From patchwork Fri Dec 1 23:15:17 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Tomas Volf <~@wolfsden.cz> X-Patchwork-Id: 57193 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 A019E17280; Fri, 1 Dec 2023 23:18:43 +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=-1.9 required=5.0 tests=BAYES_00,DKIM_ADSP_ALL, DKIM_INVALID,DKIM_SIGNED,MAILING_LIST_MULTI,SPF_HELO_PASS, URIBL_BLOCKED autolearn=no 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 7FEB916FAA for ; Fri, 1 Dec 2023 23:18:42 +0000 (GMT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1r9Clk-0004pq-CU; Fri, 01 Dec 2023 18:18:00 -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 1r9Cld-0004os-C3 for guix-patches@gnu.org; Fri, 01 Dec 2023 18:17:54 -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 1r9Cld-0008Bm-4C for guix-patches@gnu.org; Fri, 01 Dec 2023 18:17:53 -0500 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1r9Clm-0005Ky-2D for guix-patches@gnu.org; Fri, 01 Dec 2023 18:18:02 -0500 X-Loop: help-debbugs@gnu.org Subject: [bug#67557] [PATCH v2 5/5] gnu: libtorrent-rasterbar: Update to 2.0.9. Resent-From: Tomas Volf <~@wolfsden.cz> Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Fri, 01 Dec 2023 23:18:02 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 67557 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 67557@debbugs.gnu.org Cc: Tomas Volf <~@wolfsden.cz> Received: via spool by 67557-submit@debbugs.gnu.org id=B67557.170147262120409 (code B ref 67557); Fri, 01 Dec 2023 23:18:02 +0000 Received: (at 67557) by debbugs.gnu.org; 1 Dec 2023 23:17:01 +0000 Received: from localhost ([127.0.0.1]:56331 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1r9Ckn-0005Ix-0C for submit@debbugs.gnu.org; Fri, 01 Dec 2023 18:17:01 -0500 Received: from wolfsden.cz ([37.205.8.62]:42462) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1r9Ckh-0005IP-PP for 67557@debbugs.gnu.org; Fri, 01 Dec 2023 18:16:59 -0500 Received: by wolfsden.cz (Postfix, from userid 104) id 0DD50261274; Fri, 1 Dec 2023 23:16:46 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=wolfsden.cz; s=mail; t=1701472606; bh=F/zTB/jHQaqCIp6L1dIbS9/0kzQIF7/s8iRVDrnu8P8=; h=From:To:Cc:Subject:Date:In-Reply-To:References; b=sEq4Rf8SLDAsjhozfEsMEwRDBjhiGznuO6pJPmQi+7ZAKeNaHEom1OTzMjiNq4uh+ 0JFi3wqR0q0ZP5dsrdXD4lnqyBuDDe5vzqc5djsvd86KKrBJsNN4NAH+vwFjNQgoxB dhxBgD23NBY6p7JeFwDiTN4e2q13+0lizYFcpqWPS2DgyHEnzfFD7Tv2xybLBPhIOw +NxEVyL7eD/IU0hM5p6J7Yy+O3GRKJNIM+LFe89fayG191Ou2BWvKoeCS1FpSOtoHg k1w39sJ333Sai7SxsbLxm/2gI/LrwqeddV/scIRTlPSsfSdwxc7xaXyoLxHSGQS0Sv aXF/G0dzGRBV/P1xUIXNayG8IJwVKuwAqnlLkPIY1ptLsblfeHx/NV7mGCYe0HEbf8 mdpD8R3dUB9KcU6dAZ3sMVKarV5KgQmFOYn0P80iZBJN1zSK/JNp1D8DiGiJ+gMZAw 8TXNLRGnHZhZ6hiP9mjlYyBOD6pMR9GAwkMweImtuHTdix+sgXONP+lynUX2yfUIL1 PYrNrgTZFWgkbFZmO+LwLu14EaH43iJX7bIIJU/0Pr1srQ9Jqi8mprBurSqZANYBMI AxkjoXXYLtn5KnBXNy5sTqf6LkDckWqqazzqqkJ/15F1UCcJPHuyvMXdKBJ1jInhgI HtPkIxfT1jOAptMBASYQyXqI= Received: from localhost (unknown [193.32.127.144]) by wolfsden.cz (Postfix) with ESMTPSA id 6799F262C96; Fri, 1 Dec 2023 23:16:45 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=wolfsden.cz; s=mail; t=1701472605; bh=F/zTB/jHQaqCIp6L1dIbS9/0kzQIF7/s8iRVDrnu8P8=; h=From:To:Cc:Subject:Date:In-Reply-To:References; b=XBW9vpk3ZedSkZOz3WevKDlc9UKO9vorN/4ZrXdk72EG4ROQF6UxxJXG7tZwSfhKH GcyPR8PsTukLHsgVNqgpGLNqA/TdWk2Um4rO0OzNhSMhscJFVfz5SXA9aKf0W9kI7O 2ZfIMdbN1nCscslPqIaqotj0vfQ/YxXg2zwCfcrglY+8pihrUWaf5zjxS6DmbEo75P eRn29Jfa5fSMDzRq3TKplp725/DrBv2M5K6fpuEopoKU6/Bo+/n+n9FaJeS7ac58Lq MbAq7uLuKWHkPfy/b6XmmaOuFvTG04bSIg7vzE1tYvr2BhkfQW42IBJyuBJetP0M71 +gQaetf22JWJdDNt4yxYcW9VGeRdnJGRkaKYRPKLe8SJJ9+BsT3z+xbclP/g2nwjyZ CVZsPxf7LPmqLCUJ3S6X5zuAN4kTvfWBqZ1fqVfohzgYgXf0Hb0JPpp7EVVlQdumwo UFUV490Vrz0cMF4pMk22QgZ5o1qZQTZHBlqYUVNxDNhMnhI25x39phxoaBBq5tIUwV u00vl+0ph6YZFa+F9S4N1FcrLDK4l4C8Z032+6Q1K/AcCrJV2twzb5/PZ3jHGAuctY qsnSOEKp3OJhsmAcfzP9odrzxB6k6FPhGVNEF9MPpHmRtuAaXOma8Yzn2KBCeQ4I4l DtWr3gNoYE5+yz4lZinnrCug= Received: from localhost (localhost [local]) by localhost (OpenSMTPD) with ESMTPA id fe204cea; Fri, 1 Dec 2023 23:16:44 +0000 (UTC) From: Tomas Volf <~@wolfsden.cz> Date: Sat, 2 Dec 2023 00:15:17 +0100 Message-ID: <921fd74462b70786e61ebffea4c4f23d771dc3ef.1701472517.git.~@wolfsden.cz> X-Mailer: git-send-email 2.41.0 In-Reply-To: References: 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 Update the package. Since other packages do depend on the previous version (and according to their documentation do recommend it), the previous version is exposed as libtorrent-rasterbar-1.2. The v2.0.9 requires patching to get tests working. Sadly one of the changes is to introduce new binary file, so it is fetched as an input and applied in a phase. Snippet is used instead to do the rest of the patching. * gnu/packages/bittorrent.scm (libtorrent-rasterbar)[version]: Update to 2.0.9. [source]: Patch test/test_copy_file.cpp. [native-inputs]: Add the missing file (v2_empty_file.torrent). [arguments]<#:phases>: And add a phase copying it into the correct place. * gnu/packages/bittorrent.scm (libtorrent-rasterbar-1.2): New variable. (qbittorrent)[inputs]: Use libtorrent-rasterbar-1.2. * gnu/packages/enlightenment.scm (epour)[inputs]: Use libtorrent-rasterbar-1.2. Change-Id: Ifbbbf02a671f6a3db653499a7a5f2504fd23c255 --- v2: Drop the patch file and instead do the necessary changes using a substitute* and a phase copying the test file into the correct place from native-inputs. gnu/packages/bittorrent.scm | 49 +++++++++++++++++++++++++++++----- gnu/packages/enlightenment.scm | 2 +- 2 files changed, 43 insertions(+), 8 deletions(-) -- 2.41.0 diff --git a/gnu/packages/bittorrent.scm b/gnu/packages/bittorrent.scm index f9098b1a56..7a96ac08eb 100644 --- a/gnu/packages/bittorrent.scm +++ b/gnu/packages/bittorrent.scm @@ -80,6 +80,7 @@ (define-module (gnu packages bittorrent) #:use-module (gnu packages sqlite) #:use-module (gnu packages ssh) #:use-module (gnu packages tls) + #:use-module (gnu packages version-control) #:use-module (gnu packages web) #:use-module (gnu packages xml)) @@ -416,10 +417,16 @@ (define-public mktorrent (license (list l:public-domain ; sha1.*, used to build without OpenSSL l:gpl2+)))) ; with permission to link with OpenSSL +(define %v2_empty_file.torrent + (origin (method url-fetch) + (uri "https://github.com/arvidn/libtorrent/raw/v2.0.9/test/test_torrents/v2_empty_file.torrent") + (sha256 + (base32 "1hydgf0m9193hy9010wl0wrbz4k4cgrqg70jakx68pgi79jcqnrn")))) + (define-public libtorrent-rasterbar (package (name "libtorrent-rasterbar") - (version "1.2.19") + (version "2.0.9") (source (origin (method url-fetch) @@ -428,7 +435,14 @@ (define-public libtorrent-rasterbar "releases/download/v" version "/" "libtorrent-rasterbar-" version ".tar.gz")) (sha256 - (base32 "03p4nvsll568zlyqifid0cn135sg5whbk7g48gkbapnw92ayks7f")))) + (base32 "13kry578ifzz4m2f291bbd7v5v9zsi8y3mf38146cnqw0sv95kch")) + ;; https://github.com/arvidn/libtorrent/issues/7566 + ;; Remove when resolved. I would hope this to be fixed in 2.0.10. + (modules '((guix build utils))) + (snippet + #~(substitute* "test/test_copy_file.cpp" + (("EXT4_SUPER_MAGIC, EXT3_SUPER_MAGIC, XFS_SUPER_MAGIC" all) + (string-append all ", TMPFS_MAGIC\n")))))) (build-system cmake-build-system) (arguments `(#:configure-flags '("-Dpython-bindings=ON" @@ -437,6 +451,13 @@ (define-public libtorrent-rasterbar #:parallel-tests? #f #:phases (modify-phases %standard-phases + ;; https://github.com/arvidn/libtorrent/issues/7567 + ;; Remove when resolved. I would hope this to be fixed in 2.0.10. + ;; Do not forget to remove the %v2_empty_file.torrent variable. + (add-before 'configure 'copy-v2_empty_file.torrent + (lambda* (#:key inputs #:allow-other-keys) + (copy-file (assoc-ref inputs "%v2_empty_file.torrent") + "test/test_torrents/v2_empty_file.torrent"))) (replace 'check (lambda* (#:key tests? parallel-tests? #:allow-other-keys) (let* ((disabled-tests @@ -473,10 +494,10 @@ (define-public libtorrent-rasterbar "--timeout" timeout "--output-on-failure")))))))) (inputs (list boost openssl)) - (native-inputs - (list libfaketime - python-wrapper - pkg-config)) + (native-inputs `(("libfaketime" ,libfaketime) + ("python-wrapper" ,python-wrapper) + ("pkg-config" ,pkg-config) + ("%v2_empty_file.torrent" ,%v2_empty_file.torrent))) (home-page "https://www.libtorrent.org/") (synopsis "Feature-complete BitTorrent implementation") (description @@ -485,6 +506,20 @@ (define-public libtorrent-rasterbar desktops.") (license l:bsd-2))) +(define-public libtorrent-rasterbar-1.2 + (package + (inherit libtorrent-rasterbar) + (version "1.2.19") + (source + (origin + (method url-fetch) + (uri + (string-append "https://github.com/arvidn/libtorrent/" + "releases/download/v" version "/" + "libtorrent-rasterbar-" version ".tar.gz")) + (sha256 + (base32 "03p4nvsll568zlyqifid0cn135sg5whbk7g48gkbapnw92ayks7f")))))) + (define-public qbittorrent (package (name "qbittorrent") @@ -506,7 +541,7 @@ (define-public qbittorrent (list qttools-5)) (inputs (list boost - libtorrent-rasterbar + libtorrent-rasterbar-1.2 openssl python-wrapper qtsvg-5 diff --git a/gnu/packages/enlightenment.scm b/gnu/packages/enlightenment.scm index 64d8945f8e..7860c43fef 100644 --- a/gnu/packages/enlightenment.scm +++ b/gnu/packages/enlightenment.scm @@ -585,7 +585,7 @@ (define-public epour (native-inputs (list intltool python-distutils-extra)) (inputs - (list libtorrent-rasterbar python-dbus python-efl python-pyxdg)) + (list libtorrent-rasterbar-1.2 python-dbus python-efl python-pyxdg)) (home-page "https://www.enlightenment.org") (synopsis "EFL Bittorrent client") (description "Epour is a BitTorrent client based on the @dfn{Enlightenment