gnu: xscreensaver: Update to 6.04.

* gnu/packages/xdisorg.scm (xscreensaver): Update to 6.04.

Signed-off-by: Ludovic Courtès <ludo@gnu.org>
This commit is contained in:
r0man 2022-07-16 11:13:54 +02:00 committed by Ludovic Courtès
parent 28e523cc32
commit 45456595ac
No known key found for this signature in database
GPG Key ID: 090B11993D9AEBB5

View File

@ -1627,7 +1627,7 @@ less if you are working in front of the screen at night.")
(define-public xscreensaver (define-public xscreensaver
(package (package
(name "xscreensaver") (name "xscreensaver")
(version "5.45") (version "6.04")
(source (source
(origin (origin
(method url-fetch) (method url-fetch)
@ -1635,7 +1635,7 @@ less if you are working in front of the screen at night.")
(string-append "https://www.jwz.org/xscreensaver/xscreensaver-" (string-append "https://www.jwz.org/xscreensaver/xscreensaver-"
version ".tar.gz")) version ".tar.gz"))
(sha256 (sha256
(base32 "03fmyjlwjinzv7mih6n07glmys8s877snd8zijk2c0ds6rkxy5kh")))) (base32 "0lmiyvp3qs2gngd53f191jmlizs9l04i2gnrqbn96mqckyr18w3q"))))
(build-system gnu-build-system) (build-system gnu-build-system)
(arguments (arguments
`(#:tests? #f ; no check target `(#:tests? #f ; no check target
@ -1646,9 +1646,24 @@ less if you are working in front of the screen at night.")
(substitute* '("driver/Makefile.in" "po/Makefile.in.in") (substitute* '("driver/Makefile.in" "po/Makefile.in.in")
(("@GTK_DATADIR@") "@datadir@") (("@GTK_DATADIR@") "@datadir@")
(("@PO_DATADIR@") "@datadir@")) (("@PO_DATADIR@") "@datadir@"))
#t))) #t))
#:configure-flags '("--with-pam" "--with-proc-interrupts" (replace 'configure
"--without-readdisplay") (lambda* (#:key outputs #:allow-other-keys)
;; The tarball uses a very old version of autconf. It does not
;; understand extra flags like `--enable-fast-install', so
;; we need to invoke it with just what it understands.
(let ((out (assoc-ref outputs "out")))
;; 'configure' doesn't understand '--host'.
,@(if (%current-target-system)
`((setenv "CHOST" ,(%current-target-system)))
'())
(setenv "CONFIG_SHELL" (which "bash"))
(setenv "SHELL" (which "bash"))
(invoke "./configure"
(string-append "--prefix=" out)
"--with-pam"
"--with-proc-interrupts"
"--without-readdisplay")))))
#:make-flags (list (string-append "AD_DIR=" #:make-flags (list (string-append "AD_DIR="
(assoc-ref %outputs "out") (assoc-ref %outputs "out")
"/lib/X11/app-defaults")))) "/lib/X11/app-defaults"))))
@ -1668,6 +1683,7 @@ less if you are working in front of the screen at night.")
("libjpeg" ,libjpeg-turbo) ("libjpeg" ,libjpeg-turbo)
("linux-pam" ,linux-pam) ("linux-pam" ,linux-pam)
("pango" ,pango) ("pango" ,pango)
("gdk-pixbuf-xlib", gdk-pixbuf-xlib)
("gtk+" ,gtk+) ("gtk+" ,gtk+)
("perl" ,perl) ("perl" ,perl)
("cairo" ,cairo) ("cairo" ,cairo)