packages: graphviz/graphviz-fontpath.patch, graphviz/graphviz-ruby.patch, g...

qboosh qboosh at pld-linux.org
Thu May 19 16:08:44 CEST 2011 

Author: qboosh                       Date: Thu May 19 14:08:44 2011 GMT
Module: packages                      Tag: HEAD
---- Log message:
- updated to 2.28.0 (some new sonames)
- updated fontpath,ruby patches
- added guile patch (needed for guile 2 compliancy)

---- Files affected:
packages/graphviz:
   graphviz-fontpath.patch (1.5 -> 1.6) , graphviz-ruby.patch (1.1 -> 1.2) , graphviz.spec (1.122 -> 1.123) , graphviz-guile.patch (NONE -> 1.1)  (NEW)

---- Diffs:

================================================================
Index: packages/graphviz/graphviz-fontpath.patch
diff -u packages/graphviz/graphviz-fontpath.patch:1.5 packages/graphviz/graphviz-fontpath.patch:1.6
--- packages/graphviz/graphviz-fontpath.patch:1.5	Wed Dec 27 17:06:19 2006
+++ packages/graphviz/graphviz-fontpath.patch	Thu May 19 16:08:38 2011
@@ -1,11 +1,11 @@
---- graphviz-2.12/configure.ac.orig	2006-12-04 22:11:58.000000000 +0100
-+++ graphviz-2.12/configure.ac	2006-12-27 14:22:16.682261909 +0100
-@@ -79,7 +79,7 @@
+--- graphviz-2.28.0/configure.ac.orig	2011-05-07 05:25:24.000000000 +0200
++++ graphviz-2.28.0/configure.ac	2011-05-17 20:24:39.344723227 +0200
+@@ -161,7 +161,7 @@
  	AC_DEFINE_UNQUOTED(DARWIN_DYLIB,"$DARWIN_DYLIB",[Define for Darwin-style shared library names.])
  	;;
-   * ) # This sucks!  Whatever happened to standards for file system layout?
--	DEFAULT_FONTPATH="/usr/share/fonts/default/Type1:/usr/X11R6/lib/X11/fonts/TrueType:/usr/X11R6/lib/X11/fonts/truetype:/usr/X11R6/lib/X11/fonts/TTF:/usr/share/fonts/TrueType:/usr/share/fonts/truetype:/usr/openwin/lib/X11/fonts/TrueType:/usr/X11R6/lib/X11/fonts/Type1:/usr/common/share/fonts/ttf";
+   * ) # This sucks!  Whatever happened to standards for file system layout?   (Good job its no longer used unless fontconfig is unavailable.)
+-	DEFAULT_FONTPATH="/usr/share/fonts/sun/TrueType:/usr/share/fonts/TrueType:/usr/X11/lib/X11/fonts/TrueType:/usr/share/fonts/sun/Type1:/usr/openwin/lib/X11/fonts/Type1:/usr/share/fonts/X11/Type1:/usr/share/fonts/default/Type1:/usr/X11R6/lib/X11/fonts/TrueType:/usr/X11R6/lib/X11/fonts/truetype:/usr/X11R6/lib/X11/fonts/TTF:/usr/share/fonts/truetype:/usr/openwin/lib/X11/fonts/TrueType:/usr/X11R6/lib/X11/fonts/Type1:/usr/common/share/fonts/ttf";
 +	DEFAULT_FONTPATH="/usr/share/fonts/TTF:/usr/share/fonts/Type1";
  	PATHSEPARATOR=":"
- 	;;
- esac
+         NO_POSTSCRIPT_ALIAS=0
+ 	BROWSER="xdg-open"

