[pkgsrc/trunk]: pkgsrc/devel glib2: updated to 2.68.1

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

details:   https://anonhg.NetBSD.org/pkgsrc/rev/d9c51a55c200
branches:  trunk
changeset: 450309:d9c51a55c200
user:      adam <adam%pkgsrc.org@localhost>
date:      Tue Apr 13 19:22:14 2021 +0000

description:
glib2: updated to 2.68.1

Overview of changes in GLib 2.68.1
==================================

* Fix a crash in `GKeyFile` when parsing a file which contains translations
  using a `GKeyFile` instance which has loaded another file previously

* Pin GIO DLL in memory on Windows (!2016)

* Bugs fixed:
 - g_key_file_load_from_file segfaults on "Key[*]="like lines
 - !1997 Backport !1996 Include glibconfig.h to get the G_OS_UNIX token to glib-2-68
 - !2016 GIO W32: Pin gio DLL
 - !2021 Backport MR !2016 (GIO W32: Pin gio DLL) into glib-2-68
 - !2022 Few fixes and notes for building on Visual Studio 2012 and earlier
 - !2034 Backport MR !2032 (gkeyfile: Drop a redundant check) into glib-2-68
 - !2035 Backport !2026 Split g_test_log() messages that contain multiple lines to glib-2-68

* Translation updates:
 - English (United Kingdom)

diffstat:

 devel/gdbus-codegen/distinfo                |  10 +++++-----
 devel/glib2/Makefile                        |   4 +---
 devel/glib2/Makefile.common                 |   4 ++--
 devel/glib2/PLIST                           |  16 ++++++++--------
 devel/glib2/distinfo                        |  11 +++++------
 devel/glib2/patches/patch-glib_ghostutils.c |  15 ---------------
 6 files changed, 21 insertions(+), 39 deletions(-)

diffs (135 lines):

diff -r 27aed015dc31 -r d9c51a55c200 devel/gdbus-codegen/distinfo
--- a/devel/gdbus-codegen/distinfo      Tue Apr 13 18:47:09 2021 +0000
+++ b/devel/gdbus-codegen/distinfo      Tue Apr 13 19:22:14 2021 +0000
@@ -1,7 +1,7 @@
-$NetBSD: distinfo,v 1.21 2021/03/30 09:54:32 adam Exp $
+$NetBSD: distinfo,v 1.22 2021/04/13 19:22:14 adam Exp $
 
-SHA1 (glib-2.68.0.tar.xz) = cd51b3d7c99ffbc9bb6b39fa6450fc147385c3cb
-RMD160 (glib-2.68.0.tar.xz) = 8843183c417ffe664a935d5ba229af4b5d8328bd
-SHA512 (glib-2.68.0.tar.xz) = dce0660476d67d7736c00861f4c3c267723f39032f582d1b2c17660a4939eeccd97e975da61b5be49e6f54612c6d5ce592aa7bdeacf4ecc75f3b38358da94a1d
-Size (glib-2.68.0.tar.xz) = 4938804 bytes
+SHA1 (glib-2.68.1.tar.xz) = d6881f6a97f5a83081177994dbef7cfb04166c6d
+RMD160 (glib-2.68.1.tar.xz) = eb9f8c33f97bb6e06d08478753a98a67ae229d1d
+SHA512 (glib-2.68.1.tar.xz) = f705cda6f1b4b0acc5fe8d21b60994ca0ec6de39c6722f4f01cbe0ece30eacb7271d3cb29067e638e0204a3cefa2df1e535f273b72330455e185b544cebc2ab0
+Size (glib-2.68.1.tar.xz) = 4940260 bytes
 SHA1 (patch-meson.build) = 4f9d178950414e1537b48a552d63c9e551801999
diff -r 27aed015dc31 -r d9c51a55c200 devel/glib2/Makefile
--- a/devel/glib2/Makefile      Tue Apr 13 18:47:09 2021 +0000
+++ b/devel/glib2/Makefile      Tue Apr 13 19:22:14 2021 +0000
@@ -1,9 +1,7 @@
-# $NetBSD: Makefile,v 1.280 2021/03/31 09:59:43 jperkin Exp $
+# $NetBSD: Makefile,v 1.281 2021/04/13 19:22:14 adam Exp $
 
 .include "Makefile.common"
 
