Hello community, here is the log from the commit of package MozillaFirefox for openSUSE:Factory checked in at 2015-02-27 11:07:00 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/MozillaFirefox (Old) and /work/SRC/openSUSE:Factory/.MozillaFirefox.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "MozillaFirefox" Changes: -------- --- /work/SRC/openSUSE:Factory/MozillaFirefox/MozillaFirefox.changes 2015-01-21 21:50:48.000000000 +0100 +++ /work/SRC/openSUSE:Factory/.MozillaFirefox.new/MozillaFirefox.changes 2015-02-27 11:07:02.000000000 +0100 @@ -1,0 +2,67 @@ +Fri Feb 20 22:53:39 UTC 2015 - [email protected] + +- update to Firefox 36.0 (bnc#917597) + * mozilla-xremote-client was removed + * added libclearkey.so media plugin + * Pinned tiles on the new tab page can be synced + * Support for the full HTTP/2 protocol. HTTP/2 enables a faster, + more scalable, and more responsive web. + * Locale added: Uzbek (uz) + security fixes: + * MFSA 2015-11/CVE-2015-0835/CVE-2015-0836 + Miscellaneous memory safety hazards + * MFSA 2015-12/CVE-2015-0833 (bmo#945192) + Invoking Mozilla updater will load locally stored DLL files + (Windows only) + * MFSA 2015-13/CVE-2015-0832 (bmo#1065909) + Appended period to hostnames can bypass HPKP and HSTS protections + * MFSA 2015-14/CVE-2015-0830 (bmo#1110488) + Malicious WebGL content crash when writing strings + * MFSA 2015-15/CVE-2015-0834 (bmo#1098314) + TLS TURN and STUN connections silently fail to simple TCP connections + * MFSA 2015-16/CVE-2015-0831 (bmo#1130514) + Use-after-free in IndexedDB + * MFSA 2015-17/CVE-2015-0829 (bmo#1128939) + Buffer overflow in libstagefright during MP4 video playback + * MFSA 2015-18/CVE-2015-0828 (bmo#1030667, bmo#988675) + Double-free when using non-default memory allocators with a + zero-length XHR + * MFSA 2015-19/CVE-2015-0827 (bmo#1117304) + Out-of-bounds read and write while rendering SVG content + * MFSA 2015-20/CVE-2015-0826 (bmo#1092363) + Buffer overflow during CSS restyling + * MFSA 2015-21/CVE-2015-0825 (bmo#1092370) + Buffer underflow during MP3 playback + * MFSA 2015-22/CVE-2015-0824 (bmo#1095925) + Crash using DrawTarget in Cairo graphics library + * MFSA 2015-23/CVE-2015-0823 (bmo#1098497) + Use-after-free in Developer Console date with OpenType Sanitiser + * MFSA 2015-24/CVE-2015-0822 (bmo#1110557) + Reading of local files through manipulation of form autocomplete + * MFSA 2015-25/CVE-2015-0821 (bmo#1111960) + Local files or privileged URLs in pages can be opened into new tabs + * MFSA 2015-26/CVE-2015-0819 (bmo#1079554) + UI Tour whitelisted sites in background tab can spoof foreground + tabs + * MFSA 2015-27CVE-2015-0820 (bmo#1125398) + Caja Compiler JavaScript sandbox bypass +- rebased patches +- requires NSS 3.17.4 + +------------------------------------------------------------------- +Sat Jan 31 18:37:38 UTC 2015 - [email protected] + +- update to Firefox 35.0.1 + * With the Enhanced Steam extension, Firefox could crash (bmo#1123732) + * Kerberos authentication did not work with alias (bmo#1108971) + * SVG / CSS animation had a regression causing rendering issues on + websites like openstreemap.org (bmo#1083079) + * On Godaddy webmail, Firefox could crash (bmo#1113121) + * document.baseURI did not get updated to document.location after + base tag was removed from DOM for site with a CSP (bmo#1121857) + * With a Right-to-left (RTL) version of Firefox, the text selection + could be broken (bmo#1104036) + * CSP had a change in behavior with regard to case sensitivity + resources loading (bmo#1122445) + +------------------------------------------------------------------- Old: ---- firefox-35.0-source.tar.xz l10n-35.0.tar.xz New: ---- firefox-36.0-source.tar.xz l10n-36.0.tar.xz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ MozillaFirefox.spec ++++++ --- /var/tmp/diff_new_pack.wTU6m6/_old 2015-02-27 11:07:15.000000000 +0100 +++ /var/tmp/diff_new_pack.wTU6m6/_new 2015-02-27 11:07:15.000000000 +0100 @@ -1,7 +1,7 @@ # # spec file for package MozillaFirefox # -# Copyright (c) 2015 SUSE LINUX Products GmbH, Nuernberg, Germany. +# Copyright (c) 2015 SUSE LINUX GmbH, Nuernberg, Germany. # 2006-2015 Wolfgang Rosenauer # # All modifications and additions to the file contributed by third parties @@ -18,10 +18,10 @@ # changed with every update -%define major 35 +%define major 36 %define mainver %major.0 %define update_channel release -%define releasedate 2015010900 +%define releasedate 2015022000 # general build definitions %if "%{update_channel}" != "aurora" @@ -77,7 +77,7 @@ BuildRequires: libproxy-devel BuildRequires: makeinfo BuildRequires: mozilla-nspr-devel >= 4.10.7 -BuildRequires: mozilla-nss-devel >= 3.17.2 +BuildRequires: mozilla-nss-devel >= 3.17.4 BuildRequires: nss-shared-helper-devel BuildRequires: python-devel BuildRequires: startup-notification-devel @@ -565,13 +565,13 @@ %{progdir}/defaults/ %{progdir}/dictionaries/ %{progdir}/webapprt/ +%{progdir}/gmp-clearkey/ %attr(755,root,root) %{progdir}/%{progname}.sh %{progdir}/firefox %{progdir}/firefox-bin %{progdir}/application.ini %{progdir}/dependentlibs.list %{progdir}/*.so -%{progdir}/mozilla-xremote-client %{progdir}/omni.ja %{progdir}/platform.ini %{progdir}/plugin-container ++++++ compare-locales.tar.xz ++++++ ++++++ create-tar.sh ++++++ --- /var/tmp/diff_new_pack.wTU6m6/_old 2015-02-27 11:07:15.000000000 +0100 +++ /var/tmp/diff_new_pack.wTU6m6/_new 2015-02-27 11:07:15.000000000 +0100 @@ -2,8 +2,8 @@ CHANNEL="release" BRANCH="releases/mozilla-$CHANNEL" -RELEASE_TAG="FIREFOX_35_0_RELEASE" -VERSION="35.0" +RELEASE_TAG="FIREFOX_36_0_RELEASE" +VERSION="36.0" # mozilla if [ -d mozilla ]; then ++++++ firefox-35.0-source.tar.xz -> firefox-36.0-source.tar.xz ++++++ /work/SRC/openSUSE:Factory/MozillaFirefox/firefox-35.0-source.tar.xz /work/SRC/openSUSE:Factory/.MozillaFirefox.new/firefox-36.0-source.tar.xz differ: char 26, line 1 ++++++ firefox-branded-icons.patch ++++++ --- /var/tmp/diff_new_pack.wTU6m6/_old 2015-02-27 11:07:15.000000000 +0100 +++ /var/tmp/diff_new_pack.wTU6m6/_new 2015-02-27 11:07:15.000000000 +0100 @@ -1,10 +1,10 @@ # HG changeset patch -# Parent 8f03aa18c51f9c014f32aba7750f6b7927f9256e +# Parent e0751ad74e835e80041a61ea00c2a63bf6fbe2de diff --git a/browser/app/Makefile.in b/browser/app/Makefile.in --- a/browser/app/Makefile.in +++ b/browser/app/Makefile.in -@@ -75,16 +75,21 @@ GARBAGE += $(addprefix $(FINAL_TARGET)/d +@@ -62,16 +62,21 @@ GARBAGE += $(addprefix $(FINAL_TARGET)/d endif ifdef MOZ_WIDGET_GTK @@ -20,12 +20,12 @@ +endif endif - libs:: $(srcdir)/profile/prefs.js - $(INSTALL) $(IFLAGS1) $^ $(FINAL_TARGET)/defaults/profile - ifndef LIBXUL_SDK # channel-prefs.js is handled separate from other prefs due to bug 756325 libs:: $(srcdir)/profile/channel-prefs.js + $(NSINSTALL) -D $(DIST)/bin/defaults/pref + $(call py_action,preprocessor,-Fsubstitution $(PREF_PPFLAGS) $(ACDEFINES) $^ -o $(DIST)/bin/defaults/pref/channel-prefs.js) + endif diff --git a/browser/branding/official/Makefile.in b/browser/branding/official/Makefile.in --- a/browser/branding/official/Makefile.in +++ b/browser/branding/official/Makefile.in @@ -54,25 +54,25 @@ diff --git a/browser/installer/package-manifest.in b/browser/installer/package-manifest.in --- a/browser/installer/package-manifest.in +++ b/browser/installer/package-manifest.in -@@ -623,18 +623,21 @@ - @BINPATH@/browser/extensions/{972ce4c6-7e08-4474-a285-3208198ce6fd}/install.rdf - @BINPATH@/browser/extensions/{972ce4c6-7e08-4474-a285-3208198ce6fd}/icon.png - @BINPATH@/chrome/toolkit@JAREXT@ - @BINPATH@/chrome/toolkit.manifest - @BINPATH@/chrome/recording.manifest - @BINPATH@/chrome/recording/* +@@ -654,18 +654,21 @@ + @RESPATH@/browser/extensions/{972ce4c6-7e08-4474-a285-3208198ce6fd}/install.rdf + @RESPATH@/browser/extensions/{972ce4c6-7e08-4474-a285-3208198ce6fd}/icon.png + @RESPATH@/chrome/toolkit@JAREXT@ + @RESPATH@/chrome/toolkit.manifest + @RESPATH@/chrome/recording.manifest + @RESPATH@/chrome/recording/* #ifdef MOZ_GTK - @BINPATH@/browser/chrome/icons/default/default16.png -+@BINPATH@/browser/chrome/icons/default/default22.png -+@BINPATH@/browser/chrome/icons/default/default24.png - @BINPATH@/browser/chrome/icons/default/default32.png - @BINPATH@/browser/chrome/icons/default/default48.png -+@BINPATH@/browser/chrome/icons/default/default256.png + @RESPATH@/browser/chrome/icons/default/default16.png ++@RESPATH@/browser/chrome/icons/default/default22.png ++@RESPATH@/browser/chrome/icons/default/default24.png + @RESPATH@/browser/chrome/icons/default/default32.png + @RESPATH@/browser/chrome/icons/default/default48.png ++@RESPATH@/browser/chrome/icons/default/default256.png #endif ; [Webide Files] - @BINPATH@/browser/chrome/webide@JAREXT@ - @BINPATH@/browser/chrome/webide.manifest - @BINPATH@/browser/@PREF_DIR@/webide-prefs.js + @RESPATH@/browser/chrome/webide@JAREXT@ + @RESPATH@/browser/chrome/webide.manifest + @RESPATH@/browser/@PREF_DIR@/webide-prefs.js ; shell icons ++++++ firefox-kde.patch ++++++ --- /var/tmp/diff_new_pack.wTU6m6/_old 2015-02-27 11:07:15.000000000 +0100 +++ /var/tmp/diff_new_pack.wTU6m6/_new 2015-02-27 11:07:15.000000000 +0100 @@ -1,5 +1,5 @@ # HG changeset patch -# Parent 6697591ddc0a1b18171c31a7bf18d99be9825aab +# Parent ae5fa7b97ee57df54434bebc6dbda400b7525340 diff --git a/browser/base/content/browser-kde.xul b/browser/base/content/browser-kde.xul new file mode 100644 @@ -257,13 +257,13 @@ + noautohide="true" + orient="vertical" + align="stretch"> -+ <label class="SearchHighlightTitle">One-Click Searches</label> -+ <description class="SearchHighlightText" flex="1">Search any of these sites instantly, without changing your default.</description> ++ <label class="SearchHighlightTitle">&SearchHighlight1.title;</label> ++ <description class="SearchHighlightText" flex="1">&SearchHighlight1.text;</description> + <hbox class="SearchHighlightFooter" align="center"> + <spacer class="dot filled"/> + <spacer class="dot"/> + <spacer flex="1"/> -+ <button label="Next"/> ++ <button label="&SearchHighlightNext;"/> + </hbox> + </panel> + <panel id="SearchHighlight2" @@ -274,20 +274,21 @@ + noautohide="true" + orient="vertical" + align="stretch"> -+ <label class="SearchHighlightTitle">Smart Suggestions</label> -+ <description class="SearchHighlightText" flex="1">Suggestions from your default search engine appear as you type.</description> ++ <label class="SearchHighlightTitle">&SearchHighlight2.title;</label> ++ <description class="SearchHighlightText" flex="1">&SearchHighlight2.text;</description> + <hbox class="SearchHighlightFooter" align="center"> + <spacer class="dot"/> + <spacer class="dot filled"/> + <spacer flex="1"/> -+ <button label="Thanks!"/> ++ <button label="&SearchHighlightClose;"/> + </hbox> + </panel> + -+ <panel id="abouthome-search-panel" orient="vertical" type="arrow" hidden="true"> ++ <panel id="abouthome-search-panel" orient="vertical" type="arrow" hidden="true" ++ onclick="this.hidePopup()"> + <hbox id="abouthome-search-panel-manage" + onclick="openPreferences('paneSearch')"> -+ <label>&cmd_engineManager.label;</label> ++ <label>&changeSearchSettings.button;</label> + </hbox> + </panel> + @@ -732,9 +733,9 @@ + fullscreentoolbar="true" mode="icons" customizable="true" + iconsize="small" +#ifdef MOZ_DEV_EDITION -+ defaultset="urlbar-container,search-container,developer-button,bookmarks-menu-button,downloads-button,home-button" ++ defaultset="urlbar-container,search-container,developer-button,bookmarks-menu-button,downloads-button,home-button,loop-button" +#else -+ defaultset="urlbar-container,search-container,bookmarks-menu-button,downloads-button,home-button" ++ defaultset="urlbar-container,search-container,bookmarks-menu-button,downloads-button,home-button,loop-button" +#endif + customizationtarget="nav-bar-customization-target" + overflowable="true" @@ -773,7 +774,6 @@ + enablehistory="true" + maxrows="6" + newlines="stripsurroundingwhitespace" -+ oninput="gBrowser.userTypedValue = this.value;" + ontextentered="this.handleCommand(param);" + ontextreverted="return this.handleRevert();" + pageproxystate="invalid" @@ -1336,11 +1336,11 @@ * content/browser/browser-tabPreviews.xml (content/browser-tabPreviews.xml) * content/browser/chatWindow.xul (content/chatWindow.xul) content/browser/content.js (content/content.js) + content/browser/content-UITour.js (content/content-UITour.js) content/browser/defaultthemes/1.footer.jpg (content/defaultthemes/1.footer.jpg) content/browser/defaultthemes/1.header.jpg (content/defaultthemes/1.header.jpg) content/browser/defaultthemes/1.icon.jpg (content/defaultthemes/1.icon.jpg) content/browser/defaultthemes/1.preview.jpg (content/defaultthemes/1.preview.jpg) - content/browser/defaultthemes/2.footer.jpg (content/defaultthemes/2.footer.jpg) diff --git a/browser/components/build/nsModule.cpp b/browser/components/build/nsModule.cpp --- a/browser/components/build/nsModule.cpp +++ b/browser/components/build/nsModule.cpp @@ -1895,25 +1895,25 @@ diff --git a/browser/installer/package-manifest.in b/browser/installer/package-manifest.in --- a/browser/installer/package-manifest.in +++ b/browser/installer/package-manifest.in -@@ -698,19 +698,21 @@ - @BINPATH@/defaults/autoconfig/prefcalls.js - @BINPATH@/browser/defaults/profile/prefs.js +@@ -689,19 +689,21 @@ + @RESPATH@/defaults/autoconfig/prefcalls.js + @RESPATH@/browser/defaults/profile/prefs.js #ifndef LIBXUL_SDK ; Warning: changing the path to channel-prefs.js can cause bugs (Bug 756325) ; Technically this is an app pref file, but we are keeping it in the original ; gre location for now. - @BINPATH@/defaults/pref/channel-prefs.js + @RESPATH@/defaults/pref/channel-prefs.js +@BINPATH@/defaults/pref/kde.js #else ; For Fx-on-xr, channel-prefs lives with the app preferences. (Bug 762588) - @BINPATH@/@PREF_DIR@/channel-prefs.js + @RESPATH@/@PREF_DIR@/channel-prefs.js +@BINPATH@/@PREF_DIR@/kde.js #endif ; Services (gre) prefs #ifdef MOZ_SERVICES_NOTIFICATIONS - @BINPATH@/defaults/pref/services-notifications.js + @RESPATH@/defaults/pref/services-notifications.js #endif #ifdef MOZ_SERVICES_SYNC - @BINPATH@/defaults/pref/services-sync.js + @RESPATH@/defaults/pref/services-sync.js ++++++ l10n-35.0.tar.xz -> l10n-36.0.tar.xz ++++++ /work/SRC/openSUSE:Factory/MozillaFirefox/l10n-35.0.tar.xz /work/SRC/openSUSE:Factory/.MozillaFirefox.new/l10n-36.0.tar.xz differ: char 26, line 1 ++++++ mozilla-kde.patch ++++++ --- /var/tmp/diff_new_pack.wTU6m6/_old 2015-02-27 11:07:15.000000000 +0100 +++ /var/tmp/diff_new_pack.wTU6m6/_new 2015-02-27 11:07:15.000000000 +0100 @@ -1,3 +1,5 @@ +# HG changeset patch +# Parent aba9432d1fd32a118ba24e92c6b6e99ddb0b9bdc Description: Add KDE integration to Firefox (toolkit parts) Author: Wolfgang Rosenauer <[email protected]> Author: Lubos Lunak <[email protected]> @@ -202,7 +204,7 @@ 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 -@@ -44,16 +44,20 @@ +@@ -46,16 +46,20 @@ #ifdef XP_WIN #include <shlobj.h> #include "nsWindowsHelpers.h" @@ -223,7 +225,7 @@ #include "AndroidBridge.h" using namespace mozilla::widget::android; #endif -@@ -2712,16 +2716,25 @@ nsDownload::SetState(DownloadState aStat +@@ -2717,16 +2721,25 @@ nsDownload::SetState(DownloadState aStat nsCOMPtr<nsIPrefBranch> pref(do_GetService(NS_PREFSERVICE_CONTRACTID)); // Master pref to control this function. @@ -249,7 +251,7 @@ int64_t goat = PR_Now() - mStartTime; showTaskbarAlert = goat > alertIntervalUSec; -@@ -2752,16 +2765,17 @@ nsDownload::SetState(DownloadState aStat +@@ -2757,16 +2770,17 @@ nsDownload::SetState(DownloadState aStat NS_LITERAL_STRING(DOWNLOAD_MANAGER_ALERT_ICON), title, message, !removeWhenDone, mPrivate ? NS_LITERAL_STRING("private") : NS_LITERAL_STRING("non-private"), @@ -270,7 +272,7 @@ diff --git a/toolkit/content/jar.mn b/toolkit/content/jar.mn --- a/toolkit/content/jar.mn +++ b/toolkit/content/jar.mn -@@ -55,29 +55,33 @@ toolkit.jar: +@@ -57,29 +57,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) @@ -768,7 +770,7 @@ new file mode 100644 --- /dev/null +++ b/toolkit/content/widgets/preferences-kde.xml -@@ -0,0 +1,1343 @@ +@@ -0,0 +1,1350 @@ +<?xml version="1.0"?> + +<!DOCTYPE bindings [ @@ -903,8 +905,12 @@ + // In non-instant apply mode, we must try and use the last saved state + // from any previous opens of a child dialog instead of the value from + // preferences, to pick up any edits a user may have made. ++ ++ var secMan = Components.classes["@mozilla.org/scriptsecuritymanager;1"] ++ .getService(Components.interfaces.nsIScriptSecurityManager); + if (this.preferences.type == "child" && -+ !this.instantApply && window.opener) { ++ !this.instantApply && window.opener && ++ secMan.isSystemPrincipal(window.opener.document.nodePrincipal)) { + var pdoc = window.opener.document; + + // Try to find a preference element for the same preference. @@ -1824,7 +1830,10 @@ + return false; + } + -+ if (this.type == "child" && window.opener) { ++ var secMan = Components.classes["@mozilla.org/scriptsecuritymanager;1"] ++ .getService(Components.interfaces.nsIScriptSecurityManager); ++ if (this.type == "child" && window.opener && ++ secMan.isSystemPrincipal(window.opener.document.nodePrincipal)) { + var psvc = Components.classes["@mozilla.org/preferences-service;1"] + .getService(Components.interfaces.nsIPrefBranch); + var instantApply = psvc.getBoolPref("browser.preferences.instantApply"); @@ -2650,11 +2659,11 @@ 'android/nsExternalSharingAppService.cpp', 'android/nsExternalURLHandlerService.cpp', 'android/nsMIMEInfoAndroid.cpp', -@@ -121,16 +123,17 @@ include('/ipc/chromium/chromium-config.m +@@ -123,16 +125,17 @@ include('/ipc/chromium/chromium-config.m + FINAL_LIBRARY = 'xul' LOCAL_INCLUDES += [ - '/content/base/src', '/dom/base', '/dom/ipc', '/netwerk/base/src', @@ -2895,8 +2904,8 @@ 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 -@@ -10,30 +10,33 @@ - #include <QString> +@@ -7,33 +7,36 @@ + #ifdef MOZ_WIDGET_QT #if (MOZ_ENABLE_CONTENTACTION) #include <contentaction/contentaction.h> #include "nsContentHandlerApp.h" @@ -2914,6 +2923,9 @@ #ifdef MOZ_ENABLE_DBUS #include "nsDBusHandlerApp.h" #endif + #ifdef MOZ_WIDGET_QT + #include "nsMIMEInfoQt.h" + #endif +#if defined(XP_UNIX) && !defined(XP_MACOSX) +#include "nsKDEUtils.h" +#endif @@ -2926,12 +2938,12 @@ #ifdef MOZ_WIDGET_QT if (NS_FAILED(rv)) { - nsAutoCString spec; - aURI->GetAsciiSpec(spec); - if (QDesktopServices::openUrl(QUrl(spec.get()))) { - rv = NS_OK; - } -@@ -50,24 +53,24 @@ nsMIMEInfoUnix::GetHasDefaultHandler(boo + rv = nsMIMEInfoQt::LoadUriInternal(aURI); + } + #endif + + return rv; +@@ -46,24 +49,24 @@ nsMIMEInfoUnix::GetHasDefaultHandler(boo // either /etc/mailcap or ${HOME}/.mailcap, in which case we don't want to // give the GNOME answer. if (mDefaultApplication) @@ -2959,7 +2971,7 @@ if (*_retval) return NS_OK; -@@ -102,16 +105,33 @@ nsMIMEInfoUnix::LaunchDefaultWithFile(ns +@@ -98,16 +101,33 @@ nsMIMEInfoUnix::LaunchDefaultWithFile(ns ContentAction::Action::defaultActionForFile(uri, QString(mSchemeOrType.get())); if (action.isValid()) { action.trigger(); @@ -2993,7 +3005,7 @@ nsCOMPtr<nsIIOService> ioservice = do_GetService(NS_IOSERVICE_CONTRACTID, &rv); NS_ENSURE_SUCCESS(rv, rv); nsCOMPtr<nsIURI> uri; -@@ -129,17 +149,17 @@ nsMIMEInfoUnix::LaunchDefaultWithFile(ns +@@ -125,17 +145,17 @@ nsMIMEInfoUnix::LaunchDefaultWithFile(ns /* Fallback to GnomeVFS */ nsCOMPtr<nsIGnomeVFSMimeApp> app; if (NS_SUCCEEDED(gnomevfs->GetAppForMimeType(mSchemeOrType, getter_AddRefs(app))) && app) @@ -3104,24 +3116,24 @@ diff --git a/widget/gtk/moz.build b/widget/gtk/moz.build --- a/widget/gtk/moz.build +++ b/widget/gtk/moz.build -@@ -81,16 +81,17 @@ include('/ipc/chromium/chromium-config.m +@@ -79,16 +79,17 @@ else: + include('/ipc/chromium/chromium-config.mozbuild') + FINAL_LIBRARY = 'xul' LOCAL_INCLUDES += [ - '../shared', - '../xpwidgets', '/layout/generic', '/layout/xul', '/other-licenses/atk-1.0', -+ '/toolkit/xre' ++ '/toolkit/xre', + '/widget', ] if CONFIG['MOZ_X11']: LOCAL_INCLUDES += [ - '../shared/x11', + '/widget/x11', ] - DEFINES['CAIRO_GFX'] = True diff --git a/widget/gtk/nsFilePicker.cpp b/widget/gtk/nsFilePicker.cpp --- a/widget/gtk/nsFilePicker.cpp +++ b/widget/gtk/nsFilePicker.cpp @@ -3626,7 +3638,7 @@ diff --git a/xpcom/io/nsLocalFileUnix.cpp b/xpcom/io/nsLocalFileUnix.cpp --- a/xpcom/io/nsLocalFileUnix.cpp +++ b/xpcom/io/nsLocalFileUnix.cpp -@@ -44,16 +44,17 @@ +@@ -45,16 +45,17 @@ #include "nsIDirectoryEnumerator.h" #include "nsISimpleEnumerator.h" #include "private/pprio.h" ++++++ mozilla-shared-nss-db.patch ++++++ --- /var/tmp/diff_new_pack.wTU6m6/_old 2015-02-27 11:07:15.000000000 +0100 +++ /var/tmp/diff_new_pack.wTU6m6/_new 2015-02-27 11:07:15.000000000 +0100 @@ -7,7 +7,7 @@ diff --git a/configure.in b/configure.in --- a/configure.in +++ b/configure.in -@@ -8302,16 +8302,31 @@ if test "$MOZ_ENABLE_SKIA"; then +@@ -8268,16 +8268,31 @@ if test "$MOZ_ENABLE_SKIA"; then MOZ_ENABLE_SKIA_GPU=1 AC_DEFINE(USE_SKIA_GPU) AC_SUBST(MOZ_ENABLE_SKIA_GPU) @@ -42,26 +42,26 @@ diff --git a/security/manager/ssl/src/moz.build b/security/manager/ssl/src/moz.build --- a/security/manager/ssl/src/moz.build +++ b/security/manager/ssl/src/moz.build -@@ -95,16 +95,19 @@ FAIL_ON_WARNINGS = True - - FINAL_LIBRARY = 'xul' +@@ -77,16 +77,19 @@ SOURCES += [ + 'nsNSSVersion.cpp', + 'PSMContentListener.cpp', + ] LOCAL_INCLUDES += [ - '../../../certverifier', - '../../../pkix/include', + '/security/manager/boot/src', ] +CXXFLAGS += sorted(CONFIG['NSSHELPER_CFLAGS']) +OS_LIBS += sorted(CONFIG['NSSHELPER_LIBS']) + - if CONFIG['NSS_DISABLE_DBM']: - DEFINES['NSS_DISABLE_DBM'] = '1' - - DEFINES['SSL_DISABLE_DEPRECATED_CIPHER_SUITE_NAMES'] = 'True' - DEFINES['NSS_ENABLE_ECC'] = 'True' - for var in ('DLL_PREFIX', 'DLL_SUFFIX'): - DEFINES[var] = '"%s"' % CONFIG[var] + if not CONFIG['MOZ_NO_SMART_CARDS']: + UNIFIED_SOURCES += [ + 'nsSmartCardMonitor.cpp', + ] + if CONFIG['MOZ_XUL']: + UNIFIED_SOURCES += [ + 'nsCertTree.cpp', 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 @@ -87,7 +87,7 @@ #include "nsCertVerificationThread.h" #include "nsAppDirectoryServiceDefs.h" #include "nsComponentManagerUtils.h" -@@ -945,17 +952,31 @@ nsNSSComponent::InitializeNSS() +@@ -986,17 +993,31 @@ nsNSSComponent::InitializeNSS() if (NS_FAILED(rv)) { nsPSMInitPanic::SetPanic(); return NS_ERROR_NOT_AVAILABLE; @@ -123,7 +123,7 @@ diff --git a/toolkit/library/moz.build b/toolkit/library/moz.build --- a/toolkit/library/moz.build +++ b/toolkit/library/moz.build -@@ -213,16 +213,18 @@ if CONFIG['MOZ_B2G_CAMERA']: +@@ -208,16 +208,18 @@ if CONFIG['MOZ_B2G_CAMERA']: 'stagefright_omx', ] ++++++ source-stamp.txt ++++++ --- /var/tmp/diff_new_pack.wTU6m6/_old 2015-02-27 11:07:15.000000000 +0100 +++ /var/tmp/diff_new_pack.wTU6m6/_new 2015-02-27 11:07:15.000000000 +0100 @@ -1,2 +1,2 @@ -REV=32e36869f84a +REV=59eefd8af5d7 REPO=http://hg.mozilla.org/releases/mozilla-release -- To unsubscribe, e-mail: [email protected] For additional commands, e-mail: [email protected]
