From f5af2742003b06f117ba34683cefd168cc78b5a0 Mon Sep 17 00:00:00 2001 From: Wang Xin Date: Wed, 17 Aug 2016 23:15:01 -0400 Subject: 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 Signed-off-by: Richard Purdie --- .../Enable-more-tests-while-cross-compiling.patch | 2 +- meta/recipes-core/glib-2.0/glib-2.0_2.48.1.bb | 26 ---------------------- meta/recipes-core/glib-2.0/glib-2.0_2.48.2.bb | 26 ++++++++++++++++++++++ 3 files changed, 27 insertions(+), 27 deletions(-) delete mode 100644 meta/recipes-core/glib-2.0/glib-2.0_2.48.1.bb create mode 100644 meta/recipes-core/glib-2.0/glib-2.0_2.48.2.bb (limited to 'meta/recipes-core/glib-2.0') 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 @@ -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.1.bb deleted file mode 100644 index ef96ca14e4..0000000000 --- a/meta/recipes-core/glib-2.0/glib-2.0_2.48.1.bb +++ /dev/null @@ -1,26 +0,0 @@ -require glib.inc - -PE = "1" - -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://run-ptest \ - file://ptest-paths.patch \ - file://uclibc_musl_translation.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://0001-Do-not-ignore-return-value-of-write.patch \ - file://0002-tests-Ignore-y2k-warnings.patch \ - " - -SRC_URI_append_class-native = " file://glib-gettextize-dir.patch \ - file://relocate-modules.patch" - -SRC_URI[md5sum] = "67bd3b75c9f6d5587b457dc01cdcd5bb" -SRC_URI[sha256sum] = "74411bff489cb2a3527bac743a51018841a56a4d896cc1e0d0d54f8166a14612" diff --git a/meta/recipes-core/glib-2.0/glib-2.0_2.48.2.bb b/meta/recipes-core/glib-2.0/glib-2.0_2.48.2.bb new file mode 100644 index 0000000000..a45f644448 --- /dev/null +++ b/meta/recipes-core/glib-2.0/glib-2.0_2.48.2.bb @@ -0,0 +1,26 @@ +require glib.inc + +PE = "1" + +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://run-ptest \ + file://ptest-paths.patch \ + file://uclibc_musl_translation.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://0001-Do-not-ignore-return-value-of-write.patch \ + file://0002-tests-Ignore-y2k-warnings.patch \ + " + +SRC_URI_append_class-native = " file://glib-gettextize-dir.patch \ + file://relocate-modules.patch" + +SRC_URI[md5sum] = "f4ac1aa2efd4f5798c37625ea697ac57" +SRC_URI[sha256sum] = "f25e751589cb1a58826eac24fbd4186cda4518af772806b666a3f91f66e6d3f4" -- cgit 1.2.3-korg