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

To: pkgsrc-changes-hg%NetBSD.org@localhost
Subject: [pkgsrc/trunk]: pkgsrc/devel glib2: updated to 2.60.3
From: adam <adam%pkgsrc.org@localhost>
Date: Thu, 06 Jun 2019 12:05:42 +0000
details:   https://anonhg.NetBSD.org/pkgsrc/rev/b11ea261ed66
branches:  trunk
changeset: 334824:b11ea261ed66
user:      adam <adam%pkgsrc.org@localhost>
date:      Thu Jun 06 11:05:12 2019 +0000

description:
glib2: updated to 2.60.3

Overview of changes in GLib 2.60.3

* Various fixes to small key/value support in GHashTable

* Bugs fixed:
 - Critical in g_socket_client_async_connect_complete
 - New GHashTable implementation confuses valgrind
 - test_month_names: assertion failed
 - GNetworkAddressAddressEnumerator unsafely modifies cache in GNetworkAddress
 - Leaks in gsocketclient.c connection code
 - glib/date test fails
 - GDB pretty-printer for GHashTable no longer works
 - !815 Merge branch 'wip/tingping/socketclient-cancel-2' into 'master'
 - !816 Backport !814 ?gschema.dtd: Add target attribute to alias? to glib-2-60
 - !826 Backport !824 ?gsocketclient: Fix a leak in the connection code? to glib-2-60
 - !829 Backport !828 ?build: Fix a typo in the test whether _NL_ABALTMON_n is supported? to glib-2-60
 - !834 Backport !823 "gnetworkaddress: Fix parallel enumerations interfering with eachother" to glib-2-60
 - !838 Backport !835 ?Fix typo in German translation? to glib-2-60
 - !841 Backport !839 ?tests: Update month name check for Greek locale? to glib-2-60
 - !844 Backport !840 ?ghash: Disable small-arrays under valgrind? to glib-2-60
 - !846 Backport !845 ?Fixing g_format_size_full() on Windows-x64? to glib-2-60
 - !855 Backport !848 (more GHashTable fixes) to glib-2-60
 - !858 Backport !852 ?Update gdb pretty-printer for GHashTable? to glib-2-60

* Translation updates:
 - German

diffstat:

 devel/gdbus-codegen/distinfo                |  10 ++++----
 devel/glib2/Makefile                        |  19 ++++++++-------
 devel/glib2/Makefile.common                 |   7 ++---
 devel/glib2/PLIST                           |  22 +++++++++---------
 devel/glib2/distinfo                        |  15 +++++------
 devel/glib2/patches/patch-gio_giomodule.c   |  34 +----------------------------
 devel/glib2/patches/patch-gio_gunixmounts.c |   3 +-
 7 files changed, 38 insertions(+), 72 deletions(-)

diffs (234 lines):

diff -r 995f5710dc14 -r b11ea261ed66 devel/gdbus-codegen/distinfo
--- a/devel/gdbus-codegen/distinfo      Thu Jun 06 09:33:30 2019 +0000
+++ b/devel/gdbus-codegen/distinfo      Thu Jun 06 11:05:12 2019 +0000
@@ -1,7 +1,7 @@
-$NetBSD: distinfo,v 1.1 2019/06/03 09:53:50 prlw1 Exp $
+$NetBSD: distinfo,v 1.2 2019/06/06 11:05:12 adam Exp $
 
-SHA1 (glib-2.60.2.tar.xz) = 8aa8586f0b1fd13c2717adf7ac3e6427bee651b6
-RMD160 (glib-2.60.2.tar.xz) = 8d18a8e4b43071afc35762eff3618a88a7112f57
-SHA512 (glib-2.60.2.tar.xz) = 38479c8e48fda5adaa5f7ac8e1f09c184be48adf38ab614eb69f8e11301a1b0235767abf556e09fd4d5df345822db5b3dc85d1c53d05fdba1c1b40f75b61777b
-Size (glib-2.60.2.tar.xz) = 4587388 bytes
+SHA1 (glib-2.60.3.tar.xz) = 244be77d07a268d700f5bc41b2aec1d7d659934f
+RMD160 (glib-2.60.3.tar.xz) = d0768846033bacdcd0aaac6e3ec634666729e225
+SHA512 (glib-2.60.3.tar.xz) = e316846770ecbd92ca5359c3d71535a5d4628edbda43477584921c84f3b2d6a34ecfb789069404565059d157e2aa3936e1e9fe64b4b7c59fb5c66c1a6f9a2f07
+Size (glib-2.60.3.tar.xz) = 4587636 bytes
 SHA1 (patch-meson.build) = 6877b395f02619ea93b648119373ac1b53438c59
