GNU bug report logs - #66103
[PATCH] gnu: keepassxc: Update to 2.7.6.

Previous Next

To add a comment to this bug, you must first unarchive it, by sending
a message to control AT debbugs.gnu.org, with unarchive 66103 in the body.
You can then email your comments to 66103 AT debbugs.gnu.org in the normal way.

Toggle the display of automated, internal messages from the tracker.

Message #5 received at submit <at> debbugs.gnu.org (full text, mbox):

From: Timotej Lazar <timotej.lazar <at> araneo.si>
To: guix-patches <at> gnu.org
Cc: Timotej Lazar <timotej.lazar <at> araneo.si>
Subject: [PATCH] gnu: keepassxc: Update to 2.7.6.
Date: Tue, 19 Sep 2023 16:40:53 +0200

* 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

Message #8 received at 66103 <at> debbugs.gnu.org (full text, mbox):

From: Bruno Victal <mirai <at> makinata.eu>
To: Timotej Lazar <timotej.lazar <at> araneo.si>
Cc: 66103 <at> debbugs.gnu.org
Subject: Re: bug#66103: [PATCH] gnu: keepassxc: Update to 2.7.6.
Date: Wed, 20 Sep 2023 18:26:42 +0100

Hi Timotej,

Timotej Lazar <timotej.lazar <at> araneo.si> writes:
> @@ -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")))))))

Can you confirm if this is still necessary?
I see that upstream has this commit [1] that suggests the issue has
already been fixed?


[1]: <https://github.com/keepassxreboot/keepassxc/commit/bb4f5c2e9427da591504cebeae8ecbb54c1da655> 

-- 
Thanks,
Bruno.

Message #11 received at 66103 <at> debbugs.gnu.org (full text, mbox):

From: Timotej Lazar <timotej.lazar <at> araneo.si>
To: Bruno Victal <mirai <at> makinata.eu>
Cc: 66103 <at> debbugs.gnu.org
Subject: Re: [bug#66103] [PATCH] gnu: keepassxc: Update to 2.7.6.
Date: Thu, 21 Sep 2023 08:41:48 +0200

Bruno Victal <mirai <at> makinata.eu> [2023-09-20 18:26:42+0100]:
> Timotej Lazar <timotej.lazar <at> araneo.si> writes:
>> @@ -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")))))))
>
> Can you confirm if this is still necessary?
> I see that upstream has this commit [1] that suggests the issue has
> already been fixed?

The test still fails. I tried setting QT_QPA_PLATFORM as mentioned in
the comment to no effect. The test also fails in a different way without
a writable HOME, but after setting it I got the message in the comment.

Thanks for the review!

Message #14 received at 66103 <at> debbugs.gnu.org (full text, mbox):

From: Timotej Lazar <timotej.lazar <at> araneo.si>
To: 66103 <at> debbugs.gnu.org
Cc: mirai <at> makinata.eu, Timotej Lazar <timotej.lazar <at> araneo.si>
Subject: [PATCH v2] gnu: keepassxc: Switch to qt-build-system.
Date: Sat, 23 Sep 2023 15:14:36 +0200

* 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

Message #19 received at 66103-done <at> debbugs.gnu.org (full text, mbox):

From: Efraim Flashner <efraim <at> flashner.co.il>
To: Timotej Lazar <timotej.lazar <at> araneo.si>
Cc: 66103-done <at> debbugs.gnu.org, mirai <at> makinata.eu
Subject: Re: [bug#66103] [PATCH v2] gnu: keepassxc: Switch to qt-build-system.
Date: Thu, 28 Sep 2023 19:36:10 +0300

[Message part 1 (text/plain, inline)]

Thanks. Patch pushed!

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

[signature.asc (application/pgp-signature, inline)]

Previous Next

GNU bug tracking system
Copyright (C) 1999 Darren O. Benham, 1997,2003 nCipher Corporation Ltd, 1994-97 Ian Jackson.