From 9c84fbc97230990f8764ab62449724a67b624b24 Mon Sep 17 00:00:00 2001 From: Alexander Kanavin Date: Fri, 22 Jan 2016 16:03:31 +0200 Subject: glib-2.0: update to 2.46.2 Drop backported 0001-gio-tests-Don-t-depend-on-a-data-file-that-s-not-bui.patch (From OE-Core rev: de83a71d416a51caf5b8b0db9c9102689b2cce8b) Signed-off-by: Alexander Kanavin Signed-off-by: Ross Burton Signed-off-by: Richard Purdie --- ...on-t-depend-on-a-data-file-that-s-not-bui.patch | 38 ---------------------- meta/recipes-core/glib-2.0/glib-2.0_2.46.1.bb | 25 -------------- meta/recipes-core/glib-2.0/glib-2.0_2.46.2.bb | 24 ++++++++++++++ 3 files changed, 24 insertions(+), 63 deletions(-) delete mode 100644 meta/recipes-core/glib-2.0/glib-2.0/0001-gio-tests-Don-t-depend-on-a-data-file-that-s-not-bui.patch delete mode 100644 meta/recipes-core/glib-2.0/glib-2.0_2.46.1.bb create mode 100644 meta/recipes-core/glib-2.0/glib-2.0_2.46.2.bb (limited to 'meta/recipes-core/glib-2.0') diff --git a/meta/recipes-core/glib-2.0/glib-2.0/0001-gio-tests-Don-t-depend-on-a-data-file-that-s-not-bui.patch b/meta/recipes-core/glib-2.0/glib-2.0/0001-gio-tests-Don-t-depend-on-a-data-file-that-s-not-bui.patch deleted file mode 100644 index 5f3fef0086..0000000000 --- a/meta/recipes-core/glib-2.0/glib-2.0/0001-gio-tests-Don-t-depend-on-a-data-file-that-s-not-bui.patch +++ /dev/null @@ -1,38 +0,0 @@ -From 99dabcb02e2b3f90a12d17a9995752fcae57b522 Mon Sep 17 00:00:00 2001 -From: Jussi Kukkonen -Date: Thu, 5 Nov 2015 11:08:32 +0200 -Subject: [PATCH] gio/tests: Don't depend on a data file that's not built - -data.gresource is not built when cross-compiling: Don't -add it to test_data in that case. - -Signed-off-by: Jussi Kukkonen -Upstream-Status: Backport [https://bugzilla.gnome.org/show_bug.cgi?id=757628] ---- - gio/tests/Makefile.am | 3 ++- - 1 file changed, 2 insertions(+), 1 deletion(-) - -diff --git a/gio/tests/Makefile.am b/gio/tests/Makefile.am -index 894cf43..cc7deb3 100644 ---- a/gio/tests/Makefile.am -+++ b/gio/tests/Makefile.am -@@ -76,7 +76,6 @@ dist_test_data = \ - $(NULL) - - test_data = \ -- test.gresource \ - $(NULL) - - uninstalled_test_extra_programs = \ -@@ -520,6 +519,8 @@ libresourceplugin_la_SOURCES = resourceplugin.c plugin_resources.c - libresourceplugin_la_LDFLAGS = -avoid-version -module -export-dynamic $(no_undefined) - libresourceplugin_la_LIBADD = $(LDADD) - -+test_data += test.gresource -+ - # libtool contains a bug whereby the created .la file doesn't contain the correct dlname='' in the case that - # you're building a library but not installing it. This is apparently because the only considered use for an - # uninstalled library is as a convenience library for linking (despite the fact that we give -module). The lack --- -2.6.2 - diff --git a/meta/recipes-core/glib-2.0/glib-2.0_2.46.1.bb b/meta/recipes-core/glib-2.0/glib-2.0_2.46.1.bb deleted file mode 100644 index 937ae651e2..0000000000 --- a/meta/recipes-core/glib-2.0/glib-2.0_2.46.1.bb +++ /dev/null @@ -1,25 +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://add-march-i486-into-CFLAGS-automatically.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://0001-gio-tests-Don-t-depend-on-a-data-file-that-s-not-bui.patch \ - file://Enable-more-tests-while-cross-compiling.patch \ - " - -SRC_URI_append_class-native = " file://glib-gettextize-dir.patch" - -SRC_URI[md5sum] = "c90e93ceb45100ffc1d40ec5d2ca3248" -SRC_URI[sha256sum] = "5a1f03b952ebc3a7e9f612b8724f70898183e31503db329b4f15d07163c8fdfb" 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.46.2.bb new file mode 100644 index 0000000000..79643c74cb --- /dev/null +++ b/meta/recipes-core/glib-2.0/glib-2.0_2.46.2.bb @@ -0,0 +1,24 @@ +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://add-march-i486-into-CFLAGS-automatically.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 \ + " + +SRC_URI_append_class-native = " file://glib-gettextize-dir.patch" + +SRC_URI[md5sum] = "7f815d6e46df68e070cb421ed7f1139e" +SRC_URI[sha256sum] = "5031722e37036719c1a09163cc6cf7c326e4c4f1f1e074b433c156862bd733db" -- cgit v1.2.3-54-g00ecf