[graphviz] Add patch to fix build with OCaml > 4.02.0 and Fedora 22.

Richard W.M. Jones rjones at fedoraproject.org
Sat Aug 30 20:01:17 UTC 2014


commit 9afd9d7b6c663a5ec3e631a50bc557465ba32d0d
Author: Richard W.M. Jones <rjones at redhat.com>
Date:   Sat Aug 30 21:00:58 2014 +0100

    Add patch to fix build with OCaml > 4.02.0 and Fedora 22.

 graphviz-2.38.0-ocaml-fix-ints.patch |   11 +++++++++++
 graphviz.spec                        |    8 ++++++--
 2 files changed, 17 insertions(+), 2 deletions(-)
---
diff --git a/graphviz-2.38.0-ocaml-fix-ints.patch b/graphviz-2.38.0-ocaml-fix-ints.patch
new file mode 100644
index 0000000..56e40dc
--- /dev/null
+++ b/graphviz-2.38.0-ocaml-fix-ints.patch
@@ -0,0 +1,11 @@
+--- graphviz-2.38.0.old/tclpkg/gv/Makefile.am	2014-04-13 21:40:25.000000000 +0100
++++ graphviz-2.38.0/tclpkg/gv/Makefile.am	2014-08-30 20:56:43.689541154 +0100
+@@ -115,7 +115,7 @@
+ libgv_ocaml_la_SOURCES = $(BASESOURCES) gv_dummy_init.c
+ libgv_ocaml_la_LIBADD = $(BASELIBS) $(OCAML_LIBS)
+ libgv_ocaml_la_LDFLAGS = -module -avoid-version
+-libgv_ocaml_la_CPPFLAGS = $(BASECPPFLAGS) $(OCAML_INCLUDES)
++libgv_ocaml_la_CPPFLAGS = $(BASECPPFLAGS) $(OCAML_INCLUDES) -Dint64=int64_t
+ gv.ml gv.mli: gv_ocaml.cpp
+ gv_ocaml.cpp: gv.i
+ 	$(SWIG) -c++ -ocaml -o gv_ocaml.cpp $(srcdir)/gv.i
diff --git a/graphviz.spec b/graphviz.spec
index 592d20e..5695a4d 100644
--- a/graphviz.spec
+++ b/graphviz.spec
@@ -47,7 +47,7 @@
 Name:			graphviz
 Summary:		Graph Visualization Tools
 Version:		2.38.0
-Release:		13%{?dist}
+Release:		14%{?dist}
 Group:			Applications/Multimedia
 License:		EPL
 URL:			http://www.graphviz.org/
@@ -55,6 +55,8 @@ Source0:		http://www.graphviz.org/pub/graphviz/ARCHIVE/%{name}-%{version}.tar.gz
 # Fix typo in testsuite (upstream ticket #2441).
 Patch0:			graphviz-2.38.0-rtest-fix.patch
 Patch1:			graphviz-2.38.0-find-fix.patch
+# Not upstream patch to fix build with OCaml > 4.02.0 (upstream) and Fedora.
+Patch2:                 graphviz-2.38.0-ocaml-fix-ints.patch
 BuildRoot:		%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildRequires:		zlib-devel, libpng-devel, libjpeg-devel, expat-devel, freetype-devel >= 2
 BuildRequires:		ksh, bison, m4, flex, tk-devel, tcl-devel >= 8.3, swig
@@ -259,6 +261,7 @@ Various tcl packages (extensions) for the graphviz tools.
 %setup -q
 %patch0 -p1 -b .rtest-fix
 %patch1 -p1 -b .find-fix
+%patch2 -p1
 
 # Attempt to fix rpmlint warnings about executable sources
 find -type f -regex '.*\.\(c\|h\)$' -exec chmod a-x {} ';'
@@ -548,8 +551,9 @@ rm -rf %{buildroot}
 
 
 %changelog
-* Sat Aug 30 2014 Richard W.M. Jones <rjones at redhat.com> - 2.38.0-13
+* Sat Aug 30 2014 Richard W.M. Jones <rjones at redhat.com> - 2.38.0-14
 - ocaml-4.02.0 final rebuild.
+- Add patch to fix build with OCaml > 4.02.0 and Fedora 22.
 
 * Thu Aug 28 2014 Jitka Plesnikova <jplesnik at redhat.com> - 2.38.0-12
 - Perl 5.20 rebuild


More information about the scm-commits mailing list