Update to 1.3.4.

10 files changed, 10 insertions, 336 deletions

diff --git a/www/galeon2/Makefile b/www/galeon2/Makefile
index 9c803e9c888d..3f1a6dac1e87 100644
--- a/www/galeon2/Makefile
+++ b/www/galeon2/Makefile
@@ -6,7 +6,7 @@
 #
 
 PORTNAME=	galeon2
-PORTVERSION=	1.3.3
+PORTVERSION=	1.3.4
 CATEGORIES=	www gnome
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
 MASTER_SITE_SUBDIR=	${PORTNAME:S/2$//}
@@ -47,7 +47,7 @@ CONFIGURE_ARGS=	--with-mozilla-includes="${X11BASE}/include/mozilla${HEADERS_SUF
 		--with-mozilla-libs="${X11BASE}/lib/${MOZILLA}" \
 		--enable-nautilus-view=no \
 		${MOZ_CONFIGURE_ARGS}
-CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include -I${X11BASE}/include -D_REENTRANT ${PTHREAD_CFLAGS}" \
+CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include -I${X11BASE}/include ${PTHREAD_CFLAGS}" \
 		LIBS="-L${LOCALBASE}/lib ${PTHREAD_LIBS}"
 
 MAN1=		galeon.1
diff --git a/www/galeon2/distinfo b/www/galeon2/distinfo
index 9f2f14fc13ff..1c077b59911d 100644
--- a/www/galeon2/distinfo
+++ b/www/galeon2/distinfo
@@ -1 +1 @@
-MD5 (galeon-1.3.3.tar.gz) = e08a66e4c263d24532aacdd695bc75e5
+MD5 (galeon-1.3.4.tar.gz) = 07a37532c00981150605478854180936
diff --git a/www/galeon2/files/patch-ab b/www/galeon2/files/patch-ab
index b81cef0f4537..2f0e0e8d4f64 100644
--- a/www/galeon2/files/patch-ab
+++ b/www/galeon2/files/patch-ab
@@ -1,5 +1,5 @@
---- src/galeon.in.orig	Thu Dec 27 19:13:42 2001
-+++ src/galeon.in	Mon Mar 10 11:20:39 2003
+--- 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
@@ -26,7 +26,7 @@
  else
  	echo "Cannot find mozilla installation directory. Please set MOZILLA_FIVE_HOME to your mozilla directory"
  	exit
-@@ -27,16 +23,17 @@
+@@ -27,11 +23,12 @@
  MOZILLA_FIVE_HOME=$MOZILLA_HOME
  export MOZILLA_FIVE_HOME
  
@@ -43,10 +43,5 @@
 +    export LD_PRELOAD
  fi
  
- if [ -f ./galeon-bin ]; then
- exec ./galeon-bin "$@"
- else
--exec $dist_bin/galeon-bin "$@"
-+exec %%PREFIX%%/bin/galeon-bin "$@"
- fi
- 
+-exec "$dist_bin/galeon-bin" "$@"
++exec "%%PREFIX%%/bin/galeon-bin" "$@"
diff --git a/www/galeon2/files/patch-configure b/www/galeon2/files/patch-configure
index 20a6e1b02412..c4953085db6f 100644
--- a/www/galeon2/files/patch-configure
+++ b/www/galeon2/files/patch-configure
@@ -8,14 +8,3 @@
  
  # Always use our own libtool.
  LIBTOOL='$(SHELL) $(top_builddir)/libtool'
-@@ -10305,8 +10306,8 @@
-  1.3a) MOZILLA_SNAPSHOT=4 ;;
-  1.3b) MOZILLA_SNAPSHOT=5 ;;
-   1.3) MOZILLA_SNAPSHOT=6 ;;
-- 1.4a) MOZILLA_SNAPSHOT=6 ;;
--trunk) MOZILLA_SNAPSHOT=6 ;;
-+ 1.4a) MOZILLA_SNAPSHOT=7 ;;
-+trunk) MOZILLA_SNAPSHOT=7 ;;
-     *) { { echo "$as_me:$LINENO: error:
- *****************************************************************************
- Galeon can be built using mozilla 1.3a, 1.3b or trunk snapshot, but the version
diff --git a/www/galeon2/files/patch-mozilla_GaleonWrapper.cpp b/www/galeon2/files/patch-mozilla_GaleonWrapper.cpp
deleted file mode 100644
index 48c3c0939afb..000000000000
--- a/www/galeon2/files/patch-mozilla_GaleonWrapper.cpp
+++ /dev/null
@@ -1,41 +0,0 @@
---- mozilla/GaleonWrapper.cpp.orig	Mon Apr  7 18:45:26 2003
-+++ mozilla/GaleonWrapper.cpp	Mon Apr  7 18:45:35 2003
-@@ -666,10 +666,16 @@
- 	nsCOMPtr<nsIDocument> doc = do_QueryInterface(DOMDocument);
- 	if(!doc) return NS_ERROR_FAILURE;
- 
-+#if MOZILLA_SNAPSHOT > 6
-+	nsAutoString t;
-+	doc->GetDocumentTitle(t);
-+	*title = g_strdup (NS_ConvertUCS2toUTF8(t).get());
-+#else
- 	const nsString* t;
- 	t = doc->GetDocumentTitle();
- 
- 	*title = g_strdup (NS_ConvertUCS2toUTF8(*t).get());
-+#endif
- 
- 	return NS_OK;
- }
-@@ -735,7 +741,7 @@
- 	return NS_OK;
- }
- 
--nsresult GaleonWrapper::ForceCharacterSet (char *charset) 
-+nsresult GaleonWrapper::ForceCharacterSet (const char *charset) 
- {
- 	nsresult result;
- 
-@@ -839,12 +845,7 @@
- 	if (NS_FAILED(result)) return NS_ERROR_FAILURE;
- 
- 	nsICSSStyleSheet *sheet;
--#if MOZILLA_SNAPSHOT > 3
- 	result = loader->LoadAgentSheet(uri, &sheet);
--#else
--	PRBool completed;
--	result = loader->LoadAgentSheet(uri, sheet, completed, nsnull);
--#endif
- 	if (NS_FAILED(result)) return NS_ERROR_FAILURE;
- 
- 	/* catch stylesheet stuff and apply by appending it as a override
diff --git a/www/galeon2/files/patch-mozilla_GaleonWrapper.h b/www/galeon2/files/patch-mozilla_GaleonWrapper.h
deleted file mode 100644
index 77b723b32986..000000000000
--- a/www/galeon2/files/patch-mozilla_GaleonWrapper.h
+++ /dev/null
@@ -1,11 +0,0 @@
---- mozilla/GaleonWrapper.h.orig	Mon Apr  7 18:48:36 2003
-+++ mozilla/GaleonWrapper.h	Mon Apr  7 18:48:49 2003
-@@ -91,7 +91,7 @@
- 
- 	nsresult GoToHistoryIndex (PRInt16 index);
- 
--	nsresult ForceCharacterSet (char *charset);
-+	nsresult ForceCharacterSet (const char *charset);
- 
- 	nsresult CanCutSelection(PRBool *result);
- 
diff --git a/www/galeon2/files/patch-mozilla_Makefile.in b/www/galeon2/files/patch-mozilla_Makefile.in
deleted file mode 100644
index 6db4987efa4e..000000000000
--- a/www/galeon2/files/patch-mozilla_Makefile.in
+++ /dev/null
@@ -1,11 +0,0 @@
---- mozilla/Makefile.in.orig	Mon Apr  7 18:09:47 2003
-+++ mozilla/Makefile.in	Mon Apr  7 18:10:08 2003
-@@ -246,7 +246,7 @@
-         -DGDK_PIXBUF_DISABLE_DEPRECATED \
-         -DGNOME_DISABLE_DEPRECATED	\
- 	-DSHARE_DIR=\"$(pkgdatadir)\" \
--	-DNEW_H=\<new\>
-+	-include $(MOZILLA_INCLUDE_ROOT)/mozilla-config.h
- 
- 
- libgaleon_xpcom_la_LIBADD = \
diff --git a/www/galeon2/files/patch-mozilla_mozilla-embed-shell.cpp b/www/galeon2/files/patch-mozilla_mozilla-embed-shell.cpp
deleted file mode 100644
index 5a71f547df8e..000000000000
--- a/www/galeon2/files/patch-mozilla_mozilla-embed-shell.cpp
+++ /dev/null
@@ -1,235 +0,0 @@
---- mozilla/mozilla-embed-shell.cpp.orig	Mon Apr  7 18:39:50 2003
-+++ mozilla/mozilla-embed-shell.cpp	Mon Apr  7 18:39:59 2003
-@@ -42,6 +42,7 @@
- #include <nsICacheService.h>
- #include <nsCOMPtr.h>
- #include <nsNetCID.h>
-+#include <nsNetUtil.h>
- #include <nsIServiceManager.h>
- #include <nsIIOService.h>
- #include <nsIProtocolProxyService.h>
-@@ -848,17 +849,26 @@
- }
- 
- static gresult           
--impl_set_permission (GaleonEmbedShell *shell,
--		     const char *url, 
--		     PermissionType type,
--		     gboolean allow)
-+impl_set_permission(GaleonEmbedShell *shell,
-+		    const char *url, 
-+		    PermissionType type,
-+		    gboolean allow)
- {
- 	nsresult rv;
- 	nsCOMPtr<nsIPermissionManager> permissionManager =
--                        do_CreateInstance (NS_PERMISSIONMANAGER_CONTRACTID);
-+                        do_GetService(NS_PERMISSIONMANAGER_CONTRACTID);
- 
--        rv = permissionManager->Add (nsDependentCString(url),
--        			     allow ? PR_TRUE : PR_FALSE, type);
-+#if MOZILLA_SNAPSHOT > 6
-+	nsCOMPtr<nsIURI> uri;
-+	rv = NS_NewURI(getter_AddRefs(uri), url);
-+	if (NS_FAILED(rv) || !uri) return G_FAILED;
-+	rv = permissionManager->Add(uri, type,
-+				    allow ? (PRUint32)nsIPermissionManager::ALLOW_ACTION
-+				    	  : (PRUint32)nsIPermissionManager::DENY_ACTION);
-+#else
-+        rv = permissionManager->Add(nsDependentCString(url),
-+        			    allow ? PR_TRUE : PR_FALSE, type);
-+#endif
- 	if (NS_FAILED(rv)) return G_FAILED;
- 
- 	return G_OK;
-@@ -874,9 +884,9 @@
- 	*permissions = NULL;
- 	
- 	nsCOMPtr<nsIPermissionManager> permissionManager = 
--                        do_CreateInstance (NS_PERMISSIONMANAGER_CONTRACTID);
-+                        do_GetService(NS_PERMISSIONMANAGER_CONTRACTID);
-         nsCOMPtr<nsISimpleEnumerator> permissionEnumerator;
--        result = permissionManager->GetEnumerator (getter_AddRefs(permissionEnumerator));
-+        result = permissionManager->GetEnumerator(getter_AddRefs(permissionEnumerator));
-         if (NS_FAILED(result)) return G_FAILED;
- 	
-         PRBool enumResult;
-@@ -885,47 +895,68 @@
-              permissionEnumerator->HasMoreElements(&enumResult))
-         {
-                 nsCOMPtr<nsIPermission> nsPermission;
--                result = permissionEnumerator->GetNext (getter_AddRefs(nsPermission));
-+                result = permissionEnumerator->GetNext(getter_AddRefs(nsPermission));
-                 if (NS_FAILED(result)) return G_FAILED;
- 
-+#if MOZILLA_SNAPSHOT > 6
-+		PRUint32 cType;
-+#else
-                 PRInt32 cType;
--                nsPermission->GetType (&cType);
--                if (cType == type)
-+#endif
-+                nsPermission->GetType(&cType);
-+                if ((PRUint32)cType == (PRUint32)type)
-                 {
--                        PermissionInfo *b = g_new0 (PermissionInfo, 1);
--                        gchar *tmp = NULL;
--
--                        nsPermission->GetHost (&tmp);
--                        b->domain = g_strdup (tmp);
--                        nsMemory::Free (tmp);
-+                        PermissionInfo *b = g_new0(PermissionInfo, 1);
-+#if MOZILLA_SNAPSHOT > 6
-+			nsCString host;
-+			nsPermission->GetHost(host);
-+			b->domain = g_strdup(host.get());
-+
-+			PRUint32 cap;
-+			nsPermission->GetCapability(&cap);
-+			switch (cap)
-+			{
-+			  case nsIPermissionManager::ALLOW_ACTION :
-+			  	b->status = TRUE;
-+			  	break;
-+			  case nsIPermissionManager::DENY_ACTION :
-+			 	b->status = FALSE;
-+			 	break;
-+			  default :
-+			  	b->status = FALSE;
-+			}
-+#else
-+			nsXPIDLCString host;
-+                        nsPermission->GetHost(getter_Copies(host));
-+                        b->domain = g_strdup(host.get());
- 
-                         PRBool cap;
--                        nsPermission->GetCapability (&cap);
-+                        nsPermission->GetCapability(&cap);
- 			b->status = cap;
--
--                        *permissions = g_list_prepend (*permissions, b);
-+#endif
-+                        *permissions = g_list_prepend(*permissions, b);
-                 }
-         }
- 
--        *permissions = g_list_reverse (*permissions);
-+        *permissions = g_list_reverse(*permissions);
- 	
- 	return G_OK;
- }
- 
- static gresult           
--impl_remove_permissions (GaleonEmbedShell *shell,
--		         PermissionType type,
--		         GList *permissions)
-+impl_remove_permissions(GaleonEmbedShell *shell,
-+		        PermissionType type,
-+		        GList *permissions)
- {
- 	nsresult result;
-         nsCOMPtr<nsIPermissionManager> permissionManager =
--                        do_CreateInstance (NS_PERMISSIONMANAGER_CONTRACTID);
-+                        do_GetService(NS_PERMISSIONMANAGER_CONTRACTID);
- 
-         for (GList *l = permissions; l != NULL; l = l->next)
-         {
-                 PermissionInfo *b = (PermissionInfo *)l->data;
--                result = permissionManager->Remove (nsDependentCString(b->domain),
--                				    type);
-+                result = permissionManager->Remove(nsDependentCString(b->domain),
-+                				   type);
-                 if (NS_FAILED(result)) return G_FAILED;
-         };
- 
-@@ -937,28 +968,27 @@
- 		   GList **cookies)
- {
-         nsresult result;
--
-         nsCOMPtr<nsICookieManager> cookieManager = 
--                        do_CreateInstance (NS_COOKIEMANAGER_CONTRACTID);
-+                        do_GetService(NS_COOKIEMANAGER_CONTRACTID);
-         nsCOMPtr<nsISimpleEnumerator> cookieEnumerator;
-         result = 
--            cookieManager->GetEnumerator (getter_AddRefs(cookieEnumerator));
-+            cookieManager->GetEnumerator(getter_AddRefs(cookieEnumerator));
-         if (NS_FAILED(result)) return G_FAILED;
--	
-+
-         PRBool enumResult;
-         for (cookieEnumerator->HasMoreElements(&enumResult) ;
-              enumResult == PR_TRUE ;
-              cookieEnumerator->HasMoreElements(&enumResult))
-         {
-                 nsCOMPtr<nsICookie> nsCookie;
--                result = cookieEnumerator->GetNext (getter_AddRefs(nsCookie));
-+                result = cookieEnumerator->GetNext(getter_AddRefs(nsCookie));
-                 if (NS_FAILED(result)) return G_FAILED;
- 
--                CookieInfo *c = mozilla_cookie_to_info (nsCookie);
--                *cookies = g_list_prepend (*cookies, c);
-+                CookieInfo *c = mozilla_cookie_to_info(nsCookie);
-+                *cookies = g_list_prepend(*cookies, c);
-         }       
- 
--	*cookies = g_list_reverse (*cookies);
-+	*cookies = g_list_reverse(*cookies);
- 		
- 	return G_OK;
- }
-@@ -969,15 +999,15 @@
- {
- 	nsresult result;
-         nsCOMPtr<nsICookieManager> cookieManager =
--                        do_CreateInstance (NS_COOKIEMANAGER_CONTRACTID);
-+                        do_GetService(NS_COOKIEMANAGER_CONTRACTID);
- 	
-         for (GList *l = cookies; l != NULL; l = l->next)
-         {
-                 CookieInfo *c = (CookieInfo *)l->data;
- 
--                result = cookieManager->Remove (NS_LITERAL_CSTRING(c->domain),
--                                                NS_LITERAL_CSTRING(c->name),
--                                                NS_LITERAL_CSTRING(c->path),
-+                result = cookieManager->Remove (nsDependentCString(c->domain),
-+                                                nsDependentCString(c->name),
-+                                                nsDependentCString(c->path),
-                                                 PR_FALSE);
-                 if (NS_FAILED(result)) return G_FAILED;
-         };
-@@ -993,7 +1023,7 @@
-         nsresult result = NS_ERROR_FAILURE;
- 
-         nsCOMPtr<nsIPasswordManager> passwordManager =
--                        do_CreateInstance (NS_PASSWORDMANAGER_CONTRACTID);
-+                        do_GetService(NS_PASSWORDMANAGER_CONTRACTID);
-         nsCOMPtr<nsISimpleEnumerator> passwordEnumerator;
-         if (type == PASSWORD_PASSWORD)
-                 result = passwordManager->GetEnumerator 
-@@ -1041,14 +1071,14 @@
- {
- 	nsresult result = NS_ERROR_FAILURE;
-         nsCOMPtr<nsIPasswordManager> passwordManager =
--                        do_CreateInstance (NS_PASSWORDMANAGER_CONTRACTID);
-+                        do_GetService(NS_PASSWORDMANAGER_CONTRACTID);
- 
-         for (GList *l = passwords; l != NULL; l = l->next)
-         {
-                 PasswordInfo *p = (PasswordInfo *)l->data;
-                 if (type == PASSWORD_PASSWORD)
-                 {
--                        result = passwordManager->RemoveUser (NS_LITERAL_CSTRING(p->host),
-+                        result = passwordManager->RemoveUser (nsDependentCString(p->host),
-                                                               NS_ConvertUTF8toUCS2(nsDependentCString(p->username)));
-                 }
-                 else if (type == PASSWORD_REJECT)
-@@ -1129,8 +1159,6 @@
-         }
-         else
-         {
--                if (*ret_fullpath)
--                        g_free (*ret_fullpath);
-                 nsCOMPtr<nsILocalFile> file;
-                 filePicker->GetFile (getter_AddRefs(file));
- 		nsCAutoString tempFullPathStr;
diff --git a/www/galeon2/files/patch-mozilla_nsMailtoUrl.h b/www/galeon2/files/patch-mozilla_nsMailtoUrl.h
deleted file mode 100644
index fdaa127c2e7f..000000000000
--- a/www/galeon2/files/patch-mozilla_nsMailtoUrl.h
+++ /dev/null
@@ -1,14 +0,0 @@
---- mozilla/nsMailtoUrl.h.orig	Mon Apr  7 18:13:50 2003
-+++ mozilla/nsMailtoUrl.h	Mon Apr  7 18:14:24 2003
-@@ -43,8 +43,10 @@
- 
- #include "nsIMailtoUrl.h"
- #include "nsIURI.h"
--#include "nsIFileSpec.h"
-+#include "nsCRT.h"
- #include "nsCOMPtr.h"
-+#include "nsString.h"
-+#include "nsIComponentManager.h"
- #include "nsIPrompt.h"
- #include "nsIAuthPrompt.h"
- #include "nsIInterfaceRequestor.h"
diff --git a/www/galeon2/pkg-plist b/www/galeon2/pkg-plist
index 88b3e4270462..ae9b681d9ecc 100644
--- a/www/galeon2/pkg-plist
+++ b/www/galeon2/pkg-plist
@@ -209,6 +209,7 @@ share/locale/et/LC_MESSAGES/galeon-2.0.mo
 share/locale/eu/LC_MESSAGES/galeon-2.0.mo
 share/locale/fi/LC_MESSAGES/galeon-2.0.mo
 share/locale/fr/LC_MESSAGES/galeon-2.0.mo
+share/locale/ga/LC_MESSAGES/galeon-2.0.mo
 share/locale/gl/LC_MESSAGES/galeon-2.0.mo
 share/locale/hr/LC_MESSAGES/galeon-2.0.mo
 share/locale/hu/LC_MESSAGES/galeon-2.0.mo
@@ -217,6 +218,7 @@ share/locale/ja/LC_MESSAGES/galeon-2.0.mo
 share/locale/ko/LC_MESSAGES/galeon-2.0.mo
 share/locale/lt/LC_MESSAGES/galeon-2.0.mo
 share/locale/lv/LC_MESSAGES/galeon-2.0.mo
+share/locale/ml/LC_MESSAGES/galeon-2.0.mo
 share/locale/ms/LC_MESSAGES/galeon-2.0.mo
 share/locale/nl/LC_MESSAGES/galeon-2.0.mo
 share/locale/nn/LC_MESSAGES/galeon-2.0.mo