-PKGREVISION=   2
-
 CATEGORIES=    devel gnome
 COMMENT=       Some useful routines for C programming (glib2)
 
diff -r 27aed015dc31 -r d9c51a55c200 devel/glib2/Makefile.common
--- a/devel/glib2/Makefile.common       Tue Apr 13 18:47:09 2021 +0000
+++ b/devel/glib2/Makefile.common       Tue Apr 13 19:22:14 2021 +0000
@@ -1,9 +1,9 @@
-# $NetBSD: Makefile.common,v 1.90 2021/03/30 09:37:51 cirnatdan Exp $
+# $NetBSD: Makefile.common,v 1.91 2021/04/13 19:22:14 adam Exp $
 # used by devel/gdbus-codegen/Makefile
 # used by devel/glib2/Makefile
 # used by devel/glib2-tools/Makefile
 
-DISTNAME=      glib-2.68.0
+DISTNAME=      glib-2.68.1
 PKGNAME=       ${DISTNAME:S/glib/glib2/}
 MASTER_SITES=  ${MASTER_SITE_GNOME:=sources/glib/${PKGVERSION_NOREV:R}/}
 EXTRACT_SUFX=  .tar.xz
diff -r 27aed015dc31 -r d9c51a55c200 devel/glib2/PLIST
--- a/devel/glib2/PLIST Tue Apr 13 18:47:09 2021 +0000
+++ b/devel/glib2/PLIST Tue Apr 13 19:22:14 2021 +0000
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.126 2021/03/30 09:37:51 cirnatdan Exp $
+@comment $NetBSD: PLIST,v 1.127 2021/04/13 19:22:14 adam Exp $
 ${PLIST.nococoa}bin/gapplication
 bin/gdbus
 bin/gio
@@ -283,19 +283,19 @@
 lib/glib-2.0/include/glibconfig.h
 lib/libgio-2.0.so
 lib/libgio-2.0.so.0
-lib/libgio-2.0.so.0.6800.0
+lib/libgio-2.0.so.0.6800.1
 lib/libglib-2.0.so
 lib/libglib-2.0.so.0
-lib/libglib-2.0.so.0.6800.0
+lib/libglib-2.0.so.0.6800.1
 lib/libgmodule-2.0.so
 lib/libgmodule-2.0.so.0
-lib/libgmodule-2.0.so.0.6800.0
+lib/libgmodule-2.0.so.0.6800.1
 lib/libgobject-2.0.so
 lib/libgobject-2.0.so.0
-lib/libgobject-2.0.so.0.6800.0
+lib/libgobject-2.0.so.0.6800.1
 lib/libgthread-2.0.so
 lib/libgthread-2.0.so.0
-lib/libgthread-2.0.so.0.6800.0
+lib/libgthread-2.0.so.0.6800.1
 lib/pkgconfig/gio-2.0.pc
 lib/pkgconfig/gio-unix-2.0.pc
 lib/pkgconfig/glib-2.0.pc
@@ -307,8 +307,8 @@
 share/aclocal/glib-2.0.m4
 share/aclocal/glib-gettext.m4
 share/aclocal/gsettings.m4
-share/gdb/auto-load${LOCALBASE}/lib/libglib-2.0.so.0.6800.0-gdb.py
-share/gdb/auto-load${LOCALBASE}/lib/libgobject-2.0.so.0.6800.0-gdb.py
+share/gdb/auto-load${LOCALBASE}/lib/libglib-2.0.so.0.6800.1-gdb.py
+share/gdb/auto-load${LOCALBASE}/lib/libgobject-2.0.so.0.6800.1-gdb.py
 share/gettext/its/gschema.its
 share/gettext/its/gschema.loc
 share/glib-2.0/gdb/glib_gdb.py
