Add patch for a fix for get_left_margin related crashes

Package-Manager: portage-2.1.3.7

7 files changed, 100 insertions, 57 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/Manifest b/gnome-extra/gtkhtml/Manifest
index 54d1773c015f..ed14d1a79f08 100644
--- a/gnome-extra/gtkhtml/Manifest
+++ b/gnome-extra/gtkhtml/Manifest
@@ -5,6 +5,10 @@ AUX gtkhtml-3.0.10-no-extern-cluealigned.diff 423 RMD160 9d1018a40aabae678306c0a
 MD5 ccd71f8847f9cd60a587dd91fa691341 files/gtkhtml-3.0.10-no-extern-cluealigned.diff 423
 RMD160 9d1018a40aabae678306c0a62421d2102c9d8c29 files/gtkhtml-3.0.10-no-extern-cluealigned.diff 423
 SHA256 d618e6c7b1fe7bd49a344c8de8b34aee49dbbbd2ea667b2d30bb8d0bfe7aed2c files/gtkhtml-3.0.10-no-extern-cluealigned.diff 423
+AUX gtkhtml-3.14.3-get_left_margin-fix.patch 921 RMD160 a5ec7fcfc9303d6af2fd678d64b3ff7032123f83 SHA1 fabdf86dc71d36fc293491712ef249da53ba0333 SHA256 31273d61b5488296dba96f70c53fa04048718f82657eb1b8c90a72e803dfc9bc
+MD5 9f33012b4f53d96cf6572255e797a6af files/gtkhtml-3.14.3-get_left_margin-fix.patch 921
+RMD160 a5ec7fcfc9303d6af2fd678d64b3ff7032123f83 files/gtkhtml-3.14.3-get_left_margin-fix.patch 921
+SHA256 31273d61b5488296dba96f70c53fa04048718f82657eb1b8c90a72e803dfc9bc files/gtkhtml-3.14.3-get_left_margin-fix.patch 921
 AUX gtkhtml-3.2-i18n.patch 1411 RMD160 27fd26f798c0294da7fee1fa26cef95546afb283 SHA1 d7f9050512d63a3a1ac4be2a3bbcdf553ca5088f SHA256 45c7763730b3a886ba6dd4b69d20cb83dcc5c918385971e48905e7ad6e8849f7
 MD5 b954bf799749526cc35e4d73e5ebbaba files/gtkhtml-3.2-i18n.patch 1411
 RMD160 27fd26f798c0294da7fee1fa26cef95546afb283 files/gtkhtml-3.2-i18n.patch 1411
@@ -36,14 +40,14 @@ EBUILD gtkhtml-3.0.10-r1.ebuild 1068 RMD160 a27ef38a4b4f2d971317def63d8d7f0b6124
 MD5 f92ce13ee76a094ba699fe51ecb8f7f4 gtkhtml-3.0.10-r1.ebuild 1068
 RMD160 a27ef38a4b4f2d971317def63d8d7f0b612473b5 gtkhtml-3.0.10-r1.ebuild 1068
 SHA256 f66697f2df08988e43aa7b8347c7d06409b37b4f89c11e6b36bce74ed26f72ed gtkhtml-3.0.10-r1.ebuild 1068
-EBUILD gtkhtml-3.0.10.ebuild 971 RMD160 4027287ddd2713b857cdaabdd67d2b2b90afae0c SHA1 243872f41d9a162f4a145b1b5d93920c1069b47c SHA256 aee81be496cb9a7cfb0f1ef06f09c8dead20e36dd655e9d416efae076fa489b0
-MD5 40220797734b6266f781ceaf7a7aa7de gtkhtml-3.0.10.ebuild 971
-RMD160 4027287ddd2713b857cdaabdd67d2b2b90afae0c gtkhtml-3.0.10.ebuild 971
-SHA256 aee81be496cb9a7cfb0f1ef06f09c8dead20e36dd655e9d416efae076fa489b0 gtkhtml-3.0.10.ebuild 971
 EBUILD gtkhtml-3.12.3.ebuild 1258 RMD160 e32cc7c1504ad2a17c415bb0666393dec26518bd SHA1 905be6274a383d2b753c9b3564384a304822c0b6 SHA256 7abbbe13f86f8101445403b9747d70aa21ed617fabd1156ef3c318d9d78afbcc
 MD5 62dfe815b80c611699dd4affa5d15339 gtkhtml-3.12.3.ebuild 1258
 RMD160 e32cc7c1504ad2a17c415bb0666393dec26518bd gtkhtml-3.12.3.ebuild 1258
 SHA256 7abbbe13f86f8101445403b9747d70aa21ed617fabd1156ef3c318d9d78afbcc gtkhtml-3.12.3.ebuild 1258
