glib: Bump to version 2.54.2

https://bugzilla.gnome.org/show_bug.cgi?id=789663

14 files changed, 69 insertions, 290 deletions

diff --git a/recipes/glib/0001-Let-user-disable-Cocoa-and-Carbon-support-on-demand.patch b/recipes/glib/0001-Let-user-disable-Cocoa-and-Carbon-support-on-demand.patch
index 5d25dcdc..7d076097 100644
--- a/recipes/glib/0001-Let-user-disable-Cocoa-and-Carbon-support-on-demand.patch
+++ b/recipes/glib/0001-Let-user-disable-Cocoa-and-Carbon-support-on-demand.patch
@@ -1,19 +1,19 @@
-From c2e0bbaa51758c9f1561db7069388f578e6eeb62 Mon Sep 17 00:00:00 2001
+From 58179cc8fbdbae4116b02cc1c419a969c92bce76 Mon Sep 17 00:00:00 2001
 From: Nirbheek Chauhan <nirbheek@centricular.com>
 Date: Thu, 13 Nov 2014 17:22:59 +0530
-Subject: [PATCH 01/10] Let user disable Cocoa and Carbon support on demand
+Subject: [PATCH 01/13] Let user disable Cocoa and Carbon support on demand
 
 Also always AC_SUBST COCOA_LIBS and CARBON_LIBS since these are used in the
 pkg-config file, etc.
 ---
- configure.ac | 73 +++++++++++++++++++++++++++++++++++++-----------------------
- 1 file changed, 45 insertions(+), 28 deletions(-)
+ configure.ac | 71 ++++++++++++++++++++++++++++++++++++++----------------------
+ 1 file changed, 45 insertions(+), 26 deletions(-)
 
 diff --git a/configure.ac b/configure.ac
-index 94c9de1..de42595 100644
+index 58cd3f2..e9419f6 100644
 --- a/configure.ac
 +++ b/configure.ac
-@@ -172,32 +172,10 @@ AC_MSG_RESULT([$glib_native_android])
+@@ -174,32 +174,10 @@ AC_MSG_RESULT([$glib_native_android])
  
  AC_SUBST(LIB_EXE_MACHINE_FLAG)
  
@@ -46,7 +46,7 @@ index 94c9de1..de42595 100644
  
  AS_IF([test "$glib_native_win32" = "yes"], [
    AC_CHECK_TOOL(WINDRES, windres, no)
-@@ -214,19 +192,58 @@ AS_IF([test "$glib_native_win32" = "yes"], [
+@@ -216,15 +194,56 @@ AS_IF([test "$glib_native_win32" = "yes"], [
  ])
  AM_CONDITIONAL(MS_LIB_AVAILABLE, [test x$ms_librarian = xyes])
  
@@ -75,10 +75,10 @@ index 94c9de1..de42595 100644
    CARBON_LIBS="-Wl,-framework,Carbon"
    LDFLAGS="$LDFLAGS $CARBON_LIBS"
 -], [CARBON_LIBS=""])
--
 +fi
- AC_SUBST([CARBON_LIBS])
  
+ AC_SUBST([CARBON_LIBS])
+ ac_cv_have_os_x_9_or_later="no"
 -AS_IF([test "x$glib_have_cocoa" = "xyes"], [
 +dnl Check cocoa
 +AC_ARG_ENABLE(cocoa,
@@ -106,19 +106,15 @@ index 94c9de1..de42595 100644
    AC_DEFINE(HAVE_COCOA, 1, [define to 1 if Cocoa is available])
    COCOA_LIBS="-Wl,-framework,Foundation"
    LDFLAGS="$LDFLAGS $COCOA_LIBS"
--
-   osx_version=`sw_vers -productVersion`
-   osx_min_version="10.9.0"
-   AC_MSG_CHECKING([OSX version >= $osx_min_version])
-@@ -235,7 +252,7 @@ AS_IF([test "x$glib_have_cocoa" = "xyes"], [
-     AC_MSG_ERROR([OSX version is too old!])
-   ])
-   AC_MSG_RESULT([yes])
+@@ -234,7 +253,7 @@ AS_IF([test "x$glib_have_cocoa" = "xyes"], [
+ #error Compiling for minimum OS X version before 10.9
+ #endif
+   ]])],[ac_cv_have_os_x_9_or_later="yes"])
 -], [COCOA_LIBS=""])
 +fi
- 
+ AM_CONDITIONAL([MAC_OS_X_9], [test "x$ac_cv_have_os_x_9_or_later" = xyes])
  AC_SUBST([COCOA_LIBS])
  
 -- 
-2.8.1
+2.7.4
 
