Miroirs/slackbuilds_ponce
1
0
Fork 0
mirror of https://github.com/Ponce/slackbuilds synced 2024-11-04 20:29:09 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions

graphics/graphviz: Fixed build with ghostscript-9.19.

Browse source 
Signed-off-by: David Spencer <baildon.research@googlemail.com>
This commit is contained in:
David Spencer 2016-05-31 21:13:40 +01:00 committed by Willy Sudiarto Raharjo
parent 85ca1f46ca
commit d0573bcd08
No known key found for this signature in database
GPG key ID: 887B8374D7333381
3 changed files with 43 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

21
graphics/graphviz/format-string.patch Normal file
View 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
View 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";

4
graphics/graphviz/graphviz.SlackBuild
View file

@ -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}" \