summaryrefslogtreecommitdiffstats
path: root/meta/recipes-core
diff options
context:
space:
mode:
authorPeter Kjellerstedt <peter.kjellerstedt@axis.com>2018-04-28 03:54:42 +0200
committerRichard Purdie <richard.purdie@linuxfoundation.org>2018-05-04 13:28:05 +0100
commit73206c91d3f5496b31e68e869946c33540ec3bd3 (patch)
treeda8e3f58c6ae8c9491a320f01ac08f8c06a455c5 /meta/recipes-core
parent28e3c374e2a9022bfd8cbef5192cb114a8416344 (diff)
downloadpoky-73206c91d3f5496b31e68e869946c33540ec3bd3.tar.gz
glib: Make glib-mkenums ignore unknown per value options
If some other per value option was present than 'skip' or 'nick' then a KeyError would occur. Ignoring such options matches the behaviour of the old, Perl-based glib-mkenums. (From OE-Core rev: ca6c82255fbf0ce359b6205c442e165219a3216e) Signed-off-by: Peter Kjellerstedt <peter.kjellerstedt@axis.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-glib-mkenums-Ignore-other-per-value-options-than-ski.patch32
-rw-r--r--meta/recipes-core/glib-2.0/glib-2.0_2.54.3.bb1
2 files changed, 33 insertions, 0 deletions
diff --git a/meta/recipes-core/glib-2.0/glib-2.0/0001-glib-mkenums-Ignore-other-per-value-options-than-ski.patch b/meta/recipes-core/glib-2.0/glib-2.0/0001-glib-mkenums-Ignore-other-per-value-options-than-ski.patch
new file mode 100644
index 0000000000..c87635a082
--- /dev/null
+++ b/meta/recipes-core/glib-2.0/glib-2.0/0001-glib-mkenums-Ignore-other-per-value-options-than-ski.patch
@@ -0,0 +1,32 @@
1From 12ffb50d587003a46678567b771c6e984035a5e9 Mon Sep 17 00:00:00 2001
2From: Peter Kjellerstedt <pkj@axis.com>
3Date: Sat, 28 Apr 2018 03:07:50 +0200
4Subject: [PATCH] glib-mkenums: Ignore other per value options than 'skip' and
5 'nick'
6
7If some other per value option was present than 'skip' or 'nick' then
8a KeyError would occur. Ignoring such options matches the behaviour of
9the old, Perl-based glib-mkenums.
10
11Upstream-Status: Submitted [https://bugzilla.gnome.org/show_bug.cgi?id=795008]
12Signed-off-by: Peter Kjellerstedt <peter.kjellerstedt@axis.com>
13---
14 gobject/glib-mkenums.in | 2 +-
15 1 file changed, 1 insertion(+), 1 deletion(-)
16
17diff --git a/gobject/glib-mkenums.in b/gobject/glib-mkenums.in
18index fe9a10756..4ccc1f458 100755
19--- a/gobject/glib-mkenums.in
20+++ b/gobject/glib-mkenums.in
21@@ -218,7 +218,7 @@ def parse_entries(file, file_name):
22 if options is not None:
23 options = parse_trigraph(options)
24 if 'skip' not in options:
25- entries.append((name, value, options['nick']))
26+ entries.append((name, value, options.get('nick', None)))
27 else:
28 entries.append((name, value))
29 elif re.match(r's*\#', line):
30--
312.12.0
32
diff --git a/meta/recipes-core/glib-2.0/glib-2.0_2.54.3.bb b/meta/recipes-core/glib-2.0/glib-2.0_2.54.3.bb
index faf594569d..53fa07e74c 100644
--- a/meta/recipes-core/glib-2.0/glib-2.0_2.54.3.bb
+++ b/meta/recipes-core/glib-2.0/glib-2.0_2.54.3.bb
@@ -16,6 +16,7 @@ SRC_URI = "${GNOME_MIRROR}/glib/${SHRT_VER}/glib-${PV}.tar.xz \
16 file://0001-Do-not-ignore-return-value-of-write.patch \ 16 file://0001-Do-not-ignore-return-value-of-write.patch \
17 file://0001-Test-for-pthread_getname_np-before-using-it.patch \ 17 file://0001-Test-for-pthread_getname_np-before-using-it.patch \
18 file://0010-Do-not-hardcode-python-path-into-various-tools.patch \ 18 file://0010-Do-not-hardcode-python-path-into-various-tools.patch \
19 file://0001-glib-mkenums-Ignore-other-per-value-options-than-ski.patch \
19 " 20 "
20 21
21SRC_URI_append_class-native = " file://relocate-modules.patch" 22SRC_URI_append_class-native = " file://relocate-modules.patch"