Fixed bug 177344 and 184913.

(Portage version: 2.1.2.11)

6 files changed, 163 insertions, 1 deletions

diff --git a/app-i18n/scim-qtimm/ChangeLog b/app-i18n/scim-qtimm/ChangeLog
index 5f66cdbd4438..ff996e909b0f 100644
--- a/app-i18n/scim-qtimm/ChangeLog
+++ b/app-i18n/scim-qtimm/ChangeLog
@@ -1,6 +1,15 @@
 # ChangeLog for app-i18n/scim-qtimm
 # Copyright 1999-2007 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-i18n/scim-qtimm/ChangeLog,v 1.46 2007/05/31 20:32:35 armin76 Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-i18n/scim-qtimm/ChangeLog,v 1.47 2007/08/03 00:09:51 matsuu Exp $
+
+*scim-qtimm-0.9.4-r1 (03 Aug 2007)
+
+  03 Aug 2007; MATSUU Takuto <matsuu@gentoo.org>
+  +files/scim-qtimm-0.9.4-disable-debug.patch,
+  +files/scim-qtimm-0.9.4-fix-crashes.patch,
+  +files/suse-bugzilla-116220-keyboard-layout.patch,
+  +scim-qtimm-0.9.4-r1.ebuild:
+  Fixed bug 177344 and 184913.
 
   31 May 2007; Raúl Porcel <armin76@gentoo.org> scim-qtimm-0.9.4.ebuild:
   Add ~alpha wrt #151413