diff -r 995f5710dc14 -r b11ea261ed66 devel/glib2/Makefile
--- a/devel/glib2/Makefile      Thu Jun 06 09:33:30 2019 +0000
+++ b/devel/glib2/Makefile      Thu Jun 06 11:05:12 2019 +0000
@@ -1,13 +1,9 @@
-# $NetBSD: Makefile,v 1.249 2019/06/05 11:58:17 leot Exp $
+# $NetBSD: Makefile,v 1.250 2019/06/06 11:05:12 adam Exp $
 
 .include "Makefile.common"
 
 CATEGORIES=    devel gnome
 COMMENT=       Some useful routines for C programming (glib2)
-PKGREVISION=   2
-
-DISTINFO_FILE= ${.CURDIR}/../../devel/glib2/distinfo
-PATCHDIR=      ${.CURDIR}/../../devel/glib2/patches
 
 .include "options.mk"
 
@@ -36,7 +32,6 @@
 SUBST_STAGE.dbusdb=    pre-configure
 SUBST_FILES.dbusdb=    gio/gdbusconnection.c
 SUBST_FILES.dbusdb+=   gio/gdbusprivate.c
-SUBST_FILES.dbusdb+=   po/glib20.pot
 SUBST_FILES.dbusdb+=   po/*.po
 SUBST_SED.dbusdb=      -e 's,/var/lib/dbus,${VARBASE}/db/dbus,g'
 
@@ -49,9 +44,14 @@
 SUBST_SED.xdg+=                -e 's,/usr/share/locale,${PREFIX}/${PKGLOCALEDIR}/locale,'
 
 # to run gdbus-codegen to generate gdbus-daemon-generated.{h,c}
-TOOL_DEPENDS+= ${PYPKGPREFIX}-expat-[0-9]*:../../textproc/py-expat
-PYTHON_FOR_BUILD_ONLY= yes
-.include "../../lang/python/application.mk"
+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"
@@ -59,4 +59,5 @@
 .include "../../devel/py-meson/build.mk"
 .include "../../devel/libffi/buildlink3.mk"
 .include "../../devel/zlib/buildlink3.mk"
+.include "../../lang/python/application.mk"
 .include "../../mk/bsd.pkg.mk"
diff -r 995f5710dc14 -r b11ea261ed66 devel/glib2/Makefile.common
--- a/devel/glib2/Makefile.common       Thu Jun 06 09:33:30 2019 +0000
+++ b/devel/glib2/Makefile.common       Thu Jun 06 11:05:12 2019 +0000
@@ -1,10 +1,9 @@
-# $NetBSD: Makefile.common,v 1.68 2019/06/04 15:08:47 jperkin Exp $
-#
+# $NetBSD: Makefile.common,v 1.69 2019/06/06 11:05:12 adam Exp $
+# used by devel/gdbus-codegen/Makefile
 # used by devel/glib2/Makefile
-# used by devel/gdbus-codegen/Makefile
 # used by devel/glib2-tools/Makefile
 
-DISTNAME=      glib-2.60.2
+DISTNAME=      glib-2.60.3
 PKGNAME=       ${DISTNAME:S/glib/glib2/}
 MASTER_SITES=  ${MASTER_SITE_GNOME:=sources/glib/${PKGVERSION_NOREV:R}/}
 EXTRACT_SUFX=  .tar.xz
diff -r 995f5710dc14 -r b11ea261ed66 devel/glib2/PLIST
--- a/devel/glib2/PLIST Thu Jun 06 09:33:30 2019 +0000
+++ b/devel/glib2/PLIST Thu Jun 06 11:05:12 2019 +0000
@@ -1,8 +1,8 @@
-@comment $NetBSD: PLIST,v 1.102 2019/06/03 09:53:50 prlw1 Exp $
-bin/gapplication
+@comment $NetBSD: PLIST,v 1.103 2019/06/06 11:05:12 adam Exp $
+${PLIST.nococoa}bin/gapplication
 bin/gdbus
 bin/gio
-bin/gio-launch-desktop
+${PLIST.nococoa}bin/gio-launch-desktop
 bin/gio-querymodules
 bin/glib-compile-resources
 bin/glib-compile-schemas
@@ -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
@@ -280,19 +280,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.2
+lib/libgio-2.0.so.0.6000.3
 lib/libglib-2.0.so
 lib/libglib-2.0.so.0
-lib/libglib-2.0.so.0.6000.2
+lib/libglib-2.0.so.0.6000.3
 lib/libgmodule-2.0.so
 lib/libgmodule-2.0.so.0
-lib/libgmodule-2.0.so.0.6000.2
+lib/libgmodule-2.0.so.0.6000.3
 lib/libgobject-2.0.so
 lib/libgobject-2.0.so.0
-lib/libgobject-2.0.so.0.6000.2
+lib/libgobject-2.0.so.0.6000.3
 lib/libgthread-2.0.so
 lib/libgthread-2.0.so.0
-lib/libgthread-2.0.so.0.6000.2
+lib/libgthread-2.0.so.0.6000.3
 lib/pkgconfig/gio-2.0.pc
 lib/pkgconfig/gio-unix-2.0.pc
 lib/pkgconfig/glib-2.0.pc
@@ -304,8 +304,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.2-gdb.py
-share/gdb/auto-load${LOCALBASE}/lib/libgobject-2.0.so.0.6000.2-gdb.py
+share/gdb/auto-load${LOCALBASE}/lib/libglib-2.0.so.0.6000.3-gdb.py
+share/gdb/auto-load${LOCALBASE}/lib/libgobject-2.0.so.0.6000.3-gdb.py
 share/gettext/its/gschema.its
 share/gettext/its/gschema.loc
 share/glib-2.0/gdb/glib_gdb.py
diff -r 995f5710dc14 -r b11ea261ed66 devel/glib2/distinfo
--- a/devel/glib2/distinfo      Thu Jun 06 09:33:30 2019 +0000
+++ b/devel/glib2/distinfo      Thu Jun 06 11:05:12 2019 +0000
@@ -1,16 +1,15 @@
-$NetBSD: distinfo,v 1.242 2019/06/05 08:57:15 jperkin Exp $
+$NetBSD: distinfo,v 1.243 2019/06/06 11:05:12 adam Exp $
 
-SHA1 (glib-2.60.2.tar.xz) = 8aa8586f0b1fd13c2717adf7ac3e6427bee651b6
-RMD160 (glib-2.60.2.tar.xz) = 8d18a8e4b43071afc35762eff3618a88a7112f57
-SHA512 (glib-2.60.2.tar.xz) = 38479c8e48fda5adaa5f7ac8e1f09c184be48adf38ab614eb69f8e11301a1b0235767abf556e09fd4d5df345822db5b3dc85d1c53d05fdba1c1b40f75b61777b
-Size (glib-2.60.2.tar.xz) = 4587388 bytes
+SHA1 (glib-2.60.3.tar.xz) = 244be77d07a268d700f5bc41b2aec1d7d659934f
+RMD160 (glib-2.60.3.tar.xz) = d0768846033bacdcd0aaac6e3ec634666729e225
+SHA512 (glib-2.60.3.tar.xz) = e316846770ecbd92ca5359c3d71535a5d4628edbda43477584921c84f3b2d6a34ecfb789069404565059d157e2aa3936e1e9fe64b4b7c59fb5c66c1a6f9a2f07
+Size (glib-2.60.3.tar.xz) = 4587636 bytes
 SHA1 (patch-gio_gcredentialsprivate.h) = dab92e07f8357a7dc1a569e37f65f9b199aee281
 SHA1 (patch-gio_gdbus-2.0_codegen_meson.build) = 21c806f1a9884000b6a1683bc2fd1276b3c3544f
-SHA1 (patch-gio_giomodule.c) = 7f9fa22bebce1c29cdb1dfe7e7b11d92a3f463dd
-SHA1 (patch-gio_glocalfileinfo.c) = 8e0b7e9543ce3c702c468f56e7ecf418d70b049f
+SHA1 (patch-gio_giomodule.c) = 0715e77fa97f90631c77e9a2cfd54b74698522e2
 SHA1 (patch-gio_gresource-tool.c) = ad0e59f48f5f98ea66be568dbe2e5a5d1ac602fc
 SHA1 (patch-gio_gunixcredentialsmessage.c) = c13119ddd6262db7c03e53857e987f0c495d3312
-SHA1 (patch-gio_gunixmounts.c) = 5c9d4d86161ef1723da0e7d54af65debcb1ed137
+SHA1 (patch-gio_gunixmounts.c) = 13af07fffe898457edd0d8db4296a60fccba913d
 SHA1 (patch-gio_inotify_inotify-kernel.c) = 24deec33a1ad5e3c1a4f2d1397440d26b0f23b84
 SHA1 (patch-gio_meson.build) = 745b0b2047537a16f0f4f5dd5eeaebf29844e8e1
 SHA1 (patch-glib_gmain.c) = 2ab4b59e438d9f764bee62e0c1fa8bbd231b6e8d
diff -r 995f5710dc14 -r b11ea261ed66 devel/glib2/patches/patch-gio_giomodule.c
--- a/devel/glib2/patches/patch-gio_giomodule.c Thu Jun 06 09:33:30 2019 +0000
+++ b/devel/glib2/patches/patch-gio_giomodule.c Thu Jun 06 11:05:12 2019 +0000
@@ -1,33 +1,9 @@
-$NetBSD: patch-gio_giomodule.c,v 1.4 2019/06/05 08:57:15 jperkin Exp $
+$NetBSD: patch-gio_giomodule.c,v 1.5 2019/06/06 11:05:12 adam Exp $
 
-Re-enable gdesktopappinfo on Darwin.
 Disable inotify on SunOS.
 
 --- gio/giomodule.c.orig       2019-05-03 13:43:28.000000000 +0000
 +++ gio/giomodule.c
-@@ -43,12 +43,9 @@
- #endif
- #include <glib/gstdio.h>
- 
--#if defined(G_OS_UNIX) && !defined(HAVE_COCOA)
-+#if defined(G_OS_UNIX)
- #include "gdesktopappinfo.h"
- #endif
--#ifdef HAVE_COCOA
--#include "gosxappinfo.h"
--#endif
- 
- #ifdef HAVE_COCOA
- #include <AvailabilityMacros.h>
-@@ -1084,7 +1081,7 @@ _g_io_modules_ensure_extension_points_re
-     {
-       registered_extensions = TRUE;
-       
--#if defined(G_OS_UNIX) && !defined(HAVE_COCOA)
-+#if defined(G_OS_UNIX)
- #if !GLIB_CHECK_VERSION (3, 0, 0)
-       ep = g_io_extension_point_register (G_DESKTOP_APP_INFO_LOOKUP_EXTENSION_POINT_NAME);
-       G_GNUC_BEGIN_IGNORE_DEPRECATIONS
 @@ -1209,7 +1206,7 @@ _g_io_modules_ensure_loaded (void)
        /* Initialize types from built-in "modules" */
        g_type_ensure (g_null_settings_backend_get_type ());
