From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mp11.migadu.com ([2001:41d0:2:bcc0::]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) by ms9.migadu.com with LMTPS id IIs6BtFDl2QiAwAASxT56A (envelope-from ) for ; Sat, 24 Jun 2023 21:28:17 +0200 Received: from aspmx1.migadu.com ([2001:41d0:2:bcc0::]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) by mp11.migadu.com with LMTPS id uJVCBtFDl2RqYwEA9RJhRA (envelope-from ) for ; Sat, 24 Jun 2023 21:28:17 +0200 Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by aspmx1.migadu.com (Postfix) with ESMTPS id ECFD933AF3 for ; Sat, 24 Jun 2023 21:28:16 +0200 (CEST) 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 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit 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+larch=yhetil.org@gnu.org Sender: guix-patches-bounces+larch=yhetil.org@gnu.org X-Migadu-Country: US X-Migadu-Flow: FLOW_IN ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=yhetil.org; s=key1; t=1687634897; h=from:from:sender:sender:reply-to:subject:subject:date:date: message-id:message-id:to:to:cc:cc:mime-version:mime-version: content-type:content-type: content-transfer-encoding:content-transfer-encoding:resent-cc: resent-from:resent-sender:resent-message-id:in-reply-to:in-reply-to: references:references:list-id:list-help:list-unsubscribe: list-subscribe:list-post:dkim-signature; bh=0jBEN0U+HQBiyeTsd2OQoIip9Bbg2wcI34u4xF9IWgI=; b=tVIYenM40cFi2qIInE755AcLAHHUwh3g1vyi15hEbw7nWwJ6CXitSwcM6znCReMjpp2ZRP grtwgThlCS4EfwOhPdNyOtlr+wCdmZbwsHa1Mkest2FIN/ERCI5JIq141Jh/mvEM5OJWmQ 0sidaWoXPIZFolHWTJzFP035e6qnycWYtoDhJ7S8//DYz6IGxbikd5SZ4WmnKn8tPqkouL GHMOzgCs5nKOpM6N1iWYoL70ygmI8T2RAL6eRb6JS//sLjX3PAh8/natmTZeiqWgTpd9al FPvltub6OLf3dkaQAuqT962HQkQFQoTJ9KwhEz/yTmUHkhNhOHeLEYtp2GKdVA== ARC-Authentication-Results: i=1; aspmx1.migadu.com; dkim=fail ("headers rsa verify failed") header.d=araneo.si header.s=20180623 header.b=ufIoEj8x; dmarc=fail reason="SPF not aligned (relaxed)" header.from=araneo.si (policy=none); spf=pass (aspmx1.migadu.com: domain of "guix-patches-bounces+larch=yhetil.org@gnu.org" designates 209.51.188.17 as permitted sender) smtp.mailfrom="guix-patches-bounces+larch=yhetil.org@gnu.org" ARC-Seal: i=1; s=key1; d=yhetil.org; t=1687634897; a=rsa-sha256; cv=none; b=BQZ4CmPhoXvB9thvKXEXtzUDu9XF/NdqbukbHsbjpaH/yAZUPblOywPZcyv7RyinUZD1pW GFMIu1l93C37839tOSQee9VdyDVEmyELcweU5OoTYyfRBe6TdNS5ln1gweowtcE/I8M36m WItg/FGtw3HtqxGvH4x+jgsu+o2Qu/weZFk301Kk7ZKURpG0cJLUU3vFgjRSKQAvsCix7e 3+0i/M4GNAzlQaJRhudmtSr8r3J6KPLuirpUdqYGcDtkALzwOdDxK3quXAkMM3eFWL5fIb Km2A7zARXymESEtqjYUIqbtfCQV9qJFG6BZ1c135k9ki51M9wRJScgwHislg+g== X-Migadu-Scanner: scn1.migadu.com X-Migadu-Spam-Score: 0.35 Authentication-Results: aspmx1.migadu.com; dkim=fail ("headers rsa verify failed") header.d=araneo.si header.s=20180623 header.b=ufIoEj8x; dmarc=fail reason="SPF not aligned (relaxed)" header.from=araneo.si (policy=none); spf=pass (aspmx1.migadu.com: domain of "guix-patches-bounces+larch=yhetil.org@gnu.org" designates 209.51.188.17 as permitted sender) smtp.mailfrom="guix-patches-bounces+larch=yhetil.org@gnu.org" X-Migadu-Queue-Id: ECFD933AF3 X-Spam-Score: 0.35 X-TUID: idBLujxiSxVP 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")))))) -- 2.40.1