[bug#61294] [PATCH 0/3] Update imv

[bug#61294] [PATCH 0/3] Update imv

[Timotej Lazar]

Update imv and ensure the correct version is called from imv-dir script.

Timotej Lazar (3):
  gnu: imv: Update to 4.4.0.
  gnu: imv: Use new package style.
  gnu: imv: Record absolute file name of 'imv' script.

 gnu/packages/image-viewers.scm | 26 +++++++++++++-------------
 1 file changed, 13 insertions(+), 13 deletions(-)

-- 
2.39.1

[bug#61294] [PATCH 1/3] gnu: imv: Update to 4.4.0.

[Timotej Lazar]

* 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
-- 
2.39.1

[bug#61294] [PATCH 2/3] gnu: imv: Use new package style.

[Timotej Lazar]

* 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))
-- 
2.39.1

[bug#61294] [PATCH 3/3] gnu: imv: Record absolute file name of 'imv' script.

[Timotej Lazar]

* 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))
-- 
2.39.1

bug#61294: [PATCH 0/3] Update imv

[Leo Famulari]

On Sun, Feb 05, 2023 at 01:22:21PM +0100, Timotej Lazar wrote:
> Update imv and ensure the correct version is called from imv-dir script.

Thanks! Pushed as 19e4bb8da2eab765da030107930b030540779585