commit 9a694ad1f85df24b00c20b3d1fa415cfebbf53f0
Author: Jakub Bogusz <[email protected]>
Date: Sun Jan 20 20:16:45 2013 +0100
- updated to 2.30.0
- updated ruby patch
- old guile patch obsolete; new one fixes detection of guile 2.0
- removed obsolete am,format-security patches
- added libgraph patch (enables build of deprecated libgraph library for
now)
- added ming,visio,webp patches (fix build of experimental ming/visio/webp
plugins resp.)
graphviz-am.patch | 31 ---------
graphviz-format-security.patch | 99 ---------------------------
graphviz-guile.patch | 40 +++--------
graphviz-libgraph.patch | 21 ++++++
graphviz-ming.patch | 20 ++++++
graphviz-ruby.patch | 54 +++++++--------
graphviz-visio.patch | 42 ++++++++++++
graphviz-webp.patch | 11 +++
graphviz.spec | 150 +++++++++++++++++++++++++++--------------
9 files changed, 232 insertions(+), 236 deletions(-)
---
diff --git a/graphviz.spec b/graphviz.spec
index 22f0bfc..b6b8a36 100644
--- a/graphviz.spec
+++ b/graphviz.spec
@@ -1,26 +1,27 @@
# TODO
# - %{_libdir}/graphviz/config is not FHS friendly path as config
-# - io language bindings: io-graphviz
-# - ghostscript subpackage?
-# /usr/lib64/graphviz/libgvplugin_gs.so
-# /usr/lib64/graphviz/libgvplugin_gs.so.6
-# /usr/lib64/graphviz/libgvplugin_gs.so.6.0.0
+# - go language binding [6g, 8g???]
+# - io language binding: io-graphviz
+# - some plugin subpackages? (libgvplugin_*: gs=ghostscript, gtk, lasi, ming,
visio, webp)
+# - smyrna subpackage?
#
# Conditional build:
-%bcond_without dotnet # don't build C# bindings
-%bcond_without java # don't build Java bindings
-%bcond_without ocaml # don't build ocaml bindings
-%bcond_without php # don't build php bindings
-%bcond_without perl # don't build perl bindings
-%bcond_without ruby # don't build ruby bindings
-%bcond_without tcl # don't build tcl bindings
-%bcond_without lua # don't build lua bindings
-%bcond_without r # don't build R bindings
-%bcond_without python # don't build python bindings
-%bcond_with io # don't build io language bindings
-%bcond_without guile # don't build guile bindings
-%bcond_without ming # don't build ming support
-%bcond_without devil # don't build devil plugin
+%bcond_without dotnet # don't build C# bindings
+%bcond_without java # don't build Java bindings
+%bcond_without ocaml # don't build ocaml bindings
+%bcond_without php # don't build php bindings
+%bcond_without perl # don't build perl bindings
+%bcond_without ruby # don't build ruby bindings
+%bcond_without tcl # don't build tcl bindings
+%bcond_without lua # don't build lua bindings
+%bcond_without r # don't build R bindings
+%bcond_without python # don't build python bindings
+%bcond_with io # don't build io language bindings
+%bcond_without guile # don't build guile bindings
+%bcond_without ming # don't build ming support
+%bcond_without devil # don't build devil plugin
+%bcond_without smyrna # SMYRNA utility (large graph viewer)
+%bcond_without ipsepcola # IPSEPCOLA features in neato engine [C++
portability problems]
%define tclver 8.5
%ifarch i386
@@ -36,12 +37,12 @@
Summary: Graph Visualization Tools
Summary(pl.UTF-8): Narzędzie do wizualizacji w postaci grafów
Name: graphviz
-Version: 2.28.0
-Release: 9
+Version: 2.30.0
+Release: 1
License: CPL v1.0
Group: X11/Applications/Graphics
Source0:
http://www.graphviz.org/pub/graphviz/ARCHIVE/%{name}-%{version}.tar.gz
-# Source0-md5: 8d26c1171f30ca3b1dc1b429f7937e58
+# Source0-md5: 967ad0a3d2bf164082e076c4416ede95
Patch0: %{name}-fontpath.patch
Patch1: %{name}-tk.patch
Patch2: %{name}-bad-header.patch
@@ -51,44 +52,53 @@ Patch5: %{name}-lua51.patch
Patch6: %{name}-php_modules_dir.patch
Patch7: %{name}-ruby.patch
Patch8: %{name}-guile.patch
-Patch9: %{name}-am.patch
-Patch10: %{name}-format-security.patch
+Patch9: %{name}-libgraph.patch
+Patch10: %{name}-ming.patch
+Patch11: %{name}-visio.patch
+Patch12: %{name}-webp.patch
URL: http://www.graphviz.org/
%{?with_devil:BuildRequires: DevIL-devel}
-BuildRequires: QtCore-devel
-BuildRequires: QtGui-devel
+BuildRequires: QtCore-devel >= 4
+BuildRequires: QtGui-devel >= 4
%{?with_r:BuildRequires: R}
-BuildRequires: autoconf >= 2.59-9
+BuildRequires: autoconf >= 2.61
BuildRequires: automake
BuildRequires: bison
BuildRequires: expat-devel >= 1.95
BuildRequires: flex
+BuildRequires: fontconfig-devel
BuildRequires: freetype-devel >= 2.0.0
BuildRequires: gawk
BuildRequires: gd-devel >= 2.0.34
+BuildRequires: gdk-pixbuf2-devel >= 2.0
BuildRequires: gettext-devel
BuildRequires: ghostscript-devel
BuildRequires: gtk+2-devel >= 2:2.8.0
-%{?with_guile:BuildRequires: guile-devel >= 1.4}
+BuildRequires: gts-devel
+%{?with_guile:BuildRequires: guile-devel >= 2.0}
#BuildRequires: io
%if %{with java}
BuildRequires: jdk
BuildRequires: jpackage-utils
%endif
+BuildRequires: libLASi-devel
BuildRequires: libjpeg-devel
+BuildRequires: libltdl-devel >= 2:2
BuildRequires: libpng-devel
BuildRequires: librsvg-devel >= 2.0
BuildRequires: libstdc++-devel
-BuildRequires: libtool
+BuildRequires: libtool >= 2:2
+BuildRequires: libwebp-devel
+BuildRequires: libvisio-devel
# for lua51 binary
%if %{with lua}
BuildRequires: lua51
BuildRequires: lua51-devel >= 5.1
%endif
-%{?with_ming:BuildRequires: ming-devel}
+%{?with_ming:BuildRequires: ming-devel >= 0.4}
%{?with_dotnet:BuildRequires: mono-csharp}
%{?with_ocaml:BuildRequires: ocaml}
-BuildRequires: pango-devel >= 1.10
+BuildRequires: pango-devel >= 1:1.14.9
BuildRequires: perl-devel
%if %{with php}
BuildRequires: php-devel >= 3:5.0.0
@@ -96,32 +106,42 @@ BuildRequires: php-program >= 4:5.0
%endif
BuildRequires: pkgconfig
%{?with_python:BuildRequires: python-devel}
-BuildRequires: qt4-qmake
+BuildRequires: qt4-qmake >= 4
%{?with_perl:BuildRequires: rpm-perlprov}
%{?with_python:BuildRequires: rpm-pythonprov}
BuildRequires: rpmbuild(macros) >= 1.519
%{?with_ruby:BuildRequires: ruby-devel}
BuildRequires: sed >= 4.0
-# swig-csharp,swig-java,swig-lua,swig-ocaml in main swig
+# swig-csharp,swig-go,swig-java,swig-lua,swig-ocaml in main swig
# swig-io ???
-BuildRequires: swig
+BuildRequires: swig >= 1.3
%{?with_guile:BuildRequires: swig-guile >= 2.0.3}
-%{?with_perl:BuildRequires: swig-perl}
+%{?with_perl:BuildRequires: swig-perl >= 1.3}
%{?with_php:BuildRequires: swig-php >= 1.3.40}
-BuildRequires: swig-python
-%{?with_ruby:BuildRequires: swig-ruby}
+BuildRequires: swig-python >= 1.3
+%{?with_ruby:BuildRequires: swig-ruby >= 1.3}
%if %{with tcl}
-BuildRequires: swig-tcl
+BuildRequires: swig-tcl >= 1.3
BuildRequires: tcl-devel >= 8.3.0
BuildRequires: tk-devel >= 8.3.0
%endif
BuildRequires: xorg-lib-libX11-devel
BuildRequires: xorg-lib-libXaw-devel
BuildRequires: xorg-lib-libXpm-devel
+# tested in configure, actually not used
+#BuildRequires: xorg-lib-libXrender-devel
BuildRequires: zlib-devel
+%if %{with smyrna}
+BuildRequires: OpenGL-glut-devel
+# only tested, actually not used
+#BuildRequires: gtkglarea-devel >= 2.0
+BuildRequires: gtkglext-devel >= 1.0
+BuildRequires: libglade2-devel >= 2.0
+%endif
Requires(post,postun): /sbin/ldconfig
Requires: fonts-Type1-urw
Requires: gd >= 2.0.33-5
+Requires: pango >= 1:1.14.9
BuildRoot: %{tmpdir}/%{name}-%{version}-root-%(id -u -n)
%description
@@ -138,7 +158,7 @@ Summary(pl.UTF-8): Pliki nagłówkowe do bibliotek graphviz
Group: X11/Development/Libraries
Requires: %{name} = %{version}-%{release}
Requires: gd-devel >= 2.0.34
-Requires: libltdl-devel
+Requires: libltdl-devel >= 2:2
%description devel
This package contains the header files for graphviz libraries.
@@ -333,6 +353,8 @@ graphviz bindings for R language.
%patch8 -p1
%patch9 -p1
%patch10 -p1
+%patch11 -p1
+%patch12 -p1
%{__sed} '1s@/usr/bin/lua$@/usr/bin/lua51@' -i tclpkg/gv/demo/modgraph.lua
@@ -357,20 +379,24 @@ export CPPFLAGS
%configure \
lua_suffix=51 \
- --disable-ltdl-install \
- --disable-silent-rules \
+ %{!?with_devil:--disable-devil} \
%{!?with_java:--disable-java} \
+ --disable-ltdl-install \
+ %{!?with_lua:--disable-lua} \
%{!?with_ocaml:--disable-ocaml} \
- %{!?with_dotnet:--disable-sharp} \
%{!?with_perl:--disable-perl} \
%{!?with_php:--disable-php} \
+ %{!?with_r:--disable-r} \
%{!?with_ruby:--disable-ruby} \
+ %{!?with_dotnet:--disable-sharp} \
%{!?with_tcl:--disable-tcl} \
- %{!?with_ming:--disable-ming} \
- %{!?with_devil:--disable-devil} \
- %{!?with_lua:--disable-lua} \
- %{!?with_r:--disable-r} \
- --disable-static
+ --disable-silent-rules \
+ --disable-static \
+ %{?with_ipsepcola:--with-ipsepcola} \
+ %{?with_ming:--with-ming} \
+ %{?with_smyrna:--with-smyrna} \
+ --with-visio \
+ --with-webp
%{__make}
@@ -452,8 +478,11 @@ fi
%attr(755,root,root) %{_bindir}/fdp
%attr(755,root,root) %{_bindir}/gc
%attr(755,root,root) %{_bindir}/gml2gv
+%attr(755,root,root) %{_bindir}/graphml2gv
+%attr(755,root,root) %{_bindir}/gv2gml
%attr(755,root,root) %{_bindir}/gv2gxl
%attr(755,root,root) %{_bindir}/gvcolor
+%attr(755,root,root) %{_bindir}/gvedit
%attr(755,root,root) %{_bindir}/gvgen
%attr(755,root,root) %{_bindir}/gvmap
%attr(755,root,root) %{_bindir}/gvmap.sh
@@ -471,6 +500,9 @@ fi
%attr(755,root,root) %{_bindir}/prune
%attr(755,root,root) %{_bindir}/sccmap
%attr(755,root,root) %{_bindir}/sfdp
+%if %{with smyrna}
+%attr(755,root,root) %{_bindir}/smyrna
+%endif
%attr(755,root,root) %{_bindir}/tred
%attr(755,root,root) %{_bindir}/twopi
%attr(755,root,root) %{_bindir}/unflatten
@@ -500,13 +532,28 @@ fi
%attr(755,root,root) %{_libdir}/graphviz/libgvplugin_gdk_pixbuf.so*
%attr(755,root,root) %{_libdir}/graphviz/libgvplugin_gs.so*
%attr(755,root,root) %{_libdir}/graphviz/libgvplugin_gtk.so*
+%attr(755,root,root) %{_libdir}/graphviz/libgvplugin_lasi.so*
+%if %{with ming}
+%attr(755,root,root) %{_libdir}/graphviz/libgvplugin_ming.so*
+%endif
%attr(755,root,root) %{_libdir}/graphviz/libgvplugin_neato_layout.so*
%attr(755,root,root) %{_libdir}/graphviz/libgvplugin_pango.so*
%attr(755,root,root) %{_libdir}/graphviz/libgvplugin_rsvg.so*
+%attr(755,root,root) %{_libdir}/graphviz/libgvplugin_visio.so*
+%attr(755,root,root) %{_libdir}/graphviz/libgvplugin_webp.so*
%attr(755,root,root) %{_libdir}/graphviz/libgvplugin_xlib.so*
%dir %{_datadir}/graphviz
%dir %{_datadir}/graphviz/demo
+%if %{with ming}
+# for ming plugin
+%{_datadir}/graphviz/font
+%endif
+%{_datadir}/graphviz/gvedit
+%{_datadir}/graphviz/gvpr
%{_datadir}/graphviz/lefty
+%if %{with smyrna}
+%{_datadir}/graphviz/smyrna
+%endif
%{_mandir}/man1/acyclic.1*
%{_mandir}/man1/bcomps.1*
%{_mandir}/man1/ccomps.1*
@@ -519,6 +566,8 @@ fi
%{_mandir}/man1/fdp.1*
%{_mandir}/man1/gc.1*
%{_mandir}/man1/gml2gv.1*
+%{_mandir}/man1/graphml2gv.1*
+%{_mandir}/man1/gv2gml.1*
%{_mandir}/man1/gv2gxl.1*
%{_mandir}/man1/gvcolor.1*
%{_mandir}/man1/gvedit.1*
@@ -631,9 +680,10 @@ fi
%dir %{_libdir}/graphviz/ocaml
%attr(755,root,root) %{_libdir}/graphviz/ocaml/libgv_ocaml.so
%{_libdir}/graphviz/ocaml/META.gv
-%{_libdir}/graphviz/ocaml/gv.a
+# ocamlopt temporarily disabled
+#%{_libdir}/graphviz/ocaml/gv.a
%{_libdir}/graphviz/ocaml/gv.cm*
-%{_libdir}/graphviz/ocaml/gv.ml*
+#%{_libdir}/graphviz/ocaml/gv.ml*
%{_mandir}/man3/gv_ocaml.3*
%endif
@@ -680,7 +730,7 @@ fi
%attr(755,root,root) %{_libdir}/graphviz/ruby/libgv_ruby.so
%attr(755,root,root) %{_libdir}/graphviz/ruby/gv.so
%attr(755,root,root) %{_datadir}/graphviz/demo/modgraph.rb
-%{ruby_sitearchdir}/gv.so
+%{ruby_vendorarchdir}/gv.so
%{_mandir}/man3/gv_ruby.3*
%endif
diff --git a/graphviz-am.patch b/graphviz-am.patch
deleted file mode 100644
index e0349ee..0000000
--- a/graphviz-am.patch
+++ /dev/null
@@ -1,31 +0,0 @@
---- graphviz-2.28.0/plugin/ming/Makefile.am 2009-06-03 03:10:57.000000000
+0200
-+++ graphviz/plugin/ming/Makefile.am 2012-08-08 11:06:32.155715237 +0200
-@@ -1,6 +1,8 @@
- # $Id: Makefile.am,v 1.16 2009/06/03 01:10:57 ellson Exp $ $Revision: 1.16 $
- ## Process this file with automake to produce Makefile.in
-
-+pkgfontdir = ${pkgdatadir}/font
-+
- AM_CPPFLAGS = \
- -I$(top_srcdir) \
- -I$(top_srcdir)/lib/common \
-@@ -17,7 +19,7 @@
- else
- pkglib_LTLIBRARIES = libgvplugin_ming.la
- endif
--pkglib_DATA = Bitstream_Vera_Sans.fdb Bitstream_Vera_Serif.fdb
-+pkgfont_DATA = Bitstream_Vera_Sans.fdb Bitstream_Vera_Serif.fdb
- endif
-
- libgvplugin_ming_C_la_SOURCES = \
---- graphviz-2.28.0/tclpkg/gv/Makefile.am 2011-03-28 20:15:56.000000000
+0200
-+++ graphviz/tclpkg/gv/Makefile.am 2012-08-08 11:06:32.805715217 +0200
-@@ -253,7 +259,7 @@
- gv_tcl.cpp: gv.i
- $(SWIG) -c++ -tcl -namespace -o gv_tcl.cpp $(srcdir)/gv.i
-
--pkginclude_DATA = gv.i gv.cpp
-+pkginclude_HEADERS = gv.i gv.cpp
- pkglib_LTLIBRARIES =
- man_MANS =
- pdf_DATA =
diff --git a/graphviz-format-security.patch b/graphviz-format-security.patch
deleted file mode 100644
index 4b6d68c..0000000
--- a/graphviz-format-security.patch
+++ /dev/null
@@ -1,99 +0,0 @@
---- graphviz-2.28.0/lib/ortho/ortho.c~ 2011-01-28 17:24:29.000000000 +0100
-+++ graphviz-2.28.0/lib/ortho/ortho.c 2012-11-12 12:25:17.990615453 +0100
-@@ -1520,7 +1520,7 @@
- absbb.LL.x = absbb.LL.y = MAXDOUBLE;
- absbb.UR.x = absbb.UR.y = -MAXDOUBLE;
-
-- fprintf (fp, prolog2);
-+ fprintf (fp, "%s", prolog2);
- fprintf (fp, "%d %d translate\n", TRANS, TRANS);
-
- fputs ("0 0 1 setrgbcolor\n", fp);
---- graphviz-2.28.0/cmd/tools/gc.c~ 2011-01-25 17:30:47.000000000 +0100
-+++ graphviz-2.28.0/cmd/tools/gc.c 2012-11-12 12:26:27.693946328 +0100
-@@ -91,7 +91,7 @@
-
- static void usage(int v)
- {
-- printf(useString);
-+ printf("%s", useString);
- exit(v);
- }
-
---- graphviz-2.28.0/cmd/tools/gvcolor.c~ 2011-01-25 17:30:47.000000000
+0100
-+++ graphviz-2.28.0/cmd/tools/gvcolor.c 2012-11-12 12:26:57.773945267
+0100
-@@ -91,7 +91,7 @@
-
- static void usage(int v)
- {
-- printf(useString);
-+ printf("%s", useString);
- exit(v);
- }
-
---- graphviz-2.28.0/cmd/tools/nop.c~ 2011-01-25 17:30:47.000000000 +0100
-+++ graphviz-2.28.0/cmd/tools/nop.c 2012-11-12 12:27:16.403944610 +0100
-@@ -44,7 +44,7 @@
-
- static void usage(int v)
- {
-- printf(useString);
-+ printf("%s", useString);
- exit(v);
- }
-
---- graphviz-2.28.0/cmd/tools/ccomps.c~ 2011-04-29 20:46:20.000000000
+0200
-+++ graphviz-2.28.0/cmd/tools/ccomps.c 2012-11-12 12:27:33.057277356 +0100
-@@ -102,7 +102,7 @@
-
- static void usage(int v)
- {
-- printf(useString);
-+ printf("%s", useString);
- exit(v);
- }
-
---- graphviz-2.28.0/cmd/tools/gvpack.c~ 2011-01-25 17:30:47.000000000
+0100
-+++ graphviz-2.28.0/cmd/tools/gvpack.c 2012-11-12 12:27:51.010610055 +0100
-@@ -113,7 +113,7 @@
-
- static void usage(int v)
- {
-- printf(useString);
-+ printf("%s", useString);
- exit(v);
- }
-
---- graphviz-2.28.0/cmd/tools/dijkstra.c~ 2011-04-18 23:32:17.000000000
+0200
-+++ graphviz-2.28.0/cmd/tools/dijkstra.c 2012-11-12 12:28:09.517276069
+0100
-@@ -241,7 +241,7 @@
-
- static void usage(int v)
- {
-- printf(useString);
-+ printf("%s", useString);
- exit(v);
- }
-
---- graphviz-2.28.0/cmd/tools/bcomps.c~ 2011-01-25 17:30:47.000000000
+0100
-+++ graphviz-2.28.0/cmd/tools/bcomps.c 2012-11-12 12:28:29.150608710 +0100
-@@ -322,7 +322,7 @@
-
- static void usage(int v)
- {
-- printf(useString);
-+ printf("%s", useString);
- exit(v);
- }
-
---- graphviz-2.28.0/cmd/gvedit/main.cpp~ 2011-05-06 17:15:33.000000000
+0200
-+++ graphviz-2.28.0/cmd/gvedit/main.cpp 2012-11-12 13:49:35.409707616
+0100
-@@ -65,7 +65,7 @@
-
- static void usage(int v)
- {
-- printf(useString);
-+ printf("%s", useString);
- exit(v);
- }
-
diff --git a/graphviz-guile.patch b/graphviz-guile.patch
index 198a96b..14a5328 100644
--- a/graphviz-guile.patch
+++ b/graphviz-guile.patch
@@ -1,29 +1,11 @@
---- graphviz-2.28.0/configure.ac.orig 2011-05-17 20:36:04.898079515 +0200
-+++ graphviz-2.28.0/configure.ac 2011-05-17 21:16:08.718160002 +0200
-@@ -676,7 +676,7 @@
- if test "x$GUILE" = "x"; then
- use_guile="No (guile not available)"
- else
-- GUILE_VERSION=`$GUILE --version | head -1 | cut -d ' ' -f 2`
-+ GUILE_VERSION=$($GUILE --version | head -1 | sed -e 's/.*
\([[0-9.]*]\)$/\1/')
- GUILE_VERSION_MAJOR=`echo $GUILE_VERSION | cut -d '.' -f 1`
- GUILE_VERSION_MINOR=`echo $GUILE_VERSION | cut -d '.' -f 2`
- if test $GUILE_VERSION_MAJOR -lt 2; then
-@@ -691,12 +691,15 @@
- if test "x$GUILE" = "x"; then
- use_guile="No (guile is too old)"
- else
-- GUILE_INCLUDES=
-- GUILE_LIBS=
-+ GUILE_INCLUDES=$(guile-config compile)
-+ GUILE_LIBS=$(guile-config link)
-+ save_CPPFLAGS="$CPPFLAGS"
-+ CPPFLAGS="$CPPFLAGS $GUILE_INCLUDES"
- AC_CHECK_HEADER(libguile.h,,[
- use_guile="No (guile header missing)"
- GUILE=
- ])
-+ CPPFLAGS="$save_CPPFLAGS"
- if test "x$GUILE" != "x"; then
- use_guile="Yes"
- AC_SUBST(GUILE_INCLUDES)
+--- graphviz-2.30.0/configure.ac.orig 2013-01-19 20:49:15.654106463 +0100
++++ graphviz-2.30.0/configure.ac 2013-01-19 22:37:00.717305043 +0100
+@@ -710,7 +710,7 @@
+ GUILE_LIBS=
+ # don't die if PKG_CHECK_MODULES not available - el4, el5
+ PKG_CHECK_MODULES([GUILE],
+- [guile >= "$GUILE_VERSION_MAJOR.$GUILE_VERSION_MINOR"],
++ [guile-2.0 >= "$GUILE_VERSION_MAJOR.$GUILE_VERSION_MINOR"],
+ GUILE_INCLUDES="$GUILE_CFLAGS",
+ false)
+ ac_save_CFLAGS="$CFLAGS"
diff --git a/graphviz-libgraph.patch b/graphviz-libgraph.patch
new file mode 100644
index 0000000..bc60b97
--- /dev/null
+++ b/graphviz-libgraph.patch
@@ -0,0 +1,21 @@
+--- graphviz-2.30.0/lib/graph/Makefile.am.orig 2013-01-20 09:19:48.263167841
+0100
++++ graphviz-2.30.0/lib/graph/Makefile.am 2013-01-20 09:21:38.306498882
+0100
+@@ -11,15 +11,15 @@
+ -I$(top_srcdir)/lib/cdt
+
+ man_MANS = graph.3
+-if WITH_CGRAPH
+-else
++#if WITH_CGRAPH
++#else
+ pkginclude_HEADERS = graph.h
+ noinst_HEADERS = libgraph.h triefa.h parser.h agxbuf.h
+ noinst_LTLIBRARIES = libgraph_C.la
+ lib_LTLIBRARIES = libgraph.la
+ pkgconfig_DATA = libgraph.pc
+ pdf_DATA = graph.3.pdf
+-endif
++#endif
+
+ libgraph_C_la_SOURCES = \
+ attribs.c agxbuf.c edge.c graph.c graphio.c lexer.c \
diff --git a/graphviz-ming.patch b/graphviz-ming.patch
new file mode 100644
index 0000000..1fc2017
--- /dev/null
+++ b/graphviz-ming.patch
@@ -0,0 +1,20 @@
+--- graphviz-2.30.0/plugin/ming/Makefile.am.orig 2013-01-14
04:11:21.000000000 +0100
++++ graphviz-2.30.0/plugin/ming/Makefile.am 2013-01-20 17:23:58.735895674
+0100
+@@ -8,7 +8,7 @@
+ -I$(top_srcdir)/lib/common \
+ -I$(top_srcdir)/lib/pathplan \
+ -I$(top_srcdir)/lib/gvc \
+- -I$(top_srcdir)/lib/graph \
++ -I$(top_srcdir)/lib/cgraph \
+ -I$(top_srcdir)/lib/cdt \
+ $(MING_CFLAGS)
+
+@@ -28,7 +28,7 @@
+
+ libgvplugin_ming_la_LDFLAGS = -version-info @GVPLUGIN_VERSION_INFO@
+ libgvplugin_ming_la_SOURCES = $(libgvplugin_ming_C_la_SOURCES)
+-libgvplugin_ming_la_LIBADD = @MING_LIBS@ @MATH_LIBS@
++libgvplugin_ming_la_LIBADD = $(top_builddir)/lib/gvc/libgvc.la @MING_LIBS@
@MATH_LIBS@
+
+ if WITH_WIN32
+ libgvplugin_ming_la_LDFLAGS += -no-undefined
diff --git a/graphviz-ruby.patch b/graphviz-ruby.patch
index 8ae6aea..9a9983b 100644
--- a/graphviz-ruby.patch
+++ b/graphviz-ruby.patch
@@ -1,30 +1,30 @@
---- graphviz-2.28.0/configure.ac.orig 2011-05-17 20:25:19.000000000 +0200
-+++ graphviz-2.28.0/configure.ac 2011-05-17 20:35:15.828077871 +0200
-@@ -1510,12 +1510,12 @@
- if test "x$RUBY" = "x"; then
- use_ruby="No (ruby not available)"
- else
-- RUBY_INCLUDES="-I`$RUBY $srcdir/config/config_ruby.rb INCLUDES`"
-+ RUBY_INCLUDES="-I`$RUBY $srcdir/config/config_ruby.rb INCLUDES`
-I`$RUBY $srcdir/config/config_ruby.rb archincludes`"
- # hack for powerpc-darwin8 (10.4)
- if test "x$DARWIN" = "xyes"; then
- RUBY_INCLUDES=`echo $RUBY_INCLUDES | sed 's/powerpc/universal/'`
- fi
-- RUBY_LIBS="-L`$RUBY $srcdir/config/config_ruby.rb lib` `$RUBY
-rrbconfig -e \"puts Config::CONFIG[['LIBRUBYARG_SHARED']]\"`"
-+ RUBY_LIBS="-L`$RUBY $srcdir/config/config_ruby.rb lib` $($RUBY
-rrbconfig -e "puts Config::CONFIG[['LIBRUBYARG_SHARED']]")"
- RUBY_INSTALL_DIR="`$RUBY $srcdir/config/config_ruby.rb archsitelib`"
- save_CPPFLAGS=$CPPFLAGS
- CPPFLAGS="$CPPFLAGS $RUBY_INCLUDES"
---- graphviz-2.26.3/config/config_ruby.rb.orig 2005-03-26 19:49:00.000000000
+0100
-+++ graphviz-2.26.3/config/config_ruby.rb 2010-10-22 23:22:53.627734339
+0200
-@@ -5,7 +5,9 @@
-
- case ARGV[0]
- when "INCLUDES"
-- puts Config::expand(CONFIG["archdir"])
+--- graphviz-2.30.0/configure.ac.orig 2013-01-19 19:53:28.130842902 +0100
++++ graphviz-2.30.0/configure.ac 2013-01-19 19:56:44.934172133 +0100
+@@ -1549,12 +1549,12 @@
+ if test "x$RUBY" = "x"; then
+ use_ruby="No (ruby not available)"
+ else
+- RUBY_CFLAGS="-I`$RUBY $srcdir/config/config_ruby.rb archdir`"
++ RUBY_CFLAGS="-I`$RUBY $srcdir/config/config_ruby.rb archdir` "
+ # hack for powerpc-darwin8 (10.4)
+ if test "x$DARWIN" = "xyes"; then
+ RUBY_CFLAGS=`echo $RUBY_CFLAGS | sed 's/powerpc/universal/'`
+ fi
+- RUBY_LIBS="-L`$RUBY $srcdir/config/config_ruby.rb lib` `$RUBY
-rrbconfig -e \"puts Config::CONFIG[['LIBRUBYARG_SHARED']]\"`"
++ RUBY_LIBS="-L`$RUBY $srcdir/config/config_ruby.rb lib` $($RUBY
-rrbconfig -e "puts Config::CONFIG[['LIBRUBYARG_SHARED']]")"
+ RUBY_INSTALL_DIR="`$RUBY $srcdir/config/config_ruby.rb
vendorarchdir`"
+ if test "x$RUBY_INSTALL_DIR" = "x"; then
+ RUBY_INSTALL_DIR="`$RUBY $srcdir/config/config_ruby.rb
sitearchdir`"
+--- graphviz-2.30.0/config/config_ruby.rb.orig 2013-01-19 19:53:28.134176235
+0100
++++ graphviz-2.30.0/config/config_ruby.rb 2013-01-19 19:58:10.874170341
+0100
+@@ -8,6 +8,10 @@
+ puts Config::expand(CONFIG["archdir"])
+ when "lib"
+ puts Config::expand(CONFIG["libdir"])
++when "includes"
+ puts Config::expand(CONFIG["rubyhdrdir"])
+when "archincludes"
+ puts Config::expand(CONFIG["rubyhdrdir"]+"/"+CONFIG["arch"])
- when "lib"
- puts Config::expand(CONFIG["libdir"])
- when "archsitelib"
+ when "vendorarchdir"
+ puts Config::expand(CONFIG["vendorarchdir"])
+ when "sitearchdir"
diff --git a/graphviz-visio.patch b/graphviz-visio.patch
new file mode 100644
index 0000000..56a9872
--- /dev/null
+++ b/graphviz-visio.patch
@@ -0,0 +1,42 @@
+--- graphviz-2.30.0/plugin/visio/VisioGraphic.cpp.orig 2013-01-14
04:11:21.000000000 +0100
++++ graphviz-2.30.0/plugin/visio/VisioGraphic.cpp 2013-01-20
17:31:30.895886250 +0100
+@@ -16,6 +16,7 @@
+ #endif
+
+ #include <algorithm>
++#include <cstring>
+
+ #ifdef _MSC_VER
+ #include <cfloat>
+--- graphviz-2.30.0/plugin/visio/VisioText.cpp.orig 2013-01-14
04:11:21.000000000 +0100
++++ graphviz-2.30.0/plugin/visio/VisioText.cpp 2013-01-20 17:33:01.815884352
+0100
+@@ -21,6 +21,7 @@
+ #include "gvio.h"
+ #ifdef WITH_CGRAPH
+ #include <string.h>
++#include <cstdlib>
+ #endif
+
+ extern "C" char *xml_string(char* str);
+--- graphviz-2.30.0/lib/cdt/cdt.h.orig 2013-01-14 04:11:21.000000000 +0100
++++ graphviz-2.30.0/lib/cdt/cdt.h 2013-01-20 17:35:24.789214707 +0100
+@@ -17,6 +17,7 @@
+ #endif
+
+ #include <stddef.h> /* size_t */
++#include <string.h> /* memcmp, strcmp */
+
+ #ifndef _BEGIN_EXTERNS_
+ #define _BEGIN_EXTERNS_
+@@ -238,11 +239,6 @@
+ extern int dtstat _ARG_((Dt_t*, Dtstat_t*, int));
+ extern unsigned int dtstrhash _ARG_((unsigned int, Void_t*, int));
+
+-#if !_PACKAGE_ast
+-extern int memcmp _ARG_((const Void_t*, const Void_t*, size_t));
+-extern int strcmp _ARG_((const char*, const char*));
+-#endif
+-
+ #undef extern
+ _END_EXTERNS_
+
diff --git a/graphviz-webp.patch b/graphviz-webp.patch
new file mode 100644
index 0000000..b549cda
--- /dev/null
+++ b/graphviz-webp.patch
@@ -0,0 +1,11 @@
+--- graphviz-2.30.0/plugin/webp/Makefile.am.orig 2013-01-14
04:11:21.000000000 +0100
++++ graphviz-2.30.0/plugin/webp/Makefile.am 2013-01-20 18:35:17.195806496
+0100
+@@ -32,7 +32,7 @@
+
+ libgvplugin_webp_la_LDFLAGS = -version-info @GVPLUGIN_VERSION_INFO@
+ libgvplugin_webp_la_SOURCES = $(libgvplugin_webp_C_la_SOURCES)
+-libgvplugin_webp_la_LIBADD = @WEBP_LIBS@ @PANGOCAIRO_LIBS@
++libgvplugin_webp_la_LIBADD = $(top_builddir)/lib/gvc/libgvc.la @WEBP_LIBS@
@PANGOCAIRO_LIBS@
+
+ if WITH_WIN32
+ libgvplugin_webp_la_LDFLAGS += -no-undefined
================================================================
---- gitweb:
http://git.pld-linux.org/gitweb.cgi/packages/graphviz.git/commitdiff/9a694ad1f85df24b00c20b3d1fa415cfebbf53f0
_______________________________________________
pld-cvs-commit mailing list
[email protected]
http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