diff --git a/app-i18n/scim-qtimm/files/digest-scim-qtimm-0.9.4-r1 b/app-i18n/scim-qtimm/files/digest-scim-qtimm-0.9.4-r1
new file mode 100644
index 000000000000..256e092656b7
--- /dev/null
+++ b/app-i18n/scim-qtimm/files/digest-scim-qtimm-0.9.4-r1
@@ -0,0 +1,6 @@
+MD5 122f8bcc6b7eb5805df46461ed48bf2c kde-admindir-3.5.3.tar.bz2 187248
+RMD160 81eedc1b81f2cee6709b7c8ad08859024da090f6 kde-admindir-3.5.3.tar.bz2 187248
+SHA256 0cd8bf32dad0affa56edf5723747275be2b1e0702abefc28ded8763ad58fe07b kde-admindir-3.5.3.tar.bz2 187248
+MD5 a58e8e7c18c27a20b3e9d953b1c75d94 scim-qtimm-0.9.4.tar.bz2 536983
+RMD160 68656066013975f4cca8816f016443ccd22cf7ee scim-qtimm-0.9.4.tar.bz2 536983
+SHA256 11bafccea5dcb7160d5bb407275eac4eb2b1a8edf2cbc87053df8502c69d8daa scim-qtimm-0.9.4.tar.bz2 536983
diff --git a/app-i18n/scim-qtimm/files/scim-qtimm-0.9.4-disable-debug.patch b/app-i18n/scim-qtimm/files/scim-qtimm-0.9.4-disable-debug.patch
new file mode 100644
index 000000000000..72f1da5f9602
--- /dev/null
+++ b/app-i18n/scim-qtimm/files/scim-qtimm-0.9.4-disable-debug.patch
@@ -0,0 +1,12 @@
+diff -ru scim-qtimm-0.9.1.20050704.orig/src/plugin.cpp scim-qtimm-0.9.1.20050704/src/plugin.cpp
+--- scim-qtimm-0.9.1.20050704.orig/src/plugin.cpp	2005-07-04 13:01:42.000000000 +0200
++++ scim-qtimm-0.9.1.20050704/src/plugin.cpp	2005-07-04 13:12:24.000000000 +0200
+@@ -6,6 +6,8 @@
+ 
+ #include <qinputcontextplugin.h>
+ 
++#define qDebug if (false) qDebug
++
+ class ScimInputContextPlugin : public QInputContextPlugin 
+ {
+ public:
diff --git a/app-i18n/scim-qtimm/files/scim-qtimm-0.9.4-fix-crashes.patch b/app-i18n/scim-qtimm/files/scim-qtimm-0.9.4-fix-crashes.patch
new file mode 100644
index 000000000000..1c6c0688a1c9
--- /dev/null
+++ b/app-i18n/scim-qtimm/files/scim-qtimm-0.9.4-fix-crashes.patch
@@ -0,0 +1,38 @@
+Patch is from https://bugzilla.novell.com/show_bug.cgi?id=206547
+
+--- scim-qtimm-0.9.4/src/qsciminputcontext.cpp	2006-12-20 09:56:19.000000000 +0800
++++ scim-qtimm-0.9.4.new/src/qsciminputcontext.cpp	2006-12-20 10:00:55.000000000 +0800
+@@ -659,6 +659,9 @@
+     if (global.shared_input_method)
+         m_is_on = global.config->read (String (SCIM_CONFIG_FRONTEND_IM_OPENED_BY_DEFAULT), m_is_on);
+ 
++    // Associate this context with the instance.
++    m_instance->set_frontend_data (static_cast<void*> (this));
++
+     global.panel_client->prepare (m_id);
+     global.panel_client->register_input_context (m_id, m_instance->get_factory_uuid ());
+     set_ic_capabilities ();
+@@ -902,6 +905,7 @@
+         if (!global.panel_exited) {
+             global.panel_client->prepare (m_id);
+  
++	    m_instance->set_frontend_data (static_cast<void*>(this));
+             if (global.focused_ic == this)
+                 m_instance->focus_out ();
+  
+@@ -912,6 +916,7 @@
+             QScimInputContext *old_focused = global.focused_ic;
+             global.focused_ic = this;
+             // XXX: Free the smart pointer, not reset the instance.
++	    m_instance->set_frontend_data (0);
+             m_instance.reset ();
+             global.focused_ic = old_focused;
+  
+@@ -923,6 +928,7 @@
+             global.panel_client->remove_input_context (m_id);
+             global.panel_client->send ();
+         } else {
++	    m_instance->set_frontend_data (0);
+             m_instance.reset ();
+         }
+     }
diff --git a/app-i18n/scim-qtimm/files/suse-bugzilla-116220-keyboard-layout.patch b/app-i18n/scim-qtimm/files/suse-bugzilla-116220-keyboard-layout.patch
new file mode 100644
index 000000000000..919f5556dd43
--- /dev/null
+++ b/app-i18n/scim-qtimm/files/suse-bugzilla-116220-keyboard-layout.patch
@@ -0,0 +1,11 @@
+--- scim-qtimm/src/qsciminputcontext.cpp.old       2005-09-10 02:01:59.000000000 +0800
++++ scim-qtimm/src/qsciminputcontext.cpp   2005-09-10 02:02:13.000000000 +0800
+@@ -714,6 +714,7 @@
+     scimkey = scim_x11_keyevent_x11_to_scim(global.display, xkey);
+
+     scimkey.mask  &= global.valid_key_mask;
++    scimkey.layout = global.keyboard_layout;
+
+     return filterScimEvent(scimkey);
+ }
+
diff --git a/app-i18n/scim-qtimm/scim-qtimm-0.9.4-r1.ebuild b/app-i18n/scim-qtimm/scim-qtimm-0.9.4-r1.ebuild
new file mode 100644
index 000000000000..3f45d16cc985
--- /dev/null
+++ b/app-i18n/scim-qtimm/scim-qtimm-0.9.4-r1.ebuild
@@ -0,0 +1,86 @@
+# Copyright 1999-2007 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/app-i18n/scim-qtimm/scim-qtimm-0.9.4-r1.ebuild,v 1.1 2007/08/03 00:09:51 matsuu Exp $
+
+WANT_AUTOMAKE="1.9"
+WANT_AUTOCONF="latest"
+
+inherit qt3 eutils autotools
+
+DESCRIPTION="Qt immodules input method framework plugin for SCIM"
+HOMEPAGE="http://scim.freedesktop.org/"
+SRC_URI="mirror://sourceforge/scim/${P}.tar.bz2
+	http://freedesktop.org/~scim/${PN}/${P}.tar.bz2
+	mirror://gentoo/kde-admindir-3.5.3.tar.bz2"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~hppa ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd"
+IUSE="debug"
+
+RDEPEND=">=app-i18n/scim-1.4.2
+	virtual/libintl
+	$(qt_min_version 3.3.4)"
+
+DEPEND="${RDEPEND}
+	sys-devel/gettext
+	dev-util/pkgconfig"
+
+pkg_setup() {
+	if ! 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}"
+
+	rm -rf "${S}/admin"
+	ln -sf "${WORKDIR}/admin" "${S}/admin"
+
+	epatch "${FILESDIR}/${P}-qtimm-check.patch"
+	epatch "${FILESDIR}/${P}-fix-crashes.patch"
+	epatch "${FILESDIR}/suse-bugzilla-116220-keyboard-layout.patch"
+
+	if ! use debug; then
+		epatch "${FILESDIR}/${P}-disable-debug.patch"
+	fi
+
+	# Fix for autoconf 2.60
+	sed -i -e '/case $AUTO\(CONF\|HEADER\)_VERSION in/,+1 s/2\.5/2.[56]/g' \
+		admin/cvs.sh
+
+	export WANT_AUTOCONF WANT_AUTOMAKE
+	emake -j1 -f admin/Makefile.common || die "reautotooling failed"
+}
+
+src_compile() {
+	local myconf
+
+	if use debug; then
+		myconf="--enable-debug=full --enable-scim-debug"
+	else
+		myconf="--disable-debug"
+	fi
+
+	econf \
+		--disable-static \
+		--disable-dependency-tracking \
+		${myconf} || die "econf failed"
+	emake || die "make failed."
+}
+
+src_install() {
+	emake DESTDIR="${D}" install || die "make install failed"
+
+	dodoc AUTHORS ChangeLog README NEWS TODO
+}
+
+pkg_postinst() {
+	elog
+	elog "After you emerged ${PN}, use right click to switch immodules for Qt."
+	elog "If you would like to use ${PN} as default instead of XIM, set"
+	elog "	% export QT_IM_MODULE=scim"
+	elog
+}