update for xorg-server-1.18

4 files changed, 42 insertions, 110 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 642d3b0b1517..c8a607cb6816 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,6 +1,6 @@
 pkgbase = tigervnc-git
 	pkgdesc = Suite of VNC servers and clients. Based on the VNC 4 branch of TightVNC.
-	pkgver = r3061.500cbe6e
+	pkgver = r3167.36eac99
 	pkgrel = 1
 	url = http://www.tigervnc.org
 	arch = i686
@@ -45,15 +45,15 @@ pkgbase = tigervnc-git
 	conflicts = tigervnc
 	conflicts = tightvnc
 	source = git+https://github.com/TigerVNC/tigervnc.git
-	source = ftp://ftp.freedesktop.org/pub/xorg/individual/xserver/xorg-server-1.17.1.tar.bz2
+	source = ftp://ftp.freedesktop.org/pub/xorg/individual/xserver/xorg-server-1.18.0.tar.bz2
 	source = vncserver.service
 	source = vncviewer.desktop
-	source = getmaster.patch
+	source = xorg118.patch
 	md5sums = SKIP
-	md5sums = 5986510d59e394a50126a8e2833e79d3
+	md5sums = 3c1c1057d3ad27380d8dd87ffcc182cd
 	md5sums = a8a20685c23a50f86a13c33ce96a7ba7
 	md5sums = b200d83c60e80c6f9693ea19a2d9f5b0
-	md5sums = 5ee303c958d14771affd5514de3328ca
+	md5sums = 731083cf1bd4d5ca338bc1f680a361b8
 
 pkgname = tigervnc-git
 
diff --git a/PKGBUILD b/PKGBUILD
index d5bcc9231a85..7be641158b63 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -1,9 +1,9 @@
 # Maintainer: Uroš Vampl <mobile.leecher at gmail dot com>
 
 pkgname=tigervnc-git
-pkgver=r3061.500cbe6e
+pkgver=r3167.36eac99
 pkgrel=1
-_xorgver=1.17.1
+_xorgver=1.18.0
 pkgdesc="Suite of VNC servers and clients. Based on the VNC 4 branch of TightVNC."
 arch=('i686' 'x86_64')
 url="http://www.tigervnc.org"
