- tigervnc-1.9.0-199-005db35

* update to current git master in order to fix boo#1132901
>>>>>>> ./tigervnc.changes.r85a118aa653f1d42c31302a788064076

OBS-URL: https://build.opensuse.org/package/show/X11:XOrg/tigervnc?expand=0&rev=161

U_viewer-reset-ctrl-alt-to-menu-state-on-focus.patch

@@ -10,13 +10,13 @@ This checks the menu variable and sends the keys again if needed.
  vncviewer/Viewport.cxx | 6 ++++++
  1 file changed, 6 insertions(+)
 
-diff --git a/vncviewer/Viewport.cxx b/vncviewer/Viewport.cxx
+Index: b/vncviewer/Viewport.cxx
-index 4e23dc8c..317f06b2 100644
+===================================================================
 --- a/vncviewer/Viewport.cxx
 +++ b/vncviewer/Viewport.cxx
-@@ -635,6 +635,12 @@ int Viewport::handle(int event)
+@@ -655,6 +655,12 @@ int Viewport::handle(int event)
-       exit_vncviewer(e.str());
+     if (menuAltKey)
-     }
+       handleKeyPress(0x38, XK_Alt_L);
  
 +    // Resend Ctrl/Alt if needed
 +    if (menuCtrlKey)
@@ -27,6 +27,3 @@ index 4e23dc8c..317f06b2 100644
      // Yes, we would like some focus please!
      return 1;
  
--- 
-2.16.4
-

n_tigervnc-date-time.patch

@@ -1,74 +1,72 @@
-Index: tigervnc-1.9.0/unix/xserver/hw/vnc/buildtime.c
+Index: b/unix/xserver/hw/vnc/buildtime.c
 ===================================================================
---- tigervnc-1.9.0.orig/unix/xserver/hw/vnc/buildtime.c
+--- a/unix/xserver/hw/vnc/buildtime.c
-+++ tigervnc-1.9.0/unix/xserver/hw/vnc/buildtime.c
++++ b/unix/xserver/hw/vnc/buildtime.c
 @@ -15,4 +15,4 @@
   * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307,
   * USA.
   */
 -char buildtime[] = __DATE__ " " __TIME__;
 +char buildtime[] = "??? ?? ???? ??:??:??";
-Index: tigervnc-1.9.0/unix/vncconfig/buildtime.c
+Index: b/unix/vncconfig/buildtime.c
 ===================================================================
---- tigervnc-1.9.0.orig/unix/vncconfig/buildtime.c
+--- a/unix/vncconfig/buildtime.c
-+++ tigervnc-1.9.0/unix/vncconfig/buildtime.c
++++ b/unix/vncconfig/buildtime.c
 @@ -15,4 +15,4 @@
   * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307,
   * USA.
   */
 -char buildtime[] = __DATE__ " " __TIME__;
 +char buildtime[] = "??? ?? ???? ??:??:??";
-Index: tigervnc-1.9.0/unix/x0vncserver/buildtime.c
+Index: b/unix/x0vncserver/buildtime.c
 ===================================================================
---- tigervnc-1.9.0.orig/unix/x0vncserver/buildtime.c
+--- a/unix/x0vncserver/buildtime.c
-+++ tigervnc-1.9.0/unix/x0vncserver/buildtime.c
++++ b/unix/x0vncserver/buildtime.c
 @@ -15,4 +15,4 @@
   * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307,
   * USA.
   */
 -char buildtime[] = __DATE__ " " __TIME__;
 +char buildtime[] = "??? ?? ???? ??:??:??";
-Index: tigervnc-1.9.0/win/winvnc/buildTime.cxx
+Index: b/win/winvnc/buildTime.cxx
 ===================================================================
---- tigervnc-1.9.0.orig/win/winvnc/buildTime.cxx
+--- a/win/winvnc/buildTime.cxx
-+++ tigervnc-1.9.0/win/winvnc/buildTime.cxx
++++ b/win/winvnc/buildTime.cxx
 @@ -15,4 +15,4 @@
   * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307,
   * USA.
   */
 -const char* buildTime = "Built on " __DATE__ " at " __TIME__;
 +const char* buildTime = "Built on ??? ?? ???? at ??:??:??";
