Compare commits

..

2 Commits
rawhide ... f15

Author SHA1 Message Date
Tom "spot" Callaway 7dd74631ee rebuild for R 2.14.0 2011-11-09 13:19:47 -05:00
Jaroslav Škarvada cae69d983f Recompiled with -fno-strict-aliasing in CXXFLAGS
Fixed build failure due to change in php_zend_api macro type
Added gd as devel requirement
2011-10-16 20:05:33 +02:00
11 changed files with 317 additions and 1385 deletions

3
.gitignore vendored
View File

@ -1 +1,2 @@
/graphviz-*.tar.bz2
graphviz-2.26.0.tar.gz
/graphviz-2.26.3.tar.gz

View File

@ -0,0 +1,85 @@
--- graphviz-2.26.0/doc/index.html.old 2008-08-25 19:09:29.000000000 +0200
+++ graphviz-2.26.0/doc/index.html 2010-10-13 14:52:56.000000000 +0200
@@ -13,7 +13,6 @@
<ul>
<li><a href="FAQ.html">FAQ</a>
<li><a href="build.html">build</a>
- <li><a href="gd.html">gd</a>
<li><a href="tcldot.html">tcldot</a>
</ul>
<li>Guides (PDF)
@@ -26,45 +25,41 @@
</ul>
<li>Command manual pages (PDF)
<ul>
- <li><a href="../pdf/acyclic.pdf">acyclic.1</a>
- <li><a href="../pdf/bcomps.pdf">bcmps.1</a>
- <li><a href="../pdf/ccomps.pdf">ccomps.1</a>
- <li><a href="../pdf/circo.pdf">circo.1</a>
- <li><a href="../pdf/dijkstra.pdf">dijkstra.1</a>
- <li><a href="../pdf/dot.pdf">dot.1</a>
- <li><a href="../pdf/dot2gxl.pdf">dot2gxl.1</a>
- <li><a href="../pdf/dotneato-config.pdf">dotneato-config.1</a>
- <li><a href="../pdf/dotty.pdf">dotty.1</a>
- <li><a href="../pdf/fdp.pdf">fdp.1</a>
- <li><a href="../pdf/gc.pdf">gc.1</a>
- <li><a href="../pdf/gvcolor.pdf">gvcolor.1</a>
- <li><a href="../pdf/gvpack.pdf">gvpack.1</a>
- <li><a href="../pdf/gvpr.pdf">gvpr.1</a>
- <li><a href="../pdf/gxl2dot.pdf">gxl2dot.1</a>
- <li><a href="../pdf/lefty.pdf">lefty.1</a>
- <li><a href="../pdf/lneato.pdf">lneato.1</a>
- <li><a href="../pdf/neato.pdf">neato.1</a>
- <li><a href="../pdf/nop.pdf">nop.1</a>
- <li><a href="../pdf/prune.pdf">prune.1</a>
- <li><a href="../pdf/sccmap.pdf">sccmap.1</a>
- <li><a href="../pdf/tred.pdf">tred.1</a>
- <li><a href="../pdf/twopi.pdf">twopi.1</a>
- <li><a href="../pdf/unflatten.pdf">unflatten.1</a>
+ <li><a href="../pdf/acyclic.1.pdf">acyclic</a>
+ <li><a href="../pdf/bcomps.1.pdf">bcmps</a>
+ <li><a href="../pdf/ccomps.1.pdf">ccomps</a>
+ <li><a href="../pdf/circo.1.pdf">circo</a>
+ <li><a href="../pdf/dijkstra.1.pdf">dijkstra</a>
+ <li><a href="../pdf/dot.1.pdf">dot</a>
+ <li><a href="../pdf/dotty.1.pdf">dotty</a>
+ <li><a href="../pdf/fdp.1.pdf">fdp</a>
+ <li><a href="../pdf/gc.1.pdf">gc</a>
+ <li><a href="../pdf/gvcolor.1.pdf">gvcolor</a>
+ <li><a href="../pdf/gvpack.1.pdf">gvpack</a>
+ <li><a href="../pdf/gvpr.1.pdf">gvpr</a>
+ <li><a href="../pdf/lefty.1.pdf">lefty</a>
+ <li><a href="../pdf/lneato.1.pdf">lneato</a>
+ <li><a href="../pdf/neato.1.pdf">neato</a>
+ <li><a href="../pdf/nop.1.pdf">nop</a>
+ <li><a href="../pdf/prune.pdf">prune</a>
+ <li><a href="../pdf/sccmap.1.pdf">sccmap</a>
+ <li><a href="../pdf/tred.1.pdf">tred</a>
+ <li><a href="../pdf/twopi.1.pdf">twopi</a>
+ <li><a href="../pdf/unflatten.1.pdf">unflatten</a>
</ul>
<li>Tcl package manual pages (PDF)
<ul>
- <li><a href="../pdf/gdtclft.pdf">gdtclft.n</a>
- <li><a href="../pdf/tcldot.pdf">tcldot.n</a>
- <li><a href="../pdf/tkspline.pdf">tkspline.n</a>
+ <li><a href="../pdf/gdtclft.3tcl.pdf">gdtclft</a>
+ <li><a href="../pdf/tcldot.3tcl.pdf">tcldot</a>
+ <li><a href="../pdf/gv.3tcl.pdf">gv</a>
+ <li><a href="../pdf/tkspline.3tk.pdf">tkspline</a>
</ul>
<li>Library manual pages (PDF)
<ul>
- <li><a href="../pdf/agraph.pdf">agraph.3</a>
- <li><a href="../pdf/cdt.pdf">cdt.3</a>
- <li><a href="../pdf/expr.pdf">expr.3</a>
- <li><a href="../pdf/graph.pdf">graph.3</a>
- <li><a href="../pdf/pathplan.pdf">pathplan.3</a>
- <li><a href="../pdf/pack.pdf">pack.3</a>
+ <li><a href="../pdf/cgraph.3.pdf">cgraph</a>
+ <li><a href="../pdf/cdt.3.pdf">cdt</a>
+ <li><a href="../pdf/graph.3.pdf">graph</a>
+ <li><a href="../pdf/pathplan.3.pdf">pathplan</a>
</ul>
</ul>
</body>

