Hello community, here is the log from the commit of package MozillaThunderbird for openSUSE:Factory checked in at 2012-08-31 09:45:36 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/MozillaThunderbird (Old) and /work/SRC/openSUSE:Factory/.MozillaThunderbird.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "MozillaThunderbird", Maintainer is "gnome-maintainers@suse.de" Changes: -------- --- /work/SRC/openSUSE:Factory/MozillaThunderbird/MozillaThunderbird.changes 2012-07-30 11:40:49.000000000 +0200 +++ /work/SRC/openSUSE:Factory/.MozillaThunderbird.new/MozillaThunderbird.changes 2012-08-31 09:45:38.000000000 +0200 @@ -1,0 +2,31 @@ +Sun Aug 26 14:59:20 UTC 2012 - wr@rosenauer.org + +- update to Thunderbird 15.0 (bnc#777588) + * MFSA 2012-57/CVE-2012-1970 + Miscellaneous memory safety hazards + * MFSA 2012-58/CVE-2012-1972/CVE-2012-1973/CVE-2012-1974/CVE-2012-1975 + CVE-2012-1976/CVE-2012-3956/CVE-2012-3957/CVE-2012-3958/CVE-2012-3959 + CVE-2012-3960/CVE-2012-3961/CVE-2012-3962/CVE-2012-3963/CVE-2012-3964 + Use-after-free issues found using Address Sanitizer + * MFSA 2012-59/CVE-2012-1956 (bmo#756719) + Location object can be shadowed using Object.defineProperty + * MFSA 2012-61/CVE-2012-3966 (bmo#775794, bmo#775793) + Memory corruption with bitmap format images with negative height + * MFSA 2012-62/CVE-2012-3967/CVE-2012-3968 + WebGL use-after-free and memory corruption + * MFSA 2012-63/CVE-2012-3969/CVE-2012-3970 + SVG buffer overflow and use-after-free issues + * MFSA 2012-64/CVE-2012-3971 + Graphite 2 memory corruption + * MFSA 2012-65/CVE-2012-3972 (bmo#746855) + Out-of-bounds read in format-number in XSLT + * MFSA 2012-68/CVE-2012-3975 (bmo#770684) + DOMParser loads linked resources in extensions when parsing + text/html + * MFSA 2012-70/CVE-2012-3978 (bmo#770429) + Location object security checks bypassed by chrome code + * MFSA 2012-72/CVE-2012-3980 (bmo#771859) + Web console eval capable of executing chrome-privileged code +- update Enigmail to 1.4.4 + +------------------------------------------------------------------- Old: ---- enigmail-1.4.3.tar.gz l10n-14.0.tar.bz2 mozilla-disable-neon-option.patch mozilla-dump_syms-static.patch mozilla-gcc47.patch thunderbird-14.0-source.tar.bz2 New: ---- enigmail-1.4.4.tar.gz l10n-15.0.tar.bz2 mozilla-arm-disable-edsp.patch mozilla-crashreporter-restart-args.patch mozilla-ppc.patch thunderbird-15.0-source.tar.bz2 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ MozillaThunderbird.spec ++++++ --- /var/tmp/diff_new_pack.iw95y4/_old 2012-08-31 09:45:59.000000000 +0200 +++ /var/tmp/diff_new_pack.iw95y4/_new 2012-08-31 09:45:59.000000000 +0200 @@ -30,8 +30,8 @@ BuildRequires: libgnomeui-devel BuildRequires: libidl-devel BuildRequires: libnotify-devel -BuildRequires: mozilla-nspr-devel >= 4.9.0 -BuildRequires: mozilla-nss-devel >= 3.13.5 +BuildRequires: mozilla-nspr-devel >= 4.9.1 +BuildRequires: mozilla-nss-devel >= 3.13.6 BuildRequires: nss-shared-helper-devel BuildRequires: python BuildRequires: startup-notification-devel @@ -40,11 +40,11 @@ BuildRequires: xorg-x11-libXt-devel BuildRequires: yasm BuildRequires: zip -%define mainversion 14.0 +%define mainversion 15.0 %define update_channel release Version: %{mainversion} Release: 0 -%define releasedate 2012071300 +%define releasedate 2012082500 Provides: thunderbird = %{version} %if %{with_kde} # this is needed to match this package with the kde4 helper package without the main package @@ -65,18 +65,18 @@ Source6: suse-default-prefs.js Source7: find-external-requires.sh Source8: thunderbird-rpmlintrc -Source9: enigmail-1.4.3.tar.gz +Source9: enigmail-1.4.4.tar.gz Source10: create-tar.sh Source11: compare-locales.tar.bz2 Source12: kde.js # Gecko/Toolkit Patch1: mozilla-shared-nss-db.patch Patch2: mozilla-language.patch -Patch3: mozilla-dump_syms-static.patch -Patch4: mozilla-disable-neon-option.patch -Patch5: mozilla-nongnome-proxies.patch -Patch6: mozilla-kde.patch -Patch7: mozilla-gcc47.patch +Patch3: mozilla-nongnome-proxies.patch +Patch4: mozilla-kde.patch +Patch5: mozilla-arm-disable-edsp.patch +Patch6: mozilla-crashreporter-restart-args.patch +Patch7: mozilla-ppc.patch # Thunderbird/mail Patch20: tb-ssldap.patch Patch21: tb-develdirs.patch @@ -170,7 +170,7 @@ %if %build_enigmail %package -n enigmail -Version: 1.4.3+%{mainversion} +Version: 1.4.4+%{mainversion} Release: 0 Summary: OpenPGP addon for Thunderbird and SeaMonkey License: MPL-1.1 or GPL-2.0+ @@ -199,11 +199,11 @@ %patch1 -p1 %patch2 -p1 %patch3 -p1 -#%patch4 -p1 -%patch5 -p1 %if %{with_kde} -%patch6 -p1 +%patch4 -p1 %endif +%patch5 -p1 +%patch6 -p1 %patch7 -p1 popd # comm-central patches @@ -534,7 +534,6 @@ %{progdir}/chrome/icons/ %dir %{progdir}/dictionaries/ %{progdir}/defaults/ -%{progdir}/jssubloader/ %dir %{progdir}/extensions/ %{progdir}/extensions/{972ce4c6-7e08-4474-a285-3208198ce6fd} %{progdir}/isp/ @@ -556,6 +555,7 @@ %defattr(-,root,root) %{_libdir}/%{progname}/*.a %{_libdir}/%{progname}/*.py +%{_libdir}/%{progname}/*.pyc %{_libdir}/%{progname}/ply/ %{_libdir}/%{progname}/xpcshell #%{_libdir}/pkgconfig/*.pc ++++++ compare-locales.tar.bz2 ++++++ ++++++ create-tar.sh ++++++ --- /var/tmp/diff_new_pack.iw95y4/_old 2012-08-31 09:46:00.000000000 +0200 +++ /var/tmp/diff_new_pack.iw95y4/_new 2012-08-31 09:46:00.000000000 +0200 @@ -2,8 +2,8 @@ CHANNEL="release" BRANCH="releases/comm-$CHANNEL" -RELEASE_TAG="THUNDERBIRD_14_0_RELEASE" -VERSION="14.0" +RELEASE_TAG="THUNDERBIRD_15_0_RELEASE" +VERSION="15.0" echo "cloning $BRANCH..." hg clone http://hg.mozilla.org/$BRANCH thunderbird ++++++ enigmail-1.4.3.tar.gz -> enigmail-1.4.4.tar.gz ++++++ ++++ 9598 lines of diff (skipped) ++++++ l10n-14.0.tar.bz2 -> l10n-15.0.tar.bz2 ++++++ /work/SRC/openSUSE:Factory/MozillaThunderbird/l10n-14.0.tar.bz2 /work/SRC/openSUSE:Factory/.MozillaThunderbird.new/l10n-15.0.tar.bz2 differ: char 11, line 1 ++++++ mozilla-arm-disable-edsp.patch ++++++ # HG changeset patch # User Adrian Schröter <adrian@suse.de> # Parent 5b26dbfe65bd4986ea3792f02bc025fec293b51f disable ESDP support (no BNC or BMO reference yet :-() diff --git a/xpcom/glue/arm.h b/xpcom/glue/arm.h --- a/xpcom/glue/arm.h +++ b/xpcom/glue/arm.h @@ -143,17 +143,17 @@ namespace mozilla { extern bool NS_COM_GLUE neon_enabled; #endif #endif } #if defined(MOZILLA_PRESUME_EDSP) # define MOZILLA_MAY_SUPPORT_EDSP 1 inline bool supports_edsp() { return true; } -#elif defined(MOZILLA_MAY_SUPPORT_EDSP) \ +#elif 0 \ && defined(MOZILLA_ARM_HAVE_CPUID_DETECTION) inline bool supports_edsp() { return arm_private::edsp_enabled; } #else inline bool supports_edsp() { return false; } #endif #if defined(MOZILLA_PRESUME_ARMV6) # define MOZILLA_MAY_SUPPORT_ARMV6 1 ++++++ mozilla-crashreporter-restart-args.patch ++++++ # HG changeset patch # User Wolfgang Rosenauer <wr@rosenauer.org> # Parent 07bb4ecfd6d6cc16360e7a32ee10b885d523f20d Bug 762780 - crashreporter restart command should support MOZ_APP_LAUNCHER diff --git a/toolkit/crashreporter/nsExceptionHandler.cpp b/toolkit/crashreporter/nsExceptionHandler.cpp --- a/toolkit/crashreporter/nsExceptionHandler.cpp +++ b/toolkit/crashreporter/nsExceptionHandler.cpp @@ -1360,32 +1360,25 @@ nsresult SetRestartArgs(int argc, char** argv) { if (!gExceptionHandler) return NS_OK; int i; nsCAutoString envVar; char *env; + char *argv1 = getenv("MOZ_APP_LAUNCHER"); for (i = 0; i < argc; i++) { envVar = "MOZ_CRASHREPORTER_RESTART_ARG_"; envVar.AppendInt(i); envVar += "="; -#if defined(XP_UNIX) && !defined(XP_MACOSX) - // we'd like to run the script around the binary - // instead of the binary itself, so remove the -bin - // if it exists on the first argument - int arg_len = 0; - if (i == 0 && - (arg_len = strlen(argv[i])) > 4 && - strcmp(argv[i] + arg_len - 4, "-bin") == 0) { - envVar.Append(argv[i], arg_len - 4); - } else -#endif - { + if (argv1 && i == 0) { + // Is there a request to suppress default binary launcher? + envVar += argv1; + } else { envVar += argv[i]; } // PR_SetEnv() wants the string to be available for the lifetime // of the app, so dup it here env = ToNewCString(envVar); if (!env) return NS_ERROR_OUT_OF_MEMORY; ++++++ mozilla-kde.patch ++++++ --- /var/tmp/diff_new_pack.iw95y4/_old 2012-08-31 09:46:00.000000000 +0200 +++ /var/tmp/diff_new_pack.iw95y4/_new 2012-08-31 09:46:00.000000000 +0200 @@ -7,7 +7,7 @@ diff --git a/modules/libpref/src/Makefile.in b/modules/libpref/src/Makefile.in --- a/modules/libpref/src/Makefile.in +++ b/modules/libpref/src/Makefile.in -@@ -77,14 +77,16 @@ GREPREF_FILES = $(topsrcdir)/netwerk/bas +@@ -45,14 +45,16 @@ GREPREF_FILES = $(topsrcdir)/netwerk/bas # Optimizer bug with GCC 3.2.2 on OS/2 ifeq ($(OS_ARCH), OS2) nsPrefService.$(OBJ_SUFFIX): nsPrefService.cpp @@ -27,7 +27,7 @@ diff --git a/modules/libpref/src/Preferences.cpp b/modules/libpref/src/Preferences.cpp --- a/modules/libpref/src/Preferences.cpp +++ b/modules/libpref/src/Preferences.cpp -@@ -57,16 +57,17 @@ +@@ -23,16 +23,17 @@ #include "nsIStringEnumerator.h" #include "nsIZipReader.h" #include "nsPrefBranch.h" @@ -45,7 +45,7 @@ #include "prefapi.h" #include "prefread.h" #include "prefapi_private_data.h" -@@ -941,16 +942,34 @@ pref_LoadPrefsInDir(nsIFile* aDir, char +@@ -907,16 +908,34 @@ pref_LoadPrefsInDir(nsIFile* aDir, char static nsresult pref_LoadPrefsInDirList(const char *listId) { @@ -80,7 +80,7 @@ return NS_OK; bool hasMore; -@@ -966,17 +985,17 @@ static nsresult pref_LoadPrefsInDirList( +@@ -932,17 +951,17 @@ static nsresult pref_LoadPrefsInDirList( nsCAutoString leaf; path->GetNativeLeafName(leaf); @@ -99,7 +99,7 @@ { nsZipItemPtr<char> manifest(jarReader, name, true); NS_ENSURE_TRUE(manifest.Buffer(), NS_ERROR_NOT_AVAILABLE); -@@ -1070,28 +1089,40 @@ static nsresult pref_InitInitialObjects( +@@ -1036,28 +1055,40 @@ static nsresult pref_InitInitialObjects( /* these pref file names should not be used: we process them after all other application pref files for backwards compatibility */ static const char* specialFiles[] = { #if defined(XP_MACOSX) @@ -143,8 +143,7 @@ diff --git a/toolkit/components/downloads/Makefile.in b/toolkit/components/downloads/Makefile.in --- a/toolkit/components/downloads/Makefile.in +++ b/toolkit/components/downloads/Makefile.in -@@ -73,8 +73,11 @@ EXTRA_COMPONENTS = \ - nsDownloadManagerUI.js \ +@@ -41,9 +41,12 @@ EXTRA_COMPONENTS = \ nsDownloadManagerUI.manifest \ $(NULL) endif @@ -152,13 +151,15 @@ TEST_DIRS += test include $(topsrcdir)/config/rules.mk -+ + +LOCAL_INCLUDES += -I$(topsrcdir)/toolkit/xre + ++ + CXXFLAGS += $(TK_CFLAGS) diff --git a/toolkit/components/downloads/nsDownloadManager.cpp b/toolkit/components/downloads/nsDownloadManager.cpp --- a/toolkit/components/downloads/nsDownloadManager.cpp +++ b/toolkit/components/downloads/nsDownloadManager.cpp -@@ -74,16 +74,20 @@ +@@ -35,16 +35,20 @@ #ifdef XP_WIN #include <shlobj.h> @@ -179,7 +180,7 @@ #include "AndroidBridge.h" #endif -@@ -2259,16 +2263,25 @@ nsDownload::SetState(DownloadState aStat +@@ -2236,16 +2240,25 @@ nsDownload::SetState(DownloadState aStat nsCOMPtr<nsIPrefBranch> pref(do_GetService(NS_PREFSERVICE_CONTRACTID)); // Master pref to control this function. @@ -205,7 +206,7 @@ PRInt64 goat = PR_Now() - mStartTime; showTaskbarAlert = goat > alertIntervalUSec; -@@ -2292,19 +2305,20 @@ nsDownload::SetState(DownloadState aStat +@@ -2269,19 +2282,20 @@ nsDownload::SetState(DownloadState aStat // If downloads are automatically removed per the user's // retention policy, there's no reason to make the text clickable // because if it is, they'll click open the download manager and @@ -220,7 +221,7 @@ } + } - #if defined(XP_WIN) || defined(XP_MACOSX) || defined(MOZ_WIDGET_ANDROID) + #if defined(XP_WIN) || defined(XP_MACOSX) || defined(MOZ_WIDGET_ANDROID) || defined(MOZ_WIDGET_GTK2) nsCOMPtr<nsIFileURL> fileURL = do_QueryInterface(mTarget); nsCOMPtr<nsIFile> file; nsAutoString path; @@ -230,7 +231,7 @@ diff --git a/toolkit/content/jar.mn b/toolkit/content/jar.mn --- a/toolkit/content/jar.mn +++ b/toolkit/content/jar.mn -@@ -44,29 +44,33 @@ toolkit.jar: +@@ -45,29 +45,33 @@ toolkit.jar: *+ content/global/viewZoomOverlay.js (viewZoomOverlay.js) *+ content/global/bindings/autocomplete.xml (widgets/autocomplete.xml) *+ content/global/bindings/browser.xml (widgets/browser.xml) @@ -268,8 +269,12 @@ new file mode 100644 --- /dev/null +++ b/toolkit/content/widgets/dialog-kde.xml -@@ -0,0 +1,447 @@ +@@ -0,0 +1,451 @@ +<?xml version="1.0"?> ++<!-- This Source Code Form is subject to the terms of the Mozilla Public ++ - License, v. 2.0. If a copy of the MPL was not distributed with this ++ - file, You can obtain one at http://mozilla.org/MPL/2.0/. --> ++ + +<bindings id="dialogBindings" + xmlns="http://www.mozilla.org/xbl" @@ -300,7 +305,7 @@ + pack="end"> + <xul:button dlgtype="help" class="dialog-button" hidden="true"/> + <xul:button dlgtype="extra2" class="dialog-button" hidden="true"/> -+ <xul:spacer anonid="spacer" flex="1" hidden="true"/> ++ <xul:spacer anonid="spacer" flex="1"/> + <xul:button dlgtype="accept" class="dialog-button" xbl:inherits="disabled=buttondisabledaccept"/> + <xul:button dlgtype="extra1" class="dialog-button" hidden="true"/> + <xul:button dlgtype="cancel" class="dialog-button"/> @@ -720,7 +725,7 @@ new file mode 100644 --- /dev/null +++ b/toolkit/content/widgets/preferences-kde.xml -@@ -0,0 +1,1373 @@ +@@ -0,0 +1,1339 @@ +<?xml version="1.0"?> + +<!DOCTYPE bindings [ @@ -1307,8 +1312,8 @@ + <xul:button dlgtype="accept" class="dialog-button" icon="accept"/> +#elif XP_UNIX + pack="end"> -+ <xul:button dlgtype="help" class="dialog-button" hidden="true" icon="help"/> -+ <xul:button dlgtype="extra2" class="dialog-button" hidden="true"/> ++ <xul:button dlgtype="help" class="dialog-button" hidden="true" icon="help"/> ++ <xul:button dlgtype="extra2" class="dialog-button" hidden="true"/> + <xul:spacer anonid="spacer" flex="1"/> + <xul:button dlgtype="accept" class="dialog-button" icon="accept"/> + <xul:button dlgtype="extra1" class="dialog-button" hidden="true"/> @@ -1985,9 +1990,9 @@ + <handlers> + <handler event="command"> + // This "command" event handler tracks changes made to preferences by -+ // the user in this window. -+ if (event.sourceEvent) -+ event = event.sourceEvent; ++ // the user in this window. ++ if (event.sourceEvent) ++ event = event.sourceEvent; + this.userChangedValue(event.target); + </handler> + <handler event="select"> @@ -2046,43 +2051,9 @@ +</bindings> + +# -*- Mode: Java; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- -+# ***** BEGIN LICENSE BLOCK ***** -+# Version: MPL 1.1/GPL 2.0/LGPL 2.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 the Preferences System. -+# -+# The Initial Developer of the Original Code is -+# Ben Goodger. -+# Portions created by the Initial Developer are Copyright (C) 2005 -+# the Initial Developer. All Rights Reserved. -+# -+# Contributor(s): -+# Ben Goodger <ben@mozilla.org> -+# Josh Aas <josh@mozilla.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 -+# the GNU Lesser General Public License Version 2.1 or later (the "LGPL"), -+# in which case the provisions of the GPL or the LGPL are applicable instead -+# of those above. If you wish to allow use of your version of this file only -+# under the terms of either the GPL or the LGPL, and not to allow others to -+# use your version of this file under the terms of the MPL, indicate your -+# decision by deleting the provisions above and replace them with the notice -+# and other provisions required by the GPL or the LGPL. If you do not delete -+# the provisions above, a recipient may use your version of this file under -+# the terms of any one of the MPL, the GPL or the LGPL. -+# -+# ***** END LICENSE BLOCK ***** ++# This Source Code Form is subject to the terms of the Mozilla Public ++# License, v. 2.0. If a copy of the MPL was not distributed with this ++# file, You can obtain one at http://mozilla.org/MPL/2.0/. + +# +# This is PrefWindow 6. The Code Could Well Be Ready, Are You? @@ -2097,7 +2068,7 @@ diff --git a/toolkit/system/unixproxy/nsUnixSystemProxySettings.cpp b/toolkit/system/unixproxy/nsUnixSystemProxySettings.cpp --- a/toolkit/system/unixproxy/nsUnixSystemProxySettings.cpp +++ b/toolkit/system/unixproxy/nsUnixSystemProxySettings.cpp -@@ -46,16 +46,18 @@ +@@ -12,16 +12,18 @@ #include "nsArrayUtils.h" #include "prnetdb.h" #include "prenv.h" @@ -2116,7 +2087,7 @@ nsUnixSystemProxySettings() {} nsresult Init(); -@@ -67,16 +69,17 @@ private: +@@ -33,16 +35,17 @@ private: nsCOMPtr<nsIGSettingsService> mGSettings; nsCOMPtr<nsIGSettingsCollection> mProxySettings; nsInterfaceHashtable<nsCStringHashKey, nsIGSettingsCollection> mSchemeProxySettings; @@ -2134,7 +2105,7 @@ nsUnixSystemProxySettings::Init() { // If this is a GNOME session, load gconf and try to use its preferences. -@@ -529,16 +532,19 @@ nsUnixSystemProxySettings::GetProxyForUR +@@ -495,16 +498,19 @@ nsUnixSystemProxySettings::GetProxyForUR nsCAutoString host; rv = aURI->GetHost(host); NS_ENSURE_SUCCESS(rv, rv); @@ -2154,7 +2125,7 @@ if (mGConf) return GetProxyFromGConf(scheme, host, port, aResult); -@@ -564,8 +570,34 @@ static const mozilla::Module::ContractID +@@ -530,8 +536,34 @@ static const mozilla::Module::ContractID static const mozilla::Module kUnixProxyModule = { mozilla::Module::kVersion, @@ -2192,7 +2163,7 @@ diff --git a/toolkit/xre/Makefile.in b/toolkit/xre/Makefile.in --- a/toolkit/xre/Makefile.in +++ b/toolkit/xre/Makefile.in -@@ -100,17 +100,18 @@ else +@@ -69,17 +69,18 @@ else ifeq ($(MOZ_WIDGET_TOOLKIT),cocoa) CMMSRCS = nsNativeAppSupportCocoa.mm EXPORTS += MacQuirks.h @@ -2679,7 +2650,7 @@ diff --git a/uriloader/exthandler/Makefile.in b/uriloader/exthandler/Makefile.in --- a/uriloader/exthandler/Makefile.in +++ b/uriloader/exthandler/Makefile.in -@@ -90,18 +90,19 @@ LOCAL_INCLUDES = -I$(srcdir) +@@ -58,18 +58,19 @@ LOCAL_INCLUDES = -I$(srcdir) LOCAL_INCLUDES += -I$(topsrcdir)/dom/base \ -I$(topsrcdir)/dom/ipc \ -I$(topsrcdir)/content/base/src \ @@ -3047,7 +3018,7 @@ diff --git a/uriloader/exthandler/unix/nsMIMEInfoUnix.cpp b/uriloader/exthandler/unix/nsMIMEInfoUnix.cpp --- a/uriloader/exthandler/unix/nsMIMEInfoUnix.cpp +++ b/uriloader/exthandler/unix/nsMIMEInfoUnix.cpp -@@ -50,30 +50,33 @@ +@@ -16,30 +16,33 @@ #include <QString> #if (MOZ_ENABLE_CONTENTACTION) #include <contentaction/contentaction.h> @@ -3083,7 +3054,7 @@ nsCAutoString spec; aURI->GetAsciiSpec(spec); if (hildon_uri_open(spec.get(), action, nsnull)) -@@ -95,22 +98,22 @@ nsMIMEInfoUnix::LoadUriInternal(nsIURI * +@@ -61,22 +64,22 @@ nsMIMEInfoUnix::LoadUriInternal(nsIURI * return rv; } @@ -3108,7 +3079,7 @@ if (*_retval) return NS_OK; -@@ -153,16 +156,33 @@ nsMIMEInfoUnix::LaunchDefaultWithFile(ns +@@ -119,16 +122,33 @@ nsMIMEInfoUnix::LaunchDefaultWithFile(ns ContentAction::Action::defaultActionForFile(uri, QString(mSchemeOrType.get())); if (action.isValid()) { action.trigger(); @@ -3142,7 +3113,7 @@ nsCOMPtr<nsIIOService> ioservice = do_GetService(NS_IOSERVICE_CONTRACTID, &rv); NS_ENSURE_SUCCESS(rv, rv); nsCOMPtr<nsIURI> uri; -@@ -180,17 +200,17 @@ nsMIMEInfoUnix::LaunchDefaultWithFile(ns +@@ -146,17 +166,17 @@ nsMIMEInfoUnix::LaunchDefaultWithFile(ns /* Fallback to GnomeVFS */ nsCOMPtr<nsIGnomeVFSMimeApp> app; if (NS_SUCCEEDED(gnomevfs->GetAppForMimeType(mSchemeOrType, getter_AddRefs(app))) && app) @@ -3164,7 +3135,7 @@ diff --git a/uriloader/exthandler/unix/nsOSHelperAppService.cpp b/uriloader/exthandler/unix/nsOSHelperAppService.cpp --- a/uriloader/exthandler/unix/nsOSHelperAppService.cpp +++ b/uriloader/exthandler/unix/nsOSHelperAppService.cpp -@@ -44,17 +44,17 @@ +@@ -10,17 +10,17 @@ #if defined(MOZ_ENABLE_CONTENTACTION) #include <contentaction/contentaction.h> #include <QString> @@ -3183,7 +3154,7 @@ #include "nsXPIDLString.h" #include "nsIURL.h" #include "nsIFileStreams.h" -@@ -1191,29 +1191,29 @@ nsresult nsOSHelperAppService::OSProtoco +@@ -1157,29 +1157,29 @@ nsresult nsOSHelperAppService::OSProtoco ContentAction::Action::defaultActionForScheme(QString(aProtocolScheme) + ':'); if (action.isValid()) @@ -3215,7 +3186,7 @@ nsresult nsOSHelperAppService::GetFileTokenForPath(const PRUnichar * platformAppPath, nsIFile ** aFile) { -@@ -1299,17 +1299,17 @@ nsOSHelperAppService::GetFromExtension(c +@@ -1265,17 +1265,17 @@ nsOSHelperAppService::GetFromExtension(c minorType, mime_types_description, true); @@ -3234,7 +3205,7 @@ rv = LookUpTypeAndDescription(NS_ConvertUTF8toUTF16(aFileExt), majorType, -@@ -1425,17 +1425,17 @@ nsOSHelperAppService::GetFromType(const +@@ -1391,17 +1391,17 @@ nsOSHelperAppService::GetFromType(const #ifdef MOZ_WIDGET_GTK2 nsMIMEInfoBase *gnomeInfo = nsnull; if (handler.IsEmpty()) { @@ -3256,7 +3227,7 @@ diff --git a/widget/gtk2/Makefile.in b/widget/gtk2/Makefile.in --- a/widget/gtk2/Makefile.in +++ b/widget/gtk2/Makefile.in -@@ -135,11 +135,14 @@ DEFINES += -DCAIRO_GFX -DMOZ_APP_NAME=' +@@ -104,11 +104,14 @@ DEFINES += -DCAIRO_GFX -DMOZ_APP_NAME=' INCLUDES += \ -I$(srcdir)/../xpwidgets \ @@ -3274,11 +3245,11 @@ diff --git a/widget/gtk2/nsFilePicker.cpp b/widget/gtk2/nsFilePicker.cpp --- a/widget/gtk2/nsFilePicker.cpp +++ b/widget/gtk2/nsFilePicker.cpp -@@ -33,16 +33,17 @@ - * the provisions above, a recipient may use your version of this file under - * the terms of any one of the MPL, the GPL or the LGPL. - * - * ***** END LICENSE BLOCK ***** */ +@@ -1,16 +1,17 @@ + /* -*- Mode: C++; tab-width: 2; indent-tabs-mode: nil; c-basic-offset: 2 -*- */ + /* This Source Code Form is subject to the terms of the Mozilla Public + * License, v. 2.0. If a copy of the MPL was not distributed with this + * file, You can obtain one at http://mozilla.org/MPL/2.0/. */ #include "mozilla/Util.h" @@ -3292,7 +3263,7 @@ #include "nsIStringBundle.h" #include "nsArrayEnumerator.h" -@@ -51,16 +52,17 @@ +@@ -19,16 +20,17 @@ #include "nsNetUtil.h" #include "nsReadableUtils.h" #include "mozcontainer.h" @@ -3310,7 +3281,7 @@ using namespace mozilla; #define MAX_PREVIEW_SIZE 180 -@@ -285,17 +287,19 @@ nsFilePicker::AppendFilters(PRInt32 aFil +@@ -253,17 +255,19 @@ nsFilePicker::AppendFilters(PRInt32 aFil return nsBaseFilePicker::AppendFilters(aFilterMask); } @@ -3331,7 +3302,7 @@ mFilters.AppendElement(filter); mFilterNames.AppendElement(name); -@@ -390,16 +394,19 @@ nsFilePicker::GetFiles(nsISimpleEnumerat +@@ -358,16 +362,19 @@ nsFilePicker::GetFiles(nsISimpleEnumerat return NS_ERROR_FAILURE; } @@ -3351,7 +3322,7 @@ GtkFileChooserAction action = GetGtkFileChooserAction(mMode); const gchar *accept_button = (action == GTK_FILE_CHOOSER_ACTION_SAVE) ? GTK_STOCK_SAVE : GTK_STOCK_OPEN; -@@ -538,8 +545,234 @@ nsFilePicker::Show(PRInt16 *aReturn) +@@ -506,8 +513,234 @@ nsFilePicker::Show(PRInt16 *aReturn) *aReturn = nsIFilePicker::returnCancel; break; } @@ -3589,7 +3560,7 @@ diff --git a/widget/gtk2/nsFilePicker.h b/widget/gtk2/nsFilePicker.h --- a/widget/gtk2/nsFilePicker.h +++ b/widget/gtk2/nsFilePicker.h -@@ -89,11 +89,17 @@ protected: +@@ -57,11 +57,17 @@ protected: nsString mDefault; nsString mDefaultExtension; @@ -3610,7 +3581,7 @@ diff --git a/xpcom/components/Makefile.in b/xpcom/components/Makefile.in --- a/xpcom/components/Makefile.in +++ b/xpcom/components/Makefile.in -@@ -91,10 +91,11 @@ LOCAL_INCLUDES = \ +@@ -59,10 +59,11 @@ LOCAL_INCLUDES = \ # we don't want the shared lib, but we want to force the creation of a static lib. FORCE_STATIC_LIB = 1 @@ -3625,7 +3596,7 @@ diff --git a/xpcom/components/ManifestParser.cpp b/xpcom/components/ManifestParser.cpp --- a/xpcom/components/ManifestParser.cpp +++ b/xpcom/components/ManifestParser.cpp -@@ -63,16 +63,17 @@ +@@ -30,16 +30,17 @@ #include "nsTextFormatter.h" #include "nsVersionComparator.h" #include "nsXPCOMCIDInternal.h" @@ -3643,7 +3614,7 @@ const char* directive; int argc; -@@ -430,16 +431,17 @@ ParseManifest(NSLocationType type, FileL +@@ -397,16 +398,17 @@ ParseManifest(NSLocationType type, FileL NS_NAMED_LITERAL_STRING(kPlatform, "platform"); NS_NAMED_LITERAL_STRING(kContentAccessible, "contentaccessible"); NS_NAMED_LITERAL_STRING(kApplication, "application"); @@ -3661,7 +3632,7 @@ NS_NAMED_LITERAL_STRING(kXPCNativeWrappers, "xpcnativewrappers"); nsAutoString appID; -@@ -477,41 +479,46 @@ ParseManifest(NSLocationType type, FileL +@@ -444,41 +446,46 @@ ParseManifest(NSLocationType type, FileL CopyUTF8toUTF16(s, abi); abi.Insert(PRUnichar('_'), 0); abi.Insert(osTarget, 0); @@ -3708,7 +3679,7 @@ char *token; char *newline = buf; -@@ -593,24 +600,26 @@ ParseManifest(NSLocationType type, FileL +@@ -560,24 +567,26 @@ ParseManifest(NSLocationType type, FileL TriState stOsVersion = eUnspecified; TriState stOs = eUnspecified; TriState stABI = eUnspecified; @@ -3735,7 +3706,7 @@ #if defined(MOZ_WIDGET_ANDROID) bool tablet = false; if (CheckFlag(kTablet, wtoken, tablet)) { -@@ -639,16 +648,17 @@ ParseManifest(NSLocationType type, FileL +@@ -606,16 +615,17 @@ ParseManifest(NSLocationType type, FileL } if (!ok || @@ -3756,7 +3727,7 @@ diff --git a/xpcom/io/Makefile.in b/xpcom/io/Makefile.in --- a/xpcom/io/Makefile.in +++ b/xpcom/io/Makefile.in -@@ -189,17 +189,17 @@ include $(topsrcdir)/ipc/chromium/chromi +@@ -157,17 +157,17 @@ include $(topsrcdir)/ipc/chromium/chromi DEFINES += -D_IMPL_NS_COM ifeq ($(OS_ARCH),Linux) @@ -3778,7 +3749,7 @@ diff --git a/xpcom/io/nsLocalFileUnix.cpp b/xpcom/io/nsLocalFileUnix.cpp --- a/xpcom/io/nsLocalFileUnix.cpp +++ b/xpcom/io/nsLocalFileUnix.cpp -@@ -90,16 +90,17 @@ +@@ -48,16 +48,17 @@ #include "prproces.h" #include "nsIDirectoryEnumerator.h" #include "nsISimpleEnumerator.h" @@ -3796,7 +3767,7 @@ #include "prmem.h" #include "plbase64.h" -@@ -1798,44 +1799,51 @@ nsLocalFile::SetPersistentDescriptor(con +@@ -1763,44 +1764,51 @@ nsLocalFile::SetPersistentDescriptor(con return InitWithNativePath(aPersistentDescriptor); #endif } @@ -3862,7 +3833,7 @@ return rv; } return NS_ERROR_FAILURE; -@@ -1861,16 +1869,23 @@ nsLocalFile::Launch() +@@ -1826,16 +1834,23 @@ nsLocalFile::Launch() if (nsnull == connection) return NS_ERROR_FAILURE; ++++++ mozilla-ppc.patch ++++++ # HG changeset patch # Parent 0f6722dd9d75458124795d22e9240887c9b4aeca # User Wolfgang Rosenauer <wr@rosenauer.org> Bug 746112 - RegExp hang on ppc64 in execute. Bug 750620 - Make double-conversion portable to exotic architectures. TM: mozilla15 diff --git a/js/src/yarr/YarrInterpreter.h b/js/src/yarr/YarrInterpreter.h --- a/js/src/yarr/YarrInterpreter.h +++ b/js/src/yarr/YarrInterpreter.h @@ -162,17 +162,17 @@ struct ByteTerm { , m_invert(invert) { atom.characterClass = characterClass; atom.quantityType = QuantifierFixedCount; atom.quantityCount = 1; inputPosition = inputPos; } - ByteTerm(Type type, unsigned subpatternId, ByteDisjunction* parenthesesInfo, bool capture, int inputPos) + ByteTerm(Type type, unsigned subpatternId, ByteDisjunction* parenthesesInfo, bool capture, int inputPos) __attribute__((noinline)) : type(type) , m_capture(capture) , m_invert(false) { atom.subpatternId = subpatternId; atom.parenthesesDisjunction = parenthesesInfo; atom.quantityType = QuantifierFixedCount; atom.quantityCount = 1; @@ -183,17 +183,17 @@ struct ByteTerm { : type(type) , m_capture(false) , m_invert(invert) { atom.quantityType = QuantifierFixedCount; atom.quantityCount = 1; } - ByteTerm(Type type, unsigned subpatternId, bool capture, bool invert, int inputPos) + ByteTerm(Type type, unsigned subpatternId, bool capture, bool invert, int inputPos) __attribute__((noinline)) : type(type) , m_capture(capture) , m_invert(invert) { atom.subpatternId = subpatternId; atom.quantityType = QuantifierFixedCount; atom.quantityCount = 1; inputPosition = inputPos; diff --git a/js/src/yarr/YarrPattern.h b/js/src/yarr/YarrPattern.h --- a/js/src/yarr/YarrPattern.h +++ b/js/src/yarr/YarrPattern.h @@ -166,17 +166,17 @@ struct PatternTerm { , m_capture(false) , m_invert(invert) { characterClass = charClass; quantityType = QuantifierFixedCount; quantityCount = 1; } - PatternTerm(Type type, unsigned subpatternId, PatternDisjunction* disjunction, bool capture = false, bool invert = false) + PatternTerm(Type type, unsigned subpatternId, PatternDisjunction* disjunction, bool capture = false, bool invert = false) __attribute__((noinline)) : type(type) , m_capture(capture) , m_invert(invert) { parentheses.disjunction = disjunction; parentheses.subpatternId = subpatternId; parentheses.isCopy = false; parentheses.isTerminal = false; diff --git a/memory/jemalloc/jemalloc.c b/memory/jemalloc/jemalloc.c --- a/memory/jemalloc/jemalloc.c +++ b/memory/jemalloc/jemalloc.c @@ -1086,17 +1086,19 @@ struct arena_s { static unsigned ncpus; #endif /* * When MALLOC_STATIC_SIZES is defined most of the parameters * controlling the malloc behavior are defined as compile-time constants * for best performance and cannot be altered at runtime. */ +#if !(defined(__powerpc__)) #define MALLOC_STATIC_SIZES 1 +#endif #ifdef MALLOC_STATIC_SIZES /* * VM page size. It must divide the runtime CPU page size or the code * will abort. */ #define pagesize_2pow ((size_t) 12) diff --git a/mfbt/double-conversion/utils.h b/mfbt/double-conversion/utils.h --- a/mfbt/double-conversion/utils.h +++ b/mfbt/double-conversion/utils.h @@ -50,17 +50,17 @@ // the result is equal to 89255e-22. // The best way to test this, is to create a division-function and to compare // the output of the division with the expected result. (Inlining must be // disabled.) // On Linux,x86 89255e-22 != Div_double(89255.0/1e22) #if defined(_M_X64) || defined(__x86_64__) || \ defined(__ARMEL__) || defined(__avr32__) || \ defined(__hppa__) || defined(__ia64__) || \ - defined(__mips__) || defined(__powerpc__) || \ + defined(__mips__) || defined(__powerpc__) || defined(__powerpc64__) || \ defined(__sparc__) || defined(__sparc) || defined(__s390__) || \ defined(__SH4__) || defined(__alpha__) || \ defined(_MIPS_ARCH_MIPS32R2) #define DOUBLE_CONVERSION_CORRECT_DOUBLE_OPERATIONS 1 #elif defined(_M_IX86) || defined(__i386__) || defined(__i386) #if defined(_WIN32) // Windows uses a 64bit wide floating point stack. #define DOUBLE_CONVERSION_CORRECT_DOUBLE_OPERATIONS 1 ++++++ mozilla-shared-nss-db.patch ++++++ --- /var/tmp/diff_new_pack.iw95y4/_old 2012-08-31 09:46:00.000000000 +0200 +++ /var/tmp/diff_new_pack.iw95y4/_new 2012-08-31 09:46:00.000000000 +0200 @@ -7,7 +7,7 @@ diff --git a/config/autoconf.mk.in b/config/autoconf.mk.in --- a/config/autoconf.mk.in +++ b/config/autoconf.mk.in -@@ -590,16 +590,20 @@ MOZ_ENABLE_LIBNOTIFY = @MOZ_ENABLE_LIBNO +@@ -573,16 +573,20 @@ MOZ_ENABLE_LIBNOTIFY = @MOZ_ENABLE_LIBNO MOZ_ALSA_LIBS = @MOZ_ALSA_LIBS@ MOZ_ALSA_CFLAGS = @MOZ_ALSA_CFLAGS@ @@ -31,7 +31,7 @@ diff --git a/configure.in b/configure.in --- a/configure.in +++ b/configure.in -@@ -8180,16 +8180,31 @@ AC_SUBST(QCMS_LIBS) +@@ -8270,16 +8270,31 @@ AC_SUBST(QCMS_LIBS) dnl ======================================================== dnl HarfBuzz @@ -66,7 +66,7 @@ diff --git a/security/manager/ssl/src/Makefile.in b/security/manager/ssl/src/Makefile.in --- a/security/manager/ssl/src/Makefile.in +++ b/security/manager/ssl/src/Makefile.in -@@ -119,12 +119,14 @@ EXTRA_DEPS = $(NSS_DEP_LIBS) +@@ -86,12 +86,14 @@ EXTRA_DEPS = $(NSS_DEP_LIBS) DEFINES += \ -DNSS_ENABLE_ECC \ -DDLL_PREFIX=\"$(DLL_PREFIX)\" \ @@ -85,14 +85,12 @@ diff --git a/security/manager/ssl/src/nsNSSComponent.cpp b/security/manager/ssl/src/nsNSSComponent.cpp --- a/security/manager/ssl/src/nsNSSComponent.cpp +++ b/security/manager/ssl/src/nsNSSComponent.cpp -@@ -39,16 +39,23 @@ - * use your version of this file under the terms of the MPL, indicate your - * decision by deleting the provisions above and replace them with the notice - * and other provisions required by the GPL or the LGPL. If you do not delete - * the provisions above, a recipient may use your version of this file under - * the terms of any one of the MPL, the GPL or the LGPL. +@@ -1,14 +1,21 @@ + /* -*- Mode: C++; tab-width: 2; indent-tabs-mode: nil; c-basic-offset: 2 -*- * - * ***** END LICENSE BLOCK ***** */ + * This Source Code Form is subject to the terms of the Mozilla Public + * License, v. 2.0. If a copy of the MPL was not distributed with this + * file, You can obtain one at http://mozilla.org/MPL/2.0/. */ +#ifdef MOZ_ENABLE_NSSHELPER +#pragma GCC visibility push(default) @@ -109,7 +107,7 @@ #include "nsNetUtil.h" #include "nsAppDirectoryServiceDefs.h" #include "nsDirectoryService.h" -@@ -1776,18 +1783,34 @@ nsNSSComponent::InitializeNSS(bool showW +@@ -1738,18 +1745,34 @@ nsNSSComponent::InitializeNSS(bool showW ConfigureInternalPKCS11Token(); // The NSS_INIT_NOROOTINIT flag turns off the loading of the root certs @@ -149,7 +147,7 @@ diff --git a/toolkit/library/Makefile.in b/toolkit/library/Makefile.in --- a/toolkit/library/Makefile.in +++ b/toolkit/library/Makefile.in -@@ -439,17 +439,17 @@ EXTRA_DSO_LDOPTS += -INCREMENTAL:NO +@@ -446,17 +446,17 @@ EXTRA_DSO_LDOPTS += -INCREMENTAL:NO endif endif endif ++++++ tb-develdirs.patch ++++++ --- /var/tmp/diff_new_pack.iw95y4/_old 2012-08-31 09:46:00.000000000 +0200 +++ /var/tmp/diff_new_pack.iw95y4/_new 2012-08-31 09:46:00.000000000 +0200 @@ -1,9 +1,9 @@ diff --git a/config/autoconf.mk.in b/config/autoconf.mk.in --- a/config/autoconf.mk.in +++ b/config/autoconf.mk.in -@@ -56,21 +56,21 @@ MOZ_APP_VERSION = @MOZ_APP_VERSION@ - MOZ_APP_MAXVERSION = @MOZ_APP_MAXVERSION@ - MOZ_MACBUNDLE_NAME= @MOZ_MACBUNDLE_NAME@ +@@ -25,21 +25,21 @@ MOZ_MACBUNDLE_NAME= @MOZ_MACBUNDLE_NAME@ + MAR_CHANNEL_ID = @MAR_CHANNEL_ID@ + ACCEPTED_MAR_CHANNEL_IDS = @ACCEPTED_MAR_CHANNEL_IDS@ MOZ_PKG_SPECIAL = @MOZ_PKG_SPECIAL@ ++++++ thunderbird-14.0-source.tar.bz2 -> thunderbird-15.0-source.tar.bz2 ++++++ /work/SRC/openSUSE:Factory/MozillaThunderbird/thunderbird-14.0-source.tar.bz2 /work/SRC/openSUSE:Factory/.MozillaThunderbird.new/thunderbird-15.0-source.tar.bz2 differ: char 11, line 1 -- To unsubscribe, e-mail: opensuse-commit+unsubscribe@opensuse.org For additional commands, e-mail: opensuse-commit+help@opensuse.org