- updated to 1.9.0

diff --git a/tigervnc-getmaster.patch b/tigervnc-getmaster.patch
index e87998766ad2d104647b08f32c0f80001fa439e8..146afdd1b0c50b61848206ab77f28d34546667eb 100644 (file)
--- a/tigervnc-getmaster.patch
+++ b/tigervnc-getmaster.patch
@@ -1,6 +1,6 @@
-diff -urpa tigervnc-1.8.0.orig/unix/xserver/hw/vnc/InputXKB.c tigervnc-1.8.0/unix/xserver/hw/vnc/InputXKB.c
---- tigervnc-1.8.0.orig/unix/xserver/hw/vnc/InputXKB.c 2017-05-16 13:53:28.000000000 +0000
-+++ tigervnc-1.8.0/unix/xserver/hw/vnc/InputXKB.c      2018-03-14 13:40:39.471889909 +0000
+diff -urpa tigervnc-1.9.0.orig/unix/xserver/hw/vnc/InputXKB.c tigervnc-1.9.0/unix/xserver/hw/vnc/InputXKB.c
+--- tigervnc-1.9.0.orig/unix/xserver/hw/vnc/InputXKB.c 2018-07-16 14:08:55.000000000 +0000
++++ tigervnc-1.9.0/unix/xserver/hw/vnc/InputXKB.c      2018-08-20 19:16:47.275346371 +0000
 @@ -214,10 +214,7 @@ void vncPrepareInputDevices(void)
  
  unsigned vncGetKeyboardState(void)
