Merge branch 'stable' into daemondaemon

18 files changed, 42 insertions, 195 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..186bc14 100644
--- a/build/chromium-patches/search-credit.patch
+++ b/build/chromium-patches/search-credit.patch
@@ -1,5 +1,7 @@
-Description: Add Ubuntu id into search queries to get credit.
+Description: Add Ubuntu id into search queries and modify user agent to get
+ credit.
 Author: Chad Miller <chad.miller@canonical.com>
+Author: Nathan Pratta Teodosio <nathan.teodosio@canonical.com>
 Forwarded: not-needed
 
 --- a/components/search_engines/prepopulated_engines.json
@@ -24,7 +26,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 +36,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,24 +44,24 @@ 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);
 - std::string client = search_terms_data.GetSearchClient();
 + ubuntu_credit_for_search = true;
-+ std::string client = "ubuntu";
++ std::string client = "ubuntu-chr";
 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
 }
 }
 
 + /* Google search template from prefs might not have a client token. */
 + if (is_google_search && !ubuntu_credit_for_search) {
 + if (url.find_first_of('?', 8) != std::string::npos) { // perhaps no GET params
-+ url.append("&client=ubuntu");
++ url.append("&client=ubuntu-chr");
 + }
 + }
 +
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/build/chromium-patches/widevine-enable-version-string.patch b/build/chromium-patches/widevine-enable-version-string.patch
index f8b32da..8d1e9e5 100644
--- a/build/chromium-patches/widevine-enable-version-string.patch
+++ b/build/chromium-patches/widevine-enable-version-string.patch
@@ -1,7 +1,10 @@
 Description: enable widevine and set its version string to "undefined"
 Author: Michael Gilbert <mgilbert@debian.org>
 Author: Olivier Tilloy <olivier.tilloy@canonical.com>
+Author: Nathan Pratta Teodosio <nathan.teodosio@canonical.com>
+Last-Update: 2023-02-27
 Forwarded: not-needed
+Bug-Ubuntu: https://launchpad.net/bugs/2008433
 
 --- a/third_party/widevine/cdm/widevine_cdm_version.h
 +++ b/third_party/widevine/cdm/widevine_cdm_version.h
@@ -12,6 +15,16 @@ Forwarded: not-needed
 +#define WIDEVINE_CDM_VERSION_STRING "undefined"
 
 #endif // WIDEVINE_CDM_VERSION_H_
+--- a/third_party/widevine/cdm/widevine.gni
++++ b/third_party/widevine/cdm/widevine.gni
+ library_widevine_cdm_available =
+ (is_chromeos &&
+ (target_cpu == "x64" || target_cpu == "arm" || target_cpu == "arm64")) ||
+- (target_os == "linux" && target_cpu == "x64") ||
++ (target_os == "linux") ||
+ (target_os == "mac" && (target_cpu == "x64" || target_cpu == "arm64")) ||
+ (target_os == "win" &&
+ (target_cpu == "x86" || target_cpu == "x64" || target_cpu == "arm64"))
 --- a/chrome/common/media/cdm_registration.cc
 +++ b/chrome/common/media/cdm_registration.cc
 @@ -93,7 +93,7 @@ std::unique_ptr<content::CdmInfo> Create
