commit: 7f42c29c2480b809be2acd3c827242412deb64e7 Author: Matt Jolly <kangie <AT> gentoo <DOT> org> AuthorDate: Wed Feb 12 23:06:42 2025 +0000 Commit: Matt Jolly <kangie <AT> gentoo <DOT> org> CommitDate: Thu Feb 13 10:49:24 2025 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=7f42c29c
www-client/chromium: enable Wayland builds on `dev` Bug: https://bugs.gentoo.org/948384 Signed-off-by: Matt Jolly <kangie <AT> gentoo.org> www-client/chromium/chromium-135.0.6999.2.ebuild | 1 + .../files/chromium-135-fix-non-wayland-build.patch | 45 ++++++++++++++++++++++ 2 files changed, 46 insertions(+) diff --git a/www-client/chromium/chromium-135.0.6999.2.ebuild b/www-client/chromium/chromium-135.0.6999.2.ebuild index 29eb12f8453d..38c6904087ee 100644 --- a/www-client/chromium/chromium-135.0.6999.2.ebuild +++ b/www-client/chromium/chromium-135.0.6999.2.ebuild @@ -410,6 +410,7 @@ src_prepare() { "${FILESDIR}/chromium-131-unbundle-icu-target.patch" "${FILESDIR}/chromium-134-oauth2-client-switches.patch" "${FILESDIR}/chromium-134-bindgen-custom-toolchain.patch" + "${FILESDIR}/chromium-135-fix-non-wayland-build.patch" ) if use bundled-toolchain; then 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 +
