--- Begin Message ---
Package: release.debian.org
Severity: normal
User: release.debian.org@packages.debian.org
Usertags: unblock
X-Debbugs-Cc: transmission@packages.debian.org, Barak A. Pearlmutter <bap@debian.org>
Control: affects -1 + src:transmission
Hi,
Please unblock package transmission, for trixie to include a fix for #1105001
(transmission-gtk: not updating torrent progress). The fix is a one line
change documented in debian/patches/fix-gtk-progress.patch .
Other changes in the debdiff are only cosmetic fixes in patches with no
additional changes to the source code.
[ Reason ]
Fix for #1105001
[ Impact ]
gtk app does not update download progress, which is unfortunate for a download
tool.
[ Tests ]
There are no tests covering the affected code. Testing was done manually and
confirmed to fix the issue.
[ Risks ]
Change was reviewed upstream[1] although a more complicated implementation
was prefered. For trixie, the simpler and less intrusive fix was kept. Risks
are very low as we make a struct wider.
[1] https://github.com/transmission/transmission/issues/7572
[ Checklist ]
[x] all changes are documented in the d/changelog
[x] I reviewed all changes and I approve them
[x] attach debdiff against the package in testing
unblock transmission/4.1.0~beta2+dfsg-3
diff --git c/debian/changelog w/debian/changelog
index 34d523ef9..7382d53e0 100644
--- c/debian/changelog
+++ w/debian/changelog
@@ -1,3 +1,13 @@
+transmission (4.1.0~beta2+dfsg-3) unstable; urgency=medium
+
+ [ Alexandre Rossi ]
+ * Patch to fix gtk progress while downloading (Closes: #1105001)
+
+ [ Barak A. Pearlmutter ]
+ * Refresh/rephrase patches
+
+ -- Barak A. Pearlmutter <bap@debian.org> Mon, 16 Jun 2025 15:10:01 +0100
+
transmission (4.1.0~beta2+dfsg-2) unstable; urgency=medium
* Upload to unstable
diff --git c/debian/patches/0003-disable-git-hook-installation.patch w/debian/patches/0003-disable-git-hook-installation.patch
index c668b99a9..58ac06cc8 100644
--- c/debian/patches/0003-disable-git-hook-installation.patch
+++ w/debian/patches/0003-disable-git-hook-installation.patch
@@ -7,9 +7,11 @@ Forwarded: not-needed
CMakeLists.txt | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
---- transmission.git.orig/CMakeLists.txt 2024-12-13 16:29:02.504820726 +0100
-+++ transmission.git/CMakeLists.txt 2024-12-13 16:29:02.500820654 +0100
-@@ -861,7 +861,7 @@
+diff --git a/CMakeLists.txt b/CMakeLists.txt
+index 2c1c897..b777b50 100644
+--- a/CMakeLists.txt
++++ b/CMakeLists.txt
+@@ -865,7 +865,7 @@ list(APPEND CPACK_SOURCE_IGNORE_FILES
## Code Formatting
diff --git c/debian/patches/0004-do-not-mess-revision.patch w/debian/patches/0004-do-not-mess-revision.patch
index 5fb0aa630..a576746c1 100644
--- c/debian/patches/0004-do-not-mess-revision.patch
+++ w/debian/patches/0004-do-not-mess-revision.patch
@@ -1,11 +1,19 @@
From: Alexandre Rossi <niol@zincube.net>
+Date: Mon, 16 Jun 2025 14:33:18 +0100
Subject: do not mess-up with upstream REVISION file
+
+Forwarded: not-needed
+
Forwarded: not-needed
---
+ CMakeLists.txt | 7 -------
+ 1 file changed, 7 deletions(-)
---- transmission.git.orig/CMakeLists.txt 2025-01-06 21:16:15.548426492 +0100
-+++ transmission.git/CMakeLists.txt 2025-01-06 21:20:01.328584330 +0100
-@@ -194,13 +194,6 @@
+diff --git a/CMakeLists.txt b/CMakeLists.txt
+index b777b50..acf92bc 100644
+--- a/CMakeLists.txt
++++ b/CMakeLists.txt
+@@ -198,13 +198,6 @@ endif()
string(STRIP "${TR_VCS_REVISION}" TR_VCS_REVISION)
diff --git c/debian/patches/fix-gtk-progress.patch w/debian/patches/fix-gtk-progress.patch
new file mode 100644
index 000000000..e486cfdd2
--- /dev/null
+++ w/debian/patches/fix-gtk-progress.patch
@@ -0,0 +1,28 @@
+From: Alexandre Rossi <alexandre.rossi@gmail.com>
+Date: Mon, 16 Jun 2025 14:33:18 +0100
+Subject: unbreak ChangeFlag bitwise operations
+
+Forwarded: https://github.com/transmission/transmission/pull/7613
+
+Upstream fix: #7572
+
+8 bits is not enough to do bitwise comparisons on more than 8 independent
+values.
+---
+ gtk/Torrent.h | 3 ++-
+ 1 file changed, 2 insertions(+), 1 deletion(-)
+
+diff --git a/gtk/Torrent.h b/gtk/Torrent.h
+index c289e57..c26f0d9 100644
+--- a/gtk/Torrent.h
++++ b/gtk/Torrent.h
+@@ -39,7 +39,8 @@ public:
+ Gtk::TreeModelColumn<Glib::ustring> name_collated;
+ };
+
+- enum class ChangeFlag : uint8_t
++ // wider type required because of bitwise operations on underlying type
++ enum class ChangeFlag : uint32_t
+ {
+ ACTIVE_PEER_COUNT,
+ ACTIVE_PEERS_DOWN,
diff --git c/debian/patches/series w/debian/patches/series
index 939546ed1..97c725394 100644
--- c/debian/patches/series
+++ w/debian/patches/series
@@ -1,3 +1,4 @@
+fix-gtk-progress.patch
use-system-libs.patch
systemd_service_fixes.patch
web-easier-build.patch
diff --git c/debian/patches/systemd_service_fixes.patch w/debian/patches/systemd_service_fixes.patch
index f9e917835..a8a5e2a92 100644
--- c/debian/patches/systemd_service_fixes.patch
+++ w/debian/patches/systemd_service_fixes.patch
@@ -18,9 +18,11 @@ Last-Update: 2014-10-16
daemon/transmission-daemon.service | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
---- transmission.git.orig/daemon/transmission-daemon.service 2024-12-13 16:00:30.901204445 +0100
-+++ transmission.git/daemon/transmission-daemon.service 2024-12-13 16:00:30.897204372 +0100
-@@ -5,7 +5,7 @@
+diff --git a/daemon/transmission-daemon.service b/daemon/transmission-daemon.service
+index 63ca0b1..f33fad2 100644
+--- a/daemon/transmission-daemon.service
++++ b/daemon/transmission-daemon.service
+@@ -5,7 +5,7 @@ After=network-online.target
Documentation=man:transmission-daemon(1)
[Service]
diff --git c/debian/patches/use-system-libs.patch w/debian/patches/use-system-libs.patch
index 5bad2ec95..46130b6fa 100644
--- c/debian/patches/use-system-libs.patch
+++ w/debian/patches/use-system-libs.patch
@@ -6,21 +6,26 @@ Forwarded: https://github.com/transmission/transmission/pull/6900
---
cmake/FindFastFloat.cmake | 2 +-
cmake/FindFmt.cmake | 2 +-
+ cmake/FindRapidJSON.cmake | 2 +-
cmake/FindUtfCpp.cmake | 2 +-
tests/gtest/CMakeLists.txt | 8 ++++----
- 4 files changed, 7 insertions(+), 7 deletions(-)
+ 5 files changed, 8 insertions(+), 8 deletions(-)
---- transmission.git.orig/cmake/FindFastFloat.cmake 2024-12-13 16:55:12.973750841 +0100
-+++ transmission.git/cmake/FindFastFloat.cmake 2024-12-13 16:55:12.969750770 +0100
-@@ -2,4 +2,4 @@
+diff --git a/cmake/FindFastFloat.cmake b/cmake/FindFastFloat.cmake
+index a3cea4a..30f87b9 100644
+--- a/cmake/FindFastFloat.cmake
++++ b/cmake/FindFastFloat.cmake
+@@ -2,4 +2,4 @@ add_library(FastFloat::fast_float INTERFACE IMPORTED)
target_include_directories(FastFloat::fast_float
INTERFACE
- ${TR_THIRD_PARTY_SOURCE_DIR}/fast_float/include)
+ /usr/include/fast_float/)
---- transmission.git.orig/cmake/FindFmt.cmake 2024-12-13 16:55:12.973750841 +0100
-+++ transmission.git/cmake/FindFmt.cmake 2024-12-13 16:55:12.969750770 +0100
-@@ -2,7 +2,7 @@
+diff --git a/cmake/FindFmt.cmake b/cmake/FindFmt.cmake
+index 829f607..dcf91ca 100644
+--- a/cmake/FindFmt.cmake
++++ b/cmake/FindFmt.cmake
+@@ -2,7 +2,7 @@ add_library(fmt::fmt-header-only INTERFACE IMPORTED)
target_include_directories(fmt::fmt-header-only
INTERFACE
@@ -29,17 +34,34 @@ Forwarded: https://github.com/transmission/transmission/pull/6900
target_compile_definitions(fmt::fmt-header-only
INTERFACE
---- transmission.git.orig/cmake/FindUtfCpp.cmake 2024-12-13 16:55:12.973750841 +0100
-+++ transmission.git/cmake/FindUtfCpp.cmake 2024-12-13 16:55:12.969750770 +0100
-@@ -2,4 +2,4 @@
+diff --git a/cmake/FindRapidJSON.cmake b/cmake/FindRapidJSON.cmake
+index aec9374..059c1a9 100644
+--- a/cmake/FindRapidJSON.cmake
++++ b/cmake/FindRapidJSON.cmake
+@@ -2,7 +2,7 @@ add_library(RapidJSON INTERFACE IMPORTED)
+
+ target_include_directories(RapidJSON
+ INTERFACE
+- ${TR_THIRD_PARTY_SOURCE_DIR}/rapidjson/include)
++ /usr/include/rapidjson)
+
+ target_compile_definitions(RapidJSON
+ INTERFACE
+diff --git a/cmake/FindUtfCpp.cmake b/cmake/FindUtfCpp.cmake
+index f79085a..1c94813 100644
+--- a/cmake/FindUtfCpp.cmake
++++ b/cmake/FindUtfCpp.cmake
+@@ -2,4 +2,4 @@ add_library(utf8::cpp INTERFACE IMPORTED)
target_include_directories(utf8::cpp
INTERFACE
- ${TR_THIRD_PARTY_SOURCE_DIR}/utfcpp/source)
+ /usr/include/utf8cpp)
---- transmission.git.orig/tests/gtest/CMakeLists.txt 2024-12-13 16:55:12.973750841 +0100
-+++ transmission.git/tests/gtest/CMakeLists.txt 2024-12-13 16:55:12.969750770 +0100
-@@ -12,8 +12,8 @@
+diff --git a/tests/gtest/CMakeLists.txt b/tests/gtest/CMakeLists.txt
+index 77eef53..6da575b 100644
+--- a/tests/gtest/CMakeLists.txt
++++ b/tests/gtest/CMakeLists.txt
+@@ -12,8 +12,8 @@ endif()
target_sources(gtestall
PRIVATE
@@ -50,7 +72,7 @@ Forwarded: https://github.com/transmission/transmission/pull/6900
set_property(
TARGET gtestall
-@@ -21,6 +21,6 @@
+@@ -21,6 +21,6 @@ set_property(
target_include_directories(gtestall SYSTEM
PRIVATE
@@ -59,14 +81,3 @@ Forwarded: https://github.com/transmission/transmission/pull/6900
PUBLIC
- ${GTEST_ROOT_DIR}/include)
+ /usr/src/googletest/googletest/include)
---- transmission.git.orig/cmake/FindRapidJSON.cmake 2024-12-13 16:09:02.582658744 +0100
-+++ transmission.git/cmake/FindRapidJSON.cmake 2024-12-13 16:56:47.535490933 +0100
-@@ -2,7 +2,7 @@
-
- target_include_directories(RapidJSON
- INTERFACE
-- ${TR_THIRD_PARTY_SOURCE_DIR}/rapidjson/include)
-+ /usr/include/rapidjson)
-
- target_compile_definitions(RapidJSON
- INTERFACE
diff --git c/debian/patches/web-easier-build.patch w/debian/patches/web-easier-build.patch
index 0f6f57f86..8584134a3 100644
--- c/debian/patches/web-easier-build.patch
+++ w/debian/patches/web-easier-build.patch
@@ -10,7 +10,7 @@ Forwarded: not-needed
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/web/src/main.js b/web/src/main.js
-index fc8b68e..14c536d 100644
+index b2722ae..481ba13 100644
--- a/web/src/main.js
+++ b/web/src/main.js
@@ -9,7 +9,7 @@ import { Prefs } from './prefs.js';
--- End Message ---