diff --git a/srcpkgs/tigervnc/patches/xorg118.patch b/srcpkgs/tigervnc/patches/xorg118.patch deleted file mode 100644 index e68c82b2b3b..00000000000 --- a/srcpkgs/tigervnc/patches/xorg118.patch +++ /dev/null @@ -1,27 +0,0 @@ -diff -wbBur unix/xserver/hw/vnc/Input.c unix/xserver/hw/vnc/Input.c ---- unix/xserver/hw/vnc/Input.c 2015-07-11 16:00:36.000000000 +0300 -+++ unix/xserver/hw/vnc/Input.c 2015-11-25 19:04:24.278747038 +0300 -@@ -300,6 +300,8 @@ - #if XORG < 111 - n = GetKeyboardEvents(eventq, dev, action, kc); - enqueueEvents(dev, n); -+#elif XORG > 117 -+ QueueKeyboardEvents(dev, action, kc); - #else - QueueKeyboardEvents(dev, action, kc, NULL); - #endif -diff -wbBur unix/xserver/hw/vnc/xorg-version.h unix/xserver/hw/vnc/xorg-version.h ---- unix/xserver/hw/vnc/xorg-version.h 2015-07-11 16:00:36.000000000 +0300 -+++ unix/xserver/hw/vnc/xorg-version.h 2015-11-25 19:02:47.688751421 +0300 -@@ -48,8 +48,10 @@ - #define XORG 116 - #elif XORG_VERSION_CURRENT < ((1 * 10000000) + (17 * 100000) + (99 * 1000)) - #define XORG 117 -+#elif XORG_VERSION_CURRENT < ((1 * 10000000) + (18 * 100000) + (99 * 1000)) -+#define XORG 118 - #else --#error "X.Org newer than 1.17 is not supported" -+#error "X.Org newer than 1.18 is not supported" - #endif - - #endif diff --git a/srcpkgs/tigervnc/template b/srcpkgs/tigervnc/template index 9d0c871990d..629945a34a9 100644 --- a/srcpkgs/tigervnc/template +++ b/srcpkgs/tigervnc/template @@ -1,8 +1,8 @@ # Template file for 'tigervnc' pkgname=tigervnc -version=1.6.0 -revision=2 -_xorg_version=1.18.2 +version=1.6.90 +revision=1 +_xorg_version=1.18.3 build_style=cmake short_desc="VNC client forked from TightVNC" maintainer="Evan Deaubl " @@ -16,8 +16,8 @@ conflicts="turbovnc>=0" homepage="http://www.tigervnc.org" distfiles="https://github.com/TigerVNC/tigervnc/archive/v${version}.tar.gz>tigervnc-${version}.tar.gz ${XORG_SITE}/xserver/xorg-server-${_xorg_version}.tar.bz2" -checksum="98ffe98fcfe883e6c35aec579295b53d73d2ccf62e0f6e53a73ecad993b096ca - 022142b07f6477d140dcc915902df326408a53ca3a352426a499f142b25d632d" +checksum="df11dd48d5c360dbe6c505a5a3cec3f12589fac759a0726f2f358c1aee36a5a9 + ea739c22517cdbe2b5f7c0a5fd05fe8a10ac0629003e71c0c7862f4bb60142cd" post_configure() { cd ${wrksrc}/unix/xserver