summaryrefslogtreecommitdiffstats
path: root/office
diff options
context:
space:
mode:
author Robby Workman <rworkman@slackbuilds.org>2012-08-03 21:28:36 -0500
committer Robby Workman <rworkman@slackbuilds.org>2012-08-03 21:28:36 -0500
commitbcf034dd33f1310c317b7eba932789cb9c295a01 (patch)
treed0e4c3be4430c15d56d8d7475eca07388cc349df /office
parent1d1b366bfc3df329835d97ed77b7c02029fe0f72 (diff)
downloadslackbuilds-bcf034dd33f1310c317b7eba932789cb9c295a01.tar.gz
slackbuilds-bcf034dd33f1310c317b7eba932789cb9c295a01.tar.xz
office/epdfview: Include glib.h instead of glib/gmacros.h
Signed-off-by: Robby Workman <rworkman@slackbuilds.org>
Diffstat (limited to 'office')
-rw-r--r--office/epdfview/epdfview.SlackBuild5
-rw-r--r--office/epdfview/fix-glib_h-include.diff12
2 files changed, 16 insertions, 1 deletions
diff --git a/office/epdfview/epdfview.SlackBuild b/office/epdfview/epdfview.SlackBuild
index 1367c499ea..e7f7ef7f91 100644
--- a/office/epdfview/epdfview.SlackBuild
+++ b/office/epdfview/epdfview.SlackBuild
@@ -26,7 +26,7 @@
PRGNAM=epdfview
VERSION=0.1.8
-BUILD=${BUILD:-1}
+BUILD=${BUILD:-2}
TAG=${TAG:-_SBo}
if [ -z "$ARCH" ]; then
@@ -71,6 +71,9 @@ find . \
\( -perm 666 -o -perm 664 -o -perm 600 -o -perm 444 -o -perm 440 -o -perm 400 \) \
-exec chmod 644 {} \;
+# Include glib.h instead of glib/gmacros.h
+patch -p1 < $CWD/fix-glib_h-include.diff
+
CFLAGS="$SLKCFLAGS" \
CXXFLAGS="$SLKCFLAGS" \
./configure \
diff --git a/office/epdfview/fix-glib_h-include.diff b/office/epdfview/fix-glib_h-include.diff
new file mode 100644
index 0000000000..b45ee4f933
--- /dev/null
+++ b/office/epdfview/fix-glib_h-include.diff
@@ -0,0 +1,12 @@
+diff -Nur epdfview-0.1.8.orig/src/gtk/StockIcons.h epdfview-0.1.8/src/gtk/StockIcons.h
+--- epdfview-0.1.8.orig/src/gtk/StockIcons.h 2011-05-28 05:24:57.000000000 -0500
++++ epdfview-0.1.8/src/gtk/StockIcons.h 2012-08-03 21:25:47.540948945 -0500
+@@ -18,7 +18,7 @@
+ #if !defined (__STOCK_ICONS_H__)
+ #define __STOCK_ICONS_H__
+
+-#include <glib/gmacros.h>
++#include <glib.h>
+
+ G_BEGIN_DECLS
+