gnu: sxiv: Update to 24.

* gnu/packages/image-viewers.scm (sxiv): Update to 24.
[inputs]: Add freetype and libxft.
[arguments]: Pass freetype header location in #:make-flags.  Be verbose.
This commit is contained in:
Tobias Geerinckx-Rice 2018-01-17 16:16:21 +01:00
parent ba4919122a
commit 6c162d0e52
No known key found for this signature in database
GPG key ID: 0DB0FF884F556D79

View file

@ -7,6 +7,7 @@
;;; Copyright © 2017 ng0 <contact.ng0@cryptolab.net> ;;; Copyright © 2017 ng0 <contact.ng0@cryptolab.net>
;;; Copyright © 2017 Mathieu Othacehe <m.othacehe@gmail.com> ;;; Copyright © 2017 Mathieu Othacehe <m.othacehe@gmail.com>
;;; Copyright © 2017 nee <nee-git@hidamari.blue> ;;; Copyright © 2017 nee <nee-git@hidamari.blue>
;;; Copyright © 2018 Tobias Geerinckx-Rice <me@tobias.gr>
;;; ;;;
;;; This file is part of GNU Guix. ;;; This file is part of GNU Guix.
;;; ;;;
@ -36,6 +37,7 @@ (define-module (gnu packages image-viewers)
#:use-module (gnu packages boost) #:use-module (gnu packages boost)
#:use-module (gnu packages compression) #:use-module (gnu packages compression)
#:use-module (gnu packages curl) #:use-module (gnu packages curl)
#:use-module (gnu packages fontutils)
#:use-module (gnu packages ghostscript) #:use-module (gnu packages ghostscript)
#:use-module (gnu packages glib) #:use-module (gnu packages glib)
#:use-module (gnu packages gnome) #:use-module (gnu packages gnome)
@ -176,7 +178,7 @@ (define-public gpicview
(define-public sxiv (define-public sxiv
(package (package
(name "sxiv") (name "sxiv")
(version "1.3.2") (version "24")
(source (origin (source (origin
(method url-fetch) (method url-fetch)
(uri (string-append (uri (string-append
@ -185,19 +187,29 @@ (define-public sxiv
(file-name (string-append name "-" version ".tar.gz")) (file-name (string-append name "-" version ".tar.gz"))
(sha256 (sha256
(base32 (base32
"0lxnd33gaw4drhdwbkk94wzrjyhh64d57jq2ps7ffmqgizg6hlwz")))) "044i077li6m4zsz2fswlcdi2m0sbr9mwws1h3k1zjaln29fw87ai"))))
(build-system gnu-build-system) (build-system gnu-build-system)
(arguments (arguments
'(#:tests? #f ; no check target `(#:tests? #f ; no check target
#:make-flags (list (string-append "PREFIX=" %output) #:make-flags
"CC=gcc") (list (string-append "PREFIX=" %output)
;; no configure phase "CC=gcc"
#:phases (modify-phases %standard-phases (delete 'configure)))) ;; Xft.h #includes <ft2build.h> (without freetype2/). The sxiv
;; Makefile works around this by hard-coding /usr/include instead.
(string-append "DEF_CPPFLAGS=-I"
(assoc-ref %build-inputs "freetype")
"/include/freetype2")
"V=1")
#:phases
(modify-phases %standard-phases
(delete 'configure)))) ; no configure script
(inputs (inputs
`(("libx11" ,libx11) `(("freetype" ,freetype)
("imlib2" ,imlib2)
("giflib" ,giflib) ("giflib" ,giflib)
("libexif" ,libexif))) ("imlib2" ,imlib2)
("libexif" ,libexif)
("libx11" ,libx11)
("libxft" ,libxft)))
(home-page "https://github.com/muennich/sxiv") (home-page "https://github.com/muennich/sxiv")
(synopsis "Simple X Image Viewer") (synopsis "Simple X Image Viewer")
(description (description