Menu
▾
▴
[cvs] dists/10.9-libcxx/stable/main/finkinfo/graphics libgraphviz238-shlibs.info, 1.6, 1.7 libgraphviz238-shlibs.patch, 1.5, 1.6
|
From: Daniel M. <dm...@us...> - 2017-10-18 16:05:53
|
Update of /cvsroot/fink/dists/10.9-libcxx/stable/main/finkinfo/graphics In directory sfp-cvs-1.v30.ch3.sourceforge.com:/tmp/cvs-serv12575 Modified Files: libgraphviz238-shlibs.info libgraphviz238-shlibs.patch Log Message: over-zealous wildcard Index: libgraphviz238-shlibs.info =================================================================== RCS file: /cvsroot/fink/dists/10.9-libcxx/stable/main/finkinfo/graphics/libgraphviz238-shlibs.info,v retrieving revision 1.6 retrieving revision 1.7 diff -u -d -r1.6 -r1.7 --- libgraphviz238-shlibs.info 18 Oct 2017 16:04:43 -0000 1.6 +++ libgraphviz238-shlibs.info 18 Oct 2017 16:05:50 -0000 1.7 @@ -1,8 +1,8 @@ Info3: << Package: libgraphviz238%type_pkg[var]-shlibs Type: var (. -nox) -Version: 2.40.1 -Revision: 1 +Version: 2.38.0 +Revision: 8 License: OSI-Approved # License: Common Public License 1.0 Maintainer: David Fang <fa...@us...> @@ -15,9 +15,9 @@ nam-US: http://www.graphviz.org/pub/graphviz << SourceDirectory: graphviz-%v -Source-MD5: 4ea6fd64603536406166600bcc296fc8 +Source-MD5: 5b6a829b2ac94efcd5fa3c223ed6d3ae PatchFile: libgraphviz238-shlibs.patch -PatchFile-MD5: 66c0a39eec88255546e30693308dc69e +PatchFile-MD5: 40a6041cbf8f424188ab0886e0508b7b PatchScript: << #!/bin/sh -ev sed -e 's|@FINKPREFIX@|%p|g' -e 's|@PKGVERSION@|graphviz-2.38|g' < %{PatchFile} | patch -p1 @@ -31,17 +31,10 @@ sed -i.orig -e '/am__append_5/s|LIBLTDL|LTDLDEPS|' lib/gvc/Makefile.in darwin_vers=`uname -r | cut -d. -f1` - - # 10.9 and below only. Remove once we drop 10.9 support test "$darwin_vers" -le 13 || sed -i.orig -e '/#include <CGGLContext\.h>/d' plugin/quartz/gvloadimage_quartz.c # Patch configure to not link like Puma on Yosemite perl -pi.bak -e 's|10\.\[012\]\*|10.[012][,.]*|g' configure - # autoconf2.6ish patch for modern XQuartz paths - perl -pi -e "s|/usr/lpp/Xamples|/opt/X11|" configure - - # No /usr/lib/tclConfig.sh on 10.13 - perl -pi -e 's|\$\{TCLSH_EXEC_PREFIX\}/lib/tclConfig.sh|/System/Library/Frameworks/Tcl.framework/tclConfig.sh|g' configure << GCC: 4.0 Depends: << @@ -119,6 +112,7 @@ --with-extralibdir=%p/lib \ --with-tcl=/usr/bin/tclsh \ --with-tclsh=/usr/bin/tclsh \ + --with-wish=/usr/bin/wish \ --without-lasi \ --without-ghostscript \ --without-gtkgl \ @@ -129,6 +123,8 @@ LUA=lua53 \ (%type_raw[var] = .) --with-x \ (%type_raw[var] = .) --with-rsvg \ + (%type_raw[var] = .) --x-includes=$X11_ROOT/include \ + (%type_raw[var] = .) --x-libraries=$X11_ROOT/lib \ (%type_raw[var] = .) --with-glitz \ (%type_raw[var] = .) --with-libgd \ (%type_raw[var] = .) --with-gts \ @@ -186,6 +182,10 @@ ;; *) ;; esac + # TK_XINCLUDES needed for 10.8 + sed -i.orig -e '/framework/s|-\(framework\) |-Wl,-\1,|g' \ + -e "/TK_XINCLUDES/s|\"\"|\"-I$X11_ROOT/include\"|" config.status + ./config.status make V=1 fink-package-precedence . << @@ -196,13 +196,15 @@ #!/bin/sh -ev fink-package-precedence --prohibit-bdep=%n238-dev . echo "rtest.sh looks intended for post-install checking" + # upstream fix to rtest.sh + perl -pi -e "s,rrtest,'rtest," rtest/rtest.sh # cd rtest && ./rtest.sh -v || exit 2 << TestSuiteSize: small << InstallScript: << #!/bin/sh -ev - make DESTDIR=%d install V=1 + make DESTDIR=%d install # remove links in /usr rm -rf %d/usr rm -rf %d/Library @@ -217,6 +219,8 @@ # not bothering with %p/lib/php # move pkgconfig into location mv %i/lib/graphviz-2.38/pkgconfig %i/lib/pkgconfig + # this sometimes gets built with -nox + test "%type_raw[var]" = . || rm -f %i/lib/graphviz-2.38/graphviz/tcl/libtkspline* << Shlibs: << %p/lib/graphviz-2.38/graphviz/libgvplugin_core.6.dylib 7.0.0 %n (>= 2.38.0-1) @@ -236,13 +240,13 @@ %p/lib/graphviz-2.38/graphviz/tcl/libtcldot.0.dylib 1.0.0 %n (>= 2.38.0-1) %p/lib/graphviz-2.38/graphviz/tcl/libtcldot_builtin.0.dylib 1.0.0 %n (>= 2.38.0-1) %p/lib/graphviz-2.38/graphviz/tcl/libtclplan.0.dylib 1.0.0 %n (>= 2.38.0-1) + (%type_raw[var] = .) %p/lib/graphviz-2.38/graphviz/tcl/libtkspline.0.dylib 1.0.0 %n (>= 2.38.0-1) %p/lib/graphviz-2.38/libcgraph.6.dylib 7.0.0 %n (>= 2.38.0-1) %p/lib/graphviz-2.38/libcdt.5.dylib 6.0.0 %n (>= 2.38.0-1) %p/lib/graphviz-2.38/libgvc.6.dylib 7.0.0 %n (>= 2.38.0-1) %p/lib/graphviz-2.38/libpathplan.4.dylib 5.0.0 %n (>= 2.38.0-1) %p/lib/graphviz-2.38/libgvpr.2.dylib 3.0.0 %n (>= 2.38.0-1) %p/lib/graphviz-2.38/libxdot.4.dylib 5.0.0 %n (>= 2.38.0-1) - %p/lib/graphviz-2.38/liblab_gamut.1.dylib 2.0.0 %n (>= 2.40.1-1) << # rtest/rtest.sh is intended as a installcheck-time script SplitOff: << @@ -261,10 +265,7 @@ Don't know what these are about... << DocFiles: AUTHORS COPYING ChangeLog INSTALL NEWS README - PostInstScript: << - # configure the plugins upon install - %p/bin/dot -c - << + PostInstScript: %p/bin/dot -c << SplitOff2: << Package: libgraphviz238%type_pkg[var]-dev @@ -289,11 +290,11 @@ lib/graphviz-2.38/libgvpr.dylib lib/graphviz-2.38/libpathplan.dylib lib/graphviz-2.38/libxdot.dylib - lib/graphviz-2.38/liblab_gamut.dylib (%type_raw[var] = .) lib/graphviz-2.38/graphviz/tcl/libgdtclft.dylib lib/graphviz-2.38/graphviz/tcl/libtcldot.dylib lib/graphviz-2.38/graphviz/tcl/libtcldot_builtin.dylib lib/graphviz-2.38/graphviz/tcl/libtclplan.dylib + (%type_raw[var] = .) lib/graphviz-2.38/graphviz/tcl/libtkspline.dylib lib/graphviz-2.38/graphviz/libgvplugin_core.dylib lib/graphviz-2.38/graphviz/libgvplugin_dot_layout.dylib (%type_raw[var] = .) lib/graphviz-2.38/graphviz/libgvplugin_gd.dylib @@ -310,7 +311,7 @@ << DocFiles: AUTHORS COPYING ChangeLog INSTALL NEWS README << -PostRmScript: rm -f %p/lib/graphviz-2.38/graphviz/config* +PostRmScript: rm -f %p/lib/graphviz-2.38/graphvz/config* DocFiles: AUTHORS COPYING ChangeLog INSTALL NEWS README # there are more doc files Description: Graph visualization software (shared libs) @@ -356,6 +357,7 @@ all of gnome, gtk, and glib, and pangocairo (many thanks to fink-core team for guidance). * Rendering libraries, such as rsvg, have been removed for -nox. +* X11: now autodetect /opt/X11:/usr/X11R6 for newer OS X Contains patch to workaround issue using newer ocaml 4.0 TODO: separate out extension language plug-ins Index: libgraphviz238-shlibs.patch =================================================================== RCS file: /cvsroot/fink/dists/10.9-libcxx/stable/main/finkinfo/graphics/libgraphviz238-shlibs.patch,v retrieving revision 1.5 retrieving revision 1.6 diff -u -d -r1.5 -r1.6 --- libgraphviz238-shlibs.patch 18 Oct 2017 16:04:43 -0000 1.5 +++ libgraphviz238-shlibs.patch 18 Oct 2017 16:05:50 -0000 1.6 @@ -1,3 +1,15 @@ +diff -uNr graphviz-2.38.0.orig/cmd/gvmap/country_graph_coloring.c graphviz-2.38.0/cmd/gvmap/country_graph_coloring.c +--- graphviz-2.38.0.orig/cmd/gvmap/country_graph_coloring.c 2014-04-13 16:40:25.000000000 -0400 ++++ graphviz-2.38.0/cmd/gvmap/country_graph_coloring.c 2015-03-29 11:35:51.000000000 -0400 +@@ -25,7 +25,7 @@ + /* int Verbose = FALSE; */ + + static void get_local_12_norm(int n, int i, int *ia, int *ja, int *p, real *norm){ +- int j, nz; ++ int j, nz = 0; + norm[0] = n; norm[1] = 0; + for (j = ia[i]; j < ia[i+1]; j++){ + if (ja[j] == i) continue; diff -uNr graphviz-2.38.0.orig/cmd/lefty/ws/x11/gpcanvas.c graphviz-2.38.0/cmd/lefty/ws/x11/gpcanvas.c --- graphviz-2.38.0.orig/cmd/lefty/ws/x11/gpcanvas.c 2014-04-13 16:40:25.000000000 -0400 +++ graphviz-2.38.0/cmd/lefty/ws/x11/gpcanvas.c 2015-03-29 11:35:12.000000000 -0400 @@ -28,6 +40,18 @@ if (evp->type == KeyPress || evp->type == KeyRelease) XLookupString ((XKeyEvent *) evp, &c, 1, NULL, NULL); +diff -uNr graphviz-2.38.0.orig/cmd/tools/gc.c graphviz-2.38.0/cmd/tools/gc.c +--- graphviz-2.38.0.orig/cmd/tools/gc.c 2014-04-13 16:40:25.000000000 -0400 ++++ graphviz-2.38.0/cmd/tools/gc.c 2015-03-29 11:33:34.000000000 -0400 +@@ -326,7 +326,7 @@ + static int eval(Agraph_t * g, int root) + { + Agraph_t *subg; +- int cl_count; ++ int cl_count = 0; + + if (root && !(GTYPE(g) & gtype)) + return 1; diff -uNr graphviz-2.38.0.orig/configure graphviz-2.38.0/configure --- graphviz-2.38.0.orig/configure 2014-04-13 16:41:48.000000000 -0400 +++ graphviz-2.38.0/configure 2016-11-11 22:53:01.000000000 -0500 @@ -69,25 +93,25 @@ GUILE_VERSION_MAJOR=`echo $GUILE_VERSION | cut -d '.' -f 1` GUILE_VERSION_MINOR=`echo $GUILE_VERSION | cut -d '.' -f 2` if test 0$GUILE_VERSION_MAJOR -lt 2; then -@@ -23300,7 +23300,7 @@ +@@ -23323,7 +23323,7 @@ RUBY_CFLAGS=`echo $RUBY_CFLAGS | sed 's/powerpc/universal/'` fi - RUBY_LIBS="-L`$RUBY $srcdir/config/config_ruby.rb lib` `$RUBY -rrbconfig -e \"puts RbConfig::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 vendorarchdir`" + RUBY_INSTALL_DIR="@FINKPREFIX@/lib/@PKGVERSION@/graphviz/ruby" if test "x$RUBY_INSTALL_DIR" = "x"; then RUBY_INSTALL_DIR="`$RUBY $srcdir/config/config_ruby.rb sitearchdir`" fi -@@ -23370,7 +23370,7 @@ +@@ -23393,7 +23393,7 @@ RUBY_CFLAGS=`echo $RUBY_CFLAGS | sed 's/powerpc/universal/'` fi - RUBY_LIBS="-L`$RUBY $srcdir/config/config_ruby.rb lib` `$RUBY -rrbconfig -e \"puts RbConfig::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 vendorarchdir`" + RUBY_INSTALL_DIR="@FINKPREFIX@/lib/@PKGVERSION@/graphviz/ruby" if test "x$RUBY_INSTALL_DIR" = "x"; then RUBY_INSTALL_DIR="`$RUBY $srcdir/config/config_ruby.rb sitearchdir`" fi -@@ -23436,7 +23436,7 @@ +@@ -23459,7 +23459,7 @@ if test "x$RUBY" = "x"; then use_ruby="No (ruby not available)" else @@ -96,25 +120,25 @@ fi fi -@@ -23551,7 +23551,7 @@ +@@ -23574,7 +23574,7 @@ RUBY_CFLAGS=`echo $RUBY_CFLAGS | sed 's/powerpc/universal/'` fi - RUBY_LIBS="-L`$RUBY $srcdir/config/config_ruby.rb lib` `$RUBY -rrbconfig -e \"puts RbConfig::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 vendorarchdir`" + RUBY_INSTALL_DIR="@FINKPREFIX@/lib/@PKGVERSION@/graphviz/ruby" if test "x$RUBY_INSTALL_DIR" = "x"; then RUBY_INSTALL_DIR="`$RUBY $srcdir/config/config_ruby.rb sitearchdir`" fi -@@ -23621,7 +23621,7 @@ +@@ -23644,7 +23644,7 @@ RUBY_CFLAGS=`echo $RUBY_CFLAGS | sed 's/powerpc/universal/'` fi - RUBY_LIBS="-L`$RUBY $srcdir/config/config_ruby.rb lib` `$RUBY -rrbconfig -e \"puts RbConfig::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 vendorarchdir`" + RUBY_INSTALL_DIR="@FINKPREFIX@/lib/@PKGVERSION@/graphviz/ruby" if test "x$RUBY_INSTALL_DIR" = "x"; then RUBY_INSTALL_DIR="`$RUBY $srcdir/config/config_ruby.rb sitearchdir`" fi -@@ -23687,7 +23687,7 @@ +@@ -23710,7 +23710,7 @@ if test "x$RUBY" = "x"; then use_ruby="No (ruby not available)" else @@ -123,7 +147,7 @@ fi fi -@@ -23738,7 +23738,7 @@ +@@ -23761,7 +23761,7 @@ if test "x$RUBY" = "x"; then use_ruby="No (ruby not available)" else @@ -132,29 +156,58 @@ fi fi +diff -uNr graphviz-2.38.0.orig/lib/common/htmltable.c graphviz-2.38.0/lib/common/htmltable.c +--- graphviz-2.38.0.orig/lib/common/htmltable.c 2014-04-13 16:40:25.000000000 -0400 ++++ graphviz-2.38.0/lib/common/htmltable.c 2015-03-29 11:26:49.000000000 -0400 +@@ -243,7 +243,7 @@ + */ + static void doBorder(GVJ_t * job, htmldata_t * dp, boxf b) + { +- pointf AF[6]; ++ pointf AF[7]; + char *sptr[2]; + char *color = (dp->pencolor ? dp->pencolor : DEFAULT_COLOR); + unsigned short sides; diff -uNr graphviz-2.38.0.orig/lib/dotgen/compound.c graphviz-2.38.0/lib/dotgen/compound.c ---- graphviz-2.38.0.orig/lib/dotgen/compound.c 2016-08-09 16:02:10.000000000 -0500 -0400 -+++ graphviz-2.38.0/lib/dotgen/compound.c 2017-09-19 21:50:32.000000000 -0500 -@@ -180,6 +180,9 @@ - return tmin; +--- graphviz-2.38.0.orig/lib/dotgen/compound.c 2014-04-13 16:40:25.000000000 -0400 ++++ graphviz-2.38.0/lib/dotgen/compound.c 2015-03-29 11:55:21.000000000 -0400 +@@ -176,6 +176,9 @@ + double t; + int no_cross = countVertCross(pts, xcoord); - no_cross = countVertCross(pts, xcoord); -+ if (tmin >= tmax) -+ return -1.0; ++ if (tmin >= tmax) ++ return -1.0; + if (no_cross == 0) return -1.0; -@@ -222,6 +225,9 @@ - return tmin; +@@ -214,6 +217,9 @@ + double t; + int no_cross = countHorzCross(pts, ycoord); - no_cross = countHorzCross(pts, ycoord); -+ if (tmin >= tmax) -+ return -1.0; ++ if (tmin >= tmax) ++ return -1.0; + if (no_cross == 0) return -1.0; +diff -uNr graphviz-2.38.0.orig/lib/dotgen2/level.c graphviz-2.38.0/lib/dotgen2/level.c +--- graphviz-2.38.0.orig/lib/dotgen2/level.c 2014-04-13 16:40:25.000000000 -0400 ++++ graphviz-2.38.0/lib/dotgen2/level.c 2015-03-29 11:29:37.000000000 -0400 +@@ -478,11 +478,11 @@ + label = agattr(g, AGEDGE, "label", ""); + for (n = agfstnode(g); n; n = agnxtnode(g, n)) { + for (e = agfstout(g, n); e; e = agnxtout(g, e)) { +- sprintf(buf, "%f", ED_weight(e)); ++ sprintf(buf, "%d", ED_weight(e)); + agxset(e, weight, buf); + sprintf(buf, "%d", ED_minlen(e)); + agxset(e, minlen, buf); +- sprintf(buf, "%.02f,%d", ED_weight(e), ED_minlen(e)); ++ sprintf(buf, "%.2d,%d", ED_weight(e), ED_minlen(e)); + agxset(e, label, buf); + } + } diff -uNr graphviz-2.38.0.orig/lib/gvc/gvcext.h graphviz-2.38.0/lib/gvc/gvcext.h --- graphviz-2.38.0.orig/lib/gvc/gvcext.h 2014-04-13 16:40:25.000000000 -0400 +++ graphviz-2.38.0/lib/gvc/gvcext.h 2015-03-29 11:24:18.000000000 -0400 @@ -185,6 +238,15 @@ diff -uNr graphviz-2.38.0.orig/lib/neatogen/adjust.c graphviz-2.38.0/lib/neatogen/adjust.c --- graphviz-2.38.0.orig/lib/neatogen/adjust.c 2014-04-13 16:40:25.000000000 -0400 +++ graphviz-2.38.0/lib/neatogen/adjust.c 2015-03-29 11:31:16.000000000 -0400 +@@ -672,7 +672,7 @@ + { + Agnode_t *n; + real *sizes = N_GNEW(2 * agnnodes(g), real); +- int i, nedge_nodes; ++ int i, nedge_nodes = 0; + int* elabs; + + for (n = agfstnode(g); n; n = agnxtnode(g, n)) { @@ -1115,7 +1115,7 @@ int removeOverlapWith (graph_t * G, adjust_data* am) @@ -194,6 +256,18 @@ if (agnnodes(G) < 2) return 0; +diff -uNr graphviz-2.38.0.orig/lib/neatogen/stress.c graphviz-2.38.0/lib/neatogen/stress.c +--- graphviz-2.38.0.orig/lib/neatogen/stress.c 2014-04-13 16:40:25.000000000 -0400 ++++ graphviz-2.38.0/lib/neatogen/stress.c 2015-03-29 11:31:53.000000000 -0400 +@@ -741,7 +741,7 @@ + int i, j, e; + float *Dij; + int shift = 0; +- double delta; ++ double delta = 0.0; + + if (graph->ewgts == NULL) + return 0; diff -uNr graphviz-2.38.0.orig/lib/ortho/partition.c graphviz-2.38.0/lib/ortho/partition.c --- graphviz-2.38.0.orig/lib/ortho/partition.c 2014-04-13 16:40:25.000000000 -0400 +++ graphviz-2.38.0/lib/ortho/partition.c 2015-03-29 11:25:17.000000000 -0400 @@ -206,6 +280,18 @@ int tr_start; int tr_size = TRSIZE(nsegs); int* visited = N_NEW(tr_size,int); +diff -uNr graphviz-2.38.0.orig/lib/pack/pack.c graphviz-2.38.0/lib/pack/pack.c +--- graphviz-2.38.0.orig/lib/pack/pack.c 2014-04-13 16:40:25.000000000 -0400 ++++ graphviz-2.38.0/lib/pack/pack.c 2015-03-29 11:27:38.000000000 -0400 +@@ -919,7 +919,7 @@ + int i, v; + boxf* bbs; + Agraph_t* g; +- point* pts; ++ point* pts = NULL; + char* s; + + if (ng <= 0) return NULL; diff -uNr graphviz-2.38.0.orig/plugin/quartz/gvloadimage_quartz.c graphviz-2.38.0/plugin/quartz/gvloadimage_quartz.c --- graphviz-2.38.0.orig/plugin/quartz/gvloadimage_quartz.c 2014-04-13 16:40:25.000000000 -0400 +++ graphviz-2.38.0/plugin/quartz/gvloadimage_quartz.c 2015-03-29 11:24:18.000000000 -0400 @@ -272,3 +358,24 @@ @WITH_RUBY_TRUE@ else \ @WITH_RUBY_TRUE@ echo "Warning: @RUBY_INSTALL_DIR@ is not writable."; \ @WITH_RUBY_TRUE@ echo "Skipping system installation of ruby binding."; \ +diff -uNr graphviz-2.38.0.orig/tclpkg/tclpathplan/tclpathplan.c graphviz-2.38.0/tclpkg/tclpathplan/tclpathplan.c +--- graphviz-2.38.0.orig/tclpkg/tclpathplan/tclpathplan.c 2014-04-13 16:40:25.000000000 -0400 ++++ graphviz-2.38.0/tclpkg/tclpathplan/tclpathplan.c 2015-03-29 11:37:50.000000000 -0400 +@@ -468,7 +468,7 @@ + return TCL_ERROR; + } + /* accept either inline or delimited list */ +- if ((argc == 4)) { ++ if (argc == 4) { + result = + Tcl_SplitList(interp, argv[3], &vargc, + (CONST84 char ***) &vargv); +@@ -553,7 +553,7 @@ + return TCL_ERROR; + } + /* accept either inline or delimited list */ +- if ((argc == 3)) { ++ if (argc == 3) { + result = + Tcl_SplitList(interp, argv[2], &vargc, + (CONST84 char ***) &vargv); |