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:49:39 +0000 |
commit | 9c84fbc97230990f8764ab62449724a67b624b24 (patch) | |
tree | 14db9a4d93c1fabdaf4efc2138d78d3fa19f20c5 /meta/recipes-core | |
parent | bd7278cc3b4df09e86d073d6056c39ea50da863d (diff) | |
download | poky-9c84fbc97230990f8764ab62449724a67b624b24.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
(From OE-Core rev: de83a71d416a51caf5b8b0db9c9102689b2cce8b)
Signed-off-by: Alexander Kanavin <alexander.kanavin@linux.intel.com>
Signed-off-by: Ross Burton <ross.burton@intel.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/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 @@ | |||
1 | From 99dabcb02e2b3f90a12d17a9995752fcae57b522 Mon Sep 17 00:00:00 2001 | ||
2 | From: Jussi Kukkonen <jussi.kukkonen@intel.com> | ||
3 | Date: Thu, 5 Nov 2015 11:08:32 +0200 | ||
4 | Subject: [PATCH] gio/tests: Don't depend on a data file that's not built | ||
5 | |||
6 | data.gresource is not built when cross-compiling: Don't | ||
7 | add it to test_data in that case. | ||
8 | |||
9 | Signed-off-by: Jussi Kukkonen <jussi.kukkonen@intel.com> | ||
10 | Upstream-Status: Backport [https://bugzilla.gnome.org/show_bug.cgi?id=757628] | ||
11 | --- | ||
12 | gio/tests/Makefile.am | 3 ++- | ||
13 | 1 file changed, 2 insertions(+), 1 deletion(-) | ||
14 | |||
15 | diff --git a/gio/tests/Makefile.am b/gio/tests/Makefile.am | ||
16 | index 894cf43..cc7deb3 100644 | ||
17 | --- a/gio/tests/Makefile.am | ||
18 | +++ b/gio/tests/Makefile.am | ||
19 | @@ -76,7 +76,6 @@ dist_test_data = \ | ||
20 | $(NULL) | ||
21 | |||
22 | test_data = \ | ||
23 | - test.gresource \ | ||
24 | $(NULL) | ||
25 | |||
26 | uninstalled_test_extra_programs = \ | ||
27 | @@ -520,6 +519,8 @@ libresourceplugin_la_SOURCES = resourceplugin.c plugin_resources.c | ||
28 | libresourceplugin_la_LDFLAGS = -avoid-version -module -export-dynamic $(no_undefined) | ||
29 | libresourceplugin_la_LIBADD = $(LDADD) | ||
30 | |||
31 | +test_data += test.gresource | ||
32 | + | ||
33 | # libtool contains a bug whereby the created .la file doesn't contain the correct dlname='' in the case that | ||
34 | # you're building a library but not installing it. This is apparently because the only considered use for an | ||
35 | # uninstalled library is as a convenience library for linking (despite the fact that we give -module). The lack | ||
36 | -- | ||
37 | 2.6.2 | ||
38 | |||
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 \ | |||
15 | file://0001-configure.ac-Do-not-use-readlink-when-cross-compilin.patch \ | 15 | file://0001-configure.ac-Do-not-use-readlink-when-cross-compilin.patch \ |
16 | file://allow-run-media-sdX-drive-mount-if-username-root.patch \ | 16 | file://allow-run-media-sdX-drive-mount-if-username-root.patch \ |
17 | file://0001-Remove-the-warning-about-deprecated-paths-in-schemas.patch \ | 17 | file://0001-Remove-the-warning-about-deprecated-paths-in-schemas.patch \ |
18 | file://0001-gio-tests-Don-t-depend-on-a-data-file-that-s-not-bui.patch \ | ||
19 | file://Enable-more-tests-while-cross-compiling.patch \ | 18 | file://Enable-more-tests-while-cross-compiling.patch \ |
20 | " | 19 | " |
21 | 20 | ||
22 | SRC_URI_append_class-native = " file://glib-gettextize-dir.patch" | 21 | SRC_URI_append_class-native = " file://glib-gettextize-dir.patch" |
23 | 22 | ||
24 | SRC_URI[md5sum] = "c90e93ceb45100ffc1d40ec5d2ca3248" | 23 | SRC_URI[md5sum] = "7f815d6e46df68e070cb421ed7f1139e" |
25 | SRC_URI[sha256sum] = "5a1f03b952ebc3a7e9f612b8724f70898183e31503db329b4f15d07163c8fdfb" | 24 | SRC_URI[sha256sum] = "5031722e37036719c1a09163cc6cf7c326e4c4f1f1e074b433c156862bd733db" |