!42 update tigervnc to 1.13.0
From: @sherlock2010 Reviewed-by: @t_feng Signed-off-by: @t_feng
This commit is contained in:
commit
aedb94cbb8
@ -0,0 +1,28 @@
|
||||
From 774c6bcf33b5c9b94c1ff12895775e77c555decc Mon Sep 17 00:00:00 2001
|
||||
From: Pierre Ossman <ossman@cendio.se>
|
||||
Date: Thu, 9 Feb 2023 11:30:37 +0100
|
||||
Subject: [PATCH] Sanity check when cleaning up keymap changes
|
||||
|
||||
Make sure we don't send a bogus request to the X server in the (common)
|
||||
case that we don't actually have anything to restore.
|
||||
|
||||
(cherry picked from commit 1e3484f2017f038dd5149cd50741feaf39a680e4)
|
||||
---
|
||||
unix/x0vncserver/XDesktop.cxx | 4 ++++
|
||||
1 file changed, 4 insertions(+)
|
||||
|
||||
diff --git a/unix/x0vncserver/XDesktop.cxx b/unix/x0vncserver/XDesktop.cxx
|
||||
index d5c6b2db9..f9c810968 100644
|
||||
--- a/unix/x0vncserver/XDesktop.cxx
|
||||
+++ b/unix/x0vncserver/XDesktop.cxx
|
||||
@@ -481,6 +481,10 @@ void XDesktop::deleteAddedKeysyms(Display* dpy) {
|
||||
}
|
||||
}
|
||||
|
||||
+ // Did we actually find something to remove?
|
||||
+ if (highestKeyCode < lowestKeyCode)
|
||||
+ return;
|
||||
+
|
||||
changes.changed |= XkbKeySymsMask;
|
||||
changes.first_key_sym = lowestKeyCode;
|
||||
changes.num_key_syms = highestKeyCode - lowestKeyCode + 1;
|
||||
@ -3,14 +3,14 @@
|
||||
%global modulename vncsession
|
||||
|
||||
Name: tigervnc
|
||||
Version: 1.12.0
|
||||
Release: 7
|
||||
Version: 1.13.0
|
||||
Release: 1
|
||||
Summary: A TigerVNC remote display system
|
||||
|
||||
License: GPLv2+
|
||||
URL: http://github.com/TigerVNC/tigervnc/
|
||||
|
||||
Source0: https://github.com/TigerVNC/tigervnc/archive/v1.12.0.tar.gz
|
||||
Source0: https://github.com/TigerVNC/tigervnc/archive/v1.13.0.tar.gz
|
||||
Source1: vncserver.service
|
||||
Source2: vncserver
|
||||
Source3: 10-libvnc.conf
|
||||
@ -20,6 +20,7 @@ Source6: HOWTO.md
|
||||
|
||||
Patch0001: tigervnc-xserver120.patch
|
||||
Patch0002: 0001-Fix-some-translations-of-start-menu.patch
|
||||
Patch0003: backport-tigervnc-sanity-check-when-cleaning-up-keymap-changes.patch
|
||||
|
||||
BuildRequires: gcc-c++ systemd cmake automake autoconf gettext gettext-autopoint pixman-devel fltk-devel >= 1.3.3
|
||||
BuildRequires: libX11-devel libtool libxkbfile-devel libpciaccess-devel libXinerama-devel libXfont2-devel
|
||||
@ -104,6 +105,7 @@ for all in `find . -type f -perm -001`; do
|
||||
done
|
||||
popd
|
||||
%patch0002 -p1
|
||||
%patch0003 -p1
|
||||
|
||||
%build
|
||||
export CFLAGS="$RPM_OPT_FLAGS -fpic"
|
||||
@ -200,6 +202,7 @@ popd
|
||||
%{_bindir}/vncviewer
|
||||
%{_datadir}/applications/*
|
||||
%{_datadir}/icons/hicolor/*/apps/*
|
||||
%{_datadir}/metainfo/org.tigervnc.vncviewer.metainfo.xml
|
||||
|
||||
%files server
|
||||
%defattr(-,root,root)
|
||||
@ -246,6 +249,12 @@ popd
|
||||
%{_mandir}/man8/*
|
||||
|
||||
%changelog
|
||||
* Thu Feb 23 2023 zhouyihang <zhouyihang3@h-partners.com> - 1.13.0-1
|
||||
- Type:requirements
|
||||
- ID:NA
|
||||
- SUG:NA
|
||||
- DESC:update tigervnc to 1.13.0
|
||||
|
||||
* Sat Jun 11 2022 gaihuiying <eaglegai@163.com> - 1.12.0-7
|
||||
- Type:bugfix
|
||||
- CVE:NA
|
||||
|
||||
BIN
v1.12.0.tar.gz
BIN
v1.12.0.tar.gz
Binary file not shown.
BIN
v1.13.0.tar.gz
Normal file
BIN
v1.13.0.tar.gz
Normal file
Binary file not shown.
Loading…
x
Reference in New Issue
Block a user