diff options
author | Raúl Porcel <armin76@gentoo.org> | 2007-01-08 16:31:42 +0000 |
---|---|---|
committer | Raúl Porcel <armin76@gentoo.org> | 2007-01-08 16:31:42 +0000 |
commit | 62a96950570e1b0a1acdb33ddfb24866d45973e9 (patch) | |
tree | 198430a6dafb7227b27bb1dc6c03d883309c61fc /mail-client/mozilla-thunderbird/files | |
parent | remove patches (diff) | |
download | gentoo-2-62a96950570e1b0a1acdb33ddfb24866d45973e9.tar.gz gentoo-2-62a96950570e1b0a1acdb33ddfb24866d45973e9.tar.bz2 gentoo-2-62a96950570e1b0a1acdb33ddfb24866d45973e9.zip |
remove patches
(Portage version: 2.1.1-r2)
(Unsigned Manifest commit)
Diffstat (limited to 'mail-client/mozilla-thunderbird/files')
15 files changed, 0 insertions, 2055 deletions
diff --git a/mail-client/mozilla-thunderbird/files/firefox-1.1-uriloader-1.patch b/mail-client/mozilla-thunderbird/files/firefox-1.1-uriloader-1.patch deleted file mode 100644 index 588adab55e72..000000000000 --- a/mail-client/mozilla-thunderbird/files/firefox-1.1-uriloader-1.patch +++ /dev/null @@ -1,419 +0,0 @@ -Index: uriloader/exthandler/Makefile.in -=================================================================== -RCS file: /cvsroot/mozilla/uriloader/exthandler/Makefile.in,v -retrieving revision 1.60 -diff -d -u -p -r1.60 Makefile.in ---- uriloader/exthandler/Makefile.in 2 May 2005 16:30:03 -0000 1.60 -+++ uriloader/exthandler/Makefile.in 21 Jul 2005 03:07:39 -0000 -@@ -102,7 +102,7 @@ endif - LOCAL_INCLUDES = -I$(srcdir) - - ifeq ($(MOZ_WIDGET_TOOLKIT),gtk2) --OSHELPER += nsGNOMERegistry.cpp -+OSHELPER += nsMIMEInfoUnix.cpp nsGNOMERegistry.cpp - endif - - ifeq ($(MOZ_WIDGET_TOOLKIT),beos) -Index: uriloader/exthandler/unix/nsGNOMERegistry.cpp -=================================================================== -RCS file: /cvsroot/mozilla/uriloader/exthandler/unix/nsGNOMERegistry.cpp,v -retrieving revision 1.10 -diff -d -u -p -r1.10 nsGNOMERegistry.cpp ---- uriloader/exthandler/unix/nsGNOMERegistry.cpp 16 Oct 2004 13:46:17 -0000 1.10 -+++ uriloader/exthandler/unix/nsGNOMERegistry.cpp 21 Jul 2005 03:07:40 -0000 -@@ -42,7 +42,7 @@ - #include "nsString.h" - #include "nsIComponentManager.h" - #include "nsILocalFile.h" --#include "nsMIMEInfoImpl.h" -+#include "nsMIMEInfoUnix.h" - #include "nsAutoPtr.h" - - #include <glib.h> -@@ -56,12 +56,12 @@ typedef struct _GConfClient GConfClient; - typedef struct _GnomeProgram GnomeProgram; - typedef struct _GnomeModuleInfo GnomeModuleInfo; - --typedef struct { -+struct GnomeVFSMimeApplication { - char *id; - char *name; - char *command; - /* there is more here, but we don't need it */ --} GnomeVFSMimeApplication; -+}; - - typedef GConfClient * (*_gconf_client_get_default_fn)(); - typedef gchar * (*_gconf_client_get_string_fn)(GConfClient *, -@@ -264,7 +264,7 @@ nsGNOMERegistry::GetAppDescForScheme(con - } - - --/* static */ already_AddRefed<nsMIMEInfoBase> -+/* static */ already_AddRefed<nsMIMEInfoUnix> - nsGNOMERegistry::GetFromExtension(const char *aFileExt) - { - if (!gconfLib) -@@ -286,7 +286,7 @@ nsGNOMERegistry::GetFromExtension(const - return GetFromType(mimeType); - } - --/* static */ already_AddRefed<nsMIMEInfoBase> -+/* static */ already_AddRefed<nsMIMEInfoUnix> - nsGNOMERegistry::GetFromType(const char *aMIMEType) - { - if (!gconfLib) -@@ -296,9 +296,11 @@ nsGNOMERegistry::GetFromType(const char - if (!handlerApp) - return nsnull; - -- nsRefPtr<nsMIMEInfoImpl> mimeInfo = new nsMIMEInfoImpl(aMIMEType); -+ nsRefPtr<nsMIMEInfoUnix> mimeInfo = new nsMIMEInfoUnix(aMIMEType); - NS_ENSURE_TRUE(mimeInfo, nsnull); - -+ mimeInfo->SetDefaultGnomeVFSMimeApplication(handlerApp); -+ - // Get the list of extensions and append then to the mimeInfo. - GList *extensions = _gnome_vfs_mime_get_extensions_list(aMIMEType); - for (GList *extension = extensions; extension; extension = extension->next) -@@ -320,11 +322,21 @@ nsGNOMERegistry::GetFromType(const char - return nsnull; - } - -- gchar *commandPath = g_find_program_in_path(nativeCommand); -+ gchar **argv; -+ gboolean res = g_shell_parse_argv(nativeCommand, NULL, &argv, NULL); -+ if (!res) { -+ NS_ERROR("Could not convert helper app command to filesystem encoding"); -+ _gnome_vfs_mime_application_free(handlerApp); -+ return nsnull; -+ } -+ -+ gchar *commandPath = g_find_program_in_path(argv[0]); - - g_free(nativeCommand); -+ g_strfreev(argv); - - if (!commandPath) { -+ NS_WARNING("could not find command in path"); - _gnome_vfs_mime_application_free(handlerApp); - return nsnull; - } -@@ -342,7 +354,7 @@ nsGNOMERegistry::GetFromType(const char - - _gnome_vfs_mime_application_free(handlerApp); - -- nsMIMEInfoBase* retval; -+ nsMIMEInfoUnix* retval; - NS_ADDREF((retval = mimeInfo)); - return retval; - } -Index: uriloader/exthandler/unix/nsGNOMERegistry.h -=================================================================== -RCS file: /cvsroot/mozilla/uriloader/exthandler/unix/nsGNOMERegistry.h,v -retrieving revision 1.3 -diff -d -u -p -r1.3 nsGNOMERegistry.h ---- uriloader/exthandler/unix/nsGNOMERegistry.h 16 Oct 2004 13:46:17 -0000 1.3 -+++ uriloader/exthandler/unix/nsGNOMERegistry.h 21 Jul 2005 03:07:40 -0000 -@@ -35,10 +35,13 @@ - * - * ***** END LICENSE BLOCK ***** */ - -+#ifndef nsGNOMERegistry_h__ -+#define nsGNOMERegistry_h__ -+ - #include "nsIURI.h" - #include "nsCOMPtr.h" - --class nsMIMEInfoBase; -+class nsMIMEInfoUnix; - - class nsGNOMERegistry - { -@@ -52,7 +55,9 @@ class nsGNOMERegistry - static void GetAppDescForScheme(const nsACString& aScheme, - nsAString& aDesc); - -- static already_AddRefed<nsMIMEInfoBase> GetFromExtension(const char *aFileExt); -+ static already_AddRefed<nsMIMEInfoUnix> GetFromExtension(const char *aFileExt); - -- static already_AddRefed<nsMIMEInfoBase> GetFromType(const char *aMIMEType); -+ static already_AddRefed<nsMIMEInfoUnix> GetFromType(const char *aMIMEType); - }; -+ -+#endif // nsGNOMERegistry_h__ -Index: uriloader/exthandler/unix/nsMIMEInfoUnix.cpp -=================================================================== -RCS file: uriloader/exthandler/unix/nsMIMEInfoUnix.cpp -diff -N uriloader/exthandler/unix/nsMIMEInfoUnix.cpp ---- /dev/null 1 Jan 1970 00:00:00 -0000 -+++ uriloader/exthandler/unix/nsMIMEInfoUnix.cpp 21 Jul 2005 03:07:40 -0000 -@@ -0,0 +1,196 @@ -+/* ***** BEGIN LICENSE BLOCK ***** -+ * Version: MPL 1.1 -+ * -+ * The contents of this file are subject to the Mozilla Public License Version -+ * 1.1 (the "License"); you may not use this file except in compliance with -+ * the License. You may obtain a copy of the License at -+ * http://www.mozilla.org/MPL/ -+ * -+ * Software distributed under the License is distributed on an "AS IS" basis, -+ * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License -+ * for the specific language governing rights and limitations under the -+ * License. -+ * -+ * The Original Code is mozilla.org Code. -+ * -+ * The Initial Developer of the Original Code is -+ * Red Hat, Inc. -+ * Portions created by the Initial Developer are Copyright (C) 2005 -+ * the Initial Developer. All Rights Reserved. -+ * -+ * Contributor(s): -+ * Christopher Aillon <caillon@redhat.com> (Original author) -+ * -+ * -+ * ***** END LICENSE BLOCK ***** */ -+ -+#include "nsMIMEInfoUnix.h" -+#include "prlink.h" -+#include "prmem.h" -+#include <glib.h> -+#include <glib-object.h> -+ -+static PRLibrary *gnomeLib; -+static PRLibrary *vfsLib; -+ -+typedef struct _GnomeProgram GnomeProgram; -+typedef struct _GnomeModuleInfo GnomeModuleInfo; -+ -+typedef enum { -+ GNOME_VFS_OK // there's more but we don't care about them. -+} GnomeVFSResult; -+ -+typedef GnomeVFSResult (*_gnome_vfs_mime_application_launch_fn) -+ (GnomeVFSMimeApplication *app, -+ GList *uris); -+typedef void (*_gnome_vfs_mime_application_free_fn)(GnomeVFSMimeApplication *); -+typedef GnomeVFSMimeApplication * (*_gnome_vfs_mime_application_copy_fn)(GnomeVFSMimeApplication *); -+typedef GnomeProgram * (*_gnome_program_init_fn)(const char *, const char *, -+ const GnomeModuleInfo *, int, -+ char **, const char *, ...); -+typedef const char * (*_gnome_vfs_mime_application_get_name_fn)(GnomeVFSMimeApplication *); -+typedef const GnomeModuleInfo * (*_libgnome_module_info_get_fn)(); -+typedef GnomeProgram * (*_gnome_program_get_fn)(); -+typedef char * (*_gnome_vfs_make_uri_from_input_fn)(const char *); -+ -+#define DECL_FUNC_PTR(func) static _##func##_fn _##func -+ -+DECL_FUNC_PTR(gnome_vfs_mime_application_launch); -+DECL_FUNC_PTR(gnome_vfs_mime_application_free); -+DECL_FUNC_PTR(gnome_vfs_mime_application_copy); -+DECL_FUNC_PTR(gnome_vfs_mime_application_get_name); -+DECL_FUNC_PTR(gnome_program_init); -+DECL_FUNC_PTR(gnome_program_get); -+DECL_FUNC_PTR(libgnome_module_info_get); -+DECL_FUNC_PTR(gnome_vfs_make_uri_from_input); -+ -+static PRLibrary * -+LoadVersionedLibrary(const char* libName, const char* libVersion) -+{ -+ char *platformLibName = PR_GetLibraryName(nsnull, libName); -+ nsCAutoString versionLibName(platformLibName); -+ versionLibName.Append(libVersion); -+ PR_Free(platformLibName); -+ return PR_LoadLibrary(versionLibName.get()); -+} -+ -+static void -+Cleanup() -+{ -+ // Unload all libraries -+ if (gnomeLib) -+ PR_UnloadLibrary(gnomeLib); -+ if (vfsLib) -+ PR_UnloadLibrary(vfsLib); -+ -+ gnomeLib = vfsLib = nsnull; -+} -+ -+static void -+InitGnomeVFS() -+{ -+ static PRBool initialized = PR_FALSE; -+ -+ if (initialized) -+ return; -+ -+ #define ENSURE_LIB(lib) \ -+ PR_BEGIN_MACRO \ -+ if (!lib) { \ -+ Cleanup(); \ -+ return; \ -+ } \ -+ PR_END_MACRO -+ -+ #define GET_LIB_FUNCTION(lib, func, failure) \ -+ PR_BEGIN_MACRO \ -+ _##func = (_##func##_fn) PR_FindFunctionSymbol(lib##Lib, #func); \ -+ if (!_##func) { \ -+ failure; \ -+ } \ -+ PR_END_MACRO -+ -+ // Attempt to open libgnome -+ gnomeLib = LoadVersionedLibrary("gnome-2", ".0"); -+ ENSURE_LIB(gnomeLib); -+ -+ GET_LIB_FUNCTION(gnome, gnome_program_init, return Cleanup()); -+ GET_LIB_FUNCTION(gnome, libgnome_module_info_get, return Cleanup()); -+ GET_LIB_FUNCTION(gnome, gnome_program_get, return Cleanup()); -+ -+ // Attempt to open libgnomevfs -+ vfsLib = LoadVersionedLibrary("gnomevfs-2", ".0"); -+ ENSURE_LIB(vfsLib); -+ -+ GET_LIB_FUNCTION(vfs, gnome_vfs_mime_application_launch, /* do nothing */); -+ GET_LIB_FUNCTION(vfs, gnome_vfs_make_uri_from_input, return Cleanup()); -+ GET_LIB_FUNCTION(vfs, gnome_vfs_mime_application_get_name, return Cleanup()); -+ GET_LIB_FUNCTION(vfs, gnome_vfs_mime_application_free, return Cleanup()); -+ GET_LIB_FUNCTION(vfs, gnome_vfs_mime_application_copy, return Cleanup()); -+ -+ // Initialize GNOME, if it's not already initialized. It's not -+ // necessary to tell GNOME about our actual command line arguments. -+ -+ if (!_gnome_program_get()) { -+ char *argv[1] = { "gecko" }; -+ _gnome_program_init("Gecko", "1.0", _libgnome_module_info_get(), -+ 1, argv, NULL); -+ } -+ -+ // Note: after GNOME has been initialized, do not ever unload these -+ // libraries. They register atexit handlers, so if they are unloaded, we'll -+ // crash on exit. -+} -+ -+void -+nsMIMEInfoUnix::SetDefaultGnomeVFSMimeApplication(GnomeVFSMimeApplication* app) -+{ -+ if (_gnome_vfs_mime_application_copy && _gnome_vfs_mime_application_free) { -+ mDefaultVFSApplication = _gnome_vfs_mime_application_copy(app); -+ -+ mPreferredAction = nsIMIMEInfo::useSystemDefault; -+ -+ const gchar * name = _gnome_vfs_mime_application_get_name(mDefaultVFSApplication); -+ if (name) -+ mDefaultAppDescription = NS_ConvertUTF8toUCS2(name); -+ } -+} -+ -+nsMIMEInfoUnix::~nsMIMEInfoUnix() -+{ -+ if (mDefaultVFSApplication) -+ _gnome_vfs_mime_application_free(mDefaultVFSApplication); -+} -+ -+nsresult -+nsMIMEInfoUnix::LaunchDefaultWithFile(nsIFile* aFile) -+{ -+ NS_ENSURE_ARG_POINTER(aFile); -+ -+ InitGnomeVFS(); -+ -+ if (_gnome_vfs_mime_application_launch && mDefaultVFSApplication) { -+ nsCAutoString nativePath; -+ aFile->GetNativePath(nativePath); -+ -+ gchar *uri = _gnome_vfs_make_uri_from_input(nativePath.get()); -+ -+ GList *uris = NULL; -+ uris = g_list_append(uris, uri); -+ -+ GnomeVFSResult result = _gnome_vfs_mime_application_launch(mDefaultVFSApplication, uris); -+ -+ g_free(uri); -+ g_list_free(uris); -+ -+ if (result != GNOME_VFS_OK) -+ return NS_ERROR_FAILURE; -+ -+ return NS_OK; -+ } -+ -+ if (!mDefaultApplication) -+ return NS_ERROR_FILE_NOT_FOUND; -+ -+ return LaunchWithIProcess(mDefaultApplication, aFile); -+} -Index: uriloader/exthandler/unix/nsMIMEInfoUnix.h -=================================================================== -RCS file: uriloader/exthandler/unix/nsMIMEInfoUnix.h -diff -N uriloader/exthandler/unix/nsMIMEInfoUnix.h ---- /dev/null 1 Jan 1970 00:00:00 -0000 -+++ uriloader/exthandler/unix/nsMIMEInfoUnix.h 21 Jul 2005 03:07:40 -0000 -@@ -0,0 +1,50 @@ -+/* ***** BEGIN LICENSE BLOCK ***** -+ * Version: MPL 1.1 -+ * -+ * The contents of this file are subject to the Mozilla Public License Version -+ * 1.1 (the "License"); you may not use this file except in compliance with -+ * the License. You may obtain a copy of the License at -+ * http://www.mozilla.org/MPL/ -+ * -+ * Software distributed under the License is distributed on an "AS IS" basis, -+ * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License -+ * for the specific language governing rights and limitations under the -+ * License. -+ * -+ * The Original Code is mozilla.org Code. -+ * -+ * The Initial Developer of the Original Code is -+ * Red Hat, Inc. -+ * Portions created by the Initial Developer are Copyright (C) 2005 -+ * the Initial Developer. All Rights Reserved. -+ * -+ * Contributor(s): -+ * Christopher Aillon <caillon@redhat.com> (Original author) -+ * -+ * -+ * ***** END LICENSE BLOCK ***** */ -+ -+#ifndef nsMimeInfoUnix_h__ -+#define nsMimeInfoUnix_h__ -+ -+#include "nsMIMEInfoImpl.h" -+ -+struct GnomeVFSMimeApplication; -+ -+class nsMIMEInfoUnix : public nsMIMEInfoImpl -+{ -+public: -+ nsMIMEInfoUnix(const char* aType = "") : nsMIMEInfoImpl(aType), mDefaultVFSApplication(nsnull) {} -+ nsMIMEInfoUnix(const nsACString& aMIMEType) : nsMIMEInfoImpl(aMIMEType) {}; -+ -+ virtual ~nsMIMEInfoUnix(); -+ -+ void SetDefaultGnomeVFSMimeApplication(GnomeVFSMimeApplication *app); -+ -+protected: -+ virtual NS_HIDDEN_(nsresult) LaunchDefaultWithFile(nsIFile* aFile); -+ -+ GnomeVFSMimeApplication *mDefaultVFSApplication; -+}; -+ -+#endif // nsMimeInfoUnix_h__ -Index: uriloader/exthandler/unix/nsOSHelperAppService.cpp -=================================================================== -RCS file: /cvsroot/mozilla/uriloader/exthandler/unix/nsOSHelperAppService.cpp,v -retrieving revision 1.58 -diff -d -u -p -r1.58 nsOSHelperAppService.cpp ---- uriloader/exthandler/unix/nsOSHelperAppService.cpp 25 Oct 2004 07:46:01 -0000 1.58 -+++ uriloader/exthandler/unix/nsOSHelperAppService.cpp 21 Jul 2005 03:07:40 -0000 -@@ -44,6 +44,7 @@ - #include "nsOSHelperAppService.h" - #ifdef MOZ_WIDGET_GTK2 - #include "nsGNOMERegistry.h" -+#include "nsMIMEInfoUnix.h" - #endif - #include "nsISupports.h" - #include "nsString.h" diff --git a/mail-client/mozilla-thunderbird/files/firefox-1.1-uriloader.patch b/mail-client/mozilla-thunderbird/files/firefox-1.1-uriloader.patch deleted file mode 100755 index 08c7e9605e46..000000000000 --- a/mail-client/mozilla-thunderbird/files/firefox-1.1-uriloader.patch +++ /dev/null @@ -1,459 +0,0 @@ -Index: uriloader/exthandler/Makefile.in -=================================================================== -RCS file: /cvsroot/mozilla/uriloader/exthandler/Makefile.in,v -retrieving revision 1.60 -diff -d -u -p -r1.60 Makefile.in ---- uriloader/exthandler/Makefile.in 2 May 2005 16:30:03 -0000 1.60 -+++ uriloader/exthandler/Makefile.in 21 Jul 2005 03:07:39 -0000 -@@ -102,7 +102,7 @@ endif - LOCAL_INCLUDES = -I$(srcdir) - - ifeq ($(MOZ_WIDGET_TOOLKIT),gtk2) --OSHELPER += nsGNOMERegistry.cpp -+OSHELPER += nsMIMEInfoUnix.cpp nsGNOMERegistry.cpp - endif - - ifeq ($(MOZ_WIDGET_TOOLKIT),beos) -Index: uriloader/exthandler/unix/nsGNOMERegistry.cpp -=================================================================== -RCS file: /cvsroot/mozilla/uriloader/exthandler/unix/nsGNOMERegistry.cpp,v -retrieving revision 1.10 -diff -d -u -p -r1.10 nsGNOMERegistry.cpp ---- uriloader/exthandler/unix/nsGNOMERegistry.cpp 16 Oct 2004 13:46:17 -0000 1.10 -+++ uriloader/exthandler/unix/nsGNOMERegistry.cpp 21 Jul 2005 03:07:40 -0000 -@@ -42,7 +42,7 @@ - #include "nsString.h" - #include "nsIComponentManager.h" - #include "nsILocalFile.h" --#include "nsMIMEInfoImpl.h" -+#include "nsMIMEInfoUnix.h" - #include "nsAutoPtr.h" - - #include <glib.h> -@@ -56,12 +56,12 @@ typedef struct _GConfClient GConfClient; - typedef struct _GnomeProgram GnomeProgram; - typedef struct _GnomeModuleInfo GnomeModuleInfo; - --typedef struct { -+struct GnomeVFSMimeApplication { - char *id; - char *name; - char *command; - /* there is more here, but we don't need it */ --} GnomeVFSMimeApplication; -+}; - - typedef GConfClient * (*_gconf_client_get_default_fn)(); - typedef gchar * (*_gconf_client_get_string_fn)(GConfClient *, -@@ -264,7 +264,7 @@ nsGNOMERegistry::GetAppDescForScheme(con - } - - --/* static */ already_AddRefed<nsMIMEInfoBase> -+/* static */ already_AddRefed<nsMIMEInfoUnix> - nsGNOMERegistry::GetFromExtension(const char *aFileExt) - { - if (!gconfLib) -@@ -286,7 +286,7 @@ nsGNOMERegistry::GetFromExtension(const - return GetFromType(mimeType); - } - --/* static */ already_AddRefed<nsMIMEInfoBase> -+/* static */ already_AddRefed<nsMIMEInfoUnix> - nsGNOMERegistry::GetFromType(const char *aMIMEType) - { - if (!gconfLib) -@@ -296,9 +296,11 @@ nsGNOMERegistry::GetFromType(const char - if (!handlerApp) - return nsnull; - -- nsRefPtr<nsMIMEInfoImpl> mimeInfo = new nsMIMEInfoImpl(aMIMEType); -+ nsRefPtr<nsMIMEInfoUnix> mimeInfo = new nsMIMEInfoUnix(aMIMEType); - NS_ENSURE_TRUE(mimeInfo, nsnull); - -+ mimeInfo->SetDefaultGnomeVFSMimeApplication(handlerApp); -+ - // Get the list of extensions and append then to the mimeInfo. - GList *extensions = _gnome_vfs_mime_get_extensions_list(aMIMEType); - for (GList *extension = extensions; extension; extension = extension->next) -@@ -320,11 +322,21 @@ nsGNOMERegistry::GetFromType(const char - return nsnull; - } - -- gchar *commandPath = g_find_program_in_path(nativeCommand); -+ gchar **argv; -+ gboolean res = g_shell_parse_argv(nativeCommand, NULL, &argv, NULL); -+ if (!res) { -+ NS_ERROR("Could not convert helper app command to filesystem encoding"); -+ _gnome_vfs_mime_application_free(handlerApp); -+ return nsnull; -+ } -+ -+ gchar *commandPath = g_find_program_in_path(argv[0]); - - g_free(nativeCommand); -+ g_strfreev(argv); - - if (!commandPath) { -+ NS_WARNING("could not find command in path"); - _gnome_vfs_mime_application_free(handlerApp); - return nsnull; - } -@@ -342,7 +354,7 @@ nsGNOMERegistry::GetFromType(const char - - _gnome_vfs_mime_application_free(handlerApp); - -- nsMIMEInfoBase* retval; -+ nsMIMEInfoUnix* retval; - NS_ADDREF((retval = mimeInfo)); - return retval; - } -Index: uriloader/exthandler/unix/nsGNOMERegistry.h -=================================================================== -RCS file: /cvsroot/mozilla/uriloader/exthandler/unix/nsGNOMERegistry.h,v -retrieving revision 1.3 -diff -d -u -p -r1.3 nsGNOMERegistry.h ---- uriloader/exthandler/unix/nsGNOMERegistry.h 16 Oct 2004 13:46:17 -0000 1.3 -+++ uriloader/exthandler/unix/nsGNOMERegistry.h 21 Jul 2005 03:07:40 -0000 -@@ -35,10 +35,13 @@ - * - * ***** END LICENSE BLOCK ***** */ - -+#ifndef nsGNOMERegistry_h__ -+#define nsGNOMERegistry_h__ -+ - #include "nsIURI.h" - #include "nsCOMPtr.h" - --class nsMIMEInfoBase; -+class nsMIMEInfoUnix; - - class nsGNOMERegistry - { -@@ -52,7 +55,9 @@ class nsGNOMERegistry - static void GetAppDescForScheme(const nsACString& aScheme, - nsAString& aDesc); - -- static already_AddRefed<nsMIMEInfoBase> GetFromExtension(const char *aFileExt); -+ static already_AddRefed<nsMIMEInfoUnix> GetFromExtension(const char *aFileExt); - -- static already_AddRefed<nsMIMEInfoBase> GetFromType(const char *aMIMEType); -+ static already_AddRefed<nsMIMEInfoUnix> GetFromType(const char *aMIMEType); - }; -+ -+#endif // nsGNOMERegistry_h__ -Index: uriloader/exthandler/unix/nsMIMEInfoUnix.cpp -=================================================================== -RCS file: uriloader/exthandler/unix/nsMIMEInfoUnix.cpp -diff -N uriloader/exthandler/unix/nsMIMEInfoUnix.cpp ---- /dev/null 1 Jan 1970 00:00:00 -0000 -+++ uriloader/exthandler/unix/nsMIMEInfoUnix.cpp 21 Jul 2005 03:07:40 -0000 -@@ -0,0 +1,196 @@ -+/* ***** BEGIN LICENSE BLOCK ***** -+ * Version: MPL 1.1 -+ * -+ * The contents of this file are subject to the Mozilla Public License Version -+ * 1.1 (the "License"); you may not use this file except in compliance with -+ * the License. You may obtain a copy of the License at -+ * http://www.mozilla.org/MPL/ -+ * -+ * Software distributed under the License is distributed on an "AS IS" basis, -+ * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License -+ * for the specific language governing rights and limitations under the -+ * License. -+ * -+ * The Original Code is mozilla.org Code. -+ * -+ * The Initial Developer of the Original Code is -+ * Red Hat, Inc. -+ * Portions created by the Initial Developer are Copyright (C) 2005 -+ * the Initial Developer. All Rights Reserved. -+ * -+ * Contributor(s): -+ * Christopher Aillon <caillon@redhat.com> (Original author) -+ * -+ * -+ * ***** END LICENSE BLOCK ***** */ -+ -+#include "nsMIMEInfoUnix.h" -+#include "prlink.h" -+#include "prmem.h" -+#include <glib.h> -+#include <glib-object.h> -+ -+static PRLibrary *gnomeLib; -+static PRLibrary *vfsLib; -+ -+typedef struct _GnomeProgram GnomeProgram; -+typedef struct _GnomeModuleInfo GnomeModuleInfo; -+ -+typedef enum { -+ GNOME_VFS_OK // there's more but we don't care about them. -+} GnomeVFSResult; -+ -+typedef GnomeVFSResult (*_gnome_vfs_mime_application_launch_fn) -+ (GnomeVFSMimeApplication *app, -+ GList *uris); -+typedef void (*_gnome_vfs_mime_application_free_fn)(GnomeVFSMimeApplication *); -+typedef GnomeVFSMimeApplication * (*_gnome_vfs_mime_application_copy_fn)(GnomeVFSMimeApplication *); -+typedef GnomeProgram * (*_gnome_program_init_fn)(const char *, const char *, -+ const GnomeModuleInfo *, int, -+ char **, const char *, ...); -+typedef const char * (*_gnome_vfs_mime_application_get_name_fn)(GnomeVFSMimeApplication *); -+typedef const GnomeModuleInfo * (*_libgnome_module_info_get_fn)(); -+typedef GnomeProgram * (*_gnome_program_get_fn)(); -+typedef char * (*_gnome_vfs_make_uri_from_input_fn)(const char *); -+ -+#define DECL_FUNC_PTR(func) static _##func##_fn _##func -+ -+DECL_FUNC_PTR(gnome_vfs_mime_application_launch); -+DECL_FUNC_PTR(gnome_vfs_mime_application_free); -+DECL_FUNC_PTR(gnome_vfs_mime_application_copy); -+DECL_FUNC_PTR(gnome_vfs_mime_application_get_name); -+DECL_FUNC_PTR(gnome_program_init); -+DECL_FUNC_PTR(gnome_program_get); -+DECL_FUNC_PTR(libgnome_module_info_get); -+DECL_FUNC_PTR(gnome_vfs_make_uri_from_input); -+ -+static PRLibrary * -+LoadVersionedLibrary(const char* libName, const char* libVersion) -+{ -+ char *platformLibName = PR_GetLibraryName(nsnull, libName); -+ nsCAutoString versionLibName(platformLibName); -+ versionLibName.Append(libVersion); -+ PR_Free(platformLibName); -+ return PR_LoadLibrary(versionLibName.get()); -+} -+ -+static void -+Cleanup() -+{ -+ // Unload all libraries -+ if (gnomeLib) -+ PR_UnloadLibrary(gnomeLib); -+ if (vfsLib) -+ PR_UnloadLibrary(vfsLib); -+ -+ gnomeLib = vfsLib = nsnull; -+} -+ -+static void -+InitGnomeVFS() -+{ -+ static PRBool initialized = PR_FALSE; -+ -+ if (initialized) -+ return; -+ -+ #define ENSURE_LIB(lib) \ -+ PR_BEGIN_MACRO \ -+ if (!lib) { \ -+ Cleanup(); \ -+ return; \ -+ } \ -+ PR_END_MACRO -+ -+ #define GET_LIB_FUNCTION(lib, func, failure) \ -+ PR_BEGIN_MACRO \ -+ _##func = (_##func##_fn) PR_FindFunctionSymbol(lib##Lib, #func); \ -+ if (!_##func) { \ -+ failure; \ -+ } \ -+ PR_END_MACRO -+ -+ // Attempt to open libgnome -+ gnomeLib = LoadVersionedLibrary("gnome-2", ".0"); -+ ENSURE_LIB(gnomeLib); -+ -+ GET_LIB_FUNCTION(gnome, gnome_program_init, return Cleanup()); -+ GET_LIB_FUNCTION(gnome, libgnome_module_info_get, return Cleanup()); -+ GET_LIB_FUNCTION(gnome, gnome_program_get, return Cleanup()); -+ -+ // Attempt to open libgnomevfs -+ vfsLib = LoadVersionedLibrary("gnomevfs-2", ".0"); -+ ENSURE_LIB(vfsLib); -+ -+ GET_LIB_FUNCTION(vfs, gnome_vfs_mime_application_launch, /* do nothing */); -+ GET_LIB_FUNCTION(vfs, gnome_vfs_make_uri_from_input, return Cleanup()); -+ GET_LIB_FUNCTION(vfs, gnome_vfs_mime_application_get_name, return Cleanup()); -+ GET_LIB_FUNCTION(vfs, gnome_vfs_mime_application_free, return Cleanup()); -+ GET_LIB_FUNCTION(vfs, gnome_vfs_mime_application_copy, return Cleanup()); -+ -+ // Initialize GNOME, if it's not already initialized. It's not -+ // necessary to tell GNOME about our actual command line arguments. -+ -+ if (!_gnome_program_get()) { -+ char *argv[1] = { "gecko" }; -+ _gnome_program_init("Gecko", "1.0", _libgnome_module_info_get(), -+ 1, argv, NULL); -+ } -+ -+ // Note: after GNOME has been initialized, do not ever unload these -+ // libraries. They register atexit handlers, so if they are unloaded, we'll -+ // crash on exit. -+} -+ -+void -+nsMIMEInfoUnix::SetDefaultGnomeVFSMimeApplication(GnomeVFSMimeApplication* app) -+{ -+ if (_gnome_vfs_mime_application_copy && _gnome_vfs_mime_application_free) { -+ mDefaultVFSApplication = _gnome_vfs_mime_application_copy(app); -+ -+ mPreferredAction = nsIMIMEInfo::useSystemDefault; -+ -+ const gchar * name = _gnome_vfs_mime_application_get_name(mDefaultVFSApplication); -+ if (name) -+ mDefaultAppDescription = NS_ConvertUTF8toUCS2(name); -+ } -+} -+ -+nsMIMEInfoUnix::~nsMIMEInfoUnix() -+{ -+ if (mDefaultVFSApplication) -+ _gnome_vfs_mime_application_free(mDefaultVFSApplication); -+} -+ -+nsresult -+nsMIMEInfoUnix::LaunchDefaultWithFile(nsIFile* aFile) -+{ -+ NS_ENSURE_ARG_POINTER(aFile); -+ -+ InitGnomeVFS(); -+ -+ if (_gnome_vfs_mime_application_launch && mDefaultVFSApplication) { -+ nsCAutoString nativePath; -+ aFile->GetNativePath(nativePath); -+ -+ gchar *uri = _gnome_vfs_make_uri_from_input(nativePath.get()); -+ -+ GList *uris = NULL; -+ uris = g_list_append(uris, uri); -+ -+ GnomeVFSResult result = _gnome_vfs_mime_application_launch(mDefaultVFSApplication, uris); -+ -+ g_free(uri); -+ g_list_free(uris); -+ -+ if (result != GNOME_VFS_OK) -+ return NS_ERROR_FAILURE; -+ -+ return NS_OK; -+ } -+ -+ if (!mDefaultApplication) -+ return NS_ERROR_FILE_NOT_FOUND; -+ -+ return LaunchWithIProcess(mDefaultApplication, aFile); -+} -Index: uriloader/exthandler/unix/nsMIMEInfoUnix.h -=================================================================== -RCS file: uriloader/exthandler/unix/nsMIMEInfoUnix.h -diff -N uriloader/exthandler/unix/nsMIMEInfoUnix.h ---- /dev/null 1 Jan 1970 00:00:00 -0000 -+++ uriloader/exthandler/unix/nsMIMEInfoUnix.h 21 Jul 2005 03:07:40 -0000 -@@ -0,0 +1,50 @@ -+/* ***** BEGIN LICENSE BLOCK ***** -+ * Version: MPL 1.1 -+ * -+ * The contents of this file are subject to the Mozilla Public License Version -+ * 1.1 (the "License"); you may not use this file except in compliance with -+ * the License. You may obtain a copy of the License at -+ * http://www.mozilla.org/MPL/ -+ * -+ * Software distributed under the License is distributed on an "AS IS" basis, -+ * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License -+ * for the specific language governing rights and limitations under the -+ * License. -+ * -+ * The Original Code is mozilla.org Code. -+ * -+ * The Initial Developer of the Original Code is -+ * Red Hat, Inc. -+ * Portions created by the Initial Developer are Copyright (C) 2005 -+ * the Initial Developer. All Rights Reserved. -+ * -+ * Contributor(s): -+ * Christopher Aillon <caillon@redhat.com> (Original author) -+ * -+ * -+ * ***** END LICENSE BLOCK ***** */ -+ -+#ifndef nsMimeInfoUnix_h__ -+#define nsMimeInfoUnix_h__ -+ -+#include "nsMIMEInfoImpl.h" -+ -+struct GnomeVFSMimeApplication; -+ -+class nsMIMEInfoUnix : public nsMIMEInfoImpl -+{ -+public: -+ nsMIMEInfoUnix(const char* aType = "") : nsMIMEInfoImpl(aType), mDefaultVFSApplication(nsnull) {} -+ nsMIMEInfoUnix(const nsACString& aMIMEType) : nsMIMEInfoImpl(aMIMEType) {}; -+ -+ virtual ~nsMIMEInfoUnix(); -+ -+ void SetDefaultGnomeVFSMimeApplication(GnomeVFSMimeApplication *app); -+ -+protected: -+ virtual NS_HIDDEN_(nsresult) LaunchDefaultWithFile(nsIFile* aFile); -+ -+ GnomeVFSMimeApplication *mDefaultVFSApplication; -+}; -+ -+#endif // nsMimeInfoUnix_h__ -Index: uriloader/exthandler/unix/nsOSHelperAppService.cpp -=================================================================== -RCS file: /cvsroot/mozilla/uriloader/exthandler/unix/nsOSHelperAppService.cpp,v -retrieving revision 1.58 -diff -d -u -p -r1.58 nsOSHelperAppService.cpp ---- uriloader/exthandler/unix/nsOSHelperAppService.cpp 25 Oct 2004 07:46:01 -0000 1.58 -+++ uriloader/exthandler/unix/nsOSHelperAppService.cpp 21 Jul 2005 03:07:40 -0000 -@@ -44,6 +44,7 @@ - #include "nsOSHelperAppService.h" - #ifdef MOZ_WIDGET_GTK2 - #include "nsGNOMERegistry.h" -+#include "nsMIMEInfoUnix.h" - #endif - #include "nsISupports.h" - #include "nsString.h" -@@ -1486,6 +1487,17 @@ nsOSHelperAppService::GetFromType(const - - LOG(("Here we do a mimetype lookup for '%s'\n", aMIMEType.get())); - -+#ifdef MOZ_WIDGET_GTK2 -+ // Look in GNOME registry first since it is the preferred method in GNOME, -+ // should trump the mailcap entry -+ LOG(("Looking in GNOME registry\n")); -+ nsMIMEInfoBase *gnomeInfo = nsGNOMERegistry::GetFromType(aMIMEType.get()).get(); -+ if (gnomeInfo) { -+ LOG(("Got MIMEInfo from GNOME registry\n")); -+ return gnomeInfo; -+ } -+#endif -+ - // extract the major and minor types - NS_ConvertASCIItoUTF16 mimeType(aMIMEType); - nsAString::const_iterator start_iter, end_iter, -@@ -1522,21 +1534,6 @@ nsOSHelperAppService::GetFromType(const - mozillaFlags, - PR_TRUE); - -- -- if (handler.IsEmpty() && extensions.IsEmpty() && -- mailcap_description.IsEmpty() && mime_types_description.IsEmpty()) { -- // No useful data yet -- --#ifdef MOZ_WIDGET_GTK2 -- LOG(("Looking in GNOME registry\n")); -- nsMIMEInfoBase *gnomeInfo = nsGNOMERegistry::GetFromType(aMIMEType.get()).get(); -- if (gnomeInfo) { -- LOG(("Got MIMEInfo from GNOME registry\n")); -- return gnomeInfo; -- } --#endif -- } -- - if (handler.IsEmpty() && mailcap_description.IsEmpty()) { - DoLookUpHandlerAndDescription(majorType, - minorType, diff --git a/mail-client/mozilla-thunderbird/files/firefox-1.1-visibility.patch b/mail-client/mozilla-thunderbird/files/firefox-1.1-visibility.patch deleted file mode 100644 index e0665fe742b4..000000000000 --- a/mail-client/mozilla-thunderbird/files/firefox-1.1-visibility.patch +++ /dev/null @@ -1,22 +0,0 @@ -Index: configure -=================================================================== -RCS file: /cvsroot/mozilla/configure,v -retrieving revision 1.1443 -diff -u -p -6 -r1.1443 configure ---- configure 2 Jun 2005 04:00:20 -0000 1.1443 -+++ configure 6 Jun 2005 07:34:06 -0000 -@@ -7303,13 +7303,13 @@ else - int foo_default = 1; - EOF - ac_cv_visibility_pragma=no - if ${CC-cc} -Werror -S conftest.c -o conftest.s >/dev/null 2>&1; then - if grep '\.hidden.*foo_hidden' conftest.s >/dev/null; then - if ! grep '\.hidden.*foo_default' conftest.s > /dev/null; then -- ac_cv_visibility_pragma=yes -+ ac_cv_visibility_pragma=no - fi - fi - fi - rm -f conftest.cs - - fi diff --git a/mail-client/mozilla-thunderbird/files/firefox-1.5-visibility-check.patch b/mail-client/mozilla-thunderbird/files/firefox-1.5-visibility-check.patch deleted file mode 100644 index eda8ed458f9d..000000000000 --- a/mail-client/mozilla-thunderbird/files/firefox-1.5-visibility-check.patch +++ /dev/null @@ -1,273 +0,0 @@ -diff -Nur mozilla/configure.in mozilla.bug307168/configure.in ---- mozilla/configure.in 2005-10-04 05:53:49.000000000 +0000 -+++ mozilla.bug307168/configure.in 2005-12-06 16:42:46.000000000 +0000 -@@ -1036,9 +1036,9 @@ - dnl GNU specific defaults - dnl ======================================================== - if test "$GNU_CC"; then -- MKSHLIB='$(CXX) $(CXXFLAGS) $(DSO_PIC_CFLAGS) $(DSO_LDOPTS) -o $@' -- MKCSHLIB='$(CC) $(CFLAGS) $(DSO_PIC_CFLAGS) $(DSO_LDOPTS) -o $@' -- DSO_LDOPTS='-shared -Wl,-h -Wl,$@' -+ MKSHLIB='$(CXX) $(CXXFLAGS) $(DSO_PIC_CFLAGS) $(DSO_LDOPTS) -Wl,-h,$@ -o $@' -+ MKCSHLIB='$(CC) $(CFLAGS) $(DSO_PIC_CFLAGS) $(DSO_LDOPTS) -Wl,-h,$@ -o $@' -+ DSO_LDOPTS='-shared' - DSO_CFLAGS='' - DSO_PIC_CFLAGS='-fPIC' - _MOZ_RTTI_FLAGS_ON=${_COMPILER_PREFIX}-frtti -@@ -1063,9 +1063,9 @@ - _DEFINES_CFLAGS='-include $(DEPTH)/mozilla-config.h -DMOZILLA_CLIENT' - _USE_CPP_INCLUDE_FLAG=1 - else -- MKSHLIB='$(LD) $(DSO_LDOPTS) -o $@' -- MKCSHLIB='$(LD) $(DSO_LDOPTS) -o $@' -- DSO_LDOPTS='-shared -h $@' -+ MKSHLIB='$(LD) $(DSO_LDOPTS) -h $@ -o $@' -+ MKCSHLIB='$(LD) $(DSO_LDOPTS) -h $@ -o $@' -+ DSO_LDOPTS='-shared' - DSO_CFLAGS='' - DSO_PIC_CFLAGS='-KPIC' - _DEFINES_CFLAGS='$(ACDEFINES) -D_MOZILLA_CONFIG_H_ -DMOZILLA_CLIENT' -@@ -1292,9 +1292,9 @@ - - *-beos*) - no_x=yes -- MKSHLIB='$(CXX) $(CXXFLAGS) $(DSO_LDOPTS) -o $@' -+ MKSHLIB='$(CXX) $(CXXFLAGS) $(DSO_LDOPTS) -Wl,-h,$@ -o $@' - _PLATFORM_DEFAULT_TOOLKIT="beos" -- DSO_LDOPTS='-nostart -Wl,-h -Wl,$@' -+ DSO_LDOPTS='-nostart' - TK_LIBS='-lbe -lroot' - LIBS="$LIBS -lbe" - if test "$COMPILE_ENVIRONMENT"; then -@@ -1379,16 +1379,16 @@ - *-hpux*) - DLL_SUFFIX=".sl" - if test ! "$GNU_CC"; then -- DSO_LDOPTS='-b -Wl,+s -L$(DIST)/bin' -+ DSO_LDOPTS='-b -Wl,+s' - DSO_CFLAGS="" - DSO_PIC_CFLAGS="+Z" -- MKSHLIB='$(CXX) $(CXXFLAGS) $(DSO_LDOPTS) -o $@' -+ MKSHLIB='$(CXX) $(CXXFLAGS) $(DSO_LDOPTS) -L$(DIST)/bin -o $@' - MKCSHLIB='$(LD) -b +s -L$(DIST)/bin -o $@' - CXXFLAGS="$CXXFLAGS -Wc,-ansi_for_scope,on" - else -- DSO_LDOPTS='-b -E +s -L$(DIST)/bin -L$(DIST)/lib' -- MKSHLIB='$(LD) $(DSO_LDOPTS) -o $@' -- MKCSHLIB='$(LD) $(DSO_LDOPTS) -o $@' -+ DSO_LDOPTS='-b -E +s' -+ MKSHLIB='$(LD) $(DSO_LDOPTS) -L$(DIST)/bin -L$(DIST)/lib -o $@' -+ MKCSHLIB='$(LD) $(DSO_LDOPTS) -L$(DIST)/bin -L$(DIST)/lib -o $@' - fi - MOZ_POST_PROGRAM_COMMAND='chatr +s enable' - AC_DEFINE(NSCAP_DISABLE_DEBUG_PTR_TYPES) -@@ -1397,11 +1397,16 @@ - *-irix5*) - AC_DEFINE(IRIX) - DSO_LDOPTS='-elf -shared' -+ - if test "$GNU_CC"; then -+ MKSHLIB='$(CXX) $(CXXFLAGS) $(DSO_PIC_CFLAGS) $(DSO_LDOPTS) -o $@' -+ MKCSHLIB='$(CC) $(CFLAGS) $(DSO_PIC_CFLAGS) $(DSO_LDOPTS) -o $@' - MKSHLIB_FORCE_ALL='-Wl,-all' - MKSHLIB_UNFORCE_ALL='-Wl,-none' - CXXFLAGS="$CXXFLAGS -D_LANGUAGE_C_PLUS_PLUS" - else -+ MKSHLIB='$(LD) $(DSO_LDOPTS) -o $@' -+ MKCSHLIB='$(LD) $(DSO_LDOPTS) -o $@' - MKSHLIB_FORCE_ALL='-all' - MKSHLIB_UNFORCE_ALL='-none' - fi -@@ -1755,7 +1760,7 @@ - if $CC -E - -dM </dev/null | grep __ELF__ >/dev/null; then - DLL_SUFFIX=".so" - DSO_PIC_CFLAGS='-fPIC -DPIC' -- DSO_LDOPTS='-shared -Wl,-soname,lib$(LIBRARY_NAME)$(DLL_SUFFIX)' -+ DSO_LDOPTS='-shared' - BIN_FLAGS='-Wl,--export-dynamic' - else - DSO_PIC_CFLAGS='-fPIC -DPIC' -@@ -1768,6 +1773,8 @@ - if test "$LIBRUNPATH"; then - DSO_LDOPTS="-Wl,-R$LIBRUNPATH $DSO_LDOPTS" - fi -+ MKSHLIB='$(CXX) $(CXXFLAGS) $(DSO_PIC_CFLAGS) $(DSO_LDOPTS) -Wl,-soname,lib$(LIBRARY_NAME)$(DLL_SUFFIX) -o $@' -+ MKCSHLIB='$(CC) $(CFLAGS) $(DSO_PIC_CFLAGS) $(DSO_LDOPTS) -Wl,-soname,lib$(LIBRARY_NAME)$(DLL_SUFFIX) -o $@' - ;; - - *-nto*) -@@ -1931,17 +1938,19 @@ - - alpha*-*-osf*) - if test "$GNU_CC"; then -- DSO_LDOPTS='-shared -Wl,-soname -Wl,$@' -+ MKSHLIB='$(CXX) $(CXXFLAGS) $(DSO_PIC_CFLAGS) $(DSO_LDOPTS) -Wl,-soname,$@ -o $@' -+ MKCSHLIB='$(CC) $(CFLAGS) $(DSO_PIC_CFLAGS) $(DSO_LDOPTS) -Wl,-soname,$@ -o $@' -+ - else - MOZ_DEBUG_FLAGS='-g' - ASFLAGS='-I$(topsrcdir)/xpcom/reflect/xptcall/public -g' - CFLAGS="$CFLAGS -ieee" - CXXFLAGS="$CXXFLAGS "'-noexceptions -ieee -ptr $(DIST)/cxx_repository' -- DSO_LDOPTS='-shared -msym -expect_unresolved \* -soname $@ -update_registry $(DIST)/so_locations' -+ DSO_LDOPTS='-shared -msym -expect_unresolved \* -update_registry $(DIST)/so_locations' - DSO_CFLAGS= - DSO_PIC_CFLAGS= -- MKCSHLIB='$(CC) $(CFLAGS) $(DSO_PIC_CFLAGS) $(DSO_LDOPTS) -o $@' -- MKSHLIB='$(CXX) $(CXXFLAGS) $(DSO_PIC_CFLAGS) $(DSO_LDOPTS) -o $@' -+ MKCSHLIB='$(CC) $(CFLAGS) $(DSO_PIC_CFLAGS) $(DSO_LDOPTS) -soname $@ -o $@' -+ MKSHLIB='$(CXX) $(CXXFLAGS) $(DSO_PIC_CFLAGS) $(DSO_LDOPTS) -soname $@ -o $@' - MKSHLIB_FORCE_ALL='-all' - MKSHLIB_UNFORCE_ALL='-none' - dnl Might fix the libxpcom.so breakage on this platform as well.... -@@ -1973,7 +1982,7 @@ - AC_DEFINE(NSCAP_DISABLE_DEBUG_PTR_TYPES) - CXXFLAGS="$CXXFLAGS -I/usr/include/CC" - if test ! "$GNU_CC"; then -- DSO_LDOPTS='-G -h $@' -+ DSO_LDOPTS='-G' - fi - ;; - -@@ -1989,11 +1998,11 @@ - CXXFLAGS="$CXXFLAGS -xbuiltin=%all -features=tmplife" - LDFLAGS="-xildoff -zlazyload -zcombreloc $LDFLAGS" - MOZ_OPTIMIZE_FLAGS="-xO4" -- MKSHLIB='$(CXX) $(CXXFLAGS) $(DSO_PIC_FLAGS) $(DSO_LDOPTS) -o $@' -- MKCSHLIB='$(CC) $(CFLAGS) $(DSO_PIC_FLAGS) -G -Wl,-z -Wl,muldefs -o $@' -+ MKSHLIB='$(CXX) $(CXXFLAGS) $(DSO_PIC_FLAGS) $(DSO_LDOPTS) -h $@ -o $@' -+ KCSHLIB='$(CC) $(CFLAGS) $(DSO_PIC_FLAGS) -G -Wl,-z -Wl,muldefs -h $@ -o $@' - MKSHLIB_FORCE_ALL='-Qoption ld -z,allextract' - MKSHLIB_UNFORCE_ALL='' -- DSO_LDOPTS='-G -Qoption ld -z,muldefs -h $@' -+ DSO_LDOPTS='-G -Qoption ld -z,muldefs' - AR_LIST="$AR t" - AR_EXTRACT="$AR x" - AR_DELETE="$AR d" -@@ -2019,7 +2028,7 @@ - AC_MSG_RESULT([$_res]) - else - ASFLAGS="$ASFLAGS -fPIC" -- DSO_LDOPTS='-G -h $@' -+ DSO_LDOPTS='-G' - _WARNINGS_CFLAGS='' - _WARNINGS_CXXFLAGS='' - if test "$OS_RELEASE" = "5.3"; then -@@ -2378,8 +2387,25 @@ - fi - rm -f conftest.[cs] - ]) -- if test "$ac_cv_visibility_hidden" = "yes"; then -- AC_DEFINE(HAVE_VISIBILITY_HIDDEN_ATTRIBUTE) -+ if test "$ac_cv_visibility_hidden" = "yes"; then -+ AC_DEFINE(HAVE_VISIBILITY_HIDDEN_ATTRIBUTE) -+ -+ AC_CACHE_CHECK(for visibility(default) attribute, -+ ac_cv_visibility_default, -+ [cat > conftest.c <<EOF -+ int foo __attribute__ ((visibility ("default"))) = 1; -+EOF -+ ac_cv_visibility_default=no -+ if ${CC-cc} -fvisibility=hidden -Werror -S conftest.c -o conftest.s >/dev/null 2>&1; then -+ if ! grep '\.hidden.*foo' conftest.s >/dev/null; then -+ ac_cv_visibility_default=yes -+ fi -+ fi -+ rm -f conftest.[cs] -+ ]) -+ if test "$ac_cv_visibility_default" = "yes"; then -+ AC_DEFINE(HAVE_VISIBILITY_ATTRIBUTE) -+ - AC_CACHE_CHECK(for visibility pragma support, - ac_cv_visibility_pragma, - [cat > conftest.c <<EOF -@@ -2399,12 +2425,35 @@ - rm -f conftest.[cs] - ]) - if test "$ac_cv_visibility_pragma" = "yes"; then -- AC_DEFINE(HAVE_VISIBILITY_PRAGMA) -- VISIBILITY_FLAGS='-I$(DIST)/include/system_wrappers -include $(topsrcdir)/config/gcc_hidden.h' -- WRAP_SYSTEM_INCLUDES=1 -- fi -- fi --fi # GNU_CC -+ AC_CACHE_CHECK(For x86_64 gcc visibility bug with builtins (GCC bug 20297), -+ ac_cv_have_visibility_builtin_bug, -+ [cat > conftest.c <<EOF -+#pragma GCC visibility push(hidden) -+#pragma GCC visibility push(default) -+#include <string.h> -+#pragma GCC visibility pop -+ -+__attribute__ ((visibility ("default"))) void Func() { -+ char c[[100]]; -+ memset(c, 0, sizeof(c)); -+} -+EOF -+ ac_cv_have_visibility_builtin_bug=no -+ if ! ${CC-cc} ${DSO_PIC_CFLAGS} ${DSO_LDOPTS} -O2 -o conftest.so conftest.c >/dev/null 2>&1; then -+ ac_cv_have_visibility_builtin_bug=yes -+ fi -+ rm -f conftest.{c,so} -+ ]) -+ if test "$ac_cv_have_visibility_builtin_bug" = "no"; then -+ VISIBILITY_FLAGS='-I$(DIST)/include/system_wrappers -include $(topsrcdir)/config/gcc_hidden.h' -+ WRAP_SYSTEM_INCLUDES=1 -+ else -+ VISIBILITY_FLAGS='-fvisibility=hidden -fvisibility-inlines-hidden' -+ fi # have visibility pragma bug -+ fi # have visibility pragma -+ fi # have visibility(default) attribute -+ fi # have visibility(hidden) attribute -+fi # GNU_CC - - AC_SUBST(WRAP_SYSTEM_INCLUDES) - AC_SUBST(VISIBILITY_FLAGS) -diff -Nur mozilla/js/src/jstypes.h mozilla.bug307168/js/src/jstypes.h ---- mozilla/js/src/jstypes.h 2005-09-18 04:35:05.000000000 +0000 -+++ mozilla.bug307168/js/src/jstypes.h 2005-12-06 16:35:57.000000000 +0000 -@@ -109,7 +109,7 @@ - - #else /* Unix */ - --#ifdef HAVE_VISIBILITY_PRAGMA -+#ifdef HAVE_VISIBILITY_ATTRIBUTE - #define JS_EXTERNAL_VIS __attribute__((visibility ("default"))) - #else - #define JS_EXTERNAL_VIS -diff -Nur mozilla/modules/libreg/include/NSReg.h mozilla.bug307168/modules/libreg/include/NSReg.h ---- mozilla/modules/libreg/include/NSReg.h 2004-12-15 05:52:38.000000000 +0000 -+++ mozilla.bug307168/modules/libreg/include/NSReg.h 2005-12-06 16:35:57.000000000 +0000 -@@ -129,7 +129,7 @@ - #endif - #elif defined XP_MAC - #define VR_INTERFACE(__x) __declspec(export) __x --#elif defined (HAVE_VISIBILITY_PRAGMA) -+#elif defined (HAVE_VISIBILITY_ATTRIBUTE) - #define VR_INTERFACE(type) __attribute__ ((visibility ("default"))) type - #else - #define VR_INTERFACE(type) type -diff -Nur mozilla/modules/zlib/src/mozzconf.h mozilla.bug307168/modules/zlib/src/mozzconf.h ---- mozilla/modules/zlib/src/mozzconf.h 2005-08-04 19:14:14.000000000 +0000 -+++ mozilla.bug307168/modules/zlib/src/mozzconf.h 2005-12-06 16:35:57.000000000 +0000 -@@ -41,7 +41,7 @@ - #undef ZLIB_DLL - #endif - --#ifdef HAVE_VISIBILITY_PRAGMA -+#ifdef HAVE_VISIBILITY_ATTRIBUTE - #define ZEXTERN __attribute__((visibility ("default"))) extern - #endif - -diff -Nur mozilla/xpcom/base/nscore.h mozilla.bug307168/xpcom/base/nscore.h ---- mozilla/xpcom/base/nscore.h 2005-07-21 22:15:00.000000000 +0000 -+++ mozilla.bug307168/xpcom/base/nscore.h 2005-12-06 16:35:57.000000000 +0000 -@@ -105,7 +105,7 @@ - #define NS_VISIBILITY_HIDDEN - #endif - --#if defined(HAVE_VISIBILITY_HIDDEN_ATTRIBUTE) && defined(HAVE_VISIBILITY_PRAGMA) -+#if defined(HAVE_VISIBILITY_ATTRIBUTE) - #define NS_VISIBILITY_DEFAULT __attribute__ ((visibility ("default"))) - #else - #define NS_VISIBILITY_DEFAULT diff --git a/mail-client/mozilla-thunderbird/files/firefox-1.5-visibility-fix.patch b/mail-client/mozilla-thunderbird/files/firefox-1.5-visibility-fix.patch deleted file mode 100644 index 8beb92492923..000000000000 --- a/mail-client/mozilla-thunderbird/files/firefox-1.5-visibility-fix.patch +++ /dev/null @@ -1,15 +0,0 @@ -diff -u -r3.30 -r3.31 ---- nsprpub/pr/include/prtypes.h 29 Apr 2005 21:02:54 -0000 3.30 -+++ nsprpub/pr/include/prtypes.h 13 Oct 2005 17:43:36 -0000 3.31 -@@ -178,7 +178,9 @@ - - #else /* Unix */ - --#ifdef HAVE_VISIBILITY_PRAGMA -+/* GCC 3.3 and later support the visibility attribute. */ -+#if (__GNUC__ >= 4) || \ -+ (__GNUC__ == 3 && __GNUC_MINOR__ >= 3) - #define PR_VISIBILITY_DEFAULT __attribute__((visibility("default"))) - #else - #define PR_VISIBILITY_DEFAULT - diff --git a/mail-client/mozilla-thunderbird/files/firefox-bus-error.patch b/mail-client/mozilla-thunderbird/files/firefox-bus-error.patch deleted file mode 100644 index 0968762e97ff..000000000000 --- a/mail-client/mozilla-thunderbird/files/firefox-bus-error.patch +++ /dev/null @@ -1,145 +0,0 @@ -diff -aur a/gfx/src/gtk/nsFontMetricsPango.cpp b/gfx/src/gtk/nsFontMetricsPango.cpp ---- a/gfx/src/gtk/nsFontMetricsPango.cpp 2006-02-23 13:01:42.000000000 -0800 -+++ b/gfx/src/gtk/nsFontMetricsPango.cpp 2006-05-20 20:27:50.000000000 -0700 -@@ -535,8 +535,13 @@ - - PangoLayout *layout = pango_layout_new(mPangoContext); - -- gchar *text = g_utf16_to_utf8(aString, aLength, -+ // Just copy the aString to ensure the alignment, -+ // it is not used anywhere else. -+ PRUnichar* dummy = new PRUnichar[aLength]; -+ memcpy(dummy, aString, aLength*sizeof(PRUnichar)); -+ gchar *text = g_utf16_to_utf8(dummy, aLength, - NULL, NULL, NULL); -+ delete [] dummy; - - if (!text) { - #ifdef DEBUG -diff -aur a/intl/lwbrk/src/nsJISx4501LineBreaker.cpp b/intl/lwbrk/src/nsJISx4501LineBreaker.cpp ---- a/intl/lwbrk/src/nsJISx4501LineBreaker.cpp 2004-04-18 07:21:07.000000000 -0700 -+++ b/intl/lwbrk/src/nsJISx4501LineBreaker.cpp 2006-05-20 20:27:51.000000000 -0700 -@@ -487,13 +487,13 @@ - PRUint32 cur; - for (cur = aPos; cur < aLen; ++cur) - { -- if (IS_SPACE(aText[cur])) -+ if (IS_SPACE(GetUnichar(&aText[cur]))) - { - *oNext = cur; - *oNeedMoreText = PR_FALSE; - return NS_OK; - } -- if (IS_CJK_CHAR(aText[cur])) -+ if (IS_CJK_CHAR(GetUnichar(&aText[cur]))) - goto ROUTE_CJK_NEXT; - } - *oNext = aLen; -@@ -503,13 +503,13 @@ - ROUTE_CJK_NEXT: - PRInt8 c1, c2; - cur = aPos; -- if(NEED_CONTEXTUAL_ANALYSIS(aText[cur])) -+ if(NEED_CONTEXTUAL_ANALYSIS(GetUnichar(&aText[cur]))) - { -- c1 = this->ContextualAnalysis((cur>0)?aText[cur-1]:0, -- aText[cur], -- (cur<(aLen-1)) ?aText[cur+1]:0); -+ c1 = this->ContextualAnalysis((cur>0)?GetUnichar(&aText[cur-1]):0, -+ GetUnichar(&aText[cur]), -+ (cur<(aLen-1)) ?GetUnichar(&aText[cur+1]):0); - } else { -- c1 = this->GetClass(aText[cur]); -+ c1 = this->GetClass(GetUnichar(&aText[cur])); - } - - if(CLASS_THAI == c1) -@@ -521,13 +521,13 @@ - - for(cur++; cur <aLen; cur++) - { -- if(NEED_CONTEXTUAL_ANALYSIS(aText[cur])) -+ if(NEED_CONTEXTUAL_ANALYSIS(GetUnichar(&aText[cur]))) - { -- c2= this->ContextualAnalysis((cur>0)?aText[cur-1]:0, -- aText[cur], -- (cur<(aLen-1)) ?aText[cur+1]:0); -+ c2= this->ContextualAnalysis((cur>0)?GetUnichar(&aText[cur-1]):0, -+ GetUnichar(&aText[cur]), -+ (cur<(aLen-1)) ?GetUnichar(&aText[cur+1]):0); - } else { -- c2 = this->GetClass(aText[cur]); -+ c2 = this->GetClass(GetUnichar(&aText[cur])); - } - - if(GetPair(c1, c2)) { -diff -aur a/intl/unicharutil/util/nsUnicharUtils.cpp b/intl/unicharutil/util/nsUnicharUtils.cpp ---- a/intl/unicharutil/util/nsUnicharUtils.cpp 2005-04-21 15:30:21.000000000 -0700 -+++ b/intl/unicharutil/util/nsUnicharUtils.cpp 2006-05-20 20:27:50.000000000 -0700 -@@ -340,3 +340,28 @@ - return result; - } - -+PRUnichar -+GetUnichar(const void *ptr) -+{ -+ PRUnichar result; -+#if defined(__sparc__) || defined(__alpha__) -+ *((char *) &result) = *((char *) ptr); -+ *((char *) &result + 1) = *((char *) ptr + 1); -+#else -+ result = *((PRUnichar *) ptr); -+#endif -+ return result; -+} -+ -+void -+SetUnichar(void *ptr, PRUnichar aChar) -+{ -+#if defined(__sparc__) || defined(__alpha__) -+ *((char *) ptr) = *((char *) &aChar); -+ *((char *) ptr + 1) = *((char *) &aChar + 1); -+#else -+ *((PRUnichar *) ptr) = aChar; -+#endif -+} -+ -+ -diff -aur a/intl/unicharutil/util/nsUnicharUtils.h b/intl/unicharutil/util/nsUnicharUtils.h ---- a/intl/unicharutil/util/nsUnicharUtils.h 2005-02-24 07:50:57.000000000 -0800 -+++ b/intl/unicharutil/util/nsUnicharUtils.h 2006-05-20 20:27:50.000000000 -0700 -@@ -81,6 +81,8 @@ - - PRUnichar ToUpperCase(PRUnichar); - PRUnichar ToLowerCase(PRUnichar); -+PRUnichar GetUnichar(const void *); -+void SetUnichar(void *, PRUnichar); - - inline PRBool IsUpperCase(PRUnichar c) { - return ToLowerCase(c) != c; -diff -aur a/layout/generic/nsTextFrame.cpp b/layout/generic/nsTextFrame.cpp ---- a/layout/generic/nsTextFrame.cpp 2006-02-13 18:05:07.000000000 -0800 -+++ b/layout/generic/nsTextFrame.cpp 2006-05-20 20:27:50.000000000 -0700 -@@ -5101,8 +5101,8 @@ - - while (aNumChars-- > 0) { - // XXX: If you crash here then you may see the issue described -- // in http://bugzilla.mozilla.org/show_bug.cgi?id=36146#c44 -- *cp2-- = PRUnichar(*cp1--); -+ // in http://bugzilla.mozilla.org/show_bug.cgi?id=161826 -+ SetUnichar(cp2--, PRUnichar(*cp1--)); - } - } - -@@ -6199,9 +6199,9 @@ - { - PRUnichar* end = aBuffer + aWordLen; - for (; aBuffer < end; aBuffer++) { -- PRUnichar ch = *aBuffer; -+ PRUnichar ch = GetUnichar(aBuffer); - if (ch == ' ') { -- *aBuffer = CH_NBSP; -+ SetUnichar(aBuffer, CH_NBSP); - } - } - } diff --git a/mail-client/mozilla-thunderbird/files/mozilla-alpha-xpcom-subs-fix.patch b/mail-client/mozilla-thunderbird/files/mozilla-alpha-xpcom-subs-fix.patch deleted file mode 100644 index c7f95467438a..000000000000 --- a/mail-client/mozilla-thunderbird/files/mozilla-alpha-xpcom-subs-fix.patch +++ /dev/null @@ -1,139 +0,0 @@ ---- mozilla/xpcom/reflect/xptcall/src/md/unix/xptcinvoke_linux_alpha.cpp 2002-04-10 05:37:38.000000000 +0200 -+++ mozilla-alpha/xpcom/reflect/xptcall/src/md/unix/xptcinvoke_linux_alpha.cpp 2002-10-06 10:44:59.000000000 +0200 -@@ -20,6 +20,7 @@ - * the Initial Developer. All Rights Reserved. - * - * Contributor(s): -+ * Glen Nakamura <glen@imodulo.com> - * - * Alternatively, the contents of this file may be used under the terms of - * either the GNU General Public License Version 2 or later (the "GPL"), or -@@ -37,16 +38,14 @@ - - /* Platform specific code to invoke XPCOM methods on native objects */ - --/* contributed by Glen Nakamura <glen.nakamura@usa.net> */ -- - #include "xptcprivate.h" - - /* Prototype specifies unmangled function name and disables unused warning */ --static void -+void - invoke_copy_to_stack(PRUint64* d, PRUint32 paramCount, nsXPTCVariant* s) - __asm__("invoke_copy_to_stack") __attribute__((unused)); - --static void -+void - invoke_copy_to_stack(PRUint64* d, PRUint32 paramCount, nsXPTCVariant* s) - { - const PRUint8 NUM_ARG_REGS = 6-1; // -1 for "this" pointer -@@ -163,7 +162,11 @@ - "bis $16,$16,$1\n\t" /* load "this" */ - "ldq $2,16($15)\n\t" /* load "methodIndex" */ - "ldq $1,0($1)\n\t" /* load vtable */ -+#if defined(__GXX_ABI_VERSION) && __GXX_ABI_VERSION >= 100 /* G++ V3 ABI */ -+ "s8addq $2,$31,$2\n\t" /* vtable index = "methodIndex" * 8 */ -+#else /* not G++ V3 ABI */ - "s8addq $2,16,$2\n\t" /* vtable index = "methodIndex" * 8 + 16 */ -+#endif /* G++ V3 ABI */ - "addq $1,$2,$1\n\t" - "ldq $27,0($1)\n\t" /* load address of function */ - "jsr $26,($27),0\n\t" /* call virtual function */ -@@ -176,4 +179,3 @@ - "ret $31,($26),1\n\t" - ".end XPTC_InvokeByIndex" - ); -- ---- mozilla/xpcom/reflect/xptcall/src/md/unix/xptcstubs_linux_alpha.cpp 2002-04-10 05:37:42.000000000 +0200 -+++ mozilla-alpha/xpcom/reflect/xptcall/src/md/unix/xptcstubs_linux_alpha.cpp 2002-10-06 10:45:10.000000000 +0200 -@@ -20,6 +20,7 @@ - * the Initial Developer. All Rights Reserved. - * - * Contributor(s): -+ * Glen Nakamura <glen@imodulo.com> - * - * Alternatively, the contents of this file may be used under the terms of - * either the GNU General Public License Version 2 or later (the "GPL"), or -@@ -37,16 +38,14 @@ - - /* Implement shared vtbl methods. */ - --/* contributed by Glen Nakamura <glen.nakamura@usa.net> */ -- - #include "xptcprivate.h" - - /* Prototype specifies unmangled function name and disables unused warning */ --static nsresult -+nsresult - PrepareAndDispatch(nsXPTCStubBase* self, uint32 methodIndex, PRUint64* args) - __asm__("PrepareAndDispatch") __attribute__((unused)); - --static nsresult -+nsresult - PrepareAndDispatch(nsXPTCStubBase* self, uint32 methodIndex, PRUint64* args) - { - const PRUint8 PARAM_BUFFER_COUNT = 16; -@@ -188,23 +187,45 @@ - * nsresult nsXPTCStubBase::Stub##n() - * Sets register $1 to "methodIndex" and jumps to SharedStub. - */ -+#define STUB_MANGLED_ENTRY(n, symbol) \ -+ "#### Stub"#n" ####" "\n\t" \ -+ ".text" "\n\t" \ -+ ".align 5" "\n\t" \ -+ ".globl " symbol "\n\t" \ -+ ".ent " symbol "\n" \ -+symbol ":" "\n\t" \ -+ ".frame $30,0,$26,0" "\n\t" \ -+ "ldgp $29,0($27)" "\n" \ -+"$" symbol "..ng:" "\n\t" \ -+ ".prologue 1" "\n\t" \ -+ "lda $1,"#n "\n\t" \ -+ "br $31,$SharedStub..ng" "\n\t" \ -+ ".end " symbol -+ -+#if defined(__GXX_ABI_VERSION) && __GXX_ABI_VERSION >= 100 /* G++ V3 ABI */ -+ -+#define STUB_ENTRY(n) \ -+__asm__( \ -+ ".if "#n" < 10" "\n\t" \ -+ STUB_MANGLED_ENTRY(n, "_ZN14nsXPTCStubBase5Stub"#n"Ev") "\n\t" \ -+ ".elseif "#n" < 100" "\n\t" \ -+ STUB_MANGLED_ENTRY(n, "_ZN14nsXPTCStubBase6Stub"#n"Ev") "\n\t" \ -+ ".elseif "#n" < 1000" "\n\t" \ -+ STUB_MANGLED_ENTRY(n, "_ZN14nsXPTCStubBase7Stub"#n"Ev") "\n\t" \ -+ ".else" "\n\t" \ -+ ".err \"Stub"#n" >= 1000 not yet supported.\"" "\n\t" \ -+ ".endif" \ -+ ); -+ -+#else /* not G++ V3 ABI */ -+ - #define STUB_ENTRY(n) \ - __asm__( \ -- "#### Stub"#n" ####\n" \ --".text\n\t" \ -- ".align 5\n\t" \ -- ".globl Stub"#n"__14nsXPTCStubBase\n\t" \ -- ".ent Stub"#n"__14nsXPTCStubBase\n" \ --"Stub"#n"__14nsXPTCStubBase:\n\t" \ -- ".frame $30,0,$26,0\n\t" \ -- "ldgp $29,0($27)\n" \ --"$Stub"#n"__14nsXPTCStubBase..ng:\n\t" \ -- ".prologue 1\n\t" \ -- "lda $1,"#n"\n\t" \ -- "br $31,$SharedStub..ng\n\t" \ -- ".end Stub"#n"__14nsXPTCStubBase" \ -+ STUB_MANGLED_ENTRY(n, "Stub"#n"__14nsXPTCStubBase") \ - ); - -+#endif /* G++ V3 ABI */ -+ - #define SENTINEL_ENTRY(n) \ - nsresult nsXPTCStubBase::Sentinel##n() \ - { \ -@@ -213,4 +234,3 @@ - } - - #include "xptcstubsdef.inc" -- diff --git a/mail-client/mozilla-thunderbird/files/mozilla-thunderbird-1.0.6-gcc4.patch b/mail-client/mozilla-thunderbird/files/mozilla-thunderbird-1.0.6-gcc4.patch deleted file mode 100644 index 8c9eea40b00c..000000000000 --- a/mail-client/mozilla-thunderbird/files/mozilla-thunderbird-1.0.6-gcc4.patch +++ /dev/null @@ -1,124 +0,0 @@ -diff -ur mozilla-orig/security/nss/lib/pki1/oiddata.h mozilla/security/nss/lib/pki1/oiddata.h ---- mozilla-orig/security/nss/lib/pki1/oiddata.h 2005-03-13 19:12:25.000000000 -0500 -+++ mozilla/security/nss/lib/pki1/oiddata.h 2005-03-13 19:15:19.000000000 -0500 -@@ -43,12 +43,6 @@ - #include "nsspki1t.h" - #endif /* NSSPKI1T_H */ - --extern const NSSOID nss_builtin_oids[]; --extern const PRUint32 nss_builtin_oid_count; -- --/*extern const nssAttributeTypeAliasTable nss_attribute_type_aliases[];*/ --/*extern const PRUint32 nss_attribute_type_alias_count;*/ -- - extern const NSSOID *NSS_OID_RFC1274_UID; - extern const NSSOID *NSS_OID_RFC1274_EMAIL; - extern const NSSOID *NSS_OID_RFC2247_DC; -diff -ur mozilla-orig/security/nss/lib/pki1/oidgen.perl mozilla/security/nss/lib/pki1/oidgen.perl ---- mozilla-orig/security/nss/lib/pki1/oidgen.perl 2005-03-13 19:12:25.000000000 -0500 -+++ mozilla/security/nss/lib/pki1/oidgen.perl 2005-03-13 19:15:19.000000000 -0500 -@@ -233,12 +233,6 @@ - #include "nsspki1t.h" - #endif /* NSSPKI1T_H */ - --extern const NSSOID nss_builtin_oids[]; --extern const PRUint32 nss_builtin_oid_count; -- --/*extern const nssAttributeTypeAliasTable nss_attribute_type_aliases[];*/ --/*extern const PRUint32 nss_attribute_type_alias_count;*/ -- - EOD - ; - -diff -ur mozilla-orig/security/nss/lib/pki1/pki1.h mozilla/security/nss/lib/pki1/pki1.h ---- mozilla-orig/security/nss/lib/pki1/pki1.h 2005-03-13 19:12:25.000000000 -0500 -+++ mozilla/security/nss/lib/pki1/pki1.h 2005-03-13 19:15:19.000000000 -0500 -@@ -55,7 +55,9 @@ - - PR_BEGIN_EXTERN_C - --/* fgmr 19990505 moved these here from oiddata.h */ -+extern const NSSOID nss_builtin_oids[]; -+extern const PRUint32 nss_builtin_oid_count; -+ - extern const nssAttributeTypeAliasTable nss_attribute_type_aliases[]; - extern const PRUint32 nss_attribute_type_alias_count; - -diff -ur mozilla-orig/xpcom/base/nscore.h mozilla/xpcom/base/nscore.h ---- mozilla-orig/xpcom/base/nscore.h 2005-07-24 05:07:54.627311840 +0000 -+++ mozilla/xpcom/base/nscore.h 2005-07-24 05:13:02.327534296 +0000 -@@ -365,8 +365,9 @@ - * Use these macros to do 64bit safe pointer conversions. - */ - --#define NS_PTR_TO_INT32(x) ((char *)(x) - (char *)0) --#define NS_INT32_TO_PTR(x) ((void *)((char *)0 + (x))) -+#define NS_PTR_TO_INT32(x) ((PRInt32) (PRWord) (x)) -+#define NS_PTR_TO_UINT32(x) ((PRUint32) (PRWord) (x)) -+#define NS_INT32_TO_PTR(x) ((void *) (PRWord) (x)) - - /* - * These macros allow you to give a hint to the compiler about branch -diff -ur mozilla-orig/netwerk/protocol/http/src/nsHttpConnectionMgr.cpp mozilla/netwerk/protocol/http/src/nsHttpConnectionMgr.cpp ---- mozilla-orig/netwerk/protocol/http/src/nsHttpConnectionMgr.cpp 2005-07-24 05:07:51.199832896 +0000 -+++ mozilla/netwerk/protocol/http/src/nsHttpConnectionMgr.cpp 2005-07-24 05:13:08.302625944 +0000 -@@ -834,8 +834,8 @@ - void - nsHttpConnectionMgr::OnMsgUpdateParam(nsresult status, void *param) - { -- PRUint16 name = (PRUint32(param) & 0xFFFF0000) >> 16; -- PRUint16 value = PRUint32(param) & 0x0000FFFF; -+ PRUint16 name = (NS_PTR_TO_UINT32(param) & 0xFFFF0000) >> 16; -+ PRUint16 value = NS_PTR_TO_UINT32(param) & 0x0000FFFF; - - switch (name) { - case MAX_CONNECTIONS: -diff -ur mozilla-orig/widget/src/gtk2/nsDragService.cpp mozilla/widget/src/gtk2/nsDragService.cpp ---- mozilla-orig/widget/src/gtk2/nsDragService.cpp 2005-07-24 05:08:57.666728392 +0000 -+++ mozilla/widget/src/gtk2/nsDragService.cpp 2005-07-24 05:13:33.910732920 +0000 -@@ -838,7 +838,7 @@ - (GtkTargetEntry *)g_malloc(sizeof(GtkTargetEntry)); - listTarget->target = g_strdup(gMimeListType); - listTarget->flags = 0; -- listTarget->info = (guint)listAtom; -+ listTarget->info = GPOINTER_TO_UINT(listAtom); - PR_LOG(sDragLm, PR_LOG_DEBUG, - ("automatically adding target %s with id %ld\n", - listTarget->target, listAtom)); -@@ -877,7 +877,7 @@ - (GtkTargetEntry *)g_malloc(sizeof(GtkTargetEntry)); - listTarget->target = g_strdup(gTextUriListType); - listTarget->flags = 0; -- listTarget->info = (guint)listAtom; -+ listTarget->info = GPOINTER_TO_UINT(listAtom); - PR_LOG(sDragLm, PR_LOG_DEBUG, - ("automatically adding target %s with \ - id %ld\n", listTarget->target, listAtom)); -@@ -914,7 +914,7 @@ - (GtkTargetEntry *)g_malloc(sizeof(GtkTargetEntry)); - target->target = g_strdup(flavorStr); - target->flags = 0; -- target->info = (guint)atom; -+ target->info = GPOINTER_TO_UINT(atom); - PR_LOG(sDragLm, PR_LOG_DEBUG, - ("adding target %s with id %ld\n", - target->target, atom)); -@@ -931,7 +931,7 @@ - (GtkTargetEntry *)g_malloc(sizeof(GtkTargetEntry)); - plainTarget->target = g_strdup(kTextMime); - plainTarget->flags = 0; -- plainTarget->info = (guint)plainAtom; -+ plainTarget->info = GPOINTER_TO_UINT(plainAtom); - PR_LOG(sDragLm, PR_LOG_DEBUG, - ("automatically adding target %s with \ - id %ld\n", plainTarget->target, plainAtom)); -@@ -948,7 +948,7 @@ - (GtkTargetEntry *)g_malloc(sizeof(GtkTargetEntry)); - urlTarget->target = g_strdup(gMozUrlType); - urlTarget->flags = 0; -- urlTarget->info = (guint)urlAtom; -+ urlTarget->info = GPOINTER_TO_UINT(urlAtom); - PR_LOG(sDragLm, PR_LOG_DEBUG, - ("automatically adding target %s with \ - id %ld\n", urlTarget->target, urlAtom)); - diff --git a/mail-client/mozilla-thunderbird/files/mozilla-thunderbird-1.0.7-draft-template.patch b/mail-client/mozilla-thunderbird/files/mozilla-thunderbird-1.0.7-draft-template.patch deleted file mode 100644 index f65ce20988d4..000000000000 --- a/mail-client/mozilla-thunderbird/files/mozilla-thunderbird-1.0.7-draft-template.patch +++ /dev/null @@ -1,17 +0,0 @@ -diff -Nru mozilla.vanilla/mailnews/local/src/nsPop3IncomingServer.cpp mozilla/mailnews/local/src/nsPop3IncomingServer.cpp ---- mozilla.vanilla/mailnews/local/src/nsPop3IncomingServer.cpp 2005-12-02 10:52:15.000000000 +0100 -+++ mozilla/mailnews/local/src/nsPop3IncomingServer.cpp 2005-12-02 10:57:43.000000000 +0100 -@@ -409,11 +409,11 @@ - if (NS_FAILED(rv)) return rv; - rv = CreateLocalFolder(path, "Trash"); - if (NS_FAILED(rv)) return rv; -- rv = CreateLocalFolder(path, "Sent"); -+ /*rv = CreateLocalFolder(path, "Sent"); - if (NS_FAILED(rv)) return rv; - rv = CreateLocalFolder(path, "Drafts"); - if (NS_FAILED(rv)) return rv; -- return CreateLocalFolder(path, "Templates"); -+ return CreateLocalFolder(path, "Templates");*/ - - return NS_OK; - } diff --git a/mail-client/mozilla-thunderbird/files/mozilla-thunderbird-1.0.7-gcc-4.0.2.patch b/mail-client/mozilla-thunderbird/files/mozilla-thunderbird-1.0.7-gcc-4.0.2.patch deleted file mode 100644 index e97ffa804529..000000000000 --- a/mail-client/mozilla-thunderbird/files/mozilla-thunderbird-1.0.7-gcc-4.0.2.patch +++ /dev/null @@ -1,136 +0,0 @@ -diff -ur mozilla-orig/security/nss/lib/pki1/oiddata.h mozilla/security/nss/lib/pki1/oiddata.h ---- mozilla-orig/security/nss/lib/pki1/oiddata.h 2005-03-13 19:12:25.000000000 -0500 -+++ mozilla/security/nss/lib/pki1/oiddata.h 2005-03-13 19:15:19.000000000 -0500 -@@ -43,12 +43,6 @@ - #include "nsspki1t.h" - #endif /* NSSPKI1T_H */ - --extern const NSSOID nss_builtin_oids[]; --extern const PRUint32 nss_builtin_oid_count; -- --/*extern const nssAttributeTypeAliasTable nss_attribute_type_aliases[];*/ --/*extern const PRUint32 nss_attribute_type_alias_count;*/ -- - extern const NSSOID *NSS_OID_RFC1274_UID; - extern const NSSOID *NSS_OID_RFC1274_EMAIL; - extern const NSSOID *NSS_OID_RFC2247_DC; -diff -ur mozilla-orig/security/nss/lib/pki1/oidgen.perl mozilla/security/nss/lib/pki1/oidgen.perl ---- mozilla-orig/security/nss/lib/pki1/oidgen.perl 2005-03-13 19:12:25.000000000 -0500 -+++ mozilla/security/nss/lib/pki1/oidgen.perl 2005-03-13 19:15:19.000000000 -0500 -@@ -233,12 +233,6 @@ - #include "nsspki1t.h" - #endif /* NSSPKI1T_H */ - --extern const NSSOID nss_builtin_oids[]; --extern const PRUint32 nss_builtin_oid_count; -- --/*extern const nssAttributeTypeAliasTable nss_attribute_type_aliases[];*/ --/*extern const PRUint32 nss_attribute_type_alias_count;*/ -- - EOD - ; - -diff -ur mozilla-orig/security/nss/lib/pki1/pki1.h mozilla/security/nss/lib/pki1/pki1.h ---- mozilla-orig/security/nss/lib/pki1/pki1.h 2005-03-13 19:12:25.000000000 -0500 -+++ mozilla/security/nss/lib/pki1/pki1.h 2005-03-13 19:15:19.000000000 -0500 -@@ -55,7 +55,9 @@ - - PR_BEGIN_EXTERN_C - --/* fgmr 19990505 moved these here from oiddata.h */ -+extern const NSSOID nss_builtin_oids[]; -+extern const PRUint32 nss_builtin_oid_count; -+ - extern const nssAttributeTypeAliasTable nss_attribute_type_aliases[]; - extern const PRUint32 nss_attribute_type_alias_count; - -diff -ur mozilla-orig/xpcom/base/nscore.h mozilla/xpcom/base/nscore.h ---- mozilla-orig/xpcom/base/nscore.h 2005-07-24 05:07:54.627311840 +0000 -+++ mozilla/xpcom/base/nscore.h 2005-07-24 05:13:02.327534296 +0000 -@@ -365,8 +365,9 @@ - * Use these macros to do 64bit safe pointer conversions. - */ - --#define NS_PTR_TO_INT32(x) ((char *)(x) - (char *)0) --#define NS_INT32_TO_PTR(x) ((void *)((char *)0 + (x))) -+#define NS_PTR_TO_INT32(x) ((PRInt32) (PRWord) (x)) -+#define NS_PTR_TO_UINT32(x) ((PRUint32) (PRWord) (x)) -+#define NS_INT32_TO_PTR(x) ((void *) (PRWord) (x)) - - /* - * These macros allow you to give a hint to the compiler about branch -diff -ur mozilla-orig/netwerk/protocol/http/src/nsHttpConnectionMgr.cpp mozilla/netwerk/protocol/http/src/nsHttpConnectionMgr.cpp ---- mozilla-orig/netwerk/protocol/http/src/nsHttpConnectionMgr.cpp 2005-07-24 05:07:51.199832896 +0000 -+++ mozilla/netwerk/protocol/http/src/nsHttpConnectionMgr.cpp 2005-07-24 05:13:08.302625944 +0000 -@@ -834,8 +834,8 @@ - void - nsHttpConnectionMgr::OnMsgUpdateParam(nsresult status, void *param) - { -- PRUint16 name = (PRUint32(param) & 0xFFFF0000) >> 16; -- PRUint16 value = PRUint32(param) & 0x0000FFFF; -+ PRUint16 name = (NS_PTR_TO_UINT32(param) & 0xFFFF0000) >> 16; -+ PRUint16 value = NS_PTR_TO_UINT32(param) & 0x0000FFFF; - - switch (name) { - case MAX_CONNECTIONS: -diff -ur mozilla-orig/widget/src/gtk2/nsDragService.cpp mozilla/widget/src/gtk2/nsDragService.cpp ---- mozilla-orig/widget/src/gtk2/nsDragService.cpp 2005-07-24 05:08:57.666728392 +0000 -+++ mozilla/widget/src/gtk2/nsDragService.cpp 2005-07-24 05:13:33.910732920 +0000 -@@ -838,7 +838,7 @@ - (GtkTargetEntry *)g_malloc(sizeof(GtkTargetEntry)); - listTarget->target = g_strdup(gMimeListType); - listTarget->flags = 0; -- listTarget->info = (guint)listAtom; -+ listTarget->info = GPOINTER_TO_UINT(listAtom); - PR_LOG(sDragLm, PR_LOG_DEBUG, - ("automatically adding target %s with id %ld\n", - listTarget->target, listAtom)); -@@ -877,7 +877,7 @@ - (GtkTargetEntry *)g_malloc(sizeof(GtkTargetEntry)); - listTarget->target = g_strdup(gTextUriListType); - listTarget->flags = 0; -- listTarget->info = (guint)listAtom; -+ listTarget->info = GPOINTER_TO_UINT(listAtom); - PR_LOG(sDragLm, PR_LOG_DEBUG, - ("automatically adding target %s with \ - id %ld\n", listTarget->target, listAtom)); -@@ -914,7 +914,7 @@ - (GtkTargetEntry *)g_malloc(sizeof(GtkTargetEntry)); - target->target = g_strdup(flavorStr); - target->flags = 0; -- target->info = (guint)atom; -+ target->info = GPOINTER_TO_UINT(atom); - PR_LOG(sDragLm, PR_LOG_DEBUG, - ("adding target %s with id %ld\n", - target->target, atom)); -@@ -931,7 +931,7 @@ - (GtkTargetEntry *)g_malloc(sizeof(GtkTargetEntry)); - plainTarget->target = g_strdup(kTextMime); - plainTarget->flags = 0; -- plainTarget->info = (guint)plainAtom; -+ plainTarget->info = GPOINTER_TO_UINT(plainAtom); - PR_LOG(sDragLm, PR_LOG_DEBUG, - ("automatically adding target %s with \ - id %ld\n", plainTarget->target, plainAtom)); -@@ -948,7 +948,7 @@ - (GtkTargetEntry *)g_malloc(sizeof(GtkTargetEntry)); - urlTarget->target = g_strdup(gMozUrlType); - urlTarget->flags = 0; -- urlTarget->info = (guint)urlAtom; -+ urlTarget->info = GPOINTER_TO_UINT(urlAtom); - PR_LOG(sDragLm, PR_LOG_DEBUG, - ("automatically adding target %s with \ - id %ld\n", urlTarget->target, urlAtom)); - -diff -urN mozilla-orig/gfx/src/freetype/nsFreeType.cpp mozilla/gfx/src/freetype/nsFreeType.cpp ---- mozilla-orig/gfx/src/freetype/nsFreeType.cpp 2005-10-22 13:17:35.151589250 -0500 -+++ mozilla/gfx/src/freetype/nsFreeType.cpp 2005-10-22 13:23:07.672370500 -0500 -@@ -96,7 +96,7 @@ - // Define the FreeType2 functions we resolve at run time. - // see the comment near nsFreeType2::DoneFace() for more info - // --#define NS_FT2_OFFSET(f) (int)&((nsFreeType2*)0)->f -+#define NS_FT2_OFFSET(f) (NS_PTR_TO_INT32(&((nsFreeType2*)0)->f)) - FtFuncList nsFreeType2::FtFuncs [] = { - {"FT_Done_Face", NS_FT2_OFFSET(nsFT_Done_Face), PR_TRUE}, - {"FT_Done_FreeType", NS_FT2_OFFSET(nsFT_Done_FreeType), PR_TRUE}, diff --git a/mail-client/mozilla-thunderbird/files/mozilla-thunderbird-1.0.8-gcc-4.patch b/mail-client/mozilla-thunderbird/files/mozilla-thunderbird-1.0.8-gcc-4.patch deleted file mode 100644 index ab8b031069f7..000000000000 --- a/mail-client/mozilla-thunderbird/files/mozilla-thunderbird-1.0.8-gcc-4.patch +++ /dev/null @@ -1,90 +0,0 @@ -diff -ur mozilla-orig/xpcom/base/nscore.h mozilla/xpcom/base/nscore.h ---- mozilla-orig/xpcom/base/nscore.h 2005-07-24 05:07:54.627311840 +0000 -+++ mozilla/xpcom/base/nscore.h 2005-07-24 05:13:02.327534296 +0000 -@@ -365,8 +365,9 @@ - * Use these macros to do 64bit safe pointer conversions. - */ - --#define NS_PTR_TO_INT32(x) ((char *)(x) - (char *)0) --#define NS_INT32_TO_PTR(x) ((void *)((char *)0 + (x))) -+#define NS_PTR_TO_INT32(x) ((PRInt32) (PRWord) (x)) -+#define NS_PTR_TO_UINT32(x) ((PRUint32) (PRWord) (x)) -+#define NS_INT32_TO_PTR(x) ((void *) (PRWord) (x)) - - /* - * These macros allow you to give a hint to the compiler about branch -diff -ur mozilla-orig/netwerk/protocol/http/src/nsHttpConnectionMgr.cpp mozilla/netwerk/protocol/http/src/nsHttpConnectionMgr.cpp ---- mozilla-orig/netwerk/protocol/http/src/nsHttpConnectionMgr.cpp 2005-07-24 05:07:51.199832896 +0000 -+++ mozilla/netwerk/protocol/http/src/nsHttpConnectionMgr.cpp 2005-07-24 05:13:08.302625944 +0000 -@@ -834,8 +834,8 @@ - void - nsHttpConnectionMgr::OnMsgUpdateParam(nsresult status, void *param) - { -- PRUint16 name = (PRUint32(param) & 0xFFFF0000) >> 16; -- PRUint16 value = PRUint32(param) & 0x0000FFFF; -+ PRUint16 name = (NS_PTR_TO_UINT32(param) & 0xFFFF0000) >> 16; -+ PRUint16 value = NS_PTR_TO_UINT32(param) & 0x0000FFFF; - - switch (name) { - case MAX_CONNECTIONS: -diff -ur mozilla-orig/widget/src/gtk2/nsDragService.cpp mozilla/widget/src/gtk2/nsDragService.cpp ---- mozilla-orig/widget/src/gtk2/nsDragService.cpp 2005-07-24 05:08:57.666728392 +0000 -+++ mozilla/widget/src/gtk2/nsDragService.cpp 2005-07-24 05:13:33.910732920 +0000 -@@ -838,7 +838,7 @@ - (GtkTargetEntry *)g_malloc(sizeof(GtkTargetEntry)); - listTarget->target = g_strdup(gMimeListType); - listTarget->flags = 0; -- listTarget->info = (guint)listAtom; -+ listTarget->info = GPOINTER_TO_UINT(listAtom); - PR_LOG(sDragLm, PR_LOG_DEBUG, - ("automatically adding target %s with id %ld\n", - listTarget->target, listAtom)); -@@ -877,7 +877,7 @@ - (GtkTargetEntry *)g_malloc(sizeof(GtkTargetEntry)); - listTarget->target = g_strdup(gTextUriListType); - listTarget->flags = 0; -- listTarget->info = (guint)listAtom; -+ listTarget->info = GPOINTER_TO_UINT(listAtom); - PR_LOG(sDragLm, PR_LOG_DEBUG, - ("automatically adding target %s with \ - id %ld\n", listTarget->target, listAtom)); -@@ -914,7 +914,7 @@ - (GtkTargetEntry *)g_malloc(sizeof(GtkTargetEntry)); - target->target = g_strdup(flavorStr); - target->flags = 0; -- target->info = (guint)atom; -+ target->info = GPOINTER_TO_UINT(atom); - PR_LOG(sDragLm, PR_LOG_DEBUG, - ("adding target %s with id %ld\n", - target->target, atom)); -@@ -931,7 +931,7 @@ - (GtkTargetEntry *)g_malloc(sizeof(GtkTargetEntry)); - plainTarget->target = g_strdup(kTextMime); - plainTarget->flags = 0; -- plainTarget->info = (guint)plainAtom; -+ plainTarget->info = GPOINTER_TO_UINT(plainAtom); - PR_LOG(sDragLm, PR_LOG_DEBUG, - ("automatically adding target %s with \ - id %ld\n", plainTarget->target, plainAtom)); -@@ -948,7 +948,7 @@ - (GtkTargetEntry *)g_malloc(sizeof(GtkTargetEntry)); - urlTarget->target = g_strdup(gMozUrlType); - urlTarget->flags = 0; -- urlTarget->info = (guint)urlAtom; -+ urlTarget->info = GPOINTER_TO_UINT(urlAtom); - PR_LOG(sDragLm, PR_LOG_DEBUG, - ("automatically adding target %s with \ - id %ld\n", urlTarget->target, urlAtom)); - -diff -urN mozilla-orig/gfx/src/freetype/nsFreeType.cpp mozilla/gfx/src/freetype/nsFreeType.cpp ---- mozilla-orig/gfx/src/freetype/nsFreeType.cpp 2005-10-22 13:17:35.151589250 -0500 -+++ mozilla/gfx/src/freetype/nsFreeType.cpp 2005-10-22 13:23:07.672370500 -0500 -@@ -96,7 +96,7 @@ - // Define the FreeType2 functions we resolve at run time. - // see the comment near nsFreeType2::DoneFace() for more info - // --#define NS_FT2_OFFSET(f) (int)&((nsFreeType2*)0)->f -+#define NS_FT2_OFFSET(f) (NS_PTR_TO_INT32(&((nsFreeType2*)0)->f)) - FtFuncList nsFreeType2::FtFuncs [] = { - {"FT_Done_Face", NS_FT2_OFFSET(nsFT_Done_Face), PR_TRUE}, - {"FT_Done_FreeType", NS_FT2_OFFSET(nsFT_Done_FreeType), PR_TRUE}, diff --git a/mail-client/mozilla-thunderbird/files/pango-cairo-1.patch b/mail-client/mozilla-thunderbird/files/pango-cairo-1.patch deleted file mode 100644 index 73ebf8b56ad3..000000000000 --- a/mail-client/mozilla-thunderbird/files/pango-cairo-1.patch +++ /dev/null @@ -1,135 +0,0 @@ -Index: config/autoconf.mk.in -=================================================================== -RCS file: /cvsroot/mozilla/config/autoconf.mk.in,v -retrieving revision 3.363.2.1 -diff -u -p -6 -r3.363.2.1 autoconf.mk.in ---- config/autoconf.mk.in 17 Aug 2005 17:17:17 -0000 3.363.2.1 -+++ config/autoconf.mk.in 27 Aug 2005 19:57:29 -0000 -@@ -456,12 +456,13 @@ MOZ_XFT_CFLAGS = @MOZ_XFT_CFLAGS@ - MOZ_XFT_LIBS = @MOZ_XFT_LIBS@ - MOZ_ENABLE_COREXFONTS = @MOZ_ENABLE_COREXFONTS@ - - MOZ_ENABLE_PANGO = @MOZ_ENABLE_PANGO@ - MOZ_PANGO_CFLAGS = @MOZ_PANGO_CFLAGS@ - MOZ_PANGO_LIBS = @MOZ_PANGO_LIBS@ -+MOZ_PANGOCAIRO = @MOZ_PANGOCAIRO@ - - MOZ_EXTRA_X11CONVERTERS = @MOZ_EXTRA_X11CONVERTERS@ - - MOZ_ENABLE_XINERAMA = @MOZ_ENABLE_XINERAMA@ - MOZ_XINERAMA_LIBS = @MOZ_XINERAMA_LIBS@ - -Index: gfx/src/gtk/mozilla-decoder.cpp -=================================================================== -RCS file: /cvsroot/mozilla/gfx/src/gtk/mozilla-decoder.cpp,v -retrieving revision 1.3 -diff -u -p -6 -r1.3 mozilla-decoder.cpp ---- gfx/src/gtk/mozilla-decoder.cpp 7 Nov 2004 23:59:23 -0000 1.3 -+++ gfx/src/gtk/mozilla-decoder.cpp 27 Aug 2005 19:57:49 -0000 -@@ -37,13 +37,17 @@ - * ***** END LICENSE BLOCK ***** */ - - #define PANGO_ENABLE_BACKEND - #define PANGO_ENABLE_ENGINE - - #include "mozilla-decoder.h" -+#ifdef MOZ_PANGOCAIRO -+#include <pango/pangocairo.h> -+#else - #include <pango/pangoxft.h> -+#endif - #include <pango/pangofc-fontmap.h> - #include <pango/pangofc-font.h> - #include <gdk/gdkx.h> - - #include "nsString.h" - #include "nsIPersistentProperties2.h" -@@ -205,13 +209,17 @@ mozilla_decoders_init(void) - } - else { - printf("unknown suffix used for mapping\n"); - } - } - -+#ifdef MOZ_PANGOCAIRO -+ pango_fc_font_map_add_decoder_find_func(PANGO_FC_FONT_MAP(pango_cairo_font_map_get_default()), -+#else - pango_fc_font_map_add_decoder_find_func(PANGO_FC_FONT_MAP(pango_xft_get_font_map(GDK_DISPLAY(),gdk_x11_get_default_screen())), -+#endif - mozilla_find_decoder, - NULL, - NULL); - - initialized = PR_TRUE; - -Index: configure.in -=================================================================== -RCS file: /cvsroot/mozilla/configure.in,v -retrieving revision 1.1503.2.6 -diff -u -p -6 -r1.1503.2.6 configure.in ---- configure.in 25 Aug 2005 19:05:34 -0000 1.1503.2.6 -+++ configure.in 29 Aug 2005 08:03:32 -0000 -@@ -3707,14 +3707,14 @@ gtk) - ;; - - gtk2) - MOZ_ENABLE_GTK2=1 - MOZ_ENABLE_XREMOTE=1 - MOZ_ENABLE_COREXFONTS=${MOZ_ENABLE_COREXFONTS-} -- TK_CFLAGS='$(MOZ_GTK2_CFLAGS)' -- TK_LIBS='$(MOZ_GTK2_LIBS)' -+ TK_CFLAGS='$(MOZ_GTK2_CFLAGS) $(MOZ_PANGO_CFLAGS)' -+ TK_LIBS='$(MOZ_GTK2_LIBS) $(MOZ_PANGO_LIBS)' - AC_DEFINE(MOZ_WIDGET_GTK2) - ;; - - xlib) - MOZ_ENABLE_XLIB=1 - if test "$_HAVE_FREETYPE2"; then -@@ -4277,33 +4277,44 @@ if test "$MOZ_ENABLE_XFT" && test "$MOZ_ - fi - - if test "$MOZ_ENABLE_XFT" - then - AC_DEFINE(MOZ_ENABLE_XFT) - PKG_CHECK_MODULES(MOZ_XFT, xft) -- PKG_CHECK_MODULES(_PANGOCHK, pango >= 1.1.0) -+ PKG_CHECK_MODULES(MOZ_PANGO, pangoxft >= 1.1.0 pangox) - fi - - AC_SUBST(MOZ_ENABLE_XFT) - AC_SUBST(MOZ_XFT_CFLAGS) - AC_SUBST(MOZ_XFT_LIBS) -+AC_SUBST(MOZ_PANGO_CFLAGS) -+AC_SUBST(MOZ_PANGO_LIBS) - - dnl ======================================================== - dnl = pango font rendering - dnl ======================================================== - MOZ_ARG_ENABLE_BOOL(pango, - [ --enable-pango Enable Pango font rendering support], - MOZ_ENABLE_PANGO=1, - MOZ_ENABLE_PANGO=) - - if test "$MOZ_ENABLE_PANGO" - then - AC_DEFINE(MOZ_ENABLE_PANGO) -- PKG_CHECK_MODULES(MOZ_PANGO, pango >= 1.6.0 pangoft2 >= 1.6.0) -+ PKG_CHECK_MODULES(MOZ_PANGO, pangoxft >= 1.6.0) -+ PKG_CHECK_MODULES(PANGOCAIRO_CHK, pangocairo >= 1.10.0, -+ [ -+ MOZ_PANGOCAIRO=1 -+ AC_DEFINE(MOZ_PANGOCAIRO) -+ MOZ_PANGO_CFLAGS="$PANGOCAIRO_CHK_CFLAGS $MOZ_PANGO_CFLAGS" -+ MOZ_PANGO_LIBS="$PANGOCAIRO_CHK_LIBS $MOZ_PANGO_LIBS" -+ ], -+ [:]) - - AC_SUBST(MOZ_ENABLE_PANGO) -+ AC_SUBST(MOZ_PANGOCAIRO) - AC_SUBST(MOZ_PANGO_CFLAGS) - AC_SUBST(MOZ_PANGO_LIBS) - fi - - dnl ======================================================== - dnl = x11 core font support (default and ability to enable depend on toolkit) diff --git a/mail-client/mozilla-thunderbird/files/thunderbird-cairo-canvas.patch b/mail-client/mozilla-thunderbird/files/thunderbird-cairo-canvas.patch deleted file mode 100644 index fdcb7e7a95b6..000000000000 --- a/mail-client/mozilla-thunderbird/files/thunderbird-cairo-canvas.patch +++ /dev/null @@ -1,14 +0,0 @@ ---- content/canvas/src/Makefile.in.orig 2005-08-23 01:46:46.000000000 +0000 -+++ content/canvas/src/Makefile.in 2005-08-23 01:49:49.000000000 +0000 -@@ -77,6 +77,11 @@ - libpixman \ - $(NULL) - -+ifndef MOZ_TREE_CAIRO -+LOCAL_INCLUDES += $(MOZ_CAIRO_CFLAGS) -+EXTRA_DSO_LDOPTS += $(MOZ_CAIRO_LIBS) -+endif -+ - # XXX some platforms can't handle building - # an empty .a/lib. Remove this dummy.cpp - # whenever w have a rendering context diff --git a/mail-client/mozilla-thunderbird/files/thunderbird-nopangoxft.patch b/mail-client/mozilla-thunderbird/files/thunderbird-nopangoxft.patch deleted file mode 100644 index 608e803a1083..000000000000 --- a/mail-client/mozilla-thunderbird/files/thunderbird-nopangoxft.patch +++ /dev/null @@ -1,20 +0,0 @@ ---- mozilla/gfx/src/gtk/mozilla-decoder.cpp.noxft 2005-08-18 22:41:26.000000000 -0400 -+++ mozilla/gfx/src/gtk/mozilla-decoder.cpp 2005-08-18 22:38:01.000000000 -0400 -@@ -40,7 +40,7 @@ - #define PANGO_ENABLE_ENGINE - - #include "mozilla-decoder.h" --#include <pango/pangoxft.h> -+#include <pango/pangocairo.h> - #include <pango/pangofc-fontmap.h> - #include <pango/pangofc-font.h> - #include <gdk/gdkx.h> -@@ -208,7 +208,7 @@ - } - } - -- pango_fc_font_map_add_decoder_find_func(PANGO_FC_FONT_MAP(pango_xft_get_font_map(GDK_DISPLAY(),gdk_x11_get_default_screen())), -+ pango_fc_font_map_add_decoder_find_func(PANGO_FC_FONT_MAP(pango_cairo_font_map_get_default()), - mozilla_find_decoder, - NULL, - NULL); diff --git a/mail-client/mozilla-thunderbird/files/thunderbird-rpath-1.patch b/mail-client/mozilla-thunderbird/files/thunderbird-rpath-1.patch deleted file mode 100644 index 39969cd63ec1..000000000000 --- a/mail-client/mozilla-thunderbird/files/thunderbird-rpath-1.patch +++ /dev/null @@ -1,47 +0,0 @@ ---- config/rules.mk.orig 2005-07-28 01:45:18.000000000 +0000 -+++ config/rules.mk 2005-07-28 01:45:21.000000000 +0000 -@@ -507,5 +507,10 @@ - # - ifeq ($(OS_ARCH),Linux) - ifdef IS_COMPONENT -+DSO_LDOPTS += -Wl,-R#RPATH_FIXER -+OS_LDFLAGS += -Wl,-R#RPATH_FIXER - EXTRA_DSO_LDOPTS += -Wl,-Bsymbolic -+else -+DSO_LDOPTS += -Wl,-R#RPATH_FIXER -+OS_LDFLAGS += -Wl,-R#RPATH_FIXER - endif ---- nsprpub/config/rules.mk.orig 2003-09-16 02:00:28.000000000 +0000 -+++ nsprpub/config/rules.mk 2005-07-30 04:00:21.000000000 +0000 -@@ -87,6 +87,9 @@ - endif - endif - -+DSO_LDOPTS += -Wl,-R#RPATH_FIXER -+OS_LDFLAGS += -Wl,-R#RPATH_FIXER -+ - # - # This makefile contains rules for building the following kinds of - # libraries: ---- security/coreconf/rules.mk.orig 2005-07-31 16:31:37.000000000 +0000 -+++ security/coreconf/rules.mk 2005-07-31 16:37:27.000000000 +0000 -@@ -349,7 +349,7 @@ - ifdef XP_OS2_VACPP - $(MKSHLIB) $(DLLFLAGS) $(LDFLAGS) $(OBJS) $(SUB_SHLOBJS) $(LD_LIBS) $(EXTRA_LIBS) $(EXTRA_SHARED_LIBS) - else -- $(MKSHLIB) -o $@ $(OBJS) $(SUB_SHLOBJS) $(LD_LIBS) $(EXTRA_LIBS) $(EXTRA_SHARED_LIBS) -+ $(MKSHLIB) -Wl,-R#RPATH_FIXER -o $@ $(OBJS) $(SUB_SHLOBJS) $(LD_LIBS) $(EXTRA_LIBS) $(EXTRA_SHARED_LIBS) - endif - chmod +x $@ - ifeq ($(OS_TARGET),Darwin) ---- security/coreconf/rules.mk.orig 2005-08-01 11:40:54.000000000 +0000 -+++ security/coreconf/rules.mk 2005-08-01 11:50:31.000000000 +0000 -@@ -291,7 +291,7 @@ - ifdef XP_OS2_VACPP - $(MKPROG) -Fe$@ $(CFLAGS) $(OBJS) $(EXTRA_LIBS) $(EXTRA_SHARED_LIBS) $(OS_LIBS) - else -- $(MKPROG) -o $@ $(CFLAGS) $(OBJS) $(LDFLAGS) $(EXTRA_LIBS) $(EXTRA_SHARED_LIBS) $(OS_LIBS) -+ $(MKPROG) -Wl,-R#RPATH_FIXER -o $@ $(CFLAGS) $(OBJS) $(LDFLAGS) $(EXTRA_LIBS) $(EXTRA_SHARED_LIBS) $(OS_LIBS) - endif - endif - |