Beta channel release: 111.0.5563.19.

Since it matches dev channel version, merge branch 'dev' into beta. 

13 files changed, 24 insertions, 39 deletions

diff --git a/build/chromium-patches/angle-use-pkg-config.patch b/build/chromium-patches/angle-use-pkg-config.patch
index bdf82a6..56c6252 100644
--- a/build/chromium-patches/angle-use-pkg-config.patch
+++ b/build/chromium-patches/angle-use-pkg-config.patch
@@ -6,7 +6,7 @@ Author: Olivier Tilloy <olivier.tilloy@canonical.com>
 
 --- a/third_party/angle/BUILD.gn
 +++ b/third_party/angle/BUILD.gn
-@@ -881,6 +881,13 @@ config("angle_backend_config") {
+@@ -898,6 +898,13 @@ config("angle_backend_config") {
 }
 }
 
@@ -20,7 +20,7 @@ Author: Olivier Tilloy <olivier.tilloy@canonical.com>
 config("libANGLE_config") {
 cflags = []
 defines = []
-@@ -905,6 +912,7 @@ config("libANGLE_config") {
+@@ -922,6 +929,7 @@ config("libANGLE_config") {
 
 if (angle_use_x11) {
 defines += [ "ANGLE_USE_X11" ]
diff --git a/build/chromium-patches/build-script-limit-compile-jobs.patch b/build/chromium-patches/build-script-limit-compile-jobs.patch
index 418f8a9..8a98f0c 100644
--- a/build/chromium-patches/build-script-limit-compile-jobs.patch
+++ b/build/chromium-patches/build-script-limit-compile-jobs.patch
@@ -7,7 +7,7 @@ Forwarded: not-needed
 
 --- a/tools/clang/scripts/build.py
 +++ b/tools/clang/scripts/build.py
-@@ -828,6 +828,10 @@ def main():
+@@ -853,6 +853,10 @@ def main():
 '-D' + f
 for f in compiler_rt_cmake_flags(sanitizers=False, profile=args.pgo)
 ])
diff --git a/build/chromium-patches/chromedriver-snap-compatibility.patch b/build/chromium-patches/chromedriver-snap-compatibility.patch
index 7f09a7e..f794b07 100644
--- a/build/chromium-patches/chromedriver-snap-compatibility.patch
+++ b/build/chromium-patches/chromedriver-snap-compatibility.patch
@@ -10,7 +10,7 @@ Forwarded: not-needed
 
 --- a/chrome/test/chromedriver/chrome_launcher.cc
 +++ b/chrome/test/chromedriver/chrome_launcher.cc
-@@ -133,6 +133,8 @@ Status PrepareDesktopCommandLine(const C
+@@ -132,6 +132,8 @@ Status PrepareDesktopCommandLine(const C
 std::vector<std::string>* extension_bg_pages,
 base::FilePath* user_data_dir) {
 base::FilePath program = capabilities.binary;
diff --git a/build/chromium-patches/dawn-use-pkg-config.patch b/build/chromium-patches/dawn-use-pkg-config.patch
index cf96cec..499ad55 100644
--- a/build/chromium-patches/dawn-use-pkg-config.patch
+++ b/build/chromium-patches/dawn-use-pkg-config.patch
@@ -6,7 +6,7 @@ Author: Olivier Tilloy <olivier.tilloy@canonical.com>
 
 --- a/third_party/dawn/src/dawn/native/BUILD.gn
 +++ b/third_party/dawn/src/dawn/native/BUILD.gn
-@@ -77,6 +77,13 @@ config("vulkan_rpath") {
+@@ -80,6 +80,13 @@ config("vulkan_rpath") {
 "@executable_path/",
 ]
 }
@@ -20,7 +20,7 @@ Author: Olivier Tilloy <olivier.tilloy@canonical.com>
 }
 
 # Config that adds include directory for vulkan-tools.
-@@ -358,6 +365,7 @@ source_set("sources") {
+@@ -361,6 +368,7 @@ source_set("sources") {
 "XlibXcbFunctions.cpp",
 "XlibXcbFunctions.h",
 ]
@@ -28,7 +28,7 @@ Author: Olivier Tilloy <olivier.tilloy@canonical.com>
 }
 
 # Only win32 app needs to link with user32.lib
-@@ -761,6 +769,10 @@ dawn_component("native") {
+@@ -764,6 +772,10 @@ dawn_component("native") {
 ":vulkan_rpath",
 ]
 
diff --git a/build/chromium-patches/dont-collect-motherboard-metrics.patch b/build/chromium-patches/dont-collect-motherboard-metrics.patch
index 82ac9e2..e63b869 100644
--- a/build/chromium-patches/dont-collect-motherboard-metrics.patch
+++ b/build/chromium-patches/dont-collect-motherboard-metrics.patch
@@ -6,7 +6,7 @@ Forwarded: not-needed
 
 --- a/components/metrics/motherboard.cc
 +++ b/components/metrics/motherboard.cc
-@@ -41,31 +41,7 @@ using base::TrimWhitespaceASCII;
+@@ -43,31 +43,7 @@ using base::TrimWhitespaceASCII;
 using base::TRIM_TRAILING;
 
 MotherboardDetails ReadMotherboardDetails() {
diff --git a/build/chromium-patches/enable-webrtc-pipewire-capturer.patch b/build/chromium-patches/enable-webrtc-pipewire-capturer.patch
deleted file mode 100644
index cce38c8..0000000
--- a/build/chromium-patches/enable-webrtc-pipewire-capturer.patch
+++ /dev/null
@@ -1,16 +0,0 @@
-Description: For screen capture to work in Wayland, enable Pipewire.
-Author: Nathan Pratta Teodosio <nathan.teodosio@canonical.com>
-Forwarded: no
-Ubuntu-bug: https://launchpad.net/bugs/1950040
-
---- a/content/public/common/content_features.cc
-+++ b/content/public/common/content_features.cc
-@@ -1436,7 +1436,7 @@ BASE_FEATURE(kRetryGetVideoCaptureDevice
- // Wayland display server.
- BASE_FEATURE(kWebRtcPipeWireCapturer,
- "WebRTCPipeWireCapturer",
-- base::FEATURE_DISABLED_BY_DEFAULT);
-+ base::FEATURE_ENABLED_BY_DEFAULT);
- #endif // defined(WEBRTC_USE_PIPEWIRE)
- 
- enum class VideoCaptureServiceConfiguration {
diff --git a/build/chromium-patches/gn-no-last-commit-position.patch b/build/chromium-patches/gn-no-last-commit-position.patch
index e66df70..32b9e98 100644
--- a/build/chromium-patches/gn-no-last-commit-position.patch
+++ b/build/chromium-patches/gn-no-last-commit-position.patch
@@ -4,12 +4,12 @@ Forwarded: not-needed
 
 --- a/tools/gn/bootstrap/bootstrap.py
 +++ b/tools/gn/bootstrap/bootstrap.py
-@@ -120,8 +120,6 @@ def main(argv):
+@@ -121,8 +121,6 @@ def main(argv):
 cmd.append('--debug')
 subprocess.check_call(cmd)
 
 - shutil.copy2(
 - os.path.join(BOOTSTRAP_DIR, 'last_commit_position.h'), gn_build_dir)
- subprocess.check_call(
- [ninja_binary, '-C', gn_build_dir, '-w', 'dupbuild=err', 'gn'])
- shutil.copy2(os.path.join(gn_build_dir, 'gn'), gn_path)
+ cmd = [ninja_binary, '-C', gn_build_dir, '-w', 'dupbuild=err', 'gn']
+ if options.jobs:
+ cmd += ['-j', str(options.jobs)]
diff --git a/build/chromium-patches/linker-oom-armhf.patch b/build/chromium-patches/linker-oom-armhf.patch
index 7efac9b..a1d44f7 100644
--- a/build/chromium-patches/linker-oom-armhf.patch
+++ b/build/chromium-patches/linker-oom-armhf.patch
@@ -8,7 +8,7 @@ Forwarded: not-needed
 
 --- a/build/config/compiler/BUILD.gn
 +++ b/build/config/compiler/BUILD.gn
-@@ -491,6 +491,10 @@ config("compiler") {
+@@ -504,6 +504,10 @@ config("compiler") {
 # error. "-lpthread" is added in //build/config:default_libs.
 }
 
diff --git a/build/chromium-patches/search-credit.patch b/build/chromium-patches/search-credit.patch
index 97b0033..4a43828 100644
--- a/build/chromium-patches/search-credit.patch
+++ b/build/chromium-patches/search-credit.patch
@@ -24,7 +24,7 @@ Forwarded: not-needed
 "type": "SEARCH_ENGINE_DUCKDUCKGO",
 --- a/components/search_engines/template_url.cc
 +++ b/components/search_engines/template_url.cc
-@@ -996,6 +996,9 @@ std::string TemplateURLRef::HandleReplac
+@@ -995,6 +995,9 @@ std::string TemplateURLRef::HandleReplac
 
 std::string url = parsed_url_;
 
@@ -34,7 +34,7 @@ Forwarded: not-needed
 // replacements_ is ordered in ascending order, as such we need to iterate
 // from the back.
 for (const Replacement& replacement : base::Reversed(replacements_)) {
-@@ -1121,6 +1124,7 @@ std::string TemplateURLRef::HandleReplac
+@@ -1117,6 +1120,7 @@ std::string TemplateURLRef::HandleReplac
 
 case GOOGLE_BASE_URL:
 DCHECK(!replacement.is_post_param);
@@ -42,7 +42,7 @@ Forwarded: not-needed
 HandleReplacement(std::string(), search_terms_data.GoogleBaseURLValue(),
 replacement, &url);
 break;
-@@ -1247,7 +1251,8 @@ std::string TemplateURLRef::HandleReplac
+@@ -1243,7 +1247,8 @@ std::string TemplateURLRef::HandleReplac
 
 case GOOGLE_SEARCH_CLIENT: {
 DCHECK(!replacement.is_post_param);
@@ -52,7 +52,7 @@ Forwarded: not-needed
 if (!client.empty())
 HandleReplacement("client", client, replacement, &url);
 break;
-@@ -1384,6 +1389,13 @@ std::string TemplateURLRef::HandleReplac
+@@ -1392,6 +1397,13 @@ std::string TemplateURLRef::HandleReplac
 }
 }
 
diff --git a/build/chromium-patches/set-rpath-on-chromium-executables.patch b/build/chromium-patches/set-rpath-on-chromium-executables.patch
index 1e0ba28..cfa0a99 100644
--- a/build/chromium-patches/set-rpath-on-chromium-executables.patch
+++ b/build/chromium-patches/set-rpath-on-chromium-executables.patch
@@ -5,7 +5,7 @@ Forwarded: not-needed
 
 --- a/chrome/BUILD.gn
 +++ b/chrome/BUILD.gn
-@@ -337,6 +337,8 @@ if (!is_android && !is_mac) {
+@@ -340,6 +340,8 @@ if (!is_android && !is_mac) {
 "//ui/base",
 ]
 }
@@ -16,7 +16,7 @@ Forwarded: not-needed
 if (is_chromeos_ash || is_win) {
 --- a/tools/v8_context_snapshot/BUILD.gn
 +++ b/tools/v8_context_snapshot/BUILD.gn
-@@ -111,6 +111,10 @@ if (use_v8_context_snapshot) {
+@@ -110,6 +110,10 @@ if (use_v8_context_snapshot) {
 "//v8",
 ]
 
diff --git a/build/chromium-patches/swiftshader-use-pkg-config.patch b/build/chromium-patches/swiftshader-use-pkg-config.patch
index ad27f3d..331d301 100644
--- a/build/chromium-patches/swiftshader-use-pkg-config.patch
+++ b/build/chromium-patches/swiftshader-use-pkg-config.patch
@@ -19,7 +19,7 @@ Author: Olivier Tilloy <olivier.tilloy@canonical.com>
 }
 
 swiftshader_source_set("WSI") {
-@@ -93,4 +99,8 @@ swiftshader_source_set("WSI") {
+@@ -94,4 +100,8 @@ swiftshader_source_set("WSI") {
 }
 
 configs = [ "../Vulkan:swiftshader_libvulkan_private_config" ]
diff --git a/build/chromium-patches/title-bar-default-system.patch-v35 b/build/chromium-patches/title-bar-default-system.patch-v35
index 84904d3..0368c29 100644
--- a/build/chromium-patches/title-bar-default-system.patch-v35
+++ b/build/chromium-patches/title-bar-default-system.patch-v35
@@ -3,7 +3,7 @@ Forwarded: not-needed
 
 --- a/ui/base/x/x11_util.cc
 +++ b/ui/base/x/x11_util.cc
-@@ -474,6 +474,8 @@ bool HasWMSpecProperty(const base::flat_
+@@ -473,6 +473,8 @@ bool HasWMSpecProperty(const base::flat_
 }
 
 bool GetCustomFramePrefDefault() {
diff --git a/snapcraft.yaml b/snapcraft.yaml
index 3d4ec43..898aebd 100644
--- a/snapcraft.yaml
+++ b/snapcraft.yaml
@@ -115,8 +115,8 @@ parts:
 
 chromium:
 plugin: nil
- source: https://commondatastorage.googleapis.com/chromium-browser-official/chromium-110.0.5481.77.tar.xz
- source-checksum: sha512/5c10732a506c3f994bf4618aa1b0cac2a69f638095320d1c2c0ccff1853398073b28cf5c5c476138eb5b26af86ad8c0abc5619cdc8caaa6f080d236e4352ac82
+ source: https://commondatastorage.googleapis.com/chromium-browser-official/chromium-111.0.5563.19.tar.xz
+ source-checksum: sha512/e6e27485744baa79995783d4f80110c2fc19e6ae6da0641602a310a0f49dd762cbfde34428d956fdebd262fa07d7a4489f92b253bbd42ccb134202896eb4c997
 after:
 - chromium-build
 - launcher
@@ -142,6 +142,7 @@ parts:
 - libpam0g-dev
 - libpci-dev
 - libssl-dev
+ - libsystemd-dev
 - libva-dev
 - libxshmfence-dev
 - libxss-dev