Disabled bootstrap

Signed-off-by: Jaroslav Škarvada <jskarvad@redhat.com>

.cvsignore

@@ -1 +0,0 @@
-graphviz-2.26.0.tar.gz

.gitignore

@@ -0,0 +1 @@
+/graphviz-*.tar.bz2

Makefile

@@ -1,21 +0,0 @@
-# Makefile for source rpm: graphviz
-# $Id: Makefile,v 1.2 2004/11/24 04:11:05 gafton Exp $
-NAME := graphviz
-SPECFILE = $(firstword $(wildcard *.spec))
-
-define find-makefile-common
-for d in common ../common ../../common ; do if [ -f $$d/Makefile.common ] ; then if [ -f $$d/CVS/Root -a -w $$d/Makefile.common ] ; then cd $$d ; cvs -Q update ; fi ; echo "$$d/Makefile.common" ; break ; fi ; done
-endef
-
-MAKEFILE_COMMON	:= $(shell $(find-makefile-common))
-
-ifeq ($(MAKEFILE_COMMON),)
-# attept a checkout
-define checkout-makefile-common
-test -f CVS/Root && { cvs -Q -d $$(cat CVS/Root) checkout common && echo "common/Makefile.common" ; } || { echo "ERROR: I can't figure out how to checkout the 'common' module." ; exit -1 ; } >&2
-endef
-
-MAKEFILE_COMMON := $(shell $(checkout-makefile-common))
-endif
-
-include $(MAKEFILE_COMMON)

graphviz-2.20.3-configure-php.patch

@@ -1,13 +0,0 @@
---- graphviz-2.20.3/configure.orig	2009-02-25 13:14:22.000000000 -0500
-+++ graphviz-2.20.3/configure	2009-02-25 13:15:02.000000000 -0500
-@@ -27376,8 +27376,8 @@
-   if test "x$use_swig" != "xYes"; then
-     use_php="No (swig not available)"
-   else
--    if test `$SWIG -help 2>&1 | $GREP -c '\-php5 *- Generate'` = 0; then
--      use_php="No (swig does not support -php5 option)"
-+    if test `$SWIG -help 2>&1 | $GREP -c '\-php5* *- Generate'` = 0; then
-+      use_php="No (swig does not support -php or -php5 option)"
-     else
-       # Extract the first word of "php", so it can be a program name with args.
- set dummy php; ac_word=$2

graphviz-2.20.3-gv.i.patch

