From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from smtp.gentoo.org (woodpecker.gentoo.org [140.211.166.183]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits)) (No client certificate requested) by finch.gentoo.org (Postfix) with ESMTPS id 4CC9A1582EF for ; Wed, 05 Mar 2025 02:53:20 +0000 (UTC) Received: from lists.gentoo.org (bobolink.gentoo.org [140.211.166.189]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (No client certificate requested) (Authenticated sender: relay-lists.gentoo.org@gentoo.org) by smtp.gentoo.org (Postfix) with ESMTPSA id 3397134300A for ; Wed, 05 Mar 2025 02:53:20 +0000 (UTC) Received: from bobolink.gentoo.org (localhost [127.0.0.1]) by bobolink.gentoo.org (Postfix) with ESMTP id 2FD8E1102D0; Wed, 05 Mar 2025 02:53:19 +0000 (UTC) Received: from smtp.gentoo.org (woodpecker.gentoo.org [140.211.166.183]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (No client certificate requested) by bobolink.gentoo.org (Postfix) with ESMTPS id 211391102D0 for ; Wed, 05 Mar 2025 02:53:19 +0000 (UTC) Received: from oystercatcher.gentoo.org (oystercatcher.gentoo.org [148.251.78.52]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id C1E31343007 for ; Wed, 05 Mar 2025 02:53:18 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 18EAB285D for ; Wed, 05 Mar 2025 02:53:17 +0000 (UTC) From: "Matt Jolly" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Matt Jolly" Message-ID: <1741143178.77fb97b1ea3a45e9d9f9c6f1824ff50da6fbab2a.kangie@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: www-client/chromium/files/ X-VCS-Repository: repo/gentoo X-VCS-Files: www-client/chromium/files/chromium-135-fix-non-wayland-build.patch X-VCS-Directories: www-client/chromium/files/ X-VCS-Committer: kangie X-VCS-Committer-Name: Matt Jolly X-VCS-Revision: 77fb97b1ea3a45e9d9f9c6f1824ff50da6fbab2a X-VCS-Branch: master Date: Wed, 05 Mar 2025 02:53:17 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org X-Auto-Response-Suppress: DR, RN, NRN, OOF, AutoReply X-Archives-Salt: 1c297ec6-436f-4cb8-ba41-dcccd24d919c X-Archives-Hash: 208304370e51de7e7b3ead1425ff0dc1 commit: 77fb97b1ea3a45e9d9f9c6f1824ff50da6fbab2a Author: Matt Jolly gentoo org> AuthorDate: Wed Mar 5 02:50:39 2025 +0000 Commit: Matt Jolly gentoo 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 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 +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 +--- 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 +