[gnome-continuous-yocto/gnomeostree-3.28-rocko: 352/8267] glib-2.0: Upgrade 2.46.2 -> 2.48.1

[Emmanuele Bassi <ebassi src gnome org>]

commit 93e7f386bc463d80f491902a1cad2a5e730cd5a8
Author: Jussi Kukkonen <jussi kukkonen intel com>
Date:   Mon May 16 16:22:38 2016 +0300

    glib-2.0: Upgrade 2.46.2 -> 2.48.1
    
    * Remove now unnecessary readlink patches and
      ignore-format-nonliteral-warning.patch
    * Port relocate-modules.patch
    * Add ${datadir}/gettext/its to FILES_${PN}-dev: this could be done in
      gettext.bbclass but so far glib is the first and only ITS rule
      installer
    
    (From OE-Core rev: c99e920a344b29e053781008faa0328f416fdcc4)
    
    Signed-off-by: Jussi Kukkonen <jussi kukkonen intel com>
    Signed-off-by: Richard Purdie <richard purdie linuxfoundation org>

 ...c-Do-not-use-readlink-when-cross-compilin.patch |   31 ---------
 .../glib-2.0/glib-2.0-configure-readlink.patch     |   29 ---------
 .../ignore-format-nonliteral-warning.patch         |   39 ------------
 .../glib-2.0/glib-2.0/relocate-modules.patch       |   66 ++++++++++----------
 .../{glib-2.0_2.46.2.bb => glib-2.0_2.48.1.bb}     |    7 +--
 meta/recipes-core/glib-2.0/glib.inc                |    3 +-
 6 files changed, 36 insertions(+), 139 deletions(-)
---
diff --git a/meta/recipes-core/glib-2.0/glib-2.0/relocate-modules.patch 
b/meta/recipes-core/glib-2.0/glib-2.0/relocate-modules.patch
index f9e3f3d..65d5b43 100644
--- a/meta/recipes-core/glib-2.0/glib-2.0/relocate-modules.patch
+++ b/meta/recipes-core/glib-2.0/glib-2.0/relocate-modules.patch
@@ -6,44 +6,42 @@ This solves relocation problems with GIOModule for native builds of glib.
 Upstream-Status: Inappropriate
 Signed-off-by: Ross Burton <ross burton intel com>
 
+Port patch to 2.48
+Signed-off-by: Jussi Kukkonen <jussi kukkonen intel com>
+---
+ gio/giomodule.c | 12 +++++++++++-
+ 1 file changed, 11 insertions(+), 1 deletion(-)
+
 diff --git a/gio/giomodule.c b/gio/giomodule.c
-index 56c498c..a2e32b7 100644
+index da7c167..cc0bc7c 100644
 --- a/gio/giomodule.c
 +++ b/gio/giomodule.c
-@@ -47,6 +47,27 @@
- #include "gdesktopappinfo.h"
+@@ -40,6 +40,8 @@
+ #include "gnetworkmonitor.h"
+ #ifdef G_OS_WIN32
+ #include "gregistrysettingsbackend.h"
++#else
++#include <dlfcn.h>
  #endif
+ #include <glib/gstdio.h>
  
-+#include <dlfcn.h>
-+
-+/*
-+ * Generate a GIO module directory based on where glib is installed
-+ */
-+static const char *
-+_get_gio_module_dir (void)
-+{
-+  Dl_info info;
-+
-+  if (dladdr (g_io_module_new, &info)) {
-+    char *libdir = g_path_get_dirname (info.dli_fname);
-+    char *dir = g_build_filename (libdir, "gio", "modules", NULL);
-+    g_free (libdir);
-+    return dir;
-+  } else {
-+    return GIO_MODULE_DIR;
-+  }
-+}
-+
+@@ -1036,7 +1038,15 @@ get_gio_module_dir (void)
+ #endif
+       g_free (install_dir);
+ #else
+-      module_dir = g_strdup (GIO_MODULE_DIR);
++      Dl_info info;
 +
