57.0b14
authorWolfgang Rosenauer <wr@rosenauer.org>
Sat, 04 Nov 2017 23:30:29 +0100
changeset 1005 6d716caa6abe
parent 1004 f98f2fd265af
child 1006 5ba9b67de554
57.0b14
rebased patches to apply cleanly
(left out mozilla-ucontext.patch and mozilla-language.patch for now)
MozillaFirefox/MozillaFirefox.changes
MozillaFirefox/MozillaFirefox.spec
MozillaFirefox/create-tar.sh
MozillaFirefox/l10n_changesets.txt
firefox-kde.patch
firefox-no-default-ualocale.patch
mozilla-kde.patch
series
--- a/MozillaFirefox/MozillaFirefox.changes	Sat Nov 04 20:25:02 2017 +0100
+++ b/MozillaFirefox/MozillaFirefox.changes	Sat Nov 04 23:30:29 2017 +0100
@@ -1,8 +1,9 @@
 -------------------------------------------------------------------
 Sat Nov  4 19:24:17 UTC 2017 - wr@rosenauer.org
 
-- update to Firefox 57.0b13
+- update to Firefox 57.0b14
 - requires NSPR 4.17, NSS 3.33 and rustc 1.19
+- rebased patches
 
 -------------------------------------------------------------------
 Sat Oct 28 06:30:37 UTC 2017 - wr@rosenauer.org
--- a/MozillaFirefox/MozillaFirefox.spec	Sat Nov 04 20:25:02 2017 +0100
+++ b/MozillaFirefox/MozillaFirefox.spec	Sat Nov 04 23:30:29 2017 +0100
@@ -22,7 +22,7 @@
 %define mainver %major.99
 %define update_channel beta
 %define branding 1
-%define releasedate 20171030163911
+%define releasedate 20171102181127
 
 # PIE, full relro (x86_64 for now)
 %define build_hardened 1
@@ -254,7 +254,7 @@
 cd $RPM_BUILD_DIR/mozilla
 %patch1 -p1
 %patch3 -p1
-%patch5 -p1
+#%patch5 -p1
 %patch6 -p1
 %patch7 -p1
 %patch8 -p1
@@ -262,7 +262,7 @@
 %patch9 -p1
 %endif
 %patch10 -p1
-%patch11 -p1
+#%patch11 -p1
 # Firefox
 %patch101 -p1
 %patch102 -p1
--- a/MozillaFirefox/create-tar.sh	Sat Nov 04 20:25:02 2017 +0100
+++ b/MozillaFirefox/create-tar.sh	Sat Nov 04 23:30:29 2017 +0100
@@ -7,7 +7,7 @@
 
 CHANNEL="beta"
 BRANCH="releases/mozilla-$CHANNEL"
-RELEASE_TAG="FIREFOX_57_0b13_RELEASE"
+RELEASE_TAG="FIREFOX_57_0b14_RELEASE"
 VERSION="56.99"
 
 # mozilla
--- a/MozillaFirefox/l10n_changesets.txt	Sat Nov 04 20:25:02 2017 +0100
+++ b/MozillaFirefox/l10n_changesets.txt	Sat Nov 04 23:30:29 2017 +0100
@@ -1,96 +1,96 @@
 ach 845e30d48dfc
 af fb2bb189a1a8
 an a6cb9e55ca54
-ar 8751628a4e2a
+ar b064d5ee568d
 as c8c7ce08a50d
 ast 7eb260478bd8
 az e53e6a85563a
-be abc4f7b027d0
-bg 42153fa28db7
-bn-BD 618ea3d19eec
+be 3ee97e7a07c4
+bg f5cbdea3b4bb
+bn-BD bd83d95fe12f
 bn-IN 101048b9a8bd
 br 1b53314687e2
-bs 09db60726d90
+bs b3e804dbc8e2
 ca ef0d1d4ef0de
