From patchwork Sat Dec 2 00:28:58 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: 57196 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 C6D6F27BBE9; Sat, 2 Dec 2023 00:31:29 +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 9B95C1757B for ; Sat, 2 Dec 2023 00:31:28 +0000 (GMT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1r9DuQ-0007ie-Kj; Fri, 01 Dec 2023 19:31:02 -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 1r9DuH-0007h5-Sm for guix-patches@gnu.org; Fri, 01 Dec 2023 19:30: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 1r9DuH-0007TY-Jy for guix-patches@gnu.org; Fri, 01 Dec 2023 19:30:53 -0500 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1r9DuQ-0007PZ-HK for guix-patches@gnu.org; Fri, 01 Dec 2023 19:31:02 -0500 X-Loop: help-debbugs@gnu.org Subject: [bug#67557] [PATCH v3 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: Sat, 02 Dec 2023 00:31: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.170147702028412 (code B ref 67557); Sat, 02 Dec 2023 00:31:02 +0000 Received: (at 67557) by debbugs.gnu.org; 2 Dec 2023 00:30:20 +0000 Received: from localhost ([127.0.0.1]:56389 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1r9Dtj-0007O9-JA for submit@debbugs.gnu.org; Fri, 01 Dec 2023 19:30:20 -0500 Received: from wolfsden.cz ([37.205.8.62]:49428) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1r9Dtf-0007Nb-LP for 67557@debbugs.gnu.org; Fri, 01 Dec 2023 19:30:17 -0500 Received: by wolfsden.cz (Postfix, from userid 104) id CC9B52619D4; Sat, 2 Dec 2023 00:30:05 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=wolfsden.cz; s=mail; t=1701477005; bh=PUQWMm1zQN7fYit4zs/N6KwqSQ8ddX0ptslTWzDFcOU=; h=From:To:Cc:Subject:Date:In-Reply-To:References; b=fQgjAH9GECyqOeP3qglHl6kicai7OZUuT6xV9hz0ZZlIY7KKGTiDKTe4f+mcvPqD5 d3Dg5XggonOCxWdIW6N41CplwdvaEkM3GIbPRc7Zm1XB7TBzslM3Ce5ixswFFheItt PKUi91uU+Ml+sPr7MlyhSwrPCzsPiRbwxOjFt9TQ+yvlLGjZk17Pm0qOfgO5GRxQEU acdZPa+vF9GB5pp0MkSw64IN61ny6DKR8G18aj0OgGcV/Paji4ErefSHM9h1+G6/Zf dRDbPvSBaWoa4sNYqe0lAYPFvITpdkKR82P1d9U97wjnroWGAqs3tOK8Fs9Z4dt05W dorr4zOr3SrGNy43OKzSxMiTqAqSoJSQE98oe/0b6WeDgJnvwjm8fzyycNsEMryhp6 AvUL2puBNmrmP51UqFS1j66AnvQY5qltEkZ3wrHDTbZeLMbIPNmeWiFCIn40HFwM1V MB1WNjYE6vtEaqwfI18PK9QiV57oMhV0m/dumcBxLXLD2varkIeFBpOHhDG32/qWWF T/tG+ij0dRFX2tMmHJmcGzTMa3gh8fpm9pl6nGkqkNspu7QfMEMTQkZGwPBsrLHES7 SJuPiAGkMEx0EVQTZzfyfQakPDtor4MiKAOSyEfhCt2L+POX6m36VXSjABqTVLMpna G1DQzI4qa261JrlaXmzZIVlU= Received: from localhost (unknown [193.32.127.144]) by wolfsden.cz (Postfix) with ESMTPSA id 3BB812603EE; Sat, 2 Dec 2023 00:30:04 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=wolfsden.cz; s=mail; t=1701477004; bh=PUQWMm1zQN7fYit4zs/N6KwqSQ8ddX0ptslTWzDFcOU=; h=From:To:Cc:Subject:Date:In-Reply-To:References; b=ZsxHwihSZ+25bBwVA3biLCb0z2XXOI6QeLzGm1symSHYtep9LieJO4+zyRO2vz4Ql rAOGEh972cnShRvL9ZC4+teiye9rBPpRksB5LFAj6IzVpJZbWn15oeinWNaMUYAcqc 5YGCc4J7Jwj6ECcBTr0JyVtUEydmZY+VviQAhp3eo4bV4rLoVgNBegWC8UO9E7vkHs Vi2t3E5EDBJGjKNC5EVcEIw35ZqqP0yt4FlEkbNq2kGiHhkIreqP1DZHcWvqpucGqi MSCk+kZ4b6f3vNDdfgRwWE7l5pBgSx10BsmA/mGVBYefvaJxDuRsiovH3aBntA0Gz7 LNMl7/n1HmkrfQPtG1J9jBKSHIzXIg2uGAyoyhZo0fAIEdJAsSdkZjZiyjKSOoh9hh 1ePGuYeAVQj9LpvjUI8pavjHVxVgUPOXcn9Bi4W0lhtAWSb7YWHlgMoxx978+KokZx s64P3U7pR5jci+bLiITduxLkUazrIA1lwBLsQ8cz/uDOlf6izd8P00MQCq3a0o7A/A zzZVus9+rTVD/+H9KNGmzrA5EHFn6osYWqyMoeMR96biE/+eUmmMJTjU1JGFdDFg+g 49qfKbK/yDsBfjn20C5uvmLf/ok8ulg+NTkG/i6+yku9UGrUypoqbsmVNxNhYNeKrn /shJzBloNhrmZBlpq0fenOSk= Received: from localhost (localhost [local]) by localhost (OpenSMTPD) with ESMTPA id ebc9dead; Sat, 2 Dec 2023 00:30:02 +0000 (UTC) From: Tomas Volf <~@wolfsden.cz> Date: Sat, 2 Dec 2023 01:28:58 +0100 Message-ID: <671a383b562328b48e7674c5291a6150183b3faa.1701476938.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. v3: Use (or native-inputs inputs). gnu/packages/bittorrent.scm | 50 +++++++++++++++++++++++++++++----- gnu/packages/enlightenment.scm | 2 +- 2 files changed, 44 insertions(+), 8 deletions(-) -- 2.41.0 diff --git a/gnu/packages/bittorrent.scm b/gnu/packages/bittorrent.scm index f9098b1a56..731c8e1c20 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,14 @@ (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 @@ -473,10 +495,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 +507,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 +542,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