Applied preedit patch to fix GTK+ immodules handling. Thanks to Atsushi Kobayashi <loudear@iswebnet.com> for the ebuild, closing bug #54244

5 files changed, 159 insertions, 8 deletions

diff --git a/gnome-extra/libgtkhtml/ChangeLog b/gnome-extra/libgtkhtml/ChangeLog
index dcd040692761..89584b44b85d 100644
--- a/gnome-extra/libgtkhtml/ChangeLog
+++ b/gnome-extra/libgtkhtml/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for gnome-extra/libgtkhtml
 # Copyright 2002-2004 Gentoo Technologies, Inc.; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/gnome-extra/libgtkhtml/ChangeLog,v 1.78 2004/06/03 23:06:24 geoman Exp $
+# $Header: /var/cvsroot/gentoo-x86/gnome-extra/libgtkhtml/ChangeLog,v 1.79 2004/06/19 16:10:12 usata Exp $
+
+*libgtkhtml-3.0.10-r1 (20 Jun 2004)
+
+  20 Jun 2004; Mamoru KOMACHI <usata@gentoo.org> libgtkhtml-3.0.10-r1.ebuild,
+  files/libgtkhtml-fix_preedit.patch:
+  Applied preedit patch to fix GTK+ immodules. Thanks to Atsushi Kobayashi
+  <loudear@iswebnet.com> for the ebuild, closing bug #54244
 
   03 Jun 2004; Stephen P. Becker <geoman@gentoo.org> libgtkhtml-2.6.0.ebuild:
   Stable on mips.
diff --git a/gnome-extra/libgtkhtml/Manifest b/gnome-extra/libgtkhtml/Manifest
index 54849ca46921..c55391d20905 100644
--- a/gnome-extra/libgtkhtml/Manifest
+++ b/gnome-extra/libgtkhtml/Manifest
@@ -1,18 +1,21 @@
 MD5 90858fae805772e6dbf53e93755791e8 libgtkhtml-3.0.9.ebuild 1611
-MD5 ca55899fd536f9815e07888e79e414c2 libgtkhtml-2.6.0.ebuild 941
 MD5 fd7241aa4ac92e8e9fe1e72f86e097be libgtkhtml-2.4.1.ebuild 857
+MD5 e1d4744ca6df33724500fc18adb1636c libgtkhtml-3.0.10-r1.ebuild 1505
 MD5 d79fa64f1878c6a6db673699519c688b libgtkhtml-2.4.0.ebuild 856
-MD5 35ffd6769fa0b5070a3da5d5ddcc9078 libgtkhtml-2.6.1.ebuild 944
-MD5 60143fceaf6ff78cd6ef26440c40ff5a ChangeLog 10365
+MD5 015bda5bbb46647759e7384757078a51 libgtkhtml-2.6.1.ebuild 939
+MD5 ad73fa232b4562d85c8e56896592f087 libgtkhtml-2.6.0.ebuild 935
+MD5 dfd92a18a6c8baaf2120560b17c85dcf ChangeLog 10652
 MD5 03ad2e6c4ab41244af1015a8bbb0b39f metadata.xml 158
 MD5 077008fa71cc53d116ec76b3b9321d7c libgtkhtml-3.0.10.ebuild 1365
 MD5 c802878860f7a2692df330e54e635c0c files/libgtkhtml-3.0.7-libtool.patch 656
 MD5 91961ab08a6720382576581f1c879963 files/libgtkhtml-3.0.8-alpha.patch 700
-MD5 2e7135d7b2ce243b2df4b22e6f8531ce files/digest-libgtkhtml-3.0.10 68
 MD5 8b985f9a98b7a90232d5ea193b8078d1 files/libgtkhtml-2.2.0-alpha.patch 652
-MD5 e34bf128bd5fd129fbc7ed28558c2d5b files/libgtkhtml-3.0.9-gtk-2.4.patch 3582
+MD5 eb876ffb327ae10a0bdbc7efda2ca329 files/digest-libgtkhtml-2.6.1 69
+MD5 1f2800f5de2c490d27d8befe0bf150e3 files/digest-libgtkhtml-2.6.0 69
 MD5 c4945ff6d58733accdf9ff738ddc34b1 files/digest-libgtkhtml-2.4.0 69
 MD5 a5a0241e2812997e4266c6ba1df009ee files/digest-libgtkhtml-2.4.1 69
