summaryrefslogtreecommitdiffstats
path: root/meta/recipes-core
diff options
context:
space:
mode:
authorWang Xin <wangxin2015.fnst@cn.fujitsu.com>2016-08-17 23:15:01 -0400
committerRichard Purdie <richard.purdie@linuxfoundation.org>2016-08-20 16:06:03 +0100
commita2f9420358ac7f8e9addb053f3f62c5e40ad605b (patch)
tree307d620f1f24ab33500f7ccb195ec58141b8edf8 /meta/recipes-core
parente7ec6cf27c2e347e3354e2d70f1467a219c59888 (diff)
downloadpoky-a2f9420358ac7f8e9addb053f3f62c5e40ad605b.tar.gz
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. (From OE-Core rev: f5af2742003b06f117ba34683cefd168cc78b5a0) Signed-off-by: Wang Xin <wangxin2015.fnst@cn.fujitsu.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta/recipes-core')
-rw-r--r--meta/recipes-core/glib-2.0/glib-2.0/Enable-more-tests-while-cross-compiling.patch2
-rw-r--r--meta/recipes-core/glib-2.0/glib-2.0_2.48.2.bb (renamed from meta/recipes-core/glib-2.0/glib-2.0_2.48.1.bb)4
2 files changed, 3 insertions, 3 deletions
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 f1e688cacf..9b4ded14d5 100644
--- 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
46@@ -545,7 +548,6 @@ test.gresource: test.gresource.xml Makefile $(shell $(glib_compile_resources) -- 46@@ -545,7 +548,6 @@ test.gresource: test.gresource.xml Makefile $(shell $(glib_compile_resources) --
47 47
48 EXTRA_DIST += test.gresource.xml test1.txt test2.gresource.xml test2.txt test3.gresource.xml test3.txt test4.gresource.xml 48 EXTRA_DIST += test.gresource.xml test1.txt test2.gresource.xml test2.txt test3.gresource.xml test3.txt test4.gresource.xml
49 CLEANFILES += test_resources.c test_resources2.[ch] plugin_resources.c test.gresource 49 CLEANFILES += test-generated.txt test_resources.c test_resources2.[ch] plugin_resources.c test.gresource
50-endif # !CROSS_COMPILING 50-endif # !CROSS_COMPILING
51 51
52 BUILT_SOURCES += giotypefuncs.c 52 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
index ef96ca14e4..a45f644448 100644
--- 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 \
22SRC_URI_append_class-native = " file://glib-gettextize-dir.patch \ 22SRC_URI_append_class-native = " file://glib-gettextize-dir.patch \
23 file://relocate-modules.patch" 23 file://relocate-modules.patch"
24 24
25SRC_URI[md5sum] = "67bd3b75c9f6d5587b457dc01cdcd5bb" 25SRC_URI[md5sum] = "f4ac1aa2efd4f5798c37625ea697ac57"
26SRC_URI[sha256sum] = "74411bff489cb2a3527bac743a51018841a56a4d896cc1e0d0d54f8166a14612" 26SRC_URI[sha256sum] = "f25e751589cb1a58826eac24fbd4186cda4518af772806b666a3f91f66e6d3f4"