@@ -67,16 +67,7 @@ diff -urpa tigervnc-1.8.0.orig/unix/xserver/hw/vnc/InputXKB.c tigervnc-1.8.0/uni
        for (key = xkb->min_key_code; key <= xkb->max_key_code; key++) {
                unsigned int state_out;
                KeySym dummy;
-@@ -490,7 +487,7 @@ int vncIsLockModifier(KeyCode keycode, u
-       XkbDescPtr xkb;
-       XkbAction *act;
- 
--      xkb = GetMaster(vncKeyboardDev, KEYBOARD_OR_FLOAT)->key->xkbInfo->desc;
-+      xkb = vncKeyboardDev->master->key->xkbInfo->desc;
- 
-       act = XkbKeyActionPtr(xkb, keycode, state);
-       if (act == NULL)
-@@ -528,7 +525,7 @@ int vncIsAffectedByNumLock(KeyCode keyco
+@@ -511,7 +508,7 @@ int vncIsAffectedByNumLock(KeyCode keyco
        if (numlock_keycode == 0)
                return 0;
  
@@ -85,7 +76,7 @@ diff -urpa tigervnc-1.8.0.orig/unix/xserver/hw/vnc/InputXKB.c tigervnc-1.8.0/uni
  
        act = XkbKeyActionPtr(xkb, numlock_keycode, state);
        if (act == NULL)
-@@ -562,7 +559,7 @@ KeyCode vncAddKeysym(KeySym keysym, unsi
+@@ -545,7 +542,7 @@ KeyCode vncAddKeysym(KeySym keysym, unsi
        KeySym *syms;
        KeySym upper, lower;
  

diff --git a/tigervnc-manpages.patch b/tigervnc-manpages.patch
index 5919226d48f38161d69c4071459dfb2d4c97e252..cc46b4af155e6e8421492bf2f967b581d9a2ced6 100644 (file)
--- a/tigervnc-manpages.patch
+++ b/tigervnc-manpages.patch
@@ -1,8 +1,7 @@
-diff --git a/unix/vncserver b/unix/vncserver
-index c4d0535..08a9308 100755
---- a/unix/vncserver
-+++ b/unix/vncserver
-@@ -637,6 +637,7 @@ sub Usage
+diff -urpa tigervnc-1.9.0.orig/unix/vncserver tigervnc-1.9.0/unix/vncserver
+--- tigervnc-1.9.0.orig/unix/vncserver 2018-07-16 14:08:55.000000000 +0000
++++ tigervnc-1.9.0/unix/vncserver      2018-08-20 19:13:35.035348535 +0000
+@@ -684,6 +684,7 @@ sub Usage
        "                 [-geometry <width>x<height>]\n".
        "                 [-pixelformat rgbNNN|bgrNNN]\n".
        "                 [-fp <font-path>]\n".
@@ -10,13 +9,12 @@ index c4d0535..08a9308 100755
        "                 [-fg]\n".
        "                 [-autokill]\n".
        "                 [-noxstartup]\n".
-diff --git a/vncviewer/vncviewer.cxx b/vncviewer/vncviewer.cxx
-index a2bc029..6923d0e 100644
---- a/vncviewer/vncviewer.cxx
-+++ b/vncviewer/vncviewer.cxx
-@@ -338,6 +338,11 @@ static void usage(const char *programName)
-           "       %s [parameters] -listen [port] [parameters]\n",
-           programName, programName);
+diff -urpa tigervnc-1.9.0.orig/vncviewer/vncviewer.cxx tigervnc-1.9.0/vncviewer/vncviewer.cxx
+--- tigervnc-1.9.0.orig/vncviewer/vncviewer.cxx        2018-07-16 14:08:55.000000000 +0000
++++ tigervnc-1.9.0/vncviewer/vncviewer.cxx     2018-08-20 19:13:35.035348535 +0000
+@@ -353,6 +353,11 @@ static void usage(const char *programNam
+           "       %s [parameters] [.tigervnc file]\n",
+           programName, programName, programName);
    fprintf(stderr,"\n"
 +        "Options:\n\n"
 +        "  -display Xdisplay - Specifies the X display for the viewer window\n"

diff --git a/tigervnc-support-xorg120.patch b/tigervnc-support-xorg120.patch
deleted file mode 100644 (file)
index c219c7d..0000000
--- a/tigervnc-support-xorg120.patch
+++ /dev/null
@@ -1,64 +0,0 @@
-diff --git a/unix/xserver/hw/vnc/xorg-version.h b/unix/xserver/hw/vnc/xorg-version.h
-index 9d1c0eb8..16145711 100644
---- a/unix/xserver/hw/vnc/xorg-version.h
-+++ b/unix/xserver/hw/vnc/xorg-version.h
-@@ -52,8 +52,10 @@
- #define XORG 118
- #elif XORG_VERSION_CURRENT < ((1 * 10000000) + (19 * 100000) + (99 * 1000))
- #define XORG 119
-+#elif XORG_VERSION_CURRENT < ((1 * 10000000) + (20 * 100000) + (99 * 1000))
-+#define XORG 120
- #else
--#error "X.Org newer than 1.19 is not supported"
-+#error "X.Org newer than 1.20 is not supported"
- #endif
- 
- #endif
-diff --git a/unix/xserver/hw/vnc/xvnc.c b/unix/xserver/hw/vnc/xvnc.c
-index 57152cd5..9a61b1ef 100644
---- a/unix/xserver/hw/vnc/xvnc.c
-+++ b/unix/xserver/hw/vnc/xvnc.c
-@@ -84,6 +84,7 @@ from the X Consortium.
- #undef VENDOR_STRING
- #include "version-config.h"
- #include "site.h"
-+#include <glx_extinit.h>
- 
- #define XVNCVERSION "TigerVNC 1.8.0"
- #define XVNCCOPYRIGHT ("Copyright (C) 1999-2017 TigerVNC Team and many others (see README.txt)\n" \
-@@ -203,6 +204,7 @@ vfbBitsPerPixel(int depth)
- static void vfbFreeFramebufferMemory(vfbFramebufferInfoPtr pfb);
- 
- #ifdef DPMSExtension
-+#if XORG < 120
-     /* Why support DPMS? Because stupid modern desktop environments
-        such as Unity 2D on Ubuntu 11.10 crashes if DPMS is not
-        available. (DPMSSet is called by dpms.c, but the return value
-@@ -219,6 +221,7 @@ Bool DPMSSupported(void)
-     return FALSE;
- }
- #endif
-+#endif
- 
- #if XORG < 111
- void ddxGiveUp()
-@@ -1696,6 +1699,10 @@ InitOutput(ScreenInfo *scrInfo, int argc
- 
-     vncPrintBanner();
- 
-+#if XORG >= 120
-+    xorgGlxCreateVendor();
-+#else
-+
- #if XORG >= 113
- #ifdef GLXEXT
-     if (serverGeneration == 1)
-@@ -1707,6 +1714,8 @@ InitOutput(ScreenInfo *scrInfo, int argc
- #endif
- #endif
- 
-+#endif
-+
-     /* initialize pixmap formats */
- 
-     /* must have a pixmap depth to match every screen depth */

diff --git a/tigervnc.spec b/tigervnc.spec
index d2cc80320b3569fcdf10ccc35ab7cdfd4ebeb859..e0c851d8b9fe6b11aae8cfcccca2debc7e9dd8e0 100644 (file)
--- a/tigervnc.spec
+++ b/tigervnc.spec
@@ -3,12 +3,12 @@
 Summary:       A TigerVNC remote display system
 Summary(pl.UTF-8):     System zdalnego dostępu TigerVNC
 Name:          tigervnc
-Version:       1.8.0
-Release:       2
+Version:       1.9.0
+Release:       1
 License:       GPL v2
 Group:         X11/Applications/Networking
 Source0:       https://github.com/TigerVNC/tigervnc/archive/v%{version}.tar.gz?/%{name}-%{version}.tar.gz
-# Source0-md5: 5c9a80dd4b99b4eb19f535db5ce5830f
+# Source0-md5: c2f9ea552431cb8ae7f7af7300f3b53f
 Source1:       %{name}.desktop
 Source2:       vncserver.init
 Source3:       vncserver.sysconfig
@@ -17,7 +17,6 @@ Patch1:               %{name}-shebang.patch
 Patch2:                %{name}-utilize-system-crypto-policies.patch
 Patch3:                %{name}-xstartup.patch
 Patch4:                %{name}-getmaster.patch
-Patch5:                %{name}-support-xorg120.patch
 Patch100:      xserver.patch
 URL:           http://www.tigervnc.com/
 BuildRequires: ImageMagick
@@ -180,7 +179,6 @@ zdalny dostęp do pulpitu.
 %patch2 -p1
 %patch3 -p1
 %patch4 -p1
-%patch5 -p1
 
 cp -a %{_usrsrc}/xorg-xserver-server-%{_xserverver}/* unix/xserver
 cd unix/xserver
@@ -296,7 +294,7 @@ fi
 
 %files -f %{name}.lang
 %defattr(644,root,root,755)
-%doc README.txt doc/*
+%doc README.rst doc/*
 %attr(755,root,root) %{_bindir}/vncviewer
 %{_mandir}/man1/vncviewer.1*
 %{_desktopdir}/tigervnc.desktop