Browse Source

Fix up 1639815-1 and subsequent TOP patches

Ian Neal 1 month ago
parent
commit
6cff282cf0

+ 2 - 1
mozilla-release/patches/1639815-1-78a1.patch

@@ -47,7 +47,7 @@ diff --git a/build/moz.configure/old.configure b/build/moz.configure/old.configu
 diff --git a/js/moz.configure b/js/moz.configure
 diff --git a/js/moz.configure b/js/moz.configure
 --- a/js/moz.configure
 --- a/js/moz.configure
 +++ b/js/moz.configure
 +++ b/js/moz.configure
-@@ -443,8 +443,17 @@ js_option('--enable-new-regexp', default
+@@ -443,8 +443,18 @@ js_option('--enable-new-regexp', default
  
  
  @depends('--enable-new-regexp')
  @depends('--enable-new-regexp')
  def enable_new_regexp(value):
  def enable_new_regexp(value):
@@ -57,6 +57,7 @@ diff --git a/js/moz.configure b/js/moz.configure
  set_config('ENABLE_NEW_REGEXP', enable_new_regexp)
  set_config('ENABLE_NEW_REGEXP', enable_new_regexp)
  set_define('ENABLE_NEW_REGEXP', enable_new_regexp)
  set_define('ENABLE_NEW_REGEXP', enable_new_regexp)
 +
 +
++
 +# Options for generating the shell as a script
 +# Options for generating the shell as a script
 +# ============================================
 +# ============================================
 +js_option('--with-qemu-exe', nargs=1, help='Use path as an arm emulator on host platforms')
 +js_option('--with-qemu-exe', nargs=1, help='Use path as an arm emulator on host platforms')

+ 2 - 2
mozilla-release/patches/TOP-NOBUG-REGEXP-21-1634135-78a1-25318.patch

@@ -1,7 +1,7 @@
 # HG changeset patch
 # HG changeset patch
 # User Dmitry Butskoy <buc@buc.me>
 # User Dmitry Butskoy <buc@buc.me>
 # Date 1690630056 -7200
 # Date 1690630056 -7200
-# Parent  88db666f7bc8ba2359b4af32faa4bfe2e9ae2e2a
+# Parent  ed67bffe8a725bb51ec5896a3fcde17104e119d5
 No Bug - Import new regexp V8 engine. r=frg a=frg
 No Bug - Import new regexp V8 engine. r=frg a=frg
 
 
 diff --git a/js/moz.configure b/js/moz.configure
 diff --git a/js/moz.configure b/js/moz.configure
@@ -28,7 +28,7 @@ diff --git a/js/moz.configure b/js/moz.configure
  set_config('ENABLE_NEW_REGEXP', enable_new_regexp)
  set_config('ENABLE_NEW_REGEXP', enable_new_regexp)
  set_define('ENABLE_NEW_REGEXP', enable_new_regexp)
  set_define('ENABLE_NEW_REGEXP', enable_new_regexp)
  
  
- # Options for generating the shell as a script
+ 
 diff --git a/js/src/new-regexp/RegExpAPI.cpp b/js/src/new-regexp/RegExpAPI.cpp
 diff --git a/js/src/new-regexp/RegExpAPI.cpp b/js/src/new-regexp/RegExpAPI.cpp
 --- a/js/src/new-regexp/RegExpAPI.cpp
 --- a/js/src/new-regexp/RegExpAPI.cpp
 +++ b/js/src/new-regexp/RegExpAPI.cpp
 +++ b/js/src/new-regexp/RegExpAPI.cpp

+ 3 - 2
mozilla-release/patches/TOP-NOBUG-REGEXP-37-1642493-79a1-25318.patch

@@ -1,7 +1,7 @@
 # HG changeset patch
 # HG changeset patch
 # User Dmitry Butskoy <buc@buc.me>
 # User Dmitry Butskoy <buc@buc.me>
 # Date 1690631112 -7200
 # Date 1690631112 -7200
-# Parent  c1c73ffd8377118044aa2a0e4bc5f98d78cf8c2d
+# Parent  71cebaa65c11a081b568af26ea388fc813faa2c1
 No Bug - Import new regexp V8 engine. r=frg a=frg
 No Bug - Import new regexp V8 engine. r=frg a=frg
 
 
 diff --git a/.clang-format-ignore b/.clang-format-ignore
 diff --git a/.clang-format-ignore b/.clang-format-ignore
@@ -23,7 +23,7 @@ diff --git a/.clang-format-ignore b/.clang-format-ignore
 diff --git a/js/moz.configure b/js/moz.configure
 diff --git a/js/moz.configure b/js/moz.configure
 --- a/js/moz.configure
 --- a/js/moz.configure
 +++ b/js/moz.configure
 +++ b/js/moz.configure
-@@ -431,29 +431,16 @@ js_option('--enable-pipeline-operator', 
+@@ -431,30 +431,16 @@ js_option('--enable-pipeline-operator', 
  @depends('--enable-pipeline-operator')
  @depends('--enable-pipeline-operator')
  def enable_pipeline_operator(value):
  def enable_pipeline_operator(value):
      if value:
      if value:
@@ -44,6 +44,7 @@ diff --git a/js/moz.configure b/js/moz.configure
 -
 -
 -set_config('ENABLE_NEW_REGEXP', enable_new_regexp)
 -set_config('ENABLE_NEW_REGEXP', enable_new_regexp)
 -set_define('ENABLE_NEW_REGEXP', enable_new_regexp)
 -set_define('ENABLE_NEW_REGEXP', enable_new_regexp)
+-
 -
 -
  # Options for generating the shell as a script
  # Options for generating the shell as a script
  # ============================================
  # ============================================