Add patch for a fix for get_left_margin related crashes

(Portage version: 2.1.3.7)

6 files changed, 82 insertions, 43 deletions

diff --git a/gnome-extra/gtkhtml/ChangeLog b/gnome-extra/gtkhtml/ChangeLog
index 2f6e9be2e268..59baaa8d4bf3 100644
--- a/gnome-extra/gtkhtml/ChangeLog
+++ b/gnome-extra/gtkhtml/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for gnome-extra/gtkhtml
 # Copyright 2002-2007 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/gnome-extra/gtkhtml/ChangeLog,v 1.113 2007/08/29 14:49:33 cardoe Exp $
+# $Header: /var/cvsroot/gentoo-x86/gnome-extra/gtkhtml/ChangeLog,v 1.114 2007/08/31 14:27:41 leio Exp $
+
+*gtkhtml-3.14.3-r1 (31 Aug 2007)
+
+  31 Aug 2007; Mart Raudsepp <leio@gentoo.org>
+  +files/gtkhtml-3.14.3-get_left_margin-fix.patch, -gtkhtml-3.0.10.ebuild,
+  +gtkhtml-3.14.3-r1.ebuild:
+  Add patch for a fix for get_left_margin related crashes
 
   29 Aug 2007; Doug Goldstein <cardoe@gentoo.org> gtkhtml-3.0.10-r1.ebuild:
   amd64 stable
