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 --- gnu/packages/image-viewers.scm | 31 +++++++++++++++++-------------- 1 file changed, 17 insertions(+), 14 deletions(-) (limited to 'gnu/packages/image-viewers.scm') 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 ;;; Copyright © 2021 Raghav Gururajan ;;; Copyright © 2021 jgart +;;; 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 From ea0fb5a567c893cf29bf23c6c7a946c9a84b46d5 Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Mon, 4 Oct 2021 03:29:48 +0200 Subject: gnu: feh: Update to 3.7.2. * gnu/packages/image-viewers.scm (feh): Update to 3.7.2. --- gnu/packages/image-viewers.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu/packages/image-viewers.scm') diff --git a/gnu/packages/image-viewers.scm b/gnu/packages/image-viewers.scm index 80987a174c..5aded02a93 100644 --- a/gnu/packages/image-viewers.scm +++ b/gnu/packages/image-viewers.scm @@ -251,7 +251,7 @@ YouTube videos without requiring API and opens/downloads them using mpv/ytdl.") (define-public feh (package (name "feh") - (version "3.7.1") + (version "3.7.2") (home-page "https://feh.finalrewind.org/") (source (origin (method url-fetch) @@ -259,7 +259,7 @@ YouTube videos without requiring API and opens/downloads them using mpv/ytdl.") name "-" version ".tar.bz2")) (sha256 (base32 - "1djqjagp7k9rris1p8wgz0q8albgsd8gasc0hyanbjap3yk1rasp")))) + "0n42kj18ldlcmrmk5qir9gs9irdl1vz9913n8p941x8cfb98ywc4")))) (build-system gnu-build-system) (arguments `(#:phases (modify-phases %standard-phases (delete 'configure)) -- cgit v1.2.3 From 84527724333d44c6b42a9b9d1e0f9f2b73d483bd Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Wed, 6 Oct 2021 00:50:48 +0200 Subject: gnu: quazip: Update to 1.1. MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * gnu/packages/compression.scm (quazip): Redefine as an heir to the… (quazip-0): …new name of the previous package definition. Adjust all packages with quazip as input to use quazip-0. --- gnu/packages/compression.scm | 17 ++++++++++++++++- gnu/packages/cvassistant.scm | 2 +- gnu/packages/geo.scm | 2 +- gnu/packages/image-viewers.scm | 2 +- gnu/packages/kde.scm | 2 +- gnu/packages/ocr.scm | 2 +- gnu/packages/password-utils.scm | 2 +- 7 files changed, 22 insertions(+), 7 deletions(-) (limited to 'gnu/packages/image-viewers.scm') diff --git a/gnu/packages/compression.scm b/gnu/packages/compression.scm index 1fc5eb6522..e5641456d6 100644 --- a/gnu/packages/compression.scm +++ b/gnu/packages/compression.scm @@ -2310,7 +2310,7 @@ libraries by around 50%--70%, thus reducing disk space, network load times, download times, and other distribution and storage costs.") (license license:gpl2+))) -(define-public quazip +(define-public quazip-0 (package (name "quazip") (version "0.9.1") @@ -2347,6 +2347,21 @@ reading from and writing to ZIP archives. ") ;; distributed under zlib terms. (license (list license:lgpl2.1+ license:zlib)))) +(define-public quazip + (package + (inherit quazip-0) + (name "quazip") + (version "1.1") + (source + (origin + (method git-fetch) + (uri (git-reference + (url "https://github.com/stachenov/quazip") + (commit (string-append "v" version)))) + (file-name (git-file-name name version)) + (sha256 + (base32 "06srglrj6jvy5ngmidlgx03i0d5w91yhi7sf846wql00v8rvhc5h")))))) + (define-public zchunk (package (name "zchunk") diff --git a/gnu/packages/cvassistant.scm b/gnu/packages/cvassistant.scm index 3f3a6f7492..e7ad411b6f 100644 --- a/gnu/packages/cvassistant.scm +++ b/gnu/packages/cvassistant.scm @@ -70,7 +70,7 @@ (lambda _ (invoke "qmake")))))) (inputs `(("qtbase" ,qtbase-5) - ("quazip" ,quazip) + ("quazip" ,quazip-0) ("zlib" ,zlib))) (home-page "https://cvassistant.sourceforge.io/") (synopsis "Job application organizer") diff --git a/gnu/packages/geo.scm b/gnu/packages/geo.scm index a8a66fdfc4..b37eb633ff 100644 --- a/gnu/packages/geo.scm +++ b/gnu/packages/geo.scm @@ -1700,7 +1700,7 @@ using the dataset of topographical information collected by ("qtlocation" ,qtlocation) ("qtwebchannel" ,qtwebchannel) ("qtwebengine" ,qtwebengine) - ("quazip" ,quazip) + ("quazip" ,quazip-0) ("routino" ,routino) ("sqlite" ,sqlite) ; See wrap phase ("zlib" ,zlib))) diff --git a/gnu/packages/image-viewers.scm b/gnu/packages/image-viewers.scm index 5aded02a93..0bd53aae8f 100644 --- a/gnu/packages/image-viewers.scm +++ b/gnu/packages/image-viewers.scm @@ -906,7 +906,7 @@ to set X desktop background.") ("libtiff" ,libtiff) ("opencv" ,opencv) ("python" ,python-wrapper) - ("quazip" ,quazip) + ("quazip" ,quazip-0) ("qtbase" ,qtbase-5) ("qtsvg" ,qtsvg))) (native-inputs diff --git a/gnu/packages/kde.scm b/gnu/packages/kde.scm index c5a3f43361..66a112d8b5 100644 --- a/gnu/packages/kde.scm +++ b/gnu/packages/kde.scm @@ -527,7 +527,7 @@ illustrate project schedules.") ("qtmultimedia" ,qtmultimedia) ("qtsvg" ,qtsvg) ("qtx11extras" ,qtx11extras) - ("quazip" ,quazip) + ("quazip" ,quazip-0) ("zlib" ,zlib))) (home-page "https://krita.org") (synopsis "Digital painting application") diff --git a/gnu/packages/ocr.scm b/gnu/packages/ocr.scm index a60aeaa3b5..20501505d8 100644 --- a/gnu/packages/ocr.scm +++ b/gnu/packages/ocr.scm @@ -182,7 +182,7 @@ monospaced or proportional.") ("sane-backends" ,sane-backends) ("qtbase" ,qtbase-5) ("qtspell" ,qtspell) - ("quazip" ,quazip) + ("quazip" ,quazip-0) ("tesseract" ,tesseract-ocr))) (home-page "https://github.com/manisandro/gImageReader") (synopsis "Qt front-end to tesseract-ocr") diff --git a/gnu/packages/password-utils.scm b/gnu/packages/password-utils.scm index a867fe1d94..1b8df3ebe3 100644 --- a/gnu/packages/password-utils.scm +++ b/gnu/packages/password-utils.scm @@ -166,7 +166,7 @@ human.") ("qtbase" ,qtbase-5) ("qtsvg" ,qtsvg) ("qtx11extras" ,qtx11extras) - ("quazip" ,quazip) ; XC_KEESHARE + ("quazip" ,quazip-0) ; XC_KEESHARE ("readline" ,readline) ("yubikey-personalization" ,yubikey-personalization) ; XC_YUBIKEY ("zlib" ,zlib))) -- cgit v1.2.3