ryan77627/guix
1
0
Fork 0
mirror of https://git.in.rschanz.org/ryan77627/guix.git synced 2025-01-05 19:11:43 -05:00
Code Issues Projects Releases Packages Wiki Activity Actions

gnu: fgallery: Update to 1.9.1.

Browse source 
* gnu/packages/graphics.scm (fgallery): Update to 1.9.1.
[arguments]: Use new Makefile in install phase.
[inputs]: Add bash-minimal for wrap-program.  Use new style.
[source,home-page]: "http" -> "https".
This commit is contained in:
Eric Bavier 2023-02-14 21:33:44 -06:00
parent c0e9ddfa29
commit d2504fbe45
No known key found for this signature in database
GPG key ID: BC45CA67E2F8D007
1 changed files with 22 additions and 31 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

53
gnu/packages/graphics.scm
View file

@ -35,6 +35,7 @@
;;; Copyright © 2022 dan <i@dan.games> ;;; Copyright © 2022 dan <i@dan.games>
;;; Copyright © 2023 Sharlatan Hellseher <sharlatanus@gmail.com> ;;; Copyright © 2023 Sharlatan Hellseher <sharlatanus@gmail.com>
;;; Copyright © 2023 David Thompson <dthompson2@worcester.edu> ;;; Copyright © 2023 David Thompson <dthompson2@worcester.edu>
;;; Copyright © 2023 Eric Bavier <bavier@posteo.net>
;;; ;;;
;;; This file is part of GNU Guix. ;;; This file is part of GNU Guix.
;;; ;;;
@ -1734,16 +1735,16 @@ (define-public python-pastel
(define-public fgallery (define-public fgallery
(package (package
(name "fgallery") (name "fgallery")
(version "1.8.2") (version "1.9.1")
(source (origin (source (origin
(method url-fetch) (method url-fetch)
(uri (uri
(string-append (string-append
"http://www.thregr.org/~wavexx/software/fgallery/releases/" "https://www.thregr.org/~wavexx/software/fgallery/releases/"
"fgallery-" version ".zip")) "fgallery-" version ".zip"))
(sha256 (sha256
(base32 (base32
"18wlvqbxcng8pawimbc8f2422s8fnk840hfr6946lzsxr0ijakvf")))) "0zf6r88m2swgj1ylgh3qa1knzb4if501hzvga37h9psy8k179w8n"))))
(build-system gnu-build-system) (build-system gnu-build-system)
(arguments (arguments
`(#:tests? #f ; no tests `(#:tests? #f ; no tests
@ -1754,19 +1755,12 @@ (define-public fgallery
(replace 'install (replace 'install
(lambda* (#:key inputs outputs #:allow-other-keys) (lambda* (#:key inputs outputs #:allow-other-keys)
(let* ((out (assoc-ref outputs "out")) (let* ((out (assoc-ref outputs "out"))
(bin (string-append out "/bin/")) (script (string-append out "/bin/fgallery"))
(share (string-append out "/share/fgallery")) (perl5lib (getenv "PERL5LIB")))
(man (string-append out "/share/man/man1"))
(perl5lib (getenv "PERL5LIB"))
(script (string-append share "/fgallery")))
(define (bin-directory input-name) (define (bin-directory input-name)
(string-append (assoc-ref inputs input-name) "/bin")) (string-append (assoc-ref inputs input-name) "/bin"))
(mkdir-p man) (invoke "make" "install" (string-append "PREFIX=" out))
(copy-file "fgallery.1" (string-append man "/fgallery.1"))
(mkdir-p share)
(copy-recursively "." share)
;; fgallery copies files from store when it is run. The ;; fgallery copies files from store when it is run. The
;; read-only permissions from the store directories will cause ;; read-only permissions from the store directories will cause
@ -1776,37 +1770,34 @@ (define (bin-directory input-name)
(("'cp'") (("'cp'")
"'cp', '--no-preserve=all'")) "'cp', '--no-preserve=all'"))
(mkdir-p bin)
(symlink script (string-append out "/bin/fgallery"))
(wrap-program script (wrap-program script
`("PATH" ":" prefix `("PATH" ":" prefix
,(map bin-directory '("imagemagick" ,(map bin-directory '("imagemagick"
"lcms" "lcms"
"fbida" "fbida"
"libjpeg" "libjpeg-turbo"
"zip" "zip"
"jpegoptim" "jpegoptim"
"pngcrush" "pngcrush"
"p7zip"))) "p7zip")))
`("PERL5LIB" ":" prefix (,perl5lib))) `("PERL5LIB" ":" prefix (,perl5lib)))))))))
#t))))))
(native-inputs (native-inputs
(list unzip)) (list unzip))
;; TODO: Add missing optional dependency: facedetect. ;; TODO: Add missing optional dependency: facedetect.
(inputs (inputs
`(("imagemagick" ,imagemagick) (list bash-minimal
("lcms" ,lcms) imagemagick
("fbida" ,fbida) lcms
("libjpeg" ,libjpeg-turbo) fbida
("zip" ,zip) libjpeg-turbo
("perl" ,perl) zip
("perl-cpanel-json-xs" ,perl-cpanel-json-xs) perl
("perl-image-exiftool" ,perl-image-exiftool) perl-cpanel-json-xs
("jpegoptim" ,jpegoptim) perl-image-exiftool
("pngcrush" ,pngcrush) jpegoptim
("p7zip" ,p7zip))) pngcrush
(home-page "http://www.thregr.org/~wavexx/software/fgallery/") p7zip))
(home-page "https://www.thregr.org/~wavexx/software/fgallery/")
(synopsis "Static photo gallery generator") (synopsis "Static photo gallery generator")
(description (description
"FGallery is a static, JavaScript photo gallery generator with minimalist "FGallery is a static, JavaScript photo gallery generator with minimalist