From 1467244b040b88c7147b47397ee17bc88ac188f6 Mon Sep 17 00:00:00 2001 From: Isaac Hermida Date: Fri, 27 Jan 2023 11:31:10 +0100 Subject: [PATCH] cog: fix mouse pointer Apply patch to show mouse pointer, see commit https://github.com/Igalia/cog/commit/fe83f9b721f67ffa4d53c5261fc447355ebe06da Signed-off-by: Isaac Hermida --- .../0002-wl-Fix-wrong-wl_shm-for-cursor.patch | 41 +++++++++++++++++++ .../webkit/recipes-browser/cog/cog_%.bbappend | 1 + 2 files changed, 42 insertions(+) create mode 100644 meta-digi-dey/dynamic-layers/webkit/recipes-browser/cog/cog/0002-wl-Fix-wrong-wl_shm-for-cursor.patch diff --git a/meta-digi-dey/dynamic-layers/webkit/recipes-browser/cog/cog/0002-wl-Fix-wrong-wl_shm-for-cursor.patch b/meta-digi-dey/dynamic-layers/webkit/recipes-browser/cog/cog/0002-wl-Fix-wrong-wl_shm-for-cursor.patch new file mode 100644 index 000000000..c88e1514b --- /dev/null +++ b/meta-digi-dey/dynamic-layers/webkit/recipes-browser/cog/cog/0002-wl-Fix-wrong-wl_shm-for-cursor.patch @@ -0,0 +1,41 @@ +From: Flourick +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); diff --git a/meta-digi-dey/dynamic-layers/webkit/recipes-browser/cog/cog_%.bbappend b/meta-digi-dey/dynamic-layers/webkit/recipes-browser/cog/cog_%.bbappend index a7ed9b8b6..6e253e8ed 100644 --- a/meta-digi-dey/dynamic-layers/webkit/recipes-browser/cog/cog_%.bbappend +++ b/meta-digi-dey/dynamic-layers/webkit/recipes-browser/cog/cog_%.bbappend @@ -4,6 +4,7 @@ FILESEXTRAPATHS:prepend := "${THISDIR}/${BPN}:" SRC_URI:append = " \ file://0001-cog-platform-fdo-always-use-fullscreen-mode.patch \ + file://0002-wl-Fix-wrong-wl_shm-for-cursor.patch \ " EXTRA_OECMAKE += "-DCOG_HOME_URI=http://127.0.0.1/"