Add patch to prevent immediate crash when rss extension is loaded. Thanks to Travis Glenn Hansen (thansen) for reporting on IRC.

Package-Manager: portage-2.2.0_alpha75/cvs/Linux x86_64

4 files changed, 56 insertions, 9 deletions

diff --git a/www-client/epiphany-extensions/ChangeLog b/www-client/epiphany-extensions/ChangeLog
index e41ad5bd77ad..a6d9eee80cae 100644
--- a/www-client/epiphany-extensions/ChangeLog
+++ b/www-client/epiphany-extensions/ChangeLog
@@ -1,6 +1,14 @@
 # ChangeLog for www-client/epiphany-extensions
 # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/www-client/epiphany-extensions/ChangeLog,v 1.156 2011/11/06 06:16:10 tetromino Exp $
+# $Header: /var/cvsroot/gentoo-x86/www-client/epiphany-extensions/ChangeLog,v 1.157 2011/11/19 06:20:52 tetromino Exp $
+
+*epiphany-extensions-3.2.0-r1 (19 Nov 2011)
+
+  19 Nov 2011; Alexandre Rostovtsev <tetromino@gentoo.org>
+  -epiphany-extensions-3.2.0.ebuild, +epiphany-extensions-3.2.0-r1.ebuild,
+  +files/epiphany-extensions-3.2.0-dbus-libs.patch:
+  Add patch to prevent immediate crash when rss extension is loaded. Thanks to
+  Travis Glenn Hansen (thansen) for reporting on IRC.
 
 *epiphany-extensions-3.2.0 (06 Nov 2011)
 
diff --git a/www-client/epiphany-extensions/Manifest b/www-client/epiphany-extensions/Manifest
index 3c19c2b3194d..2918174b05a8 100644
--- a/www-client/epiphany-extensions/Manifest
+++ b/www-client/epiphany-extensions/Manifest
@@ -2,19 +2,20 @@
 Hash: SHA256
 
 AUX epiphany-extensions-2.30.1-fix-es_ES.patch 4792 RMD160 47b5f80b0cfafba3b57877bbeb17d7798e86cd78 SHA1 6c73ee8fbfc5ab8871470cfa7065ca7c11d87666 SHA256 a2a8a073c2092cfdb1ecb82e6591109657a35f844553cef27bf5a91545679346
+AUX epiphany-extensions-3.2.0-dbus-libs.patch 804 RMD160 6fc47a58d1d030d3690085764f22bab558371ecb SHA1 5bc3f8ec361dbaa740053ccd360c4c2e5c1693e2 SHA256 6e1ba177e8480984b4c5447aca5e7cf8bcfacbb90bcf041fa1b6d2a4dc3e818b
 DIST epiphany-extensions-2.30.1.tar.bz2 1565963 RMD160 47fec6abc2afc771282e9e80751e7cdca665f751 SHA1 b6ac443ab9fcf82dab53518a4af2f43828fd781a SHA256 2f91b34e5854df382bb30bf93ae469490a5321d1ad006ff45032e3127eddb63d
 DIST epiphany-extensions-2.32.0.tar.bz2 1045984 RMD160 f4ff2a8b937486e8d5ac8571c52b1c8f34e9516e SHA1 20541ea312d1860886a8d377f26779a9bbc99ca6 SHA256 1d6ac9f24050f409812a1653156033c6c005c27bc590f2a54164715771a1e16e
 DIST epiphany-extensions-3.2.0.tar.xz 1403132 RMD160 9692e18ace17f40ac5ef506bfc67c561619678ec SHA1 0e9eb9f176e3c7c45d57f7885661af986f458eee SHA256 0707c9109bc6070f5f4e6ef3a9653e18ad5200eb57f396852b4c13cbac69baae
 EBUILD epiphany-extensions-2.30.1.ebuild 2085 RMD160 f7f6365b489d25290ce6f31a0c8b5768881d9d3c SHA1 0d47ba3c94d98691c834df704cc92116b40bba61 SHA256 a8c640e67f703a61766426303388bec3da58ca5f9b15b06727c4f2f65586f99b
 EBUILD epiphany-extensions-2.32.0-r1.ebuild 1837 RMD160 af01dde8ae6d830323ea16acce946d3eed983025 SHA1 1328d8b6b7c8daf80cfec1c227dd8dbcfa393f45 SHA256 6bc1e23ffcdce5abc167be7270986b595d167ad7cbc60d065aed94673e8efc3c
 EBUILD epiphany-extensions-2.32.0.ebuild 2032 RMD160 a4a7a9f530b48caf6e531fce4863f79652b9224c SHA1 a605d90fd7722d2a61cde6ae052e1a646c1e8a14 SHA256 f6a9578217fa8a55436f4dfca7daf83644a5cba22925e3cae2cd641554e2b4b8
