[gentoo-commits] proj/mozilla:master commit in: mail-client/thunderbird/, mail-client/thunderbird/files/

["Jory Pratt" <anarchy@gentoo.org>]

commit:     ac6db2c013898be4d3fc56db6af18fb4f8ab549b
Author:     Jory A. Pratt <anarchy <AT> gentoo <DOT> org>
AuthorDate: Sun Apr 10 20:02:11 2011 +0000
Commit:     Jory Pratt <anarchy <AT> gentoo <DOT> org>
CommitDate: Sun Apr 10 20:02:11 2011 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/mozilla.git;a=commit;h=ac6db2c0

thunderbird-3.3 gcc-4.6 fixup

---
 mail-client/thunderbird/Manifest                   |    3 +-
 .../thunderbird/files/mozilla-2.0-gcc46.patch      |  165 ++++++++++++++++++++
 .../thunderbird/thunderbird-3.3_alpha3-r1.ebuild   |    1 +
 3 files changed, 168 insertions(+), 1 deletions(-)

diff --git a/mail-client/thunderbird/Manifest b/mail-client/thunderbird/Manifest
index bc4964d..290a991 100644
--- a/mail-client/thunderbird/Manifest
+++ b/mail-client/thunderbird/Manifest
@@ -3,8 +3,9 @@ AUX 2000-thunderbird_gentoo_install_dirs.patch 813 RMD160 802697aab947df43693d73
 AUX enigmail-1.1.2-20110124-locale-fixup.diff 125 RMD160 8704469817cd93c99665a35655fa626b74253920 SHA1 708e101ae0576f99d6f10ac778fbc2b76c3ff6ea SHA256 60627ed65b032e33935d14eea4c7224f940641c4a11ab8bdf2c5d6056a76bfda
 AUX icon/thunderbird-unbranded.desktop 277 RMD160 49301b139cddf8c88d7168fa94229581e89f57fa SHA1 d8a6a4b41b7e62cf8b2e69d24f22c30dc80dfa29 SHA256 e31c806e820e33ed56d3ca112443c39b8506140c82bb57dd1a84c03b45fec598
 AUX icon/thunderbird.desktop 267 RMD160 109313e3ae88d0cd991e831cafbb3f4856b84478 SHA1 861c4cd25a936078597b909bd444164fbf38c82c SHA256 d1e91cf5596d3044e6a1089ce7e97b431eb1fb93afd7b353c6587fc8c4fc2a6f
+AUX mozilla-2.0-gcc46.patch 5474 RMD160 6df99f01de7d95351afc2b5dad2ee9471c7ee71f SHA1 14781debf8a99f2ca487b2d6a2facb8ac6d53a44 SHA256 6a554bbb2d1c0bf6b221c1c6f5429fd0d6d8feb0632ef7251724eeb62a506906
 AUX thunderbird-3.3-gconf-config-update.patch 1569 RMD160 e237530c4d95de84aa295927fd1c703d8a54b9a9 SHA1 6f78524f88fd7b3f4fef4eec1666eabe96c89992 SHA256 9da47f2752f7bb353297b93be3aaecf2d6004af3c91717d22e35a347ee6cf2a2
 AUX thunderbird-gentoo-default-prefs-1.js 387 RMD160 5d7362448204c7ea6cf81b06446373097e358d44 SHA1 b3e706e3c24eda4d87e3f13bd4a43dfb45a3dfb3 SHA256 ecf4bafbf81675abb01c3e0f0ab9fdf3c5722868ed0440670e2a530ca85f219c
 DIST enigmail-1.2a1-20110316.tar.bz2 905604 RMD160 57bb867f70f6b37ee11d426a8e155f2ccf5d56d2 SHA1 371e3c8bd7157ed8aee7648a271df591db75f8c2 SHA256 113db06ab1621328635c5394174afe02bef9c154c46b62ea7c605ac0a0b2beba
 DIST thunderbird-3.3a3.source.tar.bz2 83692340 RMD160 79ec91e73d6f1e64f16efae9c6ec333a2e54b220 SHA1 416c085e92a04c12c49b7f1ad41effb7ef24ece9 SHA256 7f5487449023a68784d800fdd38c25d30356972b27b0a23c2ba162c149161618
-EBUILD thunderbird-3.3_alpha3-r1.ebuild 7845 RMD160 274d36893468fc4fe20c80099d6982f1296c1de9 SHA1 6b9f4cd50a98fd6f96c15d9d36d1f54e7999dd39 SHA256 6861bc566c6301603bae14ac1e4c1267c82f87980a8704cba384d4871892a6bc
+EBUILD thunderbird-3.3_alpha3-r1.ebuild 7891 RMD160 92b854a63330f7884c9e018cbb18049ac6db4f8e SHA1 9f12d09a0c8b9e45f36cb0ebd4e928464ec3d633 SHA256 70e416d868f5a8010296d592853e311b910ac4712f11d532c01b5a7126aa6a70

