Version bump

(Portage version: 2.1.8.3/cvs/Linux x86_64)

5 files changed, 11 insertions, 128 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/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"
 }