diff options
Diffstat (limited to 'www/galeon2/files')
-rw-r--r-- | www/galeon2/files/patch-ab | 52 | ||||
-rw-r--r-- | www/galeon2/files/patch-bookmarks_bookmarks-import-druid-konqueror.c | 10 | ||||
-rw-r--r-- | www/galeon2/files/patch-configure | 21 | ||||
-rw-r--r-- | www/galeon2/files/patch-mozilla_GaleonWrapper.cpp | 41 | ||||
-rw-r--r-- | www/galeon2/files/patch-mozilla_GaleonWrapper.h | 11 | ||||
-rw-r--r-- | www/galeon2/files/patch-mozilla_Makefile.in | 11 | ||||
-rw-r--r-- | www/galeon2/files/patch-mozilla_TOCProtocolHandler.cpp | 40 | ||||
-rw-r--r-- | www/galeon2/files/patch-mozilla_TOCProtocolHandler.h | 11 | ||||
-rw-r--r-- | www/galeon2/files/patch-mozilla_mozilla-embed-shell.cpp | 235 | ||||
-rw-r--r-- | www/galeon2/files/patch-mozilla_nsMailtoUrl.h | 14 | ||||
-rw-r--r-- | www/galeon2/files/patch-ui_Makefile.in | 10 |
11 files changed, 0 insertions, 456 deletions
diff --git a/www/galeon2/files/patch-ab b/www/galeon2/files/patch-ab deleted file mode 100644 index b81cef0f4..000000000 --- a/www/galeon2/files/patch-ab +++ /dev/null @@ -1,52 +0,0 @@ ---- src/galeon.in.orig Thu Dec 27 19:13:42 2001 -+++ src/galeon.in Mon Mar 10 11:20:39 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,16 +23,17 @@ - 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 - - if [ -f ./galeon-bin ]; then - exec ./galeon-bin "$@" - else --exec $dist_bin/galeon-bin "$@" -+exec %%PREFIX%%/bin/galeon-bin "$@" - fi - diff --git a/www/galeon2/files/patch-bookmarks_bookmarks-import-druid-konqueror.c b/www/galeon2/files/patch-bookmarks_bookmarks-import-druid-konqueror.c deleted file mode 100644 index 6a54adc32..000000000 --- a/www/galeon2/files/patch-bookmarks_bookmarks-import-druid-konqueror.c +++ /dev/null @@ -1,10 +0,0 @@ ---- 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 deleted file mode 100644 index 20a6e1b02..000000000 --- a/www/galeon2/files/patch-configure +++ /dev/null @@ -1,21 +0,0 @@ ---- 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' -@@ -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 48c3c0939..000000000 --- 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 77b723b32..000000000 --- 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 6db4987ef..000000000 --- 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_TOCProtocolHandler.cpp b/www/galeon2/files/patch-mozilla_TOCProtocolHandler.cpp deleted file mode 100644 index cdb7d9860..000000000 --- a/www/galeon2/files/patch-mozilla_TOCProtocolHandler.cpp +++ /dev/null @@ -1,40 +0,0 @@ ---- mozilla/TOCProtocolHandler.cpp.orig Wed Sep 4 20:41:48 2002 -+++ mozilla/TOCProtocolHandler.cpp Thu Feb 13 16:15:50 2003 -@@ -83,8 +83,8 @@ - oStream->Write (str.c_str(), str.size(), &bytesWriten); - - void ParseEnvPath(const nsCString &path, list<string> &dirs); --int gHelpSelect (const struct dirent *dirEntry); --int gnomeHelpSelect (const struct dirent *dirEntry); -+int gHelpSelect (struct dirent *dirEntry); -+int gnomeHelpSelect (struct dirent *dirEntry); - - /* Implementation file */ - NS_IMPL_ISUPPORTS1 (GTOCProtocolHandler, nsIProtocolHandler) -@@ -401,7 +408,7 @@ - } - - NS_METHOD GTOCProtocolHandler::CreateHelpPage (const char *type, -- int (*select)(const struct dirent *)) -+ int (*select)(struct dirent *)) - { - nsresult rv; - -@@ -496,7 +503,7 @@ - } - } - --int gHelpSelect (const struct dirent *dirEntry) -+int gHelpSelect (struct dirent *dirEntry) - { - #ifdef NOT_PORTED - char *helpPath = gnome_help_file_find_file ( -@@ -512,7 +519,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 deleted file mode 100644 index e942b83c8..000000000 --- a/www/galeon2/files/patch-mozilla_TOCProtocolHandler.h +++ /dev/null @@ -1,11 +0,0 @@ ---- 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-mozilla_mozilla-embed-shell.cpp b/www/galeon2/files/patch-mozilla_mozilla-embed-shell.cpp deleted file mode 100644 index 5a71f547d..000000000 --- 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 fdaa127c2..000000000 --- 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/files/patch-ui_Makefile.in b/www/galeon2/files/patch-ui_Makefile.in deleted file mode 100644 index 375c1bf91..000000000 --- a/www/galeon2/files/patch-ui_Makefile.in +++ /dev/null @@ -1,10 +0,0 @@ ---- 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 - - |