Update of /cvsroot/fink/dists/10.4/stable/main/finkinfo/languages
In directory sfp-cvs-1.v30.ch3.sourceforge.com:/tmp/cvs-serv31970
Modified Files:
tcltk-x86_64.patch
Log Message:
add reset of final upstream fix
Index: tcltk-x86_64.patch
===================================================================
RCS file:
/cvsroot/fink/dists/10.4/stable/main/finkinfo/languages/tcltk-x86_64.patch,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -d -r1.7 -r1.8
--- tcltk-x86_64.patch 7 Oct 2013 16:32:52 -0000 1.7
+++ tcltk-x86_64.patch 9 Oct 2013 21:03:06 -0000 1.8
@@ -1,6 +1,6 @@
diff -Nurd -x'*~' tcltk-8.5.15.orig/tcl8.5.15/generic/tclInt.h
tcltk-8.5.15/tcl8.5.15/generic/tclInt.h
--- tcltk-8.5.15.orig/tcl8.5.15/generic/tclInt.h 2013-08-30
11:58:39.000000000 -0400
-+++ tcltk-8.5.15/tcl8.5.15/generic/tclInt.h 2013-10-07 08:45:21.000000000
-0400
++++ tcltk-8.5.15/tcl8.5.15/generic/tclInt.h 2013-10-09 12:06:39.000000000
-0400
@@ -2808,7 +2808,7 @@
MODULE_SCOPE int TclClockOldscanObjCmd(
ClientData clientData, Tcl_Interp *interp,
@@ -21,7 +21,7 @@
MODULE_SCOPE int Tcl_ScanObjCmd(ClientData clientData,
diff -Nurd -x'*~' tcltk-8.5.15.orig/tcl8.5.15/generic/tclPort.h
tcltk-8.5.15/tcl8.5.15/generic/tclPort.h
--- tcltk-8.5.15.orig/tcl8.5.15/generic/tclPort.h 2013-08-30
11:58:39.000000000 -0400
-+++ tcltk-8.5.15/tcl8.5.15/generic/tclPort.h 2013-10-07 08:45:21.000000000
-0400
++++ tcltk-8.5.15/tcl8.5.15/generic/tclPort.h 2013-10-09 12:06:39.000000000
-0400
@@ -20,7 +20,7 @@
#if defined(_WIN32)
# include "tclWinPort.h"
@@ -33,7 +33,7 @@
diff -Nurd -x'*~' tcltk-8.5.15.orig/tcl8.5.15/unix/configure
tcltk-8.5.15/tcl8.5.15/unix/configure
--- tcltk-8.5.15.orig/tcl8.5.15/unix/configure 2013-09-13 12:07:56.000000000
-0400
-+++ tcltk-8.5.15/tcl8.5.15/unix/configure 2013-10-07 08:45:21.000000000
-0400
++++ tcltk-8.5.15/tcl8.5.15/unix/configure 2013-10-09 12:06:39.000000000
-0400
@@ -18796,7 +18796,7 @@
else
TCL_LIB_FLAG="-ltcl`echo ${TCL_VERSION} | tr -d .`"
@@ -63,7 +63,7 @@
ac_clean_files_save=$ac_clean_files
diff -Nurd -x'*~' tcltk-8.5.15.orig/tcl8.5.15/unix/tclUnixNotfy.c
tcltk-8.5.15/tcl8.5.15/unix/tclUnixNotfy.c
--- tcltk-8.5.15.orig/tcl8.5.15/unix/tclUnixNotfy.c 2013-08-30
11:58:40.000000000 -0400
-+++ tcltk-8.5.15/tcl8.5.15/unix/tclUnixNotfy.c 2013-10-07 08:46:29.000000000
-0400
++++ tcltk-8.5.15/tcl8.5.15/unix/tclUnixNotfy.c 2013-10-09 12:06:39.000000000
-0400
@@ -202,7 +202,7 @@
#ifdef TCL_THREADS
@@ -100,9 +100,23 @@
/*
*----------------------------------------------------------------------
*
+diff -Nurd -x'*~' tcltk-8.5.15.orig/tcl8.5.15/unix/tclUnixTest.c
tcltk-8.5.15/tcl8.5.15/unix/tclUnixTest.c
+--- tcltk-8.5.15.orig/tcl8.5.15/unix/tclUnixTest.c 2013-08-30
11:58:40.000000000 -0400
++++ tcltk-8.5.15/tcl8.5.15/unix/tclUnixTest.c 2013-10-09 12:07:26.000000000
-0400
+@@ -574,8 +574,8 @@
+ "Cannot fork", NULL);
+ return TCL_ERROR;
+ }
+-#if !defined(HAVE_PTHREAD_ATFORK) || defined(MAC_OSX_TCL)
+- /* Only needed when pthread_atfork is not present or on OSX. */
++#if !defined(HAVE_PTHREAD_ATFORK)
++ /* Only needed when pthread_atfork is not present. */
+ if (pid==0) {
+ Tcl_InitNotifier();
+ }
diff -Nurd -x'*~' tcltk-8.5.15.orig/tk8.5.15/unix/Makefile.in
tcltk-8.5.15/tk8.5.15/unix/Makefile.in
--- tcltk-8.5.15.orig/tk8.5.15/unix/Makefile.in 2013-09-16
12:45:24.000000000 -0400
-+++ tcltk-8.5.15/tk8.5.15/unix/Makefile.in 2013-10-07 08:45:21.000000000
-0400
++++ tcltk-8.5.15/tk8.5.15/unix/Makefile.in 2013-10-09 12:06:39.000000000
-0400
@@ -147,7 +147,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
@@ -146,7 +160,7 @@
$(CC) -c $(CC_SWITCHES) -DTK_LIBRARY=\"${TK_LIBRARY}\" \
diff -Nurd -x'*~' tcltk-8.5.15.orig/tk8.5.15/unix/configure
tcltk-8.5.15/tk8.5.15/unix/configure
--- tcltk-8.5.15.orig/tk8.5.15/unix/configure 2013-09-16 12:45:24.000000000
-0400
-+++ tcltk-8.5.15/tk8.5.15/unix/configure 2013-10-07 08:45:21.000000000
-0400
++++ tcltk-8.5.15/tk8.5.15/unix/configure 2013-10-09 12:06:39.000000000
-0400
@@ -10547,19 +10547,14 @@
echo "$as_me:$LINENO: result: $enable_xft" >&5
echo "${ECHO_T}$enable_xft" >&6
@@ -206,7 +220,7 @@
ac_clean_files_save=$ac_clean_files
diff -Nurd -x'*~' tcltk-8.5.15.orig/tk8.5.15/unix/tkConfig.sh.in
tcltk-8.5.15/tk8.5.15/unix/tkConfig.sh.in
--- tcltk-8.5.15.orig/tk8.5.15/unix/tkConfig.sh.in 2013-09-16
12:45:24.000000000 -0400
-+++ tcltk-8.5.15/tk8.5.15/unix/tkConfig.sh.in 2013-10-07 08:45:21.000000000
-0400
++++ tcltk-8.5.15/tk8.5.15/unix/tkConfig.sh.in 2013-10-09 12:06:39.000000000
-0400
@@ -32,7 +32,7 @@
TK_LIB_FILE='@TK_LIB_FILE@'
------------------------------------------------------------------------------
October Webinars: Code for Performance
Free Intel webinars can help you accelerate application performance.
Explore tips for MPI, OpenMP, advanced profiling, and more. Get the most from
the latest Intel processors and coprocessors. See abstracts and register >
http://pubads.g.doubleclick.net/gampad/clk?id=60134071&iu=/4140/ostg.clktrk
_______________________________________________
Fink-commits mailing list
Fink-commits@lists.sourceforge.net
http://news.gmane.org/gmane.os.apple.fink.cvs
