CVS commit: pkgsrc/devel/glib2

["Patrick Welche" <prlw1%netbsd.org@localhost>]

Module Name:    pkgsrc
Committed By:   prlw1
Date:           Mon Jul  3 17:42:45 UTC 2017

Modified Files:
        pkgsrc/devel/glib2: Makefile.common PLIST buildlink3.mk distinfo
        pkgsrc/devel/glib2/patches: patch-an patch-cl
            patch-gio_gdbusauthmechanismsha1.c

Log Message:
Update glib2 to 2.52.3

Highlights include:
* OS X implementations of GContentType and GAppInfo have been added
* Memory leak fixes
* Minimal support for UUIDs has been added
* A new file attribute, G_FILE_ATTRIBUTE_RECENT_MODIFIED has been added
  to improve sorting of recent files
* glib-compile-resources grew a --generate-phony-targets flag
* GLib now installs a valgrind suppressions file for GLib and GIO
* glib-genmarshal and glib-mkenums have gained --output options
  for better build system integration
* New API: g_utf8_make_valid

+ Many bug fixes and translation updates. For a full list see:
https://git.gnome.org/browse/glib/tree/NEWS?h=2.52.3


To generate a diff of this commit:
cvs rdiff -u -r1.54 -r1.55 pkgsrc/devel/glib2/Makefile.common
cvs rdiff -u -r1.90 -r1.91 pkgsrc/devel/glib2/PLIST
cvs rdiff -u -r1.25 -r1.26 pkgsrc/devel/glib2/buildlink3.mk
cvs rdiff -u -r1.220 -r1.221 pkgsrc/devel/glib2/distinfo
cvs rdiff -u -r1.13 -r1.14 pkgsrc/devel/glib2/patches/patch-an
cvs rdiff -u -r1.11 -r1.12 pkgsrc/devel/glib2/patches/patch-cl
cvs rdiff -u -r1.2 -r1.3 \
    pkgsrc/devel/glib2/patches/patch-gio_gdbusauthmechanismsha1.c

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.54 pkgsrc/devel/glib2/Makefile.common:1.55
--- pkgsrc/devel/glib2/Makefile.common:1.54     Fri Mar  3 08:22:12 2017
+++ pkgsrc/devel/glib2/Makefile.common  Mon Jul  3 17:42:45 2017
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.common,v 1.54 2017/03/03 08:22:12 prlw1 Exp $
+# $NetBSD: Makefile.common,v 1.55 2017/07/03 17:42:45 prlw1 Exp $
 #
 # used by devel/glib2/Makefile
 # used by devel/gdbus-codegen/Makefile
@@ -6,7 +6,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.50.3
+DISTNAME=      glib-2.52.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.90 pkgsrc/devel/glib2/PLIST:1.91
--- pkgsrc/devel/glib2/PLIST:1.90       Fri Mar  3 08:22:12 2017
+++ pkgsrc/devel/glib2/PLIST    Mon Jul  3 17:42:45 2017
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.90 2017/03/03 08:22:12 prlw1 Exp $
+@comment $NetBSD: PLIST,v 1.91 2017/07/03 17:42:45 prlw1 Exp $
 bin/gapplication
 bin/gdbus
 bin/gio
@@ -248,6 +248,7 @@ include/glib/glib-2.0/glib/gtypes.h
 include/glib/glib-2.0/glib/gunicode.h
 include/glib/glib-2.0/glib/gurifuncs.h
 include/glib/glib-2.0/glib/gutils.h
+include/glib/glib-2.0/glib/guuid.h
 include/glib/glib-2.0/glib/gvariant.h
 include/glib/glib-2.0/glib/gvarianttype.h
 include/glib/glib-2.0/glib/gversion.h
@@ -291,14 +292,15 @@ 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.5000.3-gdb.py
-share/gdb/auto-load${LOCALBASE}/lib/libgobject-2.0.so.0.5000.3-gdb.py
+share/gdb/auto-load${LOCALBASE}/lib/libglib-2.0.so.0.5200.3-gdb.py
+share/gdb/auto-load${LOCALBASE}/lib/libgobject-2.0.so.0.5200.3-gdb.py
 share/gettext/its/gschema.its
 share/gettext/its/gschema.loc
 share/glib-2.0/gdb/glib_gdb.py
 share/glib-2.0/gdb/gobject_gdb.py
 share/glib-2.0/gettext/po/Makefile.in.in
 share/glib-2.0/schemas/gschema.dtd
