Hello community, here is the log from the commit of package MozillaFirefox for openSUSE:Factory checked in at 2015-11-08 11:24:40 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ 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-10-24 10:24:06.000000000 +0200 +++ /work/SRC/openSUSE:Factory/.MozillaFirefox.new/MozillaFirefox.changes 2015-11-08 11:24:41.000000000 +0100 @@ -1,0 +2,62 @@ +Sat Oct 31 19:50:03 UTC 2015 - [email protected] + +- update to Firefox 42.0 (bnc#952810) + * Private Browsing with Tracking Protection blocks certain Web + elements that could be used to record your behavior across sites + * Control Center that contains site security and privacy controls + * Login Manager improvements + * WebRTC improvements + * Indicator added to tabs that play audio with one-click muting + * Media Source Extension for HTML5 video available for all sites + security fixes: + * MFSA 2015-116/CVE-2015-4513/CVE-2015-4514 + Miscellaneous memory safety hazards + * MFSA 2015-117/CVE-2015-4515 (bmo#1046421) + Information disclosure through NTLM authentication + * MFSA 2015-118/CVE-2015-4518 (bmo#1182778, bmo#1136692) + CSP bypass due to permissive Reader mode whitelist + * MFSA 2015-119/CVE-2015-7185 (bmo#1149000) (Android only) + Firefox for Android addressbar can be removed after fullscreen mode + * MFSA 2015-120/CVE-2015-7186 (bmo#1193027) (Android only) + Reading sensitive profile files through local HTML file on Android + * MFSA 2015-121/CVE-2015-7187 (bmo#1195735) + disabling scripts in Add-on SDK panels has no effect + * MFSA 2015-122/CVE-2015-7188 (bmo#1199430) + Trailing whitespace in IP address hostnames can bypass same-origin policy + * MFSA 2015-123/CVE-2015-7189 (bmo#1205900) + Buffer overflow during image interactions in canvas + * MFSA 2015-124/CVE-2015-7190 (bmo#1208520) (Android only) + Android intents can be used on Firefox for Android to open privileged files + * MFSA 2015-125/CVE-2015-7191 (bmo#1208956) (Android only) + XSS attack through intents on Firefox for Android + * MFSA 2015-126/CVE-2015-7192 (bmo#1210023) (OS X only) + Crash when accessing HTML tables with accessibility tools on OS X + * MFSA 2015-127/CVE-2015-7193 (bmo#1210302) + CORS preflight is bypassed when non-standard Content-Type headers + are received + * MFSA 2015-128/CVE-2015-7194 (bmo#1211262) + Memory corruption in libjar through zip files + * MFSA 2015-129/CVE-2015-7195 (bmo#1211871) + Certain escaped characters in host of Location-header are being + treated as non-escaped + * MFSA 2015-130/CVE-2015-7196 (bmo#1140616) + JavaScript garbage collection crash with Java applet + * MFSA 2015-131/CVE-2015-7198/CVE-2015-7199/CVE-2015-7200 + (bmo#1188010, bmo#1204061, bmo#1204155) + Vulnerabilities found through code inspection + * MFSA 2015-132/CVE-2015-7197 (bmo#1204269) + Mixed content WebSocket policy bypass through workers + * MFSA 2015-133/CVE-2015-7181/CVE-2015-7182/CVE-2015-7183 + (bmo#1202868, bmo#1205157) + NSS and NSPR memory corruption issues + (fixed in mozilla-nspr and mozilla-nss packages) +- requires NSPR >= 4.10.10 and NSS >= 3.19.4 +- removed obsolete patches + * mozilla-arm-disable-edsp.patch + * mozilla-icu-strncat.patch + * mozilla-skia-be-le.patch + * toolkit-download-folder.patch +- fixed build with enable-libproxy (bmo#1220399) + * mozilla-libproxy.patch + +------------------------------------------------------------------- Old: ---- firefox-41.0.2-source.tar.xz l10n-41.0.2.tar.xz mozilla-arm-disable-edsp.patch mozilla-icu-strncat.patch mozilla-skia-be-le.patch toolkit-download-folder.patch New: ---- firefox-42.0-source.tar.xz l10n-42.0.tar.xz mozilla-libproxy.patch ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ MozillaFirefox.spec ++++++ --- /var/tmp/diff_new_pack.dX8VNr/_old 2015-11-08 11:24:57.000000000 +0100 +++ /var/tmp/diff_new_pack.dX8VNr/_new 2015-11-08 11:24:57.000000000 +0100 @@ -18,10 +18,10 @@ # changed with every update -%define major 41 -%define mainver %major.0.2 +%define major 42 +%define mainver %major.0 %define update_channel release -%define releasedate 2015101500 +%define releasedate 2015103000 # general build definitions %if "%{update_channel}" != "aurora" @@ -76,8 +76,8 @@ BuildRequires: libnotify-devel BuildRequires: libproxy-devel BuildRequires: makeinfo -BuildRequires: mozilla-nspr-devel >= 4.10.8 -BuildRequires: mozilla-nss-devel >= 3.19.2 +BuildRequires: mozilla-nspr-devel >= 4.10.10 +BuildRequires: mozilla-nss-devel >= 3.19.4 BuildRequires: nss-shared-helper-devel BuildRequires: python-devel BuildRequires: startup-notification-devel @@ -137,20 +137,17 @@ Source15: firefox-appdata.xml Source16: MozillaFirefox.changes # Gecko/Toolkit -Patch1: toolkit-download-folder.patch -Patch2: mozilla-nongnome-proxies.patch -Patch4: mozilla-shared-nss-db.patch -Patch5: mozilla-kde.patch -Patch6: mozilla-preferences.patch -Patch7: mozilla-language.patch -Patch8: mozilla-ntlm-full-path.patch -Patch9: mozilla-repo.patch -Patch10: mozilla-icu-strncat.patch -Patch11: mozilla-arm-disable-edsp.patch -Patch12: mozilla-openaes-decl.patch -Patch14: mozilla-skia-be-le.patch -Patch15: mozilla-bmo1005535.patch -Patch16: mozilla-no-stdcxx-check.patch +Patch1: mozilla-nongnome-proxies.patch +Patch2: mozilla-shared-nss-db.patch +Patch3: mozilla-kde.patch +Patch4: mozilla-preferences.patch +Patch5: mozilla-language.patch +Patch6: mozilla-ntlm-full-path.patch +Patch7: mozilla-repo.patch +Patch8: mozilla-openaes-decl.patch +Patch9: mozilla-bmo1005535.patch +Patch10: mozilla-no-stdcxx-check.patch +Patch11: mozilla-libproxy.patch # Firefox/browser Patch101: firefox-kde.patch Patch102: firefox-no-default-ualocale.patch @@ -252,18 +249,15 @@ cd $RPM_BUILD_DIR/mozilla %patch1 -p1 %patch2 -p1 +%patch3 -p1 %patch4 -p1 %patch5 -p1 %patch6 -p1 %patch7 -p1 %patch8 -p1 -%patch9 -p1 +#%patch9 -p1 %patch10 -p1 %patch11 -p1 -%patch12 -p1 -%patch14 -p1 -%patch15 -p1 -%patch16 -p1 # Firefox %patch101 -p1 %patch102 -p1 ++++++ compare-locales.tar.xz ++++++ ++++++ create-tar.sh ++++++ --- /var/tmp/diff_new_pack.dX8VNr/_old 2015-11-08 11:24:58.000000000 +0100 +++ /var/tmp/diff_new_pack.dX8VNr/_new 2015-11-08 11:24:58.000000000 +0100 @@ -2,8 +2,8 @@ CHANNEL="release" BRANCH="releases/mozilla-$CHANNEL" -RELEASE_TAG="FIREFOX_41_0_2_RELEASE" -VERSION="41.0.2" +RELEASE_TAG="FIREFOX_42_0_RELEASE" +VERSION="42.0" # mozilla if [ -d mozilla ]; then ++++++ firefox-41.0.2-source.tar.xz -> firefox-42.0-source.tar.xz ++++++ /work/SRC/openSUSE:Factory/MozillaFirefox/firefox-41.0.2-source.tar.xz /work/SRC/openSUSE:Factory/.MozillaFirefox.new/firefox-42.0-source.tar.xz differ: char 26, line 1 ++++++ firefox-kde.patch ++++++ --- /var/tmp/diff_new_pack.dX8VNr/_old 2015-11-08 11:24:58.000000000 +0100 +++ /var/tmp/diff_new_pack.dX8VNr/_new 2015-11-08 11:24:58.000000000 +0100 @@ -1,11 +1,11 @@ # HG changeset patch -# Parent 8d1e0e3997402b94742eded6477abed4b559f373 +# Parent 95b421ca30846be2b5d7230d72263e6dff042d0b diff --git a/browser/base/content/browser-kde.xul b/browser/base/content/browser-kde.xul new file mode 100644 --- /dev/null +++ b/browser/base/content/browser-kde.xul -@@ -0,0 +1,1264 @@ +@@ -0,0 +1,1234 @@ +#filter substitution +<?xml version="1.0"?> +# -*- Mode: HTML -*- @@ -66,6 +66,7 @@ + screenX="4" screenY="4" + fullscreenbutton="true" + sizemode="normal" ++ retargetdocumentfocus="urlbar" + persist="screenX screenY width height sizemode"> + +# All JS files which are not content (only) dependent that browser.xul @@ -153,7 +154,14 @@ + <panel type="autocomplete" id="PopupSearchAutoComplete" noautofocus="true" hidden="true"/> + + <!-- for url bar autocomplete --> -+ <panel type="autocomplete-richlistbox" id="PopupAutoCompleteRichResult" noautofocus="true" hidden="true"/> ++ <panel type="autocomplete-richlistbox" id="PopupAutoCompleteRichResult" noautofocus="true" hidden="true"> ++#ifdef NIGHTLY_BUILD ++ <hbox id="urlbar-search-footer" flex="1" align="stretch" pack="end"> ++ <button id="urlbar-search-settings" label="&changeSearchSettings.button;" ++ oncommand="BrowserUITelemetry.countSearchSettingsEvent('urlbar'); openPreferences('paneSearch')"/> ++ </hbox> ++#endif ++ </panel> + + <!-- for select dropdowns. The menupopup is what shows the list of options, + and the popuponly menulist makes things like the menuactive attributes @@ -197,7 +205,7 @@ + </row> + <vbox id="editBookmarkPanelContent" flex="1" hidden="true"/> + <hbox id="editBookmarkPanelBottomButtons" pack="end"> -+#ifndef XP_UNIX ++#ifdef XP_UNIX + <button id="editBookmarkPanelDoneButton" + class="editBookmarkPanelBottomButton" + label="&editBookmark.done.label;" @@ -718,6 +726,7 @@ + autocompletesearchparam="enable-actions" + autocompletepopup="PopupAutoCompleteRichResult" + completeselectedindex="true" ++ shrinkdelay="250" + tabscrolling="true" + showcommentcolumn="true" + showimagecolumn="true" @@ -741,8 +750,6 @@ + <image id="webapps-notification-icon" class="notification-anchor-icon" role="button"/> + <image id="plugins-notification-icon" class="notification-anchor-icon" role="button"/> + <image id="web-notifications-notification-icon" class="notification-anchor-icon" role="button"/> -+ <image id="bad-content-blocked-notification-icon" class="notification-anchor-icon" role="button"/> -+ <image id="bad-content-unblocked-notification-icon" class="notification-anchor-icon" role="button"/> + <image id="webRTC-shareDevices-notification-icon" class="notification-anchor-icon" role="button"/> + <image id="webRTC-sharingDevices-notification-icon" class="notification-anchor-icon" role="button"/> + <image id="webRTC-shareMicrophone-notification-icon" class="notification-anchor-icon" role="button"/> @@ -764,10 +771,13 @@ + onclick="gIdentityHandler.handleIdentityButtonEvent(event);" + onkeypress="gIdentityHandler.handleIdentityButtonEvent(event);" + ondragstart="gIdentityHandler.onDragStart(event);"> -+ <image id="page-proxy-favicon" -+ consumeanchor="identity-box" -+ onclick="PageProxyClickHandler(event);" -+ pageproxystate="invalid"/> ++ <hbox id="identity-icons" ++ consumeanchor="identity-box"> ++ <image id="tracking-protection-icon"/> ++ <image id="page-proxy-favicon" ++ onclick="PageProxyClickHandler(event);" ++ pageproxystate="invalid"/> ++ </hbox> + <hbox id="identity-icon-labels"> + <label id="identity-icon-label" class="plain" flex="1"/> + <label id="identity-icon-country-label" class="plain"/> @@ -782,10 +792,6 @@ + hidden="true" + tooltiptext="&pageReportIcon.tooltip;" + onclick="gPopupBlockerObserver.onReportButtonClick(event);"/> -+ <image id="readinglist-addremove-button" -+ class="urlbar-icon" -+ hidden="true" -+ onclick="ReadingListUI.buttonClick(event);"/> + <image id="reader-mode-button" + class="urlbar-icon" + hidden="true" @@ -916,22 +922,6 @@ + new PlacesMenu(event, 'place:folder=UNFILED_BOOKMARKS', + PlacesUIUtils.getViewForNode(this.parentNode.parentNode).options);"/> + </menu> -+ <menuseparator> -+ <observes element="readingListSidebar" attribute="hidden"/> -+ </menuseparator> -+ <menu id="BMB_readingList" -+ class="menu-iconic bookmark-item subviewbutton" -+ label="&readingList.label;" -+ container="true"> -+ <observes element="readingListSidebar" attribute="hidden"/> -+ <menupopup id="BMB_readingListPopup" -+ placespopup="true" -+ onpopupshowing="ReadingListUI.onReadingListPopupShowing(this);"> -+ <menuitem id="BMB_viewReadingListSidebar" class="subviewbutton" -+ oncommand="SidebarUI.show('readingListSidebar');" -+ label="&readingList.showSidebar.label;"/> -+ </menupopup> -+ </menu> + <menuseparator/> + <!-- Bookmarks menu items will go here --> + <menuitem id="BMB_bookmarksShowAll" @@ -978,7 +968,7 @@ + class="chromeclass-toolbar-additional" + removable="false"> + <toolbarbutton id="PanelUI-menu-button" -+ class="toolbarbutton-1" ++ class="toolbarbutton-1 badged-button" + consumeanchor="PanelUI-button" + label="&brandShortName;" + tooltiptext="&appmenu.tooltip;"/> @@ -1196,26 +1186,6 @@ + <vbox id="full-screen-warning-message" align="center"> + <description id="full-screen-domain-text"/> + <description class="full-screen-description" value="&fullscreenExitHint2.value;"/> -+ <vbox id="full-screen-approval-pane" align="center"> -+ <hbox> -+#ifdef XP_UNIX -+ <button label="&fullscreenExitButton.label;" -+ oncommand="FullScreen.setFullscreenAllowed(false);" -+ class="full-screen-approval-button"/> -+ <button label="&fullscreenAllowButton.label;" -+ oncommand="FullScreen.setFullscreenAllowed(true);" -+ class="full-screen-approval-button"/> -+#else -+ <button label="&fullscreenAllowButton.label;" -+ oncommand="FullScreen.setFullscreenAllowed(true);" -+ class="full-screen-approval-button"/> -+ <button label="&fullscreenExitButton.label;" -+ oncommand="FullScreen.setFullscreenAllowed(false);" -+ class="full-screen-approval-button"/> -+#endif -+ </hbox> -+ <checkbox id="full-screen-remember-decision"/> -+ </vbox> + </vbox> + </hbox> + </hbox> @@ -1270,47 +1240,6 @@ +</deck> + +</window> -diff --git a/browser/base/content/browser.xul b/browser/base/content/browser.xul ---- a/browser/base/content/browser.xul -+++ b/browser/base/content/browser.xul -@@ -184,17 +184,17 @@ - class="editBookmarkPanelHeaderButton" - oncommand="StarUI.removeBookmarkButtonCommand();" - accesskey="&editBookmark.removeBookmark.accessKey;"/> - </hbox> - </vbox> - </row> - <vbox id="editBookmarkPanelContent" flex="1" hidden="true"/> - <hbox id="editBookmarkPanelBottomButtons" pack="end"> --#ifndef XP_UNIX -+#ifdef XP_UNIX - <button id="editBookmarkPanelDoneButton" - class="editBookmarkPanelBottomButton" - label="&editBookmark.done.label;" - default="true" - oncommand="StarUI.panel.hidePopup();"/> - <button id="editBookmarkPanelDeleteButton" - class="editBookmarkPanelBottomButton" - label="&editBookmark.cancel.label;" -@@ -1185,17 +1185,17 @@ - - <hbox id="full-screen-warning-container" hidden="true" fadeout="true"> - <hbox style="width: 100%;" pack="center"> <!-- Inner hbox needed due to bug 579776. --> - <vbox id="full-screen-warning-message" align="center"> - <description id="full-screen-domain-text"/> - <description class="full-screen-description" value="&fullscreenExitHint2.value;"/> - <vbox id="full-screen-approval-pane" align="center"> - <hbox> --#ifdef XP_UNIX -+#ifndef XP_UNIX - <button label="&fullscreenExitButton.label;" - oncommand="FullScreen.setFullscreenAllowed(false);" - class="full-screen-approval-button"/> - <button label="&fullscreenAllowButton.label;" - oncommand="FullScreen.setFullscreenAllowed(true);" - class="full-screen-approval-button"/> - #else - <button label="&fullscreenAllowButton.label;" diff --git a/browser/base/jar.mn b/browser/base/jar.mn --- a/browser/base/jar.mn +++ b/browser/base/jar.mn @@ -1351,11 +1280,11 @@ #if defined(XP_WIN) #include "nsIEHistoryEnumerator.h" + #include "nsEdgeReadingListExtractor.h" #endif #include "rdf.h" - #include "nsFeedSniffer.h" -@@ -31,18 +31,16 @@ using namespace mozilla::browser; +@@ -32,18 +32,16 @@ using namespace mozilla::browser; ///////////////////////////////////////////////////////////////////////////// @@ -1370,11 +1299,11 @@ #if defined(XP_WIN) NS_GENERIC_FACTORY_CONSTRUCTOR(nsIEHistoryEnumerator) + NS_GENERIC_FACTORY_CONSTRUCTOR(nsEdgeReadingListExtractor) #endif NS_GENERIC_FACTORY_CONSTRUCTOR(nsFeedSniffer) - -@@ -60,17 +58,17 @@ NS_DEFINE_NAMED_CID(NS_WINIEHISTORYENUME +@@ -63,17 +61,17 @@ NS_DEFINE_NAMED_CID(NS_EDGEREADINGLISTEX NS_DEFINE_NAMED_CID(NS_SHELLSERVICE_CID); #endif @@ -1390,26 +1319,26 @@ { &kNS_BROWSER_ABOUT_REDIRECTOR_CID, false, nullptr, AboutRedirector::Create }, #if defined(XP_WIN) { &kNS_WINIEHISTORYENUMERATOR_CID, false, nullptr, nsIEHistoryEnumeratorConstructor }, + { &kNS_EDGEREADINGLISTEXTRACTOR_CID, false, nullptr, nsEdgeReadingListExtractorConstructor }, #elif defined(XP_MACOSX) { &kNS_SHELLSERVICE_CID, false, nullptr, nsMacShellServiceConstructor }, - #endif -diff --git a/browser/components/preferences/main.js b/browser/components/preferences/main.js ---- a/browser/components/preferences/main.js -+++ b/browser/components/preferences/main.js -@@ -12,16 +12,22 @@ var gMainPane = { - - /** - * Initialization of this. - */ +diff --git a/browser/components/preferences/in-content/main.js b/browser/components/preferences/in-content/main.js +--- a/browser/components/preferences/in-content/main.js ++++ b/browser/components/preferences/in-content/main.js +@@ -14,16 +14,22 @@ var gMainPane = { init: function () { - this._pane = document.getElementById("paneMain"); + function setEventListener(aId, aEventType, aCallback) + { + document.getElementById(aId) + .addEventListener(aEventType, aCallback.bind(gMainPane)); + } + var env = Components.classes["@mozilla.org/process/environment;1"] -+ .getService(Components.interfaces.nsIEnvironment); ++ .getService(Components.interfaces.nsIEnvironment); + var kde_session = 0; + if (env.get('KDE_FULL_SESSION') == "true") -+ kde_session = 1; ++ kde_session = 1; + #ifdef HAVE_SHELL_SERVICE this.updateSetDefaultBrowser(); @@ -1419,7 +1348,7 @@ // when the user will select the default. We refresh here periodically // in case the default changes. On other Windows OS's defaults can also // be set while the prefs are open. -@@ -527,16 +533,27 @@ var gMainPane = { +@@ -709,16 +715,27 @@ var gMainPane = { */ setDefaultBrowser: function() { @@ -1430,17 +1359,17 @@ shellSvc.setDefaultBrowser(true, false); + if (kde_session == 1) { + var shellObj = Components.classes["@mozilla.org/file/local;1"] -+ .createInstance(Components.interfaces.nsILocalFile); ++ .createInstance(Components.interfaces.nsILocalFile); + shellObj.initWithPath("/usr/bin/kwriteconfig"); + var process = Components.classes["@mozilla.org/process/util;1"] -+ .createInstance(Components.interfaces.nsIProcess); ++ .createInstance(Components.interfaces.nsIProcess); + process.init(shellObj); + var args = ["--file", "kdeglobals", "--group", "General", "--key", + "BrowserApplication", "firefox"]; + process.run(false, args, args.length); + } } catch (ex) { - Components.utils.reportError(ex); + Cu.reportError(ex); return; } let selectedIndex = @@ -1887,7 +1816,7 @@ 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 -@@ -703,19 +703,21 @@ +@@ -709,19 +709,21 @@ @RESPATH@/defaults/autoconfig/prefcalls.js @RESPATH@/browser/defaults/profile/prefs.js ++++++ l10n-41.0.2.tar.xz -> l10n-42.0.tar.xz ++++++ /work/SRC/openSUSE:Factory/MozillaFirefox/l10n-41.0.2.tar.xz /work/SRC/openSUSE:Factory/.MozillaFirefox.new/l10n-42.0.tar.xz differ: char 26, line 1 ++++++ mozilla-kde.patch ++++++ --- /var/tmp/diff_new_pack.dX8VNr/_old 2015-11-08 11:24:58.000000000 +0100 +++ /var/tmp/diff_new_pack.dX8VNr/_new 2015-11-08 11:24:58.000000000 +0100 @@ -1,5 +1,5 @@ # HG changeset patch -# Parent 3f3d1e5db92a45cf3758ee5ba77c577fcfb364c9 +# Parent 21f164ba2522a31ab9cfb4766acff17526183f8e Description: Add KDE integration to Firefox (toolkit parts) Author: Wolfgang Rosenauer <[email protected]> Author: Lubos Lunak <[email protected]> @@ -28,7 +28,7 @@ diff --git a/modules/libpref/Preferences.cpp b/modules/libpref/Preferences.cpp --- a/modules/libpref/Preferences.cpp +++ b/modules/libpref/Preferences.cpp -@@ -27,16 +27,17 @@ +@@ -30,16 +30,17 @@ #include "nsIZipReader.h" #include "nsPrefBranch.h" #include "nsXPIDLString.h" @@ -46,7 +46,7 @@ #include "prefread.h" #include "prefapi_private_data.h" -@@ -1153,16 +1154,34 @@ pref_LoadPrefsInDir(nsIFile* aDir, char +@@ -1148,16 +1149,34 @@ pref_LoadPrefsInDir(nsIFile* aDir, char static nsresult pref_LoadPrefsInDirList(const char *listId) { @@ -81,7 +81,7 @@ return NS_OK; bool hasMore; -@@ -1178,17 +1197,17 @@ static nsresult pref_LoadPrefsInDirList( +@@ -1173,17 +1192,17 @@ static nsresult pref_LoadPrefsInDirList( nsAutoCString leaf; path->GetNativeLeafName(leaf); @@ -100,7 +100,7 @@ { nsZipItemPtr<char> manifest(jarReader, name, true); NS_ENSURE_TRUE(manifest.Buffer(), NS_ERROR_NOT_AVAILABLE); -@@ -1282,26 +1301,38 @@ static nsresult pref_InitInitialObjects( +@@ -1277,26 +1296,38 @@ 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) @@ -205,7 +205,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 -@@ -46,16 +46,20 @@ +@@ -51,16 +51,20 @@ #ifdef XP_WIN #include <shlobj.h> #include "nsWindowsHelpers.h" @@ -226,7 +226,7 @@ #include "AndroidBridge.h" #endif -@@ -2711,16 +2715,25 @@ nsDownload::SetState(DownloadState aStat +@@ -2714,16 +2718,25 @@ nsDownload::SetState(DownloadState aStat nsCOMPtr<nsIPrefBranch> pref(do_GetService(NS_PREFSERVICE_CONTRACTID)); // Master pref to control this function. @@ -252,7 +252,7 @@ int64_t goat = PR_Now() - mStartTime; showTaskbarAlert = goat > alertIntervalUSec; -@@ -2751,16 +2764,17 @@ nsDownload::SetState(DownloadState aStat +@@ -2754,16 +2767,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"), @@ -2183,9 +2183,9 @@ 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 -@@ -14,16 +14,17 @@ - #include "prenv.h" +@@ -15,16 +15,17 @@ #include "nsPrintfCString.h" + #include "nsNetCID.h" #include "nsNetUtil.h" #include "nsISupportsPrimitives.h" #include "nsIGSettingsService.h" @@ -2201,7 +2201,7 @@ nsUnixSystemProxySettings() : mSchemeProxySettings(4) -@@ -38,16 +39,17 @@ private: +@@ -39,16 +40,17 @@ private: nsCOMPtr<nsIGSettingsService> mGSettings; nsCOMPtr<nsIGSettingsCollection> mProxySettings; nsInterfaceHashtable<nsCStringHashKey, nsIGSettingsCollection> mSchemeProxySettings; @@ -2219,7 +2219,7 @@ nsUnixSystemProxySettings::GetMainThreadOnly(bool *aMainThreadOnly) { // dbus prevents us from being threadsafe, but this routine should not block anyhow -@@ -504,16 +506,19 @@ nsUnixSystemProxySettings::GetProxyFromG +@@ -505,16 +507,19 @@ nsUnixSystemProxySettings::GetProxyFromG nsresult nsUnixSystemProxySettings::GetProxyForURI(const nsACString & aSpec, @@ -2239,7 +2239,7 @@ if (mGConf) return GetProxyFromGConf(aScheme, aHost, aPort, aResult); -@@ -539,8 +544,34 @@ static const mozilla::Module::ContractID +@@ -540,8 +545,34 @@ static const mozilla::Module::ContractID static const mozilla::Module kUnixProxyModule = { mozilla::Module::kVersion, @@ -2277,7 +2277,7 @@ diff --git a/toolkit/xre/moz.build b/toolkit/xre/moz.build --- a/toolkit/xre/moz.build +++ b/toolkit/xre/moz.build -@@ -43,17 +43,19 @@ elif CONFIG['MOZ_WIDGET_TOOLKIT'] == 'co +@@ -48,17 +48,19 @@ elif CONFIG['MOZ_WIDGET_TOOLKIT'] == 'ui elif CONFIG['MOZ_WIDGET_TOOLKIT'] == 'qt': EXPORTS += ['nsQAppInstance.h'] SOURCES += [ @@ -3606,7 +3606,7 @@ + desktop = NS_LITERAL_STRING("android"); #endif - if (XRE_GetProcessType() == GeckoProcessType_Content) { + if (XRE_IsContentProcess()) { process = kContent; } else { process = kMain; ++++++ mozilla-libproxy.patch ++++++ # HG changeset patch # User Wolfgang Rosenauer <[email protected]> # Parent 95b421ca30846be2b5d7230d72263e6dff042d0b Bug 1220399 - building with libproxy support fails diff --git a/toolkit/system/unixproxy/nsLibProxySettings.cpp b/toolkit/system/unixproxy/nsLibProxySettings.cpp --- a/toolkit/system/unixproxy/nsLibProxySettings.cpp +++ b/toolkit/system/unixproxy/nsLibProxySettings.cpp @@ -2,16 +2,17 @@ /* 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 "nsISystemProxySettings.h" #include "mozilla/ModuleUtils.h" #include "nsIServiceManager.h" #include "nsIURI.h" +#include "nsNetCID.h" #include "nsString.h" #include "nsCOMPtr.h" #include "nspr.h" extern "C" { #include <proxy.h> } ++++++ mozilla-shared-nss-db.patch ++++++ --- /var/tmp/diff_new_pack.dX8VNr/_old 2015-11-08 11:24:58.000000000 +0100 +++ /var/tmp/diff_new_pack.dX8VNr/_new 2015-11-08 11:24:58.000000000 +0100 @@ -7,13 +7,13 @@ diff --git a/configure.in b/configure.in --- a/configure.in +++ b/configure.in -@@ -8296,16 +8296,31 @@ if test "$MOZ_ENABLE_SKIA"; then - MOZ_ENABLE_SKIA_GPU=1 +@@ -8309,16 +8309,31 @@ if test "$MOZ_ENABLE_SKIA"; then AC_DEFINE(USE_SKIA_GPU) AC_SUBST(MOZ_ENABLE_SKIA_GPU) fi fi AC_SUBST(MOZ_ENABLE_SKIA) + AC_SUBST_LIST(SKIA_INCLUDES) dnl ======================================================== +dnl Check for nss-shared-helper @@ -122,7 +122,7 @@ diff --git a/toolkit/library/moz.build b/toolkit/library/moz.build --- a/toolkit/library/moz.build +++ b/toolkit/library/moz.build -@@ -203,16 +203,18 @@ if CONFIG['MOZ_B2G_CAMERA'] and CONFIG[' +@@ -205,16 +205,18 @@ if CONFIG['MOZ_B2G_CAMERA'] and CONFIG[' 'stagefright_omx', ] ++++++ source-stamp.txt ++++++ --- /var/tmp/diff_new_pack.dX8VNr/_old 2015-11-08 11:24:58.000000000 +0100 +++ /var/tmp/diff_new_pack.dX8VNr/_new 2015-11-08 11:24:58.000000000 +0100 @@ -1,2 +1,2 @@ -REV=8cb8515fc207 +REV=e2f9a0ed50bc REPO=http://hg.mozilla.org/releases/mozilla-release
