summaryrefslogtreecommitdiffstats
path: root/libraries
diff options
context:
space:
mode:
author dsomero2012-09-06 21:18:55 +0200
committer Robby Workman2012-09-07 00:16:40 +0200
commitf0745d2257fce6d32090fe8548589679af6b8153 (patch)
tree6e37d04125e8bfe1814ba1c39108dcf8f4ff47a3 /libraries
parent80343e3789b63904324f3a0133b78171809c2a80 (diff)
downloadslackbuilds-f0745d2257fce6d32090fe8548589679af6b8153.tar.gz
libraries/equinox: Patched for glib 2.32+.
Signed-off-by: dsomero <xgizzmo@slackbuilds.org>
Diffstat (limited to 'libraries')
-rw-r--r--libraries/equinox/equinox.SlackBuild7
-rw-r--r--libraries/equinox/glib-single-include.patch13
2 files changed, 19 insertions, 1 deletions
diff --git a/libraries/equinox/equinox.SlackBuild b/libraries/equinox/equinox.SlackBuild
index c0f1ff3596..04988490cb 100644
--- a/libraries/equinox/equinox.SlackBuild
+++ b/libraries/equinox/equinox.SlackBuild
@@ -6,8 +6,9 @@
PRGNAM=equinox
VERSION=${VERSION:-1.50}
-BUILD=${BUILD:-1}
+BUILD=${BUILD:-2}
TAG=${TAG:-_SBo}
+
DOCS="AUTHORS COPYING ChangeLog INSTALL NEWS README"
if [ -z "$ARCH" ]; then
@@ -52,6 +53,10 @@ find . \
\( -perm 666 -o -perm 664 -o -perm 600 -o -perm 444 -o -perm 440 -o -perm 400 \) \
-exec chmod 644 {} \;
+# Starting with glib 2.32 it is now mandatory to
+# include glib.h instead of individual headers.
+patch -p1 -i $CWD/glib-single-include.patch
+
CFLAGS="$SLKCFLAGS" \
CXXFLAGS="$SLKCFLAGS" \
./configure \
diff --git a/libraries/equinox/glib-single-include.patch b/libraries/equinox/glib-single-include.patch
new file mode 100644
index 0000000000..3784a0aca7
--- /dev/null
+++ b/libraries/equinox/glib-single-include.patch
@@ -0,0 +1,13 @@
+Index: equinox-1.50/src/animation.c
+===================================================================
+--- equinox-1.50.orig/src/animation.c
++++ equinox-1.50/src/animation.c
+@@ -7,7 +7,7 @@
+ #include "animation.h"
+
+ #ifdef HAVE_ANIMATION
+-#include <glib/gtimer.h>
++#include <glib.h>
+
+ struct _AnimationInfo {
+ GTimer *timer;