visibility fix, uri patch added

(Portage version: 2.0.53_rc7)

7 files changed, 497 insertions, 23 deletions

diff --git a/mail-client/mozilla-thunderbird/ChangeLog b/mail-client/mozilla-thunderbird/ChangeLog
index 31fa8df49c15..79165b55bbdf 100644
--- a/mail-client/mozilla-thunderbird/ChangeLog
+++ b/mail-client/mozilla-thunderbird/ChangeLog
@@ -1,6 +1,14 @@
 # ChangeLog for mail-client/mozilla-thunderbird
 # Copyright 1999-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/mail-client/mozilla-thunderbird/ChangeLog,v 1.94 2005/11/16 22:58:29 anarchy Exp $
+# $Header: /var/cvsroot/gentoo-x86/mail-client/mozilla-thunderbird/ChangeLog,v 1.95 2005/11/22 17:28:44 anarchy Exp $
+
+*mozilla-thunderbird-1.5_rc1-r1 (22 Nov 2005)
+
+  22 Nov 2005; <anarchy@gentoo.org> +files/firefox-1.1-uriloader.patch,
+  +files/firefox-1.1-visibility.patch, -files/thunderbird-visibility.patch,
+  -mozilla-thunderbird-1.5_rc1.ebuild,
+  +mozilla-thunderbird-1.5_rc1-r1.ebuild:
+  visibility fixed, uri patch added
 
   16 Nov 2005; <anarchy@gentoo.org> mozilla-thunderbird-1.0.7-r2.ebuild,
   mozilla-thunderbird-1.5_rc1.ebuild:
diff --git a/mail-client/mozilla-thunderbird/Manifest b/mail-client/mozilla-thunderbird/Manifest
index 93a13d6f25ee..b87b4d11b54e 100644
--- a/mail-client/mozilla-thunderbird/Manifest
+++ b/mail-client/mozilla-thunderbird/Manifest
@@ -3,6 +3,9 @@ MD5 b84b32e9963589c0f2f76d98019b44d7 files/digest-mozilla-thunderbird-1.0.7 303
 MD5 34fc13a505bfb805c539a3b4f0b1bcbf files/digest-mozilla-thunderbird-1.0.7-r1 303
 MD5 106701e2f4e5e9e73301f95dd92c3306 files/digest-mozilla-thunderbird-1.0.7-r2 227
 MD5 ed1976eae02ff1d7ea4409be6be9be78 files/digest-mozilla-thunderbird-1.5_rc1 228
+MD5 ed1976eae02ff1d7ea4409be6be9be78 files/digest-mozilla-thunderbird-1.5_rc1-r1 228
+MD5 2bd0dd9035dcb875b8340be358347e8d files/firefox-1.1-uriloader.patch 15300
+MD5 cc5756b8c7af5c88b248b86c73fc5c8d files/firefox-1.1-visibility.patch 930
 MD5 1c810870d0c92c730341e491c310e2d4 files/icon/mozillathunderbird.desktop 184
 MD5 04115f0e204444eac76a092a63c89027 files/icon/thunderbird-icon.png 6499
 MD5 23d6b685fd5e49a07cc4a1786871bf47 files/mozilla-alpha-xpcom-subs-fix.patch 4953
@@ -16,4 +19,5 @@ MD5 ce23390351fe8020387d93ee29e09a3d metadata.xml 160
 MD5 2896cc99ffbb38fe463d98feb1e954f0 mozilla-thunderbird-1.0.7-r1.ebuild 5640
 MD5 feb3d5b0156f6a9f1af491b50907e32e mozilla-thunderbird-1.0.7-r2.ebuild 6156
 MD5 55697b53bd932c2ea9c20d3d5e3b771e mozilla-thunderbird-1.0.7.ebuild 5632
+MD5 29c04ecfd6772b5e72488d72a0f165b7 mozilla-thunderbird-1.5_rc1-r1.ebuild 6419
 MD5 6416de0257e20ffb69090dc0565b9acb mozilla-thunderbird-1.5_rc1.ebuild 6371
