summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorSebastian Pipping <sping@gentoo.org>2021-06-14 12:16:57 +0200
committerSebastian Pipping <sping@gentoo.org>2021-06-14 12:18:12 +0200
commitf98fd90d3276407a021879491e05d53b43827c3c (patch)
tree54330354ca2a8952ed647dff91009363cf169411 /x11-misc/xscreensaver
parentpackage.mask: Remove leftover app-misc/gcstar mask (diff)
downloadgentoo-f98fd90d3276407a021879491e05d53b43827c3c.tar.gz
gentoo-f98fd90d3276407a021879491e05d53b43827c3c.tar.bz2
gentoo-f98fd90d3276407a021879491e05d53b43827c3c.zip
x11-misc/xscreensaver: Fix compilation for USE=-opengl
Closes: https://bugs.gentoo.org/795891 Signed-off-by: Sebastian Pipping <sping@gentoo.org> Package-Manager: Portage-3.0.19, Repoman-3.0.3
Diffstat (limited to 'x11-misc/xscreensaver')
-rw-r--r--x11-misc/xscreensaver/files/xscreensaver-6.01-without-gl-makefile.patch28
-rw-r--r--x11-misc/xscreensaver/xscreensaver-6.01.ebuild1
2 files changed, 29 insertions, 0 deletions
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
new file mode 100644
index 000000000000..c98d5297e9b0
--- /dev/null
+++ b/x11-misc/xscreensaver/files/xscreensaver-6.01-without-gl-makefile.patch
@@ -0,0 +1,28 @@
+From fa531a3ff2dd8aa4e0b6767e3390f88bfbaca791 Mon Sep 17 00:00:00 2001
+From: Sebastian Pipping <sebastian@pipping.org>
+Date: Mon, 14 Jun 2021 12:11:32 +0200
+Subject: [PATCH] hacks/glx/Makefile.in: Fix target install-program for
+ --without-gl
+
+Symptom was:
+/usr/bin/install: cannot stat 'sonar': No such file or directory
+---
+ hacks/glx/Makefile.in | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/hacks/glx/Makefile.in b/hacks/glx/Makefile.in
+index ed07a1f..6ae969c 100644
+--- a/hacks/glx/Makefile.in
++++ b/hacks/glx/Makefile.in
+@@ -320,7 +320,7 @@ install-program:: $(EXES)
+ $(INSTALL_PROGRAM) $$program $$idir/$$program ; \
+ done ; \
+ \
+- exes="$(SUID_EXES)" ; \
++ exes="@SUID_EXES@" ; \
+ if [ @SETUID_HACKS@ = yes ]; then \
+ sinst="$(INSTALL_SETUID)" ; \
+ else \
+--
+2.31.1
+
diff --git a/x11-misc/xscreensaver/xscreensaver-6.01.ebuild b/x11-misc/xscreensaver/xscreensaver-6.01.ebuild
index 98a77ac0e730..a3c8734ec8ef 100644
--- a/x11-misc/xscreensaver/xscreensaver-6.01.ebuild
+++ b/x11-misc/xscreensaver/xscreensaver-6.01.ebuild
@@ -80,6 +80,7 @@ PATCHES=(
"${FILESDIR}"/${PN}-6.01-gentoo.patch
"${FILESDIR}"/${PN}-5.45-gcc.patch
"${FILESDIR}"/${PN}-6.01-configure.ac-sandbox.patch
+ "${FILESDIR}"/${PN}-6.01-without-gl-makefile.patch
)
src_prepare() {