rpms/qt/FC-4 qt-x11-free-3.3.3-Punjabi.patch, NONE, 1.1 qt-x11-free-3.3.4-imm-key.patch, NONE, 1.1 qt.spec, 1.72, 1.73

[fedora-cvs-commits at redhat.com]

Author: than

Update of /cvs/dist/rpms/qt/FC-4
In directory cvs.devel.redhat.com:/tmp/cvs-serv20903

Modified Files:
	qt.spec 
Added Files:
	qt-x11-free-3.3.3-Punjabi.patch 
	qt-x11-free-3.3.4-imm-key.patch 
Log Message:
- apply patch to fix Rendering for Punjabii, thanks to Trolltech #156504
- add better fix for #156977, thanks to trolltech
- apply patch to fix keyReleaseEvent problem #156572


qt-x11-free-3.3.3-Punjabi.patch:
 qscriptengine_x11.cpp |    2 +-
 1 files changed, 1 insertion(+), 1 deletion(-)

--- NEW FILE qt-x11-free-3.3.3-Punjabi.patch ---
--- qt-x11-free-3.3.3/src/kernel/qscriptengine_x11.cpp.orig	2005-01-21 18:16:13.000000000 +0100
+++ qt-x11-free-3.3.3/src/kernel/qscriptengine_x11.cpp	2005-06-27 10:13:53.000000000 +0200
@@ -656,7 +656,7 @@
 
     Below, None, None, None,
     None, Below, None, None,
-    None, None, None, None,
+    None, Below, None, None,
     Below, None, Post, Pre,
 
     Post, Below, Below, None,

qt-x11-free-3.3.4-imm-key.patch:
 qapplication_x11.cpp |    4 ----
 qwidget_x11.cpp      |    5 +----
 2 files changed, 1 insertion(+), 8 deletions(-)

--- NEW FILE qt-x11-free-3.3.4-imm-key.patch ---
--- qt-x11-free-3.3.4/src/kernel/qwidget_x11.cpp.tn	2005-06-14 15:11:49.000000000 +0200
+++ qt-x11-free-3.3.4/src/kernel/qwidget_x11.cpp	2005-06-14 15:13:39.000000000 +0200
@@ -2693,11 +2693,10 @@
 {
     QInputContext *qic = 0;
 
-#if !defined(QT_NO_IM_EXTENSIONS)
     if ( isInputMethodEnabled() ) {
+#if !defined(QT_NO_IM_EXTENSIONS)
 	qic = icHolderWidget()->ic;
 #else
-    {
 	// icHolderWidget is always topLevelWidget
 	QTLWExtra *topdata = icHolderWidget()->topData();
 	qic = (QInputContext *)topdata->xic;
@@ -2748,10 +2747,8 @@
 */
 void QWidget::createInputContext()
 {
-#if !defined(QT_NO_IM_EXTENSIONS)
     if( !isInputMethodEnabled() )
 	return;
-#endif
 
     QWidget *icWidget = icHolderWidget();
 #ifndef QT_NO_IM
--- qt-x11-free-3.3.4/src/kernel/qapplication_x11.cpp.tn	2005-06-14 15:09:37.000000000 +0200
+++ qt-x11-free-3.3.4/src/kernel/qapplication_x11.cpp	2005-06-14 15:11:31.000000000 +0200
@@ -3289,11 +3289,7 @@
     // filtering opportunity first to ensure all input methods work
     // properly regardless of application design.
 
-#ifndef QT_NO_IM_EXTENSIONS
     if( keywidget && keywidget->isEnabled() && keywidget->isInputMethodEnabled() ) {
-#else
-    if( keywidget && keywidget->isEnabled() ) {
-#endif
 	if( ( event->type==XKeyPress || event->type==XKeyRelease ) &&
 	    sm_blockUserInput ) // block user interaction during session management
 	    return TRUE;


Index: qt.spec
===================================================================
RCS file: /cvs/dist/rpms/qt/FC-4/qt.spec,v
retrieving revision 1.72
retrieving revision 1.73
diff -u -r1.72 -r1.73
--- qt.spec	24 May 2005 14:26:02 -0000	1.72
+++ qt.spec	29 Jun 2005 09:00:25 -0000	1.73
@@ -82,7 +82,7 @@
 Summary: The shared library for the Qt GUI toolkit.
 Name: qt
 Version: %{ver}
-Release: 15
+Release: 15.1
 Epoch: 1
 License: GPL/QPL
 Group: System Environment/Libraries
@@ -105,6 +105,7 @@
 Patch18: qt-x11-free-3.3.4-gcc4-buildkey.patch
 Patch19: qt-3.3.3-gtkstyle.patch 
 Patch20: qt-x11-free-3.3.4-qtlocale.patch
+Patch21: qt-x11-free-3.3.3-Punjabi.patch
 
 # immodule patches
 Patch50: qt-x11-immodule-unified-qt3.3.4-20041203.diff.bz2
@@ -112,6 +113,7 @@
 Patch52: qt-x11-free-3.3.3-immodule-quiet.patch
 Patch53: qt-x11-free-3.3.3-immodule-qinputcontext.patch
 Patch54: qt-x11-free-3.3.4-immodule-xim.patch
+Patch55: qt-x11-free-3.3.4-imm-key.patch
 
 # qt-copy patches
 Patch100: 0048-qclipboard_hack_80072.patch
@@ -308,6 +310,7 @@
 %patch18 -p1 -b .key
 %patch19 -p1 -b .gtk
 %patch20 -p1 -b .gcc4
+%patch21 -p1 -b .punjabi
 
 %if %{immodule}
 %patch50 -p1
@@ -315,6 +318,7 @@
 %patch52 -p1 -b .quiet
 %patch53 -p1 -b .im
 %patch54 -p1 -b .xim
+%patch55 -p1 -b .key
 %endif
 
 %patch100 -p0 -b .klipper
@@ -690,6 +694,11 @@
 
 
 %changelog
+* Wed Jun 29 2005 Than Ngo <than at redhat.com> 1:3.3.4-15.1
+- apply patch to fix Rendering for Punjabii, thanks to Trolltech #156504
+- add better fix for #156977, thanks to trolltech
+- apply patch to fix keyReleaseEvent problem #156572
+
 * Tue May 24 2005 Than Ngo <than at redhat.com> 1:3.3.4-15
 - add better fix for #156977, thanks to trolltech