Hello community, here is the log from the commit of package spice-gtk for openSUSE:Factory checked in at 2018-04-22 14:30:37 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/spice-gtk (Old) and /work/SRC/openSUSE:Factory/.spice-gtk.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "spice-gtk" Sun Apr 22 14:30:37 2018 rev:36 rq:596958 version:0.34 Changes: -------- --- /work/SRC/openSUSE:Factory/spice-gtk/spice-gtk.changes 2017-09-04 12:26:54.138982028 +0200 +++ /work/SRC/openSUSE:Factory/.spice-gtk.new/spice-gtk.changes 2018-04-22 14:30:43.028341701 +0200 @@ -1,0 +2,7 @@ +Mon Apr 9 19:22:17 UTC 2018 - [email protected] + +- Partially fix bsc#1074144, where we have keymapping issues under Xwayland. + + Add the following upstream patch: + + Use-scancode-instead-of-keycode-names.patch + +------------------------------------------------------------------- New: ---- Use-scancode-instead-of-keycode-names.patch ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ spice-gtk.spec ++++++ --- /var/tmp/diff_new_pack.PEABLs/_old 2018-04-22 14:30:43.648319261 +0200 +++ /var/tmp/diff_new_pack.PEABLs/_new 2018-04-22 14:30:43.648319261 +0200 @@ -1,7 +1,7 @@ # # spec file for package spice-gtk # -# Copyright (c) 2017 SUSE LINUX GmbH, Nuernberg, Germany. +# Copyright (c) 2018 SUSE LINUX GmbH, Nuernberg, Germany. # Copyright (c) 2011 Dominique Leuenberger, Amsterdam, The Netherlands. # # All modifications and additions to the file contributed by third parties @@ -23,12 +23,13 @@ # FIXME: /usr/bin/spice-client-glib-usb-acl-helper should be installed u+s, see bnc#744251. # FIXME: Once phodav is packaged and available in openSUSE, enable pkgconfig(libphodav-2.0) Summary: Gtk client and libraries for SPICE remote desktop servers -License: GPL-2.0+ and LGPL-2.1+ +License: GPL-2.0-or-later AND LGPL-2.1-or-later Group: System/GUI/GNOME Url: http://spice-space.org/page/Spice-Gtk Source: http://spice-space.org/download/gtk/%{name}-%{version}.tar.bz2 # PATCH-FIX-OPENSUSE spice-gtk-polkit-privs.patch bnc#804184 [email protected] -- Set the polkit defaults to auth_admin Patch0: spice-gtk-polkit-privs.patch +Patch1: Use-scancode-instead-of-keycode-names.patch BuildRequires: autoconf BuildRequires: automake BuildRequires: cyrus-sasl-devel @@ -139,6 +140,7 @@ %prep %setup -q %patch0 -p1 +%patch1 -p1 %build autoreconf -fi ++++++ Use-scancode-instead-of-keycode-names.patch ++++++ >From 28e3dc34424f5e5b0441f2341d777ae4362363f0 Mon Sep 17 00:00:00 2001 From: Olivier Fourdan <[email protected]> Date: Fri, 9 Mar 2018 09:30:00 +0100 Subject: [PATCH] Use scancode instead of keycode names MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit When running on Xwayland, the keycode mapping property is not available, which causes unknown keycode mapping errors and the keyboard doesn't work. Check for a known scancode (“XK_Page_Up”) which differs to distinguish between “xfree86” and “evdev” when the there is no keycode name. Signed-off-by: Olivier Fourdan <[email protected]> Reviewed-by: Daniel P. Berrangé <[email protected]> Acked-by: Christophe Fergeau <[email protected]> Signed-off-by: Bruce Rogers <[email protected]> --- src/vncdisplaykeymap.c | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/src/vncdisplaykeymap.c b/src/vncdisplaykeymap.c index 2a79213..86cc6bd 100644 --- a/src/vncdisplaykeymap.c +++ b/src/vncdisplaykeymap.c @@ -174,11 +174,13 @@ const guint16 *vnc_display_keymap_gdk2xtkbd_table(GdkWindow *window, VNC_DEBUG("Using xquartz keycode mapping"); *maplen = G_N_ELEMENTS(keymap_xorgxquartz2xtkbd); return keymap_xorgxquartz2xtkbd; - } else if (keycodes && STRPREFIX(keycodes, "evdev")) { + } else if ((keycodes && STRPREFIX(keycodes, "evdev")) || + (XKeysymToKeycode(xdisplay, XK_Page_Up) == 0x70)) { VNC_DEBUG("Using evdev keycode mapping"); *maplen = G_N_ELEMENTS(keymap_xorgevdev2xtkbd); return keymap_xorgevdev2xtkbd; - } else if (keycodes && STRPREFIX(keycodes, "xfree86")) { + } else if ((keycodes && STRPREFIX(keycodes, "xfree86")) || + (XKeysymToKeycode(xdisplay, XK_Page_Up) == 0x63)) { VNC_DEBUG("Using xfree86 keycode mapping"); *maplen = G_N_ELEMENTS(keymap_xorgkbd2xtkbd); return keymap_xorgkbd2xtkbd; -- 2.16.3