diff -r 27aed015dc31 -r d9c51a55c200 devel/glib2/distinfo
--- a/devel/glib2/distinfo      Tue Apr 13 18:47:09 2021 +0000
+++ b/devel/glib2/distinfo      Tue Apr 13 19:22:14 2021 +0000
@@ -1,9 +1,9 @@
-$NetBSD: distinfo,v 1.284 2021/03/31 10:11:38 wiz Exp $
+$NetBSD: distinfo,v 1.285 2021/04/13 19:22:14 adam Exp $
 
-SHA1 (glib-2.68.0.tar.xz) = cd51b3d7c99ffbc9bb6b39fa6450fc147385c3cb
-RMD160 (glib-2.68.0.tar.xz) = 8843183c417ffe664a935d5ba229af4b5d8328bd
-SHA512 (glib-2.68.0.tar.xz) = dce0660476d67d7736c00861f4c3c267723f39032f582d1b2c17660a4939eeccd97e975da61b5be49e6f54612c6d5ce592aa7bdeacf4ecc75f3b38358da94a1d
-Size (glib-2.68.0.tar.xz) = 4938804 bytes
+SHA1 (glib-2.68.1.tar.xz) = d6881f6a97f5a83081177994dbef7cfb04166c6d
+RMD160 (glib-2.68.1.tar.xz) = eb9f8c33f97bb6e06d08478753a98a67ae229d1d
+SHA512 (glib-2.68.1.tar.xz) = f705cda6f1b4b0acc5fe8d21b60994ca0ec6de39c6722f4f01cbe0ece30eacb7271d3cb29067e638e0204a3cefa2df1e535f273b72330455e185b544cebc2ab0
+Size (glib-2.68.1.tar.xz) = 4940260 bytes
 SHA1 (patch-gio_gcredentialsprivate.h) = 6547edb518a98c3aca53acc1f98bde83e71b14cb
 SHA1 (patch-gio_gdbus-2.0_codegen_meson.build) = ec8ce89da08059ebf953d84a1dca5a2b380349f4
 SHA1 (patch-gio_giomodule.c) = d704699b2f457a08fff9219fe697e5fd2cc582ed
@@ -18,7 +18,6 @@
 SHA1 (patch-glib_gatomic.c) = deb2e74010523ad41ce141aa2f49b807ba2672e6
 SHA1 (patch-glib_gatomic.h) = d1c39c3594a5c89d196349e5eafb5512795f55f8
 SHA1 (patch-glib_genviron.c) = dd25be36536d56dfe933225d785eb65f753c4a97
-SHA1 (patch-glib_ghostutils.c) = bbeb3500e3d1e269ae56e8fd6a9c2381df701651
 SHA1 (patch-glib_gspawn.c) = 8f833edd594168fe62c5d0e161ebaafdebda2294
 SHA1 (patch-glib_meson.build) = 65cbe6e3bd650f8f2c37f003a48ef183700a6ef9
 SHA1 (patch-glib_tests_hash.c) = a7e19ca55fcbbc0b188c34755cae5b6b65b67f1a
diff -r 27aed015dc31 -r d9c51a55c200 devel/glib2/patches/patch-glib_ghostutils.c
--- a/devel/glib2/patches/patch-glib_ghostutils.c       Tue Apr 13 18:47:09 2021 +0000
+++ /dev/null   Thu Jan 01 00:00:00 1970 +0000
@@ -1,15 +0,0 @@
-$NetBSD: patch-glib_ghostutils.c,v 1.2 2021/03/31 10:11:38 wiz Exp $
-
-Include glibconfig.h to get the G_OS_UNIX token
-https://gitlab.gnome.org/GNOME/glib/-/commit/1fafbb82b0049dc76a72ebaeccda46db7166e7f2
-
---- glib/ghostutils.c.orig     2021-03-18 13:28:31.903625000 +0000
-+++ glib/ghostutils.c
-@@ -18,6 +18,7 @@
-  */
- 
- #include "config.h"
-+#include "glibconfig.h"
- 
- #include <string.h>
-