commit:     77fb97b1ea3a45e9d9f9c6f1824ff50da6fbab2a
Author:     Matt Jolly <kangie <AT> gentoo <DOT> org>
AuthorDate: Wed Mar  5 02:50:39 2025 +0000
Commit:     Matt Jolly <kangie <AT> gentoo <DOT> org>
CommitDate: Wed Mar  5 02:52:58 2025 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=77fb97b1

www-client/chromium: restore dropped patch

This patch was dropped in the latest M135 build, however it
is still required for M133 and M134 and should not have
been removed from the repository.

Signed-off-by: Matt Jolly <kangie <AT> gentoo.org>

 .../files/chromium-135-fix-non-wayland-build.patch | 45 ++++++++++++++++++++++
 1 file changed, 45 insertions(+)

diff --git a/www-client/chromium/files/chromium-135-fix-non-wayland-build.patch 
b/www-client/chromium/files/chromium-135-fix-non-wayland-build.patch
new file mode 100644
index 000000000000..a31462ac0f29
--- /dev/null
+++ b/www-client/chromium/files/chromium-135-fix-non-wayland-build.patch
@@ -0,0 +1,45 @@
+From 919cda539b142b51fc2ef2342dbf1803b65f5434 Mon Sep 17 00:00:00 2001
+From: Matt Jolly <[email protected]>
+Date: Wed, 12 Feb 2025 20:13:09 +1000
+Subject: [PATCH] remoting: Linux: guard wayland includes
+
+During the refactor in 53f3429926deb4cb92d9cddcda5fc096a0332db3
+wayland support became required to build this component.
+
+Only include wayland components in the `platform_impls` target
+if `ozone_platform_wayland` is true.
+
+Bug: 391722217
+See also: https://bugs.gentoo.org/948384
+Signed-off-by: Matt Jolly <[email protected]>
+--- a/remoting/host/linux/BUILD.gn
++++ b/remoting/host/linux/BUILD.gn
+@@ -192,7 +192,6 @@ source_set("platform_impls") {
+     "wayland_seat.h",
+   ]
+   deps = [
+-    ":wayland",
+     ":x11",
+     ":x11_display_utils",
+     "//base",
+@@ -214,9 +213,16 @@ source_set("platform_impls") {
+     "//ui/base",
+     "//ui/base/x",
+     "//ui/events:dom_keycode_converter",
+-    "//ui/events/platform/wayland:wayland_event_watcher",
+     "//ui/gfx/x",
+   ]
++  # ui/events/platform/wayland:wayland_event_watcher asserts that the wayland
++  # platform is enabled.
++  if (ozone_platform_wayland) {
++    deps += [
++      ":wayland",
++      "//ui/events/platform/wayland:wayland_event_watcher",
++    ]
++  }
+ }
+ 
+ source_set("x11_display_utils") {
+-- 
+2.48.0
+

Reply via email to