mirror of
https://github.com/Ponce/slackbuilds
synced 2024-11-16 19:50:19 +01:00
graphics/graphviz: Fixed build with ghostscript-9.19.
Signed-off-by: David Spencer <baildon.research@googlemail.com>
This commit is contained in:
parent
85ca1f46ca
commit
d0573bcd08
3 changed files with 43 additions and 0 deletions
21
graphics/graphviz/format-string.patch
Normal file
21
graphics/graphviz/format-string.patch
Normal file
|
@ -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 */
|
18
graphics/graphviz/ghostscript918.patch
Normal file
18
graphics/graphviz/ghostscript918.patch
Normal file
|
@ -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";
|
|
@ -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}" \
|
||||
|
|
Loading…
Reference in a new issue