Update of /cvsroot/fink/dists/10.7/stable/main/finkinfo/languages
In directory sfp-cvs-1.v30.ch3.sourceforge.com:/tmp/cvs-serv21521
Added Files:
tcltk-10.9.patch
Log Message:
add 10.9 variant for tcltk to build 8.6.0
--- NEW FILE: tcltk-10.9.patch ---
diff -Nurd -x'*~' tcltk-8.6.0.orig/tcl8.6.0/generic/tclInt.h
tcltk-8.6.0/tcl8.6.0/generic/tclInt.h
--- tcltk-8.6.0.orig/tcl8.6.0/generic/tclInt.h 2012-11-05 10:11:15.000000000
-0500
+++ tcltk-8.6.0/tcl8.6.0/generic/tclInt.h 2013-07-13 21:25:02.000000000
-0400
@@ -3232,7 +3232,7 @@
MODULE_SCOPE int TclClockOldscanObjCmd(
ClientData clientData, Tcl_Interp *interp,
int objc, Tcl_Obj *const objv[]);
-MODULE_SCOPE int Tcl_CloseObjCmd(ClientData clientData,
+extern int Tcl_CloseObjCmd(ClientData clientData,
Tcl_Interp *interp, int objc,
Tcl_Obj *const objv[]);
MODULE_SCOPE int Tcl_ConcatObjCmd(ClientData clientData,
@@ -3415,7 +3415,7 @@
MODULE_SCOPE int Tcl_RepresentationCmd(ClientData clientData,
Tcl_Interp *interp, int objc,
Tcl_Obj *const objv[]);
-MODULE_SCOPE int Tcl_ReturnObjCmd(ClientData clientData,
+extern int Tcl_ReturnObjCmd(ClientData clientData,
Tcl_Interp *interp, int objc,
Tcl_Obj *const objv[]);
MODULE_SCOPE int Tcl_ScanObjCmd(ClientData clientData,
diff -Nurd -x'*~' tcltk-8.6.0.orig/tcl8.6.0/generic/tclPort.h
tcltk-8.6.0/tcl8.6.0/generic/tclPort.h
--- tcltk-8.6.0.orig/tcl8.6.0/generic/tclPort.h 2012-06-26 09:59:02.000000000
-0400
+++ tcltk-8.6.0/tcl8.6.0/generic/tclPort.h 2013-07-13 21:27:39.000000000
-0400
@@ -22,7 +22,7 @@
#endif
#include "tcl.h"
#if !defined(_WIN32)
-# include "tclUnixPort.h"
+# include "../unix/tclUnixPort.h"
#endif
#if !defined(LLONG_MIN)
diff -Nurd -x'*~' tcltk-8.6.0.orig/tcl8.6.0/unix/configure
tcltk-8.6.0/tcl8.6.0/unix/configure
--- tcltk-8.6.0.orig/tcl8.6.0/unix/configure 2012-12-20 10:02:15.000000000
-0500
+++ tcltk-8.6.0/tcl8.6.0/unix/configure 2013-07-13 21:25:02.000000000 -0400
@@ -19458,7 +19458,7 @@
else
TCL_LIB_FLAG="-ltcl`echo ${TCL_VERSION} | tr -d .`"
fi
- TCL_BUILD_LIB_SPEC="-L`pwd | sed -e 's/ /\\\\ /g'` ${TCL_LIB_FLAG}"
+ TCL_BUILD_LIB_SPEC="`pwd`/${TCL_LIB_FILE}"
TCL_LIB_SPEC="-L${libdir} ${TCL_LIB_FLAG}"
fi
VERSION='${VERSION}'
@@ -19502,7 +19502,7 @@
TCL_STUB_LIB_FLAG="-ltclstub`echo ${TCL_VERSION} | tr -d .`"
fi
-TCL_BUILD_STUB_LIB_SPEC="-L`pwd | sed -e 's/ /\\\\ /g'` ${TCL_STUB_LIB_FLAG}"
+TCL_BUILD_STUB_LIB_SPEC="`pwd`/${TCL_STUB_LIB_FILE}"
TCL_STUB_LIB_SPEC="-L${TCL_STUB_LIB_DIR} ${TCL_STUB_LIB_FLAG}"
TCL_BUILD_STUB_LIB_PATH="`pwd`/${TCL_STUB_LIB_FILE}"
TCL_STUB_LIB_PATH="${TCL_STUB_LIB_DIR}/${TCL_STUB_LIB_FILE}"
@@ -19686,7 +19686,7 @@
-CFLAGS="${CFLAGS} ${CPPFLAGS}"; CPPFLAGS=""
+EXTRA_CC_SWITCHES="${EXTRA_CC_SWITCHES} ${CPPFLAGS}"; CPPFLAGS=""
: ${CONFIG_STATUS=./config.status}
ac_clean_files_save=$ac_clean_files
diff -Nurd -x'*~' tcltk-8.6.0.orig/tk8.6.0/unix/Makefile.in
tcltk-8.6.0/tk8.6.0/unix/Makefile.in
--- tcltk-8.6.0.orig/tk8.6.0/unix/Makefile.in 2013-07-14 08:11:56.000000000
-0400
+++ tcltk-8.6.0/tk8.6.0/unix/Makefile.in 2013-07-14 08:45:52.000000000
-0400
@@ -148,7 +148,7 @@
# X11 include files accessible (the configure script will try to
# set this value, and will cause it to be an empty string if the
# include files are accessible via /usr/include).
-X11_INCLUDES = @XINCLUDES@
+X11_INCLUDES = $(XFT_CFLAGS) @XINCLUDES@
AQUA_INCLUDES = -I$(MAC_OSX_DIR) -I$(XLIB_DIR)
@@ -265,6 +265,9 @@
LIBS = @LIBS@ $(X11_LIB_SWITCHES) @TCL_LIBS@
WISH_LIBS = $(TCL_LIB_SPEC) @LIBS@ $(X11_LIB_SWITCHES) @TCL_LIBS@
@EXTRA_WISH_LIBS@
+# support for embedded libraries on Darwin / Mac OS X
+DYLIB_INSTALL_DIR = ${libdir}
+
# The symbols below provide support for dynamic loading and shared
# libraries. See configure.in for a description of what the
# symbols mean. The values of the symbols are normally set by the
@@ -282,9 +285,6 @@
CC_SEARCH_FLAGS = @CC_SEARCH_FLAGS@
LD_SEARCH_FLAGS = @LD_SEARCH_FLAGS@
-# support for embedded libraries on Darwin / Mac OS X
-DYLIB_INSTALL_DIR = ${LIB_RUNTIME_DIR}
-
# support for building the Aqua resource file
TK_RSRC_FILE = @TK_RSRC_FILE@
WISH_RSRC_FILE = @WISH_RSRC_FILE@
@@ -329,18 +329,18 @@
CC_SWITCHES_NO_STUBS = ${CFLAGS} ${CFLAGS_WARNING} ${SHLIB_CFLAGS} \
-I${UNIX_DIR} -I${GENERIC_DIR} -I${BMAP_DIR} -I${TCL_GENERIC_DIR} \
--I${TCL_PLATFORM_DIR} ${@TK_WINDOWINGSYSTEM@_INCLUDES} ${AC_FLAGS} \
-${PROTO_FLAGS} ${SECURITY_FLAGS} ${MEM_DEBUG_FLAGS} ${KEYSYM_FLAGS} \
-${NO_DEPRECATED_FLAGS} @EXTRA_CC_SWITCHES@
+-I${TCL_PLATFORM_DIR} ${AC_FLAGS} ${PROTO_FLAGS} ${SECURITY_FLAGS} \
+${MEM_DEBUG_FLAGS} ${KEYSYM_FLAGS} ${NO_DEPRECATED_FLAGS} \
+@EXTRA_CC_SWITCHES@ ${@TK_WINDOWINGSYSTEM@_INCLUDES}
CC_SWITCHES = $(CC_SWITCHES_NO_STUBS) @TCL_STUB_FLAGS@
APP_CC_SWITCHES = $(CC_SWITCHES_NO_STUBS) @EXTRA_APP_CC_SWITCHES@
DEPEND_SWITCHES = ${CFLAGS} -I${UNIX_DIR} -I${GENERIC_DIR} -I${BMAP_DIR} \
--I${TCL_GENERIC_DIR} -I${TCL_PLATFORM_DIR} ${@TK_WINDOWINGSYSTEM@_INCLUDES} \
-${AC_FLAGS} ${PROTO_FLAGS} ${SECURITY_FLAGS} ${MEM_DEBUG_FLAGS} \
-${KEYSYM_FLAGS} @EXTRA_CC_SWITCHES@
+-I${TCL_GENERIC_DIR} -I${TCL_PLATFORM_DIR} ${AC_FLAGS} ${PROTO_FLAGS} \
+${SECURITY_FLAGS} ${MEM_DEBUG_FLAGS} ${KEYSYM_FLAGS} @EXTRA_CC_SWITCHES@ \
+${@TK_WINDOWINGSYSTEM@_INCLUDES}
WISH_OBJS = tkAppInit.o
@@ -1200,7 +1200,7 @@
# NB: tkUnixRFont.o uses nondefault CFLAGS
tkUnixRFont.o: $(UNIX_DIR)/tkUnixRFont.c
- $(CC) -c $(CC_SWITCHES) $(XFT_CFLAGS) $(UNIX_DIR)/tkUnixRFont.c
+ $(CC) -c $(CC_SWITCHES) $(UNIX_DIR)/tkUnixRFont.c
tkUnixInit.o: $(UNIX_DIR)/tkUnixInit.c tkConfig.sh
$(CC) -c $(CC_SWITCHES) -DTK_LIBRARY=\"${TK_LIBRARY}\" \
diff -Nurd -x'*~' tcltk-8.6.0.orig/tk8.6.0/unix/configure
tcltk-8.6.0/tk8.6.0/unix/configure
--- tcltk-8.6.0.orig/tk8.6.0/unix/configure 2012-12-19 10:39:12.000000000
-0500
+++ tcltk-8.6.0/tk8.6.0/unix/configure 2013-07-13 21:25:02.000000000 -0400
@@ -10839,19 +10839,14 @@
echo "$as_me:$LINENO: result: $enable_xft" >&5
echo "${ECHO_T}$enable_xft" >&6
else
- found_xft="yes"
- XFT_CFLAGS=`xft-config --cflags 2>/dev/null` ||
found_xft="no"
- XFT_LIBS=`xft-config --libs 2>/dev/null` || found_xft="no"
- if test "$found_xft" = "no" ; then
found_xft=yes
XFT_CFLAGS=`pkg-config --cflags xft 2>/dev/null` || found_xft="no"
XFT_LIBS=`pkg-config --libs xft 2>/dev/null` || found_xft="no"
- fi
echo "$as_me:$LINENO: result: $found_xft" >&5
echo "${ECHO_T}$found_xft" >&6
if test "$found_xft" = "yes" ; then
tk_oldCFlags=$CFLAGS
- CFLAGS="$CFLAGS $XINCLUDES $XFT_CFLAGS"
+ CFLAGS="$CFLAGS $XFT_CFLAGS $XINCLUDES"
tk_oldLibs=$LIBS
LIBS="$tk_oldLIBS $XFT_LIBS $XLIBSW"
echo "$as_me:$LINENO: checking for X11/Xft/Xft.h" >&5
@@ -10916,7 +10911,7 @@
fi
if test "$found_xft" = "yes" ; then
tk_oldCFlags=$CFLAGS
- CFLAGS="$CFLAGS $XINCLUDES $XFT_CFLAGS"
+ CFLAGS="$CFLAGS $XFT_CFLAGS $XINCLUDES"
tk_oldLibs=$LIBS
LIBS="$tk_oldLIBS $XFT_LIBS $XLIBSW"
@@ -11248,7 +11243,7 @@
else
TK_LIB_FLAG="-ltk`echo ${TK_VERSION} | tr -d .`"
fi
- TK_BUILD_LIB_SPEC="-L`pwd | sed -e 's/ /\\\\ /g'` ${TK_LIB_FLAG}"
+ TK_BUILD_LIB_SPEC="`pwd`/${TK_LIB_FILE}"
if test "${ac_cv_cygwin}" = "yes" -a "$SHARED_BUILD" = "1"; then
WISH_BUILD_LIB_SPEC="-L\$(TOP_DIR)/win
-ltk${TK_MAJOR_VERSION}${TK_MINOR_VERSION} \${TCL_LIB_SPEC}"
else
@@ -11290,7 +11285,7 @@
TK_STUB_LIB_FLAG="-ltkstub`echo ${TK_VERSION} | tr -d .`"
fi
-TK_BUILD_STUB_LIB_SPEC="-L`pwd | sed -e 's/ /\\\\ /g'` ${TK_STUB_LIB_FLAG}"
+TK_BUILD_STUB_LIB_SPEC="`pwd`/${TK_STUB_LIB_FILE}"
TK_STUB_LIB_SPEC="-L${TK_STUB_LIB_DIR} ${TK_STUB_LIB_FLAG}"
TK_BUILD_STUB_LIB_PATH="`pwd`/${TK_STUB_LIB_FILE}"
TK_STUB_LIB_PATH="${TK_STUB_LIB_DIR}/${TK_STUB_LIB_FILE}"
@@ -11483,7 +11478,7 @@
LTLIBOBJS=$ac_ltlibobjs
-CFLAGS="${CFLAGS} ${CPPFLAGS}"; CPPFLAGS=""
+EXTRA_CC_SWITCHES="${EXTRA_CC_SWITCHES} ${CPPFLAGS}"; CPPFLAGS=""
: ${CONFIG_STATUS=./config.status}
ac_clean_files_save=$ac_clean_files
diff -Nurd -x'*~' tcltk-8.6.0.orig/tk8.6.0/unix/tkConfig.sh.in
tcltk-8.6.0/tk8.6.0/unix/tkConfig.sh.in
--- tcltk-8.6.0.orig/tk8.6.0/unix/tkConfig.sh.in 2012-12-19
10:39:12.000000000 -0500
+++ tcltk-8.6.0/tk8.6.0/unix/tkConfig.sh.in 2013-07-13 21:25:02.000000000
-0400
@@ -32,7 +32,7 @@
TK_LIB_FILE='@TK_LIB_FILE@'
# Additional libraries to use when linking Tk.
-TK_LIBS='@XLIBSW@ @XFT_LIBS@ @LIBS@ @TCL_LIBS@'
+TK_LIBS='@XFT_LIBS@ @XLIBSW@ @LIBS@ @TCL_LIBS@'
# Top-level directory in which Tk's platform-independent files are
# installed.
------------------------------------------------------------------------------
See everything from the browser to the database with AppDynamics
Get end-to-end visibility with application monitoring from AppDynamics
Isolate bottlenecks and diagnose root cause in seconds.
Start your free trial of AppDynamics Pro today!
http://pubads.g.doubleclick.net/gampad/clk?id=48808831&iu=/4140/ostg.clktrk
_______________________________________________
Fink-commits mailing list
Fink-commits@lists.sourceforge.net
http://news.gmane.org/gmane.os.apple.fink.cvs