diff --git a/firstrun/password-de.html b/firstrun/password-de.html
deleted file mode 100644
index ae4b9d7..0000000
--- a/firstrun/password-de.html
+++ /dev/null
@@ -1,42 +0,0 @@
-<!DOCTYPE html>
-<html>
-<head>
- <title>Anmerkung zur Chromium Passwortspeicherung</title>
- <meta name="viewport" content="width=device-width, initial-scale=1.0">
- <meta charset="UTF-8">
- <style>*{background-color:linen}tt{background-color:lightgray}pre code{display:block;background-color:lightgray}</style>
-</head>
-<body>
-
-<h1>Passwortspeicherung in Chromium</h1>
- <p>
- Das Speichern von Passwörtern im Gnome-Schlüsselbund wurde behoben,
- aber damit es funktioniert, müssen Sie Ihre alte Datei
- <tt>~/snap/chromium/common/chromium/Default/Login Data</tt>
- umbenennen, damit eine neue, funktionierende Datei sie ersetzen kann.
- </p>
-
- <p>
- Wir empfehlen Ihnen, sie in <tt>Login Data.old</tt> umzubenennen. Dafür
- können Sie Ihren Dateimanager benutzen oder ein Terminal öffnen und
- das Folgende eingeben:
- </p>
-
- <pre><code>cd ~/snap/chromium/common/chromium/Default/
-mv "Login Data" "Login Data.old"</code></pre>
-
- <p>
- Auf diese Weise können Sie die Aktion jederzeit rückgängig machen, indem
- Sie die Datei wieder in <tt>Login Data</tt> umbenennen, falls etwas fehlschlägt.
- Bitte reichen Sie in diesem Fall einen Fehlerbericht in Launchpad ein.
- </p>
-
-<hr>
-
- <p>
- <b>
- Um diese Meldung zu deaktivieren, erstellen Sie die Datei
- <tt>~/snap/chromium/common/chromium/Default/Login Data.old</tt>.
- </p>
-</body>
-</html>
diff --git a/firstrun/password-en.html b/firstrun/password-en.html
deleted file mode 100644
index a3cfc70..0000000
--- a/firstrun/password-en.html
+++ /dev/null
@@ -1,41 +0,0 @@
-<!DOCTYPE html>
-<html>
-<head>
- <title>A note about Chromium password storage</title>
- <meta name="viewport" content="width=device-width, initial-scale=1.0">
- <meta charset="UTF-8">
- <style>*{background-color:linen}tt{background-color:lightgray}pre code{display:block;background-color:lightgray}</style>
-</head>
-<body>
-
-<h1>Password storage in Chromium</h1>
- <p>
- Password storage via the Gnome keyring has been fixed,
- but for it to work, you have to rename your old
- <tt>~/snap/chromium/common/chromium/Default/Login Data</tt>
- file so that a new, working one can replace it.
- </p>
-
- <p>
- We suggest you to rename it to <tt>Login Data.old</tt>. You can do
- so through your file manager or by opening a terminal and entering
- </p>
-
- <pre><code>cd ~/snap/chromium/common/chromium/Default/
-mv "Login Data" "Login Data.old"</code></pre>
-
- <p>
- This way, in case something goes wrong (and please file a bug report in
- Launchpad if so), you can always reverse the action by renaming the file
- back to <tt>Login Data</tt>.
- </p>
-
-<hr>
-
- <p>
- <b>
- Disable this message by creating the file
- <tt>~/snap/chromium/common/chromium/Default/Login Data.old</tt></b>.
- </p>
-</body>
-</html>
diff --git a/firstrun/password-pt.html b/firstrun/password-pt.html
deleted file mode 100644
index 5b0b2a2..0000000
--- a/firstrun/password-pt.html
+++ /dev/null
@@ -1,42 +0,0 @@
-<!DOCTYPE html>
-<html>
-<head>
- <title>Um recado sobre o gerenciamento de senhas no Chromium</title>
- <meta name="viewport" content="width=device-width, initial-scale=1.0">
- <meta charset="UTF-8">
- <style>*{background-color:linen}tt{background-color:lightgray}pre code{display:block;background-color:lightgray}</style>
-</head>
-<body>
-
-<h1>Gerenciamento de senhas no Chromium</h1>
- <p>
- O gerenciamento de senhas pelo chaveiro do Gnome foi consertado,
- mas para que funcione, é necessário renomear seu antigo arquivo
- <tt>~/snap/chromium/common/chromium/Default/Login Data</tt>
- a fim de que um novo e funcional o possa suplantar.
- </p>
-
- <p>
- Sugerimos-lhe que o renomeie para <tt>Login Data.old</tt>. Você pode
- fazê-lo por meio de seu gerenciador de arquivos ou abrindo um terminal
- e digitando
- </p>
-
- <pre><code>cd ~/snap/chromium/common/chromium/Default/
-mv "Login Data" "Login Data.old"</code></pre>
-
- <p>
- Dessa forma, caso algo dê errado (e, nesse caso, por favor relate um
- problema no Launchpad), você poderá reverter a ação renomeando
- o arquivo de volta para <tt>Login Data</tt>.
- </p>
-
-<hr>
-
- <p>
- <b>
- Desative esta mensagem criando o arquivo
- <tt>~/snap/chromium/common/chromium/Default/Login Data.old</tt></b>.
- </p>
-</body>
-</html>
diff --git a/launcher/chromium.launcher b/launcher/chromium.launcher
index e0f40db..ad4a1ec 100755
--- a/launcher/chromium.launcher
+++ b/launcher/chromium.launcher
@@ -66,30 +66,6 @@ if [ -d "$SNAP_POLICIES" ]; then
 fi
 fi
 