-Index: tigervnc-1.9.0/CMakeLists.txt
+Index: b/CMakeLists.txt
 ===================================================================
---- tigervnc-1.9.0.orig/CMakeLists.txt
+--- a/CMakeLists.txt
-+++ tigervnc-1.9.0/CMakeLists.txt
++++ b/CMakeLists.txt
-@@ -42,12 +42,6 @@ if(MSVC)
+@@ -42,10 +42,6 @@ if(MSVC)
    message(FATAL_ERROR "TigerVNC cannot be built with Visual Studio.  Please use MinGW")
  endif()
  
 -if(NOT BUILD_TIMESTAMP)
--  set(BUILD_TIMESTAMP "")
+-  STRING(TIMESTAMP BUILD_TIMESTAMP "%Y-%m-%d %H:%M" UTC)
--  execute_process(COMMAND "date" "+%Y-%m-%d %H:%M" OUTPUT_VARIABLE BUILD_TIMESTAMP)
--  string(REGEX REPLACE "\n" "" BUILD_TIMESTAMP ${BUILD_TIMESTAMP})
 -endif()
 -
  # Default to optimised builds instead of debug ones. Our code has no bugs ;)
  # (CMake makes it fairly easy to toggle this back to Debug if needed)
  if(NOT CMAKE_BUILD_TYPE)
-Index: tigervnc-1.9.0/vncviewer/vncviewer.cxx
+Index: b/vncviewer/vncviewer.cxx
 ===================================================================
---- tigervnc-1.9.0.orig/vncviewer/vncviewer.cxx
+--- a/vncviewer/vncviewer.cxx
-+++ tigervnc-1.9.0/vncviewer/vncviewer.cxx
++++ b/vncviewer/vncviewer.cxx
 @@ -98,11 +98,9 @@ static const char *about_text()
    // time.
    snprintf(buffer, sizeof(buffer),
             _("TigerVNC Viewer %d-bit v%s\n"
 -             "Built on: %s\n"
               "Copyright (C) 1999-%d TigerVNC Team and many others (see README.rst)\n"
-              "See http://www.tigervnc.org for information on TigerVNC."),
+              "See https://www.tigervnc.org for information on TigerVNC."),
 -           (int)sizeof(size_t)*8, PACKAGE_VERSION,
--           BUILD_TIMESTAMP, 2018);
+-           BUILD_TIMESTAMP, 2019);
-+           (int)sizeof(size_t)*8, PACKAGE_VERSION, 2018);
++           (int)sizeof(size_t)*8, PACKAGE_VERSION, 2019);
  
    return buffer;
  }

tigervnc-1.9.0-199-005db35.tar.gz

@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:9a1d68210812ca1dccc0a4ebfb5cbf85981f8d0274970cc62c69678690d3d863
+size 1478561

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

@@ -1,7 +1,7 @@
-Index: tigervnc-1.9.0/vncviewer/DesktopWindow.cxx
+Index: b/vncviewer/DesktopWindow.cxx
 ===================================================================
---- tigervnc-1.9.0.orig/vncviewer/DesktopWindow.cxx
+--- a/vncviewer/DesktopWindow.cxx
-+++ tigervnc-1.9.0/vncviewer/DesktopWindow.cxx
++++ b/vncviewer/DesktopWindow.cxx
 @@ -207,6 +207,8 @@ DesktopWindow::~DesktopWindow()
  
    delete statsGraph;
@@ -11,10 +11,10 @@ Index: tigervnc-1.9.0/vncviewer/DesktopWindow.cxx
    // FLTK automatically deletes all child widgets, so we shouldn't touch
    // them ourselves here
  }
-Index: tigervnc-1.9.0/vncviewer/Viewport.cxx
+Index: b/vncviewer/Viewport.cxx
 ===================================================================
