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

To: pkgsrc-changes-hg%NetBSD.org@localhost
Subject: [pkgsrc/trunk]: pkgsrc/devel glib2: updated to 2.60.7
From: adam <adam%pkgsrc.org@localhost>
Date: Wed, 15 Jan 2020 12:13:19 +0000
details:   https://anonhg.NetBSD.org/pkgsrc/rev/2c0eca8cf684
branches:  trunk
changeset: 403581:2c0eca8cf684
user:      adam <adam%pkgsrc.org@localhost>
date:      Tue Oct 29 09:22:24 2019 +0000

description:
glib2: updated to 2.60.7

Overview of changes in GLib 2.60.7
* Bugs fixed:
 - Invalid characters in Open Location dialog crashes GIMP
 - Setting GLIB_VERSION_{MIN_REQUIRED, MAX_ALLOWED} to before 2.56 triggers warnings
 - Backport !1009 ?gapplication: remove inactivity_timeout source on finalize? to glib-2-60
 - Backport !1008 ?gmessages: Only use structured logs if GLIB_VERSION_MAX_ALLOWED is ?2.56? to glib-2-60
 - Backport !966 ?Resolve "Invalid characters in Open Location dialog crashes GIMP"? to glib-2-60
 - Backport !1040 ?GSettingsBackend - Fix thread-safety during destruction of GSettings instances...? to glib-2-60
 - Backport !1017 ?gdatetime: Avoid an assertion failure when parsing some ISO 8601 dates? to glib-2-60

diffstat:

 devel/gdbus-codegen/distinfo                  |  10 ++++----
 devel/glib2/Makefile                          |   8 +-----
 devel/glib2/Makefile.common                   |   4 +-
 devel/glib2/PLIST                             |  19 ++++++++-------
 devel/glib2/PLIST.Darwin                      |   2 -
 devel/glib2/distinfo                          |  19 ++++++++-------
 devel/glib2/options.mk                        |  18 +++++++++++++-
 devel/glib2/patches/patch-gio_meson.build     |  11 +--------
 devel/glib2/patches/patch-glib_meson.build    |  14 ++++++++++-
 devel/glib2/patches/patch-gobject_meson.build |   4 +-
 devel/glib2/patches/patch-meson.build         |  32 ++++++++++++++++++--------
 devel/glib2/patches/patch-meson_options.txt   |  15 ++++++++++++
 12 files changed, 96 insertions(+), 60 deletions(-)

diffs (truncated from 376 to 300 lines):

diff -r 8d3692e0e576 -r 2c0eca8cf684 devel/gdbus-codegen/distinfo
--- a/devel/gdbus-codegen/distinfo      Tue Oct 29 09:21:54 2019 +0000
+++ b/devel/gdbus-codegen/distinfo      Tue Oct 29 09:22:24 2019 +0000
@@ -1,7 +1,7 @@
-$NetBSD: distinfo,v 1.4 2019/08/20 14:06:46 wiz Exp $
+$NetBSD: distinfo,v 1.5 2019/10/29 09:22:25 adam Exp $
 
-SHA1 (glib-2.60.6.tar.xz) = b6b9bd8a9fa5fe68f972614d9bbb98a3e67c444d
-RMD160 (glib-2.60.6.tar.xz) = b268c9616e72275ec9aa4cc9187be396b454e215
-SHA512 (glib-2.60.6.tar.xz) = 2e079d2268e0cd4dd234501c03e7784a69258ea2303e62baa4869ff7a442d121c2ffdc742467e3b0b46ad953b831962e1dd847463d66b2b28745ba0f0bfd28d9
-Size (glib-2.60.6.tar.xz) = 4589516 bytes
+SHA1 (glib-2.60.7.tar.xz) = d0b21a9358ef03e9e90bcb8beb878cab21bec4f2
+RMD160 (glib-2.60.7.tar.xz) = 099608f6af4ce4a75fa24673b10f344829831be8
+SHA512 (glib-2.60.7.tar.xz) = d56d805a5abf6f7aeb8bf5be06b60ad049177ee23f78eacef4ce2ea88a8be49966a95e48fed17c752649f6e80937fd0ebc8f959709f623ec1f2f43ffd42d078a
+Size (glib-2.60.7.tar.xz) = 4590568 bytes
 SHA1 (patch-meson.build) = 6877b395f02619ea93b648119373ac1b53438c59
