From: "Matt Jolly" <kangie@gentoo.org>
To: gentoo-commits@lists.gentoo.org
Subject: [gentoo-commits] repo/gentoo:master commit in: www-client/chromium/files/
Date: Wed, 05 Mar 2025 02:53:17 +0000 (UTC) [thread overview]
Message-ID: <1741143178.77fb97b1ea3a45e9d9f9c6f1824ff50da6fbab2a.kangie@gentoo> (raw)
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 <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
+
next reply other threads:[~2025-03-05 2:53 UTC|newest]
Thread overview: 48+ messages / expand[flat|nested] mbox.gz Atom feed top
2025-03-05 2:53 Matt Jolly [this message]
-- strict thread matches above, loose matches on Subject: below --
2025-01-20 21:57 [gentoo-commits] repo/gentoo:master commit in: www-client/chromium/files/ Conrad Kostecki
2025-01-04 22:47 Conrad Kostecki
2024-12-06 23:12 Conrad Kostecki
2024-10-15 21:46 Conrad Kostecki
2024-06-27 15:40 Conrad Kostecki
2024-06-22 18:54 Conrad Kostecki
2024-04-18 19:32 Conrad Kostecki
2024-03-27 7:55 Matt Jolly
2024-03-05 9:18 Petr Vaněk
2023-10-04 21:45 Conrad Kostecki
2023-09-13 18:43 Conrad Kostecki
2023-07-02 1:43 Conrad Kostecki
2023-06-30 19:03 Stephan Hartmann
2023-05-07 18:22 Mike Gilbert
2023-05-02 20:05 Mike Gilbert
2023-04-23 14:46 Mike Gilbert
2023-01-01 18:16 Conrad Kostecki
2022-12-22 19:54 Stephan Hartmann
2022-02-03 9:18 Stephan Hartmann
2021-11-20 10:08 Stephan Hartmann
2021-08-28 19:43 Stephan Hartmann
2021-07-03 7:51 Stephan Hartmann
2020-07-14 17:32 Mike Gilbert
2020-02-28 14:39 Mike Gilbert
2020-01-30 16:17 Mike Gilbert
2019-06-28 15:30 Mike Gilbert
2019-06-20 14:49 Mike Gilbert
2018-12-29 18:50 Mike Gilbert
2018-11-05 3:30 Mike Gilbert
2018-09-30 21:28 Mike Gilbert
2018-08-08 16:00 Mike Gilbert
2018-07-23 20:40 Mike Gilbert
2018-06-20 21:46 Mike Gilbert
2018-03-13 21:20 Mike Gilbert
2018-03-02 15:01 Mike Gilbert
2018-02-18 22:40 Mike Gilbert
2017-12-31 17:09 Mike Gilbert
2017-12-12 18:17 Mike Gilbert
2017-12-09 23:27 Mike Gilbert
2017-11-17 19:38 Mike Gilbert
2017-10-31 17:15 Mike Gilbert
2017-10-02 21:26 Mike Gilbert
2017-08-09 14:30 Mike Gilbert
2017-06-11 16:50 Mike Gilbert
2017-02-17 1:25 Mike Gilbert
2016-12-04 22:43 Mike Gilbert
2016-11-08 5:47 Mike Gilbert
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=1741143178.77fb97b1ea3a45e9d9f9c6f1824ff50da6fbab2a.kangie@gentoo \
--to=kangie@gentoo.org \
--cc=gentoo-commits@lists.gentoo.org \
--cc=gentoo-dev@lists.gentoo.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox