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.

Signed-off-by: Peter Kjellerstedt <peter.kjellerstedt@axis.com>
Signed-off-by: Ross Burton <ross.burton@intel.com>

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 @@
+From 12ffb50d587003a46678567b771c6e984035a5e9 Mon Sep 17 00:00:00 2001
+From: Peter Kjellerstedt <pkj@axis.com>
+Date: Sat, 28 Apr 2018 03:07:50 +0200
+Subject: [PATCH] glib-mkenums: Ignore other per value options than 'skip' and
+ 'nick'
+
+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.
+
+Upstream-Status: Submitted [https://bugzilla.gnome.org/show_bug.cgi?id=795008]
+Signed-off-by: Peter Kjellerstedt <peter.kjellerstedt@axis.com>
+---
+ gobject/glib-mkenums.in | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/gobject/glib-mkenums.in b/gobject/glib-mkenums.in
+index fe9a10756..4ccc1f458 100755
+--- a/gobject/glib-mkenums.in
++++ b/gobject/glib-mkenums.in
+@@ -218,7 +218,7 @@ def parse_entries(file, file_name):
+             if options is not None:
+                 options = parse_trigraph(options)
+                 if 'skip' not in options:
+-                    entries.append((name, value, options['nick']))
++                    entries.append((name, value, options.get('nick', None)))
+             else:
+                 entries.append((name, value))
+         elif re.match(r's*\#', line):
+-- 
+2.12.0
+
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 \
            file://0001-Do-not-ignore-return-value-of-write.patch \
            file://0001-Test-for-pthread_getname_np-before-using-it.patch \
            file://0010-Do-not-hardcode-python-path-into-various-tools.patch \
+           file://0001-glib-mkenums-Ignore-other-per-value-options-than-ski.patch \
            "
 
 SRC_URI_append_class-native = " file://relocate-modules.patch"