From unknown Sun Jun 22 07:30:05 2025 Content-Disposition: inline Content-Transfer-Encoding: quoted-printable MIME-Version: 1.0 X-Mailer: MIME-tools 5.509 (Entity 5.509) Content-Type: text/plain; charset=utf-8 From: bug#68984 <68984@debbugs.gnu.org> To: bug#68984 <68984@debbugs.gnu.org> Subject: Status: [PATCH 0/2] Update qtpass. Reply-To: bug#68984 <68984@debbugs.gnu.org> Date: Sun, 22 Jun 2025 14:30:05 +0000 retitle 68984 [PATCH 0/2] Update qtpass. reassign 68984 guix-patches submitter 68984 Timotej Lazar severity 68984 normal tag 68984 patch thanks From debbugs-submit-bounces@debbugs.gnu.org Wed Feb 07 16:22:22 2024 Received: (at submit) by debbugs.gnu.org; 7 Feb 2024 21:22:22 +0000 Received: from localhost ([127.0.0.1]:58046 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1rXpN8-0001zy-Jj for submit@debbugs.gnu.org; Wed, 07 Feb 2024 16:22:22 -0500 Received: from lists.gnu.org ([2001:470:142::17]:49132) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1rXpN5-0001zg-Ti for submit@debbugs.gnu.org; Wed, 07 Feb 2024 16:22:20 -0500 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 1rXpMm-0000Nr-FH for guix-patches@gnu.org; Wed, 07 Feb 2024 16:22:00 -0500 Received: from static.51.243.21.65.clients.your-server.de ([65.21.243.51] helo=araneo.si) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1rXpMj-0002Fg-UE for guix-patches@gnu.org; Wed, 07 Feb 2024 16:22:00 -0500 DKIM-Signature: v=1; a=rsa-sha256; c=simple/simple; s=20230811; bh=cN1hOZcwJRi shXxRu//6r+qARDhCMHCg6PcSAjbtnbA=; h=date:subject:cc:to:from; d=araneo.si; b=WBmDeZ48bkcdpBBvE/isCLrJRTTX/EDArkmLc9ePuL+9HI/mprY0480 1hq09Ly8xPk76qirvXSgw3QtDkAOoujjYThuoqfZz78nscb1BtnuJPvci4fMgIrGgVJObi /6KgrvXzW2e5+GmvUx+W8GybSOqyVt4agyRvB4y5HClQnI= Received: by araneo.si (OpenSMTPD) with ESMTPSA id fe7e03d9 (TLSv1.3:TLS_AES_256_GCM_SHA384:256:NO); Wed, 7 Feb 2024 21:21:52 +0000 (UTC) From: Timotej Lazar To: guix-patches@gnu.org Subject: [PATCH 0/2] Update qtpass. Date: Wed, 7 Feb 2024 22:17:42 +0100 Message-ID: X-Mailer: git-send-email 2.41.0 MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Received-SPF: pass client-ip=65.21.243.51; envelope-from=timotej.lazar@araneo.si; helo=araneo.si X-Spam_score_int: -20 X-Spam_score: -2.1 X-Spam_bar: -- X-Spam_report: (-2.1 / 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, SPF_HELO_PASS=-0.001, SPF_PASS=-0.001, T_SCC_BODY_TEXT_LINE=-0.01 autolearn=ham autolearn_force=no X-Spam_action: no action X-Spam-Score: 1.0 (+) X-Debbugs-Envelope-To: submit Cc: Timotej Lazar X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -0.0 (/) 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 From debbugs-submit-bounces@debbugs.gnu.org Wed Feb 07 16:23:55 2024 Received: (at 68984) by debbugs.gnu.org; 7 Feb 2024 21:23:55 +0000 Received: from localhost ([127.0.0.1]:58051 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1rXpOd-00022c-0U for submit@debbugs.gnu.org; Wed, 07 Feb 2024 16:23:55 -0500 Received: from static.51.243.21.65.clients.your-server.de ([65.21.243.51]:35744 helo=araneo.si) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1rXpOb-00022U-7p for 68984@debbugs.gnu.org; Wed, 07 Feb 2024 16:23:53 -0500 DKIM-Signature: v=1; a=rsa-sha256; c=simple/simple; s=20230811; bh=LxiareXHOmM sDJk5ddskzCg4YAsv1ijwQiS1RxNOzUw=; h=references:in-reply-to:date: subject:cc:to:from; d=araneo.si; b=rgt+FXIxexLVePg07DJcD5YFW7X3Igxs7qW 1D3SxTKLdnHNi/N+3yOPU5GuOyFshGBCpXyRxBmI6Jkb1j1ijsBz38pk/gtFKfp0beoAV3 Hweu7amydJ1aDNp1cRE15H/5H1wdlQ6puaCslISiw5b7jWpn5jYZmcjWyZjz3DmXX8= Received: by araneo.si (OpenSMTPD) with ESMTPSA id b4f733bf (TLSv1.3:TLS_AES_256_GCM_SHA384:256:NO); Wed, 7 Feb 2024 21:23:37 +0000 (UTC) From: Timotej Lazar To: 68984@debbugs.gnu.org Subject: [PATCH 1/2] gnu: qtpass: Update to 1.4.0. Date: Wed, 7 Feb 2024 22:23:33 +0100 Message-ID: X-Mailer: git-send-email 2.41.0 In-Reply-To: References: MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Spam-Score: -0.0 (/) X-Debbugs-Envelope-To: 68984 Cc: Timotej Lazar X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -1.0 (-) * 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 From debbugs-submit-bounces@debbugs.gnu.org Wed Feb 07 16:23:57 2024 Received: (at 68984) by debbugs.gnu.org; 7 Feb 2024 21:23:57 +0000 Received: from localhost ([127.0.0.1]:58054 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1rXpOf-00022r-Bj for submit@debbugs.gnu.org; Wed, 07 Feb 2024 16:23:57 -0500 Received: from static.51.243.21.65.clients.your-server.de ([65.21.243.51]:35744 helo=araneo.si) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1rXpOd-00022U-1K for 68984@debbugs.gnu.org; Wed, 07 Feb 2024 16:23:55 -0500 DKIM-Signature: v=1; a=rsa-sha256; c=simple/simple; s=20230811; bh=a/Z2OvaoQrs MQ9VaVyEc0R41dZM6kZ+kgP/5HPWVRhU=; h=references:in-reply-to:date: subject:cc:to:from; d=araneo.si; b=IZwlKu5XO7MFI61KZLK0skS6rPfBq5CtT97 Fh2KL/OcMEGgwgAERAgrnrd/X5GZZ3ooBqShSO4UkXjtvsznim9RLLS9enYElFLFiydVNa JvsG+S63P6/M2wZ6KDOjmR7ozvFLwXj/MKJmtdMtdqRSwmEEkFBch/S18olhry/XCI= Received: by araneo.si (OpenSMTPD) with ESMTPSA id 0ecdcb9e (TLSv1.3:TLS_AES_256_GCM_SHA384:256:NO); Wed, 7 Feb 2024 21:23:40 +0000 (UTC) From: Timotej Lazar To: 68984@debbugs.gnu.org Subject: [PATCH 2/2] gnu: qtpass: Switch to qt-build-system and new package style. Date: Wed, 7 Feb 2024 22:23:34 +0100 Message-ID: <6de9dbd1ac3cd0a8e8ec83e6a8b2af46c985e3e3.1707340157.git.timotej.lazar@araneo.si> X-Mailer: git-send-email 2.41.0 In-Reply-To: References: MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Spam-Score: -0.0 (/) X-Debbugs-Envelope-To: 68984 Cc: Timotej Lazar X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -1.0 (-) * 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 From debbugs-submit-bounces@debbugs.gnu.org Tue Feb 13 07:25:02 2024 Received: (at submit) by debbugs.gnu.org; 13 Feb 2024 12:25:02 +0000 Received: from localhost ([127.0.0.1]:42610 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1rZrqP-0001ID-Md for submit@debbugs.gnu.org; Tue, 13 Feb 2024 07:25:02 -0500 Received: from lists.gnu.org ([209.51.188.17]:52410) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1rZrqN-0001Hp-Rf for submit@debbugs.gnu.org; Tue, 13 Feb 2024 07:25:00 -0500 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 1rZrq6-00053K-2W for guix-patches@gnu.org; Tue, 13 Feb 2024 07:24:42 -0500 Received: from mira.cbaines.net ([2a01:7e00:e000:2f8:fd4d:b5c7:13fb:3d27]) by eggs.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1rZrq4-0006Rq-Jf for guix-patches@gnu.org; Tue, 13 Feb 2024 07:24:41 -0500 Received: from localhost (unknown [212.132.255.10]) by mira.cbaines.net (Postfix) with ESMTPSA id 4630927BBE2; Tue, 13 Feb 2024 12:24:38 +0000 (GMT) Received: from felis (localhost.lan [127.0.0.1]) by localhost (OpenSMTPD) with ESMTP id 54be4216; Tue, 13 Feb 2024 12:24:38 +0000 (UTC) References: User-agent: mu4e 1.10.7; emacs 29.1 From: Christopher Baines To: Timotej Lazar Subject: Re: [bug#68984] [PATCH 0/2] Update qtpass. Date: Tue, 13 Feb 2024 12:24:18 +0000 In-reply-to: Message-ID: <874jecblh6.fsf@cbaines.net> MIME-Version: 1.0 Content-Type: multipart/signed; boundary="=-=-="; micalg=pgp-sha512; protocol="application/pgp-signature" Received-SPF: pass client-ip=2a01:7e00:e000:2f8:fd4d:b5c7:13fb:3d27; envelope-from=mail@cbaines.net; helo=mira.cbaines.net X-Spam_score_int: -18 X-Spam_score: -1.9 X-Spam_bar: - X-Spam_report: (-1.9 / 5.0 requ) BAYES_00=-1.9, SPF_HELO_PASS=-0.001, SPF_PASS=-0.001, T_SCC_BODY_TEXT_LINE=-0.01 autolearn=ham autolearn_force=no X-Spam_action: no action X-Spam-Score: -1.4 (-) X-Debbugs-Envelope-To: submit Cc: 68984-done@debbugs.gnu.org, guix-patches@gnu.org X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -2.4 (--) --=-=-= Content-Type: text/plain Timotej Lazar 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 --=-=-= Content-Type: application/pgp-signature; name="signature.asc" -----BEGIN PGP SIGNATURE----- iQKlBAEBCgCPFiEEPonu50WOcg2XVOCyXiijOwuE9XcFAmXLX4VfFIAAAAAALgAo aXNzdWVyLWZwckBub3RhdGlvbnMub3BlbnBncC5maWZ0aGhvcnNlbWFuLm5ldDNF ODlFRUU3NDU4RTcyMEQ5NzU0RTBCMjVFMjhBMzNCMEI4NEY1NzcRHG1haWxAY2Jh aW5lcy5uZXQACgkQXiijOwuE9XdFlw//ZT/JoLAT4igg4IH0idJWPlpxMcnTe9hP bwKnxOdM6uUHqltRI+0C4Kg4eGjnDzceZzsNUcvXZgLvutnn47FXtdG5bW4tfoyp FDL3jF785Zwm1V4xJZLMbYQClJLl2BBg80fMdI5ky1XiC3tOLs8YxSrukNCf0MZt bl5OgPycE2XpjXReLmJ4Se7ntZatWNI1jrcxXq6+GuQwjGVSTekR+4SPWlOE+XWv INcvXbydDU4Kx/YacV0+G04KDAvhK/+um6iJa7MkEMK1ohf9EoDifuHvejYRYfte 3XudsVwRhjaObx+LucP8fQ8/W13Sz9VE0sUbMzcj5VKLskM8n7rPGWTv4/GSrOP0 CtVM8cxF+C/Rft5z8Y5KTU/kzQ2uxwVHZl82hxpwdQdeLNj5kFVZCD/sycL8iEfW AseXBkF6mj977ZvX6JHvXKZOWNdmWLQenGv8T34SMcEbco0x1czSy5eGEZwukJy/ H0p1lDD8Z1V79Dkhq5FxhPdhp7e37KNcTbk/9X+BMubeVaI/7aACrtJJv7B2mmqg bbsAP33cfd6GJxrBjODpzv26yrc1N3WIRSkoLZidruEDe/vQOCJ3yY0jAmFep9/0 MnM8+aPkLjjcNhp9WG808xhIBGzWORIxXRrw2rD5Pk1ZgD71C/nnVsUHeMQ43sLe AUb2V9JN/ww= =02UV -----END PGP SIGNATURE----- --=-=-=-- From unknown Sun Jun 22 07:30:05 2025 Received: (at fakecontrol) by fakecontrolmessage; To: internal_control@debbugs.gnu.org From: Debbugs Internal Request Subject: Internal Control Message-Id: bug archived. Date: Wed, 13 Mar 2024 11:24:18 +0000 User-Agent: Fakemail v42.6.9 # This is a fake control message. # # The action: # bug archived. thanks # This fakemail brought to you by your local debbugs # administrator