Control: tags 1113073 + patch
Control: tags 1113073 + pending

Dear maintainer,

I've prepared an NMU for kernelshark (versioned as 2.4.0-1.1) and 
uploaded it to DELAYED/14. Please feel free to tell me if I should 
cancel it.

cu
Adrian
diffstat for kernelshark-2.4.0 kernelshark-2.4.0

 changelog                                                  |    7 ++
 patches/0001-kernelshark-Allow-building-with-CMake-4.patch |   37 +++++++++++++
 patches/series                                             |    1 
 3 files changed, 45 insertions(+)

diff -Nru kernelshark-2.4.0/debian/changelog kernelshark-2.4.0/debian/changelog
--- kernelshark-2.4.0/debian/changelog	2025-04-05 01:46:28.000000000 +0300
+++ kernelshark-2.4.0/debian/changelog	2025-10-24 16:05:10.000000000 +0300
@@ -1,3 +1,10 @@
+kernelshark (2.4.0-1.1) unstable; urgency=medium
+
+  * Non-maintainer upload.
+  * Add upstream fix for FTBFS with CMake 4. (Closes: #1113073)
+
+ -- Adrian Bunk <[email protected]>  Fri, 24 Oct 2025 16:05:10 +0300
+
 kernelshark (2.4.0-1) unstable; urgency=medium
 
   * New upstream version 2.4.0
diff -Nru kernelshark-2.4.0/debian/patches/0001-kernelshark-Allow-building-with-CMake-4.patch kernelshark-2.4.0/debian/patches/0001-kernelshark-Allow-building-with-CMake-4.patch
--- kernelshark-2.4.0/debian/patches/0001-kernelshark-Allow-building-with-CMake-4.patch	1970-01-01 02:00:00.000000000 +0200
+++ kernelshark-2.4.0/debian/patches/0001-kernelshark-Allow-building-with-CMake-4.patch	2025-10-24 16:04:34.000000000 +0300
@@ -0,0 +1,37 @@
+From c191316c05d2fa3f7ff9440449f69639421c1092 Mon Sep 17 00:00:00 2001
+From: Michal Sojka <[email protected]>
+Date: Fri, 10 Oct 2025 15:17:15 +0200
+Subject: kernelshark: Allow building with CMake 4+
+
+CMake 4.0 removed compatibility with versions of CMake older than 3.5
+[1]. In order to builde Kernelshark with CMake 4, at least version 3.5
+needs to be declared. However, versions older than 3.10 are deprecated
+so it's probably better to upgrade directly to 3.10.
+
+To support builds with older CMake, as before, we use the "..." syntax
+in cmake_minimum_required [3].
+
+[1]: https://cmake.org/cmake/help/latest/release/4.0.html#deprecated-and-removed-features
+[2]: https://cmake.org/cmake/help/latest/release/3.31.html#deprecated-and-removed-features
+[3]: https://cmake.org/cmake/help/latest/command/cmake_minimum_required.html#command:cmake_minimum_required
+
+Signed-off-by: Michal Sojka <[email protected]>
+Signed-off-by: Yordan Karadzhov <[email protected]>
+---
+ CMakeLists.txt | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/CMakeLists.txt b/CMakeLists.txt
+index 6aa1a5b..54ff97c 100644
+--- a/CMakeLists.txt
++++ b/CMakeLists.txt
+@@ -1,5 +1,5 @@
+ # Check if cmake has the required version
+-cmake_minimum_required(VERSION 3.1.2 FATAL_ERROR)
++cmake_minimum_required(VERSION 3.1.2...3.10)
+ 
+ # Set the name and version of the project
+ project(kernel-shark)
+-- 
+2.30.2
+
diff -Nru kernelshark-2.4.0/debian/patches/series kernelshark-2.4.0/debian/patches/series
--- kernelshark-2.4.0/debian/patches/series	2025-04-05 01:34:13.000000000 +0300
+++ kernelshark-2.4.0/debian/patches/series	2025-10-24 16:05:08.000000000 +0300
@@ -1 +1,2 @@
 remove_rpath.patch
+0001-kernelshark-Allow-building-with-CMake-4.patch

Reply via email to