[csw-devel] SF.net SVN: gar:[8191] csw/mgar/pkg/graphviz/trunk

ellson at users.sourceforge.net ellson at users.sourceforge.net
Tue Jan 26 20:02:16 CET 2010


Revision: 8191
          http://gar.svn.sourceforge.net/gar/?rev=8191&view=rev
Author:   ellson
Date:     2010-01-26 19:02:13 +0000 (Tue, 26 Jan 2010)

Log Message:
-----------
upgrade to graphviz-2.26.3
  - fixed bugs 0004094, 0004114

Modified Paths:
--------------
    csw/mgar/pkg/graphviz/trunk/Makefile
    csw/mgar/pkg/graphviz/trunk/checksums

Added Paths:
-----------
    csw/mgar/pkg/graphviz/trunk/files/Draw.c.diff

Removed Paths:
-------------
    csw/mgar/pkg/graphviz/trunk/files/no_svg_in_libcairo.diff

Modified: csw/mgar/pkg/graphviz/trunk/Makefile
===================================================================
--- csw/mgar/pkg/graphviz/trunk/Makefile	2010-01-26 17:50:00 UTC (rev 8190)
+++ csw/mgar/pkg/graphviz/trunk/Makefile	2010-01-26 19:02:13 UTC (rev 8191)
@@ -1,5 +1,5 @@
 GARNAME = graphviz
-GARVERSION = 2.24.0
+GARVERSION = 2.26.3
 CATEGORIES = utils
 
 DESCRIPTION = Graph visualization tools 
@@ -14,7 +14,7 @@
 # disable dependency checks because plugins depend on libs from base package
 ENABLE_CHECK = 0
 
-PATCHFILES = no_svg_in_libcairo.diff
+PATCHFILES =  Draw.c.diff
 
 PACKAGES = CSWgraphviz \
 	CSWgraphvizdevel \
@@ -36,8 +36,11 @@
 #	CSWgraphvizruby \
 #
 
-INCOMPATIBLE_PKGS = CSWgraphvis CSWgraphviz2
+INCOMPATIBLE_PKGS = CSWgraphvis
 
+# defer for some time to allow CSWgraphviz2 upgrades
+# INCOMPATIBLE_PKGS = CSWgraphviz2
+
 ARCHALL_CSWgraphvizdoc = 1
 ARCHALL_CSWgraphvizgraphs = 1
 
@@ -48,7 +51,7 @@
 
 REQUIRED_PKGS_CSWgraphviz = CSWexpat CSWpango CSWlibcairo CSWgts CSWlibxrender \
 	CSWgs CSWfconfig CSWftype2 CSWggettextrt CSWglib2 CSWgtk2 CSWiconv \
-	CSWlibatk CSWliblasi CSWpng CSWzlib CSWxpm
+	CSWlibatk CSWliblasi CSWpng CSWzlib CSWxpm CSWlibrsvg
 REQUIRED_PKGS_CSWgraphvizdevel =
 REQUIRED_PKGS_CSWgraphvizdoc = 
 REQUIRED_PKGS_CSWgraphvizgraphs = 
@@ -61,7 +64,7 @@
 REQUIRED_PKGS_CSWgraphvizocaml = CSWocaml
 REQUIRED_PKGS_CSWgraphvizperl = CSWperl
 REQUIRED_PKGS_CSWgraphvizphp = CSWphp5
-REQUIRED_PKGS_CSWgraphvizpython = CSWpython-rt
+REQUIRED_PKGS_CSWgraphvizpython = CSWpython
 REQUIRED_PKGS_CSWgraphvizr = CSWr
 REQUIRED_PKGS_CSWgraphvizruby = CSWruby
 REQUIRED_PKGS_CSWgraphviztcl = CSWtcl CSWtk
@@ -116,6 +119,7 @@
 PKGFILES_CSWgraphviz += $(mandir)/man1/.*\.1
 PKGFILES_CSWgraphviz += $(mandir)/man7/.*\.7
 
+PKGFILES_CSWgraphvizdevel = $(libdir)/.*\.so
 PKGFILES_CSWgraphvizdevel = $(libdir)/pkgconfig/.*\.pc
 PKGFILES_CSWgraphvizdevel += $(includedir)/.*\.h
 PKGFILES_CSWgraphvizdevel += $(mandir)/man3/.*\.3
@@ -187,12 +191,13 @@
 
 CONFIGURE_ARGS = $(DIRPATHS)
 CONFIGURE_ARGS += --with-sfdp
+CONFIGURE_ARGS += --without-smyrna
 CONFIGURE_ARGS += --with-gtk
 CONFIGURE_ARGS += --with-gdk-pixbuf
 CONFIGURE_ARGS += --with-ghostscript
 CONFIGURE_ARGS += --with-lasi
 CONFIGURE_ARGS += --without-ipsepcola
-CONFIGURE_ARGS += --without-rsvg
+CONFIGURE_ARGS += --with-rsvg
 CONFIGURE_ARGS += --disable-ruby
 CONFIGURE_ARGS += --disable-devil
 CONFIGURE_ARGS += --disable-java

