From patchwork Sat Dec 2 00:28:54 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: 57199 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 5FAA227BBEA; Sat, 2 Dec 2023 00:31:45 +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 8DD1B27BBE2 for ; Sat, 2 Dec 2023 00:31:42 +0000 (GMT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1r9DuT-0007la-Cn; Fri, 01 Dec 2023 19:31:05 -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 1r9DuM-0007hp-Ff for guix-patches@gnu.org; Fri, 01 Dec 2023 19:31:00 -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 1r9DuJ-0007UI-Ip for guix-patches@gnu.org; Fri, 01 Dec 2023 19:30:55 -0500 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1r9DuS-0007Q3-FI for guix-patches@gnu.org; Fri, 01 Dec 2023 19:31:04 -0500 X-Loop: help-debbugs@gnu.org Subject: [bug#67557] [PATCH v3 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: Sat, 02 Dec 2023 00:31:04 +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.170147702128440 (code B ref 67557); Sat, 02 Dec 2023 00:31:04 +0000 Received: (at 67557) by debbugs.gnu.org; 2 Dec 2023 00:30:21 +0000 Received: from localhost ([127.0.0.1]:56397 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1r9Dtl-0007OZ-60 for submit@debbugs.gnu.org; Fri, 01 Dec 2023 19:30:21 -0500 Received: from wolfsden.cz ([37.205.8.62]:49394) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1r9Dtf-0007NW-Kr for 67557@debbugs.gnu.org; Fri, 01 Dec 2023 19:30:18 -0500 Received: by wolfsden.cz (Postfix, from userid 104) id C7C582628A4; 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=H1DkL1YIfVU6GbWe/hpGyXdbWIiW3eNmlVpVBhDwABo=; h=From:To:Cc:Subject:Date; b=vkWXrZxVLMOwvoA/uL3VdNuFYHr8hCAxHmxczn7CKTu8UBLFGqbF3Gh0MgKsd0B6C 6RB0kyzDlXuYXFyADCpYhEFGedQP/rUs2fCf7m96i735GNLJWOHXIAfSwbkMKxwx0Q 2RSf5+PXTRBuEptuQqDFSaf05v42XUuGxBXudGhxvmyqZdkTRUK/RIJmGLTk8kDh9E Q81EvfW0WaD2O8jIhrYZTbAPRkggYoh7q0gYZTd2FRdOiPVYt6Wmtw5pUOumJBo19K erFvk53G2EDAu6k/W6PMmfCKyVr6J7iYFKm94iGYREBZS1oXR3Nyyvjqh4RNDIBcT9 3mFNwBzrCm8e1ch1wJLPW1jwEtutgLQBNcUrTvY1aFu8hh9fFelg9MTtvEezUoDAwc mTyrPXz8wQWu2KR9Hd9sVnsEtHAUlUMLQdfsF44Et1nADqHT9IXA4n1msTs3U5n2Ti 9iOEay3oCDmKG3sOYVUVMCb1q0G7xFl8KuSA+lAhViM5/OFE5kNEvp+sC26zK5uIIS 8uzJIVND5HuFyxc4fvEiBNzjVD8g73ZFfw0NZmgoUoHu0gaaEiHCJevRzP/6GjhYDz D+1Rqc13r7qJ9cnifwU7DO9ZY6YmlZbJmLpOxl/GVmE5EZKYQ82b05/LPXl+fBGw5l JdFZ2+BuktiOMGoq9CjKsKt4= Received: from localhost (unknown [193.32.127.144]) by wolfsden.cz (Postfix) with ESMTPSA id 148082603E3; Sat, 2 Dec 2023 00:30:02 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=wolfsden.cz; s=mail; t=1701477003; bh=H1DkL1YIfVU6GbWe/hpGyXdbWIiW3eNmlVpVBhDwABo=; h=From:To:Cc:Subject:Date; b=s0leB/tqVEm/FW6oxhdzsM2Wh7p6C5+wo0AsGEZOf7UU3JkZh+RXiMiNdlYZczi1E HR4BBPq4vJjfU1pkVQUN4HLhWrJALUiSWchQqm8DMtUOlUk3P4ERx2ZUGS3hmiAGqa tKU69s5cL/tSmk6xSViYwZYBM9ZevblK0g1pzJnQQXaqIOUVzlniRTnFfsuZOAyDgT zJ0XrjzTXWF1R9vOzCAvDAi9/e9U8PKCCx3y7p6KzSnh0QxpHJUWz7WtP1TSyNuPZh 92cWsRWWA+mpG9m5DyVpNC0NbZIkS9kN5LKziH087oBeS37gO3byX6Ae+tDFZ1F9SN zW6LZ42oRN/gv+W1njK0ACCCTJUfvrCywVR0gWqMTZcUzr+eh2IZs9t93+pZtE8f0/ TJbhy+fXvKVMu0uKtMeo8xb9Npjg0HL/2y2hM2LJy3kdERNG4ddRtsTV/MDdJrNeMO ycv5NfiC39VGskMb+o6oRg9DsCfA74LgzWWZ8zJUrpBv9gBM6M5sxTeM/Zgre2BjT5 pKFXyRQoGX1tiLeAqDhSXdA10F4BAOx/S/rtjWa95O2L0XQd2OPCbf7MmVJzA7MpC9 /+RC13uyn35mV3lbDeeE4f8ibN9A1xtru3TGk2NY4fIPEAFgZoAvaAMEcdR/qMM3vV yMoPAe9iWTuihLP7iuoP3gQg= Received: from localhost (localhost [local]) by localhost (OpenSMTPD) with ESMTPA id bbd2262f; Sat, 2 Dec 2023 00:30:01 +0000 (UTC) From: Tomas Volf <~@wolfsden.cz> Date: Sat, 2 Dec 2023 01:28:54 +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: 842a11f1caa1bb929c427722ad9d7b7c1ff65727 -- 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 Sat Dec 2 00:28:55 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: 57195 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 92AAD27BBE9; Sat, 2 Dec 2023 00:31:18 +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 33D0C1740A for ; Sat, 2 Dec 2023 00:31:14 +0000 (GMT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1r9DuQ-0007jZ-Vs; Fri, 01 Dec 2023 19:31:03 -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 1r9DuI-0007h7-I5 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 1r9DuI-0007Ts-3W for guix-patches@gnu.org; Fri, 01 Dec 2023 19:30:54 -0500 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1r9DuR-0007Ph-1X for guix-patches@gnu.org; Fri, 01 Dec 2023 19:31:03 -0500 X-Loop: help-debbugs@gnu.org Subject: [bug#67557] [PATCH v3 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: Sat, 02 Dec 2023 00:31: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.170147702028419 (code B ref 67557); Sat, 02 Dec 2023 00:31:03 +0000 Received: (at 67557) by debbugs.gnu.org; 2 Dec 2023 00:30:20 +0000 Received: from localhost ([127.0.0.1]:56391 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1r9Dtk-0007OD-67 for submit@debbugs.gnu.org; Fri, 01 Dec 2023 19:30:20 -0500 Received: from wolfsden.cz ([37.205.8.62]:49410) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1r9Dtf-0007NY-Kr for 67557@debbugs.gnu.org; Fri, 01 Dec 2023 19:30:18 -0500 Received: by wolfsden.cz (Postfix, from userid 104) id 575E12619C8; 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=O+cE/lgiQ1/zHJu6YdxBL/E592gitPqNxnHAxgKyrVw=; h=From:To:Cc:Subject:Date:In-Reply-To:References; b=JKQGtmqbqF3mECTwDwJ6ZxD/FIwBR7i/lvzIX7SpycUecwgjHUGZxQaRyzB44BM+t iagDtPry3GcxqXm4DI4BPrhDJ5FjKdWvAIr5rwBaupJDuBE2S4LroQ/as/BjqB5Gkq YQvCkLmFNgwQJB21dJQhPod9lia05xaQ1AmxJMEh2S46DO+pWl0F/CRB2r4VqzE2qE tdqRibSbqEYQdxP4B6OAxn8+9PT7aFoaiazf+4H+7WhNC7/dWjbFADOvB5/BPVxswZ 2O//AHIBns3/GsRt/CdqXKg9Z56q0gRQcSHPVrB03PutBCAVeAOLh8hnY5vVhqHZAS GZJEuhl1uxTrbxVNqmGOI8+L/yUMYG39btTqhxR2pktcKvFn0quwtugVuxvwLZesAl CAkWOG8E5/uqDMPyuUJAsQVU7lyFcTiHZUf8Q/AbAe7liedUluZ+Wzu82ZJQalW3Wz zqDzTUeMPfRJ9cC817xf6IOlO6GjRFYAZaDf9JtAW12nnETEH3A3UKU4P5k5D2y7NX EU7GNXYq1s9cSdD+fmCIAv4u4qwJ9q3hhNZvJNegn9J1dLGzYRsn8gVnji2st6RK0Y 5kcIkqL7VBc4MZjmj42pjcIFpjkA0rZ0HZtVEDHoh/D7MBA2lKOUsuS0HTlnRIkOH4 ms5H1U8ZBexJiIPL2+0IkMWE= Received: from localhost (unknown [193.32.127.144]) by wolfsden.cz (Postfix) with ESMTPSA id 53E14261556; Sat, 2 Dec 2023 00:30:03 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=wolfsden.cz; s=mail; t=1701477003; bh=O+cE/lgiQ1/zHJu6YdxBL/E592gitPqNxnHAxgKyrVw=; h=From:To:Cc:Subject:Date:In-Reply-To:References; b=sXc3JdtpmdBX+gbshtmV1hkvK/zlGiEVTffguRsENZb8FZxap3mWIMhf7RBJJDM4D AKSwq4GsWGHUafdMQ1vBT2nmV1xNP6VXgX9Kp/s0t9TeeXe6xe9rAPNc8JAkCe9AYR jKQKo9j8J7bug7i3F7dtfMqtjRDmfNNcLO1fe7S3fJYdOrM+X/Tbeha2dTuq1U0ptA q2g/mOK+Y5OTnGRkaEij1x773GIFkv6qyBYJbTtwfskJxegiAHX4FAX3xeVd/P5bPw WtSE/tk0+lNa4L1WHb6VMUkXbKQ8eGuuiPWnrOxvT5CpdW65G/gV8sH8okeswrJ2FB 9sBaoKRHDGcRMXGIz5/qXQscMOosVphG7B1rlDgswiqJpNU2PCWZndVT+KCcU1c0hZ E+BBLyzf1rO+PTY5LpN9/1pQUH7ze+5uhS9nSvzEa7iR2NGBfFrPO0BW0rD1b4DpFt ArLkT9icpq4rs23XcbFCXuZtu7z4KBNxFRg3EWqwVlrwd5748omKXtxF/zbIpbz0GO Wp7xiio2nWeB4uTSDV7CEvVqob1LaqvTxTQtkU4pQrU9OMzb2TL2vC9UmhzgAc1Ckd PjEMRs77oz1bVKR/+4rnGpDaRNVHMwsOp1xgklQbi/z0JJtx6kquv0XWsn98KRSyIb PxSaXiAOYl/M7fW29Ef8avbY= Received: from localhost (localhost [local]) by localhost (OpenSMTPD) with ESMTPA id c42d65cc; Sat, 2 Dec 2023 00:30:01 +0000 (UTC) From: Tomas Volf <~@wolfsden.cz> Date: Sat, 2 Dec 2023 01:28:55 +0100 Message-ID: <367e95748003ea62a27dc1b3a27ce13d1e0c7e6f.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 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 Sat Dec 2 00:28:56 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: 57197 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 1B65127BBEE; Sat, 2 Dec 2023 00:31: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 9C0C827BBEA for ; Sat, 2 Dec 2023 00:31:42 +0000 (GMT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1r9DuT-0007lZ-Cc; Fri, 01 Dec 2023 19:31:05 -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 1r9DuI-0007hH-Of 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 1r9DuI-0007Ty-Ft for guix-patches@gnu.org; Fri, 01 Dec 2023 19:30:54 -0500 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1r9DuR-0007Po-Da for guix-patches@gnu.org; Fri, 01 Dec 2023 19:31:03 -0500 X-Loop: help-debbugs@gnu.org Subject: [bug#67557] [PATCH v3 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: Sat, 02 Dec 2023 00:31: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.170147702028426 (code B ref 67557); Sat, 02 Dec 2023 00:31:03 +0000 Received: (at 67557) by debbugs.gnu.org; 2 Dec 2023 00:30:20 +0000 Received: from localhost ([127.0.0.1]:56393 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1r9Dtk-0007OK-Ii for submit@debbugs.gnu.org; Fri, 01 Dec 2023 19:30:20 -0500 Received: from wolfsden.cz ([37.205.8.62]:49396) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1r9Dtf-0007NX-Kq for 67557@debbugs.gnu.org; Fri, 01 Dec 2023 19:30:18 -0500 Received: by wolfsden.cz (Postfix, from userid 104) id 18700261677; 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=9l6NilxYioviN+4WEXvrpnWxFpfhfGAH6hkUPYjOZPc=; h=From:To:Cc:Subject:Date:In-Reply-To:References; b=goxeo0fcK+bQyuC+b4MSF/WjJ3X99s0bZ1T0PuGpzP+Fr6TUdHsKN4cqTD/IB5Rpr wgbq6kJuhf2fofK1qsKZf5jAi9YwX87wBLfRGzQB49t8Eu7NbSlwKg2DxMQpJ5WJ/g d9ac8yyJJN9ft3bbbn+ZdSMLudVcwi33gTXwJwOHHFwgAwBo3HcDgyy+Yb1hZZHqz0 1SUaIefrFtCPZjkXVP/WP1SOGVaoYbb2xh4hXz4QerQ4BBCpLY+qQ08rA+7M8HC8Xc yD1tYRwmKgU4OOb8tTZ0k+5jnW1LTJ+rxLjqdygOBlhxHcMU29Va58pGrNscEp5+lA dnO16mqufMJfVrX2aFTbfWv4TE4E7OwhVL2GsNy3UM9p+NsVYuQ9XmlfCXlt7OLzPT AJ7Cnm3PGXT38qJCKS9YcPjM9uJWYz3np+2BMBczdWU8OOw0OQ480Rk1UpaAXOxLUe 1CAZkyT4MOWRnbB41ikLDrzCXeuJD0nVVLoxUdzUcC96aC2mGc/5/7BDHYH4oGljWo 7/y2bPjn1dGGx6IJCMDbmrc8467Yg/1nxvQM6HGIOpE29nkkORO/RFY24JEBywIp2D th7T7OYw42GXqQUKMjs5HO5W/ZaPc+LRgj/8LpsM77/WkJXO+D4dqCjOH4UC/uqqYk PAqeQRP0/R0oAqp/tjzGo0fg= Received: from localhost (unknown [193.32.127.144]) by wolfsden.cz (Postfix) with ESMTPSA id 9A5CB2603E8; Sat, 2 Dec 2023 00:30:03 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=wolfsden.cz; s=mail; t=1701477003; bh=9l6NilxYioviN+4WEXvrpnWxFpfhfGAH6hkUPYjOZPc=; h=From:To:Cc:Subject:Date:In-Reply-To:References; b=MIphHjCDPWz6dgXbUFx7aG8MCeZPutBxVa+OQ7luNWxLaklCQCfPRR9IeK8qiqlku 0Nmw/Lp28mqumes++iOrKx0+TekKoedkLGbcQ7JSfx800SPxuTOpNE27d3bnAS1xOT 4b9HtKgEioK7qH7Lo89+p1er1eqiiKRJmgG25ARd/7BK3pGOu/iire5FeesQA+IZIe uzr/+StR9AhViDaffWQV/nCYnWmdFnc/rmGQE7aDCPrQW4lJWz+KRKpVIgWv3f6tbJ 75QxSgd1DQ4yP59VoBhYBNatrpiLF6Rol80uY7U4oXob+ogMdsMmHjqiqVUsOuZ4eu w/mfP+kyIARQdCFs8TQM5mE05fwBJK9CuajZGKSgVJtzRPX2l42ZNUSff5bFpRgrm2 0sRom2XKHV+kSD2YzOV1lGKpdHiVjoCBbXUzT7gIt9Z1lseC6iuIRZeDfrQCKoVWCG gkW8keyy05JSwAZEnumJP4qBaVLDm30nKeVQuaTk031hcJxwLZ1T5DxXd+UmnaXzU7 DALAN5y2PrjjM46+QH1UFbFkVDqZBllGM84vbBAjhGqV+6cR2uYk407n0FE1jdNAn4 YtlAg7m8B3droEgak+W04ZeF5ba8Hf+RQD5Rjd4Vyvq37KNBw+2Xmq7InCTHNO6EZQ q+0SwzKT/e1RMjRmInfpfnbs= Received: from localhost (localhost [local]) by localhost (OpenSMTPD) with ESMTPA id 491a3234; Sat, 2 Dec 2023 00:30:01 +0000 (UTC) From: Tomas Volf <~@wolfsden.cz> Date: Sat, 2 Dec 2023 01:28:56 +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 Sat Dec 2 00:28:57 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: 57198 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 1D4BA27BBF0; Sat, 2 Dec 2023 00:31: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 9EE2A27BBEB for ; Sat, 2 Dec 2023 00:31:42 +0000 (GMT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1r9DuT-0007lL-13; Fri, 01 Dec 2023 19:31:05 -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 1r9DuJ-0007hN-8u for guix-patches@gnu.org; Fri, 01 Dec 2023 19:30:56 -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 1r9DuI-0007UA-W5 for guix-patches@gnu.org; Fri, 01 Dec 2023 19:30:55 -0500 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1r9DuR-0007Pv-Tp for guix-patches@gnu.org; Fri, 01 Dec 2023 19:31:03 -0500 X-Loop: help-debbugs@gnu.org Subject: [bug#67557] [PATCH v3 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: Sat, 02 Dec 2023 00:31: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.170147702128434 (code B ref 67557); Sat, 02 Dec 2023 00:31:03 +0000 Received: (at 67557) by debbugs.gnu.org; 2 Dec 2023 00:30:21 +0000 Received: from localhost ([127.0.0.1]:56395 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1r9Dtk-0007OW-Ta for submit@debbugs.gnu.org; Fri, 01 Dec 2023 19:30:21 -0500 Received: from wolfsden.cz ([37.205.8.62]:49412) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1r9Dtf-0007NZ-Ks for 67557@debbugs.gnu.org; Fri, 01 Dec 2023 19:30:18 -0500 Received: by wolfsden.cz (Postfix, from userid 104) id 9BD1D261557; 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=UkW7UBlhqgylLW8gjB3na6p4uQb7zOjqIjhtBckh6IU=; h=From:To:Cc:Subject:Date:In-Reply-To:References; b=JQlcn53+RQhghlqaviqqY4qbZPjDKz2TvBr6KJItSkODoKbuMdyWC+8Aig2eYPQJz 42UtrOOW752753n9jl5lmNRq3gKa/pSSp47mgtQxEbSx2FzKQSyZezgMTmk42v/l+C AWZj+zA4t1SJN4yJeud8akEB/5w1VKEiHspwNSP4mykJ0Eaxj89nBfiPSapFbohTRc Ps1sJivHorlxbC/wIYNjMxWCVgkiCImeN+KVVjdypqNywCEsPvkO47mbnNVTrvXRMX XFGRvcgxIf1eYZux8SJZiCi0kX2HBOyoWF5Ure6sPPkD97XC1jKitixTo1guzfQH/a UWPBv4fgSlNCz0U8hSqOTW5teINZciNleES9aGWhr8t4kWFSnWrXfRYMRHHqivHtLm IS7HBK+iS9uJORFgp3FPYFIOevVErPrdDU/+DO19arV/D9KGsUF2f4rXlSd/SRwiWz xfRS/i0z0sfCKrPT2W7I21rTOYeX+67csyD9gZ3SpAY6KNrh4/TXvNI0mnZMrjlBfV WK06Cz1Gwkyggz/jfg2JeYoTRe2li1d0yQkTg3p3t8RWibU2rpPPuu3eFNfoWPp3Lo QZxCXLQ0FWRTtJBZEMk6fIhV+Dlnof5AVKvJhw8nErofSpqnmJezTelkZdrvZuwNI9 zN4IbxO4ngp7yWpjhH2chU1w= Received: from localhost (unknown [193.32.127.144]) by wolfsden.cz (Postfix) with ESMTPSA id DDE142603EB; Sat, 2 Dec 2023 00:30:03 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=wolfsden.cz; s=mail; t=1701477004; bh=UkW7UBlhqgylLW8gjB3na6p4uQb7zOjqIjhtBckh6IU=; h=From:To:Cc:Subject:Date:In-Reply-To:References; b=DopTm0lSWXe5XJqviqCJ7SiJn01M2+ySAEp5V9Iw9L2ZCV4Zi7ACUnO3VJj+ZbzGY Mbkybk/SRmgNpjpvRKNwMi65pJb3W4UxhyWwfcXjeNX00dosRkmZfwrnvHKSKOLJOY ghvfPYNPDyMnc4dbnEVU7+Uk6ipmG0NIK/gD3OVvFSHzGnIdsvyAGPg3o54S/3CtJe ycKgL4fZbA64JrGcKsw3WGtl2Erb0MOdOKz22higLQzzlR0kwPLmG4j3Us3JEyyaPA G6hDJ8ERHCxN1oAt962FCojGYvbsiTAaLYlqNwpH4cU896vwUWvkREyv9WZcaqVwgA 7ZGj0kDbdj7KrixBrjxiyB+uSuw9Nne4VdJKg56bLiOtAm+YWDnH0X3UO0KDTu19Zc Uu41B+gc2+l82xyCsgMc46DMIoJBo7ZsrmM6FGOYDjCjDgob/Xnzi+Z1qwxRbukdDL tr50sf3xFznwAdq2SqVVN/Lrzt7GBolwNCOVfpDM6ctUpXWsBd9orA0B8Zry/mB894 l5OSFgrnmv3VJAwFBQrSTFaYQow8lMwQkAr/YKicg78v3b8RdI1j32Y+23oGejOx1t rC6hKqwowxvrN1u2l1ObmKCc9TfVzPOO4SBXZe+A3y3z8CWDdyMQZY6Xc/+U/msRNX OVNpK4ARgTfuhkU3WQIj83YU= Received: from localhost (localhost [local]) by localhost (OpenSMTPD) with ESMTPA id 14605114; Sat, 2 Dec 2023 00:30:02 +0000 (UTC) From: Tomas Volf <~@wolfsden.cz> Date: Sat, 2 Dec 2023 01:28:57 +0100 Message-ID: <9a33bc543d1ef38d2fa8333b14c74a86815efe52.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 * 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 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