diff options
Diffstat (limited to 'www-client/chromium')
| -rw-r--r-- | www-client/chromium/Manifest | 1 | ||||
| -rw-r--r-- | www-client/chromium/files/chromium-135-fix-non-wayland-build.patch | 45 |
2 files changed, 46 insertions, 0 deletions
diff --git a/www-client/chromium/Manifest b/www-client/chromium/Manifest index a400d424f735..2741ab547692 100644 --- a/www-client/chromium/Manifest +++ b/www-client/chromium/Manifest @@ -7,6 +7,7 @@ AUX chromium-134-bindgen-custom-toolchain.patch 4838 BLAKE2B 196c183b5d23243310b AUX chromium-134-map_droppable-glibc.patch 1554 BLAKE2B 4f9ee69b74e5689abfd493287a0e4b7e3d38092ad9925344dd23cb8efd2873f43366bd2a59f49954dd1c604400f40d0fe3a8a1378b58d7d705d52128a47cc944 SHA512 1dff0c72cc1fed1dc553c304274209b3bac14b23e18649d800319c2beeae7360cf6f56b3c1d06c74129a25869edf09fc9fe3bbcba54e31747fb2b6a9cd7b1f88 AUX chromium-134-oauth2-client-switches.patch 1867 BLAKE2B e5266308b7c1506f82b811e865b482886530c4c26d062d6e15155e5ef4031d7c8d680730e5fc8ab1df899d9ffacd8be01db3b43c2817a756a1cfc5d54296a9c7 SHA512 a8d95d5c10b2561fa30bf593aaf177507666cc46dd966ea048e6ee99db6dfd3a7b11962203374770ec2d508198ba14fceeb93dd5795276794a2e7adb58a363fe AUX chromium-134-qt5-optional.patch 4140 BLAKE2B 2a5879384a95fa0a9edf2e6506b2f374f6366ef0bd5f248b14333cbe721c5ad85d04101cf7a15a207c476525a8ba22645d8446c684363b3fa8b9c642c89b8fbf SHA512 b9fba4b3d33430a9565a6605f8d525618e6691622095bfe17f781e030e4395cb5ed25242625761ca16b19da8014e4afa1335fc6719cae78c8b3594c9e9092978 +AUX chromium-135-fix-non-wayland-build.patch 1274 BLAKE2B 9171ae97a91844bf4777dc8106ff2bbe75af1bfadba03ea4902d5884b0d09bb739c00250f6cf373e4c006a54031f4b5104360a83ab2a7edec7730d492dc82a49 SHA512 b11778f41371d19d8dd40f0eb9c0a023a7b9bb2e8d177ddee0345ae7c9d99dc99c05e017f5625d0edf34a2e1ccf524ea4c810e47977bd70f240f7016fd31d769 AUX chromium-135-map_droppable-glibc.patch 1395 BLAKE2B a099ecaccd2cdefc3f4f7f4dbd8f0d1cf2bcc0d97230aabeb0a89d7f45a34b05926b39515965356fbb6e6fb97f8d3171c587e455abb7ffe534cce996c4bc35bc SHA512 fa741270a22a87cee56baef38fa44276543de3bcac495695550dbeada38dec655076f758c8dc0a3a1e290b49fa4c5c8dc4f2541f1574adf441d8d3fd6a5c902e AUX chromium-135-oauth2-client-switches.patch 2086 BLAKE2B 630dd4d14264b5ef204afed9fe1548e559b2d9319f49e1eae0ccdfb254035212f58f507b68a0365dfcc6972856652a44f29a64be22b5930180ae4e314d7ea448 SHA512 23735898a5ebbb952f775b50251e1bcef6ca865fcdbb5559bd5f79d1ce7d394b52382ed0a0125b8e0db1c3ad6eb3aba50616dbdac6d79786dea91ea1f663d58b AUX chromium-browser.xml 407 BLAKE2B 168d78b0855546ca559cfb51aff0bc85d5e6ae974c25eb76e4a02f6d11659489c6e40397a0b2f7bc1fda336fd2c6dd8c863fccc3340719210b41c7fef51927f4 SHA512 b767fb4fd1925029d95560fc14cb7ab12ae43b2fe923e92d75e733b9723cbe1dcdf6df041a2b62554e98b79b47ef3f6028c773e72e6fd53166a021d49657aeca 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 <kangie@gentoo.org> +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 <kangie@gentoo.org> +--- 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 + |