diff options
| author | Robert Nagy <rnagy@FreeBSD.org> | 2025-05-13 11:01:50 +0200 |
|---|---|---|
| committer | Robert Nagy <rnagy@FreeBSD.org> | 2025-05-13 11:01:50 +0200 |
| commit | d9f04f5f5efef5a55aeec5c76ba21b9ccce0e581 (patch) | |
| tree | 505b52017ba5441f288ec21512031ef6285a2386 | |
| parent | Haskell ports: Switch some to GHC 9.6 (diff) | |
www/{*chromium,iridium}: unbreak wayland ozone platform
avoid running into unreachable code which will immediately crash
the process on purprose
PR: 286635
6 files changed, 42 insertions, 0 deletions
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; + |