webkit: cog: remove upstreamed patch
The patch was upstreamed in 0.17.1, we now use 0.18.2. https://onedigi.atlassian.net/browse/DEL-9011 Signed-off-by: Gabriel Valcazar <gabriel.valcazar@digi.com>
This commit is contained in:
parent
eca9ddc1d9
commit
f54dcf2067
|
|
@ -1,41 +0,0 @@
|
||||||
From: Flourick <you@flourick.me>
|
|
||||||
Date: Thu, 27 Oct 2022 11:03:45 +0200
|
|
||||||
Subject: [PATCH] wl: Fix wrong wl_shm for cursor
|
|
||||||
|
|
||||||
---
|
|
||||||
platform/wayland/cog-platform-wl.c | 6 ++----
|
|
||||||
1 file changed, 2 insertions(+), 4 deletions(-)
|
|
||||||
|
|
||||||
diff --git a/platform/wayland/cog-platform-wl.c b/platform/wayland/cog-platform-wl.c
|
|
||||||
index ec76a08b719a..6ba43dd99f51 100644
|
|
||||||
--- a/platform/wayland/cog-platform-wl.c
|
|
||||||
+++ b/platform/wayland/cog-platform-wl.c
|
|
||||||
@@ -173,7 +173,6 @@ static struct {
|
|
||||||
#endif
|
|
||||||
|
|
||||||
#ifdef COG_USE_WAYLAND_CURSOR
|
|
||||||
- struct wl_shm *wl_shm;
|
|
||||||
struct wl_cursor_theme *cursor_theme;
|
|
||||||
struct wl_cursor *cursor_left_ptr;
|
|
||||||
struct wl_surface *cursor_left_ptr_surface;
|
|
||||||
@@ -1979,10 +1978,10 @@ init_wayland (GError **error)
|
|
||||||
wl_display_roundtrip (wl_data.display);
|
|
||||||
|
|
||||||
#if COG_USE_WAYLAND_CURSOR
|
|
||||||
- if (wl_data.wl_shm) {
|
|
||||||
+ if (wl_data.shm) {
|
|
||||||
if (!(wl_data.cursor_theme = wl_cursor_theme_load (NULL,
|
|
||||||
32,
|
|
||||||
- wl_data.wl_shm))) {
|
|
||||||
+ wl_data.shm))) {
|
|
||||||
g_warning ("%s: Could not load cursor theme.", G_STRFUNC);
|
|
||||||
} else if (!(wl_data.cursor_left_ptr =
|
|
||||||
wl_cursor_theme_get_cursor (wl_data.cursor_theme, "left_ptr"))) {
|
|
||||||
@@ -2027,7 +2026,6 @@ clear_wayland (void)
|
|
||||||
#ifdef COG_USE_WAYLAND_CURSOR
|
|
||||||
g_clear_pointer (&wl_data.cursor_left_ptr_surface, wl_surface_destroy);
|
|
||||||
g_clear_pointer (&wl_data.cursor_theme, wl_cursor_theme_destroy);
|
|
||||||
- g_clear_pointer (&wl_data.wl_shm, wl_shm_destroy);
|
|
||||||
#endif /* COG_USE_WAYLAND_CURSOR */
|
|
||||||
|
|
||||||
wl_registry_destroy (wl_data.registry);
|
|
||||||
|
|
@ -1,10 +1,4 @@
|
||||||
# Copyright (C) 2020-2023, Digi International Inc.
|
# Copyright (C) 2020-2024, Digi International Inc.
|
||||||
|
|
||||||
FILESEXTRAPATHS:prepend := "${THISDIR}/${BPN}:"
|
|
||||||
|
|
||||||
SRC_URI:append = " \
|
|
||||||
file://0001-wl-Fix-wrong-wl_shm-for-cursor.patch \
|
|
||||||
"
|
|
||||||
|
|
||||||
EXTRA_OECMAKE += "-DCOG_HOME_URI=http://127.0.0.1/"
|
EXTRA_OECMAKE += "-DCOG_HOME_URI=http://127.0.0.1/"
|
||||||
|
|
||||||
|
|
|
||||||
Loading…
Reference in New Issue