summaryrefslogtreecommitdiff
path: root/desktop
diff options
context:
space:
mode:
authordsomero <xgizzmo@slackbuilds.org>2012-09-16 19:04:02 -0400
committerdsomero <xgizzmo@slackbuilds.org>2012-09-16 19:42:17 -0400
commitc82ea210efe517b0625f0132a80a754078e1efb0 (patch)
tree8066a625606af46a3a4ba2163614f3a74e0764c7 /desktop
parent9bd329be05c8d293648518ad1cc6273ad33e228d (diff)
downloadslackbuilds-c82ea210efe517b0625f0132a80a754078e1efb0.tar.gz
desktop/cairo-dock: Patched for glib 2.32+
Diffstat (limited to 'desktop')
-rw-r--r--desktop/cairo-dock/cairo-dock.SlackBuild6
-rw-r--r--desktop/cairo-dock/glib-single-include.patch13
2 files changed, 18 insertions, 1 deletions
diff --git a/desktop/cairo-dock/cairo-dock.SlackBuild b/desktop/cairo-dock/cairo-dock.SlackBuild
index 5a72f51cd7..9392108c33 100644
--- a/desktop/cairo-dock/cairo-dock.SlackBuild
+++ b/desktop/cairo-dock/cairo-dock.SlackBuild
@@ -23,7 +23,7 @@
PRGNAM=cairo-dock
VERSION=${VERSION:-2.3.0~2}
-BUILD=${BUILD:-1}
+BUILD=${BUILD:-2}
TAG=${TAG:-_SBo}
SRCBUILD=1
@@ -66,6 +66,10 @@ cd $PRGNAM-$VERSION
chown -R root:root .
chmod -R u+w,go+r-w,a-s .
+# 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
+
cmake \
-DCMAKE_C_FLAGS_RELEASE:STRING="$SLKCFLAGS" \
-DCMAKE_CXX_FLAGS_RELEASE:STRING="$SLKCFLAGS" \
diff --git a/desktop/cairo-dock/glib-single-include.patch b/desktop/cairo-dock/glib-single-include.patch
new file mode 100644
index 0000000000..f09298cd6f
--- /dev/null
+++ b/desktop/cairo-dock/glib-single-include.patch
@@ -0,0 +1,13 @@
+Index: cairo-dock-2.3.0~2/src/gldit/cairo-dock-keybinder.h
+===================================================================
+--- cairo-dock-2.3.0~2.orig/src/gldit/cairo-dock-keybinder.h
++++ cairo-dock-2.3.0~2/src/gldit/cairo-dock-keybinder.h
+@@ -31,7 +31,7 @@
+ #ifndef __CD_KEY_BINDER_H__
+ #define __CD_KEY_BINDER_H__
+
+-#include <glib/gtypes.h>
++#include <glib.h>
+ #include "cairo-dock-struct.h"
+ #include "cairo-dock-manager.h"
+