From patchwork Sat Jun 24 19:27:31 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Timotej Lazar X-Patchwork-Id: 51264 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 358EA27BBE9; Sat, 24 Jun 2023 20:28:21 +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=-2.7 required=5.0 tests=BAYES_00,DKIM_INVALID, DKIM_SIGNED,MAILING_LIST_MULTI,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 EFADC27BBE2 for ; Sat, 24 Jun 2023 20:28:19 +0100 (BST) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1qD8vU-0007Cp-25; Sat, 24 Jun 2023 15:28:04 -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 1qD8vS-0007CQ-GF for guix-patches@gnu.org; Sat, 24 Jun 2023 15:28:02 -0400 Received: from debbugs.gnu.org ([209.51.188.43]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1qD8vS-0007Lp-5y for guix-patches@gnu.org; Sat, 24 Jun 2023 15:28:02 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1qD8vS-0002yz-23 for guix-patches@gnu.org; Sat, 24 Jun 2023 15:28:02 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#64273] [PATCH 1/2] gnu: qbittorrent: Update to 4.5.4. Resent-From: Timotej Lazar Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Sat, 24 Jun 2023 19:28:02 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 64273 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 64273@debbugs.gnu.org Cc: Timotej Lazar Received: via spool by 64273-submit@debbugs.gnu.org id=B64273.168763486211428 (code B ref 64273); Sat, 24 Jun 2023 19:28:02 +0000 Received: (at 64273) by debbugs.gnu.org; 24 Jun 2023 19:27:42 +0000 Received: from localhost ([127.0.0.1]:41540 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1qD8v8-0002yF-0S for submit@debbugs.gnu.org; Sat, 24 Jun 2023 15:27:42 -0400 Received: from araneo.si ([90.157.193.204]:40460) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1qD8v4-0002y6-Uj for 64273@debbugs.gnu.org; Sat, 24 Jun 2023 15:27:40 -0400 Received: from araneo.si (localhost.lan [127.0.0.1]) by araneo.si (OpenSMTPD) with ESMTP id a16a558b for <64273@debbugs.gnu.org>; Sat, 24 Jun 2023 19:27:38 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha1; c=relaxed; d=araneo.si; h=from:to:cc :subject:date:message-id:in-reply-to:references:mime-version :content-transfer-encoding; s=20180623; bh=jn2DUTvyFJag8vg9QnmXm LW0uj0=; b=Gr4mgUE3HDI9871oplxvP/eZAVIb9gK4yCVSKkoWsqz1nWbPDymPa qE76/c9nK9AN2PezyekLoKp2U/Q+5+hvBsmBSswWD1O/4OXxlN78Qvrly0AXHDmG GyZV7OfCGHI22nx7XyrzE5VNsB1C4/fBOafL3zYhPl8G4Z7C9Fa4HPss4JTm+pUs YTxnjaQABSyQ0TB5LGeG7HzPRr6vutTWED2SE5sN1Uk1C9hFfcHzhZGjaGN1pDYr tCUjJ5TGVq9qrn5ywWoOFk4p85kwpMt1fpk46WzLsZXDndXCgyxAIy2LPGwlo/+7 4XuNh6MqdHDidDCQlWZbhn0nFwH/V779Q== Received: by araneo.si (OpenSMTPD) with ESMTPSA id 5245d9c2 (TLSv1.3:TLS_AES_256_GCM_SHA384:256:NO); Sat, 24 Jun 2023 19:27:37 +0000 (UTC) From: Timotej Lazar Date: Sat, 24 Jun 2023 21:27:31 +0200 Message-Id: <93646cf1d518a4f8d6a8818cdfda4971c1d93f62.1687634693.git.timotej.lazar@araneo.si> X-Mailer: git-send-email 2.40.1 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.5.4. --- 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 38e959b884..3e40720730 100644 --- a/gnu/packages/bittorrent.scm +++ b/gnu/packages/bittorrent.scm @@ -451,7 +451,7 @@ (define-public libtorrent-rasterbar (define-public qbittorrent (package (name "qbittorrent") - (version "4.5.2") + (version "4.5.4") (source (origin (method git-fetch) @@ -460,7 +460,7 @@ (define-public qbittorrent (commit (string-append "release-" version)))) (file-name (git-file-name name version)) (sha256 - (base32 "07s0ypkd1zzkw9qhfwxxx7s6zizjz0448al17xmc1b48phn46hjk")))) + (base32 "1r4vqlwmvg7b0ibq53m7ascyykv3v66qxlwfi0zmmi1ig7rlkxkk")))) (build-system gnu-build-system) (arguments `(#:configure-flags From patchwork Sat Jun 24 19:27:32 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Timotej Lazar X-Patchwork-Id: 51263 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 2513327BBE9; Sat, 24 Jun 2023 20:28:18 +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=-2.7 required=5.0 tests=BAYES_00,DKIM_INVALID, DKIM_SIGNED,MAILING_LIST_MULTI,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 498AD27BBE2 for ; Sat, 24 Jun 2023 20:28:15 +0100 (BST) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1qD8vU-0007D9-8r; Sat, 24 Jun 2023 15:28:04 -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 1qD8vS-0007CZ-RW for guix-patches@gnu.org; Sat, 24 Jun 2023 15:28:02 -0400 Received: from debbugs.gnu.org ([209.51.188.43]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1qD8vS-0007ME-JS for guix-patches@gnu.org; Sat, 24 Jun 2023 15:28:02 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1qD8vS-0002z8-Fg for guix-patches@gnu.org; Sat, 24 Jun 2023 15:28:02 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#64273] [PATCH 2/2] gnu: qbittorrent{, -nox}: Use qt-build-system. Resent-From: Timotej Lazar Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Sat, 24 Jun 2023 19:28:02 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 64273 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 64273@debbugs.gnu.org Cc: Timotej Lazar Received: via spool by 64273-submit@debbugs.gnu.org id=B64273.168763486611444 (code B ref 64273); Sat, 24 Jun 2023 19:28:02 +0000 Received: (at 64273) by debbugs.gnu.org; 24 Jun 2023 19:27:46 +0000 Received: from localhost ([127.0.0.1]:41542 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1qD8vC-0002yV-BT for submit@debbugs.gnu.org; Sat, 24 Jun 2023 15:27:46 -0400 Received: from araneo.si ([90.157.193.204]:40460) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1qD8v7-0002y6-71 for 64273@debbugs.gnu.org; Sat, 24 Jun 2023 15:27:45 -0400 Received: from araneo.si (localhost.lan [127.0.0.1]) by araneo.si (OpenSMTPD) with ESMTP id 8f7aa517 for <64273@debbugs.gnu.org>; Sat, 24 Jun 2023 19:27:40 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha1; c=relaxed; d=araneo.si; h=from:to:cc :subject:date:message-id:in-reply-to:references:mime-version :content-type:content-transfer-encoding; s=20180623; bh=FqBlsp1s UJGLIOlzFbDmcmBxIP0=; b=ufIoEj8xR8X/bwSBXLbLQEPbb7mYPbFiqEk59m5e Cin99FXJYYhEvjJE/POZHJAlN9K7MGU+q7ceMn4dPrXfx8qAYa/luzLI5nbKbkQE vNSjPRsXPypJCc1YOSjVWtCluRgZGEGm2MHYHDBjOR2EpchjHFYYAFVNRNoszV2C RuT/RkTL5KbhX/ZC6W+UwevCqrugpM7t2v6K4eEBnDFDmGWgK9yQHCIDmDfPyzA5 vZI/jcOAMsiHfGQXEq7CDN+by/JulOpVjOYO7JJG6Y+MQv8O+COrc7RdwWFxaqoO X5OmbL2fq9o271kI5/pSAnhiQJmzgGYeaTjpNUJVdCp+fQ== Received: by araneo.si (OpenSMTPD) with ESMTPSA id 97fd8b34 (TLSv1.3:TLS_AES_256_GCM_SHA384:256:NO); Sat, 24 Jun 2023 19:27:39 +0000 (UTC) From: Timotej Lazar Date: Sat, 24 Jun 2023 21:27:32 +0200 Message-Id: <337b77fbfc4edb4f4cf05fc5638a73d9b2cc2a8d.1687634693.git.timotej.lazar@araneo.si> X-Mailer: git-send-email 2.40.1 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 CMake is now upstream’s preferred build system. * gnu/packages/bittorrent.scm (qbittorrent)[build-system]: Use qt-build-system. [arguments]: Drop custom wrap phase. (Re-)enable tests. [inputs]: Remove input labels. Drop qtbase-5. [native-inputs]: Drop pkg-config. (qbittorrent-nox)[arguments]: Adjust configure-flags. Keep the wrap-qt phase since the non-GUI version is also a QT program. --- gnu/packages/bittorrent.scm | 44 ++++++++++--------------------------- 1 file changed, 12 insertions(+), 32 deletions(-) diff --git a/gnu/packages/bittorrent.scm b/gnu/packages/bittorrent.scm index 3e40720730..0495d2dc6a 100644 --- a/gnu/packages/bittorrent.scm +++ b/gnu/packages/bittorrent.scm @@ -40,6 +40,7 @@ (define-module (gnu packages bittorrent) #:use-module (guix build-system cmake) #:use-module (guix build-system gnu) #:use-module (guix build-system python) + #:use-module (guix build-system qt) #:use-module (guix build-system glib-or-gtk) #:use-module ((guix licenses) #:prefix l:) #:use-module (guix gexp) @@ -461,36 +462,19 @@ (define-public qbittorrent (file-name (git-file-name name version)) (sha256 (base32 "1r4vqlwmvg7b0ibq53m7ascyykv3v66qxlwfi0zmmi1ig7rlkxkk")))) - (build-system gnu-build-system) + (build-system qt-build-system) (arguments - `(#:configure-flags - (list (string-append "--with-boost-libdir=" - (assoc-ref %build-inputs "boost") - "/lib") - "--enable-debug" - "QMAKE_LRELEASE=lrelease") - #:modules ((guix build gnu-build-system) - (guix build qt-utils) - (guix build utils)) - #:imported-modules (,@%gnu-build-system-modules - (guix build qt-utils)) - #:phases - (modify-phases %standard-phases - (add-after 'install 'wrap-qt - (lambda* (#:key outputs inputs #:allow-other-keys) - (let ((out (assoc-ref outputs "out"))) - (wrap-qt-program "qbittorrent" #:output out #:inputs inputs)) - #t))))) + (list #:configure-flags #~(list "-DTESTING=ON") + #:test-target "check")) (native-inputs - (list pkg-config qttools-5)) + (list qttools-5)) (inputs - `(("boost" ,boost) - ("libtorrent-rasterbar" ,libtorrent-rasterbar) - ("openssl" ,openssl) - ("python" ,python-wrapper) - ("qtbase" ,qtbase-5) - ("qtsvg-5" ,qtsvg-5) - ("zlib" ,zlib))) + (list boost + libtorrent-rasterbar + openssl + python-wrapper + qtsvg-5 + zlib)) (home-page "https://www.qbittorrent.org/") (synopsis "Graphical BitTorrent client") (description @@ -510,11 +494,7 @@ (define-public qbittorrent-nox (arguments (substitute-keyword-arguments (package-arguments base) ((#:configure-flags configure-flags) - #~(append #$configure-flags - (list "--disable-gui"))) - ((#:phases phases) - #~(modify-phases #$phases - (delete 'wrap-qt))))) + #~(cons "-DGUI=OFF" #$configure-flags)))) (inputs (modify-inputs (package-inputs base) (delete "qtsvg-5"))))))