Version bump

Package-Manager: portage-2.1.8.3/cvs/Linux x86_64

6 files changed, 24 insertions, 134 deletions

diff --git a/gnome-extra/gtkhtml/ChangeLog b/gnome-extra/gtkhtml/ChangeLog
index 7b77fae35a1d..e4cdd8db8fea 100644
--- a/gnome-extra/gtkhtml/ChangeLog
+++ b/gnome-extra/gtkhtml/ChangeLog
@@ -1,6 +1,14 @@
 # ChangeLog for gnome-extra/gtkhtml
 # Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/gnome-extra/gtkhtml/ChangeLog,v 1.211 2010/06/13 16:06:05 pacho Exp $
+# $Header: /var/cvsroot/gentoo-x86/gnome-extra/gtkhtml/ChangeLog,v 1.212 2010/06/23 12:38:46 pacho Exp $
+
+*gtkhtml-3.30.2 (23 Jun 2010)
+
+  23 Jun 2010; Pacho Ramos <pacho@gentoo.org> -gtkhtml-3.30.1-r1.ebuild,
+  -files/gtkhtml-3.30.1-crash-attachment.patch,
+  -files/gtkhtml-3.30.1-crash-table.patch,
+  -files/gtkhtml-3.30.1-magic-spacebar.patch, +gtkhtml-3.30.2.ebuild:
+  Version bump with updated translations and fixes, remove old.
 
 *gtkhtml-3.30.1-r1 (13 Jun 2010)
 
diff --git a/gnome-extra/gtkhtml/Manifest b/gnome-extra/gtkhtml/Manifest
index 3cb4adf89bc4..50c14e5a78ff 100644
--- a/gnome-extra/gtkhtml/Manifest
+++ b/gnome-extra/gtkhtml/Manifest
@@ -1,15 +1,22 @@
-AUX gtkhtml-3.30.1-crash-attachment.patch 1627 RMD160 9a153d60d4ebcdc4a98fc31c6d2b2ce62fb2970a SHA1 c20f41776b0a695da714ed04ad2f4cda2496533b SHA256 ad478a7f37918447a263eadfd4a62a3b3d5c27f9925c861d24ac364a3d95f595
-AUX gtkhtml-3.30.1-crash-table.patch 1000 RMD160 360accaacd0e4d6985386377c590aacab8e090df SHA1 d1273e2a461b318fba79b4acc70efb6d0a67f861 SHA256 2be0fbd08c763dab8cb5d2b6457274568c1aeca7216d36bf4a0466fdb49791b6
-AUX gtkhtml-3.30.1-magic-spacebar.patch 1177 RMD160 99054c332b246ea9590a630f7ea119d10210e747 SHA1 04ff3c3229af93f07eec8d066c149c51bfb6586f SHA256 2e0957f5a87c2c6e3b7ed597a78e10c2d0984d74a16450c5f7e3558abcfb3a2f
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
 AUX gtkhtml-editor.xml 1035 RMD160 2809f2569ed25df3607102fdee641777adc443dc SHA1 6bbdf72e2a38506cc5f3626240b9cd2880de3e33 SHA256 5ae563343abc4a667fc3057ca73e61667f12ca203e4fc270c3906e1a1adeb505
 AUX libgtkhtml-2.2.0-alpha.patch 652 RMD160 db8f1127f1539bc3b44f65d918ae7657a3175000 SHA1 5df0cd9a732ce5ca4f6b3c46ce1b5954b9aa01b3 SHA256 37fc95e6c2443e37b59dee81509f64d1ebca884c3797020f805e5da88a3a72f1
 DIST gtkhtml-3.26.3.tar.bz2 1487455 RMD160 a994250236abd2def6c94cc7703ef161269c5445 SHA1 4b681e763c5801adf8d083ff80ef4332f48935f6 SHA256 e700a1d57522d63987d27c1b4f0b1b3936a13471d61873c5f77c4535dbfd63eb
 DIST gtkhtml-3.28.3.tar.bz2 1364797 RMD160 b952a8d9f1db9eac039c563ae1b47de61012c92f SHA1 ebbce23ddbc7b96756914bddce9a96d748f9dd00 SHA256 4a6e93b4744703686b2fce71cd0d36668331cd1bd35f3b20e9d3abc0745c8a73
