Patches to fix crash on check spelling. Thanks to reporters in bug 120820

(Portage version: 2.1_pre5-r4)

6 files changed, 235 insertions, 1 deletions

diff --git a/app-office/abiword/ChangeLog b/app-office/abiword/ChangeLog
index 7f3440d5a224..03c61ac24317 100644
--- a/app-office/abiword/ChangeLog
+++ b/app-office/abiword/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for app-office/abiword
 # Copyright 2002-2006 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-office/abiword/ChangeLog,v 1.149 2006/01/24 16:09:17 obz Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-office/abiword/ChangeLog,v 1.150 2006/03/10 20:01:48 joem Exp $
+
+*abiword-2.4.2-r1 (10 Mar 2006)
+
+  10 Mar 2006; Joe McCann <joem@gentoo.org>
+  +files/abiword-2.4.2-spell_crash_1.patch,
+  +files/abiword-2.4.2-spell_crash_2.patch, +abiword-2.4.2-r1.ebuild:
+  Patches to fix crash on check spelling. Thanks to reporters in bug 120820
 
 *abiword-2.4.2 (25 Jan 2006)
 
diff --git a/app-office/abiword/Manifest b/app-office/abiword/Manifest
index 362f67f6d5af..59cc88ef4da1 100644
--- a/app-office/abiword/Manifest
+++ b/app-office/abiword/Manifest
@@ -1,10 +1,42 @@
 MD5 5d8b4e909edabbd792548b51d124cf9d ChangeLog 19730
+RMD160 1c83743dd030db39c770ec7349e3aba23a5e5c8a ChangeLog 19730
+SHA256 115c573168fa802c49dc56855629f7d50169163c45ddbfb2d4a0fd9d0d1dfa3e ChangeLog 19730
 MD5 2dd7fd9aac648a1b6c0be125e38f4ee5 abiword-2.2.10.ebuild 2320
+RMD160 221e60ca5573b38128f47dec8fd470b83fc77760 abiword-2.2.10.ebuild 2320
+SHA256 f5e7ddccb9c0bd4639a085556de662476dd3e830a879198fe109806628f4c54d abiword-2.2.10.ebuild 2320
 MD5 6b67fa20694fe782fed48a947bdd289f abiword-2.2.11.ebuild 2335
+RMD160 15b60f324bcbd891c3d001f9c2f8cf7172060587 abiword-2.2.11.ebuild 2335
+SHA256 10943e56169ae4603beb6a670f1cf97038ca35e0e7cf12ac72731cad0c367df2 abiword-2.2.11.ebuild 2335
 MD5 7a50754706edb7a66c3e7b84d1fc219b abiword-2.4.1.ebuild 2346
+RMD160 4571964fd9c998913a1303f89beafbc1746c1c1a abiword-2.4.1.ebuild 2346
+SHA256 bb71957accc34d27794b73024abc2d5a070fcbe53b061fa8f3cf18efeac7d058 abiword-2.4.1.ebuild 2346
+MD5 1d4ff59fdd1c1791b71e7aa6a558c328 abiword-2.4.2-r1.ebuild 2471
+RMD160 cffafdb23de2156b508f7ee0633d7fbaeea3b409 abiword-2.4.2-r1.ebuild 2471
+SHA256 a8e6e9d1281b8cf7657c0fdf7a38b9dc3c13c2afd3794705d31dc3dd2fc91429 abiword-2.4.2-r1.ebuild 2471
 MD5 f4537b2e3e2e6eb91ef92dba5e92d7db abiword-2.4.2.ebuild 2342
+RMD160 5bb8c2a44dd12a948d72246201635f8bc08c29a5 abiword-2.4.2.ebuild 2342
+SHA256 acd38eff41c727cfbf975009ec0d106f5363eea1dd305b86e2f5e6fbaa1da813 abiword-2.4.2.ebuild 2342
+MD5 98841e46f8a384dc4121c339f9ce79eb files/abiword-2.4.2-spell_crash_1.patch 1700
+RMD160 eeaf9431172739dd271c64148c9bb1676d0fc8cd files/abiword-2.4.2-spell_crash_1.patch 1700
+SHA256 adff1614e3328e90703da5b856726a2ae2e001418de12b1577a1cf677c0a6429 files/abiword-2.4.2-spell_crash_1.patch 1700
+MD5 2ef9a6ab9199efafba2e8d53310f78ed files/abiword-2.4.2-spell_crash_2.patch 2394
+RMD160 4ccdeef0e0a29231422ea5176c0bbafaf255acb0 files/abiword-2.4.2-spell_crash_2.patch 2394
+SHA256 759105e1aa0cb2e8cdb43997451d2686c52d3d7439dae26c7b91709b538a8550 files/abiword-2.4.2-spell_crash_2.patch 2394
 MD5 8b023d31957e4d3d1684959d96564364 files/digest-abiword-2.2.10 69
