From cd332bf13fcc5f27e542213379a0a0df95461ab6 Mon Sep 17 00:00:00 2001 From: "Ralf S. Engelschall" Date: Tue, 11 Mar 2008 19:56:44 +0000 Subject: [PATCH] upgrading package: graphviz 2.16.1 -> 2.18 --- graphviz/graphviz.patch | 127 ++++++++++++++++++++-------------------- graphviz/graphviz.spec | 4 +- 2 files changed, 65 insertions(+), 66 deletions(-) diff --git a/graphviz/graphviz.patch b/graphviz/graphviz.patch index 2f4bd947cc..afa741e464 100644 --- a/graphviz/graphviz.patch +++ b/graphviz/graphviz.patch @@ -1,6 +1,62 @@ +Index: cmd/dot/Makefile.am +--- cmd/dot/Makefile.am.orig 2008-02-23 01:48:35 +0100 ++++ cmd/dot/Makefile.am 2008-03-11 18:46:16 +0100 +@@ -70,26 +70,52 @@ + # like $(top_srcdir)/lib/gvc/dot_builtins.c + dot_static_SOURCES = dot.c $(top_srcdir)/lib/gvc/no_demand_loading.c + dot_static_LDFLAGS = -export-dynamic -dlpreopen self -export-symbols-regex '.*_LTX_library' ++if WITH_PANGOCAIRO ++dot_static_LDADD = \ ++ $(top_builddir)/plugin/dot_layout/.libs/libgvplugin_dot_layout_C.a \ ++ $(top_builddir)/plugin/neato_layout/.libs/libgvplugin_neato_layout_C.a \ ++ $(top_builddir)/plugin/core/.libs/libgvplugin_core_C.a \ ++ $(top_builddir)/lib/gvc/libgvc_C.la \ ++ $(top_builddir)/lib/pathplan/libpathplan_C.la \ ++ $(top_builddir)/lib/graph/libgraph_C.la \ ++ $(top_builddir)/lib/cdt/libcdt_C.la \ ++ @ICONV_LIBS@ @EXPAT_LIBS@ @Z_LIBS@ @LIBGEN_LIBS@ @LIBLTDL@ @SOCKET_LIBS@ @IPSEPCOLA_LIBS@ @MATH_LIBS@ ++else + dot_static_LDADD = \ + $(top_builddir)/plugin/dot_layout/.libs/libgvplugin_dot_layout_C.a \ + $(top_builddir)/plugin/neato_layout/.libs/libgvplugin_neato_layout_C.a \ + $(top_builddir)/plugin/core/.libs/libgvplugin_core_C.a \ ++ $(top_builddir)/plugin/gd/.libs/libgvplugin_gd_C.a \ + $(top_builddir)/lib/gvc/libgvc_C.la \ + $(top_builddir)/lib/pathplan/libpathplan_C.la \ + $(top_builddir)/lib/graph/libgraph_C.la \ + $(top_builddir)/lib/cdt/libcdt_C.la \ + @ICONV_LIBS@ @EXPAT_LIBS@ @Z_LIBS@ @LIBGEN_LIBS@ @LIBLTDL@ @SOCKET_LIBS@ @IPSEPCOLA_LIBS@ @MATH_LIBS@ ++endif + + dot_builtins_SOURCES = dot.c $(top_srcdir)/lib/gvc/dot_builtins.c $(top_srcdir)/lib/gvc/no_demand_loading.c ++if WITH_PANGOCAIRO ++dot_builtins_LDADD = \ ++ $(top_builddir)/plugin/dot_layout/libgvplugin_dot_layout.la \ ++ $(top_builddir)/plugin/neato_layout/libgvplugin_neato_layout.la \ ++ $(top_builddir)/plugin/core/libgvplugin_core.la \ ++ $(top_builddir)/lib/gvc/libgvc_builtins.la \ ++ $(top_builddir)/lib/pathplan/libpathplan.la \ ++ $(top_builddir)/lib/graph/libgraph.la \ ++ $(top_builddir)/lib/cdt/libcdt.la \ ++ @ICONV_LIBS@ @EXPAT_LIBS@ @Z_LIBS@ @LIBGEN_LIBS@ @LIBLTDL@ @SOCKET_LIBS@ @IPSEPCOLA_LIBS@ @MATH_LIBS@ ++else + dot_builtins_LDADD = \ + $(top_builddir)/plugin/dot_layout/libgvplugin_dot_layout.la \ + $(top_builddir)/plugin/neato_layout/libgvplugin_neato_layout.la \ + $(top_builddir)/plugin/core/libgvplugin_core.la \ ++ $(top_builddir)/plugin/gd/libgvplugin_gd.la \ + $(top_builddir)/lib/gvc/libgvc_builtins.la \ + $(top_builddir)/lib/pathplan/libpathplan.la \ + $(top_builddir)/lib/graph/libgraph.la \ + $(top_builddir)/lib/cdt/libcdt.la \ + @ICONV_LIBS@ @EXPAT_LIBS@ @Z_LIBS@ @LIBGEN_LIBS@ @LIBLTDL@ @SOCKET_LIBS@ @IPSEPCOLA_LIBS@ @MATH_LIBS@ ++endif + + if WITH_LIBGD + if WITH_MYLIBGD Index: lib/sfio/sfhdr.h ---- lib/sfio/sfhdr.h.orig Fri Apr 27 04:17:42 2001 -+++ lib/sfio/sfhdr.h Tue Feb 18 19:26:37 2003 +--- lib/sfio/sfhdr.h.orig 2008-02-22 15:21:42 +0100 ++++ lib/sfio/sfhdr.h 2008-03-11 08:09:41 +0100 @@ -143,6 +143,10 @@ #include #include @@ -13,7 +69,7 @@ Index: lib/sfio/sfhdr.h /* initialization */ @@ -254,7 +258,9 @@ - #include + #include #else #if _hdr_values +#ifdef HAVE_VALUES_H @@ -23,8 +79,8 @@ Index: lib/sfio/sfhdr.h #define SF_MAXDOUBLE MAXDOUBLE #endif Index: plugin/gd/gvrender_gd.c ---- plugin/gd/gvrender_gd.c.orig 2007-11-08 20:42:15 +0100 -+++ plugin/gd/gvrender_gd.c 2007-11-10 18:37:15 +0100 +--- plugin/gd/gvrender_gd.c.orig 2008-03-04 00:01:52 +0100 ++++ plugin/gd/gvrender_gd.c 2008-03-11 08:09:41 +0100 @@ -34,6 +34,10 @@ #ifdef HAVE_LIBGD #include "gd.h" @@ -37,8 +93,8 @@ Index: plugin/gd/gvrender_gd.c FORMAT_GIF, FORMAT_JPEG, Index: plugin/gd/gvtextlayout_gd.c ---- plugin/gd/gvtextlayout_gd.c.orig 2007-11-08 20:42:15 +0100 -+++ plugin/gd/gvtextlayout_gd.c 2007-11-10 18:37:31 +0100 +--- plugin/gd/gvtextlayout_gd.c.orig 2008-03-06 22:40:02 +0100 ++++ plugin/gd/gvtextlayout_gd.c 2008-03-11 08:09:41 +0100 @@ -29,6 +29,10 @@ #ifdef HAVE_LIBGD #include "gd.h" @@ -50,60 +106,3 @@ Index: plugin/gd/gvtextlayout_gd.c #if defined(HAVE_LIBGD) && defined(HAVE_GD_FREETYPE) /* fontsize at which text is omitted entirely */ -Index: cmd/dot/Makefile.am ---- cmd/dot/Makefile.am 2007/08/28 12:28:57 1.1 -+++ cmd/dot/Makefile.am 2007/08/28 13:08:51 -@@ -96,6 +96,7 @@ - @ICONV_LIBS@ @FONTCONFIG_LIBS@ @FREETYPE2_LIBS@ @JPEG_LIBS@ @PNG_LIBS@ @EXPAT_LIBS@ @Z_LIBS@ @LIBGEN_LIBS@ @LIBLTDL@ @SOCKET_LIBS@ @IPSEPCOLA_LIBS@ @MATH_LIBS@ - endif - else -+if WITH_PANGOCAIRO - dot_static_LDADD = \ - $(top_builddir)/plugin/dot_layout/.libs/libgvplugin_dot_layout_C.a \ - $(top_builddir)/plugin/neato_layout/.libs/libgvplugin_neato_layout_C.a \ -@@ -107,6 +108,18 @@ - $(top_builddir)/lib/graph/libgraph_C.la \ - $(top_builddir)/lib/cdt/libcdt_C.la \ - @GD_LIBS@ @ICONV_LIBS@ @FONTCONFIG_LIBS@ @FREETYPE2_LIBS@ @JPEG_LIBS@ @PNG_LIBS@ @EXPAT_LIBS@ @Z_LIBS@ @LIBGEN_LIBS@ @LIBLTDL@ @SOCKET_LIBS@ @IPSEPCOLA_LIBS@ @PANGOCAIRO_LIBS@ @MATH_LIBS@ -+else -+dot_static_LDADD = \ -+ $(top_builddir)/plugin/dot_layout/.libs/libgvplugin_dot_layout_C.a \ -+ $(top_builddir)/plugin/neato_layout/.libs/libgvplugin_neato_layout_C.a \ -+ $(top_builddir)/plugin/core/.libs/libgvplugin_core_C.a \ -+ $(top_builddir)/plugin/gd/.libs/libgvplugin_gd_C.a \ -+ $(top_builddir)/lib/gvc/libgvc_C.la \ -+ $(top_builddir)/lib/pathplan/libpathplan_C.la \ -+ $(top_builddir)/lib/graph/libgraph_C.la \ -+ $(top_builddir)/lib/cdt/libcdt_C.la \ -+ @GD_LIBS@ @ICONV_LIBS@ @FONTCONFIG_LIBS@ @FREETYPE2_LIBS@ @JPEG_LIBS@ @PNG_LIBS@ @EXPAT_LIBS@ @Z_LIBS@ @LIBGEN_LIBS@ @LIBLTDL@ @SOCKET_LIBS@ @IPSEPCOLA_LIBS@ @PANGOCAIRO_LIBS@ @MATH_LIBS@ -+endif - endif - - dot_builtins_SOURCES =3D dot.c $(top_srcdir)/lib/gvc/dot_builtins.c $(top_srcdir)/lib/gvc/no_demand_loading.c -@@ -138,6 +151,7 @@ - @ICONV_LIBS@ @FONTCONFIG_LIBS@ @FREETYPE2_LIBS@ @JPEG_LIBS@ @PNG_LIBS@ @EXPAT_LIBS@ @Z_LIBS@ @LIBGEN_LIBS@ @LIBLTDL@ @SOCKET_LIBS@ @IPSEPCOLA_LIBS@ @MATH_LIBS@ - endif - else -+if WITH_PANGOCAIRO - dot_builtins_LDADD = \ - $(top_builddir)/plugin/dot_layout/libgvplugin_dot_layout.la \ - $(top_builddir)/plugin/neato_layout/libgvplugin_neato_layout.la \ -@@ -149,6 +163,18 @@ - $(top_builddir)/lib/graph/libgraph.la \ - $(top_builddir)/lib/cdt/libcdt.la \ - @GD_LIBS@ @ICONV_LIBS@ @FONTCONFIG_LIBS@ @FREETYPE2_LIBS@ @JPEG_LIBS@ @PNG_LIBS@ @EXPAT_LIBS@ @Z_LIBS@ @LIBGEN_LIBS@ @LIBLTDL@ @SOCKET_LIBS@ @IPSEPCOLA_LIBS@ @PANGOCAIRO_LIBS@ @MATH_LIBS@ -+else -+dot_builtins_LDADD = \ -+ $(top_builddir)/plugin/dot_layout/libgvplugin_dot_layout.la \ -+ $(top_builddir)/plugin/neato_layout/libgvplugin_neato_layout.la \ -+ $(top_builddir)/plugin/core/libgvplugin_core.la \ -+ $(top_builddir)/plugin/gd/libgvplugin_gd.la \ -+ $(top_builddir)/lib/gvc/libgvc_builtins.la \ -+ $(top_builddir)/lib/pathplan/libpathplan.la \ -+ $(top_builddir)/lib/graph/libgraph.la \ -+ $(top_builddir)/lib/cdt/libcdt.la \ -+ @GD_LIBS@ @ICONV_LIBS@ @FONTCONFIG_LIBS@ @FREETYPE2_LIBS@ @JPEG_LIBS@ @PNG_LIBS@ @EXPAT_LIBS@ @Z_LIBS@ @LIBGEN_LIBS@ @LIBLTDL@ @SOCKET_LIBS@ @IPSEPCOLA_LIBS@ @PANGOCAIRO_LIBS@ @MATH_LIBS@ -+endif - endif - - diff --git a/graphviz/graphviz.spec b/graphviz/graphviz.spec index 7020563283..0545d4c359 100644 --- a/graphviz/graphviz.spec +++ b/graphviz/graphviz.spec @@ -22,7 +22,7 @@ ## # package versions -%define V_graphviz 2.16.1 +%define V_graphviz 2.18 %define V_graphviz_perl_base 2.03 %define V_graphviz_perl_data_structure 0.17 @@ -37,7 +37,7 @@ Class: BASE Group: Diagram License: GPL Version: %{V_graphviz} -Release: 20080101 +Release: 20080311 # package options %option with_x11 no