diff -r 8d3692e0e576 -r 2c0eca8cf684 devel/glib2/Makefile
--- a/devel/glib2/Makefile      Tue Oct 29 09:21:54 2019 +0000
+++ b/devel/glib2/Makefile      Tue Oct 29 09:22:24 2019 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.261 2019/10/08 10:58:17 prlw1 Exp $
+# $NetBSD: Makefile,v 1.262 2019/10/29 09:22:24 adam Exp $
 
 .include "Makefile.common"
 
@@ -60,12 +60,6 @@
 TOOL_DEPENDS+=         ${PYPKGPREFIX}-expat-[0-9]*:../../textproc/py-expat
 PYTHON_FOR_BUILD_ONLY= yes
 
-.include "../../mk/bsd.prefs.mk"
-PLIST_VARS+=   nococoa
-.if ${OPSYS} != "Darwin"
-PLIST.nococoa= yes
-.endif
-
 .include "../../converters/libiconv/buildlink3.mk"
 .include "../../devel/gettext-lib/buildlink3.mk"
 .include "../../devel/pcre/buildlink3.mk"
diff -r 8d3692e0e576 -r 2c0eca8cf684 devel/glib2/Makefile.common
--- a/devel/glib2/Makefile.common       Tue Oct 29 09:21:54 2019 +0000
+++ b/devel/glib2/Makefile.common       Tue Oct 29 09:22:24 2019 +0000
@@ -1,9 +1,9 @@
-# $NetBSD: Makefile.common,v 1.72 2019/09/08 10:43:43 nia Exp $
+# $NetBSD: Makefile.common,v 1.73 2019/10/29 09:22:24 adam Exp $
 # used by devel/gdbus-codegen/Makefile
 # used by devel/glib2/Makefile
 # used by devel/glib2-tools/Makefile
 
-DISTNAME=      glib-2.60.6
+DISTNAME=      glib-2.60.7
 PKGNAME=       ${DISTNAME:S/glib/glib2/}
 MASTER_SITES=  ${MASTER_SITE_GNOME:=sources/glib/${PKGVERSION_NOREV:R}/}
 EXTRACT_SUFX=  .tar.xz
diff -r 8d3692e0e576 -r 2c0eca8cf684 devel/glib2/PLIST
--- a/devel/glib2/PLIST Tue Oct 29 09:21:54 2019 +0000
+++ b/devel/glib2/PLIST Tue Oct 29 09:22:24 2019 +0000
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.106 2019/08/20 14:06:46 wiz Exp $
+@comment $NetBSD: PLIST,v 1.107 2019/10/29 09:22:24 adam Exp $
 ${PLIST.nococoa}bin/gapplication
 bin/gdbus
 bin/gio
@@ -10,7 +10,7 @@
 bin/gobject-query
 bin/gresource
 bin/gsettings
-include/gio-unix-2.0/gio/gdesktopappinfo.h
+${PLIST.nococoa}include/gio-unix-2.0/gio/gdesktopappinfo.h
 include/gio-unix-2.0/gio/gfiledescriptorbased.h
 include/gio-unix-2.0/gio/gunixconnection.h
 include/gio-unix-2.0/gio/gunixcredentialsmessage.h
@@ -113,6 +113,7 @@
 include/glib-2.0/gio/gnetworkmonitor.h
 include/glib-2.0/gio/gnetworkservice.h
 include/glib-2.0/gio/gnotification.h
+${PLIST.cocoa}include/glib-2.0/gio/gosxappinfo.h
 include/glib-2.0/gio/goutputstream.h
 include/glib-2.0/gio/gpermission.h
 include/glib-2.0/gio/gpollableinputstream.h
@@ -280,19 +281,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.6000.6
+lib/libgio-2.0.so.0.6000.7
 lib/libglib-2.0.so
 lib/libglib-2.0.so.0
-lib/libglib-2.0.so.0.6000.6
+lib/libglib-2.0.so.0.6000.7
 lib/libgmodule-2.0.so
 lib/libgmodule-2.0.so.0
-lib/libgmodule-2.0.so.0.6000.6
+lib/libgmodule-2.0.so.0.6000.7
 lib/libgobject-2.0.so
 lib/libgobject-2.0.so.0
-lib/libgobject-2.0.so.0.6000.6
+lib/libgobject-2.0.so.0.6000.7
 lib/libgthread-2.0.so
 lib/libgthread-2.0.so.0
-lib/libgthread-2.0.so.0.6000.6
+lib/libgthread-2.0.so.0.6000.7
 lib/pkgconfig/gio-2.0.pc
 lib/pkgconfig/gio-unix-2.0.pc
 lib/pkgconfig/glib-2.0.pc
