From patchwork Tue Sep 19 14:40:53 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Timotej Lazar X-Patchwork-Id: 54056 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 1994427BBE2; Tue, 19 Sep 2023 15:43:25 +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 49A9C27BBE9 for ; Tue, 19 Sep 2023 15:43:24 +0100 (BST) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1qibwI-00007x-Oq; Tue, 19 Sep 2023 10:42:58 -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 1qibwE-00006l-3e for guix-patches@gnu.org; Tue, 19 Sep 2023 10:42:54 -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 1qibwD-0001Iw-DR for guix-patches@gnu.org; Tue, 19 Sep 2023 10:42:53 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1qibwM-0000VC-6x for guix-patches@gnu.org; Tue, 19 Sep 2023 10:43:02 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#66103] [PATCH] gnu: keepassxc: Update to 2.7.6. Resent-From: Timotej Lazar Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Tue, 19 Sep 2023 14:43:01 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: report 66103 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 66103@debbugs.gnu.org Cc: Timotej Lazar X-Debbugs-Original-To: guix-patches@gnu.org Received: via spool by submit@debbugs.gnu.org id=B.16951345281861 (code B ref -1); Tue, 19 Sep 2023 14:43:01 +0000 Received: (at submit) by debbugs.gnu.org; 19 Sep 2023 14:42:08 +0000 Received: from localhost ([127.0.0.1]:57634 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1qibvU-0000Tw-Cg for submit@debbugs.gnu.org; Tue, 19 Sep 2023 10:42:08 -0400 Received: from lists.gnu.org ([2001:470:142::17]:33488) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1qibvR-0000TN-EE for submit@debbugs.gnu.org; Tue, 19 Sep 2023 10:42:07 -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 1qibvC-0008T8-Cf for guix-patches@gnu.org; Tue, 19 Sep 2023 10:41:50 -0400 Received: from static.51.243.21.65.clients.your-server.de ([65.21.243.51] helo=localhost) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1qibvA-00010Y-AU for guix-patches@gnu.org; Tue, 19 Sep 2023 10:41:49 -0400 DKIM-Signature: v=1; a=rsa-sha256; c=simple/simple; s=20230811; bh=2wN33GMNXkA S27li/zR+ksLe4P/HfzlR7f2+6FryF/s=; h=date:subject:cc:to:from; d=araneo.si; b=uyUY5rPLth70jlaOhncR35O/d5CNmM4rFDwzQC29alIiyxaqbJ0a6kl XV2/cndiRrteakM5PIZDaLt7nXzJSk/VaPf0OtKgVHS0L5CELL9fFXJfgIzMf5zZoosyJ2 BHvaYTYFHfFR9w2rzQmMJiA+XAVPbuCOOR1Luq4FdgKSS8= Received: by araneo.si (OpenSMTPD) with ESMTPSA id 6e5f3cb1 (TLSv1.3:TLS_AES_256_GCM_SHA384:256:NO); Tue, 19 Sep 2023 14:41:42 +0000 (UTC) From: Timotej Lazar Date: Tue, 19 Sep 2023 16:40:53 +0200 Message-ID: <20230919144138.5269-1-timotej.lazar@araneo.si> X-Mailer: git-send-email 2.41.0 MIME-Version: 1.0 Received-SPF: pass client-ip=65.21.243.51; envelope-from=timotej.lazar@araneo.si; helo=localhost X-Spam_score_int: 17 X-Spam_score: 1.7 X-Spam_bar: + X-Spam_report: (1.7 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, FSL_HELO_NON_FQDN_1=0.001, HELO_LOCALHOST=3.828, SPF_PASS=-0.001 autolearn=no autolearn_force=no X-Spam_action: no action 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/password-utils.scm (keepassxc): Update to 2.7.6. [build-system]: Switch to qt-build-system. [arguments]: Drop superfluous phase and modules. [inputs]: Drop qtbase-5. --- gnu/packages/password-utils.scm | 18 +++++------------- 1 file changed, 5 insertions(+), 13 deletions(-) diff --git a/gnu/packages/password-utils.scm b/gnu/packages/password-utils.scm index 753a29dcca..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) @@ -145,7 +146,7 @@ (define-public pwgen (define-public keepassxc (package (name "keepassxc") - (version "2.7.5") + (version "2.7.6") (source (origin (method url-fetch) @@ -153,15 +154,10 @@ (define-public keepassxc "/releases/download/" version "/keepassxc-" version "-src.tar.xz")) (sha256 - (base32 "03002fncllr658mgl5s6an5wnh0a333qnkxad6aw85hqj004iqpd")))) - (build-system cmake-build-system) + (base32 "0w6nh2lnzfqcxasfsppmh4q309p1flzgfiv25hahzsd8kx879055")))) + (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