From 5c0d490135414da20cb082fb801a667d3e5575de Mon Sep 17 00:00:00 2001 From: Otavio Salvador Date: Mon, 24 Nov 2014 13:18:58 -0200 Subject: [PATCH] weston: Remove "Desktop-shell-Don-t-assume-there-is-a-pointer.patch" This patch is applied upstream and can be removed now. Signed-off-by: Otavio Salvador --- ...hell-Don-t-assume-there-is-a-pointer.patch | 36 ------------------- .../wayland/weston_%.bbappend | 1 - 2 files changed, 37 deletions(-) delete mode 100644 meta-fsl-arm/recipes-graphics/wayland/weston/0004-Desktop-shell-Don-t-assume-there-is-a-pointer.patch diff --git a/meta-fsl-arm/recipes-graphics/wayland/weston/0004-Desktop-shell-Don-t-assume-there-is-a-pointer.patch b/meta-fsl-arm/recipes-graphics/wayland/weston/0004-Desktop-shell-Don-t-assume-there-is-a-pointer.patch deleted file mode 100644 index f6ef253c..00000000 --- a/meta-fsl-arm/recipes-graphics/wayland/weston/0004-Desktop-shell-Don-t-assume-there-is-a-pointer.patch +++ /dev/null @@ -1,36 +0,0 @@ -From 1194ccebc0db14ba681bd8272e01715b3e7008cc Mon Sep 17 00:00:00 2001 -From: Yong Gan -Date: Fri, 27 Jun 2014 11:33:53 +0800 -Subject: [PATCH] ENGR00320189 desktop-shell: Don't assume there is a pointer - when resizing - -Fixes a crash on touch devices without a pointer, when touching -the window frame of a client. -cherry-pick from 5872b6821be7c9c0a17a0de962e3f4a04f5d0c6f - -Date: Jun 27, 2014 - -Upstream Status: N/A - -Signed-off-by Yong Gan ---- - desktop-shell/shell.c | 3 ++- - 1 file changed, 2 insertions(+), 1 deletion(-) - -diff --git a/desktop-shell/shell.c b/desktop-shell/shell.c -index 84f5c83..d965618 100644 ---- a/desktop-shell/shell.c -+++ b/desktop-shell/shell.c -@@ -1784,7 +1784,8 @@ common_surface_resize(struct wl_resource *resource, - struct shell_surface *shsurf = wl_resource_get_user_data(resource); - struct weston_surface *surface; - -- if (seat->pointer->button_count == 0 || -+ if (seat->pointer == NULL || -+ seat->pointer->button_count == 0 || - seat->pointer->grab_serial != serial || - seat->pointer->focus == NULL) - return; --- -1.7.9.5 - diff --git a/meta-fsl-arm/recipes-graphics/wayland/weston_%.bbappend b/meta-fsl-arm/recipes-graphics/wayland/weston_%.bbappend index 7b50283e..01773d27 100644 --- a/meta-fsl-arm/recipes-graphics/wayland/weston_%.bbappend +++ b/meta-fsl-arm/recipes-graphics/wayland/weston_%.bbappend @@ -3,7 +3,6 @@ FILESEXTRAPATHS_prepend := "${THISDIR}/${PN}:" SRC_URI_append_mx6 = " file://0001-ENGR00314805-1-Add-Vivante-EGL-support.patch \ file://0002-ENGR00314805-2-Add-Vivante-GAL2D-support.patch \ file://0003-Distorted-line-and-shadow-if-use-2d-com.patch \ - file://0004-Desktop-shell-Don-t-assume-there-is-a-pointer.patch \ file://0005-Enable-GAL2D-compositor-in-SoloLite.patch \ file://0006-Change-GAL2D-compositor-to-be-default-i.patch \ " -- 2.40.1