View File

@ -0,0 +1,11 @@
--- graphviz-2.26.0/plugin/gtk/callbacks.c.old 2009-06-03 03:10:57.000000000 +0200
+++ graphviz-2.26.0/plugin/gtk/callbacks.c 2010-10-06 17:38:59.703008542 +0200
@@ -187,7 +187,7 @@
NULL };
GtkWindow *window = GTK_WINDOW(gtk_widget_get_toplevel(GTK_WIDGET(menuitem)));
gtk_show_about_dialog(window,
- "name", "DotEdit",
+ "program-name", "DotEdit",
"version", "0.1",
"copyright", "(C) 2005 AT&T Corp.",
"license", "Common Public License, Version 1.0.",

View File

@ -0,0 +1,22 @@
--- graphviz-2.26.0/rtest/rtest.sh.old 2009-12-06 00:27:49.000000000 +0100
+++ graphviz-2.26.0/rtest/rtest.sh 2010-10-22 10:37:42.952893435 +0200
@@ -279,14 +279,16 @@
$testcmd 2> errout
RVAL=$?
+ if [[ -s errout ]]
+ then
+ cat errout
+ fi
+
if [[ $RVAL != 0 || ! -s $OUTPATH ]]
then
(( CRASH_CNT+=1 ))
print -u 2 "Test $TESTNAME:$i : == Layout failed =="
print -u 2 " $testcmd"
- elif [[ -s errout ]]
- then
- cat errout
elif [[ $GENERATE == 1 ]]
then
continue

View File

@ -0,0 +1,26 @@
--- graphviz-2.26.0/lib/gvc/gvconfig.c.old 2009-07-08 17:14:20.000000000 +0200
+++ graphviz-2.26.0/lib/gvc/gvconfig.c 2010-10-20 11:51:21.238392202 +0200
@@ -471,6 +471,7 @@
libdir = gvconfig_libdir(gvc);
rc = stat(libdir, &libdir_st);
if (rc == -1) {
+ gvtextlayout_select(gvc); /* choose best available textlayout plugin immediately */
/* if we fail to stat it then it probably doesn't exist so just fail silently */
return;
}
@@ -485,6 +486,7 @@
if (rescan) {
config_rescan(gvc, gvc->config_path);
gvc->config_found = TRUE;
+ gvtextlayout_select(gvc); /* choose best available textlayout plugin immediately */
return;
}
@@ -492,6 +494,7 @@
rc = stat(gvc->config_path, &config_st);
if (rc == -1) {
+ gvtextlayout_select(gvc); /* choose best available textlayout plugin immediately */
/* silently return without setting gvc->config_found = TRUE */
return;
}

View File

@ -0,0 +1,14 @@
diff -up graphviz-2.26.3/configure.fc15 graphviz-2.26.3/configure
--- graphviz-2.26.3/configure.fc15 2011-01-21 13:55:37.913416407 +0000
+++ graphviz-2.26.3/configure 2011-01-21 14:01:48.333416483 +0000
@@ -27576,7 +27576,9 @@ fi
else
RUBY_INCLUDES="-I`$RUBY $srcdir/config/config_ruby.rb INCLUDES`"
# 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_INSTALL_DIR="`$RUBY $srcdir/config/config_ruby.rb archsitelib`"
save_CPPFLAGS=$CPPFLAGS

View File

@ -1,15 +0,0 @@
diff --git a/cmd/tools/Makefile.am b/cmd/tools/Makefile.am
index 4978fea..9fbe2e2 100644
--- a/cmd/tools/Makefile.am
+++ b/cmd/tools/Makefile.am
@@ -249,7 +249,9 @@ gvpack_LDADD = \
$(top_builddir)/lib/ingraphs/libingraphs_C.la \
$(top_builddir)/lib/cgraph/libcgraph.la \
$(top_builddir)/lib/cdt/libcdt.la \
- $(top_builddir)/plugin/neato_layout/libgvplugin_neato_layout.la
+ $(top_builddir)/plugin/neato_layout/libgvplugin_neato_layout_C.la \
+ $(top_builddir)/lib/pathplan/libpathplan_C.la \
+ $(EXPAT_LIBS) $(Z_LIBS) $(GTS_LIBS) $(SOCKET_LIBS) $(IPSEPCOLA_LIBS) $(MATH_LIBS)
if ENABLE_STATIC
gvpack_static_SOURCES = gvpack.cpp

View File

@ -1,13 +0,0 @@
diff --git a/configure.ac b/configure.ac
index 49e027f..542c23a 100644
--- a/configure.ac
+++ b/configure.ac
@@ -1141,7 +1141,7 @@ else
use_python3="No (python-$PYTHON3_VERSION.pc not found)"
fi
fi
- PYTHON3_INSTALL_DIR="`$PYTHON3 -c 'from distutils import sysconfig; print(sysconfig.get_python_lib(1,0))'`"
+ PYTHON3_INSTALL_DIR="`$PYTHON3 -c 'import sysconfig; print(sysconfig.get_path("platlib"))'`"
save_CPPFLAGS=$CPPFLAGS
CPPFLAGS="$CPPFLAGS $PYTHON3_INCLUDES"
AC_CHECK_HEADER(Python.h,,[

11
graphviz-sparc64.patch Normal file
View File

@ -0,0 +1,11 @@
--- graphviz-2.26.0/configure.sparc64 2009-12-10 17:30:43.000000000 -0600
+++ graphviz-2.26.0/configure 2009-12-18 11:31:30.000000000 -0600
@@ -2834,7 +2834,7 @@
case "${host_os}" in
*linux* )
case "${host_cpu}" in
- powerpc64 | s390x | x86_64 )
+ powerpc64 | s390x | x86_64 | sparc64 )
LIBPOSTFIX="64"
;;
esac

File diff suppressed because it is too large Load Diff

View File

@ -1 +1 @@
SHA512 (graphviz-7.1.0.tar.bz2) = 28b3217153cbe96270b25862aa030269128653b011cf9eb6607fe9d061aa9db85f9b2454d9fde70be5af4f98474f8cac61040584ce164723df6ceb372cfb29ad
6f45946fa622770c45609778c0a982ee graphviz-2.26.3.tar.gz