community/tigervnc to 1.3.90-1

This commit is contained in:
David Beauchamp 2014-11-24 14:03:23 -05:00
parent e34c132c08
commit 737a28e986
2 changed files with 16 additions and 17 deletions

View file

@ -4,52 +4,50 @@
# ALARM: Kevin Mihelich <kevin@archlinuxarm.org> # ALARM: Kevin Mihelich <kevin@archlinuxarm.org>
# - use -fPIC for v7 # - use -fPIC for v7
# ALARM: David Beauchamp <david@archlinuxarm.org>
# - remove mesa-dri from optdepends
pkgname=tigervnc pkgname=tigervnc
pkgver=1.3.1 pkgver=1.3.90
pkgrel=6 pkgrel=1
_xorgver=1.16.0 _xorgver=1.16.2
pkgdesc="Suite of VNC servers and clients. Based on the VNC 4 branch of TightVNC." pkgdesc="Suite of VNC servers and clients. Based on the VNC 4 branch of TightVNC."
arch=('i686' 'x86_64') arch=('i686' 'x86_64')
url="http://www.tigervnc.org" url="http://www.tigervnc.org"
license=('GPL') license=('GPL')
depends=('fltk' 'pam' 'gnutls' 'libjpeg-turbo' 'libxtst' 'libxfont' 'pixman' depends=('fltk' 'pam' 'gnutls' 'libjpeg-turbo' 'libxtst' 'libxfont' 'pixman'
'xorg-xauth' 'xorg-xsetroot' 'xkeyboard-config' 'xorg-xkbcomp' 'xorg-xauth' 'xorg-xsetroot' 'xkeyboard-config' 'xorg-xkbcomp'
'libgl' 'libgcrypt' 'perl' ) 'libgcrypt' 'perl' )
makedepends=('cmake' 'nasm' 'xorg-font-util' 'xorg-util-macros' 'bigreqsproto' makedepends=('cmake' 'nasm' 'xorg-font-util' 'xorg-util-macros' 'bigreqsproto'
'compositeproto' 'damageproto' 'randrproto' 'resourceproto' 'compositeproto' 'damageproto' 'randrproto' 'resourceproto'
'scrnsaverproto' 'videoproto' 'xcmiscproto' 'xf86vidmodeproto' 'scrnsaverproto' 'videoproto' 'xcmiscproto' 'xf86vidmodeproto'
'xtrans' 'glproto' 'dri2proto' 'dri3proto' 'presentproto' 'xtrans' 'glproto' 'dri2proto' 'dri3proto' 'presentproto'
'imagemagick' 'mesa') 'mesa' 'imagemagick')
optdepends=('libgl: for OpenGL functionality in Xvnc')
conflicts=('tightvnc') conflicts=('tightvnc')
source=(http://downloads.sourceforge.net/project/tigervnc/tigervnc/$pkgver/tigervnc-$pkgver.tar.gz source=(https://github.com/TigerVNC/tigervnc/archive/v${pkgver}.tar.gz
ftp://ftp.freedesktop.org/pub/xorg/individual/xserver/xorg-server-${_xorgver}.tar.bz2 ftp://ftp.freedesktop.org/pub/xorg/individual/xserver/xorg-server-${_xorgver}.tar.bz2
vncserver.service vncserver.service
vncviewer.desktop vncviewer.desktop
gethomedir.patch gethomedir.patch
getmaster.patch getmaster.patch)
xorg116.patch md5sums=('d1aa5653d3b4e8a04b33e01f11d4fde0'
xserver116.patch) '89620960b13515db8d0a8dbb92a1378a'
md5sums=('e80b16aa74f1d8e89f284a6aef99955d' '87678d73cc7c3fcd12797da43a0d061e'
'8a9ff6ee9907360f09b5bdabb8089502'
'0903d5a0dfa38e0b04964505b644585c'
'71cac0fb9701b0a041430f0fddfe00c8' '71cac0fb9701b0a041430f0fddfe00c8'
'22f1523a0eca56ad79cfabd0db6e2cf6' '22f1523a0eca56ad79cfabd0db6e2cf6'
'e056a2502dfe0cb3b02e08cab689482f' 'e056a2502dfe0cb3b02e08cab689482f')
'e212f9d268a62af0349183a495bc55a5'
'948218a19eac135484267d9990502bf6')
prepare() { prepare() {
cd ${srcdir}/${pkgname}-${pkgver} cd ${srcdir}/${pkgname}-${pkgver}
patch -Np1 -i ${srcdir}/gethomedir.patch patch -Np1 -i ${srcdir}/gethomedir.patch
patch -Np1 -i ${srcdir}/getmaster.patch patch -Np1 -i ${srcdir}/getmaster.patch
patch -Np1 -i ${srcdir}/xorg116.patch
sed -i 's/iconic/nowin/' unix/vncserver sed -i 's/iconic/nowin/' unix/vncserver
cd unix/xserver cd unix/xserver
cp -r ${srcdir}/xorg-server-${_xorgver}/* . cp -r ${srcdir}/xorg-server-${_xorgver}/* .
patch -Np1 -i ${srcdir}/xserver116.patch patch -Np1 -i ../xserver116.patch
} }
build() { build() {

View file

@ -21,6 +21,7 @@ After=syslog.target network.target
Type=forking Type=forking
User= User=
ExecStartPre=/bin/sh -c '/usr/bin/vncserver -kill %i >/dev/null 2>&1 || true'
ExecStart=/usr/bin/vncserver %i ExecStart=/usr/bin/vncserver %i
ExecStop=/usr/bin/vncserver -kill %i ExecStop=/usr/bin/vncserver -kill %i