GNU bug report logs - #67864
[PATCH] gnu: Transmission: Update to 4.0.5.

Previous Next

To add a comment to this bug, you must first unarchive it, by sending
a message to control AT debbugs.gnu.org, with unarchive 67864 in the body.
You can then email your comments to 67864 AT debbugs.gnu.org in the normal way.

Toggle the display of automated, internal messages from the tracker.

Message #5 received at submit <at> debbugs.gnu.org (full text, mbox):

From: Leo Famulari <leo <at> famulari.name>
To: guix-patches <at> gnu.org
Subject: [PATCH] gnu: Transmission: Update to 4.0.5.
Date: Sun, 17 Dec 2023 01:33:48 -0500

* gnu/packages/bittorrent.scm (transmission): Update to 4.0.5.
[source]: Use 'transmission-4.0.5-fix-build.patch'.
* gnu/packages/patches/transmission-4.0.5-fix-build.patch: New file.
* gnu/local.mk (dist_patch_DATA): Add it.

Change-Id: I8e9486dca07f01628e7886e7ac5757d511056cb7
---
 gnu/local.mk                                  |  1 +
 gnu/packages/bittorrent.scm                   |  5 +-
 .../transmission-4.0.5-fix-build.patch        | 98 +++++++++++++++++++
 3 files changed, 102 insertions(+), 2 deletions(-)
 create mode 100644 gnu/packages/patches/transmission-4.0.5-fix-build.patch

diff --git a/gnu/local.mk b/gnu/local.mk
index c404d2f52f..7983be58a5 100644
--- a/gnu/local.mk
+++ b/gnu/local.mk
@@ -2057,6 +2057,7 @@ dist_patch_DATA =						\
   %D%/packages/patches/tofi-32bit-compat.patch			\
   %D%/packages/patches/tpetra-remove-duplicate-using.patch	\
   %D%/packages/patches/transcode-ffmpeg.patch	\
+  %D%/packages/patches/transmission-4.0.5-fix-build.patch	\
   %D%/packages/patches/trytond-add-egg-modules-to-path.patch	\
   %D%/packages/patches/trytond-add-guix_trytond_path.patch	\
   %D%/packages/patches/ttf2eot-cstddef.patch			\
diff --git a/gnu/packages/bittorrent.scm b/gnu/packages/bittorrent.scm
index 8c032940d4..fd92a93763 100644
--- a/gnu/packages/bittorrent.scm
+++ b/gnu/packages/bittorrent.scm
@@ -87,15 +87,16 @@ (define-module (gnu packages bittorrent)
 (define-public transmission
   (package
     (name "transmission")
-    (version "4.0.4")
+    (version "4.0.5")
     (source (origin
               (method url-fetch)
               (uri (string-append "https://github.com/transmission/transmission"
                                   "/releases/download/" version "/transmission-"
                                   version ".tar.xz"))
+              (patches (search-patches "transmission-4.0.5-fix-build.patch"))
               (sha256
                (base32
-                "19nm7f4x3zq610da5fl63vpycj4kv07np6ldm8czpgyziwqv9xqm"))))
+                "0mv3ds3bbp1fbmdlrjinmzvk46acpafydirh7h2014j7988zys7x"))))
     (build-system cmake-build-system)
     (outputs '("out"                      ; library and command-line interface
                "gui"))                    ; graphical user interface
