Add patch for GCC 4.6 on xulrunner

3 files changed, 84 insertions, 2 deletions

diff --git a/net-libs/xulrunner/Manifest b/net-libs/xulrunner/Manifest
index 7f7d139..4925c0c 100644
--- a/net-libs/xulrunner/Manifest
+++ b/net-libs/xulrunner/Manifest
@@ -1,4 +1,4 @@
 AUX default-prefs.js 584 RMD160 2fd5ffe5ba46ec3ca7e17c3262f444b383c36e35 SHA1 9d9b838c253b4a136bbde38671e82079ea8d2e4b SHA256 eff68bbd2a1fb9f84d092da1cb765cf95183b57c511938689eed8cf94380c0e5
-AUX gentoo-specific.patch 1133 RMD160 8cecf45b0961d85787c17beb84ec4a99f25ec83b SHA1 002366526b42dbde183e40a322620c0601db8fa5 SHA256 dc216c4ca8b886ad076d94a28dff9e3edc7936c0b2a308584f75d870f4afd9a1
+AUX gcc46.patch 3554 RMD160 3ed51ae4440bfe367dcdb200028bb099ecc9a81a SHA1 4d9cf5c50d41aab79e00b5b74bc54b7d61066f54 SHA256 a5286801b28ff4f19b9e0392f96301836cd4b910e33a9dee63f6b0a66f3bf557
 AUX libpng15.patch 446 RMD160 a6b43dde909929befa6b7ec38f0fb51d0ddf4ac5 SHA1 6e9dd65b774022111c6723bda5341acadef8b040 SHA256 ece56d83be83178bc05bcd3b11251624371522d2db932974f4a6e72f49857e51