Modified: csw/mgar/pkg/graphviz/trunk/checksums
===================================================================
--- csw/mgar/pkg/graphviz/trunk/checksums	2010-01-26 17:50:00 UTC (rev 8190)
+++ csw/mgar/pkg/graphviz/trunk/checksums	2010-01-26 19:02:13 UTC (rev 8191)
@@ -1,7 +1,7 @@
-b66d09e11339fc981ab7c62518b3f92e  download/CSWgraphviz.postinstall
-b66d09e11339fc981ab7c62518b3f92e  download/CSWgraphvizdevil.postinstall
-b66d09e11339fc981ab7c62518b3f92e  download/CSWgraphvizdevil.postuninstall
-b66d09e11339fc981ab7c62518b3f92e  download/CSWgraphvizgd.postinstall
-b66d09e11339fc981ab7c62518b3f92e  download/CSWgraphvizgd.postuninstall
-806a30dbc3f8deb219216f35be0e7a40  download/graphviz-2.24.0.tar.gz
-5d2209a856b3549918b271cb39e6e761  download/no_svg_in_libcairo.diff
+b66d09e11339fc981ab7c62518b3f92e  CSWgraphviz.postinstall
+b66d09e11339fc981ab7c62518b3f92e  CSWgraphvizdevil.postinstall
+b66d09e11339fc981ab7c62518b3f92e  CSWgraphvizdevil.postuninstall
+b66d09e11339fc981ab7c62518b3f92e  CSWgraphvizgd.postinstall
+b66d09e11339fc981ab7c62518b3f92e  CSWgraphvizgd.postuninstall
+440058cc9beafc050b858fbf93242eee  Draw.c.diff
+6f45946fa622770c45609778c0a982ee  graphviz-2.26.3.tar.gz

Added: csw/mgar/pkg/graphviz/trunk/files/Draw.c.diff
===================================================================
--- csw/mgar/pkg/graphviz/trunk/files/Draw.c.diff	                        (rev 0)
+++ csw/mgar/pkg/graphviz/trunk/files/Draw.c.diff	2010-01-26 19:02:13 UTC (rev 8191)
@@ -0,0 +1,25 @@
+--- graphviz2/cmd/lefty/ws/x11/libfilereq/Draw.c.orig	2010-01-26 13:27:07.000000000 -0500
++++ graphviz2/cmd/lefty/ws/x11/libfilereq/Draw.c	2010-01-26 13:27:39.000000000 -0500
+@@ -1,4 +1,4 @@
+-/* $Id: Draw.c,v 1.8 2009/10/13 14:20:29 ellson Exp $ $Revision: 1.8 $ */
++/* $Id: Draw.c,v 1.9 2010/01/26 18:24:35 ellson Exp $ $Revision: 1.9 $ */
+ /* vim:set shiftwidth=4 ts=8: */
+ 
+ /**********************************************************
+@@ -43,8 +43,16 @@
+  *         erik at sra.co.jp
+  */
+ 
++#ifdef HAVE_CONFIG_H
++#include "config.h"
++#endif
+ #include <stdio.h>
++#ifdef HAVE_STDINT_H
+ #include <stdint.h>
++#endif
++#ifdef HAVE_INTTYPES_H
++#include <inttypes.h>
++#endif
+ #include "SFinternal.h"
+ #include "xstat.h"
+ #include <X11/StringDefs.h>

Deleted: csw/mgar/pkg/graphviz/trunk/files/no_svg_in_libcairo.diff
===================================================================
--- csw/mgar/pkg/graphviz/trunk/files/no_svg_in_libcairo.diff	2010-01-26 17:50:00 UTC (rev 8190)
+++ csw/mgar/pkg/graphviz/trunk/files/no_svg_in_libcairo.diff	2010-01-26 19:02:13 UTC (rev 8191)
@@ -1,31 +0,0 @@
---- graphviz-2.24.0.orig/plugin/pango/gvrender_pango.c	2009-06-02 21:10:57.000000000 -0400
-+++ graphviz-2.24.0/plugin/pango/gvrender_pango.c	2009-07-22 17:37:30.000000000 -0400
-@@ -1,4 +1,4 @@
--/* $Id: gvrender_pango.c,v 1.67 2009/06/03 01:10:57 ellson Exp $ $Revision: 1.67 $ */
-+/* $Id: gvrender_pango.c,v 1.68 2009/07/22 21:24:26 ellson Exp $ $Revision: 1.68 $ */
- /* vim:set shiftwidth=4 ts=8: */
- 
- /**********************************************************
-@@ -95,16 +95,22 @@
- 	    cairo_destroy(cr);
-         switch (job->render.id) {
-         case FORMAT_PS:
-+#ifdef CAIRO_HAS_PS_SURFACE
- 	    surface = cairo_ps_surface_create_for_stream (writer,
- 			job, job->width, job->height);
-+#endif
- 	    break;
-         case FORMAT_PDF:
-+#ifdef CAIRO_HAS_PDF_SURFACE
- 	    surface = cairo_pdf_surface_create_for_stream (writer,
- 			job, job->width, job->height);
-+#endif
- 	    break;
-         case FORMAT_SVG:
-+#ifdef CAIRO_HAS_SVG_SURFACE
- 	    surface = cairo_svg_surface_create_for_stream (writer,
- 			job, job->width, job->height);
-+#endif
- 	    break;
-         case FORMAT_CAIRO:
-         case FORMAT_PNG:


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.


More information about the devel mailing list