recipes: Bump the GLib and glib-networking to 2.42

+ make use of %(version)s in the source URL

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

14 files changed, 60 insertions, 282 deletions

diff --git a/recipes/glib/0002-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 15ad5b3a..4db2a296 100644
--- a/recipes/glib/0002-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,16 +1,16 @@
-From a1a15efce96ee7107aecee2cdb850b9e189bfe43 Mon Sep 17 00:00:00 2001
+From dd6211bb891c51f78a49fe28e492401cda680731 Mon Sep 17 00:00:00 2001
 From: Thibault Saunier <thibault.saunier@collabora.com>
 Date: Fri, 25 Jan 2013 12:37:43 -0300
-Subject: [PATCH 02/11] Let user disable Cocoa and Carbon support on demand
+Subject: [PATCH 1/8] Let user disable Cocoa and Carbon support on demand
 
 Conflicts:
 	configure.ac
 ---
- configure.ac | 79 +++++++++++++++++++++++++++++++++++++++++-------------------
- 1 file changed, 54 insertions(+), 25 deletions(-)
+ configure.ac | 79 +++++++++++++++++++++++++++++++++++-------------------------
+ 1 file changed, 46 insertions(+), 33 deletions(-)
 
 diff --git a/configure.ac b/configure.ac
-index a01e58d..579d713 100644
+index a0237cb..d751ab4 100644
 --- a/configure.ac
 +++ b/configure.ac
 @@ -169,32 +169,10 @@ AC_MSG_RESULT([$glib_native_android])
