diff options
| author |   Alexander Kanavin <alexander.kanavin@linux.intel.com> | 2016-01-22 16:03:31 +0200 |
|---|---|---|
| committer |   Richard Purdie <richard.purdie@linuxfoundation.org> | 2016-01-26 22:47:09 +0000 |
| commit | de83a71d416a51caf5b8b0db9c9102689b2cce8b (patch) | |
| tree | 6f7c9fe3e123036e581b0d7a9e71e5d0cd1dc524 /meta/recipes-core/glib-2.0 | |
| parent | 0a6b3b9ae0028918f60df9e0cfd487ba833bac2b (diff) | |
| download | openembedded-core-de83a71d416a51caf5b8b0db9c9102689b2cce8b.tar.gz | |
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
Signed-off-by: Alexander Kanavin <alexander.kanavin@linux.intel.com>
Signed-off-by: Ross Burton <ross.burton@intel.com>
Diffstat (limited to 'meta/recipes-core/glib-2.0')
| -rw-r--r-- | meta/recipes-core/glib-2.0/glib-2.0/0001-gio-tests-Don-t-depend-on-a-data-file-that-s-not-bui.patch | 38 | ||||
| -rw-r--r-- | meta/recipes-core/glib-2.0/glib-2.0_2.46.2.bb (renamed from meta/recipes-core/glib-2.0/glib-2.0_2.46.1.bb) | 5 |
2 files changed, 2 insertions, 41 deletions
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 <jussi.kukkonen@intel.com> -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 <jussi.kukkonen@intel.com> -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.2.bb index 937ae651e2..79643c74cb 100644 --- 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.2.bb @@ -15,11 +15,10 @@ SRC_URI = "${GNOME_MIRROR}/glib/${SHRT_VER}/glib-${PV}.tar.xz \ 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" +SRC_URI[md5sum] = "7f815d6e46df68e070cb421ed7f1139e" +SRC_URI[sha256sum] = "5031722e37036719c1a09163cc6cf7c326e4c4f1f1e074b433c156862bd733db" |