rpms/graphviz
7
0
Fork 0
Code Issues Pull Requests Releases Activity

Fixed build with ghostscript-9.18+

Browse Source 
Resolves: rhbz#1384016
This commit is contained in:
Jaroslav Škarvada 2016-10-14 16:07:22 +02:00
parent 4cc7005866
commit 0dc2fdba00
2 changed files with 26 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
graphviz-2.38.0-gs-9.18-fix.patch Normal file
View File

@ -0,0 +1,19 @@
diff --git a/plugin/gs/gvloadimage_gs.c b/plugin/gs/gvloadimage_gs.c
index 4ed9b71..53be600 100644
--- a/plugin/gs/gvloadimage_gs.c
+++ b/plugin/gs/gvloadimage_gs.c
@@ -72,11 +72,11 @@ static void gs_error(GVJ_t * job, const char *name, const char *funstr, int err)
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";

8
graphviz.spec
View File

@ -51,7 +51,7 @@
Name: graphviz Name: graphviz
Summary: Graph Visualization Tools Summary: Graph Visualization Tools
Version: 2.38.0 Version: 2.38.0
Release: 38%{?dist} Release: 39%{?dist}
Group: Applications/Multimedia Group: Applications/Multimedia
License: EPL License: EPL
URL: http://www.graphviz.org/ URL: http://www.graphviz.org/
@ -67,6 +67,7 @@ Patch3: graphviz-2.38.0-format-string.patch
Patch4: graphviz-2.38.0-vimdot-vi.patch Patch4: graphviz-2.38.0-vimdot-vi.patch
Patch5: graphviz-2.38.0-rbconfig.patch Patch5: graphviz-2.38.0-rbconfig.patch
Patch6: graphviz-2.38.0-visio.patch Patch6: graphviz-2.38.0-visio.patch
Patch7: graphviz-2.38.0-gs-9.18-fix.patch
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
BuildRequires: zlib-devel, libpng-devel, libjpeg-devel, expat-devel, freetype-devel >= 2 BuildRequires: zlib-devel, libpng-devel, libjpeg-devel, expat-devel, freetype-devel >= 2
BuildRequires: ksh, bison, m4, flex, tk-devel, tcl-devel >= 8.3, swig BuildRequires: ksh, bison, m4, flex, tk-devel, tcl-devel >= 8.3, swig
@ -278,6 +279,7 @@ Various tcl packages (extensions) for the graphviz tools.
%patch5 -p1 -b .rbconfig %patch5 -p1 -b .rbconfig
# Upstream ticket: http://www.graphviz.org/mantisbt/view.php?id=2553 # Upstream ticket: http://www.graphviz.org/mantisbt/view.php?id=2553
%patch6 -p1 -b .visio %patch6 -p1 -b .visio
%patch7 -p1 -b .gs-9.18-fix
# Attempt to fix rpmlint warnings about executable sources # Attempt to fix rpmlint warnings about executable sources
find -type f -regex '.*\.\(c\|h\)$' -exec chmod a-x {} ';' find -type f -regex '.*\.\(c\|h\)$' -exec chmod a-x {} ';'
@ -575,6 +577,10 @@ rm -rf %{buildroot}
%changelog %changelog
* Fri Oct 14 2016 Jaroslav Škarvada <jskarvad@redhat.com> - 2.38.0-39
- Fixed build with ghostscript-9.18+
Resolves: rhbz#1384016
* Tue Jul 19 2016 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 2.38.0-38 * Tue Jul 19 2016 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 2.38.0-38
- https://fedoraproject.org/wiki/Changes/Automatic_Provides_for_Python_RPM_Packages - https://fedoraproject.org/wiki/Changes/Automatic_Provides_for_Python_RPM_Packages