-DIST gtkhtml-3.30.1.tar.bz2 1350166 RMD160 e47734cf521bfe20ebd340162769b8c372f453e9 SHA1 e72ace1cf3461d3b01746e7ebcfef6e94124103b SHA256 70c8e2bffaff783408b847e54e9bb68f438dcd488721b9597168f88395a8f703
+DIST gtkhtml-3.30.2.tar.bz2 1350044 RMD160 ee9ea5b50e285ccc52ed09c787db5dab781316bd SHA1 998f3968b1c8d9b276208eee6ffb02aa9be8f361 SHA256 6710d3085e4ae0d71e04f694e7e0abbc46c9c3ea2796143818335e7c38cfe08e
 DIST libgtkhtml-2.11.1.tar.bz2 597923 RMD160 4f3a65b616c0fbfaaa487d11c8749718708deb2a SHA1 1325c1540091b89cc03d99a1e594285d2e846e50 SHA256 3ca77a0d0f15e94fb654097c2f78cf928194d4c4bf64ff7b2ba408d29c924a57
 EBUILD gtkhtml-2.11.1.ebuild 1209 RMD160 2e55d52af094a26fa553364c6488d7aa1d4491d7 SHA1 aaf3e2b9b87f86a8e8bcf627e383e60e75333cea SHA256 1e9ca3ab64c16a35ca94143e38588cfc7ecfbac444d4aabffac0c8819aeb527f
 EBUILD gtkhtml-3.26.3.ebuild 1731 RMD160 449e218a6a270bb9391e791996a67fda490af667 SHA1 8255d9d8c341e1f94ee56d8f2f1c009204902473 SHA256 85589fec1fce5b6724149758e4ec151c9a6b5e1caf3858bd2f993d83d32c90ba
 EBUILD gtkhtml-3.28.3.ebuild 1777 RMD160 ac6fe8a50b438263b76c4ccc95f9fd6c774ef870 SHA1 4ea4ba77605f3d800aee5eadfc783098a9e92e7f SHA256 253b9113925648b9da35a9e849a8411ed4e8d91b8051ee610633e6bcc55d388a