diff --git a/recipes/glib/0002-Optionally-revert-to-the-old-pre-2.28-URI-handler-co.patch b/recipes/glib/0002-Optionally-revert-to-the-old-pre-2.28-URI-handler-co.patch
index 54715adb..c1cd1fcd 100644
--- a/recipes/glib/0002-Optionally-revert-to-the-old-pre-2.28-URI-handler-co.patch
+++ b/recipes/glib/0002-Optionally-revert-to-the-old-pre-2.28-URI-handler-co.patch
@@ -1,7 +1,7 @@
-From fbe70c34939822bb4574a87daa71d6925f2cd117 Mon Sep 17 00:00:00 2001
+From 91744bf811e9337a85e08843bbdb77ebf9cc89e0 Mon Sep 17 00:00:00 2001
 From: =?UTF-8?q?Sebastian=20Dr=C3=B6ge?= <sebastian.droege@collabora.co.uk>
 Date: Fri, 9 Mar 2012 08:44:13 +0100
-Subject: [PATCH 02/10] Optionally revert to the old (pre-2.28) URI handler
+Subject: [PATCH 02/13] Optionally revert to the old (pre-2.28) URI handler
  code
 
 This is required to work with the GVfs distributed on Linux distributions
@@ -11,10 +11,10 @@ that ship with GLib 2.24 (e.g. Ubuntu Lucid and Debian Squeeze).
  1 file changed, 51 insertions(+)
 
 diff --git a/gio/gdesktopappinfo.c b/gio/gdesktopappinfo.c
-index d65288d..fadcada 100644
+index 35896b8..6fcd12f 100644
 --- a/gio/gdesktopappinfo.c
 +++ b/gio/gdesktopappinfo.c
