5 files changed, 162 insertions, 1 deletions
diff --git a/www-client/epiphany/ChangeLog b/www-client/epiphany/ChangeLog
index f5203b8ed4dc..99943d6fc68d 100644
--- a/www-client/epiphany/ChangeLog
+++ b/www-client/epiphany/ChangeLog
@@ -1,6 +1,14 @@
 # ChangeLog for www-client/epiphany
 # Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/www-client/epiphany/ChangeLog,v 1.228 2010/03/11 00:17:56 eva Exp $
+# $Header: /var/cvsroot/gentoo-x86/www-client/epiphany/ChangeLog,v 1.229 2010/03/12 11:03:32 pacho Exp $
+
+*epiphany-2.26.3-r4 (12 Mar 2010)
+
+  12 Mar 2010; Pacho Ramos <pacho@gentoo.org> +epiphany-2.26.3-r4.ebuild,
+  +files/epiphany-2.26.3-glib.patch, +files/epiphany-2.26.3-nspr.patch,
+  +files/epiphany-2.26.3-xul192.patch:
+  Support xulrunner-1.9.2, thanks a lot to Hicham HAOUARI for his help and
+  patches.
 
   11 Mar 2010; Gilles Dartiguelongue <eva@gentoo.org>
   epiphany-2.24.3.ebuild, -epiphany-2.24.3-r10.ebuild,
diff --git a/www-client/epiphany/epiphany-2.26.3-r4.ebuild b/www-client/epiphany/epiphany-2.26.3-r4.ebuild
new file mode 100644
index 000000000000..9b98de257ddc
--- /dev/null
+++ b/www-client/epiphany/epiphany-2.26.3-r4.ebuild
@@ -0,0 +1,103 @@
+# Copyright 1999-2010 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/www-client/epiphany/epiphany-2.26.3-r4.ebuild,v 1.1 2010/03/12 11:03:32 pacho 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
+		--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 libcanberra automagic support, bug #266232
+	epatch "${FILESDIR}/${PN}-2.26.1-automagic-libcanberra.patch"
+
+	# 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"
+
+	# Fix missing favicons of most web-sites, bug #290024
+	epatch "${FILESDIR}/${P}-favicon-cache.patch"
+
+	# Fix download location reset, bug #292867
+	epatch "${FILESDIR}/${P}-revert-downloadir.patch"
+
+	# Port to xulrunner-1.9.2, bug #303583
+	epatch "${FILESDIR}/${P}-xul192.patch"
+	sed -i s/TextZoom/FullZoom/  embed/mozilla/EphyBrowser.cpp || die
+
+	# Fix nspr dependency, bug #303583
+	epatch "${FILESDIR}/${P}-nspr.patch"
+
+	# Fix missing glib header, bug #303583
+	epatch "${FILESDIR}/${P}-glib.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
+
+	# All .la files are for plugins or extensions that are dlopened.
+	# Upstream should pass *_la_LIBTOOLFLAGS = --tag=disable-static to drop them instead
+	# but gecko is a dead branch for them, so do it ourselves:
+	find "${D}" -name '*.la' -delete
+}
diff --git a/www-client/epiphany/files/epiphany-2.26.3-glib.patch b/www-client/epiphany/files/epiphany-2.26.3-glib.patch
new file mode 100644
index 000000000000..0d99a3040559
--- /dev/null
+++ b/www-client/epiphany/files/epiphany-2.26.3-glib.patch
@@ -0,0 +1,22 @@
+--- embed/ephy-embed-shell.c.old	2010-03-10 11:43:01.773638266 +0000
++++ embed/ephy-embed-shell.c	2010-03-10 11:43:21.957638633 +0000
+@@ -21,6 +21,7 @@
+ #include <config.h>
+ 
+ #include <glib.h>
++#include <glib/gstdio.h>
+ 
+ #include <glib/gi18n.h>
+ #include <gtk/gtk.h>
+
+--- embed/ephy-favicon-cache.c.old	2010-03-10 11:45:38.433638346 +0000
++++ embed/ephy-favicon-cache.c	2010-03-10 11:46:05.265637902 +0000
+@@ -39,6 +39,8 @@
+ #include "ephy-glib-compat.h"
+ 
+ #include <glib.h>
++#include <glib/gstdio.h>
++
+ #include <gio/gio.h>
+ 
+ #define EPHY_FAVICON_CACHE_XML_ROOT    (const xmlChar *)"ephy_favicons_cache"
diff --git a/www-client/epiphany/files/epiphany-2.26.3-nspr.patch b/www-client/epiphany/files/epiphany-2.26.3-nspr.patch
new file mode 100644
index 000000000000..cef222b95dd9
--- /dev/null
+++ b/www-client/epiphany/files/epiphany-2.26.3-nspr.patch
@@ -0,0 +1,14 @@
+--- configure.ac.old	2010-03-01 17:07:05.000000000 +0000
++++ configure.ac	2010-03-01 17:07:33.000000000 +0000
+@@ -532,9 +532,9 @@ AC_MSG_RESULT([$enable_desktop_file_plug
+ 
+ if test "$enable_desktop_file_plugin" = "yes"; then
+ 	if test "${gecko_cv_gecko}" = "libxul-embedding" -o "${gecko_cv_gecko}" = "libxul"; then
+-		PKG_CHECK_MODULES([DESKTOP_FILE_PLUGIN_DEP],[${gecko_cv_gecko} mozilla-plugin gtk+-2.0 >= 2.6.0])
++		PKG_CHECK_MODULES([DESKTOP_FILE_PLUGIN_DEP],[${gecko_cv_gecko} mozilla-plugin gtk+-2.0 >= 2.6.0 nspr])
+ 	else
+-		PKG_CHECK_MODULES([DESKTOP_FILE_PLUGIN_DEP],[${gecko_cv_gecko}-xpcom ${gecko_cv_gecko}-plugin gtk+-2.0 >= 2.6.0])
++		PKG_CHECK_MODULES([DESKTOP_FILE_PLUGIN_DEP],[${gecko_cv_gecko}-xpcom ${gecko_cv_gecko}-plugin gtk+-2.0 >= 2.6.0 nspr])
+ 	fi
+ 	AC_SUBST([DESKTOP_FILE_PLUGIN_DEP_CFLAGS])
+ 	AC_SUBST([DESKTOP_FILE_PLUGIN_DEP_LIBS])
diff --git a/www-client/epiphany/files/epiphany-2.26.3-xul192.patch b/www-client/epiphany/files/epiphany-2.26.3-xul192.patch
new file mode 100644
index 000000000000..6bb5e0b5b11c
--- /dev/null
+++ b/www-client/epiphany/files/epiphany-2.26.3-xul192.patch
@@ -0,0 +1,14 @@
+--- embed/mozilla/EphyXULAppInfo.cpp~	2009-05-28 21:26:21.000000000 +0200
++++ embed/mozilla/EphyXULAppInfo.cpp	2010-03-08 23:29:42.000000000 +0100
+@@ -128,3 +128,11 @@
+   aXPCOMABI.Assign (EPHY_HOST_CPU "-gcc3");
+   return NS_OK;
+ }
++
++/* readonly attribute AUTF8String WidgetToolkit; */
++NS_IMETHODIMP
++EphyXULAppInfo::GetWidgetToolkit(nsACString & aWidgetToolkit)
++{
++  aWidgetToolkit.Assign ("gtk");
++  return NS_OK;
++}