add bug 1377911 and bug 1393848

bug1240930-253/mozilla/1377911-1-57a1.patch

@@ -0,0 +1,37 @@
+
+# HG changeset patch
+# User Zibi Braniecki <zbraniecki@mozilla.com>
+# Date 1503623306 25200
+# Node ID 0c0bbead5d73c4ea3db4e5178a9b27883879d744
+# Parent  f70b43ea56ccb6131e6bbd40b1759634795fdad9
+Bug 1377911 - Do not strip localized override entries when repackaging. r=glandium,Pike
+
+MozReview-Commit-ID: vKPJcxzh4T
+
+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
+@@ -191,22 +191,16 @@ class ManifestOverload(ManifestEntry):
+     def __init__(self, base, overloaded, overload, *flags):
+         ManifestEntry.__init__(self, base, *flags)
+         self.overloaded = overloaded
+         self.overload = overload
+ 
+     def __str__(self):
+         return self.serialize(self.overloaded, self.overload)
+ 
+-    @property
+-    def localized(self):
+-        u = urlparse(self.overload)
+-        return u.scheme == 'chrome' and \
+-               u.path.split('/')[0:2] == ['', 'locale']
+-
+ 
+ class ManifestOverlay(ManifestOverload):
+     '''
+     Class for 'overlay' entries.
+         overlay chrome://global/content/viewSource.xul \
+             chrome://browser/content/viewSourceOverlay.xul
+     '''
+     type = 'overlay'
+

bug1240930-253/mozilla/1377911-2-57a1.patch

@@ -0,0 +1,65 @@
+# HG changeset patch
+# User Zibi Braniecki <zbraniecki@mozilla.com>
+# Date 1503616908 25200
+# Node ID 8396a848ae256af62f3f67779d69c8434d378c23
+# Parent  0c0bbead5d73c4ea3db4e5178a9b27883879d744
+Bug 1377911 - Move the override chrome entries from language manifests to product manifests. r=Pike
+
+MozReview-Commit-ID: 7VgO2ui9yH5
+
+diff --git a/browser/base/jar.mn b/browser/base/jar.mn
+--- a/browser/base/jar.mn
++++ b/browser/base/jar.mn
+@@ -154,8 +154,13 @@ browser.jar:
+ # the following files are browser-specific overrides
+ *       content/browser/license.html                  (/toolkit/content/license.html)
+ % override chrome://global/content/license.html chrome://browser/content/license.html
+         content/browser/report-phishing-overlay.xul     (content/report-phishing-overlay.xul)
+         content/browser/blockedSite.xhtml               (content/blockedSite.xhtml)
+ % overlay chrome://browser/content/browser.xul chrome://browser/content/report-phishing-overlay.xul
+ 
+ % override chrome://global/content/netError.xhtml chrome://browser/content/aboutNetError.xhtml
++
++# L10n resource overrides.
++% override chrome://global/locale/appstrings.properties chrome://browser/locale/appstrings.properties
++% override chrome://global/locale/netError.dtd chrome://browser/locale/netError.dtd
++% override chrome://mozapps/locale/downloads/settingsChange.dtd chrome://browser/locale/downloads/settingsChange.dtd
+diff --git a/browser/locales/jar.mn b/browser/locales/jar.mn
+--- a/browser/locales/jar.mn
++++ b/browser/locales/jar.mn
+@@ -1,13 +1,15 @@
+ #filter substitution
+ # 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/.
+ 
++# Note: All overrides should go to browser/base/jar.mn in order to avoid
++# having to create the same override entry for each locale.
+ 
+ @AB_CD@.jar:
+ % locale browser @AB_CD@ %locale/browser/
+ # bookmarks.html is produced by LOCALIZED_GENERATED_FILES.
+     locale/browser/bookmarks.html                  (bookmarks.html)
+     locale/browser/aboutAccounts.dtd               (%chrome/browser/aboutAccounts.dtd)
+     locale/browser/aboutDialog.dtd                 (%chrome/browser/aboutDialog.dtd)
+     locale/browser/aboutPrivateBrowsing.dtd        (%chrome/browser/aboutPrivateBrowsing.dtd)
+@@ -112,19 +114,16 @@
+     locale/browser/searchplugins/images/yandex-en.ico  (searchplugins/images/yandex-en.ico)
+     locale/browser/searchplugins/images/yandex-ru.ico  (searchplugins/images/yandex-ru.ico)
+ % locale browser-region @AB_CD@ %locale/browser-region/
+     locale/browser-region/region.properties        (%chrome/browser-region/region.properties)
+ # the following files are browser-specific overrides
+     locale/browser/netError.dtd                (%chrome/overrides/netError.dtd)
+     locale/browser/appstrings.properties       (%chrome/overrides/appstrings.properties)
+     locale/browser/downloads/settingsChange.dtd  (%chrome/overrides/settingsChange.dtd)
+-% override chrome://global/locale/netError.dtd chrome://browser/locale/netError.dtd
+-% override chrome://global/locale/appstrings.properties chrome://browser/locale/appstrings.properties
+-% override chrome://mozapps/locale/downloads/settingsChange.dtd chrome://browser/locale/downloads/settingsChange.dtd
+ % locale pdf.js @AB_CD@ %locale/pdfviewer/
+     locale/pdfviewer/viewer.properties             (%pdfviewer/viewer.properties)
+     locale/pdfviewer/chrome.properties             (%pdfviewer/chrome.properties)
+ 
+ #ifdef XPI_NAME
+ # Bug 1240628, restructure how l10n repacks work with feature addons
+ # This is hacky, but ensures the chrome.manifest chain is complete
+ [.] chrome.jar:

bug1240930-253/mozilla/1393848-57a1.patch

@@ -0,0 +1,67 @@
+# HG changeset patch
+# User Zibi Braniecki <zbraniecki@mozilla.com>
+# Date 1503680417 25200
+# Node ID 43855f42baabb1e7e19abd41540dccebd3926697
+# Parent  c423d7c2998a580d7ffaf597c646065e3e349ea4
+Bug 1393848 - Move search-plugin resource entry to browser's content jar.mn. r=Pike
+
+MozReview-Commit-ID: JJD222TkR8a
+
+diff --git a/browser/base/jar.mn b/browser/base/jar.mn
+--- a/browser/base/jar.mn
++++ b/browser/base/jar.mn
+@@ -155,12 +155,13 @@ browser.jar:
+ *       content/browser/license.html                  (/toolkit/content/license.html)
+ % override chrome://global/content/license.html chrome://browser/content/license.html
+         content/browser/report-phishing-overlay.xul     (content/report-phishing-overlay.xul)
+         content/browser/blockedSite.xhtml               (content/blockedSite.xhtml)
+ % overlay chrome://browser/content/browser.xul chrome://browser/content/report-phishing-overlay.xul
+ 
+ % override chrome://global/content/netError.xhtml chrome://browser/content/aboutNetError.xhtml
+ 
+-# L10n resource overrides.
++# L10n resources and overrides.
+ % override chrome://global/locale/appstrings.properties chrome://browser/locale/appstrings.properties
+ % override chrome://global/locale/netError.dtd chrome://browser/locale/netError.dtd
+ % override chrome://mozapps/locale/downloads/settingsChange.dtd chrome://browser/locale/downloads/settingsChange.dtd
++% resource search-plugins chrome://browser/locale/searchplugins/
+diff --git a/browser/locales/jar.mn b/browser/locales/jar.mn
+--- a/browser/locales/jar.mn
++++ b/browser/locales/jar.mn
+@@ -1,15 +1,16 @@
+ #filter substitution
+ # 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/.
+ 
+-# Note: All overrides should go to browser/base/jar.mn in order to avoid
+-# having to create the same override entry for each locale.
++# Note: This file should only contain locale entries. All
++# override and resource entries should go to browser/base/jar.mn to avoid
++# having to create the same entry for each locale.
+ 
+ @AB_CD@.jar:
+ % locale browser @AB_CD@ %locale/browser/
+ # bookmarks.html is produced by LOCALIZED_GENERATED_FILES.
+     locale/browser/bookmarks.html                  (bookmarks.html)
+     locale/browser/aboutAccounts.dtd               (%chrome/browser/aboutAccounts.dtd)
+     locale/browser/aboutDialog.dtd                 (%chrome/browser/aboutDialog.dtd)
+     locale/browser/aboutPrivateBrowsing.dtd        (%chrome/browser/aboutPrivateBrowsing.dtd)
+@@ -95,17 +96,16 @@
+     locale/browser/preferences/siteDataSettings.dtd     (%chrome/browser/preferences/siteDataSettings.dtd)
+     locale/browser/preferences-old/sync.dtd           (%chrome/browser/preferences-old/sync.dtd)
+     locale/browser/preferences/sync.dtd               (%chrome/browser/preferences/sync.dtd)
+     locale/browser/preferences-old/tabs.dtd           (%chrome/browser/preferences-old/tabs.dtd)
+     locale/browser/preferences/tabs.dtd               (%chrome/browser/preferences/tabs.dtd)
+     locale/browser/preferences/translation.dtd        (%chrome/browser/preferences/translation.dtd)
+     locale/browser/syncBrand.dtd                (%chrome/browser/syncBrand.dtd)
+     locale/browser/syncSetup.properties         (%chrome/browser/syncSetup.properties)
+-% resource search-plugins chrome://browser/locale/searchplugins/
+ #if BUILD_FASTER
+     locale/browser/searchplugins/               (searchplugins/*.xml)
+     locale/browser/searchplugins/list.json      (search/list.json)
+ #else
+     locale/browser/searchplugins/               (.deps/generated_@AB_CD@/*.xml)
+     locale/browser/searchplugins/list.json      (.deps/generated_@AB_CD@/list.json)
+ #endif
+     locale/browser/searchplugins/images/amazon.ico     (searchplugins/images/amazon.ico)

bug1240930-253/mozilla/series-append

@@ -1,3 +1,6 @@
+1377911-1-57a1.patch
+1377911-2-57a1.patch
+1393848-57a1.patch
 1437942-62a1.patch
 1240930-80a1.patch
 1457321-1only-62a1.patch