glib: Update to 2.48.1

14 files changed, 64 insertions, 344 deletions

diff --git a/recipes/build-tools/glib-tools.recipe b/recipes/build-tools/glib-tools.recipe
index 547802c4..f77ac5c6 100644
--- a/recipes/build-tools/glib-tools.recipe
+++ b/recipes/build-tools/glib-tools.recipe
@@ -2,12 +2,13 @@
 
 class Recipe(recipe.Recipe):
     name = 'glib-tools'
-    version = '2.46.2'
+    version = '2.48.1'
     stype = SourceType.TARBALL
-    url = 'http://ftp.acc.umu.se/pub/GNOME/sources/glib/2.46/glib-%(version)s.tar.xz'
+    url = 'http://ftp.acc.umu.se/pub/GNOME/sources/glib/2.48/glib-%(version)s.tar.xz'
     tarball_dirname = 'glib-%(version)s'
     licenses = [License.LGPLv2Plus]
     config_sh = 'sh autogen.sh'
+    configure_options = '--with-pcre=internal'
     deps = ['libffi', 'zlib']
     can_use_configure_cache = False
     patches = ["../glib/0001-Let-user-disable-Cocoa-and-Carbon-support-on-demand.patch",
@@ -18,10 +19,7 @@ class Recipe(recipe.Recipe):
                "../glib/0006-giomodule-do-not-try-to-load-modules-from-gio-module.patch",
                "../glib/0008-gdbus-codgen-Use-a-proper-shebang-in-the-generator.patch",
                "../glib/0009-Unhide-_g_io_modules_ensure_extension_points_registe.patch",
-               '../glib/0014-Don-t-use-AT_FDCWD-on-iOS-for-now.patch',
-               '../glib/0015-Implementation-of-Cocoa-event-loop-integration-in-GM.patch',
-               '../glib/0016-gparamspecs-GTypes-are-stored-in-v_pointer-not-v_lon.patch',
-               '../glib/0030-Library-ctor-order.patch'
+               '../glib/0015-Implementation-of-Cocoa-event-loop-integration-in-GM.patch'
               ]
 
     def prepare(self):
