Fixed Qt4 focus issue, bug #242848.

Package-Manager: portage-2.2_rc12/cvs/Linux 2.6.27-gentoo x86_64

4 files changed, 161 insertions, 2 deletions

diff --git a/app-i18n/scim-bridge/ChangeLog b/app-i18n/scim-bridge/ChangeLog
index d451a85c541b..84e7c02cb12b 100644
--- a/app-i18n/scim-bridge/ChangeLog
+++ b/app-i18n/scim-bridge/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for app-i18n/scim-bridge
 # Copyright 1999-2008 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-i18n/scim-bridge/ChangeLog,v 1.22 2008/10/18 16:54:10 matsuu Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-i18n/scim-bridge/ChangeLog,v 1.23 2008/11/02 09:31:21 matsuu Exp $
+
+*scim-bridge-0.4.15-r3 (02 Nov 2008)
+
+  02 Nov 2008; MATSUU Takuto <matsuu@gentoo.org>
+  +files/scim-bridge-0.4.15-qt4-focus.patch, +scim-bridge-0.4.15-r3.ebuild:
+  Fixed Qt4 focus issue, bug #242848.
 
 *scim-bridge-0.4.15-r2 (18 Oct 2008)
 
diff --git a/app-i18n/scim-bridge/Manifest b/app-i18n/scim-bridge/Manifest
index 81946e8fdf23..489dd542fec5 100644
--- a/app-i18n/scim-bridge/Manifest
+++ b/app-i18n/scim-bridge/Manifest
@@ -1,8 +1,10 @@
 AUX scim-bridge-0.4.14-qt4.patch 1163 RMD160 82b4ee7269455843c46aa09d18b722c907addbe6 SHA1 d62b9e9f5f5c6b7490e0d49e8a50cc8812d36ffd SHA256 3bf397ff3a8330a920289335838cb240ae998575bc775f47eb703a8e8677fb05
+AUX scim-bridge-0.4.15-qt4-focus.patch 1974 RMD160 99dff169717446c0a38aa19eed932a0b9954bf05 SHA1 193529b5f75097a5d43c6fb675574fdfdf88a8f0 SHA256 124fc258c1f7cadabea5b9c5a7b8b3ab9b26d50910b16760d5746f58ab6b8a50
 DIST scim-bridge-0.4.15.tar.gz 753583 RMD160 96650d2768e8d51593b15aadc1a0786534a524f4 SHA1 7551bb9826b1b33692d110abd98dcb826ddab849 SHA256 802a65c412c44d7598397d2926ec6fe478fe6cc3c645047632a97ec54b2d8bcf
 DIST scim-bridge-0.4.9.tar.gz 509254 RMD160 ad135d1de043be68d1bb3eb358687da13f7e43f7 SHA1 fb76c95d6cb45954a894de1e265aa7ababf3091e SHA256 4851ee787525700960f6d6d3644d5cb99a609c231407daaf0eb7e54657e08cea
 EBUILD scim-bridge-0.4.15-r1.ebuild 2095 RMD160 94754c7761c955e7381d835f81d714816959b6c1 SHA1 6e0d37b7dd13c045c7c0a6b973a4ffa4fa7c6973 SHA256 3b1dec585036345bcebea55107b6218462a0cb8a8dd5edd9db5ecb4b9ae4dc4f
 EBUILD scim-bridge-0.4.15-r2.ebuild 2168 RMD160 ad6ae08f41f0bd2e932b7d5aabc11a5a597f0e1c SHA1 405bdf78af6548187a29de3c469bc37f90e6126e SHA256 2c395f02c10db153ed9ab2e752653dc2ad7cd899e80bf575425b72a2bc181077
+EBUILD scim-bridge-0.4.15-r3.ebuild 2226 RMD160 7a77f69df9f798ba83184da08d206cb214b3f2e4 SHA1 8560cad45015b5ef4fdac7983ec2685b043e585b SHA256 fc4ceba10aacbc92697b694dabe481c68f34629f4296897afb593ca1951a7988
 EBUILD scim-bridge-0.4.9.ebuild 1766 RMD160 465f7ced4fa46e7a51b909bcc5db2be3a9f2cdd5 SHA1 bba097d405cbfeb450a0f2a3d88ea93f4a55a04a SHA256 b1e271734904a906fe4c0170702efdf2ea0764fc4cb5cd33ce50006d3f078260
