diff options
author | Uros Vampl | 2016-05-11 18:38:22 +0200 |
---|---|---|
committer | Uros Vampl | 2016-05-11 18:38:22 +0200 |
commit | 175849b9b52338498455bc573d38905de3ee9cc3 (patch) | |
tree | e5773e85157843d420680e1825eff2a8bffc48be | |
parent | 0e65b7d22782fb3d6f2cfd3da3fcfab7d3db6fea (diff) | |
download | aur-175849b9b52338498455bc573d38905de3ee9cc3.tar.gz |
use newer xorg-server
-rw-r--r-- | .SRCINFO | 8 | ||||
-rw-r--r-- | PKGBUILD | 15 | ||||
-rw-r--r-- | xorg118.patch | 29 |
3 files changed, 9 insertions, 43 deletions
@@ -1,6 +1,6 @@ pkgbase = tigervnc-git pkgdesc = Suite of VNC servers and clients. Based on the VNC 4 branch of TightVNC. - pkgver = r3167.36eac99 + pkgver = r3320.3821d7e pkgrel = 1 url = http://www.tigervnc.org arch = i686 @@ -45,15 +45,13 @@ 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.18.0.tar.bz2 + source = ftp://ftp.freedesktop.org/pub/xorg/individual/xserver/xorg-server-1.18.3.tar.bz2 source = vncserver.service source = vncviewer.desktop - source = xorg118.patch md5sums = SKIP - md5sums = 3c1c1057d3ad27380d8dd87ffcc182cd + md5sums = 043d720bf2472a65bb8f0daa97f83dfa md5sums = a8a20685c23a50f86a13c33ce96a7ba7 md5sums = b200d83c60e80c6f9693ea19a2d9f5b0 - md5sums = 731083cf1bd4d5ca338bc1f680a361b8 pkgname = tigervnc-git @@ -1,9 +1,9 @@ # Maintainer: Uroš Vampl <mobile.leecher at gmail dot com> pkgname=tigervnc-git -pkgver=r3167.36eac99 +pkgver=r3320.3821d7e pkgrel=1 -_xorgver=1.18.0 +_xorgver=1.18.3 pkgdesc="Suite of VNC servers and clients. Based on the VNC 4 branch of TightVNC." arch=('i686' 'x86_64') url="http://www.tigervnc.org" @@ -22,13 +22,11 @@ provides=('tigervnc') 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 - xorg118.patch) + vncviewer.desktop) md5sums=('SKIP' - '3c1c1057d3ad27380d8dd87ffcc182cd' + '043d720bf2472a65bb8f0daa97f83dfa' 'a8a20685c23a50f86a13c33ce96a7ba7' - 'b200d83c60e80c6f9693ea19a2d9f5b0' - '731083cf1bd4d5ca338bc1f680a361b8') + 'b200d83c60e80c6f9693ea19a2d9f5b0') pkgver() { cd tigervnc @@ -38,12 +36,11 @@ pkgver() { prepare() { cd tigervnc - 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 ../xserver117.patch + patch -Np1 -i ../xserver118.patch } build() { diff --git a/xorg118.patch b/xorg118.patch deleted file mode 100644 index c472139c77f1..000000000000 --- a/xorg118.patch +++ /dev/null @@ -1,29 +0,0 @@ -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 |