From: r0man <roman.scherer@burningswell.com>
To: 56597@debbugs.gnu.org
Subject: [bug#56597] [PATCH] gnu: xscreensaver: Update to 6.04.
Date: Sat, 16 Jul 2022 11:16:40 +0200 [thread overview]
Message-ID: <87r12lqurl.fsf@burningswell.com> (raw)
[-- Attachment #1.1: Type: text/plain, Size: 257 bytes --]
Hello Guix,
this patch updates xscreensaver to version 6.04. I had to replace the
configure phase, because xscreensaver uses an autoconf script that does
not understand the --enable-fast-install flag.
Could you please review this patch?
Thanks, Roman.
[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #1.2: 0001-gnu-xscreensaver-Update-to-6.04.patch --]
[-- Type: text/x-patch, Size: 3093 bytes --]
From 9fb6c5eb00d6446baf92ebbe88018d4d4a1d081c Mon Sep 17 00:00:00 2001
Message-Id: <9fb6c5eb00d6446baf92ebbe88018d4d4a1d081c.1657962947.git.roman@burningswell.com>
From: r0man <roman@burningswell.com>
Date: Sat, 16 Jul 2022 11:13:54 +0200
Subject: [PATCH] gnu: xscreensaver: Update to 6.04.
* gnu/packages/xdisorg.scm (xscreensaver): Update to 6.04.
---
gnu/packages/xdisorg.scm | 26 +++++++++++++++++++++-----
1 file changed, 21 insertions(+), 5 deletions(-)
diff --git a/gnu/packages/xdisorg.scm b/gnu/packages/xdisorg.scm
index d345bc461d..730b19b51a 100644
--- a/gnu/packages/xdisorg.scm
+++ b/gnu/packages/xdisorg.scm
@@ -1585,7 +1585,7 @@ (define-public gammastep
(define-public xscreensaver
(package
(name "xscreensaver")
- (version "5.45")
+ (version "6.04")
(source
(origin
(method url-fetch)
@@ -1593,7 +1593,7 @@ (define-public xscreensaver
(string-append "https://www.jwz.org/xscreensaver/xscreensaver-"
version ".tar.gz"))
(sha256
- (base32 "03fmyjlwjinzv7mih6n07glmys8s877snd8zijk2c0ds6rkxy5kh"))))
+ (base32 "0lmiyvp3qs2gngd53f191jmlizs9l04i2gnrqbn96mqckyr18w3q"))))
(build-system gnu-build-system)
(arguments
`(#:tests? #f ; no check target
@@ -1604,9 +1604,24 @@ (define-public xscreensaver
(substitute* '("driver/Makefile.in" "po/Makefile.in.in")
(("@GTK_DATADIR@") "@datadir@")
(("@PO_DATADIR@") "@datadir@"))
- #t)))
- #:configure-flags '("--with-pam" "--with-proc-interrupts"
- "--without-readdisplay")
+ #t))
+ (replace 'configure
+ (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="
(assoc-ref %outputs "out")
"/lib/X11/app-defaults"))))
@@ -1626,6 +1641,7 @@ (define-public xscreensaver
("libjpeg" ,libjpeg-turbo)
("linux-pam" ,linux-pam)
("pango" ,pango)
+ ("gdk-pixbuf-xlib", gdk-pixbuf-xlib)
("gtk+" ,gtk+)
("perl" ,perl)
("cairo" ,cairo)
--
2.36.1
[-- Attachment #2: signature.asc --]
[-- Type: application/pgp-signature, Size: 528 bytes --]
next reply other threads:[~2022-07-16 9:23 UTC|newest]
Thread overview: 5+ messages / expand[flat|nested] mbox.gz Atom feed top
2022-07-16 9:16 r0man [this message]
2022-08-03 10:19 ` bug#56597: [PATCH] gnu: xscreensaver: Update to 6.04 Ludovic Courtès
2022-08-03 15:58 ` [bug#56597] " Ludovic Courtès
2022-08-09 7:29 ` Rick Huyzer
2022-08-21 10:27 ` Reza Alizadeh Majd
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
List information: https://guix.gnu.org/
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=87r12lqurl.fsf@burningswell.com \
--to=roman.scherer@burningswell.com \
--cc=56597@debbugs.gnu.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
Code repositories for project(s) associated with this public inbox
https://git.savannah.gnu.org/cgit/guix.git
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 read-only IMAP folder(s) and NNTP newsgroup(s).