-cak 0fb20d33961c
-cs 874422011781
-cy 0fc97d75e410
+cak a3648bb10a20
+cs 528911ffcb44
+cy 21e09e135ce7
 da 9c08e8177409
 de 3d02afaa90f1
-dsb 4e23f584ca17
-el fdf19cea5806
-en-GB 2e545cf002c7
+dsb 4f2a125adbc5
+el a925e0e24aaf
+en-GB 440d6fbf0938
 en-ZA 4bd5e2534230
-eo e0aae3b5888d
-es-AR 54ab5ffe4481
-es-CL 63f03fc50654
+eo 42248b1fda32
+es-AR 39d7f70fbd4a
+es-CL e0806844a966
 es-ES 385b05704e12
-es-MX d2af3b43124a
+es-MX 4322b61a47fd
 et fc5042e8d705
 eu 1010ee63a76a
 fa 988038c98e07
-ff a206043d6c09
-fi f329ad8ddd70
-fr 633f7c951396
-fy-NL 8334c2341110
+ff 0ae0e4ad0400
+fi 83ae1ba711f8
+fr 0acb9b019381
+fy-NL f66ad8f570c9
 ga-IE b6bd9e6bf934
-gd 2f44fb76137b
+gd 2b1b66f8236b
 gl bd2efa51e288
 gn ef1c4c22501c
-gu-IN 7bf58a4c1eec
+gu-IN 9b4d89d58ee1
 he 923c4ce99db2
-hi-IN 728de88353f2
+hi-IN 62f4cab806a5
 hr 26c2911d2b28
-hsb 9870e542b52f
-hu d933202fb960
+hsb 9a556a68f383
+hu 43fb04933e45
 hy-AM 6020222039ca
-id df76458d5889
+id bc055f358395
 is b265b8439970
-it f4872570a9b6
-ja 0729352399ba
-ja-JP-mac 788b3ad663ef
-ka 220d00be33a1
-kab 35725622b786
-kk a6136a555475
+it 72e0f73d8188
+ja 9e9796b48f28
+ja-JP-mac 2cbb5add9822
+ka 43d1466fc89b
+kab 8e739627fb01
+kk 51aee666e469
 km 79239374c86f
-kn b4f57ec740ce
+kn a6dd05b338cf
 ko 0fccbb892229
 lij d1d09ea09eff
-lt d1d7e5a41bd7
+lt 5f5779c69338
 lv f0fd0c3546e0
 mai 64d402c5dbc1
 mk b3fb89cac86c
 ml 9d626ede460e
-mr df4ee137aeed
-ms 7cd42ad75aab
+mr 1a23c6401834
+ms 15a3d7fccea1
 my 2e2cc78ff945
-nb-NO 3d9e549a7377
-nl ba07a69755d5
-nn-NO d5c0e1e0d51e
+nb-NO 467ca2ff0cd1
+nl 10957cbee7f0
+nn-NO 71fce03b2c6b
 or 8c482206a700
 pa-IN a2af69c875ad
-pl 3a84792cd4a9
-pt-BR abaf82feb0cd
-pt-PT 5729d6b88c60
+pl ce3a564b00c2
+pt-BR 71346ac29bfc
+pt-PT 387686b89f52
 rm de3c6abf95ab
-ro 2c71dc65aaca
-ru 9c3320764d7c
+ro 6e3dfa0ea030
+ru 760cda086381
 si 355b25c93905
-sk 4681d1a76647
-sl 6ea5be344dbb
+sk 5444e00cc3e6
+sl cb6eb7e6ba4a
 son e9a07815a9aa
 sq c61933c72577
-sr a369834f1f2f
-sv-SE 00caecc6c495
+sr 74f5c2f98346
+sv-SE f75dd8e9c4df
 ta ad1bce7770b4
 te dde86e2a2c17
 th 1950402ffa30
