Control: tags 1112868 + patch Control: tags 1112868 + pending Dear maintainer,
I've prepared an NMU for eiskaltdcpp (versioned as 2.4.2-1.4) and uploaded it to DELAYED/2. Please feel free to tell me if I should cancel it. cu Adrian
diffstat for eiskaltdcpp-2.4.2 eiskaltdcpp-2.4.2 changelog | 7 ++ patches/cmake-4.patch | 124 ++++++++++++++++++++++++++++++++++++++++++++++++++ patches/series | 1 3 files changed, 132 insertions(+) diff -Nru eiskaltdcpp-2.4.2/debian/changelog eiskaltdcpp-2.4.2/debian/changelog --- eiskaltdcpp-2.4.2/debian/changelog 2025-03-06 21:17:55.000000000 +0200 +++ eiskaltdcpp-2.4.2/debian/changelog 2025-11-19 21:21:59.000000000 +0200 @@ -1,3 +1,10 @@ +eiskaltdcpp (2.4.2-1.4) unstable; urgency=medium + + * Non-maintainer upload. + * Fix FTBFS with CMake 4. (Closes: #1112868) + + -- Adrian Bunk <[email protected]> Wed, 19 Nov 2025 21:21:59 +0200 + eiskaltdcpp (2.4.2-1.3) unstable; urgency=medium * Non-maintainer upload. diff -Nru eiskaltdcpp-2.4.2/debian/patches/cmake-4.patch eiskaltdcpp-2.4.2/debian/patches/cmake-4.patch --- eiskaltdcpp-2.4.2/debian/patches/cmake-4.patch 1970-01-01 02:00:00.000000000 +0200 +++ eiskaltdcpp-2.4.2/debian/patches/cmake-4.patch 2025-11-19 21:21:59.000000000 +0200 @@ -0,0 +1,124 @@ +Description: Fix FTBFS with CMake 4 +Author: Adrian Bunk <[email protected]> +Bug-Debian: https://bugs.debian.org/1112868 + +--- eiskaltdcpp-2.4.2.orig/CMakeLists.txt ++++ eiskaltdcpp-2.4.2/CMakeLists.txt +@@ -1,5 +1,5 @@ + project (eiskaltdcpp) +-cmake_minimum_required (VERSION 2.6.3) ++cmake_minimum_required (VERSION 3.5) + + set (PROJECT_NAME "EiskaltDC++") + set (VERSION "2.4.2-stable") # Main program version (displayed in UI) +--- eiskaltdcpp-2.4.2.orig/cmake/FindGTK3.cmake ++++ eiskaltdcpp-2.4.2/cmake/FindGTK3.cmake +@@ -338,7 +338,7 @@ endif() + # If specified, enforce version number + # + if(GTK3_FIND_VERSION) +- cmake_minimum_required(VERSION 2.6.2) ++ cmake_minimum_required(VERSION 3.5) + set(GTK3_FAILED_VERSION_CHECK true) + if(GTK3_DEBUG) + message(STATUS "[FindGTK3.cmake:${CMAKE_CURRENT_LIST_LINE}] " +--- eiskaltdcpp-2.4.2.orig/dcpp/CMakeLists.txt ++++ eiskaltdcpp-2.4.2/dcpp/CMakeLists.txt +@@ -1,6 +1,6 @@ + project (dcpp) + +-cmake_minimum_required (VERSION 2.6) ++cmake_minimum_required (VERSION 3.5) + + aux_source_directory(${PROJECT_SOURCE_DIR} dcpp_srcs) + file (GLOB dcpp_hdrs ${PROJECT_SOURCE_DIR}/*.h) +--- eiskaltdcpp-2.4.2.orig/dht/CMakeLists.txt ++++ eiskaltdcpp-2.4.2/dht/CMakeLists.txt +@@ -1,6 +1,6 @@ + project (dht) + +-cmake_minimum_required (VERSION 2.6) ++cmake_minimum_required (VERSION 3.5) + + aux_source_directory(${PROJECT_SOURCE_DIR} dht_srcs) + +--- eiskaltdcpp-2.4.2.orig/eiskaltdcpp-cli/CMakeLists.txt ++++ eiskaltdcpp-2.4.2/eiskaltdcpp-cli/CMakeLists.txt +@@ -1,6 +1,6 @@ + project(eiskaltdcpp-cli) + +-cmake_minimum_required(VERSION 2.6) ++cmake_minimum_required(VERSION 3.5) + + if (USE_CLI_XMLRPC) + install (FILES cli-xmlrpc.pl DESTINATION ${BINDIR} RENAME ${PROJECT_NAME}-xmlrpc +--- eiskaltdcpp-2.4.2.orig/eiskaltdcpp-daemon/CMakeLists.txt ++++ eiskaltdcpp-2.4.2/eiskaltdcpp-daemon/CMakeLists.txt +@@ -1,6 +1,6 @@ + project(eiskaltdcpp-daemon) + +-cmake_minimum_required(VERSION 2.6) ++cmake_minimum_required(VERSION 3.5) + # ######### General setup ########## + include_directories(${PROJECT_SOURCE_DIR} + ${PROJECT_SOURCE_DIR}/.. +--- eiskaltdcpp-2.4.2.orig/eiskaltdcpp-gtk/CMakeLists.txt ++++ eiskaltdcpp-2.4.2/eiskaltdcpp-gtk/CMakeLists.txt +@@ -1,6 +1,6 @@ + project (eiskaltdcpp-gtk) + +-cmake_minimum_required (VERSION 2.6) ++cmake_minimum_required (VERSION 3.5) + + set (GTK2_DIR "${PROJECT_SOURCE_DIR}/cmake/") + +--- eiskaltdcpp-2.4.2.orig/eiskaltdcpp-qt/CMakeLists.txt ++++ eiskaltdcpp-2.4.2/eiskaltdcpp-qt/CMakeLists.txt +@@ -1,10 +1,6 @@ + project (eiskaltdcpp-qt) + +-if (USE_QT) +- cmake_minimum_required (VERSION 2.6) +-elseif (USE_QT5) +- cmake_minimum_required (VERSION 2.8.11) +-endif () ++cmake_minimum_required (VERSION 3.5) + + include_directories(${PROJECT_BINARY_DIR}) + +--- eiskaltdcpp-2.4.2.orig/extra/CMakeLists.txt ++++ eiskaltdcpp-2.4.2/extra/CMakeLists.txt +@@ -1,5 +1,5 @@ + project (extra) +-cmake_minimum_required (VERSION 2.6) ++cmake_minimum_required (VERSION 3.5) + include_directories (${PROJECT_SOURCE_DIR} + ${GETTEXT_INCLUDE_DIR} + ${MINIUPNP_INCLUDE_DIR} +--- eiskaltdcpp-2.4.2.orig/haiku/CMakeLists.txt ++++ eiskaltdcpp-2.4.2/haiku/CMakeLists.txt +@@ -1,6 +1,6 @@ + project(haiku) + +-cmake_minimum_required (VERSION 2.6) ++cmake_minimum_required (VERSION 3.5) + + if (HAIKU_PKG) + install (CODE " +--- eiskaltdcpp-2.4.2.orig/json/CMakeLists.txt ++++ eiskaltdcpp-2.4.2/json/CMakeLists.txt +@@ -1,5 +1,5 @@ + project (jsonrpcpp) +-cmake_minimum_required (VERSION 2.6) ++cmake_minimum_required (VERSION 3.5) + + # ######### General setup ########## + +--- eiskaltdcpp-2.4.2.orig/windows/install-deps.cmake ++++ eiskaltdcpp-2.4.2/windows/install-deps.cmake +@@ -1,4 +1,4 @@ +-cmake_minimum_required (VERSION 2.6.3) ++cmake_minimum_required (VERSION 3.5) + + if (CMAKE_PREFIX_PATH MATCHES "mxe" AND NOT BUILD_STATIC) + set (LIBS_TARGET install-dependencies) diff -Nru eiskaltdcpp-2.4.2/debian/patches/series eiskaltdcpp-2.4.2/debian/patches/series --- eiskaltdcpp-2.4.2/debian/patches/series 2024-10-20 19:49:21.000000000 +0300 +++ eiskaltdcpp-2.4.2/debian/patches/series 2025-11-19 21:21:59.000000000 +0200 @@ -1,2 +1,3 @@ 1000100-pcre2.patch 1076688-ftbfs.patch +cmake-4.patch