-EBUILD xulrunner-9999.ebuild 2615 RMD160 7fe80d24a5ceed0f894777437b23e67a389a15b5 SHA1 afed5fdbdef8e5c2f6e624da075fdf7a87340234 SHA256 ec483e504ba045d2d1add127e99ecd76b0aef10a85152674c43ea96c1424a695
+EBUILD xulrunner-9999.ebuild 2649 RMD160 5d5bf39b3b695c67517993fee4e694688365e2ca SHA1 6d72794bde45002e3e00cff90980657cab693bf6 SHA256 27279d7611527a0f0352da5fdbe7656013906da8af0102b41cac35a5bc4a35cd
diff --git a/net-libs/xulrunner/files/gcc46.patch b/net-libs/xulrunner/files/gcc46.patch
new file mode 100644
index 0000000..28dad01
--- /dev/null
+++ b/net-libs/xulrunner/files/gcc46.patch
@@ -0,0 +1,81 @@
+diff -urN a/embedding/browser/gtk/src/EmbedPrivate.cpp b/embedding/browser/gtk/src/EmbedPrivate.cpp
+--- a/embedding/browser/gtk/src/EmbedPrivate.cpp	2011-03-18 19:33:39.000000000 -0400
++++ b/embedding/browser/gtk/src/EmbedPrivate.cpp	2011-04-03 08:12:12.995741697 -0400
+@@ -104,7 +104,7 @@
+   NS_DECL_NSIDIRECTORYSERVICEPROVIDER2
+ };
+ 
+-static const GTKEmbedDirectoryProvider kDirectoryProvider;
++static const GTKEmbedDirectoryProvider kDirectoryProvider = GTKEmbedDirectoryProvider();
+ 
+ NS_IMPL_QUERY_INTERFACE2(GTKEmbedDirectoryProvider,
+                          nsIDirectoryServiceProvider,
+diff -urN a/layout/style/nsCSSRuleProcessor.cpp b/layout/style/nsCSSRuleProcessor.cpp
+--- a/layout/style/nsCSSRuleProcessor.cpp	2011-03-18 19:34:00.000000000 -0400
++++ b/layout/style/nsCSSRuleProcessor.cpp	2011-04-03 08:12:35.205741696 -0400
+@@ -1505,7 +1505,7 @@
+     return PR_FALSE;
+ 
+   const nsDefaultStringComparator defaultComparator;
+-  const nsASCIICaseInsensitiveStringComparator ciComparator;
++  const nsASCIICaseInsensitiveStringComparator ciComparator = nsASCIICaseInsensitiveStringComparator();
+   const nsStringComparator& comparator =
+       (aAttrSelector->mCaseSensitive || !isHTML)
+                 ? static_cast<const nsStringComparator&>(defaultComparator)
+diff -urN a/toolkit/xre/nsAppRunner.cpp b/toolkit/xre/nsAppRunner.cpp
+--- a/toolkit/xre/nsAppRunner.cpp	2011-04-03 08:17:35.091741681 -0400
++++ b/toolkit/xre/nsAppRunner.cpp	2011-04-03 08:12:12.305741698 -0400
+@@ -1041,7 +1041,7 @@
+ 
+ #endif
+ 
+-static const nsXULAppInfo kAppInfo;
++static const nsXULAppInfo kAppInfo = nsXULAppInfo();
+ static nsresult AppInfoConstructor(nsISupports* aOuter,
+                                    REFNSIID aIID, void **aResult)
+ {
+diff -urN a/xpcom/base/nsDebugImpl.cpp b/xpcom/base/nsDebugImpl.cpp
+--- a/xpcom/base/nsDebugImpl.cpp	2011-03-18 19:34:13.000000000 -0400
++++ b/xpcom/base/nsDebugImpl.cpp	2011-04-03 08:12:15.530741697 -0400
+@@ -524,7 +524,7 @@
+ #endif
+ }
+ 
+-static const nsDebugImpl kImpl;
++static const nsDebugImpl kImpl = nsDebugImpl();
+ 
+ nsresult
+ nsDebugImpl::Create(nsISupports* outer, const nsIID& aIID, void* *aInstancePtr)
+diff -urN a/xpcom/base/nsTraceRefcntImpl.cpp b/xpcom/base/nsTraceRefcntImpl.cpp
+--- a/xpcom/base/nsTraceRefcntImpl.cpp	2011-03-18 19:34:13.000000000 -0400
++++ b/xpcom/base/nsTraceRefcntImpl.cpp	2011-04-03 08:12:15.529741697 -0400
+@@ -1362,7 +1362,7 @@
+   return NS_OK;
+ }
+ 
+-static const nsTraceRefcntImpl kTraceRefcntImpl;
++static const nsTraceRefcntImpl kTraceRefcntImpl = nsTraceRefcntImpl();
+ 
+ NS_METHOD
+ nsTraceRefcntImpl::Create(nsISupports* outer, const nsIID& aIID, void* *aInstancePtr)
+diff -urN a/xpcom/glue/nsEnumeratorUtils.cpp b/xpcom/glue/nsEnumeratorUtils.cpp
+--- a/xpcom/glue/nsEnumeratorUtils.cpp	2011-03-18 19:34:13.000000000 -0400
++++ b/xpcom/glue/nsEnumeratorUtils.cpp	2011-04-03 08:12:15.574741697 -0400
+@@ -112,7 +112,7 @@
+     return NS_ERROR_UNEXPECTED;
+ }
+ 
+-const EmptyEnumeratorImpl EmptyEnumeratorImpl::kInstance;
++const EmptyEnumeratorImpl EmptyEnumeratorImpl::kInstance = EmptyEnumeratorImpl();
+ 
+ nsresult
+ NS_NewEmptyEnumerator(nsISimpleEnumerator** aResult)
+diff -urN a/xpcom/io/nsUnicharInputStream.cpp b/xpcom/io/nsUnicharInputStream.cpp
+--- a/xpcom/io/nsUnicharInputStream.cpp	2011-03-18 19:34:13.000000000 -0400
++++ b/xpcom/io/nsUnicharInputStream.cpp	2011-04-03 08:12:16.023741697 -0400
+@@ -464,4 +464,4 @@
+ }
+ 
+ const nsSimpleUnicharStreamFactory
+-nsSimpleUnicharStreamFactory::kInstance;
++nsSimpleUnicharStreamFactory::kInstance = nsSimpleUnicharStreamFactory();
diff --git a/net-libs/xulrunner/xulrunner-9999.ebuild b/net-libs/xulrunner/xulrunner-9999.ebuild
index 7d9edb7..ae63654 100644
--- a/net-libs/xulrunner/xulrunner-9999.ebuild
+++ b/net-libs/xulrunner/xulrunner-9999.ebuild
@@ -19,6 +19,7 @@ RDEPEND="
 
 src_prepare() {
 	has_version '>=media-libs/libpng-1.5' && epatch "${FILESDIR}"/libpng15.patch
+	epatch "${FILESDIR}"/gcc46.patch
 
 	# Gentoo prefix stuff
 	sed -i \