-EBUILD gtkhtml-3.30.1-r1.ebuild 2078 RMD160 c2994dd3c58b77326c981ad472802d85e43ea99d SHA1 38173810ef93084024d38751ec8aeac3ea3e3a02 SHA256 09288d24d3cec2789aace7f69c48ea065b59ea7f5447edee9ba41c8f86695aaa
-MISC ChangeLog 29792 RMD160 756a7e4738eb5fcad76c0646baeec6e2bf204738 SHA1 a900ff008e482280f4c88f129ed0b7711639ea97 SHA256 5d72fc75c44964de1e1984f893578f6566eec66a5b797a9213474cc3a547d93b
+EBUILD gtkhtml-3.30.2.ebuild 1726 RMD160 8b69d4e2712fdc960eb5a5e49ef1469d48071e54 SHA1 9c8aea94fe3f633de2876d5f3c6705a19a3b15bc SHA256 1cf290ca8e48aa1c852dec26fda11ea51f8acd497a99216119960953a86e0f5d
+MISC ChangeLog 30122 RMD160 fb222c392b811512d18e7f74b2d3d5e39465dd05 SHA1 37cf334d9eacfc7539a8cd44cd8ec05701f1bb0c SHA256 c834486f7a2584063b934bd971e4103415a2b1c22fa4a297abaf766c82e740f1
 MISC metadata.xml 250 RMD160 4e46249cd3426e09b6f462c29ea489724464f51c SHA1 96ab3cf6c39bb44e33d788425a99ddd337a31eeb SHA256 86cd2180b3599ddb2bef78131a9c86a37fa1ee7247aa3245e11e7ff6a239e2e0
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v2.0.15 (GNU/Linux)
+
+iEYEARECAAYFAkwiAFwACgkQCaWpQKGI+9QhowCeKvlsGtrDwFmN7GmKVJRIVyuO
+VTYAn1Kgpta/DNthcR0CEw6JJzoU8C8r
+=HvJi
+-----END PGP SIGNATURE-----
diff --git a/gnome-extra/gtkhtml/files/gtkhtml-3.30.1-crash-attachment.patch b/gnome-extra/gtkhtml/files/gtkhtml-3.30.1-crash-attachment.patch
deleted file mode 100644
index 777555eeeedd..000000000000
--- a/gnome-extra/gtkhtml/files/gtkhtml-3.30.1-crash-attachment.patch
+++ /dev/null
@@ -1,41 +0,0 @@
-From d43a84424361bcf8657459b6e2023b513322414d Mon Sep 17 00:00:00 2001
-From: Chenthill Palanisamy <pchenthill@novell.com>
-Date: Wed, 09 Jun 2010 06:57:32 +0000
-Subject: Bug #344076 - Crash after closing an inline view of text attachment
-
----
-diff --git a/gtkhtml/htmlembedded.c b/gtkhtml/htmlembedded.c
-index 7b618dd..730fde8 100644
---- a/gtkhtml/htmlembedded.c
-+++ b/gtkhtml/htmlembedded.c
-@@ -75,22 +75,23 @@ draw (HTMLObject *o,
- 		return;
- 
- 	if (element->parent) {
-+		GtkWidget *parent;
- 		new_x = o->x + tx;
- 		new_y = o->y + ty - o->ascent;
- 
--		if (gtk_widget_get_parent (element->widget)) {
-+		if ((parent = gtk_widget_get_parent (element->widget))) {
- 			if (new_x != element->abs_x || new_y != element->abs_y) {
- 				d (printf ("element: %p moveto: %d,%d shown: %d\n", element, new_x, new_y, GTK_WIDGET_VISIBLE (element->widget)));
--				gtk_layout_move (GTK_LAYOUT(element->parent), element->widget, new_x, new_y);
--			} else if (!GTK_HTML (element->parent)->engine->expose)
-+				gtk_layout_move (GTK_LAYOUT(parent), element->widget, new_x, new_y);
-+			} else if (!GTK_HTML (parent)->engine->expose)
- 				gtk_widget_queue_draw (element->widget);
- 		}
- 
- 		element->abs_x = new_x;
- 		element->abs_y = new_y;
- 
--		if (!gtk_widget_get_parent (element->widget)) {
--			d (printf ("element: %p put: %d,%d shown: %d\n", element, new_x, new_y, GTK_WIDGET_VISIBLE (element->widget)));
-+		if (!parent) {
-+			d(printf ("element: %p put: %d,%d shown: %d\n", element, new_x, new_y, GTK_WIDGET_VISIBLE (element->widget)));
- 			gtk_layout_put (GTK_LAYOUT(element->parent), element->widget, new_x, new_y);
- 		}
- 	}
---
-cgit v0.8.3.1
diff --git a/gnome-extra/gtkhtml/files/gtkhtml-3.30.1-crash-table.patch b/gnome-extra/gtkhtml/files/gtkhtml-3.30.1-crash-table.patch
deleted file mode 100644
index 3d61522badd1..000000000000
--- a/gnome-extra/gtkhtml/files/gtkhtml-3.30.1-crash-table.patch
+++ /dev/null
@@ -1,36 +0,0 @@
-From e8b22ca78e7637b24e912184f418430b51223b26 Mon Sep 17 00:00:00 2001
-From: Bharath Acharya <abharath@novell.com>
-Date: Wed, 09 Jun 2010 04:04:59 +0000
-Subject: Bug #607324 - Crash doing table editing.
-
-Double free fixes.
----
-diff --git a/gtkhtml/htmlengine-edit-table.c b/gtkhtml/htmlengine-edit-table.c
-index c4e7fad..09c1923 100644
---- a/gtkhtml/htmlengine-edit-table.c
-+++ b/gtkhtml/htmlengine-edit-table.c
-@@ -315,7 +315,8 @@ delete_cells_undo_destroy (HTMLUndoData *undo_data)
- 	gint i;
- 
- 	for (i = 0; i < data->size; i ++)
--		html_object_destroy (HTML_OBJECT (data->cells [i]));
-+		if (data->cells [i])
-+			html_object_destroy (HTML_OBJECT (data->cells [i]));
- 	g_free(data->cells);
- }
- 
-diff --git a/gtkhtml/htmlobject.c b/gtkhtml/htmlobject.c
-index 62114bc..1d9d128 100644
---- a/gtkhtml/htmlobject.c
-+++ b/gtkhtml/htmlobject.c
-@@ -76,8 +76,6 @@ destroy (HTMLObject *self)
- 
- 	if (self->redraw_pending) {
- 		self->free_pending = TRUE;
--	} else {
--		g_free (self);
- 	}
- }
- 
---
-cgit v0.8.3.1
diff --git a/gnome-extra/gtkhtml/files/gtkhtml-3.30.1-magic-spacebar.patch b/gnome-extra/gtkhtml/files/gtkhtml-3.30.1-magic-spacebar.patch
deleted file mode 100644
index e74e69c8632d..000000000000
--- a/gnome-extra/gtkhtml/files/gtkhtml-3.30.1-magic-spacebar.patch
+++ /dev/null
@@ -1,39 +0,0 @@
-From bf1997a08dee4f4aad17a00b06a4dbb52f17ffcd Mon Sep 17 00:00:00 2001
-From: Milan Crha <mcrha@redhat.com>
-Date: Wed, 28 Apr 2010 18:03:20 +0000
-Subject: Bug #575038 - Cursor/caret mode breaks magic spacebar
-
----
-diff --git a/gtkhtml/gtkhtml.c b/gtkhtml/gtkhtml.c
-index 17a8692..c92de7e 100644
---- a/gtkhtml/gtkhtml.c
-+++ b/gtkhtml/gtkhtml.c
-@@ -1032,7 +1032,7 @@ update_mouse_cursor (GtkWidget *widget, guint state)
- 	motion_notify_event (widget, &event);
- }
- 
--static gint
-+static gboolean
- key_press_event (GtkWidget *widget, GdkEventKey *event)
- {
- 	GtkHTML *html = GTK_HTML (widget);
-@@ -1116,7 +1116,7 @@ key_press_event (GtkWidget *widget, GdkEventKey *event)
- 	return retval;
- }
- 
--static gint
-+static gboolean
- key_release_event (GtkWidget *widget, GdkEventKey *event)
- {
- 	GtkHTML *html = GTK_HTML (widget);
-@@ -4778,7 +4778,7 @@ scroll_command (GtkHTML *html,
- 	gdouble page_size;
- 
- 	/* we dont want scroll in editable (move cursor instead) */
--	if (html_engine_get_editable (html->engine) || html->engine->caret_mode)
-+	if (html_engine_get_editable (html->engine))
- 		return FALSE;
- 
- 	adjustment = gtk_layout_get_vadjustment (GTK_LAYOUT (html));
---
-cgit v0.8.3.1
diff --git a/gnome-extra/gtkhtml/gtkhtml-3.30.1-r1.ebuild b/gnome-extra/gtkhtml/gtkhtml-3.30.2.ebuild
index 377208b8f8cf..0997b0137044 100644
--- a/gnome-extra/gtkhtml/gtkhtml-3.30.1-r1.ebuild
+++ b/gnome-extra/gtkhtml/gtkhtml-3.30.2.ebuild
@@ -1,11 +1,11 @@
 # Copyright 1999-2010 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/gnome-extra/gtkhtml/gtkhtml-3.30.1-r1.ebuild,v 1.2 2010/06/14 00:52:07 mr_bones_ Exp $
+# $Header: /var/cvsroot/gentoo-x86/gnome-extra/gtkhtml/gtkhtml-3.30.2.ebuild,v 1.1 2010/06/23 12:38:46 pacho Exp $
 
 EAPI="2"
 GCONF_DEBUG="no"
 
-inherit eutils gnome2
+inherit gnome2
 
 DESCRIPTION="Lightweight HTML Rendering/Printing/Editing Engine"
 HOMEPAGE="http://www.gnome.org/"
@@ -51,13 +51,4 @@ src_prepare() {
 		-i configure.ac configure || die "sed 1 failed"
 	sed -i -e 's:-DGTK_DISABLE_DEPRECATED=1 -DGDK_DISABLE_DEPRECATED=1 -DG_DISABLE_DEPRECATED=1 -DGNOME_DISABLE_DEPRECATED=1::g' \
 		a11y/Makefile.am a11y/Makefile.in || die "sed 2 failed"
-
-	# Upstream bug 575038: Cursor/caret mode breaks magic spacebar
-	epatch "${FILESDIR}/${P}-magic-spacebar.patch"
-
-	# Upstream bug 607324: Crash doing table editing
-	epatch "${FILESDIR}/${P}-crash-table.patch"
-
-	# Upstream bug 344076: Crash after closing an inline view of text attachment
-	epatch "${FILESDIR}/${P}-crash-attachment.patch"
 }