diff --git a/mail-client/mozilla-thunderbird/files/digest-mozilla-thunderbird-1.5_rc1 b/mail-client/mozilla-thunderbird/files/digest-mozilla-thunderbird-1.5_rc1-r1
index 5e7545aa5c90..5e7545aa5c90 100644
--- a/mail-client/mozilla-thunderbird/files/digest-mozilla-thunderbird-1.5_rc1
+++ b/mail-client/mozilla-thunderbird/files/digest-mozilla-thunderbird-1.5_rc1-r1
diff --git a/mail-client/mozilla-thunderbird/files/firefox-1.1-uriloader.patch b/mail-client/mozilla-thunderbird/files/firefox-1.1-uriloader.patch
new file mode 100755
index 000000000000..08c7e9605e46
--- /dev/null
+++ b/mail-client/mozilla-thunderbird/files/firefox-1.1-uriloader.patch
@@ -0,0 +1,459 @@
+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
new file mode 100644
index 000000000000..e0665fe742b4
--- /dev/null
+++ b/mail-client/mozilla-thunderbird/files/firefox-1.1-visibility.patch
@@ -0,0 +1,22 @@
+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/thunderbird-visibility.patch b/mail-client/mozilla-thunderbird/files/thunderbird-visibility.patch
deleted file mode 100644
index 698c8770770a..000000000000
--- a/mail-client/mozilla-thunderbird/files/thunderbird-visibility.patch
+++ /dev/null
@@ -1,20 +0,0 @@
- --- configure   2 Mar 2005 16:57:17 -0000   1.1395
-+++ configure   3 Mar 2005 17:50:31 -0000
-@@ -7042,7 +7042,7 @@
-
- fi
-
--if test "$GNU_CC"; then
-+if /bin/false; then
-   echo $ac_n "checking for visibility(hidden) attribute""... $ac_c" 1>&6
- echo "configure:7048: checking for visibility(hidden) attribute" >&5
- if eval "test \"`echo '$''{'ac_cv_visibility_hidden'+set}'`\" = set"; then
-
-diff -u -r1.1.2.1 gcc_hidden.h
---- nsprpub/config/gcc_hidden.h 15 Dec 2004 05:52:39 -0000  1.1.2.1
-+++ nsprpub/config/gcc_hidden.h 3 Mar 2005 17:51:06 -0000
-@@ -1,2 +1,3 @@
--/* Begin all files as hidden visibility */
-+/* Begin all files as hidden visibility
- #pragma GCC visibility push(hidden)
-+*/ 
diff --git a/mail-client/mozilla-thunderbird/mozilla-thunderbird-1.5_rc1.ebuild b/mail-client/mozilla-thunderbird/mozilla-thunderbird-1.5_rc1-r1.ebuild
index 302ef6115f02..7965f9ac2444 100644
--- a/mail-client/mozilla-thunderbird/mozilla-thunderbird-1.5_rc1.ebuild
+++ b/mail-client/mozilla-thunderbird/mozilla-thunderbird-1.5_rc1-r1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/mail-client/mozilla-thunderbird/mozilla-thunderbird-1.5_rc1.ebuild,v 1.3 2005/11/16 22:58:29 anarchy Exp $
+# $Header: /var/cvsroot/gentoo-x86/mail-client/mozilla-thunderbird/mozilla-thunderbird-1.5_rc1-r1.ebuild,v 1.1 2005/11/22 17:28:44 anarchy Exp $
 
 unset ALLOWED_FLAGS  # stupid extra-functions.sh ... bug 49179
 inherit flag-o-matic toolchain-funcs eutils mozconfig-2 mozilla-launcher makeedit multilib versionator
@@ -47,7 +47,7 @@ src_unpack() {
 
 	# amd64 visibility patch
 	if [[ ${ARCH} == amd64 ]] && [[ $(gcc-major-version) -ge 3 ]]; then
-		epatch ${FILESDIR}/thunderbird-visibility.patch
+		epatch ${FILESDIR}/firefox-1.1-visibility.patch
 	fi
 
 	# patch to fix math operations on alpha, makes maps.google.com work!
@@ -66,6 +66,7 @@ src_unpack() {
 
 	# rpath fix
 	epatch ${FILESDIR}/thunderbird-rpath-1.patch
+	epatch ${FILESDIR}/firefox-1.1-uriloader.patch
 
 	# Fix a compilation issue using the 32-bit userland with 64-bit kernel on
 	# PowerPC, because with that configuration, it detects a ppc64 system.