Bug#1110449: calamares: diff for NMU version 3.3.14-5.1
Control: tags 1110449 + pending
Dear maintainer,
I've prepared an NMU for calamares (versioned as 3.3.14-5.1) and
uploaded it to DELAYED/2. Please feel free to tell me if I should
cancel it.
cu
Adrian
diffstat for calamares-3.3.14 calamares-3.3.14
changelog | 7 +++
patches/0001-CMake-Don-t-build-with-Wl-fatal-warnings.patch | 25 ++++++++++++
patches/series | 1
rules | 4 -
4 files changed, 33 insertions(+), 4 deletions(-)
diff -Nru calamares-3.3.14/debian/changelog calamares-3.3.14/debian/changelog
--- calamares-3.3.14/debian/changelog 2025-12-02 16:05:13.000000000 +0200
+++ calamares-3.3.14/debian/changelog 2025-12-16 07:24:20.000000000 +0200
@@ -1,3 +1,10 @@
+calamares (3.3.14-5.1) unstable; urgency=medium
+
+ * Non-maintainer upload.
+ * Don't build with -Wl,--fatal-warnings. (Closes: #1110449)
+
+ -- Adrian Bunk <bunk@debian.org> Tue, 16 Dec 2025 07:24:20 +0200
+
calamares (3.3.14-5) unstable; urgency=medium
* Restore debian/rules
diff -Nru calamares-3.3.14/debian/patches/0001-CMake-Don-t-build-with-Wl-fatal-warnings.patch calamares-3.3.14/debian/patches/0001-CMake-Don-t-build-with-Wl-fatal-warnings.patch
--- calamares-3.3.14/debian/patches/0001-CMake-Don-t-build-with-Wl-fatal-warnings.patch 1970-01-01 02:00:00.000000000 +0200
+++ calamares-3.3.14/debian/patches/0001-CMake-Don-t-build-with-Wl-fatal-warnings.patch 2025-12-16 07:23:49.000000000 +0200
@@ -0,0 +1,25 @@
+From abca3c0fb31c8d6b09b159a7b3cf34d1dccc72fe Mon Sep 17 00:00:00 2001
+From: Adrian Bunk <bunk@debian.org>
+Date: Tue, 2 Dec 2025 17:36:58 +0200
+Subject: CMake: Don't build with -Wl,--fatal-warnings
+
+---
+ CMakeLists.txt | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/CMakeLists.txt b/CMakeLists.txt
+index b73735236..df62995e9 100644
+--- a/CMakeLists.txt
++++ b/CMakeLists.txt
+@@ -267,7 +267,7 @@ set(CMAKE_C_FLAGS_MINSIZEREL "-Os -DNDEBUG")
+ set(CMAKE_C_FLAGS_RELEASE "-O3 -DNDEBUG")
+ set(CMAKE_C_FLAGS_RELWITHDEBINFO "-O2 -g")
+
+-set(CMAKE_SHARED_LINKER_FLAGS "-Wl,--no-undefined -Wl,--fatal-warnings ${CMAKE_SHARED_LINKER_FLAGS}")
++set(CMAKE_SHARED_LINKER_FLAGS "-Wl,--no-undefined ${CMAKE_SHARED_LINKER_FLAGS}")
+
+ # If no build type is set, pick a reasonable one
+ if(DEBUG_SANITIZERS)
+--
+2.30.2
+
diff -Nru calamares-3.3.14/debian/patches/series calamares-3.3.14/debian/patches/series
--- calamares-3.3.14/debian/patches/series 1970-01-01 02:00:00.000000000 +0200
+++ calamares-3.3.14/debian/patches/series 2025-12-16 07:24:02.000000000 +0200
@@ -0,0 +1 @@
+0001-CMake-Don-t-build-with-Wl-fatal-warnings.patch
diff -Nru calamares-3.3.14/debian/rules calamares-3.3.14/debian/rules
--- calamares-3.3.14/debian/rules 2025-12-02 16:05:13.000000000 +0200
+++ calamares-3.3.14/debian/rules 2025-12-16 07:23:34.000000000 +0200
@@ -6,10 +6,6 @@
# Help makes build paths reproducible
export DEB_BUILD_MAINT_OPTIONS=buildinfo=+path
-ifeq ($(DEB_TARGET_ARCH),arm64)
-DEB_LDFLAGS_MAINT_APPEND=-Wl,-z,gcs-report-dynamic=none
-endif
-
%:
dh $@ --with kf6
Reply to: