[PATCH] gnu: keepassxc: Update to 2.7.6.

  • Done
  • quality assurance status badge
Details
3 participants
  • Efraim Flashner
  • Bruno Victal
  • Timotej Lazar
Owner
unassigned
Submitted by
Timotej Lazar
Severity
normal
T
T
Timotej Lazar wrote on 19 Sep 2023 16:40
(address . guix-patches@gnu.org)(name . Timotej Lazar)(address . timotej.lazar@araneo.si)
20230919144138.5269-1-timotej.lazar@araneo.si
* 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(-)

Toggle diff (61 lines)
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
B
B
Bruno Victal wrote on 20 Sep 2023 19:26
(name . Timotej Lazar)(address . timotej.lazar@araneo.si)(address . 66103@debbugs.gnu.org)
87o7hwzrfx.fsf@makinata.eu
Hi Timotej,

Timotej Lazar <timotej.lazar@araneo.si> writes:
Toggle quote (10 lines)
> @@ -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?



--
Thanks,
Bruno.
T
T
Timotej Lazar wrote on 21 Sep 2023 08:41
Re: [bug#66103] [PATCH] gnu: keepassxc: Update to 2.7.6.
(name . Bruno Victal)(address . mirai@makinata.eu)(address . 66103@debbugs.gnu.org)
87sf789ger.fsf@araneo.si
Bruno Victal <mirai@makinata.eu> [2023-09-20 18:26:42+0100]:
Toggle quote (15 lines)
> Timotej Lazar <timotej.lazar@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!
T
T
Timotej Lazar wrote on 23 Sep 2023 15:14
[PATCH v2] gnu: keepassxc: Switch to qt-build-system.
(address . 66103@debbugs.gnu.org)
20230923131622.22200-1-timotej.lazar@araneo.si
* 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(-)

Toggle diff (50 lines)
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
E
E
Efraim Flashner wrote on 28 Sep 2023 18:36
(name . Timotej Lazar)(address . timotej.lazar@araneo.si)
ZRWrer13YYgBLDSP@3900XT
Thanks. Patch pushed!

--
Efraim Flashner <efraim@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
-----BEGIN PGP SIGNATURE-----

iQIzBAABCAAdFiEEoov0DD5VE3JmLRT3Qarn3Mo9g1EFAmUVq3oACgkQQarn3Mo9
g1EFoRAAlmonr2v0YnGcSlSMZktKy/mTlytTvSMxTdkMdS/ejKZXxxt+fTQBCA1Q
Px8rwQbRcrdekpgP7iwmEaYbiYG1nyIVaEC/FpL1m526waK1PBGY/P0fpuTSDMPS
ZHSOq00Z7XbsbmflpDOSzmwr99Bn1Pbxjfe2FZIuK2jyyJPuAmX43b1EfkSea1ey
UuG4i+JYfth1bNwMAdxFjM/qAg5jcB5Ty9pIN/wb/gD2FnblMha30uGhErA6t8xg
O5uvdzvQSGIMh0XCqzV6clCKgAvRieZqT3WsBPWnURivSG6Q9PH7FtaUe71X1nGD
RxvfsUSMD1W0HjM/7mh5EA33zaKQSoRklRSjUjk+OXDvMKdSjzn6r/BHrfz4yWUr
9wfJt3c0MjsrdjfRil4ZNlaIvGiO3tDg20AqgMhuWs+aCgwW0AqFLZVFgo4N7aqj
YxCKKV65zyegrZqWUqzx0WHu6U2cHBm6v4Qep8VzaPjAkHgU8svPhuybIrLRMwyW
iH0/fUKkpfiNOyGSYZUUyHJ/trZf9kn37KLsgCFB8NU5tF4ESnYStMRaVhmm0umM
kJ9E6t+f0yWGvP1cU1sKo8flRg0Pwu1LGlajJp/G1BPEg015CJFcqDJDYeg+ri6i
h/BJL1juXgFD2j8W/LFgF9RtYyTtV1MNlXcgjMz6wIYBcOS4ExY=
=D2LZ
-----END PGP SIGNATURE-----


Closed
?