# HG changeset patch # User Wolfgang Rosenauer # Date 1305867950 -7200 # Node ID e8638477314984bba77cd527a0968b35a403579a # Parent d8ff9355f632861400c28aac4d222f8626cad031 gcc 4.6 buildfixes diff -r d8ff9355f632 -r e86384773149 mozilla-gcc46.patch --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/mozilla-gcc46.patch Fri May 20 07:05:50 2011 +0200 @@ -0,0 +1,192 @@ +# HG changeset patch +# Parent 8bb5926317b6f1e7c9291c8e7079b0c51ccc4615 +From: Christophe Giboudeaux +Subject: gcc 4.6 build fixes. + +diff --git a/embedding/browser/gtk/src/EmbedPrivate.cpp b/embedding/browser/gtk/src/EmbedPrivate.cpp +--- a/embedding/browser/gtk/src/EmbedPrivate.cpp ++++ b/embedding/browser/gtk/src/EmbedPrivate.cpp +@@ -99,16 +99,17 @@ nsISupports *EmbedPrivate::s + GtkWidget *EmbedPrivate::sOffscreenWindow = 0; + GtkWidget *EmbedPrivate::sOffscreenFixed = 0; + + nsIDirectoryServiceProvider *EmbedPrivate::sAppFileLocProvider = nsnull; + + class GTKEmbedDirectoryProvider : public nsIDirectoryServiceProvider2 + { + public: ++ GTKEmbedDirectoryProvider() {} + NS_DECL_ISUPPORTS_INHERITED + NS_DECL_NSIDIRECTORYSERVICEPROVIDER + NS_DECL_NSIDIRECTORYSERVICEPROVIDER2 + }; + + static const GTKEmbedDirectoryProvider kDirectoryProvider; + + NS_IMPL_QUERY_INTERFACE2(GTKEmbedDirectoryProvider, +diff --git a/gfx/ots/src/os2.cc b/gfx/ots/src/os2.cc +--- a/gfx/ots/src/os2.cc ++++ b/gfx/ots/src/os2.cc +@@ -1,12 +1,14 @@ + // Copyright (c) 2009 The Chromium Authors. All rights reserved. + // Use of this source code is governed by a BSD-style license that can be + // found in the LICENSE file. + ++#include ++ + #include "os2.h" + + #include "head.h" + + // OS/2 - OS/2 and Windows Metrics + // http://www.microsoft.com/opentype/otspec/os2.htm + + namespace ots { +diff --git a/intl/unicharutil/util/nsUnicharUtils.h b/intl/unicharutil/util/nsUnicharUtils.h +--- a/intl/unicharutil/util/nsUnicharUtils.h ++++ b/intl/unicharutil/util/nsUnicharUtils.h +@@ -67,16 +67,18 @@ inline PRBool IsLowerCase(PRUnichar c) { + return ToUpperCase(c) != c; + } + + #ifdef MOZILLA_INTERNAL_API + + class nsCaseInsensitiveStringComparator : public nsStringComparator + { + public: ++ nsCaseInsensitiveStringComparator() { ++ } + virtual int operator() (const PRUnichar*, + const PRUnichar*, + PRUint32 aLength) const; + virtual int operator() (PRUnichar, + PRUnichar) const; + }; + + class nsCaseInsensitiveStringArrayComparator +diff --git a/toolkit/crashreporter/google-breakpad/src/common/linux/language.cc b/toolkit/crashreporter/google-breakpad/src/common/linux/language.cc +--- a/toolkit/crashreporter/google-breakpad/src/common/linux/language.cc ++++ b/toolkit/crashreporter/google-breakpad/src/common/linux/language.cc +@@ -34,16 +34,17 @@ + + #include "common/linux/language.h" + + namespace google_breakpad { + + // C++ language-specific operations. + class CPPLanguage: public Language { + public: ++ CPPLanguage() {} + string MakeQualifiedName(const string &parent_name, + const string &name) const { + if (parent_name.empty()) + return name; + else + return parent_name + "::" + name; + } + }; +diff --git a/toolkit/xre/nsAppRunner.cpp b/toolkit/xre/nsAppRunner.cpp +--- a/toolkit/xre/nsAppRunner.cpp ++++ b/toolkit/xre/nsAppRunner.cpp +@@ -635,16 +635,17 @@ class nsXULAppInfo : public nsIXULAppInf + #endif + #ifdef MOZ_CRASHREPORTER + public nsICrashReporter_MOZILLA_1_9_2_BRANCH, + #endif + public nsIXULRuntime + + { + public: ++ nsXULAppInfo() {} + NS_DECL_ISUPPORTS_INHERITED + NS_DECL_NSIXULAPPINFO + NS_DECL_NSIXULRUNTIME + #ifdef MOZ_CRASHREPORTER + NS_DECL_NSICRASHREPORTER + NS_DECL_NSICRASHREPORTER_MOZILLA_1_9_2_BRANCH + #endif + #ifdef XP_WIN +diff --git a/xpcom/base/nsDebugImpl.h b/xpcom/base/nsDebugImpl.h +--- a/xpcom/base/nsDebugImpl.h ++++ b/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 NS_METHOD Create(nsISupports* outer, const nsIID& aIID, void* *aInstancePtr); + }; + + +diff --git a/xpcom/base/nsTraceRefcntImpl.h b/xpcom/base/nsTraceRefcntImpl.h +--- a/xpcom/base/nsTraceRefcntImpl.h ++++ b/xpcom/base/nsTraceRefcntImpl.h +@@ -39,16 +39,17 @@ + #define nsTraceRefcntImpl_h___ + + #include // 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/xpcom/glue/nsEnumeratorUtils.cpp b/xpcom/glue/nsEnumeratorUtils.cpp +--- a/xpcom/glue/nsEnumeratorUtils.cpp ++++ b/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/xpcom/io/nsUnicharInputStream.h b/xpcom/io/nsUnicharInputStream.h +--- a/xpcom/io/nsUnicharInputStream.h ++++ b/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 -r d8ff9355f632 -r e86384773149 mozilla-xulrunner192/mozilla-gcc46.patch --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/mozilla-xulrunner192/mozilla-gcc46.patch Fri May 20 07:05:50 2011 +0200 @@ -0,0 +1,1 @@ +../mozilla-gcc46.patch \ No newline at end of file diff -r d8ff9355f632 -r e86384773149 mozilla-xulrunner192/mozilla-xulrunner192.changes --- a/mozilla-xulrunner192/mozilla-xulrunner192.changes Fri May 20 06:59:11 2011 +0200 +++ b/mozilla-xulrunner192/mozilla-xulrunner192.changes Fri May 20 07:05:50 2011 +0200 @@ -1,7 +1,22 @@ ------------------------------------------------------------------- -Fri Apr 15 07:14:51 UTC 2011 - wr@rosenauer.org +Wed May 11 09:44:20 UTC 2011 - cgiboudeaux@gmx.com + +- Add mozilla-gcc46.patch. Fixes various build errors with GCC4.6 + +------------------------------------------------------------------- +Thu Apr 21 10:16:51 UTC 2011 - wr@rosenauer.org -- security update to 1.9.2.17 +- security update to 1.9.2.17 (bnc#689281) + * MFSA 2011-12/ CVE-2011-0069 CVE-2011-0070 CVE-2011-0072 + CVE-2011-0074 CVE-2011-0075 CVE-2011-0077 CVE-2011-0078 + CVE-2011-0080 CVE-2011-0081 + Miscellaneous memory safety hazards + * MFSA 2011-13/CVE-2011-0065/CVE-2011-0066/CVE-2011-0073 + Multiple dangling pointer vulnerabilities + * MFSA 2011-14/CVE-2011-0067 (bmo#527935) + Information stealing via form history + * MFSA 2011-18/CVE-2011-1202 (bmo#640339) + XSLT generate-id() function heap address leak ------------------------------------------------------------------- Mon Mar 28 16:25:25 UTC 2011 - llunak@novell.com diff -r d8ff9355f632 -r e86384773149 mozilla-xulrunner192/mozilla-xulrunner192.spec --- a/mozilla-xulrunner192/mozilla-xulrunner192.spec Fri May 20 06:59:11 2011 +0200 +++ b/mozilla-xulrunner192/mozilla-xulrunner192.spec Fri May 20 07:05:50 2011 +0200 @@ -86,6 +86,7 @@ Patch17: mozilla-gdk-pixbuf.patch Patch18: mozilla-prlog.patch Patch19: mozilla-ntlm-full-path.patch +Patch20: mozilla-gcc46.patch BuildRoot: %{_tmppath}/%{name}-%{version}-build Requires: mozilla-js192 = %{version} Requires(post): update-alternatives coreutils @@ -237,6 +238,7 @@ %patch17 -p1 %patch18 -p1 %patch19 -p1 +%patch20 -p1 %build %if %suse_version >= 1110 diff -r d8ff9355f632 -r e86384773149 series --- a/series Fri May 20 06:59:11 2011 +0200 +++ b/series Fri May 20 07:05:50 2011 +0200 @@ -16,6 +16,7 @@ mozilla-gdk-pixbuf.patch mozilla-prlog.patch mozilla-ntlm-full-path.patch +mozilla-gcc46.patch # Firefox patches firefox-libxul-sdk.patch