-# With libsecret 19, Chromium stopped being able to store passwords encrypted
-# with the keyring (https://gitlab.gnome.org/GNOME/libsecret/-/issues/49).
-# This leaves the user with a "invalid" Login Data (passwords file).
-# The issue was fixed, but for it to work the invalid file must be moved away.
-# Ref: https://launchpad.net/bugs/1997168
-warn_password_fixed() {
- passwords="$SNAP_USER_COMMON/chromium/Default/Login Data"
- oldpasswords="$passwords.old"
- if [ ! -e "$oldpasswords" ]; then
- if [ ! -s "$passwords" ]; then
- mkdir -p "$(dirname "$oldpasswords")"
- printf "%s\n" "This is a placeholder file to disable password
- storage informational note." > "$oldpasswords"
- else
- lang_code=$(locale | awk -F '[_=]' '/LANG=/{print $2}')
- PASSWORD_PAGE="$SNAP/firstrun/password-$lang_code.html"
- if [ ! -f "$PASSWORD_PAGE" ]; then
- # No localized version, fall back to English
- PASSWORD_PAGE="$SNAP/firstrun/password-en.html"
- fi
- fi
- fi
-}
-
 # Specify that no encrypted password store (keyring) should be used when the
 # password-manager-service interface is not plugged, because Chromium won't
 # fall back to the basic store (no encryption) if it fails to talk to the
@@ -97,7 +73,6 @@ warn_password_fixed() {
 # Ref: https://launchpad.net/bugs/1763829
 if snapctl is-connected password-manager-service; then
 PASSWORD_STORE= # an empty string means detect the store based on the current DE (os_crypt::SelectBackend())
- warn_password_fixed # inserting this here to avoid double call to snapctl
 else
 PASSWORD_STORE=basic
 fi
@@ -134,9 +109,6 @@ if [ $WANT_HEADLESS -eq 0 ] ; then
 if [ ! -z "$FIRSTRUN_PAGE" ]; then
 set -- "$@" "$FIRSTRUN_PAGE"
 fi
- if [ ! -z "$PASSWORD_PAGE" ]; then
- set -- "$@" "$PASSWORD_PAGE"
- fi
 fi
 
 case "$CHROMIUM_FLAGS" in
diff --git a/snapcraft.yaml b/snapcraft.yaml
index 1fccc46..c41671d 100644
--- a/snapcraft.yaml
+++ b/snapcraft.yaml
@@ -149,8 +149,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-112.0.5615.49.tar.xz
+ source-checksum: sha512/48387f8b960a33520da70953912076582e83263b2194fdb8afddf888f5e4d31ade0bf41e19fbdc8c2827c3371228428072520fdda41c229c78e2d71c341961e0
 after:
 - chromium-build
 - launcher
@@ -176,6 +176,7 @@ parts:
 - libpam0g-dev
 - libpci-dev
 - libssl-dev
+ - libsystemd-dev
 - libva-dev
 - libxshmfence-dev
 - libxss-dev