Added a patch to fix immodule issue. Thanks to liuspider <liuspider@yahoo.com> for the patch. This closes bug #83952.

Package-Manager: portage-2.0.51.19

5 files changed, 78 insertions, 35 deletions

diff --git a/x11-libs/qt/ChangeLog b/x11-libs/qt/ChangeLog
index 827851f666ad..1cc4706a4366 100644
--- a/x11-libs/qt/ChangeLog
+++ b/x11-libs/qt/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for x11-libs/qt
 # Copyright 2002-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/x11-libs/qt/ChangeLog,v 1.205 2005/03/15 20:18:15 gmsoft Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-libs/qt/ChangeLog,v 1.206 2005/04/03 08:09:13 usata Exp $
+
+  03 Apr 2005; Mamoru KOMACHI <usata@gentoo.org>
+  +files/qt-3.3.4-immodule-focus.patch, qt-3.3.4-r2.ebuild,
+  qt-3.3.4-r3.ebuild:
+  Added a patch to fix immodule issue. Thanks to liuspider
+  <liuspider@yahoo.com> for the patch. This closes bug #83952.
 
   15 Mar 2005; Guy Martin <gmsoft@gentoo.org> qt-3.3.4-r2.ebuild:
   Stable on hppa.
diff --git a/x11-libs/qt/Manifest b/x11-libs/qt/Manifest
index 93ac16fe8fdd..ce332f7c21b4 100644
--- a/x11-libs/qt/Manifest
+++ b/x11-libs/qt/Manifest
@@ -1,44 +1,55 @@
-MD5 97685b11e852dafe6f5bc018c3cc17c5 qt-3.3.4-r3.ebuild 8650
-MD5 7daec76f47482903184ed2b6d6d5640f qt-3.3.3-r1.ebuild 8039
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
+MD5 7575f873651c882ffe871697f7356923 ChangeLog 34614
+MD5 512150b47a904b0240101e319856aab1 metadata.xml 156
 MD5 f48889277f11c39d5f2160b262e7c314 qt-2.3.2-r1.ebuild 2289
+MD5 7daec76f47482903184ed2b6d6d5640f qt-3.3.3-r1.ebuild 8039
+MD5 d19bb3e74e4a955fd9d7a580440f1780 qt-3.3.4-r3.ebuild 8696
+MD5 2a5d402b9d5ceff465069a1651f3b329 qt-2.3.2-r2.ebuild 2765
 MD5 048c159df273b9caf9ab683e542c3c4f qt-4.0.0_beta1-r3.ebuild 5840
-MD5 33d589c9da8769ba0d221d8cb8668cfd qt-3.3.4-r2.ebuild 8342
+MD5 75d091f0ffbbb610e4f93f1e7e19fcfc qt-4.0.0_beta1-r4.ebuild 5880
 MD5 dc7eab137481c73dca4e2ea75795fa9f qt-4.0.0_beta1-r5.ebuild 5880
-MD5 641c4687985c18d3ba4d027d0a40b841 ChangeLog 34361
-MD5 512150b47a904b0240101e319856aab1 metadata.xml 156
+MD5 404ab84e0b37823cbcbbe0c72a5758f5 qt-3.3.4-r2.ebuild 8388
 MD5 3f30d4e96664ba2574dfb069b708f4a1 qt-3.3.3.ebuild 6897
-MD5 2a5d402b9d5ceff465069a1651f3b329 qt-2.3.2-r2.ebuild 2765
-MD5 75d091f0ffbbb610e4f93f1e7e19fcfc qt-4.0.0_beta1-r4.ebuild 5880
-MD5 74acd4c098f2c4bd70bdea585f0cb096 files/qt-no-rpath.patch 352
-MD5 ad4921b9f10a62c1e211d064f5c7fd9a files/44qt4 121
-MD5 c7f65a0625242eccf159e2b8ee74976d files/45qt3 109
-MD5 7a287bc7609ad2420f70af6d4c58302f files/50qt2 63
-MD5 37722e33e1a10fcc58463d13979e0f05 files/qt4-qtprf.patch 470
+MD5 c115b4205c2a2eab0a547375e2f62460 files/digest-qt-3.3.4-r3 166
 MD5 494ea57bec4dcfe3a4ca65e413d81791 files/digest-qt-3.3.3 165
-MD5 b9689fa9461944ba25ebf0acde5fb70b files/qt-3.3.4-flickerfree_qiconview_buffered.patch 3347
-MD5 bbc93b26dddb70c7709d8d579b489a4c files/digest-qt-4.0.0_beta1-r3 99
-MD5 9ac242bd35ccb451ab12b4fe9878d8b0 files/digest-qt-4.0.0_beta1-r4 99
-MD5 9207a8f92e32bd42c37464f13abc7b3c files/digest-qt-4.0.0_beta1-r5 99
+MD5 8c01ee8bb9af451f93082717ed8f4c49 files/qfontdatabase_x11.diff 1147
 MD5 4122542a37b787efb9476b0fb1fdafc0 files/qt-3.3.4-0047-fix-kmenu-widget.diff 992