-tr 2d144754af6e
-uk 0d12ea210a8c
+tr e8700165617b
+uk e7b649fcf3bb
 ur 9881f47a738d
 uz 9ac534694f99
 vi 601e9a63473e
 xh 4d22de472867
-zh-CN 50181d22b5e9
-zh-TW 976dabba2975
+zh-CN 8aff87add86f
+zh-TW 2ac3b80bdb6e
 
--- a/firefox-kde.patch	Sat Nov 04 20:25:02 2017 +0100
+++ b/firefox-kde.patch	Sat Nov 04 23:30:29 2017 +0100
@@ -1,5 +1,5 @@
 # HG changeset patch
-# Parent  05209af7fdfec897f5f574c691184ba27049b0ff
+# Parent  c68a0b83e6eaebd87e9790659aef919e50b830c0
 
 diff --git a/browser/base/content/browser-kde.xul b/browser/base/content/browser-kde.xul
 new file mode 100644
@@ -1330,8 +1330,8 @@
 --- a/browser/base/jar.mn
 +++ b/browser/base/jar.mn
 @@ -58,16 +58,18 @@ browser.jar:
-         content/browser/aboutSocialError.xhtml        (content/aboutSocialError.xhtml)
-         content/browser/aboutProviderDirectory.xhtml  (content/aboutProviderDirectory.xhtml)
+         content/browser/aboutRobots-icon.png          (content/aboutRobots-icon.png)
+         content/browser/aboutRobots-widget-left.png   (content/aboutRobots-widget-left.png)
          content/browser/aboutTabCrashed.css           (content/aboutTabCrashed.css)
          content/browser/aboutTabCrashed.js            (content/aboutTabCrashed.js)
          content/browser/aboutTabCrashed.xhtml         (content/aboutTabCrashed.xhtml)
@@ -1346,8 +1346,8 @@
          content/browser/browser-customization.js      (content/browser-customization.js)
          content/browser/browser-data-submission-info-bar.js (content/browser-data-submission-info-bar.js)
          content/browser/browser-compacttheme.js       (content/browser-compacttheme.js)
-         content/browser/browser-feeds.js              (content/browser-feeds.js)
-         content/browser/browser-fullScreenAndPointerLock.js  (content/browser-fullScreenAndPointerLock.js)
+ #ifndef MOZILLA_OFFICIAL
+         content/browser/browser-development-helpers.js (content/browser-development-helpers.js)
 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
@@ -1370,7 +1370,7 @@
  
  #include "rdf.h"
  #include "nsFeedSniffer.h"
-@@ -31,18 +31,16 @@ using namespace mozilla::browser;
+@@ -32,18 +32,16 @@ using namespace mozilla::browser;
  
  /////////////////////////////////////////////////////////////////////////////
  
@@ -1389,9 +1389,9 @@
  
  NS_GENERIC_FACTORY_CONSTRUCTOR(nsFeedSniffer)
  
-@@ -60,17 +58,17 @@ NS_DEFINE_NAMED_CID(NS_WINIEHISTORYENUME
- NS_DEFINE_NAMED_CID(NS_SHELLSERVICE_CID);
- #endif
+@@ -64,17 +62,17 @@ NS_DEFINE_NAMED_CID(NS_SHELLSERVICE_CID)
+ NS_GENERIC_FACTORY_CONSTRUCTOR(nsSessionStoreUtils)
+ NS_DEFINE_NAMED_CID(NS_SESSIONSTOREUTILS_CID);
  
  static const mozilla::Module::CIDEntry kBrowserCIDs[] = {
      { &kNS_BROWSERDIRECTORYPROVIDER_CID, false, nullptr, DirectoryProviderConstructor },
@@ -1411,13 +1411,13 @@
 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
-@@ -41,16 +41,23 @@ var gMainPane = {
-         // way to get all file type association prefs. So we don't know
-         // 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.
-         window.setInterval(this.updateSetDefaultBrowser.bind(this), 1000);
-       }
+@@ -203,16 +203,23 @@ var gMainPane = {
+           this._backoffIndex++ : backoffTimes.length - 1]);
+       };
+ 
+       window.setTimeout(() => {
+         window.requestIdleCallback(pollForDefaultBrowser);
+       }, backoffTimes[this._backoffIndex]);
      }
  
 +    var env = Components.classes["@mozilla.org/process/environment;1"]
