From 6aa0839a418d2e855271db35e3c8fadb1f7e313a Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Marcela=20Ma=C5=A1l=C3=A1=C5=88ov=C3=A1?=
 <mmaslano@fedoraproject.org>
Date: Wed, 19 Nov 2008 15:05:00 +0000
Subject: [PATCH] - update to 8.5.5

---
 .cvsignore         |  3 +-
 genericevent.patch | 84 ----------------------------------------------
 sources            |  3 +-
 tk.spec            |  7 ++--
 4 files changed, 6 insertions(+), 91 deletions(-)
 delete mode 100644 genericevent.patch

diff --git a/.cvsignore b/.cvsignore
index 9189cd6..f5c73be 100644
--- a/.cvsignore
+++ b/.cvsignore
@@ -1,2 +1 @@
-tk8.5.2-src.tar.gz
-tk8.5.3-src.tar.gz
+tk8.5.5-src.tar.gz
diff --git a/genericevent.patch b/genericevent.patch
deleted file mode 100644
index 69499ce..0000000
--- a/genericevent.patch
+++ /dev/null
@@ -1,84 +0,0 @@
-diff -up tk8.5.3/generic/tkEvent.c.crash1 tk8.5.3/generic/tkEvent.c
---- tk8.5.3/generic/tkEvent.c.crash1	2008-03-26 20:04:09.000000000 +0100
-+++ tk8.5.3/generic/tkEvent.c	2008-08-06 09:47:03.000000000 +0200
-@@ -75,7 +75,7 @@ typedef struct TkWindowEvent {
-  * Array of event masks corresponding to each X event:
-  */
- 
--static unsigned long eventMasks[TK_LASTEVENT] = {
-+static unsigned long realEventMasks[MappingNotify+1] = {
-     0,
-     0,
-     KeyPressMask,			/* KeyPress */
-@@ -113,7 +113,10 @@ static unsigned long eventMasks[TK_LASTE
-     0,					/* SelectionNotify */
-     ColormapChangeMask,			/* ColormapNotify */
-     0,					/* ClientMessage */
--    0,					/* Mapping Notify */
-+    0					/* Mapping Notify */
-+};
-+
-+static unsigned long virtualEventMasks[TK_LASTEVENT-VirtualEvent] = {
-     VirtualEventMask,			/* VirtualEvents */
-     ActivateMask,			/* ActivateNotify */
-     ActivateMask,			/* DeactivateNotify */
-@@ -489,7 +492,7 @@ GetTkWindowFromXEvent(
-  *
-  * GetEventMaskFromXEvent --
-  *
-- *	The event type is looked up in our eventMasks table, and may be
-+ *	The event type is looked up in our eventMasks tables, and may be
-  *	changed to a different mask depending on the state of the event and
-  *	window members.
-  *
-@@ -506,7 +509,23 @@ static unsigned long
- GetEventMaskFromXEvent(
-     XEvent *eventPtr)
- {
--    unsigned long mask = eventMasks[eventPtr->xany.type];
-+    unsigned long mask;
-+
-+    /*
-+     * Get the event mask from the correct table. Note that there are two
-+     * tables here because that means we no longer need this code to rely on
-+     * the exact value of VirtualEvent, which has caused us problems in the
-+     * past when X11 changed the value of LASTEvent. [Bug ???]
-+     */
-+
-+    if (eventPtr->xany.type <= MappingNotify) {
-+	    mask = realEventMasks[eventPtr->xany.type];
-+    } else if (eventPtr->xany.type >= VirtualEvent
-+	    && eventPtr->xany.type<TK_LASTEVENT) {
-+	    mask = virtualEventMasks[eventPtr->xany.type - VirtualEvent]; 
-+    } else {
-+        mask = 0;
-+    }
- 
-     /*
-      * Events selected by StructureNotify require special handling. They look
-diff -up tk8.5.3/generic/tk.h.crash1 tk8.5.3/generic/tk.h
---- tk8.5.3/generic/tk.h.crash1	2008-06-30 05:37:37.000000000 +0200
-+++ tk8.5.3/generic/tk.h	2008-08-06 09:47:40.000000000 +0200
-@@ -627,17 +627,15 @@ typedef struct Tk_GeomMgr {
-  *---------------------------------------------------------------------------
-  */
- 
--#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
diff --git a/sources b/sources
index e9a0bff..c12533a 100644
--- a/sources
+++ b/sources
@@ -1,2 +1 @@
-bd014bd3e1a818e06ad375b95241452d  tk8.5.2-src.tar.gz
-c7d2ef187d0f313850689cda20148ec3  tk8.5.3-src.tar.gz
+e7e17a2dd4197d9872129c0fbd06f02f  tk8.5.5-src.tar.gz
diff --git a/tk.spec b/tk.spec
index 076e90c..ddcbbdb 100644
--- a/tk.spec
+++ b/tk.spec
@@ -1,5 +1,5 @@
 %define majorver 8.5
-%define vers %{majorver}.3
+%define vers %{majorver}.5
 
 Summary: The graphical toolkit for the Tcl scripting language
 Name: tk
@@ -23,7 +23,6 @@ Obsoletes: tile <= 0.8.2
 Provides: tile = 0.8.2
 Patch1: tk8.5-make.patch
 Patch2: tk8.5-conf.patch
-Patch3: genericevent.patch
 
 %description
 When paired with the Tcl scripting language, Tk provides a fast and powerful
@@ -47,7 +46,6 @@ The package contains the development files and man pages for tk.
 
 %patch1 -p1 -b .make
 %patch2 -p1 -b .conf
-%patch3 -p1 -b .crash1
 
 %build
 cd unix
@@ -115,6 +113,9 @@ rm -rf %{buildroot}
 %{_mandir}/man3/*
 
 %changelog
+* Wed Nov 19 2008 Marcela Maslanova <mmaslano@redhat.com> - 1:8.5.5-1
+- update to 8.5.5
+
 * Wed Aug  6 2008 Marcela Maslanova <mmaslano@redhat.com> - 1:8.5.3-4
 - rewrite patch once more - the same way how upstream fix it