@@ -37,11 +13,3 @@
        g_type_ensure (g_inotify_file_monitor_get_type ());
  #endif
  #if defined(HAVE_KQUEUE)
-@@ -1225,7 +1222,6 @@ _g_io_modules_ensure_loaded (void)
- #endif
- #ifdef HAVE_COCOA
-       g_type_ensure (g_nextstep_settings_backend_get_type ());
--      g_type_ensure (g_osx_app_info_get_type ());
- #endif
- #ifdef G_OS_UNIX
-       g_type_ensure (_g_unix_volume_monitor_get_type ());
diff -r 995f5710dc14 -r b11ea261ed66 devel/glib2/patches/patch-gio_gunixmounts.c
--- a/devel/glib2/patches/patch-gio_gunixmounts.c       Thu Jun 06 09:33:30 2019 +0000
+++ b/devel/glib2/patches/patch-gio_gunixmounts.c       Thu Jun 06 11:05:12 2019 +0000
@@ -1,4 +1,4 @@
-$NetBSD: patch-gio_gunixmounts.c,v 1.4 2019/06/03 23:09:29 maya Exp $
+$NetBSD: patch-gio_gunixmounts.c,v 1.5 2019/06/06 11:05:12 adam Exp $
 
 SunOS has sys/mntent.h but no mnt_opts.
 XXX who else uses the sys/mntent.h case?
@@ -15,4 +15,3 @@
                                               is_read_only);
  
        return_list = g_list_prepend (return_list, mount_entry);
-
Prev by Date: [pkgsrc/trunk]: pkgsrc/doc Updated devel/gdbus-codegen, devel/glib2, devel/gl...
Next by Date: [pkgsrc/trunk]: pkgsrc/devel/glib2 glib2: add PLIST.Darwin; remove unused patch
Previous by Thread: [pkgsrc/trunk]: pkgsrc/doc Updated devel/gdbus-codegen, devel/glib2, devel/gl...
Next by Thread: [pkgsrc/trunk]: pkgsrc/devel/glib2 glib2: add PLIST.Darwin; remove unused patch
Indexes:
Home | Main Index | Thread Index | Old Index