-@@ -4082,6 +4082,7 @@ out:
+@@ -4116,6 +4116,7 @@ out:
  GAppInfo *
  g_app_info_get_default_for_uri_scheme (const char *uri_scheme)
  {
@@ -22,7 +22,7 @@ index d65288d..fadcada 100644
    GAppInfo *app_info;
    char *content_type, *scheme_down;
  
-@@ -4092,6 +4093,56 @@ g_app_info_get_default_for_uri_scheme (const char *uri_scheme)
+@@ -4126,6 +4127,56 @@ g_app_info_get_default_for_uri_scheme (const char *uri_scheme)
    g_free (content_type);
  
    return app_info;
@@ -80,5 +80,5 @@ index d65288d..fadcada 100644
  
  /* "Get all" API {{{2 */
 -- 
-2.8.1
+2.7.4
 
diff --git a/recipes/glib/0003-Add-support-for-loading-GIO-modules-from-the-distro-.patch b/recipes/glib/0003-Add-support-for-loading-GIO-modules-from-the-distro-.patch
index 72a6baed..6ead77b9 100644
--- a/recipes/glib/0003-Add-support-for-loading-GIO-modules-from-the-distro-.patch
+++ b/recipes/glib/0003-Add-support-for-loading-GIO-modules-from-the-distro-.patch
@@ -1,7 +1,7 @@
-From 72cfa4e02c0644f80e9252db455e7657843c329d Mon Sep 17 00:00:00 2001
+From 2f168353a9406e1db0ee7206e46c2d523e8aeddc Mon Sep 17 00:00:00 2001
 From: =?UTF-8?q?Sebastian=20Dr=C3=B6ge?= <sebastian.droege@collabora.co.uk>
 Date: Fri, 9 Mar 2012 08:51:12 +0100
-Subject: [PATCH 03/10] Add support for loading GIO modules from the distro's
+Subject: [PATCH 03/13] Add support for loading GIO modules from the distro's
  GIO module path
 
 This is needed to e.g. load GVfs from the distro. Without this elements
@@ -11,10 +11,10 @@ like giosrc are pretty useless and we really don't want to ship GVfs.
  1 file changed, 5 insertions(+)
 
 diff --git a/gio/giomodule.c b/gio/giomodule.c
-index da7c167..b97aa78 100644
+index 7b9662d..4c53e1f 100644
 --- a/gio/giomodule.c
 +++ b/gio/giomodule.c
-@@ -1084,6 +1084,11 @@ _g_io_modules_ensure_loaded (void)
+@@ -1098,6 +1098,11 @@ _g_io_modules_ensure_loaded (void)
        g_io_modules_scan_all_in_directory_with_scope (module_dir, scope);
        g_free (module_dir);
  
@@ -27,5 +27,5 @@ index da7c167..b97aa78 100644
  
        /* Initialize types from built-in "modules" */
 -- 
-2.8.1
+2.7.4
 
diff --git a/recipes/glib/0004-Allow-for-a-second-distro-GIO-module-path-as-used-on.patch b/recipes/glib/0004-Allow-for-a-second-distro-GIO-module-path-as-used-on.patch
index 89f4b624..9c5e742a 100644
--- a/recipes/glib/0004-Allow-for-a-second-distro-GIO-module-path-as-used-on.patch
+++ b/recipes/glib/0004-Allow-for-a-second-distro-GIO-module-path-as-used-on.patch
@@ -1,7 +1,7 @@
-From 47138b062f774ca52f160e8e90c4fe76821786f3 Mon Sep 17 00:00:00 2001
+From e1feeab48318489137904d83b8f29ab82e9b2882 Mon Sep 17 00:00:00 2001
 From: =?UTF-8?q?Sebastian=20Dr=C3=B6ge?= <sebastian.droege@collabora.co.uk>
 Date: Mon, 12 Mar 2012 13:04:41 +0100
-Subject: [PATCH 04/10] Allow for a second distro GIO module path as used on
+Subject: [PATCH 04/13] Allow for a second distro GIO module path as used on
  Ubuntu
 
 ...because apparently only half of their packages are multi-arch
@@ -11,10 +11,10 @@ capable...
  1 file changed, 5 insertions(+)
 
 diff --git a/gio/giomodule.c b/gio/giomodule.c
-index b97aa78..e17905d 100644
+index 4c53e1f..0a24645 100644
 --- a/gio/giomodule.c
 +++ b/gio/giomodule.c
-@@ -1089,6 +1089,11 @@ _g_io_modules_ensure_loaded (void)
+@@ -1103,6 +1103,11 @@ _g_io_modules_ensure_loaded (void)
        g_io_modules_scan_all_in_directory_with_scope (GST_SDK_GLIB_GIO_DISTRO_GIO_MODULE_PATH, scope);
  #endif
  
@@ -27,5 +27,5 @@ index b97aa78..e17905d 100644
  
        /* Initialize types from built-in "modules" */
 -- 
-2.8.1
+2.7.4
 
diff --git a/recipes/glib/0005-Blacklist-the-bamf-GIO-module.patch b/recipes/glib/0005-Blacklist-the-bamf-GIO-module.patch
index abfdbc05..21961a59 100644
--- a/recipes/glib/0005-Blacklist-the-bamf-GIO-module.patch
+++ b/recipes/glib/0005-Blacklist-the-bamf-GIO-module.patch
@@ -1,7 +1,7 @@
-From 5b229f28dbba371b4ba2b5fbc94bb292bf999649 Mon Sep 17 00:00:00 2001
+From 8d46829b9174c81646ee6f3f1880c182b1496c43 Mon Sep 17 00:00:00 2001
 From: =?UTF-8?q?Sebastian=20Dr=C3=B6ge?= <sebastian.droege@collabora.co.uk>
 Date: Mon, 12 Mar 2012 14:30:02 +0100
-Subject: [PATCH 05/10] Blacklist the bamf GIO module
+Subject: [PATCH 05/13] Blacklist the bamf GIO module
 
 I uses Ubuntu specific GLib API on Ubuntu... and thus crashes
 everything that ever tries to use GIO.
@@ -10,10 +10,10 @@ everything that ever tries to use GIO.
  1 file changed, 7 insertions(+)
 
 diff --git a/gio/giomodule.c b/gio/giomodule.c
-index e17905d..865ad74 100644
+index 0a24645..56a1755 100644
 --- a/gio/giomodule.c
 +++ b/gio/giomodule.c
-@@ -366,6 +366,13 @@ is_valid_module_name (const gchar        *basename,
+@@ -373,6 +373,13 @@ is_valid_module_name (const gchar        *basename,
  {
    gboolean result;
  
@@ -28,5 +28,5 @@ index e17905d..865ad74 100644
    if (!g_str_has_prefix (basename, "lib") ||
        !g_str_has_suffix (basename, ".so"))
 -- 
-2.8.1
+2.7.4
 
diff --git a/recipes/glib/0006-giomodule-do-not-try-to-load-modules-from-gio-module.patch b/recipes/glib/0006-giomodule-do-not-try-to-load-modules-from-gio-module.patch
index cd5bd886..52c20725 100644
--- a/recipes/glib/0006-giomodule-do-not-try-to-load-modules-from-gio-module.patch
+++ b/recipes/glib/0006-giomodule-do-not-try-to-load-modules-from-gio-module.patch
@@ -1,7 +1,7 @@
-From 9b078a9131138bfe53a0885b407ae1bbadac1889 Mon Sep 17 00:00:00 2001
+From 6e58f37111a268b65fcf539b87c8d78b8947a203 Mon Sep 17 00:00:00 2001
 From: Thiago Santos <thiago.sousa.santos@collabora.com>
 Date: Wed, 22 May 2013 15:00:34 -0300
-Subject: [PATCH 06/10] giomodule: do not try to load modules from
+Subject: [PATCH 06/13] giomodule: do not try to load modules from
  gio-module-dir in IOS
 
 There is no gio-module-dir for ios. When it tries to load on a real
@@ -13,10 +13,10 @@ exist in the user machine, but it will fail to load the modules
  1 file changed, 2 insertions(+)
 
 diff --git a/gio/giomodule.c b/gio/giomodule.c
-index 865ad74..278597a 100644
+index 56a1755..9f03b66 100644
 --- a/gio/giomodule.c
 +++ b/gio/giomodule.c
-@@ -1085,11 +1085,13 @@ _g_io_modules_ensure_loaded (void)
+@@ -1099,11 +1099,13 @@ _g_io_modules_ensure_loaded (void)
  	  g_strfreev (paths);
  	}
  
@@ -31,5 +31,5 @@ index 865ad74..278597a 100644
  #ifdef GST_SDK_GLIB_GIO_DISTRO_GIO_MODULE_PATH
        /* Now load all modules from the distro, e.g. gvfs */
 -- 
-2.8.1
+2.7.4
 
diff --git a/recipes/glib/0009-Unhide-_g_io_modules_ensure_extension_points_registe.patch b/recipes/glib/0008-Unhide-_g_io_modules_ensure_extension_points_registe.patch
index 3c8043b7..7aeb78db 100644
--- a/recipes/glib/0009-Unhide-_g_io_modules_ensure_extension_points_registe.patch
+++ b/recipes/glib/0008-Unhide-_g_io_modules_ensure_extension_points_registe.patch
@@ -1,7 +1,7 @@
-From 9c05e795e9df3623a4d35bc009dd435c07aab503 Mon Sep 17 00:00:00 2001
+From e51bda771338e8b5025c8c325415d3249cb4f35a Mon Sep 17 00:00:00 2001
 From: =?UTF-8?q?Sebastian=20Dr=C3=B6ge?= <sebastian@centricular.com>
 Date: Fri, 7 Mar 2014 13:59:22 +0100
-Subject: [PATCH 08/10] Unhide _g_io_modules_ensure_extension_points_registered
+Subject: [PATCH 08/13] Unhide _g_io_modules_ensure_extension_points_registered
  for calling by gio modules
 
 ---
@@ -21,5 +21,5 @@ index 2a51055..cd89648 100644
  void _g_io_modules_ensure_loaded                      (void);
  
 -- 
-2.8.1
+2.7.4
 
diff --git a/recipes/glib/0008-gdbus-codgen-Use-a-proper-shebang-in-the-generator.patch b/recipes/glib/0008-gdbus-codgen-Use-a-proper-shebang-in-the-generator.patch
deleted file mode 100644
index b7ccbecb..00000000
--- a/recipes/glib/0008-gdbus-codgen-Use-a-proper-shebang-in-the-generator.patch
+++ /dev/null
@@ -1,22 +0,0 @@
-From 41e24e3e65eda9ed104a9ef4b030daf347208d77 Mon Sep 17 00:00:00 2001
-From: Thibault Saunier <tsaunier@gnome.org>
-Date: Wed, 2 Apr 2014 19:41:59 +0200
-Subject: [PATCH 07/10] gdbus-codgen: Use a proper shebang in the generator
-
----
- gio/gdbus-2.0/codegen/gdbus-codegen.in | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/gio/gdbus-2.0/codegen/gdbus-codegen.in b/gio/gdbus-2.0/codegen/gdbus-codegen.in
-index fd31a55..b9c7e19 100644
---- a/gio/gdbus-2.0/codegen/gdbus-codegen.in
-+++ b/gio/gdbus-2.0/codegen/gdbus-codegen.in
-@@ -1,4 +1,4 @@
--#!@PYTHON@
-+#!/usr/bin/env @PYTHON@
- 
- # GDBus - GLib D-Bus Library
- #
--- 
-2.8.1
-
diff --git a/recipes/glib/0015-Implementation-of-Cocoa-event-loop-integration-in-GM.patch b/recipes/glib/0009-Implementation-of-Cocoa-event-loop-integration-in-GM.patch
index 8c06fc60..1aea34db 100644
--- a/recipes/glib/0015-Implementation-of-Cocoa-event-loop-integration-in-GM.patch
+++ b/recipes/glib/0009-Implementation-of-Cocoa-event-loop-integration-in-GM.patch
@@ -1,7 +1,7 @@
-From 86e1e199eb2b8441efb74b4a45cb0f83ccd4334d Mon Sep 17 00:00:00 2001
+From 4d5183a847b0f958d1fa8ac8cc1d4f6166c384ab Mon Sep 17 00:00:00 2001
 From: =?UTF-8?q?Sebastian=20Dr=C3=B6ge?= <sebastian@centricular.com>
 Date: Fri, 12 Dec 2014 16:40:23 +0100
-Subject: [PATCH] Implementation of Cocoa event loop integration in
+Subject: [PATCH 09/13] Implementation of Cocoa event loop integration in
  GMainContext
 
 ---
@@ -11,20 +11,20 @@ Subject: [PATCH] Implementation of Cocoa event loop integration in
  3 files changed, 991 insertions(+), 2 deletions(-)
 
 diff --git a/configure.ac b/configure.ac
-index 60e4938..51de9f2 100644
+index e9419f6..285d405 100644
 --- a/configure.ac
 +++ b/configure.ac
-@@ -244,7 +244,7 @@ AM_CONDITIONAL(OS_COCOA, [test "$glib_have_cocoa" = "yes"])
+@@ -245,7 +245,7 @@ AM_CONDITIONAL(OS_COCOA, [test "$glib_have_cocoa" = "yes"])
  
  if test "x$glib_have_cocoa" = "xyes"; then
    AC_DEFINE(HAVE_COCOA, 1, [define to 1 if Cocoa is available])
 -  COCOA_LIBS="-Wl,-framework,Foundation"
 +  COCOA_LIBS="-Wl,-framework,Foundation -Wl,-framework,AppKit"
    LDFLAGS="$LDFLAGS $COCOA_LIBS"
-   osx_version=`sw_vers -productVersion`
-   osx_min_version="10.9.0"
+   AC_COMPILE_IFELSE([AC_LANG_PROGRAM([[
+ #include <AvailabilityMacros.h>
 diff --git a/glib/Makefile.am b/glib/Makefile.am
-index 82a7d3a..01bf1c6 100644
+index d755853..611eb5b 100644
 --- a/glib/Makefile.am
 +++ b/glib/Makefile.am
 @@ -44,6 +44,10 @@ AM_CPPFLAGS = 				\
@@ -38,7 +38,7 @@ index 82a7d3a..01bf1c6 100644
  AM_CFLAGS = $(GLIB_WARN_CFLAGS)
  
  MIRRORING_TAB_SOURCE = 				\
-@@ -351,7 +355,7 @@ pcre_inc =
+@@ -353,7 +357,7 @@ pcre_inc =
  endif
  
  libglib_2_0_la_CFLAGS = $(AM_CFLAGS) $(GLIB_HIDDEN_VISIBILITY_CFLAGS) $(LIBSYSTEMD_CFLAGS)
@@ -48,7 +48,7 @@ index 82a7d3a..01bf1c6 100644
  
  libglib_2_0_la_LDFLAGS = $(GLIB_LINK_FLAGS) \
 diff --git a/glib/gmain.c b/glib/gmain.c
-index 4f90574..c537af4 100644
+index 27c0234..2a88474 100644
 --- a/glib/gmain.c
 +++ b/glib/gmain.c
 @@ -72,6 +72,10 @@
@@ -62,7 +62,7 @@ index 4f90574..c537af4 100644
  #ifdef HAVE_MACH_MACH_TIME_H
  #include <mach/mach_time.h>
  #endif
-@@ -449,6 +453,85 @@ static GMainContext *glib_worker_context;
+@@ -450,6 +454,85 @@ static GMainContext *glib_worker_context;
  G_LOCK_DEFINE_STATIC (main_loop);
  static GMainContext *default_main_context;
  
@@ -148,7 +148,7 @@ index 4f90574..c537af4 100644
  #ifndef G_OS_WIN32
  
  
-@@ -3267,6 +3350,35 @@ g_main_context_acquire (GMainContext *context)
+@@ -3298,6 +3381,35 @@ g_main_context_acquire (GMainContext *context)
      {
        context->owner = self;
        g_assert (context->owner_count == 0);
@@ -184,7 +184,7 @@ index 4f90574..c537af4 100644
        TRACE (GLIB_MAIN_CONTEXT_ACQUIRE (context, TRUE  /* success */));
      }
  
-@@ -3323,6 +3435,24 @@ g_main_context_release (GMainContext *context)
+@@ -3354,6 +3466,24 @@ g_main_context_release (GMainContext *context)
  	  if (!loop_internal_waiter)
  	    g_mutex_unlock (waiter->mutex);
  	}
@@ -209,7 +209,7 @@ index 4f90574..c537af4 100644
      }
  
    UNLOCK_CONTEXT (context); 
-@@ -5816,3 +5946,858 @@ g_get_worker_context (void)
+@@ -5857,3 +5987,858 @@ g_get_worker_context (void)
  
    return glib_worker_context;
  }
@@ -1069,5 +1069,5 @@ index 4f90574..c537af4 100644
 +
 +#endif
 -- 
-2.9.3
+2.7.4
 
diff --git a/recipes/glib/0017-GSocket-Fix-race-conditions-on-Win32-if-multiple-thr.patch b/recipes/glib/0010-GSocket-Fix-race-conditions-on-Win32-if-multiple-thr.patch
index 8634baca..e013ae96 100644
--- a/recipes/glib/0017-GSocket-Fix-race-conditions-on-Win32-if-multiple-thr.patch
+++ b/recipes/glib/0010-GSocket-Fix-race-conditions-on-Win32-if-multiple-thr.patch
@@ -1,8 +1,8 @@
-From e5ae075ff9b3cba2ee7b7393bc7f4b49c3d3ee79 Mon Sep 17 00:00:00 2001
+From 3235f26bdf88a9423bbb44c56870ff7df284c7bf Mon Sep 17 00:00:00 2001
 From: =?UTF-8?q?Sebastian=20Dr=C3=B6ge?= <sebastian@centricular.com>
 Date: Mon, 5 Dec 2016 12:28:57 +0200
-Subject: [PATCH] GSocket: Fix race conditions on Win32 if multiple threads are
- waiting on conditions for the same socket
+Subject: [PATCH 10/13] GSocket: Fix race conditions on Win32 if multiple
+ threads are waiting on conditions for the same socket
 
 WSAWaitForMultipleEvents() only returns for one of the waiting threads, and
 that one might not even be the one waiting for the condition that changed. As
@@ -19,7 +19,7 @@ https://bugzilla.gnome.org/show_bug.cgi?id=762283
  1 file changed, 68 insertions(+), 26 deletions(-)
 
 diff --git a/gio/gsocket.c b/gio/gsocket.c
-index 5a2f33285..ff5403b6f 100644
+index f69b565..c5fc855 100644
 --- a/gio/gsocket.c
 +++ b/gio/gsocket.c
 @@ -249,11 +249,14 @@ struct _GSocketPrivate
@@ -305,5 +305,5 @@ index 5a2f33285..ff5403b6f 100644
        }
  
 -- 
-2.11.0
+2.7.4
 
diff --git a/recipes/glib/0019-gmain-Fix-erroneous-if-condition-when-dtrace-is-disa.patch b/recipes/glib/0013-gmain-Fix-erroneous-if-condition-when-dtrace-is-disa.patch
index 8d9ee288..c8c47b39 100644
--- a/recipes/glib/0019-gmain-Fix-erroneous-if-condition-when-dtrace-is-disa.patch
+++ b/recipes/glib/0013-gmain-Fix-erroneous-if-condition-when-dtrace-is-disa.patch
@@ -1,7 +1,8 @@
-From cda76baac0c447a4f3ef5c9a34c15e9b8b586c44 Mon Sep 17 00:00:00 2001
+From e3b6ca6367b66f825de2beee7beb727c6592a85a Mon Sep 17 00:00:00 2001
 From: Jan Schmidt <jan@centricular.com>
 Date: Mon, 24 Apr 2017 22:24:26 +1000
-Subject: [PATCH] gmain: Fix erroneous if condition when dtrace is disabled
+Subject: [PATCH 13/13] gmain: Fix erroneous if condition when dtrace is
+ disabled
 
 Add a block around an if statement whose contents disappear
 when DTrace support is compiled out, making it erroneously
@@ -11,10 +12,10 @@ associate to the next line.
  1 file changed, 2 insertions(+), 1 deletion(-)
 
 diff --git a/glib/gmain.c b/glib/gmain.c
-index c537af4..e0db289 100644
+index 2a88474..cfb9e6b 100644
 --- a/glib/gmain.c
 +++ b/glib/gmain.c
-@@ -1681,11 +1681,12 @@ g_source_set_callback_indirect (GSource              *source,
+@@ -1700,11 +1700,12 @@ g_source_set_callback_indirect (GSource              *source,
    if (context)
      LOCK_CONTEXT (context);
  
@@ -29,5 +30,5 @@ index c537af4..e0db289 100644
    old_cb_data = source->callback_data;
    old_cb_funcs = source->callback_funcs;
 -- 
-2.9.3
+2.7.4
 
diff --git a/recipes/glib/0016-gmessages-Fix-compilation-on-Android.patch b/recipes/glib/0016-gmessages-Fix-compilation-on-Android.patch
deleted file mode 100644
index ca954623..00000000
--- a/recipes/glib/0016-gmessages-Fix-compilation-on-Android.patch
+++ /dev/null
@@ -1,62 +0,0 @@
-From 617d3457f88a5306d2499c2365bda7ee3d92b7e4 Mon Sep 17 00:00:00 2001
-From: =?UTF-8?q?Sebastian=20Dr=C3=B6ge?= <sebastian@centricular.com>
-Date: Mon, 5 Dec 2016 12:10:48 +0200
-Subject: [PATCH] gmessages: Fix compilation on Android
-
-There is no systemd on Android.
----
- glib/gmessages.c | 10 +++++-----
- 1 file changed, 5 insertions(+), 5 deletions(-)
-
-diff --git a/glib/gmessages.c b/glib/gmessages.c
-index 2ef2b9d..d4290fb 100644
---- a/glib/gmessages.c
-+++ b/glib/gmessages.c
-@@ -175,7 +175,7 @@
- #include <locale.h>
- #include <errno.h>
- 
--#ifdef __linux__
-+#if defined(__linux__) && !defined(__BIONIC__)
- #include <sys/types.h>
- #include <sys/socket.h>
- #include <sys/un.h>
-@@ -1922,7 +1922,7 @@ g_log_writer_supports_color (gint output_fd)
- #endif
- }
- 
--#ifdef __linux__
-+#if defined(__linux__) && !defined(__BIONIC__)
- static int journal_fd = -1;
- 
- #ifndef SOCK_CLOEXEC
-@@ -1961,7 +1961,7 @@ open_journal (void)
- gboolean
- g_log_writer_is_journald (gint output_fd)
- {
--#ifdef __linux__
-+#if defined(__linux__) && !defined(__BIONIC__)
-   /* FIXME: Use the new journal API for detecting whether we’re writing to the
-    * journal. See: https://github.com/systemd/systemd/issues/2473
-    */
-@@ -2096,7 +2096,7 @@ g_log_writer_format_fields (GLogLevelFlags   log_level,
-   return g_string_free (gstring, FALSE);
- }
- 
--#ifdef __linux__
-+#if defined(__linux__) && !defined(__BIONIC__)
- static int
- journal_sendv (struct iovec *iov,
-                gsize         iovlen)
-@@ -2210,7 +2210,7 @@ g_log_writer_journald (GLogLevelFlags   log_level,
-                        gsize            n_fields,
-                        gpointer         user_data)
- {
--#ifdef __linux__
-+#if defined(__linux__) && !defined(__BIONIC__)
-   const char equals = '=';
-   const char newline = '\n';
-   gsize i, k;
--- 
-2.11.0
-
diff --git a/recipes/glib/0018-Check-for-RTLD_LAZY-and-others-in-configure.patch b/recipes/glib/0018-Check-for-RTLD_LAZY-and-others-in-configure.patch
deleted file mode 100644
index 1aa65d98..00000000
--- a/recipes/glib/0018-Check-for-RTLD_LAZY-and-others-in-configure.patch
+++ /dev/null
@@ -1,68 +0,0 @@
-From 943cffea01804ff4e134d2cdc8a732df37961b55 Mon Sep 17 00:00:00 2001
-From: =?UTF-8?q?Sebastian=20Dr=C3=B6ge?= <sebastian@centricular.com>
-Date: Wed, 4 Jan 2017 21:39:48 +0200
-Subject: [PATCH 1/2] =?UTF-8?q?gmodule=20=E2=80=93=20Check=20for=20RTLD=5F?=
- =?UTF-8?q?LAZY=20and=20others=20in=20configure?=
-MIME-Version: 1.0
-Content-Type: text/plain; charset=UTF-8
-Content-Transfer-Encoding: 8bit
-
-They are no #defines on Android but enum values, and on 64 bit Android
-they have different values than what we would otherwise fall-back to.
-
-https://bugzilla.gnome.org/show_bug.cgi?id=776876
----
- configure.ac         | 10 ++++++++++
- gmodule/gmodule-dl.c |  7 ++++---
- 2 files changed, 14 insertions(+), 3 deletions(-)
-
-diff --git a/configure.ac b/configure.ac
-index 5607a6323..17ae3b7a0 100644
---- a/configure.ac
-+++ b/configure.ac
-@@ -1492,6 +1492,16 @@ dnl *** check whether we need preceeding underscores
-   		G_MODULE_NEED_USCORE=0
- 	fi
- 
-+        AC_CHECK_DECL([RTLD_LAZY],
-+                      [AC_DEFINE(HAVE_RTLD_LAZY, 1, [Define to 1 if RTLD_LAZY is available])],
-+                      [], [[#include <dlfcn.h>]])
-+        AC_CHECK_DECL([RTLD_NOW],
-+                      [AC_DEFINE(HAVE_RTLD_NOW, 1, [Define to 1 if RTLD_NOW is available])],
-+                      [], [[#include <dlfcn.h>]])
-+        AC_CHECK_DECL([RTLD_GLOBAL],
-+                      [AC_DEFINE(HAVE_RTLD_GLOBAL, 1, [Define to 1 if RTLD_GLOBAL is available])],
-+                      [], [[#include <dlfcn.h>]])
-+
- 	LDFLAGS="$LDFLAGS_orig"
- dnl *** check for having dlerror()
- 	AC_CHECK_FUNC(dlerror,
-diff --git a/gmodule/gmodule-dl.c b/gmodule/gmodule-dl.c
-index 20225df80..e452e3495 100644
---- a/gmodule/gmodule-dl.c
-+++ b/gmodule/gmodule-dl.c
-@@ -57,17 +57,18 @@
-  * RTLD_GLOBAL - the external symbols defined in the library will be made
-  *		 available to subsequently loaded libraries.
-  */
--#ifndef	RTLD_LAZY
-+#ifndef	HAVE_RTLD_LAZY
- #define	RTLD_LAZY	1
- #endif	/* RTLD_LAZY */
--#ifndef	RTLD_NOW
-+#ifndef	HAVE_RTLD_NOW
- #define	RTLD_NOW	0
- #endif	/* RTLD_NOW */
- /* some systems (OSF1 V5.0) have broken RTLD_GLOBAL linkage */
- #ifdef G_MODULE_BROKEN_RTLD_GLOBAL
- #undef	RTLD_GLOBAL
-+#undef	HAVE_RTLD_GLOBAL
- #endif /* G_MODULE_BROKEN_RTLD_GLOBAL */
--#ifndef	RTLD_GLOBAL
-+#ifndef	HAVE_RTLD_GLOBAL
- #define	RTLD_GLOBAL	0
- #endif	/* RTLD_GLOBAL */
- 
--- 
-2.11.0
-
diff --git a/recipes/glib/0018-Don-t-use-RTLD_DEFAULT-on-Android-for-g_module_self.patch b/recipes/glib/0018-Don-t-use-RTLD_DEFAULT-on-Android-for-g_module_self.patch
deleted file mode 100644
index 49d55088..00000000
--- a/recipes/glib/0018-Don-t-use-RTLD_DEFAULT-on-Android-for-g_module_self.patch
+++ /dev/null
@@ -1,66 +0,0 @@
-From 5b71ac916735c709edc9d5ea77d78721ddfad6f3 Mon Sep 17 00:00:00 2001
-From: =?UTF-8?q?Sebastian=20Dr=C3=B6ge?= <sebastian@centricular.com>
-Date: Wed, 8 Feb 2017 16:27:34 +0200
-Subject: [PATCH 2/2] =?UTF-8?q?gmodule=20=E2=80=93=20Don't=20use=20RTLD=5F?=
- =?UTF-8?q?DEFAULT=20on=20Android=20for=20g=5Fmodule=5Fself()=20on=20Andro?=
- =?UTF-8?q?id=2064=20bit?=
-MIME-Version: 1.0
-Content-Type: text/plain; charset=UTF-8
-Content-Transfer-Encoding: 8bit
-
-On 64 bit Android this is #defined to 0, which is considered an invalid
-library handle in all other cases. RTLD_DEFAULT is only supposed to be
-used with dlsym() it seems, and the usage here was just an
-"optimization" before.
-
-By dlopen'ing NULL, we get the same on all 64 bit Android variants and it
-actually works instead of erroring out. On 32 bit Android, dlopen() of
-NULL unfortunately usually gives us something useless that finds no
-symbols whatsoever.
-
-https://bugzilla.gnome.org/show_bug.cgi?id=776876
----
- gmodule/gmodule-dl.c | 18 +++++++++++++++---
- 1 file changed, 15 insertions(+), 3 deletions(-)
-
-diff --git a/gmodule/gmodule-dl.c b/gmodule/gmodule-dl.c
-index e452e3495..80ef80ceb 100644
---- a/gmodule/gmodule-dl.c
-+++ b/gmodule/gmodule-dl.c
-@@ -111,8 +111,14 @@ _g_module_self (void)
-   /* to query symbols from the program itself, special link options
-    * are required on some systems.
-    */
--  
--#ifdef __BIONIC__
-+
-+  /* On Android 32 bit (i.e. not __LP64__), dlopen(NULL)
-+   * does not work reliable and generally no symbols are found
-+   * at all. RTLD_DEFAULT works though.
-+   * On Android 64 bit, dlopen(NULL) seems to work but RTLD_DEFAULT
-+   * is NULL, which is considered an invalid module.
-+   */
-+#if defined(__BIONIC__) && !defined(__LP64__)
-   handle = RTLD_DEFAULT;
- #else
-   handle = dlopen (NULL, RTLD_GLOBAL | RTLD_LAZY);
-@@ -129,9 +135,15 @@ _g_module_close (gpointer handle,
- {
-   /* are there any systems out there that have dlopen()/dlclose()
-    * without a reference count implementation?
-+   *
-+   * See above for the Android special case
-    */
-+#if defined(__BIONIC__) && !defined(__LP64__)
-+  is_unref = (handle != RTLD_DEFAULT);
-+#else
-   is_unref |= 1;
--  
-+#endif
-+
-   if (is_unref)
-     {
-       if (dlclose (handle) != 0)
--- 
-2.11.0
-