@@ -46,21 +46,11 @@ index a01e58d..579d713 100644
  
  AS_IF([test "$glib_native_win32" = "yes"], [
    AC_CHECK_TOOL(WINDRES, windres, no)
-@@ -211,10 +189,61 @@ AS_IF([test "$glib_native_win32" = "yes"], [
+@@ -211,21 +189,56 @@ AS_IF([test "$glib_native_win32" = "yes"], [
  ])
  AM_CONDITIONAL(MS_LIB_AVAILABLE, [test x$ms_librarian = xyes])
  
 -AS_IF([test "x$glib_have_carbon" = "xyes"], [
-+if test "$glib_native_win32" != yes; then
-+    # libtool option to control which symbols are exported
-+    # right now, symbols starting with _ are not exported
-+    LIBTOOL_EXPORT_OPTIONS="-export-symbols-regex \^[_]?g.*"
-+else
-+    # We currently use .def files on Windows
-+    LIBTOOL_EXPORT_OPTIONS=
-+fi
-+AC_SUBST(LIBTOOL_EXPORT_OPTIONS)
-+
 +AC_ARG_ENABLE(carbon,
 +              [AC_HELP_STRING([--disable-carbon],
 +                              [disable Max OS X Carbon support])],,
@@ -82,17 +72,24 @@ index a01e58d..579d713 100644
 +
 +if test "x$glib_have_carbon" = "xyes"; then
    AC_DEFINE(HAVE_CARBON, 1, [define to 1 if Carbon is available])
--  LDFLAGS="$LDFLAGS -Wl,-framework,Carbon"
--])
+-  CARBON_LIBS="-Wl,-framework,Carbon"
+-  LDFLAGS="$LDFLAGS $CARBON_LIBS"
+-], [CARBON_LIBS=""])
 +  LDFLAGS="$LDFLAGS -Wl,-framework Carbon"
 +fi
-+
+ 
+-AC_SUBST([CARBON_LIBS])
 +dnl Check cocoa
 +AC_ARG_ENABLE(cocoa,
 +              [AC_HELP_STRING([--disable-cocoa],
 +                              [disable Max OS X Cocoa support])],,
 +              [enable_cocoa=yes])
-+
+ 
+-AS_IF([test "x$glib_have_cocoa" = "xyes"], [
+-  AC_DEFINE(HAVE_COCOA, 1, [define to 1 if Cocoa is available])
+-  COCOA_LIBS="-Wl,-framework,Foundation"
+-  LDFLAGS="$LDFLAGS $COCOA_LIBS"
+-], [COCOA_LIBS=""])
 +glib_have_cocoa=no
 +if test "x${enable_cocoa}" = "xyes"; then
 +  AC_MSG_RESULT([yes])
@@ -109,8 +106,14 @@ index a01e58d..579d713 100644
 +fi
 +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])
+-AC_SUBST([COCOA_LIBS])
++if test "x$glib_have_cocoa" = "xyes"; then
++  AC_DEFINE(HAVE_COCOA, 1, [define to 1 if Cocoa is available])
++  LDFLAGS="$LDFLAGS -Wl,-framework,Foundation"
++fi
+ 
+ dnl declare --enable-* args and collect ac_help strings
+ AC_ARG_ENABLE(debug,
 -- 
-1.9.0
+2.1.0
 
diff --git a/recipes/glib/0001-Unhide-_g_io_modules_ensure_extension_points_registe.patch b/recipes/glib/0001-Unhide-_g_io_modules_ensure_extension_points_registe.patch
deleted file mode 100644
index 24028872..00000000
--- a/recipes/glib/0001-Unhide-_g_io_modules_ensure_extension_points_registe.patch
+++ /dev/null
@@ -1,25 +0,0 @@
-From 1e910a5abb72b296370478f4a3cc392c4072ae1d 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 01/11] Unhide _g_io_modules_ensure_extension_points_registered
- for calling by gio modules
-
----
- gio/giomodule-priv.h | 1 +
- 1 file changed, 1 insertion(+)
-
-diff --git a/gio/giomodule-priv.h b/gio/giomodule-priv.h
-index 2a51055..cd89648 100644
---- a/gio/giomodule-priv.h
-+++ b/gio/giomodule-priv.h
-@@ -25,6 +25,7 @@
- 
- G_BEGIN_DECLS
- 
-+GLIB_AVAILABLE_IN_ALL
- void _g_io_modules_ensure_extension_points_registered (void);
- void _g_io_modules_ensure_loaded                      (void);
- 
--- 
-1.9.0
-
diff --git a/recipes/glib/0003-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 21d79cfa..18e88358 100644
--- a/recipes/glib/0003-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,8 +1,7 @@
-From 6059729c739662573bda47dc04fbb698400b05d9 Mon Sep 17 00:00:00 2001
+From 9de6088e011fb8b351cb5563d127cc29fcb8278a 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 03/11] Optionally revert to the old (pre-2.28) URI handler
- code
+Subject: [PATCH 2/8] Optionally revert to the old (pre-2.28) URI handler code
 
 This is required to work with the GVfs distributed on Linux distributions
 that ship with GLib 2.24 (e.g. Ubuntu Lucid and Debian Squeeze).
@@ -11,10 +10,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 0582b52..3f60a7a 100644
+index 582a5dc..fbaacf1 100644
 --- a/gio/gdesktopappinfo.c
 +++ b/gio/gdesktopappinfo.c