+share/glib-2.0/valgrind/glib.supp
 share/gtk-doc/html/gio/GAction.html
 share/gtk-doc/html/gio/GActionGroup.html
 share/gtk-doc/html/gio/GActionMap.html
@@ -432,24 +434,6 @@ share/gtk-doc/html/gio/GVolumeMonitor.ht
 share/gtk-doc/html/gio/GZlibCompressor.html
 share/gtk-doc/html/gio/GZlibDecompressor.html
 share/gtk-doc/html/gio/annotation-glossary.html
-share/gtk-doc/html/gio/api-index-2-18.html
-share/gtk-doc/html/gio/api-index-2-20.html
-share/gtk-doc/html/gio/api-index-2-22.html
-share/gtk-doc/html/gio/api-index-2-24.html
-share/gtk-doc/html/gio/api-index-2-26.html
-share/gtk-doc/html/gio/api-index-2-28.html
-share/gtk-doc/html/gio/api-index-2-30.html
-share/gtk-doc/html/gio/api-index-2-32.html
-share/gtk-doc/html/gio/api-index-2-34.html
-share/gtk-doc/html/gio/api-index-2-36.html
-share/gtk-doc/html/gio/api-index-2-38.html
-share/gtk-doc/html/gio/api-index-2-40.html
-share/gtk-doc/html/gio/api-index-2-42.html
-share/gtk-doc/html/gio/api-index-2-44.html
-share/gtk-doc/html/gio/api-index-2-46.html
-share/gtk-doc/html/gio/api-index-2-48.html
-share/gtk-doc/html/gio/api-index-2-50.html
-share/gtk-doc/html/gio/api-index-deprecated.html
 share/gtk-doc/html/gio/api-index-full.html
 share/gtk-doc/html/gio/application.html
 share/gtk-doc/html/gio/async.html
@@ -484,7 +468,6 @@ share/gtk-doc/html/gio/gdbus-convenience
 share/gtk-doc/html/gio/gdbus-example-gdbus-codegen.html
 share/gtk-doc/html/gio/gdbus-lowlevel.html
 share/gtk-doc/html/gio/gdbus.html
-share/gtk-doc/html/gio/gio.html
 share/gtk-doc/html/gio/gio-D-Bus-Addresses.html
 share/gtk-doc/html/gio/gio-D-Bus-Introspection-Data.html
 share/gtk-doc/html/gio/gio-D-Bus-Utilities.html
@@ -512,6 +495,7 @@ share/gtk-doc/html/gio/gio-gpollableutil
 share/gtk-doc/html/gio/gio-hierarchy.html
 share/gtk-doc/html/gio/gio-querymodules.html
 share/gtk-doc/html/gio/gio.devhelp2
+share/gtk-doc/html/gio/gio.html
 share/gtk-doc/html/gio/glib-compile-resources.html
 share/gtk-doc/html/gio/glib-compile-schemas.html
 share/gtk-doc/html/gio/gresource-tool.html
@@ -553,32 +537,6 @@ share/gtk-doc/html/glib/Sorted_binary_tr
 share/gtk-doc/html/glib/Sorted_binary_tree_postorder.svg
 share/gtk-doc/html/glib/Sorted_binary_tree_preorder.svg
 share/gtk-doc/html/glib/annotation-glossary.html
