CVS commit: pkgsrc/devel/wayland

["Nia Alarie" <nia%netbsd.org@localhost>]

Module Name:    pkgsrc
Committed By:   nia
Date:           Wed Aug 28 10:35:40 UTC 2019

Modified Files:
        pkgsrc/devel/wayland: distinfo
        pkgsrc/devel/wayland/patches: patch-src_wayland-os.c
            patch-src_wayland-os.h

Log Message:
wayland: declare wl_os_epoll_create_cloexec properly


To generate a diff of this commit:
cvs rdiff -u -r1.2 -r1.3 pkgsrc/devel/wayland/distinfo
cvs rdiff -u -r1.1 -r1.2 pkgsrc/devel/wayland/patches/patch-src_wayland-os.c \
    pkgsrc/devel/wayland/patches/patch-src_wayland-os.h

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: pkgsrc/devel/wayland/distinfo
diff -u pkgsrc/devel/wayland/distinfo:1.2 pkgsrc/devel/wayland/distinfo:1.3
--- pkgsrc/devel/wayland/distinfo:1.2   Mon Aug 19 12:50:23 2019
+++ pkgsrc/devel/wayland/distinfo       Wed Aug 28 10:35:40 2019
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.2 2019/08/19 12:50:23 nia Exp $
+$NetBSD: distinfo,v 1.3 2019/08/28 10:35:40 nia Exp $
 
 SHA1 (wayland-1.17.0.tar.xz) = 4d9e08a7a4a07fa37a25d7aa3ef83f08edec0600
 RMD160 (wayland-1.17.0.tar.xz) = 635494fb0f5d9eb1e782f98e08c3e0e26ff44268
@@ -8,8 +8,8 @@ SHA1 (patch-Makefile.am) = af2c47eb2e1a4
 SHA1 (patch-configure.ac) = df15013a1639d673e5f0a86433a074f6201dbbc4
 SHA1 (patch-cursor_os-compatibility.c) = 9aac1c734199bc7e33e7735356bc8dbc80fba89d
 SHA1 (patch-src_event-loop.c) = 04d0eed4ba0708518201ec630dab97d52735fb0c
-SHA1 (patch-src_wayland-os.c) = fc1a70d4baf8311afce92a081368104b7a732e27
-SHA1 (patch-src_wayland-os.h) = 2e8fb20d4adfb3666adffe48104205488b4a1c7b
+SHA1 (patch-src_wayland-os.c) = 7297f8259aea9603a7ba20fe58f79e3fd0042990
+SHA1 (patch-src_wayland-os.h) = 1e01dfadb5ed5889d76e024d30537935f33631a3
 SHA1 (patch-src_wayland-server.c) = 335de8f5390eb337dfbde26f523162bd44c06baf
 SHA1 (patch-src_wayland-shm.c) = a59ddce3a161bb21fedb04737ff502da608b1da9
 SHA1 (patch-tests_client-test.c) = 6ffe18dfd64176a92f6f795eb757c54a3cf0ad10

Index: pkgsrc/devel/wayland/patches/patch-src_wayland-os.c
diff -u pkgsrc/devel/wayland/patches/patch-src_wayland-os.c:1.1 pkgsrc/devel/wayland/patches/patch-src_wayland-os.c:1.2
--- pkgsrc/devel/wayland/patches/patch-src_wayland-os.c:1.1     Sun Aug 18 16:05:12 2019
+++ pkgsrc/devel/wayland/patches/patch-src_wayland-os.c Wed Aug 28 10:35:40 2019
@@ -1,4 +1,4 @@
-$NetBSD: patch-src_wayland-os.c,v 1.1 2019/08/18 16:05:12 nia Exp $
+$NetBSD: patch-src_wayland-os.c,v 1.2 2019/08/28 10:35:40 nia Exp $
 
 BSD support from FreeBSD
 
@@ -79,7 +79,7 @@ https://lists.freedesktop.org/archives/w
  
        newfd = fcntl(fd, F_DUPFD, minfd);
        return set_cloexec_or_close(newfd);
-@@ -123,17 +153,20 @@ wl_os_recvmsg_cloexec(int sockfd, struct
+@@ -123,15 +153,18 @@ wl_os_recvmsg_cloexec(int sockfd, struct
  {
        ssize_t len;
  
@@ -96,16 +96,15 @@ https://lists.freedesktop.org/archives/w
  
 +#ifdef HAVE_SYS_EPOLL_H
  int
--wl_os_epoll_create_cloexec(void)
-+wl_os_queue_create_cloexec(void)
+ wl_os_epoll_create_cloexec(void)
  {
-       int fd;
- 
-@@ -148,6 +181,16 @@ wl_os_epoll_create_cloexec(void)
+@@ -148,6 +181,18 @@ wl_os_epoll_create_cloexec(void)
        fd = epoll_create(1);
        return set_cloexec_or_close(fd);
  }
-+#elif defined(HAVE_SYS_EVENT_H)
++#endif
++
++#ifdef HAVE_SYS_EVENT_H
 +int
 +wl_os_queue_create_cloexec(void)
 +{
Index: pkgsrc/devel/wayland/patches/patch-src_wayland-os.h
diff -u pkgsrc/devel/wayland/patches/patch-src_wayland-os.h:1.1 pkgsrc/devel/wayland/patches/patch-src_wayland-os.h:1.2
--- pkgsrc/devel/wayland/patches/patch-src_wayland-os.h:1.1     Sun Aug 18 16:05:12 2019
+++ pkgsrc/devel/wayland/patches/patch-src_wayland-os.h Wed Aug 28 10:35:40 2019
@@ -1,4 +1,4 @@
-$NetBSD: patch-src_wayland-os.h,v 1.1 2019/08/18 16:05:12 nia Exp $
+$NetBSD: patch-src_wayland-os.h,v 1.2 2019/08/28 10:35:40 nia Exp $
 
 BSD support from FreeBSD
 
@@ -6,7 +6,7 @@ https://lists.freedesktop.org/archives/w
 
 --- src/wayland-os.h.orig      2019-03-21 00:55:25.000000000 +0000
 +++ src/wayland-os.h
-@@ -26,17 +26,23 @@
+@@ -26,17 +26,29 @@
  #ifndef WAYLAND_OS_H
  #define WAYLAND_OS_H
  
@@ -24,10 +24,15 @@ https://lists.freedesktop.org/archives/w
  ssize_t
  wl_os_recvmsg_cloexec(int sockfd, struct msghdr *msg, int flags);
  
-+
++#ifdef HAVE_SYS_EPOLL_H
  int
--wl_os_epoll_create_cloexec(void);
+ wl_os_epoll_create_cloexec(void);
++#endif
++
++#ifdef HAVE_SYS_EVENT_H
++int
 +wl_os_queue_create_cloexec(void);
++#endif
  
  int
  wl_os_accept_cloexec(int sockfd, struct sockaddr *addr, socklen_t *addrlen);