Compare commits

..

2 Commits
rawhide ... f18

Author SHA1 Message Date
Jaroslav Škarvada
53d2bca852 Fixed patch numbering 2013-09-02 14:36:51 +02:00
Jaroslav Škarvada
e93a45857f Fixed dot crash (by dot-crash-fix patch)
Resolves: rhbz#919308
2013-09-02 14:35:25 +02:00
10 changed files with 282 additions and 1168 deletions

4
.gitignore vendored
View File

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

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,29 @@
diff -up graphviz-2.28.0/lib/dotgen/dotsplines.c.dot-crash-fix graphviz-2.28.0/lib/dotgen/dotsplines.c
--- graphviz-2.28.0/lib/dotgen/dotsplines.c.dot-crash-fix 2011-02-05 19:19:45.000000000 -0500
+++ graphviz-2.28.0/lib/dotgen/dotsplines.c 2013-09-02 07:48:27.160523116 -0400
@@ -897,6 +897,7 @@ makeSimpleFlatLabels (node_t* tn, node_t
ctrx = (leftend + rightend)/2.0;
/* do first edge */
+ e = earray[0];
pointn = 0;
points[pointn++] = tp;
points[pointn++] = tp;
@@ -917,7 +918,7 @@ makeSimpleFlatLabels (node_t* tn, node_t
umaxx = ctrx + (ED_label(e)->dimen.x)/2.0;
for (i = 1; i < n_lbls; i++) {
- e = edges[ind + i];
+ e = earray[i];
if (i%2) { /* down */
if (i == 1) {
lminx = ctrx - (ED_label(e)->dimen.x)/2.0;
@@ -975,7 +976,7 @@ makeSimpleFlatLabels (node_t* tn, node_t
/* edges with no labels */
for (; i < cnt; i++) {
- e = edges[ind + i];
+ e = earray[i];
if (i%2) { /* down */
if (i == 1) {
lminx = (2*leftend + rightend)/3.0;

View 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

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,,[

22
graphviz-ocaml-4.patch Normal file
View File

@ -0,0 +1,22 @@
--- graphviz-2.28.0.old/tclpkg/gv/Makefile.am 2011-03-28 19:15:56.000000000 +0100
+++ graphviz-2.28.0/tclpkg/gv/Makefile.am 2012-06-09 16:37:52.421455627 +0100
@@ -111,6 +111,8 @@
gv.ml gv.mli: gv_ocaml.cpp
gv_ocaml.cpp: gv.i
$(SWIG) -c++ -ocaml -o gv_ocaml.cpp $(srcdir)/gv.i
+ sed '/caml_array_length/d' < gv_ocaml.cpp > gv_ocaml.cpp.
+ mv gv_ocaml.cpp. gv_ocaml.cpp
swig.mli:
$(SWIG) -ocaml -co swig.mli
swig.ml:
--- graphviz-2.28.0.old/tclpkg/gv/Makefile.in 2011-05-07 04:27:54.000000000 +0100
+++ graphviz-2.28.0/tclpkg/gv/Makefile.in 2012-06-09 16:40:11.215092361 +0100
@@ -3362,6 +3362,8 @@
gv.ml gv.mli: gv_ocaml.cpp
gv_ocaml.cpp: gv.i
$(SWIG) -c++ -ocaml -o gv_ocaml.cpp $(srcdir)/gv.i
+ sed '/caml_array_length/d' < gv_ocaml.cpp > gv_ocaml.cpp.
+ mv gv_ocaml.cpp. gv_ocaml.cpp
swig.mli:
$(SWIG) -ocaml -co swig.mli
swig.ml:

File diff suppressed because it is too large Load Diff

View File

@ -1 +1 @@
SHA512 (graphviz-7.1.0.tar.bz2) = 28b3217153cbe96270b25862aa030269128653b011cf9eb6607fe9d061aa9db85f9b2454d9fde70be5af4f98474f8cac61040584ce164723df6ceb372cfb29ad 8d26c1171f30ca3b1dc1b429f7937e58 graphviz-2.28.0.tar.gz