[Pkg-tcltk-commits] r704 - in tk8.5/trunk/debian: . patches

[sgolovan-guest at alioth.debian.org]

Author: sgolovan-guest
Date: 2008-07-15 16:48:12 +0000 (Tue, 15 Jul 2008)
New Revision: 704

Added:
   tk8.5/trunk/debian/patches/tk-lastevent.diff
Modified:
   tk8.5/trunk/debian/changelog
   tk8.5/trunk/debian/patches/series
Log:
[tk8.5]
  * Added a patch by upstream to mitigate a design bug in Tk event system
    (Tk events break if built with x11proto-core 7.0.13).


Modified: tk8.5/trunk/debian/changelog
===================================================================
--- tk8.5/trunk/debian/changelog	2008-07-15 16:43:06 UTC (rev 703)
+++ tk8.5/trunk/debian/changelog	2008-07-15 16:48:12 UTC (rev 704)
@@ -1,8 +1,9 @@
-tk8.5 (8.5.3-2) UNRELEASED; urgency=low
+tk8.5 (8.5.3-2) unstable; urgency=low
 
-  * NOT RELEASED YET
+  * Added a patch by upstream to mitigate a design bug in Tk event system
+    (Tk events break if built with x11proto-core 7.0.13).
 
- -- Sergei Golovan <sgolovan at debian.org>  Thu,  3 Jul 2008 21:34:00 +0400
+ -- Sergei Golovan <sgolovan at debian.org>  Tue, 15 Jul 2008 20:47:11 +0400
 
 tk8.5 (8.5.3-1) unstable; urgency=low
 

Modified: tk8.5/trunk/debian/patches/series
===================================================================
--- tk8.5/trunk/debian/patches/series	2008-07-15 16:43:06 UTC (rev 703)
+++ tk8.5/trunk/debian/patches/series	2008-07-15 16:48:12 UTC (rev 704)
@@ -1,3 +1,4 @@
+tk-lastevent.diff
 tkport.diff
 tklibrary.diff
 tkprivate.diff

Added: tk8.5/trunk/debian/patches/tk-lastevent.diff
===================================================================
--- tk8.5/trunk/debian/patches/tk-lastevent.diff	                        (rev 0)
+++ tk8.5/trunk/debian/patches/tk-lastevent.diff	2008-07-15 16:48:12 UTC (rev 704)
@@ -0,0 +1,29 @@
+Date: Sat Jul 12 09:40:30 PDT 2008
+Files: generic/tk.h
+Bugid: 2010422
+
+--- tk8.4-8.4.19.orig/generic/tk.h
++++ tk8.4-8.4.19/generic/tk.h
+@@ -627,17 +627,15 @@
+  *---------------------------------------------------------------------------
+  */
+ 
+-#define VirtualEvent	    (LASTEvent)
+-#define ActivateNotify	    (LASTEvent + 1)
+-#define DeactivateNotify    (LASTEvent + 2)
+-#define MouseWheelEvent     (LASTEvent + 3)
+-#define TK_LASTEVENT	    (LASTEvent + 4)
++#define VirtualEvent	    (MappingNotify + 1)
++#define ActivateNotify	    (MappingNotify + 2)
++#define DeactivateNotify    (MappingNotify + 3)
++#define MouseWheelEvent     (MappingNotify + 4)
++#define TK_LASTEVENT	    (MappingNotify + 5)
+ 
+ #define MouseWheelMask	    (1L << 28)
+-
+ #define ActivateMask	    (1L << 29)
+ #define VirtualEventMask    (1L << 30)
+-#define TK_LASTEVENT	    (LASTEvent + 4)
+ 
+ /*
+  * A virtual event shares most of its fields with the XKeyEvent and