rpms/tk/F-10 tk-seg_input.patch,NONE,1.1 tk.spec,1.58,1.59

[Marcela Mašláňová]

Author: mmaslano

Update of /cvs/pkgs/rpms/tk/F-10
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv12258

Modified Files:
	tk.spec 
Added Files:
	tk-seg_input.patch 
Log Message:
* Thu Mar 26 2009 Marcela Mašláňová <mmaslano at redhat.com> - 1:8.5.3-6
- 480742 patch fixes the input method. The reason for this behaviour
 is still unknown. Backported from rawhide from 8.6.b1


tk-seg_input.patch:

--- NEW FILE tk-seg_input.patch ---
diff -up tk8.5.3/generic/tkEvent.c.seg tk8.5.3/generic/tkEvent.c
--- tk8.5.3/generic/tkEvent.c.seg	2009-03-26 10:41:49.000000000 +0100
+++ tk8.5.3/generic/tkEvent.c	2009-03-26 10:47:12.000000000 +0100
@@ -247,16 +247,10 @@ InvokeFocusHandlers(
     }
 
     /*
-     * MouseWheel events are not focus specific on Mac OS X.
+     * Only key-related events are directed according to the focus.
      */
 
-#ifdef MAC_OSX_TK
-#define FOCUS_DIRECTED_EVENT_MASK (KeyPressMask|KeyReleaseMask)
-#else
-#define	FOCUS_DIRECTED_EVENT_MASK (KeyPressMask|KeyReleaseMask|MouseWheelMask)
-#endif
-
-    if (mask & FOCUS_DIRECTED_EVENT_MASK) {
+    if (mask & (KeyPressMask|KeyReleaseMask)) {
 	(*winPtrPtr)->dispPtr->lastEventTime = eventPtr->xkey.time;
 	*winPtrPtr = TkFocusKeyEvent(*winPtrPtr, eventPtr);
 	if (*winPtrPtr == NULL) {
@@ -795,7 +789,7 @@ InvokeGenericHandlers(
 	    int done;
 
 	    tsdPtr->handlersActive++;
-	    done = (*curPtr->proc)(curPtr->clientData, eventPtr);
+	    done = curPtr->proc(curPtr->clientData, eventPtr);
 	    tsdPtr->handlersActive--;
 	    if (done) {
 		return done;
@@ -1388,7 +1382,7 @@ Tk_HandleEvent(
 	for (handlerPtr = winPtr->handlerList; handlerPtr != NULL; ) {
 	    if ((handlerPtr->mask & mask) != 0) {
 		ip.nextHandler = handlerPtr->nextPtr;
-		(*(handlerPtr->proc))(handlerPtr->clientData, eventPtr);
+		handlerPtr->proc(handlerPtr->clientData, eventPtr);
 		handlerPtr = ip.nextHandler;
 	    } else {
 		handlerPtr = handlerPtr->nextPtr;
@@ -1792,7 +1786,7 @@ WindowEventProc(
 	return 0;
     }
     if (tsdPtr->restrictProc != NULL) {
-	result = (*tsdPtr->restrictProc)(tsdPtr->restrictArg, &wevPtr->event);
+	result = tsdPtr->restrictProc(tsdPtr->restrictArg, &wevPtr->event);
 	if (result != TK_PROCESS_EVENT) {
 	    if (result == TK_DEFER_EVENT) {
 		return 0;
@@ -2058,7 +2052,7 @@ TkFinalize(
 
 	firstExitPtr = exitPtr->nextPtr;
 	Tcl_MutexUnlock(&exitMutex);
-	(*exitPtr->proc)(exitPtr->clientData);
+	exitPtr->proc(exitPtr->clientData);
 	ckfree((char *) exitPtr);
 	Tcl_MutexLock(&exitMutex);
     }
@@ -2108,7 +2102,7 @@ TkFinalizeThread(
 	     */
 
 	    tsdPtr->firstExitPtr = exitPtr->nextPtr;
-	    (*exitPtr->proc)(exitPtr->clientData);
+	    exitPtr->proc(exitPtr->clientData);
 	    ckfree((char *) exitPtr);
 	}
     }


Index: tk.spec
===================================================================
RCS file: /cvs/pkgs/rpms/tk/F-10/tk.spec,v
retrieving revision 1.58
retrieving revision 1.59
diff -u -r1.58 -r1.59
--- tk.spec	5 Mar 2009 09:10:33 -0000	1.58
+++ tk.spec	26 Mar 2009 10:06:44 -0000	1.59
@@ -4,7 +4,7 @@
 Summary: The graphical toolkit for the Tcl scripting language
 Name: tk
 Version: %{vers}
-Release: 5%{?dist}
+Release: 6%{?dist}
 Epoch:   1
 License: TCL
 Group: Development/Languages
@@ -25,6 +25,7 @@
 Patch2: tk8.5-conf.patch
 Patch3: genericevent.patch
 Patch4: tk-8.5.6-segv_due_XCreateIC.patch
+Patch5: tk-seg_input.patch
 
 %description
 When paired with the Tcl scripting language, Tk provides a fast and powerful
@@ -35,7 +36,7 @@
 Group: Development/Languages
 Requires: %{name} = %{epoch}:%{version}-%{release}
 Requires: tcl-devel = %{epoch}:%{version}
-Requires: libX11-devel
+Requires: libX11-devel libXft-devel
 
 %description devel
 When paired with the Tcl scripting language, Tk provides a fast and powerful
@@ -50,6 +51,7 @@
 %patch2 -p1 -b .conf
 %patch3 -p1 -b .crash1
 %patch4 -p1 -b .crash2
+%patch5 -p1 -b .seg
 
 %build
 cd unix
@@ -117,6 +119,10 @@
 %{_mandir}/man3/*
 
 %changelog
+* Thu Mar 26 2009 Marcela Mašláňová <mmaslano at redhat.com> - 1:8.5.3-6
+- 480742 patch fixes the input method. The reason for this behaviour
+ is still unknown. Backported from rawhide from 8.6.b1
+
 * Thu Mar  5 2009 Marcela Mašláňová <mmaslano at redhat.com> - 1:8.5.3-5
 - 488453 fix XGetICValues. Visible only in Gnome.