From patchwork Tue Aug 6 13:07:40 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Adam Faiz X-Patchwork-Id: 66826 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 BB5E027BBE2; Tue, 6 Aug 2024 14:09: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=-6.4 required=5.0 tests=BAYES_00,DKIM_INVALID, DKIM_SIGNED,MAILING_LIST_MULTI,RCVD_IN_VALIDITY_CERTIFIED, RCVD_IN_VALIDITY_RPBL,RCVD_IN_VALIDITY_SAFE,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 90E3A27BBE9 for ; Tue, 6 Aug 2024 14:09:38 +0100 (BST) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1sbJw3-00016y-To; Tue, 06 Aug 2024 09:09:15 -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 1sbJva-0008KN-St for guix-patches@gnu.org; Tue, 06 Aug 2024 09:08:42 -0400 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 1sbJva-0002la-H2 for guix-patches@gnu.org; Tue, 06 Aug 2024 09:08:38 -0400 DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=debbugs.gnu.org; s=debbugs-gnu-org; h=From:MIME-Version:Date:To:In-Reply-To:References:Subject; bh=s3YvtRUVw+cm1X49wyuPhJ6kwNB32expIVETb4IGN3U=; b=nrHo8f08dct4LF4LLp4B4yYnjMmczzBS22O2gKyTDdk5XbDsGIcbwR5aULdnj5rpr3C5KTpp34InVer80ARswp9Ss0CTjZYXjFMgOFrWDwkknm0H60BSjbpKQ2KYtvy9RXLlJ8Xwe8KF/m5SqRaTukgs29TgACb+Wlq3RNrdI64JcKls4IYHDxxIIZyMLWxI893Z94C+VWxeweebX2ICKO2+Zgpda9aREBATcmJA85kfWsy5wS2jtCQ50zq403alCIZS7hE40GkIjNRoL+lldEcSdvUoO60oIAMi83kRd0MiEfjqcLSJzVBrNCzKi6hJGek95LI5+8zortRkiBcNUg==; Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1sbJvy-0004Zu-9g for guix-patches@gnu.org; Tue, 06 Aug 2024 09:09:02 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#69276] [PATCH 1/2] gnu: libtorrent-rasterbar: Update to 2.0.10. References: In-Reply-To: Resent-From: Adam Faiz Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Tue, 06 Aug 2024 13:09:02 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 69276 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 69276@debbugs.gnu.org Received: via spool by 69276-submit@debbugs.gnu.org id=B69276.172294972017540 (code B ref 69276); Tue, 06 Aug 2024 13:09:02 +0000 Received: (at 69276) by debbugs.gnu.org; 6 Aug 2024 13:08:40 +0000 Received: from localhost ([127.0.0.1]:60421 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1sbJvc-0004Yp-C1 for submit@debbugs.gnu.org; Tue, 06 Aug 2024 09:08:40 -0400 Received: from layka.disroot.org ([178.21.23.139]:40086) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1sbJvZ-0004Yc-Od for 69276@debbugs.gnu.org; Tue, 06 Aug 2024 09:08:38 -0400 Received: from localhost (localhost [127.0.0.1]) by disroot.org (Postfix) with ESMTP id 264A740A16 for <69276@debbugs.gnu.org>; Tue, 6 Aug 2024 15:08:12 +0200 (CEST) X-Virus-Scanned: SPAM Filter at disroot.org Received: from layka.disroot.org ([127.0.0.1]) by localhost (disroot.org [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id jBdOylz4pCpa for <69276@debbugs.gnu.org>; Tue, 6 Aug 2024 15:08:11 +0200 (CEST) Message-ID: <9a9ec5ec-5b51-cad9-b01e-76d495752240@disroot.org> DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=disroot.org; s=mail; t=1722949691; bh=jQv5vrSf27non4AWomZecKs7P/7e+zIwk3YG8vQoQIg=; h=Date:To:From:Subject; b=OmE4MG7U3ihD/OlZhcS/QAulM5NpK1p+s8/eVeO65HLjcLb/8pHibaw5oTEw98W3+ Tz5PUkcHdSaLV3wn8dicHLWtb7bMhLxeq+9jayhy5Q3wh8ajlKPu7OypB1n5RMrIhE iAPkH6T0kHwfgwx9mb6QnIgsJzBS1st1s8IMrtfucSbacKS/AbaKG1p6+HfgvLzxMo QAcEHYW1dL6xg96BC9nypbBGhDWpA/Inzn2HQuOIoX37+2ul6jiQ/jgV2kdb8f931Y nt/qXWcwS1GUcmaa43UrLEiDP9VrPaWDmZ8KradxoRQsT9Ihr8fAvs+w0IeYqZEED5 /WfZ8TuAMcFNw== Date: Tue, 6 Aug 2024 21:07:40 +0800 MIME-Version: 1.0 Content-Language: en-US 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: , Reply-to: Adam Faiz X-ACL-Warn: , Adam Faiz via Guix-patches X-Patchwork-Original-From: Adam Faiz via Guix-patches via From: Adam Faiz 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 From 4af05095ca922bb6d0335a6e946a404d4764ac1f Mon Sep 17 00:00:00 2001 Message-ID: <4af05095ca922bb6d0335a6e946a404d4764ac1f.1722949379.git.adam.faiz@disroot.org> In-Reply-To: References: From: AwesomeAdam54321 Date: Tue, 6 Aug 2024 19:57:47 +0800 Subject: [PATCH 1/2] gnu: libtorrent-rasterbar: Update to 2.0.10. * gnu/packages/bittorrent.scm (libtorrent-rasterbar): Update to 2.0.10. [source]: Remove test/test_copy_file.cpp patch since it's resolved. [native-inputs]: Remove no longer needed file (v2_empty_file.torrent). [arguments]<#:phases>: And remove a phase copying it into the correct place. --- gnu/packages/bittorrent.scm | 28 +++------------------------- 1 file changed, 3 insertions(+), 25 deletions(-) diff --git a/gnu/packages/bittorrent.scm b/gnu/packages/bittorrent.scm index 5c2fa9c688..abc598f7fa 100644 --- a/gnu/packages/bittorrent.scm +++ b/gnu/packages/bittorrent.scm @@ -418,16 +418,10 @@ (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 "2.0.9") + (version "2.0.10") (source (origin (method url-fetch) @@ -436,14 +430,7 @@ (define-public libtorrent-rasterbar "releases/download/v" version "/" "libtorrent-rasterbar-" version ".tar.gz")) (sha256 - (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")))))) + (base32 "0pc8rbcp7njbx8m02z47pcbbwcp5cjggbgq4sfjc19dc3n65p4zw")))) (build-system cmake-build-system) (arguments `(#:configure-flags '("-Dpython-bindings=ON" @@ -452,14 +439,6 @@ (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 native-inputs inputs #:allow-other-keys) - (copy-file (assoc-ref (or native-inputs 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 @@ -502,8 +481,7 @@ (define-public libtorrent-rasterbar (inputs (list boost openssl)) (native-inputs `(("libfaketime" ,libfaketime) ("python-wrapper" ,python-wrapper) - ("pkg-config" ,pkg-config) - ("%v2_empty_file.torrent" ,%v2_empty_file.torrent))) + ("pkg-config" ,pkg-config))) (home-page "https://www.libtorrent.org/") (synopsis "Feature-complete BitTorrent implementation") (description