-@@ -3500,6 +3500,7 @@ g_app_info_get_default_for_type (const char *content_type,
+@@ -4115,6 +4115,7 @@ g_app_info_get_default_for_type (const char *content_type,
  GAppInfo *
  g_app_info_get_default_for_uri_scheme (const char *uri_scheme)
  {
@@ -22,7 +21,7 @@ index 0582b52..3f60a7a 100644
    GAppInfo *app_info;
    char *content_type, *scheme_down;
  
-@@ -3510,6 +3511,56 @@ g_app_info_get_default_for_uri_scheme (const char *uri_scheme)
+@@ -4125,6 +4126,56 @@ g_app_info_get_default_for_uri_scheme (const char *uri_scheme)
    g_free (content_type);
  
    return app_info;
@@ -80,5 +79,5 @@ index 0582b52..3f60a7a 100644
  
  /* "Get all" API {{{2 */
 -- 
-1.9.0
+2.1.0
 
diff --git a/recipes/glib/0004-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 f2cfab91..e5424d57 100644
--- a/recipes/glib/0004-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,8 +1,8 @@
-From 7eededaa8606187ce0fcbe32fd8a3e4bd76168d5 Mon Sep 17 00:00:00 2001
+From 84e9bda2599cf4a255cde4ffcad382da21eb8a61 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 04/11] Add support for loading GIO modules from the distro's
- GIO module path
+Subject: [PATCH 3/8] 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
 like giosrc are pretty useless and we really don't want to ship GVfs.
@@ -11,7 +11,7 @@ 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 18b7933..ed45f61 100644
+index 510f652..61173fb 100644
 --- a/gio/giomodule.c
 +++ b/gio/giomodule.c
 @@ -1050,6 +1050,11 @@ _g_io_modules_ensure_loaded (void)
@@ -27,5 +27,5 @@ index 18b7933..ed45f61 100644
  
        /* Initialize types from built-in "modules" */
 -- 
-1.9.0
+2.1.0
 
diff --git a/recipes/glib/0005-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 5481030f..782c6698 100644
--- a/recipes/glib/0005-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 3499b675a04e519b942bcfd6c660439f8e390e84 Mon Sep 17 00:00:00 2001
+From 79921512ccf535a32c1ffb1a31ce9f6b56450af1 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 05/11] Allow for a second distro GIO module path as used on
+Subject: [PATCH 4/8] Allow for a second distro GIO module path as used on
  Ubuntu
 
 ...because apparently only half of their packages are multi-arch
@@ -11,7 +11,7 @@ capable...
  1 file changed, 5 insertions(+)
 
 diff --git a/gio/giomodule.c b/gio/giomodule.c
-index ed45f61..a2401a1 100644
+index 61173fb..06bae56 100644
 --- a/gio/giomodule.c
 +++ b/gio/giomodule.c
 @@ -1055,6 +1055,11 @@ _g_io_modules_ensure_loaded (void)
@@ -27,5 +27,5 @@ index ed45f61..a2401a1 100644
  
        /* Initialize types from built-in "modules" */
 -- 
-1.9.0
+2.1.0
 
diff --git a/recipes/glib/0006-Blacklist-the-bamf-GIO-module.patch b/recipes/glib/0005-Blacklist-the-bamf-GIO-module.patch
index 4462a04d..488124d3 100644
--- a/recipes/glib/0006-Blacklist-the-bamf-GIO-module.patch
+++ b/recipes/glib/0005-Blacklist-the-bamf-GIO-module.patch
@@ -1,7 +1,7 @@
-From 20041dde79ec5346e4edf7d40e779d9c8f5d9c5d Mon Sep 17 00:00:00 2001
+From 8e4363702a79166ad20ceb0136a2d8bfb18d4e91 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 06/11] Blacklist the bamf GIO module
+Subject: [PATCH 5/8] Blacklist the bamf GIO module
 
 I uses Ubuntu specific GLib API on Ubuntu... and thus crashes
 everything that ever tries to use GIO.
@@ -10,7 +10,7 @@ everything that ever tries to use GIO.
  1 file changed, 7 insertions(+)
 
 diff --git a/gio/giomodule.c b/gio/giomodule.c
-index a2401a1..a790420 100644
+index 06bae56..4b3dccf 100644
 --- a/gio/giomodule.c
 +++ b/gio/giomodule.c
 @@ -352,6 +352,13 @@ is_valid_module_name (const gchar        *basename,
@@ -28,5 +28,5 @@ index a2401a1..a790420 100644
    if (!g_str_has_prefix (basename, "lib") ||
        !g_str_has_suffix (basename, ".so"))
 -- 
-1.9.0
+2.1.0
 
diff --git a/recipes/glib/0007-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 d3785589..03785a51 100644
--- a/recipes/glib/0007-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,8 +1,8 @@
-From c43c2c8e98a2335241cdeeb88ae375bb30fc8234 Mon Sep 17 00:00:00 2001
+From 110d2d8150f8fc38b2219e0f31ceef838bd7fcdb 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 07/11] giomodule: do not try to load modules from
- gio-module-dir in IOS
+Subject: [PATCH 6/8] 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
 device it gets ignored because the path doesn't exist. When it tries
