Merging upstream version 126.0.

Signed-off-by: Daniel Baumann <daniel.baumann@progress-linux.org>

12 files changed, 40 insertions, 18 deletions

diff --git a/config/createprecomplete.py b/config/createprecomplete.py
index 8c5fceefaa..f3ac8c6713 100644
--- a/config/createprecomplete.py
+++ b/config/createprecomplete.py
@@ -24,7 +24,11 @@ def get_build_entries(root_path):
             if not (
                 rel_path_file.endswith("channel-prefs.js")
                 or rel_path_file.endswith("update-settings.ini")
-                or rel_path_file.find("distribution/") != -1
+                or "/ChannelPrefs.framework/" in rel_path_file
+                or rel_path_file.startswith("ChannelPrefs.framework/")
+                or "/UpdateSettings.framework/" in rel_path_file
+                or rel_path_file.startswith("UpdateSettings.framework/")
+                or "distribution/" in rel_path_file
             ):
                 rel_file_path_set.add(rel_path_file)
 
diff --git a/config/external/ffi/preprocess_libffi_asm.py b/config/external/ffi/preprocess_libffi_asm.py
index 4808c3a7e4..f8d7d68fce 100644
--- a/config/external/ffi/preprocess_libffi_asm.py
+++ b/config/external/ffi/preprocess_libffi_asm.py
@@ -1,6 +1,6 @@
 # -*- Mode: python; indent-tabs-mode: nil; tab-width: 40 -*-
 # vim: set filetype=python:
-# This Souce Code Form is subject to the terms of the Mozilla Public
+# 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 distibuted with this
 # file, You can obtain one at http://mozilla.org/MPL/2.0/.
 
diff --git a/config/external/ffi/subst_header.py b/config/external/ffi/subst_header.py
index e1448ff889..f8fa5b4753 100644
--- a/config/external/ffi/subst_header.py
+++ b/config/external/ffi/subst_header.py
@@ -1,6 +1,6 @@
 # -*- Mode: python; indent-tabs-mode: nil; tab-width: 40 -*-
 # vim: set filetype=python:
-# This Souce Code Form is subject to the terms of the Mozilla Public
+# 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 distibuted with this
 # file, You can obtain one at http://mozilla.org/MPL/2.0/.
 
diff --git a/config/external/gkcodecs/gkcodecs.symbols b/config/external/gkcodecs/gkcodecs.symbols
index 12cb274c70..8aa191be9e 100644
--- a/config/external/gkcodecs/gkcodecs.symbols
+++ b/config/external/gkcodecs/gkcodecs.symbols
@@ -98,6 +98,8 @@ opus_packet_get_nb_frames
 opus_packet_get_samples_per_frame
 opus_packet_parse
 opus_strerror
+opus_multistream_encode_float
+opus_multistream_surround_encoder_create
 # libtheora symbols
 th_comment_clear
 th_comment_init
@@ -127,6 +129,19 @@ vorbis_synthesis_init
 vorbis_synthesis_pcmout
 vorbis_synthesis_read
 vorbis_synthesis_restart
+vorbis_encode_ctl
+vorbis_bitrate_addblock
+vorbis_analysis_buffer
+vorbis_analysis_blockout
+vorbis_encode_setup_vbr
+vorbis_analysis
+vorbis_analysis_init
+vorbis_analysis_headerout
+vorbis_encode_setup_init
+vorbis_encode_setup_managed
+vorbis_comment_add_tag
+vorbis_bitrate_flushpacket
+vorbis_analysis_wrote
 # libvpx symbols
 #ifndef MOZ_SYSTEM_LIBVPX
 vpx_codec_build_config
@@ -156,3 +171,4 @@ vpx_img_alloc
 vpx_img_free
 vpx_img_wrap
 #endif
