summaryrefslogtreecommitdiff
path: root/graphics
diff options
context:
space:
mode:
authorponce <matteo.bernardini@gmail.com>2012-05-30 06:22:09 +0200
committerRobby Workman <rworkman@slackbuilds.org>2012-08-21 08:55:30 -0500
commit0cfa1744b880b158c07dbc767514311ea2633c88 (patch)
tree5c79b91afc77ce9dcac3552330c495d0163052e3 /graphics
parenteed82ba7f01a3961ee56110db9908c00a3d6c526 (diff)
downloadslackbuilds-0cfa1744b880b158c07dbc767514311ea2633c88.tar.gz
graphics/graphviz: Added a fix for php-5.4.
Signed-off-by: Robby Workman <rworkman@slackbuilds.org>
Diffstat (limited to 'graphics')
-rw-r--r--graphics/graphviz/graphviz.SlackBuild5
-rw-r--r--graphics/graphviz/php_5.4_compat.patch17
2 files changed, 21 insertions, 1 deletions
diff --git a/graphics/graphviz/graphviz.SlackBuild b/graphics/graphviz/graphviz.SlackBuild
index 385a05f48f..82469e34d7 100644
--- a/graphics/graphviz/graphviz.SlackBuild
+++ b/graphics/graphviz/graphviz.SlackBuild
@@ -8,7 +8,7 @@
PRGNAM=graphviz
VERSION=${VERSION:-2.28.0}
-BUILD=${BUILD:-1}
+BUILD=${BUILD:-2}
TAG=${TAG:-_SBo}
if [ -z "$ARCH" ]; then
@@ -52,6 +52,9 @@ chmod -R u+w,go+r-w,a-s .
# Install PHP bindings to proper location.
sed -i 's|/php/modules|/php/extensions|' configure
+# Fix for php-5.4
+patch -p1 < $CWD/php_5.4_compat.patch
+
CFLAGS="$SLKCFLAGS" \
CXXFLAGS="$SLKCFLAGS" \
./configure \
diff --git a/graphics/graphviz/php_5.4_compat.patch b/graphics/graphviz/php_5.4_compat.patch
new file mode 100644
index 0000000000..58c2993b36
--- /dev/null
+++ b/graphics/graphviz/php_5.4_compat.patch
@@ -0,0 +1,17 @@
+diff -Naur graphviz-2.28.0.orig/tclpkg/gv/gv_php_init.c graphviz-2.28.0/tclpkg/gv/gv_php_init.c
+--- graphviz-2.28.0.orig/tclpkg/gv/gv_php_init.c 2011-01-25 17:30:51.000000000 +0100
++++ graphviz-2.28.0/tclpkg/gv/gv_php_init.c 2012-05-30 04:10:40.657221055 +0200
+@@ -19,11 +19,13 @@
+
+ static size_t gv_string_writer (GVJ_t *job, const char *s, size_t len)
+ {
++ TSRMLS_FETCH();
+ return PHPWRITE(s, len);
+ }
+
+ static size_t gv_channel_writer (GVJ_t *job, const char *s, size_t len)
+ {
++ TSRMLS_FETCH();
+ return PHPWRITE(s, len);
+ }
+