-share/gtk-doc/html/glib/api-index-2-10.html
-share/gtk-doc/html/glib/api-index-2-12.html
-share/gtk-doc/html/glib/api-index-2-14.html
-share/gtk-doc/html/glib/api-index-2-16.html
-share/gtk-doc/html/glib/api-index-2-18.html
-share/gtk-doc/html/glib/api-index-2-2.html
-share/gtk-doc/html/glib/api-index-2-20.html
-share/gtk-doc/html/glib/api-index-2-22.html
-share/gtk-doc/html/glib/api-index-2-24.html
-share/gtk-doc/html/glib/api-index-2-26.html
-share/gtk-doc/html/glib/api-index-2-28.html
-share/gtk-doc/html/glib/api-index-2-30.html
-share/gtk-doc/html/glib/api-index-2-32.html
-share/gtk-doc/html/glib/api-index-2-34.html
-share/gtk-doc/html/glib/api-index-2-36.html
-share/gtk-doc/html/glib/api-index-2-38.html
-share/gtk-doc/html/glib/api-index-2-4.html
-share/gtk-doc/html/glib/api-index-2-40.html
-share/gtk-doc/html/glib/api-index-2-42.html
-share/gtk-doc/html/glib/api-index-2-44.html
-share/gtk-doc/html/glib/api-index-2-46.html
-share/gtk-doc/html/glib/api-index-2-48.html
-share/gtk-doc/html/glib/api-index-2-50.html
-share/gtk-doc/html/glib/api-index-2-6.html
-share/gtk-doc/html/glib/api-index-2-8.html
-share/gtk-doc/html/glib/api-index-deprecated.html
 share/gtk-doc/html/glib/api-index-full.html
 share/gtk-doc/html/glib/deprecated.html
 share/gtk-doc/html/glib/file-name-encodings.png
@@ -608,6 +566,7 @@ share/gtk-doc/html/glib/glib-Error-Repor
 share/gtk-doc/html/glib/glib-File-Utilities.html
 share/gtk-doc/html/glib/glib-GDateTime.html
 share/gtk-doc/html/glib/glib-GTimeZone.html
+share/gtk-doc/html/glib/glib-GUuid.html
 share/gtk-doc/html/glib/glib-GVariant.html
 share/gtk-doc/html/glib/glib-GVariantType.html
 share/gtk-doc/html/glib/glib-Glob-style-pattern-matching.html
@@ -687,28 +646,6 @@ share/gtk-doc/html/gobject/GBinding.html
 share/gtk-doc/html/gobject/GTypeModule.html
 share/gtk-doc/html/gobject/GTypePlugin.html
 share/gtk-doc/html/gobject/annotation-glossary.html
-share/gtk-doc/html/gobject/api-index-2-10.html
-share/gtk-doc/html/gobject/api-index-2-12.html
-share/gtk-doc/html/gobject/api-index-2-14.html
-share/gtk-doc/html/gobject/api-index-2-18.html
-share/gtk-doc/html/gobject/api-index-2-2.html
-share/gtk-doc/html/gobject/api-index-2-22.html
-share/gtk-doc/html/gobject/api-index-2-24.html
-share/gtk-doc/html/gobject/api-index-2-26.html
-share/gtk-doc/html/gobject/api-index-2-28.html
-share/gtk-doc/html/gobject/api-index-2-30.html
-share/gtk-doc/html/gobject/api-index-2-32.html
-share/gtk-doc/html/gobject/api-index-2-34.html
-share/gtk-doc/html/gobject/api-index-2-36.html
-share/gtk-doc/html/gobject/api-index-2-38.html
-share/gtk-doc/html/gobject/api-index-2-4.html
-share/gtk-doc/html/gobject/api-index-2-40.html
-share/gtk-doc/html/gobject/api-index-2-42.html
-share/gtk-doc/html/gobject/api-index-2-44.html
-share/gtk-doc/html/gobject/api-index-2-46.html
-share/gtk-doc/html/gobject/api-index-2-6.html
-share/gtk-doc/html/gobject/api-index-2-8.html
-share/gtk-doc/html/gobject/api-index-deprecated.html
 share/gtk-doc/html/gobject/api-index-full.html
 share/gtk-doc/html/gobject/ch01s02.html
 share/gtk-doc/html/gobject/chapter-gobject.html
@@ -801,6 +738,7 @@ share/locale/eu/LC_MESSAGES/glib20.mo
 share/locale/fa/LC_MESSAGES/glib20.mo
 share/locale/fi/LC_MESSAGES/glib20.mo
 share/locale/fr/LC_MESSAGES/glib20.mo
+share/locale/fur/LC_MESSAGES/glib20.mo
 share/locale/ga/LC_MESSAGES/glib20.mo
 share/locale/gd/LC_MESSAGES/glib20.mo
 share/locale/gl/LC_MESSAGES/glib20.mo

