CVS commit: pkgsrc/devel/glib2

["Thomas Klausner" <wiz%netbsd.org@localhost>]

Module Name:    pkgsrc
Committed By:   wiz
Date:           Sun Jan 28 16:51:51 UTC 2018

Modified Files:
        pkgsrc/devel/glib2: Makefile.common PLIST distinfo
        pkgsrc/devel/glib2/patches: patch-gobject_glib-mkenums.in

Log Message:
glib2: update to 2.54.3.

Overview of changes in GLib 2.54.3
==================================

* Bugs fixed:
 691436 glib-mkenums output arch dependent
 761102 Increase performance for main loop
 776147 gio/glocalfilemonitor.c doesn't handle case G_FILE_MONITOR_EVENT_MOVE...
 779182 xdg-open fails with gio open for some uris
 782057 Unit tests fail in run-assert-msg-test.sh
 785113 glib-mkenums Python port fixes
 788990 Include licensing information in output from glib-mkenums, glib-genma...
 789637 glib-mkenums: Fails when --ouput file does not exist
 789894 Text tool has color from previous line, when overwriting existing text
 790030 GResource/GVariant fails to load from non-pointer aligned memory
 790093 gio-tool: fix inverted logic in monitor tool
 790126 gengiotypefuncs.py is missing from tarballs
 790829 glib-genmarshal --body must not generate alias implementations
 790934 gtester doesn't handle skipped tests
 791235 Fix gschema.dtd regarding flags.
 791267 Make gschema.dtd usable.
 791296 gtester-report: fix range usage when running as python3 app
 791325 Gio handling of thumbnail:: attribute namespace causes inconsistent b...
 791334 gbinding.c:898: The target object of type GNetworkAddress has no prop...
 791337 Crash opening URIs with g_desktop_app_info_launch_uris_with_spawn()
 791720 Criticals in gio/xdp-dbus.h leading to crash under flatpak
 791744 gmenumodel test sometimes fails: assertion failed (items_changed_coun...
 791754 gdbus-peer test intermittently fails: assertion 'source->ref_count > ...
 791906 GSocketListenerClass.event has wrong signature

* Translation updates:
 Norwegian bokmål


To generate a diff of this commit:
cvs rdiff -u -r1.60 -r1.61 pkgsrc/devel/glib2/Makefile.common
cvs rdiff -u -r1.95 -r1.96 pkgsrc/devel/glib2/PLIST
cvs rdiff -u -r1.227 -r1.228 pkgsrc/devel/glib2/distinfo
cvs rdiff -u -r1.2 -r1.3 \
    pkgsrc/devel/glib2/patches/patch-gobject_glib-mkenums.in

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.common
diff -u pkgsrc/devel/glib2/Makefile.common:1.60 pkgsrc/devel/glib2/Makefile.common:1.61
--- pkgsrc/devel/glib2/Makefile.common:1.60     Mon Dec 11 13:34:00 2017
+++ pkgsrc/devel/glib2/Makefile.common  Sun Jan 28 16:51:50 2018
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.common,v 1.60 2017/12/11 13:34:00 jperkin Exp $
+# $NetBSD: Makefile.common,v 1.61 2018/01/28 16:51:50 wiz Exp $
 #
 # used by devel/glib2/Makefile
 # used by devel/gdbus-codegen/Makefile
@@ -7,7 +7,7 @@
 
 # When updating this package, please apply patch-ak to configure.in and
 # then run a matching version of autoconf to regen patch-aa.
-DISTNAME=      glib-2.54.2
+DISTNAME=      glib-2.54.3
 PKGNAME=       ${DISTNAME:S/glib/glib2/}
 CATEGORIES=    # empty; redefined in Makefile
 MASTER_SITES=  ${MASTER_SITE_GNOME:=sources/glib/${PKGVERSION_NOREV:R}/}

Index: pkgsrc/devel/glib2/PLIST
diff -u pkgsrc/devel/glib2/PLIST:1.95 pkgsrc/devel/glib2/PLIST:1.96
--- pkgsrc/devel/glib2/PLIST:1.95       Tue Nov  7 12:04:05 2017
+++ pkgsrc/devel/glib2/PLIST    Sun Jan 28 16:51:50 2018
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.95 2017/11/07 12:04:05 adam Exp $
+@comment $NetBSD: PLIST,v 1.96 2018/01/28 16:51:50 wiz Exp $
 bin/gapplication
 bin/gdbus
 bin/gio
@@ -290,8 +290,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.5400.2-gdb.py
-share/gdb/auto-load${LOCALBASE}/lib/libgobject-2.0.so.0.5400.2-gdb.py
+share/gdb/auto-load/usr/pkg/lib/libglib-2.0.so.0.5400.3-gdb.py
+share/gdb/auto-load/usr/pkg/lib/libgobject-2.0.so.0.5400.3-gdb.py
 share/gettext/its/gschema.its
 share/gettext/its/gschema.loc
 share/glib-2.0/gdb/glib_gdb.py
@@ -380,6 +380,7 @@ share/gtk-doc/html/gio/GPollableOutputSt
 share/gtk-doc/html/gio/GPropertyAction.html
 share/gtk-doc/html/gio/GProxy.html
 share/gtk-doc/html/gio/GProxyAddress.html
+share/gtk-doc/html/gio/GProxyAddressEnumerator.html
 share/gtk-doc/html/gio/GProxyResolver.html
 share/gtk-doc/html/gio/GRemoteActionGroup.html
 share/gtk-doc/html/gio/GResolver.html
@@ -395,6 +396,7 @@ share/gtk-doc/html/gio/GSimplePermission
 share/gtk-doc/html/gio/GSimpleProxyResolver.html
 share/gtk-doc/html/gio/GSocket.html
 share/gtk-doc/html/gio/GSocketAddress.html
+share/gtk-doc/html/gio/GSocketAddressEnumerator.html
 share/gtk-doc/html/gio/GSocketClient.html
 share/gtk-doc/html/gio/GSocketConnectable.html
 share/gtk-doc/html/gio/GSocketConnection.html

Index: pkgsrc/devel/glib2/distinfo
diff -u pkgsrc/devel/glib2/distinfo:1.227 pkgsrc/devel/glib2/distinfo:1.228
--- pkgsrc/devel/glib2/distinfo:1.227   Wed Nov 22 08:45:59 2017
+++ pkgsrc/devel/glib2/distinfo Sun Jan 28 16:51:50 2018
@@ -1,9 +1,9 @@
-$NetBSD: distinfo,v 1.227 2017/11/22 08:45:59 wiz Exp $
+$NetBSD: distinfo,v 1.228 2018/01/28 16:51:50 wiz Exp $
 
-SHA1 (glib-2.54.2.tar.xz) = 85b5d649fc3d18f8d8197bd971dfbebd94b5f96d
-RMD160 (glib-2.54.2.tar.xz) = 6804848c49bc882da563d8c3e025f1e37518bbc5
-SHA512 (glib-2.54.2.tar.xz) = 09ee6fa3a6f3f15af229bd789bef536e3570f36d1e4ce624a57e97c4040577f6baccd6ab5746257863ccf7173b558cfa753951d562a278f854e52604104ba7ee
-Size (glib-2.54.2.tar.xz) = 7830724 bytes
+SHA1 (glib-2.54.3.tar.xz) = 12d7466550156ac8a765f603b0df7604cdf34cfd
+RMD160 (glib-2.54.3.tar.xz) = 7439dbf9d661352e7f2c1beae84b76e401798675
+SHA512 (glib-2.54.3.tar.xz) = 23eb4458684624f80c17aa784eab42a38eec87bb5979fcfe56f0bc63b5c7bcf8251a0d4ea916fe2c8109ff5b14a4b60c6260755d079ff984c0d8e6a2871d307d
+Size (glib-2.54.3.tar.xz) = 7836536 bytes
 SHA1 (patch-Makefile.in) = 4d587eb9ff27ff2b3489c59388319142e2fb6ced
 SHA1 (patch-aa) = 938e6fb29a2190eaa65b929b986c2f73c46d15ae
 SHA1 (patch-ab) = 04bde955a2a588011a8c77ada4923d5464a0d544
@@ -35,4 +35,4 @@ SHA1 (patch-glib_gtimezone.c) = d9686da5
 SHA1 (patch-gobject_Makefile.am) = 6eed6b57f5ff0aa0dfb623110b23a3ff78aa4e75
 SHA1 (patch-gobject_Makefile.in) = a4768ff7b0607a8a4dfbb2cff087a987b451fd18
 SHA1 (patch-gobject_glib-genmarshal.in) = f21ca416d4eb4ad5a8ce3ffa053f8bcd2be8953a
-SHA1 (patch-gobject_glib-mkenums.in) = 7468c428ca33de20571d0199d17a0dcc6ea9d624
+SHA1 (patch-gobject_glib-mkenums.in) = 22676989e47dfd13583d89469810af6ce7d01ab7

Index: pkgsrc/devel/glib2/patches/patch-gobject_glib-mkenums.in
diff -u pkgsrc/devel/glib2/patches/patch-gobject_glib-mkenums.in:1.2 pkgsrc/devel/glib2/patches/patch-gobject_glib-mkenums.in:1.3
--- pkgsrc/devel/glib2/patches/patch-gobject_glib-mkenums.in:1.2        Sat Oct 21 08:57:33 2017
+++ pkgsrc/devel/glib2/patches/patch-gobject_glib-mkenums.in    Sun Jan 28 16:51:51 2018
@@ -1,9 +1,7 @@
-$NetBSD: patch-gobject_glib-mkenums.in,v 1.2 2017/10/21 08:57:33 prlw1 Exp $
+$NetBSD: patch-gobject_glib-mkenums.in,v 1.3 2018/01/28 16:51:51 wiz Exp $
 
 - Revert 4395a897 Use env to run the Python-based tools
   https://bugzilla.gnome.org/show_bug.cgi?id=788527
-- Don't insist that authors' names in comments be encoded in utf-8
-  https://bugzilla.gnome.org/show_bug.cgi?id=785113
 
 --- gobject/glib-mkenums.in.orig       2017-10-21 08:20:09.664007702 +0000
 +++ gobject/glib-mkenums.in
@@ -13,44 +11,3 @@ $NetBSD: patch-gobject_glib-mkenums.in,v
  
  # If the code below looks horrible and unpythonic, do not panic.
  #
-@@ -34,6 +34,11 @@ if sys.stdout.encoding is None:
- else:
-     output_stream = sys.stdout
- 
-+# Some source files aren't utf-8 and the old perl version didn't care.
-+# Replace invalid data with a replacement character to keep things working.
-+# https://bugzilla.gnome.org/show_bug.cgi?id=785113#c20
-+decoding_errors = "replace"
-+
- # pylint: disable=too-few-public-methods
- class Color:
-     '''ANSI Terminal colors'''
-@@ -157,7 +162,8 @@ def parse_entries(file, file_name):
-         m = re.match(r'\#include\s*<([^>]*)>', line)
-         if m:
-             newfilename = os.path.join("..", m.group(1))
--            newfile = io.open(newfilename, encoding="utf-8")
-+            newfile = io.open(newfilename, encoding="utf-8",
-+                              errors=decoding_errors)
- 
-             if not parse_entries(newfile, newfilename):
-                 return False
-@@ -253,7 +259,7 @@ def read_template_file(file):
-            }
-     in_ = 'junk'
- 
--    ifile = io.open(file, encoding="utf-8")
-+    ifile = io.open(file, encoding="utf-8", errors=decoding_errors)
-     for line in ifile:
-         m = re.match(r'\/\*\*\*\s+(BEGIN|END)\s+([\w-]+)\s+\*\*\*\/', line)
-         if m:
-@@ -409,7 +415,8 @@ def process_file(curfilename):
-     firstenum = True
- 
-     try:
--        curfile = io.open(curfilename, encoding="utf-8")
-+        curfile = io.open(curfilename, encoding="utf-8",
-+                          errors=decoding_errors)
-     except IOError as e:
-         if e.errno == errno.ENOENT:
-             print_warning('No file "{}" found.'.format(curfilename))