* [bug#68984] [PATCH 0/2] Update qtpass.
@ 2024-02-07 21:17 Timotej Lazar
2024-02-07 21:23 ` [bug#68984] [PATCH 1/2] gnu: qtpass: Update to 1.4.0 Timotej Lazar
` (2 more replies)
0 siblings, 3 replies; 4+ messages in thread
From: Timotej Lazar @ 2024-02-07 21:17 UTC (permalink / raw)
To: 68984; +Cc: Timotej Lazar
This updates qtpass to latest release and simplifies the package a bit
by using qt-build-system. Even without the 'reset-resource-timestamps
the build appears reproducible with `guix build --check --rounds=3`.
Timotej Lazar (2):
gnu: qtpass: Update to 1.4.0.
gnu: qtpass: Switch to qt-build-system and new package style.
gnu/packages/password-utils.scm | 84 +++++++++++----------------------
1 file changed, 28 insertions(+), 56 deletions(-)
base-commit: cce7a6d2d2b18f51d1fcab67b02a38c11d6f4f2d
--
2.41.0
^ permalink raw reply [flat|nested] 4+ messages in thread
* [bug#68984] [PATCH 1/2] gnu: qtpass: Update to 1.4.0.
2024-02-07 21:17 [bug#68984] [PATCH 0/2] Update qtpass Timotej Lazar
@ 2024-02-07 21:23 ` Timotej Lazar
2024-02-07 21:23 ` [bug#68984] [PATCH 2/2] gnu: qtpass: Switch to qt-build-system and new package style Timotej Lazar
2024-02-13 12:24 ` [bug#68984] [PATCH 0/2] Update qtpass Christopher Baines
2 siblings, 0 replies; 4+ messages in thread
From: Timotej Lazar @ 2024-02-07 21:23 UTC (permalink / raw)
To: 68984; +Cc: Timotej Lazar
* gnu/packages/password-utils.scm (qtpass): Update to 1.4.0.
Change-Id: Ia0d29a0044b8bfedef692aba337d1ef23c672804
---
gnu/packages/password-utils.scm | 5 ++---
1 file changed, 2 insertions(+), 3 deletions(-)
diff --git a/gnu/packages/password-utils.scm b/gnu/packages/password-utils.scm
index 6dc257dc0e..0f88fab2d9 100644
--- a/gnu/packages/password-utils.scm
+++ b/gnu/packages/password-utils.scm
@@ -852,7 +852,7 @@ (define-public pass-otp
(define-public qtpass
(package
(name "qtpass")
- (version "1.3.2")
+ (version "1.4.0")
(source
(origin
(method git-fetch)
@@ -861,8 +861,7 @@ (define-public qtpass
(commit (string-append "v" version))))
(file-name (git-file-name name version))
(sha256
- (base32
- "0748hjvhjrybi33ci3c8hcr74k9pdrf5jv8npf9hrsrmdyy1kr9x"))))
+ (base32 "10ixahm4ap0l1rrz4cyswblm22ns9z1baf5lv3dn23wprfdcp8m0"))))
(build-system gnu-build-system)
(arguments
`(#:modules ((guix build gnu-build-system)
--
2.41.0
^ permalink raw reply related [flat|nested] 4+ messages in thread
* [bug#68984] [PATCH 2/2] gnu: qtpass: Switch to qt-build-system and new package style.
2024-02-07 21:17 [bug#68984] [PATCH 0/2] Update qtpass Timotej Lazar
2024-02-07 21:23 ` [bug#68984] [PATCH 1/2] gnu: qtpass: Update to 1.4.0 Timotej Lazar
@ 2024-02-07 21:23 ` Timotej Lazar
2024-02-13 12:24 ` [bug#68984] [PATCH 0/2] Update qtpass Christopher Baines
2 siblings, 0 replies; 4+ messages in thread
From: Timotej Lazar @ 2024-02-07 21:23 UTC (permalink / raw)
To: 68984; +Cc: Timotej Lazar
* gnu/packages/password-utils.scm (qtpass): Use qt-build-system.
[arguments]: Drop 'wrap-qt and 'check-setup phases. Drop the unnecessary
'reset-resource-timestamps phase. Use new package style for remaining phases.
[inputs]: Drop qtbase-5.
Change-Id: I23a0b8dfd1fdfeca343704d3df084c522b319d30
---
gnu/packages/password-utils.scm | 79 +++++++++++----------------------
1 file changed, 26 insertions(+), 53 deletions(-)
diff --git a/gnu/packages/password-utils.scm b/gnu/packages/password-utils.scm
index 0f88fab2d9..1547acf1be 100644
--- a/gnu/packages/password-utils.scm
+++ b/gnu/packages/password-utils.scm
@@ -862,63 +862,36 @@ (define-public qtpass
(file-name (git-file-name name version))
(sha256
(base32 "10ixahm4ap0l1rrz4cyswblm22ns9z1baf5lv3dn23wprfdcp8m0"))))
- (build-system gnu-build-system)
+ (build-system qt-build-system)
(arguments
- `(#:modules ((guix build gnu-build-system)
- (guix build qt-utils)
- (guix build utils))
- #:imported-modules (,@%gnu-build-system-modules
- (guix build qt-utils))
- #:phases
- (modify-phases %standard-phases
- (replace 'configure
- (lambda* (#:key inputs outputs #:allow-other-keys)
- (let ((out (assoc-ref outputs "out")))
- ;; lupdate/lrelease need to find qmake.
- (setenv "QMAKE" "qmake")
- ;; qmake needs to find lrelease/lupdate.
- (invoke "qmake"
- "QMAKE_LRELEASE=lrelease"
- "QMAKE_LUPDATE=lupdate"
- (string-append "PREFIX=" out)))))
- (add-after 'configure 'reset-resource-timestamps
- ;; Reset timestamps on localization files for a reproducible build.
- (lambda _
- (with-directory-excursion "localization"
- (for-each (lambda (file)
- (let* ((base (basename file ".qm"))
- (src (string-append base ".ts"))
- (st (stat src)))
- (set-file-time file st)))
- (find-files "." ".*\\.qm")))
- #t))
- (add-after 'install 'install-auxilliary
- ;; Install man-page, icon and .desktop file.
- (lambda* (#:key inputs outputs #:allow-other-keys)
- (let* ((out (assoc-ref outputs "out"))
- (applications (string-append out "/share/applications"))
- (icons (string-append out "/share/icons/hicolor/scalable/apps"))
- (man (string-append out "/share/man/man1")))
- (install-file "qtpass.desktop" applications)
- (install-file "artwork/icon.svg" icons)
- (rename-file (string-append icons "/icon.svg")
- (string-append icons "/qtpass-icon.svg"))
- (install-file "qtpass.1" man)
- #t)))
- (add-after 'install 'wrap-qt
- (lambda* (#:key outputs inputs #:allow-other-keys)
- (let ((out (assoc-ref outputs "out")))
- (wrap-qt-program "qtpass" #:output out #:inputs inputs))
- #t))
- (add-before 'check 'check-setup
- ;; Make Qt render "offscreen", required for tests.
- (lambda _
- (setenv "QT_QPA_PLATFORM" "offscreen")
- #t)))))
+ (list
+ #:test-target "check"
+ #:phases
+ #~(modify-phases %standard-phases
+ (replace 'configure
+ (lambda _
+ (invoke "qmake"
+ "QMAKE_LRELEASE=lrelease"
+ "QMAKE_LUPDATE=lupdate"
+ (string-append "PREFIX=" #$output))))
+ (add-before 'check 'pre-check
+ ;; Fontconfig needs a writable cache.
+ (lambda _ (setenv "HOME" "/tmp")))
+ (add-after 'install 'install-auxilliary
+ ;; Install man-page, icon and .desktop file.
+ (lambda _
+ (let ((applications (string-append #$output "/share/applications"))
+ (icons (string-append #$output "/share/icons/hicolor/scalable/apps"))
+ (man (string-append #$output "/share/man/man1")))
+ (install-file "qtpass.desktop" applications)
+ (install-file "artwork/icon.svg" icons)
+ (rename-file (string-append icons "/icon.svg")
+ (string-append icons "/qtpass-icon.svg"))
+ (install-file "qtpass.1" man)))))))
(native-inputs
(list qttools-5))
(inputs
- (list qtbase-5 qtsvg-5))
+ (list qtsvg-5))
(home-page "https://qtpass.org")
(synopsis "GUI for password manager password-store")
(description
--
2.41.0
^ permalink raw reply related [flat|nested] 4+ messages in thread
* [bug#68984] [PATCH 0/2] Update qtpass.
2024-02-07 21:17 [bug#68984] [PATCH 0/2] Update qtpass Timotej Lazar
2024-02-07 21:23 ` [bug#68984] [PATCH 1/2] gnu: qtpass: Update to 1.4.0 Timotej Lazar
2024-02-07 21:23 ` [bug#68984] [PATCH 2/2] gnu: qtpass: Switch to qt-build-system and new package style Timotej Lazar
@ 2024-02-13 12:24 ` Christopher Baines
2 siblings, 0 replies; 4+ messages in thread
From: Christopher Baines @ 2024-02-13 12:24 UTC (permalink / raw)
To: Timotej Lazar; +Cc: 68984-done, 68984
[-- Attachment #1: Type: text/plain, Size: 623 bytes --]
Timotej Lazar <timotej.lazar@araneo.si> writes:
> This updates qtpass to latest release and simplifies the package a bit
> by using qt-build-system. Even without the 'reset-resource-timestamps
> the build appears reproducible with `guix build --check --rounds=3`.
>
> Timotej Lazar (2):
> gnu: qtpass: Update to 1.4.0.
> gnu: qtpass: Switch to qt-build-system and new package style.
>
> gnu/packages/password-utils.scm | 84 +++++++++++----------------------
> 1 file changed, 28 insertions(+), 56 deletions(-)
Thanks for the patches, I've pushed these to master as
608b9a1c868c9ed4cdcd9c06b879b5c72880fa48.
Chris
[-- Attachment #2: signature.asc --]
[-- Type: application/pgp-signature, Size: 987 bytes --]
^ permalink raw reply [flat|nested] 4+ messages in thread
end of thread, other threads:[~2024-02-13 12:25 UTC | newest]
Thread overview: 4+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2024-02-07 21:17 [bug#68984] [PATCH 0/2] Update qtpass Timotej Lazar
2024-02-07 21:23 ` [bug#68984] [PATCH 1/2] gnu: qtpass: Update to 1.4.0 Timotej Lazar
2024-02-07 21:23 ` [bug#68984] [PATCH 2/2] gnu: qtpass: Switch to qt-build-system and new package style Timotej Lazar
2024-02-13 12:24 ` [bug#68984] [PATCH 0/2] Update qtpass Christopher Baines
Code repositories for project(s) associated with this external index
https://git.savannah.gnu.org/cgit/guix.git
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.