-MISC ChangeLog 3661 RMD160 9d19890059b9a3a1d962a4ac01e070212e2919f5 SHA1 036a8a6c5c8cac9cc350c7f3b494c4eb1e781b92 SHA256 6506a3212d54e62de2b041717b2a3d67f293ac1fe471aef4f44d6b97a0134cff
+MISC ChangeLog 3863 RMD160 49d5464ef3987147dad233b3723077a0d8678bb4 SHA1 eac545b37782c80f5e3cf7510d936b42567ed5a6 SHA256 ad4d52da7629a4d8feca7a811b363675358e9f37ca6ddcb1f404918b84f75a76
 MISC metadata.xml 157 RMD160 97adcce791d5b0e94b3844a1e27e00be60378454 SHA1 e11f0d9b1f8c57c4f50e453a89d2e61cf737329a SHA256 92a8379a3f1d8c9e52e17dbaf224721ad5bd6ba9fba4302e909aa2b099b33f89
diff --git a/app-i18n/scim-bridge/files/scim-bridge-0.4.15-qt4-focus.patch b/app-i18n/scim-bridge/files/scim-bridge-0.4.15-qt4-focus.patch
new file mode 100644
index 000000000000..75f91f28ab93
--- /dev/null
+++ b/app-i18n/scim-bridge/files/scim-bridge-0.4.15-qt4-focus.patch
@@ -0,0 +1,59 @@
+From 94a089901574835c4f96e322a129c24bc73b76e6 Mon Sep 17 00:00:00 2001
+From: Alexander Gavrilov <angavrilov@gmail.com>
+Date: Sun, 7 Sep 2008 00:41:08 +0400
+Subject: [PATCH] Trying to fix KDE BUG#167982
+
+The bug is caused by preedit string update events that were sent by
+scim-bridge during the focus change sequence. Problems:
+
+1) QInputContext::setFocusWidget() is called before focus_out()
+2) Preedit string hide event is sent even if it wasn't displayed.
+
+As a result, when the focus is switched in, the _target_ Kate widget
+receives a preedit event, and trashes its selection.
+
+This patch is an obvious stopgap measure that seems unlikely to cause
+regression, but requires attention of people with better understanding
+of the affected interfaces.
+
+Signed-off-by: Alexander Gavrilov <angavrilov@gmail.com>
+---
+ client-qt/qt4/scim-bridge-client-imcontext-qt.cpp |   13 +++++++++++++
+ 1 files changed, 13 insertions(+), 0 deletions(-)
+
+diff --git a/client-qt/qt4/scim-bridge-client-imcontext-qt.cpp b/client-qt/qt4/scim-bridge-client-imcontext-qt.cpp
+index f65ad02..fbdb327 100644
+--- a/client-qt/qt4/scim-bridge-client-imcontext-qt.cpp
++++ b/client-qt/qt4/scim-bridge-client-imcontext-qt.cpp
+@@ -219,6 +219,12 @@ void ScimBridgeClientIMContextImpl::widgetDestroyed (QWidget *widget)
+ void ScimBridgeClientIMContextImpl::setFocusWidget (QWidget *widget)
+ {
+     scim_bridge_pdebugln (4, "ScimBridgeClientIMContextImpl::setFocusWidget ()");
++
++    if (focused_imcontext != NULL) {
++        focused_imcontext->focus_out ();
++        focused_imcontext = NULL;
++    }
++
+     QInputContext::setFocusWidget (widget);
+     focus_in ();
+     update ();
+@@ -442,8 +448,15 @@ void ScimBridgeClientIMContextImpl::focus_out ()
+         }
+     }
+ 
++#ifdef QT4
++    if (preedit_shown) {
++        set_preedit_shown (false);
++        update_preedit ();
++    }
++#else
+     set_preedit_shown (false);
+     update_preedit ();
++#endif
+ 
+     focused_imcontext = NULL;
+ }
+-- 
+1.6.0.20.g6148bc
+
diff --git a/app-i18n/scim-bridge/scim-bridge-0.4.15-r3.ebuild b/app-i18n/scim-bridge/scim-bridge-0.4.15-r3.ebuild
new file mode 100644
index 000000000000..5e10ca95efc0
--- /dev/null
+++ b/app-i18n/scim-bridge/scim-bridge-0.4.15-r3.ebuild
@@ -0,0 +1,92 @@
+# Copyright 1999-2008 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/app-i18n/scim-bridge/scim-bridge-0.4.15-r3.ebuild,v 1.1 2008/11/02 09:31:21 matsuu Exp $
+
+EAPI="1"
+WANT_AUTOMAKE="latest"
+WANT_AUTOCONF="latest"
+
+inherit autotools eutils qt3
+
+DESCRIPTION="Yet another IM-client of SCIM"
+HOMEPAGE="http://www.scim-im.org/projects/scim_bridge"
+SRC_URI="mirror://sourceforge/scim/${P}.tar.gz"
+
+LICENSE="GPL-2 LGPL-2.1"
+SLOT="0"
+KEYWORDS="~amd64 ~hppa ~ppc64 ~sparc ~x86"
+IUSE="doc gtk qt3 qt4"
+
+RESTRICT="test"
+
+RDEPEND=">=app-i18n/scim-1.4.6
+	gtk? (
+		>=x11-libs/gtk+-2.2
+		>=x11-libs/pango-1.1
+	)
+	qt3? (
+		x11-libs/qt:3
+		>=x11-libs/pango-1.1
+	)
+	qt4? (
+		|| ( ( x11-libs/qt-gui:4 x11-libs/qt-core:4 )
+			=x11-libs/qt-4.3*:4 )
+		>=x11-libs/pango-1.1
+	)"
+DEPEND="${RDEPEND}
+	dev-util/pkgconfig
+	dev-util/intltool
+	doc? ( app-doc/doxygen )"
+
+get_gtk_confdir() {
+	if use amd64 || ( [ "${CONF_LIBDIR}" == "lib32" ] && use x86 ) ; then
+		echo "/etc/gtk-2.0/${CHOST}"
+	else
+		echo "/etc/gtk-2.0"
+	fi
+}
+
+pkg_setup() {
+	if use qt3 && ! built_with_use =x11-libs/qt-3* immqt-bc && ! built_with_use =x11-libs/qt-3* immqt; then
+		die "You need to rebuild >=x11-libs/qt-3.3.4 with immqt-bc(recommended) or immqt USE flag enabled."
+	fi
+}
+
+src_unpack() {
+	unpack ${A}
+	cd "${S}"
+	epatch "${FILESDIR}/${PN}-0.4.14-qt4.patch"
+	# bug #242848
+	epatch "${FILESDIR}/${P}-qt4-focus.patch"
+	# bug #241954
+	intltoolize --force
+	eautoreconf
+}
+
+src_compile() {
+	econf \
+		$(use_enable gtk gtk2-immodule) \
+		$(use_enable qt3 qt3-immodule) \
+		$(use_enable qt4 qt4-immodule) \
+		$(use_enable doc documents) || die
+	emake || die
+}
+
+src_install() {
+	emake DESTDIR="${D}" install || die "make install failed"
+
+	dodoc AUTHORS ChangeLog NEWS README
+}
+
+pkg_postinst() {
+	elog
+	elog "If you would like to use ${PN} as default instead of scim, set"
+	elog " $ export GTK_IM_MODULE=scim-bridge"
+	elog " $ export QT_IM_MODULE=scim-bridge"
+	elog
+	[ -x /usr/bin/gtk-query-immodules-2.0 ] && gtk-query-immodules-2.0 > "${ROOT}$(get_gtk_confdir)/gtk.immodules"
+}
+
+pkg_postrm() {
+	[ -x /usr/bin/gtk-query-immodules-2.0 ] && gtk-query-immodules-2.0 > "${ROOT}$(get_gtk_confdir)/gtk.immodules"
+}