-MD5 1f2800f5de2c490d27d8befe0bf150e3 files/digest-libgtkhtml-2.6.0 69
-MD5 eb876ffb327ae10a0bdbc7efda2ca329 files/digest-libgtkhtml-2.6.1 69
 MD5 9834c23269f27d4366fc45b9e0ecbec4 files/digest-libgtkhtml-3.0.9 67
+MD5 c3a4d4c5994a804fef9d7c8009d5bb67 files/libgtkhtml-fix_preedit.patch 2439
+MD5 2e7135d7b2ce243b2df4b22e6f8531ce files/digest-libgtkhtml-3.0.10 68
+MD5 e34bf128bd5fd129fbc7ed28558c2d5b files/libgtkhtml-3.0.9-gtk-2.4.patch 3582
+MD5 2e7135d7b2ce243b2df4b22e6f8531ce files/digest-libgtkhtml-3.0.10-r1 68
diff --git a/gnome-extra/libgtkhtml/files/digest-libgtkhtml-3.0.10-r1 b/gnome-extra/libgtkhtml/files/digest-libgtkhtml-3.0.10-r1
new file mode 100644
index 000000000000..1533aceb51d9
--- /dev/null
+++ b/gnome-extra/libgtkhtml/files/digest-libgtkhtml-3.0.10-r1
@@ -0,0 +1 @@
+MD5 b05b8551f7803f32ecfcf505a6310f3f gtkhtml-3.0.10.tar.bz2 1074973
diff --git a/gnome-extra/libgtkhtml/files/libgtkhtml-fix_preedit.patch b/gnome-extra/libgtkhtml/files/libgtkhtml-fix_preedit.patch
new file mode 100644
index 000000000000..96c2af2db9e2
--- /dev/null
+++ b/gnome-extra/libgtkhtml/files/libgtkhtml-fix_preedit.patch
@@ -0,0 +1,82 @@
+--- gtkhtml.c	Sat Jun 28 16:40:03 2003
++++ gtkhtml_new.c	Sat Jun 28 15:54:30 2003
+@@ -789,10 +790,17 @@
+ void
+ gtk_html_im_reset (GtkHTML *html)
+ {
++	/* I don't know why this is called for every keypress, but it f***s up the preedit totally.
++	   gtk_im_context_reset() should only be called if we really want to do a reset,
++	   e.g. a selection is made with somewhere else in the text. 
++	   Adding a character to the text shouldn't trigger this. => FIXME
++	*/
++	/* 
+ 	if (html->priv->need_im_reset) {
+ 		html->priv->need_im_reset = FALSE;
+-		gtk_im_context_reset (html->priv->im_context);
++		gtk_im_context_reset (html->priv->im_context); 
+ 	}
++	*/
+ }
+ 
+ static gint
+@@ -2662,16 +2670,57 @@
+ 	}
+ }
+ 
++static gint last_length; /* FIXME: put these somewhere else */
++static gint last_pos;
++static void 
++gtk_html_delete_preedit(GtkHTML *html)
++{
++	/* delete previous preedit string */
++	if ((last_pos - last_length >= 0) && (last_length > 0)) {
++		html_cursor_jump_to_position_no_spell (html->engine->cursor, html->engine, last_pos - last_length);
++		html_engine_set_mark (html->engine);
++		html_cursor_jump_to_position_no_spell (html->engine->cursor, html->engine, last_pos);
++		html_engine_delete (html->engine);
++	}
++}
++
+ static void
+ gtk_html_im_commit_cb (GtkIMContext *context, const gchar *str, GtkHTML *html)
+ {
++	gint orig_position = html->engine->cursor->position;
++	gtk_html_delete_preedit(html);
++
+ 	html_engine_paste_text (html->engine, str, -1);
++	last_length = 0;
++	last_pos = html->engine->cursor->position;
+ }
+ 
+ static void
+ gtk_html_im_preedit_changed_cb (GtkIMContext *context, GtkHTML *html)
+ {
+-	g_warning ("preedit changed callback: implement me");
++	gint position;
++	gchar *str;
++	PangoAttrList *attribs;
++	gint preedit_cursor_position;
++
++	gtk_im_context_get_preedit_string (context, &str, &attribs, &preedit_cursor_position);
++
++	gtk_html_delete_preedit(html);
++
++	last_length = g_utf8_strlen(str, -1); /* store new string length */
++
++	position = html->engine->cursor->position + preedit_cursor_position;
++	
++	/* FIXME: Apply the pango attributes to the string */
++	html_engine_insert_text (html->engine, str, -1);
++	last_pos = html->engine->cursor->position;
++
++	/* Move the cursor inside the preedit string as requested */
++	if (position >= 0) html_cursor_jump_to_position_no_spell (html->engine->cursor, html->engine, position);
++	
++	pango_attr_list_unref (attribs);
++	g_free (str);
++
+ }
+ 
+ static gchar *
+
+
diff --git a/gnome-extra/libgtkhtml/libgtkhtml-3.0.10-r1.ebuild b/gnome-extra/libgtkhtml/libgtkhtml-3.0.10-r1.ebuild
new file mode 100644
index 000000000000..503a7e4366c9
--- /dev/null
+++ b/gnome-extra/libgtkhtml/libgtkhtml-3.0.10-r1.ebuild
@@ -0,0 +1,58 @@
+# Copyright 1999-2004 Gentoo Technologies, Inc.
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/gnome-extra/libgtkhtml/libgtkhtml-3.0.10-r1.ebuild,v 1.1 2004/06/19 16:10:12 usata Exp $
+
+inherit gnome2 eutils
+
+MY_P=${P/lib/}
+MY_PN=${PN/lib/}
+DESCRIPTION="Lightweight HTML Rendering/Printing/Editing Engine"
+HOMEPAGE="http://www.gnome.org/"
+
+# stolen from gnome.org eclass because it support this one-off name-mangling
+
+[ -z "${GNOME_TARBALL_SUFFIX}" ] && export GNOME_TARBALL_SUFFIX="bz2"
+PVP=($(echo " $PV " | sed 's:[-\._]: :g'))
+SRC_URI="mirror://gnome/sources/${MY_PN}/${PVP[0]}.${PVP[1]}/${MY_P}.tar.${GNOME_TARBALL_SUFFIX}"
+LICENSE="GPL-2"
+SLOT="3"
+KEYWORDS="~x86 ~ppc sparc ~hppa ~alpha ~ia64 ~amd64"
+IUSE=""
+
+S=${WORKDIR}/${MY_P}
+
+RDEPEND=">=gnome-extra/gal-1.99.11
+	>=net-libs/libsoup-1.99.28
+	>=gnome-base/libgnomeui-2.2
+	>=gnome-base/libgnomeprint-2.2
+	>=gnome-base/libgnomeprintui-2.2.1
+	>=gnome-base/libbonoboui-2.0
+	>=gnome-base/libbonobo-2.0
+	>=gnome-base/ORBit2-2.5.6
+	>=gnome-base/gnome-vfs-2.1
+	>=gnome-base/gail-1.1
+	>=dev-libs/libxml2-2.5"
+
+DEPEND="${RDEPEND}
+	>=dev-util/pkgconfig-0.12.0"
+
+USE_DESTDIR="1"
+SCROLLKEEPER_UPDATE="0"
+ELTCONF="--reverse-deps"
+
+src_unpack() {
+	unpack ${A}
+
+	cd ${S}/src
+	# bug 54244, patch for cjk input methods
+	epatch ${FILESDIR}/${PN}-fix_preedit.patch
+}
+
+src_compile() {
+	gnome2_src_configure
+
+	EPATCH_OPTS="${S}/libtool"
+	epatch ${FILESDIR}/${PN}-3.0.7-libtool.patch
+
+	emake || die "make failed"
+}