From patchwork Sun Dec 17 06:33:48 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Leo Famulari X-Patchwork-Id: 57658 Return-Path: X-Original-To: patchwork@mira.cbaines.net Delivered-To: patchwork@mira.cbaines.net Received: by mira.cbaines.net (Postfix, from userid 113) id EEADA27BBE2; Sun, 17 Dec 2023 06:35:20 +0000 (GMT) X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on mira.cbaines.net X-Spam-Level: X-Spam-Status: No, score=-2.7 required=5.0 tests=BAYES_00,DKIM_INVALID, DKIM_SIGNED,MAILING_LIST_MULTI,SPF_HELO_PASS,URIBL_BLOCKED autolearn=unavailable autolearn_force=no version=3.4.6 Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mira.cbaines.net (Postfix) with ESMTPS id 8637427BBE9 for ; Sun, 17 Dec 2023 06:35:16 +0000 (GMT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1rEkjv-0007ca-Cs; Sun, 17 Dec 2023 01:35:03 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1rEkjt-0007cL-E7 for guix-patches@gnu.org; Sun, 17 Dec 2023 01:35:01 -0500 Received: from debbugs.gnu.org ([2001:470:142:5::43]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1rEkjt-00049t-5p for guix-patches@gnu.org; Sun, 17 Dec 2023 01:35:01 -0500 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1rEkjt-0002xQ-Uf for guix-patches@gnu.org; Sun, 17 Dec 2023 01:35:01 -0500 X-Loop: help-debbugs@gnu.org Subject: [bug#67864] [PATCH] gnu: Transmission: Update to 4.0.5. Resent-From: Leo Famulari Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Sun, 17 Dec 2023 06:35:01 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: report 67864 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 67864@debbugs.gnu.org X-Debbugs-Original-To: guix-patches@gnu.org Received: via spool by submit@debbugs.gnu.org id=B.170279485211291 (code B ref -1); Sun, 17 Dec 2023 06:35:01 +0000 Received: (at submit) by debbugs.gnu.org; 17 Dec 2023 06:34:12 +0000 Received: from localhost ([127.0.0.1]:56526 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1rEkj5-0002w1-Q9 for submit@debbugs.gnu.org; Sun, 17 Dec 2023 01:34:12 -0500 Received: from lists.gnu.org ([2001:470:142::17]:59118) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1rEkj1-0002vj-2Q for submit@debbugs.gnu.org; Sun, 17 Dec 2023 01:34:10 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1rEkiu-0007Vo-8B for guix-patches@gnu.org; Sun, 17 Dec 2023 01:34:00 -0500 Received: from wout4-smtp.messagingengine.com ([64.147.123.20]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1rEkir-00043z-9J for guix-patches@gnu.org; Sun, 17 Dec 2023 01:33:59 -0500 Received: from compute7.internal (compute7.nyi.internal [10.202.2.48]) by mailout.west.internal (Postfix) with ESMTP id 311653200A35; Sun, 17 Dec 2023 01:33:55 -0500 (EST) Received: from mailfrontend2 ([10.202.2.163]) by compute7.internal (MEProxy); Sun, 17 Dec 2023 01:33:55 -0500 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=famulari.name; h=cc:content-transfer-encoding:content-type:date:date:from:from :in-reply-to:message-id:mime-version:reply-to:subject:subject:to :to; s=mesmtp; t=1702794834; x=1702881234; bh=J7OiNUrHgvyTJ8WuFH 3/HBdvh8CVtoAT6tEaulh0bhk=; b=gn4TOhJCaUmQFpbK/Xpa4RBiyjoBA6W7BP 5PbbyafBJnQdXuA4nN4pcJS+09n+0RyKsm1xhK4Gf05GS2pBkXcB4yiFRTLbHP2E UcqnEyB1tGwQC88GkF8/BbTvBwim9+45QXgNP6WbhSwjRdCf0U0y4hww13tPBFnj SsNyoMQZA= DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d= messagingengine.com; h=cc:content-transfer-encoding:content-type :date:date:feedback-id:feedback-id:from:from:in-reply-to :message-id:mime-version:reply-to:subject:subject:to:to :x-me-proxy:x-me-proxy:x-me-sender:x-me-sender:x-sasl-enc; s= fm2; t=1702794834; x=1702881234; bh=J7OiNUrHgvyTJ8WuFH3/HBdvh8CV toAT6tEaulh0bhk=; b=3cTn5mCumXETmWC4axzOkG8miF10GgqxFfkZ0jXWG4m+ W1fPqE4lE3NHsf6mPdIrFqMUOLMsbF8wbyCtgA3TgGdCI1syVdcUfkr6RC+j2QpS QN2abb/37MKl0083gz6GqSJWYc84vBo5R5YdK3Ppo7qAfG0r8H3AL7xU6syDwu0p 4dXXkECXWZ7FpK681z9wb01sBLvyoWH+hFUNczCdWC36WkGvfKL1l8629Gw34fQd e2tp6nNEgJdGL60Kx7WQouRuG40E8avO8NQOGAJy3G/rvOQuEIPEZPv8pbVdUA72 uWfRsnOd768JLSIu4YYypuvE0zCIT26xoBt1vmfMxg== X-ME-Sender: X-ME-Received: X-ME-Proxy-Cause: gggruggvucftvghtrhhoucdtuddrgedvkedrvddthedgleekucetufdoteggodetrfdotf fvucfrrhhofhhilhgvmecuhfgrshhtofgrihhlpdfqfgfvpdfurfetoffkrfgpnffqhgen uceurghilhhouhhtmecufedttdenucenucfjughrpefhvffufffkofgggfestdekredtre dttdenucfhrhhomhepnfgvohcuhfgrmhhulhgrrhhiuceolhgvohesfhgrmhhulhgrrhhi rdhnrghmvgeqnecuggftrfgrthhtvghrnhepgeevfedtgefgveeggffhfedulefgudeitd ekhfeggeevheefjeehuefffeehveeinecuffhomhgrihhnpehgihhthhhusgdrtghomhen ucevlhhushhtvghrufhiiigvpedtnecurfgrrhgrmhepmhgrihhlfhhrohhmpehlvghose hfrghmuhhlrghrihdrnhgrmhgv X-ME-Proxy: Feedback-ID: i819c4023:Fastmail Received: by mail.messagingengine.com (Postfix) with ESMTPA for ; Sun, 17 Dec 2023 01:33:54 -0500 (EST) From: Leo Famulari Date: Sun, 17 Dec 2023 01:33:48 -0500 Message-ID: X-Mailer: git-send-email 2.41.0 MIME-Version: 1.0 Received-SPF: pass client-ip=64.147.123.20; envelope-from=leo@famulari.name; helo=wout4-smtp.messagingengine.com X-Spam_score_int: -27 X-Spam_score: -2.8 X-Spam_bar: -- X-Spam_report: (-2.8 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_DNSWL_LOW=-0.7, RCVD_IN_MSPIKE_H5=0.001, RCVD_IN_MSPIKE_WL=0.001, SPF_HELO_PASS=-0.001, SPF_PASS=-0.001, T_SCC_BODY_TEXT_LINE=-0.01 autolearn=ham autolearn_force=no X-Spam_action: no action X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list X-BeenThere: guix-patches@gnu.org List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: guix-patches-bounces+patchwork=mira.cbaines.net@gnu.org Sender: guix-patches-bounces+patchwork=mira.cbaines.net@gnu.org X-getmail-retrieved-from-mailbox: Patches * 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 base-commit: fe86819d8bde674766659c22b215d3a689a8026e 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?= +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 +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>(); ++ auto files_model = get_files(); ++ for (auto i = guint{ 0 }; i < files_model->get_n_items(); ++i) ++ { ++ files.push_back(gtr_ptr_dynamic_cast(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 */