glib-2.0: 2.48.1 -> 2.48.2

1) Upgrade glib-2.0 from 2.48.1 to 2.48.2.
2) Modify Enable-more-tests-while-cross-compiling.patch, since the data has changed.

Signed-off-by: Wang Xin <wangxin2015.fnst@cn.fujitsu.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>

diff --git a/meta/recipes-core/glib-2.0/glib-2.0/Enable-more-tests-while-cross-compiling.patch b/meta/recipes-core/glib-2.0/glib-2.0/Enable-more-tests-while-cross-compiling.patch
index f1e688cacf86720d1996fe773a49406471cdbf5e..9b4ded14d58ec7a130a05730c45f99be1594ed74 100644 (file)
--- a/meta/recipes-core/glib-2.0/glib-2.0/Enable-more-tests-while-cross-compiling.patch
+++ b/meta/recipes-core/glib-2.0/glib-2.0/Enable-more-tests-while-cross-compiling.patch
@@ -46,7 +46,7 @@ index 868873f..533e454 100644
 @@ -545,7 +548,6 @@ test.gresource: test.gresource.xml Makefile $(shell $(glib_compile_resources) --
  
  EXTRA_DIST += test.gresource.xml test1.txt test2.gresource.xml test2.txt test3.gresource.xml test3.txt test4.gresource.xml
- CLEANFILES += test_resources.c test_resources2.[ch] plugin_resources.c test.gresource
+ CLEANFILES += test-generated.txt test_resources.c test_resources2.[ch] plugin_resources.c test.gresource
 -endif # !CROSS_COMPILING
  
  BUILT_SOURCES += giotypefuncs.c

diff --git a/meta/recipes-core/glib-2.0/glib-2.0_2.48.1.bb b/meta/recipes-core/glib-2.0/glib-2.0_2.48.2.bb
similarity index 87%
rename from meta/recipes-core/glib-2.0/glib-2.0_2.48.1.bb
rename to meta/recipes-core/glib-2.0/glib-2.0_2.48.2.bb
index ef96ca14e4602fef0a72fe101af965b6b5aa1360..a45f64444885b98900ebe2fe979a4d61cc6b3e71 100644 (file)
--- a/meta/recipes-core/glib-2.0/glib-2.0_2.48.1.bb
+++ b/meta/recipes-core/glib-2.0/glib-2.0_2.48.2.bb
@@ -22,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] = "67bd3b75c9f6d5587b457dc01cdcd5bb"
-SRC_URI[sha256sum] = "74411bff489cb2a3527bac743a51018841a56a4d896cc1e0d0d54f8166a14612"
+SRC_URI[md5sum] = "f4ac1aa2efd4f5798c37625ea697ac57"
+SRC_URI[sha256sum] = "f25e751589cb1a58826eac24fbd4186cda4518af772806b666a3f91f66e6d3f4"