From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mp10.migadu.com ([2001:41d0:306:2d92::]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) by ms9.migadu.com with LMTPS id KIAtKlXlDmUt9gAAG6o9tA:P1 (envelope-from ) for ; Sat, 23 Sep 2023 15:17:09 +0200 Received: from aspmx1.migadu.com ([2001:41d0:306:2d92::]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) by mp10.migadu.com with LMTPS id KIAtKlXlDmUt9gAAG6o9tA (envelope-from ) for ; Sat, 23 Sep 2023 15:17:09 +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 5D8713F1A2 for ; Sat, 23 Sep 2023 15:17:09 +0200 (CEST) Authentication-Results: aspmx1.migadu.com; dkim=fail ("headers rsa verify failed") header.d=araneo.si header.s=20230811 header.b=ThX4ZOdf; 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"; dmarc=fail reason="SPF not aligned (relaxed)" header.from=araneo.si (policy=none) ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=yhetil.org; s=key1; t=1695475029; 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=YZMEqs7td1q+lgS+OdxHD5vSbjPrWrPIrBqCCi7Psbs=; b=FtngHVTPqYAErDQxrqhuRVoeKwuFjaRFL8jvR4/jfX2+OFuJgh5RBNidMT871wRwppkiSA 8JcIKG2TifZ+6+TA+XEHW+KS+CzsI4u1Vhgp+xcVk8xEtzvVxtBtxOvIScbDlqGJDtIc+J 7LoFe6xvItOC8b9Z0ChFKuphTZNE8E3a6iE22ptOg+mVHUH3oBNw77zrQDKYNhXKoWD3l7 UGurfbaWnW3om+XcPYSNUWdcYAkElFGX9ZQMTHKqh+1D9KkO2/krQ+IDJ4nayhCku+nQlJ XnLN2OVnc+VEzvK7aGpFn7UD59hXYTuoITYl8kK9MxEyPG0S6d94xfmDzviEEg== ARC-Authentication-Results: i=1; aspmx1.migadu.com; dkim=fail ("headers rsa verify failed") header.d=araneo.si header.s=20230811 header.b=ThX4ZOdf; 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"; dmarc=fail reason="SPF not aligned (relaxed)" header.from=araneo.si (policy=none) ARC-Seal: i=1; s=key1; d=yhetil.org; t=1695475029; a=rsa-sha256; cv=none; b=kS45SoOvdq4D502sd54akpA3ySjo7ESTDOEM4OtY5T/QkvGlZg27bDZ0YyRkPKBHajdlhZ hPREYqSSpfcUTsN2vYAIlDi/EBYr/VSyHej6cmC0qjrMlErQ/4Gec6qnLKXN3LrAhIGK3x Fh9Dcw87l+X6kOGTZy0bvhGrhLodXlGtXljhFXZNDTJxbIwGy/xYTzT070s3UQVGjxkwbP zGK0X7kzDcXySreD5xiNDnrciLqt3vGqAhnlbfy+o0O+3fH0nbpJP531xAVKGCn/YwbE4d vLuA+ZEqVHf6sLubuAKhrs3tGpkejq9tyYu3325fBpSdMjDOHartsw3/0vrrQQ== Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1qk2VA-0005ub-Lh; Sat, 23 Sep 2023 09:16:52 -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 1qk2V8-0005uA-Qs for guix-patches@gnu.org; Sat, 23 Sep 2023 09:16:50 -0400 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 1qk2V8-0006KN-I4 for guix-patches@gnu.org; Sat, 23 Sep 2023 09:16:50 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1qk2VJ-0005fU-Mt for guix-patches@gnu.org; Sat, 23 Sep 2023 09:17:01 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#66103] [PATCH v2] gnu: keepassxc: Switch to qt-build-system. References: <20230919144138.5269-1-timotej.lazar@araneo.si> In-Reply-To: <20230919144138.5269-1-timotej.lazar@araneo.si> Resent-From: Timotej Lazar Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Sat, 23 Sep 2023 13:17:01 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 66103 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 66103@debbugs.gnu.org Cc: mirai@makinata.eu, Timotej Lazar Received: via spool by 66103-submit@debbugs.gnu.org id=B66103.169547500521757 (code B ref 66103); Sat, 23 Sep 2023 13:17:01 +0000 Received: (at 66103) by debbugs.gnu.org; 23 Sep 2023 13:16:45 +0000 Received: from localhost ([127.0.0.1]:37984 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1qk2V3-0005eq-AF for submit@debbugs.gnu.org; Sat, 23 Sep 2023 09:16:45 -0400 Received: from static.51.243.21.65.clients.your-server.de ([65.21.243.51]:53198 helo=araneo.si) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1qk2V0-0005eb-8Q for 66103@debbugs.gnu.org; Sat, 23 Sep 2023 09:16:43 -0400 DKIM-Signature: v=1; a=rsa-sha256; c=simple/simple; s=20230811; bh=lNTUwL2++Jr coWYcy2P/qr+O+GWnS5SGexCQvv3gy6I=; h=date:subject:cc:to:from; d=araneo.si; b=ThX4ZOdfzXo1SMggDiBOlL3RGm1UReHK8BZhb1bJAbu9c3Dsfxk5dKM gq0dCh3ylWmkXq6Sylks5+2djof9hZV8AVXM9jFABomu/tmFwZOTgSDoKDJN0cihr7qwhD M6kJY6XFL3aXRS9yiKTwIRNrs5aMNWjT4Jas+5NOuZzBlM= Received: by araneo.si (OpenSMTPD) with ESMTPSA id e4fbe9ad (TLSv1.3:TLS_AES_256_GCM_SHA384:256:NO); Sat, 23 Sep 2023 13:16:27 +0000 (UTC) From: Timotej Lazar Date: Sat, 23 Sep 2023 15:14:36 +0200 Message-ID: <20230923131622.22200-1-timotej.lazar@araneo.si> X-Mailer: git-send-email 2.41.0 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-Flow: FLOW_IN X-Migadu-Country: US X-Migadu-Spam-Score: -4.10 X-Migadu-Scanner: mx2.migadu.com X-Migadu-Queue-Id: 5D8713F1A2 X-Spam-Score: -4.10 X-TUID: ysT9Q7HEmJvo * gnu/packages/password-utils.scm (keepassxc): Use qt-build-system. [build-system]: Switch to qt-build-system. [arguments]: Drop superfluous phase and modules. [inputs]: Drop qtbase-5. --- The package was updated on master, so I’m sending just the build-system change. Workaround for the failing test is still necessary. gnu/packages/password-utils.scm | 14 +++----------- 1 file changed, 3 insertions(+), 11 deletions(-) diff --git a/gnu/packages/password-utils.scm b/gnu/packages/password-utils.scm index be85898c41..9e9e48c1f5 100644 --- a/gnu/packages/password-utils.scm +++ b/gnu/packages/password-utils.scm @@ -63,6 +63,7 @@ (define-module (gnu packages password-utils) #:use-module (guix build-system gnu) #:use-module (guix build-system go) #:use-module (guix build-system python) + #:use-module (guix build-system qt) #:use-module (guix build-system trivial) #:use-module (guix download) #:use-module (guix gexp) @@ -154,14 +155,9 @@ (define-public keepassxc version "-src.tar.xz")) (sha256 (base32 "0w6nh2lnzfqcxasfsppmh4q309p1flzgfiv25hahzsd8kx879055")))) - (build-system cmake-build-system) + (build-system qt-build-system) (arguments (list - #:modules '((guix build cmake-build-system) - (guix build qt-utils) - (guix build utils)) - #:imported-modules `(,@%cmake-build-system-modules - (guix build qt-utils)) #:configure-flags #~(append (list "-DWITH_XC_ALL=YES" @@ -178,10 +174,7 @@ (define-public keepassxc ;; Fails with "TestCli::testClip() Compared values are not the ;; same". That test also requires a phase with (setenv ;; "QT_QPA_PLATFORM" "offscreen") in order to work. - (invoke "ctest" "--exclude-regex" "testcli")))) - (add-after 'install 'wrap-qt - (lambda* (#:key inputs #:allow-other-keys) - (wrap-qt-program "keepassxc" #:output #$output #:inputs inputs)))))) + (invoke "ctest" "--exclude-regex" "testcli"))))))) (native-inputs (append (list qttools-5) @@ -201,7 +194,6 @@ (define-public keepassxc minizip pcsc-lite qrencode - qtbase-5 qtsvg-5 qtwayland-5 qtx11extras -- 2.41.0