+#
diff --git a/config/external/icu/defs.mozbuild b/config/external/icu/defs.mozbuild
index d6d75358ef..3c9cb1a31f 100644
--- a/config/external/icu/defs.mozbuild
+++ b/config/external/icu/defs.mozbuild
@@ -50,7 +50,6 @@ AllowCompilerWarnings()
 # warnings that get triggered for every file.
 if CONFIG["CC_TYPE"] in ("clang", "clang-cl"):
     CFLAGS += [
-        "-Wno-c++20-compat",
         "-Wno-comma",
         "-Wno-implicit-const-int-float-conversion",
         "-Wno-macro-redefined",
@@ -60,7 +59,6 @@ if CONFIG["CC_TYPE"] in ("clang", "clang-cl"):
         "-Wno-unreachable-code-return",
     ]
     CXXFLAGS += [
-        "-Wno-c++20-compat",
         "-Wno-comma",
         "-Wno-implicit-const-int-float-conversion",
         "-Wno-macro-redefined",
diff --git a/config/external/moz.build b/config/external/moz.build
index f9f0113216..b6e174c5d6 100644
--- a/config/external/moz.build
+++ b/config/external/moz.build
@@ -27,7 +27,7 @@ DIRS += [
     "/third_party/sipcc",
 ]
 
-# There's no "native" brotli or woff2 yet, but probably in the future...
+# There's no "native" brotli, zstd or woff2 yet, but probably in the future...
 external_dirs += ["modules/brotli"]
 external_dirs += ["modules/woff2"]
 
diff --git a/config/external/wasm2c_sandbox_compiler/preprocess_wasm2c_config.py b/config/external/wasm2c_sandbox_compiler/preprocess_wasm2c_config.py
index 3edb8f4e06..8be0859798 100644
--- a/config/external/wasm2c_sandbox_compiler/preprocess_wasm2c_config.py
+++ b/config/external/wasm2c_sandbox_compiler/preprocess_wasm2c_config.py
@@ -1,6 +1,6 @@
 # -*- Mode: python; indent-tabs-mode: nil; tab-width: 40 -*-
 # vim: set filetype=python:
-# This Souce Code Form is subject to the terms of the Mozilla Public
+# 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 distibuted with this
 # file, You can obtain one at http://mozilla.org/MPL/2.0/.
 
diff --git a/config/makefiles/rust.mk b/config/makefiles/rust.mk
index b10594f5cb..52c4e402f9 100644
--- a/config/makefiles/rust.mk
+++ b/config/makefiles/rust.mk
@@ -148,7 +148,9 @@ endif # MOZ_CODE_COVERAGE
 endif # WINNT
 
 ifeq (WINNT,$(HOST_OS_ARCH))
-normalize_sep = $(subst \,/,$(1))
+# //?/ is the long path prefix which seems to confuse make, so we remove it
+# (things should work without it).
+normalize_sep = $(patsubst //?/%,%,$(subst \,/,$(1)))
 else
 normalize_sep = $(1)
 endif
@@ -467,12 +469,12 @@ endef
 # spaces with some unlikely string for the foreach, and replace them back in the
 # loop itself.
 define make_cargo_rule
-$(notdir $(1))_deps := $$(wordlist 2, 10000000, $$(if $$(wildcard $(basename $(1)).d),$$(shell cat $(basename $(1)).d)))
+$(notdir $(1))_deps := $$(call normalize_sep,$$(wordlist 2, 10000000, $$(if $$(wildcard $(basename $(1)).d),$$(shell cat $(basename $(1)).d))))
 $(1): $(CARGO_FILE) $(3) $(topsrcdir)/Cargo.lock $$(if $$($(notdir $(1))_deps),$$($(notdir $(1))_deps),$(2))
 	$$(REPORT_BUILD)
 	$$(if $$($(notdir $(1))_deps),+$(MAKE) $(2),:)
 
-$$(foreach dep, $$(call normalize_sep,$$(subst \ ,_^_^_^_,$$($(notdir $(1))_deps))),$$(eval $$(call make_default_rule,$$(subst _^_^_^_,\ ,$$(dep)))))
+$$(foreach dep, $$(subst \ ,_^_^_^_,$$($(notdir $(1))_deps)),$$(eval $$(call make_default_rule,$$(subst _^_^_^_,\ ,$$(dep)))))
 endef
 
 ifdef RUST_LIBRARY_FILE
diff --git a/config/milestone.txt b/config/milestone.txt
index 53010bea47..5b476c5ba8 100644
--- a/config/milestone.txt
+++ b/config/milestone.txt
@@ -10,4 +10,4 @@
 # hardcoded milestones in the tree from these two files.
 #--------------------------------------------------------
 
-125.0.3
+126.0
diff --git a/config/moz.build b/config/moz.build
index 3280aac27e..9ad0268c25 100644
--- a/config/moz.build
+++ b/config/moz.build
@@ -112,5 +112,5 @@ if CONFIG["COMPILE_ENVIRONMENT"] and CONFIG["CBINDGEN"]:
         "cbindgen-metadata.json",
         script="/build/RunCbindgen.py",
         entry_point="generate_metadata",
-        inputs=["!/.cargo/config"],
+        inputs=["!/.cargo/config.toml"],
     )
diff --git a/config/mozunit/mozunit/mozunit.py b/config/mozunit/mozunit/mozunit.py
index 28009425b6..4bd250647d 100644
--- a/config/mozunit/mozunit/mozunit.py
+++ b/config/mozunit/mozunit/mozunit.py
@@ -166,10 +166,11 @@ class _MockBaseOpen(object):
         self,
         name,
         mode="r",
-        buffering=None,
+        buffering=-1,
         encoding=None,
-        newline=None,
         errors=None,
+        newline=None,
+        closefd=True,
         opener=None,
     ):
         # open() can be called with an integer "name" (i.e. a file descriptor).
@@ -181,8 +182,9 @@ class _MockBaseOpen(object):
                 mode=mode,
                 buffering=buffering,
                 encoding=encoding,
-                newline=newline,
                 errors=errors,
+                newline=newline,
+                closefd=closefd,
                 opener=opener,
             )
         # buffering is ignored.
diff --git a/config/recurse.mk b/config/recurse.mk
index a2e10e6a18..6afad04c2e 100644
--- a/config/recurse.mk
+++ b/config/recurse.mk
@@ -202,15 +202,15 @@ endif
 $(addprefix build/unix/stdc++compat/,target host) build/clang-plugin/host: config/export
 
 # Rust targets, and export targets that run cbindgen need
-# $topobjdir/.cargo/config to be preprocessed first. Ideally, we'd only set it
+# $topobjdir/.cargo/config.toml to be preprocessed first. Ideally, we'd only set it
 # as a dependency of the rust targets, but unfortunately, that pushes Make to
 # execute them much later than we'd like them to be when the file doesn't exist
 # prior to Make running. So we also set it as a dependency of pre-export, which
 # ensures it exists before recursing the rust targets and the export targets
 # that run cbindgen, tricking Make into keeping them early.
-$(rust_targets): $(DEPTH)/.cargo/config
+$(rust_targets): $(DEPTH)/.cargo/config.toml
 ifndef TEST_MOZBUILD
-recurse_pre-export: $(DEPTH)/.cargo/config
+recurse_pre-export: $(DEPTH)/.cargo/config.toml
 endif
 
 endif