[arch-commits] Commit in tigervnc/trunk (PKGBUILD xorg115.patch)

[Sergej Pupykin]

    Date: Wednesday, January 15, 2014 @ 10:51:26
  Author: spupykin
Revision: 104075

upgpkg: tigervnc 1.3.0-4

upd

Added:
  tigervnc/trunk/xorg115.patch
Modified:
  tigervnc/trunk/PKGBUILD

---------------+
 PKGBUILD      |   14 +++++++++-----
 xorg115.patch |   15 +++++++++++++++
 2 files changed, 24 insertions(+), 5 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2014-01-15 09:49:32 UTC (rev 104074)
+++ PKGBUILD	2014-01-15 09:51:26 UTC (rev 104075)
@@ -4,8 +4,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"
@@ -23,13 +23,15 @@
 	vncserver.service
 	vncviewer.desktop
 	gethomedir.patch
-	getmaster.patch)
+	getmaster.patch
+	xorg115.patch)
 md5sums=('a5158228e64d14496821a39bf3851f1b'
-         '5d36a6483e8e301875131e8302c67727'
+         'c2ace3697b32414094cf8c597c39d7d9'
          '0903d5a0dfa38e0b04964505b644585c'
          '71cac0fb9701b0a041430f0fddfe00c8'
          '22f1523a0eca56ad79cfabd0db6e2cf6'
-         'e056a2502dfe0cb3b02e08cab689482f')
+         'e056a2502dfe0cb3b02e08cab689482f'
+         'd7765cb11be43b557ee77dfa486fdb68')
 
 prepare() {
   cd ${srcdir}/${pkgname}-${pkgver}
@@ -37,6 +39,7 @@
 
   patch -Np1 -i ${srcdir}/gethomedir.patch
   patch -Np1 -i ${srcdir}/getmaster.patch
+  patch -Np1 -i ${srcdir}/xorg115.patch
 }
 
 build() {
@@ -49,6 +52,7 @@
   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 \

Added: xorg115.patch
===================================================================
--- xorg115.patch	                        (rev 0)
+++ xorg115.patch	2014-01-15 09:51:26 UTC (rev 104075)
@@ -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