+RMD160 eba99022f8cde3560b66450ad2fa1d84f3724f76 files/digest-abiword-2.2.10 69
+SHA256 71150ba328519c912636450e822cf034ca9447bd11ef92e8b709f683e185982c files/digest-abiword-2.2.10 69
 MD5 a8522f74aea43b8fe31b8075165da843 files/digest-abiword-2.2.11 69
+RMD160 e6ae0dabf7597f212c9a51ac576e6ee081574980 files/digest-abiword-2.2.11 69
+SHA256 2f9b59abc98bdfe8119e2d45599e6ea9fe2695efd97a814e720bda1a8c59fde4 files/digest-abiword-2.2.11 69
 MD5 c20fafc315b3ee5486c3d8ab489e84b1 files/digest-abiword-2.4.1 68
+RMD160 6dadede09062cc0be975176c3c57dc23bc945a82 files/digest-abiword-2.4.1 68
+SHA256 8233329f89aa53a40f361149707c94b147afe2c630987f5bd3263f65e8697920 files/digest-abiword-2.4.1 68
 MD5 1e204780e303e366641a44d07fa9cce5 files/digest-abiword-2.4.2 68
+RMD160 3172bc253c1fcfa72cbbbe5a87036a03ab2241c7 files/digest-abiword-2.4.2 68
+SHA256 101745a79960abd46b29eec117ae5f0f922f07aae805cb06e8b4b3773ff8e398 files/digest-abiword-2.4.2 68
+MD5 044a4f35a0cada9beb0dd0d531d40349 files/digest-abiword-2.4.2-r1 250
+RMD160 a22cb0d2b18e912ab1ff46a83c78fc94e5dbc0a1 files/digest-abiword-2.4.2-r1 250
+SHA256 f3107a4919c07769ed2547507378b37ce8610b5eaf9a649eaff03fba5dbbca23 files/digest-abiword-2.4.2-r1 250
 MD5 3b7f9b4ae874f21ec05137f8038bdd69 metadata.xml 165
