v0.35 release
Signed-off-by: Victor Toso <victortoso@redhat.com>
This commit is contained in:
Victor Toso
parent
cc90756c52
commit
33fdf0ecbb
@ -1,42 +0,0 @@
|
||||
From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
|
||||
From: Olivier Fourdan <ofourdan@redhat.com>
|
||||
Date: Fri, 9 Mar 2018 09:30:00 +0100
|
||||
Subject: [spice-gtk] 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 <ofourdan@redhat.com>
|
||||
Reviewed-by: Daniel P. Berrangé <berrange@redhat.com>
|
||||
Acked-by: Christophe Fergeau <cfergeau@redhat.com>
|
||||
---
|
||||
src/vncdisplaykeymap.c | 6 ++++--
|
||||
1 file changed, 4 insertions(+), 2 deletions(-)
|
||||
|
||||
diff --git a/src/vncdisplaykeymap.c b/src/vncdisplaykeymap.c
|
||||
index 2a792136..86cc6bde 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
sources
2
sources
@ -1 +1 @@
|
||||
SHA512 (spice-gtk-0.34.tar.bz2) = 17ea737511855b47f5eaf5143756483542cf8ee83f8d276cbfb2c0407355f68ed329fcbed8a67737179f3e53587710634d6faa856590234ee68be7b4b13f2689
|
||||
SHA512 (spice-gtk-0.35.tar.bz2) = f0914a4a9baf892e39dab7d51aa9f5ab4dbb4ef01f09da158b20756f890745837d0a6c8c1f7897844e695be2ed01f3b1d04ada1cacc958b5cfadb0d4bf7c4729
|
||||
|
||||
@ -1,8 +1,8 @@
|
||||
#define _version_suffix
|
||||
|
||||
Name: spice-gtk
|
||||
Version: 0.34
|
||||
Release: 5%{?dist}
|
||||
Version: 0.35
|
||||
Release: 1%{?dist}
|
||||
Summary: A GTK+ widget for SPICE clients
|
||||
|
||||
Group: System Environment/Libraries
|
||||
@ -10,7 +10,6 @@ License: LGPLv2+
|
||||
URL: https://www.spice-space.org/spice-gtk.html
|
||||
#VCS: git:git://anongit.freedesktop.org/spice/spice-gtk
|
||||
Source0: http://www.spice-space.org/download/gtk/%{name}-%{version}%{?_version_suffix}.tar.bz2
|
||||
Patch1: 0001-Use-scancode-instead-of-keycode-names.patch
|
||||
|
||||
BuildRequires: git-core
|
||||
BuildRequires: intltool
|
||||
@ -32,7 +31,7 @@ BuildRequires: libsoup-devel >= 2.49.91
|
||||
BuildRequires: libphodav-devel
|
||||
BuildRequires: lz4-devel
|
||||
BuildRequires: gtk3-devel
|
||||
BuildRequires: spice-protocol >= 0.12.11
|
||||
BuildRequires: spice-protocol >= 0.12.14
|
||||
BuildRequires: gstreamer1-devel gstreamer1-plugins-base-devel
|
||||
Obsoletes: spice-gtk-python < 0.32
|
||||
|
||||
@ -107,11 +106,10 @@ spicy-screenshot is a tool to capture screen-shots of a SPICE desktop.
|
||||
%prep
|
||||
%autosetup -S git_am
|
||||
|
||||
find . -name '*.stamp' | xargs touch
|
||||
|
||||
|
||||
%build
|
||||
%configure \
|
||||
--disable-celt051 \
|
||||
--enable-gtk-doc \
|
||||
--enable-webdav \
|
||||
--with-usb-acl-helper-dir=%{_libexecdir}/spice-gtk-%{_arch}/ \
|
||||
@ -144,7 +142,6 @@ rm -f %{buildroot}%{_libdir}/*.la
|
||||
|
||||
%files -n spice-glib -f %{name}.lang
|
||||
%{_libdir}/libspice-client-glib-2.0.so.*
|
||||
%{_libdir}/libspice-controller.so.*
|
||||
%{_libdir}/girepository-1.0/SpiceClientGLib-2.0.typelib
|
||||
%dir %{_libexecdir}/spice-gtk-%{_arch}/
|
||||
%attr(4755, root, root) %{_libexecdir}/spice-gtk-%{_arch}/spice-client-glib-usb-acl-helper
|
||||
@ -152,13 +149,9 @@ rm -f %{buildroot}%{_libdir}/*.la
|
||||
|
||||
%files -n spice-glib-devel
|
||||
%{_libdir}/libspice-client-glib-2.0.so
|
||||
%{_libdir}/libspice-controller.so
|
||||
%{_includedir}/spice-client-glib-2.0
|
||||
%{_includedir}/spice-controller
|
||||
%{_libdir}/pkgconfig/spice-client-glib-2.0.pc
|
||||
%{_libdir}/pkgconfig/spice-controller.pc
|
||||
%{_datadir}/gir-1.0/SpiceClientGLib-2.0.gir
|
||||
%{_datadir}/vala/vapi/spice-protocol.vapi
|
||||
%doc %{_datadir}/gtk-doc/html/*
|
||||
|
||||
%files -n spice-gtk3
|
||||
@ -183,6 +176,9 @@ rm -f %{buildroot}%{_libdir}/*.la
|
||||
%{_bindir}/spicy-stats
|
||||
|
||||
%changelog
|
||||
* Tue Jun 12 2018 Victor Toso <victortoso@redhat.com> - 0.35-1
|
||||
- v0.35 release
|
||||
|
||||
* Wed May 30 2018 Christophe Fergeau <cfergeau@redhat.com> - 0.34-5
|
||||
- Fix keyboard input under Xwayland
|
||||
Resolves: rhbz#1512564
|
||||
|
||||
Loading…
Reference in New Issue
Block a user