Subject: bug#66103: closed (Re: [bug#66103] [PATCH v2] gnu: keepassxc: Switch to qt-build-system.)

From: [email-masked] (GNU bug Tracking System)
Date: Thu, 28 Sep 2023 16:37:04 +0000

Your bug report

#66103: [PATCH] gnu: keepassxc: Update to 2.7.6.

which was filed against the guix-patches package, has been closed.

The explanation is attached below, along with your original report.
If you require more details, please reply to [email-masked].

-- 
66103: https://debbugs.gnu.org/cgi/bugreport.cgi?bug=66103
GNU Bug Tracking System
Contact [email-masked] with problems

Subject: Re: [bug#66103] [PATCH v2] gnu: keepassxc: Switch to qt-build-system.
From: Efraim Flashner <[email-masked]>
To: Timotej Lazar <[email-masked]>
Cc: [email-masked], [email-masked]
Date: Thu, 28 Sep 2023 19:36:10 +0300
List-Id: <debbugs-submit.debbugs.gnu.org>

Thanks. Patch pushed!

-- 
Efraim Flashner   <[email-masked]>   רנשלפ םירפא
GPG key = A28B F40C 3E55 1372 662D  14F7 41AA E7DC CA3D 8351
Confidentiality cannot be guaranteed on emails sent or received unencrypted

Subject: [PATCH] gnu: keepassxc: Update to 2.7.6.
From: Timotej Lazar <[email-masked]>
To: [email-masked]
Cc: Timotej Lazar <[email-masked]>
Date: Tue, 19 Sep 2023 16:40:53 +0200
List-Id: <debbugs-submit.debbugs.gnu.org>

* 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
-- 
2.41.0