+EBUILD gtkhtml-3.14.3-r1.ebuild 1139 RMD160 3d866aa094d258df370f7fdac1bbe69e200c7011 SHA1 76a79876d7a528fb70c06bccdc73f0f426b8d7f6 SHA256 60b2d210c9b48d2e16ef70dabe0d5d72067d76b479b029bd2cb931cf626423f4
+MD5 d81333f81dd76ea91fbb434b1e6eb148 gtkhtml-3.14.3-r1.ebuild 1139
+RMD160 3d866aa094d258df370f7fdac1bbe69e200c7011 gtkhtml-3.14.3-r1.ebuild 1139
+SHA256 60b2d210c9b48d2e16ef70dabe0d5d72067d76b479b029bd2cb931cf626423f4 gtkhtml-3.14.3-r1.ebuild 1139
 EBUILD gtkhtml-3.14.3.ebuild 969 RMD160 7db8d92ebd86cb628e48deb7475bd9ff762756fc SHA1 c35be3f10499307f527ffd3f0a9fd3183f64487e SHA256 e0d4b0e30a66693868574e70b935f0ea11822c3d2f44ac2896bb3c7755e39e62
 MD5 87db1821ec11ccae63840472b9b1a9fc gtkhtml-3.14.3.ebuild 969
 RMD160 7db8d92ebd86cb628e48deb7475bd9ff762756fc gtkhtml-3.14.3.ebuild 969
@@ -60,10 +64,10 @@ EBUILD gtkhtml-3.6.2.ebuild 1107 RMD160 fba62d4366bff28c6f69f491af5040addd518e67
 MD5 8ac7c790324583c6de86def07ea594a1 gtkhtml-3.6.2.ebuild 1107
 RMD160 fba62d4366bff28c6f69f491af5040addd518e67 gtkhtml-3.6.2.ebuild 1107
 SHA256 231bfb55faecfd83e28b87200030d4423ec1277eacefd1d40dcfe4d54fec865e gtkhtml-3.6.2.ebuild 1107
-MISC ChangeLog 15769 RMD160 bb55297171338374e6e4916102629d335258e802 SHA1 c17e511ddf07a1df6505cac8f3794090c582894a SHA256 12fbe2c48ea7811cd89e3240c14b4ef72c1a0a118de223529e064fa66422d729
-MD5 c5e12540d6c57ceb02ad1200d8c6fd28 ChangeLog 15769
-RMD160 bb55297171338374e6e4916102629d335258e802 ChangeLog 15769
-SHA256 12fbe2c48ea7811cd89e3240c14b4ef72c1a0a118de223529e064fa66422d729 ChangeLog 15769
+MISC ChangeLog 16011 RMD160 0794a48ec5298afae6642bb10351aaab9815d018 SHA1 b94835c30c3189f293bd6d9ba3fe173e25bce68a SHA256 52b9958489b37f9d718954bfe97cda5594c8b0fe7e74873150a54361690a954b
+MD5 124542c3ca1134de6596bdd5a562f429 ChangeLog 16011
+RMD160 0794a48ec5298afae6642bb10351aaab9815d018 ChangeLog 16011
+SHA256 52b9958489b37f9d718954bfe97cda5594c8b0fe7e74873150a54361690a954b ChangeLog 16011
 MISC metadata.xml 158 RMD160 c0e2bae8e91bb6be8922bac5e4f597302e06587e SHA1 38f78e9790bcd4382b4a49aa226aa6dda1d3a3d7 SHA256 3a7dbca0fdc557de69783e0663e2d76ddab129ea8a19b2d0ef6d3e5d1b947ce1
 MD5 03ad2e6c4ab41244af1015a8bbb0b39f metadata.xml 158
 RMD160 c0e2bae8e91bb6be8922bac5e4f597302e06587e metadata.xml 158
