community/tigervnc to 1.3.0-4 (xorg115)

community/tigervnc/PKGBUILD

@@ -7,8 +7,8 @@
 
 pkgname=tigervnc
 pkgver=1.3.0
-pkgrel=3
-_xorgver=1.14.2
+pkgrel=4
+_xorgver=1.15.0
 pkgdesc="suite of VNC servers and clients. VNC 4 branch of TightVNC."
 arch=('i686' 'x86_64')
 url="http://www.tigervnc.org"
@@ -20,7 +20,6 @@ makedepends=('cmake' 'nasm' 'xorg-font-util' 'xorg-util-macros' 'bigreqsproto'
 	     'compositeproto' 'damageproto' 'randrproto' 'resourceproto'
 	     'scrnsaverproto' 'videoproto' 'xcmiscproto' 'xf86vidmodeproto'
 	     'xtrans' 'mesa' 'glproto' 'dri2proto' 'imagemagick')
-options=(!libtool)
 conflicts=('tightvnc')
 source=(http://downloads.sourceforge.net/project/tigervnc/tigervnc/$pkgver/tigervnc-$pkgver.tar.bz2
 	ftp://ftp.freedesktop.org/pub/xorg/individual/xserver/xorg-server-${_xorgver}.tar.bz2
@@ -28,14 +27,16 @@ source=(http://downloads.sourceforge.net/project/tigervnc/tigervnc/$pkgver/tiger
 	vncviewer.desktop
 	xserver114.patch
 	gethomedir.patch
-	getmaster.patch)
+	getmaster.patch
+    xorg115.patch)
 md5sums=('a5158228e64d14496821a39bf3851f1b'
-         '5d36a6483e8e301875131e8302c67727'
+         'c2ace3697b32414094cf8c597c39d7d9'
          '0903d5a0dfa38e0b04964505b644585c'
          '71cac0fb9701b0a041430f0fddfe00c8'
          '928faf837ba5b1b34283f9f018df2f5e'
          '22f1523a0eca56ad79cfabd0db6e2cf6'
-         'e056a2502dfe0cb3b02e08cab689482f')
+         'e056a2502dfe0cb3b02e08cab689482f'
+         'd7765cb11be43b557ee77dfa486fdb68')
 
 prepare() {
   cd ${srcdir}/${pkgname}-${pkgver}
@@ -43,6 +44,7 @@ prepare() {
 
   patch -Np1 -i ${srcdir}/gethomedir.patch
   patch -Np1 -i ${srcdir}/getmaster.patch
+  patch -Np1 -i ${srcdir}/xorg115.patch 
 }
 
 build() {
@@ -59,6 +61,7 @@ build() {
   patch -Np1 -i ../xserver114.patch
   autoreconf -fiv
   ./configure --prefix=/usr \
+    --disable-wayland --disable-present --disable-dri3 \
 	--disable-static --disable-xinerama --without-dtrace \
 	--disable-xorg --disable-xnest --disable-xvfb --disable-dmx \
 	--disable-xwin --disable-xephyr --disable-kdrive --with-pic \

community/tigervnc/xorg115.patch

@@ -0,0 +1,15 @@
+diff -up tigervnc-1.3.0/unix/xserver/hw/vnc/xorg-version.h.jx tigervnc-1.3.0/unix/xserver/hw/vnc/xorg-version.h
+--- tigervnc-1.3.0/unix/xserver/hw/vnc/xorg-version.h.jx    2013-07-01 08:41:24.000000000 -0400
++++ tigervnc-1.3.0/unix/xserver/hw/vnc/xorg-version.h   2013-11-07 11:39:49.749992669 -0500
+@@ -44,8 +44,10 @@
+ #define XORG 113
+ #elif XORG_VERSION_CURRENT < ((1 * 10000000) + (14 * 100000) + (99 * 1000))
+ #define XORG 114
++#elif XORG_VERSION_CURRENT < ((1 * 10000000) + (15 * 100000) + (99 * 1000))
++#define XORG 115
+ #else
+-#error "X.Org newer than 1.14 is not supported"
++#error "X.Org newer than 1.15 is not supported"
+ #endif
+ 
+ #endif