- /**
-  * SECTION:giomodule
-  * @short_description: Loadable GIO Modules
-@@ -1057,7 +1078,7 @@ _g_io_modules_ensure_loaded (void)
-       /* Then load the compiled in path */
-       module_dir = g_getenv ("GIO_MODULE_DIR");
-       if (module_dir == NULL)
--        module_dir = GIO_MODULE_DIR;
-+        module_dir = _get_gio_module_dir ();
- 
-       g_io_modules_scan_all_in_directory_with_scope (module_dir, scope);
++      if (dladdr (g_io_module_new, &info)) {
++        char *libdir = g_path_get_dirname (info.dli_fname);
++        module_dir = g_build_filename (libdir, "gio", "modules", NULL);
++        g_free (libdir);
++      } else {
++        module_dir = g_strdup (GIO_MODULE_DIR);
++      }
+ #endif
+     }
  
+-- 
+2.1.4
+
diff --git a/meta/recipes-core/glib-2.0/glib-2.0_2.46.2.bb b/meta/recipes-core/glib-2.0/glib-2.0_2.48.1.bb
similarity index 73%
rename from meta/recipes-core/glib-2.0/glib-2.0_2.46.2.bb
rename to meta/recipes-core/glib-2.0/glib-2.0_2.48.1.bb
index 9e95149..ef96ca1 100644
--- a/meta/recipes-core/glib-2.0/glib-2.0_2.46.2.bb
+++ b/meta/recipes-core/glib-2.0/glib-2.0_2.48.1.bb
@@ -7,17 +7,14 @@ SHRT_VER = "${@oe.utils.trim_version("${PV}", 2)}"
 SRC_URI = "${GNOME_MIRROR}/glib/${SHRT_VER}/glib-${PV}.tar.xz \
            file://configure-libtool.patch \
            file://fix-conflicting-rand.patch \
-           file://glib-2.0-configure-readlink.patch \
            file://run-ptest \
            file://ptest-paths.patch \
            file://uclibc_musl_translation.patch \
-           file://0001-configure.ac-Do-not-use-readlink-when-cross-compilin.patch \
            file://allow-run-media-sdX-drive-mount-if-username-root.patch \
            file://0001-Remove-the-warning-about-deprecated-paths-in-schemas.patch \
            file://Enable-more-tests-while-cross-compiling.patch \
            file://gi-exclude.patch \
            file://0001-Install-gio-querymodules-as-libexec_PROGRAM.patch \
-           file://ignore-format-nonliteral-warning.patch \
            file://0001-Do-not-ignore-return-value-of-write.patch \
            file://0002-tests-Ignore-y2k-warnings.patch \
            "
@@ -25,5 +22,5 @@ SRC_URI = "${GNOME_MIRROR}/glib/${SHRT_VER}/glib-${PV}.tar.xz \
 SRC_URI_append_class-native = " file://glib-gettextize-dir.patch \
                                 file://relocate-modules.patch"
 
-SRC_URI[md5sum] = "7f815d6e46df68e070cb421ed7f1139e"
-SRC_URI[sha256sum] = "5031722e37036719c1a09163cc6cf7c326e4c4f1f1e074b433c156862bd733db"
+SRC_URI[md5sum] = "67bd3b75c9f6d5587b457dc01cdcd5bb"
+SRC_URI[sha256sum] = "74411bff489cb2a3527bac743a51018841a56a4d896cc1e0d0d54f8166a14612"
diff --git a/meta/recipes-core/glib-2.0/glib.inc b/meta/recipes-core/glib-2.0/glib.inc
index e764fad..ddf5e40 100644
--- a/meta/recipes-core/glib-2.0/glib.inc
+++ b/meta/recipes-core/glib-2.0/glib.inc
@@ -59,7 +59,8 @@ FILES_${PN}-dev += "${libdir}/glib-2.0/include \
                     ${bindir}/glib-mkenums \
                     ${bindir}/glib-compile-resources \
                     ${datadir}/glib-2.0/gettext/po/Makefile.in.in \
-                    ${datadir}/glib-2.0/schemas/gschema.dtd"
+                    ${datadir}/glib-2.0/schemas/gschema.dtd \
+                    ${datadir}/gettext/its"
 FILES_${PN}-dbg += "${datadir}/glib-2.0/gdb ${datadir}/gdb"
 FILES_${PN}-codegen = "${datadir}/glib-2.0/codegen/*.py \
                        ${bindir}/gdbus-codegen"