Update to 1.3.8.

PR:		56689
Submitted by:	Simon Barner <barner@in.tum.de>


git-svn-id: svn://creme-brulee.marcuscom.com/ports/trunk@1199 df743ca5-7f9a-e211-a948-0013205c9059

9 files changed, 159 insertions, 0 deletions

diff --git a/www/galeon2/files/patch-ab b/www/galeon2/files/patch-ab
new file mode 100644
index 000000000..2f0e0e8d4
--- /dev/null
+++ b/www/galeon2/files/patch-ab
@@ -0,0 +1,47 @@
+--- src/galeon.in.orig	Thu Apr  3 15:08:00 2003
++++ src/galeon.in	Sat Apr 19 23:10:10 2003
+@@ -4,18 +4,14 @@
+ 
+ if test -n "$MOZILLA_FIVE_HOME"; then
+ 	MOZILLA_HOME=$MOZILLA_FIVE_HOME
+-elif [ -f @MOZILLA_HOME@/chrome/comm.jar ]; then
++elif [ -f @MOZILLA_HOME@/libgtkembedmoz.so ]; then
+ 	MOZILLA_HOME=@MOZILLA_HOME@
+-elif [ -f /usr/local/mozilla/chrome/comm.jar ]; then
+-	MOZILLA_HOME=/usr/local/mozilla
+-elif [ -f /usr/lib/mozilla/chrome/comm.jar ]; then
+-	MOZILLA_HOME=/usr/lib/mozilla
+-elif [ -f /opt/mozilla/chrome/comm.jar ]; then
+-	MOZILLA_HOME=/opt/mozilla
+-elif [ -f /usr/lib/mozilla-0.9.7/chrome/comm.jar ]; then
+-	MOZILLA_HOME=/usr/lib/mozilla-0.9.7/
+-elif [ -f /opt/gnome/lib/mozilla/chrome/comm.jar ]; then
+-        MOZILLA_HOME=/opt/gnome/lib/mozilla/
++elif [ -f %%LOCALBASE%%/lib/%%MOZILLA%%/libgtkembedmoz.so ]; then
++    	MOZILLA_HOME=%%LOCALBASE%%/lib/%%MOZILLA%%
++elif [ -f %%X11BASE%%/lib/%%MOZILLA%%/libgtkembedmoz.so ]; then
++    	MOZILLA_HOME=%%X11BASE%%/lib/%%MOZILLA%%
++elif [ -f %%PREFIX%%/lib/%%MOZILLA%%/libgtkembedmoz.so ]; then
++    	MOZILLA_HOME=%%PREFIX%%/lib/%%MOZILLA%%
+ else
+ 	echo "Cannot find mozilla installation directory. Please set MOZILLA_FIVE_HOME to your mozilla directory"
+ 	exit
+@@ -27,11 +23,12 @@
+ MOZILLA_FIVE_HOME=$MOZILLA_HOME
+ export MOZILLA_FIVE_HOME
+ 
+-# for some reason this lets Galeon start properly on Red Hat 7.1 systems
+-if [ -f /etc/redhat-release ]; then
+-	if [ "`cat /etc/redhat-release`" = "Red Hat Linux release 7.1 (Seawolf)"  ]; then
+-   	 export LD_ASSUME_KERNEL=2.2.5
+-	fi
++MOZ_PLUGIN_PATH=%%PREFIX%%/lib/browser_plugins
++export MOZ_PLUGIN_PATH
++
++if [ -f %%FLASHPLAYER%% ]; then
++    LD_PRELOAD=%%FLASHPLAYER%%
++    export LD_PRELOAD
+ fi
+ 
+-exec "$dist_bin/galeon-bin" "$@"
++exec "%%PREFIX%%/bin/galeon-bin" "$@"
diff --git a/www/galeon2/files/patch-bookmarks_bookmarks-import-druid-konqueror.c b/www/galeon2/files/patch-bookmarks_bookmarks-import-druid-konqueror.c
new file mode 100644
index 000000000..6a54adc32
--- /dev/null
+++ b/www/galeon2/files/patch-bookmarks_bookmarks-import-druid-konqueror.c
@@ -0,0 +1,10 @@
+--- bookmarks/bookmarks-import-druid-konqueror.c.orig	Sun Feb 16 18:36:14 2003
++++ bookmarks/bookmarks-import-druid-konqueror.c	Sun Feb 16 18:36:40 2003
+@@ -20,6 +20,7 @@
+ #include "config.h"
+ #endif
+ 
++#include <sys/types.h>
+ #include <libgnome/gnome-i18n.h>
+ #include "bookmarks-import-druid-konqueror.h"
+ #include "gul-gobject-misc.h"
diff --git a/www/galeon2/files/patch-configure b/www/galeon2/files/patch-configure
new file mode 100644
index 000000000..c4953085d
--- /dev/null
+++ b/www/galeon2/files/patch-configure
@@ -0,0 +1,10 @@
+--- configure.orig	Sun Mar  9 08:30:25 2003
++++ configure	Mon Apr  7 21:57:40 2003
+@@ -7838,6 +7838,7 @@
+ 
+ # This can be used to rebuild libtool when needed
+ LIBTOOL_DEPS="$ac_aux_dir/ltmain.sh"
++$ac_aux_dir/ltconfig $LIBTOOL_DEPS
+ 
+ # Always use our own libtool.
+ LIBTOOL='$(SHELL) $(top_builddir)/libtool'
diff --git a/www/galeon2/files/patch-mozilla_TOCProtocolHandler.cpp b/www/galeon2/files/patch-mozilla_TOCProtocolHandler.cpp
new file mode 100644
index 000000000..37f1b5483
--- /dev/null
+++ b/www/galeon2/files/patch-mozilla_TOCProtocolHandler.cpp
@@ -0,0 +1,40 @@
+--- mozilla/TOCProtocolHandler.cpp.orig	Sat Jun 14 11:42:57 2003
++++ mozilla/TOCProtocolHandler.cpp	Mon Jul 21 11:30:04 2003
+@@ -83,8 +83,8 @@
+ 	oStream->Write (str.c_str(), str.size(), &bytesWriten);
+ 
+ static void ParseEnvPath(const nsCString &path, list<string> &dirs);
+-static int gHelpSelect (const struct dirent *dirEntry);
+-static int gnomeHelpSelect (const struct dirent *dirEntry);
++static int gHelpSelect (struct dirent *dirEntry);
++static int gnomeHelpSelect (struct dirent *dirEntry);
+ static void RenderContentType (nsIOutputStream *oStream, PRUint32 &bytesWriten);
+ 
+ /* Implementation file */
+@@ -362,7 +362,7 @@
+ }
+ 
+ NS_METHOD GTOCProtocolHandler::CreateHelpPage (const char *type,
+-					       int (*select)(const struct dirent *))
++					       int (*select)(struct dirent *))
+ {
+ 	nsresult rv;
+ 
+@@ -445,7 +445,7 @@
+ 	}
+ }
+ 
+-int gHelpSelect (const struct dirent *dirEntry)
++int gHelpSelect (struct dirent *dirEntry)
+ {
+ #ifdef NOT_PORTED
+ 	char *helpPath = gnome_help_file_find_file (
+@@ -461,7 +461,7 @@
+ #endif
+ }
+ 
+-int gnomeHelpSelect (const struct dirent *dirEntry)
++int gnomeHelpSelect (struct dirent *dirEntry)
+ {
+ #ifdef NOT_PORTED
+ 	nsCString fileName = dirEntry->d_name;
diff --git a/www/galeon2/files/patch-mozilla_TOCProtocolHandler.h b/www/galeon2/files/patch-mozilla_TOCProtocolHandler.h
new file mode 100644
index 000000000..e942b83c8
--- /dev/null
+++ b/www/galeon2/files/patch-mozilla_TOCProtocolHandler.h
@@ -0,0 +1,11 @@
+--- mozilla/TOCProtocolHandler.h.orig	Wed Nov 20 15:25:05 2002
++++ mozilla/TOCProtocolHandler.h	Wed Nov 20 15:25:10 2002
+@@ -55,7 +55,7 @@
+   	NS_METHOD CreateInfoPage (void);
+   	NS_METHOD CreateManPage (void);
+   	NS_METHOD CreateHelpPage (const char *type,
+-  				  int (*select)(const struct dirent *));
++  				  int (*select)(struct dirent *));
+   	nsCOMPtr<nsIURI> mURI;
+ 	nsCOMPtr<nsIChannel> mChannel;
+ 	nsCOMPtr<nsIStorageStream> mStream;
diff --git a/www/galeon2/files/patch-src_Makefile.in b/www/galeon2/files/patch-src_Makefile.in
new file mode 100644
index 000000000..75df3add0
--- /dev/null
+++ b/www/galeon2/files/patch-src_Makefile.in
@@ -0,0 +1,10 @@
+--- src/Makefile.in.orig	Sun Aug 17 15:00:55 2003
++++ src/Makefile.in	Sun Aug 17 15:01:50 2003
+@@ -205,6 +205,7 @@
+ 	$(GALEON_DEPENDENCY_CFLAGS) \
+ 	-DSHARE_DIR=\"$(pkgdatadir)\" \
+ 	-DDATADIR=\""$(datadir)"\" \
++	-DGNOMELOCALEDIR=\""$(prefix)/share/locale"\" \
+ 	-DG_DISABLE_DEPRECATED		\
+ 	-DGDK_DISABLE_DEPRECATED	\
+ 	-DGTK_DISABLE_DEPRECATED	\
diff --git a/www/galeon2/files/patch-src_galeon-main.c b/www/galeon2/files/patch-src_galeon-main.c
new file mode 100644
index 000000000..777907e0e
--- /dev/null
+++ b/www/galeon2/files/patch-src_galeon-main.c
@@ -0,0 +1,11 @@
+--- src/galeon-main.c.orig	Thu Sep 11 01:11:30 2003
++++ src/galeon-main.c	Thu Sep 11 01:12:31 2003
+@@ -130,7 +130,7 @@
+ #ifdef ENABLE_NLS
+ 	/* Initialize the i18n stuff */
+ 	setlocale(LC_ALL, "");
+-	bindtextdomain(GETTEXT_PACKAGE, DATADIR "/locale");
++	bindtextdomain(GETTEXT_PACKAGE, GNOMELOCALEDIR);
+ 	textdomain(GETTEXT_PACKAGE);
+ #endif
+ 	/* set the application name manually until gnome handles the
diff --git a/www/galeon2/files/patch-ui_Makefile.in b/www/galeon2/files/patch-ui_Makefile.in
new file mode 100644
index 000000000..375c1bf91
--- /dev/null
+++ b/www/galeon2/files/patch-ui_Makefile.in
@@ -0,0 +1,10 @@
+--- ui/Makefile.in.orig	Sun Nov 17 00:56:49 2002
++++ ui/Makefile.in	Sun Nov 17 00:56:52 2002
+@@ -182,7 +182,6 @@
+ 
+ uixmldir = $(datadir)/gnome-2.0/ui
+ uixml_in_files = galeon-bookmarks-editor-ui.xml.in 	\
+-                 nautilus-galeon-view-ui.xml.in 	\
+ 		 galeon-ui.xml.in
+ 
+ 
diff --git a/www/galeon2/files/patch-utils_gul-toolbar-bonobo-view.c b/www/galeon2/files/patch-utils_gul-toolbar-bonobo-view.c
new file mode 100644
index 000000000..ffa0128c0
--- /dev/null
+++ b/www/galeon2/files/patch-utils_gul-toolbar-bonobo-view.c
@@ -0,0 +1,10 @@
+--- utils/gul-toolbar-bonobo-view.c.orig	Sun Jun 15 02:34:00 2003
++++ utils/gul-toolbar-bonobo-view.c	Sun Jun 15 02:34:36 2003
+@@ -20,6 +20,7 @@
+ #include "config.h"
+ #endif
+ 
++#include <sys/types.h>
+ #include <libgnome/gnome-i18n.h>
+ #include "gul-gobject-misc.h"
+ #include "galeon-marshal.h"