From 3fcbbe765cbef978dddc47b0faa1a77d6484f7bb Mon Sep 17 00:00:00 2001 From: Patrick Laughton Date: Wed, 7 Feb 2007 14:55:06 +0000 Subject: [PATCH] - Added patch for slightly broken tk 8.5 --- graphviz-tk8.5.patch | 237 +++++++++++++++++++++++++++++++++++++++++++ graphviz.spec | 9 +- 2 files changed, 245 insertions(+), 1 deletion(-) create mode 100644 graphviz-tk8.5.patch diff --git a/graphviz-tk8.5.patch b/graphviz-tk8.5.patch new file mode 100644 index 0000000..ab654d5 --- /dev/null +++ b/graphviz-tk8.5.patch @@ -0,0 +1,237 @@ +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 2007-02-07 08:20:19.000000000 -0600 +@@ -26251,8 +26251,8 @@ + fi; + + 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 +@@ -26291,8 +26291,8 @@ + fi + + 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 +@@ -26331,7 +26331,47 @@ + fi + + 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 $as_executable_p "$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 ++ ++ ;; ++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 +@@ -26370,6 +26410,7 @@ + echo "${ECHO_T}no" >&6 + fi + ++ fi + fi + fi + fi +@@ -26674,8 +26715,8 @@ + WISH=$withval + 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 +@@ -26714,7 +26755,47 @@ + fi + + if test "x$WISH" = "x"; then +- # Extract the first word of "wish8.3", so it can be a program name with args. ++ # 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 ++ 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 $as_executable_p "$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 ++ ++ ;; ++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 "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 +@@ -26753,8 +26834,8 @@ + 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. ++ 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 +@@ -26793,6 +26874,7 @@ + echo "${ECHO_T}no" >&6 + fi + ++ fi + fi + fi + fi +@@ -26815,7 +26897,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 +@@ -33490,7 +33572,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="" +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 2007-02-07 08:20:02.000000000 -0600 +@@ -755,11 +755,14 @@ + TCLSH=$withval,) + + if test "x$TCLSH" = "x"; then +- AC_PATH_PROG(TCLSH,tclsh8.4) ++ AC_PATH_PROG(TCLSH,tclsh8.5) + if test "x$TCLSH" = "x"; then +- AC_PATH_PROG(TCLSH,tclsh8.3) ++ AC_PATH_PROG(TCLSH,tclsh8.4) + if test "x$TCLSH" = "x"; then +- AC_PATH_PROG(TCLSH,tclsh) ++ AC_PATH_PROG(TCLSH,tclsh8.3) ++ if test "x$TCLSH" = "x"; then ++ AC_PATH_PROG(TCLSH,tclsh) ++ fi + fi + fi + fi +@@ -904,11 +907,14 @@ + [ --with-wish=PROG build graphviz for specific wish], + WISH=$withval,) + if test "x$WISH" = "x"; then +- AC_PATH_PROG(WISH,wish8.4) ++ AC_PATH_PROG(WISH,wish8.5) + if test "x$WISH" = "x"; then +- AC_PATH_PROG(WISH,wish8.3) +- if test "x$WISH" = "x"; then +- AC_PATH_PROG(WISH,wish) ++ AC_PATH_PROG(WISH,wish8.4) ++ if test "x$WISH" = "x"; then ++ AC_PATH_PROG(WISH,wish8.3) ++ if test "x$WISH" = "x"; then ++ AC_PATH_PROG(WISH,wish) ++ fi + fi + fi + fi +@@ -930,7 +936,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 +@@ -1673,7 +1679,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="" diff --git a/graphviz.spec b/graphviz.spec index e3b9290..9563cb9 100644 --- a/graphviz.spec +++ b/graphviz.spec @@ -7,12 +7,13 @@ #-- graphviz src.rpm -------------------------------------------------------- Name: graphviz Version: 2.12 -Release: 4%{?dist} +Release: 5%{?dist} License: CPL URL: http://www.graphviz.org/ Source: http://www.graphviz.org/pub/graphviz/ARCHIVE/graphviz-2.12.tar.gz Patch0: %{name}-php5.patch +Patch1: %{name}-tk8.5.patch # graphviz is relocatable Prefix: /usr @@ -397,6 +398,9 @@ Provides some additional PDF and HTML documentation for graphviz. %prep %setup -q %patch0 -p1 +%if "%fedora" >= "7" +%patch1 -p1 +%endif %build # XXX ix86 only used to have -ffast-math, let's use everywhere @@ -433,6 +437,9 @@ rm -rf $RPM_BUILD_ROOT #-- changelog -------------------------------------------------- %changelog +* Wed Feb 07 2007 Patrick "Jima" Laughton 2.12-5 +- Added patch for slightly broken tk 8.5 + * Thu Feb 01 2007 Patrick "Jima" Laughton 2.12-4 - Bump-n-build due to tk upgrade