Add commentary_dialog patch from Thomas Holder <ThomasxHolder@compuserve.de>, bug #142996.

(Portage version: 2.1.1_pre5-r1)

3 files changed, 149 insertions, 2 deletions

diff --git a/app-text/gnomesword/ChangeLog b/app-text/gnomesword/ChangeLog
index 5656cfbbde62..7e558f1de773 100644
--- a/app-text/gnomesword/ChangeLog
+++ b/app-text/gnomesword/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for app-text/gnomesword
 # Copyright 1999-2006 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-text/gnomesword/ChangeLog,v 1.12 2006/07/12 05:36:30 tsunam Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-text/gnomesword/ChangeLog,v 1.13 2006/08/16 00:11:47 squinky86 Exp $
+
+  16 Aug 2006; Jon Hood <squinky86@gentoo.org>
+  +files/gnomesword-2.1.7-commentary_dialog.c.patch,
+  gnomesword-2.1.7.ebuild:
+  Add commentary_dialog patch from Thomas Holder
+  <ThomasxHolder@compuserve.de>, bug #142996.
 
   12 Jul 2006; Joshua Jackson <tsunam@gentoo.org> gnomesword-2.1.1.ebuild:
   Moving from x86 to ~x86
diff --git a/app-text/gnomesword/files/gnomesword-2.1.7-commentary_dialog.c.patch b/app-text/gnomesword/files/gnomesword-2.1.7-commentary_dialog.c.patch
new file mode 100644
index 000000000000..69b9d9336add
--- /dev/null
+++ b/app-text/gnomesword/files/gnomesword-2.1.7-commentary_dialog.c.patch
@@ -0,0 +1,135 @@
+--- src/gnome2/commentary_dialog.c.orig	2006-08-05 19:40:34.000000000 +0200
++++ src/gnome2/commentary_dialog.c	2006-08-05 19:44:41.000000000 +0200
+@@ -317,7 +317,7 @@
+ #ifndef USE_GTKHTML38
+ 	GSHTMLEditorControlData *ec =
+ 	    (GSHTMLEditorControlData *) d->editor;
+-	ed->changed = TRUE;
++	ec->changed = TRUE;
+ 	//g_warning("html_key_press_event");
+ 	gui_update_statusbar(ec);
+ #endif
+@@ -368,9 +368,9 @@
+ #ifndef USE_GTKHTML38
+ 	if (!ec)
+ 		return;
+-	if (ed->key)
+-		g_free(ed->key);
+-	ed->key = g_strdup_printf("%s 1:1", bookname);
++	if (ec->key)
++		g_free(ec->key);
++	ec->key = g_strdup_printf("%s 1:1", bookname);
+ #endif
+ }
+ 
+@@ -416,9 +416,9 @@
+ #ifndef USE_GTKHTML38
+ 	if (!ec)
+ 		return FALSE;
+-	if (ed->key)
+-		g_free(ed->key);
+-	ed->key = g_strdup_printf("%s %d:1", bookname, chapter);
++	if (ec->key)
++		g_free(ec->key);
++	ec->key = g_strdup_printf("%s %d:1", bookname, chapter);
+ #endif
+ 	return FALSE;
+ }
+@@ -471,9 +471,9 @@
+ #ifndef USE_GTKHTML38
+ 	if (!ec)
+ 		return FALSE;
+-	if (ed->key)
+-		g_free(ed->key);
+-	ed->key = g_strdup_printf("%s %d:%d", bookname, chapter, verse);
++	if (ec->key)
++		g_free(ec->key);
++	ec->key = g_strdup_printf("%s %d:%d", bookname, chapter, verse);
+ #endif
+ 	return FALSE;
+ }
+@@ -516,9 +516,9 @@
+ #ifndef USE_GTKHTML38
+ 		if (!ec)
+ 			return;
+-		if (ed->key)
+-			g_free(ed->key);
+-		ed->key = g_strdup_printf("%s", buf);
++		if (ec->key)
++			g_free(ec->key);
++		ec->key = g_strdup_printf("%s", buf);
+ #endif
+ 	}
+ 	return FALSE;
+@@ -560,9 +560,9 @@
+ #ifndef USE_GTKHTML38
+ 	if (!ec)
+ 		return;
+-	if (ed->key)
+-		g_free(ed->key);
+-	ed->key = g_strdup_printf("%s", buf);
++	if (ec->key)
++		g_free(ec->key);
++	ec->key = g_strdup_printf("%s", buf);
+ #endif
+ }
+ 
+@@ -967,41 +967,41 @@
+ 
+ 	if (do_edit) {
+ #ifndef USE_GTKHTML38
+-		ed->htmlwidget = gtk_html_new();
+-		ed->html = GTK_HTML(ed->htmlwidget);
+-		gtk_widget_show(ed->htmlwidget);
++		ec->htmlwidget = gtk_html_new();
++		ec->html = GTK_HTML(ec->htmlwidget);
++		gtk_widget_show(ec->htmlwidget);
+ 		gtk_container_add(GTK_CONTAINER(scrolledwindow38),
+-				  ed->htmlwidget);
++				  ec->htmlwidget);
+ 
+-		ed->vbox = vbox30;
++		ec->vbox = vbox30;
+ 
+-		ed->pm = gui_create_editor_popup(ec);
+-		gnome_popup_menu_attach(ed->pm, ed->htmlwidget, NULL);
++		ec->pm = gui_create_editor_popup(ec);
++		gnome_popup_menu_attach(ec->pm, ec->htmlwidget, NULL);
+ 
+-		ed->statusbar = gtk_statusbar_new();
+-		gtk_widget_show(ed->statusbar);
+-		gtk_box_pack_start(GTK_BOX(vbox30), ed->statusbar,
++		ec->statusbar = gtk_statusbar_new();
++		gtk_widget_show(ec->statusbar);
++		gtk_box_pack_start(GTK_BOX(vbox30), ec->statusbar,
+ 				   FALSE, TRUE, 0);
+ 		
+ 		/* html.c */
+-		g_signal_connect(G_OBJECT(ed->htmlwidget),
++		g_signal_connect(G_OBJECT(ec->htmlwidget),
+ 				 "key_press_event",
+ 				 G_CALLBACK(html_key_press_event), d);
+-		g_signal_connect(GTK_OBJECT(ed->htmlwidget),
++		g_signal_connect(GTK_OBJECT(ec->htmlwidget),
+ 				 "link_clicked",
+ 				 G_CALLBACK(gui_link_clicked), NULL);
+ 
+-		g_signal_connect(GTK_OBJECT(ed->htmlwidget),
++		g_signal_connect(GTK_OBJECT(ec->htmlwidget),
+ 				 "on_url", G_CALLBACK(gui_url), NULL);
+ 
+ 		gui_toolbar_style(ec);
+ 		gtk_box_pack_start(GTK_BOX(vbox_toolbars),
+-				   ed->toolbar_style, FALSE, FALSE, 0);
+-		gtk_widget_show(ed->toolbar_style);
++				   ec->toolbar_style, FALSE, FALSE, 0);
++		gtk_widget_show(ec->toolbar_style);
+ 		gui_toolbar_edit(ec);
+ 		gtk_box_pack_start(GTK_BOX(vbox_toolbars),
+-				   ed->toolbar_edit, FALSE, FALSE, 0);
+-		gtk_widget_show(ed->toolbar_edit);
++				   ec->toolbar_edit, FALSE, FALSE, 0);
++		gtk_widget_show(ec->toolbar_edit);
+ #endif  /* USE_GTKHTML38 */
+ 	} else {
+ 		d->html = gtk_html_new();
diff --git a/app-text/gnomesword/gnomesword-2.1.7.ebuild b/app-text/gnomesword/gnomesword-2.1.7.ebuild
index aca5978ce02e..7d97f93f4194 100644
--- a/app-text/gnomesword/gnomesword-2.1.7.ebuild
+++ b/app-text/gnomesword/gnomesword-2.1.7.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2006 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-text/gnomesword/gnomesword-2.1.7.ebuild,v 1.4 2006/07/09 08:11:26 pylon Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-text/gnomesword/gnomesword-2.1.7.ebuild,v 1.5 2006/08/16 00:11:47 squinky86 Exp $
 
 inherit libtool gnome2 eutils
 
@@ -31,6 +31,12 @@ DEPEND="${RDEPEND}
 G2CONF="${G2CONF} $(use_enable spell pspell)"
 DOCS="NEWS ChangeLog README TODO"
 
+src_unpack() {
+	unpack ${A}
+	cd ${S}
+	epatch ${FILESDIR}/${P}-commentary_dialog.c.patch
+}
+
 pkg_postinst() {
 	gnome2_pkg_postinst