Update galeon to 1.2.6

Changes:
- Compatible with 1.0.x, 1.1.x and 1.2a
- Compatible with gcc 3.2 with --disable-werror
- Complete Basic Sidebar support
- Basic means basic. No XUL sidebars supported.
- Proxy prefs should actually be respected for a change
- Support for forcing all cookies to be session cookies
- Fixed almost all downloader progress dialog related crashes.
- Helper app handling improved, and a number of bugs fixed

4 files changed, 9 insertions, 53 deletions

diff --git a/www/galeon/Makefile b/www/galeon/Makefile
index 6b1d549d8f2..e1c6539b41d 100644
--- a/www/galeon/Makefile
+++ b/www/galeon/Makefile
@@ -1,7 +1,6 @@
-# $NetBSD: Makefile,v 1.37 2002/10/07 11:23:29 wiz Exp $
+# $NetBSD: Makefile,v 1.38 2002/10/08 14:50:52 taya Exp $
 
-DISTNAME=	galeon-1.2.5
-PKGREVISION=	1
+DISTNAME=	galeon-1.2.6
 CATEGORIES=	www
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE:=galeon/}
 
@@ -24,7 +23,7 @@ CONFIGURE_ARGS+= --with-mozilla-includes=${PREFIX}/include/mozilla \
 		--disable-werror \
 		--sysconfdir=${PREFIX}/etc
 # XXX to build against mozilla 1.1
-CONFIGURE_ARGS+= --with-mozilla-snapshot=trunk
+#CONFIGURE_ARGS+= --with-mozilla-snapshot=trunk
 
 .include	"../../converters/libiconv/buildlink2.mk"
 .include	"../../devel/GConf/buildlink2.mk"
diff --git a/www/galeon/PLIST b/www/galeon/PLIST
index 354acb4898a..3cd57ef426b 100644
--- a/www/galeon/PLIST
+++ b/www/galeon/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.13 2002/08/04 23:53:21 taya Exp $
+@comment $NetBSD: PLIST,v 1.14 2002/10/08 14:50:52 taya Exp $
 bin/galeon
 bin/galeon-bin
 bin/galeon-config-tool
@@ -138,6 +138,7 @@ share/galeon/spinners/pipeon/012.png
 share/galeon/spinners/pipeon/013.png
 share/galeon/spinners/pipeon/014.png
 share/galeon/spinners/pipeon/rest.png
+share/galeon/stock_trash.xpm
 share/galeon/stocks.png
 share/galeon/stop.png
 share/galeon/tabs.png
@@ -340,9 +341,9 @@ share/oaf/GNOME_Galeon_NautilusView.oaf
 share/omf/galeon/galeon-manual-C.omf
 share/pixmaps/galeon.png
 share/sounds/galeon/clicked.wav
-@dirrm share/sounds/galeon
 @exec ${MKDIR} %D/share/omf/galeon
 @exec env GCONF_CONFIG_SOURCE=xml::${X11PREFIX}/etc/gconf/gconf.xml.defaults gconftool-1 --makefile-install-rule ${X11PREFIX}/etc/gconf/schemas/galeon.schemas
+@dirrm share/sounds/galeon
 @dirrm share/omf/galeon
 @dirrm share/gnome/help/galeon-manual/C/stylesheet-images
 @dirrm share/gnome/help/galeon-manual/C/figures
diff --git a/www/galeon/distinfo b/www/galeon/distinfo
index a34bfce429b..c62e57115d5 100644
--- a/www/galeon/distinfo
+++ b/www/galeon/distinfo
@@ -1,5 +1,4 @@
-$NetBSD: distinfo,v 1.26 2002/08/29 20:00:21 drochner Exp $
+$NetBSD: distinfo,v 1.27 2002/10/08 14:50:53 taya Exp $
 
-SHA1 (galeon-1.2.5.tar.gz) = 93977e663709260c4f566d60ffeef29f4abab886
-Size (galeon-1.2.5.tar.gz) = 4004289 bytes
-SHA1 (patch-aa) = f088d7ffee942263a312c362d7fb462ca8da30d1
+SHA1 (galeon-1.2.6.tar.gz) = 5958a413ddf3b938bb469d014f451a43c6e4a6e3
+Size (galeon-1.2.6.tar.gz) = 4053858 bytes
diff --git a/www/galeon/patches/patch-aa b/www/galeon/patches/patch-aa
deleted file mode 100644
index 4e481e07557..00000000000
--- a/www/galeon/patches/patch-aa
+++ /dev/null
@@ -1,43 +0,0 @@
-$NetBSD: patch-aa,v 1.8 2002/08/29 20:00:22 drochner Exp $
-
---- src/mozilla/ProgressListener2.cpp.orig	Thu Aug 29 20:56:41 2002
-+++ src/mozilla/ProgressListener2.cpp	Thu Aug 29 20:56:50 2002
-@@ -334,7 +334,7 @@
- NS_IMETHODIMP GProgressListener2::Init(nsIURI *aSource,
- 				       nsILocalFile *aTarget,
- 				       const PRUnichar *aDisplayName,
--				       const PRUnichar *openingWith,
-+				       nsIMIMEInfo *openingWith,
- 				       PRInt64 aStartTime,
- 				       nsIWebBrowserPersist *aPersist)
- {
-@@ -379,11 +379,29 @@
- 	return NS_OK;
- }
- 
-+#if 0
- NS_IMETHODIMP GProgressListener2::GetOpeningWith(PRUnichar * *aOpeningWith)
- {
- 	*aOpeningWith = NULL;
- 	return NS_OK;
- }
-+#else
-+NS_IMETHODIMP GProgressListener2::GetMIMEInfo(nsIMIMEInfo **mi)
-+{
-+	*mi = NULL;
-+	return NS_OK;
-+}
-+NS_IMETHODIMP GProgressListener2::SetCancelDownloadOnClose(int val)
-+{
-+	return NS_OK;
-+}
-+NS_IMETHODIMP GProgressListener2::GetCancelDownloadOnClose(int *val)
-+{
-+	*val = 0;
-+	return NS_OK;
-+}
-+#endif
-+
- /* attribute nsIObserver observer; */
- NS_IMETHODIMP GProgressListener2::GetObserver(nsIObserver * *aObserver)
- {