wayland: update the patch files to apply on 1.18.0 version

ERROR: wayland-native-1.18.0-r0 do_patch: Command Error: 'quilt --quiltrc /jenkins/mjansa/build-ros/webos-dashing-dunfell/tmp-glibc/work/x86_64-linux/wayland-native/1.18.0-r0/recipe-sysroot-native/etc/quiltrc push' exited with 0  Output:
Applying patch 0003-Enhance-logging-for-wayland-error-detection.patch
patching file Makefile.am
Hunk #1 succeeded at 45 (offset 1 line).
Hunk #2 FAILED at 78.
Hunk webosose#3 FAILED at 90.
2 out of 3 hunks FAILED -- rejects in file Makefile.am
patching file configure.ac
Hunk #1 succeeded at 99 (offset 6 lines).
Hunk #2 succeeded at 133 (offset -4 lines).
patching file src/connection.c
Hunk #1 succeeded at 75 (offset 8 lines).
Hunk #2 succeeded at 1309 (offset 22 lines).
Hunk webosose#3 succeeded at 1382 (offset 25 lines).
patching file src/wayland-util.c
Patch 0003-Enhance-logging-for-wayland-error-detection.patch does not apply (enforce with -f)
ERROR: Logfile of failure stored in: /jenkins/mjansa/build-ros/webos-dashing-dunfell/tmp-glibc/work/x86_64-linux/wayland-native/1.18.0-r0/temp/log.do_patch.18682

Signed-off-by: Martin Jansa <[email protected]>

meta-webos/recipes-graphics/wayland/wayland/0001-Support-dynamic-turning-on-off-wayland-debug.patch

@@ -1,4 +1,4 @@
-From 8a54d87ad336dc35b8ee8afde8d34ae548d18abf Mon Sep 17 00:00:00 2001
+From 3bb652a346dd8ea9819138d0537a96c3d74cabac Mon Sep 17 00:00:00 2001
 From: "hyunsook.park" <[email protected]>
 Date: Tue, 27 Jan 2015 16:45:01 +0900
 Subject: [PATCH] Support dynamic turning on/off wayland debug
@@ -7,22 +7,22 @@ Use named pipe to command on a process
 
 Upstream-Status: Inappropriate [webOS specific]
 ---
- src/wayland-server.c | 70 ++++++++++++++++++++++++++++++++++++++++++++++++++++
+ src/wayland-server.c | 70 ++++++++++++++++++++++++++++++++++++++++++++
  1 file changed, 70 insertions(+)
 
 diff --git a/src/wayland-server.c b/src/wayland-server.c
-index eb1e500..d7b1400 100644
+index 3f48dfe..12a0464 100644
 --- a/src/wayland-server.c
 +++ b/src/wayland-server.c
