From patchwork Sun Feb 5 12:23:48 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Timotej Lazar X-Patchwork-Id: 46681 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 CC20B27BBEB; Sun, 5 Feb 2023 12:24:29 +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_H2,SPF_HELO_PASS, URIBL_BLOCKED autolearn=unavailable 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 2391027BBE9 for ; Sun, 5 Feb 2023 12:24:29 +0000 (GMT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1pOe3x-0002p1-NT; Sun, 05 Feb 2023 07:24:05 -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 1pOe3v-0002oj-0n for guix-patches@gnu.org; Sun, 05 Feb 2023 07:24:03 -0500 Received: from debbugs.gnu.org ([209.51.188.43]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1pOe3u-0001kv-Gu for guix-patches@gnu.org; Sun, 05 Feb 2023 07:24:02 -0500 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1pOe3u-0001Yn-BQ for guix-patches@gnu.org; Sun, 05 Feb 2023 07:24:02 -0500 X-Loop: help-debbugs@gnu.org Subject: [bug#61294] [PATCH 1/3] gnu: imv: Update to 4.4.0. References: <20230205122221.31111-1-timotej.lazar@araneo.si> In-Reply-To: <20230205122221.31111-1-timotej.lazar@araneo.si> Resent-From: Timotej Lazar Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Sun, 05 Feb 2023 12:24:02 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 61294 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 61294@debbugs.gnu.org Cc: Timotej Lazar Received: via spool by 61294-submit@debbugs.gnu.org id=B61294.16755998395972 (code B ref 61294); Sun, 05 Feb 2023 12:24:02 +0000 Received: (at 61294) by debbugs.gnu.org; 5 Feb 2023 12:23:59 +0000 Received: from localhost ([127.0.0.1]:44284 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1pOe3r-0001YG-1H for submit@debbugs.gnu.org; Sun, 05 Feb 2023 07:23:59 -0500 Received: from araneo.si ([90.157.193.204]:43022) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1pOe3p-0001Y3-BJ for 61294@debbugs.gnu.org; Sun, 05 Feb 2023 07:23:57 -0500 Received: from araneo.si (localhost.lan [127.0.0.1]) by araneo.si (OpenSMTPD) with ESMTP id ae552a3a for <61294@debbugs.gnu.org>; Sun, 5 Feb 2023 12:23:56 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha1; c=relaxed; d=araneo.si; h=from:to:cc :subject:date:message-id:mime-version:content-transfer-encoding; s=20180623; bh=LBDNn4z+sgQjoInD4kGqyNC1PP4=; b=Ylylnk4boVeHdJCF VkQfs+sdqYxNllTtzBkm+IaRLO9tNTL+rdUUGkB55+EOdOm6WsNmwvPKdPbxYFpc UJtatpaNVz6cJwDlxWcNopyvqQBrSys/xal10L9BNIUB3Lfvb3ipjC8SEbViazId PWb69u8BKfMDOwEW4IqB5XMv4IZhQ65R3PrnjZJ+hFsvl470dSC+SlPKzzULExg7 3VZD5Hnnrp0L5/nDDOVeTXYfHpYo3RspAX/A+wmt7UG4DRssYKFZ1q18O2cWyS/B Mia2zp8sK5X3oUqSNCL/N/4Q3skcoL98bBswvDekWQ4gRkOhBQdeG2kw7iLc4A4h xZm+8w== Received: by araneo.si (OpenSMTPD) with ESMTPSA id 56cf4ced (TLSv1.3:TLS_AES_256_GCM_SHA384:256:NO); Sun, 5 Feb 2023 12:23:56 +0000 (UTC) From: Timotej Lazar Date: Sun, 5 Feb 2023 13:23:48 +0100 Message-Id: <20230205122350.2759-1-timotej.lazar@araneo.si> X-Mailer: git-send-email 2.39.1 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/image-viewers.scm (imv): Update to 4.4.0. --- gnu/packages/image-viewers.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gnu/packages/image-viewers.scm b/gnu/packages/image-viewers.scm index 200b8c1cc3..0701f7bd4f 100644 --- a/gnu/packages/image-viewers.scm +++ b/gnu/packages/image-viewers.scm @@ -750,7 +750,7 @@ (define-public chafa (define-public imv (package (name "imv") - (version "4.3.1") + (version "4.4.0") (source (origin (method git-fetch) (uri (git-reference @@ -758,7 +758,7 @@ (define-public imv (commit (string-append "v" version)))) (sha256 (base32 - "01x6qg7nhikqh68gnzrdvq0rxma5v9z19il89y8bvdrcr7r1vh40")) + "1zlds43z17jrnsrfz3rf3sb3pa5gkmxaibq87509ikc7p1p09c9c")) (file-name (git-file-name name version)))) (build-system meson-build-system) (arguments From patchwork Sun Feb 5 12:23:49 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Timotej Lazar X-Patchwork-Id: 46680 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 CDF1927BBEB; Sun, 5 Feb 2023 12:24:25 +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_H2,SPF_HELO_PASS, URIBL_BLOCKED autolearn=unavailable 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 E908827BBE9 for ; Sun, 5 Feb 2023 12:24:23 +0000 (GMT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1pOe3y-0002p2-MG; Sun, 05 Feb 2023 07:24:06 -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 1pOe3v-0002or-D7 for guix-patches@gnu.org; Sun, 05 Feb 2023 07:24:03 -0500 Received: from debbugs.gnu.org ([209.51.188.43]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1pOe3u-0001lZ-Vh for guix-patches@gnu.org; Sun, 05 Feb 2023 07:24:02 -0500 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1pOe3u-0001Yv-Rp for guix-patches@gnu.org; Sun, 05 Feb 2023 07:24:02 -0500 X-Loop: help-debbugs@gnu.org Subject: [bug#61294] [PATCH 2/3] gnu: imv: Use new package style. Resent-From: Timotej Lazar Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Sun, 05 Feb 2023 12:24:02 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 61294 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 61294@debbugs.gnu.org Cc: Timotej Lazar Received: via spool by 61294-submit@debbugs.gnu.org id=B61294.16755998405981 (code B ref 61294); Sun, 05 Feb 2023 12:24:02 +0000 Received: (at 61294) by debbugs.gnu.org; 5 Feb 2023 12:24:00 +0000 Received: from localhost ([127.0.0.1]:44288 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1pOe3s-0001YO-BK for submit@debbugs.gnu.org; Sun, 05 Feb 2023 07:24:00 -0500 Received: from araneo.si ([90.157.193.204]:43022) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1pOe3q-0001Y3-6i for 61294@debbugs.gnu.org; Sun, 05 Feb 2023 07:23:58 -0500 Received: from araneo.si (localhost.lan [127.0.0.1]) by araneo.si (OpenSMTPD) with ESMTP id 38638ff6 for <61294@debbugs.gnu.org>; Sun, 5 Feb 2023 12:23:57 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha1; c=relaxed; d=araneo.si; h=from:to:cc :subject:date:message-id:in-reply-to:references:mime-version :content-transfer-encoding; s=20180623; bh=Mo+DEwrcU2uS6UjrhdyMk e5gy4E=; b=Ck7vjckjBoeayKGy6c0HNa4p4g7w7EfxCd4pqD5Q9KwFOxS4hPw7z wqVOksq6XRtQuRN38qn+fN3Fvvxj5PFIm6HyGM06eZrjRYli+K9gV10/+dwUMazU p/97NfwUEPQvyQY+emnuLow7cVLmKZ9uTuEFIVFuMh3pBC0JpO/t5E87yHcaro8J GH35nS6GOfD52yqbfg8YvgDuheT8r3FkdRy+F963lvLyINvx9409m+3vXvAs5uRu LVQh6Wm1L3wke2JkACU6Hwzf+PRtkbs73PP5d5Lat78koAw+FdNXkA1QI6xM+/d9 VqiA84yVUJBbyeF+bLulplJWXvRr6NfNg== Received: by araneo.si (OpenSMTPD) with ESMTPSA id e25f6b3c (TLSv1.3:TLS_AES_256_GCM_SHA384:256:NO); Sun, 5 Feb 2023 12:23:56 +0000 (UTC) From: Timotej Lazar Date: Sun, 5 Feb 2023 13:23:49 +0100 Message-Id: <20230205122350.2759-2-timotej.lazar@araneo.si> X-Mailer: git-send-email 2.39.1 In-Reply-To: <20230205122350.2759-1-timotej.lazar@araneo.si> References: <20230205122350.2759-1-timotej.lazar@araneo.si> 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/image-viewers.scm (imv)[arguments]: Use G-expressions. --- gnu/packages/image-viewers.scm | 20 +++++++++----------- 1 file changed, 9 insertions(+), 11 deletions(-) diff --git a/gnu/packages/image-viewers.scm b/gnu/packages/image-viewers.scm index 0701f7bd4f..02e25aee5f 100644 --- a/gnu/packages/image-viewers.scm +++ b/gnu/packages/image-viewers.scm @@ -762,17 +762,15 @@ (define-public imv (file-name (git-file-name name version)))) (build-system meson-build-system) (arguments - `(#:phases - (modify-phases %standard-phases - (add-after 'install 'record-absolute-file-names - (lambda* (#:key outputs #:allow-other-keys) - ;; 'imv' is a script that execs 'imv-x11' or 'imv-wayland'. - ;; Record their absolute file name. - (let* ((out (assoc-ref outputs "out")) - (bin (string-append out "/bin"))) - (substitute* (string-append bin "/imv") - (("imv-") - (string-append bin "/imv-"))))))))) + (list #:phases + #~(modify-phases %standard-phases + (add-after 'install 'record-absolute-file-names + (lambda _ + ;; 'imv' is a script that execs 'imv-x11' or 'imv-wayland'. + ;; Record their absolute file name. + (let ((bin (string-append #$output "/bin"))) + (substitute* (string-append bin "/imv") + (("imv-") (string-append bin "/imv-"))))))))) (native-inputs (list asciidoc pkg-config)) From patchwork Sun Feb 5 12:23:50 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Timotej Lazar X-Patchwork-Id: 46682 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 9E62427BBED; Sun, 5 Feb 2023 12:25:25 +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_H2,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 0A78F27BBE9 for ; Sun, 5 Feb 2023 12:25:25 +0000 (GMT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1pOe4v-00030x-Sh; Sun, 05 Feb 2023 07:25:05 -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 1pOe4s-00030f-Rv for guix-patches@gnu.org; Sun, 05 Feb 2023 07:25:03 -0500 Received: from debbugs.gnu.org ([209.51.188.43]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1pOe4s-0002B9-Gk for guix-patches@gnu.org; Sun, 05 Feb 2023 07:25:02 -0500 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1pOe4s-0001ak-Al for guix-patches@gnu.org; Sun, 05 Feb 2023 07:25:02 -0500 X-Loop: help-debbugs@gnu.org Subject: [bug#61294] [PATCH 3/3] gnu: imv: Record absolute file name of 'imv' script. Resent-From: Timotej Lazar Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Sun, 05 Feb 2023 12:25:02 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 61294 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 61294@debbugs.gnu.org Cc: Timotej Lazar Received: via spool by 61294-submit@debbugs.gnu.org id=B61294.16755998446042 (code B ref 61294); Sun, 05 Feb 2023 12:25:02 +0000 Received: (at 61294) by debbugs.gnu.org; 5 Feb 2023 12:24:04 +0000 Received: from localhost ([127.0.0.1]:44292 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1pOe3v-0001ZF-Mp for submit@debbugs.gnu.org; Sun, 05 Feb 2023 07:24:04 -0500 Received: from araneo.si ([90.157.193.204]:43022) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1pOe3r-0001Y3-1p for 61294@debbugs.gnu.org; Sun, 05 Feb 2023 07:24:01 -0500 Received: from araneo.si (localhost.lan [127.0.0.1]) by araneo.si (OpenSMTPD) with ESMTP id 8ba339f2 for <61294@debbugs.gnu.org>; Sun, 5 Feb 2023 12:23:58 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha1; c=relaxed; d=araneo.si; h=from:to:cc :subject:date:message-id:in-reply-to:references:mime-version :content-transfer-encoding; s=20180623; bh=FFeKkVnoLRdQ/lHebr+yF el0Rgo=; b=qsXZKiwZEX52qVCl8tNaFtr4VuGhSWDnsyvMJpbGxNfhx9fOvE6o5 wcNcrMiSwoTVO5LpFOmsW0ZgP8Nu7kT9J24RsgF3/yP9Z7IJ+VXbRd7WGv0CVrHw 94fvU2v3zL8gzg1ar1XHQ+cxdp/zuvwMq9fZleW0KHO3NGP18l3zF6eX9mn/dPV1 7tacAp5zSqKGqJ7m26qrmrS2K2HsirpO2QnAclqtRTrXKOf4TymNzs2JfbuDjhpv uZG+Tc8BbMLV8WKR1VrHKbyMZnIS4Wus/Mka3LusGFJ+KItvOyfWqcWS5sfkbn6N vdMMOLRncZ1fxGJ+zyepiwv2Fo4B9h8ig== Received: by araneo.si (OpenSMTPD) with ESMTPSA id 488cf8fd (TLSv1.3:TLS_AES_256_GCM_SHA384:256:NO); Sun, 5 Feb 2023 12:23:57 +0000 (UTC) From: Timotej Lazar Date: Sun, 5 Feb 2023 13:23:50 +0100 Message-Id: <20230205122350.2759-3-timotej.lazar@araneo.si> X-Mailer: git-send-email 2.39.1 In-Reply-To: <20230205122350.2759-1-timotej.lazar@araneo.si> References: <20230205122350.2759-1-timotej.lazar@araneo.si> 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/image-viewers.scm (imv)[arguments]: Also fix the 'imv-dir' script in the 'record-absolute-file-names phase. --- gnu/packages/image-viewers.scm | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/gnu/packages/image-viewers.scm b/gnu/packages/image-viewers.scm index 02e25aee5f..1879b9949c 100644 --- a/gnu/packages/image-viewers.scm +++ b/gnu/packages/image-viewers.scm @@ -767,10 +767,12 @@ (define-public imv (add-after 'install 'record-absolute-file-names (lambda _ ;; 'imv' is a script that execs 'imv-x11' or 'imv-wayland'. - ;; Record their absolute file name. + ;; 'imv-dir' execs 'imv'. Record their absolute file names. (let ((bin (string-append #$output "/bin"))) (substitute* (string-append bin "/imv") - (("imv-") (string-append bin "/imv-"))))))))) + (("imv-") (string-append bin "/imv-"))) + (substitute* (string-append bin "/imv-dir") + (("imv") (string-append bin "/imv"))))))))) (native-inputs (list asciidoc pkg-config))