@@ -23,12 +23,12 @@ source=(git+https://github.com/TigerVNC/tigervnc.git
 	ftp://ftp.freedesktop.org/pub/xorg/individual/xserver/xorg-server-${_xorgver}.tar.bz2
 	vncserver.service
 	vncviewer.desktop
-	getmaster.patch)
+	xorg118.patch)
 md5sums=('SKIP'
-         '5986510d59e394a50126a8e2833e79d3'
+         '3c1c1057d3ad27380d8dd87ffcc182cd'
          'a8a20685c23a50f86a13c33ce96a7ba7'
          'b200d83c60e80c6f9693ea19a2d9f5b0'
-         '5ee303c958d14771affd5514de3328ca')
+         '731083cf1bd4d5ca338bc1f680a361b8')
 
 pkgver() {
   cd tigervnc
@@ -38,12 +38,12 @@ pkgver() {
 prepare() {
   cd tigervnc
 
-  patch -Np1 -i ${srcdir}/getmaster.patch
+  patch -Np1 -i ${srcdir}/xorg118.patch
   sed -i 's/iconic/nowin/' unix/vncserver
 
   cd unix/xserver
   cp -r ${srcdir}/xorg-server-${_xorgver}/* .
-  patch -Np1 -i ../xserver116.patch
+  patch -Np1 -i ../xserver117.patch
 }
 
 build() {
@@ -59,7 +59,7 @@ build() {
 	--disable-xwin --disable-xephyr --disable-kdrive --disable-xwayland \
 	--disable-config-hal --disable-config-udev --with-pic \
 	--disable-unit-tests --disable-devel-docs --disable-selective-werror \
-	--disable-dri --enable-dri2 --enable-dri3 --enable-glx --enable-glx-tls
+	--disable-dri --enable-dri2 --enable-dri3 --enable-glx
   make
 }
 
diff --git a/getmaster.patch b/getmaster.patch
deleted file mode 100644
index 2eb8d033f2ad..000000000000
--- a/getmaster.patch
+++ /dev/null
@@ -1,97 +0,0 @@
-diff --git a/unix/xserver/hw/vnc/InputXKB.c b/unix/xserver/hw/vnc/InputXKB.c
-index 8d7ae56..e7ded9c 100644
---- a/unix/xserver/hw/vnc/InputXKB.c
-+++ b/unix/xserver/hw/vnc/InputXKB.c
-@@ -212,10 +212,7 @@ void vncPrepareInputDevices(void)
- 
- unsigned vncGetKeyboardState(void)
- {
--	DeviceIntPtr master;
--
--	master = GetMaster(vncKeyboardDev, KEYBOARD_OR_FLOAT);
--	return XkbStateFieldFromRec(&master->key->xkbInfo->state);
-+	return XkbStateFieldFromRec(&vncKeyboardDev->master->key->xkbInfo->state);
- }
- 
- unsigned vncGetLevelThreeMask(void)
-@@ -236,7 +233,7 @@ unsigned vncGetLevelThreeMask(void)
- 			return 0;
- 	}
- 
--	xkb = GetMaster(vncKeyboardDev, KEYBOARD_OR_FLOAT)->key->xkbInfo->desc;
-+	xkb = vncKeyboardDev->master->key->xkbInfo->desc;
- 
- 	act = XkbKeyActionPtr(xkb, keycode, state);
- 	if (act == NULL)
-@@ -261,7 +258,7 @@ KeyCode vncPressShift(void)
- 	if (state & ShiftMask)
- 		return 0;
- 
--	xkb = GetMaster(vncKeyboardDev, KEYBOARD_OR_FLOAT)->key->xkbInfo->desc;
-+	xkb = vncKeyboardDev->master->key->xkbInfo->desc;
- 	for (key = xkb->min_key_code; key <= xkb->max_key_code; key++) {
- 		XkbAction *act;
- 		unsigned char mask;
-@@ -301,7 +298,7 @@ size_t vncReleaseShift(KeyCode *keys, size_t maxKeys)
- 
- 	count = 0;
- 
--	master = GetMaster(vncKeyboardDev, KEYBOARD_OR_FLOAT);
-+	master = vncKeyboardDev->master;
- 	xkb = master->key->xkbInfo->desc;
- 	for (key = xkb->min_key_code; key <= xkb->max_key_code; key++) {
- 		XkbAction *act;
-@@ -357,7 +354,7 @@ KeyCode vncPressLevelThree(void)
- 			return 0;
- 	}
- 
--	xkb = GetMaster(vncKeyboardDev, KEYBOARD_OR_FLOAT)->key->xkbInfo->desc;
-+	xkb = vncKeyboardDev->master->key->xkbInfo->desc;
- 
- 	act = XkbKeyActionPtr(xkb, keycode, state);
- 	if (act == NULL)
-@@ -388,7 +385,7 @@ size_t vncReleaseLevelThree(KeyCode *keys, size_t maxKeys)
- 
- 	count = 0;
- 
--	master = GetMaster(vncKeyboardDev, KEYBOARD_OR_FLOAT);
-+	master = vncKeyboardDev->master;
- 	xkb = master->key->xkbInfo->desc;
- 	for (key = xkb->min_key_code; key <= xkb->max_key_code; key++) {
- 		XkbAction *act;
-@@ -431,7 +428,7 @@ KeyCode vncKeysymToKeycode(KeySym keysym, unsigned state, unsigned *new_state)
- 	if (new_state != NULL)
- 		*new_state = state;
- 
--	xkb = GetMaster(vncKeyboardDev, KEYBOARD_OR_FLOAT)->key->xkbInfo->desc;
-+	xkb = vncKeyboardDev->master->key->xkbInfo->desc;
- 	for (key = xkb->min_key_code; key <= xkb->max_key_code; key++) {
- 		unsigned int state_out;
- 		KeySym dummy;
-@@ -488,7 +485,7 @@ int vncIsLockModifier(KeyCode keycode, unsigned state)
- 	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)
-@@ -526,7 +523,7 @@ int vncIsAffectedByNumLock(KeyCode keycode)
- 	if (numlock_keycode == 0)
- 		return 0;
- 
--	xkb = GetMaster(vncKeyboardDev, KEYBOARD_OR_FLOAT)->key->xkbInfo->desc;
-+	xkb = vncKeyboardDev->master->key->xkbInfo->desc;
- 
- 	act = XkbKeyActionPtr(xkb, numlock_keycode, state);
- 	if (act == NULL)
-@@ -560,7 +557,7 @@ KeyCode vncAddKeysym(KeySym keysym, unsigned state)
- 	KeySym *syms;
- 	KeySym upper, lower;
- 
--	master = GetMaster(vncKeyboardDev, KEYBOARD_OR_FLOAT);
-+	master = vncKeyboardDev->master;
- 	xkb = master->key->xkbInfo->desc;
- 	for (key = xkb->max_key_code; key >= xkb->min_key_code; key--) {
- 		if (XkbKeyNumGroups(xkb, key) == 0)
diff --git a/xorg118.patch b/xorg118.patch
new file mode 100644
index 000000000000..c472139c77f1
--- /dev/null
+++ b/xorg118.patch
@@ -0,0 +1,29 @@
+diff --git a/unix/xserver/hw/vnc/Input.c b/unix/xserver/hw/vnc/Input.c
+index 4c90a95..a92188d 100644
+--- a/unix/xserver/hw/vnc/Input.c
++++ b/unix/xserver/hw/vnc/Input.c
+@@ -301,7 +301,7 @@ static inline void pressKey(DeviceIntPtr dev, int kc, Bool down, const char *msg
+ 	n = GetKeyboardEvents(eventq, dev, action, kc);
+ 	enqueueEvents(dev, n);
+ #else
+-	QueueKeyboardEvents(dev, action, kc, NULL);
++	QueueKeyboardEvents(dev, action, kc);
+ #endif
+ }
+ 
+diff --git a/unix/xserver/hw/vnc/xorg-version.h b/unix/xserver/hw/vnc/xorg-version.h
+index 8cc1c86..60610cb 100644
+--- a/unix/xserver/hw/vnc/xorg-version.h
++++ b/unix/xserver/hw/vnc/xorg-version.h
+@@ -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