diff --git a/mail-client/thunderbird/files/mozilla-2.0-gcc46.patch b/mail-client/thunderbird/files/mozilla-2.0-gcc46.patch
new file mode 100644
index 0000000..3c3e8e9
--- /dev/null
+++ b/mail-client/thunderbird/files/mozilla-2.0-gcc46.patch
@@ -0,0 +1,165 @@
+# HG changeset patch
+# User Rafael Ávila de Espíndola <respindola@mozilla.com>
+# Date 1301009215 14400
+# Node ID ca41c566399956643d79ac88bfac1d63ea3b2bcc
+# Parent  92b43aa07b7d8ca9833c98ddb3d4da30d0693ed8
+Bug 623126 - Add constructor for nsDebugImpl, nsTraceRefcntImpl, EmptyEnumeratorImpl, and nsSimpleUnicharStreamFactory to placate CLang; r=bsmedberg
+
+diff --git a/mozilla/xpcom/base/nsDebugImpl.h b/mozilla/xpcom/base/nsDebugImpl.h
+--- a/mozilla/xpcom/base/nsDebugImpl.h
++++ b/mozilla/xpcom/base/nsDebugImpl.h
+@@ -35,16 +35,17 @@
+  * ***** END LICENSE BLOCK ***** */
+ 
+ #include "nsIDebug.h"
+ #include "nsIDebug2.h"
+ 
+ class nsDebugImpl : public nsIDebug2
+ {
+ public:
++    nsDebugImpl() {}
+     NS_DECL_ISUPPORTS
+     NS_DECL_NSIDEBUG
+     NS_DECL_NSIDEBUG2
+     
+     static nsresult Create(nsISupports* outer, const nsIID& aIID, void* *aInstancePtr);
+ };
+ 
+ 
+diff --git a/mozilla/xpcom/base/nsTraceRefcntImpl.h b/mozilla/xpcom/base/nsTraceRefcntImpl.h
+--- a/mozilla/xpcom/base/nsTraceRefcntImpl.h
++++ b/mozilla/xpcom/base/nsTraceRefcntImpl.h
+@@ -39,16 +39,17 @@
+ #define nsTraceRefcntImpl_h___
+ 
+ #include <stdio.h> // for FILE
+ #include "nsITraceRefcnt.h"
+ 
+ class nsTraceRefcntImpl : public nsITraceRefcnt
+ {
+ public:
++  nsTraceRefcntImpl() {}
+   NS_DECL_ISUPPORTS
+   NS_DECL_NSITRACEREFCNT
+ 
+   static NS_COM void Startup();
+   static NS_COM void Shutdown();
+ 
+   enum StatisticsType {
+     ALL_STATS,
+diff --git a/mozilla/xpcom/glue/nsEnumeratorUtils.cpp b/mozilla/xpcom/glue/nsEnumeratorUtils.cpp
+--- a/mozilla/xpcom/glue/nsEnumeratorUtils.cpp
++++ b/mozilla/xpcom/glue/nsEnumeratorUtils.cpp
+@@ -47,16 +47,17 @@
+ 
+ #include "nsCOMPtr.h"
+ 
+ class EmptyEnumeratorImpl : public nsISimpleEnumerator,
+                             public nsIUTF8StringEnumerator,
+                             public nsIStringEnumerator
+ {
+ public:
++    EmptyEnumeratorImpl() {}
+     // nsISupports interface
+     NS_DECL_ISUPPORTS_INHERITED  // not really inherited, but no mRefCnt
+ 
+     // nsISimpleEnumerator
+     NS_DECL_NSISIMPLEENUMERATOR
+     NS_DECL_NSIUTF8STRINGENUMERATOR
+     // can't use NS_DECL_NSISTRINGENUMERATOR because they share the
+     // HasMore() signature
+diff --git a/mozilla/xpcom/io/nsUnicharInputStream.h b/mozilla/xpcom/io/nsUnicharInputStream.h
+--- a/mozilla/xpcom/io/nsUnicharInputStream.h
++++ b/mozilla/xpcom/io/nsUnicharInputStream.h
+@@ -46,16 +46,17 @@
+ #define NS_SIMPLE_UNICHAR_STREAM_FACTORY_CID \
+ { 0x428dca6f, 0x1a0f, 0x4cda, { 0xb5, 0x16, 0xd, 0x52, 0x44, 0x74, 0x5a, 0x6a } }
+ 
+ class nsSimpleUnicharStreamFactory :
+   public nsIFactory, 
+   private nsISimpleUnicharStreamFactory
+ {
+ public:
++  nsSimpleUnicharStreamFactory() {}
+   NS_DECL_ISUPPORTS_INHERITED
+   NS_DECL_NSIFACTORY
+   NS_DECL_NSISIMPLEUNICHARSTREAMFACTORY
+ 
+   static NS_COM nsSimpleUnicharStreamFactory* GetInstance();
+ 
+ private:
+   static const nsSimpleUnicharStreamFactory kInstance;
+
+
+diff --git a/mozilla/embedding/browser/gtk/src/EmbedPrivate.cpp b/mozilla/embedding/browser/gtk/src/EmbedPrivate.cpp
+index 57fd9b1..0052ca7 100644
+--- a/mozilla/embedding/browser/gtk/src/EmbedPrivate.cpp
++++ b/mozilla/embedding/browser/gtk/src/EmbedPrivate.cpp
+@@ -99,6 +99,7 @@ nsIDirectoryServiceProvider *EmbedPrivate::sAppFileLocProvider = nsnull;
+ class GTKEmbedDirectoryProvider : public nsIDirectoryServiceProvider2
+ {
+ public:
++  GTKEmbedDirectoryProvider() {}
+   NS_DECL_ISUPPORTS_INHERITED
+   NS_DECL_NSIDIRECTORYSERVICEPROVIDER
+   NS_DECL_NSIDIRECTORYSERVICEPROVIDER2
+
+# HG changeset patch
+# User Rafael Ávila de Espíndola <respindola@mozilla.com>
+# Date 1301009369 14400
+# Node ID 570781a55419e42e0ddd43d5d9da070dd022772d
+# Parent  b26e0f9e43e8f44b6663fdb29e9ee8a14c955e22
+Bug 623123 - Add constructor for nsXULAppInfo (which inherits from nsIXULAppInfo) to placate CLang; r=bsmedberg
+
+diff --git a/mozilla/toolkit/xre/nsAppRunner.cpp b/mozilla/toolkit/xre/nsAppRunner.cpp
+--- a/mozilla/toolkit/xre/nsAppRunner.cpp
++++ b/mozilla/toolkit/xre/nsAppRunner.cpp
+@@ -608,16 +608,17 @@ class nsXULAppInfo : public nsIXULAppInf
+ #endif
+ #ifdef MOZ_CRASHREPORTER
+                      public nsICrashReporter,
+ #endif
+                      public nsIXULRuntime
+ 
+ {
+ public:
++  nsXULAppInfo() {}
+   NS_DECL_ISUPPORTS_INHERITED
+   NS_DECL_NSIXULAPPINFO
+   NS_DECL_NSIXULRUNTIME
+ #ifdef MOZ_CRASHREPORTER
+   NS_DECL_NSICRASHREPORTER
+ #endif
+ #ifdef XP_WIN
+   NS_DECL_NSIWINAPPHELPER
+
+# HG changeset patch
+# User Rafael Ávila de Espíndola <respindola@mozilla.com>
+# Date 1301011307 14400
+# Node ID 067fdfe97f0d9b0400e665d38578c0b3a0f670db
+# Parent  17015e66511231d618d2915aecfc146c18a873a5
+Bug 623116 - Add constructor for nsASCIICaseInsensitiveStringComparator (which inherits from nsStringComparator) to placate CLang; r=smontagu
+
+diff --git a/mozilla/intl/unicharutil/util/nsUnicharUtils.h b/mozilla/intl/unicharutil/util/nsUnicharUtils.h
+--- a/mozilla/intl/unicharutil/util/nsUnicharUtils.h
++++ b/mozilla/intl/unicharutil/util/nsUnicharUtils.h
+@@ -98,16 +98,17 @@ public:
+   PRBool Equals(const A& a, const B& b) const {
+     return a.Equals(b, nsCaseInsensitiveStringComparator());
+   }
+ };
+ 
+ class nsASCIICaseInsensitiveStringComparator : public nsStringComparator
+ {
+ public:
++  nsASCIICaseInsensitiveStringComparator() {}
+   virtual int operator() (const PRUnichar*,
+                           const PRUnichar*,
+                           PRUint32,
+                           PRUint32) const;
+ };
+ 
+ inline PRBool
+ CaseInsensitiveFindInReadable(const nsAString& aPattern,
+
+

diff --git a/mail-client/thunderbird/thunderbird-3.3_alpha3-r1.ebuild b/mail-client/thunderbird/thunderbird-3.3_alpha3-r1.ebuild
index 0dcba17..6cdd98f 100644
--- a/mail-client/thunderbird/thunderbird-3.3_alpha3-r1.ebuild
+++ b/mail-client/thunderbird/thunderbird-3.3_alpha3-r1.ebuild
@@ -118,6 +118,7 @@ src_prepare() {
 	epatch "${FILESDIR}/1001-xulrunner_fix_jemalloc_vs_aslr.patch"
 	epatch "${FILESDIR}/2000-thunderbird_gentoo_install_dirs.patch"
 	epatch "${FILESDIR}/thunderbird-3.3-gconf-config-update.patch"
+	epatch "${FILESDIR}/mozilla-2.0-gcc46.patch"
 
 	if use crypt ; then
 		mv "${WORKDIR}"/enigmail "${S}"/mailnews/extensions/enigmail