Add galeon2, and fix build with mozilla-1.7.3.

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

10 files changed, 166 insertions, 0 deletions

diff --git a/www/galeon2/files/galeon b/www/galeon2/files/galeon
new file mode 100644
index 000000000..4b824adf0
--- /dev/null
+++ b/www/galeon2/files/galeon
@@ -0,0 +1,27 @@
+#!/bin/sh
+
+dist_bin=`dirname $0`
+
+MOZILLA_HOME=%%X11BASE%%/lib/%%MOZILLA%%
+
+if [ -z "$MOZ_PLUGIN_PATH" ]; then
+    MOZ_PLUGIN_PATH=%%PREFIX%%/lib/browser_plugins
+    export MOZ_PLUGIN_PATH
+fi
+
+if [ -n "$LD_LIBRARY_PATH" ]; then
+  LD_LIBRARY_PATH=$MOZILLA_HOME:$LD_LIBRARY_PATH
+else
+  LD_LIBRARY_PATH=$MOZILLA_HOME
+fi
+export LD_LIBRARY_PATH
+
+MOZILLA_FIVE_HOME=$MOZILLA_HOME
+export MOZILLA_FIVE_HOME
+
+if [ -f %%LOCALBASE%%/lib/libflashplayer.so.1 ]; then
+    LD_PRELOAD=%%LOCALBASE%%/lib/libflashplayer.so.1
+    export LD_PRELOAD
+fi
+
+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..0400ebcf4
--- /dev/null
+++ b/www/galeon2/files/patch-bookmarks_bookmarks-import-druid-konqueror.c
@@ -0,0 +1,10 @@
+--- bookmarks/bookmarks-import-druid-konqueror.c.orig	Tue Mar 30 16:33:05 2004
++++ bookmarks/bookmarks-import-druid-konqueror.c	Mon May 31 23:35:26 2004
+@@ -20,6 +20,7 @@
+ #include "config.h"
+ #endif
+ 
++#include <sys/types.h>
+ #include <glib/gi18n.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..c9c3f468c
--- /dev/null
+++ b/www/galeon2/files/patch-configure
@@ -0,0 +1,16 @@
+--- configure.orig	Mon Aug  9 23:57:15 2004
++++ configure	Mon Aug  9 23:57:15 2004
+@@ -22744,11 +22744,11 @@
+ echo "$as_me:$LINENO: result: $MOZILLA_VERSION$autodetect" >&5
+ echo "${ECHO_T}$MOZILLA_VERSION$autodetect" >&6
+ 
+-if test $MOZILLA_VERSION == "trunk"; then
++if test $MOZILLA_VERSION = "trunk"; then
+ 	MOZILLA_VERSION=99.0 # use a high number
+ fi
+ 
+-version=$(echo $MOZILLA_VERSION | sed -e 's/\([0-9]\+\|[a-z]\+\)/\1 /g' -e 's/\.//g')
++version=$(echo $MOZILLA_VERSION | sed -E -e 's/([0-9]+|[a-z]+)/\1 /g' -e 's/\.//g')
+ 
+ set -- $version;
+ 
diff --git a/www/galeon2/files/patch-libegg_egg-toolbar-editor.c b/www/galeon2/files/patch-libegg_egg-toolbar-editor.c
new file mode 100644
index 000000000..e0a4fa1e3
--- /dev/null
+++ b/www/galeon2/files/patch-libegg_egg-toolbar-editor.c
@@ -0,0 +1,18 @@
+--- libegg/egg-toolbar-editor.c.orig	Sat Jul  3 16:37:44 2004
++++ libegg/egg-toolbar-editor.c	Sat Jul  3 16:38:00 2004
+@@ -102,12 +102,12 @@
+ static gint
+ compare_actions (gconstpointer a, gconstpointer b)
+ {
+-  g_return_val_if_fail (GTK_IS_ACTION (a), 0);
+-  g_return_val_if_fail (GTK_IS_ACTION (b), 0);
+-
+   GValue value_a = { 0, }, value_b = { 0, };
+   const char *short_label_a, *short_label_b;
+   int ret;
++
++  g_return_val_if_fail (GTK_IS_ACTION (a), 0);
++  g_return_val_if_fail (GTK_IS_ACTION (b), 0);
+ 
+   g_value_init (&value_a, G_TYPE_STRING);
+   g_object_get_property (G_OBJECT (a), "short_label", &value_a);
diff --git a/www/galeon2/files/patch-mozilla_mozilla-embed.cpp b/www/galeon2/files/patch-mozilla_mozilla-embed.cpp
new file mode 100644
index 000000000..39d7c1a09
--- /dev/null
+++ b/www/galeon2/files/patch-mozilla_mozilla-embed.cpp
@@ -0,0 +1,32 @@
+--- mozilla/mozilla-embed.cpp.orig	Sun Oct  3 20:39:54 2004
++++ mozilla/mozilla-embed.cpp	Sun Oct  3 20:45:47 2004
+@@ -961,7 +961,7 @@
+ 
+ 	
+ #if MOZILLA_CHECK_VERSION4 (1,8,MOZILLA_ALPHA,3) || \
+-    (MOZILLA_IS_BRANCH (1,7) && MOZILLA_CHECK_VERSION3(1,7,3))
++  (MOZILLA_IS_BRANCH (1,7) && MOZILLA_CHECK_VERSION3(1,7,3))
+ 	gtk_moz_embed_reload (GTK_MOZ_EMBED(embed), reloadFlags);
+ 	return G_OK;
+ #else
+@@ -1388,7 +1388,8 @@
+ 	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
+@@ -1700,10 +1701,8 @@
+ 	if (NS_SUCCEEDED(rv) &&
+ 	    ((info->keycode == nsIDOMKeyEvent::DOM_VK_F10 &&
+ 	      info->modifier == GDK_SHIFT_MASK) 
+-#if MOZILLA_CHECK_VERSION4(1,7,MOZILLA_BETA,0)
+ 	     || (info->keycode == nsIDOMKeyEvent::DOM_VK_CONTEXT_MENU &&
+ 		 !info->modifier)
+-#endif
+ 		    ))
+ 	{
+ 		// Translate relative coordinates to absolute values, and try
diff --git a/www/galeon2/files/patch-src_Makefile.in b/www/galeon2/files/patch-src_Makefile.in
new file mode 100644
index 000000000..3c75398d9
--- /dev/null
+++ b/www/galeon2/files/patch-src_Makefile.in
@@ -0,0 +1,10 @@
+--- src/Makefile.in.orig	Thu Dec 18 15:12:38 2003
++++ src/Makefile.in	Thu Dec 18 15:13:13 2003
+@@ -206,6 +206,7 @@
+ 	-I$(top_srcdir)/bookmarks \
+ 	$(GALEON_DEPENDENCY_CFLAGS) \
+ 	-DSHARE_DIR=\"$(pkgdatadir)\" \
++	-DGNOMELOCALEDIR=\""$(prefix)/share/locale"\" \
+ 	-DDATADIR=\""$(datadir)"\"
+ 
+ 
diff --git a/www/galeon2/files/patch-src_galeon-encoding-dialog.c b/www/galeon2/files/patch-src_galeon-encoding-dialog.c
new file mode 100644
index 000000000..674069940
--- /dev/null
+++ b/www/galeon2/files/patch-src_galeon-encoding-dialog.c
@@ -0,0 +1,15 @@
+--- src/galeon-encoding-dialog.c.orig	Sat Jul  3 16:45:02 2004
++++ src/galeon-encoding-dialog.c	Sat Jul  3 16:45:11 2004
+@@ -282,10 +282,10 @@
+ tree_view_selection_changed_cb (GtkTreeSelection *selection, 
+ 				GaleonEncodingDialog *dialog)
+ {
+-	if (dialog->priv->update_tag == TRUE) return;
+-
+ 	GtkTreeModel *model;
+ 	GtkTreeIter iter;
++
++	if (dialog->priv->update_tag == TRUE) return;
+ 
+ 	if (gtk_tree_selection_get_selected (selection, &model, &iter))
+ 	{
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-src_popup-commands.c b/www/galeon2/files/patch-src_popup-commands.c
new file mode 100644
index 000000000..510f87bc6
--- /dev/null
+++ b/www/galeon2/files/patch-src_popup-commands.c
@@ -0,0 +1,15 @@
+--- src/popup-commands.c.orig	Tue Aug 10 00:31:14 2004
++++ src/popup-commands.c	Tue Aug 10 00:31:21 2004
+@@ -333,11 +333,11 @@
+ 			GaleonPopup *popup)
+ {
+ 	GaleonEmbed *embed;
++	char *location;
+ 
+ 	embed = galeon_popup_get_embed (popup);
+ 	g_return_if_fail (GALEON_IS_EMBED (embed));
+ 		
+-	char *location;
+ 	galeon_embed_get_location (embed, FALSE, FALSE, &location);
+ 	popup_copy_to_clipboard (popup, location);
+ 	g_free (location);
diff --git a/www/galeon2/files/patch-ui_Makefile.in b/www/galeon2/files/patch-ui_Makefile.in
new file mode 100644
index 000000000..9e87b8029
--- /dev/null
+++ b/www/galeon2/files/patch-ui_Makefile.in
@@ -0,0 +1,12 @@
+--- ui/Makefile.in.orig	Fri Jan 23 01:48:25 2004
++++ ui/Makefile.in	Fri Jan 23 01:48:55 2004
+@@ -265,8 +265,7 @@
+ uidir = $(pkgdatadir)
+ 
+ uixmldir = $(datadir)/gnome-2.0/ui
+-uixml_in_files = galeon-bookmarks-editor-ui.xml.in 	\
+-                 nautilus-galeon-view-ui.xml.in
++uixml_in_files = galeon-bookmarks-editor-ui.xml.in
+ 
+ 
+ uixml_DATA = $(uixml_in_files:.xml.in=.xml)