Control: tags 1024577 + patch [Replace XX with correct value]
Hello Mike, I've prepared an NMU for libzypp (versioned as 17.25.7-2.3) and uploaded it, non-delayed as LowThresholdNmu. Kind regards Andreas
diff -Nru libzypp-17.25.7/debian/changelog libzypp-17.25.7/debian/changelog --- libzypp-17.25.7/debian/changelog 2022-10-06 22:17:51.000000000 +0200 +++ libzypp-17.25.7/debian/changelog 2022-12-08 12:07:05.000000000 +0100 @@ -1,3 +1,11 @@ +libzypp (17.25.7-2.3) unstable; urgency=low + + * Non-maintainer upload. + * 1010_gpgme-pkg_search_module.diff: Fix FTBFS against libgpgme-dev >= + 1.18.0-2 by using pkg_search_module(). Closes: #1024577 + + -- Andreas Metzler <ametz...@debian.org> Thu, 08 Dec 2022 12:07:05 +0100 + libzypp (17.25.7-2.2) unstable; urgency=medium * Non-maintainer upload. diff -Nru libzypp-17.25.7/debian/patches/1010_gpgme-pkg_search_module.diff libzypp-17.25.7/debian/patches/1010_gpgme-pkg_search_module.diff --- libzypp-17.25.7/debian/patches/1010_gpgme-pkg_search_module.diff 1970-01-01 01:00:00.000000000 +0100 +++ libzypp-17.25.7/debian/patches/1010_gpgme-pkg_search_module.diff 2022-12-08 12:07:05.000000000 +0100 @@ -0,0 +1,45 @@ +Description: Use pkg-config to lacte gpgme +Author: Andreas Metzler <ametz...@debian.org> +Bug-Debian: https://bugs.debian.org/1024577 +Origin: vendor +Last-Update: 2022-12-08 + +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -218,17 +218,14 @@ + # static case: Assert libsolv.a ist the last one linked + SET(LibSolv_LIBRARIES ${LibSolv_LIBRARIES} ${LIBSOLV_LIBRARY}) + ENDIF() + ENDIF( LIBSOLV_SRCDIR AND LIBSOLV_BUILDDIR ) + +-FIND_PACKAGE(Gpgme REQUIRED) +-IF ( NOT GPGME_PTHREAD_FOUND ) +- MESSAGE( FATAL_ERROR " gpgme not found" ) +-ELSE() +- INCLUDE_DIRECTORIES( ${GPGME_INCLUDES} ) +- LINK_DIRECTORIES(${GPGME_LIBRARY_DIR}) +-ENDIF() ++pkg_search_module(GPGME REQUIRED gpgme>=1.8.0) ++MESSAGE(STATUS "found gpgme ${GPGME_VERSION}" ) ++INCLUDE_DIRECTORIES( ${GPGME_INCLUDE_DIRS} ) ++LINK_DIRECTORIES(${GPGME_LIBRARY_DIRS}) + + FIND_PACKAGE(OpenSSL REQUIRED) + + FIND_PACKAGE(Udev) + IF ( NOT UDEV_FOUND ) +--- a/zypp/CMakeLists.txt ++++ b/zypp/CMakeLists.txt +@@ -926,11 +926,11 @@ + TARGET_LINK_LIBRARIES(${LIBNAME} ${LibSolv_LIBRARIES} ) + TARGET_LINK_LIBRARIES(${LIBNAME} ${OPENSSL_LIBRARIES} ) + TARGET_LINK_LIBRARIES(${LIBNAME} ${CRYPTO_LIBRARIES} ) + TARGET_LINK_LIBRARIES(${LIBNAME} ${SIGNALS_LIBRARY}) + TARGET_LINK_LIBRARIES(${LIBNAME} ${Boost_THREAD_LIBRARY}) +- TARGET_LINK_LIBRARIES(${LIBNAME} ${GPGME_PTHREAD_LIBRARIES}) ++ TARGET_LINK_LIBRARIES(${LIBNAME} ${GPGME_LIBRARIES}) + target_link_libraries(${LIBNAME} ${SIGCPP_LIBRARIES}) + target_link_libraries(${LIBNAME} ${LIBGLIB_LIBRARIES}) + target_link_libraries(${LIBNAME} ${YAML_CPP_LIBRARIES}) + + IF (ENABLE_ZSTD_COMPRESSION) diff -Nru libzypp-17.25.7/debian/patches/series libzypp-17.25.7/debian/patches/series --- libzypp-17.25.7/debian/patches/series 2022-10-06 22:17:48.000000000 +0200 +++ libzypp-17.25.7/debian/patches/series 2022-12-08 12:01:08.000000000 +0100 @@ -3,3 +3,4 @@ 1004_fix-fastcgi-includes.patch 0001-Add-missing-includes-for-GCC-11-bsc-1181874.patch 0001-Fix-building-with-GCC-12.x-release.patch +1010_gpgme-pkg_search_module.diff
signature.asc
Description: PGP signature
