summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
author dsomero <xgizzmo@slackbuilds.org>2012-09-06 14:53:45 -0400
committer Robby Workman <rworkman@slackbuilds.org>2012-09-06 17:13:43 -0500
commitfc5f522017e091b634a26aad59d29816fc167cc1 (patch)
treee09dbb65202f0473da2f4829a60b426893fef301
parentac027590f05665081b3c362aee08cab56d559d9c (diff)
downloadslackbuilds-fc5f522017e091b634a26aad59d29816fc167cc1.tar.gz
slackbuilds-fc5f522017e091b634a26aad59d29816fc167cc1.tar.xz
development/regexxer: Patched for glib 2.32+.
Signed-off-by: dsomero <xgizzmo@slackbuilds.org>
-rw-r--r--development/regexxer/glib-single-include.patch26
-rw-r--r--development/regexxer/regexxer.SlackBuild4
2 files changed, 30 insertions, 0 deletions
diff --git a/development/regexxer/glib-single-include.patch b/development/regexxer/glib-single-include.patch
new file mode 100644
index 0000000000..7570e6b99c
--- /dev/null
+++ b/development/regexxer/glib-single-include.patch
@@ -0,0 +1,26 @@
+Index: regexxer-0.9/src/globalstrings.h
+===================================================================
+--- regexxer-0.9.orig/src/globalstrings.h
++++ regexxer-0.9/src/globalstrings.h
+@@ -21,7 +21,7 @@
+ #ifndef REGEXXER_GLOBALSTRINGS_H_INCLUDED
+ #define REGEXXER_GLOBALSTRINGS_H_INCLUDED
+
+-#include <glib/gutils.h> /* for G_DIR_SEPARATOR_S */
++#include <glib.h> /* for G_DIR_SEPARATOR_S */
+
+ namespace Regexxer
+ {
+Index: regexxer-0.9/src/translation.h
+===================================================================
+--- regexxer-0.9.orig/src/translation.h
++++ regexxer-0.9/src/translation.h
+@@ -21,7 +21,7 @@
+ #ifndef REGEXXER_TRANSLATION_H_INCLUDED
+ #define REGEXXER_TRANSLATION_H_INCLUDED
+
+-#include <glib/gmacros.h>
++#include <glib.h>
+ #include <glibmm/ustring.h>
+
+ #ifndef gettext_noop
diff --git a/development/regexxer/regexxer.SlackBuild b/development/regexxer/regexxer.SlackBuild
index 438a751f4b..c4ee246065 100644
--- a/development/regexxer/regexxer.SlackBuild
+++ b/development/regexxer/regexxer.SlackBuild
@@ -48,12 +48,16 @@ chown -R root:root .
find . \
\( -perm 777 -o -perm 775 -o -perm 711 -o -perm 555 -o -perm 511 \) \
-exec chmod 755 {} \; -o \
\( -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 \
--prefix=/usr \
--libdir=/usr/lib${LIBDIRSUFFIX} \
--sysconfdir=/etc \