From cab63b604186543994a63f172669c7f6c3606ac4bcc517b158279b05600b63b0 Mon Sep 17 00:00:00 2001 From: Bruce Rogers Date: Fri, 26 Jan 2018 01:09:47 +0000 Subject: [PATCH] Accepting request 569760 from home:bfrogers:branches:Virtualization Hopefully we're at least close to the right stuff for handling python2 vs python3 right with these changes. OBS-URL: https://build.opensuse.org/request/show/569760 OBS-URL: https://build.opensuse.org/package/show/Virtualization/qemu?expand=0&rev=385 --- qemu-testsuite.changes | 2 ++ qemu-testsuite.spec | 1 + qemu.changes | 2 ++ qemu.spec | 1 + qemu.spec.in | 1 + ui-keycodemapdb-Add-missing-QKeyCode-val.patch | 1 + ui-keycodemapdb-Fix-compat-with-py3-dict.patch | 1 + 7 files changed, 9 insertions(+) diff --git a/qemu-testsuite.changes b/qemu-testsuite.changes index cf34d05b..8487346d 100644 --- a/qemu-testsuite.changes +++ b/qemu-testsuite.changes @@ -25,6 +25,8 @@ Thu Jan 25 22:52:06 UTC 2018 - brogers@suse.com 0043-input-add-missing-JIS-keys-to-virti.patch 0044-Make-installed-scripts-explicitly-p.patch Make-installed-scripts-explicitly-python3.patch + ui-keycodemapdb-Add-missing-QKeyCode-val.patch + ui-keycodemapdb-Fix-compat-with-py3-dict.patch - Patch queue updated from git://github.com/openSUSE/qemu.git opensuse-2.11 ------------------------------------------------------------------- diff --git a/qemu-testsuite.spec b/qemu-testsuite.spec index 5cf3e864..2051a1ea 100644 --- a/qemu-testsuite.spec +++ b/qemu-testsuite.spec @@ -199,6 +199,7 @@ Patch1400: skiboot-GCC7-fixes-for-Wimplicit-fallthr.patch Patch1401: skiboot-libc-stdio-vsnprintf.c-add-expli.patch Patch1402: skiboot-build-LDFLAGS-pass-pie-flag-explicitly-to-ld.patch +# ui/keycodemapdb Patch2000: ui-keycodemapdb-Add-missing-QKeyCode-val.patch Patch2001: ui-keycodemapdb-Fix-compat-with-py3-dict.patch diff --git a/qemu.changes b/qemu.changes index cf34d05b..8487346d 100644 --- a/qemu.changes +++ b/qemu.changes @@ -25,6 +25,8 @@ Thu Jan 25 22:52:06 UTC 2018 - brogers@suse.com 0043-input-add-missing-JIS-keys-to-virti.patch 0044-Make-installed-scripts-explicitly-p.patch Make-installed-scripts-explicitly-python3.patch + ui-keycodemapdb-Add-missing-QKeyCode-val.patch + ui-keycodemapdb-Fix-compat-with-py3-dict.patch - Patch queue updated from git://github.com/openSUSE/qemu.git opensuse-2.11 ------------------------------------------------------------------- diff --git a/qemu.spec b/qemu.spec index 1bf13484..7cc6b9fb 100644 --- a/qemu.spec +++ b/qemu.spec @@ -199,6 +199,7 @@ Patch1400: skiboot-GCC7-fixes-for-Wimplicit-fallthr.patch Patch1401: skiboot-libc-stdio-vsnprintf.c-add-expli.patch Patch1402: skiboot-build-LDFLAGS-pass-pie-flag-explicitly-to-ld.patch +# ui/keycodemapdb Patch2000: ui-keycodemapdb-Add-missing-QKeyCode-val.patch Patch2001: ui-keycodemapdb-Fix-compat-with-py3-dict.patch diff --git a/qemu.spec.in b/qemu.spec.in index 44d4eafd..f2960630 100644 --- a/qemu.spec.in +++ b/qemu.spec.in @@ -156,6 +156,7 @@ Patch1400: skiboot-GCC7-fixes-for-Wimplicit-fallthr.patch Patch1401: skiboot-libc-stdio-vsnprintf.c-add-expli.patch Patch1402: skiboot-build-LDFLAGS-pass-pie-flag-explicitly-to-ld.patch +# ui/keycodemapdb Patch2000: ui-keycodemapdb-Add-missing-QKeyCode-val.patch Patch2001: ui-keycodemapdb-Fix-compat-with-py3-dict.patch diff --git a/ui-keycodemapdb-Add-missing-QKeyCode-val.patch b/ui-keycodemapdb-Add-missing-QKeyCode-val.patch index 0774364f..9dbe4960 100644 --- a/ui-keycodemapdb-Add-missing-QKeyCode-val.patch +++ b/ui-keycodemapdb-Add-missing-QKeyCode-val.patch @@ -7,6 +7,7 @@ The AT set1 code for KEY_ISO is removed because it conflicts with KEY_KATAKANAHIRAGANA. Signed-off-by: Miika S +Signed-off-by: Bruce Rogers --- data/keymaps.csv | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/ui-keycodemapdb-Fix-compat-with-py3-dict.patch b/ui-keycodemapdb-Fix-compat-with-py3-dict.patch index 0114f6d7..d8688c63 100644 --- a/ui-keycodemapdb-Fix-compat-with-py3-dict.patch +++ b/ui-keycodemapdb-Fix-compat-with-py3-dict.patch @@ -4,6 +4,7 @@ Date: Fri, 12 Jan 2018 13:53:44 +0000 Subject: [PATCH] Fix compat with py3 dict keys/values data types Signed-off-by: Daniel P. Berrange +Signed-off-by: Bruce Rogers --- tools/keymap-gen | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-)