@@ -1,45 +0,0 @@
---- graphviz-2.20.3/tclpkg/gv/gv.i.orig	2009-02-25 13:44:36.000000000 -0500
-+++ graphviz-2.20.3/tclpkg/gv/gv.i	2009-02-25 13:46:29.000000000 -0500
-@@ -15,8 +15,22 @@
- **********************************************************/
- 
- %module gv
--%{
- 
-+#ifdef SWIGTCL
-+// A typemap telling SWIG to ignore an argument for input
-+// However, we still need to pass a pointer to the C function
-+%typemap(in,numinputs=0) char *outdata (char *temp) {
-+     $1 = &temp;
-+}
-+// A typemap defining how to return an argument by appending it to the result
-+%typemap(argout) char *outdata {
-+     Tcl_Obj *o = Tcl_NewStringObj($1);
-+     Tcl_ListObjAppendElement(interp,$result,o);
-+}
-+#endif
-+
-+
-+%{
- /* some language headers (e.g. php.h, ruby.h) leave these defined */
- #undef PACKAGE_BUGREPORT
- #undef PACKAGE_STRING
-@@ -371,18 +385,4 @@
- extern bool write(Agraph_t *g, char *filename);
- extern bool write(Agraph_t *g, FILE *f);
- 
--
--#ifdef SWIGTCL
--// A typemap telling SWIG to ignore an argument for input
--// However, we still need to pass a pointer to the C function
--%typemap(in,numinputs=0) char *outdata (char *temp) {
--     $1 = &temp;
--}
--// A typemap defining how to return an argument by appending it to the result
--%typemap(argout) char *outdata {
--     Tcl_Obj *o = Tcl_NewStringObj($1);
--     Tcl_ListObjAppendElement(interp,$result,o);
--}
--#endif
--
- %}

graphviz-4.0.0-gvpack-neato-static.patch

@@ -0,0 +1,15 @@
+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

graphviz-7.0.6-fix-python-3.12.patch

@@ -0,0 +1,13 @@
+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,,[

graphviz-arith.patch

@@ -1,29 +0,0 @@
-Index: lib/common/Makefile.am
-===================================================================
-RCS file: /home/cvsroot/graphviz2/lib/common/Makefile.am,v
-retrieving revision 1.46
-retrieving revision 1.47
-diff -u -r1.46 -r1.47
---- lib/common/Makefile.am	26 Jul 2007 13:53:25 -0000	1.46
-+++ lib/common/Makefile.am	4 Sep 2007 23:39:07 -0000	1.47
-@@ -1,4 +1,4 @@
--# $Id: Makefile.am,v 1.46 2007/07/26 13:53:25 erg Exp $ $Revision: 1.46 $
-+# $Id: Makefile.am,v 1.47 2007/09/04 23:39:07 ellson Exp $ $Revision: 1.47 $
- ## Process this file with automake to produce Makefile.in
- 
- AM_CPPFLAGS = \
-@@ -14,11 +14,10 @@
- AM_CFLAGS = -D_BLD_common=1
- endif
- 
--pkginclude_HEADERS = geom.h color.h types.h textpara.h usershape.h
-+pkginclude_HEADERS = arith.h geom.h color.h types.h textpara.h usershape.h
- noinst_HEADERS = render.h utils.h memory.h \
--	geomprocs.h colorprocs.h colortbl.h entities.h \
--	logic.h arith.h globals.h \
--	const.h macros.h htmllex.h htmltable.h pointset.h
-+	geomprocs.h colorprocs.h colortbl.h entities.h globals.h \
-+	logic.h const.h macros.h htmllex.h htmltable.h pointset.h
- noinst_LTLIBRARIES = libcommon_C.la
- 
- if WITH_CODEGENS

graphviz-black.patch

@@ -1,29 +0,0 @@
---- graphviz-2.12/lib/common/colxlate.c.orig	2006-07-26 22:44:05.000000000 -0500
-+++ graphviz-2.12/lib/common/colxlate.c	2007-07-12 14:07:13.000000000 -0500
-@@ -1,4 +1,4 @@
--/* $Id: colxlate.c,v 1.11 2006/07/27 03:44:05 erg Exp $ $Revision: 1.11 $ */
-+/* $Id: colxlate.c,v 1.13 2007/07/12 16:47:57 erg Exp $ $Revision: 1.13 $ */
- /* vim:set shiftwidth=4 ts=8: */
- 
- /**********************************************************
-@@ -180,6 +180,10 @@
- 
- /* resolveColor:
-  * Resolve input color str allowing color scheme namespaces.
-+ *  0) "black" => "black" 
-+ *    NB: This is something of a hack due to the remaining codegen.
-+ *        Once these are gone, this case could be removed and all references
-+ *        to "black" could be replaced by "/X11/black".
-  *  1) No initial / => 
-  *          if colorscheme is defined and no "X11", return /colorscheme/str
-  *          else return str
-@@ -214,7 +218,8 @@
-     char* ss;   /* second slash */
-     char* c2;   /* second char */
- 
--    if (*str == '/') {   /* if begins with '/' */
-+    if ((*str == 'b') || !strncmp(str+1,"lack",4)) return str;
-+    else if (*str == '/') {   /* if begins with '/' */
- 	c2 = str+1;
-         if ((ss = strchr(c2, '/'))) {  /* if has second '/' */
- 	    if (*c2 == '/') {    /* if second '/' is second character */

graphviz-gcc43.patch

@@ -1,32 +0,0 @@
---- graphviz-2.16/lib/vpsc/generate-constraints.cpp.orig	2008-02-11 13:42:16.000000000 -0500
-+++ graphviz-2.16/lib/vpsc/generate-constraints.cpp	2008-02-11 13:05:19.000000000 -0500
-@@ -18,6 +18,7 @@
- 
- #include <set>
- #include <cassert>
-+#include <cstdlib>
- #include "generate-constraints.h"
- #include "constraint.h"
- 
---- graphviz-2.16/lib/vpsc/csolve_VPSC.cpp.orig	2008-02-11 13:42:00.000000000 -0500
-+++ graphviz-2.16/lib/vpsc/csolve_VPSC.cpp	2008-02-11 13:05:19.000000000 -0500
-@@ -21,6 +21,7 @@
- #include <constraint.h>
- #include <generate-constraints.h>
- #include <solve_VPSC.h>
-+#include <cstdlib>
- #include <cassert>
- #include "csolve_VPSC.h"
- extern "C" {
---- graphviz-2.16/tclpkg/gv/gv.i.orig	2008-02-11 13:41:21.000000000 -0500
-+++ graphviz-2.16/tclpkg/gv/gv.i	2008-02-11 13:38:57.000000000 -0500
-@@ -25,6 +25,9 @@
- #undef TRUE
- #undef FALSE
- 
-+#ifdef HAVE_CONFIG_H
-+#include "config.h"
-+#endif
- #include "gvc.h"
- %}
- 

graphviz-libcdt.patch

@@ -1,11 +0,0 @@
---- graphviz-2.12/lib/expr/Makefile.am.orig	2006-09-26 11:47:54.000000000 -0500
-+++ graphviz-2.12/lib/expr/Makefile.am	2007-05-05 11:49:49.000000000 -0500
-@@ -34,7 +34,7 @@
- 
- libexpr_la_LDFLAGS = -version-info @VERSION_INFO@
- libexpr_la_SOURCES = $(libexpr_C_la_SOURCES)
--libexpr_la_LIBADD = $(libexpr_C_la_LIBADD)
-+libexpr_la_LIBADD = $(libexpr_C_la_LIBADD) \
- 	$(top_builddir)/lib/cdt/libcdt.la
- 
- $(libexpr_la_OBJECTS): exparse.h exparse.c exgram.h exop.h

graphviz-multilib.patch

@@ -1,14 +0,0 @@
-diff -urN graphviz-2.16.1.orig/plugin/pango/gvtextlayout_pango.c graphviz-2.16.1/plugin/pango/gvtextlayout_pango.c
---- graphviz-2.16.1.orig/plugin/pango/gvtextlayout_pango.c	2007-11-09 17:31:43.000000000 -0600
-+++ graphviz-2.16.1/plugin/pango/gvtextlayout_pango.c	2008-03-03 09:55:01.000000000 -0600
-@@ -154,8 +154,8 @@
- 	logical_rect.height = 0;
- 
-     textlayout_scale = POINTS_PER_INCH / (FONT_DPI * PANGO_SCALE);
--    para->width = logical_rect.width * textlayout_scale;
--    para->height = logical_rect.height * textlayout_scale;
-+    para->width = ROUND(logical_rect.width * textlayout_scale);
-+    para->height = ROUND(logical_rect.height * textlayout_scale);
- 
-     /* The y offset from baseline to 0,0 of the bitmap representation */
-     iter = pango_layout_get_iter (layout);

graphviz-php5.patch

@@ -1,30 +0,0 @@
-diff -urN graphviz-2.12/configure graphviz-2.12-patched/configure
---- graphviz-2.12/configure	2006-12-04 16:02:10.000000000 -0600
-+++ graphviz-2.12-patched/configure	2006-12-08 09:45:19.000000000 -0600
-@@ -25552,7 +25552,7 @@
- 
- fi;
- if test "x$enable_php" != "xno"; then
--if test `$SWIG -help 2>&1 | $GREP -c '\-php *- Generate'` = 0; then
-+if test `$SWIG -help 2>&1 | $GREP -c '\-php[5 ]*- Generate'` = 0; then
- 	PHP=
- 	{ echo "$as_me:$LINENO: WARNING: swig does not support php. The PHP packages will not be built" >&5
- echo "$as_me: WARNING: swig does not support php. The PHP packages will not be built" >&2;}
-diff -urN graphviz-2.12/configure.ac graphviz-2.12-patched/configure.ac
---- graphviz-2.12/configure.ac	2006-12-04 15:11:58.000000000 -0600
-+++ graphviz-2.12-patched/configure.ac	2006-12-08 08:07:10.000000000 -0600
-@@ -1,4 +1,4 @@
--# $Id: graphviz-php5.patch,v 1.1 2006/12/11 18:42:36 jima Exp $ $Revision: 1.1 $
-+# $Id: graphviz-php5.patch,v 1.1 2006/12/11 18:42:36 jima Exp $ $Revision: 1.1 $
- 
- # Process this file with autoconf to produce a configure script
- AC_PREREQ(2.54)
-@@ -628,7 +628,7 @@
- AC_ARG_ENABLE(php,
-   [AC_HELP_STRING([--disable-php], [don't support php language bindings])])
- if test "x$enable_php" != "xno"; then
--if test `$SWIG -help 2>&1 | $GREP -c '\-php *- Generate'` = 0; then
-+if test `$SWIG -help 2>&1 | $GREP -c '\-php[[5 ]]*- Generate'` = 0; then
- 	PHP=
- 	AC_MSG_WARN([swig does not support php. The PHP packages will not be built])
- else

graphviz-sparc64.patch

@@ -1,11 +0,0 @@
---- 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

graphviz-tk8.5.patch

@@ -1,181 +0,0 @@
-diff -urN graphviz-2.16.orig/configure graphviz-2.16/configure
---- graphviz-2.16.orig/configure	2007-11-09 23:41:41.000000000 -0600
-+++ graphviz-2.16/configure	2008-01-03 08:52:00.000000000 -0600
-@@ -28003,8 +28003,8 @@
- 
- 
- if test "x$TCLSH" = "x"; then
--    # Extract the first word of "tclsh8.4", so it can be a program name with args.
--set dummy tclsh8.4; ac_word=$2
-+    # Extract the first word of "tclsh8.5", so it can be a program name with args.
-+set dummy tclsh8.5; ac_word=$2
- { echo "$as_me:$LINENO: checking for $ac_word" >&5
- echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; }
- if test "${ac_cv_path_TCLSH+set}" = set; then
-@@ -28044,8 +28044,8 @@
- 
- 
-     if test "x$TCLSH" = "x"; then
--        # Extract the first word of "tclsh8.3", so it can be a program name with args.
--set dummy tclsh8.3; ac_word=$2
-+        # Extract the first word of "tclsh8.4", so it can be a program name with args.
-+set dummy tclsh8.4; ac_word=$2
- { echo "$as_me:$LINENO: checking for $ac_word" >&5
- echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; }
- if test "${ac_cv_path_TCLSH+set}" = set; then
-@@ -28085,7 +28085,48 @@
- 
- 
-         if test "x$TCLSH" = "x"; then
--            # Extract the first word of "tclsh", so it can be a program name with args.
-+            # Extract the first word of "tclsh8.3", so it can be a program name with args.
-+set dummy tclsh8.3; ac_word=$2
-+{ echo "$as_me:$LINENO: checking for $ac_word" >&5
-+echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; }
-+if test "${ac_cv_path_TCLSH+set}" = set; then
-+  echo $ECHO_N "(cached) $ECHO_C" >&6
-+else
-+  case $TCLSH in
-+  [\\/]* | ?:[\\/]*)
-+  ac_cv_path_TCLSH="$TCLSH" # Let the user override the test with a path.
-+  ;;
-+  *)
-+  as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
-+for as_dir in $PATH
-+do
-+  IFS=$as_save_IFS
-+  test -z "$as_dir" && as_dir=.
-+  for ac_exec_ext in '' $ac_executable_extensions; do
-+  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
-+    ac_cv_path_TCLSH="$as_dir/$ac_word$ac_exec_ext"
-+    echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
-+    break 2
-+  fi
-+done
-+done
-+IFS=$as_save_IFS
-+
-+  ;;
-+esac
-+fi
-+TCLSH=$ac_cv_path_TCLSH
-+if test -n "$TCLSH"; then
-+  { echo "$as_me:$LINENO: result: $TCLSH" >&5
-+echo "${ECHO_T}$TCLSH" >&6; }
-+else
-+  { echo "$as_me:$LINENO: result: no" >&5
-+echo "${ECHO_T}no" >&6; }
-+fi
-+
-+
-+            if test "x$TCLSH" = "x"; then
-+                # Extract the first word of "tclsh", so it can be a program name with args.
- set dummy tclsh; ac_word=$2
- { echo "$as_me:$LINENO: checking for $ac_word" >&5
- echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; }
-@@ -28125,6 +28166,7 @@
- fi
- 
- 
-+            fi
-         fi
-     fi
-     if test "x$TCLSH" = "x"; then
-@@ -28413,8 +28455,8 @@
- fi
- 
-     if test "x$WISH" = "x"; then
--        # Extract the first word of "wish8.4", so it can be a program name with args.
--set dummy wish8.4; ac_word=$2
-+        # Extract the first word of "wish8.5", so it can be a program name with args.
-+set dummy wish8.5; ac_word=$2
- { echo "$as_me:$LINENO: checking for $ac_word" >&5
- echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; }
- if test "${ac_cv_path_WISH+set}" = set; then
-@@ -28454,8 +28496,8 @@
- 
- 
-         if test "x$WISH" = "x"; then
--    	    # Extract the first word of "wish8.3", so it can be a program name with args.
--set dummy wish8.3; ac_word=$2
-+    	    # Extract the first word of "wish8.4", so it can be a program name with args.
-+set dummy wish8.4; ac_word=$2
- { echo "$as_me:$LINENO: checking for $ac_word" >&5
- echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; }
- if test "${ac_cv_path_WISH+set}" = set; then
-@@ -28495,7 +28537,48 @@
- 
- 
-     	    if test "x$WISH" = "x"; then
--                # Extract the first word of "wish", so it can be a program name with args.
-+                # Extract the first word of "wish8.3", so it can be a program name with args.
-+set dummy wish8.3; ac_word=$2
-+{ echo "$as_me:$LINENO: checking for $ac_word" >&5
-+echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; }
-+if test "${ac_cv_path_WISH+set}" = set; then
-+  echo $ECHO_N "(cached) $ECHO_C" >&6
-+else
-+  case $WISH in
-+  [\\/]* | ?:[\\/]*)
-+  ac_cv_path_WISH="$WISH" # Let the user override the test with a path.
-+  ;;
-+  *)
-+  as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
-+for as_dir in $PATH
-+do
-+  IFS=$as_save_IFS
-+  test -z "$as_dir" && as_dir=.
-+  for ac_exec_ext in '' $ac_executable_extensions; do
-+  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
-+    ac_cv_path_WISH="$as_dir/$ac_word$ac_exec_ext"
-+    echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
-+    break 2
-+  fi
-+done
-+done
-+IFS=$as_save_IFS
-+
-+  ;;
-+esac
-+fi
-+WISH=$ac_cv_path_WISH
-+if test -n "$WISH"; then
-+  { echo "$as_me:$LINENO: result: $WISH" >&5
-+echo "${ECHO_T}$WISH" >&6; }
-+else
-+  { echo "$as_me:$LINENO: result: no" >&5
-+echo "${ECHO_T}no" >&6; }
-+fi
-+
-+
-+    	        if test "x$WISH" = "x"; then
-+                    # Extract the first word of "wish", so it can be a program name with args.
- set dummy wish; ac_word=$2
- { echo "$as_me:$LINENO: checking for $ac_word" >&5
- echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; }
-@@ -28535,6 +28618,7 @@
- fi
- 
- 
-+                fi
-             fi
-         fi
-     fi
-@@ -28557,7 +28641,7 @@
-     WISH_EXEC_PREFIX=`echo $WISH|sed -e 's%/bin/wish.*$%%'`
- 
-     if test -f ${WISH_EXEC_PREFIX}/include/tk${TK_VERSION_FOUND}/tk.h; then
--	TK_INCLUDES="-I${WISH_EXEC_PREFIX}/include/tk${TK_VERSION_FOUND} -I${WISH_EXEC_PREFIX}/include/tk${TK_VERSION_FOUND}/generic"
-+	TK_INCLUDES="-I${WISH_EXEC_PREFIX}/include/tk${TK_VERSION_FOUND} -I${WISH_EXEC_PREFIX}/include/tk${TK_VERSION_FOUND}/generic -I${WISH_EXEC_PREFIX}/include/tk${TK_VERSION_FOUND}/unix"
-     else
-         if test "x${WISH_EXEC_PREFIX}" != "x/usr" -a -f ${WISH_EXEC_PREFIX}/include/tk.h; then
- 	    TK_INCLUDES=-I${WISH_EXEC_PREFIX}/include
-@@ -34721,7 +34805,7 @@
- # -----------------------------------
- # tkInt.h
- if test -f "$TK_SRC_DIR/generic/tkInt.h"; then
--TKINT_INCLUDES="-I$TK_SRC_DIR/generic"
-+TKINT_INCLUDES="-I$TK_SRC_DIR/generic -I$TK_SRC_DIR/unix"
- else
- if test -f "/usr/include/tkInt.h"; then
- TKINT_INCLUDES=""

sources

@@ -1 +1 @@
-0609b42cb9ef913b7af13e43c4d716c9  graphviz-2.26.0.tar.gz
+SHA512 (graphviz-7.1.0.tar.bz2) = 28b3217153cbe96270b25862aa030269128653b011cf9eb6607fe9d061aa9db85f9b2454d9fde70be5af4f98474f8cac61040584ce164723df6ceb372cfb29ad