CVS commit: pkgsrc/devel/glib2

["Maya Rashish" <maya%netbsd.org@localhost>]

Module Name:    pkgsrc
Committed By:   maya
Date:           Tue Jun  4 10:24:21 UTC 2019

Modified Files:
        pkgsrc/devel/glib2: distinfo
        pkgsrc/devel/glib2/patches: patch-gio_inotify_inotify-kernel.c

Log Message:
glib2: check for sys/filio.h before including it. not all linux has it.


To generate a diff of this commit:
cvs rdiff -u -r1.240 -r1.241 pkgsrc/devel/glib2/distinfo
cvs rdiff -u -r1.3 -r1.4 \
    pkgsrc/devel/glib2/patches/patch-gio_inotify_inotify-kernel.c

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

Modified files:

Index: pkgsrc/devel/glib2/distinfo
diff -u pkgsrc/devel/glib2/distinfo:1.240 pkgsrc/devel/glib2/distinfo:1.241
--- pkgsrc/devel/glib2/distinfo:1.240   Mon Jun  3 23:09:29 2019
+++ pkgsrc/devel/glib2/distinfo Tue Jun  4 10:24:21 2019
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.240 2019/06/03 23:09:29 maya Exp $
+$NetBSD: distinfo,v 1.241 2019/06/04 10:24:21 maya Exp $
 
 SHA1 (glib-2.60.2.tar.xz) = 8aa8586f0b1fd13c2717adf7ac3e6427bee651b6
 RMD160 (glib-2.60.2.tar.xz) = 8d18a8e4b43071afc35762eff3618a88a7112f57
@@ -11,7 +11,7 @@ SHA1 (patch-gio_glocalfileinfo.c) = 8e0b
 SHA1 (patch-gio_gresource-tool.c) = ad0e59f48f5f98ea66be568dbe2e5a5d1ac602fc
 SHA1 (patch-gio_gunixcredentialsmessage.c) = c13119ddd6262db7c03e53857e987f0c495d3312
 SHA1 (patch-gio_gunixmounts.c) = 5c9d4d86161ef1723da0e7d54af65debcb1ed137
-SHA1 (patch-gio_inotify_inotify-kernel.c) = a48c70f0dfd5e485f27b9719e2d0670f67a159c5
+SHA1 (patch-gio_inotify_inotify-kernel.c) = 24deec33a1ad5e3c1a4f2d1397440d26b0f23b84
 SHA1 (patch-gio_meson.build) = 5983ff37da260558d0f367feed75d4c0ed1bd6fd
 SHA1 (patch-glib_gmain.c) = 2ab4b59e438d9f764bee62e0c1fa8bbd231b6e8d
 SHA1 (patch-glib_meson.build) = 477cbc2324a81bb2a406487daef71cfc2140719c

Index: pkgsrc/devel/glib2/patches/patch-gio_inotify_inotify-kernel.c
diff -u pkgsrc/devel/glib2/patches/patch-gio_inotify_inotify-kernel.c:1.3 pkgsrc/devel/glib2/patches/patch-gio_inotify_inotify-kernel.c:1.4
--- pkgsrc/devel/glib2/patches/patch-gio_inotify_inotify-kernel.c:1.3   Mon Jun  3 23:09:29 2019
+++ pkgsrc/devel/glib2/patches/patch-gio_inotify_inotify-kernel.c       Tue Jun  4 10:24:21 2019
@@ -1,4 +1,4 @@
-$NetBSD: patch-gio_inotify_inotify-kernel.c,v 1.3 2019/06/03 23:09:29 maya Exp $
+$NetBSD: patch-gio_inotify_inotify-kernel.c,v 1.4 2019/06/04 10:24:21 maya Exp $
 
 Use _XOPEN_NAME_MAX in lieu of NAME_MAX for SunOS.
 
@@ -7,11 +7,13 @@ https://gitlab.gnome.org/GNOME/glib/merg
 
 --- gio/inotify/inotify-kernel.c.orig  2016-02-23 22:25:36.000000000 +0000
 +++ gio/inotify/inotify-kernel.c
-@@ -30,11 +30,15 @@
+@@ -30,11 +30,17 @@
  #include <glib.h>
  #include "inotify-kernel.h"
  #include <sys/inotify.h>
++#ifdef HAVE_SYS_FILIO_H
 +#include <sys/filio.h>
++#endif
  #include <glib/glib-unix.h>
  
  #include "glib-private.h"