Gentoo Archives: gentoo-commits

From: Sebastian Pipping <sping@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] repo/gentoo:master commit in: x11-misc/xscreensaver/files/, x11-misc/xscreensaver/
Date: Mon, 14 Jun 2021 10:18:44
Message-Id: 1623665892.f98fd90d3276407a021879491e05d53b43827c3c.sping@gentoo
1 commit: f98fd90d3276407a021879491e05d53b43827c3c
2 Author: Sebastian Pipping <sping <AT> gentoo <DOT> org>
3 AuthorDate: Mon Jun 14 10:16:57 2021 +0000
4 Commit: Sebastian Pipping <sping <AT> gentoo <DOT> org>
5 CommitDate: Mon Jun 14 10:18:12 2021 +0000
6 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=f98fd90d
7
8 x11-misc/xscreensaver: Fix compilation for USE=-opengl
9
10 Closes: https://bugs.gentoo.org/795891
11 Signed-off-by: Sebastian Pipping <sping <AT> gentoo.org>
12 Package-Manager: Portage-3.0.19, Repoman-3.0.3
13
14 .../xscreensaver-6.01-without-gl-makefile.patch | 28 ++++++++++++++++++++++
15 x11-misc/xscreensaver/xscreensaver-6.01.ebuild | 1 +
16 2 files changed, 29 insertions(+)
17
18 diff --git a/x11-misc/xscreensaver/files/xscreensaver-6.01-without-gl-makefile.patch b/x11-misc/xscreensaver/files/xscreensaver-6.01-without-gl-makefile.patch
19 new file mode 100644
20 index 00000000000..c98d5297e9b
21 --- /dev/null
22 +++ b/x11-misc/xscreensaver/files/xscreensaver-6.01-without-gl-makefile.patch
23 @@ -0,0 +1,28 @@
24 +From fa531a3ff2dd8aa4e0b6767e3390f88bfbaca791 Mon Sep 17 00:00:00 2001
25 +From: Sebastian Pipping <sebastian@×××××××.org>
26 +Date: Mon, 14 Jun 2021 12:11:32 +0200
27 +Subject: [PATCH] hacks/glx/Makefile.in: Fix target install-program for
28 + --without-gl
29 +
30 +Symptom was:
31 +/usr/bin/install: cannot stat 'sonar': No such file or directory
32 +---
33 + hacks/glx/Makefile.in | 2 +-
34 + 1 file changed, 1 insertion(+), 1 deletion(-)
35 +
36 +diff --git a/hacks/glx/Makefile.in b/hacks/glx/Makefile.in
37 +index ed07a1f..6ae969c 100644
38 +--- a/hacks/glx/Makefile.in
39 ++++ b/hacks/glx/Makefile.in
40 +@@ -320,7 +320,7 @@ install-program:: $(EXES)
41 + $(INSTALL_PROGRAM) $$program $$idir/$$program ; \
42 + done ; \
43 + \
44 +- exes="$(SUID_EXES)" ; \
45 ++ exes="@SUID_EXES@" ; \
46 + if [ @SETUID_HACKS@ = yes ]; then \
47 + sinst="$(INSTALL_SETUID)" ; \
48 + else \
49 +--
50 +2.31.1
51 +
52
53 diff --git a/x11-misc/xscreensaver/xscreensaver-6.01.ebuild b/x11-misc/xscreensaver/xscreensaver-6.01.ebuild
54 index 98a77ac0e73..a3c8734ec8e 100644
55 --- a/x11-misc/xscreensaver/xscreensaver-6.01.ebuild
56 +++ b/x11-misc/xscreensaver/xscreensaver-6.01.ebuild
57 @@ -80,6 +80,7 @@ PATCHES=(
58 "${FILESDIR}"/${PN}-6.01-gentoo.patch
59 "${FILESDIR}"/${PN}-5.45-gcc.patch
60 "${FILESDIR}"/${PN}-6.01-configure.ac-sandbox.patch
61 + "${FILESDIR}"/${PN}-6.01-without-gl-makefile.patch
62 )
63
64 src_prepare() {