From patchwork Wed Feb 7 21:23:33 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Timotej Lazar X-Patchwork-Id: 59880 Return-Path: X-Original-To: patchwork@mira.cbaines.net Delivered-To: patchwork@mira.cbaines.net Received: by mira.cbaines.net (Postfix, from userid 113) id 5F9DE27BBEB; Wed, 7 Feb 2024 21:24:00 +0000 (GMT) X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on mira.cbaines.net X-Spam-Level: X-Spam-Status: No, score=-3.7 required=5.0 tests=BAYES_00,DKIM_INVALID, DKIM_SIGNED,MAILING_LIST_MULTI,RCVD_IN_MSPIKE_H5,RCVD_IN_MSPIKE_WL, SPF_HELO_PASS,URIBL_BLOCKED autolearn=ham autolearn_force=no version=3.4.6 Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mira.cbaines.net (Postfix) with ESMTPS id EA89627BBE2 for ; Wed, 7 Feb 2024 21:23:59 +0000 (GMT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1rXpOe-00011I-Qz; Wed, 07 Feb 2024 16:23:56 -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 1rXpOX-0000yG-BK for guix-patches@gnu.org; Wed, 07 Feb 2024 16:23:50 -0500 Received: from debbugs.gnu.org ([2001:470:142:5::43]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1rXpOW-0002NX-Hu for guix-patches@gnu.org; Wed, 07 Feb 2024 16:23:49 -0500 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1rXpOk-00023A-GD for guix-patches@gnu.org; Wed, 07 Feb 2024 16:24:02 -0500 X-Loop: help-debbugs@gnu.org Subject: [bug#68984] [PATCH 1/2] gnu: qtpass: Update to 1.4.0. Resent-From: Timotej Lazar Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Wed, 07 Feb 2024 21:24:02 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 68984 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 68984@debbugs.gnu.org Cc: Timotej Lazar Received: via spool by 68984-submit@debbugs.gnu.org id=B68984.17073410357855 (code B ref 68984); Wed, 07 Feb 2024 21:24:02 +0000 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 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 X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list X-BeenThere: guix-patches@gnu.org List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: guix-patches-bounces+patchwork=mira.cbaines.net@gnu.org Sender: guix-patches-bounces+patchwork=mira.cbaines.net@gnu.org X-getmail-retrieved-from-mailbox: Patches * 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) From patchwork Wed Feb 7 21:23:34 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Timotej Lazar X-Patchwork-Id: 59881 Return-Path: X-Original-To: patchwork@mira.cbaines.net Delivered-To: patchwork@mira.cbaines.net Received: by mira.cbaines.net (Postfix, from userid 113) id B8FD027BBEB; Wed, 7 Feb 2024 21:24:13 +0000 (GMT) X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on mira.cbaines.net X-Spam-Level: X-Spam-Status: No, score=-3.7 required=5.0 tests=BAYES_00,DKIM_INVALID, DKIM_SIGNED,MAILING_LIST_MULTI,RCVD_IN_MSPIKE_H5,RCVD_IN_MSPIKE_WL, SPF_HELO_PASS,URIBL_BLOCKED autolearn=ham autolearn_force=no version=3.4.6 Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mira.cbaines.net (Postfix) with ESMTPS id E73B327BBEA for ; Wed, 7 Feb 2024 21:24:12 +0000 (GMT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1rXpOg-00015f-5o; Wed, 07 Feb 2024 16:23:58 -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 1rXpOX-0000yH-BW for guix-patches@gnu.org; Wed, 07 Feb 2024 16:23:50 -0500 Received: from debbugs.gnu.org ([2001:470:142:5::43]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1rXpOX-0002NY-1p for guix-patches@gnu.org; Wed, 07 Feb 2024 16:23:49 -0500 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1rXpOl-00023I-0Z for guix-patches@gnu.org; Wed, 07 Feb 2024 16:24:03 -0500 X-Loop: help-debbugs@gnu.org Subject: [bug#68984] [PATCH 2/2] gnu: qtpass: Switch to qt-build-system and new package style. Resent-From: Timotej Lazar Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Wed, 07 Feb 2024 21:24:02 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 68984 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 68984@debbugs.gnu.org Cc: Timotej Lazar Received: via spool by 68984-submit@debbugs.gnu.org id=B68984.17073410377869 (code B ref 68984); Wed, 07 Feb 2024 21:24:02 +0000 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 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 X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list X-BeenThere: guix-patches@gnu.org List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: guix-patches-bounces+patchwork=mira.cbaines.net@gnu.org Sender: guix-patches-bounces+patchwork=mira.cbaines.net@gnu.org X-getmail-retrieved-from-mailbox: Patches * 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