diff options
| -rw-r--r-- | www-client/epiphany/ChangeLog | 10 | ||||
| -rw-r--r-- | www-client/epiphany/epiphany-2.26.1.ebuild | 79 | ||||
| -rw-r--r-- | www-client/epiphany/epiphany-2.26.3-r1.ebuild (renamed from www-client/epiphany/epiphany-2.26.2.ebuild) | 15 | ||||
| -rw-r--r-- | www-client/epiphany/files/epiphany-2.26.3-system-plugin.patch | 24 |
4 files changed, 45 insertions, 83 deletions
diff --git a/www-client/epiphany/ChangeLog b/www-client/epiphany/ChangeLog index bc976bf5cf81..2461fd01b4e1 100644 --- a/www-client/epiphany/ChangeLog +++ b/www-client/epiphany/ChangeLog @@ -1,6 +1,14 @@ # ChangeLog for www-client/epiphany # Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/www-client/epiphany/ChangeLog,v 1.212 2009/07/06 22:08:22 eva Exp $ +# $Header: /var/cvsroot/gentoo-x86/www-client/epiphany/ChangeLog,v 1.213 2009/08/02 10:12:47 eva Exp $ + +*epiphany-2.26.3-r1 (02 Aug 2009) + + 02 Aug 2009; Gilles Dartiguelongue <eva@gentoo.org> + -epiphany-2.26.1.ebuild, -epiphany-2.26.2.ebuild, + +epiphany-2.26.3-r1.ebuild, +files/epiphany-2.26.3-system-plugin.patch: + Version bump. Fix system plugin lookup, bug #279417. Clean up old + revisions. *epiphany-2.26.3 (07 Jul 2009) diff --git a/www-client/epiphany/epiphany-2.26.1.ebuild b/www-client/epiphany/epiphany-2.26.1.ebuild deleted file mode 100644 index ffc7eeaa27d3..000000000000 --- a/www-client/epiphany/epiphany-2.26.1.ebuild +++ /dev/null @@ -1,79 +0,0 @@ -# Copyright 1999-2009 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/www-client/epiphany/epiphany-2.26.1.ebuild,v 1.2 2009/07/02 07:13:39 nirbheek Exp $ - -EAPI="2" - -inherit gnome2 eutils multilib autotools - -DESCRIPTION="GNOME webbrowser based on the mozilla rendering engine" -HOMEPAGE="http://www.gnome.org/projects/epiphany/" - -LICENSE="GPL-2" -SLOT="0" -KEYWORDS="~alpha ~amd64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86" -IUSE="avahi doc networkmanager python spell" - -RDEPEND=">=dev-libs/glib-2.18.0 - >=x11-libs/gtk+-2.16.0 - >=dev-libs/libxml2-2.6.12 - >=dev-libs/libxslt-1.1.7 - >=gnome-base/libglade-2.3.1 - >=gnome-base/libgnome-2.14 - >=gnome-base/libgnomeui-2.14 - >=gnome-base/gnome-desktop-2.9.91 - >=x11-libs/startup-notification-0.5 - >=x11-libs/libnotify-0.4 - >=media-libs/libcanberra-0.3[gtk] - >=dev-libs/dbus-glib-0.71 - >=gnome-base/gconf-2 - >=app-text/iso-codes-0.35 - avahi? ( >=net-dns/avahi-0.6.22 ) - networkmanager? ( net-misc/networkmanager ) - =net-libs/xulrunner-1.9* - python? ( - >=dev-lang/python-2.3 - >=dev-python/pygtk-2.7.1 - >=dev-python/gnome-python-2.6 ) - spell? ( app-text/enchant ) - x11-themes/gnome-icon-theme" -DEPEND="${RDEPEND} - app-text/scrollkeeper - >=dev-util/pkgconfig-0.9 - >=dev-util/intltool-0.40 - >=app-text/gnome-doc-utils-0.3.2 - doc? ( >=dev-util/gtk-doc-1 )" - -DOCS="AUTHORS ChangeLog* HACKING MAINTAINERS NEWS README TODO" - -pkg_setup() { - G2CONF="${G2CONF} - --disable-scrollkeeper - --with-gecko=libxul-embedding - --enable-certificate-manager - --with-distributor-name=Gentoo - --enable-canberra - $(use_enable avahi zeroconf) - $(use_enable networkmanager network-manager) - $(use_enable spell spell-checker) - $(use_enable python)" -} - -src_prepare() { - gnome2_src_prepare - - # Fix compilation with xulrunner 1.9.1, bug #263990 - epatch "${FILESDIR}/${PN}-2.26.0-xulrunner191.patch" - - # Fix libcanberra automagic support, bug #266232 - epatch "${FILESDIR}/${P}-automagic-libcanberra.patch" - - # Fix sandbox violations, bug 263585 - epatch "${FILESDIR}/${PN}-2.26-fix-sandbox-violations.patch" - - # Make it libtool-1 compatible - rm -v m4/lt* m4/libtool.m4 || die "removing libtool macros failed" - - intltoolize --force --copy --automake || die "intltoolize failed" - eautoreconf -} diff --git a/www-client/epiphany/epiphany-2.26.2.ebuild b/www-client/epiphany/epiphany-2.26.3-r1.ebuild index 92377aeea34a..bf42d762f746 100644 --- a/www-client/epiphany/epiphany-2.26.2.ebuild +++ b/www-client/epiphany/epiphany-2.26.3-r1.ebuild @@ -1,6 +1,6 @@ # Copyright 1999-2009 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/www-client/epiphany/epiphany-2.26.2.ebuild,v 1.2 2009/07/02 07:13:39 nirbheek Exp $ +# $Header: /var/cvsroot/gentoo-x86/www-client/epiphany/epiphany-2.26.3-r1.ebuild,v 1.1 2009/08/02 10:12:47 eva Exp $ EAPI="2" @@ -50,7 +50,6 @@ pkg_setup() { G2CONF="${G2CONF} --disable-scrollkeeper --with-gecko=libxul-embedding - --enable-certificate-manager --with-distributor-name=Gentoo --enable-canberra $(use_enable avahi zeroconf) @@ -68,12 +67,22 @@ src_prepare() { # Fix libcanberra automagic support, bug #266232 epatch "${FILESDIR}/${PN}-2.26.1-automagic-libcanberra.patch" - # Fix sandbox violations, bug 263585 + # Fix sandbox violations, bug #263585 epatch "${FILESDIR}/${PN}-2.26-fix-sandbox-violations.patch" + # Fix detection of system plugin, bug #279417 + epatch "${FILESDIR}/${P}-system-plugin.patch" + # Make it libtool-1 compatible rm -v m4/lt* m4/libtool.m4 || die "removing libtool macros failed" intltoolize --force --copy --automake || die "intltoolize failed" eautoreconf } + +src_install() { + gnome2_src_install + + # Drop useless .la file + find "${D}" -name '*.la' -delete +} diff --git a/www-client/epiphany/files/epiphany-2.26.3-system-plugin.patch b/www-client/epiphany/files/epiphany-2.26.3-system-plugin.patch new file mode 100644 index 000000000000..71b408141e76 --- /dev/null +++ b/www-client/epiphany/files/epiphany-2.26.3-system-plugin.patch @@ -0,0 +1,24 @@ +# Allow plugins installed in system to be used +# Gentoo: https://bugs.gentoo.org/attachment.cgi?id=199400 +--- a/embed/mozilla/Makefile.am 2009-07-27 21:18:46.658006845 -0500 ++++ b/embed/mozilla/Makefile.am 2009-07-27 21:19:46.633007194 -0500 +@@ -161,7 +161,7 @@ + -DPLUGINDIR=\"$(libdir)/epiphany/$(EPIPHANY_MAJOR)/plugins\" \ + -DMOZILLA_HOME=\"$(GECKO_HOME)\" \ + -DMOZILLA_PREFIX=\"$(GECKO_PREFIX)\" \ +- -DMOZILLA_NATIVE_PLUGINSDIR=\"$(libdir)/mozilla/plugins\" \ ++ -DMOZILLA_NATIVE_PLUGINSDIR=\"$(libdir)/nsbrowser/plugins\" \ + -DUA_VERSION=\"$(EPIPHANY_UA_VERSION)\" \ + -DALLOW_PRIVATE_API \ + $(AM_CPPFLAGS) +--- a/embed/mozilla/Makefile.in 2009-07-27 21:18:53.673984077 -0500 ++++ b/embed/mozilla/Makefile.in 2009-07-27 21:20:06.010983867 -0500 +@@ -493,7 +493,7 @@ + -DPLUGINDIR=\"$(libdir)/epiphany/$(EPIPHANY_MAJOR)/plugins\" \ + -DMOZILLA_HOME=\"$(GECKO_HOME)\" \ + -DMOZILLA_PREFIX=\"$(GECKO_PREFIX)\" \ +- -DMOZILLA_NATIVE_PLUGINSDIR=\"$(libdir)/mozilla/plugins\" \ ++ -DMOZILLA_NATIVE_PLUGINSDIR=\"$(libdir)/nsbrowser/plugins\" \ + -DUA_VERSION=\"$(EPIPHANY_UA_VERSION)\" -DALLOW_PRIVATE_API \ + $(AM_CPPFLAGS) $(am__append_7) + libephymozillaembed_la_CXXFLAGS = \ |