unofficial mirror of guix-patches@gnu.org 
 help / color / mirror / Atom feed
* [bug#50546] [PATCH] imv: Update to 4.1.0 and adjust arguments+inputs.
       [not found] <87h7eq109g.fsf@qq.com>
@ 2021-09-12 11:49 ` Z572 via Guix-patches via
  2021-09-21 13:02   ` bug#50546: " Ludovic Courtès
  0 siblings, 1 reply; 2+ messages in thread
From: Z572 via Guix-patches via @ 2021-09-12 11:49 UTC (permalink / raw)
  To: 50546

[-- Attachment #1: 0001-gnu-imv-Update-to-4.1.0-and-adjust-arguments-inputs.patch --]
[-- Type: text/x-patch, Size: 3768 bytes --]

From 69060bd446332a5e48f9ec44f4b71f07c3a3ca0c Mon Sep 17 00:00:00 2001
From: Z572 <873216071@qq.com>
Date: Thu, 9 Sep 2021 21:36:54 +0800
Subject: [PATCH] gnu: imv: Update to 4.1.0 and adjust arguments+inputs.

* 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
---
 gnu/packages/image-viewers.scm | 31 +++++++++++++++++--------------
 1 file changed, 17 insertions(+), 14 deletions(-)

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
-- 
2.33.0


[-- Attachment #2: Type: text/plain, Size: 10 bytes --]


-- 
over

^ permalink raw reply	[flat|nested] 2+ messages in thread

* bug#50546: [PATCH] imv: Update to 4.1.0 and adjust arguments+inputs.
  2021-09-12 11:49 ` [bug#50546] [PATCH] imv: Update to 4.1.0 and adjust arguments+inputs Z572 via Guix-patches via
@ 2021-09-21 13:02   ` Ludovic Courtès
  0 siblings, 0 replies; 2+ messages in thread
From: Ludovic Courtès @ 2021-09-21 13:02 UTC (permalink / raw)
  To: Z572; +Cc: 50546-done

Hi,

Z572 <873216071@qq.com> skribis:

>>From 69060bd446332a5e48f9ec44f4b71f07c3a3ca0c Mon Sep 17 00:00:00 2001
> From: Z572 <873216071@qq.com>
> Date: Thu, 9 Sep 2021 21:36:54 +0800
> Subject: [PATCH] gnu: imv: Update to 4.1.0 and adjust arguments+inputs.
>
> * 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

Applied, thanks!

Ludo’.




^ permalink raw reply	[flat|nested] 2+ messages in thread

end of thread, other threads:[~2021-09-21 13:03 UTC | newest]

Thread overview: 2+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
     [not found] <87h7eq109g.fsf@qq.com>
2021-09-12 11:49 ` [bug#50546] [PATCH] imv: Update to 4.1.0 and adjust arguments+inputs Z572 via Guix-patches via
2021-09-21 13:02   ` bug#50546: " Ludovic Courtès

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).