-@@ -137,6 +137,7 @@ struct wl_protocol_logger {
+@@ -140,6 +140,7 @@ struct wl_protocol_logger {
  };
 
  static int debug_server = 0;
 +static char debug_fifo_path[UNIX_PATH_MAX];
 
  static void
  log_closure(struct wl_resource *resource,
-@@ -989,6 +990,71 @@ bind_display(struct wl_client *client, struct wl_display *display)
+@@ -1031,6 +1032,71 @@ bind_display(struct wl_client *client, struct wl_display *display)
  	return 0;
  }
 
@@ -94,7 +94,7 @@ index eb1e500..d7b1400 100644
  /** Create Wayland display object.
   *
   * \return The Wayland display object. Null if failed to create
-@@ -1034,6 +1100,8 @@ wl_display_create(void)
+@@ -1076,6 +1142,8 @@ wl_display_create(void)
 
  	wl_array_init(&display->additional_shm_formats);
 
@@ -103,7 +103,7 @@ index eb1e500..d7b1400 100644
  	return display;
  }
 
-@@ -1103,6 +1171,8 @@ wl_display_destroy(struct wl_display *display)
+@@ -1145,6 +1213,8 @@ wl_display_destroy(struct wl_display *display)
 
  	wl_list_remove(&display->protocol_loggers);
 

meta-webos/recipes-graphics/wayland/wayland/0002-Support-log-redirection-for-wayland-debug.patch

@@ -1,4 +1,4 @@
-From f9547ffe952c176dc7970459506e9adcb4ab71b4 Mon Sep 17 00:00:00 2001
+From 8c321ee8089fc6ad56182dfc4e9a5d74efd59814 Mon Sep 17 00:00:00 2001
 From: "cathy.park" <[email protected]>
 Date: Wed, 28 Jan 2015 23:46:05 -0800
 Subject: [PATCH] Support log redirection for wayland debug
@@ -7,14 +7,14 @@ Write and update wayland debug message in file
 
 Upstream-Status: Inappropriate [webOS specific]
 ---
- src/connection.c | 118 +++++++++++++++++++++++++++++++++++++++++++++++++++++++
+ src/connection.c | 118 +++++++++++++++++++++++++++++++++++++++++++++++
  1 file changed, 118 insertions(+)
 
 diff --git a/src/connection.c b/src/connection.c
-index 294c521..a82d38e 100644
+index d0c7d9f..52a83a7 100644
 --- a/src/connection.c
 +++ b/src/connection.c
-@@ -56,6 +56,53 @@ struct wl_buffer {
+@@ -64,6 +64,53 @@ struct wl_buffer {
  #define MAX_FDS_OUT	28
  #define CLEN		(CMSG_LEN(MAX_FDS_OUT * sizeof(int32_t)))
 
@@ -68,7 +68,7 @@ index 294c521..a82d38e 100644
  struct wl_connection {
  	struct wl_buffer in, out;
  	struct wl_buffer fds_in, fds_out;
-@@ -1241,7 +1288,11 @@ wl_closure_print(struct wl_closure *closure, struct wl_object *target, int send)
+@@ -1263,7 +1310,11 @@ wl_closure_print(struct wl_closure *closure, struct wl_object *target, int send)
  	const char *signature = closure->message->signature;
  	struct timespec tp;
  	unsigned int time;
@@ -80,7 +80,7 @@ index 294c521..a82d38e 100644
  	clock_gettime(CLOCK_REALTIME, &tp);
  	time = (tp.tv_sec * 1000000L) + (tp.tv_nsec / 1000);
 
-@@ -1298,6 +1349,73 @@ wl_closure_print(struct wl_closure *closure, struct wl_object *target, int send)
+@@ -1323,6 +1374,73 @@ wl_closure_print(struct wl_closure *closure, struct wl_object *target, int send)
  	}
 
  	fprintf(stderr, ")\n");

meta-webos/recipes-graphics/wayland/wayland/0003-Enhance-logging-for-wayland-error-detection.patch

@@ -1,4 +1,4 @@
-From 47251538a192c8b3a0d8109dfa63e63575e24e65 Mon Sep 17 00:00:00 2001
+From 5a389b3ee5990760fccb42f9cef0d437a1b90ad4 Mon Sep 17 00:00:00 2001
 From: "jaehak.lee" <[email protected]>
 Date: Wed, 16 Sep 2015 13:40:36 +0900
 Subject: [PATCH] Enhance logging for wayland error detection
@@ -16,10 +16,10 @@ Upstream-Status: Inappropriate [webOS specific]
  4 files changed, 57 insertions(+), 10 deletions(-)
 
 diff --git a/Makefile.am b/Makefile.am
-index 741db5e..d76ec69 100644
+index cc87392..8902192 100644
 --- a/Makefile.am
 +++ b/Makefile.am
-@@ -44,6 +44,12 @@ libwayland_util_la_CFLAGS = $(AM_CFLAGS)
+@@ -45,6 +45,12 @@ libwayland_util_la_CFLAGS = $(AM_CFLAGS)
  libwayland_util_la_SOURCES =			\
  	src/wayland-util.c			\
  	src/wayland-util.h
@@ -32,21 +32,21 @@ index 741db5e..d76ec69 100644
 
  noinst_LTLIBRARIES = libwayland-util.la
 
-@@ -72,6 +78,10 @@ nodist_include_HEADERS =			\
+@@ -74,6 +80,10 @@ nodist_include_HEADERS =			\
 
  libwayland_server_la_CFLAGS = $(FFI_CFLAGS) $(AM_CFLAGS) -pthread
- libwayland_server_la_LIBADD = $(FFI_LIBS) libwayland-private.la libwayland-util.la -lrt -lm
+ libwayland_server_la_LIBADD = $(FFI_LIBS) libwayland-private.la libwayland-util.la $(RT_LIBS) -lm
 +if ENABLE_PMLOG
 +libwayland_server_la_CFLAGS += $(PMLOG_CFLAGS)
 +libwayland_server_la_LIBADD += $(PMLOG_LIBS)
 +endif
  libwayland_server_la_LDFLAGS = -version-info 1:0:1
  libwayland_server_la_SOURCES =			\
  	src/wayland-server.c			\
-@@ -84,6 +94,10 @@ nodist_libwayland_server_la_SOURCES =		\
+@@ -86,6 +96,10 @@ nodist_libwayland_server_la_SOURCES =		\
 
  libwayland_client_la_CFLAGS = $(FFI_CFLAGS) $(AM_CFLAGS) -pthread
- libwayland_client_la_LIBADD = $(FFI_LIBS) libwayland-private.la libwayland-util.la -lrt -lm
+ libwayland_client_la_LIBADD = $(FFI_LIBS) libwayland-private.la libwayland-util.la $(RT_LIBS) -lm
 +if ENABLE_PMLOG
 +libwayland_client_la_CFLAGS += $(PMLOG_CFLAGS)
 +libwayland_client_la_LIBADD += $(PMLOG_LIBS)
@@ -55,10 +55,10 @@ index 741db5e..d76ec69 100644
  libwayland_client_la_SOURCES =			\
  	src/wayland-client.c
 diff --git a/configure.ac b/configure.ac
-index 102d258..ca347f4 100644
+index dda5e48..92e3bee 100644
 --- a/configure.ac
 +++ b/configure.ac
-@@ -93,6 +93,13 @@ AM_CONDITIONAL(USE_HOST_SCANNER, test "x$with_host_scanner" = xyes)
+@@ -99,6 +99,13 @@ AM_CONDITIONAL(USE_HOST_SCANNER, test "x$with_host_scanner" = xyes)
 
  AM_CONDITIONAL(ENABLE_LIBRARIES, test "x$enable_libraries" = xyes)
 
@@ -72,7 +72,7 @@ index 102d258..ca347f4 100644
  AC_ARG_WITH(icondir, [  --with-icondir=<dir>    Look for cursor icons here],
  		     [  ICONDIR=$withval],
  		     [  ICONDIR=${datadir}/icons])
-@@ -130,6 +137,11 @@ if test "x$enable_dtd_validation" = "xyes"; then
+@@ -126,6 +133,11 @@ if test "x$enable_dtd_validation" = "xyes"; then
  	AC_CONFIG_LINKS([src/wayland.dtd.embed:protocol/wayland.dtd])
  fi
 
@@ -85,10 +85,10 @@ index 102d258..ca347f4 100644
  AM_CONDITIONAL([HAVE_XSLTPROC], [test "x$XSLTPROC" != "x"])
 
 diff --git a/src/connection.c b/src/connection.c
-index a82d38e..53df260 100644
+index 52a83a7..0fc1c50 100644
 --- a/src/connection.c
 +++ b/src/connection.c
-@@ -67,17 +67,13 @@ static FILE* open_file()
+@@ -75,17 +75,13 @@ static FILE* open_file()
  	char proc_file[UNIX_PATH_MAX];
  	char filename[UNIX_PATH_MAX];
  	FILE *tmp_debug_fp = NULL;
@@ -111,7 +111,7 @@ index a82d38e..53df260 100644
 
  	if (!debug_path)
  		snprintf(filename, UNIX_PATH_MAX, "/tmp/wayland_%s.log",proc_name);
-@@ -1291,6 +1287,8 @@ wl_closure_print(struct wl_closure *closure, struct wl_object *target, int send)
+@@ -1313,6 +1309,8 @@ wl_closure_print(struct wl_closure *closure, struct wl_object *target, int send)
  	static FILE *debug_fp = NULL;
  	struct timeval  nowTv;
  	struct tm       nowTm;
@@ -120,7 +120,7 @@ index a82d38e..53df260 100644
 
  #ifdef NO_WEBOS_WAYLAND_DEBUG
  	clock_gettime(CLOCK_REALTIME, &tp);
-@@ -1359,10 +1357,15 @@ wl_closure_print(struct wl_closure *closure, struct wl_object *target, int send)
+@@ -1384,10 +1382,15 @@ wl_closure_print(struct wl_closure *closure, struct wl_object *target, int send)
  	}
 
  	get_time(&nowTv, &nowTm);
@@ -138,7 +138,7 @@ index a82d38e..53df260 100644
  			target->interface->name, target->id,
  			closure->message->name);
 diff --git a/src/wayland-util.c b/src/wayland-util.c
-index 3a471a8..fcbb409 100644
+index d5973bf..3cb23d8 100644
 --- a/src/wayland-util.c
 +++ b/src/wayland-util.c
 @@ -30,8 +30,12 @@

meta-webos/recipes-graphics/wayland/wayland/0004-server-Fix-crash-when-accessing-client-which-is-alre.patch

@@ -1,4 +1,4 @@
-From d1a1b08db87029c43788d3c9d017e704363091b5 Mon Sep 17 00:00:00 2001
+From 180309c456d1b619931abea8ff76a317974a5dd9 Mon Sep 17 00:00:00 2001
 From: Hyunkook Khang <[email protected]>
 Date: Tue, 20 Sep 2016 10:25:36 +0900
 Subject: [PATCH] server: Fix crash when accessing client which is already
@@ -15,16 +15,15 @@ just set the error here and destroy the client where it needs to be.
 Signed-off-by: Hyunkook Khang <[email protected]>
 
 Upstream-Status: Submitted
-
 ---
  src/wayland-server.c | 8 +++++++-
  1 file changed, 7 insertions(+), 1 deletion(-)
 
 diff --git a/src/wayland-server.c b/src/wayland-server.c
-index d7b1400..19183f1 100644
+index 12a0464..3c70e24 100644
 --- a/src/wayland-server.c
 +++ b/src/wayland-server.c
-@@ -1323,10 +1323,16 @@ wl_display_terminate(struct wl_display *display)
+@@ -1414,10 +1414,16 @@ wl_display_terminate(struct wl_display *display)
  WL_EXPORT void
  wl_display_run(struct wl_display *display)
  {
@@ -41,7 +40,7 @@ index d7b1400..19183f1 100644
  		wl_event_loop_dispatch(display->loop, -1);
  	}
  }
-@@ -1344,7 +1350,7 @@ wl_display_flush_clients(struct wl_display *display)
+@@ -1435,7 +1441,7 @@ wl_display_flush_clients(struct wl_display *display)
  						  WL_EVENT_WRITABLE |
  						  WL_EVENT_READABLE);
  		} else if (ret < 0) {

meta-webos/recipes-graphics/wayland/wayland/0005-client-Exit-on-a-fatal-connection-error.patch

@@ -1,4 +1,4 @@
-From d3e5f581b16f6f5da22660bbcb79f1abcdfc6223 Mon Sep 17 00:00:00 2001
+From fb354bd791a5252444a1f7b7ea22617c3224632c Mon Sep 17 00:00:00 2001
 From: Jaeyoon Jung <[email protected]>
 Date: Mon, 13 Aug 2018 14:29:34 +0900
 Subject: [PATCH] client: Exit on a fatal connection error
@@ -15,10 +15,10 @@ Upstream-Status: Inappropriate [webOS specific]
  1 file changed, 7 insertions(+)
 
 diff --git a/src/wayland-client.c b/src/wayland-client.c
-index 03c087a..aae83c2 100644
+index 5358500..d16376f 100644
 --- a/src/wayland-client.c
 +++ b/src/wayland-client.c
-@@ -154,6 +154,13 @@ display_fatal_error(struct wl_display *display, int error)
+@@ -153,6 +153,13 @@ display_fatal_error(struct wl_display *display, int error)
  	display->last_error = error;
 
  	display_wakeup_threads(display);