---- tigervnc-1.9.0.orig/vncviewer/Viewport.cxx
+--- a/vncviewer/Viewport.cxx
-+++ tigervnc-1.9.0/vncviewer/Viewport.cxx
++++ b/vncviewer/Viewport.cxx
 @@ -189,6 +189,18 @@ Viewport::Viewport(int w, int h, const r
  
  Viewport::~Viewport()
@@ -34,10 +34,10 @@ Index: tigervnc-1.9.0/vncviewer/Viewport.cxx
    // 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.9.0/vncviewer/vncviewer.cxx
+Index: b/vncviewer/vncviewer.cxx
 ===================================================================
---- tigervnc-1.9.0.orig/vncviewer/vncviewer.cxx
+--- a/vncviewer/vncviewer.cxx
-+++ tigervnc-1.9.0/vncviewer/vncviewer.cxx
++++ b/vncviewer/vncviewer.cxx
 @@ -107,6 +107,8 @@ static const char *about_text()
    return buffer;
  }
@@ -64,7 +64,7 @@ Index: tigervnc-1.9.0/vncviewer/vncviewer.cxx
    exit(1);
  }
  
-@@ -566,6 +578,9 @@ int main(int argc, char** argv)
+@@ -587,6 +599,9 @@ int main(int argc, char** argv)
    XkbSetDetectableAutoRepeat(fl_display, True, NULL);
  #endif
  
@@ -74,7 +74,7 @@ Index: tigervnc-1.9.0/vncviewer/vncviewer.cxx
    CSecurity::upg = &dlg;
  #ifdef HAVE_GNUTLS
    CSecurityTLS::msg = &dlg;
-@@ -651,7 +666,7 @@ int main(int argc, char** argv)
+@@ -672,7 +687,7 @@ int main(int argc, char** argv)
  #endif
    }
  

tigervnc-newfbsize.patch

@@ -1,8 +1,8 @@
-Index: tigervnc-1.6.0/vncviewer/CConn.cxx
+Index: b/vncviewer/CConn.cxx
 ===================================================================