diff --git a/recipes/glib.recipe b/recipes/glib.recipe
index df40d536..9fe93511 100644
--- a/recipes/glib.recipe
+++ b/recipes/glib.recipe
@@ -19,11 +19,12 @@ GLIB_CONFIG_UNVERSAL='''\
 
 class Recipe(recipe.Recipe):
     name = 'glib'
-    version = '2.46.2'
+    version = '2.48.1'
     stype = SourceType.TARBALL
-    url = 'http://ftp.acc.umu.se/pub/GNOME/sources/glib/2.46/glib-%(version)s.tar.xz'
+    url = 'http://ftp.acc.umu.se/pub/GNOME/sources/glib/2.48/glib-%(version)s.tar.xz'
     licenses = [License.LGPLv2Plus]
     config_sh = 'sh autogen.sh'
+    configure_options = '--with-pcre=internal'
     deps = ['libffi', 'zlib']
     can_use_configure_cache = False
     patches = ["glib/0001-Let-user-disable-Cocoa-and-Carbon-support-on-demand.patch",
@@ -34,10 +35,7 @@ class Recipe(recipe.Recipe):
                "glib/0006-giomodule-do-not-try-to-load-modules-from-gio-module.patch",
                "glib/0008-gdbus-codgen-Use-a-proper-shebang-in-the-generator.patch",
                "glib/0009-Unhide-_g_io_modules_ensure_extension_points_registe.patch",
-               'glib/0014-Don-t-use-AT_FDCWD-on-iOS-for-now.patch',
-               'glib/0015-Implementation-of-Cocoa-event-loop-integration-in-GM.patch',
-               'glib/0016-gparamspecs-GTypes-are-stored-in-v_pointer-not-v_lon.patch',
-               'glib/0030-Library-ctor-order.patch'
+               'glib/0015-Implementation-of-Cocoa-event-loop-integration-in-GM.patch'
               ]
 
     files_libs = [
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 ac37ea94..5d25dcdc 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,7 +1,7 @@
-From 0c96c0272ceb01f9a4041339dc656de3b89fb066 Mon Sep 17 00:00:00 2001
+From c2e0bbaa51758c9f1561db7069388f578e6eeb62 Mon Sep 17 00:00:00 2001
 From: Nirbheek Chauhan <nirbheek@centricular.com>
 Date: Thu, 13 Nov 2014 17:22:59 +0530
-Subject: [PATCH] Let user disable Cocoa and Carbon support on demand
+Subject: [PATCH 01/10] 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.
@@ -10,10 +10,10 @@ pkg-config file, etc.
  1 file changed, 45 insertions(+), 28 deletions(-)
 
 diff --git a/configure.ac b/configure.ac
-index f8b41e8..40e65c4 100644
+index 94c9de1..de42595 100644
 --- a/configure.ac
 +++ b/configure.ac
-@@ -169,32 +169,10 @@ AC_MSG_RESULT([$glib_native_android])
+@@ -172,32 +172,10 @@ AC_MSG_RESULT([$glib_native_android])
  
  AC_SUBST(LIB_EXE_MACHINE_FLAG)
  
@@ -46,7 +46,7 @@ index f8b41e8..40e65c4 100644
  
  AS_IF([test "$glib_native_win32" = "yes"], [
    AC_CHECK_TOOL(WINDRES, windres, no)
-@@ -211,19 +189,58 @@ AS_IF([test "$glib_native_win32" = "yes"], [
+@@ -214,19 +192,58 @@ AS_IF([test "$glib_native_win32" = "yes"], [
  ])
  AM_CONDITIONAL(MS_LIB_AVAILABLE, [test x$ms_librarian = xyes])
  
@@ -110,7 +110,7 @@ index f8b41e8..40e65c4 100644
    osx_version=`sw_vers -productVersion`
    osx_min_version="10.9.0"
    AC_MSG_CHECKING([OSX version >= $osx_min_version])
-@@ -232,7 +249,7 @@ AS_IF([test "x$glib_have_cocoa" = "xyes"], [
+@@ -235,7 +252,7 @@ AS_IF([test "x$glib_have_cocoa" = "xyes"], [
      AC_MSG_ERROR([OSX version is too old!])
    ])
    AC_MSG_RESULT([yes])
@@ -120,5 +120,5 @@ index f8b41e8..40e65c4 100644
  AC_SUBST([COCOA_LIBS])
  
 -- 
-2.6.1
+2.8.1
 
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 18e88358..54715adb 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,8 @@
-From 9de6088e011fb8b351cb5563d127cc29fcb8278a Mon Sep 17 00:00:00 2001
+From fbe70c34939822bb4574a87daa71d6925f2cd117 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 2/8] Optionally revert to the old (pre-2.28) URI handler code
+Subject: [PATCH 02/10] 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).
@@ -10,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 582a5dc..fbaacf1 100644
+index d65288d..fadcada 100644
 --- a/gio/gdesktopappinfo.c
 +++ b/gio/gdesktopappinfo.c
-@@ -4115,6 +4115,7 @@ g_app_info_get_default_for_type (const char *content_type,
+@@ -4082,6 +4082,7 @@ out:
  GAppInfo *
  g_app_info_get_default_for_uri_scheme (const char *uri_scheme)
  {
@@ -21,7 +22,7 @@ index 582a5dc..fbaacf1 100644
    GAppInfo *app_info;
    char *content_type, *scheme_down;
  
-@@ -4125,6 +4126,56 @@ g_app_info_get_default_for_uri_scheme (const char *uri_scheme)
+@@ -4092,6 +4093,56 @@ g_app_info_get_default_for_uri_scheme (const char *uri_scheme)
    g_free (content_type);
  
    return app_info;
@@ -79,5 +80,5 @@ index 582a5dc..fbaacf1 100644
  
  /* "Get all" API {{{2 */
 -- 
-2.1.0
+2.8.1
 
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 e5424d57..72a6baed 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,8 +1,8 @@
-From 84e9bda2599cf4a255cde4ffcad382da21eb8a61 Mon Sep 17 00:00:00 2001
+From 72cfa4e02c0644f80e9252db455e7657843c329d 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 3/8] Add support for loading GIO modules from the distro's GIO
- module path
+Subject: [PATCH 03/10] 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,12 +11,12 @@ 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 510f652..61173fb 100644
+index da7c167..b97aa78 100644
 --- a/gio/giomodule.c
 +++ b/gio/giomodule.c
-@@ -1050,6 +1050,11 @@ _g_io_modules_ensure_loaded (void)
- 
+@@ -1084,6 +1084,11 @@ _g_io_modules_ensure_loaded (void)
        g_io_modules_scan_all_in_directory_with_scope (module_dir, scope);
+       g_free (module_dir);
  
 +#ifdef GST_SDK_GLIB_GIO_DISTRO_GIO_MODULE_PATH
 +      /* Now load all modules from the distro, e.g. gvfs */
@@ -27,5 +27,5 @@ index 510f652..61173fb 100644
  
        /* Initialize types from built-in "modules" */
 -- 
-2.1.0
+2.8.1
 
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 782c6698..89f4b624 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 79921512ccf535a32c1ffb1a31ce9f6b56450af1 Mon Sep 17 00:00:00 2001
+From 47138b062f774ca52f160e8e90c4fe76821786f3 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 4/8] Allow for a second distro GIO module path as used on
+Subject: [PATCH 04/10] 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 61173fb..06bae56 100644
+index b97aa78..e17905d 100644
 --- a/gio/giomodule.c
 +++ b/gio/giomodule.c
-@@ -1055,6 +1055,11 @@ _g_io_modules_ensure_loaded (void)
+@@ -1089,6 +1089,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 61173fb..06bae56 100644
  
        /* Initialize types from built-in "modules" */
 -- 
-2.1.0
+2.8.1
 
diff --git a/recipes/glib/0005-Blacklist-the-bamf-GIO-module.patch b/recipes/glib/0005-Blacklist-the-bamf-GIO-module.patch
index 488124d3..abfdbc05 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 8e4363702a79166ad20ceb0136a2d8bfb18d4e91 Mon Sep 17 00:00:00 2001
+From 5b229f28dbba371b4ba2b5fbc94bb292bf999649 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 5/8] Blacklist the bamf GIO module
+Subject: [PATCH 05/10] 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 06bae56..4b3dccf 100644
+index e17905d..865ad74 100644
 --- a/gio/giomodule.c
 +++ b/gio/giomodule.c
-@@ -352,6 +352,13 @@ is_valid_module_name (const gchar        *basename,
+@@ -366,6 +366,13 @@ is_valid_module_name (const gchar        *basename,
  {
    gboolean result;
  
@@ -28,5 +28,5 @@ index 06bae56..4b3dccf 100644
    if (!g_str_has_prefix (basename, "lib") ||
        !g_str_has_suffix (basename, ".so"))
 -- 
-2.1.0
+2.8.1
 
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 03785a51..cd5bd886 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,8 +1,8 @@
-From 110d2d8150f8fc38b2219e0f31ceef838bd7fcdb Mon Sep 17 00:00:00 2001
+From 9b078a9131138bfe53a0885b407ae1bbadac1889 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 6/8] giomodule: do not try to load modules from gio-module-dir
- in IOS
+Subject: [PATCH 06/10] 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,19 +13,23 @@ 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 4b3dccf..4012b94 100644
+index 865ad74..278597a 100644
 --- a/gio/giomodule.c
 +++ b/gio/giomodule.c
-@@ -1055,7 +1055,9 @@ _g_io_modules_ensure_loaded (void)
-       if (module_dir == NULL)
-         module_dir = GIO_MODULE_DIR;
+@@ -1085,11 +1085,13 @@ _g_io_modules_ensure_loaded (void)
+ 	  g_strfreev (paths);
+ 	}
  
 +#ifndef GST_SDK_IOS
+       /* Then load the compiled in path */
+       module_dir = get_gio_module_dir ();
+ 
        g_io_modules_scan_all_in_directory_with_scope (module_dir, scope);
+       g_free (module_dir);
 +#endif
  
  #ifdef GST_SDK_GLIB_GIO_DISTRO_GIO_MODULE_PATH
        /* Now load all modules from the distro, e.g. gvfs */
 -- 
-2.1.0
+2.8.1
 
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
index 9f625c08..b7ccbecb 100644
--- 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
@@ -1,7 +1,7 @@
-From 2586072d15d012ae280386ebf4ec322b2957a7b2 Mon Sep 17 00:00:00 2001
+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 8/8] gdbus-codgen: Use a proper shebang in the generator
+Subject: [PATCH 07/10] gdbus-codgen: Use a proper shebang in the generator
 
 ---
  gio/gdbus-2.0/codegen/gdbus-codegen.in | 2 +-
@@ -18,5 +18,5 @@ index fd31a55..b9c7e19 100644
  # GDBus - GLib D-Bus Library
  #
 -- 
-2.1.0
+2.8.1
 
diff --git a/recipes/glib/0009-Unhide-_g_io_modules_ensure_extension_points_registe.patch b/recipes/glib/0009-Unhide-_g_io_modules_ensure_extension_points_registe.patch
index 6e4523cf..3c8043b7 100644
--- a/recipes/glib/0009-Unhide-_g_io_modules_ensure_extension_points_registe.patch
+++ b/recipes/glib/0009-Unhide-_g_io_modules_ensure_extension_points_registe.patch
@@ -1,7 +1,7 @@
-From a99b7d4d115dc350e4a577a15416e53029ead8e5 Mon Sep 17 00:00:00 2001
+From 9c05e795e9df3623a4d35bc009dd435c07aab503 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 9/9] Unhide _g_io_modules_ensure_extension_points_registered
+Subject: [PATCH 08/10] 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.1.0
+2.8.1
 
diff --git a/recipes/glib/0014-Don-t-use-AT_FDCWD-on-iOS-for-now.patch b/recipes/glib/0014-Don-t-use-AT_FDCWD-on-iOS-for-now.patch
deleted file mode 100644
index bee276c9..00000000
--- a/recipes/glib/0014-Don-t-use-AT_FDCWD-on-iOS-for-now.patch
+++ /dev/null
@@ -1,36 +0,0 @@
-From 5e1f1f1f7f5624debe6dc8ebdb155042d20fbc91 Mon Sep 17 00:00:00 2001
-From: =?UTF-8?q?Sebastian=20Dr=C3=B6ge?= <sebastian@centricular.com>
-Date: Fri, 9 Jan 2015 10:36:27 +0100
-Subject: [PATCH] Don't use AT_FDCWD on iOS for now
-
-https://bugzilla.gnome.org/show_bug.cgi?id=742097
----
- gio/glocalfile.c | 12 ++++++++++++
- 1 file changed, 12 insertions(+)
-
-diff --git a/gio/glocalfile.c b/gio/glocalfile.c
-index 846eedb..42bd557 100644
---- a/gio/glocalfile.c
-+++ b/gio/glocalfile.c
-@@ -87,6 +87,18 @@
- #endif
- #endif
- 
-+#ifdef __APPLE__
-+#include <TargetConditionals.h>
-+
-+/* AT_FDCWD is available since XCode 6.1 and cause linking failures
-+ * when linking an application later with older XCode versions
-+ */
-+#if defined(TARGET_OS_IPHONE) && defined(AT_FDCWD)
-+#undef AT_FDCWD
-+#endif
-+
-+#endif
-+
- 
- static void g_local_file_file_iface_init (GFileIface *iface);
- 
--- 
-2.1.4
-
diff --git a/recipes/glib/0015-Implementation-of-Cocoa-event-loop-integration-in-GM.patch b/recipes/glib/0015-Implementation-of-Cocoa-event-loop-integration-in-GM.patch
index d1fa6c5e..68714a7a 100644
--- a/recipes/glib/0015-Implementation-of-Cocoa-event-loop-integration-in-GM.patch
+++ b/recipes/glib/0015-Implementation-of-Cocoa-event-loop-integration-in-GM.patch
@@ -1,7 +1,7 @@
-From 9c9505f39bac91f514f5f0f8296c94d18b05489d Mon Sep 17 00:00:00 2001
+From 5ad93badab2ec54798e8e31ba25b056e6ef8045d 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 10/10] Implementation of Cocoa event loop integration in
  GMainContext
 
 ---
@@ -11,10 +11,10 @@ Subject: [PATCH] Implementation of Cocoa event loop integration in
  3 files changed, 988 insertions(+), 2 deletions(-)
 
 diff --git a/configure.ac b/configure.ac
-index 40e65c4..5736e0d 100644
+index de42595..00991c5 100644
 --- a/configure.ac
 +++ b/configure.ac
-@@ -239,7 +239,7 @@ AM_CONDITIONAL(OS_COCOA, [test "$glib_have_cocoa" = "yes"])
+@@ -242,7 +242,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])
@@ -24,7 +24,7 @@ index 40e65c4..5736e0d 100644
    osx_version=`sw_vers -productVersion`
    osx_min_version="10.9.0"
 diff --git a/glib/Makefile.am b/glib/Makefile.am
-index 2783b51..de06789 100644
+index d2295cb..a10bece 100644
 --- a/glib/Makefile.am
 +++ b/glib/Makefile.am
 @@ -44,6 +44,10 @@ AM_CPPFLAGS = 				\
@@ -48,7 +48,7 @@ index 2783b51..de06789 100644
  
  libglib_2_0_la_LDFLAGS = $(GLIB_LINK_FLAGS) \
 diff --git a/glib/gmain.c b/glib/gmain.c
-index 9b90100..8ab6a3e 100644
+index 29ccee0..b7db6c0 100644
 --- a/glib/gmain.c
 +++ b/glib/gmain.c
 @@ -71,6 +71,10 @@
@@ -1066,5 +1066,5 @@ index 9b90100..8ab6a3e 100644
 +
 +#endif
 -- 
-2.6.1
+2.8.1
 
diff --git a/recipes/glib/0016-gparamspecs-GTypes-are-stored-in-v_pointer-not-v_lon.patch b/recipes/glib/0016-gparamspecs-GTypes-are-stored-in-v_pointer-not-v_lon.patch
deleted file mode 100644
index 4acb026d..00000000
--- a/recipes/glib/0016-gparamspecs-GTypes-are-stored-in-v_pointer-not-v_lon.patch
+++ /dev/null
@@ -1,55 +0,0 @@
-From 34b13946942d7e9e7e05513e6a82547836adf5fd Mon Sep 17 00:00:00 2001
-From: =?UTF-8?q?Sebastian=20Dr=C3=B6ge?= <sebastian@centricular.com>
-Date: Thu, 14 Apr 2016 14:40:04 +0300
-Subject: [PATCH] gparamspecs: GTypes are stored in v_pointer, not v_long
-
-v_long is 32 bits on Win64, v_pointer is 64 bits. On most other platforms the
-size of long and pointer is the same, so it's usually not a problem.
-
-https://bugzilla.gnome.org/show_bug.cgi?id=758738
----
- gobject/gparamspecs.c | 10 +++++-----
- 1 file changed, 5 insertions(+), 5 deletions(-)
-
-diff --git a/gobject/gparamspecs.c b/gobject/gparamspecs.c
-index 16c1f55..43fc383 100644
---- a/gobject/gparamspecs.c
-+++ b/gobject/gparamspecs.c
-@@ -1067,7 +1067,7 @@ param_gtype_set_default (GParamSpec *pspec,
- {
-   GParamSpecGType *tspec = G_PARAM_SPEC_GTYPE (pspec);
- 
--  value->data[0].v_long = tspec->is_a_type;
-+  value->data[0].v_pointer = GSIZE_TO_POINTER (tspec->is_a_type);
- }
- 
- static gboolean
-@@ -1075,12 +1075,12 @@ param_gtype_validate (GParamSpec *pspec,
- 		      GValue     *value)
- {
-   GParamSpecGType *tspec = G_PARAM_SPEC_GTYPE (pspec);
--  GType gtype = value->data[0].v_long;
-+  GType gtype = GPOINTER_TO_SIZE (value->data[0].v_pointer);
-   guint changed = 0;
-   
-   if (tspec->is_a_type != G_TYPE_NONE && !g_type_is_a (gtype, tspec->is_a_type))
-     {
--      value->data[0].v_long = tspec->is_a_type;
-+      value->data[0].v_pointer = GSIZE_TO_POINTER (tspec->is_a_type);
-       changed++;
-     }
-   
-@@ -1092,8 +1092,8 @@ param_gtype_values_cmp (GParamSpec   *pspec,
- 			const GValue *value1,
- 			const GValue *value2)
- {
--  GType p1 = value1->data[0].v_long;
--  GType p2 = value2->data[0].v_long;
-+  GType p1 = GPOINTER_TO_SIZE (value1->data[0].v_pointer);
-+  GType p2 = GPOINTER_TO_SIZE (value2->data[0].v_pointer);
- 
-   /* not much to compare here, try to at least provide stable lesser/greater result */
- 
--- 
-2.8.0.rc3
-
diff --git a/recipes/glib/0030-Library-ctor-order.patch b/recipes/glib/0030-Library-ctor-order.patch
deleted file mode 100644
index ee89249c..00000000
--- a/recipes/glib/0030-Library-ctor-order.patch
+++ /dev/null
@@ -1,190 +0,0 @@
-From 1133ed82df5390a9426818e5097b83c4af6374a0 Mon Sep 17 00:00:00 2001
-From: Matthias Clasen <mclasen@redhat.com>
-Date: Tue, 6 Oct 2015 19:43:38 -0400
-Subject: [PATCH 1/4] Make glib_init safe to call more than once
-
-This will be needed to fix constructor order for non-GNU libc.
-
-https://bugzilla.gnome.org/show_bug.cgi?id=756139
----
- glib/glib-init.c | 7 +++++++
- 1 file changed, 7 insertions(+)
-
-diff --git a/glib/glib-init.c b/glib/glib-init.c
-index e7002e6..405e2ad 100644
---- a/glib/glib-init.c
-+++ b/glib/glib-init.c
-@@ -231,6 +231,13 @@ g_debug_init (void)
- static void
- glib_init (void)
- {
-+  static gboolean glib_inited;
-+
-+  if (glib_inited)
-+    return;
-+
-+  glib_inited = TRUE;
-+
-   g_messages_prefixed_init ();
-   g_debug_init ();
-   g_quark_init ();
--- 
-2.6.2
-
-From d9fab911ecf633ae1425eb4f4501d4896ceb161b Mon Sep 17 00:00:00 2001
-From: Matthias Clasen <mclasen@redhat.com>
-Date: Tue, 6 Oct 2015 19:45:38 -0400
-Subject: [PATCH 2/4] Export glib_init via GLIB_PRIVATE_CALL
-
-This will be used in the next commit to call glib_init from the
-gobject constructor, to ensure proper constructor ordering with
-non-GNU libc.
-
-https://bugzilla.gnome.org/show_bug.cgi?id=756139
----
- glib/glib-init.c    | 2 +-
- glib/glib-init.h    | 1 +
- glib/glib-private.c | 3 +++
- glib/glib-private.h | 3 +++
- 4 files changed, 8 insertions(+), 1 deletion(-)
-
-diff --git a/glib/glib-init.c b/glib/glib-init.c
-index 405e2ad..24fb627 100644
---- a/glib/glib-init.c
-+++ b/glib/glib-init.c
-@@ -228,7 +228,7 @@ g_debug_init (void)
-   g_mem_gc_friendly = flags & 1;
- }
- 
--static void
-+void
- glib_init (void)
- {
-   static gboolean glib_inited;
-diff --git a/glib/glib-init.h b/glib/glib-init.h
-index b56f7e2..e893d55 100644
---- a/glib/glib-init.h
-+++ b/glib/glib-init.h
-@@ -25,6 +25,7 @@
- extern GLogLevelFlags g_log_always_fatal;
- extern GLogLevelFlags g_log_msg_prefix;
- 
-+void glib_init (void);
- void g_quark_init (void);
- 
- #ifdef G_OS_WIN32
-diff --git a/glib/glib-private.c b/glib/glib-private.c
-index bbf879f..dd04e58 100644
---- a/glib/glib-private.c
-+++ b/glib/glib-private.c
-@@ -20,6 +20,7 @@
- #include "config.h"
- 
- #include "glib-private.h"
-+#include "glib-init.h"
- 
- /**
-  * glib__private__:
-@@ -32,6 +33,8 @@ GLibPrivateVTable *
- glib__private__ (void)
- {
-   static GLibPrivateVTable table = {
-+    glib_init,
-+
-     g_wakeup_new,
-     g_wakeup_free,
-     g_wakeup_get_pollfd,
-diff --git a/glib/glib-private.h b/glib/glib-private.h
-index 0a28008..198e07f 100644
---- a/glib/glib-private.h
-+++ b/glib/glib-private.h
-@@ -61,6 +61,9 @@ typedef struct {
-                                                          guint        flags);
-   GDir *                (* g_dir_new_from_dirp)         (gpointer dirp);
- 
-+  /* See glib-init.c */
-+  void                  (* glib_init)                   (void);
-+
-   /* Add other private functions here, initialize them in glib-private.c */
- } GLibPrivateVTable;
- 
--- 
-2.6.2
-
-From 490ae890ec857274d02980ba30bf6a2a1945b91c Mon Sep 17 00:00:00 2001
-From: Matthias Clasen <mclasen@redhat.com>
-Date: Tue, 6 Oct 2015 20:09:08 -0400
-Subject: [PATCH 3/4] Call glib_init from the gobject constructor
-
-We are using quarks in the gobject constructor, among other things,
-so we need to ensure that glib is being initialized first.
-
-https://bugzilla.gnome.org/show_bug.cgi?id=756139
----
- gobject/gtype.c | 6 ++++++
- 1 file changed, 6 insertions(+)
-
-diff --git a/gobject/gtype.c b/gobject/gtype.c
-index 6a0de28..7545079 100644
---- a/gobject/gtype.c
-+++ b/gobject/gtype.c
-@@ -31,6 +31,7 @@
- #include "gatomicarray.h"
- #include "gobject_trace.h"
- 
-+#include "glib-private.h"
- #include "gconstructor.h"
- 
- #ifdef G_OS_WIN32
-@@ -4371,6 +4372,11 @@ gobject_init (void)
-   TypeNode *node;
-   GType type;
- 
-+  /* Ensure GLib is initialized first, see
-+   * https://bugzilla.gnome.org/show_bug.cgi?id=756139
-+   */
-+  GLIB_PRIVATE_CALL (glib_init) ();
-+
-   G_WRITE_LOCK (&type_rw_lock);
- 
-   /* setup GObject library wide debugging flags */
--- 
-2.6.2
-
-From 97698d94cb35a3565cf5c3f59ffb1b856b90ed8d Mon Sep 17 00:00:00 2001
-From: Emmanuele Bassi <ebassi@gnome.org>
-Date: Thu, 8 Oct 2015 12:32:58 +0100
-Subject: [PATCH 4/4] Maintain the struct order when initializing
-
-Otherwise it'll break every GLIB_PRIVATE_CALL user.
----
- glib/glib-private.c | 6 +++---
- 1 file changed, 3 insertions(+), 3 deletions(-)
-
-diff --git a/glib/glib-private.c b/glib/glib-private.c
-index dd04e58..3dbf744 100644
---- a/glib/glib-private.c
-+++ b/glib/glib-private.c
-@@ -33,8 +33,6 @@ GLibPrivateVTable *
- glib__private__ (void)
- {
-   static GLibPrivateVTable table = {
--    glib_init,
--
-     g_wakeup_new,
-     g_wakeup_free,
-     g_wakeup_get_pollfd,
-@@ -47,7 +45,9 @@ glib__private__ (void)
-     g_main_context_new_with_next_id,
- 
-     g_dir_open_with_errno,
--    g_dir_new_from_dirp
-+    g_dir_new_from_dirp,
-+
-+    glib_init,
-   };
- 
-   return &table;
--- 
-2.6.2
-