SHA256
1
0
forked from pool/tigervnc

- Remove patch: tigervnc-clean-pressed-key-on-exit.patch

* fixed bsc#670448 wich can no longer be reproduced
  * removing the patch fixes bsc#1196214
  * related: https://github.com/TigerVNC/tigervnc/pull/14

OBS-URL: https://build.opensuse.org/package/show/X11:XOrg/tigervnc?expand=0&rev=224
This commit is contained in:
Joan Torres 2022-02-21 16:45:12 +00:00 committed by Git OBS Bridge
parent 833369efa9
commit 013453dfc3
3 changed files with 8 additions and 86 deletions

View File

@ -1,84 +0,0 @@
Index: tigervnc-1.12.0/vncviewer/DesktopWindow.cxx
===================================================================
--- tigervnc-1.12.0.orig/vncviewer/DesktopWindow.cxx
+++ tigervnc-1.12.0/vncviewer/DesktopWindow.cxx
@@ -236,6 +236,8 @@ DesktopWindow::~DesktopWindow()
delete statsGraph;
+ delete viewport;
+
instances.erase(this);
if (instances.size() == 0)
Index: tigervnc-1.12.0/vncviewer/Viewport.cxx
===================================================================
--- tigervnc-1.12.0.orig/vncviewer/Viewport.cxx
+++ tigervnc-1.12.0/vncviewer/Viewport.cxx
@@ -192,6 +192,18 @@ Viewport::Viewport(int w, int h, const r
Viewport::~Viewport()
{
+ // Send release for every pressed key
+ for(DownMap::iterator iter = downKeySym.begin(); iter != downKeySym.end(); ++iter) {
+ try {
+ if (iter->first > 0xff)
+ cc->writer()->writeKeyEvent(iter->second, 0, false);
+ else
+ cc->writer()->writeKeyEvent(iter->second, iter->first, false);
+ } catch (rdr::Exception& e) {
+ // ignore
+ }
+ }
+
// Unregister all timeouts in case they get a change tro trigger
// again later when this object is already gone.
Fl::remove_timeout(handlePointerTimeout, this);
Index: tigervnc-1.12.0/vncviewer/vncviewer.cxx
===================================================================
--- tigervnc-1.12.0.orig/vncviewer/vncviewer.cxx
+++ tigervnc-1.12.0/vncviewer/vncviewer.cxx
@@ -113,6 +113,7 @@ static const char *about_text()
return buffer;
}
+static CConn *cc;
void abort_vncviewer(const char *error, ...)
{
@@ -176,8 +177,6 @@ void about_vncviewer()
static void mainloop(const char* vncserver, network::Socket* sock)
{
while (true) {
- CConn *cc;
-
exitMainloop = false;
cc = new CConn(vncServerName, sock);
@@ -262,6 +261,16 @@ static void CleanupSignalHandler(int sig
// CleanupSignalHandler allows C++ object cleanup to happen because it calls
// exit() rather than the default which is to abort.
vlog.info(_("Termination signal %d has been received. TigerVNC Viewer will now exit."), sig);
+ delete cc;
+ exit(1);
+}
+
+static int CleanupXIOErrorHandler(Display *dpy)
+{
+ // CleanupSignalHandler allows C++ object cleanup to happen because it calls
+ // exit() rather than the default which is to abort.
+ vlog.info("XErrorHandler called");
+ delete cc;
exit(1);
}
@@ -744,6 +753,9 @@ int main(int argc, char** argv)
XkbSetDetectableAutoRepeat(fl_display, True, NULL);
#endif
+ fl_open_display();
+ XSetIOErrorHandler(CleanupXIOErrorHandler);
+
init_fltk();
enable_touch();

View File

@ -1,3 +1,11 @@
-------------------------------------------------------------------
Mon Feb 21 16:18:49 UTC 2022 - Joan Torres <joan.torres@suse.com>
- Remove patch: tigervnc-clean-pressed-key-on-exit.patch
* fixed bsc#670448 wich can no longer be reproduced
* removing the patch fixes bsc#1196214
* related: https://github.com/TigerVNC/tigervnc/pull/14
-------------------------------------------------------------------
Thu Feb 17 14:14:13 UTC 2022 - Stefan Dirsch <sndirsch@suse.com>

View File

@ -58,7 +58,6 @@ Source19: xvnc.target
Source21: xvnc-novnc.service.in
Source22: vnc.sysusers
Patch1: tigervnc-newfbsize.patch
Patch2: tigervnc-clean-pressed-key-on-exit.patch
Patch3: u_tigervnc-ignore-epipe-on-write.patch
Patch4: n_tigervnc-date-time.patch
Patch5: u_build_libXvnc_as_separate_library.patch
@ -246,7 +245,6 @@ It maps common x11vnc arguments to x0vncserver arguments.
%prep
%setup -T -b1 -q -n tigervnc-%{version}
%patch1 -p1
%patch2 -p1
%patch3 -p0
%patch4 -p1
%patch5 -p1