---- tigervnc-1.6.0.orig/vncviewer/CConn.cxx
+--- a/vncviewer/CConn.cxx
-+++ tigervnc-1.6.0/vncviewer/CConn.cxx
++++ b/vncviewer/CConn.cxx
-@@ -438,6 +438,8 @@ void CConn::dataRect(const Rect& r, int
+@@ -388,6 +388,8 @@ void CConn::dataRect(const Rect& r, int
  
    if (encoding != encodingCopyRect)
      lastServerEncoding = encoding;

tigervnc.changes

@@ -1,3 +1,9 @@
+-------------------------------------------------------------------
+Sat Apr 20 09:54:02 UTC 2019 - Stefan Dirsch <sndirsch@suse.com>
+
+- tigervnc-1.9.0-199-005db35
+  * update to current git master in order to fix boo#1132901
+
 -------------------------------------------------------------------
 Tue Mar 26 08:22:53 UTC 2019 - Yifan Jiang <yfjiang@suse.com>
 
@@ -27,6 +33,7 @@ Thu Mar 21 09:16:51 UTC 2019 - Dominique Leuenberger <dimstar@opensuse.org>
   runtime.
 
 -------------------------------------------------------------------
+>>>>>>> ./tigervnc.changes.r85a118aa653f1d42c31302a788064076
 Thu Feb  7 12:34:03 UTC 2019 - Stephan Kulow <coolo@suse.com>
 
 - Fix build with latest cmake - which now requires the source

tigervnc.spec

@@ -12,7 +12,7 @@
 # license that conforms to the Open Source Definition (Version 1.9)
 # published by the Open Source Initiative.
 
-# Please submit bugfixes or comments via https://bugs.opensuse.org/
+# Please submit bugfixes or comments via http://bugs.opensuse.org/
 #
 
 
@@ -108,9 +108,10 @@ Requires(postun): update-alternatives
 Url:            http://tigervnc.org/
 BuildRoot:      %{_tmppath}/%{name}-%{version}-build
 Summary:        An implementation of VNC
+#Source1:        https://github.com/TigerVNC/tigervnc/archive/v%{version}.tar.gz
 License:        GPL-2.0-only AND MIT
 Group:          System/X11/Servers/XF86_4
-Source1:        https://github.com/TigerVNC/tigervnc/archive/v%{version}.tar.gz
+Source1:        tigervnc-1.9.0-199-005db35.tar.gz
 Source4:        10-libvnc.conf
 Source5:        vnc-server.susefirewall
 Source6:        vnc-httpd.susefirewall
@@ -182,8 +183,8 @@ This is the TigerVNC implementation of Xvnc.
 %package -n xorg-x11-Xvnc-module
 Requires:       xorg-x11-Xvnc
 Summary:        VNC module for X server
+#%%{x11_abi_extension_req}
 Group:          System/X11/Servers/XF86_4
-%{x11_abi_extension_req}
 
 %description -n xorg-x11-Xvnc-module
 This module allows to share content of X server's screen over VNC.
@@ -243,7 +244,7 @@ This is a wrapper that looks like x11vnc, but starts x0vncserver instead.
 It maps common x11vnc arguments to x0vncserver arguments.
 
 %prep
-%setup -T -b1 -q
+%setup -T -b1 -q -n tigervnc
 cp -r /usr/src/xserver/* unix/xserver/
 
 %patch1 -p1

u_build_libXvnc_as_separate_library.patch

@@ -4,8 +4,8 @@ Subject: [PATCH] Build libXvnc as separate library.
 
 So it can be used by others, not only vncconfig.
 
-diff --git a/unix/vncconfig/CMakeLists.txt b/unix/vncconfig/CMakeLists.txt
+Index: b/unix/vncconfig/CMakeLists.txt
-index 959681f..5fe1fb8 100644
+===================================================================
 --- a/unix/vncconfig/CMakeLists.txt
 +++ b/unix/vncconfig/CMakeLists.txt
 @@ -3,13 +3,25 @@ include_directories(${X11_INCLUDE_DIR})

u_tigervnc-cve-2014-8240.patch

@@ -2,11 +2,11 @@ Patch-Mainline: To be upstreamed
 References: bnc#900896 CVE-2014-8240
 Signed-off-by: Michal Srb <msrb@suse.com>
 
-Index: tigervnc-1.8.0/unix/x0vncserver/Image.cxx
+Index: b/unix/x0vncserver/Image.cxx
 ===================================================================
---- tigervnc-1.8.0.orig/unix/x0vncserver/Image.cxx
+--- a/unix/x0vncserver/Image.cxx
-+++ tigervnc-1.8.0/unix/x0vncserver/Image.cxx
++++ b/unix/x0vncserver/Image.cxx
-@@ -80,6 +80,14 @@ void Image::Init(int width, int height)
+@@ -82,6 +82,14 @@ void Image::Init(int width, int height)
    xim = XCreateImage(dpy, vis, DefaultDepth(dpy, DefaultScreen(dpy)),
                       ZPixmap, 0, 0, width, height, BitmapPad(dpy), 0);
  
@@ -21,7 +21,7 @@ Index: tigervnc-1.8.0/unix/x0vncserver/Image.cxx
    xim->data = (char *)malloc(xim->bytes_per_line * xim->height);
    if (xim->data == NULL) {
      vlog.error("malloc() failed");
-@@ -254,6 +262,17 @@ void ShmImage::Init(int width, int heigh
+@@ -257,6 +265,17 @@ void ShmImage::Init(int width, int heigh
      delete shminfo;
      shminfo = NULL;
      return;

u_tigervnc_update_default_vncxstartup.patch

@@ -2,11 +2,11 @@ Author: Michal Srb <msrb@suse.com>
 References: bnc#956537
 Subject: Update default vnc xstartup script.
 
-Index: tigervnc-1.6.0/unix/vncserver
+Index: b/unix/vncserver
 ===================================================================
---- tigervnc-1.6.0.orig/unix/vncserver
+--- a/unix/vncserver
-+++ tigervnc-1.6.0/unix/vncserver
++++ b/unix/vncserver
-@@ -61,27 +61,31 @@ $defaultXStartup
+@@ -58,27 +58,31 @@ $defaultXStartup
      = ("#!/bin/sh\n\n".
         "unset SESSION_MANAGER\n".
         "unset DBUS_SESSION_BUS_ADDRESS\n".

v1.9.0.tar.gz

@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:f15ced8500ec56356c3bf271f52e58ed83729118361c7103eab64a618441f740
-size 1506520