languages tcltk-10.9.patch, 1.2, 1.3

Jack Howarth Mon, 07 Oct 2013 09:35:37 -0700

Update of /cvsroot/fink/dists/10.7/stable/main/finkinfo/languages
In directory sfp-cvs-1.v30.ch3.sourceforge.com:/tmp/cvs-serv23370


Modified Files:
        tcltk-10.9.patch 
Log Message:
revert back to --disable-corefoundation and use upstream fix for 
http://core.tcl.tk/tcl/info/4b277b8c24

Index: tcltk-10.9.patch
===================================================================
RCS file: 
/cvsroot/fink/dists/10.7/stable/main/finkinfo/languages/tcltk-10.9.patch,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -d -r1.2 -r1.3
--- tcltk-10.9.patch    27 Sep 2013 20:06:21 -0000      1.2
+++ tcltk-10.9.patch    7 Oct 2013 16:34:48 -0000       1.3
@@ -1,6 +1,6 @@
 diff -Nurd -x'*~' tcltk-8.6.1.orig/tcl8.6.1/generic/tclInt.h 
tcltk-8.6.1/tcl8.6.1/generic/tclInt.h
 --- tcltk-8.6.1.orig/tcl8.6.1/generic/tclInt.h 2013-09-19 15:04:14.000000000 
-0400
-+++ tcltk-8.6.1/tcl8.6.1/generic/tclInt.h      2013-09-27 14:55:41.000000000 
-0400
++++ tcltk-8.6.1/tcl8.6.1/generic/tclInt.h      2013-10-07 10:43:29.000000000 
-0400
 @@ -3160,7 +3160,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.6.1.orig/tcl8.6.1/generic/tclPort.h 
tcltk-8.6.1/tcl8.6.1/generic/tclPort.h
 --- tcltk-8.6.1.orig/tcl8.6.1/generic/tclPort.h        2013-09-19 
15:04:14.000000000 -0400
-+++ tcltk-8.6.1/tcl8.6.1/generic/tclPort.h     2013-09-27 14:56:28.000000000 
-0400
++++ tcltk-8.6.1/tcl8.6.1/generic/tclPort.h     2013-10-07 10:43:29.000000000 
-0400
 @@ -20,7 +20,7 @@
  #if defined(_WIN32)
  #   include "tclWinPort.h"
@@ -33,7 +33,7 @@
  
 diff -Nurd -x'*~' tcltk-8.6.1.orig/tcl8.6.1/unix/configure 
tcltk-8.6.1/tcl8.6.1/unix/configure
 --- tcltk-8.6.1.orig/tcl8.6.1/unix/configure   2013-09-19 16:17:13.000000000 
-0400
-+++ tcltk-8.6.1/tcl8.6.1/unix/configure        2013-09-27 14:55:41.000000000 
-0400
++++ tcltk-8.6.1/tcl8.6.1/unix/configure        2013-10-07 10:43:29.000000000 
-0400
 @@ -19240,7 +19240,7 @@
      else
          TCL_LIB_FLAG="-ltcl`echo ${TCL_VERSION} | tr -d .`"
@@ -61,9 +61,48 @@
  
  : ${CONFIG_STATUS=./config.status}
  ac_clean_files_save=$ac_clean_files
