diff options
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 |
commit | fc5f522017e091b634a26aad59d29816fc167cc1 (patch) | |
tree | e09dbb65202f0473da2f4829a60b426893fef301 | |
parent | ac027590f05665081b3c362aee08cab56d559d9c (diff) | |
download | slackbuilds-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.patch | 26 | ||||
-rw-r--r-- | development/regexxer/regexxer.SlackBuild | 4 |
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 @@ | |||
1 | Index: regexxer-0.9/src/globalstrings.h | ||
2 | =================================================================== | ||
3 | --- regexxer-0.9.orig/src/globalstrings.h | ||
4 | +++ regexxer-0.9/src/globalstrings.h | ||
5 | @@ -21,7 +21,7 @@ | ||
6 | #ifndef REGEXXER_GLOBALSTRINGS_H_INCLUDED | ||
7 | #define REGEXXER_GLOBALSTRINGS_H_INCLUDED | ||
8 | |||
9 | -#include <glib/gutils.h> /* for G_DIR_SEPARATOR_S */ | ||
10 | +#include <glib.h> /* for G_DIR_SEPARATOR_S */ | ||
11 | |||
12 | namespace Regexxer | ||
13 | { | ||
14 | Index: regexxer-0.9/src/translation.h | ||
15 | =================================================================== | ||
16 | --- regexxer-0.9.orig/src/translation.h | ||
17 | +++ regexxer-0.9/src/translation.h | ||
18 | @@ -21,7 +21,7 @@ | ||
19 | #ifndef REGEXXER_TRANSLATION_H_INCLUDED | ||
20 | #define REGEXXER_TRANSLATION_H_INCLUDED | ||
21 | |||
22 | -#include <glib/gmacros.h> | ||
23 | +#include <glib.h> | ||
24 | #include <glibmm/ustring.h> | ||
25 | |||
26 | #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 | |||
@@ -51,6 +51,10 @@ find . \ | |||
51 | \( -perm 666 -o -perm 664 -o -perm 600 -o -perm 444 -o -perm 440 -o -perm 400 \) \ | 51 | \( -perm 666 -o -perm 664 -o -perm 600 -o -perm 444 -o -perm 440 -o -perm 400 \) \ |
52 | -exec chmod 644 {} \; | 52 | -exec chmod 644 {} \; |
53 | 53 | ||
54 | # Starting with glib 2.32 it is now mandatory to | ||
55 | # include glib.h instead of individual headers. | ||
56 | patch -p1 -i $CWD/glib-single-include.patch | ||
57 | |||
54 | CFLAGS="$SLKCFLAGS" \ | 58 | CFLAGS="$SLKCFLAGS" \ |
55 | CXXFLAGS="$SLKCFLAGS" \ | 59 | CXXFLAGS="$SLKCFLAGS" \ |
56 | ./configure \ | 60 | ./configure \ |