-MD5 77ee6484af384828441336443499ec0e files/digest-qt-3.3.3-r1 238
-MD5 c115b4205c2a2eab0a547375e2f62460 files/digest-qt-3.3.4-r2 166
-MD5 c115b4205c2a2eab0a547375e2f62460 files/digest-qt-3.3.4-r3 166
-MD5 0221c85bc6f785b68812fc7f42110742 files/qt-3.3.3-flickerfree_qscrollview_fixwindowactivate.patch 1540
+MD5 8f75ba0e151481962fcb239dc216cf39 files/qt-3.3.4-0051-qtoolbar_77047.patch 1278
+MD5 0c2c86fd45ff3cd7036dcd7cf941d3b0 files/qt4b1_20050302.patch 305
 MD5 9e806a56da0d48f62aab37291e910d0e files/qt4b1_nomkdir.patch 2485
-MD5 2df2442dc59faeb8b545a81d2523cf28 files/qt-3.3.3-immodule-r123-event-inversion-20040909.diff 327
-MD5 8c01ee8bb9af451f93082717ed8f4c49 files/qfontdatabase_x11.diff 1147
-MD5 7dc4f78d52452c28ba797ffc7db34f23 files/50qtdir3 16
-MD5 b9689fa9461944ba25ebf0acde5fb70b files/qt-3.3.3-flickerfree_qiconview_buffered.patch 3347
-MD5 2f121ac14a939da7f1958ffc866f8560 files/qt4-rpath.patch 353
+MD5 da2eb517a4c29a58002e92864ff966e5 files/qt-no-rpath-uic.patch 294
+MD5 c7f65a0625242eccf159e2b8ee74976d files/45qt3 109
 MD5 08cdd879d3418837cf4bad594dc0f91f files/45qtdir2 16
-MD5 0221c85bc6f785b68812fc7f42110742 files/qt-3.3.4-flickerfree_qscrollview_fixwindowactivate.patch 1540
-MD5 0c2c86fd45ff3cd7036dcd7cf941d3b0 files/qt4b1_20050302.patch 305
-MD5 3c0e22a55628691f1789f7bf18426ba0 files/qt4b1_20041228.patch 297
-MD5 3e5e045d0c1448839a8dc1c82aeef21b files/qt-3.3.3-qclipboard-hack.patch 1662
+MD5 7a287bc7609ad2420f70af6d4c58302f files/50qt2 63
+MD5 7dc4f78d52452c28ba797ffc7db34f23 files/50qtdir3 16
+MD5 ad4921b9f10a62c1e211d064f5c7fd9a files/44qt4 121
 MD5 037b7ee164790946df6a2d6ea89f01fc files/digest-qt-2.3.2-r1 65
+MD5 527200fe7fd34be19a63e56a09ad7f47 files/qt-3.3.4-immodule-focus.patch 877
+MD5 77ee6484af384828441336443499ec0e files/digest-qt-3.3.3-r1 238
 MD5 037b7ee164790946df6a2d6ea89f01fc files/digest-qt-2.3.2-r2 65
-MD5 3e5e045d0c1448839a8dc1c82aeef21b files/qt-3.3.4-qclipboard-hack.patch 1662
-MD5 da2eb517a4c29a58002e92864ff966e5 files/qt-no-rpath-uic.patch 294
-MD5 8f75ba0e151481962fcb239dc216cf39 files/qt-3.3.4-0051-qtoolbar_77047.patch 1278
+MD5 2df2442dc59faeb8b545a81d2523cf28 files/qt-3.3.3-immodule-r123-event-inversion-20040909.diff 327
+MD5 bbc93b26dddb70c7709d8d579b489a4c files/digest-qt-4.0.0_beta1-r3 99
+MD5 74acd4c098f2c4bd70bdea585f0cb096 files/qt-no-rpath.patch 352
 MD5 471c09f2792eec732d715a983b7f7244 files/qt-3.3.3-immodule-20040819-event-inversion-20040908.diff 4150
+MD5 9ac242bd35ccb451ab12b4fe9878d8b0 files/digest-qt-4.0.0_beta1-r4 99
+MD5 37722e33e1a10fcc58463d13979e0f05 files/qt4-qtprf.patch 470
+MD5 2f121ac14a939da7f1958ffc866f8560 files/qt4-rpath.patch 353
+MD5 3c0e22a55628691f1789f7bf18426ba0 files/qt4b1_20041228.patch 297
+MD5 9207a8f92e32bd42c37464f13abc7b3c files/digest-qt-4.0.0_beta1-r5 99
 MD5 e0a483959b1d3dad0fc58adc242624c1 files/qt-3.3.3-amd64-fullscreen.patch 1220
