Update of /cvsroot/fink/dists/10.4/unstable/main/finkinfo/languages
In directory sc8-pr-cvs17.sourceforge.net:/tmp/cvs-serv13724

Modified Files:
        tcltk.info tcltk.patch 
Log Message:
Patch for runtime failure of Tk when libtk8.4.dylib is built in presence of 
X11/X.h from xquartz-2.3.0

Index: tcltk.info
===================================================================
RCS file: /cvsroot/fink/dists/10.4/unstable/main/finkinfo/languages/tcltk.info,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -d -r1.11 -r1.12
--- tcltk.info  3 May 2008 04:25:05 -0000       1.11
+++ tcltk.info  28 Jul 2008 08:16:35 -0000      1.12
@@ -1,6 +1,6 @@
 Package: tcltk
 Version: 8.4.16
-Revision: 4
+Revision: 5
 BuildDepends: x11-dev, fink (>= 0.24.12-1)
 Depends: %N-shlibs (= %v-%r)
 Source: mirror:sourceforge:tcl/tcl%v-src.tar.gz
@@ -9,7 +9,7 @@
 Source2: mirror:sourceforge:tcl/tk%v-src.tar.gz
 Source2-MD5: 24d18fbebe3bb8853e418431be01bf2c
 PatchFile: %n.patch
-PatchFile-MD5: 2244e58412e0bbaa07ce748324ccf213
+PatchFile-MD5: 0104c8993d04304bf75443fed88baee5
 PatchScript: <<
        cd .. && patch -p0 < %{PatchFile}
 <<
@@ -109,6 +109,9 @@
 <<
 DescPackaging: <<
  Former Maintainer: None <[EMAIL PROTECTED]>
+
+ Patch added for crash caused by changed LASTEvent definition in
+ the xquartz-2.3.0 update. Does not affect binary compatibility.
 <<
 DescDetail: <<
 Tcl provides a portable scripting environment for Unix, Windows,

Index: tcltk.patch
===================================================================
RCS file: 
/cvsroot/fink/dists/10.4/unstable/main/finkinfo/languages/tcltk.patch,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -d -r1.3 -r1.4
--- tcltk.patch 17 Feb 2008 17:59:18 -0000      1.3
+++ tcltk.patch 28 Jul 2008 08:16:35 -0000      1.4
@@ -58,3 +58,32 @@
  
  
  tk_config_files="${tk_config_files} Makefile tkConfig.sh"
+
+/* remove use of LASTEvent from X.h which is currently on the move from 35 to 
36 */
+--- tk8.4.16.orig/generic/tk.h 2007-05-30 19:34:45.000000000 +0200
++++ tk8.4.16/generic/tk.h      2008-07-28 08:32:51.000000000 +0200
+@@ -635,17 +635,18 @@
+  *
+  *---------------------------------------------------------------------------
+  */
+-#define VirtualEvent      (LASTEvent)
+-#define ActivateNotify            (LASTEvent + 1)
+-#define DeactivateNotify    (LASTEvent + 2)
+-#define MouseWheelEvent     (LASTEvent + 3)
+-#define TK_LASTEVENT      (LASTEvent + 4)
++
++#define VirtualEvent        35 
++#define ActivateNotify            (VirtualEvent + 1)
++#define DeactivateNotify    (VirtualEvent + 2)
++#define MouseWheelEvent     (VirtualEvent + 3)
++#define TK_LASTEVENT      (VirtualEvent + 4)
+ 
+ #define MouseWheelMask            (1L << 28)
+ 
+ #define ActivateMask      (1L << 29)
+ #define VirtualEventMask    (1L << 30)
+-#define TK_LASTEVENT      (LASTEvent + 4)
++
+ 
+ 
+ /*


-------------------------------------------------------------------------
This SF.Net email is sponsored by the Moblin Your Move Developer's challenge
Build the coolest Linux based applications with Moblin SDK & win great prizes
Grand prize is a trip for two to an Open Source event anywhere in the world
http://moblin-contest.org/redirect.php?banner_id=100&url=/
_______________________________________________
Fink-commits mailing list
Fink-commits@lists.sourceforge.net
http://news.gmane.org/gmane.os.apple.fink.cvs

Reply via email to