-EBUILD epiphany-extensions-3.2.0.ebuild 1605 RMD160 aee9949cfd93947f3c9bcb436aa541e068cf5f9d SHA1 e02618589ea9de92b0aa8dc0e91f8fc77b8ef058 SHA256 3760a32d8e77d99a682dcd53c507adfd1fc0656268d60bc6d4f3321125e91eb1
-MISC ChangeLog 26687 RMD160 10947bf93e43cb5b14b0d90103e0161824bb4d80 SHA1 44dd77c5b5e4e23cf49032554721aa752d05f85a SHA256 f2b18cbf2a6986daf8cdfe0aa8f391f22713be40b012a3d31e9a9dd975d31f50
+EBUILD epiphany-extensions-3.2.0-r1.ebuild 1825 RMD160 a615ab57a2f8ea4c3f1ea1b6751f671235ac0c2c SHA1 210f8d7922eb8714e628d703bc459664b0f06197 SHA256 a0e269feef8294cfa63e9b0d8486f53df57593881aec12f2df59256c63c17c4d
+MISC ChangeLog 27052 RMD160 0378cfb3fe4db788c3140f802d8d2a676bf6a407 SHA1 7d6a5e23c8c08ed91a48add1ece27bbc7c38bf88 SHA256 1d393f11f04b06e4bcff82eb4e010477afc63a0c6d12c6883bea8743941bf2d8
 MISC metadata.xml 158 RMD160 c0e2bae8e91bb6be8922bac5e4f597302e06587e SHA1 38f78e9790bcd4382b4a49aa226aa6dda1d3a3d7 SHA256 3a7dbca0fdc557de69783e0663e2d76ddab129ea8a19b2d0ef6d3e5d1b947ce1
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.18 (GNU/Linux)
 
-iF4EAREIAAYFAk62Ji8ACgkQdjK8w9WeBnBTnwEArllJZb2Kg0Cs16XCzFUkooeB
-6SjPD8yCixeDsks7fv8A/RaT1v7iDSDoYkxAOTlKSIAxbJXaH7X79IHVu8gatVj4
-=PeLe
+iF4EAREIAAYFAk7HSsoACgkQdjK8w9WeBnBX/wD+J65i4y/a/mWMwUFux/Zc43iB
+lSzSZaVWyCJ1hPug+z0BAIeJ1TuWXto7kS4aG6dgyfTVMpHysHScSRQlOIvwawVv
+=rsbn
 -----END PGP SIGNATURE-----
diff --git a/www-client/epiphany-extensions/epiphany-extensions-3.2.0.ebuild b/www-client/epiphany-extensions/epiphany-extensions-3.2.0-r1.ebuild
index 688cd130f277..63b324e4c244 100644
--- a/www-client/epiphany-extensions/epiphany-extensions-3.2.0.ebuild
+++ b/www-client/epiphany-extensions/epiphany-extensions-3.2.0-r1.ebuild
@@ -1,12 +1,12 @@
 # Copyright 1999-2011 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/www-client/epiphany-extensions/epiphany-extensions-3.2.0.ebuild,v 1.1 2011/11/06 05:02:41 tetromino Exp $
+# $Header: /var/cvsroot/gentoo-x86/www-client/epiphany-extensions/epiphany-extensions-3.2.0-r1.ebuild,v 1.1 2011/11/19 06:20:52 tetromino Exp $
 
 EAPI="4"
 GCONF_DEBUG="yes"
 GNOME2_LA_PUNT="yes"
 
-inherit gnome2
+inherit autotools eutils gnome2
 
 DESCRIPTION="Extensions for the Epiphany web browser"
 HOMEPAGE="http://www.gnome.org/projects/epiphany/extensions.html"
@@ -30,7 +30,9 @@ RDEPEND=">=www-client/epiphany-3.2.0
 DEPEND="${RDEPEND}
 	>=dev-util/intltool-0.40
 	>=dev-util/pkgconfig-0.20
-	>=app-text/gnome-doc-utils-0.3.2"
+	>=app-text/gnome-doc-utils-0.3.2
+
+	gnome-base/gnome-common"
 # eautoreconf dependencies:
 #	  gnome-base/gnome-common
 
@@ -51,3 +53,10 @@ pkg_setup() {
 		--with-extensions=$(echo "${extensions}" | sed -e 's/[[:space:]]\+/,/g')"
 	DOCS="AUTHORS ChangeLog HACKING NEWS README"
 }
+
+src_prepare() {
+	# https://bugzilla.gnome.org/show_bug.cgi?id=664369; needs eautoreconf
+	epatch "${FILESDIR}/${PN}-3.2.0-dbus-libs.patch"
+	eautoreconf
+	gnome2_src_prepare
+}
diff --git a/www-client/epiphany-extensions/files/epiphany-extensions-3.2.0-dbus-libs.patch b/www-client/epiphany-extensions/files/epiphany-extensions-3.2.0-dbus-libs.patch
new file mode 100644
index 000000000000..1737c49ea342
--- /dev/null
+++ b/www-client/epiphany-extensions/files/epiphany-extensions-3.2.0-dbus-libs.patch
@@ -0,0 +1,29 @@
+From 2066084961b77810477b658cabbb7f6e90a17b94 Mon Sep 17 00:00:00 2001
+From: Alexandre Rostovtsev <tetromino@gentoo.org>
+Date: Sat, 19 Nov 2011 01:01:12 -0500
+Subject: [PATCH] rss: add DBUS_LIBS to librssextension_la_LIBADD
+
+Otherwise, epiphany-3.2 crashes.
+
+https://bugzilla.gnome.org/show_bug.cgi?id=664369
+---
+ extensions/rss/Makefile.am |    3 +++
+ 1 files changed, 3 insertions(+), 0 deletions(-)
+
+diff --git a/extensions/rss/Makefile.am b/extensions/rss/Makefile.am
+index ed6962f..da669c8 100644
+--- a/extensions/rss/Makefile.am
++++ b/extensions/rss/Makefile.am
+@@ -25,6 +25,9 @@ librssextension_la_LDFLAGS = \
+ 	-export-symbols $(top_srcdir)/ephy-extension.symbols \
+ 	$(AM_LDFLAGS)
+ 
++librssextension_la_LIBADD = \
++	$(DBUS_LIBS)
++
+ uidir = $(pkgdatadir)/ui
+ ui_DATA = rss-ui.ui
+ 
+-- 
+1.7.8.rc3
+