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>
This commit is contained in:
parent
bd7278cc3b
commit
9c84fbc972
|
@ -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
|
||||
|
|
@ -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"
|
Loading…
Reference in New Issue