@@ -1427,17 +1427,17 @@
 +      kde_session = 1;
 +    }
 +
+     this.initBrowserContainers();
      this.buildContentProcessCountMenuList();
-     this.updateDefaultPerformanceSettingsPref();
  
-     let defaultPerformancePref =
-       document.getElementById("browser.preferences.defaultPerformanceSettings.enabled");
-     defaultPerformancePref.addEventListener("change", () => {
-       this.updatePerformanceSettingsBox({duringChangeEvent: true});
-     });
-@@ -875,16 +882,27 @@ var gMainPane = {
-       let alwaysCheckPref = document.getElementById("browser.shell.checkDefaultBrowser");
-       alwaysCheckPref.value = true;
+     let performanceSettingsLink = document.getElementById("performanceSettingsLearnMore");
+     let performanceSettingsUrl = Services.urlFormatter.formatURLPref("app.support.baseURL") + "performance";
+     performanceSettingsLink.setAttribute("href", performanceSettingsUrl);
+ 
+     this.updateDefaultPerformanceSettingsPref();
+@@ -952,16 +959,27 @@ var gMainPane = {
+       // Reset exponential backoff delay time in order to do visual update in pollForDefaultBrowser.
+       this._backoffIndex = 0;
  
        let shellSvc = getShellService();
        if (!shellSvc)
@@ -1466,7 +1466,7 @@
 diff --git a/browser/components/shell/moz.build b/browser/components/shell/moz.build
 --- a/browser/components/shell/moz.build
 +++ b/browser/components/shell/moz.build
-@@ -38,16 +38,18 @@ if CONFIG['OS_ARCH'] == 'WINNT':
+@@ -39,16 +39,18 @@ if CONFIG['OS_ARCH'] == 'WINNT':
      ]
  elif CONFIG['MOZ_WIDGET_TOOLKIT'] == 'cocoa':
      SOURCES += [
@@ -1778,7 +1778,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
-@@ -664,16 +664,18 @@
+@@ -666,16 +666,18 @@
  @RESPATH@/browser/defaults/blocklists
  @RESPATH@/browser/defaults/pinning
  
--- a/firefox-no-default-ualocale.patch	Sat Nov 04 20:25:02 2017 +0100
+++ b/firefox-no-default-ualocale.patch	Sat Nov 04 23:30:29 2017 +0100
@@ -1,18 +1,18 @@
 # HG changeset patch
 # User Wolfgang Rosenauer <wr@rosenauer.org>
 # Parent 099312626f5f7c9cb5573a61d0230574ee12a660
-# Parent  b692fb539e9d0641ff557cb4b984b5e211aec572
+# Parent  74161085d62009c0ddc2eb02d320ef7f10d4c1f1
 Do not overwrite the locale dynamic pref from xulrunner's all.js with a wrong default value
 
 diff --git a/browser/app/profile/firefox.js b/browser/app/profile/firefox.js
 --- a/browser/app/profile/firefox.js
 +++ b/browser/app/profile/firefox.js
-@@ -240,17 +240,17 @@ pref("browser.uitour.readerViewTrigger",
+@@ -219,17 +219,17 @@ pref("browser.uitour.requireSecure", tru
+ pref("browser.uitour.themeOrigin", "https://addons.mozilla.org/%LOCALE%/firefox/themes/");
+ pref("browser.uitour.url", "https://www.mozilla.org/%LOCALE%/firefox/%VERSION%/tour/");
+ // How long to show a Hearbeat survey (two hours, in seconds)
  pref("browser.uitour.surveyDuration", 7200);
  
- pref("browser.customizemode.tip0.shown", false);
- pref("browser.customizemode.tip0.learnMoreUrl", "https://support.mozilla.org/1/firefox/%VERSION%/%OS%/%LOCALE%/customize");
- 
  pref("keyword.enabled", true);
  pref("browser.fixup.domainwhitelist.localhost", true);
  
--- a/mozilla-kde.patch	Sat Nov 04 20:25:02 2017 +0100
+++ b/mozilla-kde.patch	Sat Nov 04 23:30:29 2017 +0100
@@ -1,5 +1,5 @@
 # HG changeset patch
-# Parent  a930d4c1c3fba77f61071becdc51e3232e0b72ca
+# Parent  c5bcac47a3f81790e9c2724d9d17ea5a7f20e735
 Description: Add KDE integration to Firefox (toolkit parts)
 Author: Wolfgang Rosenauer <wolfgang@rosenauer.org>
 Author: Lubos Lunak <lunak@suse.com>
@@ -9,10 +9,10 @@
 diff --git a/modules/libpref/Preferences.cpp b/modules/libpref/Preferences.cpp
 --- a/modules/libpref/Preferences.cpp
 +++ b/modules/libpref/Preferences.cpp
-@@ -33,16 +33,17 @@
+@@ -37,16 +37,17 @@
  #include "nsIZipReader.h"
  #include "nsPrefBranch.h"
- #include "nsXPIDLString.h"
+ #include "nsString.h"
  #include "nsCRT.h"
  #include "nsCOMArray.h"
  #include "nsXPCOMCID.h"
@@ -27,7 +27,7 @@
  #include "prefread.h"
  #include "prefapi_private_data.h"
  
-@@ -1435,16 +1436,34 @@ pref_LoadPrefsInDir(nsIFile* aDir, char 
+@@ -1413,16 +1414,34 @@ pref_LoadPrefsInDir(nsIFile* aDir, char 
  
  static nsresult pref_LoadPrefsInDirList(const char *listId)
  {
@@ -62,7 +62,7 @@
      return NS_OK;
  
    bool hasMore;
-@@ -1460,17 +1479,17 @@ static nsresult pref_LoadPrefsInDirList(
+@@ -1438,17 +1457,17 @@ static nsresult pref_LoadPrefsInDirList(
  
      nsAutoCString leaf;
      path->GetNativeLeafName(leaf);
@@ -79,9 +79,9 @@
  
  static nsresult pref_ReadPrefFromJar(nsZipArchive* jarReader, const char *name)
  {
-   nsZipItemPtr<char> manifest(jarReader, name, true);
-   NS_ENSURE_TRUE(manifest.Buffer(), NS_ERROR_NOT_AVAILABLE);
-@@ -1566,24 +1585,36 @@ pref_InitInitialObjects()
+   nsCString manifest;
+   MOZ_TRY_VAR(manifest, URLPreloader::ReadZip(jarReader, nsDependentCString(name)));
+@@ -1544,24 +1563,36 @@ 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)
@@ -121,7 +121,7 @@
 diff --git a/modules/libpref/moz.build b/modules/libpref/moz.build
 --- a/modules/libpref/moz.build
 +++ b/modules/libpref/moz.build
-@@ -33,16 +33,20 @@ EXPORTS.mozilla += [
+@@ -31,16 +31,20 @@ EXPORTS.mozilla += [
  UNIFIED_SOURCES += [
      'nsPrefBranch.cpp',
      'nsPrefsFactory.cpp',
@@ -166,8 +166,7 @@
 diff --git a/python/mozbuild/mozpack/chrome/manifest.py b/python/mozbuild/mozpack/chrome/manifest.py
 --- a/python/mozbuild/mozpack/chrome/manifest.py
 +++ b/python/mozbuild/mozpack/chrome/manifest.py
-@@ -33,16 +33,17 @@ class ManifestEntry(object):
-         'application',
+@@ -34,16 +34,17 @@ class ManifestEntry(object):
          'platformversion',
          'os',
          'osversion',
@@ -175,7 +174,8 @@
          'xpcnativewrappers',
          'tablet',
          'process',
-+        'desktop',
+         'contentaccessible',
++	'desktop',
      ]
  
      def __init__(self, base, *flags):
@@ -3126,10 +3126,10 @@
  #include "nsString.h"
  #include "nsReadableUtils.h"
  #include "nsUnicharUtils.h"
- #include "nsXPIDLString.h"
  #include "nsIURL.h"
  #include "nsIFileStreams.h"
-@@ -1143,26 +1143,26 @@ nsresult nsOSHelperAppService::OSProtoco
+ #include "nsILineInputStream.h"
+@@ -1142,26 +1142,26 @@ nsresult nsOSHelperAppService::OSProtoco
      ContentAction::Action::defaultActionForScheme(QString(aProtocolScheme) + ':');
  
    if (action.isValid())
@@ -3158,7 +3158,7 @@
  
  nsresult nsOSHelperAppService::GetFileTokenForPath(const char16_t * platformAppPath, nsIFile ** aFile)
  {
-@@ -1249,17 +1249,17 @@ nsOSHelperAppService::GetFromExtension(c
+@@ -1248,17 +1248,17 @@ nsOSHelperAppService::GetFromExtension(c
                                           mime_types_description,
                                           true);
  
@@ -3177,7 +3177,7 @@
  
      rv = LookUpTypeAndDescription(NS_ConvertUTF8toUTF16(aFileExt),
                                    majorType,
-@@ -1370,17 +1370,17 @@ nsOSHelperAppService::GetFromType(const 
+@@ -1369,17 +1369,17 @@ nsOSHelperAppService::GetFromType(const 
    nsAutoString extensions, mime_types_description;
    LookUpExtensionsAndDescription(majorType,
                                   minorType,
@@ -3306,7 +3306,7 @@
 +    return NS_OK;
 +  }
 +
-   nsXPIDLCString title;
+   nsCString title;
    title.Adopt(ToNewUTF8String(mTitle));
  
    GtkWindow *parent_widget =
@@ -3727,7 +3727,7 @@
 diff --git a/xpcom/io/nsLocalFileUnix.cpp b/xpcom/io/nsLocalFileUnix.cpp
 --- a/xpcom/io/nsLocalFileUnix.cpp
 +++ b/xpcom/io/nsLocalFileUnix.cpp
-@@ -46,16 +46,17 @@
+@@ -45,16 +45,17 @@
  #include "prproces.h"
  #include "nsIDirectoryEnumerator.h"
  #include "nsISimpleEnumerator.h"
@@ -3745,7 +3745,7 @@
  #include "prmem.h"
  #include "plbase64.h"
  
-@@ -1941,59 +1942,74 @@ nsLocalFile::SetPersistentDescriptor(con
+@@ -1938,59 +1939,74 @@ nsLocalFile::SetPersistentDescriptor(con
    return InitWithNativePath(aPersistentDescriptor);
  #endif
  }
--- a/series	Sat Nov 04 20:25:02 2017 +0100
+++ b/series	Sat Nov 04 23:30:29 2017 +0100
@@ -1,14 +1,14 @@
 # xulrunner/gecko patches
 mozilla-nongnome-proxies.patch
 mozilla-kde.patch
-mozilla-language.patch
+#mozilla-language.patch
 mozilla-ntlm-full-path.patch
 mozilla-idldir.patch
 mozilla-openaes-decl.patch
 mozilla-no-stdcxx-check.patch
 mozilla-reduce-files-per-UnifiedBindings.patch
 mozilla-aarch64-startup-crash.patch
-mozilla-ucontext.patch
+#mozilla-ucontext.patch
 
 # Firefox patches
 firefox-kde.patch