diff --git a/gnu/packages/patches/transmission-4.0.5-fix-build.patch b/gnu/packages/patches/transmission-4.0.5-fix-build.patch
new file mode 100644
index 0000000000..606e8d2ab3
--- /dev/null
+++ b/gnu/packages/patches/transmission-4.0.5-fix-build.patch
@@ -0,0 +1,98 @@
+Fix the build of Transmission 4.0.5:
+
+https://github.com/transmission/transmission/issues/6392
+
+Patches copied from upstream pull request:
+
+https://github.com/transmission/transmission/pull/6393
+
+From 64b0933e713c725867ba5817bd197d668923161e Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?C=C5=93ur?= <coeur <at> gmx.fr>
+Date: Sun, 17 Dec 2023 00:11:11 +0100
+Subject: [PATCH] build fix get_files2 behind IF_GTKMM4_10
+
+---
+ gtk/GtkCompat.h      | 6 ++++++
+ gtk/OptionsDialog.cc | 2 +-
+ 2 files changed, 7 insertions(+), 1 deletion(-)
+
+diff --git a/gtk/GtkCompat.h b/gtk/GtkCompat.h
+index 34d1bbe22dd..6dde2a5ef8b 100644
+--- a/gtk/GtkCompat.h
++++ b/gtk/GtkCompat.h
+@@ -44,6 +44,12 @@
+ #define IF_GTKMM4(ThenValue, ElseValue) ElseValue
+ #endif
+ 
++#if GTKMM_CHECK_VERSION(4, 10, 0)
++#define IF_GTKMM4_10(ThenValue, ElseValue) ThenValue
++#else
++#define IF_GTKMM4_10(ThenValue, ElseValue) ElseValue
++#endif
++
+ #if GLIBMM_CHECK_VERSION(2, 68, 0)
+ #define IF_GLIBMM2_68(ThenValue, ElseValue) ThenValue
+ #else
+diff --git a/gtk/OptionsDialog.cc b/gtk/OptionsDialog.cc
+index 08198540c10..bff4286286a 100644
+--- a/gtk/OptionsDialog.cc
++++ b/gtk/OptionsDialog.cc
+@@ -338,7 +338,7 @@ void TorrentFileChooserDialog::onOpenDialogResponse(int response, Glib::RefPtr<S
+         bool const do_prompt = get_choice(std::string(ShowOptionsDialogChoice)) == "true";
+         bool const do_notify = false;
+ 
+-        auto const files = IF_GTKMM4(get_files2, get_files)();
++        auto const files = IF_GTKMM4_10(get_files2, get_files)();
+         g_assert(!files.empty());
+ 
+         /* remember this folder the next time we use this dialog */
+
+From 49ce9ab1d59347a529dcbfcc378b7423d13750e6 Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?C=C5=93ur?= <coeur <at> gmx.fr>
+Date: Sun, 17 Dec 2023 02:54:33 +0100
+Subject: [PATCH] code review: revert bd31d805003909bd5927f26a02eb60b78a82355b
+
+---
+ gtk/GtkCompat.h      |  6 ------
+ gtk/OptionsDialog.cc | 11 ++++++++++-
+ 2 files changed, 10 insertions(+), 7 deletions(-)
+
+diff --git a/gtk/GtkCompat.h b/gtk/GtkCompat.h
+index 6dde2a5ef8b..34d1bbe22dd 100644
+--- a/gtk/GtkCompat.h
++++ b/gtk/GtkCompat.h
+@@ -44,12 +44,6 @@
+ #define IF_GTKMM4(ThenValue, ElseValue) ElseValue
+ #endif
+ 
+-#if GTKMM_CHECK_VERSION(4, 10, 0)
+-#define IF_GTKMM4_10(ThenValue, ElseValue) ThenValue
+-#else
+-#define IF_GTKMM4_10(ThenValue, ElseValue) ElseValue
+-#endif
+-
+ #if GLIBMM_CHECK_VERSION(2, 68, 0)
+ #define IF_GLIBMM2_68(ThenValue, ElseValue) ThenValue
+ #else
+diff --git a/gtk/OptionsDialog.cc b/gtk/OptionsDialog.cc
+index bff4286286a..8c28fc76f98 100644
+--- a/gtk/OptionsDialog.cc
++++ b/gtk/OptionsDialog.cc
+@@ -338,7 +338,16 @@ void TorrentFileChooserDialog::onOpenDialogResponse(int response, Glib::RefPtr<S
+         bool const do_prompt = get_choice(std::string(ShowOptionsDialogChoice)) == "true";
+         bool const do_notify = false;
+ 
+-        auto const files = IF_GTKMM4_10(get_files2, get_files)();
++#if GTKMM_CHECK_VERSION(4, 0, 0)
++        auto files = std::vector<Glib::RefPtr<Gio::File>>();
++        auto files_model = get_files();
++        for (auto i = guint{ 0 }; i < files_model->get_n_items(); ++i)
++        {
++            files.push_back(gtr_ptr_dynamic_cast<Gio::File>(files_model->get_object(i)));
++        }
++#else
++        auto const files = get_files();
++#endif
+         g_assert(!files.empty());
+ 
+         /* remember this folder the next time we use this dialog */

base-commit: fe86819d8bde674766659c22b215d3a689a8026e
-- 
2.41.0

Message #8 received at 67864 <at> debbugs.gnu.org (full text, mbox):

From: Mathieu Othacehe <othacehe <at> gnu.org>
To: Leo Famulari <leo <at> famulari.name>
Cc: 67864 <at> debbugs.gnu.org
Subject: Re: [bug#67864] [PATCH] gnu: Transmission: Update to 4.0.5.
Date: Mon, 25 Dec 2023 18:27:10 +0100

> * gnu/packages/bittorrent.scm (transmission): Update to 4.0.5.
> [source]: Use 'transmission-4.0.5-fix-build.patch'.
> * gnu/packages/patches/transmission-4.0.5-fix-build.patch: New file.
> * gnu/local.mk (dist_patch_DATA): Add it.

Looks good!

Mathieu

Message #13 received at 67864-done <at> debbugs.gnu.org (full text, mbox):

From: Leo Famulari <leo <at> famulari.name>
To: Mathieu Othacehe <othacehe <at> gnu.org>
Cc: 67864-done <at> debbugs.gnu.org
Subject: Re: [bug#67864] [PATCH] gnu: Transmission: Update to 4.0.5.
Date: Fri, 29 Dec 2023 14:59:51 -0500

On Mon, Dec 25, 2023 at 06:27:10PM +0100, Mathieu Othacehe wrote:
> 
> > * gnu/packages/bittorrent.scm (transmission): Update to 4.0.5.
> > [source]: Use 'transmission-4.0.5-fix-build.patch'.
> > * gnu/packages/patches/transmission-4.0.5-fix-build.patch: New file.
> > * gnu/local.mk (dist_patch_DATA): Add it.
> 
> Looks good!

Great, pushed as d263c49919235b81b318c45c99aa189be04c5f28

Previous Next

GNU bug tracking system
Copyright (C) 1999 Darren O. Benham, 1997,2003 nCipher Corporation Ltd, 1994-97 Ian Jackson.