Control: tags 1112756 + patch Control: tags 1112756 + pending Dear maintainer,
I've prepared an NMU for blockattack (versioned as 2.9.0-1.1) and uploaded it to DELAYED/14. Please feel free to tell me if I should cancel it. cu Adrian
diffstat for blockattack-2.9.0 blockattack-2.9.0 changelog | 7 ++ patches/0001-Update-to-CMake-to-handle-newer-versions.patch | 31 ++++++++++++ patches/cmake-4.patch | 13 +++++ patches/series | 2 4 files changed, 53 insertions(+) diff -Nru blockattack-2.9.0/debian/changelog blockattack-2.9.0/debian/changelog --- blockattack-2.9.0/debian/changelog 2024-05-31 21:25:20.000000000 +0300 +++ blockattack-2.9.0/debian/changelog 2025-10-11 16:56:46.000000000 +0300 @@ -1,3 +1,10 @@ +blockattack (2.9.0-1.1) unstable; urgency=medium + + * Non-maintainer upload. + * Fix FTBFS with CMake 4. (Closes: #1112756) + + -- Adrian Bunk <[email protected]> Sat, 11 Oct 2025 16:56:46 +0300 + blockattack (2.9.0-1) unstable; urgency=medium * Team upload. diff -Nru blockattack-2.9.0/debian/patches/0001-Update-to-CMake-to-handle-newer-versions.patch blockattack-2.9.0/debian/patches/0001-Update-to-CMake-to-handle-newer-versions.patch --- blockattack-2.9.0/debian/patches/0001-Update-to-CMake-to-handle-newer-versions.patch 1970-01-01 02:00:00.000000000 +0200 +++ blockattack-2.9.0/debian/patches/0001-Update-to-CMake-to-handle-newer-versions.patch 2025-10-11 16:56:46.000000000 +0300 @@ -0,0 +1,31 @@ +From 96fb5431a616b4800e85e4c805ba301203444bab Mon Sep 17 00:00:00 2001 +From: Poul Sander <[email protected]> +Date: Sat, 22 Feb 2025 11:16:29 +0100 +Subject: Update to CMake to handle newer versions + +--- + CMakeLists.txt | 4 ++-- + 1 file changed, 2 insertions(+), 2 deletions(-) + +diff --git a/CMakeLists.txt b/CMakeLists.txt +index 0927a63..8522617 100644 +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -1,4 +1,4 @@ +-cmake_minimum_required(VERSION 3.5.1...3.27.4) ++cmake_minimum_required(VERSION 3.5.1...3.30.3) + project (blockattack) + set(BIN_DIR ${blockattack_SOURCE_DIR}/Game) + +@@ -77,7 +77,7 @@ pkg_search_module(SDL2TTF REQUIRED SDL2_ttf) + + find_package(Intl REQUIRED) + +-find_package(Boost COMPONENTS program_options REQUIRED) ++find_package(Boost COMPONENTS program_options REQUIRED NO_MODULE) + + #Find all sources but one + file(GLOB SOURCES "source/code/*.cpp" "source/code/*.inc" "source/code/*.h*" "source/code/*/*.cpp" "source/code/*/*.h*" "source/code/Libs/*.c" "source/code/Libs/*.h*") +-- +2.30.2 + diff -Nru blockattack-2.9.0/debian/patches/cmake-4.patch blockattack-2.9.0/debian/patches/cmake-4.patch --- blockattack-2.9.0/debian/patches/cmake-4.patch 1970-01-01 02:00:00.000000000 +0200 +++ blockattack-2.9.0/debian/patches/cmake-4.patch 2025-10-11 16:56:46.000000000 +0300 @@ -0,0 +1,13 @@ +Description: Fix FTBFS with CMake 4 +Author: Adrian Bunk <[email protected]> +Bug-Debian: https://bugs.debian.org/1112756 + +--- blockattack-2.9.0.orig/source/misc/embedded_libs/PlatformFolders-4.2.0/CMakeLists.txt ++++ blockattack-2.9.0/source/misc/embedded_libs/PlatformFolders-4.2.0/CMakeLists.txt +@@ -1,5 +1,5 @@ + # For target_compile_features +-cmake_minimum_required(VERSION 3.1.0 FATAL_ERROR) ++cmake_minimum_required(VERSION 3.5.0 FATAL_ERROR) + + set(PLATFORMFOLDERS_MAIN_PROJECT OFF) + if(CMAKE_CURRENT_SOURCE_DIR STREQUAL CMAKE_SOURCE_DIR) diff -Nru blockattack-2.9.0/debian/patches/series blockattack-2.9.0/debian/patches/series --- blockattack-2.9.0/debian/patches/series 2024-05-31 21:25:20.000000000 +0300 +++ blockattack-2.9.0/debian/patches/series 2025-10-11 16:56:46.000000000 +0300 @@ -1,3 +1,5 @@ install-path.patch build-Add-include-directories-for-all-SDL2_foo-modules.patch bug +0001-Update-to-CMake-to-handle-newer-versions.patch +cmake-4.patch
