CVS commit: pkgsrc/devel/glib2

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

Module Name:    pkgsrc
Committed By:   maya
Date:           Mon Jun  3 23:09:29 UTC 2019

Modified Files:
        pkgsrc/devel/glib2: Makefile distinfo
        pkgsrc/devel/glib2/patches: patch-gio_gunixmounts.c
            patch-gio_inotify_inotify-kernel.c patch-meson.build

Log Message:
glib2: spell mnt_mntopts correctly. bump pkgrevision.

While here, mention upstream merge requests for the things I've already
submitted.


To generate a diff of this commit:
cvs rdiff -u -r1.247 -r1.248 pkgsrc/devel/glib2/Makefile
cvs rdiff -u -r1.239 -r1.240 pkgsrc/devel/glib2/distinfo
cvs rdiff -u -r1.3 -r1.4 pkgsrc/devel/glib2/patches/patch-gio_gunixmounts.c
cvs rdiff -u -r1.2 -r1.3 \
    pkgsrc/devel/glib2/patches/patch-gio_inotify_inotify-kernel.c \
    pkgsrc/devel/glib2/patches/patch-meson.build

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/Makefile
diff -u pkgsrc/devel/glib2/Makefile:1.247 pkgsrc/devel/glib2/Makefile:1.248
--- pkgsrc/devel/glib2/Makefile:1.247   Mon Jun  3 21:24:04 2019
+++ pkgsrc/devel/glib2/Makefile Mon Jun  3 23:09:29 2019
@@ -1,9 +1,10 @@
-# $NetBSD: Makefile,v 1.247 2019/06/03 21:24:04 maya Exp $
+# $NetBSD: Makefile,v 1.248 2019/06/03 23:09:29 maya Exp $
 
 .include "Makefile.common"
 
 CATEGORIES=    devel gnome
 COMMENT=       Some useful routines for C programming (glib2)
+PKGREVISION=   1
 
 DISTINFO_FILE= ${.CURDIR}/../../devel/glib2/distinfo
 PATCHDIR=      ${.CURDIR}/../../devel/glib2/patches

Index: pkgsrc/devel/glib2/distinfo
diff -u pkgsrc/devel/glib2/distinfo:1.239 pkgsrc/devel/glib2/distinfo:1.240
--- pkgsrc/devel/glib2/distinfo:1.239   Mon Jun  3 21:24:04 2019
+++ pkgsrc/devel/glib2/distinfo Mon Jun  3 23:09:29 2019
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.239 2019/06/03 21:24:04 maya Exp $
+$NetBSD: distinfo,v 1.240 2019/06/03 23:09:29 maya Exp $
 
 SHA1 (glib-2.60.2.tar.xz) = 8aa8586f0b1fd13c2717adf7ac3e6427bee651b6
 RMD160 (glib-2.60.2.tar.xz) = 8d18a8e4b43071afc35762eff3618a88a7112f57
@@ -10,8 +10,8 @@ SHA1 (patch-gio_giomodule.c) = 08181ad8d
 SHA1 (patch-gio_glocalfileinfo.c) = 8e0b7e9543ce3c702c468f56e7ecf418d70b049f
 SHA1 (patch-gio_gresource-tool.c) = ad0e59f48f5f98ea66be568dbe2e5a5d1ac602fc
 SHA1 (patch-gio_gunixcredentialsmessage.c) = c13119ddd6262db7c03e53857e987f0c495d3312
-SHA1 (patch-gio_gunixmounts.c) = bce5aaa9778b7044aebe588d12068202682c5feb
-SHA1 (patch-gio_inotify_inotify-kernel.c) = ee931a707c7685a91e52eba1300405dfdb647b0c
+SHA1 (patch-gio_gunixmounts.c) = 5c9d4d86161ef1723da0e7d54af65debcb1ed137
+SHA1 (patch-gio_inotify_inotify-kernel.c) = a48c70f0dfd5e485f27b9719e2d0670f67a159c5
 SHA1 (patch-gio_meson.build) = 5983ff37da260558d0f367feed75d4c0ed1bd6fd
 SHA1 (patch-glib_gmain.c) = 2ab4b59e438d9f764bee62e0c1fa8bbd231b6e8d
 SHA1 (patch-glib_meson.build) = 477cbc2324a81bb2a406487daef71cfc2140719c
