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

Package-Manager: portage-2.1.1_pre5-r1

4 files changed, 161 insertions, 20 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/Manifest b/app-text/gnomesword/Manifest
index 89cd3f6dc374..9698f8ad4d9f 100644
--- a/app-text/gnomesword/Manifest
+++ b/app-text/gnomesword/Manifest
@@ -1,24 +1,25 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
-
 AUX gnomesword-2.1.1-gcc-3.4.patch 365 RMD160 3bdeceb35bceaa29795637c6079e2e9587f3892d SHA1 3df42524ad9122412a4b887685a38c71febaa629 SHA256 26292d8acb0dd3b8f6f338c2b200947fc69623d4bfcf46413dcd07985b507ac9
 MD5 c7c3a66ca0618cbc1ec047753829a4aa files/gnomesword-2.1.1-gcc-3.4.patch 365
 RMD160 3bdeceb35bceaa29795637c6079e2e9587f3892d files/gnomesword-2.1.1-gcc-3.4.patch 365
 SHA256 26292d8acb0dd3b8f6f338c2b200947fc69623d4bfcf46413dcd07985b507ac9 files/gnomesword-2.1.1-gcc-3.4.patch 365
+AUX gnomesword-2.1.7-commentary_dialog.c.patch 3650 RMD160 339564b85ebf2078e04eb5a4d8f62c9a0ace50ed SHA1 d08e21bfa563abb2ef2d474d12025382e89c90ba SHA256 4a6daf46d0b114acc1eca0c18101cb276cf1d5c531f79dbae57dd25313fe1665
+MD5 2bc4aa62654d1bf4215a5dc448fd5022 files/gnomesword-2.1.7-commentary_dialog.c.patch 3650
+RMD160 339564b85ebf2078e04eb5a4d8f62c9a0ace50ed files/gnomesword-2.1.7-commentary_dialog.c.patch 3650
+SHA256 4a6daf46d0b114acc1eca0c18101cb276cf1d5c531f79dbae57dd25313fe1665 files/gnomesword-2.1.7-commentary_dialog.c.patch 3650
 DIST gnomesword-2.1.1.tar.gz 1758480
 DIST gnomesword-2.1.7.tar.gz 2516069 RMD160 ecae162431f0fbd7147cd67e18a56a79eb8e55f6 SHA1 fdb77d43788e68228cc353b312d876ee5ab2ab20 SHA256 9478c6b0826d2d21343db8ce35a56ab6260db588d591e59c069d57ffc3c07a87
 EBUILD gnomesword-2.1.1.ebuild 1010 RMD160 b0a539b0f9dd5abe3227ffd6b132306a3e365aa9 SHA1 6dbc5e11f3beb4f545ce123b3344ca39763a0eda SHA256 966a4a983b0ba0327ddaec194725c25ae2b2f09f4bcfbe6d3a42d549d9975aea
 MD5 5430d1afa5a8106c1674405af9d921c2 gnomesword-2.1.1.ebuild 1010
 RMD160 b0a539b0f9dd5abe3227ffd6b132306a3e365aa9 gnomesword-2.1.1.ebuild 1010
 SHA256 966a4a983b0ba0327ddaec194725c25ae2b2f09f4bcfbe6d3a42d549d9975aea gnomesword-2.1.1.ebuild 1010
-EBUILD gnomesword-2.1.7.ebuild 1105 RMD160 9686ea37f4ee3423a0509ba5b08f3121a30804d7 SHA1 1d87b7cdd3e952cd225f096fad1e075aab1c5575 SHA256 9f5ac85570190c997899c28a37ad1b9f10849ac96d0f533ee5b22f16df3daae0
-MD5 d7373273359dcf2143b1be0dc5d6fd5c gnomesword-2.1.7.ebuild 1105
-RMD160 9686ea37f4ee3423a0509ba5b08f3121a30804d7 gnomesword-2.1.7.ebuild 1105
-SHA256 9f5ac85570190c997899c28a37ad1b9f10849ac96d0f533ee5b22f16df3daae0 gnomesword-2.1.7.ebuild 1105
-MISC ChangeLog 1691 RMD160 9dd9161a3ead20671da392f63d8137b9d23fc1c2 SHA1 3d5b60b6c747ca0688a1bf5f59add5c06e8e1448 SHA256 11479129d2f0f6735b5878a2e71fc401dcdb9a6d1da0016a7766fd50116a2ef9
-MD5 b76663106f11eec31051bbfe11fcd9b2 ChangeLog 1691
-RMD160 9dd9161a3ead20671da392f63d8137b9d23fc1c2 ChangeLog 1691
-SHA256 11479129d2f0f6735b5878a2e71fc401dcdb9a6d1da0016a7766fd50116a2ef9 ChangeLog 1691
+EBUILD gnomesword-2.1.7.ebuild 1200 RMD160 79eb338c087a1f3e833d79d81ac7fb59dd014a79 SHA1 2bef552b05a105dd03d49cf3163e14ef8dd5db6b SHA256 aa1fcf9ef08075781bebe6fb4037bfef8454e2844285acecf9139c4d124f7d93
+MD5 b0c339d6ffb16ace9cd1645aeb710396 gnomesword-2.1.7.ebuild 1200
+RMD160 79eb338c087a1f3e833d79d81ac7fb59dd014a79 gnomesword-2.1.7.ebuild 1200
+SHA256 aa1fcf9ef08075781bebe6fb4037bfef8454e2844285acecf9139c4d124f7d93 gnomesword-2.1.7.ebuild 1200
+MISC ChangeLog 1917 RMD160 95457b8bf565a123f03f2a80dea59b7ee9a96f55 SHA1 065838cbd4d868122eb680a2c1e389614621a8e2 SHA256 e91955171c5c1ee5d883022ba3c39c1b1d7bdd1533140ed58bdc68bf878c6ebc
+MD5 e31d56f7a01c19bf84a7c2114f1392ea ChangeLog 1917
+RMD160 95457b8bf565a123f03f2a80dea59b7ee9a96f55 ChangeLog 1917
+SHA256 e91955171c5c1ee5d883022ba3c39c1b1d7bdd1533140ed58bdc68bf878c6ebc ChangeLog 1917
 MISC metadata.xml 247 RMD160 9951b031c811a444e4ba88e687dcf13219c19c35 SHA1 9caed47052f4bf4073ad396315ca7959a3baa33b SHA256 9cf2f19dc4aa639bb7ba04a81e9e45f76e5d51723fa17bb94bd6cbc8c4d5af06
 MD5 5adfc3ab32f89cd4a0dd8d947094e194 metadata.xml 247
 RMD160 9951b031c811a444e4ba88e687dcf13219c19c35 metadata.xml 247
@@ -29,10 +30,3 @@ SHA256 c4dddbdde51c6cb0d2eccc686f33ed1a290fae2087c1ca500dbe0c00e3163132 files/di
 MD5 042b409aaddc3bf735316784447ce5c9 files/digest-gnomesword-2.1.7 253
 RMD160 c0e7557e0722f113a3856aa7f9a6a1341b0467f1 files/digest-gnomesword-2.1.7 253
 SHA256 4874acf66aa853f37fc4371a28cfc21f74152686cde5a1ffa8aac5d75d395ea6 files/digest-gnomesword-2.1.7 253
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v1.4.2.2 (GNU/Linux)
-
-iD8DBQFEtIqB2ZWR0Jhg/EsRApOCAJ9COrpb381y3HkJt2+9L5fcgSEIMgCfcTUs
-RsJCSGb8AI/ixWJvPbRXXHY=
-=wwq4
------END PGP SIGNATURE-----
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