Control: tags 1024475 + pending Control: tags 1112720 + patch Control: tags 1112720 + pending
Dear maintainer, I've prepared an NMU for basket (versioned as 2.49-1.1) and uploaded it to DELAYED/2. Please feel free to tell me if I should cancel it. cu Adrian
diffstat for basket-2.49 basket-2.49 changelog | 9 ++++ patches/05_gpgme-pkg_search_module.diff | 61 ++++++++++++++++++++++++++++++++ patches/cmake-4.patch | 12 ++++++ patches/series | 2 + 4 files changed, 84 insertions(+) diff -Nru basket-2.49/debian/changelog basket-2.49/debian/changelog --- basket-2.49/debian/changelog 2019-08-20 22:55:23.000000000 +0300 +++ basket-2.49/debian/changelog 2025-10-17 19:14:48.000000000 +0300 @@ -1,3 +1,12 @@ +basket (2.49-1.1) unstable; urgency=medium + + * Non-maintainer upload. + * Fix FTBFS with CMake 4. (Closes: #1112720) + * Add patch from Andreas Metzler to restore gpgme integration. + (Closes: #1024475) + + -- Adrian Bunk <[email protected]> Fri, 17 Oct 2025 19:14:48 +0300 + 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 02:00:00.000000000 +0200 +++ basket-2.49/debian/patches/05_gpgme-pkg_search_module.diff 2025-10-17 19:14:48.000000000 +0300 @@ -0,0 +1,61 @@ +Description: Use pkg-config to locate gpgme +Author: Andreas Metzler <[email protected]> +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/cmake-4.patch basket-2.49/debian/patches/cmake-4.patch --- basket-2.49/debian/patches/cmake-4.patch 1970-01-01 02:00:00.000000000 +0200 +++ basket-2.49/debian/patches/cmake-4.patch 2025-10-17 19:14:48.000000000 +0300 @@ -0,0 +1,12 @@ +Description: Fix FTBFS with CMake 4 +Author: Adrian Bunk <[email protected]> +Bug-Debian: https://bugs.debian.org/1112720 + +--- basket-2.49.orig/CMakeLists.txt ++++ basket-2.49/CMakeLists.txt +@@ -1,4 +1,4 @@ +-cmake_minimum_required(VERSION 2.8.12) ++cmake_minimum_required(VERSION 3.5) + cmake_policy(SET CMP0063 NEW) + set(BASKET_DISABLE_GPG "0" CACHE BOOL "Disables GPG Support") + diff -Nru basket-2.49/debian/patches/series basket-2.49/debian/patches/series --- basket-2.49/debian/patches/series 2019-08-20 22:49:15.000000000 +0300 +++ basket-2.49/debian/patches/series 2025-10-17 19:14:48.000000000 +0300 @@ -1 +1,3 @@ 01-fix-mimetype-installation.patch +cmake-4.patch +05_gpgme-pkg_search_module.diff
