summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAlexandre Rostovtsev <tetromino@gentoo.org>2011-11-19 06:20:52 +0000
committerAlexandre Rostovtsev <tetromino@gentoo.org>2011-11-19 06:20:52 +0000
commitb02535c759d0dcd175a05b1106387fabe921b46a (patch)
tree21ed33bb1c5dccb0907c55de7c6a2af7f98f4528 /www-client/epiphany-extensions
parentVersion bump and remove old. (diff)
downloadgentoo-2-b02535c759d0dcd175a05b1106387fabe921b46a.tar.gz
gentoo-2-b02535c759d0dcd175a05b1106387fabe921b46a.tar.bz2
gentoo-2-b02535c759d0dcd175a05b1106387fabe921b46a.zip
Add patch to prevent immediate crash when rss extension is loaded. Thanks to Travis Glenn Hansen (thansen) for reporting on IRC.
(Portage version: 2.2.0_alpha75/cvs/Linux x86_64)
Diffstat (limited to 'www-client/epiphany-extensions')
-rw-r--r--www-client/epiphany-extensions/ChangeLog10
-rw-r--r--www-client/epiphany-extensions/epiphany-extensions-3.2.0-r1.ebuild (renamed from www-client/epiphany-extensions/epiphany-extensions-3.2.0.ebuild)15
-rw-r--r--www-client/epiphany-extensions/files/epiphany-extensions-3.2.0-dbus-libs.patch29
3 files changed, 50 insertions, 4 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/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
+