@@ -304,8 +305,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.6000.6-gdb.py
-share/gdb/auto-load${LOCALBASE}/lib/libgobject-2.0.so.0.6000.6-gdb.py
+share/gdb/auto-load${LOCALBASE}/lib/libglib-2.0.so.0.6000.7-gdb.py
+share/gdb/auto-load${LOCALBASE}/lib/libgobject-2.0.so.0.6000.7-gdb.py
 share/gettext/its/gschema.its
 share/gettext/its/gschema.loc
 share/glib-2.0/gdb/glib_gdb.py
diff -r 8d3692e0e576 -r 2c0eca8cf684 devel/glib2/PLIST.Darwin
--- a/devel/glib2/PLIST.Darwin  Tue Oct 29 09:21:54 2019 +0000
+++ /dev/null   Thu Jan 01 00:00:00 1970 +0000
@@ -1,2 +0,0 @@
-@comment $NetBSD: PLIST.Darwin,v 1.1 2019/06/06 11:06:51 adam Exp $
-include/glib-2.0/gio/gosxappinfo.h
diff -r 8d3692e0e576 -r 2c0eca8cf684 devel/glib2/distinfo
--- a/devel/glib2/distinfo      Tue Oct 29 09:21:54 2019 +0000
+++ b/devel/glib2/distinfo      Tue Oct 29 09:22:24 2019 +0000
@@ -1,9 +1,9 @@
-$NetBSD: distinfo,v 1.254 2019/08/20 14:06:46 wiz Exp $
+$NetBSD: distinfo,v 1.255 2019/10/29 09:22:24 adam Exp $
 
-SHA1 (glib-2.60.6.tar.xz) = b6b9bd8a9fa5fe68f972614d9bbb98a3e67c444d
-RMD160 (glib-2.60.6.tar.xz) = b268c9616e72275ec9aa4cc9187be396b454e215
-SHA512 (glib-2.60.6.tar.xz) = 2e079d2268e0cd4dd234501c03e7784a69258ea2303e62baa4869ff7a442d121c2ffdc742467e3b0b46ad953b831962e1dd847463d66b2b28745ba0f0bfd28d9
-Size (glib-2.60.6.tar.xz) = 4589516 bytes
+SHA1 (glib-2.60.7.tar.xz) = d0b21a9358ef03e9e90bcb8beb878cab21bec4f2
+RMD160 (glib-2.60.7.tar.xz) = 099608f6af4ce4a75fa24673b10f344829831be8
+SHA512 (glib-2.60.7.tar.xz) = d56d805a5abf6f7aeb8bf5be06b60ad049177ee23f78eacef4ce2ea88a8be49966a95e48fed17c752649f6e80937fd0ebc8f959709f623ec1f2f43ffd42d078a
+Size (glib-2.60.7.tar.xz) = 4590568 bytes
 SHA1 (patch-gio_gcredentialsprivate.h) = dab92e07f8357a7dc1a569e37f65f9b199aee281
 SHA1 (patch-gio_gdbus-2.0_codegen_meson.build) = 21c806f1a9884000b6a1683bc2fd1276b3c3544f
 SHA1 (patch-gio_giomodule.c) = d704699b2f457a08fff9219fe697e5fd2cc582ed
@@ -11,7 +11,7 @@
 SHA1 (patch-gio_gunixcredentialsmessage.c) = c13119ddd6262db7c03e53857e987f0c495d3312
 SHA1 (patch-gio_gunixmounts.c) = 13af07fffe898457edd0d8db4296a60fccba913d
 SHA1 (patch-gio_inotify_inotify-kernel.c) = 24deec33a1ad5e3c1a4f2d1397440d26b0f23b84
-SHA1 (patch-gio_meson.build) = 56b86a0b8ade34ebd155b2d530a19bf3eac97b76
+SHA1 (patch-gio_meson.build) = 7eb21bd0a0af539f13459f2aeb5e32624ceb93f2
 SHA1 (patch-gio_tests_gdbus-export.c) = 59d85ca079d02b52e33153c7d2ac1cc48c26707a
 SHA1 (patch-glib_gatomic.c) = 875ad9c828dcf2add356d4988d14fb4f1985aef8
 SHA1 (patch-glib_gatomic.h) = 21294cac483c3379198283c54fe6e24af3e630b1