+MD5 b9689fa9461944ba25ebf0acde5fb70b files/qt-3.3.3-flickerfree_qiconview_buffered.patch 3347
+MD5 0221c85bc6f785b68812fc7f42110742 files/qt-3.3.3-flickerfree_qscrollview_fixwindowactivate.patch 1540
+MD5 3e5e045d0c1448839a8dc1c82aeef21b files/qt-3.3.3-qclipboard-hack.patch 1662
+MD5 c115b4205c2a2eab0a547375e2f62460 files/digest-qt-3.3.4-r2 166
+MD5 b9689fa9461944ba25ebf0acde5fb70b files/qt-3.3.4-flickerfree_qiconview_buffered.patch 3347
+MD5 0221c85bc6f785b68812fc7f42110742 files/qt-3.3.4-flickerfree_qscrollview_fixwindowactivate.patch 1540
+MD5 3e5e045d0c1448839a8dc1c82aeef21b files/qt-3.3.4-qclipboard-hack.patch 1662
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v1.4.1 (GNU/Linux)
+
+iD8DBQFCT6JaVWNWqTUmv+0RAiIzAJ9UfPBbQ2P69uZ+zB/GgVF91iC4FACgjCH4
+4FH56szQTbeIKFrgHzjrcyo=
+=Me00
+-----END PGP SIGNATURE-----
diff --git a/x11-libs/qt/files/qt-3.3.4-immodule-focus.patch b/x11-libs/qt/files/qt-3.3.4-immodule-focus.patch
new file mode 100644
index 000000000000..f20c1b135810
--- /dev/null
+++ b/x11-libs/qt/files/qt-3.3.4-immodule-focus.patch
@@ -0,0 +1,24 @@
+--- qt-x11-free-3.3.4/src/kernel/qwidget.cpp	2005-04-03 14:19:26.000000000 +0900
++++ qt-x11-free-3.3.4/src/kernel/qwidget.cpp-immqt	2005-04-03 14:27:00.000000000 +0900
+@@ -3293,7 +3293,10 @@
+ 	    // input context should be survived until focused again. So we
+ 	    // delegate the responsibility to input context via
+ 	    // unfocusInputContext().
+-	    if ( prev != this ) {
++	    if ( prev != this && prev->isInputMethodEnabled() &&
++    			(isInputMethodEnabled() || !testWFlags(WType_Popup))) {
++	    // If this is a popup and inputmethod is not enabled, then we
++	    // should not unfocus the current editing widget.
+ #if 0
+ 		prev->resetInputContext();
+ #else
+@@ -3307,7 +3310,8 @@
+ 	}
+ #endif
+ 	qApp->focus_widget = this;
+-	focusInputContext();
++	if ( isInputMethodEnabled() )
++	    focusInputContext();
+ 
+ #if defined(Q_WS_WIN)
+ 	if ( !topLevelWidget()->isPopup() )
diff --git a/x11-libs/qt/qt-3.3.4-r2.ebuild b/x11-libs/qt/qt-3.3.4-r2.ebuild
index 4942aaf4e69d..be7efe18deaa 100644
--- a/x11-libs/qt/qt-3.3.4-r2.ebuild
+++ b/x11-libs/qt/qt-3.3.4-r2.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/x11-libs/qt/qt-3.3.4-r2.ebuild,v 1.14 2005/03/15 20:18:15 gmsoft Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-libs/qt/qt-3.3.4-r2.ebuild,v 1.15 2005/04/03 08:09:13 usata Exp $
 
 inherit eutils flag-o-matic
 
@@ -76,6 +76,7 @@ src_unpack() {
 
 	if use immqt || use immqt-bc ; then
 		epatch ../${IMMQT_P}.diff
+		epatch ${FILESDIR}/${P}-immodule-focus.patch
 		sh make-symlinks.sh || die "make symlinks failed"
 	fi
 
diff --git a/x11-libs/qt/qt-3.3.4-r3.ebuild b/x11-libs/qt/qt-3.3.4-r3.ebuild
index 518b237ead0c..50c5f5ddc5af 100644
--- a/x11-libs/qt/qt-3.3.4-r3.ebuild
+++ b/x11-libs/qt/qt-3.3.4-r3.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/x11-libs/qt/qt-3.3.4-r3.ebuild,v 1.3 2005/03/15 00:09:42 greg_g Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-libs/qt/qt-3.3.4-r3.ebuild,v 1.4 2005/04/03 08:09:13 usata Exp $
 
 inherit eutils flag-o-matic
 
@@ -84,6 +84,7 @@ src_unpack() {
 
 	if use immqt || use immqt-bc ; then
 		epatch ../${IMMQT_P}.diff
+		epatch ${FILESDIR}/${P}-immodule-focus.patch
 		sh make-symlinks.sh || die "make symlinks failed"
 	fi