Control: tags 1113478 + patch
Control: tags 1113478 + pending

Dear maintainer,

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

cu
Adrian
diffstat for rtl-433-25.02 rtl-433-25.02

 changelog                                                               |    8 
 patches/0001-build-Update-for-compat-with-newer-CMake-closes-3245.patch |   25 ++
 patches/cmake                                                           |  108 ----------
 patches/series                                                          |    2 
 4 files changed, 34 insertions(+), 109 deletions(-)

diff -Nru rtl-433-25.02/debian/changelog rtl-433-25.02/debian/changelog
--- rtl-433-25.02/debian/changelog	2025-02-19 18:52:07.000000000 +0200
+++ rtl-433-25.02/debian/changelog	2025-10-20 11:02:46.000000000 +0300
@@ -1,3 +1,11 @@
+rtl-433 (25.02-1.1) unstable; urgency=medium
+
+  * Non-maintainer upload.
+  * Backport upstream fix for FTBFS with CMake 4. (Closes: #1113478)
+  * Remove unnecessary cmake patch.
+
+ -- Adrian Bunk <[email protected]>  Mon, 20 Oct 2025 11:02:46 +0300
+
 rtl-433 (25.02-1) unstable; urgency=medium
 
   * New upstream version.
diff -Nru rtl-433-25.02/debian/patches/0001-build-Update-for-compat-with-newer-CMake-closes-3245.patch rtl-433-25.02/debian/patches/0001-build-Update-for-compat-with-newer-CMake-closes-3245.patch
--- rtl-433-25.02/debian/patches/0001-build-Update-for-compat-with-newer-CMake-closes-3245.patch	1970-01-01 02:00:00.000000000 +0200
+++ rtl-433-25.02/debian/patches/0001-build-Update-for-compat-with-newer-CMake-closes-3245.patch	2025-10-20 11:01:48.000000000 +0300
@@ -0,0 +1,25 @@
+From e08a9aa98d9296fb1e252f214f42f53c1b7ae656 Mon Sep 17 00:00:00 2001
+From: "Christian W. Zuckschwerdt" <[email protected]>
+Date: Sun, 30 Mar 2025 12:05:53 +0200
+Subject: build: Update for compat with newer CMake (closes #3245)
+
+---
+ CMakeLists.txt | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/CMakeLists.txt b/CMakeLists.txt
+index 08f63eea..6dc1f791 100644
+--- a/CMakeLists.txt
++++ b/CMakeLists.txt
+@@ -1,7 +1,7 @@
+ ########################################################################
+ # Project setup
+ ########################################################################
+-cmake_minimum_required(VERSION 2.6)
++cmake_minimum_required(VERSION 2.6...3.10)
+ # Fix behavior of CMAKE_C_STANDARD when targeting macOS.
+ if(POLICY CMP0025)
+     cmake_policy(SET CMP0025 NEW)
+-- 
+2.30.2
+
diff -Nru rtl-433-25.02/debian/patches/cmake rtl-433-25.02/debian/patches/cmake
--- rtl-433-25.02/debian/patches/cmake	2020-02-17 14:22:33.000000000 +0200
+++ rtl-433-25.02/debian/patches/cmake	1970-01-01 02:00:00.000000000 +0200
@@ -1,108 +0,0 @@
-Description: <short summary of the patch>
- TODO: Put a short summary on the line above and replace this paragraph
- with a longer explanation of this change. Complete the meta-information
- with other relevant fields (see below for details). To make it easier, the
- information below has been extracted from the changelog. Adjust it or drop
- it.
- .
- rtl-433 (20.02-1) unstable; urgency=medium
- .
-   * New upstream version.
-   * Bump standards version to 4.5.0.
-Author: Gürkan Myczko <[email protected]>
-
----
-The information above should follow the Patch Tagging Guidelines, please
-checkout http://dep.debian.net/deps/dep3/ to learn about the format. Here
-are templates for supplementary fields that you might want to add:
-
-Origin: <vendor|upstream|other>, <url of original patch>
-Bug: <url in upstream bugtracker>
-Bug-Debian: https://bugs.debian.org/<bugnumber>
-Bug-Ubuntu: https://launchpad.net/bugs/<bugnumber>
-Forwarded: <no|not-needed|url proving that it has been forwarded>
-Reviewed-By: <name and email of someone who approved the patch>
-Last-Update: 2020-02-17
-
---- /dev/null
-+++ rtl-433-20.02/configure.ac.disabled
-@@ -0,0 +1,79 @@
-+AC_INIT([rtl433],
-+        m4_esyscmd([./git-version-gen .tarball-version]),
-+        [[email protected]])
-+
-+AM_INIT_AUTOMAKE([dist-bzip2 subdir-objects])
-+
-+dnl kernel style compile messages
-+m4_ifdef([AM_SILENT_RULES], [AM_SILENT_RULES([yes])])
-+
-+dnl checks for programs
-+AC_PROG_MAKE_SET
-+AC_PROG_CC
-+AC_PROG_CC_STDC
-+AC_PROG_INSTALL
-+LT_INIT
-+AC_PROG_LIBTOOL
-+
-+LT_LIB_M
-+
-+PKG_CHECK_MODULES([LIBRTLSDR], [librtlsdr], [HAVE_LIBRTLSDR=1], [HAVE_LIBRTLSDR=0])
-+AM_CONDITIONAL([USE_LIBRTLSDR], [test "$HAVE_LIBRTLSDR" -eq 1])
-+AM_COND_IF([USE_LIBRTLSDR],
-+           [ LIBS="$LIBS $LIBRTLSDR_LIBS"
-+             CFLAGS="$CFLAGS $LIBRTLSDR_CFLAGS -DRTLSDR" ])
-+
-+PKG_CHECK_MODULES([SOAPYSDR], [SoapySDR], [HAVE_SOAPYSDR=1], [HAVE_SOAPYSDR=0])
-+AM_CONDITIONAL([USE_SOAPYSDR], [test "$HAVE_SOAPYSDR" -eq 1])
-+AM_COND_IF([USE_SOAPYSDR],
-+           [ LIBS="$LIBS $SOAPYSDR_LIBS"
-+             CFLAGS="$CFLAGS $SOAPYSDR_CFLAGS -DSOAPYSDR" ])
-+
-+AC_PATH_PROG(DOXYGEN,doxygen,false)
-+AM_CONDITIONAL(HAVE_DOXYGEN, test $DOXYGEN != false)
-+
-+# cmake compat dummies for Doxyfile.in
-+AC_SUBST(CMAKE_CURRENT_SOURCE_DIR, "$srcdir")
-+AC_SUBST(CMAKE_CURRENT_BINARY_DIR, ".")
-+
-+AC_CONFIG_MACRO_DIR([m4])
-+
-+dnl checks for header files
-+AC_HEADER_STDC
-+AC_CHECK_HEADERS(sys/types.h)
-+
-+# pc variables
-+AC_SUBST(RTLSDR_PC_LIBS,["$LIBS"])
-+AC_SUBST(RTLSDR_PC_CFLAGS,["$CFLAGS"])
-+
-+dnl checks for required libraries
-+
-+# The following test is taken from WebKit's webkit.m4
-+saved_CFLAGS="$CFLAGS"
-+CFLAGS="$CFLAGS -fvisibility=hidden "
-+AC_MSG_CHECKING([if ${CC} supports -fvisibility=hidden])
-+AC_COMPILE_IFELSE([AC_LANG_SOURCE([char foo;])],
-+    [ AC_MSG_RESULT([yes])
-+      SYMBOL_VISIBILITY="-fvisibility=hidden"],
-+      AC_MSG_RESULT([no]))
-+CFLAGS="$saved_CFLAGS"
-+AC_SUBST(SYMBOL_VISIBILITY)
-+
-+AC_MSG_CHECKING(whether compiler understands -Wall)
-+old_CFLAGS="$CFLAGS"
-+CFLAGS="$CFLAGS -Wall -Wextra -Wno-unused -Wsign-compare"
-+AC_TRY_COMPILE([],[],
-+  AC_MSG_RESULT(yes),
-+  AC_MSG_RESULT(no)
-+  CFLAGS="$old_CFLAGS")
-+
-+dnl Generate the output
-+AM_CONFIG_HEADER(config.h)
-+
-+AC_OUTPUT(
-+	rtl433.pc
-+	include/Makefile
-+	src/Makefile
-+	Makefile
-+	Doxyfile
-+)
diff -Nru rtl-433-25.02/debian/patches/series rtl-433-25.02/debian/patches/series
--- rtl-433-25.02/debian/patches/series	2020-02-17 15:05:28.000000000 +0200
+++ rtl-433-25.02/debian/patches/series	2025-10-20 11:02:46.000000000 +0300
@@ -1 +1 @@
-cmake
+0001-build-Update-for-compat-with-newer-CMake-closes-3245.patch

Reply via email to