Date: Monday, December 15, 2014 @ 18:39:36 Author: spupykin Revision: 123915
upgpkg: tigervnc 1.4.0-1 upd Added: tigervnc/trunk/compile_fix.patch Modified: tigervnc/trunk/PKGBUILD -------------------+ PKGBUILD | 20 +++++++++++--------- compile_fix.patch | 13 +++++++++++++ 2 files changed, 24 insertions(+), 9 deletions(-) Modified: PKGBUILD =================================================================== --- PKGBUILD 2014-12-15 17:17:07 UTC (rev 123914) +++ PKGBUILD 2014-12-15 17:39:36 UTC (rev 123915) @@ -2,9 +2,9 @@ # Maintainer: Uroš Vampl <mobile.leecher at gmail dot com> pkgname=tigervnc -pkgver=1.3.90 +pkgver=1.4.0 pkgrel=1 -_xorgver=1.16.2 +_xorgver=1.16.2.901 pkgdesc="Suite of VNC servers and clients. Based on the VNC 4 branch of TightVNC." arch=('i686' 'x86_64') url="http://www.tigervnc.org" @@ -11,14 +11,13 @@ license=('GPL') depends=('fltk' 'pam' 'gnutls' 'libjpeg-turbo' 'libxtst' 'libxfont' 'pixman' 'xorg-xauth' 'xorg-xsetroot' 'xkeyboard-config' 'xorg-xkbcomp' - 'libgcrypt' 'perl' ) + 'libgl' 'libgcrypt' 'perl' ) makedepends=('cmake' 'nasm' 'xorg-font-util' 'xorg-util-macros' 'bigreqsproto' 'compositeproto' 'damageproto' 'randrproto' 'resourceproto' 'scrnsaverproto' 'videoproto' 'xcmiscproto' 'xf86vidmodeproto' 'xtrans' 'glproto' 'dri2proto' 'dri3proto' 'presentproto' 'mesa' 'imagemagick') -optdepends=('mesa-dri: for OpenGL functionality in Xvnc' - 'libgl: for OpenGL functionality in Xvnc') +optdepends=('mesa: for OpenGL functionality in Xvnc') conflicts=('tightvnc') source=(https://github.com/TigerVNC/tigervnc/archive/v${pkgver}.tar.gz ftp://ftp.freedesktop.org/pub/xorg/individual/xserver/xorg-server-${_xorgver}.tar.bz2 @@ -25,13 +24,15 @@ vncserver.service vncviewer.desktop gethomedir.patch - getmaster.patch) -md5sums=('d1aa5653d3b4e8a04b33e01f11d4fde0' - '89620960b13515db8d0a8dbb92a1378a' + getmaster.patch + compile_fix.patch) +md5sums=('fd0288ad4b7bff8648fcb59fba177e0d' + '82cbcf6755787962e943d8e23495358d' '87678d73cc7c3fcd12797da43a0d061e' 'b200d83c60e80c6f9693ea19a2d9f5b0' '22f1523a0eca56ad79cfabd0db6e2cf6' - 'e056a2502dfe0cb3b02e08cab689482f') + 'e056a2502dfe0cb3b02e08cab689482f' + '557f978305b46b880dacd07461ad8db9') prepare() { cd ${srcdir}/${pkgname}-${pkgver} @@ -38,6 +39,7 @@ patch -Np1 -i ${srcdir}/gethomedir.patch patch -Np1 -i ${srcdir}/getmaster.patch + patch -Np1 -i ${srcdir}/compile_fix.patch sed -i 's/iconic/nowin/' unix/vncserver cd unix/xserver Added: compile_fix.patch =================================================================== --- compile_fix.patch (rev 0) +++ compile_fix.patch 2014-12-15 17:39:36 UTC (rev 123915) @@ -0,0 +1,13 @@ +diff -ur tigervnc-1.4.0.orig/unix/xserver/hw/vnc/Makefile.am tigervnc-1.4.0/unix/xserver/hw/vnc/Makefile.am +--- tigervnc-1.4.0.orig/unix/xserver/hw/vnc/Makefile.am 2014-12-10 11:18:40.000000000 +0100 ++++ tigervnc-1.4.0/unix/xserver/hw/vnc/Makefile.am 2014-12-14 23:17:54.569210661 +0100 +@@ -7,6 +7,9 @@ + XREGION_LIB=$(LIB_DIR)/Xregion/libXregion.la + COMMON_LIBS=$(NETWORK_LIB) $(RFB_LIB) $(RDR_LIB) $(XREGION_LIB) + ++# Hack to get the C headers to work when included from C++ code ++AM_CXXFLAGS = -fpermissive ++ + noinst_LTLIBRARIES = libvnccommon.la + + HDRS = RegionHelper.h vncExtInit.h vncHooks.h XserverDesktop.h xorg-version.h \