summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
author David Spencer <baildon.research@googlemail.com>2016-05-31 21:13:40 +0100
committer Willy Sudiarto Raharjo <willysr@slackbuilds.org>2016-06-01 23:54:53 +0700
commitd0573bcd0860e2ccf9eb895a32c8385f05be83fb (patch)
tree2551032490e0032fd008267d9960877018487d99
parent85ca1f46ca4f9354542a948cafdb007a2b10d77d (diff)
downloadslackbuilds-d0573bcd0860e2ccf9eb895a32c8385f05be83fb.tar.gz
slackbuilds-d0573bcd0860e2ccf9eb895a32c8385f05be83fb.tar.xz
graphics/graphviz: Fixed build with ghostscript-9.19.
Signed-off-by: David Spencer <baildon.research@googlemail.com>
-rw-r--r--graphics/graphviz/format-string.patch21
-rw-r--r--graphics/graphviz/ghostscript918.patch18
-rw-r--r--graphics/graphviz/graphviz.SlackBuild4
3 files changed, 43 insertions, 0 deletions
diff --git a/graphics/graphviz/format-string.patch b/graphics/graphviz/format-string.patch
new file mode 100644
index 0000000000..1cc586739c
--- /dev/null
+++ b/graphics/graphviz/format-string.patch
@@ -0,0 +1,21 @@
+diff -Naur old/lib/cgraph/scan.l new/lib/cgraph/scan.l
+--- old/lib/cgraph/scan.l 2014-04-13 10:40:25.000000000 -1000
++++ new/lib/cgraph/scan.l 2014-12-02 08:54:21.285050735 -1000
+@@ -149,7 +149,7 @@
+ agxbput(&xb,buf);
+ agxbput(&xb,fname);
+ agxbput(&xb, " splits into two tokens\n");
+- agerr(AGWARN,agxbuse(&xb));
++ agerr(AGWARN, "%s", agxbuse(&xb));
+
+ agxbfree(&xb);
+ return 1;
+@@ -225,7 +225,7 @@
+ agxbput (&xb, buf);
+ agxbput (&xb, yytext);
+ agxbput (&xb,"'\n");
+- agerr(AGERR,agxbuse(&xb));
++ agerr(AGERR, "%s", agxbuse(&xb));
+ agxbfree(&xb);
+ }
+ /* must be here to see flex's macro defns */
diff --git a/graphics/graphviz/ghostscript918.patch b/graphics/graphviz/ghostscript918.patch
new file mode 100644
index 0000000000..189c5134ae
--- /dev/null
+++ b/graphics/graphviz/ghostscript918.patch
@@ -0,0 +1,18 @@
+diff -uprb graphviz-2.38.0.orig/plugin/gs/gvloadimage_gs.c graphviz-2.38.0/plugin/gs/gvloadimage_gs.c
+--- graphviz-2.38.0.orig/plugin/gs/gvloadimage_gs.c 2014-04-13 23:40:25.000000000 +0300
++++ graphviz-2.38.0/plugin/gs/gvloadimage_gs.c 2015-11-11 00:08:32.916123704 +0200
+@@ -72,11 +72,11 @@ static void gs_error(GVJ_t * job, const
+
+ assert (err < 0);
+
+- if (err >= e_VMerror)
++ if (err >= gs_error_VMerror)
+ errsrc = "PostScript Level 1";
+- else if (err >= e_unregistered)
++ else if (err >= gs_error_unregistered)
+ errsrc = "PostScript Level 2";
+- else if (err >= e_invalidid)
++ else if (err >= gs_error_invalidid)
+ errsrc = "DPS error";
+ else
+ errsrc = "Ghostscript internal error";
diff --git a/graphics/graphviz/graphviz.SlackBuild b/graphics/graphviz/graphviz.SlackBuild
index dd401257c0..c156107652 100644
--- a/graphics/graphviz/graphviz.SlackBuild
+++ b/graphics/graphviz/graphviz.SlackBuild
@@ -77,6 +77,10 @@ sed -i 's|/php/modules|/php/extensions|' configure
# Fix for php-5.4
patch -p1 -i $CWD/php_5.4_compat.patch
+# Patches from Arch (thanks!)
+patch -p1 -i $CWD/format-string.patch
+patch -p1 -i $CWD/ghostscript918.patch
+
CFLAGS="$SLKCFLAGS" \
CXXFLAGS="$SLKCFLAGS" \
LDFLAGS="-L/usr/lib${LIBDIRSUFFIX}" \