meta-agl-profile-graphical: update wayland for dunfell

Remove backported patch now present in wayland 1.18.0 in dunfell, and
update another patch to quiet patch fuzz QA warning.

Bug-AGL: SPEC-3302

Signed-off-by: Scott Murray <scott.murray@konsulko.com>
Change-Id: I4ac5adfac6167cc96a755f07922c1c0721d0cb05

diff --git a/meta-agl-profile-graphical/recipes-graphics/wayland/wayland/0001-Change-socket-mode-add-rw-for-group.patch b/meta-agl-profile-graphical/recipes-graphics/wayland/wayland/0001-Change-socket-mode-add-rw-for-group.patch
index b04127b..d0dcb45 100644 (file)
--- a/meta-agl-profile-graphical/recipes-graphics/wayland/wayland/0001-Change-socket-mode-add-rw-for-group.patch
+++ b/meta-agl-profile-graphical/recipes-graphics/wayland/wayland/0001-Change-socket-mode-add-rw-for-group.patch
@@ -4,16 +4,19 @@ Date: Tue, 18 Apr 2017 13:53:26 +0200
 Subject: [PATCH] Change socket mode:add rw for group
 
 Signed-off-by: Ronan Le Martret <ronan.lemartret@iot.bzh>
+[Updated for 1.18.0 to remove fuzz]
+Signed-off-by: Scott Murray <scott.murray@konsulko.com>
+
 ---
  src/wayland-server.c | 5 ++++-
  1 file changed, 4 insertions(+), 1 deletion(-)
 
 diff --git a/src/wayland-server.c b/src/wayland-server.c
-index 64d1bec..313c5a0 100644
+index 3f48dfe..fbccb45 100644
 --- a/src/wayland-server.c
 +++ b/src/wayland-server.c
-@@ -1189,7 +1189,10 @@ _wl_display_add_socket(struct wl_display *display, struct wl_socket *s)
-               wl_log("bind() failed with error: %m\n");
+@@ -1528,7 +1528,10 @@ _wl_display_add_socket(struct wl_display *display, struct wl_socket *s)
+               wl_log("bind() failed with error: %s\n", strerror(errno));
                return -1;
        }
 -
@@ -22,8 +25,5 @@ index 64d1bec..313c5a0 100644
 +              return -1;
 +      }
        if (listen(s->fd, 128) < 0) {
-               wl_log("listen() failed with error: %m\n");
+               wl_log("listen() failed with error: %s\n", strerror(errno));
                return -1;
--- 
-2.6.6
-

diff --git a/meta-agl-profile-graphical/recipes-graphics/wayland/wayland/0002-server-Fix-fake-Address-already-in-use-error.patch b/meta-agl-profile-graphical/recipes-graphics/wayland/wayland/0002-server-Fix-fake-Address-already-in-use-error.patch
deleted file mode 100644 (file)
index ea9dbd6..0000000
--- a/meta-agl-profile-graphical/recipes-graphics/wayland/wayland/0002-server-Fix-fake-Address-already-in-use-error.patch
+++ /dev/null
@@ -1,35 +0,0 @@
-From 152c9ed968124c253f0be25b76c2a083a21af37e Mon Sep 17 00:00:00 2001
-From: Liu Wenlong <liuwl.fnst@cn.fujitsu.com>
-Date: Mon, 26 Aug 2019 17:08:22 +0800
-Subject: [PATCH] server: Fix fake "Address already in use" error
-
-In the current workflow, socket file will be deleted if it already exists.
-However, if the socket file is a symbolic link and the file that it refers
-to doesn't exist, we will got "Address already in use" because bind()
-thinks the socket file exists and won't create it.
-
-Now, use lstat() to determine whether the socket file exists.
-
-Upstream-Status: Backport [https://gitlab.freedesktop.org/wayland/wayland/merge_requests/35]
-
-Signed-off-by: Liu Wenlong <liuwl.fnst@cn.fujitsu.com>
----
- src/wayland-server.c | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/src/wayland-server.c b/src/wayland-server.c
-index 83b984f..3bc6ed7 100644
---- a/src/wayland-server.c
-+++ b/src/wayland-server.c
-@@ -1393,7 +1393,7 @@ wl_socket_lock(struct wl_socket *socket)
-               goto err_fd;
-       }
- 
--      if (stat(socket->addr.sun_path, &socket_stat) < 0 ) {
-+      if (lstat(socket->addr.sun_path, &socket_stat) < 0 ) {
-               if (errno != ENOENT) {
-                       wl_log("did not manage to stat file %s\n",
-                               socket->addr.sun_path);
--- 
-2.7.4
-

diff --git a/meta-agl-profile-graphical/recipes-graphics/wayland/wayland_%.bbappend b/meta-agl-profile-graphical/recipes-graphics/wayland/wayland_%.bbappend
index 5677ed5..9d18226 100644 (file)
--- a/meta-agl-profile-graphical/recipes-graphics/wayland/wayland_%.bbappend
+++ b/meta-agl-profile-graphical/recipes-graphics/wayland/wayland_%.bbappend
@@ -2,5 +2,4 @@ FILESEXTRAPATHS_prepend := "${THISDIR}/${PN}:"
 
 SRC_URI_append = "\
     file://0001-Change-socket-mode-add-rw-for-group.patch \
-    file://0002-server-Fix-fake-Address-already-in-use-error.patch \
     "