From patchwork Mon Apr 24 22:39:47 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Leo Famulari X-Patchwork-Id: 49478 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 0174927BBEA; Mon, 24 Apr 2023 23:41:40 +0100 (BST) X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on mira.cbaines.net X-Spam-Level: X-Spam-Status: No, score=-3.2 required=5.0 tests=BAYES_00,DKIM_INVALID, DKIM_SIGNED,MAILING_LIST_MULTI,RCVD_IN_MSPIKE_H2,SPF_HELO_PASS, URIBL_BLOCKED,URI_NOVOWEL autolearn=ham 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 0B16B27BBE2 for ; Mon, 24 Apr 2023 23:41:36 +0100 (BST) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1pr4rr-0006SY-DX; Mon, 24 Apr 2023 18:41:07 -0400 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 1pr4rm-0006SE-St for guix-patches@gnu.org; Mon, 24 Apr 2023 18:41:03 -0400 Received: from debbugs.gnu.org ([209.51.188.43]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1pr4rm-0004IU-Dn for guix-patches@gnu.org; Mon, 24 Apr 2023 18:41:02 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1pr4rl-0003qf-Nq for guix-patches@gnu.org; Mon, 24 Apr 2023 18:41:01 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#63056] [PATCH v2] gnu: Transmission: Update to 4.0.3. References: In-Reply-To: Resent-From: Leo Famulari Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Mon, 24 Apr 2023 22:41:01 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 63056 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 63056@debbugs.gnu.org Received: via spool by 63056-submit@debbugs.gnu.org id=B63056.168237603514752 (code B ref 63056); Mon, 24 Apr 2023 22:41:01 +0000 Received: (at 63056) by debbugs.gnu.org; 24 Apr 2023 22:40:35 +0000 Received: from localhost ([127.0.0.1]:50613 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1pr4rH-0003pp-Qx for submit@debbugs.gnu.org; Mon, 24 Apr 2023 18:40:35 -0400 Received: from out5-smtp.messagingengine.com ([66.111.4.29]:49249) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1pr4rA-0003pP-Bx for 63056@debbugs.gnu.org; Mon, 24 Apr 2023 18:40:30 -0400 Received: from compute2.internal (compute2.nyi.internal [10.202.2.46]) by mailout.nyi.internal (Postfix) with ESMTP id 9386C5C00F5; Mon, 24 Apr 2023 18:40:16 -0400 (EDT) Received: from mailfrontend1 ([10.202.2.162]) by compute2.internal (MEProxy); Mon, 24 Apr 2023 18:40:16 -0400 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:sender:subject :subject:to:to; s=mesmtp; t=1682376016; x=1682462416; bh=lPzkIq7 ncrvBd8Ura0F2UII7sjlDDpbjyXRgzHr9Tns=; b=a5ihc9zWQcuzyhqQ++iHqUU gl8Cp5IKeVTHZyXVOAcZrlBNCjkNCFrH9QBjbR9aK3N2dhHsWvZDO6xCG9duBHG+ +FsMM7F8jhog5G3hLaaA7YKy6kXMJ5M3KhEXfjC1726lmxcY+9861Rp4xX9PbHCo RnWx9qgaR4WN0SdbmLFE= 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:sender:subject:subject:to:to :x-me-proxy:x-me-proxy:x-me-sender:x-me-sender:x-sasl-enc; s= fm3; t=1682376016; x=1682462416; bh=lPzkIq7ncrvBd8Ura0F2UII7sjlD DpbjyXRgzHr9Tns=; b=DVElzikvHBjpy8odH0MYk3AG/Bef1sXbFjDYtqhtu3zl Kqtx+lpoK2pzAERU4ipy/TRx+TSUMZwuKdtnoB+frx6UAqj4YcAuyUe4Biqd3Lqb t1m8mQT3bjVTLKSBR5r2uU+nmjSYNxR5omf9LdlI3cWaOe07QCH8Fe1/BOY6BSdi Dk5QuthvPkB306uhh9ybFxdwOVUg0vFt6/zQop6Bcewcb42nQJW0qONJi+65bxTW ZARDmEx36ErMe8hANkP9PTETR4DDoPlh5k5wWeKKN7B9mNLgTSIfY26MNtSUP3ui whU7+4F3ZW+iKbiWqyLswK1+ajPo9aUf4ArYIFw54A== X-ME-Sender: X-ME-Received: X-ME-Proxy-Cause: gggruggvucftvghtrhhoucdtuddrgedvhedrfeduuddgudefucetufdoteggodetrfdotf fvucfrrhhofhhilhgvmecuhfgrshhtofgrihhlpdfqfgfvpdfurfetoffkrfgpnffqhgen uceurghilhhouhhtmecufedttdenucenucfjughrpefhvffufffkofgggfestdekredtre dttdenucfhrhhomhepnfgvohcuhfgrmhhulhgrrhhiuceolhgvohesfhgrmhhulhgrrhhi rdhnrghmvgeqnecuggftrfgrthhtvghrnhepgfejleeiueekjedvjeeljeeihedvtdduhe egfefhueehudekhfefgfdukeejgeevnecuffhomhgrihhnpehgihhthhhusgdrtghomhdp thhrrghnshhmihhsshhiohhnsghtrdgtohhmnecuvehluhhsthgvrhfuihiivgeptdenuc frrghrrghmpehmrghilhhfrhhomheplhgvohesfhgrmhhulhgrrhhirdhnrghmvg X-ME-Proxy: Feedback-ID: i819c4023:Fastmail Received: by mail.messagingengine.com (Postfix) with ESMTPA for <63056@debbugs.gnu.org>; Mon, 24 Apr 2023 18:40:16 -0400 (EDT) From: Leo Famulari Date: Mon, 24 Apr 2023 18:39:47 -0400 Message-Id: X-Mailer: git-send-email 2.39.2 MIME-Version: 1.0 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 Thanks to help from Efraim, the wrap phase is working properly now! * gnu/packages/bittorrent.scm: Update to 4.0.3. [build-system]: Use cmake-build-system. [source]: Remove obsolete patch. [inputs]: Add gtkmm, glib:bin, and python. [arguments]: Run the test suite. Import the glib-or-gtk-build-system and wrap the 'gui' build output. Remove #:configure-flags. Adjust the 'move-gui' phase to upstream changes. * gnu/packages/patches/transmission-honor-localedir.patch: Delete file. * gnu/local.mk (dist_patch_DATA): Remove it. --- gnu/local.mk | 1 - gnu/packages/bittorrent.scm | 89 ++++++++++--------- .../transmission-honor-localedir.patch | 34 ------- 3 files changed, 49 insertions(+), 75 deletions(-) delete mode 100644 gnu/packages/patches/transmission-honor-localedir.patch diff --git a/gnu/local.mk b/gnu/local.mk index ee90d102ac..c93c4e1dc5 100644 --- a/gnu/local.mk +++ b/gnu/local.mk @@ -1925,7 +1925,6 @@ dist_patch_DATA = \ %D%/packages/patches/tootle-reason-phrase.patch \ %D%/packages/patches/transcode-ffmpeg.patch \ %D%/packages/patches/transfig-gcc10-fno-common.patch \ - %D%/packages/patches/transmission-honor-localedir.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 bfe524366c..8e345f2de7 100644 --- a/gnu/packages/bittorrent.scm +++ b/gnu/packages/bittorrent.scm @@ -81,7 +81,7 @@ (define-module (gnu packages bittorrent) (define-public transmission (package (name "transmission") - (version "3.00") + (version "4.0.3") (source (origin (method url-fetch) (uri (string-append "https://github.com/transmission/transmission" @@ -89,51 +89,60 @@ (define-public transmission version ".tar.xz")) (sha256 (base32 - "1wjmn96zrvmk8j1yz2ysmqd7a2x6ilvnwwapcvfzgxs2wwpnai4i")) - (patches (search-patches "transmission-honor-localedir.patch")))) - (build-system glib-or-gtk-build-system) + "0njlmpcdsxwx8vwdk9dvsby51l6f6awks9d0mgvi9fs2ivaizc5n")))) + (build-system cmake-build-system) (outputs '("out" ; library and command-line interface "gui")) ; graphical user interface (arguments - '(#:configure-flags - (list (string-append "--localedir=" - (assoc-ref %outputs "gui") - "/share/locale")) - ;; Some tests segfault when using libevent 2.12 without internet - ;; connection. This has been reported mainstream but not fixed yet: - ;; https://github.com/transmission/transmission/issues/1437. - #:tests? #f - #:glib-or-gtk-wrap-excluded-outputs '("out") - #:phases - (modify-phases %standard-phases + (list + #:imported-modules `((guix build glib-or-gtk-build-system) + ,@%cmake-build-system-modules) + #:modules '(((guix build glib-or-gtk-build-system) #:prefix glib-or-gtk:) + (guix build cmake-build-system) + (guix build utils)) + #:phases + #~(modify-phases %standard-phases ;; Avoid embedding kernel version for reproducible build - (add-after 'unpack 'remove-kernel-version - (lambda _ - (substitute* "third-party/miniupnpc/updateminiupnpcstrings.sh" - (("OS_VERSION=`uname -r`") "OS_VERSION=Guix")))) - (add-after 'install 'move-gui - (lambda* (#:key outputs #:allow-other-keys) - ;; Move the GUI to its own output, so that "out" doesn't - ;; depend on GTK+. - (let ((out (assoc-ref outputs "out")) - (gui (assoc-ref outputs "gui"))) - (mkdir-p (string-append gui "/bin")) - (rename-file (string-append out "/bin/transmission-gtk") - (string-append gui "/bin/transmission-gtk")) - + (add-after 'unpack 'remove-kernel-version + (lambda _ + (substitute* "third-party/miniupnpc/updateminiupnpcstrings.sh" + (("OS_VERSION=`uname -r`") "OS_VERSION=Guix")))) + (replace 'check + (lambda* (#:key tests? parallel-tests? #:allow-other-keys) + (if tests? + ;; XXX this test fails... + (invoke "ctest" "-E" "usesBootstrapFile" + "-j" (if parallel-tests? + (number->string (parallel-job-count)) + "1")) + (format #t "test suite not run~%")))) + (add-after 'install 'move-gui + (lambda* (#:key outputs #:allow-other-keys) + (mkdir-p (string-append #$output:gui "/bin")) + (mkdir-p (string-append #$output:gui "/share/man/man1")) + (rename-file (string-append #$output "/bin/transmission-gtk") + (string-append #$output:gui "/bin/transmission-gtk")) (for-each (lambda (dir) - (rename-file (string-append out "/share/" dir) - (string-append gui "/share/" dir))) - '("appdata" "applications" "icons" "pixmaps")) - - (mkdir-p (string-append gui "/share/man/man1")) - (rename-file - (string-append out "/share/man/man1/transmission-gtk.1") - (string-append gui "/share/man/man1/transmission-gtk.1")) - #t)))))) - (inputs - (list libevent curl openssl zlib gtk+ libappindicator)) + (rename-file (string-append #$output "/share/" dir) + (string-append #$output:gui "/share/" dir))) + '("applications" "icons" "metainfo" "transmission")) + (rename-file + (string-append #$output "/share/man/man1/transmission-gtk.1") + (string-append #$output:gui "/share/man/man1/transmission-gtk.1")))) + (add-after 'move-gui 'glib-or-gtk-wrap + (lambda* (#:key outputs #:allow-other-keys #:rest args) + (apply (assoc-ref glib-or-gtk:%standard-phases 'glib-or-gtk-wrap) + #:glib-or-gtk-wrap-excluded-outputs (list "out") + args)))))) + (inputs (list curl + (list glib "bin") + gtkmm + libappindicator + libevent + openssl + python + zlib)) (native-inputs (list intltool pkg-config)) (home-page "https://transmissionbt.com/") diff --git a/gnu/packages/patches/transmission-honor-localedir.patch b/gnu/packages/patches/transmission-honor-localedir.patch deleted file mode 100644 index 70c66bfb2b..0000000000 --- a/gnu/packages/patches/transmission-honor-localedir.patch +++ /dev/null @@ -1,34 +0,0 @@ -This patch modifies Transmission so it honors the "localedir" option -passed to its configure script, allowing GTK-specific localization -data to be placed in the package's "gui" output. - -Without this patch, localization of transmission-gtk can break as the -application will expect to find this data in the package's default -output (as a result of the call to bindtextdomain in gtk/main.c). - -diff --git a/configure b/configure -index a29e24f..3ae8ef4 100755 ---- a/configure -+++ b/configure -@@ -21305,7 +21305,7 @@ $as_echo "$LINGUAS" >&6; } - sed -e "/^#/d" -e "/^\$/d" -e "s,.*, $posrcprefix& \\\\," -e "\$s/\(.*\) \\\\/\1/" \ - < $srcdir/po/POTFILES.in > po/POTFILES - -- transmissionlocaledir='${prefix}/${DATADIRNAME}/locale' -+ transmissionlocaledir='${localedir}' - - fi - -diff --git a/configure.ac b/configure.ac -index 57d3cae..ab62093 100644 ---- a/configure.ac -+++ b/configure.ac -@@ -563,7 +563,7 @@ if test "x$enable_nls" = "xyes" ; then - AC_SUBST(GETTEXT_PACKAGE) - AC_DEFINE_UNQUOTED([GETTEXT_PACKAGE],["$GETTEXT_PACKAGE"],[Gettext package]) - AM_GLIB_GNU_GETTEXT -- transmissionlocaledir='${prefix}/${DATADIRNAME}/locale' -+ transmissionlocaledir='${localedir}' - AC_SUBST(transmissionlocaledir) - fi - AC_SUBST(INTLLIBS)