From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mp0.migadu.com ([2001:41d0:403:4876::]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) by ms8.migadu.com with LMTPS id MLfzKf30w2WGEwAAqHPOHw:P1 (envelope-from ) for ; Wed, 07 Feb 2024 22:24:13 +0100 Received: from aspmx1.migadu.com ([2001:41d0:403:4876::]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) by mp0.migadu.com with LMTPS id MLfzKf30w2WGEwAAqHPOHw (envelope-from ) for ; Wed, 07 Feb 2024 22:24:13 +0100 X-Envelope-To: larch@yhetil.org Authentication-Results: aspmx1.migadu.com; dkim=fail ("headers rsa verify failed") header.d=araneo.si header.s=20230811 header.b=IZwlKu5X; dmarc=fail reason="SPF not aligned (relaxed)" header.from=araneo.si (policy=none); spf=pass (aspmx1.migadu.com: domain of "guix-patches-bounces+larch=yhetil.org@gnu.org" designates 209.51.188.17 as permitted sender) smtp.mailfrom="guix-patches-bounces+larch=yhetil.org@gnu.org" ARC-Seal: i=1; s=key1; d=yhetil.org; t=1707341053; a=rsa-sha256; cv=none; b=jNtDaFSmxnLvroBVAe/1jTQ/vwjfwoxSG7FdcFUTSs2w2fvQGxAKElx0EtKXsqhMzQtSt0 WN7NmJibxe4nBvRCgHHvIKoFQHjIWD2hIMomQ9FXt7hX6FZAGskkkMZKKiLQzK3Om4UeHf lQXoO4y5jphzfbbWIBUpwyOwTtjrtYV0g2ox+EEBUd/23A5FvUWv/s1twk0AN0nsMiZWDN IMk9tnkrDZGAAkx9ifWfDnm7Tj0VQ3ENHCEC4k1lWdNZzp5wLRzVL8nJUTQhoezKKkWjcW O2v5h4m1rk433gdu7x1AtfcitPICs5wOfQFx8LAOpT9TSfSsWVkOpcM9m8fWqA== ARC-Authentication-Results: i=1; aspmx1.migadu.com; dkim=fail ("headers rsa verify failed") header.d=araneo.si header.s=20230811 header.b=IZwlKu5X; dmarc=fail reason="SPF not aligned (relaxed)" header.from=araneo.si (policy=none); spf=pass (aspmx1.migadu.com: domain of "guix-patches-bounces+larch=yhetil.org@gnu.org" designates 209.51.188.17 as permitted sender) smtp.mailfrom="guix-patches-bounces+larch=yhetil.org@gnu.org" ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=yhetil.org; s=key1; t=1707341053; h=from:from:sender:sender:reply-to:subject:subject:date:date: message-id:message-id:to:to:cc:cc:mime-version:mime-version: content-transfer-encoding:content-transfer-encoding:resent-cc: resent-from:resent-sender:resent-message-id:in-reply-to:in-reply-to: references:references:list-id:list-help:list-unsubscribe: list-subscribe:list-post:dkim-signature; bh=cC/rfhz+Q9uX0qYH1LdQ2Fw3bSaopNsrOSaHyN1/Muo=; b=cLnpzCtI6iek1YfUmMFF6S/w9xfgmT2wKrr5jexgit8/Q9EA+bY/y4AhRZr+2/pkS8KwZI MZxy2djFlBZKOlMffDnVwQhoaz37Nnffi9ybS/ZIH3Y6Ty7rILn0pX36w7fZ/Yn9bs2XTo dFNLT1h6aQIB7Urrrt38/oVAScpzAiW+G1Pw4YWViIhyxEVQT5cfdy4B5qYATK1pgZpXjM McYKG7AagDW799y/p0+H0ebLDr90lHa+gOFIzSpgWbPVq4bGclC3qzFynS3ehUmTzQ4XXD 8WZf7RUr19rw4yVcntzvAfs70JXiWIHVknxy6Y9XeOTOLR61PIVvE0NrYboUzg== Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by aspmx1.migadu.com (Postfix) with ESMTPS id EACD027089 for ; Wed, 7 Feb 2024 22:24:12 +0100 (CET) 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 Content-Transfer-Encoding: 8bit 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+larch=yhetil.org@gnu.org Sender: guix-patches-bounces+larch=yhetil.org@gnu.org X-Migadu-Flow: FLOW_IN X-Migadu-Country: US X-Migadu-Scanner: mx10.migadu.com X-Spam-Score: -4.07 X-Migadu-Queue-Id: EACD027089 X-Migadu-Spam-Score: -4.07 X-TUID: 7XNAWedwwM7/ * 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