@@ -19,7 +19,7 @@
 SHA1 (patch-glib_glibconfig.h.in) = 1964b5fb15317e681dad426d4862e3f48c4274f7
 SHA1 (patch-glib_gmain.c) = 2ab4b59e438d9f764bee62e0c1fa8bbd231b6e8d
 SHA1 (patch-glib_gtypes.h) = a659b770c55a8071a6e6afd8a9fccdf723e086e6
-SHA1 (patch-glib_meson.build) = 119e48efd8aaabf06b62c6e1897261b470cf7355
+SHA1 (patch-glib_meson.build) = 6cb2d8eb2d19ef1290df2adde5675b36bf037b22
 SHA1 (patch-glib_tests_hash.c) = e928b22926ad917a7a201882a5105b25533554ae
 SHA1 (patch-gmodule_gmodule-ar.c) = e382a0ada232e083d51cbede7f689a50ebeff4d8
 SHA1 (patch-gmodule_gmodule-dl.c) = b678a04debbc79ebb67d91db7716990658e76da4
@@ -27,5 +27,6 @@
 SHA1 (patch-gmodule_gmodule-win32.c) = 477a861f8590a62c3dbc0aa4ad728cc86ebb34dd
 SHA1 (patch-gmodule_gmodule.c) = 55c5f9d16e3517f3fdc04d40922f50d9c66b0b9a
 SHA1 (patch-gobject_glib-mkenums.in) = c177cf9b1ea81542665240678f47f68351a3760d
-SHA1 (patch-gobject_meson.build) = 58ee162e44047bf20c66067fd3edbe98cc13af50
-SHA1 (patch-meson.build) = 125d98082c9bf2b6403bbda1c12e0fa695031ee6
+SHA1 (patch-gobject_meson.build) = 3cf17f5a60b2b15e62ad9287a6660e1c7e8af0d9
+SHA1 (patch-meson.build) = 7b734de6bcc2dd78d8b028ba107d15bf89a3ac36
+SHA1 (patch-meson_options.txt) = 23e215e44190a2e701b83e280ce235cf117e14ac
diff -r 8d3692e0e576 -r 2c0eca8cf684 devel/glib2/options.mk
--- a/devel/glib2/options.mk    Tue Oct 29 09:21:54 2019 +0000
+++ b/devel/glib2/options.mk    Tue Oct 29 09:22:24 2019 +0000
@@ -1,11 +1,25 @@
-# $NetBSD: options.mk,v 1.21 2019/06/03 09:53:50 prlw1 Exp $
+# $NetBSD: options.mk,v 1.22 2019/10/29 09:22:24 adam Exp $
 
 PKG_OPTIONS_VAR=       PKG_OPTIONS.glib2
 PKG_SUPPORTED_OPTIONS= fam
-PKG_SUGGESTED_OPTIONS=
+
+.include "../../mk/bsd.prefs.mk"
+.if ${OPSYS} == "Darwin"
+PKG_SUPPORTED_OPTIONS+=        cocoa
+.endif
 
 .include "../../mk/bsd.options.mk"
 
+PLIST_VARS+=   cocoa nococoa
+
+# if this options is enabled, use quartz for gtk{2,3}
+.if !empty(PKG_OPTIONS:Mcocoa)
+MESON_ARGS+=   -Duse_cocoa=true
+PLIST.cocoa=   yes
+.else
+PLIST.nococoa= yes
+.endif
+
 PLIST_VARS+=   fam
 .if !empty(PKG_OPTIONS:Mfam)
 MESON_ARGS+=   -Dfam=true
diff -r 8d3692e0e576 -r 2c0eca8cf684 devel/glib2/patches/patch-gio_meson.build
--- a/devel/glib2/patches/patch-gio_meson.build Tue Oct 29 09:21:54 2019 +0000
+++ b/devel/glib2/patches/patch-gio_meson.build Tue Oct 29 09:22:24 2019 +0000
@@ -1,19 +1,10 @@
-$NetBSD: patch-gio_meson.build,v 1.5 2019/06/28 19:42:05 schmonz Exp $
+$NetBSD: patch-gio_meson.build,v 1.6 2019/10/29 09:22:24 adam Exp $
 
 Don't build tests, as have strong dependency on libdl.
 Disable inotify on SunOS.
-Install gio/gdesktopappinfo.h on OS X.
 
 --- gio/meson.build.orig       2019-06-10 17:47:20.000000000 +0000
 +++ gio/meson.build
