Control: tags -1 pending On 2022-11-20 Andreas Metzler <ametz...@bebt.de> wrote: > Package: basket > Version: 2.49-1 > Severity: important > User: pkg-gnupg-ma...@lists.alioth.debian.org > Usertags: gpgme-config-transition
> Hello, > basket relies on gpgme-config to detect gpgme. gpgme-config has been > dropped and replaced by pkg-config pc files. Straightforward patch attached. cu Andreas -- `What a good friend you are to him, Dr. Maturin. His other friends are so grateful to you.' `I sew his ears on from time to time, sure'
diff -Nru basket-2.49/debian/changelog basket-2.49/debian/changelog --- basket-2.49/debian/changelog 2019-08-20 21:55:23.000000000 +0200 +++ basket-2.49/debian/changelog 2022-12-10 14:13:50.000000000 +0100 @@ -1,3 +1,10 @@ +basket (2.49-1.1) unstable; urgency=medium + + * Non-maintainer upload. + * Use pkg-config to locate gpgme. Closes: #1024475 + + -- Andreas Metzler <ametz...@debian.org> Sat, 10 Dec 2022 14:13:50 +0100 + basket (2.49-1) unstable; urgency=medium * New release (2.49): diff -Nru basket-2.49/debian/patches/05_gpgme-pkg_search_module.diff basket-2.49/debian/patches/05_gpgme-pkg_search_module.diff --- basket-2.49/debian/patches/05_gpgme-pkg_search_module.diff 1970-01-01 01:00:00.000000000 +0100 +++ basket-2.49/debian/patches/05_gpgme-pkg_search_module.diff 2022-12-10 14:13:50.000000000 +0100 @@ -0,0 +1,61 @@ +Description: Use pkg-config to locate gpgme +Author: Andreas Metzler <ametz...@debian.org> +Bug-Debian: https://bugs.debian.org/1024475 +Origin: vendor +Forwarded: no +Last-Update: 2022-12-10 + +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -10,11 +10,12 @@ + find_package(ECM REQUIRED NO_MODULE) + set(CMAKE_MODULE_PATH ${CMAKE_MODULE_PATH} ${ECM_MODULE_PATH}) + + set(CMAKE_MODULE_PATH ${CMAKE_MODULE_PATH} "${CMAKE_SOURCE_DIR}/cmake/Modules/") + IF(NOT BASKET_DISABLE_GPG) +- find_package(Gpgme) ++ FIND_PACKAGE(PkgConfig) ++ pkg_search_module(GPGME gpgme) + ENDIF(NOT BASKET_DISABLE_GPG) + + # libgit2 + find_package(Libgit2) + IF(LIBGIT2_FOUND) +--- a/src/CMakeLists.txt ++++ b/src/CMakeLists.txt +@@ -1,6 +1,6 @@ +-include_directories(${GPGME_INCLUDES}) ++include_directories(${GPGME_INCLUDE_DIRS}) + + ########### next target ############### + + set(basketcommon_LIB_SRCS + aboutdata.cpp +@@ -67,11 +67,11 @@ + + add_library(basketcommon SHARED ${basketcommon_LIB_SRCS} ${basket_FORM_HDRS} ${basket_RESOURCES}) + + target_link_libraries(basketcommon + ${PHONON_LIBRARY} +- ${GPGME_VANILLA_LIBRARIES} ++ ${GPGME_LIBRARIES} + KF5::Archive + KF5::ConfigWidgets + KF5::CoreAddons + KF5::Crash + KF5::DBusAddons +--- a/src/tests/CMakeLists.txt ++++ b/src/tests/CMakeLists.txt +@@ -36,11 +36,11 @@ + + add_executable(${_testname} ${_testname}.cpp ${baskettest_SRCS}) + ecm_mark_as_test(${_testname}) + add_dependencies(tests ${_testname}) + +- target_link_libraries(${_testname} basketcommon ${GPGME_VANILLA_LIBRARIES} Qt5::Test) ++ target_link_libraries(${_testname} basketcommon ${GPGME_LIBRARIES} Qt5::Test) + endmacro(basket_full_unit_test) + + + basket_standalone_unit_test(notetest) + basket_standalone_unit_test(basketviewtest) diff -Nru basket-2.49/debian/patches/series basket-2.49/debian/patches/series --- basket-2.49/debian/patches/series 2019-08-20 21:49:15.000000000 +0200 +++ basket-2.49/debian/patches/series 2022-12-10 14:11:08.000000000 +0100 @@ -1 +1,2 @@ 01-fix-mimetype-installation.patch +05_gpgme-pkg_search_module.diff
