[pkgsrc/trunk]: pkgsrc/devel/wayland wayland: g/c stale patches, delint

[tnn <tnn%pkgsrc.org@localhost>]

details:   https://anonhg.NetBSD.org/pkgsrc/rev/2382d93b9f99
branches:  trunk
changeset: 382889:2382d93b9f99
user:      tnn <tnn%pkgsrc.org@localhost>
date:      Sun Aug 07 23:08:39 2022 +0000

description:
wayland: g/c stale patches, delint

diffstat:

 devel/wayland/patches/patch-src_event-loop.c    |  20 -------
 devel/wayland/patches/patch-tests_test-runner.c |  67 -------------------------
 devel/wayland/platform.mk                       |   6 +-
 3 files changed, 3 insertions(+), 90 deletions(-)

diffs (116 lines):

diff -r 776a17086534 -r 2382d93b9f99 devel/wayland/patches/patch-src_event-loop.c
--- a/devel/wayland/patches/patch-src_event-loop.c      Sun Aug 07 22:40:52 2022 +0000
+++ /dev/null   Thu Jan 01 00:00:00 1970 +0000
@@ -1,20 +0,0 @@
-$NetBSD: patch-src_event-loop.c,v 1.3 2020/03/15 16:03:26 nia Exp $
-
-https://lists.freedesktop.org/archives/wayland-devel/2019-February/040024.html
-
---- src/event-loop.c.orig      2020-02-11 23:46:03.000000000 +0000
-+++ src/event-loop.c
-@@ -23,6 +23,8 @@
-  * SOFTWARE.
-  */
- 
-+#include "config.h"
-+#ifdef HAVE_SYS_EPOLL_H
- #include <assert.h>
- #include <stddef.h>
- #include <stdio.h>
-@@ -1088,3 +1090,4 @@ wl_event_loop_get_destroy_listener(struc
- {
-       return wl_signal_get(&loop->destroy_signal, notify);
- }
-+#endif /* HAVE_SYS_EPOLL_H */
diff -r 776a17086534 -r 2382d93b9f99 devel/wayland/patches/patch-tests_test-runner.c
--- a/devel/wayland/patches/patch-tests_test-runner.c   Sun Aug 07 22:40:52 2022 +0000
+++ /dev/null   Thu Jan 01 00:00:00 1970 +0000
@@ -1,67 +0,0 @@
-$NetBSD: patch-tests_test-runner.c,v 1.2 2020/01/05 19:30:48 nia Exp $
-
-NetBSD support
-
---- tests/test-runner.c.orig   2019-03-21 00:55:25.000000000 +0000
-+++ tests/test-runner.c
-@@ -31,19 +31,34 @@
- #include <sys/types.h>
- #include <sys/wait.h>
- #include <sys/stat.h>
-+#include <signal.h>
- #include <string.h>
- #include <assert.h>
- #include <dlfcn.h>
- #include <errno.h>
- #include <limits.h>
- #include <sys/ptrace.h>
-+#if defined(HAVE_PRCTL)
- #include <sys/prctl.h>
-+#endif
- #ifndef PR_SET_PTRACER
- # define PR_SET_PTRACER 0x59616d61
- #endif
- 
- #include "test-runner.h"
- 
-+#ifndef PTRACE_ATTACH
-+#define PTRACE_ATTACH PT_ATTACH
-+#endif
-+
-+#ifndef PTRACE_CONT
-+#define PTRACE_CONT PT_CONTINUE
-+#endif
-+
-+#ifndef PTRACE_DETACH
-+#define PTRACE_DETACH PT_DETACH
-+#endif
-+
- /* when set to 1, check if tests are not leaking opened files.
-  * It is turned on by default. It can be turned off by
-  * WAYLAND_TEST_NO_LEAK_CHECK environment variable. */
-@@ -259,12 +274,13 @@ is_debugger_attached(void)
-                       _exit(1);
-               if (!waitpid(-1, NULL, 0))
-                       _exit(1);
--              ptrace(PTRACE_CONT, NULL, NULL);
-+              ptrace(PTRACE_CONT, ppid, NULL, NULL);
-               ptrace(PTRACE_DETACH, ppid, NULL, NULL);
-               _exit(0);
-       } else {
-               close(pipefd[0]);
- 
-+#if defined(HAVE_PRCTL)
-               /* Enable child to ptrace the parent process */
-               rc = prctl(PR_SET_PTRACER, pid);
-               if (rc != 0 && errno != EINVAL) {
-@@ -275,7 +291,9 @@ is_debugger_attached(void)
-                        */
-                       perror("prctl");
-                       write(pipefd[1], "-", 1);
--              } else {
-+              } else
-+#endif
-+              {
-                       /* Signal to client that parent is ready by passing '+' */
-                       write(pipefd[1], "+", 1);
-               }
diff -r 776a17086534 -r 2382d93b9f99 devel/wayland/platform.mk
--- a/devel/wayland/platform.mk Sun Aug 07 22:40:52 2022 +0000
+++ b/devel/wayland/platform.mk Sun Aug 07 23:08:39 2022 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: platform.mk,v 1.6 2020/03/28 08:58:25 maya Exp $
+# $NetBSD: platform.mk,v 1.7 2022/08/07 23:08:39 tnn Exp $
 
 .if !defined(PLATFORM_SUPPORTS_WAYLAND)
 .  include "../../mk/bsd.fast.prefs.mk"
@@ -11,9 +11,9 @@
 
 # We can have Wayland without EGL, but a lot of things expect
 # wayland and EGL support together.
-.if ${OPSYS} == "NetBSD" && !empty(MESALIB_SUPPORTS_EGL:M[Yy][Ee][Ss])
+.  if ${OPSYS} == "NetBSD" && !empty(MESALIB_SUPPORTS_EGL:M[Yy][Ee][Ss])
 PLATFORM_SUPPORTS_WAYLAND=     yes
-.endif
+.  endif
 
 .  for _wayland_platform in ${WAYLAND_PLATFORMS}
 .    if !empty(MACHINE_PLATFORM:M${_wayland_platform})