Compare commits
No commits in common. "rawhide" and "f17" have entirely different histories.
4
.gitignore
vendored
4
.gitignore
vendored
@ -1 +1,3 @@
|
||||
/graphviz-*.tar.bz2
|
||||
graphviz-2.26.0.tar.gz
|
||||
/graphviz-2.26.3.tar.gz
|
||||
/graphviz-2.28.0.tar.gz
|
||||
|
22
graphviz-2.26.0-rtest-errout-fix.patch
Normal file
22
graphviz-2.26.0-rtest-errout-fix.patch
Normal 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
|
26
graphviz-2.26.0-testsuite-sigsegv-fix.patch
Normal file
26
graphviz-2.26.0-testsuite-sigsegv-fix.patch
Normal 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;
|
||||
}
|
31
graphviz-2.28.0-guile-detect.patch
Normal file
31
graphviz-2.28.0-guile-detect.patch
Normal file
@ -0,0 +1,31 @@
|
||||
diff -up ./graphviz-2.28.0/configure.xorig ./graphviz-2.28.0/configure
|
||||
--- graphviz-2.28.0/configure.xorig 2011-05-07 05:27:36.000000000 +0200
|
||||
+++ graphviz-2.28.0/configure 2011-05-19 13:45:26.026395747 +0200
|
||||
@@ -20066,7 +20066,7 @@ fi
|
||||
if test "x$GUILE" = "x"; then
|
||||
use_guile="No (guile not available)"
|
||||
else
|
||||
- GUILE_VERSION=`$GUILE --version | head -1 | cut -d ' ' -f 2`
|
||||
+ GUILE_VERSION=`$GUILE --version | sed -n '1 s/^.* \+\([0-9\.]\+\)$/\1/ p'`
|
||||
GUILE_VERSION_MAJOR=`echo $GUILE_VERSION | cut -d '.' -f 1`
|
||||
GUILE_VERSION_MINOR=`echo $GUILE_VERSION | cut -d '.' -f 2`
|
||||
if test $GUILE_VERSION_MAJOR -lt 2; then
|
||||
@@ -20081,9 +20081,16 @@ fi
|
||||
if test "x$GUILE" = "x"; then
|
||||
use_guile="No (guile is too old)"
|
||||
else
|
||||
- GUILE_INCLUDES=
|
||||
- GUILE_LIBS=
|
||||
+ GUILE_INCLUDES=`$PKG_CONFIG --cflags "guile-$GUILE_VERSION_MAJOR.$GUILE_VERSION_MINOR" 2>/dev/null`
|
||||
+ GUILE_LIBS=`$PKG_CONFIG --libs "guile-$GUILE_VERSION_MAJOR.$GUILE_VERSION_MINOR" 2>/dev/null`
|
||||
+
|
||||
+ ac_save_CFLAGS="$CFLAGS"
|
||||
+ ac_save_CPPFLAGS="$CPPFLAGS"
|
||||
+ CFLAGS="$CFLAGS $GUILE_INCLUDES"
|
||||
+ CPPFLAGS="$CPPFLAGS $GUILE_INCLUDES"
|
||||
ac_fn_c_check_header_mongrel "$LINENO" "libguile.h" "ac_cv_header_libguile_h" "$ac_includes_default"
|
||||
+ CFLAGS="$ac_save_CFLAGS"
|
||||
+ CPPFLAGS="$ac_save_CPPFLAGS"
|
||||
if test "x$ac_cv_header_libguile_h" = x""yes; then :
|
||||
|
||||
else
|
@ -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
|
@ -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,,[
|
1343
graphviz.spec
1343
graphviz.spec
File diff suppressed because it is too large
Load Diff
Loading…
Reference in New Issue
Block a user