Index: pkgsrc/devel/glib2/buildlink3.mk
diff -u pkgsrc/devel/glib2/buildlink3.mk:1.25 pkgsrc/devel/glib2/buildlink3.mk:1.26
--- pkgsrc/devel/glib2/buildlink3.mk:1.25       Sat Oct  6 20:44:04 2012
+++ pkgsrc/devel/glib2/buildlink3.mk    Mon Jul  3 17:42:45 2017
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.25 2012/10/06 20:44:04 prlw1 Exp $
+# $NetBSD: buildlink3.mk,v 1.26 2017/07/03 17:42:45 prlw1 Exp $
 
 BUILDLINK_TREE+=       glib2
 
@@ -14,7 +14,9 @@ BUILDLINK_PKGSRCDIR.glib2?=   ../../devel/
 .include "../../devel/pcre/buildlink3.mk"
 .include "../../devel/zlib/buildlink3.mk"
 .include "../../devel/libffi/buildlink3.mk"
+.if empty(MACHINE_PLATFORM:MIRIX-5*)
 .include "../../mk/pthread.buildlink3.mk"
+.endif
 .endif # GLIB2_BUILDLINK3_MK
 
 BUILDLINK_TREE+=       -glib2

Index: pkgsrc/devel/glib2/distinfo
diff -u pkgsrc/devel/glib2/distinfo:1.220 pkgsrc/devel/glib2/distinfo:1.221
--- pkgsrc/devel/glib2/distinfo:1.220   Fri Mar  3 08:22:12 2017
+++ pkgsrc/devel/glib2/distinfo Mon Jul  3 17:42:45 2017
@@ -1,9 +1,9 @@
-$NetBSD: distinfo,v 1.220 2017/03/03 08:22:12 prlw1 Exp $
+$NetBSD: distinfo,v 1.221 2017/07/03 17:42:45 prlw1 Exp $
 
-SHA1 (glib-2.50.3.tar.xz) = 3177471fb11fd2fd5abb77ec0675ee0049521009
-RMD160 (glib-2.50.3.tar.xz) = 3bc3bf5ae5d9997520e970c5c5a269538d871889
-SHA512 (glib-2.50.3.tar.xz) = ef35806c15170b6608445f255136c0bebd2d433adf903c2af2865f6a57b4f2fcfc1e4a7cea1a0dac48ff5fe26248fbf7886dba4a8d209506f0a94160df8fb7af
-Size (glib-2.50.3.tar.xz) = 7589284 bytes
+SHA1 (glib-2.52.3.tar.xz) = 9e31cce788d018894e6e0b1350263bc11b41cff8
+RMD160 (glib-2.52.3.tar.xz) = 367e119f257be876718ce135d768705f9f8a56b6
+SHA512 (glib-2.52.3.tar.xz) = a068f2519cfb82de8d4b7f004e7c1f15e841cad4046430a83b02b359d011e0c4077cdff447a1687ed7c68f1a11b4cf66b9ed9fc23ab5f0c7c6be84eb0ddc3017
+Size (glib-2.52.3.tar.xz) = 7679972 bytes
 SHA1 (patch-aa) = d197ded7ca05c2e37396e6c6b185797bd9bb2821
 SHA1 (patch-ab) = 04bde955a2a588011a8c77ada4923d5464a0d544
 SHA1 (patch-ac) = 96e153339675457356f71e35d20375bed669d337
@@ -14,14 +14,14 @@ SHA1 (patch-aha) = ade66edd87a5e76a1256b
 SHA1 (patch-ak) = edf116968bd3c787fea77787add7e0164b6f1ffb
 SHA1 (patch-al) = 4eb4e241488dabe254973f5ada92898af57cd0f5
 SHA1 (patch-am) = 99f54927d76580dfeda2a6b1909e1bea5dbdc293
-SHA1 (patch-an) = ce167f6441480b1c0299350a23e087c6de942018
+SHA1 (patch-an) = 64618bac5556cdcda5b33582618226366a8b43be
 SHA1 (patch-cb) = 56e2a9b2de04c8e528faf7ce778503fa55dcc3ac
 SHA1 (patch-cc) = f3d37cbb483863aab602f9c1209650e3e4795871
 SHA1 (patch-cd) = a8a90eca84a687400a92b0e26fafe4b9b6014ec3
 SHA1 (patch-ck) = 324116cc6fb8dbce8ce8d20f5b237fc469a55cd2
