Control: tags 1112766 + patch Control: tags 1112766 + pending Control: tags 1114076 + patch Control: tags 1114076 + pending
Dear maintainer, I've prepared an NMU for catimg (versioned as 2.7.0-4.1) and uploaded it to DELAYED/14. Please feel free to tell me if I should cancel it. cu Adrian
diffstat for catimg-2.7.0 catimg-2.7.0 changelog | 8 ++++++++ patches/cmake-4.patch | 12 ++++++++++++ patches/gcc-15.patch | 15 +++++++++++++++ patches/series | 2 ++ 4 files changed, 37 insertions(+) diff -Nru catimg-2.7.0/debian/changelog catimg-2.7.0/debian/changelog --- catimg-2.7.0/debian/changelog 2025-01-14 11:06:11.000000000 +0200 +++ catimg-2.7.0/debian/changelog 2025-10-04 22:00:53.000000000 +0300 @@ -1,3 +1,11 @@ +catimg (2.7.0-4.1) unstable; urgency=medium + + * Non-maintainer upload. + * Fix FTBFS with CMake 4. (Closes: #1112766) + * Fix FTBFS with GCC 15. (Closes: #1114076) + + -- Adrian Bunk <[email protected]> Sat, 04 Oct 2025 22:00:53 +0300 + catimg (2.7.0-4) unstable; urgency=medium * Add patch to not require c99 and work around ftbfs diff -Nru catimg-2.7.0/debian/patches/cmake-4.patch catimg-2.7.0/debian/patches/cmake-4.patch --- catimg-2.7.0/debian/patches/cmake-4.patch 1970-01-01 02:00:00.000000000 +0200 +++ catimg-2.7.0/debian/patches/cmake-4.patch 2025-10-04 22:00:53.000000000 +0300 @@ -0,0 +1,12 @@ +Description: Fix FTBFS with CMake 4 +Author: Adrian Bunk <[email protected]> +Bug-Debian: https://bugs.debian.org/1112766 + +--- catimg-2.7.0.orig/CMakeLists.txt ++++ catimg-2.7.0/CMakeLists.txt +@@ -1,4 +1,4 @@ +-cmake_minimum_required(VERSION 2.8) ++cmake_minimum_required(VERSION 3.5) + project(catimg) + + set(EXECUTABLE_OUTPUT_PATH ${PROJECT_SOURCE_DIR}/bin) diff -Nru catimg-2.7.0/debian/patches/gcc-15.patch catimg-2.7.0/debian/patches/gcc-15.patch --- catimg-2.7.0/debian/patches/gcc-15.patch 1970-01-01 02:00:00.000000000 +0200 +++ catimg-2.7.0/debian/patches/gcc-15.patch 2025-10-04 22:00:53.000000000 +0300 @@ -0,0 +1,15 @@ +Description: Fix FTBFS with GCC 15 +Author: Adrian Bunk <[email protected]> +Bug-Debian: https://bugs.debian.org/1114076 + +--- catimg-2.7.0.orig/src/catimg.c ++++ catimg-2.7.0/src/catimg.c +@@ -34,7 +34,7 @@ extern int optreset; + volatile int loops = -1, loop = -1; + volatile char stop = 0; + +-void intHandler() { ++void intHandler(int sig) { + loops = loop; + stop = 1; + } diff -Nru catimg-2.7.0/debian/patches/series catimg-2.7.0/debian/patches/series --- catimg-2.7.0/debian/patches/series 2025-01-14 11:06:11.000000000 +0200 +++ catimg-2.7.0/debian/patches/series 2025-10-04 22:00:53.000000000 +0300 @@ -1 +1,3 @@ do-not-use-c99 +cmake-4.patch +gcc-15.patch
