Control: tags 1113425 + patch Control: tags 1113425 + pending Dear maintainer,
I've prepared an NMU for psi (versioned as 1.5+dfsg1-2.1) and uploaded it to DELAYED/15. Please feel free to tell me if I should cancel it. cu Adrian
diffstat for psi-1.5+dfsg1 psi-1.5+dfsg1 changelog | 7 +++++ patches/cmake-4.patch | 66 ++++++++++++++++++++++++++++++++++++++++++++++++++ patches/series | 1 3 files changed, 74 insertions(+) diff -Nru psi-1.5+dfsg1/debian/changelog psi-1.5+dfsg1/debian/changelog --- psi-1.5+dfsg1/debian/changelog 2024-12-26 23:32:41.000000000 +0200 +++ psi-1.5+dfsg1/debian/changelog 2025-10-26 23:04:27.000000000 +0200 @@ -1,3 +1,10 @@ +psi (1.5+dfsg1-2.1) unstable; urgency=medium + + * Non-maintainer upload. + * Fix FTBFS with CMake 4. (Closes: #1113425) + + -- Adrian Bunk <[email protected]> Sun, 26 Oct 2025 23:04:27 +0200 + psi (1.5+dfsg1-2) unstable; urgency=medium * Team upload. diff -Nru psi-1.5+dfsg1/debian/patches/cmake-4.patch psi-1.5+dfsg1/debian/patches/cmake-4.patch --- psi-1.5+dfsg1/debian/patches/cmake-4.patch 1970-01-01 02:00:00.000000000 +0200 +++ psi-1.5+dfsg1/debian/patches/cmake-4.patch 2025-10-26 23:04:27.000000000 +0200 @@ -0,0 +1,66 @@ +Description: Fix FTBFS with CMake 4 +Author: Adrian Bunk <[email protected]> +Bug-Debian: https://bugs.debian.org/1113425 + +--- psi-1.5+dfsg1.orig/3rdparty/CMakeLists.txt ++++ psi-1.5+dfsg1/3rdparty/CMakeLists.txt +@@ -1,4 +1,4 @@ +-cmake_minimum_required(VERSION 3.1.0) ++cmake_minimum_required(VERSION 3.5) + + if(NOT CMAKE_BUILD_TYPE) + set(CMAKE_BUILD_TYPE "Release") +--- psi-1.5+dfsg1.orig/CMakeLists.txt ++++ psi-1.5+dfsg1/CMakeLists.txt +@@ -1,4 +1,4 @@ +-cmake_minimum_required(VERSION 3.1.0) ++cmake_minimum_required(VERSION 3.5) + if(NOT CMAKE_BUILD_TYPE) + set(CMAKE_BUILD_TYPE "Release" CACHE STRING "") + endif() +--- psi-1.5+dfsg1.orig/iris/CMakeLists.txt ++++ psi-1.5+dfsg1/iris/CMakeLists.txt +@@ -3,7 +3,7 @@ if(NOT CMAKE_BUILD_TYPE) + endif() + + project(iris) +-cmake_minimum_required(VERSION 3.1.0) ++cmake_minimum_required(VERSION 3.5) + + set( IRIS_LIB_VERSION_MAJOR 1 ) + set( IRIS_LIB_VERSION_MINOR 0 ) +--- psi-1.5+dfsg1.orig/iris/src/irisnet/CMakeLists.txt ++++ psi-1.5+dfsg1/iris/src/irisnet/CMakeLists.txt +@@ -1,4 +1,4 @@ +-cmake_minimum_required(VERSION 3.1.0) ++cmake_minimum_required(VERSION 3.5) + include_directories( + ${CMAKE_CURRENT_BINARY_DIR} + corelib +--- psi-1.5+dfsg1.orig/iris/src/jdns/CMakeLists.txt ++++ psi-1.5+dfsg1/iris/src/jdns/CMakeLists.txt +@@ -1,7 +1,7 @@ + project(jdns) + + # Force cmake 2.8.8 in order to have a decent support of Qt5 +-cmake_minimum_required(VERSION 2.8.8) ++cmake_minimum_required(VERSION 3.5) + cmake_policy(SET CMP0003 NEW) + + # Do not link against qtmain on Windows +--- psi-1.5+dfsg1.orig/src/plugins/CMakeLists.txt ++++ psi-1.5+dfsg1/src/plugins/CMakeLists.txt +@@ -1,4 +1,4 @@ +-cmake_minimum_required( VERSION 2.8.12 ) ++cmake_minimum_required( VERSION 3.5 ) + set_directory_properties(PROPERTIES + INCLUDE_DIRECTORIES "" + COMPILE_DEFINITIONS "" +--- psi-1.5+dfsg1.orig/src/win32-prepare-deps.cmake ++++ psi-1.5+dfsg1/src/win32-prepare-deps.cmake +@@ -1,4 +1,4 @@ +-cmake_minimum_required(VERSION 2.8.12) ++cmake_minimum_required(VERSION 3.5) + if(CMAKE_BUILD_TYPE STREQUAL "Debug" AND WIN32) + set(D "d") + endif() diff -Nru psi-1.5+dfsg1/debian/patches/series psi-1.5+dfsg1/debian/patches/series --- psi-1.5+dfsg1/debian/patches/series 2024-12-26 23:32:41.000000000 +0200 +++ psi-1.5+dfsg1/debian/patches/series 2025-10-26 23:04:27.000000000 +0200 @@ -1,2 +1,3 @@ 01_install-hicolor-icons.patch make-the-build-reproducible-closes-10174.patch +cmake-4.patch
