components/graphviz/patches/gerrors-defs.patch
author saurabh.vyas@oracle.com
Tue, 11 Apr 2017 20:19:32 -0700
changeset 7859 d828b72ad743
permissions -rw-r--r--
25837225 build failing for other components (gutenprint, graphviz) post GS uprev to 9.20
Ignore whitespace changes - Everywhere: Within whitespace: At end of lines:
7859
d828b72ad743 25837225 build failing for other components (gutenprint, graphviz) post GS uprev to 9.20
saurabh.vyas@oracle.com
parents:
diff changeset
     1
The patch has been taken from community and fixes build issue of
d828b72ad743 25837225 build failing for other components (gutenprint, graphviz) post GS uprev to 9.20
saurabh.vyas@oracle.com
parents:
diff changeset
     2
graphviz post ghostscript upgrade to 9.18
d828b72ad743 25837225 build failing for other components (gutenprint, graphviz) post GS uprev to 9.20
saurabh.vyas@oracle.com
parents:
diff changeset
     3
The details can be found in the following location
d828b72ad743 25837225 build failing for other components (gutenprint, graphviz) post GS uprev to 9.20
saurabh.vyas@oracle.com
parents:
diff changeset
     4
http://www.graphviz.org/mantisbt/view.php?id=2604
d828b72ad743 25837225 build failing for other components (gutenprint, graphviz) post GS uprev to 9.20
saurabh.vyas@oracle.com
parents:
diff changeset
     5
d828b72ad743 25837225 build failing for other components (gutenprint, graphviz) post GS uprev to 9.20
saurabh.vyas@oracle.com
parents:
diff changeset
     6
diff --git a/plugin/gs/gvloadimage_gs.c b/plugin/gs/gvloadimage_gs.c
d828b72ad743 25837225 build failing for other components (gutenprint, graphviz) post GS uprev to 9.20
saurabh.vyas@oracle.com
parents:
diff changeset
     7
index 4ed9b71..53be600 100644
d828b72ad743 25837225 build failing for other components (gutenprint, graphviz) post GS uprev to 9.20
saurabh.vyas@oracle.com
parents:
diff changeset
     8
--- a/plugin/gs/gvloadimage_gs.c
d828b72ad743 25837225 build failing for other components (gutenprint, graphviz) post GS uprev to 9.20
saurabh.vyas@oracle.com
parents:
diff changeset
     9
+++ b/plugin/gs/gvloadimage_gs.c
d828b72ad743 25837225 build failing for other components (gutenprint, graphviz) post GS uprev to 9.20
saurabh.vyas@oracle.com
parents:
diff changeset
    10
@@ -72,11 +72,11 @@ static void gs_error(GVJ_t * job, const char *name, const char *funstr, int err)
d828b72ad743 25837225 build failing for other components (gutenprint, graphviz) post GS uprev to 9.20
saurabh.vyas@oracle.com
parents:
diff changeset
    11
 
d828b72ad743 25837225 build failing for other components (gutenprint, graphviz) post GS uprev to 9.20
saurabh.vyas@oracle.com
parents:
diff changeset
    12
     assert (err < 0);
d828b72ad743 25837225 build failing for other components (gutenprint, graphviz) post GS uprev to 9.20
saurabh.vyas@oracle.com
parents:
diff changeset
    13
 
d828b72ad743 25837225 build failing for other components (gutenprint, graphviz) post GS uprev to 9.20
saurabh.vyas@oracle.com
parents:
diff changeset
    14
-    if (err >= e_VMerror) 
d828b72ad743 25837225 build failing for other components (gutenprint, graphviz) post GS uprev to 9.20
saurabh.vyas@oracle.com
parents:
diff changeset
    15
+    if (err >= gs_error_VMerror)
d828b72ad743 25837225 build failing for other components (gutenprint, graphviz) post GS uprev to 9.20
saurabh.vyas@oracle.com
parents:
diff changeset
    16
 	errsrc = "PostScript Level 1"; 
d828b72ad743 25837225 build failing for other components (gutenprint, graphviz) post GS uprev to 9.20
saurabh.vyas@oracle.com
parents:
diff changeset
    17
-    else if (err >= e_unregistered)
d828b72ad743 25837225 build failing for other components (gutenprint, graphviz) post GS uprev to 9.20
saurabh.vyas@oracle.com
parents:
diff changeset
    18
+    else if (err >= gs_error_unregistered)
d828b72ad743 25837225 build failing for other components (gutenprint, graphviz) post GS uprev to 9.20
saurabh.vyas@oracle.com
parents:
diff changeset
    19
 	errsrc = "PostScript Level 2";
d828b72ad743 25837225 build failing for other components (gutenprint, graphviz) post GS uprev to 9.20
saurabh.vyas@oracle.com
parents:
diff changeset
    20
-    else if (err >= e_invalidid)
d828b72ad743 25837225 build failing for other components (gutenprint, graphviz) post GS uprev to 9.20
saurabh.vyas@oracle.com
parents:
diff changeset
    21
+    else if (err >= gs_error_invalidid)
d828b72ad743 25837225 build failing for other components (gutenprint, graphviz) post GS uprev to 9.20
saurabh.vyas@oracle.com
parents:
diff changeset
    22
 	errsrc = "DPS error";
d828b72ad743 25837225 build failing for other components (gutenprint, graphviz) post GS uprev to 9.20
saurabh.vyas@oracle.com
parents:
diff changeset
    23
     else
d828b72ad743 25837225 build failing for other components (gutenprint, graphviz) post GS uprev to 9.20
saurabh.vyas@oracle.com
parents:
diff changeset
    24
 	errsrc = "Ghostscript internal error";