OpenPKG CVS Repository http://cvs.openpkg.org/ ____________________________________________________________________________
Server: cvs.openpkg.org Name: Ralf S. Engelschall Root: /v/openpkg/cvs Email: [email protected] Module: openpkg-src Date: 11-Mar-2009 20:54:44 Branch: HEAD Handle: 2009031119544400 Modified files: openpkg-src/graphviz graphviz.patch graphviz.spec Log: upgrading package: graphviz 2.22.0 -> 2.22.1 Summary: Revision Changes Path 1.16 +40 -38 openpkg-src/graphviz/graphviz.patch 1.87 +2 -2 openpkg-src/graphviz/graphviz.spec ____________________________________________________________________________ patch -p0 <<'@@ .' Index: openpkg-src/graphviz/graphviz.patch ============================================================================ $ cvs diff -u -r1.15 -r1.16 graphviz.patch --- openpkg-src/graphviz/graphviz.patch 4 Mar 2009 22:10:45 -0000 1.15 +++ openpkg-src/graphviz/graphviz.patch 11 Mar 2009 19:54:44 -0000 1.16 @@ -1,6 +1,38 @@ +Index: lib/graph/graphio.c +--- lib/graph/graphio.c.orig 2009-03-09 19:16:00 +0100 ++++ lib/graph/graphio.c 2009-03-11 20:43:50 +0100 +@@ -193,7 +193,7 @@ + { + if (myfgets) AG.fgets = myfgets; + if (myfwrite) AG.fwrite = myfwrite; +-#if defined(__SUNPRO_C) || defined(__CYGWIN__) || defined(__MINGW32__) || defined(__FreeBSD__) ++#if 1 || defined(__SUNPRO_C) || defined(__CYGWIN__) || defined(__MINGW32__) || defined(__FreeBSD__) + #undef ferror + #endif + if (myferror) AG.ferror = myferror; +@@ -581,7 +581,7 @@ + free(dict); + } + +-#ifdef ferror ++#if 1 + /* if ferror is a macro (__SUNPRO_C __CYGWIN__ __MINGW32__ __FreeBSD__ and poss others) + * then wrap it in a function */ + static int agferror(FILE *stream) +@@ -600,7 +600,7 @@ + AG.fwrite = fwrite; /* init to system version of fwrite() */ + } + if (AG.ferror == NULL) { +-#ifdef ferror ++#if 1 + #undef ferror + /* if ferror is a macro, then use our wrapper function, but + * undef the macro first so it doesn't subst in "AG.ferror" */ +Index: lib/sfio/Makefile +sed: -e expression #1, char 19: unknown option to `s' Index: lib/sfio/sfhdr.h ---- lib/sfio/sfhdr.h.orig 2008-02-22 15:21:42 +0100 -+++ lib/sfio/sfhdr.h 2008-03-11 08:09:41 +0100 +--- lib/sfio/sfhdr.h.orig 2009-02-05 20:21:15 +0100 ++++ lib/sfio/sfhdr.h 2009-03-11 20:39:44 +0100 @@ -143,6 +143,10 @@ #include <errno.h> #include <ctype.h> @@ -23,9 +55,9 @@ #define SF_MAXDOUBLE MAXDOUBLE #endif Index: plugin/gd/gvrender_gd.c ---- 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 @@ +--- plugin/gd/gvrender_gd.c.orig 2009-02-18 14:36:50 +0100 ++++ plugin/gd/gvrender_gd.c 2009-03-11 20:39:44 +0100 +@@ -33,6 +33,10 @@ #ifdef HAVE_LIBGD #include "gd.h" @@ -37,9 +69,9 @@ FORMAT_GIF, FORMAT_JPEG, Index: plugin/gd/gvtextlayout_gd.c ---- 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 @@ +--- plugin/gd/gvtextlayout_gd.c.orig 2008-10-30 23:06:59 +0100 ++++ plugin/gd/gvtextlayout_gd.c 2009-03-11 20:39:44 +0100 +@@ -26,6 +26,10 @@ #ifdef HAVE_LIBGD #include "gd.h" @@ -50,33 +82,3 @@ #if defined(HAVE_LIBGD) && defined(HAVE_GD_FREETYPE) /* fontsize at which text is omitted entirely */ -Index: lib/graph/graphio.c ---- lib/graph/graphio.c.orig 2009-03-02 18:46:34 +0100 -+++ lib/graph/graphio.c 2009-03-04 23:03:28 +0100 -@@ -193,7 +193,7 @@ - { - if (myfgets) AG.fgets = myfgets; - if (myfwrite) AG.fwrite = myfwrite; --#if defined(__SUNPRO_C) || defined(__CYGWIN__) || defined(__MINGW32__) -+#if 1 || defined(__SUNPRO_C) || defined(__CYGWIN__) || defined(__MINGW32__) - #undef ferror - #endif - if (myferror) AG.ferror = myferror; -@@ -581,7 +581,7 @@ - free(dict); - } - --#if defined(__SUNPRO_C) || defined(__CYGWIN__) || defined(__MINGW32__) -+#if 1 || defined(__SUNPRO_C) || defined(__CYGWIN__) || defined(__MINGW32__) - /* for systems where ferror is a macro */ - static int agferror(FILE *stream) - { -@@ -599,7 +599,7 @@ - AG.fwrite = fwrite; /* init to system version of fwrite() */ - } - if (AG.ferror == NULL) { --#if defined(__SUNPRO_C) || defined(__CYGWIN__) || defined(__MINGW32__) -+#if 1 || defined(__SUNPRO_C) || defined(__CYGWIN__) || defined(__MINGW32__) - #undef ferror - AG.ferror = agferror; /* init to ferror macro wrapper function */ - #else @@ . patch -p0 <<'@@ .' Index: openpkg-src/graphviz/graphviz.spec ============================================================================ $ cvs diff -u -r1.86 -r1.87 graphviz.spec --- openpkg-src/graphviz/graphviz.spec 4 Mar 2009 22:10:45 -0000 1.86 +++ openpkg-src/graphviz/graphviz.spec 11 Mar 2009 19:54:44 -0000 1.87 @@ -22,7 +22,7 @@ ## # package versions -%define V_graphviz 2.22.0 +%define V_graphviz 2.22.1 %define V_graphviz_perl_base 2.04 %define V_graphviz_perl_data_structure 0.17 @@ -37,7 +37,7 @@ Group: Diagram License: GPL Version: %{V_graphviz} -Release: 20090304 +Release: 20090311 # package options %option with_x11 no @@ . ______________________________________________________________________ OpenPKG http://openpkg.org CVS Repository Commit List [email protected]
