Update to galeon-2.0.7. Use xulrunner.

XXX: Some stock icons appear to not work, is there a missing GNOME
dependency here?

2.0.7 "Surprise!"
- Works with Firefox 2/3 and Xulrunner 1.8/1.9
  - Restored support for http authentication by Mike Hommey <mh@glandium.org>
  - Restored support for remembering passwords.
  - Partially restored support for user stylesheets.
    - Effect is global rather than per page but UI doesn't reflect this.

2.0.6 "Pining for the Fjords"
- Works with Firefox 2  and 3 and xulrunner 1.8 and 1.9
  - Thanks to Alexander Sack <asac@ubuntu.com> and Loïc Minier <lool#dooz.org>
    for the xulrunner 1.9 patches.
  - With Firefox 3/xulrunner 1.9, functionality remains crippled as
    documented in the 2.0.5 release notes.
- Support for older versions of Mozilla have been removed.
  You can use 2.0.5 to build against them if you need to.
- GConf pref added to suppress close confirmation for web forms.

4 files changed, 50 insertions, 7 deletions

diff --git a/www/galeon/patches/patch-ae b/www/galeon/patches/patch-ae
index 80028d72957..af5cdd7230c 100644
--- a/www/galeon/patches/patch-ae
+++ b/www/galeon/patches/patch-ae
@@ -1,17 +1,17 @@
-$NetBSD: patch-ae,v 1.6 2006/10/18 21:48:42 rillig Exp $
+$NetBSD: patch-ae,v 1.7 2009/08/06 07:48:06 tnn Exp $
 
---- configure.orig	2006-10-18 23:43:38.000000000 +0200
-+++ configure	2006-10-18 23:45:44.000000000 +0200
-@@ -28300,7 +28300,7 @@ fi
+--- configure.orig	2008-09-27 05:16:12.000000000 +0200
++++ configure
+@@ -29151,7 +29151,7 @@ fi
  
  
  
--if test "$gecko" == "xulrunner"; then
-+if test "$gecko" = "xulrunner"; then
+-if test "$gecko" == "xulrunner" || test "$gecko" == "libxul-embedding-unstable"; then
++if test "$gecko" = "xulrunner" || test "$gecko" = "libxul-embedding-unstable"; then
  	echo ""
  	echo "Note that Galeon has a runtime dependency on the 'cookie' and 'permission'"
  	echo "mozilla extensions. These are not built as part of the default xulrunner"
-@@ -28308,7 +28308,7 @@ if test "$gecko" == "xulrunner"; then
+@@ -29159,7 +29159,7 @@ if test "$gecko" == "xulrunner" || test 
  	echo ""
  fi
  
diff --git a/www/galeon/patches/patch-af b/www/galeon/patches/patch-af
new file mode 100644
index 00000000000..889654eb986
--- /dev/null
+++ b/www/galeon/patches/patch-af
@@ -0,0 +1,18 @@
+$NetBSD: patch-af,v 1.5 2009/08/06 07:48:06 tnn Exp $
+
+--- mozilla/EventContext.cpp.orig	2008-07-18 06:41:08.000000000 +0200
++++ mozilla/EventContext.cpp
+@@ -525,10 +525,11 @@ nsresult EventContext::GetTargetCoords (
+ 	{
+ 		PRInt32 val;
+ 		elem->GetOffsetTop(&val);	y += val;
+-		elem->GetScrollTop(&val);	y -= val;
+ 		elem->GetOffsetLeft(&val);	x += val;
++#if 0 /* XXX no such accessors, check in GNOME git if fixed ... */
++		elem->GetScrollTop(&val);	y -= val;
+ 		elem->GetScrollLeft(&val);	x -= val;
+-
++#endif
+ 		nsCOMPtr<nsIDOMElement> parent;
+ 		elem->GetOffsetParent(getter_AddRefs(parent));
+ 		elem = do_QueryInterface(parent);
diff --git a/www/galeon/patches/patch-ag b/www/galeon/patches/patch-ag
new file mode 100644
index 00000000000..8845f747564
--- /dev/null
+++ b/www/galeon/patches/patch-ag
@@ -0,0 +1,12 @@
+$NetBSD: patch-ag,v 1.3 2009/08/06 07:48:06 tnn Exp $
+
+--- mozilla/MozRegisterComponents.cpp.orig	2008-09-03 05:08:44.000000000 +0200
++++ mozilla/MozRegisterComponents.cpp
+@@ -62,6 +62,7 @@
+ #include <nsServiceManagerUtils.h>
+ #include <nsDocShellCID.h>
+ #include <nsXPCOMCID.h>
++#include <nsXPCOMCIDInternal.h>
+ 
+ #include <glib.h>
+ 
diff --git a/www/galeon/patches/patch-ah b/www/galeon/patches/patch-ah
new file mode 100644
index 00000000000..d41b7c1b641
--- /dev/null
+++ b/www/galeon/patches/patch-ah
@@ -0,0 +1,13 @@
+$NetBSD: patch-ah,v 1.3 2009/08/06 07:48:06 tnn Exp $
+
+--- src/Makefile.in.orig	2008-09-27 05:16:16.000000000 +0200
++++ src/Makefile.in
+@@ -199,7 +199,7 @@ EXEEXT = @EXEEXT@
+ F77 = @F77@
+ FFLAGS = @FFLAGS@
+ GALEON_DEPENDENCY_CFLAGS = @GALEON_DEPENDENCY_CFLAGS@
+-GALEON_DEPENDENCY_LIBS = @GALEON_DEPENDENCY_LIBS@
++GALEON_DEPENDENCY_LIBS = @GALEON_DEPENDENCY_LIBS@ `pkg-config --libs mozilla-nspr`
+ GCONFTOOL = @GCONFTOOL@
+ GCONF_REQUIRED = @GCONF_REQUIRED@
+ GCONF_SCHEMAS_INSTALL_FALSE = @GCONF_SCHEMAS_INSTALL_FALSE@