git: bac2e5f4e0f3 - 2025Q2 - www/{*chromium,iridium}: unbreak wayland ozone platform
- Go to: [ bottom of page ] [ top of archives ] [ this month ]
Date: Tue, 13 May 2025 09:04:38 UTC
The branch 2025Q2 has been updated by rnagy:
URL: https://cgit.FreeBSD.org/ports/commit/?id=bac2e5f4e0f398be04d58aef6d325bf1fab3c921
commit bac2e5f4e0f398be04d58aef6d325bf1fab3c921
Author: Robert Nagy <rnagy@FreeBSD.org>
AuthorDate: 2025-05-13 09:01:50 +0000
Commit: Robert Nagy <rnagy@FreeBSD.org>
CommitDate: 2025-05-13 09:04:34 +0000
www/{*chromium,iridium}: unbreak wayland ozone platform
avoid running into unreachable code which will immediately crash
the process on purprose
PR: 286635
(cherry picked from commit d9f04f5f5efef5a55aeec5c76ba21b9ccce0e581)
---
www/chromium/Makefile | 1 +
...i_ozone_platform_wayland_host_wayland__frame__manager.cc | 13 +++++++++++++
www/iridium/Makefile | 1 +
...i_ozone_platform_wayland_host_wayland__frame__manager.cc | 13 +++++++++++++
www/ungoogled-chromium/Makefile | 1 +
...i_ozone_platform_wayland_host_wayland__frame__manager.cc | 13 +++++++++++++
6 files changed, 42 insertions(+)
diff --git a/www/chromium/Makefile b/www/chromium/Makefile
index 7ce5d02167fe..83f18761e28a 100644
--- a/www/chromium/Makefile
+++ b/www/chromium/Makefile
@@ -1,5 +1,6 @@
PORTNAME= chromium
PORTVERSION= 136.0.7103.92
+PORTREVISION= 1
PULSEMV= 16
PULSEV= ${PULSEMV}.1
CATEGORIES= www wayland
diff --git a/www/chromium/files/patch-ui_ozone_platform_wayland_host_wayland__frame__manager.cc b/www/chromium/files/patch-ui_ozone_platform_wayland_host_wayland__frame__manager.cc
new file mode 100644
index 000000000000..e106ca3408e3
--- /dev/null
+++ b/www/chromium/files/patch-ui_ozone_platform_wayland_host_wayland__frame__manager.cc
@@ -0,0 +1,13 @@
+--- ui/ozone/platform/wayland/host/wayland_frame_manager.cc.orig 2025-05-13 08:59:54 UTC
++++ ui/ozone/platform/wayland/host/wayland_frame_manager.cc
+@@ -461,8 +461,10 @@ std::optional<bool> WaylandFrameManager::ApplySurfaceC
+ surface->UpdateBufferDamageRegion(
+ gfx::ToEnclosingRectIgnoringError(surface_damage));
+
++#if !BUILDFLAG(IS_BSD)
+ if (!config.access_fence_handle.is_null())
+ surface->set_acquire_fence(std::move(config.access_fence_handle));
++#endif
+
+ bool needs_commit = false;
+
diff --git a/www/iridium/Makefile b/www/iridium/Makefile
index d2c911f84d6f..77f52b16e365 100644
--- a/www/iridium/Makefile
+++ b/www/iridium/Makefile
@@ -1,5 +1,6 @@
PORTNAME= iridium
PORTVERSION= 2025.05.136.1
+PORTREVISION= 1
PULSEMV= 16
PULSEV= ${PULSEMV}.1
CATEGORIES= www wayland
diff --git a/www/iridium/files/patch-ui_ozone_platform_wayland_host_wayland__frame__manager.cc b/www/iridium/files/patch-ui_ozone_platform_wayland_host_wayland__frame__manager.cc
new file mode 100644
index 000000000000..e106ca3408e3
--- /dev/null
+++ b/www/iridium/files/patch-ui_ozone_platform_wayland_host_wayland__frame__manager.cc
@@ -0,0 +1,13 @@
+--- ui/ozone/platform/wayland/host/wayland_frame_manager.cc.orig 2025-05-13 08:59:54 UTC
++++ ui/ozone/platform/wayland/host/wayland_frame_manager.cc
+@@ -461,8 +461,10 @@ std::optional<bool> WaylandFrameManager::ApplySurfaceC
+ surface->UpdateBufferDamageRegion(
+ gfx::ToEnclosingRectIgnoringError(surface_damage));
+
++#if !BUILDFLAG(IS_BSD)
+ if (!config.access_fence_handle.is_null())
+ surface->set_acquire_fence(std::move(config.access_fence_handle));
++#endif
+
+ bool needs_commit = false;
+
diff --git a/www/ungoogled-chromium/Makefile b/www/ungoogled-chromium/Makefile
index 616c569e77cd..486a71a46852 100644
--- a/www/ungoogled-chromium/Makefile
+++ b/www/ungoogled-chromium/Makefile
@@ -1,5 +1,6 @@
PORTNAME= ungoogled-chromium
PORTVERSION= 136.0.7103.92
+PORTREVISION= 1
PULSEMV= 16
PULSEV= ${PULSEMV}.1
UGVERSION= ${DISTVERSION}-1
diff --git a/www/ungoogled-chromium/files/patch-ui_ozone_platform_wayland_host_wayland__frame__manager.cc b/www/ungoogled-chromium/files/patch-ui_ozone_platform_wayland_host_wayland__frame__manager.cc
new file mode 100644
index 000000000000..e106ca3408e3
--- /dev/null
+++ b/www/ungoogled-chromium/files/patch-ui_ozone_platform_wayland_host_wayland__frame__manager.cc
@@ -0,0 +1,13 @@
+--- ui/ozone/platform/wayland/host/wayland_frame_manager.cc.orig 2025-05-13 08:59:54 UTC
++++ ui/ozone/platform/wayland/host/wayland_frame_manager.cc
+@@ -461,8 +461,10 @@ std::optional<bool> WaylandFrameManager::ApplySurfaceC
+ surface->UpdateBufferDamageRegion(
+ gfx::ToEnclosingRectIgnoringError(surface_damage));
+
++#if !BUILDFLAG(IS_BSD)
+ if (!config.access_fence_handle.is_null())
+ surface->set_acquire_fence(std::move(config.access_fence_handle));
++#endif
+
+ bool needs_commit = false;
+