-@@ -421,6 +421,7 @@ if host_system != 'windows'
-       unix_sources += files('gcocoanotificationbackend.m')
-     endif
-     application_headers += files('gosxappinfo.h')
-+    gio_unix_include_headers += files('gdesktopappinfo.h')
-   else
-     contenttype_sources += files('gcontenttype.c')
-     appinfo_sources += files('gdesktopappinfo.c')
 @@ -758,7 +759,7 @@ gioenumtypes_c = custom_target('gioenumt
  gioenumtypes_dep = declare_dependency(sources : [gioenumtypes_h, glib_enumtypes_h])
  
diff -r 8d3692e0e576 -r 2c0eca8cf684 devel/glib2/patches/patch-glib_meson.build
--- a/devel/glib2/patches/patch-glib_meson.build        Tue Oct 29 09:21:54 2019 +0000
+++ b/devel/glib2/patches/patch-glib_meson.build        Tue Oct 29 09:22:24 2019 +0000
@@ -1,11 +1,21 @@
-$NetBSD: patch-glib_meson.build,v 1.3 2019/06/16 15:28:12 leot Exp $
+$NetBSD: patch-glib_meson.build,v 1.4 2019/10/29 09:22:24 adam 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
 - Don't build tests
 
---- glib/meson.build.orig      2019-06-10 17:47:20.000000000 +0000
+--- glib/meson.build.orig      2019-07-24 10:52:04.000000000 +0000
 +++ glib/meson.build
+@@ -230,7 +230,7 @@ else
+   platform_deps = []
+ endif
+ 
+-if host_system == 'darwin'
++if host_system == 'darwin' and glib_have_cocoa
+   glib_sources += files('gosxutils.m')
+ endif
+ 
 @@ -324,24 +324,8 @@ if host_system == 'windows'
        include_directories : configinc,
        dependencies : [libglib_dep])
diff -r 8d3692e0e576 -r 2c0eca8cf684 devel/glib2/patches/patch-gobject_meson.build
--- a/devel/glib2/patches/patch-gobject_meson.build     Tue Oct 29 09:21:54 2019 +0000
+++ b/devel/glib2/patches/patch-gobject_meson.build     Tue Oct 29 09:22:24 2019 +0000
@@ -1,7 +1,7 @@
-$NetBSD: patch-gobject_meson.build,v 1.3 2019/06/16 15:28:12 leot Exp $
+$NetBSD: patch-gobject_meson.build,v 1.4 2019/10/29 09:22:24 adam Exp $
 
 Leave glib-genmarshal and glib-mkenums to devel/glib2-tools.
- 
+
 --- gobject/meson.build.orig   2019-06-10 17:47:20.000000000 +0000
 +++ gobject/meson.build
 @@ -75,7 +75,7 @@ foreach tool: python_tools
diff -r 8d3692e0e576 -r 2c0eca8cf684 devel/glib2/patches/patch-meson.build
--- a/devel/glib2/patches/patch-meson.build     Tue Oct 29 09:21:54 2019 +0000
+++ b/devel/glib2/patches/patch-meson.build     Tue Oct 29 09:22:24 2019 +0000
@@ -1,22 +1,34 @@
-$NetBSD: patch-meson.build,v 1.5 2019/06/26 10:42:50 prlw1 Exp $
+$NetBSD: patch-meson.build,v 1.6 2019/10/29 09:22:24 adam Exp $
+
+- On Darwin, optionally use Cocoa (needed for X11 users).
 
-- Don't insist that python binary is called "python3".
+- 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)
 
 - Ignore __GCC_HAVE_SYNC_COMPARE_AND_SWAP_4 as is already done
   for android and linux. PR pkg/54298
 
---- meson.build.orig   2019-06-10 17:47:20.000000000 +0000
+--- meson.build.orig   2019-07-24 10:52:04.000000000 +0000
 +++ meson.build
-@@ -1570,28 +1570,15 @@ atomictest = '''int main() {
+@@ -643,6 +643,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)
+@@ -1570,28 +1571,15 @@ atomictest = '''int main() {
Prev by Date: [pkgsrc/trunk]: pkgsrc/doc doc: Updated www/logswan to 2.1.0
Next by Date: [pkgsrc/trunk]: pkgsrc/doc Updated devel/glib2, devel/glib2-tools, devel/gdbu...
Previous by Thread: [pkgsrc/trunk]: pkgsrc/doc doc: Updated www/logswan to 2.1.0
Next by Thread: [pkgsrc/trunk]: pkgsrc/doc Updated devel/glib2, devel/glib2-tools, devel/gdbu...
Indexes:
Home | Main Index | Thread Index | Old Index