aboutsummaryrefslogtreecommitdiff
path: root/desktop
diff options
context:
space:
mode:
authordsomero <xgizzmo@slackbuilds.org>2012-09-06 21:49:38 -0400
committerRobby Workman <rworkman@slackbuilds.org>2012-09-06 21:42:28 -0500
commit92410e150a578d61578431fe810f102d1b79aaa4 (patch)
tree020a9e602b7f30ad9bbe086291215c69f470a536 /desktop
parentcff2f8f628c2a44187cadc5f84ace88f9952c903 (diff)
desktop/gtk-engines: Patched for glib 2.32+.
Signed-off-by: dsomero <xgizzmo@slackbuilds.org>
Diffstat (limited to 'desktop')
-rw-r--r--desktop/gtk-engines/glib-single-include.patch13
-rw-r--r--desktop/gtk-engines/gtk-engines.SlackBuild6
2 files changed, 18 insertions, 1 deletions
diff --git a/desktop/gtk-engines/glib-single-include.patch b/desktop/gtk-engines/glib-single-include.patch
new file mode 100644
index 0000000000000..ca64fee330211
--- /dev/null
+++ b/desktop/gtk-engines/glib-single-include.patch
@@ -0,0 +1,13 @@
+Index: gtk-engines-2.20.2/engines/clearlooks/src/animation.c
+===================================================================
+--- gtk-engines-2.20.2.orig/engines/clearlooks/src/animation.c
++++ gtk-engines-2.20.2/engines/clearlooks/src/animation.c
+@@ -28,7 +28,7 @@
+ #include "animation.h"
+
+ #ifdef HAVE_WORKING_ANIMATION
+-#include <glib/gtimer.h>
++#include <glib.h>
+
+ struct _AnimationInfo {
+ GTimer *timer;
diff --git a/desktop/gtk-engines/gtk-engines.SlackBuild b/desktop/gtk-engines/gtk-engines.SlackBuild
index 083f3290cba24..1266b17880ac5 100644
--- a/desktop/gtk-engines/gtk-engines.SlackBuild
+++ b/desktop/gtk-engines/gtk-engines.SlackBuild
@@ -21,7 +21,7 @@
PRGNAM=gtk-engines
VERSION=${VERSION:-2.20.2}
-BUILD=${BUILD:-1}
+BUILD=${BUILD:-2}
TAG=${TAG:-_SBo}
if [ -z "$ARCH" ]; then
@@ -65,6 +65,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 \