Compare commits
No commits in common. "c8" and "c10s" have entirely different histories.
1
.fmf/version
Normal file
1
.fmf/version
Normal file
@ -0,0 +1 @@
|
|||||||
|
1
|
2
.gitignore
vendored
2
.gitignore
vendored
@ -1 +1 @@
|
|||||||
SOURCES/graphviz-2.40.1.tar.gz
|
/graphviz-*.tar.xz
|
||||||
|
@ -1 +0,0 @@
|
|||||||
643843f5f48973827906f51bf6a6921701b457d2 SOURCES/graphviz-2.40.1.tar.gz
|
|
@ -1,16 +0,0 @@
|
|||||||
diff --git a/lib/dotgen/conc.c b/lib/dotgen/conc.c
|
|
||||||
--- a/lib/dotgen/conc.c
|
|
||||||
+++ b/lib/dotgen/conc.c
|
|
||||||
@@ -159,7 +159,11 @@ static void rebuild_vlists(graph_t * g)
|
|
||||||
|
|
||||||
for (r = GD_minrank(g); r <= GD_maxrank(g); r++) {
|
|
||||||
lead = GD_rankleader(g)[r];
|
|
||||||
- if (GD_rank(dot_root(g))[r].v[ND_order(lead)] != lead) {
|
|
||||||
+ if (lead == NULL) {
|
|
||||||
+ agerr(AGERR, "rebuiltd_vlists: lead is null for rank %d\n", r);
|
|
||||||
+ longjmp(jbuf, 1);
|
|
||||||
+ }
|
|
||||||
+ else if (GD_rank(dot_root(g))[r].v[ND_order(lead)] != lead) {
|
|
||||||
agerr(AGERR, "rebuiltd_vlists: rank lead %s not in order %d of rank %d\n",
|
|
||||||
agnameof(lead), ND_order(lead), r);
|
|
||||||
longjmp(jbuf, 1);
|
|
@ -1,17 +0,0 @@
|
|||||||
diff --git a/lib/common/shapes.c b/lib/common/shapes.c
|
|
||||||
index 61e4fe1..8d18502 100644
|
|
||||||
--- a/lib/common/shapes.c
|
|
||||||
+++ b/lib/common/shapes.c
|
|
||||||
@@ -3545,9 +3545,10 @@ static void record_init(node_t * n)
|
|
||||||
reclblp = ND_label(n)->text;
|
|
||||||
len = strlen(reclblp);
|
|
||||||
/* For some forgotten reason, an empty label is parsed into a space, so
|
|
||||||
- * we need at least two bytes in textbuf.
|
|
||||||
+ * we need at least two bytes in textbuf, as well as accounting for the
|
|
||||||
+ * error path involving "\\N" below.
|
|
||||||
*/
|
|
||||||
- len = MAX(len, 1);
|
|
||||||
+ len = MAX(MAX(len, 1), (int)strlen("\\N"));
|
|
||||||
textbuf = N_NEW(len + 1, char);
|
|
||||||
if (!(info = parse_reclbl(n, flip, TRUE, textbuf))) {
|
|
||||||
agerr(AGERR, "bad label format %s\n", ND_label(n)->text);
|
|
@ -1,26 +0,0 @@
|
|||||||
diff --git a/cmd/lefty/dot2l/dotlex.c b/cmd/lefty/dot2l/dotlex.c
|
|
||||||
index cf738c0..65e17e2 100644
|
|
||||||
--- a/cmd/lefty/dot2l/dotlex.c
|
|
||||||
+++ b/cmd/lefty/dot2l/dotlex.c
|
|
||||||
@@ -252,7 +252,7 @@ static char *scan_token (char *p) {
|
|
||||||
char *q;
|
|
||||||
|
|
||||||
q = lexbuf;
|
|
||||||
- if (p == '\0')
|
|
||||||
+ if (!p || *p == '\0')
|
|
||||||
return NULL;
|
|
||||||
while (isalnum (*p) || (*p == '_') || (!isascii (*p)))
|
|
||||||
*q++ = *p++;
|
|
||||||
diff --git a/cmd/tools/gvgen.c b/cmd/tools/gvgen.c
|
|
||||||
index 662343e..2925d19 100644
|
|
||||||
--- a/cmd/tools/gvgen.c
|
|
||||||
+++ b/cmd/tools/gvgen.c
|
|
||||||
@@ -458,6 +458,8 @@ closeOpen (void)
|
|
||||||
fprintf(opts.outfile, "}\ngraph {\n");
|
|
||||||
}
|
|
||||||
|
|
||||||
+extern void makeTetrix(int depth, edgefn ef);
|
|
||||||
+
|
|
||||||
int main(int argc, char *argv[])
|
|
||||||
{
|
|
||||||
GraphType graphType;
|
|
@ -1,22 +0,0 @@
|
|||||||
diff --git a/cmd/dotty/dotty_ui.lefty b/cmd/dotty/dotty_ui.lefty
|
|
||||||
index a8c9116..a708c61 100644
|
|
||||||
--- a/cmd/dotty/dotty_ui.lefty
|
|
||||||
+++ b/cmd/dotty/dotty_ui.lefty
|
|
||||||
@@ -342,7 +342,7 @@ dotty.protovt.normal.uifuncs = [
|
|
||||||
else
|
|
||||||
gt.insertedge (gt, data.pobj, null, data.obj, null, null, 1);
|
|
||||||
};
|
|
||||||
- 'rightdown' = function (data) {
|
|
||||||
+ 'rightup' = function (data) {
|
|
||||||
local vt, gt, menu, i;
|
|
||||||
|
|
||||||
vt = dotty.views[data.widget];
|
|
||||||
@@ -447,7 +447,7 @@ dotty.protovt.birdseye.uifuncs = [
|
|
||||||
'middledown' = dotty.protovt.normal.uifuncs.middledown;
|
|
||||||
'middlemove' = dotty.protovt.normal.uifuncs.middlemove;
|
|
||||||
'middleup' = dotty.protovt.normal.uifuncs.middleup;
|
|
||||||
- 'rightdown' = dotty.protovt.normal.uifuncs.rightdown;
|
|
||||||
+ 'rightup' = dotty.protovt.normal.uifuncs.rightup;
|
|
||||||
'keyup' = dotty.protovt.normal.uifuncs.keyup;
|
|
||||||
'redraw' = dotty.protovt.normal.uifuncs.redraw;
|
|
||||||
'closeview' = dotty.protovt.normal.uifuncs.closeview;
|
|
@ -1,16 +0,0 @@
|
|||||||
diff --git a/tclpkg/gv/Makefile.am b/tclpkg/gv/Makefile.am
|
|
||||||
index 0b0b1f1..d42bf57 100644
|
|
||||||
--- a/tclpkg/gv/Makefile.am
|
|
||||||
+++ b/tclpkg/gv/Makefile.am
|
|
||||||
@@ -451,7 +451,10 @@ pdf = gv.3sharp.pdf gv.3go.pdf gv.3guile.pdf gv.3io.pdf gv.3java.pdf gv.3lua.pdf
|
|
||||||
gv.3ruby.pdf gv.3tcl.pdf
|
|
||||||
|
|
||||||
|
|
||||||
-$(man): gv.i gv_doc_writer.tcl gv_doc_template.tcl gv_doc_langs.tcl
|
|
||||||
+$(man): gv_doc_writer.intermediate ;
|
|
||||||
+
|
|
||||||
+.INTERMEDIATE: gv_doc_writer.intermediate
|
|
||||||
+gv_doc_writer.intermediate: gv.i gv_doc_writer.tcl gv_doc_template.tcl gv_doc_langs.tcl
|
|
||||||
$(TCLSH) $(srcdir)/gv_doc_writer.tcl "$(srcdir)"
|
|
||||||
|
|
||||||
gv.3sharp.pdf: gv.3sharp
|
|
@ -1,58 +0,0 @@
|
|||||||
diff --git a/config/config_python.py b/config/config_python.py
|
|
||||||
index b747045..2b1ac8d 100644
|
|
||||||
--- a/config/config_python.py
|
|
||||||
+++ b/config/config_python.py
|
|
||||||
@@ -1,12 +1,13 @@
|
|
||||||
+from __future__ import print_function
|
|
||||||
+
|
|
||||||
import sys
|
|
||||||
from distutils import sysconfig
|
|
||||||
|
|
||||||
if sys.argv[1] == "archlib":
|
|
||||||
- print sysconfig.get_python_lib(1,1)
|
|
||||||
+ print(sysconfig.get_python_lib(1,1))
|
|
||||||
elif sys.argv[1] == "lib":
|
|
||||||
- print sysconfig.get_python_lib(0,1)
|
|
||||||
+ print(sysconfig.get_python_lib(0,1))
|
|
||||||
elif sys.argv[1] == "archsitelib":
|
|
||||||
- print sysconfig.get_python_lib(1,0)
|
|
||||||
+ print(sysconfig.get_python_lib(1,0))
|
|
||||||
elif sys.argv[1] == "sitelib":
|
|
||||||
- print sysconfig.get_python_lib(0,0)
|
|
||||||
-
|
|
||||||
+ print(sysconfig.get_python_lib(0,0))
|
|
||||||
diff --git a/configure.ac b/configure.ac
|
|
||||||
index 51166c3..4d8c9a0 100644
|
|
||||||
--- a/configure.ac
|
|
||||||
+++ b/configure.ac
|
|
||||||
@@ -1142,7 +1142,7 @@ else
|
|
||||||
if test `$SWIG -help 2>&1 | $EGREP -c '\-python *- Generate'` = 0; then
|
|
||||||
use_python="No (swig does not support -python option)"
|
|
||||||
else
|
|
||||||
- AC_CHECK_PROG(PYTHON,python,python)
|
|
||||||
+ AC_CHECK_PROGS(PYTHON,[python3 python])
|
|
||||||
if test "x$PYTHON" = "x"; then
|
|
||||||
use_python="No (python not available)"
|
|
||||||
else
|
|
||||||
@@ -1167,8 +1167,11 @@ else
|
|
||||||
if test "x$PYTHON" = "x"; then
|
|
||||||
use_python="No (python is too old)"
|
|
||||||
else
|
|
||||||
- PYTHON_PREFIX=`$PYTHON -c "import sys; print sys.prefix"`
|
|
||||||
+ PYTHON_PREFIX=`$PYTHON -c "import sys; print(sys.prefix)"`
|
|
||||||
PYTHON_INCLUDES=-I$PYTHON_PREFIX/include/python$PYTHON_VERSION_SHORT
|
|
||||||
+ if test $PYTHON_VERSION_MAJOR -gt 2; then
|
|
||||||
+ PYTHON_INCLUDES="${PYTHON_INCLUDES}m"
|
|
||||||
+ fi
|
|
||||||
# PYTHON_LIBS="-lpython$PYTHON_VERSION_SHORT"
|
|
||||||
PYTHON_LIBS="-undefined dynamic_lookup"
|
|
||||||
PYTHON_INSTALL_DIR="`$PYTHON $srcdir/config/config_python.py archsitelib`"
|
|
||||||
@@ -1548,7 +1551,7 @@ else
|
|
||||||
if test "x$PYTHON34" = "x"; then
|
|
||||||
use_python34="No (python34 is too old)"
|
|
||||||
else
|
|
||||||
- PYTHON34_PREFIX=`$PYTHON3 -c "import sys; print sys.prefix"`
|
|
||||||
+ PYTHON34_PREFIX=`$PYTHON3 -c "import sys; print(sys.prefix)"`
|
|
||||||
# PYTHON34_INCLUDES=-I$PYTHON34_PREFIX/include/python$PYTHON34_VERSION_SHORT
|
|
||||||
# FIXME - whats the stupid "m" for?
|
|
||||||
PYTHON34_INCLUDES=-I/usr/include/python3.4m
|
|
@ -1,25 +0,0 @@
|
|||||||
diff --git a/plugin/visio/VisioGraphic.cpp b/plugin/visio/VisioGraphic.cpp
|
|
||||||
index 303eac0..14e377c 100644
|
|
||||||
--- a/plugin/visio/VisioGraphic.cpp
|
|
||||||
+++ b/plugin/visio/VisioGraphic.cpp
|
|
||||||
@@ -29,6 +29,8 @@
|
|
||||||
#define isfinite(x) finite(x)
|
|
||||||
#endif
|
|
||||||
|
|
||||||
+#include <cstdlib>
|
|
||||||
+
|
|
||||||
#include "VisioGraphic.h"
|
|
||||||
|
|
||||||
#include "gvcjob.h"
|
|
||||||
diff --git a/plugin/visio/VisioText.cpp b/plugin/visio/VisioText.cpp
|
|
||||||
index 635806c..3c6441a 100644
|
|
||||||
--- a/plugin/visio/VisioText.cpp
|
|
||||||
+++ b/plugin/visio/VisioText.cpp
|
|
||||||
@@ -17,6 +17,7 @@
|
|
||||||
|
|
||||||
#include "gvcjob.h"
|
|
||||||
#include "gvio.h"
|
|
||||||
+#include <cstdlib>
|
|
||||||
#include <string.h>
|
|
||||||
|
|
||||||
extern "C" char *xml_string(char* str);
|
|
25
gating.yaml
Normal file
25
gating.yaml
Normal file
@ -0,0 +1,25 @@
|
|||||||
|
--- !Policy
|
||||||
|
product_versions:
|
||||||
|
- fedora-*
|
||||||
|
decision_context: bodhi_update_push_testing
|
||||||
|
subject_type: koji_build
|
||||||
|
rules:
|
||||||
|
- !PassingTestCaseRule {test_case_name: fedora-ci.koji-build./plans/tier1-public.functional}
|
||||||
|
|
||||||
|
#Rawhide
|
||||||
|
--- !Policy
|
||||||
|
product_versions:
|
||||||
|
- fedora-*
|
||||||
|
decision_context: bodhi_update_push_stable
|
||||||
|
subject_type: koji_build
|
||||||
|
rules:
|
||||||
|
- !PassingTestCaseRule {test_case_name: fedora-ci.koji-build./plans/tier1-public.functional}
|
||||||
|
|
||||||
|
#gating rhel
|
||||||
|
--- !Policy
|
||||||
|
product_versions:
|
||||||
|
- rhel-*
|
||||||
|
decision_context: osci_compose_gate
|
||||||
|
rules:
|
||||||
|
- !PassingTestCaseRule {test_case_name: osci.brew-build./plans/tier1-public.functional}
|
||||||
|
- !PassingTestCaseRule {test_case_name: osci.brew-build./plans/tier1-internal.functional}
|
@ -1,8 +1,8 @@
|
|||||||
diff --git a/cmd/tools/Makefile.am b/cmd/tools/Makefile.am
|
diff --git a/cmd/tools/Makefile.am b/cmd/tools/Makefile.am
|
||||||
index 3f81e73..e3a688e 100644
|
index 4978fea..9fbe2e2 100644
|
||||||
--- a/cmd/tools/Makefile.am
|
--- a/cmd/tools/Makefile.am
|
||||||
+++ b/cmd/tools/Makefile.am
|
+++ b/cmd/tools/Makefile.am
|
||||||
@@ -157,7 +157,9 @@ gvpack_LDADD = \
|
@@ -249,7 +249,9 @@ gvpack_LDADD = \
|
||||||
$(top_builddir)/lib/ingraphs/libingraphs_C.la \
|
$(top_builddir)/lib/ingraphs/libingraphs_C.la \
|
||||||
$(top_builddir)/lib/cgraph/libcgraph.la \
|
$(top_builddir)/lib/cgraph/libcgraph.la \
|
||||||
$(top_builddir)/lib/cdt/libcdt.la \
|
$(top_builddir)/lib/cdt/libcdt.la \
|
||||||
@ -12,4 +12,4 @@ index 3f81e73..e3a688e 100644
|
|||||||
+ $(EXPAT_LIBS) $(Z_LIBS) $(GTS_LIBS) $(SOCKET_LIBS) $(IPSEPCOLA_LIBS) $(MATH_LIBS)
|
+ $(EXPAT_LIBS) $(Z_LIBS) $(GTS_LIBS) $(SOCKET_LIBS) $(IPSEPCOLA_LIBS) $(MATH_LIBS)
|
||||||
|
|
||||||
if ENABLE_STATIC
|
if ENABLE_STATIC
|
||||||
gvpack_static_SOURCES = gvpack.c
|
gvpack_static_SOURCES = gvpack.cpp
|
60
graphviz-9.0.0-doxygen-fix.patch
Normal file
60
graphviz-9.0.0-doxygen-fix.patch
Normal file
@ -0,0 +1,60 @@
|
|||||||
|
diff --git a/Doxyfile b/Doxyfile
|
||||||
|
index d9442cf..14c1015 100644
|
||||||
|
--- a/Doxyfile
|
||||||
|
+++ b/Doxyfile
|
||||||
|
@@ -68,7 +68,7 @@ PROJECT_LOGO =
|
||||||
|
# entered, it will be relative to the location where doxygen was started. If
|
||||||
|
# left blank the current directory will be used.
|
||||||
|
|
||||||
|
-OUTPUT_DIRECTORY = graphviz/public
|
||||||
|
+OUTPUT_DIRECTORY = ./public
|
||||||
|
|
||||||
|
# If the CREATE_SUBDIRS tag is set to YES then doxygen will create up to 4096
|
||||||
|
# sub-directories (in 2 levels) under the output directory of each output format
|
||||||
|
@@ -911,11 +911,11 @@ WARN_LOGFILE =
|
||||||
|
# because doxygen builds directory dependency graphs only for root children,
|
||||||
|
# but not for root directory itself.
|
||||||
|
|
||||||
|
-INPUT = graphviz/cmd \
|
||||||
|
- graphviz/lib \
|
||||||
|
- graphviz/dot.demo \
|
||||||
|
- graphviz/plugin \
|
||||||
|
- graphviz/tclpkg
|
||||||
|
+INPUT = ./cmd \
|
||||||
|
+ ./lib \
|
||||||
|
+ ./dot.demo \
|
||||||
|
+ ./plugin \
|
||||||
|
+ ./tclpkg
|
||||||
|
|
||||||
|
# This tag can be used to specify the character encoding of the source files
|
||||||
|
# that doxygen parses. Internally doxygen uses the UTF-8 encoding. Doxygen uses
|
||||||
|
diff --git a/Doxyfile.in b/Doxyfile.in
|
||||||
|
index 050f623..a86c859 100644
|
||||||
|
--- a/Doxyfile.in
|
||||||
|
+++ b/Doxyfile.in
|
||||||
|
@@ -68,7 +68,7 @@ PROJECT_LOGO =
|
||||||
|
# entered, it will be relative to the location where doxygen was started. If
|
||||||
|
# left blank the current directory will be used.
|
||||||
|
|
||||||
|
-OUTPUT_DIRECTORY = graphviz/public
|
||||||
|
+OUTPUT_DIRECTORY = ./public
|
||||||
|
|
||||||
|
# If the CREATE_SUBDIRS tag is set to YES then doxygen will create up to 4096
|
||||||
|
# sub-directories (in 2 levels) under the output directory of each output format
|
||||||
|
@@ -911,11 +911,11 @@ WARN_LOGFILE =
|
||||||
|
# because doxygen builds directory dependency graphs only for root children,
|
||||||
|
# but not for root directory itself.
|
||||||
|
|
||||||
|
-INPUT = graphviz/cmd \
|
||||||
|
- graphviz/lib \
|
||||||
|
- graphviz/dot.demo \
|
||||||
|
- graphviz/plugin \
|
||||||
|
- graphviz/tclpkg
|
||||||
|
+INPUT = ./cmd \
|
||||||
|
+ ./lib \
|
||||||
|
+ ./dot.demo \
|
||||||
|
+ ./plugin \
|
||||||
|
+ ./tclpkg
|
||||||
|
|
||||||
|
# This tag can be used to specify the character encoding of the source files
|
||||||
|
# that doxygen parses. Internally doxygen uses the UTF-8 encoding. Doxygen uses
|
File diff suppressed because it is too large
Load Diff
36
plans.fmf
Normal file
36
plans.fmf
Normal file
@ -0,0 +1,36 @@
|
|||||||
|
/tier1-internal:
|
||||||
|
plan:
|
||||||
|
import:
|
||||||
|
url: https://src.fedoraproject.org/tests/graphviz.git
|
||||||
|
name: /plans/tier1/internal
|
||||||
|
|
||||||
|
/tier1-public:
|
||||||
|
plan:
|
||||||
|
import:
|
||||||
|
url: https://src.fedoraproject.org/tests/graphviz.git
|
||||||
|
name: /plans/tier1/public
|
||||||
|
|
||||||
|
/tier2-tier3-internal:
|
||||||
|
plan:
|
||||||
|
import:
|
||||||
|
url: https://src.fedoraproject.org/tests/graphviz.git
|
||||||
|
name: /plans/tier2-tier3/internal
|
||||||
|
|
||||||
|
/tier2-tier3-public:
|
||||||
|
plan:
|
||||||
|
import:
|
||||||
|
url: https://src.fedoraproject.org/tests/graphviz.git
|
||||||
|
name: /plans/tier2-tier3/public
|
||||||
|
|
||||||
|
/others-internal:
|
||||||
|
plan:
|
||||||
|
import:
|
||||||
|
url: https://src.fedoraproject.org/tests/graphviz.git
|
||||||
|
name: /plans/others/internal
|
||||||
|
|
||||||
|
/others-public:
|
||||||
|
plan:
|
||||||
|
import:
|
||||||
|
url: https://src.fedoraproject.org/tests/graphviz.git
|
||||||
|
name: /plans/others/public
|
||||||
|
|
Loading…
Reference in New Issue
Block a user