@@ -13,7 +13,7 @@ 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 a790420..898ff2f 100644
+index 4b3dccf..4012b94 100644
 --- a/gio/giomodule.c
 +++ b/gio/giomodule.c
 @@ -1055,7 +1055,9 @@ _g_io_modules_ensure_loaded (void)
@@ -27,5 +27,5 @@ index a790420..898ff2f 100644
  #ifdef GST_SDK_GLIB_GIO_DISTRO_GIO_MODULE_PATH
        /* Now load all modules from the distro, e.g. gvfs */
 -- 
-1.9.0
+2.1.0
 
diff --git a/recipes/glib/0008-configure-fix-link-with-Carbon-framework.patch b/recipes/glib/0007-configure-fix-link-with-Carbon-framework.patch
index a9a985e6..45fec087 100644
--- a/recipes/glib/0008-configure-fix-link-with-Carbon-framework.patch
+++ b/recipes/glib/0007-configure-fix-link-with-Carbon-framework.patch
@@ -1,17 +1,17 @@
-From 180e757d61b1f98e5307849641685d2185ceeaa2 Mon Sep 17 00:00:00 2001
+From 011a0d4b781327150f9a5f9b838e27a0a991a855 Mon Sep 17 00:00:00 2001
 From: Andoni Morales Alastruey <ylatuya@gmail.com>
 Date: Mon, 28 Oct 2013 12:19:00 +0100
-Subject: [PATCH 08/11] configure: fix link with Carbon framework
+Subject: [PATCH 7/8] configure: fix link with Carbon framework
 
 ---
  configure.ac | 2 +-
  1 file changed, 1 insertion(+), 1 deletion(-)
 
 diff --git a/configure.ac b/configure.ac
-index 579d713..1ce2ba6 100644
+index d751ab4..49cdd66 100644
 --- a/configure.ac
 +++ b/configure.ac
-@@ -220,7 +220,7 @@ AM_CONDITIONAL(OS_CARBON, [test "$glib_have_carbon" = "yes"])
+@@ -210,7 +210,7 @@ AM_CONDITIONAL(OS_CARBON, [test "$glib_have_carbon" = "yes"])
  
  if test "x$glib_have_carbon" = "xyes"; then
    AC_DEFINE(HAVE_CARBON, 1, [define to 1 if Carbon is available])
@@ -21,5 +21,5 @@ index 579d713..1ce2ba6 100644
  
  dnl Check cocoa
 -- 
-1.9.0
+2.1.0
 
diff --git a/recipes/glib/0001-gdbus-codgen-Use-a-proper-shebang-in-the-generator.patch b/recipes/glib/0008-gdbus-codgen-Use-a-proper-shebang-in-the-generator.patch
index ed0e0fc1..9f625c08 100644
--- a/recipes/glib/0001-gdbus-codgen-Use-a-proper-shebang-in-the-generator.patch
+++ b/recipes/glib/0008-gdbus-codgen-Use-a-proper-shebang-in-the-generator.patch
@@ -1,14 +1,14 @@
-From d88282e48bd9496fcee01900ea57279bed9bf68b Mon Sep 17 00:00:00 2001
+From 2586072d15d012ae280386ebf4ec322b2957a7b2 Mon Sep 17 00:00:00 2001
 From: Thibault Saunier <tsaunier@gnome.org>
 Date: Wed, 2 Apr 2014 19:41:59 +0200
