Control: tags 1116277 + pending
Control: tags 1116299 + patch
Control: tags 1116299 + pending
Dear maintainer,
I've prepared an NMU for gammaray (versioned as 3.2.2-1.1) and uploaded
it to DELAYED/2. Please feel free to tell me if I should cancel it.
cu
Adrian
diffstat for gammaray-3.2.2 gammaray-3.2.2
changelog | 9 ++
patches/0001-tests-Fix-translatortest-not-working-in-6.10.patch | 35 ++++++++++
patches/no-fatal-warnings.patch | 15 ++++
patches/series | 2
4 files changed, 61 insertions(+)
diff -Nru gammaray-3.2.2/debian/changelog gammaray-3.2.2/debian/changelog
--- gammaray-3.2.2/debian/changelog 2025-08-29 08:22:14.000000000 +0300
+++ gammaray-3.2.2/debian/changelog 2025-09-25 21:37:10.000000000 +0300
@@ -1,3 +1,12 @@
+gammaray (3.2.2-1.1) unstable; urgency=medium
+
+ * Non-maintainer upload.
+ * Don't build with -Wl,--fatal-warnings. (Closes: #1116277)
+ * Backport upstream workaround for test failure due to broken
+ Swedish translation in translations. (Closes: #1116299)
+
+ -- Adrian Bunk <b...@debian.org> Thu, 25 Sep 2025 21:37:10 +0300
+
gammaray (3.2.2-1) unstable; urgency=medium
* Team upload.
diff -Nru gammaray-3.2.2/debian/patches/0001-tests-Fix-translatortest-not-working-in-6.10.patch gammaray-3.2.2/debian/patches/0001-tests-Fix-translatortest-not-working-in-6.10.patch
--- gammaray-3.2.2/debian/patches/0001-tests-Fix-translatortest-not-working-in-6.10.patch 1970-01-01 02:00:00.000000000 +0200
+++ gammaray-3.2.2/debian/patches/0001-tests-Fix-translatortest-not-working-in-6.10.patch 2025-09-25 21:37:10.000000000 +0300
@@ -0,0 +1,35 @@
+From 738da1479425b016da089277d8b7afd24d651f77 Mon Sep 17 00:00:00 2001
+From: Sergio Martins <@>
+Date: Mon, 22 Sep 2025 12:44:43 +0100
+Subject: tests: Fix translatortest not working in 6.10
+
+Swedish translation is broken in 6.9 and 6.10 due to QTBUG-140436
+---
+ tests/translatortest.cpp | 4 ++--
+ 1 file changed, 2 insertions(+), 2 deletions(-)
+
+diff --git a/tests/translatortest.cpp b/tests/translatortest.cpp
+index 5e178b54d..ca7401b4e 100644
+--- a/tests/translatortest.cpp
++++ b/tests/translatortest.cpp
+@@ -33,7 +33,7 @@ private slots:
+
+ auto t1 = new QTranslator;
+ t1->setObjectName(QStringLiteral("t1"));
+- QVERIFY(t1->load(QLibraryInfo::location(QLibraryInfo::TranslationsPath) + QStringLiteral("/qt_sv.qm")));
++ QVERIFY(t1->load(QLibraryInfo::location(QLibraryInfo::TranslationsPath) + QStringLiteral("/qt_pt_PT.qm")));
+ QVERIFY(!t1->isEmpty());
+ QCoreApplication::installTranslator(t1);
+ QTest::qWait(1);
+@@ -71,7 +71,7 @@ private slots:
+
+ auto t1 = new QTranslator;
+ t1->setObjectName(QStringLiteral("t1"));
+- QVERIFY(t1->load(QLibraryInfo::location(QLibraryInfo::TranslationsPath) + QStringLiteral("/qt_sv.qm")));
++ QVERIFY(t1->load(QLibraryInfo::location(QLibraryInfo::TranslationsPath) + QStringLiteral("/qt_pt_PT.qm")));
+ QVERIFY(!t1->isEmpty());
+ QCoreApplication::installTranslator(t1);
+ QTest::qWait(1);
+--
+2.30.2
+
diff -Nru gammaray-3.2.2/debian/patches/no-fatal-warnings.patch gammaray-3.2.2/debian/patches/no-fatal-warnings.patch
--- gammaray-3.2.2/debian/patches/no-fatal-warnings.patch 1970-01-01 02:00:00.000000000 +0200
+++ gammaray-3.2.2/debian/patches/no-fatal-warnings.patch 2025-09-25 21:37:10.000000000 +0300
@@ -0,0 +1,15 @@
+Description: Don't make linker warnings fatal
+Author: Adrian Bunk <b...@debian.org>
+Debian-Bug: https://bugs.debian.org/1116277
+
+--- gammaray-3.2.2.orig/CMakeLists.txt
++++ gammaray-3.2.2/CMakeLists.txt
+@@ -419,7 +419,7 @@ if((CMAKE_SYSTEM_NAME MATCHES Linux OR C
+ )
+ set(_linker_flags "-Wl,-z,origin")
+ if(NOT ECM_ENABLE_SANITIZERS)
+- set(_linker_flags "-Wl,--fatal-warnings -Wl,--no-undefined -lc ${_linker_flags}")
++ set(_linker_flags "-Wl,--no-undefined -lc ${_linker_flags}")
+ endif()
+ set(CMAKE_SHARED_LINKER_FLAGS "${_linker_flags} ${CMAKE_SHARED_LINKER_FLAGS}")
+ set(CMAKE_MODULE_LINKER_FLAGS "${_linker_flags} ${CMAKE_MODULE_LINKER_FLAGS}")
diff -Nru gammaray-3.2.2/debian/patches/series gammaray-3.2.2/debian/patches/series
--- gammaray-3.2.2/debian/patches/series 2025-08-14 08:11:29.000000000 +0300
+++ gammaray-3.2.2/debian/patches/series 2025-09-25 21:37:10.000000000 +0300
@@ -1,3 +1,5 @@
debian-archs-fix-build.patch
qt-system-paths.patch
disable-flaky-tests.patch
+no-fatal-warnings.patch
+0001-tests-Fix-translatortest-not-working-in-6.10.patch
