Skip to content

Commit

Permalink
Update glib2 to 2.66.0
Browse files Browse the repository at this point in the history
Highlights:
* Fixes to the new `statx()` calls - note that since GLib 2.65.2 uses `statx()`
  (if available) instead of `stat()`/`fstat()`/`lstat()`/`fstatat()`, syscall
  sandboxing for third party applications might need to be updated
* Fix deadlock in `g_subprocess_communicate_async()` (work by Alexander Larsson) (#2182)
* Add `%f`/microsecond placeholder support to `g_date_time_format()` (work by Johan Bjäreholt) (!1605)
* Add `GUri` API for parsing, building and representing URIs according to
  [RFC 3986](https://tools.ietf.org/html/rfc3986) (work by Marc-Andre Lureau) (#110)
* D-Bus credentials support on macOS (#507)
* Year 2038 fixes involving new API in `GBookmarkFile` (#1931)

For full details, see:
https://gitlab.gnome.org/GNOME/glib/-/blob/2.66.0/NEWS
  • Loading branch information
prlw1 committed Sep 29, 2020
1 parent 43d0a70 commit cbbe6bc
Show file tree
Hide file tree
Showing 8 changed files with 40 additions and 58 deletions.
10 changes: 5 additions & 5 deletions devel/gdbus-codegen/distinfo
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
$NetBSD: distinfo,v 1.14 2020/08/19 09:34:35 adam Exp $
$NetBSD: distinfo,v 1.15 2020/09/29 10:43:33 prlw1 Exp $

SHA1 (glib-2.64.5.tar.xz) = be12160d2b91a152721279d27b00f8affbf9501b
RMD160 (glib-2.64.5.tar.xz) = f1d1dd687d98b796b0d6219e6053ced097034c15
SHA512 (glib-2.64.5.tar.xz) = a87537274619b6de88a0e68555059036ac18c748b5005c8d84728646b0db342fde0b8c5b303b9ad79f64d71ea4ed990d52a4fbd68cda3ca74aed5fe4d497e060
Size (glib-2.64.5.tar.xz) = 4778456 bytes
SHA1 (glib-2.66.0.tar.xz) = f2bf625fa3f93be73841c4a6417adcc110ba09a8
RMD160 (glib-2.66.0.tar.xz) = 5f47925074f104798b423aa31377902b07c802e0
SHA512 (glib-2.66.0.tar.xz) = 358e6a840b722139593eb7825c3aa70153eb26036e05d13d3286bcc6d2e962c2b4ddcb0fe5c6728b89bfffbd178101e72c576081ae714326a272a9fc34ed953e
Size (glib-2.66.0.tar.xz) = 4839236 bytes
SHA1 (patch-meson.build) = 4f9d178950414e1537b48a552d63c9e551801999
4 changes: 1 addition & 3 deletions devel/glib2/Makefile
Original file line number Diff line number Diff line change
@@ -1,9 +1,7 @@
# $NetBSD: Makefile,v 1.275 2020/09/18 11:18:29 wiz Exp $
# $NetBSD: Makefile,v 1.276 2020/09/29 10:43:33 prlw1 Exp $

.include "Makefile.common"

PKGREVISION= 1

CATEGORIES= devel gnome
COMMENT= Some useful routines for C programming (glib2)

Expand Down
4 changes: 2 additions & 2 deletions devel/glib2/Makefile.common
Original file line number Diff line number Diff line change
@@ -1,9 +1,9 @@
# $NetBSD: Makefile.common,v 1.83 2020/08/19 09:34:35 adam Exp $
# $NetBSD: Makefile.common,v 1.84 2020/09/29 10:43:33 prlw1 Exp $
# used by devel/gdbus-codegen/Makefile
# used by devel/glib2/Makefile
# used by devel/glib2-tools/Makefile

DISTNAME= glib-2.64.5
DISTNAME= glib-2.66.0
PKGNAME= ${DISTNAME:S/glib/glib2/}
MASTER_SITES= ${MASTER_SITE_GNOME:=sources/glib/${PKGVERSION_NOREV:R}/}
EXTRACT_SUFX= .tar.xz
Expand Down
18 changes: 9 additions & 9 deletions devel/glib2/PLIST
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
@comment $NetBSD: PLIST,v 1.119 2020/08/19 09:34:35 adam Exp $
@comment $NetBSD: PLIST,v 1.120 2020/09/29 10:43:33 prlw1 Exp $
${PLIST.nococoa}bin/gapplication
bin/gdbus
bin/gio
Expand Down Expand Up @@ -248,7 +248,7 @@ include/glib-2.0/glib/gtrashstack.h
include/glib-2.0/glib/gtree.h
include/glib-2.0/glib/gtypes.h
include/glib-2.0/glib/gunicode.h
include/glib-2.0/glib/gurifuncs.h
include/glib-2.0/glib/guri.h
include/glib-2.0/glib/gutils.h
include/glib-2.0/glib/guuid.h
include/glib-2.0/glib/gvariant.h
Expand Down Expand Up @@ -282,19 +282,19 @@ ${PLIST.fam}lib/gio/modules/libgiofam.so
lib/glib-2.0/include/glibconfig.h
lib/libgio-2.0.so
lib/libgio-2.0.so.0
lib/libgio-2.0.so.0.6400.5
lib/libgio-2.0.so.0.6600.0
lib/libglib-2.0.so
lib/libglib-2.0.so.0
lib/libglib-2.0.so.0.6400.5
lib/libglib-2.0.so.0.6600.0
lib/libgmodule-2.0.so
lib/libgmodule-2.0.so.0
lib/libgmodule-2.0.so.0.6400.5
lib/libgmodule-2.0.so.0.6600.0
lib/libgobject-2.0.so
lib/libgobject-2.0.so.0
lib/libgobject-2.0.so.0.6400.5
lib/libgobject-2.0.so.0.6600.0
lib/libgthread-2.0.so
lib/libgthread-2.0.so.0
lib/libgthread-2.0.so.0.6400.5
lib/libgthread-2.0.so.0.6600.0
lib/pkgconfig/gio-2.0.pc
lib/pkgconfig/gio-unix-2.0.pc
lib/pkgconfig/glib-2.0.pc
Expand All @@ -306,8 +306,8 @@ lib/pkgconfig/gthread-2.0.pc
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.6400.5-gdb.py
share/gdb/auto-load${LOCALBASE}/lib/libgobject-2.0.so.0.6400.5-gdb.py
share/gdb/auto-load${LOCALBASE}/lib/libglib-2.0.so.0.6600.0-gdb.py
share/gdb/auto-load${LOCALBASE}/lib/libgobject-2.0.so.0.6600.0-gdb.py
share/gettext/its/gschema.its
share/gettext/its/gschema.loc
share/glib-2.0/gdb/glib_gdb.py
Expand Down
17 changes: 8 additions & 9 deletions devel/glib2/distinfo
Original file line number Diff line number Diff line change
@@ -1,10 +1,10 @@
$NetBSD: distinfo,v 1.275 2020/09/18 11:18:29 wiz Exp $
$NetBSD: distinfo,v 1.276 2020/09/29 10:43:33 prlw1 Exp $

SHA1 (glib-2.64.5.tar.xz) = be12160d2b91a152721279d27b00f8affbf9501b
RMD160 (glib-2.64.5.tar.xz) = f1d1dd687d98b796b0d6219e6053ced097034c15
SHA512 (glib-2.64.5.tar.xz) = a87537274619b6de88a0e68555059036ac18c748b5005c8d84728646b0db342fde0b8c5b303b9ad79f64d71ea4ed990d52a4fbd68cda3ca74aed5fe4d497e060
Size (glib-2.64.5.tar.xz) = 4778456 bytes
SHA1 (patch-gio_gcredentialsprivate.h) = dab92e07f8357a7dc1a569e37f65f9b199aee281
SHA1 (glib-2.66.0.tar.xz) = f2bf625fa3f93be73841c4a6417adcc110ba09a8
RMD160 (glib-2.66.0.tar.xz) = 5f47925074f104798b423aa31377902b07c802e0
SHA512 (glib-2.66.0.tar.xz) = 358e6a840b722139593eb7825c3aa70153eb26036e05d13d3286bcc6d2e962c2b4ddcb0fe5c6728b89bfffbd178101e72c576081ae714326a272a9fc34ed953e
Size (glib-2.66.0.tar.xz) = 4839236 bytes
SHA1 (patch-gio_gcredentialsprivate.h) = 6547edb518a98c3aca53acc1f98bde83e71b14cb
SHA1 (patch-gio_gdbus-2.0_codegen_meson.build) = ec8ce89da08059ebf953d84a1dca5a2b380349f4
SHA1 (patch-gio_giomodule.c) = d704699b2f457a08fff9219fe697e5fd2cc582ed
SHA1 (patch-gio_glib-compile-schemas.c) = 4fc8e8ba62bef01762007ebf21569053374808d0
Expand All @@ -18,13 +18,12 @@ SHA1 (patch-gio_tests_meson.build) = 38fbe56f310545163623c5dbd9ba1f8a25e4d928
SHA1 (patch-glib_gatomic.c) = deb2e74010523ad41ce141aa2f49b807ba2672e6
SHA1 (patch-glib_gatomic.h) = d1c39c3594a5c89d196349e5eafb5512795f55f8
SHA1 (patch-glib_genviron.c) = dd25be36536d56dfe933225d785eb65f753c4a97
SHA1 (patch-glib_gmain.c) = a50bf85d640d63bb901ad26afca933df52e6ccbd
SHA1 (patch-glib_gspawn.c) = 8f833edd594168fe62c5d0e161ebaafdebda2294
SHA1 (patch-glib_meson.build) = 8a45f4e32d9db8c0406908bef332ec81237d0cdf
SHA1 (patch-glib_meson.build) = 65cbe6e3bd650f8f2c37f003a48ef183700a6ef9
SHA1 (patch-glib_tests_hash.c) = a7e19ca55fcbbc0b188c34755cae5b6b65b67f1a
SHA1 (patch-glib_tests_include.c) = 12d98caebfb87c1146821d518c37c45f97fc7be0
SHA1 (patch-glib_tests_meson.build) = d012ede92bd3202bde4e8fab9cf4c0ee9ca8d3d4
SHA1 (patch-gobject_glib-mkenums.in) = c177cf9b1ea81542665240678f47f68351a3760d
SHA1 (patch-gobject_meson.build) = 412b65558aa4cf9648ee84a57ad6dfcc988b1a1d
SHA1 (patch-meson.build) = 85700da2a55f7c5791f6fa6cd9adf264c61451f8
SHA1 (patch-meson.build) = 4a1b813970d9cd4dc5a4bfff6d6be5dd0f2830e8
SHA1 (patch-meson_options.txt) = 7f633fbbfa9d9b2d958365891ffb9e4094d7dd54
8 changes: 4 additions & 4 deletions devel/glib2/patches/patch-gio_gcredentialsprivate.h
Original file line number Diff line number Diff line change
@@ -1,15 +1,15 @@
$NetBSD: patch-gio_gcredentialsprivate.h,v 1.3 2018/10/19 16:44:15 leot Exp $
$NetBSD: patch-gio_gcredentialsprivate.h,v 1.4 2020/09/29 10:43:33 prlw1 Exp $

NetBSD has G_CREDENTIALS_SOCKET_GET_CREDENTIALS_SUPPORTED.

--- gio/gcredentialsprivate.h.orig 2017-07-13 23:03:38.000000000 +0000
--- gio/gcredentialsprivate.h.orig 2020-08-18 10:52:24.847177300 +0000
+++ gio/gcredentialsprivate.h
@@ -47,7 +47,7 @@
@@ -134,7 +134,7 @@
#define G_CREDENTIALS_USE_NETBSD_UNPCBID 1
#define G_CREDENTIALS_NATIVE_TYPE G_CREDENTIALS_TYPE_NETBSD_UNPCBID
#define G_CREDENTIALS_NATIVE_SIZE (sizeof (struct unpcbid))
-/* #undef G_CREDENTIALS_UNIX_CREDENTIALS_MESSAGE_SUPPORTED */
+#define G_CREDENTIALS_SOCKET_GET_CREDENTIALS_SUPPORTED 1
#define G_CREDENTIALS_SPOOFING_SUPPORTED 1
#define G_CREDENTIALS_HAS_PID 1

#elif defined(__OpenBSD__)
12 changes: 1 addition & 11 deletions devel/glib2/patches/patch-glib_meson.build
Original file line number Diff line number Diff line change
@@ -1,20 +1,10 @@
$NetBSD: patch-glib_meson.build,v 1.8 2020/03/04 15:11:48 wiz Exp $
$NetBSD: patch-glib_meson.build,v 1.9 2020/09/29 10:43:33 prlw1 Exp $

- On Darwin, allow building without Cocoa.
- Don't bother with gtester as it's slated for deprecation anyway:
https://gitlab.gnome.org/GNOME/glib/issues/1441

--- glib/meson.build.orig 2020-02-27 16:12:52.000000000 +0000
+++ glib/meson.build
@@ -316,7 +316,7 @@ else
platform_deps = []
endif

-if host_system == 'darwin'
+if host_system == 'darwin' and glib_have_cocoa
glib_sources += files('gosxutils.m')
endif

@@ -410,25 +410,8 @@ if host_system == 'windows'
include_directories : configinc,
dependencies : [libglib_dep])
Expand Down
25 changes: 10 additions & 15 deletions devel/glib2/patches/patch-meson.build
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
$NetBSD: patch-meson.build,v 1.10 2020/03/04 15:11:48 wiz Exp $
$NetBSD: patch-meson.build,v 1.11 2020/09/29 10:43:33 prlw1 Exp $

- On Darwin, optionally use Cocoa (needed for X11 users).

Expand All @@ -12,31 +12,26 @@ $NetBSD: patch-meson.build,v 1.10 2020/03/04 15:11:48 wiz Exp $

- Define a newer POSIX, as we build this package with -std=gnu99

- Check size_t compatibility with various other types
commit 505c9544247f27cb6ebf749d0902d53c33dac308
glib bug #1777
c.f., PR pkg/54909 and PR pkg/54298

--- meson.build.orig 2020-02-27 16:12:52.000000000 +0000
--- meson.build.orig 2020-08-18 10:52:24.985179000 +0000
+++ meson.build
@@ -677,6 +677,7 @@ if host_system == 'darwin'
@@ -756,6 +756,7 @@ if host_system == 'darwin'
#error "Detected GNUstep, not Cocoa"
#endif''',
name : 'Mac OS X Cocoa support')
+ glib_have_cocoa = glib_have_cocoa and get_option('use_cocoa')

if glib_have_cocoa
glib_conf.set('HAVE_COCOA', true)
@@ -1904,7 +1905,7 @@ endif
# proxy-libintl subproject.
@@ -2003,7 +2004,7 @@ endif
# FIXME: glib-gettext.m4 has much more checks to detect broken/uncompatible
# implementations. This could be extended if issues are found in some platforms.
libintl_deps = []
-if cc.has_function('ngettext')
+if cc.has_function('ngettext') and host_system != 'sunos'
libintl = []
have_bind_textdomain_codeset = cc.has_function('bind_textdomain_codeset')
else
@@ -1955,16 +1956,15 @@ if host_system != 'windows' and get_opti
# First just find the bare library.
@@ -2076,16 +2077,15 @@ if host_system != 'windows' and get_opti
if cc.has_function('getxattr') and cc.has_header('sys/xattr.h')
glib_conf.set('HAVE_SYS_XATTR_H', 1)
glib_conf_prefix = glib_conf_prefix + '#define @0@ 1\n'.format('HAVE_SYS_XATTR_H')
Expand All @@ -55,7 +50,7 @@ $NetBSD: patch-meson.build,v 1.10 2020/03/04 15:11:48 wiz Exp $
if cc.compiles(glib_conf_prefix + '''
#include <stdio.h>
#ifdef HAVE_SYS_TYPES_H
@@ -2058,9 +2058,11 @@ endif
@@ -2185,9 +2185,11 @@ endif

glib_conf.set('HAVE_PROC_SELF_CMDLINE', have_proc_self_cmdline)

Expand All @@ -70,7 +65,7 @@ $NetBSD: patch-meson.build,v 1.10 2020/03/04 15:11:48 wiz Exp $

python_version = python.language_version()
python_version_req = '>=3.5'
@@ -2069,7 +2071,7 @@ if not python_version.version_compare(py
@@ -2196,7 +2198,7 @@ if not python_version.version_compare(py
endif

# Determine which user environment-dependent files that we want to install
Expand All @@ -79,7 +74,7 @@ $NetBSD: patch-meson.build,v 1.10 2020/03/04 15:11:48 wiz Exp $
have_sh = find_program('sh', required : false).found() # For glib-gettextize

# Some installed tests require a custom environment
@@ -2077,8 +2079,7 @@ env_program = find_program('env', requir
@@ -2204,8 +2206,7 @@ env_program = find_program('env', requir

# FIXME: How to detect Solaris? https://github.com/mesonbuild/meson/issues/1578
if host_system == 'sunos'
Expand Down

0 comments on commit cbbe6bc

Please sign in to comment.