summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJaka Kranjc2008-04-28 17:51:13 +0200
committerEric Sandall2008-04-29 13:10:18 -0700
commit775f4dce31937beb79a9b52f6bcc21fd3ce4ce50 (patch)
tree866296f26351a91f68d7a9eff7a5d46da8c8120b
parent8b7dd00f3ba6f9b582869314fee17816738115c9 (diff)
rss-glx: fixed #14475 and compilation
(cherry picked from commit 8cbb928cefefd3ca34c57d9076180823d0418bd0)
-rw-r--r--x11/rss-glx/HISTORY4
-rwxr-xr-xx11/rss-glx/PRE_BUILD4
-rw-r--r--x11/rss-glx/gcc43.patch11
-rw-r--r--x11/rss-glx/imagemagick.patch10
4 files changed, 29 insertions, 0 deletions
diff --git a/x11/rss-glx/HISTORY b/x11/rss-glx/HISTORY
index a4825d6fd6..3ad5ec90d1 100644
--- a/x11/rss-glx/HISTORY
+++ b/x11/rss-glx/HISTORY
@@ -1,3 +1,7 @@
+2008-04-28 Jaka Kranjc <lynxlynxlynx@sourcemage.org>
+ * PRE_BUILD, gcc43.patch: ported to gcc43
+ * imagemagick.patch: added patch from gentoo for #14475
+
2008-01-05 Jaka Kranjc <lynxlynxlynx@sourcemage.org>
* DEPENDS: added imagemagick #14196
diff --git a/x11/rss-glx/PRE_BUILD b/x11/rss-glx/PRE_BUILD
new file mode 100755
index 0000000000..a83b47f893
--- /dev/null
+++ b/x11/rss-glx/PRE_BUILD
@@ -0,0 +1,4 @@
+default_pre_build &&
+cd "$SOURCE_DIRECTORY" &&
+patch -p1 < $SPELL_DIRECTORY/imagemagick.patch &&
+patch -p4 < $SPELL_DIRECTORY/gcc43.patch
diff --git a/x11/rss-glx/gcc43.patch b/x11/rss-glx/gcc43.patch
new file mode 100644
index 0000000000..0db3571632
--- /dev/null
+++ b/x11/rss-glx/gcc43.patch
@@ -0,0 +1,11 @@
+--- /usr/src/rss-glx_0.8.1/reallyslick/Implicit/impSurface.cpp.orig 2008-04-28 17:45:14.000000000 +0200
++++ /usr/src/rss-glx_0.8.1/reallyslick/Implicit/impSurface.cpp 2008-04-28 17:45:52.000000000 +0200
+@@ -21,6 +21,7 @@
+ #include <Implicit/impSurface.h>
+ #include <math.h>
+ #include <iostream>
++#include <cstring>
+
+
+
+
diff --git a/x11/rss-glx/imagemagick.patch b/x11/rss-glx/imagemagick.patch
new file mode 100644
index 0000000000..772f55d24d
--- /dev/null
+++ b/x11/rss-glx/imagemagick.patch
@@ -0,0 +1,10 @@
+--- rss-glx_0.8.1/other_src/Makefile.in 2006-02-25 21:14:56.000000000 +0000
++++ rss-glx_0.8.1.new/other_src/Makefile.in 2008-03-27 16:00:53.000000000 +0000
+@@ -232,6 +232,7 @@
+ sysconfdir = @sysconfdir@
+ target_alias = @target_alias@
+ INCLUDES = -I$(top_srcdir)/include -I$(top_srcdir)/src
++AM_CFLAGS = $(Wand_CFLAGS)
+ biof_SOURCES = driver.c biof.c
+ busyspheres_SOURCES = driver.c busyspheres.c
+ matrixview_SOURCES = driver.c matrixview.c matrixview_textures.c