diff --git a/gnome-extra/gtkhtml/files/digest-gtkhtml-3.0.10 b/gnome-extra/gtkhtml/files/digest-gtkhtml-3.0.10
deleted file mode 100644
index af50c0fdbf8c..000000000000
--- a/gnome-extra/gtkhtml/files/digest-gtkhtml-3.0.10
+++ /dev/null
@@ -1,3 +0,0 @@
-MD5 b05b8551f7803f32ecfcf505a6310f3f gtkhtml-3.0.10.tar.bz2 1074973
-RMD160 28804d3bab14f2d76ce15c1f441fe873e5a607ba gtkhtml-3.0.10.tar.bz2 1074973
-SHA256 47492876466dcbcd82e371264c6a1422f82feb80e40fe25a42ccc1fb7897180c gtkhtml-3.0.10.tar.bz2 1074973
diff --git a/gnome-extra/gtkhtml/files/digest-gtkhtml-3.14.3-r1 b/gnome-extra/gtkhtml/files/digest-gtkhtml-3.14.3-r1
new file mode 100644
index 000000000000..c7beeb666ed5
--- /dev/null
+++ b/gnome-extra/gtkhtml/files/digest-gtkhtml-3.14.3-r1
@@ -0,0 +1,3 @@
+MD5 7c028f07e0eb061b0a895ac514265cf1 gtkhtml-3.14.3.tar.bz2 1283748
+RMD160 2761c056a1ed9d8759c1897afb61808872305f9d gtkhtml-3.14.3.tar.bz2 1283748
+SHA256 6419265c9766de668bd553742d915df095bdab2737a4583f63e67242d3903832 gtkhtml-3.14.3.tar.bz2 1283748
diff --git a/gnome-extra/gtkhtml/files/gtkhtml-3.14.3-get_left_margin-fix.patch b/gnome-extra/gtkhtml/files/gtkhtml-3.14.3-get_left_margin-fix.patch
new file mode 100644
index 000000000000..ed705fcbf30c
--- /dev/null
+++ b/gnome-extra/gtkhtml/files/gtkhtml-3.14.3-get_left_margin-fix.patch
@@ -0,0 +1,28 @@
+Patch from Milan Crha  <mcrha@redhat.com> from http://bugzilla.gnome.org/show_bug.cgi?id=426496
+to hopefully fix crashes in html_object_get_left_margin
+
+Index: src/htmlembedded.c
+===================================================================
+--- src/htmlembedded.c	(revision 8509)
++++ src/htmlembedded.c	(working copy)
+@@ -120,6 +120,7 @@
+ 			gtk_container_remove (GTK_CONTAINER (element->parent), element->widget);
+ 		} else {
+ 			g_object_ref_sink (element->widget);
++			g_object_unref (element->widget);
+ 		}
+ 	}
+ 
+Index: src/gtkhtml.c
+===================================================================
+--- src/gtkhtml.c	(revision 8509)
++++ src/gtkhtml.c	(working copy)
+@@ -4515,7 +4515,7 @@
+ {
+ 	GtkAdjustment *adj;
+ 	gint line_height;
+-	gfloat delta;
++	gfloat delta = 0;
+ 
+ 	/* we dont want scroll in editable (move cursor instead) */
+ 	if (html_engine_get_editable (html->engine) || html->engine->caret_mode)
diff --git a/gnome-extra/gtkhtml/gtkhtml-3.0.10.ebuild b/gnome-extra/gtkhtml/gtkhtml-3.0.10.ebuild
deleted file mode 100644
index a76d804df545..000000000000
--- a/gnome-extra/gtkhtml/gtkhtml-3.0.10.ebuild
+++ /dev/null
@@ -1,39 +0,0 @@
-# Copyright 1999-2007 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/gnome-extra/gtkhtml/gtkhtml-3.0.10.ebuild,v 1.2 2007/02/16 16:57:45 dang Exp $
-
-inherit gnome2 eutils
-
-DESCRIPTION="Lightweight HTML Rendering/Printing/Editing Engine"
-HOMEPAGE="http://www.gnome.org/"
-
-LICENSE="GPL-2"
-SLOT="3"
-KEYWORDS="alpha amd64 arm hppa ia64 ppc sparc x86"
-IUSE=""
-
-RDEPEND="=gnome-extra/gal-1.99.11*
-	>=net-libs/libsoup-1.99.28
-	>=gnome-base/libgnomeui-2.2
-	>=gnome-base/libgnomeprint-2.2
-	>=gnome-base/libgnomeprintui-2.2.1
-	>=gnome-base/libbonoboui-2.0
-	>=gnome-base/libbonobo-2.0
-	>=gnome-base/orbit-2.5.6
-	>=gnome-base/gnome-vfs-2.1
-	>=gnome-base/gail-1.1
-	>=dev-libs/libxml2-2.5"
-
-DEPEND="${RDEPEND}
-	>=dev-util/pkgconfig-0.12.0"
-
-USE_DESTDIR="1"
-SCROLLKEEPER_UPDATE="0"
-ELTCONF="--reverse-deps"
-
-src_unpack() {
-	unpack ${A}
-	cd ${S}
-	# bug 101970
-	epatch ${FILESDIR}/${P}-no-extern-cluealigned.diff
-}
diff --git a/gnome-extra/gtkhtml/gtkhtml-3.14.3-r1.ebuild b/gnome-extra/gtkhtml/gtkhtml-3.14.3-r1.ebuild
new file mode 100644
index 000000000000..d50b5dae2887
--- /dev/null
+++ b/gnome-extra/gtkhtml/gtkhtml-3.14.3-r1.ebuild
@@ -0,0 +1,43 @@
+# Copyright 1999-2007 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/gnome-extra/gtkhtml/gtkhtml-3.14.3-r1.ebuild,v 1.1 2007/08/31 14:27:41 leio Exp $
+
+inherit gnome2 eutils
+
+DESCRIPTION="Lightweight HTML Rendering/Printing/Editing Engine"
+HOMEPAGE="http://www.gnome.org/"
+
+LICENSE="GPL-2 LGPL-2"
+SLOT="3.14"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~sh ~sparc ~x86 ~x86-fbsd"
+IUSE="static"
+
+RDEPEND=">=gnome-base/gail-1.1
+	>=gnome-base/libgnomeui-2
+	>=x11-libs/gtk+-2.10
+	>=gnome-base/libglade-2
+	>=gnome-base/libbonoboui-2.2.4
+	>=gnome-base/orbit-2
+	>=gnome-base/libbonobo-2
+	>=net-libs/libsoup-2.1.6
+	>=x11-libs/pango-1.15.2
+	>=x11-themes/gnome-icon-theme-1.2"
+
+DEPEND="${RDEPEND}
+	  sys-devel/gettext
+	>=dev-util/intltool-0.35.5
+	>=dev-util/pkgconfig-0.9"
+
+DOCS="AUTHORS BUGS ChangeLog NEWS README TODO"
+
+pkg_setup() {
+	ELTCONF="--reverse-deps"
+	G2CONF="$(use_enable static) --enable-file-chooser"
+}
+
+src_unpack() {
+	gnome2_src_unpack
+
+	# A fix for a html_object_get_left_margin related crashes
+	epatch "${FILESDIR}/${P}-get_left_margin-fix.patch"
+}