+diff -Nurd -x'*~' tcltk-8.6.1.orig/tcl8.6.1/unix/tclUnixNotfy.c 
tcltk-8.6.1/tcl8.6.1/unix/tclUnixNotfy.c
+--- tcltk-8.6.1.orig/tcl8.6.1/unix/tclUnixNotfy.c      2013-09-19 
15:04:17.000000000 -0400
++++ tcltk-8.6.1/tcl8.6.1/unix/tclUnixNotfy.c   2013-10-07 10:46:40.000000000 
-0400
+@@ -194,7 +194,7 @@
+ 
+ #ifdef TCL_THREADS
+ static void   NotifierThreadProc(ClientData clientData);
+-#ifdef HAVE_PTHREAD_ATFORK
++#if defined(HAVE_PTHREAD_ATFORK) && !defined(__APPLE__)
+ static int    atForkInit = 0;
+ static void   AtForkPrepare(void);
+ static void   AtForkParent(void);
+@@ -290,7 +290,7 @@
+        */
+ 
+       Tcl_MutexLock(&notifierMutex);
+-#ifdef HAVE_PTHREAD_ATFORK
++#if defined(HAVE_PTHREAD_ATFORK) && !defined(__APPLE__)
+       /*
+        * Install pthread_atfork handlers to reinitialize the notifier in the
+        * child of a fork.
+@@ -304,7 +304,7 @@
+           }
+           atForkInit = 1;
+       }
+-#endif
++#endif /* HAVE_PTHREAD_ATFORK */
+       /*
+        * Check if my process id changed, e.g. I was forked
+        * In this case, restart the notifier thread and close the
+@@ -1313,7 +1313,7 @@
+     TclpThreadExit(0);
+ }
+ 
+-#ifdef HAVE_PTHREAD_ATFORK
++#if defined(HAVE_PTHREAD_ATFORK) && !defined(__APPLE__)
+ /*
+  *----------------------------------------------------------------------
+  *
 diff -Nurd -x'*~' tcltk-8.6.1.orig/tk8.6.1/unix/Makefile.in 
tcltk-8.6.1/tk8.6.1/unix/Makefile.in
 --- tcltk-8.6.1.orig/tk8.6.1/unix/Makefile.in  2013-09-17 08:25:13.000000000 
-0400
-+++ tcltk-8.6.1/tk8.6.1/unix/Makefile.in       2013-09-27 14:55:41.000000000 
-0400
++++ tcltk-8.6.1/tk8.6.1/unix/Makefile.in       2013-10-07 10:43:29.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
@@ -129,7 +168,7 @@
        $(CC) -c $(CC_SWITCHES) -DTK_LIBRARY=\"${TK_LIBRARY}\" \
 diff -Nurd -x'*~' tcltk-8.6.1.orig/tk8.6.1/unix/configure 
tcltk-8.6.1/tk8.6.1/unix/configure
 --- tcltk-8.6.1.orig/tk8.6.1/unix/configure    2013-09-17 08:25:13.000000000 
-0400
-+++ tcltk-8.6.1/tk8.6.1/unix/configure 2013-09-27 14:59:48.000000000 -0400
++++ tcltk-8.6.1/tk8.6.1/unix/configure 2013-10-07 10:43:29.000000000 -0400
 @@ -10361,19 +10361,14 @@
        echo "$as_me:$LINENO: result: $enable_xft" >&5
  echo "${ECHO_T}$enable_xft" >&6
@@ -189,7 +228,7 @@
  ac_clean_files_save=$ac_clean_files
 diff -Nurd -x'*~' tcltk-8.6.1.orig/tk8.6.1/unix/tkConfig.sh.in 
tcltk-8.6.1/tk8.6.1/unix/tkConfig.sh.in
 --- tcltk-8.6.1.orig/tk8.6.1/unix/tkConfig.sh.in       2013-09-17 
08:25:13.000000000 -0400
-+++ tcltk-8.6.1/tk8.6.1/unix/tkConfig.sh.in    2013-09-27 14:55:41.000000000 
-0400
++++ tcltk-8.6.1/tk8.6.1/unix/tkConfig.sh.in    2013-10-07 10:43:29.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=60134791&iu=/4140/ostg.clktrk
_______________________________________________
Fink-commits mailing list
Fink-commits@lists.sourceforge.net
http://news.gmane.org/gmane.os.apple.fink.cvs

[cvs] dists/10.7/stable/main/finkinfo/languages tcltk-10.9.patch, 1.2, 1.3

Reply via email to