Browse Source

Chronological shuffle for 64a1

Ian Neal 4 months ago
parent
commit
8910243832
31 changed files with 489 additions and 489 deletions
  1. 3 3
      mozilla-release/patches/1079662-2-64a1.patch
  2. 6 6
      mozilla-release/patches/1079662-3-64a1.patch
  3. 0 0
      mozilla-release/patches/1237610-2-PARTIAL-64a1.patch
  4. 0 0
      mozilla-release/patches/1237610-4-64a1.patch
  5. 9 9
      mozilla-release/patches/1397263-6-64a1.patch
  6. 7 7
      mozilla-release/patches/1399870-64a1.patch
  7. 48 0
      mozilla-release/patches/1471622-3-64a1.patch
  8. 25 42
      mozilla-release/patches/1471622-4-64a1.patch
  9. 19 17
      mozilla-release/patches/1471622-5-64a1.patch
  10. 24 24
      mozilla-release/patches/1471622-6-64a1.patch
  11. 66 24
      mozilla-release/patches/1471622-7-64a1.patch
  12. 0 75
      mozilla-release/patches/1471622-8-64a1.patch
  13. 4 4
      mozilla-release/patches/1471888-1-64a1.patch
  14. 5 5
      mozilla-release/patches/1474488-2only-64a1.patch
  15. 3 4
      mozilla-release/patches/1478843-64a1.patch
  16. 0 0
      mozilla-release/patches/1480834-4-64a1.patch
  17. 3 2
      mozilla-release/patches/1481721-64a1.patch
  18. 5 5
      mozilla-release/patches/1488307-64a1.patch
  19. 9 8
      mozilla-release/patches/1489757-64a1.patch
  20. 8 8
      mozilla-release/patches/1490463-2-64a1.patch
  21. 6 6
      mozilla-release/patches/1491419-1-64a1.patch
  22. 5 5
      mozilla-release/patches/1491419-2-64a1.patch
  23. 6 6
      mozilla-release/patches/1491419-3-64a1.patch
  24. 0 0
      mozilla-release/patches/1491788-1only-64a1.patch
  25. 6 6
      mozilla-release/patches/1492037-64a1.patch
  26. 8 8
      mozilla-release/patches/1492268-64a1.patch
  27. 3 3
      mozilla-release/patches/1492341-64a1.patch
  28. 3 4
      mozilla-release/patches/1492915-64a1.patch
  29. 0 0
      mozilla-release/patches/1494222-2no3to5-64a1.patch
  30. 2 2
      mozilla-release/patches/1494398-64a1.patch
  31. 206 206
      mozilla-release/patches/series

+ 3 - 3
mozilla-release/patches/1079662-2-64a1.patch

@@ -2,7 +2,7 @@
 # User Mike Hommey <mh+mozilla@glandium.org>
 # Date 1536198690 -32400
 # Node ID 877c851a1b66348627379e9a7a7f4b1f9fd73dfb
-# Parent  de2f40b089e2d0d41530c8654a9ce0c5599bcf57
+# Parent  9a7ddb70e64a1ba6f9ae80e03a1c04ca858da868
 Bug 1079662 - Always pass -rdynamic when linking with sanitizers. r=froydnj
 
 When building executables as PIE, and because we use -Bsymbolic, which
@@ -82,8 +82,8 @@ diff --git a/build/autoconf/sanitize.m4 b/build/autoconf/sanitize.m4
  AC_SUBST(MOZ_TSAN)
  
  dnl ========================================================