@@ -71,9 +75,6 @@ SHA256 3a7dbca0fdc557de69783e0663e2d76ddab129ea8a19b2d0ef6d3e5d1b947ce1 metadata
 MD5 e8ad10c6fea0b49024098ebc98068753 files/digest-gtkhtml-2.6.3 253
 RMD160 02b63960edbe37d2b1de6f0947897343d819cfa5 files/digest-gtkhtml-2.6.3 253
 SHA256 d9770b3ca2a64d14fd429f9fd7e16535e02aa2fe4c8b0b44f78246e937b4b421 files/digest-gtkhtml-2.6.3 253
-MD5 5f0d72f673943cc62678e6a8e2d9a6cd files/digest-gtkhtml-3.0.10 250
-RMD160 dc17c5f94e13e69d757eead76053ee2665350c21 files/digest-gtkhtml-3.0.10 250
-SHA256 d1d6b0dfb5d716eb9c9cb18daa5d93679dfd75cbcd521ca63e220bb6ec83a2f6 files/digest-gtkhtml-3.0.10 250
 MD5 5f0d72f673943cc62678e6a8e2d9a6cd files/digest-gtkhtml-3.0.10-r1 250
 RMD160 dc17c5f94e13e69d757eead76053ee2665350c21 files/digest-gtkhtml-3.0.10-r1 250
 SHA256 d1d6b0dfb5d716eb9c9cb18daa5d93679dfd75cbcd521ca63e220bb6ec83a2f6 files/digest-gtkhtml-3.0.10-r1 250
@@ -83,6 +84,9 @@ SHA256 9b7f3b7700b7fdb4027d937db9025188ff2d87280e336de5b294006a657e6e8c files/di
 MD5 edbc6b85c48dd9215ed63a816527a9c5 files/digest-gtkhtml-3.14.3 250
 RMD160 ccec8673b5529c6bead99a4f7c36cfcdbdf3a9d4 files/digest-gtkhtml-3.14.3 250
 SHA256 87119cb45f3dad294d3d8ffb711b5853c7181edc8667e9558bfec9fbf2d783ed files/digest-gtkhtml-3.14.3 250
+MD5 edbc6b85c48dd9215ed63a816527a9c5 files/digest-gtkhtml-3.14.3-r1 250
+RMD160 ccec8673b5529c6bead99a4f7c36cfcdbdf3a9d4 files/digest-gtkhtml-3.14.3-r1 250
+SHA256 87119cb45f3dad294d3d8ffb711b5853c7181edc8667e9558bfec9fbf2d783ed files/digest-gtkhtml-3.14.3-r1 250
 MD5 1766d4c6fabb2fc26806dce873b739f9 files/digest-gtkhtml-3.2.4 247
 RMD160 5a4014ebc06c78190b748e7c7ad38cdf785ea544 files/digest-gtkhtml-3.2.4 247
 SHA256 a813a24e67df9fb4f484b6ecbd878b45745c8ad5c97a7d7d20a84da1540d9072 files/digest-gtkhtml-3.2.4 247
@@ -95,7 +99,7 @@ SHA256 b61839611a0d72760e25c475b2d41598fdf167d50b10e08ee1aaefb946d10b18 files/di
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.6 (GNU/Linux)
 
-iD8DBQFG1YeLoeSe8B0zEfwRAqTrAKCKYJIM1DCxGbXi2D5CSGr6XI3TZgCfaYuF
-wsnv3Eff8Djcjuc9XnAaKrE=
-=ZjGl
+iD8DBQFG2CT6keYb6olFHJcRAtHLAJ9AtUQT5xetQiNOSX5YBzG4W0JrBQCfYlTK
+C1Ba7W2EJ0Q68k5e8XFIml4=
+=/p80
 -----END PGP SIGNATURE-----
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"
+}