-SHA1 (patch-cl) = 871e1ca59f697eddd6692702fc7d63a2df826afc
+SHA1 (patch-cl) = 18f34d749a8ca5a996a1be0ebd3c8df9dc012839
 SHA1 (patch-cm) = 534af37ae8f2bd667f630142058d4de5ea91be93
-SHA1 (patch-gio_gdbusauthmechanismsha1.c) = dfbd4a85ea842f11e4bb76d39c5509fb8b0d5baa
+SHA1 (patch-gio_gdbusauthmechanismsha1.c) = 39b9e9375bc8832c2c177c8e89228790d9ae9e7b
 SHA1 (patch-gio_gresource-tool.c) = 4eb7c9df25e9ac3e977edf3be8fb977a6fb39182
 SHA1 (patch-gio_inotify_inotify-kernel.c) = 18fc55be06dfa4ebf7128b8d1888aaff3b2b95c0
 SHA1 (patch-glib_gmain.c) = d09ff66e475ee52d37ac0dcb463110f690ce6511

Index: pkgsrc/devel/glib2/patches/patch-an
diff -u pkgsrc/devel/glib2/patches/patch-an:1.13 pkgsrc/devel/glib2/patches/patch-an:1.14
--- pkgsrc/devel/glib2/patches/patch-an:1.13    Thu Apr  7 18:33:05 2016
+++ pkgsrc/devel/glib2/patches/patch-an Mon Jul  3 17:42:45 2017
@@ -1,12 +1,12 @@
-$NetBSD: patch-an,v 1.13 2016/04/07 18:33:05 prlw1 Exp $
+$NetBSD: patch-an,v 1.14 2017/07/03 17:42:45 prlw1 Exp $
 
 - Leave gdbus-2.0/codegen sudirectory to devel/gdbus-codegen package.
 - Don't compile tests as they include gdbus-codegen tests.
 - Don't install completion data.
 
---- gio/Makefile.in.orig       2016-02-16 11:35:28.000000000 +0000
+--- gio/Makefile.in.orig       2017-06-22 13:16:23.000000000 +0000
 +++ gio/Makefile.in
-@@ -879,8 +879,7 @@ am__set_b = \
+@@ -931,8 +931,7 @@ am__set_b = \
      *) \
        b='$*';; \
    esac
@@ -14,9 +14,9 @@ $NetBSD: patch-an,v 1.13 2016/04/07 18:3
 -      fam
 +DIST_SUBDIRS = gdbus-2.0/codegen xdgmime inotify kqueue win32 . fam
  am__DIST_COMMON = $(srcdir)/Makefile.in $(srcdir)/gio.rc.in \
