[glib/glib-2-60] 2.60.4

[Philip Withnall <pwithnall src gnome org>]

commit 6672d0cbed1f2bc87ca27ab69290900ff838224e
Author: Philip Withnall <withnall endlessm com>
Date:   Mon Jun 10 18:37:19 2019 +0100

    2.60.4
    
    Signed-off-by: Philip Withnall <withnall endlessm com>

 NEWS        | 22 ++++++++++++++++++++++
 meson.build |  2 +-
 2 files changed, 23 insertions(+), 1 deletion(-)
---
diff --git a/NEWS b/NEWS
index 26220fe77..12a50b291 100644
--- a/NEWS
+++ b/NEWS
@@ -1,3 +1,25 @@
+Overview of changes in GLib 2.60.4
+==================================
+
+* Fixes to improved network status detection with NetworkManager (#1788)
+
+* Leak fixes to some `glib-genmarshal` generated code (#1793)
+
+* Further fixes to the Happy Eyeballs (RFC 8305) implementation (!865)
+
+* File system permissions fix to clamp down permissions in a small time window
+  when copying files (CVE-2019-12450, !876)
+
+* Bugs fixed:
+ - #1755 Please revert #535 gmacros: Try to use the standard __func__ first in G_STRFUNC
+ - #1788 GNetworkMonitor claims I am offline
+ - #1792 glib-genmarshal generated valist marshal does not respect static scope for some types
+ - #1793 glib-genmarshal generates wrong code for va marshaler for VARIANT type
+ - #1795 Fix mingw32 CI on older branches
+ - !865 gnetworkaddress: fix "happy eyeballs" logic
+ - !878 Backport !876 “gfile: Limit access to files when copying” to glib-2-60
+
+
 Overview of changes in GLib 2.60.3
 ==================================
 
diff --git a/meson.build b/meson.build
index a74502400..832044947 100644
--- a/meson.build
+++ b/meson.build
@@ -1,5 +1,5 @@
 project('glib', 'c', 'cpp',
-  version : '2.60.3',
+  version : '2.60.4',
   meson_version : '>= 0.48.0',
   default_options : [
     'buildtype=debugoptimized',