-Subject: [PATCH] gdbus-codgen: Use a proper shebang in the generator
+Subject: [PATCH 8/8] gdbus-codgen: Use a proper shebang in the generator
 
 ---
- gio/gdbus-2.0/codegen/gdbus-codegen.in |    2 +-
+ 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 253d151..21e61b1 100644
+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 @@
@@ -18,5 +18,5 @@ index 253d151..21e61b1 100644
  # GDBus - GLib D-Bus Library
  #
 -- 
-1.7.10.4
+2.1.0
 
diff --git a/recipes/glib/0009-socketclient-Fix-leak.patch b/recipes/glib/0009-socketclient-Fix-leak.patch
deleted file mode 100644
index 4ac16f0c..00000000
--- a/recipes/glib/0009-socketclient-Fix-leak.patch
+++ /dev/null
@@ -1,29 +0,0 @@
-From 14bb9538ca0274eb93b08bcd945e91e930cd7a30 Mon Sep 17 00:00:00 2001
-From: =?UTF-8?q?Olivier=20Cr=C3=AAte?= <olivier.crete@collabora.com>
-Date: Mon, 17 Mar 2014 23:50:30 -0400
-Subject: [PATCH 09/11] socketclient: Fix leak
-
-https://bugzilla.gnome.org/show_bug.cgi?id=726611
----
- gio/gsocketclient.c | 5 ++++-
- 1 file changed, 4 insertions(+), 1 deletion(-)
-
-diff --git a/gio/gsocketclient.c b/gio/gsocketclient.c
-index 61c55ca..382b6b6 100644
---- a/gio/gsocketclient.c
-+++ b/gio/gsocketclient.c
-@@ -1574,7 +1574,10 @@ g_socket_client_enumerator_callback (GObject      *object,
-   GError *error = NULL;
- 
-   if (g_task_return_error_if_cancelled (data->task))
--    return;
-+    {
-+      g_object_unref (data->task);
-+      return;
-+    }
- 
-   address = g_socket_address_enumerator_next_finish (data->enumerator,
- 						     result, &error);
--- 
-1.9.0
-
diff --git a/recipes/glib/0010-gio-fix-two-more-g_task_return_error_if_cancelled-le.patch b/recipes/glib/0010-gio-fix-two-more-g_task_return_error_if_cancelled-le.patch
deleted file mode 100644
index 639d29ea..00000000
--- a/recipes/glib/0010-gio-fix-two-more-g_task_return_error_if_cancelled-le.patch
+++ /dev/null
@@ -1,47 +0,0 @@
-From 59f8d3884f75f3e158d3aa1a5028e9ea4a896025 Mon Sep 17 00:00:00 2001
-From: Dan Winship <danw@gnome.org>
-Date: Tue, 18 Mar 2014 09:56:23 -0400
-Subject: [PATCH 10/11] gio: fix two more g_task_return_error_if_cancelled()
- leaks
-
-https://bugzilla.gnome.org/show_bug.cgi?id=726611
----
- gio/gunixmount.c  | 5 ++++-
- gio/gunixvolume.c | 5 ++++-
- 2 files changed, 8 insertions(+), 2 deletions(-)
-
-diff --git a/gio/gunixmount.c b/gio/gunixmount.c
-index a42614f..2ec8e5c 100644
---- a/gio/gunixmount.c
-+++ b/gio/gunixmount.c
-@@ -283,7 +283,10 @@ eject_unmount_do_cb (gpointer user_data)
-   argv = g_task_get_task_data (task);
- 
-   if (g_task_return_error_if_cancelled (task))
--    return G_SOURCE_REMOVE;
-+    {
-+      g_object_unref (task);
-+      return G_SOURCE_REMOVE;
-+    }
- 
-   subprocess = g_subprocess_newv (argv, G_SUBPROCESS_FLAGS_STDOUT_SILENCE | G_SUBPROCESS_FLAGS_STDERR_PIPE, &error);
-   g_assert_no_error (error);
-diff --git a/gio/gunixvolume.c b/gio/gunixvolume.c
-index 1c12505..981f703 100644
---- a/gio/gunixvolume.c
-+++ b/gio/gunixvolume.c
-@@ -309,7 +309,10 @@ eject_mount_do (GVolume              *volume,
-   task = g_task_new (volume, cancellable, callback, user_data);
- 
-   if (g_task_return_error_if_cancelled (task))
--    return;
-+    {
-+      g_object_unref (task);
-+      return;
-+    }
- 
-   subprocess = g_subprocess_newv (argv, G_SUBPROCESS_FLAGS_STDOUT_SILENCE | G_SUBPROCESS_FLAGS_STDERR_PIPE, &error);
-   g_assert_no_error (error);
--- 
-1.9.0
-
diff --git a/recipes/glib/0011-networkmonitornetlink-IN6_IS_ADDR_MC_LINKLOCAL-is-on.patch b/recipes/glib/0011-networkmonitornetlink-IN6_IS_ADDR_MC_LINKLOCAL-is-on.patch
deleted file mode 100644
index 4c9f0d21..00000000
--- a/recipes/glib/0011-networkmonitornetlink-IN6_IS_ADDR_MC_LINKLOCAL-is-on.patch
+++ /dev/null
@@ -1,33 +0,0 @@
-From 40b6d210f0bf61da4c79bffab191cfdb9e8afa52 Mon Sep 17 00:00:00 2001
-From: =?UTF-8?q?Olivier=20Cr=C3=AAte?= <olivier.crete@collabora.com>
-Date: Wed, 26 Mar 2014 19:45:52 -0400
-Subject: [PATCH 11/11] networkmonitornetlink: IN6_IS_ADDR_MC_LINKLOCAL is only
- guaranteed to work on struct in6_addr*
-
-https://bugzilla.gnome.org/show_bug.cgi?id=727119
----
- gio/gnetworkmonitornetlink.c | 5 ++++-
- 1 file changed, 4 insertions(+), 1 deletion(-)
-
-diff --git a/gio/gnetworkmonitornetlink.c b/gio/gnetworkmonitornetlink.c
-index fd916b3..21a7ad5 100644
---- a/gio/gnetworkmonitornetlink.c
-+++ b/gio/gnetworkmonitornetlink.c
-@@ -382,10 +382,13 @@ read_netlink_messages (GSocket      *socket,
-                * IPv6 link-local multicast routes, which are added and
-                * removed all the time for some reason.
-                */
-+#define UNALIGNED_IN6_IS_ADDR_MC_LINKLOCAL(a)           \
-+              ((a[0] == 0xff) && ((a[1] & 0xf) == 0x2))
-+
-               if (!nl->priv->dump_networks &&
-                   rtmsg->rtm_family == AF_INET6 &&
-                   rtmsg->rtm_dst_len != 0 &&
--                  IN6_IS_ADDR_MC_LINKLOCAL (dest))
-+                  UNALIGNED_IN6_IS_ADDR_MC_LINKLOCAL (dest))
-                 continue;
- 
-               if (msg->nlmsg_type == RTM_NEWROUTE)
--- 
-1.9.0
-
diff --git a/recipes/glib/0012-gutils-Don-t-use-issetugid-on-Android.patch b/recipes/glib/0012-gutils-Don-t-use-issetugid-on-Android.patch
deleted file mode 100644
index be8544f3..00000000
--- a/recipes/glib/0012-gutils-Don-t-use-issetugid-on-Android.patch
+++ /dev/null
@@ -1,37 +0,0 @@
-From 012717f32c16596246d12fd70b26a58153ecaea5 Mon Sep 17 00:00:00 2001
-From: =?UTF-8?q?Sebastian=20Dr=C3=B6ge?= <sebastian@centricular.com>
-Date: Tue, 9 Sep 2014 20:18:20 +0200
-Subject: [PATCH] gutils: Don't use issetugid() on Android
-
-Android had it in older versions but the new 64 bit ABI does not
-have it anymore, and some versions of the 32 bit ABI neither.
-
-https://code.google.com/p/android-developer-preview/issues/detail?id=168
-
-https://bugzilla.gnome.org/show_bug.cgi?id=736351
----
- glib/gutils.c | 7 ++++++-
- 1 file changed, 6 insertions(+), 1 deletion(-)
-
-diff --git a/glib/gutils.c b/glib/gutils.c
-index 8fd045a..e229d0d 100644
---- a/glib/gutils.c
-+++ b/glib/gutils.c
-@@ -2330,8 +2330,13 @@ g_check_setuid (void)
-     extern int __libc_enable_secure;
-     return __libc_enable_secure;
-   }
--#elif defined(HAVE_ISSETUGID)
-+#elif defined(HAVE_ISSETUGID) && !defined(__BIONIC__)
-   /* BSD: http://www.freebsd.org/cgi/man.cgi?query=issetugid&sektion=2 */
-+
-+  /* Android had it in older versions but the new 64 bit ABI does not
-+   * have it anymore, and some versions of the 32 bit ABI neither.
-+   * https://code.google.com/p/android-developer-preview/issues/detail?id=168
-+   */
-   return issetugid ();
- #elif defined(G_OS_UNIX)
-   uid_t ruid, euid, suid; /* Real, effective and saved user ID's */
--- 
-2.1.0
-
diff --git a/recipes/glib/0013-grand-Only-use-rand_s-when-targetting-Visual-Studio-.patch b/recipes/glib/0013-grand-Only-use-rand_s-when-targetting-Visual-Studio-.patch
deleted file mode 100644
index ff379061..00000000
--- a/recipes/glib/0013-grand-Only-use-rand_s-when-targetting-Visual-Studio-.patch
+++ /dev/null
@@ -1,53 +0,0 @@
-From b3fbeb704191d96ab3305dcde281b5c4c442cd0d Mon Sep 17 00:00:00 2001
-From: =?UTF-8?q?Sebastian=20Dr=C3=B6ge?= <sebastian@centricular.com>
-Date: Sat, 13 Sep 2014 16:31:03 +0300
-Subject: [PATCH] grand: Only use rand_s() when targetting Visual Studio >=
- 2005
-
-It did not exist before. Fall back to the current time plus
-process id on older targets. This makes GLib work again on
-Windows XP.
-
-https://bugzilla.gnome.org/show_bug.cgi?id=736458
----
- glib/grand.c | 13 +++++++++++++
- 1 file changed, 13 insertions(+)
-
-diff --git a/glib/grand.c b/glib/grand.c
-index 6262cd2..78a7708 100644
---- a/glib/grand.c
-+++ b/glib/grand.c
-@@ -56,6 +56,7 @@
- 
- #ifdef G_OS_WIN32
- #include <stdlib.h>
-+#include <process.h> /* For getpid() */
- #endif
- 
- /**
-@@ -261,10 +262,22 @@ g_rand_new (void)
-       seed[3] = getppid ();
-     }
- #else /* G_OS_WIN32 */
-+  /* rand_s() is only available since Visual Studio 2005 */
-+#if defined(_MSC_VER) && _MSC_VER >= 1400
-   gint i;
- 
-   for (i = 0; i < G_N_ELEMENTS (seed); i++)
-     rand_s (&seed[i]);
-+#else
-+  GTimeVal now;
-+
-+  g_get_current_time (&now);
-+  seed[0] = now.tv_sec;
-+  seed[1] = now.tv_usec;
-+  seed[2] = getpid ();
-+  seed[3] = 0;
-+#endif
-+
- #endif
- 
-   return g_rand_new_with_seed_array (seed, 4);
--- 
-2.1.0
-