From patchwork Fri Dec 1 23:15:13 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: 57194 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 ACD2617182; Fri, 1 Dec 2023 23:18:49 +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 885E416FAA for ; Fri, 1 Dec 2023 23:18:48 +0000 (GMT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1r9Clm-0004qw-4M; Fri, 01 Dec 2023 18:18: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 1r9Clf-0004p4-1A for guix-patches@gnu.org; Fri, 01 Dec 2023 18:17:55 -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 1r9Cle-0008CI-Pc for guix-patches@gnu.org; Fri, 01 Dec 2023 18:17:54 -0500 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1r9Cln-0005LT-Nq for guix-patches@gnu.org; Fri, 01 Dec 2023 18:18:03 -0500 X-Loop: help-debbugs@gnu.org Subject: [bug#67557] [PATCH v2 1/5] gnu: libtorrent-rasterbar: Update to 1.2.19. References: In-Reply-To: Resent-From: Tomas Volf <~@wolfsden.cz> Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Fri, 01 Dec 2023 23:18:03 +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.170147262320449 (code B ref 67557); Fri, 01 Dec 2023 23:18:03 +0000 Received: (at 67557) by debbugs.gnu.org; 1 Dec 2023 23:17:03 +0000 Received: from localhost ([127.0.0.1]:56339 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1r9Cko-0005Jg-Hz for submit@debbugs.gnu.org; Fri, 01 Dec 2023 18:17:02 -0500 Received: from wolfsden.cz ([37.205.8.62]:42434) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1r9Ckh-0005IJ-PQ for 67557@debbugs.gnu.org; Fri, 01 Dec 2023 18:17:00 -0500 Received: by wolfsden.cz (Postfix, from userid 104) id 0A7672603E1; 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=sQ8I9EYzgafVf7osiSuLyfvj4HQQDISqR+x2kwJ8TNM=; h=From:To:Cc:Subject:Date; b=LX1JyRINyr9i/01H6kp9rMpLSL/ekcoo90gFQFgTAfLOzw26dU2r79wHMn+x/xEce /avL1WMLs3gIYFUz/hUzoEhC4H9HOrjC1VraEYhWwpouTSyH8ECBEovCgowAUvuhjl 1gFVWEs3KMFdXjARZj0BVZYbv2KHHWLpMtVYGu2YgPdG/rYQkUuJ740YlhKhuAeQur i4mBWn0MC8VtB1JTF48U2/4XLTbY3TpU84LKUbox5PQEaSy+yqbEW0CYON/g+DC1/f 4QMCXzqdet5hWV2dCODJwNXyJ3KFOGisvGCOiV9RXdjjFy3gTP1UUbPLb+jthGfvcM NgOgI6jUtyJSP5LjdY92nMxG3FoeH2SIvxn/HLSIpBIACM397ouBT+NAtjZTHS7P56 iUpG/qY/lJs3+t+Kl4zAtBITv3TaQRMhv8thes0GyXXZQj3ma9pt+u76qjEPfvAOU1 fS5t3dOYQ4NI3hjt96BqrKKzS1OGgyCuiughr4IgBBRADgmkrfNoCkRIgp/KtjbPiJ T1V/1pI7hVWljx/OojbtXRz9CvYpDd4pbkZEV6ZBswfrOxlcRRNls47ahL6BwOTHhw BN3NLxPbzRWjImYAFtlwdoZZ8t0/jcNmM1j3eCcRQKKBIhbxYwSgSUEeWjW8IjaMgx L6Ta84gHiAwYnBHQ9vrYquok= Received: from localhost (unknown [193.32.127.144]) by wolfsden.cz (Postfix) with ESMTPSA id 72B2026271E; Fri, 1 Dec 2023 23:16:44 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=wolfsden.cz; s=mail; t=1701472604; bh=sQ8I9EYzgafVf7osiSuLyfvj4HQQDISqR+x2kwJ8TNM=; h=From:To:Cc:Subject:Date; b=vHjLNobnJhSXBme6k596PynGAmM8tb7xViT4eysI8duQWGdei3LvlFQAUdJ9++1Jz G8fT425FzEGUbxrfHYNzErc+S/BnnKBgTmjR753FIZvQYovJ648Umg1//RLKwYg1SY KduTGo4R4PaVRQWnVFNYdTwCSaPLiRKWM7af9X+75kv1Y969+aai42oWtK1SeIjHVQ zWLlXrKyZCxmdGA9DiB8grh3mwCjjL7t4LL8twtH4TcLF6dxQ6rM8shuh3DhR/iByw e6TImll7tIKipf9hL7AUiDvJGtHjka9nWO/3fMEPIBh5ZWmMMSdX0D7XeWWmKoBozO 9biNBhumvsVRiP8vgxDWu1XmaNuTVeIUfA9pEpIrAu4MyipkJeO4+7IquNBh/HHMl/ Dz0wVkVHiu8lepWu2YJ15ob35FlLIa1bQ+AqfSO3CnmpmRBQfkLYt5ws7gCOTDGwsm IWJdZhXbJxP98ScJCfD4FoaLeLjeWIiX7HSd0hXlmuKSEiyqRxJ2uf7mKlok5NqH/Z imP0y4EEJR/dMLhDSupcqEB0IR/7HY6445mND5pnCzeIF/J+Sys56EIGfbZX6vOmZM cJeLtkpEl2oTA+uxmMRKN16vIp7IZLQVDRM0xTsYCLmlbCqL4F6O2WqzOzHCeQpSL0 hZCqRY3xhfVjFny4mbEYtF+g= Received: from localhost (localhost [local]) by localhost (OpenSMTPD) with ESMTPA id 6a53c904; Fri, 1 Dec 2023 23:16:43 +0000 (UTC) From: Tomas Volf <~@wolfsden.cz> Date: Sat, 2 Dec 2023 00:15:13 +0100 Message-ID: X-Mailer: git-send-email 2.41.0 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 With the update, the execution of the test suite was overhauled a lot. Parallel tests were disabled, since the do not work well. Since faketime does cause some tests to hang, test_ssl was moved into a separate run. * gnu/packages/bittorrent.scm (libtorrent-rasterbar)[version]: Update to 1.2.19. [arguments]<#:parallel-tests?>: Disable. [arguments]<#:phases>: Move test_ssl into separate run under faketime. Do not run under tests under faketime. Anchor the regex for test exclusion. Set timeout of 600 seconds for each test. Change-Id: I7392cb3ce1a8815b26b3257498082761255535ee --- gnu/packages/bittorrent.scm | 46 ++++++++++++++++++++++++------------- 1 file changed, 30 insertions(+), 16 deletions(-) base-commit: bdbb9dc27a590b08651d058f06a42caa26e04abb -- 2.41.0 diff --git a/gnu/packages/bittorrent.scm b/gnu/packages/bittorrent.scm index 6f75a92cff..e115c13017 100644 --- a/gnu/packages/bittorrent.scm +++ b/gnu/packages/bittorrent.scm @@ -417,7 +417,7 @@ (define-public mktorrent (define-public libtorrent-rasterbar (package (name "libtorrent-rasterbar") - (version "1.2.18") + (version "1.2.19") (source (origin (method url-fetch) @@ -426,35 +426,49 @@ (define-public libtorrent-rasterbar "releases/download/v" version "/" "libtorrent-rasterbar-" version ".tar.gz")) (sha256 - (base32 "0wpsaqadcicxl4lf1nc1i93c4yzjv8hpzhhrw1hdkrp4gn0vdwpy")))) + (base32 "03p4nvsll568zlyqifid0cn135sg5whbk7g48gkbapnw92ayks7f")))) (build-system cmake-build-system) (arguments `(#:configure-flags '("-Dpython-bindings=ON" "-Dbuild_tests=ON") + ;; Tests do not reliably work when executed in parallel. + #:parallel-tests? #f #:phases (modify-phases %standard-phases - (add-after 'unpack 'extend-test-timeout - (lambda _ - (substitute* "test/test_remove_torrent.cpp" - ;; Extend the test timeout from 3 seconds to 10. - (("i > 30") "i > 100")))) (replace 'check (lambda* (#:key tests? parallel-tests? #:allow-other-keys) - (let ((disabled-tests - ;; test_upnp requires a non-localhost IPv4 interface. - '("test_upnp"))) + (let* ((disabled-tests + '( + ;; Requires a non-localhost IPv4 interface. + "test_upnp" + ;; test_ssl needs to be run separately. + "test_ssl")) + (exclude-regex (string-append "^(" + (string-join disabled-tests "|") + ")$")) + (timeout "600") + (jobs (if parallel-tests? + (number->string (parallel-job-count)) + "1"))) (when tests? + (invoke "ctest" + "-E" exclude-regex + "-j" jobs + "--timeout" timeout + "--output-on-failure") ;; test_ssl relies on bundled TLS certificates with a fixed ;; expiry date. To ensure succesful builds in the future, ;; fake the time to be roughly that of the release. - (setenv "FAKETIME_ONLY_CMDS" "test_ssl") + ;; + ;; At the same time, faketime happens to cause + ;; test_fast_extension, test_privacy and test_resolve_links + ;; to hang, even with FAKETIME_ONLY_CMDS. Not sure why. So + ;; execute only test_ssl under faketime. (invoke "faketime" "2022-10-24" "ctest" - "--exclude-regex" (string-join disabled-tests "|") - "-j" (if parallel-tests? - (number->string (parallel-job-count)) - "1") - "--rerun-failed" + "-R" "^test_ssl$" + "-j" jobs + "--timeout" timeout "--output-on-failure")))))))) (inputs (list boost openssl)) (native-inputs From patchwork Fri Dec 1 23:15:14 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: 57191 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 415B016FF1; Fri, 1 Dec 2023 23:18:25 +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 1608B16E76 for ; Fri, 1 Dec 2023 23:18:23 +0000 (GMT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1r9Clj-0004pp-H6; Fri, 01 Dec 2023 18:17:59 -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-0004oy-Pd 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-0008Bt-Hq 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-0005L5-FT for guix-patches@gnu.org; Fri, 01 Dec 2023 18:18:02 -0500 X-Loop: help-debbugs@gnu.org Subject: [bug#67557] [PATCH v2 2/5] gnu: deluge: Update to 2.1.1. 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.170147262220428 (code B ref 67557); Fri, 01 Dec 2023 23:18:02 +0000 Received: (at 67557) by debbugs.gnu.org; 1 Dec 2023 23:17:02 +0000 Received: from localhost ([127.0.0.1]:56333 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1r9Ckn-0005J8-Ha for submit@debbugs.gnu.org; Fri, 01 Dec 2023 18:17:01 -0500 Received: from wolfsden.cz ([37.205.8.62]:42438) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1r9Ckh-0005IK-PU for 67557@debbugs.gnu.org; Fri, 01 Dec 2023 18:17:00 -0500 Received: by wolfsden.cz (Postfix, from userid 104) id 2CB92262F06; 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=O+cE/lgiQ1/zHJu6YdxBL/E592gitPqNxnHAxgKyrVw=; h=From:To:Cc:Subject:Date:In-Reply-To:References; b=SA0NUfcAKtuGoMJpbvvTMsDpkOcFS0UC6K27wI8bl2T1JNr2svDZyWPHG6e+bGeog fobY4lFLqlZfvdEYQEHH9us5kNq42Ux8bxl2DzzhszRJK7TLkAeMoJkSAJHoXoZ0s4 fljbNm3jnUqETN04WOf8v8bWhBpyMYCU6ASzHoEF11Qv+lPqiBC1IzW4eQ6o1D6ugF 2z7HdjpSQnClDQeQG0T0EHVeT43FIgIVP9RreVR5lmk0QgXWOq3PRf4t3Xtyesx0ox ERd2P3pj6q1xm0MeYTvtR5rFhOjxpvb+nJkv5rxjDLVnOeTNsWBJLpxC+6HCNnC7yv dSoYkYg1gyql3fTdOmWQk1Ya+3JrCVBBMJS2/5md5ATexI8el4P2TeMbQa4jH9rH6k RSZaEOG969X1PaTUm2PhW+fq44YJsgTXpCHLhBN6YxMRLUM2z41329mmXzNA4GH8Lu wVwvtuZgLTpS1ZY4NoPo79dlBfPT/e+M658UKFpwsuCumlQhqi7E4Gsh6XYEWa4F+B 1uh9IkWm9ADpFxFM5q+0Fyq9fSEMNxh/LvX0uvDFV4A271bVlQE7Ar1W78SHrb99eo fXCFb2wGkzyrpG+qyCEAHCkVKG5QO6GFQCtUT9QlaYRDhpkJkjvk/2nK7DaZlBVawY Jnb3lT2yVX49PXoaEtwrUse0= Received: from localhost (unknown [193.32.127.144]) by wolfsden.cz (Postfix) with ESMTPSA id AF093260768; Fri, 1 Dec 2023 23:16:44 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=wolfsden.cz; s=mail; t=1701472604; bh=O+cE/lgiQ1/zHJu6YdxBL/E592gitPqNxnHAxgKyrVw=; h=From:To:Cc:Subject:Date:In-Reply-To:References; b=MYQ9eyXbiyWD4ASB4KcYQHPLysyHdplXLh6AnxXld5XidZXeoFNCCxZUtg7qBPkPv MtZoHvusawjv7LTvzcNyE3yPDlS79OPaTU3+CM73Ar80Li0oczCRVYm9cgf03k/5zF AuHjam+dIAyL9xlsA3WtsnVmAxLDrmcFzJDbgqz4InnTzNB9djGlRcgMRX1keS9bql MKTnA1O7pVq44dAy4JJ6qEcCIQ2mZp91o3ndxoI1aN58G91pyveQYEbI7JHjKQx4Df vmnqPTiuuiemrJhgW/kJLHFse4HgC2GfbinNRQ9vQGfkOwu0Ch0ES2ixEhknUhbtz0 NdjNy7otKE0WJInThYeUXrZesSnzEhOkoFUvMmKjvZUAS1FdGRgAJzFXhWcULYS/bO g+R+qPPwQjSuE1eeJ37gEwQhu9vedlIwaNNVADFbkXgZ/g49o0EqRzgmpfiiifzrt0 C0gJMd2qGDezeqez2GqMH/N5j5636PyatesL8mydQMs/rSFardzmJ5H1ybktYQK/KK n84tqMKU2Pl5LlX/DwComWbH0y6vn+CcB3A3/zgNdHh1GHUTuzAzYL9WU+Fyb6eEn4 Q1Yv4Q+QCaVucVXTu0pvkvMFOJcwnn4dqtsLSntfVaCvqwcOnkXv6w9RPidZxxk850 D8g8pB3tOQl3vusufYC/L4+I= Received: from localhost (localhost [local]) by localhost (OpenSMTPD) with ESMTPA id c29da741; Fri, 1 Dec 2023 23:16:43 +0000 (UTC) From: Tomas Volf <~@wolfsden.cz> Date: Sat, 2 Dec 2023 00:15:14 +0100 Message-ID: <00b037edcd941fdf3a288c9212ceded8f182821c.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 Dependency on nss-certs was added. Most torrents do require SSL in some shape or form, so it seems appropriate to add it by default. * gnu/packages/bittorrent.scm (deluge)[version]: Update to 2.1.1. [propagated-inputs]: Add nss-certs. [native-search-paths]: Set to allow locating the certificates. Change-Id: Ic6c79f24851d6917dc4e5b22b3bcb2f6b99e187a --- gnu/packages/bittorrent.scm | 10 ++++++++-- 1 file changed, 8 insertions(+), 2 deletions(-) diff --git a/gnu/packages/bittorrent.scm b/gnu/packages/bittorrent.scm index e115c13017..3d79a3a159 100644 --- a/gnu/packages/bittorrent.scm +++ b/gnu/packages/bittorrent.scm @@ -46,11 +46,13 @@ (define-module (gnu packages bittorrent) #:use-module ((guix licenses) #:prefix l:) #:use-module (guix gexp) #:use-module (guix utils) + #:use-module ((guix search-paths) #:select ($SSL_CERT_DIR $SSL_CERT_FILE)) #:use-module (gnu packages) #:use-module (gnu packages adns) #:use-module (gnu packages autotools) #:use-module (gnu packages bash) #:use-module (gnu packages boost) + #:use-module (gnu packages certs) #:use-module (gnu packages check) #:use-module (gnu packages cmake) #:use-module (gnu packages compression) @@ -574,7 +576,7 @@ (define-public qbittorrent-enhanced-nox (define-public deluge (package (name "deluge") - (version "2.0.5") + (version "2.1.1") (source (origin (method url-fetch) @@ -583,12 +585,13 @@ (define-public deluge (version-major+minor version) "/deluge-" version ".tar.xz")) (sha256 (base32 - "1n15dzfnz1gvb4cf046yhi404i3gs933qgz0ichna6r1znmh9gf4")))) + "1xyz8bscwqmd7d8b43svxl42w54pnisvwkkrndx46hifh0cx73bn")))) (build-system python-build-system) (inputs (list bash-minimal)) (propagated-inputs (list gtk+ libtorrent-rasterbar + nss-certs python-pycairo python-chardet python-dbus @@ -606,6 +609,9 @@ (define-public deluge (native-inputs (list intltool python-wheel (librsvg-for-system))) + (native-search-paths + (list $SSL_CERT_DIR + $SSL_CERT_FILE)) ;; TODO: Enable tests. ;; After "pytest-twisted" is packaged, HOME is set, and an X server is ;; started, some of the tests still fail. There are likely some tests From patchwork Fri Dec 1 23:15:15 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: 57192 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 65FF716FF1; Fri, 1 Dec 2023 23:18:26 +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 26F1E16E22 for ; Fri, 1 Dec 2023 23:18:25 +0000 (GMT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1r9Clk-0004pr-JK; 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 1r9Cle-0004p0-6v 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-0008C0-Vm 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-0005LE-Tl for guix-patches@gnu.org; Fri, 01 Dec 2023 18:18:02 -0500 X-Loop: help-debbugs@gnu.org Subject: [bug#67557] [PATCH v2 3/5] gnu: qbittorrent-enhanced: Update to 4.6.1.10. 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.170147262220435 (code B ref 67557); Fri, 01 Dec 2023 23:18:02 +0000 Received: (at 67557) by debbugs.gnu.org; 1 Dec 2023 23:17:02 +0000 Received: from localhost ([127.0.0.1]:56335 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1r9Ckn-0005JR-VH for submit@debbugs.gnu.org; Fri, 01 Dec 2023 18:17:02 -0500 Received: from wolfsden.cz ([37.205.8.62]:42440) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1r9Ckh-0005IL-PT for 67557@debbugs.gnu.org; Fri, 01 Dec 2023 18:17:00 -0500 Received: by wolfsden.cz (Postfix, from userid 104) id 5545C2617EA; 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=9l6NilxYioviN+4WEXvrpnWxFpfhfGAH6hkUPYjOZPc=; h=From:To:Cc:Subject:Date:In-Reply-To:References; b=bIdFtjwS4gDltGOJ5qRvOswFiurnB6NpiUEEUn1mCvAHfp/jq3FPe+PZLuij5n9Ma GIz7KQMnrcJqU9Uzjidk4GOR9b0vnyM+Uw9EH9d7SReFUtEScFMe/wkpxBISQs3RlF 3lLZLPSIMKXhzb5R3stmZh2x5Q8lovmTPpGN4sEru1mdpOhsYQrWFY4Kbq55p1U/HW yZfSGwqoobuEOaGk/17qVDfyd37behb6ePXCqjTw92q7e/Nydbvaho/PNL5yDGwxqF qlu4hRK6n3qWMfVouZwS2HP18gSRSwn7BKZgMpMe25owV2HzEYeR9bH2R6AluLDpsj vYfePAmvDKx2ZcYRnncjFlFA4ERyi9Kc0L1JVtijYQ5cG//bPLpqNEO1NDhITyn3LR pe3o58aIlQkG+MU9qqV8d+QlfJCkBTgo72xfCe3Ir61K6ydqTtuPYgDw05HpBtG/qw 7UDkcEmXT9/TXC/3CdF2fNVnbAEb+rD3pfBP3dwapX6SPh7sBLiqnIRgrVI24fAAnx 0sdnus+HUm2GZppeupRipC/E4abSqXSYGRoJjsHET4WT7mZUra3l7vPlMRZuo3UuS3 qpvO62vVzOJm5TE0pb9KsPDexyK01HuPJaP9yrj4hiYMTs2jtZ9OoaINf2Q+oQJph2 oePxFcPTsWEEeMXdpRDIe+Kc= Received: from localhost (unknown [193.32.127.144]) by wolfsden.cz (Postfix) with ESMTPSA id E9A86262A9F; Fri, 1 Dec 2023 23:16:44 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=wolfsden.cz; s=mail; t=1701472605; bh=9l6NilxYioviN+4WEXvrpnWxFpfhfGAH6hkUPYjOZPc=; h=From:To:Cc:Subject:Date:In-Reply-To:References; b=bIdFtjwS4gDltGOJ5qRvOswFiurnB6NpiUEEUn1mCvAHfp/jq3FPe+PZLuij5n9Ma GIz7KQMnrcJqU9Uzjidk4GOR9b0vnyM+Uw9EH9d7SReFUtEScFMe/wkpxBISQs3RlF 3lLZLPSIMKXhzb5R3stmZh2x5Q8lovmTPpGN4sEru1mdpOhsYQrWFY4Kbq55p1U/HW yZfSGwqoobuEOaGk/17qVDfyd37behb6ePXCqjTw92q7e/Nydbvaho/PNL5yDGwxqF qlu4hRK6n3qWMfVouZwS2HP18gSRSwn7BKZgMpMe25owV2HzEYeR9bH2R6AluLDpsj vYfePAmvDKx2ZcYRnncjFlFA4ERyi9Kc0L1JVtijYQ5cG//bPLpqNEO1NDhITyn3LR pe3o58aIlQkG+MU9qqV8d+QlfJCkBTgo72xfCe3Ir61K6ydqTtuPYgDw05HpBtG/qw 7UDkcEmXT9/TXC/3CdF2fNVnbAEb+rD3pfBP3dwapX6SPh7sBLiqnIRgrVI24fAAnx 0sdnus+HUm2GZppeupRipC/E4abSqXSYGRoJjsHET4WT7mZUra3l7vPlMRZuo3UuS3 qpvO62vVzOJm5TE0pb9KsPDexyK01HuPJaP9yrj4hiYMTs2jtZ9OoaINf2Q+oQJph2 oePxFcPTsWEEeMXdpRDIe+Kc= Received: from localhost (localhost [local]) by localhost (OpenSMTPD) with ESMTPA id 4f871593; Fri, 1 Dec 2023 23:16:43 +0000 (UTC) From: Tomas Volf <~@wolfsden.cz> Date: Sat, 2 Dec 2023 00:15:15 +0100 Message-ID: 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 * gnu/packages/bittorrent.scm (qbittorrent-enhanced): Update to 4.6.1.10. Change-Id: Ic164ee27ea54018acfcba0e9db8db11f119800a4 --- gnu/packages/bittorrent.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gnu/packages/bittorrent.scm b/gnu/packages/bittorrent.scm index 3d79a3a159..fb20b3c92c 100644 --- a/gnu/packages/bittorrent.scm +++ b/gnu/packages/bittorrent.scm @@ -542,7 +542,7 @@ (define-public qbittorrent-enhanced (package (inherit qbittorrent) (name "qbittorrent-enhanced") - (version "4.5.5.10") + (version "4.6.1.10") (source (origin (method git-fetch) @@ -552,7 +552,7 @@ (define-public qbittorrent-enhanced (file-name (git-file-name name version)) (sha256 (base32 - "029crx8yd8apssg2k4alnc0py5i2sp3bhjkwki5fvvnpgkrhfqf0")))) + "101a9n2vk9d6b4vc3schkmpc56l0i0i60fcjh8hwadc6amc2ymvy")))) (home-page "https://github.com/c0re100/qBittorrent-Enhanced-Edition") (description "qBittorrent Enhanced is a bittorrent client based on qBittorrent with From patchwork Fri Dec 1 23:15:16 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: 57190 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 D687E16FB9; Fri, 1 Dec 2023 23:18:24 +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 0CC4D16DF9 for ; Fri, 1 Dec 2023 23:18:21 +0000 (GMT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1r9Clk-0004pt-Q7; 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 1r9Cle-0004p3-KY for guix-patches@gnu.org; Fri, 01 Dec 2023 18:17:55 -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 1r9Cle-0008C9-Cg for guix-patches@gnu.org; Fri, 01 Dec 2023 18:17:54 -0500 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1r9Cln-0005LM-AC for guix-patches@gnu.org; Fri, 01 Dec 2023 18:18:03 -0500 X-Loop: help-debbugs@gnu.org Subject: [bug#67557] [PATCH v2 4/5] gnu: qbittorrent: Update to 4.6.2. Resent-From: Tomas Volf <~@wolfsden.cz> Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Fri, 01 Dec 2023 23:18:03 +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.170147262220442 (code B ref 67557); Fri, 01 Dec 2023 23:18:03 +0000 Received: (at 67557) by debbugs.gnu.org; 1 Dec 2023 23:17:02 +0000 Received: from localhost ([127.0.0.1]:56337 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1r9Cko-0005JY-8R for submit@debbugs.gnu.org; Fri, 01 Dec 2023 18:17:02 -0500 Received: from wolfsden.cz ([37.205.8.62]:42450) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1r9Ckh-0005IM-PS for 67557@debbugs.gnu.org; Fri, 01 Dec 2023 18:17:00 -0500 Received: by wolfsden.cz (Postfix, from userid 104) id 7CD682603E2; 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=UkW7UBlhqgylLW8gjB3na6p4uQb7zOjqIjhtBckh6IU=; h=From:To:Cc:Subject:Date:In-Reply-To:References; b=NRdIEL/VgHdzyI+bhzAc4jEfOjUeE/MeLHGXY3/ZGmPeFv3qRYpee5imQjocRIy3i wb+bBX9c7gl23ujBMa1CER7VecQZaNvcBaq10GyTN70pnmqqCDbdLZIs5VGwufRiT+ hWGdhBMBE/5RT1uT2xNxBLLHpvddGKAf9d7Q5fSfPYPuCv7KPbCQQQ8+YDHFfAIwW4 7vHFZTuPzA8PgkLRzv4iJaCO6DfFt3Qkbfm+4k5GTm8BefmZblNNCwAycP4WDHHZhD tEItQlcZtr1t/JedGlwCKmQqE3u9oMSZ0M5/aM8xGUpMq7JwpS5HHtF6Qm3bZipts9 RH8+xuTxJYMo0W+GL7LZj2+Epc/giMG8N/VO1uuIXrh+sFM3LbKoaQ3UZ6Qova6MTr AYm/pH8hKKmQIjowyLvJj0ipDuSiArO6WbmzpkQeD0rCPyFIldUwmW135X1CbJu2Vi 35VmUcbgFrI3lWh12WJ0vKSUbI6zxs/N9vzkng67/vpSf3xFWAz5ajBAMsXAGWCUbw LgD+Yh4ThiMvnycpolzo399E1wsG5qQhDGPTJP9pjyyYEc+g4uguWscfEy87eYvx8K AoVKWqsyRV0TuKLQHNPYPN9D2g1Ieex1NZp2ozS8x1pYqWQ22/+FI7rwtK3qqD3Oy0 x9nUMsOigpqnWWdFBLrNEe0A= Received: from localhost (unknown [193.32.127.144]) by wolfsden.cz (Postfix) with ESMTPSA id 2BE8A262AA2; 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=UkW7UBlhqgylLW8gjB3na6p4uQb7zOjqIjhtBckh6IU=; h=From:To:Cc:Subject:Date:In-Reply-To:References; b=NRdIEL/VgHdzyI+bhzAc4jEfOjUeE/MeLHGXY3/ZGmPeFv3qRYpee5imQjocRIy3i wb+bBX9c7gl23ujBMa1CER7VecQZaNvcBaq10GyTN70pnmqqCDbdLZIs5VGwufRiT+ hWGdhBMBE/5RT1uT2xNxBLLHpvddGKAf9d7Q5fSfPYPuCv7KPbCQQQ8+YDHFfAIwW4 7vHFZTuPzA8PgkLRzv4iJaCO6DfFt3Qkbfm+4k5GTm8BefmZblNNCwAycP4WDHHZhD tEItQlcZtr1t/JedGlwCKmQqE3u9oMSZ0M5/aM8xGUpMq7JwpS5HHtF6Qm3bZipts9 RH8+xuTxJYMo0W+GL7LZj2+Epc/giMG8N/VO1uuIXrh+sFM3LbKoaQ3UZ6Qova6MTr AYm/pH8hKKmQIjowyLvJj0ipDuSiArO6WbmzpkQeD0rCPyFIldUwmW135X1CbJu2Vi 35VmUcbgFrI3lWh12WJ0vKSUbI6zxs/N9vzkng67/vpSf3xFWAz5ajBAMsXAGWCUbw LgD+Yh4ThiMvnycpolzo399E1wsG5qQhDGPTJP9pjyyYEc+g4uguWscfEy87eYvx8K AoVKWqsyRV0TuKLQHNPYPN9D2g1Ieex1NZp2ozS8x1pYqWQ22/+FI7rwtK3qqD3Oy0 x9nUMsOigpqnWWdFBLrNEe0A= Received: from localhost (localhost [local]) by localhost (OpenSMTPD) with ESMTPA id fbe4c2b7; Fri, 1 Dec 2023 23:16:44 +0000 (UTC) From: Tomas Volf <~@wolfsden.cz> Date: Sat, 2 Dec 2023 00:15:16 +0100 Message-ID: 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 * gnu/packages/bittorrent.scm (qbittorrent): Update to 4.6.2. Change-Id: I75d05f14396e1b017cc939264e30ade625cb7017 --- gnu/packages/bittorrent.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gnu/packages/bittorrent.scm b/gnu/packages/bittorrent.scm index fb20b3c92c..f9098b1a56 100644 --- a/gnu/packages/bittorrent.scm +++ b/gnu/packages/bittorrent.scm @@ -488,7 +488,7 @@ (define-public libtorrent-rasterbar (define-public qbittorrent (package (name "qbittorrent") - (version "4.5.5") + (version "4.6.2") (source (origin (method git-fetch) @@ -497,7 +497,7 @@ (define-public qbittorrent (commit (string-append "release-" version)))) (file-name (git-file-name name version)) (sha256 - (base32 "1ngvvwhafi9mi05r2l9dk9x05za8x35y12p230wpzprydhlgwsxd")))) + (base32 "1wps17iv4gj7y751fibvcxk51v09wyniv6xm2yx429dj7z8rfmzs")))) (build-system qt-build-system) (arguments (list #:configure-flags #~(list "-DTESTING=ON") 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