+RMD160 46d22302656e49f090e45d3c10f90c4e16f75877 metadata.xml 165
+SHA256 9e51028c1f6811ec63067385fb8d6cb393d04b1a1d6688e0bbeb368ef34d57a0 metadata.xml 165
diff --git a/app-office/abiword/abiword-2.4.2-r1.ebuild b/app-office/abiword/abiword-2.4.2-r1.ebuild
new file mode 100644
index 000000000000..366ab0131e0b
--- /dev/null
+++ b/app-office/abiword/abiword-2.4.2-r1.ebuild
@@ -0,0 +1,93 @@
+# Copyright 1999-2006 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/app-office/abiword/abiword-2.4.2-r1.ebuild,v 1.1 2006/03/10 20:01:48 joem Exp $
+
+inherit eutils fdo-mime alternatives
+
+S=${WORKDIR}/${P}/abi
+
+DESCRIPTION="Fully featured yet light and fast cross platform word processor"
+HOMEPAGE="http://www.abisource.com/"
+
+SRC_URI="http://www.abisource.com/downloads/${PN}/${PV}/source/${P}.tar.bz2"
+
+KEYWORDS="~alpha ~amd64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86"
+IUSE="debug gnome spell xml2"
+
+LICENSE="GPL-2"
+SLOT="2"
+
+RDEPEND="virtual/xft
+	>=dev-libs/glib-2
+	>=x11-libs/gtk+-2.4
+	>=x11-libs/pango-1.2
+	>=gnome-base/libglade-2
+	>=gnome-base/libgnomeprint-2.2
+	>=gnome-base/libgnomeprintui-2.2
+	sys-libs/zlib
+	>=media-libs/libpng-1.2
+	dev-libs/popt
+	>=media-libs/fontconfig-2.1
+	>=app-text/wv-1
+	>=dev-libs/fribidi-0.10.4
+	xml2? ( >=dev-libs/libxml2-2.4.10 )
+	!xml2? ( dev-libs/expat )
+	spell? ( >=app-text/enchant-1.1 )
+	gnome? (
+		>=gnome-base/libbonobo-2
+		>=gnome-base/libgnomeui-2.2
+		>=gnome-extra/gucharmap-1.4 )"
+
+DEPEND="${RDEPEND}
+	>=dev-util/pkgconfig-0.9"
+
+src_unpack() {
+	unpack ${A}
+	cd ${S}
+	epatch ${FILESDIR}/${P}-spell_crash_1.patch
+	epatch ${FILESDIR}/${P}-spell_crash_2.patch
+}
+
+src_compile() {
+	# this is a hack since I don't want to go hack in the gnome-vfs
+	# headerfiles. The issue is about gnome-vfs containing "long long"
+	# which makes gcc 3.3.1 balk
+	sed -i -e 's:-pedantic::g' configure
+
+	local myconf="$(use_enable gnome) \
+		$(use_enable gnome gucharmap) \
+		$(use_enable spell enchant)   \
+		$(use_enable debug)           \
+		$(use_with xml2 libxml2)      \
+		--enable-threads    \
+		--disable-scripting \
+		--with-sys-wv"
+
+	econf $myconf || die "./configure failed"
+
+	emake all-recursive || die "Compilation failed"
+}
+
+src_install() {
+	dodir /usr/{bin,lib}
+
+	make DESTDIR="${D}" install || die "Installation failed"
+
+	dosed "s:Exec=abiword:Exec=abiword-2.4:" /usr/share/applications/abiword.desktop
+
+	rm -f ${D}/usr/bin/abiword-2.4
+	rm -f ${D}/usr/bin/abiword
+	dosym AbiWord-2.4 /usr/bin/abiword-2.4
+
+	dodoc *.TXT docs/build/BUILD.TXT user/wp/readme.txt
+}
+
+pkg_postinst() {
+	fdo-mime_desktop_database_update
+
+	alternatives_auto_makesym "/usr/bin/abiword" "/usr/bin/abiword-[0-9].[0-9]"
+
+	einfo "As of version 2.4, all abiword plugins have been moved"
+	einfo "into a seperate abiword-plugins package"
+	einfo "You can install them by running emerge abiword-plugins"
+}
diff --git a/app-office/abiword/files/abiword-2.4.2-spell_crash_1.patch b/app-office/abiword/files/abiword-2.4.2-spell_crash_1.patch
new file mode 100644
index 000000000000..073b579aafec
--- /dev/null
+++ b/app-office/abiword/files/abiword-2.4.2-spell_crash_1.patch
@@ -0,0 +1,40 @@
+Index: src/wp/ap/unix/ap_UnixDialog_Spell.cpp
+===================================================================
+RCS file: /cvsroot/abi/src/wp/ap/unix/ap_UnixDialog_Spell.cpp,v
+retrieving revision 1.45
+diff -u -5 -r1.45 ap_UnixDialog_Spell.cpp
+--- src/wp/ap/unix/ap_UnixDialog_Spell.cpp	19 Feb 2005 04:50:22 -0000	1.45
++++ src/wp/ap/unix/ap_UnixDialog_Spell.cpp	29 Jan 2006 15:29:46 -0000
+@@ -207,11 +207,16 @@
+             makeWordVisible();
+      
+             // update dialog with new misspelled word info/suggestions
+             _updateWindow();
+      
+-            // run into the GTK event loop for this window
++		m_listHandlerID = g_signal_connect (gtk_tree_view_get_selection (GTK_TREE_VIEW (m_lvSuggestions)), 
++						  "changed",
++						  G_CALLBACK (AP_UnixDialog_Spell__onSuggestionSelected), 
++						  (gpointer)this);
++
++			// run into the GTK event loop for this window
+ 	    gint response = abiRunModalDialog (GTK_DIALOG(mainWindow), false);
+ 	    UT_DEBUGMSG (("ROB: response='%d'\n", response));
+             switch(response) {
+ 
+ 	            case SPELL_RESPONSE_CHANGE:
+@@ -301,14 +306,10 @@
+ 					  (gpointer)this);
+ 	g_signal_connect (GTK_TREE_VIEW (m_lvSuggestions), 
+ 					  "row-activated", 
+ 					  G_CALLBACK (AP_UnixDialog_Spell__onSuggestionDblClicked), 
+ 					  (gpointer)this);
+-	m_listHandlerID = g_signal_connect (gtk_tree_view_get_selection (GTK_TREE_VIEW (m_lvSuggestions)), 
+-					  "changed",
+-					  G_CALLBACK (AP_UnixDialog_Spell__onSuggestionSelected), 
+-					  (gpointer)this);
+     m_replaceHandlerID = g_signal_connect (G_OBJECT(m_eChange), 
+ 					   "changed",
+ 					   G_CALLBACK (AP_UnixDialog_Spell__onSuggestionChanged),
+ 					   (gpointer)this);
+
diff --git a/app-office/abiword/files/abiword-2.4.2-spell_crash_2.patch b/app-office/abiword/files/abiword-2.4.2-spell_crash_2.patch
new file mode 100644
index 000000000000..e075a05679d5
--- /dev/null
+++ b/app-office/abiword/files/abiword-2.4.2-spell_crash_2.patch
@@ -0,0 +1,59 @@
+Index: src/wp/ap/unix/ap_UnixDialog_Spell.cpp
+===================================================================
+RCS file: /cvsroot/abi/src/wp/ap/unix/ap_UnixDialog_Spell.cpp,v
+retrieving revision 1.46
+diff -u -5 -r1.46 ap_UnixDialog_Spell.cpp
+--- src/wp/ap/unix/ap_UnixDialog_Spell.cpp	29 Jan 2006 15:36:28 -0000	1.46
++++ src/wp/ap/unix/ap_UnixDialog_Spell.cpp	29 Jan 2006 21:06:13 -0000
+@@ -204,17 +204,15 @@
+         while (bRes) {
+      
+             // show word in main window
+             makeWordVisible();
+      
++			gpointer inst = gtk_tree_view_get_selection (GTK_TREE_VIEW (m_lvSuggestions));
++			g_signal_handler_block (inst, m_listHandlerID);
+             // update dialog with new misspelled word info/suggestions
+             _updateWindow();
+-     
+-		m_listHandlerID = g_signal_connect (gtk_tree_view_get_selection (GTK_TREE_VIEW (m_lvSuggestions)), 
+-						  "changed",
+-						  G_CALLBACK (AP_UnixDialog_Spell__onSuggestionSelected), 
+-						  (gpointer)this);
++			g_signal_handler_unblock (inst, m_listHandlerID);
+ 
+ 			// run into the GTK event loop for this window
+ 	    gint response = abiRunModalDialog (GTK_DIALOG(mainWindow), false);
+ 	    UT_DEBUGMSG (("ROB: response='%d'\n", response));
+             switch(response) {
+@@ -335,10 +333,14 @@
+ 												"text", COLUMN_SUGGESTION,
+ 												NULL);
+ 	GtkTreeViewColumn *column = gtk_tree_view_get_column (GTK_TREE_VIEW (m_lvSuggestions), 0);
+ 	gtk_tree_view_column_set_sort_column_id (column, COLUMN_SUGGESTION);
+ 
++	m_listHandlerID = g_signal_connect (gtk_tree_view_get_selection (GTK_TREE_VIEW (m_lvSuggestions)), 
++				  "changed",
++				  G_CALLBACK (AP_UnixDialog_Spell__onSuggestionSelected), 
++				  (gpointer)this);
+ 
+     gtk_widget_show_all (m_wDialog);
+     return m_wDialog;
+ }
+ 
+@@ -432,10 +434,15 @@
+ 			gtk_list_store_set (GTK_LIST_STORE (model), &iter, 
+ 								COLUMN_SUGGESTION, suggest,  
+ 								COLUMN_NUMBER, i,
+ 								-1);
+ 	    }
++		// put the first suggestion in the entry
++		suggest = (gchar*) _convertToMB((UT_UCSChar*)m_Suggestions->getNthItem(0));
++        g_signal_handler_block(G_OBJECT(m_eChange), m_replaceHandlerID);
++        gtk_entry_set_text(GTK_ENTRY(m_eChange), suggest);
++        g_signal_handler_unblock(G_OBJECT(m_eChange), m_replaceHandlerID);      
+     }
+ 
+ 	gtk_tree_view_set_model (GTK_TREE_VIEW (m_lvSuggestions), model);
+ 	g_object_unref (G_OBJECT (model));
+
diff --git a/app-office/abiword/files/digest-abiword-2.4.2-r1 b/app-office/abiword/files/digest-abiword-2.4.2-r1
new file mode 100644
index 000000000000..3fce9b5e6438
--- /dev/null
+++ b/app-office/abiword/files/digest-abiword-2.4.2-r1
@@ -0,0 +1,3 @@
+MD5 935f1218eab7ff96b7a23cfeba4e76d1 abiword-2.4.2.tar.bz2 24729796
+RMD160 1b30dd7da238bd282abcce814a0b4d7c93e17199 abiword-2.4.2.tar.bz2 24729796
+SHA256 6a5921f9ab593637008bc0d5411ef9d8a689a4c89d9f7b273236331b14f66933 abiword-2.4.2.tar.bz2 24729796