Minor galeon updates

(Portage version: 2.1.1_pre2-r8)

5 files changed, 84 insertions, 1 deletions

diff --git a/www-client/galeon/ChangeLog b/www-client/galeon/ChangeLog
index 1f68327b1875..7d29b5cf43b0 100644
--- a/www-client/galeon/ChangeLog
+++ b/www-client/galeon/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for www-client/galeon
 # Copyright 2002-2006 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/www-client/galeon/ChangeLog,v 1.25 2006/07/05 00:35:09 metalgod Exp $
+# $Header: /var/cvsroot/gentoo-x86/www-client/galeon/ChangeLog,v 1.26 2006/07/12 22:13:34 hanno Exp $
+
+*galeon-2.0.1-r2 (12 Jul 2006)
+
+  12 Jul 2006; Hanno Boeck <hanno@gentoo.org>
+  +files/galeon-2.0.1-findahead.diff,
+  +files/galeon-2.0.1-imagebehaviour.diff, +galeon-2.0.1-r2.ebuild:
+  Fix some minor issues and add seamonkey support.
 
   05 Jul 2006; Luis Medinas <metalgod@gentoo.org> galeon-2.0.1-r1.ebuild:
   Stable on amd64 see bug #138278.
diff --git a/www-client/galeon/files/digest-galeon-2.0.1-r2 b/www-client/galeon/files/digest-galeon-2.0.1-r2
new file mode 100644
index 000000000000..5d3e56887252
--- /dev/null
+++ b/www-client/galeon/files/digest-galeon-2.0.1-r2
@@ -0,0 +1,3 @@
+MD5 34d6e3a6ee78f9e4d12736e5d81b462b galeon-2.0.1.tar.bz2 2991656
+RMD160 79ed47c272df3c87eade11de1bfc3086602d6bcc galeon-2.0.1.tar.bz2 2991656
+SHA256 26f0d37b8e8d17d4ad51091527907c233dfbcd513d776608bb2d435a37aea4e6 galeon-2.0.1.tar.bz2 2991656
diff --git a/www-client/galeon/files/galeon-2.0.1-findahead.diff b/www-client/galeon/files/galeon-2.0.1-findahead.diff
new file mode 100644
index 000000000000..f9462ef0aa91
--- /dev/null
+++ b/www-client/galeon/files/galeon-2.0.1-findahead.diff
@@ -0,0 +1,13 @@
+diff -u -r1.47 -r1.48
+--- galeon-2.0.1/mozilla/EventContext.cpp	2006/01/14 13:48:21	1.47
++++ galeon-2.0.1/mozilla/EventContext.cpp	2006/03/05 12:08:23	1.48
+@@ -975,6 +975,9 @@
+ 	rv = node->GetOwnerDocument (getter_AddRefs (doc));
+ 	NS_ENSURE_SUCCESS (rv, retval);
+ 
++	nsCOMPtr<nsIDOMXULDocument> xul_document (do_QueryInterface(doc, &rv));
++	if (xul_document) return retval;
++
+ 	nsCOMPtr<nsIDOMNSHTMLDocument> htmlDoc (do_QueryInterface (doc));
+ 	if (htmlDoc)
+ 	{
diff --git a/www-client/galeon/files/galeon-2.0.1-imagebehaviour.diff b/www-client/galeon/files/galeon-2.0.1-imagebehaviour.diff
new file mode 100644
index 000000000000..799720f4ac25
--- /dev/null
+++ b/www-client/galeon/files/galeon-2.0.1-imagebehaviour.diff
@@ -0,0 +1,11 @@
+--- galeon-2.0.1/mozilla/mozilla-notifiers.cpp	2006-07-07 13:50:12.000000000 +0000
++++ galeon-2.0.1/mozilla/mozilla-notifiers.cpp-firefox	2006-07-07 13:39:33.000000000 +0000
+@@ -139,7 +139,7 @@
+ {
+ 	{ CONF_FILTERING_JAVA_ENABLED, BOOL_PREF, "security.enable_java"},
+ 	{ CONF_FILTERING_JAVASCRIPT_ENABLED, BOOL_PREF, "javascript.enabled"},
+-	{ CONF_FILTERING_IMAGE_LOADING_TYPE, INT_PREF, "network.image.imageBehavior"},
++	{ CONF_FILTERING_IMAGE_LOADING_TYPE, INT_PREF, "permissions.default.image"},
+ 	{ CONF_RENDERING_BG_COLOR, STRING_PREF, "browser.display.background_color"},
+ 	{ CONF_RENDERING_TEXT_COLOR, STRING_PREF, "browser.display.foreground_color"},
+ 	{ CONF_RENDERING_UNVISITED_LINKS, STRING_PREF, "browser.anchor_color"},
diff --git a/www-client/galeon/galeon-2.0.1-r2.ebuild b/www-client/galeon/galeon-2.0.1-r2.ebuild
new file mode 100644
index 000000000000..13541ed16aac
--- /dev/null
+++ b/www-client/galeon/galeon-2.0.1-r2.ebuild
@@ -0,0 +1,49 @@
+# Copyright 1999-2006 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/www-client/galeon/galeon-2.0.1-r2.ebuild,v 1.1 2006/07/12 22:13:34 hanno Exp $
+
+inherit gnome2
+
+DESCRIPTION="A GNOME Web browser based on gecko (mozilla's rendering engine)"
+HOMEPAGE="http://galeon.sourceforge.net"
+SRC_URI="mirror://sourceforge/galeon/${P}.tar.bz2"
+
+LICENSE="GPL-2"
+IUSE="seamonkey"
+KEYWORDS="~amd64 ~ia64 ~ppc ~sparc ~x86"
+SLOT="0"
+RDEPEND="seamonkey? ( www-client/seamonkey )
+	firefox? ( >=www-client/mozilla-firefox-1.5.0.4 )
+	>=dev-libs/glib-2
+	>=x11-libs/gtk+-2.4.0
+	>=dev-libs/libxml2-2.6.6
+	>=gnome-base/gconf-2.3.2
+	>=gnome-base/orbit-2
+	>=gnome-base/libbonobo-2
+	>=gnome-base/libbonoboui-2.1.1
+	>=gnome-base/libgnomeui-2.5.2
+	>=gnome-base/gnome-vfs-2
+	>=gnome-base/gnome-desktop-2.10.0
+	>=gnome-base/libglade-2.3.1
+	app-text/scrollkeeper"
+DEPEND="${RDEPEND}
+	dev-util/pkgconfig
+	>=dev-util/intltool-0.30
+	>=sys-devel/gettext-0.11"
+
+DOCS="AUTHORS ChangeLog FAQ README README.ExtraPrefs THANKS TODO NEWS"
+
+src_unpack() {
+	unpack ${A}
+	cd ${S}
+	epatch ${FILESDIR}/galeon-2.0.1-imagebehaviour.diff
+	epatch ${FILESDIR}/galeon-2.0.1-findahead.diff
+}
+
+src_compile() {
+	use seamonkey && myconf="--with-mozilla=seamonkey"
+	use seamonkey || myconf="--with-mozilla=firefox"
+
+	econf ${myconf} || die "configure failed"
+	emake || die "compile failed"
+}