- dnl = Use UndefinedBehavior Sanitizer (with custom checks)
-@@ -107,26 +107,26 @@ MOZ_ARG_ENABLE_BOOL(unsigned-overflow-sa
+ dnl = Use UndefinedBehavior Sanitizer to find integer overflows
+@@ -89,26 +89,26 @@ MOZ_ARG_ENABLE_BOOL(unsigned-overflow-sa
  if test -n "$MOZ_SIGNED_OVERFLOW_SANITIZE$MOZ_UNSIGNED_OVERFLOW_SANITIZE"; then
      MOZ_UBSAN=1
      SANITIZER_BLACKLISTS=""

+ 6 - 6
mozilla-release/patches/1079662-3-64a1.patch

@@ -2,7 +2,7 @@
 # User Mike Hommey <mh+mozilla@glandium.org>
 # Date 1536208069 -32400
 # Node ID 3cbbfc5127e473345c8b0f040a0ed1b254d800ed
-# Parent  a6336b1624c36d4b7d9e096b8d2af34c8b9220d3
+# Parent  caec98017ee71acb38a62eb315f527c041a29850
 Bug 1079662 - Always enable PIE. r=froydnj
 
 Last attempt, a few years ago, blatantly failed because nautilus (the
@@ -180,7 +180,7 @@ diff --git a/browser/moz.configure b/browser/moz.configure
 diff --git a/build/autoconf/compiler-opts.m4 b/build/autoconf/compiler-opts.m4
 --- a/build/autoconf/compiler-opts.m4
 +++ b/build/autoconf/compiler-opts.m4
-@@ -170,39 +170,18 @@ if test "$GNU_CC" -a "$GCC_USE_GNU_LD" -
+@@ -203,39 +203,18 @@ if test "$GNU_CC" -a "$GCC_USE_GNU_LD" -
           if test "$GC_SECTIONS_BREAKS_DEBUG_RANGES" = no; then
               DSO_LDOPTS="$DSO_LDOPTS -Wl,--gc-sections"
           fi
@@ -225,7 +225,7 @@ diff --git a/build/autoconf/compiler-opts.m4 b/build/autoconf/compiler-opts.m4
 diff --git a/build/moz.configure/old.configure b/build/moz.configure/old.configure
 --- a/build/moz.configure/old.configure
 +++ b/build/moz.configure/old.configure
-@@ -195,17 +195,16 @@ def old_configure_options(*options):
+@@ -196,17 +196,16 @@ def old_configure_options(*options):
      '--enable-memory-sanitizer',
      '--enable-mobile-optimize',
      '--enable-necko-wifi',
@@ -246,7 +246,7 @@ diff --git a/build/moz.configure/old.configure b/build/moz.configure/old.configu
 diff --git a/build/moz.configure/toolchain.configure b/build/moz.configure/toolchain.configure
 --- a/build/moz.configure/toolchain.configure
 +++ b/build/moz.configure/toolchain.configure
-@@ -1583,17 +1583,16 @@ def security_hardening_cflags(hardening_
+@@ -1553,17 +1553,16 @@ def security_hardening_cflags(hardening_
      return namespace(
          flags=flags,
          js_flags=js_flags,
@@ -267,10 +267,10 @@ diff --git a/build/moz.configure/toolchain.configure b/build/moz.configure/toolc
 diff --git a/build/mozconfig.no-compile b/build/mozconfig.no-compile
 --- a/build/mozconfig.no-compile
 +++ b/build/mozconfig.no-compile
-@@ -22,10 +22,11 @@ unset TOOLCHAIN_PREFIX
+@@ -21,10 +21,11 @@ unset MAKECAB
+ unset TOOLCHAIN_PREFIX
  unset BINDGEN_CFLAGS
  unset LLVM_CONFIG
- unset LLVM_PROFDATA
  unset WIN64_LINK
  unset WIN64_LIB
  unset ENABLE_CLANG_PLUGIN

+ 0 - 0
mozilla-release/patches/1237610-1only-PARTIAL-64a1.patch → mozilla-release/patches/1237610-2-PARTIAL-64a1.patch


+ 0 - 0
mozilla-release/patches/1237610-3-64a1.patch → mozilla-release/patches/1237610-4-64a1.patch


+ 9 - 9
mozilla-release/patches/1397263-6-64a1.patch

@@ -2,7 +2,7 @@
 # User Nathan Froyd <froydnj@mozilla.com>
 # Date 1538612969 14400
 # Node ID d678adeaddcd50c3d49c6a4afe3395f1a10853e1
-# Parent  1bb7c3c7e4c71fd14ebec4bd211da7c95e1c0195
+# Parent  c7d294975ffe4b319f7ae716e3869ce6050f4e6f
 Bug 1397263 - move --enable-accessibility to moz.configure; r=mshal
 
 diff --git a/build/moz.configure/old.configure b/build/moz.configure/old.configure
@@ -18,7 +18,6 @@ diff --git a/build/moz.configure/old.configure b/build/moz.configure/old.configu
      '--cache-file',
      '--datadir',
 -    '--enable-accessibility',
-     '--enable-bundled-fonts',
      '--enable-content-sandbox',
      '--enable-cookies',
      '--enable-cpp-rtti',
@@ -26,10 +25,11 @@ diff --git a/build/moz.configure/old.configure b/build/moz.configure/old.configu
      '--enable-dbus',
      '--enable-debug-js-modules',
      '--enable-directshow',
+     '--enable-dtrace',
 diff --git a/old-configure.in b/old-configure.in
 --- a/old-configure.in
 +++ b/old-configure.in
-@@ -1853,17 +1853,16 @@ MOZ_SPELLCHECK=1
+@@ -1851,17 +1851,16 @@ MOZ_SPELLCHECK=1
  MOZ_TOOLKIT_SEARCH=1
  MOZ_UNIVERSALCHARDET=1
  MOZ_XUL=1
@@ -47,7 +47,7 @@ diff --git a/old-configure.in b/old-configure.in
  
  case "$target_os" in
      mingw*)
-@@ -2195,45 +2194,16 @@ AC_SUBST(MOZ_ENABLE_DBUS)
+@@ -2186,45 +2185,16 @@ AC_SUBST(MOZ_ENABLE_DBUS)
  
  dnl =========================================================
  dnl = Whether to exclude hyphenations files in the build
@@ -92,8 +92,8 @@ diff --git a/old-configure.in b/old-configure.in
  AC_SUBST(MOZ_WEBRTC_HAVE_ETHTOOL_SPEED_HI)
  
  if test -n "$MOZ_WEBRTC"; then
-     MOZ_RAW=1
-@@ -3744,17 +3714,16 @@ AC_SUBST(MOZ_PREF_EXTENSIONS)
+     if test -n "$MOZ_X11"; then
+@@ -3622,17 +3592,16 @@ AC_SUBST(MOZ_PREF_EXTENSIONS)
  AC_SUBST_LIST(MOZ_DEBUG_LDFLAGS)
  AC_SUBST(WARNINGS_AS_ERRORS)
  AC_SUBST_LIST(WARNINGS_CFLAGS)
@@ -107,14 +107,14 @@ diff --git a/old-configure.in b/old-configure.in
  AC_SUBST(MOZ_ANDROID_ANR_REPORTER)
  AC_SUBST(MOZ_CRASHREPORTER)
  AC_SUBST(MOZ_CRASHREPORTER_INJECTOR)
- AC_SUBST(MOZ_MAINTENANCE_SERVICE)
  AC_SUBST(MOZ_STUB_INSTALLER)
- AC_SUBST(MOZ_VERIFY_MAR_SIGNATURE)
  AC_SUBST(MOZ_ENABLE_SIGNMAR)
+ AC_SUBST(MOZ_UPDATER)
+ 
 diff --git a/toolkit/moz.configure b/toolkit/moz.configure
 --- a/toolkit/moz.configure
 +++ b/toolkit/moz.configure
-@@ -1113,20 +1113,46 @@ def midl_flags(c_compiler, target):
+@@ -1141,20 +1141,46 @@ def midl_flags(c_compiler, target):
  
      # mingw
      return {

+ 7 - 7
mozilla-release/patches/1399870-64a1.patch

@@ -2,7 +2,7 @@
 # User Ted Mielczarek <ted@mielczarek.org>
 # Date 1537300219 14400
 # Node ID 5b8dd6f38524a27b81bc39ed5f3224eebe3684ce
-# Parent  67aba54e222739f7b503b8d305e490d838707548
+# Parent  d74a66dfcf3b45e96520d8fdd92e566f92657680
 Bug 1399870 - make DEFFILE a Path instead of a string; r=gps
 
 All but one of the current uses of DEFFILE use `SRCDIR + '/file.def'` to
@@ -189,12 +189,12 @@ diff --git a/modules/pdfium/moz.build b/modules/pdfium/moz.build
 diff --git a/mozglue/build/moz.build b/mozglue/build/moz.build
 --- a/mozglue/build/moz.build
 +++ b/mozglue/build/moz.build
-@@ -17,17 +17,17 @@ if CONFIG['OS_TARGET'] == 'Android':
+@@ -22,17 +22,17 @@ if CONFIG['MOZ_ASAN']:
      ]
  
- if CONFIG['MOZ_ASAN']:
+ if CONFIG['MOZ_UBSAN']:
      SOURCES += [
-         'AsanOptions.cpp',
+         'UbsanOptions.cpp',
      ]
  
  if CONFIG['OS_TARGET'] == 'WINNT':
@@ -211,7 +211,7 @@ diff --git a/mozglue/build/moz.build b/mozglue/build/moz.build
 diff --git a/python/mozbuild/mozbuild/frontend/context.py b/python/mozbuild/mozbuild/frontend/context.py
 --- a/python/mozbuild/mozbuild/frontend/context.py
 +++ b/python/mozbuild/mozbuild/frontend/context.py
-@@ -1631,17 +1631,17 @@ VARIABLES = {
+@@ -1620,17 +1620,17 @@ VARIABLES = {
          """),
  
      'RCINCLUDE': (unicode, unicode,
@@ -233,7 +233,7 @@ diff --git a/python/mozbuild/mozbuild/frontend/context.py b/python/mozbuild/mozb
 diff --git a/python/mozbuild/mozbuild/frontend/emitter.py b/python/mozbuild/mozbuild/frontend/emitter.py
 --- a/python/mozbuild/mozbuild/frontend/emitter.py
 +++ b/python/mozbuild/mozbuild/frontend/emitter.py
-@@ -1040,17 +1040,16 @@ class TreeMetadataEmitter(LoggingMixin):
+@@ -1031,17 +1031,16 @@ class TreeMetadataEmitter(LoggingMixin):
          # them. We should aim to keep this set small because it violates the
          # desired abstraction of the build definition away from makefiles.
          passthru = VariablePassthru(context)
@@ -251,7 +251,7 @@ diff --git a/python/mozbuild/mozbuild/frontend/emitter.py b/python/mozbuild/mozb
          for v in varlist:
              if v in context and context[v]:
                  passthru.variables[v] = context[v]
-@@ -1071,23 +1070,38 @@ class TreeMetadataEmitter(LoggingMixin):
+@@ -1062,23 +1061,38 @@ class TreeMetadataEmitter(LoggingMixin):
  
          for v in ['HOST_CXXFLAGS', 'HOST_CFLAGS']:
              if v in context and context[v]:

+ 48 - 0
mozilla-release/patches/1471622-3-64a1.patch

@@ -0,0 +1,48 @@
+# HG changeset patch
+# User Raphael Pierzina <rpierzina@mozilla.com>
+# Date 1537388739 0
+# Node ID c36d288368a155965d0ae3b3fcb4c8397ad38cad
+# Parent  00c86de70ef0307d262548ec397275740befea1e
+mozfile: Fix Python 3 compat issue in mozfile test_move_remove.py (Bug 1471622) r=ahal
+
+This patch updates mozfile test_move_remove.py to use `open` instead of `file`
+and enables the according test module for Python 3.5.
+
+Differential Revision: https://phabricator.services.mozilla.com/D6245
+
+diff --git a/testing/mozbase/mozfile/tests/manifest.ini b/testing/mozbase/mozfile/tests/manifest.ini
+--- a/testing/mozbase/mozfile/tests/manifest.ini
++++ b/testing/mozbase/mozfile/tests/manifest.ini
+@@ -1,10 +1,9 @@
+ [DEFAULT]
+ subsuite = mozbase, os == "linux"
+ [test_extract.py]
+ [test_load.py]
+ [test_move_remove.py]
+-skip-if = python == 3
+ [test_tempdir.py]
+ [test_tempfile.py]
+ [test_tree.py]
+ [test_url.py]
+diff --git a/testing/mozbase/mozfile/tests/test_move_remove.py b/testing/mozbase/mozfile/tests/test_move_remove.py
+--- a/testing/mozbase/mozfile/tests/test_move_remove.py
++++ b/testing/mozbase/mozfile/tests/test_move_remove.py
+@@ -76,17 +76,17 @@ class MozfileRemoveTestCase(unittest.Tes
+         self.assertTrue(os.path.isdir(self.tempdir))
+         mozfile.remove(self.tempdir)
+         self.assertFalse(os.path.exists(self.tempdir))
+ 
+     def test_remove_directory_with_open_file(self):
+         """Test removing a directory with an open file"""
+         # Open a file in the generated stub
+         filepath = os.path.join(self.tempdir, *stubs.files[1])
+-        f = file(filepath, 'w')
++        f = open(filepath, 'w')
+         f.write('foo-bar')
+ 
+         # keep file open and then try removing the dir-tree
+         if mozinfo.isWin:
+             # On the Windows family WindowsError should be raised.
+             self.assertRaises(OSError, mozfile.remove, self.tempdir)
+             self.assertTrue(os.path.exists(self.tempdir))
+         else:

+ 25 - 42
mozilla-release/patches/1471622-4-64a1.patch

@@ -1,48 +1,31 @@
 # HG changeset patch
 # User Raphael Pierzina <rpierzina@mozilla.com>
-# Date 1537388739 0
-# Node ID c36d288368a155965d0ae3b3fcb4c8397ad38cad
-# Parent  00c86de70ef0307d262548ec397275740befea1e
-mozfile: Fix Python 3 compat issue in mozfile test_move_remove.py (Bug 1471622) r=ahal
+# Date 1539166286 0
+# Node ID 5c168bf3ca2f3be7de77182b1331c76055d498fe
+# Parent  97cf7b59f181071f78d1309d888b5a58d9a82549
+Bug 1471622 - Update dependency specifier for mozfile in mozprofile; r=davehunt
 
-This patch updates mozfile test_move_remove.py to use `open` instead of `file`
-and enables the according test module for Python 3.5.
+Differential Revision: https://phabricator.services.mozilla.com/D8096
 
-Differential Revision: https://phabricator.services.mozilla.com/D6245
-
-diff --git a/testing/mozbase/mozfile/tests/manifest.ini b/testing/mozbase/mozfile/tests/manifest.ini
---- a/testing/mozbase/mozfile/tests/manifest.ini
-+++ b/testing/mozbase/mozfile/tests/manifest.ini
-@@ -1,10 +1,9 @@
- [DEFAULT]
- subsuite = mozbase, os == "linux"
- [test_extract.py]
- [test_load.py]
- [test_move_remove.py]
--skip-if = python == 3
- [test_tempdir.py]
- [test_tempfile.py]
- [test_tree.py]
- [test_url.py]
-diff --git a/testing/mozbase/mozfile/tests/test_move_remove.py b/testing/mozbase/mozfile/tests/test_move_remove.py
---- a/testing/mozbase/mozfile/tests/test_move_remove.py
-+++ b/testing/mozbase/mozfile/tests/test_move_remove.py
-@@ -76,17 +76,17 @@ class MozfileRemoveTestCase(unittest.Tes
-         self.assertTrue(os.path.isdir(self.tempdir))
-         mozfile.remove(self.tempdir)
-         self.assertFalse(os.path.exists(self.tempdir))
+diff --git a/testing/mozbase/mozprofile/setup.py b/testing/mozbase/mozprofile/setup.py
+--- a/testing/mozbase/mozprofile/setup.py
++++ b/testing/mozbase/mozprofile/setup.py
+@@ -5,17 +5,17 @@
+ from __future__ import absolute_import
+ 
+ from setuptools import setup
+ 
+ PACKAGE_NAME = 'mozprofile'
+ PACKAGE_VERSION = '2.0.0'
  
-     def test_remove_directory_with_open_file(self):
-         """Test removing a directory with an open file"""
-         # Open a file in the generated stub
-         filepath = os.path.join(self.tempdir, *stubs.files[1])
--        f = file(filepath, 'w')
-+        f = open(filepath, 'w')
-         f.write('foo-bar')
+ deps = [
+-    'mozfile==1.*',
++    'mozfile>=1.2',
+     'mozlog==3.*',
+     'six>=1.10.0,<2',
+ ]
  
-         # keep file open and then try removing the dir-tree
-         if mozinfo.isWin:
-             # On the Windows family WindowsError should be raised.
-             self.assertRaises(OSError, mozfile.remove, self.tempdir)
-             self.assertTrue(os.path.exists(self.tempdir))
-         else:
+ setup(name=PACKAGE_NAME,
+       version=PACKAGE_VERSION,
+       description="Library to create and modify Mozilla application profiles",
+       long_description="see https://firefox-source-docs.mozilla.org/mozbase/index.html",

+ 19 - 17
mozilla-release/patches/1471622-5-64a1.patch

@@ -1,31 +1,33 @@
 # HG changeset patch
 # User Raphael Pierzina <rpierzina@mozilla.com>
-# Date 1539166286 0
-# Node ID 5c168bf3ca2f3be7de77182b1331c76055d498fe
-# Parent  63141000563f0e808914c29e89dd4a32253889e7
-Bug 1471622 - Update dependency specifier for mozfile in mozprofile; r=davehunt
+# Date 1539166273 0
+# Node ID d3ae81a06c155ff71e69fb35a0985dfaf1a684ba
+# Parent  7f2767d1e2d558f4fe685618c23fbc2130869bcb
+Bug 1471622 - Update dependency specifier for mozfile in mozrunner; r=davehunt
 
-Differential Revision: https://phabricator.services.mozilla.com/D8096
+Depends on D8096
 
-diff --git a/testing/mozbase/mozprofile/setup.py b/testing/mozbase/mozprofile/setup.py
---- a/testing/mozbase/mozprofile/setup.py
-+++ b/testing/mozbase/mozprofile/setup.py
-@@ -5,17 +5,17 @@
- from __future__ import absolute_import
+Differential Revision: https://phabricator.services.mozilla.com/D8097
+
+diff --git a/testing/mozbase/mozrunner/setup.py b/testing/mozbase/mozrunner/setup.py
+--- a/testing/mozbase/mozrunner/setup.py
++++ b/testing/mozbase/mozrunner/setup.py
+@@ -8,17 +8,17 @@ from setuptools import setup, find_packa
  
- from setuptools import setup
+ PACKAGE_NAME = 'mozrunner'
+ PACKAGE_VERSION = '7.1.0'
  
- PACKAGE_NAME = 'mozprofile'
- PACKAGE_VERSION = '1.1.0'
+ desc = """Reliable start/stop/configuration of Mozilla Applications (Firefox, Thunderbird, etc.)"""
  
  deps = [
+     'mozdevice>=0.37,<1',
 -    'mozfile==1.*',
 +    'mozfile>=1.2',
+     'mozinfo>=0.7,<2',
      'mozlog==3.*',
+     'mozprocess>=0.23,<1',
+     'mozprofile>=1.1.0,<3',
      'six>=1.10.0,<2',
  ]
  
- setup(name=PACKAGE_NAME,
-       version=PACKAGE_VERSION,
-       description="Library to create and modify Mozilla application profiles",
-       long_description="see https://firefox-source-docs.mozilla.org/mozbase/index.html",
+ EXTRAS_REQUIRE = {'crash': ['mozcrash >= 1.0']}

+ 24 - 24
mozilla-release/patches/1471622-6-64a1.patch

@@ -1,33 +1,33 @@
 # HG changeset patch
 # User Raphael Pierzina <rpierzina@mozilla.com>
-# Date 1539166273 0
-# Node ID d3ae81a06c155ff71e69fb35a0985dfaf1a684ba
-# Parent  1e6899f50df97fed7593d9c600e3037376a6bc1d
-Bug 1471622 - Update dependency specifier for mozfile in mozrunner; r=davehunt
+# Date 1539166199 0
+# Node ID 6b1fd4c384b953bf617f0d58f4ce0ddf0e0b2326
+# Parent  0c10f0fb82e33ef17a19b139ea94be1193aa0f95
+Bug 1471622 - Update dependency specifier for mozfile in tps; r=davehunt
 
-Depends on D8096
+Depends on D8097
 
-Differential Revision: https://phabricator.services.mozilla.com/D8097
+Differential Revision: https://phabricator.services.mozilla.com/D8098
 
-diff --git a/testing/mozbase/mozrunner/setup.py b/testing/mozbase/mozrunner/setup.py
---- a/testing/mozbase/mozrunner/setup.py
-+++ b/testing/mozbase/mozrunner/setup.py
-@@ -8,17 +8,17 @@ from setuptools import setup, find_packa
+diff --git a/testing/tps/setup.py b/testing/tps/setup.py
+--- a/testing/tps/setup.py
++++ b/testing/tps/setup.py
+@@ -4,17 +4,17 @@
  
- PACKAGE_NAME = 'mozrunner'
- PACKAGE_VERSION = '7.0.1'
  
- desc = """Reliable start/stop/configuration of Mozilla Applications (Firefox, Thunderbird, etc.)"""
+ from setuptools import setup, find_packages
+ import sys
  
- deps = [
-     'mozdevice>=0.37,<1',
--    'mozfile==1.*',
-+    'mozfile>=1.2',
-     'mozinfo>=0.7,<2',
-     'mozlog==3.*',
-     'mozprocess>=0.23,<1',
-     'mozprofile>=1.1.0,<2',
-     'six>=1.10.0,<2',
- ]
+ version = '0.5'
  
- EXTRAS_REQUIRE = {'crash': ['mozcrash >= 1.0']}
+ deps = ['httplib2 == 0.9.2',
+-        'mozfile == 1.2',
++        'mozfile >= 1.2',
+         'mozhttpd == 0.7',
+         'mozinfo >= 0.10',
+         'mozinstall == 1.12',
+         'mozprocess == 0.23',
+         'mozprofile == 2.0.0',
+         'mozrunner == 7.0.2',
+         'mozversion == 1.4',
+        ]

+ 66 - 24
mozilla-release/patches/1471622-7-64a1.patch

@@ -1,33 +1,75 @@
 # HG changeset patch
 # User Raphael Pierzina <rpierzina@mozilla.com>
-# Date 1539166199 0
-# Node ID 6b1fd4c384b953bf617f0d58f4ce0ddf0e0b2326
-# Parent  0066f31f777c59c4215059da756fea2a74aa5916
-Bug 1471622 - Update dependency specifier for mozfile in tps; r=davehunt
+# Date 1539267610 0
+# Node ID 172e411269552064ec3531a25623c9d402701a6f
+# Parent  394b6d13adfbbc0c9b9e5f901f98ec6fa1c4e052
+[mozfile] Bump version to 2.0.0, update classifiers and add setup.cfg (Bug 1471622) r=davehunt
 
-Depends on D8097
+[mozfile] Bump version to 2.0.0, update classifiers and add setup.cfg (Bug 1471622)
 
-Differential Revision: https://phabricator.services.mozilla.com/D8098
+Differential Revision: https://phabricator.services.mozilla.com/D6905
 
-diff --git a/testing/tps/setup.py b/testing/tps/setup.py
---- a/testing/tps/setup.py
-+++ b/testing/tps/setup.py
-@@ -4,17 +4,17 @@
+diff --git a/testing/mozbase/mozfile/setup.cfg b/testing/mozbase/mozfile/setup.cfg
+new file mode 100644
+--- /dev/null
++++ b/testing/mozbase/mozfile/setup.cfg
+@@ -0,0 +1,2 @@
++[bdist_wheel]
++universal = 1
+diff --git a/testing/mozbase/mozfile/setup.py b/testing/mozbase/mozfile/setup.py
+--- a/testing/mozbase/mozfile/setup.py
++++ b/testing/mozbase/mozfile/setup.py
+@@ -1,28 +1,34 @@
+ # 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/.
  
+ from __future__ import absolute_import
  
- from setuptools import setup, find_packages
- import sys
+ from setuptools import setup
  
- version = '0.5'
+-PACKAGE_NAME = 'mozfile'
+-PACKAGE_VERSION = '1.2'
++PACKAGE_NAME = "mozfile"
++PACKAGE_VERSION = "2.0.0"
  
- deps = ['httplib2 == 0.9.2',
--        'mozfile == 1.2',
-+        'mozfile >= 1.2',
-         'mozhttpd == 0.7',
-         'mozinfo >= 0.10',
-         'mozinstall == 1.12',
-         'mozprocess == 0.23',
-         'mozprofile == 0.28',
-         'mozrunner == 6.12',
-         'mozversion == 1.4',
-        ]
+-setup(name=PACKAGE_NAME,
+-      version=PACKAGE_VERSION,
+-      description="Library of file utilities for use in Mozilla testing",
+-      long_description="see https://firefox-source-docs.mozilla.org/mozbase/index.html",
+-      classifiers=['Programming Language :: Python :: 2.7',
+-                   'Programming Language :: Python :: 3'],
+-      keywords='mozilla',
+-      author='Mozilla Automation and Tools team',
+-      author_email='tools@lists.mozilla.org',
+-      url='https://wiki.mozilla.org/Auto-tools/Projects/Mozbase',
+-      license='MPL',
+-      packages=['mozfile'],
+-      include_package_data=True,
+-      zip_safe=False,
+-      install_requires=['six >= 1.10.0'],
+-      tests_require=['wptserve']
+-      )
++setup(
++    name=PACKAGE_NAME,
++    version=PACKAGE_VERSION,
++    description="Library of file utilities for use in Mozilla testing",
++    long_description="see https://firefox-source-docs.mozilla.org/mozbase/index.html",
++    classifiers=[
++        "Programming Language :: Python :: 2",
++        "Programming Language :: Python :: 2.7",
++        "Programming Language :: Python :: 3",
++        "Programming Language :: Python :: 3.5",
++        "License :: OSI Approved :: Mozilla Public License 2.0 (MPL 2.0)",
++    ],
++    keywords="mozilla",
++    author="Mozilla Automation and Tools team",
++    author_email="tools@lists.mozilla.org",
++    url="https://wiki.mozilla.org/Auto-tools/Projects/Mozbase",
++    license="MPL",
++    packages=["mozfile"],
++    include_package_data=True,
++    zip_safe=False,
++    install_requires=["six >= 1.10.0"],
++    tests_require=["wptserve"],
++)

+ 0 - 75
mozilla-release/patches/1471622-8-64a1.patch

@@ -1,75 +0,0 @@
-# HG changeset patch
-# User Raphael Pierzina <rpierzina@mozilla.com>
-# Date 1539267610 0
-# Node ID 172e411269552064ec3531a25623c9d402701a6f
-# Parent  394b6d13adfbbc0c9b9e5f901f98ec6fa1c4e052
-[mozfile] Bump version to 2.0.0, update classifiers and add setup.cfg (Bug 1471622) r=davehunt
-
-[mozfile] Bump version to 2.0.0, update classifiers and add setup.cfg (Bug 1471622)
-
-Differential Revision: https://phabricator.services.mozilla.com/D6905
-
-diff --git a/testing/mozbase/mozfile/setup.cfg b/testing/mozbase/mozfile/setup.cfg
-new file mode 100644
---- /dev/null
-+++ b/testing/mozbase/mozfile/setup.cfg
-@@ -0,0 +1,2 @@
-+[bdist_wheel]
-+universal = 1
-diff --git a/testing/mozbase/mozfile/setup.py b/testing/mozbase/mozfile/setup.py
---- a/testing/mozbase/mozfile/setup.py
-+++ b/testing/mozbase/mozfile/setup.py
-@@ -1,28 +1,34 @@
- # 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/.
- 
- from __future__ import absolute_import
- 
- from setuptools import setup
- 
--PACKAGE_NAME = 'mozfile'
--PACKAGE_VERSION = '1.2'
-+PACKAGE_NAME = "mozfile"
-+PACKAGE_VERSION = "2.0.0"
- 
--setup(name=PACKAGE_NAME,
--      version=PACKAGE_VERSION,
--      description="Library of file utilities for use in Mozilla testing",
--      long_description="see https://firefox-source-docs.mozilla.org/mozbase/index.html",
--      classifiers=['Programming Language :: Python :: 2.7',
--                   'Programming Language :: Python :: 3'],
--      keywords='mozilla',
--      author='Mozilla Automation and Tools team',
--      author_email='tools@lists.mozilla.org',
--      url='https://wiki.mozilla.org/Auto-tools/Projects/Mozbase',
--      license='MPL',
--      packages=['mozfile'],
--      include_package_data=True,
--      zip_safe=False,
--      install_requires=['six >= 1.10.0'],
--      tests_require=['wptserve']
--      )
-+setup(
-+    name=PACKAGE_NAME,
-+    version=PACKAGE_VERSION,
-+    description="Library of file utilities for use in Mozilla testing",
-+    long_description="see https://firefox-source-docs.mozilla.org/mozbase/index.html",
-+    classifiers=[
-+        "Programming Language :: Python :: 2",
-+        "Programming Language :: Python :: 2.7",
-+        "Programming Language :: Python :: 3",
-+        "Programming Language :: Python :: 3.5",
-+        "License :: OSI Approved :: Mozilla Public License 2.0 (MPL 2.0)",
-+    ],
-+    keywords="mozilla",
-+    author="Mozilla Automation and Tools team",
-+    author_email="tools@lists.mozilla.org",
-+    url="https://wiki.mozilla.org/Auto-tools/Projects/Mozbase",
-+    license="MPL",
-+    packages=["mozfile"],
-+    include_package_data=True,
-+    zip_safe=False,
-+    install_requires=["six >= 1.10.0"],
-+    tests_require=["wptserve"],
-+)

+ 4 - 4
mozilla-release/patches/1471888-1-64a1.patch

@@ -2,7 +2,7 @@
 # User Pavel Slepushkin <slepushkin@yandex.ru>
 # Date 1536692285 0
 # Node ID 0ec82a778cede6ffedfe748d0e104661216b4a01
-# Parent  f6fc71f9bfb5854e3269cd7539d8fa6d7d88d882
+# Parent  848e8a34269e479016b105ee59f345bcabe98fdd
 Bug 1471888 - [mozprofile] Add support for Python 3. r=davehunt
 
 Bug 1471888 - [mozprofile] Add support for Python 3.
@@ -260,7 +260,7 @@ diff --git a/testing/mozbase/mozprofile/setup.py b/testing/mozbase/mozprofile/se
 +PACKAGE_VERSION = '2.0.0'
  
  deps = [
-     'mozfile>=1.2',
+     'mozfile==1.*',
      'mozlog==3.*',
      'six>=1.10.0,<2',
  ]
@@ -513,7 +513,7 @@ diff --git a/testing/mozbase/mozrunner/setup.py b/testing/mozbase/mozrunner/setu
  
  deps = [
      'mozdevice>=0.37,<1',
-     'mozfile>=1.2',
+     'mozfile==1.*',
      'mozinfo>=0.7,<2',
      'mozlog==3.*',
      'mozprocess>=0.23,<1',
@@ -534,7 +534,7 @@ diff --git a/testing/tps/setup.py b/testing/tps/setup.py
  version = '0.5'
  
  deps = ['httplib2 == 0.9.2',
-         'mozfile >= 1.2',
+         'mozfile == 1.2',
          'mozhttpd == 0.7',
          'mozinfo >= 0.10',
          'mozinstall == 1.12',

+ 5 - 5
mozilla-release/patches/1474488-2only-64a1.patch

@@ -2,7 +2,7 @@
 # User Thomas P. <pdknsk+mozilla@gmail.com>
 # Date 1536634043 0
 # Node ID 75f0a4384b0f31f7356d4bb92bb6429ba82d281f
-# Parent  398eb9327e15c508f428c175138a7fc8ea9cd511
+# Parent  d901cc0cc45d308aaef2bb42b78a4b5b7fcd3a56
 Bug 1474488: add --enable-undefined-sanitizer with custom checks r=froydnj
 
 diff --git a/build/autoconf/frameptr.m4 b/build/autoconf/frameptr.m4
@@ -28,7 +28,7 @@ diff --git a/build/autoconf/sanitize.m4 b/build/autoconf/sanitize.m4
 --- a/build/autoconf/sanitize.m4
 +++ b/build/autoconf/sanitize.m4
 @@ -69,16 +69,34 @@ if test -n "$MOZ_TSAN"; then
-         LDFLAGS="-fsanitize=thread $LDFLAGS"
+         LDFLAGS="-fsanitize=thread -rdynamic $LDFLAGS"
      fi
      AC_DEFINE(MOZ_TSAN)
      MOZ_PATH_PROG(LLVM_SYMBOLIZER, llvm-symbolizer)
@@ -65,7 +65,7 @@ diff --git a/build/autoconf/sanitize.m4 b/build/autoconf/sanitize.m4
 diff --git a/build/moz.configure/toolchain.configure b/build/moz.configure/toolchain.configure
 --- a/build/moz.configure/toolchain.configure
 +++ b/build/moz.configure/toolchain.configure
-@@ -1599,16 +1599,36 @@ js_option('--enable-address-sanitizer', 
+@@ -1494,16 +1494,36 @@ js_option('--enable-address-sanitizer', 
  
  @depends_if('--enable-address-sanitizer')
  def asan(value):
@@ -105,7 +105,7 @@ diff --git a/build/moz.configure/toolchain.configure b/build/moz.configure/toolc
 diff --git a/config/rules.mk b/config/rules.mk
 --- a/config/rules.mk
 +++ b/config/rules.mk
-@@ -911,23 +911,25 @@ cargo_linker_env_var := CARGO_TARGET_$(R
+@@ -983,23 +983,25 @@ cargo_linker_env_var := CARGO_TARGET_$(R
  # already works with the current setup) setup on Windows, and we don't
  # have to pass in any special linker options on Windows.
  ifneq (WINNT,$(OS_ARCH))
@@ -168,7 +168,7 @@ diff --git a/mozglue/build/moz.build b/mozglue/build/moz.build
 +    ]
 +
  if CONFIG['OS_TARGET'] == 'WINNT':
-     DEFFILE = '!mozglue.def'
+     DEFFILE = 'mozglue.def'
      # We'll break the DLL blocklist if we immediately load user32.dll
      DELAYLOAD_DLLS += [
          'user32.dll',

+ 3 - 4
mozilla-release/patches/1478843-60.patch → mozilla-release/patches/1478843-64a1.patch

@@ -1,10 +1,9 @@
 # HG changeset patch
 # User Paul Adenot <paul@paul.cx>
 # Date 1532938054 -7200
-#      Mon Jul 30 10:07:34 2018 +0200
-# Node ID 0fa07c704ca4391c3e609d9fd3b89d7aef48360e
-# Parent  b27c13af491b83e6e6d2bd8ab0676eba8253d049
-Bug 1478843 - Consider HLS resources CORS cross-origin. r=jya, a=RyanVM
+# Node ID 19d5e50db843b03d4aed8e5f5736a531035c9cf0
+# Parent  26b8fd513eacdd7598e96ae3dc20cc42066ee0b1
+Bug 1478843 - Consider HLS resources CORS cross-origin. r=jya
 
 diff --git a/dom/media/hls/HLSDecoder.cpp b/dom/media/hls/HLSDecoder.cpp
 --- a/dom/media/hls/HLSDecoder.cpp

+ 0 - 0
mozilla-release/patches/1480834-64a1.patch → mozilla-release/patches/1480834-4-64a1.patch


+ 3 - 2
mozilla-release/patches/1481721-64a1.patch

@@ -2,7 +2,7 @@
 # User Mike Hommey <mh+mozilla@glandium.org>
 # Date 1536706349 0
 # Node ID 23860890d959f318130e619976cbeae4472937a3
-# Parent  da36ef75492bd9bbd6b85b1c1039f7f4b4379657
+# Parent  8b6bfa0280062356b2bb2657394a159dee656ac2
 Bug 1481721 - Switch Linux nightlies and PGO builds to clang r=froydnj
 
 And enable LTO on CI builds using clang + PGO.
@@ -12,7 +12,7 @@ Differential Revision: https://phabricator.services.mozilla.com/D4991
 diff --git a/build/mozconfig.no-compile b/build/mozconfig.no-compile
 --- a/build/mozconfig.no-compile
 +++ b/build/mozconfig.no-compile
-@@ -16,15 +16,16 @@ unset RUSTC
+@@ -16,16 +16,17 @@ unset RUSTC
  unset CARGO
  unset RUSTDOC
  unset RUSTFMT
@@ -27,6 +27,7 @@ diff --git a/build/mozconfig.no-compile b/build/mozconfig.no-compile
  unset ENABLE_CLANG_PLUGIN
  
  unset MOZ_STDCXX_COMPAT
+ unset MOZ_NO_PIE_COMPAT
  
  unset NASM
 diff --git a/build/unix/mozconfig.unix b/build/unix/mozconfig.unix

+ 5 - 5
mozilla-release/patches/1488307-64a1.patch

@@ -2,7 +2,7 @@
 # User Mike Hommey <mh+mozilla@glandium.org>
 # Date 1535594149 -32400
 # Node ID e2a02b08089b0bd0c18ceac0b2eb1e3888d56dc2
-# Parent  0b88ec99d88949a2832dc4d9b843641397fd60f0
+# Parent  135ac6630535bc7d585e2a0d422347c2fee2ae91
 Bug 1488307 - Build the LLVM gold plugin. r=mshal
 
 As much as it's tempting to use LLD for LTO, it still causes some
@@ -16,7 +16,7 @@ Differential Revision: https://phabricator.services.mozilla.com/D4896
 diff --git a/build/build-clang/build-clang.py b/build/build-clang/build-clang.py
 --- a/build/build-clang/build-clang.py
 +++ b/build/build-clang/build-clang.py
-@@ -213,16 +213,18 @@ def build_one_stage(cc, cxx, asm, ld, ar
+@@ -212,16 +212,18 @@ def build_one_stage(cc, cxx, asm, ld, ar
              "-DCMAKE_BUILD_TYPE=%s" % build_type,
              "-DCMAKE_INSTALL_PREFIX=%s" % inst_dir,
              "-DLLVM_TARGETS_TO_BUILD=X86;ARM;AArch64",
@@ -30,8 +30,8 @@ diff --git a/build/build-clang/build-clang.py b/build/build-clang/build-clang.py
          if is_windows():
              cmake_args.insert(-1, "-DLLVM_EXPORT_SYMBOLS_FOR_PLUGINS=ON")
              cmake_args.insert(-1, "-DLLVM_USE_CRT_RELEASE=MT")
-         else:
-             # libllvm as a shared library is not supported on Windows
-             cmake_args += ["-DLLVM_LINK_LLVM_DYLIB=ON"]
          if ranlib is not None:
              cmake_args += ["-DCMAKE_RANLIB=%s" % slashify_path(ranlib)]
+         if libtool is not None:
+             cmake_args += ["-DCMAKE_LIBTOOL=%s" % slashify_path(libtool)]
+         if osx_cross_compile:

+ 9 - 8
mozilla-release/patches/1489757-60.patch → mozilla-release/patches/1489757-64a1.patch

@@ -1,10 +1,9 @@
 # HG changeset patch
 # User Andrew Johnson <ajohnson@draster.com>
 # Date 1537446212 14400
-#      Thu Sep 20 08:23:32 2018 -0400
-# Node ID 46f19852aaa66bbf1f1b2af1d1c47d38d6506da5
-# Parent  cecb5036d0d52e6809d262507b4be003cb063579
-Bug 1489757 - Bug 1448863 causes video streams to take a very long time to recover from packet loss. r=bwc, a=RyanVM
+# Node ID 4bc0d86a17a8630ff5a2868980d72d3ecb9efb30
+# Parent  6aaf4203c5d760e82fa19346816622546ceb6d01
+Bug 1489757 - Bug 1448863 causes video streams to take a very long time to recover from packet loss; r=bwc
 
 This patch sets mDecoderStatus from the GMPThread so we can eventually report
 an error back to the caller. Since this done during an asynchronous call, there
@@ -147,15 +146,17 @@ diff --git a/media/webrtc/signaling/src/media-conduit/WebrtcGmpVideoCodec.cpp b/
    if (NS_FAILED(rv)) {
      LOG(LogLevel::Error, ("%s: Decode failed (rv=%u)!",
          __PRETTY_FUNCTION__, static_cast<unsigned>(rv)));
-+    aThis->mDecoderStatus = GMPDecodeErr;
-+    return;
-   }
- 
+-  }
+-
 -  if(aThis->mDecoderStatus != GMPNoErr){
 -    aThis->mDecoderStatus = GMPNoErr;
 -    LOG(LogLevel::Error, ("%s: Decoder status is bad (%u)!",
 -        __PRETTY_FUNCTION__, static_cast<unsigned>(aThis->mDecoderStatus)));
 -  }
++    aThis->mDecoderStatus = GMPDecodeErr;
++    return;
++  }
++
 +  aThis->mDecoderStatus = GMPNoErr;
  }
  

+ 8 - 8
mozilla-release/patches/1490463-2-64a1.patch

@@ -2,7 +2,7 @@
 # User Ted Mielczarek <ted@mielczarek.org>
 # Date 1537300942 14400
 # Node ID 23cb01b0c33ee3bd87ada94f26ac759584334bcb
-# Parent  9376f9ce6c9c4c74423bd8ab73e2be311687ef15
+# Parent  59c09497bad3564ddae9bd8f0ee33281c7e67fdc
 Bug 1490463 - part 2 - use srcdir_rel for passing manifest paths to mt.exe; r=mshal
 
 mt.exe doesn't like absolute paths, so we use srcdir-relative paths
@@ -11,12 +11,12 @@ where necessary for file arguments.
 diff --git a/config/rules.mk b/config/rules.mk
 --- a/config/rules.mk
 +++ b/config/rules.mk
-@@ -541,25 +541,25 @@ endif
- $(PROGRAM): $(PROGOBJS) $(STATIC_LIBS) $(RUST_STATIC_LIB) $(EXTRA_DEPS) $(RESFILE) $(GLOBAL_DEPS) $(call mkdir_deps,$(FINAL_TARGET))
+@@ -547,25 +547,25 @@ endif
+ $(PROGRAM): $(PROGOBJS) $(STATIC_LIBS) $(EXTRA_DEPS) $(RESFILE) $(GLOBAL_DEPS) $(call mkdir_deps,$(FINAL_TARGET))
  	$(REPORT_BUILD)
  	@$(RM) $@.manifest
  ifeq (_WINNT,$(GNU_CC)_$(OS_ARCH))
- 	$(LINKER) -NOLOGO -OUT:$(call LINKER_OUT,$@) -PDB:$(LINK_PDBFILE) -IMPLIB:$(basename $(@F)).lib $(WIN32_EXE_LDFLAGS) $(LDFLAGS) $(MOZ_PROGRAM_LDFLAGS) $($(notdir $@)_$(OBJS_VAR_SUFFIX)) $(RESFILE) $(STATIC_LIBS) $(RUST_STATIC_LIB) $(SHARED_LIBS) $(OS_LIBS)
+ 	$(LINKER) -NOLOGO -OUT:$(call LINKER_OUT,$@) -PDB:$(LINK_PDBFILE) -IMPLIB:$(basename $(@F)).lib $(WIN32_EXE_LDFLAGS) $(LDFLAGS) $(MOZ_PROGRAM_LDFLAGS) $($(notdir $@)_$(OBJS_VAR_SUFFIX)) $(RESFILE) $(STATIC_LIBS) $(SHARED_LIBS) $(OS_LIBS)
  ifdef MSMANIFEST_TOOL
  	@if test -f $@.manifest; then \
  		if test -f '$(srcdir)/$(notdir $@).manifest'; then \
@@ -41,7 +41,7 @@ diff --git a/config/rules.mk b/config/rules.mk
  	touch -t `date +%Y%m%d%H%M.%S -d 'now+5seconds'` pgo.relink
  endif
  else # !WINNT || GNU_CC
-@@ -576,25 +576,25 @@ endif
+@@ -582,25 +582,25 @@ endif
  
  $(HOST_PROGRAM): $(HOST_PROGOBJS) $(HOST_LIBS) $(HOST_EXTRA_DEPS) $(GLOBAL_DEPS) $(call mkdir_deps,$(DEPTH)/dist/host/bin)
  	$(REPORT_BUILD)
@@ -71,7 +71,7 @@ diff --git a/config/rules.mk b/config/rules.mk
  else
  	$(HOST_CC) -o $@ $(HOST_C_LDFLAGS) $(HOST_LDFLAGS) $(HOST_PROGOBJS) $(HOST_LIBS) $(HOST_EXTRA_LIBS)
  endif # HOST_CPP_PROG_LINK
-@@ -615,17 +615,17 @@ endif
+@@ -621,17 +621,17 @@ endif
  	$(REPORT_BUILD)
  ifeq (_WINNT,$(GNU_CC)_$(OS_ARCH))
  	$(LINKER) -nologo -out:$@ -pdb:$(LINK_PDBFILE) $($@_$(OBJS_VAR_SUFFIX)) $(WIN32_EXE_LDFLAGS) $(LDFLAGS) $(MOZ_PROGRAM_LDFLAGS) $(STATIC_LIBS) $(SHARED_LIBS) $(OS_LIBS)
@@ -90,8 +90,8 @@ diff --git a/config/rules.mk b/config/rules.mk
  endif # WINNT && !GNU_CC
  
  ifdef ENABLE_STRIP
-@@ -693,25 +693,25 @@ endif
- 	$(MKSHLIB) $($@_$(OBJS_VAR_SUFFIX)) $(RESFILE) $(LDFLAGS) $(STATIC_LIBS) $(RUST_STATIC_LIB) $(SHARED_LIBS) $(EXTRA_DSO_LDOPTS) $(MOZ_GLUE_LDFLAGS) $(OS_LIBS)
+@@ -699,25 +699,25 @@ endif
+ 	$(MKSHLIB) $($@_$(OBJS_VAR_SUFFIX)) $(RESFILE) $(LDFLAGS) $(STATIC_LIBS) $(RUST_STATIC_LIB_FOR_SHARED_LIB) $(SHARED_LIBS) $(EXTRA_DSO_LDOPTS) $(MOZ_GLUE_LDFLAGS) $(OS_LIBS)
  	$(call py_action,check_binary,--target $@)
  
  ifeq (_WINNT,$(GNU_CC)_$(OS_ARCH))

+ 6 - 6
mozilla-release/patches/1491419-1-64a1.patch

@@ -2,7 +2,7 @@
 # User Nathan Froyd <froydnj@mozilla.com>
 # Date 1538419888 14400
 # Node ID 2a985dd40eba10801b2da141d1e8966b2ec060a5
-# Parent  73441ccdc90dcaf450f5282c9211cd34489c0f69
+# Parent  1cc3e51fe4f7bdeaff696109e4d281442ec8268c
 Bug 1491419 - move --enable-maintenance-service to moz.configure; r=nalexander
 
 diff --git a/browser/confvars.sh b/browser/confvars.sh
@@ -29,7 +29,7 @@ diff --git a/browser/confvars.sh b/browser/confvars.sh
 diff --git a/build/moz.configure/old.configure b/build/moz.configure/old.configure
 --- a/build/moz.configure/old.configure
 +++ b/build/moz.configure/old.configure
-@@ -186,17 +186,16 @@ def old_configure_options(*options):
+@@ -187,17 +187,16 @@ def old_configure_options(*options):
      '--enable-gconf',
      '--enable-hardware-aec-ns',
      '--enable-icf',
@@ -50,7 +50,7 @@ diff --git a/build/moz.configure/old.configure b/build/moz.configure/old.configu
 diff --git a/old-configure.in b/old-configure.in
 --- a/old-configure.in
 +++ b/old-configure.in
-@@ -2856,33 +2856,16 @@ if test -n "$MOZ_TREE_FREETYPE" -a "$OS_
+@@ -2918,33 +2918,16 @@ if test -n "$MOZ_TREE_FREETYPE" -a "$OS_
     CAIRO_FT_CFLAGS="-I$_topsrcdir/modules/freetype2/include"
     AC_SUBST_LIST(CAIRO_FT_CFLAGS)
  fi
@@ -84,11 +84,11 @@ diff --git a/old-configure.in b/old-configure.in
      MOZ_BUNDLED_FONTS=1,
      MOZ_BUNDLED_FONTS=)
  
-@@ -3708,17 +3691,16 @@ AC_SUBST_SET(MOZ_EXTENSIONS)
- AC_SUBST(MOZ_TOOLKIT_SEARCH)
+@@ -3773,17 +3756,16 @@ AC_SUBST(MOZ_TOOLKIT_SEARCH)
  AC_SUBST(MOZ_FEEDS)
  
  AC_SUBST(MOZ_UNIVERSALCHARDET)
+ AC_SUBST(ACCESSIBILITY)
  AC_SUBST(MOZ_SPELLCHECK)
  AC_SUBST(MOZ_ANDROID_ANR_REPORTER)
  AC_SUBST(MOZ_CRASHREPORTER)
@@ -105,7 +105,7 @@ diff --git a/old-configure.in b/old-configure.in
 diff --git a/toolkit/moz.configure b/toolkit/moz.configure
 --- a/toolkit/moz.configure
 +++ b/toolkit/moz.configure
-@@ -1151,8 +1151,21 @@ set_config('MOZ_UNSIGNED_SYSTEM_SCOPE', 
+@@ -1093,8 +1093,21 @@ set_config('MOZ_UNSIGNED_SYSTEM_SCOPE', 
  
  # Alternative Crashreporter setting
  option("--with-crashreporter-url", env="MOZ_CRASHREPORTER_URL",

+ 5 - 5
mozilla-release/patches/1491419-2-64a1.patch

@@ -2,7 +2,7 @@
 # User Nathan Froyd <froydnj@mozilla.com>
 # Date 1538419888 14400
 # Node ID 61ab6941b46309f804ae444b42b2f705d44142d4
-# Parent  7c9625aa71afaafbffaf56cf9e4e5daf537ccacc
+# Parent  c3e671863a15552da31870c83d53f834272dd9d2
 Bug 1491419 - move --enable-bundled-fonts to moz.configure; r=nalexander
 
 diff --git a/browser/confvars.sh b/browser/confvars.sh
@@ -33,8 +33,7 @@ diff --git a/browser/confvars.sh b/browser/confvars.sh
 diff --git a/build/moz.configure/old.configure b/build/moz.configure/old.configure
 --- a/build/moz.configure/old.configure
 +++ b/build/moz.configure/old.configure
-@@ -164,17 +164,16 @@ def old_configure_options(*options):
- 
+@@ -165,17 +165,16 @@ def old_configure_options(*options):
      return depends(prepare_configure, extra_old_configure_args, all_options,
                     *options)
  
@@ -42,6 +41,7 @@ diff --git a/build/moz.configure/old.configure b/build/moz.configure/old.configu
  @old_configure_options(
      '--cache-file',
      '--datadir',
+     '--enable-accessibility',
 -    '--enable-bundled-fonts',
      '--enable-content-sandbox',
      '--enable-cookies',
@@ -54,7 +54,7 @@ diff --git a/build/moz.configure/old.configure b/build/moz.configure/old.configu
 diff --git a/old-configure.in b/old-configure.in
 --- a/old-configure.in
 +++ b/old-configure.in
-@@ -2856,29 +2856,16 @@ if test -n "$MOZ_TREE_FREETYPE" -a "$OS_
+@@ -2918,29 +2918,16 @@ if test -n "$MOZ_TREE_FREETYPE" -a "$OS_
     CAIRO_FT_CFLAGS="-I$_topsrcdir/modules/freetype2/include"
     AC_SUBST_LIST(CAIRO_FT_CFLAGS)
  fi
@@ -87,7 +87,7 @@ diff --git a/old-configure.in b/old-configure.in
 diff --git a/toolkit/moz.configure b/toolkit/moz.configure
 --- a/toolkit/moz.configure
 +++ b/toolkit/moz.configure
-@@ -1164,8 +1164,26 @@ option('--enable-maintenance-service', h
+@@ -1106,8 +1106,26 @@ option('--enable-maintenance-service', h
         when=target_is_windows, default=target_is_windows)
  
  set_define('MOZ_MAINTENANCE_SERVICE',

+ 6 - 6
mozilla-release/patches/1491419-3-64a1.patch

@@ -2,13 +2,13 @@
 # User Nathan Froyd <froydnj@mozilla.com>
 # Date 1538419888 14400
 # Node ID 4a6d50bdd4918c60974a18276122ae9ac39c4c4e
-# Parent  62d64b51855c2659d405d9a97a1efb14cfd6f071
+# Parent  870a12c4b7e126a869d6d60997d0a1c52f2f92c3
 Bug 1491419 - move --enable-verify-mar to moz.configure; r=nalexander
 
 diff --git a/build/moz.configure/old.configure b/build/moz.configure/old.configure
 --- a/build/moz.configure/old.configure
 +++ b/build/moz.configure/old.configure
-@@ -213,17 +213,16 @@ def old_configure_options(*options):
+@@ -214,17 +214,16 @@ def old_configure_options(*options):
      '--enable-system-extension-dirs',
      '--enable-system-pixman',
      '--enable-tasktracer',
@@ -29,7 +29,7 @@ diff --git a/build/moz.configure/old.configure b/build/moz.configure/old.configu
 diff --git a/old-configure.in b/old-configure.in
 --- a/old-configure.in
 +++ b/old-configure.in
-@@ -2856,29 +2856,16 @@ if test -n "$MOZ_TREE_FREETYPE" -a "$OS_
+@@ -2918,29 +2918,16 @@ if test -n "$MOZ_TREE_FREETYPE" -a "$OS_
     CAIRO_FT_CFLAGS="-I$_topsrcdir/modules/freetype2/include"
     AC_SUBST_LIST(CAIRO_FT_CFLAGS)
  fi
@@ -59,10 +59,10 @@ diff --git a/old-configure.in b/old-configure.in
  dnl ========================================================
  
  MOZ_ARG_ENABLE_BOOL(signmar,
-@@ -3679,17 +3666,16 @@ AC_SUBST(MOZ_TOOLKIT_SEARCH)
- AC_SUBST(MOZ_FEEDS)
+@@ -3744,17 +3731,16 @@ AC_SUBST(MOZ_FEEDS)
  
  AC_SUBST(MOZ_UNIVERSALCHARDET)
+ AC_SUBST(ACCESSIBILITY)
  AC_SUBST(MOZ_SPELLCHECK)
  AC_SUBST(MOZ_ANDROID_ANR_REPORTER)
  AC_SUBST(MOZ_CRASHREPORTER)
@@ -80,7 +80,7 @@ diff --git a/old-configure.in b/old-configure.in
 diff --git a/toolkit/moz.configure b/toolkit/moz.configure
 --- a/toolkit/moz.configure
 +++ b/toolkit/moz.configure
-@@ -1182,8 +1182,18 @@ def allow_bundled_fonts(project):
+@@ -1124,8 +1124,18 @@ def allow_bundled_fonts(project):
      return project == 'browser'
  
  option('--enable-bundled-fonts', default=bundled_fonts_default,

+ 0 - 0
mozilla-release/patches/1491788-64a1.patch → mozilla-release/patches/1491788-1only-64a1.patch


+ 6 - 6
mozilla-release/patches/1492037-64a1.patch

@@ -2,7 +2,7 @@
 # User Mike Hommey <mh+mozilla@glandium.org>
 # Date 1536532895 -32400
 # Node ID 7e05c2752c5a2a16082854a01e76e53c1b03659b
-# Parent  d935abfd00a6255711bd3657261121ad60b7adc8
+# Parent  c8757e653c8e5fab1a95fbcec160a85c216c7294
 Bug 1492037 - Build clang with LLVM as a shared library. r=froydnj
 
 Doing so changes the size of the compressed toolchain archive from ~280M
@@ -55,12 +55,12 @@ diff --git a/build/build-clang/build-clang.py b/build/build-clang/build-clang.py
  import which
  from distutils.dir_util import copy_tree
  
-@@ -215,16 +216,19 @@ def build_one_stage(cc, cxx, asm, ld, ar
-             "-DLLVM_ENABLE_ASSERTIONS=%s" % ("ON" if assertions else "OFF"),
-             "-DPYTHON_EXECUTABLE=%s" % slashify_path(python_path),
+@@ -217,16 +218,19 @@ def build_one_stage(cc, cxx, asm, ld, ar
              "-DLLVM_TOOL_LIBCXX_BUILD=%s" % ("ON" if build_libcxx else "OFF"),
              "-DLIBCXX_LIBCPPABI_VERSION=\"\"",
          ]
+         if is_linux():
+             cmake_args += ["-DLLVM_BINUTILS_INCDIR=%s/include" % gcc_dir]
          if is_windows():
              cmake_args.insert(-1, "-DLLVM_EXPORT_SYMBOLS_FOR_PLUGINS=ON")
              cmake_args.insert(-1, "-DLLVM_USE_CRT_RELEASE=MT")
@@ -75,7 +75,7 @@ diff --git a/build/build-clang/build-clang.py b/build/build-clang/build-clang.py
              cmake_args += [
                  "-DCMAKE_SYSTEM_NAME=Darwin",
                  "-DCMAKE_SYSTEM_VERSION=10.10",
-@@ -359,21 +363,27 @@ def prune_final_dir_for_clang_tidy(final
+@@ -361,21 +365,27 @@ def prune_final_dir_for_clang_tidy(final
      re_clang_tidy = re.compile(
          r"^clang-(apply-replacements|format|tidy)(\.exe)?$", re.I)
      for f in glob.glob("%s/bin/*" % final_dir):
@@ -106,7 +106,7 @@ diff --git a/build/build-clang/build-clang.py b/build/build-clang/build-clang.py
              delete(f)
  
      # Completely remove libexec/, msbuilld-bin and tools, if it exists.
-@@ -593,21 +603,21 @@ if __name__ == "__main__":
+@@ -595,21 +605,21 @@ if __name__ == "__main__":
      if is_darwin():
          extra_cflags = []
          extra_cxxflags = ["-stdlib=libc++"]

+ 8 - 8
mozilla-release/patches/1492268-64a1.patch

@@ -2,7 +2,7 @@
 # User Adam Gashlin <agashlin@mozilla.com>
 # Date 1537309421 0
 # Node ID 61ffb6c642cde13f8a37ffbbe546d06ecd431c08
-# Parent  83a3de9a196a06faeeb39c508f8b5a94310dafb4
+# Parent  5a31f5a1c383679df0b9b4783fc8f940e3e0c18b
 Bug 1492268: Allow a Rust library to link to a program r=froydnj
 
 Differential Revision: https://phabricator.services.mozilla.com/D6200
@@ -10,7 +10,7 @@ Differential Revision: https://phabricator.services.mozilla.com/D6200
 diff --git a/config/rules.mk b/config/rules.mk
 --- a/config/rules.mk
 +++ b/config/rules.mk
-@@ -532,21 +532,21 @@ LINKER_OUT=$(subst /,\,$1)
+@@ -539,21 +539,21 @@ LINKER_OUT=$(subst /,\,$1)
  else
  LINKER_OUT=$1
  endif
@@ -29,12 +29,12 @@ diff --git a/config/rules.mk b/config/rules.mk
  ifdef MSMANIFEST_TOOL
  	@if test -f $@.manifest; then \
  		if test -f '$(srcdir)/$(notdir $@).manifest'; then \
- 			echo 'Embedding manifest from $(srcdir)/$(notdir $@).manifest and $@.manifest'; \
- 			$(MT) -NOLOGO -MANIFEST '$(win_srcdir)/$(notdir $@).manifest' $@.manifest -OUTPUTRESOURCE:$@\;1; \
+ 			echo 'Embedding manifest from $(srcdir_rel)/$(notdir $@).manifest and $@.manifest'; \
+ 			$(MT) -NOLOGO -MANIFEST '$(srcdir_rel)/$(notdir $@).manifest' $@.manifest -OUTPUTRESOURCE:$@\;1; \
  		else \
  			echo 'Embedding manifest from $@.manifest'; \
  			$(MT) -NOLOGO -MANIFEST $@.manifest -OUTPUTRESOURCE:$@\;1; \
-@@ -557,17 +557,17 @@ ifdef MSMANIFEST_TOOL
+@@ -564,17 +564,17 @@ ifdef MSMANIFEST_TOOL
  	fi
  endif	# MSVC with manifest tool
  ifdef MOZ_PROFILE_GENERATE
@@ -53,7 +53,7 @@ diff --git a/config/rules.mk b/config/rules.mk
  endif
  ifdef MOZ_POST_PROGRAM_COMMAND
  	$(MOZ_POST_PROGRAM_COMMAND) $@
-@@ -677,22 +677,22 @@ else
+@@ -686,22 +686,22 @@ else
  	$(HOST_CXX) $(HOST_OUTOPTION)$@ $(HOST_OBJS) $(HOST_CXX_LDFLAGS) $(HOST_LDFLAGS) $(HOST_LIBS) $(HOST_EXTRA_LIBS)
  endif
  
@@ -77,11 +77,11 @@ diff --git a/config/rules.mk b/config/rules.mk
  ifdef EMBED_MANIFEST_AT
  	@if test -f $@.manifest; then \
  		if test -f '$(srcdir)/$@.manifest'; then \
- 			echo 'Embedding manifest from $(srcdir)/$@.manifest and $@.manifest'; \
+ 			echo 'Embedding manifest from $(srcdir_rel)/$@.manifest and $@.manifest'; \
 diff --git a/python/mozbuild/mozbuild/backend/recursivemake.py b/python/mozbuild/mozbuild/backend/recursivemake.py
 --- a/python/mozbuild/mozbuild/backend/recursivemake.py
 +++ b/python/mozbuild/mozbuild/backend/recursivemake.py
-@@ -1394,37 +1394,37 @@ class RecursiveMakeBackend(CommonBackend
+@@ -1473,37 +1473,37 @@ class RecursiveMakeBackend(CommonBackend
              if isinstance(lib, (HostLibrary, HostRustLibrary)):
                  backend_file.write_once('HOST_LIBS += %s\n' %
                                          pretty_relpath(lib, lib.import_name))

+ 3 - 3
mozilla-release/patches/1492341-64a1.patch

@@ -2,7 +2,7 @@
 # User Dave Hunt <dhunt@mozilla.com>
 # Date 1537461236 0
 # Node ID 483e333ad24b323c1326a8df7414500c08ae433b
-# Parent  afabadec30ee9bece246ed53515fab551e7b9dc6
+# Parent  3c3f039f330e792663ec6521d8bae40977678f5d
 Bug 1492341 - Bump mozrunner version to 7.0.2; r=tcsc
 
 TPS is currently depending on mozrunner v7.0.1, which depends on an earlier version of mozprofile. For TPS to be able to use the latest version of mozprofile we need to release a new version of mozrunner with the recent mozprofile version identifier update.
@@ -28,7 +28,7 @@ diff --git a/testing/mozbase/mozrunner/setup.py b/testing/mozbase/mozrunner/setu
  
  deps = [
      'mozdevice>=0.37,<1',
-     'mozfile>=1.2',
+     'mozfile==1.*',
      'mozinfo>=0.7,<2',
      'mozlog==3.*',
 diff --git a/testing/tps/setup.py b/testing/tps/setup.py
@@ -37,7 +37,7 @@ diff --git a/testing/tps/setup.py b/testing/tps/setup.py
 @@ -10,17 +10,17 @@ version = '0.5'
  
  deps = ['httplib2 == 0.9.2',
-         'mozfile >= 1.2',
+         'mozfile == 1.2',
          'mozhttpd == 0.7',
          'mozinfo >= 0.10',
          'mozinstall == 1.12',

+ 3 - 4
mozilla-release/patches/1492915-60.patch → mozilla-release/patches/1492915-64a1.patch

@@ -1,10 +1,9 @@
 # HG changeset patch
 # User Bryce Van Dyk <bvandyk@mozilla.com>
 # Date 1537545493 0
-#      Fri Sep 21 15:58:13 2018 +0000
-# Node ID 2d280e5573314dc5b729de7fced18922566ce7c0
-# Parent  c3a48066f3834cf7525e25c98331ff180eb54159
-Bug 1492915 - Stop WebMDemuxer from inspecting partially encrypted packets for keyframe information. r=jya, a=RyanVM
+# Node ID e6a202d7695b65e1b994f4bf1e8796b2419f8e70
+# Parent  fd9e2c699143ecdbf836f3cbaab537f080d41326
+Bug 1492915 - Stop WebMDemuxer from inspecting partially encrypted packets for keyframe information. r=jya
 
 Differential Revision: https://phabricator.services.mozilla.com/D6415
 

+ 0 - 0
mozilla-release/patches/1494222-2-no3to5-64a1.patch → mozilla-release/patches/1494222-2no3to5-64a1.patch


+ 2 - 2
mozilla-release/patches/1494398-64a1.patch

@@ -2,7 +2,7 @@
 # User Aaron Klotz <aklotz@mozilla.com>
 # Date 1537996780 0
 # Node ID 073b690ff354d293616e47ee15d399306f358766
-# Parent  ecd01ccaa5b35239e677eafea94dad0b78330685
+# Parent  18ebc962b42428fac83a211f7a571fd63c9e75fe
 Bug 1494398: Bump mozrunner version to 7.1.0 to reflect wait-for-browser changes; r=wlach
 
 Differential Revision: https://phabricator.services.mozilla.com/D6997
@@ -26,6 +26,6 @@ diff --git a/testing/mozbase/mozrunner/setup.py b/testing/mozbase/mozrunner/setu
  
  deps = [
      'mozdevice>=0.37,<1',
-     'mozfile>=1.2',
+     'mozfile==1.*',
      'mozinfo>=0.7,<2',
      'mozlog==3.*',

+ 206 - 206
mozilla-release/patches/series

@@ -4520,264 +4520,268 @@ NOBUG-20180824-buildsetting-63a1.patch
 1435552-63a1.patch
 1487595-1-63a1.patch
 1487595-2-63a1.patch
-1480552-64a1.patch
 1484611-2ano1-64a1.patch
 1484611-2b-64a1.patch
+1480552-64a1.patch
 1417646-1-64a1.patch
-1487419-64a1.patch
-1486445-1-64a1.patch
+1487122-64a1.patch
+1486410-64a1.patch
+1487931-64a1.patch
+1488307-64a1.patch
+1475141-64a1.patch
+1488687-64a1.patch
+1488463-64a1.patch
+1476062-64a1.patch
+1488587-64a1.patch
+1488217-64a1.patch
+1446066-64a1.patch
+1489021-64a1.patch
+1486759-64a1.patch
+1440879-1-64a1.patch
+1440879-2-64a1.patch
+1489102-1-64a1.patch
+1489102-2-64a1.patch
+1489102-3-64a1.patch
+1489102-4-64a1.patch
+1489102-5-64a1.patch
+1489550-64a1.patch
+1489454-libmar-64a1.patch
+1488632-64a1.patch
+1489001-64a1.patch
+1079662-1-64a1.patch
+1079662-2-64a1.patch
+1079662-3-64a1.patch
+1488523-2-64a1.patch
+1282098-64a1.patch
+1486086-64a1.patch
 1489944-64a1.patch
+1489205-64a1.patch
 1489744-64a1.patch
 1490115-1-64a1.patch
 1490115-2-64a1.patch
-1493227-64a1.patch
-1467523-2-64a1.patch
-1482425-64a1.patch
-1420028-2-fix-64a1.patch
-1488632-64a1.patch
-1488463-64a1.patch
-1475141-64a1.patch
-1489001-64a1.patch
-1446066-64a1.patch
-1282098-64a1.patch
+1473217-1-64a1.patch
+1481097-5-64a1.patch
+1490130-64a1.patch
+1478370-64a1.patch
+1484829-64a1.patch
 1481721-64a1.patch
+1489287-64a1.patch
+1490128-64a1.patch
+1471888-1-64a1.patch
+1487419-64a1.patch
 1481515-64a1.patch
+1399877-64a1.patch
+1372826-64a1.patch
+1489096-64a1.patch
 1490355-64a1.patch
+1490589-64a1.patch
+1490725-64a1.patch
 1490167-64a1.patch
+1487049-1-64a1.patch
+1487049-2-64a1.patch
+1487049-3-64a1.patch
+1490765-64a1.patch
+1490542-64a1.patch
+1486445-1-64a1.patch
+1490413-64a1.patch
+1487811-1-64a1.patch
+1487811-2-64a1.patch
+1487811-3-64a1.patch
+1487811-4-64a1.patch
+1480834-4-64a1.patch
 1490845-64a1.patch
 1491198-64a1.patch
-1489102-1-64a1.patch
-1489102-2-64a1.patch
-1489102-3-64a1.patch
-1489102-4-64a1.patch
-1489102-5-64a1.patch
-1490413-64a1.patch
-1469027-3only-64a1.patch
-1440879-1-64a1.patch
-1440879-2-64a1.patch
+1490738-64a1.patch
+1490549-3-64a1.patch
+1474488-2only-64a1.patch
+1491577-4-64a1.patch
+1491615-64a1.patch
 1489091-64a1.patch
+1486866-64a1.patch
+1491489-64a1.patch
+1491132-64a1.patch
+1463048-64a1.patch
+1491159-64a1.patch
+1490566-64a1.patch
+1489052-64a1.patch
 1399870-64a1.patch
+1490463-1-64a1.patch
+1490463-2-64a1.patch
+1490463-3-64a1.patch
+1491236-64a1.patch
 1492268-64a1.patch
-1493413-64a1.patch
-1397263-1-64a1.patch
-1397263-2-64a1.patch
-1397263-3-64a1.patch
-1397263-4-64a1.patch
-1397263-5-PARTIAL-64a1.patch
-1397263-6-64a1.patch
-1496327-1-64a1.patch
-1496327-2-64a1.patch
-1237610-1only-PARTIAL-64a1.patch
-1487122-64a1.patch
-1478370-64a1.patch
-1484829-64a1.patch
-1491159-64a1.patch
-1494150-64a1.patch
-1486055-64a1.patch
-1496591-64a1.patch
-1497440-1only-64a1.patch
-1496733-64a1.patch
-1496708-1-64a1.patch
-1496708-2-64a1.patch
-1490227-64a1.patch
-1497741-64a1.patch
-1494287-1-64a1.patch
-1494287-2-64a1.patch
-1497677-64a1.patch
-1497439-64a1.patch
-1499580-64a1.patch
-1494222-1-64a1.patch
-1494222-2-no3to5-64a1.patch
-1496610-64a1.patch
-1497350-64a1.patch
-1497359-64a1.patch
-1496136-64a1.patch
-1498031-64a1.patch
+1492365-64a1.patch
+1489698-1-64a1.patch
+1489698-2-64a1.patch
+1489698-3-64a1.patch
+1489698-4-64a1.patch
+1492401-64a1.patch
+1471622-3-64a1.patch
+979649-1-64a1.patch
+1488778-64a1.patch
+1480089-64a1.patch
+1481338-64a1.patch
+1138579-64a1.patch
+1491788-1only-64a1.patch
+1473915-64a1.patch
+1488181-64a1.patch
+1489757-64a1.patch
+1492037-64a1.patch
+1492770-64a1.patch
+1448417-1-64a1.patch
+1448417-2-64a1.patch
+1493142-64a1.patch
+1477490-64a1.patch
+1237610-4-64a1.patch
+1237610-2-PARTIAL-64a1.patch
+1351501-1-64a1.patch
+1351501-2-64a1.patch
+1492915-64a1.patch
+1492341-64a1.patch
+1393570-3only-64a1.patch
 1336712-1-64a1.patch
 1336712-2-64a1.patch
 1336712-3-64a1.patch
 1336712-4-64a1.patch
 1336712-5-64a1.patch
 1336712-6-64a1.patch
-1336712-7-64a1.patch
-1489287-64a1.patch
-1486410-64a1.patch
-1488687-64a1.patch
-1488778-64a1.patch
-1486759-64a1.patch
-1489096-64a1.patch
-1491788-64a1.patch
-1477490-64a1.patch
-1480089-64a1.patch
-1473217-1-64a1.patch
-1492770-64a1.patch
-1481338-64a1.patch
+1485638-1-64a1.patch
+1485638-2-64a1.patch
+1492599-64a1.patch
+1492601-64a1.patch
 1493672-64a1.patch
+1493641-64a1.patch
+1493590-64a1.patch
 1493922-64a1.patch
+1491889-1-64a1.patch
+1491889-2-64a1.patch
+1420028-2-fix-64a1.patch
+1482435-64a1.patch
+1448417-3-64a1.patch
+1494038-64a1.patch
+1438975-1-64a1.patch
+1438975-2-64a1.patch
+1494150-64a1.patch
+1438830-64a1.patch
+1494178-1-64a1.patch
+1494178-2-64a1.patch
+1490240-64a1.patch
+715884-64a1.patch
+1494398-64a1.patch
 1492508-64a1.patch
 1494384-64a1.patch
+1494511-64a1.patch
+1494503-64a1.patch
+1493227-64a1.patch
+1494300-64a1.patch
+1469027-3only-64a1.patch
+1493413-64a1.patch
+1486055-64a1.patch
+1336712-7-64a1.patch
+1491419-1-64a1.patch
+1491419-2-64a1.patch
+1491419-3-64a1.patch
+1491419-4-64a1.patch
+1491419-5-64a1.patch
+1491419-6-64a1.patch
+1491419-7-64a1.patch
+1491419-8-64a1.patch
+1491419-9-64a1.patch
 1494326-64a1.patch
-1492037-64a1.patch
-1493641-64a1.patch
-1495641-64a1.patch
+1493788-1-64a1.patch
+1493788-2-64a1.patch
+1492526-64a1.patch
+1478843-64a1.patch
+1494216-64a1.patch
+1493345-64a1.patch
+1496136-64a1.patch
 1487321-64a1.patch
 1496084-64a1.patch
 1494951-64a1.patch
+1443332-64a1.patch
+1496080-64a1.patch
+1495874-64a1.patch
+1491848-64a1.patch
+1397263-1-64a1.patch
+1397263-2-64a1.patch
+1397263-3-64a1.patch
+1397263-4-64a1.patch
+1397263-5-PARTIAL-64a1.patch
+1397263-6-64a1.patch
 1253844-64a1.patch
+1496327-1-64a1.patch
+1496327-2-64a1.patch
+1496610-64a1.patch
+1495641-64a1.patch
 1496379-64a1.patch
+1496591-64a1.patch
+1494222-1-64a1.patch
+1494222-2no3to5-64a1.patch
 1414287-1-64a1.patch
 1414287-2no3-64a1.patch
-1427808-3-64a1.patch
-1427808-4-64a1.patch
-1486554-1-64a1.patch
-1486554-3no2-64a1.patch
-1479298-64a1.patch
-1498958-64a1.patch
-1492401-64a1.patch
+1490227-64a1.patch
+1490253-1-64a1.patch
+1496733-64a1.patch
+1496708-1-64a1.patch
+1496708-2-64a1.patch
+1496501-64a1.patch
+1497440-1only-64a1.patch
+1275926-1-64a1.patch
+1275926-2-64a1.patch
+1495514-64a1.patch
+1497350-64a1.patch
+1497677-64a1.patch
 1471622-4-64a1.patch
 1471622-5-64a1.patch
 1471622-6-64a1.patch
-1471622-7-64a1.patch
-1471622-8-64a1.patch
-1438830-64a1.patch
-1399877-64a1.patch
-1481097-5-64a1.patch
-1490128-64a1.patch
-1490253-1-64a1.patch
 1490253-2-64a1.patch
-1490253-3-64a1.patch
-1487049-1-64a1.patch
-1487049-2-64a1.patch
-1487049-3-64a1.patch
-1473915-64a1.patch
-1495874-64a1.patch
-1491848-64a1.patch
-1490566-64a1.patch
-1490765-64a1.patch
-1474488-2only-64a1.patch
-1490463-1-64a1.patch
-1490463-2-64a1.patch
-1490463-3-64a1.patch
-1138579-64a1.patch
-1443332-64a1.patch
-1490542-64a1.patch
-1490130-64a1.patch
-1494511-64a1.patch
-1494503-64a1.patch
-1491577-4-64a1.patch
-1487931-64a1.patch
-1488587-64a1.patch
-1489205-64a1.patch
-1393570-3only-64a1.patch
-1494300-64a1.patch
+1497439-64a1.patch
+1479298-64a1.patch
+1497586-64a1.patch
+1497741-64a1.patch
 1481612-1-64a1.patch
 1481612-2-64a1.patch
 1481612-3-64a1.patch
 1481612-4-64a1.patch
-1485638-1-64a1.patch
-1485638-2-64a1.patch
-1482435-64a1.patch
-1496080-64a1.patch
-1491615-64a1.patch
-1486866-64a1.patch
-1448417-1-64a1.patch
-1448417-2-64a1.patch
-1448417-3-64a1.patch
+1483651-64a1.patch
+1467523-2-64a1.patch
+1390547-64a1.patch
+1497359-64a1.patch
+1471622-7-64a1.patch
+1494287-1-64a1.patch
+1494287-2-64a1.patch
+1498289-64a1.patch
+1498519-64a1.patch
+1497692-64a1.patch
+1427808-3-64a1.patch
+1427808-4-64a1.patch
 1494069-1-64a1.patch
 1494069-2-64a1.patch
+1498274-64a1.patch
+1490253-3-64a1.patch
+1498031-64a1.patch
+1498958-64a1.patch
 1494069-3-64a1.patch
 1494069-4-64a1.patch
 1494069-5-64a1.patch
 1494069-6-64a1.patch
 1494069-7-64a1.patch
 1494069-8-64a1.patch
-1493345-64a1.patch
-1079662-1-64a1.patch
-1079662-2-64a1.patch
-1079662-3-64a1.patch
+1482425-64a1.patch
+1499580-64a1.patch
+1486554-1-64a1.patch
+1486554-3no2-64a1.patch
 1489443-64a1.patch
-1491132-64a1.patch
-1492365-64a1.patch
-1486086-64a1.patch
-1487811-1-64a1.patch
-1487811-2-64a1.patch
-1487811-3-64a1.patch
-1487811-4-64a1.patch
-1351501-1-64a1.patch
-1351501-2-64a1.patch
-1491889-1-64a1.patch
-1491889-2-64a1.patch
-1494178-1-64a1.patch
-1494178-2-64a1.patch
-1495514-64a1.patch
-1496501-64a1.patch
-1489757-60.patch
-1492915-60.patch
-1478843-60.patch
-1500484-64a1.patch
-979649-1-64a1.patch
-1493788-1-64a1.patch
-1493788-2-64a1.patch
-1491236-64a1.patch
-1488307-64a1.patch
-1493142-64a1.patch
-1494216-64a1.patch
-1490738-64a1.patch
-1492526-64a1.patch
 1499510-64a1.patch
+1499778-64a1.patch
+1499198-64a1.patch
 1375861-64a1.patch
+1458129-64a1.patch
 1500447-64a1.patch
-1490589-64a1.patch
-1471888-1-64a1.patch
-1483651-64a1.patch
-1480834-64a1.patch
-1490549-3-64a1.patch
-1237610-3-64a1.patch
-1499778-64a1.patch
-1489052-64a1.patch
-1498519-64a1.patch
+1498765-64a1.patch
 1500377-1-64a1.patch
 1500377-2-64a1.patch
-1493590-64a1.patch
-1499198-64a1.patch
-1494038-64a1.patch
-715884-64a1.patch
-1438975-1-64a1.patch
-1438975-2-64a1.patch
-1275926-1-64a1.patch
-1275926-2-64a1.patch
-1491489-64a1.patch
-1491419-1-64a1.patch
-1491419-2-64a1.patch
-1491419-3-64a1.patch
-1491419-4-64a1.patch
-1491419-5-64a1.patch
-1491419-6-64a1.patch
-1491419-7-64a1.patch
-1491419-8-64a1.patch
-1491419-9-64a1.patch
-1498289-64a1.patch
-1489021-64a1.patch
-1488523-2-64a1.patch
-1372826-64a1.patch
-1490725-64a1.patch
-1463048-64a1.patch
-1488181-64a1.patch
-1492341-64a1.patch
-1490240-64a1.patch
-1390547-64a1.patch
-1497692-64a1.patch
-1498274-64a1.patch
-1498765-64a1.patch
-1492599-64a1.patch
-1492601-64a1.patch
-1494398-64a1.patch
-1497586-64a1.patch
-1489550-64a1.patch
-1476062-64a1.patch
-1488217-64a1.patch
-1489454-libmar-64a1.patch
-1458129-64a1.patch
+1500484-64a1.patch
 1499844-65a1.patch
 1498072-65a1.patch
 1501712-65a1.patch
@@ -4825,10 +4829,6 @@ NOBUG-20180824-buildsetting-63a1.patch
 1502159-1-65a1.patch
 1502159-2-65a1.patch
 1504727-65a1.patch
-1489698-1-64a1.patch
-1489698-2-64a1.patch
-1489698-3-64a1.patch
-1489698-4-64a1.patch
 1489698-5-65a1.patch
 1489698-6-65a1.patch
 1489698-7-65a1.patch