commit 596c0fe1241bdfd05f74e7e268be0af082c986f8911452e7159ffd4fb3bfe1ab Author: OBS User unknown Date: Mon Jan 15 23:15:41 2007 +0000 OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/graphviz?expand=0&rev=1 diff --git a/.gitattributes b/.gitattributes new file mode 100644 index 0000000..9b03811 --- /dev/null +++ b/.gitattributes @@ -0,0 +1,23 @@ +## Default LFS +*.7z filter=lfs diff=lfs merge=lfs -text +*.bsp filter=lfs diff=lfs merge=lfs -text +*.bz2 filter=lfs diff=lfs merge=lfs -text +*.gem filter=lfs diff=lfs merge=lfs -text +*.gz filter=lfs diff=lfs merge=lfs -text +*.jar filter=lfs diff=lfs merge=lfs -text +*.lz filter=lfs diff=lfs merge=lfs -text +*.lzma filter=lfs diff=lfs merge=lfs -text +*.obscpio filter=lfs diff=lfs merge=lfs -text +*.oxt filter=lfs diff=lfs merge=lfs -text +*.pdf filter=lfs diff=lfs merge=lfs -text +*.png filter=lfs diff=lfs merge=lfs -text +*.rpm filter=lfs diff=lfs merge=lfs -text +*.tbz filter=lfs diff=lfs merge=lfs -text +*.tbz2 filter=lfs diff=lfs merge=lfs -text +*.tgz filter=lfs diff=lfs merge=lfs -text +*.ttf filter=lfs diff=lfs merge=lfs -text +*.txz filter=lfs diff=lfs merge=lfs -text +*.whl filter=lfs diff=lfs merge=lfs -text +*.xz filter=lfs diff=lfs merge=lfs -text +*.zip filter=lfs diff=lfs merge=lfs -text +*.zst filter=lfs diff=lfs merge=lfs -text diff --git a/.gitignore b/.gitignore new file mode 100644 index 0000000..57affb6 --- /dev/null +++ b/.gitignore @@ -0,0 +1 @@ +.osc diff --git a/aliasing-fixes.diff b/aliasing-fixes.diff new file mode 100644 index 0000000..e3c8f3e --- /dev/null +++ b/aliasing-fixes.diff @@ -0,0 +1,122 @@ +Index: graphviz-2.6/lib/agraph/edge.c +=================================================================== +--- graphviz-2.6.orig/lib/agraph/edge.c ++++ graphviz-2.6/lib/agraph/edge.c +@@ -153,25 +153,29 @@ static Agedge_t *agfindedge_by_id(Agnode + + void agedgesetop(Agraph_t * g, Agedge_t * e, int ins) + { +- Dtlink_t **seq_set, **id_set; ++ union { ++ Dtlink_t **dtlink; ++ Agedge_t **agedge; ++ } seq_set; ++ Dtlink_t **id_set; + Agnode_t *n; /* node where is referenced */ + + if (AGTYPE(e) == AGOUTEDGE) { + n = AGOUT2IN(e)->node; +- seq_set = (Dtlink_t **) & (n->out); ++ seq_set.agedge = & (n->out); + id_set = &(n->outid); + } else { + n = AGIN2OUT(e)->node; +- seq_set = (Dtlink_t **) & (n->in); ++ seq_set.agedge = & (n->in); + id_set = &(n->inid); + } + +- dtrestore(g->e_seq, *seq_set); ++ dtrestore(g->e_seq, *seq_set.dtlink); + if (ins) + dtinsert(g->e_seq, e); + else + dtdelete(g->e_seq, e); +- *seq_set = dtextract(g->e_seq); ++ *seq_set.dtlink = dtextract(g->e_seq); + + dtrestore(g->e_id, *id_set); + if (ins) +Index: graphviz-2.6/lib/agraph/flatten.c +=================================================================== +--- graphviz-2.6.orig/lib/agraph/flatten.c ++++ graphviz-2.6/lib/agraph/flatten.c +@@ -30,8 +30,14 @@ void agflatten_elist(Dict_t * d, Dtlink_ + + void agflatten_edges(Agraph_t * g, Agnode_t * n) + { +- agflatten_elist(g->e_seq, (Dtlink_t **) & (n->out)); +- agflatten_elist(g->e_seq, (Dtlink_t **) & (n->in)); ++ union { ++ Dtlink_t **dtlink; ++ Agedge_t **agedge; ++ } out, in; ++ out.agedge = & (n->out); ++ in.agedge = & (n->in); ++ agflatten_elist(g->e_seq, out.dtlink); ++ agflatten_elist(g->e_seq, in.dtlink); + } + + void agflatten(Agraph_t * g, int flag) +Index: graphviz-2.6/lib/gd/fontwheeltest.c +=================================================================== +--- graphviz-2.6.orig/lib/gd/fontwheeltest.c ++++ graphviz-2.6/lib/gd/fontwheeltest.c +@@ -21,7 +21,10 @@ void + dowheel (gdImagePtr im, int color, char *fontfile, int fontsize, + double angle, int x, int y, int offset, char *string) + { +- int brect[8]; ++ union { ++ int coords[8]; ++ gdPoint points[4]; ++ } brect; + FILE *err; + double curangrads, curang, x0, y0; + char *cp; +@@ -40,16 +43,16 @@ dowheel (gdImagePtr im, int color, char + + /* The case of newlines is taken care of in the gdImageStringTTF call */ + #if defined(OLDER_GD) +- cp = gdImageStringTTF (im, brect, color, fontfile, fontsize, ++ cp = gdImageStringTTF (im, brect.coords, color, fontfile, fontsize, + curangrads, x0, y0, string); + #else +- cp = gdImageStringFT (im, brect, color, fontfile, fontsize, ++ cp = gdImageStringFT (im, brect.coords, color, fontfile, fontsize, + curangrads, x0, y0, string); + #endif + if (cp) + doerr (err, cp); + +- gdImagePolygon (im, (gdPointPtr)brect, 4, color); ++ gdImagePolygon (im, brect.points, 4, color); + } + + fclose (err); +Index: graphviz-2.6/tclpkg/tcldot/tcldot.c +=================================================================== +--- graphviz-2.6.orig/tclpkg/tcldot/tcldot.c ++++ graphviz-2.6/tclpkg/tcldot/tcldot.c +@@ -1232,6 +1232,8 @@ static int graphcmd(ClientData clientDat + return TCL_OK; + + } else if ((c == 'w') && (strncmp(argv[1], "write", length) == 0)) { ++ void *aliasing_dummy; ++ + g = g->root; + if (argc < 3) { + Tcl_AppendResult(interp, "wrong # args: should be \"", argv[0], +@@ -1258,9 +1260,11 @@ static int graphcmd(ClientData clientDat + gvc->job->output_lang = + gvrender_select(gvc->job, gvc->job->output_langname); + ++ aliasing_dummy = gvc->job->output_file; + if (Tcl_GetOpenFile (interp, argv[2], 1, 1, +- (ClientData *) &(gvc->job->output_file)) != TCL_OK) ++ (ClientData *) &aliasing_dummy) != TCL_OK) + return TCL_ERROR; ++ gvc->job->output_file = aliasing_dummy; + + /* make sure that layout is done - unless canonical output */ + if ((!GD_drawing(g) || argc > 4) diff --git a/config-file-option.diff b/config-file-option.diff new file mode 100644 index 0000000..5fc0b97 --- /dev/null +++ b/config-file-option.diff @@ -0,0 +1,42 @@ +From: Andreas Gruenbacher +Subject: Add a -C option to specify an alternative config file + +Add this patch without applying it for now; we need additional +changes before the config file can be created in the build +system without being root. + +Index: graphviz-2.6/lib/common/args.c +=================================================================== +--- graphviz-2.6.orig/lib/common/args.c ++++ graphviz-2.6/lib/common/args.c +@@ -122,6 +122,16 @@ config_extra_args(GVC_t *gvc, int argc, + if (arg && *arg == '-') { + switch (arg[1]) { + case 'c' : Config = TRUE; break; ++ case 'C' : ++ if (!arg[2]) { ++ fprintf (stderr, "No argument for -C flag\n"); ++ dotneato_usage (1); ++ } ++ if (gvc->config_path) ++ free(gvc->config_path); ++ gvc->config_path = gmalloc(strlen(arg+1) + 1); ++ strcpy(gvc->config_path, arg+1); ++ break; + default : + cnt++; + if (*p != arg) *p = arg; +Index: graphviz-2.6/lib/common/input.c +=================================================================== +--- graphviz-2.6.orig/lib/common/input.c ++++ graphviz-2.6/lib/common/input.c +@@ -64,7 +64,8 @@ static char *memtestItems = "\n\ + static char *configFlags = "(additional options for config) [-c]\n"; + static char *configItems = "\n\ + -c - Configure plugins (Writes $prefix/lib/graphviz/config \n\ +- with available plugin information. Needs write priviledge.)\n"; ++ with available plugin information. Needs write priviledge.)\n\ ++ -C file - Use an alternative config file.\n"; + + void dotneato_usage(int exval) + { diff --git a/fix-pkgIndex.diff b/fix-pkgIndex.diff new file mode 100644 index 0000000..4d55d72 --- /dev/null +++ b/fix-pkgIndex.diff @@ -0,0 +1,10 @@ +Index: graphviz-2.2/mkpkgindex.sh +=================================================================== +--- graphviz-2.2.orig/tclpkg/mkpkgindex.sh ++++ graphviz-2.2/tclpkg/mkpkgindex.sh +@@ -11,4 +11,4 @@ case "$1" in + echo " package require Tk 8.3" >>pkgIndex.tcl + ;; + esac +-echo " load [file join \$dir $lib] $2\"" >>pkgIndex.tcl ++echo " load $lib $2\"" >>pkgIndex.tcl diff --git a/graphviz-2.6.tar.bz2 b/graphviz-2.6.tar.bz2 new file mode 100644 index 0000000..b02f17f --- /dev/null +++ b/graphviz-2.6.tar.bz2 @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:618ed9e9ad5762f24d42692c21d91cfcb13004dc35325f699efb9dbd2a0741a6 +size 3444862 diff --git a/graphviz-fix_swig_template.patch b/graphviz-fix_swig_template.patch new file mode 100644 index 0000000..0d8d015 --- /dev/null +++ b/graphviz-fix_swig_template.patch @@ -0,0 +1,137 @@ +--- tclpkg/gv/gv.i ++++ tclpkg/gv/gv.i +@@ -17,6 +17,134 @@ + %module gv + %{ + #include "gvc.h" ++ ++/* new graph objects */ ++extern Agraph_t *graph(char *name); /* new empty graph */ ++extern Agraph_t *digraph(char *name); /* new empty digraph */ ++extern Agraph_t *strictgraph(char *name); /* new empty strict graph */ ++extern Agraph_t *strictdigraph(char *name); /* new empty strict digraph */ ++ ++extern Agraph_t *readstring(char *string); /* from dot-formatted string */ ++extern Agraph_t *read(char *filename); /* from dot-formatted file */ ++extern Agraph_t *read(FILE *f); /* from dot-formatted file */ ++ ++extern Agraph_t *graph(Agraph_t *g, char *name);/* add subgraph to graph */ ++extern Agnode_t *node(Agraph_t *g, char *name); /* add node to graph */ ++extern Agedge_t *edge(Agnode_t *t, Agnode_t *h);/* add edge between existing nodes */ ++ ++extern Agedge_t *edge(Agnode_t *t, char *hname);/* add edge, existing tail, named head which will be induced if necessary */ ++extern Agedge_t *edge(char *tname, Agnode_t *h);/* add edge, named tail which will be induced if necessary, existing head */ ++ ++extern Agedge_t *edge(Agraph_t *g, char *tname, char *hname);/* add edge between named nodes, induced as necessary */ ++ ++/* set/get attribute of graph/node/edge */ ++extern char *setv(Agraph_t *g, char *attr, char *val); ++extern char *setv(Agraph_t *g, char *gne, char *att, char *val); ++extern char *setv(Agnode_t *n, char *attr, char *val); ++extern char *setv(Agedge_t *e, char *attr, char *val); ++ ++extern char *setv(Agraph_t *g, Agsym_t *a, char *val); ++extern char *setv(Agraph_t *g, char *gne, Agsym_t *a, char *val); ++extern char *setv(Agnode_t *n, Agsym_t *a, char *val); ++extern char *setv(Agedge_t *e, Agsym_t *a, char *val); ++ ++extern char *getv(Agraph_t *g, char *attr); ++extern char *getv(Agraph_t *g, char *gne, char *attr); ++extern char *getv(Agnode_t *n, char *attr); ++extern char *getv(Agedge_t *e, char *attr); ++ ++extern char *getv(Agraph_t *g, Agsym_t *a); ++extern char *getv(Agraph_t *g, char *gne, Agsym_t *a); ++extern char *getv(Agnode_t *n, Agsym_t *a); ++extern char *getv(Agedge_t *e, Agsym_t *a); ++ ++/* names */ ++extern char *nameof(Agraph_t *g); ++extern char *nameof(Agnode_t *n); ++//extern char *nameof(Agedge_t *e); ++extern char *nameof(Agsym_t *a); ++ ++extern Agraph_t *findsubg(Agraph_t *g, char *name); ++extern Agnode_t *findnode(Agraph_t *g, char *name); ++extern Agedge_t *findedge(Agnode_t *t, Agnode_t *h); ++ ++extern Agsym_t *findattr(Agraph_t *g, char *name); ++extern Agsym_t *findattr(Agnode_t *n, char *name); ++extern Agsym_t *findattr(Agedge_t *e, char *name); ++ ++/* misc navigators */ ++extern Agnode_t *headof(Agedge_t *e); ++extern Agnode_t *tailof(Agedge_t *e); ++extern Agraph_t *graphof(Agraph_t *g); ++extern Agraph_t *graphof(Agedge_t *e); ++extern Agraph_t *graphof(Agnode_t *n); ++extern Agraph_t *rootof(Agraph_t *g); ++ ++/* iterators */ ++extern bool ok(Agraph_t *g); ++extern bool ok(Agnode_t *n); ++extern bool ok(Agedge_t *e); ++extern bool ok(Agsym_t *a); ++ ++extern Agraph_t *firstsubg(Agraph_t *g); ++extern Agraph_t *nextsubg(Agraph_t *g, Agraph_t *sg); ++ ++extern Agraph_t *firstsupg(Agraph_t *g); ++extern Agraph_t *nextsupg(Agraph_t *g, Agraph_t *sg); ++ ++extern Agedge_t *firstedge(Agraph_t *g); ++extern Agedge_t *nextedge(Agraph_t *g, Agedge_t *e); ++ ++extern Agedge_t *firstout(Agraph_t *g); ++extern Agedge_t *nextout(Agraph_t *g, Agedge_t *e); ++ ++extern Agedge_t *firstedge(Agnode_t *n); ++extern Agedge_t *nextedge(Agnode_t *n, Agedge_t *e); ++ ++extern Agedge_t *firstout(Agnode_t *n); ++extern Agedge_t *nextout(Agnode_t *n, Agedge_t *e); ++ ++extern Agnode_t *firsthead(Agnode_t *n); ++extern Agnode_t *nexthead(Agnode_t *n, Agnode_t *h); ++ ++extern Agedge_t *firstin(Agraph_t *g); ++extern Agedge_t *nextin(Agnode_t *n, Agedge_t *e); ++ ++extern Agedge_t *firstin(Agnode_t *n); ++extern Agedge_t *nextin(Agraph_t *g, Agedge_t *e); ++ ++extern Agnode_t *firsttail(Agnode_t *n); ++extern Agnode_t *nexttail(Agnode_t *n, Agnode_t *t); ++ ++extern Agnode_t *firstnode(Agraph_t *g); ++extern Agnode_t *nextnode(Agraph_t *g, Agnode_t *n); ++ ++extern Agnode_t *firstnode(Agedge_t *e); ++extern Agnode_t *nextnode(Agedge_t *e, Agnode_t *n); ++ ++extern Agsym_t *firstattr(Agraph_t *g); ++extern Agsym_t *firstattr(Agraph_t *g, char *gne); ++extern Agsym_t *nextattr(Agraph_t *g, Agsym_t *a); ++extern Agsym_t *nextattr(Agraph_t *g, char *gne, Agsym_t *a); ++ ++extern Agsym_t *firstattr(Agnode_t *n); ++extern Agsym_t *nextattr(Agnode_t *n, Agsym_t *a); ++ ++extern Agsym_t *firstattr(Agedge_t *e); ++extern Agsym_t *nextattr(Agedge_t *e, Agsym_t *a); ++ ++/* remove graph objects */ ++extern void rm(Agraph_t *g); ++extern void rm(Agnode_t *n); ++extern void rm(Agedge_t *e); ++ ++extern void layout(Agraph_t *g, char *engine); ++ ++extern void render(Agraph_t *g, char *format); ++extern void render(Agraph_t *g, char *format, char *filename); ++extern void render(Agraph_t *g, char *format, FILE *f); ++extern void render(Agraph_t *g, char *format, void **data); ++ + %} + + /* new graph objects */ diff --git a/graphviz-neato_splines.patch b/graphviz-neato_splines.patch new file mode 100644 index 0000000..ea2ae2d --- /dev/null +++ b/graphviz-neato_splines.patch @@ -0,0 +1,11 @@ +--- lib/neatogen/neatosplines.c ++++ lib/neatogen/neatosplines.c +@@ -61,6 +61,8 @@ + n = n + poly[i]->pn; + } + bar = N_GNEW(n, Pedge_t); ++ if (bar == (Pedge_t *)1) ++ bar = (Pedge_t *)0; + b = 0; + for (i = 0; i < npoly; i++) { + if (i == pp) diff --git a/graphviz-new_X_paths.patch b/graphviz-new_X_paths.patch new file mode 100644 index 0000000..3935460 --- /dev/null +++ b/graphviz-new_X_paths.patch @@ -0,0 +1,34 @@ +--- configure.ac ++++ configure.ac +@@ -91,7 +91,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/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"; ++ DEFAULT_FONTPATH="/usr/share/fonts/TTF:/usr/share/fonts/TrueType:/usr/share/fonts/truetype:/usr/openwin/lib/X11/fonts/TrueType:/usr/share/fonts/Type1:/usr/common/share/fonts/ttf"; + PATHSEPARATOR=":" + ;; + esac +--- doc/FAQ.html ++++ doc/FAQ.html +@@ -691,7 +691,8 @@ +

