summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorTomas Chvatal <scarabeus@gentoo.org>2009-03-13 20:31:33 +0000
committerTomas Chvatal <scarabeus@gentoo.org>2009-03-13 20:31:33 +0000
commit73f09306d5ea8f4cf761ad066314d4919286d354 (patch)
tree458fa7c733059bd8e6cb6ceb4e6f71434abe8357 /x11-misc
parentMarking texlive-langnorwegian-2008 ppc64 for bug 235551 (diff)
downloadgentoo-2-73f09306d5ea8f4cf761ad066314d4919286d354.tar.gz
gentoo-2-73f09306d5ea8f4cf761ad066314d4919286d354.tar.bz2
gentoo-2-73f09306d5ea8f4cf761ad066314d4919286d354.zip
Fix compilation of glforrestfire with -opengl. Per bug #256072. Needed by kscreensaver so we need it fixed. Slap me later if you dont like it.
(Portage version: 2.2_rc24/cvs/Linux x86_64)
Diffstat (limited to 'x11-misc')
-rw-r--r--x11-misc/xscreensaver/ChangeLog7
-rw-r--r--x11-misc/xscreensaver/files/5.07/03_all_glforrestfire.patch13
-rw-r--r--x11-misc/xscreensaver/files/5.08/03_all_glforrestfire.patch13
3 files changed, 32 insertions, 1 deletions
diff --git a/x11-misc/xscreensaver/ChangeLog b/x11-misc/xscreensaver/ChangeLog
index 2821849a67aa..a320f3e6996b 100644
--- a/x11-misc/xscreensaver/ChangeLog
+++ b/x11-misc/xscreensaver/ChangeLog
@@ -1,6 +1,11 @@
# ChangeLog for x11-misc/xscreensaver
# Copyright 2002-2009 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/x11-misc/xscreensaver/ChangeLog,v 1.246 2009/01/19 15:06:44 ssuominen Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-misc/xscreensaver/ChangeLog,v 1.247 2009/03/13 20:31:32 scarabeus Exp $
+
+ 13 Mar 2009; Tomas Chvatal <scarabeus@gentoo.org>
+ +files/5.07/03_all_glforrestfire.patch,
+ +files/5.08/03_all_glforrestfire.patch:
+ Fix compilation of glforrestfire with -opengl. Per bug #256072.
19 Jan 2009; Samuli Suominen <ssuominen@gentoo.org>
xscreensaver-5.08.ebuild:
diff --git a/x11-misc/xscreensaver/files/5.07/03_all_glforrestfire.patch b/x11-misc/xscreensaver/files/5.07/03_all_glforrestfire.patch
new file mode 100644
index 000000000000..cca0abad0e75
--- /dev/null
+++ b/x11-misc/xscreensaver/files/5.07/03_all_glforrestfire.patch
@@ -0,0 +1,13 @@
+--- xscreensaver-5.08/hacks/glx/Makefile.in 2008-12-28 09:59:21.000000000 +0200
++++ xscreensaver-5.08/hacks/glx/Makefile.in 2009-01-24 19:39:35.000000000 +0200
+@@ -169,8 +169,8 @@
+ GRAB_OBJS = $(UTILS_BIN)/grabclient.o grab-ximage.o $(XSHM_OBJS)
+ EXES = @GL_UTIL_EXES@ $(HACK_EXES)
+
+-RETIRED_EXES = glforestfire
+-RETIRED_GL_EXES = @RETIRED_GL_EXES@
++RETIRED_EXES =
++RETIRED_GL_EXES = glforestfire
+
+ HACK_OBJS = $(HACK_BIN)/screenhack.o $(HACK_BIN)/fps.o \
+ xlockmore-gl.o xlock-gl-utils.o glxfonts.o fps-gl.o \
diff --git a/x11-misc/xscreensaver/files/5.08/03_all_glforrestfire.patch b/x11-misc/xscreensaver/files/5.08/03_all_glforrestfire.patch
new file mode 100644
index 000000000000..cca0abad0e75
--- /dev/null
+++ b/x11-misc/xscreensaver/files/5.08/03_all_glforrestfire.patch
@@ -0,0 +1,13 @@
+--- xscreensaver-5.08/hacks/glx/Makefile.in 2008-12-28 09:59:21.000000000 +0200
++++ xscreensaver-5.08/hacks/glx/Makefile.in 2009-01-24 19:39:35.000000000 +0200
+@@ -169,8 +169,8 @@
+ GRAB_OBJS = $(UTILS_BIN)/grabclient.o grab-ximage.o $(XSHM_OBJS)
+ EXES = @GL_UTIL_EXES@ $(HACK_EXES)
+
+-RETIRED_EXES = glforestfire
+-RETIRED_GL_EXES = @RETIRED_GL_EXES@
++RETIRED_EXES =
++RETIRED_GL_EXES = glforestfire
+
+ HACK_OBJS = $(HACK_BIN)/screenhack.o $(HACK_BIN)/fps.o \
+ xlockmore-gl.o xlock-gl-utils.o glxfonts.o fps-gl.o \