From be32889902abc29c14f3ea9a4f52da1bf9a0383a Mon Sep 17 00:00:00 2001
From: Z572 <873216071@qq.com>
Date: Thu, 9 Sep 2021 21:36:54 +0800
Subject: gnu: imv: Update to 4.1.0 and adjust arguments+inputs.
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

* gnu/packages/image-viewers.scm (imv): [version]: Update to 4.1.0.
[build-system]: Replace with meson-build-system.
[phases]: Remove (delete 'configure)
[make-flags]: Remove it.
[inputs]: Remove asciidoc. Add libheif, libjpeg-turbo, libinih, libnsgif,
librsvg-next, libtiff
[native-inputs]: Add asciidoc, Add git-minimal

Signed-off-by: Ludovic Courtès <ludo@gnu.org>
---
 gnu/packages/image-viewers.scm | 31 +++++++++++++++++--------------
 1 file changed, 17 insertions(+), 14 deletions(-)

(limited to 'gnu')

diff --git a/gnu/packages/image-viewers.scm b/gnu/packages/image-viewers.scm
index 3b45c25e21..80987a174c 100644
--- a/gnu/packages/image-viewers.scm
+++ b/gnu/packages/image-viewers.scm
@@ -20,6 +20,7 @@
 ;;; Copyright © 2021 Stefan Reichör <stefan@xsteve.at>
 ;;; Copyright © 2021 Raghav Gururajan <rg@raghavgururajan.name>
 ;;; Copyright © 2021 jgart <jgart@dismail.de>
+;;; Copyright © 2021 Zheng Junjie <873216071@qq.com>
 ;;;
 ;;; This file is part of GNU Guix.
 ;;;
@@ -80,6 +81,7 @@
   #:use-module (gnu packages qt)
   #:use-module (gnu packages suckless)
   #:use-module (gnu packages terminals)
+  #:use-module (gnu packages version-control)
   #:use-module (gnu packages video)
   #:use-module (gnu packages web)
   #:use-module (gnu packages xdisorg)
@@ -739,7 +741,7 @@ displayed in a terminal.")
 (define-public imv
   (package
     (name "imv")
-    (version "4.1.0")
+    (version "4.3.0")
     (source (origin
               (method git-fetch)
               (uri (git-reference
@@ -747,13 +749,12 @@ displayed in a terminal.")
                     (commit (string-append "v" version))))
               (sha256
                (base32
-                "0gk8g178i961nn3bls75a8qpv6wvfvav6hd9lxca1skaikd33zdx"))
+                "12xcayyzmfknbff04z8jdlxsnnimgisqiah0bw07cyxx8ksmdzqw"))
               (file-name (git-file-name name version))))
-    (build-system gnu-build-system)
+    (build-system meson-build-system)
     (arguments
      `(#:phases
        (modify-phases %standard-phases
-         (delete 'configure)
          (add-after 'install 'record-absolute-file-names
            (lambda* (#:key outputs #:allow-other-keys)
              ;; 'imv' is a script that execs 'imv-x11' or 'imv-wayland'.
@@ -763,22 +764,24 @@ displayed in a terminal.")
                (substitute* (string-append bin "/imv")
                  (("imv-")
                   (string-append bin "/imv-")))
-               #t))))
-       #:make-flags
-       (list ,(string-append "CC=" (cc-for-target))
-             (string-append "PREFIX=" (assoc-ref %outputs "out"))
-             (string-append "CONFIGPREFIX="
-                            (assoc-ref %outputs "out") "/etc"))))
+               #t))))))
     (inputs
-     `(("asciidoc" ,asciidoc)
-       ("freeimage" ,freeimage)
+     `(("freeimage" ,freeimage)
        ("glu" ,glu)
-       ("librsvg" ,librsvg)
+       ("libheif" ,libheif)
+       ("libjpeg-turbo" ,libjpeg-turbo)
+       ("libinih" ,libinih)
+       ("libnsgif" ,libnsgif)
+       ("librsvg" ,librsvg-next)
+       ("libtiff" ,libtiff)
        ("libxkbcommon" ,libxkbcommon)
        ("pango" ,pango)
        ("wayland" ,wayland)))
     (native-inputs
-     `(("cmocka" ,cmocka)
+     `(("asciidoc" ,asciidoc)
+       ("cmocka" ,cmocka)
+       ;; why build need it?
+       ("git" ,git-minimal)
        ("pkg-config" ,pkg-config)))
     (synopsis "Image viewer for tiling window managers")
     (description "@code{imv} is a command line image viewer intended for use
-- 
cgit v1.2.3

 Cascadian</td></tr>
<tr><td><span title='2021-02-08 07:18:41 -0800'>2021-02-08</span></td><td><a href='/guix/commit/gnu/bootloader/u-boot.scm?id=15990546a5c26742fcbc7f7aa56b2a6db09dc643'>gnu: u-boot-puma-rk3399: Switch to using arm-trusted-firmware-rk3399.</a><span class='msg-avail'>...<span class='msg-tooltip'>* gnu/packages/bootloaders.scm (u-boot-puma-rk3399)[native-inputs]:
  Add arm-trusted-firmware-rk3399.
  Remove arm-trusted-firmware-puma-rk3399 and rk3399-cortex-m0.
* gnu/packages/firmware.scm (arm-trusted-firmware-puma-rk3399,
  rk3399-cortex-m0): Remove obsolete variables.
* gnu/bootloader/u-boot.scm (install-puma-rk3399-u-boot): Install
  idbloader.img.
</span></span></td><td>Vagrant Cascadian</td></tr>
<tr><td><span title='2020-10-05 11:10:35 +0200'>2020-10-05</span></td><td><a href='/guix/commit/gnu/bootloader/u-boot.scm?id=b97b423e3f61c80d5877dadc95b3f316cd61788f'>bootloader: Fix u-boot installation.</a><span class='msg-avail'>...<span class='msg-tooltip'>This is a follow-up of f19cf27c2b9ff92e2c0fd931ef7fde39c376adaa. The
bootloader installation must be done on the final disk-image, hence using
"disk-image-installer" instead of "installer" callback.

* gnu/bootloader/u-boot.scm: Turn all installer callbacks into
disk-image-installer callbacks.
* gnu/build/bootloader.scm (write-file-on-device): Open the output file with
'no-truncate and 'no-create options.
* gnu/system/image.scm (with-imported-modules*): Add (gnu build bootloader)
module.
</span></span></td><td>Mathieu Othacehe</td></tr>