Update galeon to 1.3.17:

    - Works with Mozilla 1.4 through 1.8a2 and trunk
    - Support printing with Xprint
    - Get rid of the startup script; you need to update your scripts
      if you have been using galeon-bin directly
    - Add saved files in recent-files list for easy access
    - Add support for vfolders of bookmarks.
    - Restore the 'Reload Frame' context menu item
    - Add progress dialog when printing.
    - Don't copy the history of the old tab, when creating an
      unrelated new tab
    - Support the new GNOME 2.8 mime type system
    - lots of other bug fixes

Also include fix for http://bugzilla.gnome.org/show_bug.cgi?id=153693

5 files changed, 24 insertions, 10 deletions

diff --git a/www/galeon/patches/patch-aa b/www/galeon/patches/patch-aa
index d2de77cbdd1..eeb0acf90cc 100644
--- a/www/galeon/patches/patch-aa
+++ b/www/galeon/patches/patch-aa
@@ -1,6 +1,6 @@
-$NetBSD: patch-aa,v 1.11 2004/07/20 17:37:23 abs Exp $
+$NetBSD: patch-aa,v 1.12 2004/10/05 16:54:29 abs Exp $
 
---- configure.in.orig	2004-07-03 17:49:13.000000000 +0100
+--- configure.in.orig	2004-08-07 21:42:52.000000000 +0100
 +++ configure.in
 @@ -213,12 +213,12 @@ AC_ARG_WITH(mozilla-snapshot,
  AC_MSG_RESULT($MOZILLA_VERSION$autodetect)
diff --git a/www/galeon/patches/patch-ab b/www/galeon/patches/patch-ab
index 30279a9bc6b..3593fb8bfd4 100644
--- a/www/galeon/patches/patch-ab
+++ b/www/galeon/patches/patch-ab
@@ -1,8 +1,8 @@
-$NetBSD: patch-ab,v 1.9 2004/07/20 17:37:23 abs Exp $
+$NetBSD: patch-ab,v 1.10 2004/10/05 16:54:29 abs Exp $
 
---- configure.orig	2004-07-03 18:07:57.000000000 +0100
+--- configure.orig	2004-08-08 21:12:00.000000000 +0100
 +++ configure
-@@ -22732,11 +22732,11 @@ fi;
+@@ -22744,11 +22744,11 @@ fi;
  echo "$as_me:$LINENO: result: $MOZILLA_VERSION$autodetect" >&5
  echo "${ECHO_T}$MOZILLA_VERSION$autodetect" >&6
  
diff --git a/www/galeon/patches/patch-ac b/www/galeon/patches/patch-ac
index 4286b0d9ac7..e0955535d09 100644
--- a/www/galeon/patches/patch-ac
+++ b/www/galeon/patches/patch-ac
@@ -1,6 +1,6 @@
-$NetBSD: patch-ac,v 1.5 2004/07/20 17:37:23 abs Exp $
+$NetBSD: patch-ac,v 1.6 2004/10/05 16:54:29 abs Exp $
 
---- galeon.desktop.in.orig	2003-09-17 22:16:18.000000000 +0100
+--- galeon.desktop.in.orig	2004-07-21 21:46:59.000000000 +0100
 +++ galeon.desktop.in
 @@ -7,7 +7,7 @@ _Comment=Browse the web
  Exec=galeon
diff --git a/www/galeon/patches/patch-ad b/www/galeon/patches/patch-ad
index db1142e3611..4c9048e1108 100644
--- a/www/galeon/patches/patch-ad
+++ b/www/galeon/patches/patch-ad
@@ -1,8 +1,8 @@
-$NetBSD: patch-ad,v 1.3 2004/07/20 17:37:23 abs Exp $
+$NetBSD: patch-ad,v 1.4 2004/10/05 16:54:29 abs Exp $
 
---- sounds/Makefile.in.orig	2004-07-03 18:08:08.000000000 +0100
+--- sounds/Makefile.in.orig	2004-08-08 21:12:13.000000000 +0100
 +++ sounds/Makefile.in
-@@ -223,7 +223,8 @@ sharedstatedir = @sharedstatedir@
+@@ -232,7 +232,8 @@ sharedstatedir = @sharedstatedir@
  sysconfdir = @sysconfdir@
  target_alias = @target_alias@
  galeon_SOUNDS = clicked.wav
diff --git a/www/galeon/patches/patch-ae b/www/galeon/patches/patch-ae
new file mode 100644
index 00000000000..32f21b23fe1
--- /dev/null
+++ b/www/galeon/patches/patch-ae
@@ -0,0 +1,14 @@
+$NetBSD: patch-ae,v 1.4 2004/10/05 16:54:29 abs Exp $
+
+--- mozilla/mozilla-embed.cpp.orig	2004-10-05 13:03:37.000000000 +0100
++++ mozilla/mozilla-embed.cpp
+@@ -1388,7 +1388,8 @@ impl_set_encoding (GaleonEmbed *embed,
+ 	rv = wrapper->ForceEncoding (charset);
+ 	if (NS_FAILED (rv)) return G_FAILED;
+ 
+-#if MOZILLA_CHECK_VERSION4 (1,8,MOZILLA_ALPHA,3)
++#if MOZILLA_CHECK_VERSION4 (1,8,MOZILLA_ALPHA,3) || \
++    (MOZILLA_IS_BRANCH (1,7) && MOZILLA_CHECK_VERSION3(1,7,3))
+ 	gtk_moz_embed_reload (GTK_MOZ_EMBED (embed),
+ 			      GTK_MOZ_EMBED_FLAG_RELOADCHARSETCHANGE);
+ #else