-       $(srcdir)/gnetworking.h.in \
-       $(top_srcdir)/build/Makefile.msvcproj $(top_srcdir)/depcomp \
-@@ -1257,8 +1256,8 @@ all_test_ltlibs = $(test_ltlibraries) $(
+       $(srcdir)/gnetworking.h.in $(top_srcdir)/depcomp \
+       $(top_srcdir)/glib.mk $(top_srcdir)/test-driver \
+@@ -1315,8 +1314,8 @@ all_test_ltlibs = $(test_ltlibraries) $(
  @ENABLE_INSTALLED_TESTS_TRUE@                      $(dist_test_scripts) $(dist_installed_test_scripts)
  
  @ENABLE_INSTALLED_TESTS_TRUE@installed_test_meta_DATA = $(installed_testcases:=.test)
@@ -27,7 +27,7 @@ $NetBSD: patch-an,v 1.13 2016/04/07 18:3
  @MS_LIB_AVAILABLE_TRUE@@OS_WIN32_AND_DLL_COMPILATION_TRUE@install_ms_lib_cmd = $(INSTALL) gio-2.0.lib $(DESTDIR)$(libdir)
  @MS_LIB_AVAILABLE_TRUE@@OS_WIN32_AND_DLL_COMPILATION_TRUE@uninstall_ms_lib_cmd = -rm $(DESTDIR)$(libdir)/gio-2.0.lib
  AM_CPPFLAGS = \
-@@ -4547,7 +4546,7 @@ info: info-recursive
+@@ -4800,7 +4799,7 @@ info: info-recursive
  
  info-am:
  

Index: pkgsrc/devel/glib2/patches/patch-cl
diff -u pkgsrc/devel/glib2/patches/patch-cl:1.11 pkgsrc/devel/glib2/patches/patch-cl:1.12
--- pkgsrc/devel/glib2/patches/patch-cl:1.11    Fri Sep  5 20:49:55 2014
+++ pkgsrc/devel/glib2/patches/patch-cl Mon Jul  3 17:42:45 2017
@@ -1,10 +1,10 @@
-$NetBSD: patch-cl,v 1.11 2014/09/05 20:49:55 prlw1 Exp $
+$NetBSD: patch-cl,v 1.12 2017/07/03 17:42:45 prlw1 Exp $
 
 - Leave gdbus-2.0/codegen sudirectory to devel/gdbus-codegen package.
 - Don't compile tests as they include gdbus-codegen tests.
 - Don't install completion data.
 (patch-an)
---- gio/Makefile.am.orig       2014-02-17 18:06:20.000000000 +0000
+--- gio/Makefile.am.orig       2017-06-22 12:53:56.000000000 +0000
 +++ gio/Makefile.am
 @@ -1,6 +1,6 @@
  include $(top_srcdir)/glib.mk
@@ -13,8 +13,8 @@ $NetBSD: patch-cl,v 1.11 2014/09/05 20:4
 +SUBDIRS = 
  
  if OS_UNIX
- SUBDIRS += xdgmime
-@@ -240,7 +240,7 @@ platform_libadd += win32/libgiowin32.la
+ if !OS_COCOA
+@@ -244,7 +244,7 @@ platform_libadd += win32/libgiowin32.la
  platform_deps += win32/libgiowin32.la
  endif
  
@@ -23,8 +23,8 @@ $NetBSD: patch-cl,v 1.11 2014/09/05 20:4
  
  if HAVE_FAM
  SUBDIRS += fam
-@@ -750,14 +750,6 @@ gapplication_LDADD = libgio-2.0.la                        \
-       $(NULL)
+@@ -898,14 +898,6 @@ gapplication_LDADD = libgio-2.0.la                        \
+ endif
  endif
  
 -completiondir = $(datadir)/bash-completion/completions

Index: pkgsrc/devel/glib2/patches/patch-gio_gdbusauthmechanismsha1.c
diff -u pkgsrc/devel/glib2/patches/patch-gio_gdbusauthmechanismsha1.c:1.2 pkgsrc/devel/glib2/patches/patch-gio_gdbusauthmechanismsha1.c:1.3
--- pkgsrc/devel/glib2/patches/patch-gio_gdbusauthmechanismsha1.c:1.2   Sun Dec  8 13:08:59 2013
+++ pkgsrc/devel/glib2/patches/patch-gio_gdbusauthmechanismsha1.c       Mon Jul  3 17:42:45 2017
@@ -1,12 +1,12 @@
-$NetBSD: patch-gio_gdbusauthmechanismsha1.c,v 1.2 2013/12/08 13:08:59 prlw1 Exp $
+$NetBSD: patch-gio_gdbusauthmechanismsha1.c,v 1.3 2017/07/03 17:42:45 prlw1 Exp $
 
 Suppress format warnings that are converted to errors with gcc 4.8
 
---- gio/gdbusauthmechanismsha1.c.orig  2013-08-08 10:00:40.000000000 +0000
+--- gio/gdbusauthmechanismsha1.c.orig  2017-06-22 12:52:49.000000000 +0000
 +++ gio/gdbusauthmechanismsha1.c
-@@ -273,7 +273,7 @@ ensure_keyring_directory (GError **error
+@@ -272,7 +272,7 @@ ensure_keyring_directory (GError **error
                             G_IO_ERROR_FAILED,
-                            _("Permissions on directory '%s' are malformed. Expected mode 0700, got 0%o"),
+                            _("Permissions on directory “%s” are malformed. Expected mode 0700, got 0%o"),
                             path,
 -                           statbuf.st_mode & 0777);
 +                           (guint)statbuf.st_mode & 0777);