Merge branch 'master' of ssh://vparabola/home/parabola/abslibre-pre-mips64el

Conflicts:
	community/aspell-pl/PKGBUILD
	community/gloox/PKGBUILD
	community/libircclient/PKGBUILD
	community/mashup/PKGBUILD
	community/omniorb/PKGBUILD
	community/openbox/PKGBUILD
	community/patchutils/PKGBUILD
	community/rxvt-unicode/PKGBUILD
	extra/mesa/PKGBUILD
	extra/pygobject2/PKGBUILD
	extra/qt5/PKGBUILD
	extra/samba/PKGBUILD
	extra/tdb/PKGBUILD
	extra/transmission/PKGBUILD
	extra/vim/PKGBUILD
	pcr/python-sfml2/PKGBUILD
	pcr/python2-sfml2/PKGBUILD

1 files changed, 16 insertions, 38 deletions

diff --git a/community/tigervnc/PKGBUILD b/community/tigervnc/PKGBUILD
index e05d189d0..4e2ad657b 100644
--- a/community/tigervnc/PKGBUILD
+++ b/community/tigervnc/PKGBUILD
@@ -1,65 +1,43 @@
-# $Id: PKGBUILD 93093 2013-06-24 09:56:34Z spupykin $
+# $Id: PKGBUILD 93706 2013-07-08 14:56:58Z spupykin $
 # Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com>
 # Maintainer: Uroš Vampl <mobile.leecher at gmail dot com>
 
 pkgname=tigervnc
-pkgver=1.2.0
-pkgrel=13
-_xorgver=1.14.0
+pkgver=1.3.0
+pkgrel=1
+_xorgver=1.14.2
 pkgdesc="suite of VNC servers and clients. VNC 4 branch of TightVNC."
 arch=('i686' 'x86_64')
 url="http://www.tigervnc.org"
 license=('GPL')
 depends=('pam' 'gnutls' 'libjpeg-turbo' 'libxft' 'libxinerama' 'libxcursor'
 	 'libxtst' 'libxfont' 'pixman' 'xorg-xauth' 'xorg-xsetroot'
-	 'xkeyboard-config' 'libgl' 'libgcrypt' 'perl' 'xorg-xkbcomp')
+	 'xkeyboard-config' 'libgl' 'libgcrypt' 'perl' 'xorg-xkbcomp'
+	 'fltk')
 makedepends=('cmake' 'nasm' 'xorg-font-util' 'xorg-util-macros' 'bigreqsproto'
 	     'compositeproto' 'damageproto' 'randrproto' 'resourceproto'
 	     'scrnsaverproto' 'videoproto' 'xcmiscproto' 'xf86vidmodeproto'
 	     'xtrans' 'mesa' 'glproto' 'dri2proto' 'imagemagick' 'librsvg')
 options=(!libtool)
 conflicts=('tightvnc')
-source=(http://downloads.sourceforge.net/tigervnc/${pkgname}-${pkgver}.tar.gz
+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
 	vncserver.service
 	vncviewer.desktop
-	xorg111.patch
-	xorg112.patch
-	xorg113.patch
-	xorg114.patch
-	xserver113.patch
-	xserver114.patch
-	glx.patch
-	gnutls.patch
-	gethomedir.patch
-	cmakelists.patch)
-md5sums=('3a5755b4ed600a81c3a17976c6f8420d'
-         '86110278b784e279381b7f6f2295c508'
+	xserver114.patch)
+md5sums=('a5158228e64d14496821a39bf3851f1b'
+         '5d36a6483e8e301875131e8302c67727'
          '0903d5a0dfa38e0b04964505b644585c'
          '15c0405f920c3dac250692e8922578d1'
-         'b680b55f7f9f569cd26ac0b330012a8b'
-         'f73e055153889ae7b5aac8e697f7a841'
-         'ef4078ba31a583dc3134e9090fbd30d0'
-         '72518a7a1e7d3721ebe7404dcd8b3d01'
-         'fabbe561d4ac845317ffdbf1bb2eeb02'
-         '928faf837ba5b1b34283f9f018df2f5e'
-         '4b86c015c78a0360205fdcf511ea1c39'
-         '1a5fe8867ab3e49e20aafc70c415494f'
-         'fa059baabe72308bf82622bca73cb3e0'
-         '6ef923c71cc0e79c4b37eb3b124eea75')
+         '928faf837ba5b1b34283f9f018df2f5e')
 
-build() {
+prepare() {
   cd ${srcdir}/${pkgname}-${pkgver}
-
   cp -r ${srcdir}/xorg-server-${_xorgver}/* unix/xserver
-  patch -Np1 -i ${srcdir}/gnutls.patch
-  patch -Np1 -i ${srcdir}/gethomedir.patch
-  patch -Np1 -i ${srcdir}/cmakelists.patch
-  patch -Np1 -i ${srcdir}/xorg111.patch
-  patch -Np1 -i ${srcdir}/xorg112.patch
-  patch -Np1 -i ${srcdir}/xorg113.patch
-  patch -Np1 -i ${srcdir}/xorg114.patch
-  patch -Np1 -i ${srcdir}/glx.patch
+}
+
+build() {
+  cd ${srcdir}/${pkgname}-${pkgver}
 
   cmake -G "Unix Makefiles" -DCMAKE_INSTALL_PREFIX=/usr -DUSE_INCLUDED_FLTK=yes
   make