+ The default DOTFONTPATH is: + 

+-#define DEFAULT_FONTPATH "/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"
++#define DEFAULT_FONTPATH
++"/usr/share/fonts/TrueType:/usr/share/fonts/truetype:/usr/share/fonts/TTF:/usr/share/fonts/TrueType:/usr/share/fonts/truetype:/usr/openwin/lib/X11/fonts/TrueType:/usr/share/fonts/Type1"
+
+ If your fonts are somewhere else, then you must set that directory in + the webdot script, or recompile Graphviz with the correct DEFAULT_FONTPATH +--- lib/gd/gd.h ++++ lib/gd/gd.h +@@ -59,7 +59,7 @@ + /* 2.0.23: more Type 1 fonts */ + #ifndef DEFAULT_FONTPATH + /* default fontpath for unix systems - whatever happened to standards ! */ +-#define DEFAULT_FONTPATH "/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/lib/X11/fonts/Type1:/usr/openwin/lib/X11/fonts/Type1" ++#define DEFAULT_FONTPATH "/usr/share/fonts/TrueType:/usr/share/fonts/truetype:/usr/share/fonts/TTF:/usr/share/fonts/truetype:/usr/openwin/lib/X11/fonts/TrueType:/usr/share/fonts/Type1:/usr/openwin/lib/X11/fonts/Type1" + #endif + #ifndef PATHSEPARATOR + #define PATHSEPARATOR ":" diff --git a/graphviz.changes b/graphviz.changes new file mode 100644 index 0000000..87dcb42 --- /dev/null +++ b/graphviz.changes @@ -0,0 +1,373 @@ +------------------------------------------------------------------- +Fri Aug 11 11:30:14 CEST 2006 - pth@suse.de + +- Adapt to new X11 paths. + +------------------------------------------------------------------- +Mon Apr 3 11:33:45 CEST 2006 - pnemec@suse.cz + +- add pkgconfig files to devel package + +------------------------------------------------------------------- +Sun Feb 19 19:31:51 CET 2006 - aj@suse.de + +- Reduce BuildRequires. + +------------------------------------------------------------------- +Thu Feb 9 19:00:59 CET 2006 - pth@suse.de + +- Fix segfault in neato when using splines (#144275) + +------------------------------------------------------------------- +Fri Feb 3 18:01:07 CET 2006 - pth@suse.de + +- Fix swig template to include declaration. +- Fix BuildRequires +- Fix dependencies for -devel package + +------------------------------------------------------------------- +Thu Nov 24 18:56:26 CET 2005 - agruen@suse.de + +- Add missing plugin config file. +- Fix gcc aliasing bugs. + +------------------------------------------------------------------- +Mon Aug 29 15:42:52 CEST 2005 - agruen@suse.de + +- Update to version 2.6: numerous bugfixes. + +------------------------------------------------------------------- +Tue Aug 9 17:27:30 CEST 2005 - agruen@suse.de + +- fix-pkgIndex.diff: Fix tcl library search for "package require + Tkspline" and similar statements by (a) moving the tcl/tk + libraries from _libdir/graphviz/ to _libdir/, and removing + path names from library names in pkgIndex.tcl so that 32bit + and 64bit libraries are searched as appropriate. + +------------------------------------------------------------------- +Tue Aug 2 01:11:47 CEST 2005 - ro@suse.de + +- move pkgIndex.tcl to /usr/share + +------------------------------------------------------------------- +Thu Feb 10 15:14:15 CET 2005 - agruen@suse.de + +- Update to version 2.2. +- Drop graphviz-graphs subpackage. + +------------------------------------------------------------------- +Sun Aug 29 02:04:21 CEST 2004 - garloff@suse.de + +- Drop EULA notification message. + +------------------------------------------------------------------- +Sat Mar 27 20:13:52 CET 2004 - sndirsch@suse.de + +- update to graphviz-1.12 + * general + - rename bcc -> bcomps to avoid name conflict with + "Bruce's C Compiler" on Redhat distributions. + - all build without X11 (fix problem in lefty tree) + - remove from distribution: + dag, fdp, geo, grid, incr, shape, tcldgr, tcldgl + * dotneato + - fix "brown-bag" problem resulting in PNG and JPEG errors on + RH8 and RH9. +- removed hunks for dag, fdp, grid, tcldgl from codecleanup patch; + directories were dropped upstream (see 1.12 changelog above) +- no need to rename bcc any longer (see 1.12 changelog above) +- removed libtcldgl/libtcldgr (see 1.12 changelog above) + +------------------------------------------------------------------- +Tue Mar 9 00:04:51 CET 2004 - garloff@suse.de + +- Rename bcc to bcc-graphviz due to conflict with bcc from dev86. + +------------------------------------------------------------------- +Mon Mar 1 17:42:43 CET 2004 - garloff@suse.de + +- Update to graphviz-1.11: + * Drop lots of patches (merged upstream) ;-) + * dotneato: add -Gviewport, fix memleak in gdft, clean up calc + of whitespace around labels + +------------------------------------------------------------------- +Wed Feb 25 15:40:49 CET 2004 - garloff@suse.de + +- Update to graphviz-1.10: + * enhanced gpr: string matching, lock primitive to save graphs + * zoomable 2 1/2 D graph viewer (Java) + * neato -gpack + +------------------------------------------------------------------- +Fri Jan 16 10:49:32 CET 2004 - meissner@suse.de + +- Change freetype detection to new one, so the internal libGD is build + against it again. + +------------------------------------------------------------------- +Sat Jan 10 11:23:19 CET 2004 - adrian@suse.de + +- build as user + +------------------------------------------------------------------- +Mon Oct 6 12:17:24 CEST 2003 - kukuk@suse.de + +- Remove curl (source code does not use it) and lynx from + neededforbuild. + +------------------------------------------------------------------- +Mon Jul 28 17:23:10 CEST 2003 - ro@suse.de + +- updated neededforbuild + +------------------------------------------------------------------- +Tue May 13 20:02:40 CEST 2003 - pthomas@suse.de + +- Add hacks to work around problems with libtool 1.5. + +------------------------------------------------------------------- +Mon Apr 14 19:42:24 CEST 2003 - pthomas@suse.de + +- Get rid of nearly all compiler warnings. + +------------------------------------------------------------------- +Mon Apr 7 12:34:14 CEST 2003 - pthomas@suse.de + +- Use posix-2001 conforming syntax for sort. + +------------------------------------------------------------------- +Fri Feb 7 19:13:50 CET 2003 - pthomas@suse.de + +- Update to 1.9 +- Split off subpackages devel, graphs and tcl like + it's done in the specfile included with graphviz. +- remove obsolete patches + +------------------------------------------------------------------- +Wed Jan 29 13:47:12 CET 2003 - ro@suse.de + +- fix png library detection in configure +- removed perl-GD and blt from neededforbuild + +------------------------------------------------------------------- +Thu Jan 9 00:58:22 CET 2003 - ro@suse.de + +- fixed configure.in + +------------------------------------------------------------------- +Thu Nov 14 17:05:40 CET 2002 - tcrhak@suse.cz + +- fixed for new bison: end rules with semicolons + +------------------------------------------------------------------- +Tue Aug 20 02:08:25 CEST 2002 - mmj@suse.de + +- Correct PreReq + +------------------------------------------------------------------- +Sat Aug 10 15:47:28 CEST 2002 - aj@suse.de + +- Fix typo in license. + +------------------------------------------------------------------- +Fri Jul 5 10:24:42 CEST 2002 - kukuk@suse.de + +- Use %ix86 macro + +------------------------------------------------------------------- +Tue Jul 2 14:55:10 MEST 2002 - garloff@suse.de + +- Update to 1.8.6: + * FPU handling fix got included + * arch independent stuff in /usr/share/graphviz now + * arrow fixes and improvements and more arrow types + * new pack option to neato + * bugfixes +- Change licensor from SuSE GmbH to SuSE Linux AG + +------------------------------------------------------------------- +Wed May 22 14:48:29 MEST 2002 - garloff@suse.de + +- Add prune binary and man page to file list. + +------------------------------------------------------------------- +Fri May 10 12:04:39 MEST 2002 - garloff@suse.de + +- Fix FPU excpetion handling. (Use feenableexcept() rather than + _FPU_GETCW(), if available.) + +------------------------------------------------------------------- +Wed May 8 21:01:46 MEST 2002 - garloff@suse.de + +- Update to graphviz-1.8.5: + * fixed various Win and MacOSX probs + * minimal Type1 font support + * webdot.cgi perl script accepts same args as webgot.tcl now + * various SVG enhancements and fixes + * various portability/64bit fixes + * various bug fixes + +------------------------------------------------------------------- +Fri May 3 10:57:57 CEST 2002 - meissner@suse.de + +- %_lib fixes (to find tclConfig.sh and tkConfig.sh) + +------------------------------------------------------------------- +Fri Feb 1 00:26:14 CET 2002 - ro@suse.de + +- changed neededforbuild to + +------------------------------------------------------------------- +Mon Jan 28 17:58:45 MET 2002 - garloff@suse.de + +- Some more missing decls found and fixed. + +------------------------------------------------------------------- +Mon Jan 28 17:12:04 MET 2002 - garloff@suse.de + +- Added patch to fix lots of warnings (and potential bugs on 64bit + platforms). + +------------------------------------------------------------------- +Mon Jan 28 12:20:44 MET 2002 - garloff@suse.de + +- Pass TK_DEFS to gcc for tkspline (which uses tkInt.h) + +------------------------------------------------------------------- +Mon Jan 28 02:14:55 MET 2002 - garloff@suse.de + +- Update to 1.7.16: + * Various bug fixes + * Support for xfig, svgz, + * Text output improvements + * New twopi tool +- Drop patches that have been included in official source ball. + +------------------------------------------------------------------- +Wed May 23 00:30:21 CEST 2001 - garloff@suse.de + +- Fix cast warnings on 64bit archs and add missing includes + where necessary. + +------------------------------------------------------------------- +Wed May 9 19:53:12 CEST 2001 - garloff@suse.de + +- Cleanup patches. + +------------------------------------------------------------------- +Tue May 8 21:37:33 CEST 2001 - mfabian@suse.de + +- bzip2 sources + +------------------------------------------------------------------- +Mon Apr 30 17:28:11 MEST 2001 - garloff@suse.de + +- Update to release 1.7.6 with lots of bugfixes: + * Lots of font related fixes + * Fix various bugs WRT labels + * UTF-8 fixes + * cluster and neato layout fixes + * -Timap (mouse sensitive graphs for web pages) fixes + * PNG by default does white background now instead of transp. +- New features in 1.7.6: + * New graph processing tools: acyclic, ccomps, colorize, gc, + gpr, nop, sccmap, tred, unflatten (See ChangeLog for details) +- Spec file: Consistently use %{prefix} + +------------------------------------------------------------------- +Thu Mar 22 16:05:02 CET 2001 - ro@suse.de + +- changed neededforbuild to freetype2 +- updated to 1.7.5 for freetype2 + +------------------------------------------------------------------- +Mon Feb 26 12:50:47 CET 2001 - uli@suse.de + +- fixed for new glibc + +------------------------------------------------------------------- +Fri Jan 19 17:18:16 MET 2001 - garloff@suse.de + +- Assorted patches from Stephen C. North to + * fix runtime error in graphs having multiple nodes in the min + or max rank set + * fix layout thinko (mincross) + +------------------------------------------------------------------- +Sat Dec 16 10:55:33 CET 2000 - garloff@suse.de + +- Update to 1.7.4: + * various fixes + * support various linestyles + * Remove Tcldot dependence on libgdtclft + * support for long label strings (fixing a reported crash) + +------------------------------------------------------------------- +Tue Dec 12 01:27:03 MET 2000 - garloff@suse.de + +- Specfile cleanups. + +------------------------------------------------------------------- +Mon Dec 11 23:08:39 MET 2000 - garloff@suse.de + +- Update to 1.7.3: + * Better font drawing support + * Bugfixes +- Removed most explicit Requires: from spec, as AutoReqProv works + just fine. +- Split off webdot. + +------------------------------------------------------------------- +Wed Nov 29 17:26:55 CET 2000 - ro@suse.de + +- changed neededforbuild to + +------------------------------------------------------------------- +Wed Nov 8 16:32:06 CET 2000 - ro@suse.de + +- fixed neededforbuild gd -> perl-GD + +------------------------------------------------------------------- +Wed Nov 1 14:55:33 CET 2000 - garloff@suse.de + +- Use %{?suse_update_config} -> support for S/390 added + +------------------------------------------------------------------- +Tue Oct 31 19:49:41 MET 2000 - garloff@suse.de + +- Update to 1.7: * dot/neato again separate binaries + * 64 bit patches integrated + * Some bugfixes and feature enhancements + +------------------------------------------------------------------- +Wed Oct 18 21:46:09 MEST 2000 - garloff@suse.de + +- Change the wording of the license notification to match the + wording from the letter from AT&T. + +------------------------------------------------------------------- +Tue Sep 19 15:39:53 MEST 2000 - garloff@suse.de + +- Cleanups for 64 bit archs. + +------------------------------------------------------------------- +Mon Sep 18 18:34:53 MEST 2000 - garloff@suse.de + +- Add a notification for the sysadmin, that (s)he and the users + need to agree with the license termn in MINTERMS.txt. According + to "Stephen C. North" , this is all that + needs to be done to fulfill the license requirements. + +------------------------------------------------------------------- +Wed Sep 6 13:28:50 CEST 2000 - garloff@suse.de + +- LICENSOR is SuSE: Filled in MINTERMS.txt + +------------------------------------------------------------------- +Tue Sep 5 20:46:59 CEST 2000 - garloff@suse.de + +- Creation of package graphviz-1.6 +- Fix lneato Makefile to install into $DESTDIR + diff --git a/graphviz.spec b/graphviz.spec new file mode 100644 index 0000000..20bdf03 --- /dev/null +++ b/graphviz.spec @@ -0,0 +1,395 @@ +# +# spec file for package graphviz (Version 2.6) +# +# Copyright (c) 2006 SUSE LINUX Products GmbH, Nuernberg, Germany. +# This file and all modifications and additions to the pristine +# package are under the same license as the package itself. +# +# Please submit bugfixes or comments via http://bugs.opensuse.org/ +# + +# norootforbuild + +Name: graphviz +BuildRequires: expat freetype2-devel gcc-c++ libjpeg-devel libpng-devel libstdc++-devel pkgconfig swig tk-devel xorg-x11-devel +Version: 2.6 +Release: 22 +Autoreqprov: on +Summary: Graph Visualization Tools +Group: Productivity/Graphics/Visualization/Graph +Source: http://www.graphviz.org/pub/graphviz/ARCHIVE/%{name}-%{version}.tar.bz2 +Patch0: fix-pkgIndex.diff +Patch1: aliasing-fixes.diff +Patch2: config-file-option.diff +Patch3: graphviz-fix_swig_template.patch +Patch4: graphviz-neato_splines.patch +Patch5: graphviz-new_X_paths.patch +URL: http://www.graphviz.org/ +License: IBM Public License +Prefix: /usr +BuildRoot: %{_tmppath}/%{name}-%{version}-build +PreReq: /bin/cat + +%description +A collection of tools and tcl packages for the manipulation and layout +of graphs (as in nodes and edges, not as in bar charts). + + + +Authors: +-------- + David Dobkin + John Ellson + Emden Gansner + Eleftherios Koutsofios + Stephen North + Kiem-Phong Vo + Gordon Woodhull + +%package tcl +Group: Development/Libraries/Tcl +Summary: Tcl extension tools for graphviz + +%description tcl +The graphviz-tcl package contains the various tcl packages (extensions) +for the graphviz tools. + + + +Authors: +-------- + David Dobkin + John Ellson + Emden Gansner + Eleftherios Koutsofios + Stephen North + Kiem-Phong Vo + Gordon Woodhull + +%package devel +Group: Development/Libraries/C and C++ +Summary: Graphiviz development package +Requires: %{name} = %{version} +Requires: glibc-devel tcl-devel fontconfig-devel expat freetype2-devel +Requires: libjpeg-devel libpng-devel zlib-devel libtool perl +Requires: libstdc++-devel tk-devel + +%description devel +The graphviz-devel package contains all that's necessary for developing +programs that use the graphviz libraries including man3 pages. + + + +Authors: +-------- + David Dobkin + John Ellson + Emden Gansner + Eleftherios Koutsofios + Stephen North + Kiem-Phong Vo + Gordon Woodhull + +%prep +%setup -q +%patch -p1 +%patch1 -p1 +#%patch2 -p1 +%patch3 +%patch4 +%if %{suse_version} > 1010 +%patch5 +%endif +# Force rebuild +#rm -f tclpkg/gv/gv_perl.cpp + +%build +./autogen.sh +#perl -pi -e 's#lib/tkConfig.sh#%{_lib}/tkConfig.sh#g' \ +# -e 's#lib/tclConfig#%{_lib}/tclConfig#g' \ +# configure.in configure +WARN_FLAGS="-W -Wall -Wno-unused-parameter -Wno-unknown-pragmas -Wstrict-prototypes -Wpointer-arith" +CFLAGS="$RPM_OPT_FLAGS $WARN_FLAGS" +%ifarch %ix86 x86_64 +CFLAGS="$CFLAGS -ffast-math" +%endif +CC=gcc +RANLIB=: +export CC RANLIB +CFLAGS="$CFLAGS" \ +./configure \ + --prefix=%{_prefix} \ + --bindir=%{_bindir} \ + --libdir=%{_libdir} \ + --includedir=%{_includedir} \ + --datadir=%{_datadir} \ + --mandir=%{_mandir} \ + --with-x \ + --with-mylibgd \ + --disable-dependency-tracking +make DESTDIR=$RPM_BUILD_ROOT + +%install +make install DESTDIR=$RPM_BUILD_ROOT +#rm -rf $RPM_BUILD_ROOT/usr/%{_lib}/pkgconfig # ? +mkdir -p $RPM_BUILD_ROOT/%{_docdir} +mv $RPM_BUILD_ROOT/usr/share/graphviz/doc $RPM_BUILD_ROOT/%{_docdir}/%{name} +mkdir -p $RPM_BUILD_ROOT/usr/share/tcl/graphviz +mv $RPM_BUILD_ROOT/usr/%_lib/graphviz/pkgIndex.tcl \ + $RPM_BUILD_ROOT/usr/share/tcl/graphviz +mv $RPM_BUILD_ROOT/%{_libdir}/%{name}/*tcl*.so* \ + $RPM_BUILD_ROOT/%{_libdir}/%{name}/*tk*.so* \ + $RPM_BUILD_ROOT/%{_libdir} +#dot -c -C$RPM_BUILD_ROOT/usr/lib/graphviz/config +mkdir -p $RPM_BUILD_ROOT/usr/lib/graphviz +touch $RPM_BUILD_ROOT/usr/lib/graphviz/config + +%post +%{_bindir}/dot -c + +%files +%defattr(-,root,root) +#%doc %{_docdir}/graphviz/ +%doc doc/FAQ.html AUTHORS COPYING README NEWS ChangeLog +%doc doc/dotguide.pdf doc/dottyguide.pdf doc/leftyguide.pdf doc/neatoguide.pdf doc/Dot.ref doc/FAQ.html doc/latex_suggestions.txt +%attr(755,root,root) %{_bindir}/* +%dir %{_datadir}/%{name} +%{_datadir}/%{name}/lefty +%{_datadir}/%{name}/graphs +%{_mandir}/man1/*.1* +%dir %{_libdir}/%{name} +%{_libdir}/%{name}/libagraph.so* +%{_libdir}/%{name}/libcdt.so* +%{_libdir}/%{name}/libexpr.so* +%{_libdir}/%{name}/libgraph.so* +%{_libdir}/%{name}/libpack.so* +%{_libdir}/%{name}/libpathplan.so* +%{_libdir}/%{name}/libgvgd.so* +%{_libdir}/%{name}/libgv_perl.so* +%{_libdir}/%{name}/libgvc.so* +%{_libdir}/%{name}/libgvplugin_dot_layout.so* +%{_libdir}/%{name}/libgvplugin_neato_layout.so* +%{_libdir}/%{name}/libgvplugin_usershape_gd.so* +%{_libdir}/%{name}/libgvc_builtins.so* +%{_libdir}/libgv_tcl.so* +%dir /usr/lib/graphviz +%ghost /usr/lib/graphviz/config + +%files tcl +%defattr(-,root,root) +%{_libdir}/libgdtclft.so* +%{_libdir}/libtcldot.so* +%{_libdir}/libtclplan.so* +%{_libdir}/libtkspline.so* +%dir %{_datadir}/tcl/%{name} +%{_datadir}/tcl/%{name}/pkgIndex.tcl +%{_datadir}/%{name}/demo +%{_mandir}/mann/*.n* + +%files devel +%defattr(-,root,root) +%{_includedir}/%{name} +%{_libdir}/%{name}/*.*a +%{_libdir}/pkgconfig/*.pc +%{_mandir}/man3/*.3* + +%changelog -n graphviz +* Fri Aug 11 2006 - pth@suse.de +- Adapt to new X11 paths. +* Mon Apr 03 2006 - pnemec@suse.cz +- add pkgconfig files to devel package +* Sun Feb 19 2006 - aj@suse.de +- Reduce BuildRequires. +* Thu Feb 09 2006 - pth@suse.de +- Fix segfault in neato when using splines (#144275) +* Fri Feb 03 2006 - pth@suse.de +- Fix swig template to include declaration. +- Fix BuildRequires +- Fix dependencies for -devel package +* Thu Nov 24 2005 - agruen@suse.de +- Add missing plugin config file. +- Fix gcc aliasing bugs. +* Mon Aug 29 2005 - agruen@suse.de +- Update to version 2.6: numerous bugfixes. +* Tue Aug 09 2005 - agruen@suse.de +- fix-pkgIndex.diff: Fix tcl library search for "package require + Tkspline" and similar statements by (a) moving the tcl/tk + libraries from _libdir/graphviz/ to _libdir/, and removing + path names from library names in pkgIndex.tcl so that 32bit + and 64bit libraries are searched as appropriate. +* Tue Aug 02 2005 - ro@suse.de +- move pkgIndex.tcl to /usr/share +* Thu Feb 10 2005 - agruen@suse.de +- Update to version 2.2. +- Drop graphviz-graphs subpackage. +* Sun Aug 29 2004 - garloff@suse.de +- Drop EULA notification message. +* Sat Mar 27 2004 - sndirsch@suse.de +- update to graphviz-1.12 + * general +- rename bcc -> bcomps to avoid name conflict with + "Bruce's C Compiler" on Redhat distributions. +- all build without X11 (fix problem in lefty tree) +- remove from distribution: + dag, fdp, geo, grid, incr, shape, tcldgr, tcldgl + * dotneato +- fix "brown-bag" problem resulting in PNG and JPEG errors on + RH8 and RH9. +- removed hunks for dag, fdp, grid, tcldgl from codecleanup patch; + directories were dropped upstream (see 1.12 changelog above) +- no need to rename bcc any longer (see 1.12 changelog above) +- removed libtcldgl/libtcldgr (see 1.12 changelog above) +* Tue Mar 09 2004 - garloff@suse.de +- Rename bcc to bcc-graphviz due to conflict with bcc from dev86. +* Mon Mar 01 2004 - garloff@suse.de +- Update to graphviz-1.11: + * Drop lots of patches (merged upstream) ;-) + * dotneato: add -Gviewport, fix memleak in gdft, clean up calc + of whitespace around labels +* Wed Feb 25 2004 - garloff@suse.de +- Update to graphviz-1.10: + * enhanced gpr: string matching, lock primitive to save graphs + * zoomable 2 1/2 D graph viewer (Java) + * neato -gpack +* Fri Jan 16 2004 - meissner@suse.de +- Change freetype detection to new one, so the internal libGD is build + against it again. +* Sat Jan 10 2004 - adrian@suse.de +- build as user +* Mon Oct 06 2003 - kukuk@suse.de +- Remove curl (source code does not use it) and lynx from + neededforbuild. +* Mon Jul 28 2003 - ro@suse.de +- updated neededforbuild +* Tue May 13 2003 - pthomas@suse.de +- Add hacks to work around problems with libtool 1.5. +* Mon Apr 14 2003 - pthomas@suse.de +- Get rid of nearly all compiler warnings. +* Mon Apr 07 2003 - pthomas@suse.de +- Use posix-2001 conforming syntax for sort. +* Fri Feb 07 2003 - pthomas@suse.de +- Update to 1.9 +- Split off subpackages devel, graphs and tcl like + it's done in the specfile included with graphviz. +- remove obsolete patches +* Wed Jan 29 2003 - ro@suse.de +- fix png library detection in configure +- removed perl-GD and blt from neededforbuild +* Thu Jan 09 2003 - ro@suse.de +- fixed configure.in +* Thu Nov 14 2002 - tcrhak@suse.cz +- fixed for new bison: end rules with semicolons +* Tue Aug 20 2002 - mmj@suse.de +- Correct PreReq +* Sat Aug 10 2002 - aj@suse.de +- Fix typo in license. +* Fri Jul 05 2002 - kukuk@suse.de +- Use %%ix86 macro +* Tue Jul 02 2002 - garloff@suse.de +- Update to 1.8.6: + * FPU handling fix got included + * arch independent stuff in /usr/share/graphviz now + * arrow fixes and improvements and more arrow types + * new pack option to neato + * bugfixes +- Change licensor from SuSE GmbH to SuSE Linux AG +* Wed May 22 2002 - garloff@suse.de +- Add prune binary and man page to file list. +* Fri May 10 2002 - garloff@suse.de +- Fix FPU excpetion handling. (Use feenableexcept() rather than + _FPU_GETCW(), if available.) +* Wed May 08 2002 - garloff@suse.de +- Update to graphviz-1.8.5: + * fixed various Win and MacOSX probs + * minimal Type1 font support + * webdot.cgi perl script accepts same args as webgot.tcl now + * various SVG enhancements and fixes + * various portability/64bit fixes + * various bug fixes +* Fri May 03 2002 - meissner@suse.de +- %%_lib fixes (to find tclConfig.sh and tkConfig.sh) +* Fri Feb 01 2002 - ro@suse.de +- changed neededforbuild to +* Mon Jan 28 2002 - garloff@suse.de +- Some more missing decls found and fixed. +* Mon Jan 28 2002 - garloff@suse.de +- Added patch to fix lots of warnings (and potential bugs on 64bit + platforms). +* Mon Jan 28 2002 - garloff@suse.de +- Pass TK_DEFS to gcc for tkspline (which uses tkInt.h) +* Mon Jan 28 2002 - garloff@suse.de +- Update to 1.7.16: + * Various bug fixes + * Support for xfig, svgz, + * Text output improvements + * New twopi tool +- Drop patches that have been included in official source ball. +* Wed May 23 2001 - garloff@suse.de +- Fix cast warnings on 64bit archs and add missing includes + where necessary. +* Wed May 09 2001 - garloff@suse.de +- Cleanup patches. +* Tue May 08 2001 - mfabian@suse.de +- bzip2 sources +* Mon Apr 30 2001 - garloff@suse.de +- Update to release 1.7.6 with lots of bugfixes: + * Lots of font related fixes + * Fix various bugs WRT labels + * UTF-8 fixes + * cluster and neato layout fixes + * -Timap (mouse sensitive graphs for web pages) fixes + * PNG by default does white background now instead of transp. +- New features in 1.7.6: + * New graph processing tools: acyclic, ccomps, colorize, gc, + gpr, nop, sccmap, tred, unflatten (See ChangeLog for details) +- Spec file: Consistently use %%{prefix} +* Thu Mar 22 2001 - ro@suse.de +- changed neededforbuild to freetype2 +- updated to 1.7.5 for freetype2 +* Mon Feb 26 2001 - uli@suse.de +- fixed for new glibc +* Fri Jan 19 2001 - garloff@suse.de +- Assorted patches from Stephen C. North to + * fix runtime error in graphs having multiple nodes in the min + or max rank set + * fix layout thinko (mincross) +* Sat Dec 16 2000 - garloff@suse.de +- Update to 1.7.4: + * various fixes + * support various linestyles + * Remove Tcldot dependence on libgdtclft + * support for long label strings (fixing a reported crash) +* Tue Dec 12 2000 - garloff@suse.de +- Specfile cleanups. +* Mon Dec 11 2000 - garloff@suse.de +- Update to 1.7.3: + * Better font drawing support + * Bugfixes +- Removed most explicit Requires: from spec, as AutoReqProv works + just fine. +- Split off webdot. +* Wed Nov 29 2000 - ro@suse.de +- changed neededforbuild to +* Wed Nov 08 2000 - ro@suse.de +- fixed neededforbuild gd -> perl-GD +* Wed Nov 01 2000 - garloff@suse.de +- Use %%{?suse_update_config} -> support for S/390 added +* Tue Oct 31 2000 - garloff@suse.de +- Update to 1.7: * dot/neato again separate binaries + * 64 bit patches integrated + * Some bugfixes and feature enhancements +* Wed Oct 18 2000 - garloff@suse.de +- Change the wording of the license notification to match the + wording from the letter from AT&T. +* Tue Sep 19 2000 - garloff@suse.de +- Cleanups for 64 bit archs. +* Mon Sep 18 2000 - garloff@suse.de +- Add a notification for the sysadmin, that (s)he and the users + need to agree with the license termn in MINTERMS.txt. According + to "Stephen C. North" , this is all that + needs to be done to fulfill the license requirements. +* Wed Sep 06 2000 - garloff@suse.de +- LICENSOR is SuSE: Filled in MINTERMS.txt +* Tue Sep 05 2000 - garloff@suse.de +- Creation of package graphviz-1.6 +- Fix lneato Makefile to install into $DESTDIR diff --git a/ready b/ready new file mode 100644 index 0000000..473a0f4