================================================================
Index: packages/graphviz/graphviz-ruby.patch
diff -u packages/graphviz/graphviz-ruby.patch:1.1 packages/graphviz/graphviz-ruby.patch:1.2
--- packages/graphviz/graphviz-ruby.patch:1.1	Sat Oct 23 08:40:13 2010
+++ packages/graphviz/graphviz-ruby.patch	Thu May 19 16:08:38 2011
@@ -1,13 +1,15 @@
---- graphviz-2.26.3/configure.ac.orig	2010-10-22 09:01:47.799741043 +0200
-+++ graphviz-2.26.3/configure.ac	2010-10-22 23:17:41.319743558 +0200
-@@ -1404,10 +1404,10 @@
+--- 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)
- 	RUBY_INCLUDES=`echo $RUBY_INCLUDES | sed 's/powerpc/universal/'`
+ 	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`"

================================================================
Index: packages/graphviz/graphviz.spec
diff -u packages/graphviz/graphviz.spec:1.122 packages/graphviz/graphviz.spec:1.123
--- packages/graphviz/graphviz.spec:1.122	Sat Dec 11 22:35:09 2010
+++ packages/graphviz/graphviz.spec	Thu May 19 16:08:38 2011
@@ -36,12 +36,12 @@
 Summary:	Graph Visualization Tools
 Summary(pl.UTF-8):	Narzędzie do wizualizacji w postaci grafów
 Name:		graphviz
-Version:	2.26.3
-Release:	7
+Version:	2.28.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:	6f45946fa622770c45609778c0a982ee
+# Source0-md5:	8d26c1171f30ca3b1dc1b429f7937e58
 Patch0:		%{name}-fontpath.patch
 Patch1:		%{name}-tk.patch
 Patch2:		%{name}-bad-header.patch
@@ -50,6 +50,7 @@
 Patch5:		%{name}-lua51.patch
 Patch6:		%{name}-php_modules_dir.patch
 Patch7:		%{name}-ruby.patch
+Patch8:		%{name}-guile.patch
 URL:		http://www.graphviz.org/
 %{?with_devil:BuildRequires:	DevIL-devel}
 %{?with_r:BuildRequires:	R}
@@ -62,6 +63,7 @@
 BuildRequires:	gawk
 BuildRequires:	gd-devel >= 2.0.34
 BuildRequires:	gettext-devel
+BuildRequires:	ghostscript-devel
 BuildRequires:	gtk+2-devel >= 2:2.8.0
 %{?with_guile:BuildRequires:	guile-devel >= 1.4}
 #BuildRequires:	io
@@ -322,14 +324,13 @@
 %patch5 -p1
 %patch6 -p1
 %patch7 -p1
-
-# not used for anything
-sed -i -e 's/libgnomeui-2.0/libgnomeui-disabled/' configure.ac
+%patch8 -p1
 
 %{__sed} '1s@/usr/bin/lua$@/usr/bin/lua51@' -i tclpkg/gv/demo/modgraph.lua
 
+%{__rm} m4/*.m4
+
 %build
-rm -f m4/*.m4
 touch config/config.rpath
 %{__libtoolize} --ltdl
 %{__aclocal} -I m4
@@ -433,10 +434,12 @@
 %attr(755,root,root) %{_bindir}/bcomps
 %attr(755,root,root) %{_bindir}/ccomps
 %attr(755,root,root) %{_bindir}/circo
+%attr(755,root,root) %{_bindir}/cluster
 %attr(755,root,root) %{_bindir}/diffimg
 %attr(755,root,root) %{_bindir}/dijkstra
 %attr(755,root,root) %{_bindir}/dot
 %attr(755,root,root) %{_bindir}/dot2gxl
+%attr(755,root,root) %{_bindir}/dot_builtins
 %attr(755,root,root) %{_bindir}/dotty
 %attr(755,root,root) %{_bindir}/fdp
 %attr(755,root,root) %{_bindir}/gc
@@ -444,6 +447,8 @@
 %attr(755,root,root) %{_bindir}/gv2gxl
 %attr(755,root,root) %{_bindir}/gvcolor
 %attr(755,root,root) %{_bindir}/gvgen
+%attr(755,root,root) %{_bindir}/gvmap
+%attr(755,root,root) %{_bindir}/gvmap.sh
 %attr(755,root,root) %{_bindir}/gvpack
 %attr(755,root,root) %{_bindir}/gvpr
 %attr(755,root,root) %{_bindir}/gxl2dot
@@ -454,6 +459,7 @@
 %attr(755,root,root) %{_bindir}/neato
 %attr(755,root,root) %{_bindir}/nop
 %attr(755,root,root) %{_bindir}/osage
+%attr(755,root,root) %{_bindir}/patchwork
 %attr(755,root,root) %{_bindir}/prune
 %attr(755,root,root) %{_bindir}/sccmap
 %attr(755,root,root) %{_bindir}/sfdp
@@ -462,15 +468,15 @@
 %attr(755,root,root) %{_bindir}/unflatten
 %attr(755,root,root) %{_bindir}/vimdot
 %attr(755,root,root) %{_libdir}/libcdt.so.*.*.*
-%attr(755,root,root) %ghost %{_libdir}/libcdt.so.4
+%attr(755,root,root) %ghost %{_libdir}/libcdt.so.5
 %attr(755,root,root) %{_libdir}/libcgraph.so.*.*.*
-%attr(755,root,root) %ghost %{_libdir}/libcgraph.so.5
+%attr(755,root,root) %ghost %{_libdir}/libcgraph.so.6
 %attr(755,root,root) %{_libdir}/libgraph.so.*.*.*
-%attr(755,root,root) %ghost %{_libdir}/libgraph.so.4
+%attr(755,root,root) %ghost %{_libdir}/libgraph.so.5
 %attr(755,root,root) %{_libdir}/libgvc.so.*.*.*
-%attr(755,root,root) %ghost %{_libdir}/libgvc.so.5
+%attr(755,root,root) %ghost %{_libdir}/libgvc.so.6
 %attr(755,root,root) %{_libdir}/libgvpr.so.*.*.*
-%attr(755,root,root) %ghost %{_libdir}/libgvpr.so.1
+%attr(755,root,root) %ghost %{_libdir}/libgvpr.so.2
 %attr(755,root,root) %{_libdir}/libpathplan.so.*.*.*
 %attr(755,root,root) %ghost %{_libdir}/libpathplan.so.4
 %attr(755,root,root) %{_libdir}/libxdot.so.*.*.*
@@ -497,6 +503,8 @@
 %{_mandir}/man1/bcomps.1*
 %{_mandir}/man1/ccomps.1*
 %{_mandir}/man1/circo.1*
+%{_mandir}/man1/cluster.1*
+%{_mandir}/man1/diffimg.1*
 %{_mandir}/man1/dijkstra.1*
 %{_mandir}/man1/dot.1*
 %{_mandir}/man1/dotty.1*
@@ -505,7 +513,10 @@
 %{_mandir}/man1/gml2gv.1*
 %{_mandir}/man1/gv2gxl.1*
 %{_mandir}/man1/gvcolor.1*
+%{_mandir}/man1/gvedit.1*
 %{_mandir}/man1/gvgen.1*
+%{_mandir}/man1/gvmap.1*
+%{_mandir}/man1/gvmap.sh.1*
 %{_mandir}/man1/gvpack.1*
 %{_mandir}/man1/gvpr.1*
 %{_mandir}/man1/gxl2gv.1*
@@ -515,6 +526,7 @@
 %{_mandir}/man1/neato.1*
 %{_mandir}/man1/nop.1*
 %{_mandir}/man1/osage.1*
+%{_mandir}/man1/patchwork.1*
 %{_mandir}/man1/prune.1*
 %{_mandir}/man1/sccmap.1*
 %{_mandir}/man1/sfdp.1*
@@ -522,6 +534,7 @@
 %{_mandir}/man1/tred.1*
 %{_mandir}/man1/twopi.1*
 %{_mandir}/man1/unflatten.1*
+%{_mandir}/man1/vimdot.1*
 %{_mandir}/man7/graphviz.7*
 
 %files devel
@@ -550,8 +563,10 @@
 %{_includedir}/graphviz
 %{_mandir}/man3/cdt.3*
 %{_mandir}/man3/cgraph.3*
+%{_mandir}/man3/expr.3*
 %{_mandir}/man3/graph.3*
 %{_mandir}/man3/gvc.3*
+%{_mandir}/man3/pack.3*
 %{_mandir}/man3/xdot.3*
 
 %files doc-html
@@ -713,6 +728,11 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.123  2011/05/19 14:08:38  qboosh
+- updated to 2.28.0 (some new sonames)
+- updated fontpath,ruby patches
+- added guile patch (needed for guile 2 compliancy)
+
 Revision 1.122  2010/12/11 21:35:09  arekm
 - release 7
 

================================================================
Index: packages/graphviz/graphviz-guile.patch
diff -u /dev/null packages/graphviz/graphviz-guile.patch:1.1
--- /dev/null	Thu May 19 16:08:44 2011
+++ packages/graphviz/graphviz-guile.patch	Thu May 19 16:08:38 2011
@@ -0,0 +1,29 @@
+--- 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)
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/graphviz/graphviz-fontpath.patch?r1=1.5&r2=1.6&f=u
    http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/graphviz/graphviz-ruby.patch?r1=1.1&r2=1.2&f=u
    http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/graphviz/graphviz.spec?r1=1.122&r2=1.123&f=u

More information about the pld-cvs-commit mailing list