@@ -22,4 +22,4 @@ SHA1 (patch-gmodule_gmodule-win32.c) = 4
 SHA1 (patch-gmodule_gmodule.c) = 55c5f9d16e3517f3fdc04d40922f50d9c66b0b9a
 SHA1 (patch-gobject_glib-mkenums.in) = c177cf9b1ea81542665240678f47f68351a3760d
 SHA1 (patch-gobject_meson.build) = 5e7c8508dbc228d01960e563bdba40cbf10db489
-SHA1 (patch-meson.build) = 7c7de85d2dc91ac835d80d76c23330c3e0ab3555
+SHA1 (patch-meson.build) = b2e1139f4606870b117fd6ff35d7832b35ea1126

Index: pkgsrc/devel/glib2/patches/patch-gio_gunixmounts.c
diff -u pkgsrc/devel/glib2/patches/patch-gio_gunixmounts.c:1.3 pkgsrc/devel/glib2/patches/patch-gio_gunixmounts.c:1.4
--- pkgsrc/devel/glib2/patches/patch-gio_gunixmounts.c:1.3      Mon Jun  3 21:24:04 2019
+++ pkgsrc/devel/glib2/patches/patch-gio_gunixmounts.c  Mon Jun  3 23:09:29 2019
@@ -1,7 +1,8 @@
-$NetBSD: patch-gio_gunixmounts.c,v 1.3 2019/06/03 21:24:04 maya Exp $
+$NetBSD: patch-gio_gunixmounts.c,v 1.4 2019/06/03 23:09:29 maya Exp $
 
 SunOS has sys/mntent.h but no mnt_opts.
 XXX who else uses the sys/mntent.h case?
+https://gitlab.gnome.org/GNOME/glib/merge_requests/890
 
 --- gio/gunixmounts.c.orig     2019-05-03 13:43:28.000000000 +0000
 +++ gio/gunixmounts.c
@@ -10,7 +11,7 @@ XXX who else uses the sys/mntent.h case?
                                               NULL,
                                               mntent.mnt_fstype,
 -                                             mntent.mnt_opts,
-+                                             NULL/*mntent.mnt_opts*/,
++                                             mntent.mnt_mntopts,
                                               is_read_only);
  
        return_list = g_list_prepend (return_list, mount_entry);

Index: pkgsrc/devel/glib2/patches/patch-gio_inotify_inotify-kernel.c
diff -u pkgsrc/devel/glib2/patches/patch-gio_inotify_inotify-kernel.c:1.2 pkgsrc/devel/glib2/patches/patch-gio_inotify_inotify-kernel.c:1.3
--- pkgsrc/devel/glib2/patches/patch-gio_inotify_inotify-kernel.c:1.2   Mon Jun  3 21:24:04 2019
+++ pkgsrc/devel/glib2/patches/patch-gio_inotify_inotify-kernel.c       Mon Jun  3 23:09:29 2019
@@ -1,7 +1,9 @@
-$NetBSD: patch-gio_inotify_inotify-kernel.c,v 1.2 2019/06/03 21:24:04 maya Exp $
+$NetBSD: patch-gio_inotify_inotify-kernel.c,v 1.3 2019/06/03 23:09:29 maya Exp $
 
 Use _XOPEN_NAME_MAX in lieu of NAME_MAX for SunOS.
+
 Include <sys/filio.h> for FIONREAD on SunOS.
+https://gitlab.gnome.org/GNOME/glib/merge_requests/889
 
 --- gio/inotify/inotify-kernel.c.orig  2016-02-23 22:25:36.000000000 +0000
 +++ gio/inotify/inotify-kernel.c
Index: pkgsrc/devel/glib2/patches/patch-meson.build
diff -u pkgsrc/devel/glib2/patches/patch-meson.build:1.2 pkgsrc/devel/glib2/patches/patch-meson.build:1.3
--- pkgsrc/devel/glib2/patches/patch-meson.build:1.2    Mon Jun  3 21:24:04 2019
+++ pkgsrc/devel/glib2/patches/patch-meson.build        Mon Jun  3 23:09:29 2019
@@ -1,9 +1,12 @@
-$NetBSD: patch-meson.build,v 1.2 2019/06/03 21:24:04 maya Exp $
+$NetBSD: patch-meson.build,v 1.3 2019/06/03 23:09:29 maya Exp $
 
 - Don't insist that python binary is called "python3".
   (Requires meson >= 0.50.0)
 - Don't install bash completion scripts.
+
 - Tolerate getxattr not existing (smartOS)
+https://gitlab.gnome.org/GNOME/glib/merge_requests/888
+
 - Define a newer POSIX, as we build this package with -std=gnu99
 - auto-detect GNU iconv, even if no arguments are passed.
   (by checking if iconv.h might in fact be a gnu one)