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
author: Nicolás Reynolds <fauno@endefensadelsl.org> 2013-07-09 21:04:53 -0300
committer: Nicolás Reynolds <fauno@endefensadelsl.org> 2013-07-09 21:04:53 -0300
commit: fd5ff7e53a5b8dbabc85ab6e2ff1342b85e155b1 (patch)
tree: d2b16d75c64d947545149f37bda7cdb8873a4770 /community
parent: 7823c9009a845174746fd0da09af46a138481851 (diff)
parent: 10aa61ef39e662453e1d817046e359372fe3b326 (diff)
73 files changed, 721 insertions, 1805 deletions
diff --git a/community/arm-wince-cegcc-binutils/PKGBUILD b/community/arm-wince-cegcc-binutils/PKGBUILD
deleted file mode 100644
index edd8f46df..000000000
--- a/community/arm-wince-cegcc-binutils/PKGBUILD
+++ /dev/null
@@ -1,36 +0,0 @@
-# $Id: PKGBUILD 60993 2011-12-20 11:27:39Z spupykin $
-# Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com>
-
-pkgname=arm-wince-cegcc-binutils
-pkgver=0.59.1
-pkgrel=1
-_prefix=/opt/cegcc
-pkgdesc="CE GCC bundle - cross compilation tools for WinCE"
-arch=(i686 x86_64)
-license=(GPL)
-options=(!libtool)
-url="http://cegcc.sf.net"
-depends=(zlib)
-groups=('cegcc')
-source=(http://arch.p5n.pp.ru/~sergej/dl/cegcc-$pkgver.tar.bz2)
-md5sums=('5e3c1098abdf8e5db2a3518ee3578b4b')
-
-build() {
-  cd $srcdir/cegcc/src/binutils
-
-  unset CFLAGS
-  unset LDFLAGS
-
-  find . -name Makefile.in -exec sed -i 's|WARN_CFLAGS =.*|WARN_CFLAGS =|g' {} \;
-  [ $NOEXTRACT -eq 1 ] || ./configure \
-	--prefix=${_prefix}      \
-	--exec-prefix=${_prefix} \
-	--bindir=${_prefix}/bin  \
-	--target=arm-wince-cegcc \
-	--disable-nls            \
-	--includedir=${_prefix}/include
-
-  make || (cd etc && make) && make
-  make DESTDIR=$pkgdir install
-  rm -rf $pkgdir/opt/cegcc/info
-}
diff --git a/community/aspell-pl/PKGBUILD b/community/aspell-pl/PKGBUILD
index b46e38cd8..6802622df 100644
--- a/community/aspell-pl/PKGBUILD
+++ b/community/aspell-pl/PKGBUILD
@@ -1,29 +1,26 @@
-# $Id: PKGBUILD 58727 2011-11-18 05:20:53Z bpiotrowski $
+# $Id: PKGBUILD 93578 2013-07-05 19:42:56Z bpiotrowski $
 # Maintainer: Bartłomiej Piotrowski <barthalion@gmail.com>
 # Contributor: Jaroslaw Swierczynski <swiergot@aur.archlinux.org>
 # Contributor: Arkadiusz Laczynski <alaczynski@gmail.com>
 
 pkgname=aspell-pl
-pkgver=20111117
+pkgver=20130705
 pkgrel=1
-pkgdesc="Polish dictionary for aspell"
+pkgdesc='Polish dictionary for aspell'
 arch=('i686' 'x86_64' 'mips64el')
 url="http://www.sjp.pl/slownik/en/"
 license=('GPL' 'LGPL' 'MPL')
 depends=('aspell')
-#source=(http://sjp.pl/slownik/ort/sjp-aspell6-pl-6.0_$pkgver-0.tar.bz2)
 source=(ftp://ftp.archlinux.org/other/community/$pkgname/sjp-aspell6-pl-6.0_$pkgver-0.tar.bz2)
-md5sums=('27aa9ca734d7049238399c279c5417fb')
+md5sums=('977708b770709d55909b23be2851af10')
 
 build() {
-  cd "$srcdir/aspell6-pl-6.0_$pkgver-0"
-
+  cd aspell6-pl-6.0_$pkgver-0
   ./configure
   make
 }
 
 package() {
-  cd "$srcdir/aspell6-pl-6.0_$pkgver-0"
-
+  cd aspell6-pl-6.0_$pkgver-0
   make DESTDIR="$pkgdir" install
 }
diff --git a/community/c++-gtk-utils/PKGBUILD b/community/c++-gtk-utils/PKGBUILD
index 55da00752..8ed15d896 100644
--- a/community/c++-gtk-utils/PKGBUILD
+++ b/community/c++-gtk-utils/PKGBUILD
@@ -1,8 +1,8 @@
-# $Id: PKGBUILD 92397 2013-06-04 16:29:40Z giovanni $
+# $Id: PKGBUILD 93711 2013-07-08 17:21:21Z giovanni $
 # Maintainer: Giovanni Scafora <giovanni@archlinux.org>
 
 pkgname=c++-gtk-utils
-pkgver=2.0.17
+pkgver=2.0.18
 pkgrel=1
 pkgdesc="Classes and functions for programming in GTK+"
 arch=('i686' 'x86_64' 'mips64el')
@@ -11,7 +11,7 @@ license=('LGPL2.1')
 depends=('gtk3')
 options=('!libtool' '!docs' '!emptydirs')
 source=("http://downloads.sourceforge.net/project/cxx-gtk-utils/cxx-gtk-utils/${pkgver}/${pkgname}-${pkgver}.tar.gz")
-md5sums=('2ce17c4d9f2cc669f67f0087479e278a')
+md5sums=('446a8e0120d69639b1950c72bd545116')
 
 build() {
   cd "${srcdir}/${pkgname}-${pkgver}"
diff --git a/community/cgoban/PKGBUILD b/community/cgoban/PKGBUILD
new file mode 100644
index 000000000..0c16f3877
--- /dev/null
+++ b/community/cgoban/PKGBUILD
@@ -0,0 +1,27 @@
+# $Id: PKGBUILD 93531 2013-07-05 01:29:22Z bisson $
+# Maintainer: Gaetan Bisson <bisson@archlinux.org>
+# Contributor: Jason Chu <jason@archlinux.org>
+# Contributor: Tom Newsom <Jeepster@gmx.co.uk>
+
+pkgname=cgoban
+pkgver=1.9.14
+pkgrel=2
+pkgdesc='SGF editor and client for connection to IGS'
+url='http://sourceforge.net/projects/cgoban1/'
+arch=('i686' 'x86_64')
+license=('GPL2')
+depends=('libxt')
+source=("http://downloads.sourceforge.net/project/cgoban1/cgoban1/${pkgver}/${pkgname}-${pkgver}.tar.gz")
+sha1sums=('90bd53499c9f410caddaae601e7f00350d520a32')
+
+build() {
+	cd "${srcdir}/${pkgname}-${pkgver}"
+	./configure --prefix=/usr --mandir=/usr/share/man
+	make
+}
+
+package() {
+	cd "${srcdir}/${pkgname}-${pkgver}"
+	install -d "${pkgdir}"/usr/{bin,share/man/man6}
+	make DESTDIR="${pkgdir}" install
+}
diff --git a/community/cromfs/PKGBUILD b/community/cromfs/PKGBUILD
new file mode 100644
index 000000000..2d3b2454a
--- /dev/null
+++ b/community/cromfs/PKGBUILD
@@ -0,0 +1,34 @@
+# $Id: PKGBUILD 93532 2013-07-05 01:31:34Z bisson $
+# Maintainer: Gaetan Bisson <bisson@archlinux.org>
+
+pkgname=cromfs
+pkgver=1.5.10.1
+pkgrel=2
+arch=('i686' 'x86_64')
+pkgdesc='Compressed read-only filesystem based on FUSE'
+url='http://bisqwit.iki.fi/source/cromfs.html'
+license=('GPL')
+depends=('fuse' 'lzo2')
+source=("http://bisqwit.iki.fi/src/arch/${pkgname}-${pkgver}.tar.gz"
+        'make-generic.patch')
+sha1sums=('3d591530ea3a6ed9b6b53b3fcccf9c7c021efd13'
+          'ae51f1d2446df20bcbaef6ac125b1756177725d4')
+
+prepare() {
+	cd "${srcdir}/${pkgname}-${pkgver}"
+	patch -p1 -i ../make-generic.patch
+}
+
+build() {
+	cd "${srcdir}/${pkgname}-${pkgver}"
+	./configure
+	make
+}
+
+package() {
+	cd "${srcdir}/${pkgname}-${pkgver}"
+	make DESTDIR="${pkgdir}" install
+	install -d "${pkgdir}"/usr/{bin,share/doc/cromfs}
+	install -m755 install/progs/* "${pkgdir}"/usr/bin/
+	install -m644 install/docs/* "${pkgdir}"/usr/share/doc/cromfs/
+}
diff --git a/community/cromfs/make-generic.patch b/community/cromfs/make-generic.patch
new file mode 100644
index 000000000..6dff65efb
--- /dev/null
+++ b/community/cromfs/make-generic.patch
@@ -0,0 +1,25 @@
+diff -Naur old/configure new/configure
+--- old/configure	2012-04-11 09:33:55.000000000 +0200
++++ new/configure	2012-04-11 12:05:07.098916602 +0200
+@@ -96,9 +96,9 @@
+   fi
+ }
+ 
+-CFLAGS=""
+-CPPFLAGS=""
+-LDFLAGS=""
++CFLAGS="$CFLAGS"
++CPPFLAGS="$CXXFLAGS"
++LDFLAGS="$LDFLAGS"
+ OPTIM=""
+ 
+ do_echo -n "Determining compiler version to use... "
+@@ -451,6 +451,8 @@
+   OPTIM="$OPTIM_BACKUP $BEST_CPUFEATURE"
+ fi
+ 
++OPTIM=""
++
+ do_echo "Updating Makefile.sets ..."
+ 
+ if [ "$DEBUG" = "1" ]; then
diff --git a/community/doublecmd/PKGBUILD b/community/doublecmd/PKGBUILD
index ade9c7dae..cddc9f719 100644
--- a/community/doublecmd/PKGBUILD
+++ b/community/doublecmd/PKGBUILD
@@ -1,33 +1,48 @@
-# $Id: PKGBUILD 70846 2012-05-17 18:29:58Z idevolder $
+# vim:set ft=sh:
+# $Id: PKGBUILD 93494 2013-07-04 12:38:35Z idevolder $
 # Maintainer: BlackIkeEagle <ike DOT devolder AT gmail DOT com>
 # Contributor: (sirocco AT ngs.ru)
 
 pkgbase=doublecmd
 pkgname=('doublecmd-gtk2' 'doublecmd-qt')
-pkgver=0.5.4
-_helpver=0.5.1
-pkgrel=2.1
+pkgver=0.5.5
+_helpver=0.5.5
+pkgrel=1
 url="http://doublecmd.sourceforge.net/"
 arch=('i686' 'x86_64')
 license=('GPL')
 install="$pkgbase.install"
 provides=("$pkgbase")
 makedepends=('lazarus' 'qt4pas' 'gtk2')
-optdepends=('lua: scripting' 'p7zip: support for 7zip archives' 'libunrar: support for rar archives')
-source=("http://downloads.sourceforge.net/project/$pkgbase/Double%20Commander%20Source/$pkgbase-$pkgver-src.tar.gz"
+optdepends=(
+	'lua51: scripting'
+	'p7zip: support for 7zip archives'
+	'libunrar: support for rar archives'
+)
+source=(
+	"http://downloads.sourceforge.net/project/$pkgbase/Double%20Commander%20Source/$pkgbase-$pkgver-src.tar.gz"
 	"http://downloads.sourceforge.net/project/$pkgbase/Double%20Commander%20Source/$pkgbase-help-$_helpver-src.tar.gz"
 )
-sha256sums=('480b83279adeba007ad5c54f455733fae3d9c9ee61762e6b5a63e2e67b1cd7b7'
-            'd9f518e05e089b71aaa31c7d4af8177e77594a02be2c316e85e061e63b4c03e5')
+sha256sums=('253ec036ec119c067f501247445acdd35d67ffd9693d246dc4e98897c6df6434'
+            '5c5d00187df811df0734bf751a581bce7e1bdd4cf4639b2a1101f1da8743daaf')
 
 build() {
 	cp -a $pkgbase-$pkgver $pkgbase-gtk
 	cp -a $pkgbase-$pkgver $pkgbase-qt
 
 	cd "$srcdir/$pkgbase-gtk"
+	if [ "$CARCH" = "i686" ]; then
+		sed -e '/fPIC/d' -i "$srcdir/$pkgbase-gtk/components/doublecmd/doublecmd_common.lpk"
+	fi
+	sed -e 's/\(export\ lazbuild=\).*/\1"$(which\ lazbuild) --lazarusdir=\/usr\/lib\/lazarus"/' -i build.sh
 	./build.sh beta gtk2
 
 	cd "$srcdir/$pkgbase-qt"
+	# dont use fPIC on i686
+	if [ "$CARCH" = "i686" ]; then
+		sed -e '/fPIC/d' -i "$srcdir/$pkgbase-qt/components/doublecmd/doublecmd_common.lpk"
+	fi
+	sed -e 's/\(export\ lazbuild=\).*/\1"$(which\ lazbuild) --lazarusdir=\/usr\/lib\/lazarus"/' -i build.sh
 	./build.sh beta qt
 }
 
@@ -54,3 +69,4 @@ package_doublecmd-qt() {
 	cd "$srcdir/$pkgbase-help-$_helpver"
 	cp -a * "$pkgdir/usr/share/$pkgbase/doc/"
 }
+
diff --git a/community/doublecmd/doublecmd.install b/community/doublecmd/doublecmd.install
index 40d56528f..c27b5bb23 100644
--- a/community/doublecmd/doublecmd.install
+++ b/community/doublecmd/doublecmd.install
@@ -3,20 +3,20 @@ update_icons() {
 	# Setup Menus
 	if which update-desktop-database
 	then
-		update-desktop-database -q /usr/share/applications
+		update-desktop-database -q /usr/share/applications > /dev/null 2>&1
 	fi
 
 	# Setup MIME types
 	if which update-mime-database
 	then
-		update-mime-database /usr/share/mime >/dev/null
+		update-mime-database /usr/share/mime > /dev/null 2>&1
 	fi
 
 	# Setup Icons
 	touch -c /usr/share/icons/hicolor
 	if which gtk-update-icon-cache
 	then
-		gtk-update-icon-cache -tq /usr/share/icons/hicolor
+		gtk-update-icon-cache -tq /usr/share/icons/hicolor > /dev/null 2>&1
 	fi
 
 }
diff --git a/community/fcitx/PKGBUILD b/community/fcitx/PKGBUILD
index f41a44166..1f6d9ea22 100644
--- a/community/fcitx/PKGBUILD
+++ b/community/fcitx/PKGBUILD
@@ -1,4 +1,4 @@
-# $Id: PKGBUILD 93362 2013-07-02 09:47:19Z fyan $
+# $Id: PKGBUILD 93582 2013-07-06 12:35:20Z fyan $
 # Maintainer: Felix Yan <felixonmars@gmail.com>
 # Contributor: Andrea Scarpino <andrea@archlinux.org>
 # Contributor: csslayer <wengxt AT gmail com>
@@ -6,7 +6,7 @@
 pkgbase=fcitx
 pkgname=('fcitx' 'fcitx-gtk2' 'fcitx-gtk3' 'fcitx-qt4')
 pkgver=4.2.8
-pkgrel=2
+pkgrel=3
 groups=('fcitx-im')
 arch=('i686' 'x86_64' 'mips64el')
 url="http://fcitx-im.org"
diff --git a/community/fcitx/fcitx-gtk2.install b/community/fcitx/fcitx-gtk2.install
index 2bdfac388..e99de41ed 100644
--- a/community/fcitx/fcitx-gtk2.install
+++ b/community/fcitx/fcitx-gtk2.install
@@ -1,7 +1,5 @@
 post_install() {
-  if res="$(usr/bin/gtk-query-immodules-2.0)"; then
-    echo "$res" > etc/gtk-2.0/gtk.immodules
-  fi
+    /usr/bin/gtk-query-immodules-2.0 --update-cache
 }
 
 post_upgrade() {
diff --git a/community/gigi/PKGBUILD b/community/gigi/PKGBUILD
index 0b73f0075..c9fff9a34 100644
--- a/community/gigi/PKGBUILD
+++ b/community/gigi/PKGBUILD
@@ -1,4 +1,4 @@
-# $Id: PKGBUILD 90035 2013-05-06 19:37:22Z foutrelis $
+# $Id: PKGBUILD 93708 2013-07-08 14:58:25Z arodseth $
 # Maintainer: Alexander Rødseth <rodseth@gmail.com>
 # Contributor: Sven-Hendrik Haase <sh@lutzhaase.com>
 # Contributor: fana-m <geminin@gmx.net>
@@ -6,9 +6,8 @@
 # Contributor: Manuel Gaul <inkaine@hotmail.com>
 
 pkgname=gigi
-pkgver=0.8.0
-pkgrel=20
-_fixedrevision=5780 #5407
+pkgver=6141
+pkgrel=1
 pkgdesc='Small, efficient and feature rich GUI for OpenGL and C++ (freeorion fork)'
 #url='http://gigi.sourceforge.net/'
 url='http://freeorion.svn.sourceforge.net/viewvc/freeorion/trunk/FreeOrion/GG/'
@@ -16,22 +15,18 @@ arch=('x86_64' 'i686')
 license=('LGPL')
 depends=('boost' 'libpng' 'libtiff' 'ogre' 'sdl' 'python')
 makedepends=('subversion' 'cmake' 'setconf' 'doxygen' 'mesa-libgl')
+#https://gigi.svn.sourceforge.net/svnroot/gigi/trunk/GG/
+source=("$pkgname::svn+https://freeorion.svn.sourceforge.net/svnroot/freeorion/trunk/FreeOrion/GG/#revision=6141") # 5780 # 5407
+sha256sums=('SKIP')
 
-build() {
-  cd "$srcdir"
+pkgver() {
+  cd "$pkgname"
 
-  msg2 'Fetching files...'
-  if [ -d gigi/.svn ]; then
-    (cd gigi && svn up -r "$_fixedrevision")
-  else
-    #svn co https://gigi.svn.sourceforge.net/svnroot/gigi/trunk/GG/ \
-    svn co https://freeorion.svn.sourceforge.net/svnroot/freeorion/trunk/FreeOrion/GG/ \
-      --config-dir ./ -r "$_fixedrevision" gigi
-  fi
+  svnversion | tr -d [A-z]
+}
 
-  rm -rf gigi-build
-  svn export gigi gigi-build
-  cd gigi-build
+build() {
+  cd "$srcdir/$pkgname"
 
   msg2 'Configuring...'
   setconf cmake/GiGiOgre.pc.in prefix /usr
@@ -46,17 +41,17 @@ build() {
     -D CMAKE_C_FLAGS_RELEASE='-DNDEBUG' \
     .
 
-  msg2 'Building documentation...'
-  cd doc
-  doxygen
-  cd ..
+  #msg2 'Building documentation...'
+  #cd doc
+  #doxygen
+  #cd ..
 
   msg2 'Compiling...'
   make -j1
 }
 
 package() {
-  cd "$srcdir/gigi-build"
+  cd "$srcdir/$pkgname"
 
   msg2 'Packaging files...'
   make install
@@ -64,13 +59,13 @@ package() {
   msg2 'Moving files to the right location...'
   mv -v "$srcdir/pkg/usr" "$pkgdir/"
 
-  msg2 'Fixing documentation...'
-  mkdir -p "$pkgdir/usr/share/doc"
-  mv "$pkgdir/usr/doc" "$pkgdir/usr/share/doc/$pkgname"
+  #msg2 'Fixing documentation...'
+  #mkdir -p "$pkgdir/usr/share/doc"
+  #mv "$pkgdir/usr/doc" "$pkgdir/usr/share/doc/$pkgname"
 
-  for f in `find "$pkgdir/usr/share/doc" -name "dir_*.html"`; do
-    sed -i "s:$srcdir:/:g" "$f"
-  done
+  #for f in `find "$pkgdir/usr/share/doc" -name "dir_*.html"`; do
+  #  sed -i "s:$srcdir:/:g" "$f"
+  #done
 
   msg2 'Python 3 fix...'
   for f in `find "$pkgdir/usr" -name "*.py"`; do
diff --git a/community/gloox/PKGBUILD b/community/gloox/PKGBUILD
index 08f90c370..b0dfe7f6a 100644
--- a/community/gloox/PKGBUILD
+++ b/community/gloox/PKGBUILD
@@ -1,10 +1,10 @@
-# $Id: PKGBUILD 65524 2012-02-21 08:42:59Z spupykin $
+# $Id: PKGBUILD 93658 2013-07-08 11:17:28Z spupykin $
 # Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com>
 # Maintainer: William Rea <sillywilly@gmail.com>
 
 pkgname=gloox
-pkgver=1.0
-pkgrel=3.1
+pkgver=1.0.2
+pkgrel=1
 pkgdesc="C++ libraries for development of Jabber client/component/server"
 arch=(i686 x86_64 'mips64el')
 url="http://camaya.net/gloox"
@@ -12,11 +12,15 @@ options=('!libtool')
 license=("GPL")
 depends=('libidn' 'gnutls')
 source=(http://camaya.net/download/gloox-$pkgver.tar.bz2)
-md5sums=('f8eacf1c6476e0a309b453fd04f90e31')
+md5sums=('4c446ee186406c3b3a24402418127faa')
 
 build() {
   cd $srcdir/gloox-$pkgver
   ./configure --prefix=/usr
   make
+}
+
+package() {
+  cd $srcdir/gloox-$pkgver
   make DESTDIR=$pkgdir install
 }
diff --git a/community/gmic/PKGBUILD b/community/gmic/PKGBUILD
index efb7a2307..956c5997d 100644
--- a/community/gmic/PKGBUILD
+++ b/community/gmic/PKGBUILD
@@ -1,4 +1,4 @@
-# $Id: PKGBUILD 92433 2013-06-05 10:32:14Z spupykin $
+# $Id: PKGBUILD 93486 2013-07-04 10:12:04Z spupykin $
 # Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com>
 # Maintainer: Jan "heftig" Steffens <jan.steffens@gmail.com>
 # Contributor: farid <farid at archlinuc-br.org>
@@ -6,7 +6,7 @@
 
 pkgbase=gmic
 pkgname=("gmic" "gimp-plugin-gmic" "zart")
-pkgver=1.5.6.0
+pkgver=1.5.6.1
 pkgrel=1
 arch=("i686" "x86_64" "mips64el")
 url="http://gmic.sourceforge.net"
@@ -15,7 +15,7 @@ makedepends=('gimp' 'qt4' 'fftw' 'openexr' 'opencv' 'mesa' 'gtk2')
 #options=('!emptydirs')
 source=("http://downloads.sourceforge.net/sourceforge/gmic/gmic_${pkgver}.tar.gz"
         "opencv-buildfix.patch")
-md5sums=('3aea4c983bc5e8a834f147dad88ebdac'
+md5sums=('06545a7c2f73b55b0d35e5f5544dce88'
          '120319b0d6c81c5af186abe2281b79ca')
 
 prepare() {
diff --git a/community/gwget/PKGBUILD b/community/gwget/PKGBUILD
index 8abab841c..4f9cadfd7 100644
--- a/community/gwget/PKGBUILD
+++ b/community/gwget/PKGBUILD
@@ -1,4 +1,4 @@
-# $Id: PKGBUILD 93450 2013-07-03 13:33:10Z bgyorgy $
+# $Id: PKGBUILD 93470 2013-07-04 00:59:01Z bgyorgy $
 # Maintainer: Balló György <ballogyor+arch at gmail dot com>
 # Contributor: Allan McRae <allan@archlinux.org>
 # Contributor: Aaron, phrakture, Griffin <aaron@archlinux.org>
@@ -7,7 +7,7 @@
 
 pkgname=gwget
 pkgver=1.0.4
-pkgrel=6
+pkgrel=7
 pkgdesc="Download manager for GNOME"
 arch=('i686' 'x86_64' 'mips64el')
 url="http://projects.gnome.org/gwget/"
@@ -22,7 +22,7 @@ source=(http://ftp.gnome.org/pub/GNOME/sources/$pkgname/${pkgver%.*}/$pkgname-$p
 sha256sums=('a65b2b2b3befb6cf34a697a13111b35498a6d63f9a9b048a22b8654f35ef643f'
             '84efbbea9c2a91c60288edb67264bbdb4ec2c579cf95b3baa8282040a1b65c76'
             '319c4795d0034c4adacf302db697d966ca228fc1bbe9778af9dadcfb0c2531c8'
-            '465216f441271fffdd4530bc07829e733e0d3476fdc34f1f028da82cfc05373d')
+            'e95bc7d60bdd98c81d0b44c0d62122889536ee5bc0013d2daaa74244252d0c53')
 
 build() {
   cd "$srcdir/$pkgname-$pkgver"
diff --git a/community/gwget/drop-libgnomeui.patch b/community/gwget/drop-libgnomeui.patch
index 7f1f551a6..d88bac58b 100644
--- a/community/gwget/drop-libgnomeui.patch
+++ b/community/gwget/drop-libgnomeui.patch
@@ -1,6 +1,6 @@
 diff -Naur gwget-1.0.4.orig/configure.ac gwget-1.0.4/configure.ac
---- gwget-1.0.4.orig/configure.ac	2013-07-03 14:43:02.845220000 +0200
-+++ gwget-1.0.4/configure.ac	2013-07-03 14:43:57.003180469 +0200
+--- gwget-1.0.4.orig/configure.ac	2013-07-04 02:34:53.853338000 +0200
++++ gwget-1.0.4/configure.ac	2013-07-04 02:35:57.021516447 +0200
 @@ -14,15 +14,13 @@
  
  AM_GCONF_SOURCE_2
@@ -21,7 +21,7 @@ diff -Naur gwget-1.0.4.orig/configure.ac gwget-1.0.4/configure.ac
  			
 diff -Naur gwget-1.0.4.orig/src/custom-cell-renderer-progressbar.c gwget-1.0.4/src/custom-cell-renderer-progressbar.c
 --- gwget-1.0.4.orig/src/custom-cell-renderer-progressbar.c	2009-06-16 19:58:06.000000000 +0200
-+++ gwget-1.0.4/src/custom-cell-renderer-progressbar.c	2013-07-03 14:43:57.003180469 +0200
++++ gwget-1.0.4/src/custom-cell-renderer-progressbar.c	2013-07-04 02:35:57.024849860 +0200
 @@ -21,8 +21,8 @@
  
  #include <config.h>
@@ -35,7 +35,7 @@ diff -Naur gwget-1.0.4.orig/src/custom-cell-renderer-progressbar.c gwget-1.0.4/s
  
 diff -Naur gwget-1.0.4.orig/src/gwget-application.c gwget-1.0.4/src/gwget-application.c
 --- gwget-1.0.4.orig/src/gwget-application.c	2009-06-20 10:12:37.000000000 +0200
-+++ gwget-1.0.4/src/gwget-application.c	2013-07-03 14:43:57.003180469 +0200
++++ gwget-1.0.4/src/gwget-application.c	2013-07-04 02:35:57.024849860 +0200
 @@ -21,8 +21,6 @@
  #include "gwget-application.h"
  
@@ -95,7 +95,7 @@ diff -Naur gwget-1.0.4.orig/src/gwget-application.c gwget-1.0.4/src/gwget-applic
  
 diff -Naur gwget-1.0.4.orig/src/main.c gwget-1.0.4/src/main.c
 --- gwget-1.0.4.orig/src/main.c	2009-06-20 10:12:37.000000000 +0200
-+++ gwget-1.0.4/src/main.c	2013-07-03 14:43:57.003180469 +0200
++++ gwget-1.0.4/src/main.c	2013-07-04 02:35:57.024849860 +0200
 @@ -17,11 +17,13 @@
  
  #include <config.h>
@@ -146,7 +146,7 @@ diff -Naur gwget-1.0.4.orig/src/main.c gwget-1.0.4/src/main.c
  }
 diff -Naur gwget-1.0.4.orig/src/main_window.c gwget-1.0.4/src/main_window.c
 --- gwget-1.0.4.orig/src/main_window.c	2009-08-14 19:19:51.000000000 +0200
-+++ gwget-1.0.4/src/main_window.c	2013-07-03 14:46:01.992833090 +0200
++++ gwget-1.0.4/src/main_window.c	2013-07-04 02:35:57.024849860 +0200
 @@ -15,7 +15,9 @@
   */
   
@@ -197,7 +197,7 @@ diff -Naur gwget-1.0.4.orig/src/main_window.c gwget-1.0.4/src/main_window.c
  	/* Listen to changes to the key. */
 diff -Naur gwget-1.0.4.orig/src/main_window_cb.c gwget-1.0.4/src/main_window_cb.c
 --- gwget-1.0.4.orig/src/main_window_cb.c	2009-08-14 19:19:51.000000000 +0200
-+++ gwget-1.0.4/src/main_window_cb.c	2013-07-03 14:43:57.003180469 +0200
++++ gwget-1.0.4/src/main_window_cb.c	2013-07-04 02:45:43.468873631 +0200
 @@ -15,7 +15,9 @@
   */
   
@@ -209,40 +209,36 @@ diff -Naur gwget-1.0.4.orig/src/main_window_cb.c gwget-1.0.4/src/main_window_cb.
  #include <gconf/gconf-client.h>
  #include <signal.h>
  
-@@ -217,7 +219,10 @@
+@@ -217,6 +219,9 @@
  	gchar *size;
  	int width = 16, height = 16;
  	gdouble perc;
--	
-+	GThemedIcon *icon;
-+       const gchar *const *icon_names;
++	GIcon *icon;
++	const gchar *const *icon_names;
 +	gint i;
-+
+ 	
  	gtk_list_store_append (GTK_LIST_STORE(model), &iter); 
  	size = g_strdup_printf ("%d kB", (guint32)(gwgetdata->cur_size + 512) / 1024);
- 	gtk_list_store_set (GTK_LIST_STORE(model), &iter,URL_COLUMN,gwgetdata->url,
-@@ -243,10 +248,15 @@
+@@ -243,8 +248,14 @@
  	theme = gtk_icon_theme_get_default ();
  	if (!gwgetdata->recursive) {
  		content_type = g_content_type_guess (gwgetdata->local_filename, NULL, 0, NULL);
 -		gwgetdata->icon_name = gnome_icon_lookup (theme, NULL, NULL, NULL, NULL,
 -	 							content_type, GNOME_ICON_LOOKUP_FLAGS_NONE, NULL);
--	} else {
- 		gwgetdata->icon_name = g_strdup("gtk-refresh");
-+		icon = (GThemedIcon*) g_content_type_get_icon (content_type);
-+		icon_names = g_themed_icon_get_names (icon);
-+		for (i=0; i<sizeof(icon_names)-1; i++) {
++		icon = g_content_type_get_icon (content_type);
++		icon_names = g_themed_icon_get_names (G_THEMED_ICON (icon));
++		for (i=0; i < g_strv_length ((gchar **)icon_names); i++) {
 +			if (gtk_icon_theme_has_icon (gtk_icon_theme_get_default (), icon_names[i])) {
 +	 			gwgetdata->icon_name = icon_names[i];
 +				break;
 +			}
 +		}
+ 	} else {
+ 		gwgetdata->icon_name = g_strdup("gtk-refresh");
  	}
- 	gtk_icon_size_lookup (GTK_ICON_SIZE_MENU, &width, &height);
- 	width *= 2;
 diff -Naur gwget-1.0.4.orig/src/new_window.c gwget-1.0.4/src/new_window.c
 --- gwget-1.0.4.orig/src/new_window.c	2009-08-14 19:19:51.000000000 +0200
-+++ gwget-1.0.4/src/new_window.c	2013-07-03 14:43:57.003180469 +0200
++++ gwget-1.0.4/src/new_window.c	2013-07-04 02:35:57.028183273 +0200
 @@ -24,7 +24,8 @@
  */
  
@@ -254,8 +250,8 @@ diff -Naur gwget-1.0.4.orig/src/new_window.c gwget-1.0.4/src/new_window.c
  #include "new_window.h"
  #include "main_window.h"
 diff -Naur gwget-1.0.4.orig/src/systray.c gwget-1.0.4/src/systray.c
---- gwget-1.0.4.orig/src/systray.c	2013-07-03 14:43:02.845220000 +0200
-+++ gwget-1.0.4/src/systray.c	2013-07-03 14:43:57.006513881 +0200
+--- gwget-1.0.4.orig/src/systray.c	2013-07-04 02:34:53.920006000 +0200
++++ gwget-1.0.4/src/systray.c	2013-07-04 02:35:57.028183273 +0200
 @@ -1,6 +1,7 @@
  
  #include <config.h>
@@ -267,7 +263,7 @@ diff -Naur gwget-1.0.4.orig/src/systray.c gwget-1.0.4/src/systray.c
  #include "systray.h"
 diff -Naur gwget-1.0.4.orig/src/utils.c gwget-1.0.4/src/utils.c
 --- gwget-1.0.4.orig/src/utils.c	2009-08-14 19:19:51.000000000 +0200
-+++ gwget-1.0.4/src/utils.c	2013-07-03 14:43:57.006513881 +0200
++++ gwget-1.0.4/src/utils.c	2013-07-04 02:35:57.028183273 +0200
 @@ -14,7 +14,8 @@
   *  Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
   */
@@ -280,7 +276,7 @@ diff -Naur gwget-1.0.4.orig/src/utils.c gwget-1.0.4/src/utils.c
  #include "gwget_data.h"
 diff -Naur gwget-1.0.4.orig/src/wget-log.c gwget-1.0.4/src/wget-log.c
 --- gwget-1.0.4.orig/src/wget-log.c	2009-10-04 20:29:35.000000000 +0200
-+++ gwget-1.0.4/src/wget-log.c	2013-07-03 14:43:57.006513881 +0200
++++ gwget-1.0.4/src/wget-log.c	2013-07-04 02:35:57.028183273 +0200
 @@ -25,7 +25,9 @@
  #define _FILE_OFFSET_BITS 64
  
diff --git a/community/gxmessage/PKGBUILD b/community/gxmessage/PKGBUILD
index 0c977a485..3787e99c0 100644
--- a/community/gxmessage/PKGBUILD
+++ b/community/gxmessage/PKGBUILD
@@ -1,11 +1,11 @@
-# $Id: PKGBUILD 65552 2012-02-21 08:53:43Z spupykin $
+# $Id: PKGBUILD 93662 2013-07-08 11:18:13Z spupykin $
 # Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com>
 # Maintainer: Geoffroy Carrier <geoffroy.carrier@koon.fr>
 # Contributor: Jaroslav Lichtblau <tu@dragonlord.cz>
 
 pkgname=gxmessage
-pkgver=2.12.4
-pkgrel=2
+pkgver=2.20.0
+pkgrel=1
 pkgdesc="A GTK2 based xmessage clone."
 arch=('i686' 'x86_64' 'mips64el')
 url="http://homepages.ihug.co.nz/~trmusson/programs.html#gxmessage"
@@ -15,13 +15,17 @@ makedepends=('pkgconfig' 'intltool')
 install=$pkgname.install
 source=(http://homepages.ihug.co.nz/~trmusson/stuff/$pkgname-$pkgver.tar.gz
         $pkgname.desktop)
-md5sums=('7c94c714ebedbfa2db2d645cc4a4092a'
+md5sums=('f4160442548bdd90895b008b85df0f6e'
          'af92506581c1aae70e3845a66a983f22')
 
 build() {
   cd "$srcdir/$pkgname-$pkgver"
   ./configure --prefix=/usr --mandir=/usr/share/man
   make
+}
+
+package() {
+  cd "$srcdir/$pkgname-$pkgver"
   make DESTDIR="$pkgdir" install
   install -D -m644 "$srcdir/$pkgname.desktop" \
     "${pkgdir}/usr/share/applications/$pkgname.desktop"
diff --git a/community/ibus-kkc/ChangeLog b/community/ibus-kkc/ChangeLog
deleted file mode 100644
index 61358e57e..000000000
--- a/community/ibus-kkc/ChangeLog
+++ /dev/null
@@ -1,14 +0,0 @@
-2013-06-07  ponsfoot  <cabezon dot hashimoto at gmail dot com>
-
-	* ibus-kkc 1.5.14-1
-	- upstream update
-
-2013-05-27  ponsfoot  <cabezon dot hashimoto at gmail dot com>
-
-	* ibus-kkc 1.5.13-2
-	- Fix dependency (Add libkkc)
-
-2013-05-27  ponsfoot  <cabezon dot hashimoto at gmail dot com>
-
-	* ibus-kkc 1.5.13-1
-	- Initial release on AUR
diff --git a/community/ibus-kkc/PKGBUILD b/community/ibus-kkc/PKGBUILD
index d9d9a5a07..dadd66602 100644
--- a/community/ibus-kkc/PKGBUILD
+++ b/community/ibus-kkc/PKGBUILD
@@ -2,8 +2,8 @@
 # Contributor: ponsfoot <cabezon dot hashimoto at gmail dot com>
 
 pkgname=ibus-kkc
-pkgver=1.5.14
-pkgrel=2
+pkgver=1.5.15
+pkgrel=1
 pkgdesc="libkkc (Japanese Kana Kanji input method) engine for ibus"
 arch=('i686' 'x86_64')
 url="https://bitbucket.org/libkkc"
@@ -11,13 +11,10 @@ license=('GPL')
 options=(!libtool)
 depends=('ibus' 'libkkc' 'libkkc-data' 'skk-jisyo')
 makedepends=('vala' 'intltool')
-changelog=ChangeLog
 source=(https://bitbucket.org/libkkc/${pkgname}/downloads/${pkgname}-${pkgver}.tar.gz)
-sha1sums=('9396521d85501757dd42c64f92e52a2e5f514872')
 
 build() {
   cd "${pkgname}-${pkgver}"
-  # VALAC=/usr/bin/valac-0.18 \
   ./configure --prefix=/usr --libexecdir=/usr/lib/ibus-kkc --disable-static
   make
 }
@@ -26,3 +23,5 @@ package() {
   cd "${pkgname}-${pkgver}"
   make DESTDIR="$pkgdir" install
 }
+
+md5sums=('b5014e47c80d01d0774ac539d6ee7f5f')
diff --git a/community/iniparser/PKGBUILD b/community/iniparser/PKGBUILD
deleted file mode 100644
index efb922b14..000000000
--- a/community/iniparser/PKGBUILD
+++ /dev/null
@@ -1,26 +0,0 @@
-# $Id: PKGBUILD 73573 2012-07-10 10:07:34Z spupykin $
-# Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com>
-# Maintainer: Roman Kyrylych <Roman.Kyrylych@gmail.com>
-# Contributor: Roman Kyrylych <Roman.Kyrylych@gmail.com>
-
-pkgname=iniparser
-pkgver=3.1
-pkgrel=2
-pkgdesc="A free stand-alone ini file parsing library written in portable ANSI C"
-arch=('i686' 'x86_64' 'mips64el')
-url="http://ndevilla.free.fr/iniparser/"
-license=('MIT')
-depends=()
-source=(http://ndevilla.free.fr/iniparser/$pkgname-$pkgver.tar.gz)
-md5sums=('0aa4f995468ed390caf323f50a285bc3')
-
-build() {
-  cd $srcdir/$pkgname
-  make
-  install -Dm644 src/iniparser.h $pkgdir/usr/include/iniparser.h
-  install -Dm644 src/dictionary.h $pkgdir/usr/include/dictionary.h
-  install -Dm644 libiniparser.a $pkgdir/usr/lib/libiniparser.a
-  install -Dm644 libiniparser.so.0 $pkgdir/usr/lib/libiniparser.so.0
-  install -Dm644 LICENSE $pkgdir/usr/share/licenses/iniparser/LICENSE
-  ln -sf libiniparser.so.0 $pkgdir/usr/lib/libiniparser.so
-}
diff --git a/community/libcec/PKGBUILD b/community/libcec/PKGBUILD
index 63dd754c4..762e02be1 100644
--- a/community/libcec/PKGBUILD
+++ b/community/libcec/PKGBUILD
@@ -1,10 +1,10 @@
-# $Id: PKGBUILD 85975 2013-03-10 17:23:41Z idevolder $
+# $Id: PKGBUILD 93498 2013-07-04 12:44:24Z idevolder $
 # Maintainer: BlackIkeEagle <ike DOT devolder AT gmail DOT com>
 # Contributor: Philippe Cherel <philippe.cherel@mayenne.org>
 # vim: ft=sh:
 
 pkgname=libcec
-pkgver=2.1.1
+pkgver=2.1.3
 pkgrel=1
 pkgdesc="Pulse-Eight's libcec for the Pulse-Eight USB-CEC adapter"
 arch=('i686' 'x86_64' 'mips64el')
@@ -12,9 +12,9 @@ url="https://github.com/Pulse-Eight/libcec"
 license=('GPL')
 depends=('udev' 'lockdev')
 source=("$pkgname-$pkgver.tar.gz::https://github.com/Pulse-Eight/libcec/tarball/$pkgname-$pkgver")
-_srcfolder=Pulse-Eight-libcec-605d913
+_srcfolder=Pulse-Eight-libcec-54be21e
 options=(!libtool)
-sha256sums=('085cabf38bbe82c0a1c78fc4a0cc318b3c4f5fadae325b3d648821d2a4bf694d')
+sha256sums=('2aa88451b528184b02077ee8c6cd10e2f89121a6a05b1b35b4b792b03108a9d1')
 
 build() {
   mv "$_srcfolder" "$pkgname-$pkgver"
diff --git a/community/libircclient/PKGBUILD b/community/libircclient/PKGBUILD
index edad3bacf..8f1d1a2ad 100644
--- a/community/libircclient/PKGBUILD
+++ b/community/libircclient/PKGBUILD
@@ -1,55 +1,51 @@
+# $Id: PKGBUILD 93508 2013-07-04 20:56:31Z bpiotrowski $
 # Maintainer:  Bartłomiej Piotrowski <barthalion@gmail.com>
 # Maintainer:  SpepS <dreamspepser at yahoo dot it>
 # Contributor: Marcel Wysocki <maci@satgnu.net>
 # Contributor: coolkehon <coolkehon at g m a i l>
 
 pkgname=libircclient
-pkgver=1.6
+pkgver=1.7
 pkgrel=1
-pkgdesc="A small but powerful library, which implements client-server IRC protocol."
+pkgdesc='Small but powerful library, which implements client-server IRC protocol'
 arch=('i686' 'x86_64' 'mips64el')
-url="http://www.ulduzsoft.com/libircclient/"
+url='http://www.ulduzsoft.com/libircclient/'
 depends=('glibc')
+makedepends=('python2-sphinx' 'python2-rst2pdf') 
 license=('GPL')
 source=("http://downloads.sourceforge.net/sourceforge/$pkgname/$pkgname-$pkgver.tar.gz")
-md5sums=('eb6a2c4e91862cc10de3b13b198cfa23')
+md5sums=('968370276f7cf21302f504f9bce1fc99')
 
 build() {
-  cd "$srcdir/$pkgname-$pkgver"
+  cd $pkgname-$pkgver
 
-  # add fPIC flag for x86_64
-  [ "$CARCH" != i686 ] && export CFLAGS="$CFLAGS -fPIC"
+  # add fPIC flag for x86_64 and mips64el
+  [ "$CARCH" != "i686" ] && export CFLAGS="$CFLAGS -fPIC"
 
-  ## Makefile.in fixes:
-  #  invalid `lib` requisite for `install` target
-  #  install shared lib instead of static
-  #  headers in /usr/include/$pkgname
   sed -e "/install/s/lib/all/" \
       -e "/DESTDIR/s/\.a/\.so/g" \
       -e "s/@\/include/&\/$pkgname/" \
       -i src/Makefile.in
 
   ./configure --prefix=/usr \
+              --libdir=/usr/lib \
               --enable-shared
+  cd src && make
 
-  cd src &&  make CFLAGS="$CFLAGS"
+  cd ../doc
+  sed -i 's/sphinx-build/sphinx-build2/g' Makefile 
+  make singlehtml man
 }
 
 package() {
-  cd "$srcdir/$pkgname-$pkgver/src"
+  cd $pkgname-$pkgver/src
+  make DESTDIR="$pkgdir" install
 
-  make DESTDIR="$pkgdir/" install
+  install -d "$pkgdir"/usr/share/doc/$pkgname
+  cp -a ../doc/_build/singlehtml/* "$pkgdir"/usr/share/doc/$pkgname
+  cp -a ../doc/_build/man "$pkgdir"/usr/share
 
-  # doc
-  install -d "$pkgdir/usr/share/doc/$pkgname"
-  cp -a ../doc/{html,rfc1459.txt} \
-    "$pkgdir/usr/share/doc/$pkgname"
-
-  # man
-  cp -a ../doc/man "$pkgdir/usr/share"
-
-  # examples (optional)
-  install -d "$pkgdir/usr/share/$pkgname/examples"
+  install -d "$pkgdir"/usr/share/$pkgname/examples
   install -Dm644 ../examples/* \
-    "$pkgdir/usr/share/$pkgname/examples"
+    "$pkgdir"/usr/share/$pkgname/examples
 }
diff --git a/community/libkkc-data/PKGBUILD b/community/libkkc-data/PKGBUILD
index 1c84beae9..0a235cb22 100644
--- a/community/libkkc-data/PKGBUILD
+++ b/community/libkkc-data/PKGBUILD
@@ -2,8 +2,8 @@
 # Contributor: ponsfoot <cabezon dot hashimoto at gmail dot com>
 
 pkgname=libkkc-data
-pkgver=0.2.0
-pkgrel=4
+pkgver=0.2.5
+pkgrel=1
 pkgdesc="Language model data package for libkkc"
 arch=('i686' 'x86_64')
 url="https://bitbucket.org/libkkc"
@@ -11,15 +11,16 @@ license=('GPL')
 makedepends=('python2-marisa')
 changelog=ChangeLog
 source=(https://bitbucket.org/libkkc/${pkgname}/downloads/${pkgname}-${pkgver}.tar.xz)
-sha1sums=('6bc5601b3ec4c76066255827563b8debb50dd917')
 
 build() {
   cd "${pkgname}-${pkgver}"
   ./configure PYTHON=/usr/bin/python2 --prefix=/usr
-  make -j1
+  make
 }
 
 package() {
   cd "${pkgname}-${pkgver}"
   make DESTDIR="$pkgdir" install
 }
+
+md5sums=('bb31dca814e72dfcddf88f2da3fc37c5')
diff --git a/community/libkkc/ChangeLog b/community/libkkc/ChangeLog
deleted file mode 100644
index 8067acabf..000000000
--- a/community/libkkc/ChangeLog
+++ /dev/null
@@ -1,26 +0,0 @@
-2013-06-07  ponsfoot  <cabezon dot hashimoto at gmail dot com>
-
-	* libkkc 0.2.4-1
-	- upstream update
-
-2013-05-29  ponsfoot  <cabezon dot hashimoto at gmail dot com>
-
-	* libkkc 0.2.3-4
-	- Fix makedepends (s/python2/marisa-python2/)
-	- Add to install docs
-
-2013-05-28  ponsfoot  <cabezon dot hashimoto at gmail dot com>
-
-	* libkkc 0.2.3-3
-	- Fix dependency (libgee-0.6 -> libgee06 [extra])
-
-2013-05-27  ponsfoot  <cabezon dot hashimoto at gmail dot com>
-
-	* libkkc 0.2.3-2
-	- Fix dependency (move some of makedepends into depends)
-
-2013-05-27  ponsfoot  <cabezon dot hashimoto at gmail dot com>
-
-	* libkkc 0.2.3-1
-	- Initial release on AUR
-
diff --git a/community/libkkc/PKGBUILD b/community/libkkc/PKGBUILD
index 32afb6144..c80ee65ec 100644
--- a/community/libkkc/PKGBUILD
+++ b/community/libkkc/PKGBUILD
@@ -2,8 +2,8 @@
 # Contributor: ponsfoot <cabezon dot hashimoto at gmail dot com>
 
 pkgname=libkkc
-pkgver=0.2.4
-pkgrel=2
+pkgver=0.2.6
+pkgrel=1
 pkgdesc="Japanese Kana Kanji conversion library"
 arch=('i686' 'x86_64')
 url="https://bitbucket.org/libkkc"
@@ -11,14 +11,11 @@ license=('GPL')
 options=(!libtool)
 depends=('marisa' 'json-glib' 'libgee06')
 makedepends=('vala' 'gobject-introspection' 'intltool' 'python2-marisa')
-changelog=ChangeLog
 source=(https://bitbucket.org/libkkc/libkkc/downloads/${pkgname}-${pkgver}.tar.gz)
-sha1sums=('28bafb612f8176735f02bd6f49581e072700af4e')
 
 build() {
   cd "${pkgname}-${pkgver}"
 
-  #VALAC=/usr/bin/valac-0.18 \
   PYTHON=/usr/bin/python2 \
   ./configure --prefix=/usr --disable-static --disable-silent-rules
   make
@@ -31,3 +28,5 @@ package() {
   install -m 644 README data/rules/README.rules COPYING \
     "${pkgdir}/usr/share/doc/${pkgname}-${pkgver}/"  
 }
+
+md5sums=('b50f0341596a4e290188a7bf5195cd26')
diff --git a/community/libvirt/PKGBUILD b/community/libvirt/PKGBUILD
index e301ba2dc..e9cffbca3 100644
--- a/community/libvirt/PKGBUILD
+++ b/community/libvirt/PKGBUILD
@@ -1,10 +1,10 @@
-# $Id: PKGBUILD 93317 2013-07-01 14:35:45Z spupykin $
+# $Id: PKGBUILD 93546 2013-07-05 10:38:11Z spupykin $
 # Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com>
 # Contributor: Jonathan Wiersma <archaur at jonw dot org>
 
 pkgname=libvirt
 pkgver=1.1.0
-pkgrel=1
+pkgrel=2
 pkgdesc="API for controlling virtualization engines (openvz,kvm,qemu,virtualbox,xen,etc)"
 arch=('i686' 'x86_64' 'mips64el')
 url="http://libvirt.org/"
@@ -33,11 +33,13 @@ install="libvirt.install"
 source=("http://libvirt.org/sources/$pkgname-$pkgver.tar.gz"
 	libvirtd.conf.d
 	libvirtd-guests.conf.d
-	libvirt.tmpfiles.d)
+	libvirt.tmpfiles.d
+	"storage-fix.patch::https://bugs.archlinux.org/index.php?getfile=10700")
 md5sums=('f980a84719033e9efca01048da505dfb'
          '3ed0e24f5b5e25bf553f5427d64915e6'
          '0a96ed876ffb1fcb9dff5a9b3a609c1e'
-         '020971887442ebbf1b6949e031c8dd3f')
+         '020971887442ebbf1b6949e031c8dd3f'
+         '321f03bd626d2d24e816d5298c3bc3fe')
 
 build() {
   cd "$srcdir/$pkgname-$pkgver"
@@ -49,6 +51,8 @@ build() {
     sed -i 's_#!.*/usr/bin/env.*python_#!/usr/bin/env python2_' $file
   done
 
+  patch -p1 <$srcdir/storage-fix.patch
+
   export LDFLAGS=-lX11
   export RADVD=/usr/bin/radvd
   [ -f Makefile ] || ./configure --prefix=/usr --libexec=/usr/lib/"$pkgname" --sbindir=/usr/bin \
diff --git a/community/mashup/PKGBUILD b/community/mashup/PKGBUILD
index 1b41676c8..1ec596fbc 100644
--- a/community/mashup/PKGBUILD
+++ b/community/mashup/PKGBUILD
@@ -2,16 +2,16 @@
 # Maintainer: Stefan Husmann <stefan-husmann@t-online.de>
 
 pkgname=mashup
-pkgver=3.5
-pkgrel=2.1
+pkgver=3.7.1
+pkgrel=1
 pkgdesc="Adjusting images on a sheet of paper for printing"
-url="http://kornelix.squarespace.com/$pkgname"
+url="http://kornelix.com/$pkgname"
 arch=('i686' 'x86_64' 'mips64el')
 license=('GPL3')
 depends=('gtk3')
 replaces=('printoxx')
-source=("http://kornelix.squarespace.com/storage/downloads/$pkgname-$pkgver.tar.gz")
-md5sums=('454b08e5589f93b3bdd4577c2578ae36')
+source=("http://www.kornelix.com/uploads/1/3/0/3/13035936/$pkgname-$pkgver.tar.gz")
+md5sums=('e93e38fb831b01a30bf90684ea4e44c9')
 
 build() {
   cd $srcdir/$pkgname-$pkgver
diff --git a/community/mcelog/PKGBUILD b/community/mcelog/PKGBUILD
index 4e959e0fa..0af28a473 100644
--- a/community/mcelog/PKGBUILD
+++ b/community/mcelog/PKGBUILD
@@ -1,10 +1,10 @@
-# $Id: PKGBUILD 91951 2013-05-30 09:42:52Z spupykin $
+# $Id: PKGBUILD 93664 2013-07-08 11:18:34Z spupykin $
 # Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com>
 # Contributor: Thomas Mudrunka <harvie@@email..cz>
 # Maintainer: Thomas Mudrunka <harvie@@email..cz>
 
 pkgname=mcelog
-pkgver=20130530
+pkgver=20130708
 pkgrel=1
 pkgdesc="Print machine check event log from x86-64 kernel"
 url="http://freshmeat.net/projects/mcelog/"
diff --git a/community/mongodb/PKGBUILD b/community/mongodb/PKGBUILD
index c2314fb7a..dcd5fbad6 100644
--- a/community/mongodb/PKGBUILD
+++ b/community/mongodb/PKGBUILD
@@ -1,4 +1,4 @@
-# $Id: PKGBUILD 92438 2013-06-05 11:16:09Z fyan $
+# $Id: PKGBUILD 93615 2013-07-07 11:23:57Z fyan $
 # Maintainer: Felix Yan <felixonmars@gmail.com>
 # Contributor: Sven-Hendrik Haase <sh@lutzhaase.com>
 # Contributor: Thomas Dziedzic < gostrc at gmail >
@@ -6,21 +6,20 @@
 # Contributor: Alec Thomas
 
 pkgname=mongodb
-pkgver=2.4.4
+pkgver=2.4.5
 pkgrel=1
 pkgdesc='A high-performance, open source, schema-free document-oriented database'
 arch=('i686' 'x86_64' 'mips64el')
 url='http://www.mongodb.org'
 license=('AGPL3')
-depends=('boost-libs')
-makedepends=('scons' 'boost' 'libpcap')
+depends=('boost-libs' 'pcre' 'snappy' 'openssl' 'gperftools') # 'v8') doesn't work
+makedepends=('scons' 'boost' 'readline' 'ncurses' 'libpcap') # 'cyrus-sasl') doesn't work
 checkdepends=('python2-pymongo')
 optdepends=('libpcap: needed for mongosniff')
 backup=('etc/mongodb.conf')
 install=mongodb.install
 source=("http://downloads.mongodb.org/src/mongodb-src-r${pkgver}.tar.gz"
-        'mongodb.conf' 'mongodb.service' 'SConscript.client.patch'
-        'removeWerror.patch')
+        'mongodb.conf' 'mongodb.service' 'removeWerror.patch')
 
 build() {
   # fucking mongo aint no fun to package
@@ -28,13 +27,18 @@ build() {
 
   cd mongodb-src-r${pkgver}
 
-  # fix https://jira.mongodb.org/browse/SERVER-5575
-  patch -Np1 -i ${srcdir}/SConscript.client.patch
-
   # failed to build with -Werror since 2.4.0
   patch -Np1 -i "$srcdir/removeWerror.patch"
 
-  scons all --use-system-boost # --sharedclient currently fails
+  scons all \
+    --use-system-boost \
+    --use-system-pcre \
+    --use-system-snappy \
+    --use-system-tcmalloc \
+    --ssl \
+    --sharedclient
+    # --use-sasl-client doesn't work
+    # --use-system-v8 doesn't work
 }
 
 <<COMMENT
@@ -52,21 +56,27 @@ package() {
 
   cd mongodb-src-r${pkgver}
 
-  scons install --use-system-boost --full --prefix=$pkgdir/usr # --sharedclient currently fails
+  scons install \
+    --use-system-boost \
+    --use-system-pcre \
+    --use-system-snappy \
+    --use-system-tcmalloc \
+    --ssl \
+    --sharedclient \
+    --full \
+    --prefix="$pkgdir/usr"
+    # --use-sasl-client doesn't work
+    # --use-system-v8 doesn't work
+
+  rm "$pkgdir/usr/lib/libmongoclient.a"
 
   install -Dm644 "$srcdir/mongodb.conf" "$pkgdir/etc/mongodb.conf"
-  [[ -f "$pkgdir/usr/lib" ]] && rm "$pkgdir/usr/lib" # wtf mongo
   install -Dm644 "$srcdir/mongodb.service" "$pkgdir/usr/lib/systemd/system/mongodb.service"
   install -dm700 "$pkgdir/var/lib/mongodb"
   install -dm755 "$pkgdir/var/log/mongodb"
-
-  # the earlier SConscript patch actually gives us some trouble on x86_64 so we need to hack it out again
-  mv ${pkgdir}/usr/lib64/libmongoclient.a ${pkgdir}/usr/lib/ || true
-  rm -r ${pkgdir}/usr/lib64 || true
 }
 
-sha512sums=('f72aee0a9c979756741902eb87775d154de45660596ec4507274a7719d376869510f192cf7777840821cb491cfe009beced8891e3f243c761ee758ab023a457d'
+sha512sums=('07a46770c5acc0e046750e0299e669b934f6093705f5979bc5fa8bb56e73761f9602a5bdbaaad688700e4dde32d1e5f48a6cf3763ffab4d80a47f0158d8fb89e'
             '05dead727d3ea5fe8af1a3c3888693f6b3e2b8cb7f197a5d793352e10d2c524e96c9a5c55ad2e88c1114643a9612ec0b26a2574b48a5260a9b51ec8941461f1c'
             '177251404b2e818ae2b546fe8b13cb76e348c99e85c7bef22a04b0f07b600fd515a309ede50214f4198594388a6d2b31f46e945b9dae84aabb4dfa13b1123bb9'
-            '2f7d0e9e35a043d9006fd429f36cd6b45ed4edd98ce653b35b237e0313d2d7ef39ae85dcd31713bae7ab68e40a38534bba5f7746653e9380f2106865a8b3b9a5'
             'e709f76fa71a10d6b72d2eeae65d715e0a0a7e6cb93704114f22db8662d7102de77bd1e6706049351beb159aaa04548cfe4b14fe6ee498a166c5ad54c8275f84')
diff --git a/community/nomacs/PKGBUILD b/community/nomacs/PKGBUILD
new file mode 100644
index 000000000..f7041dc5a
--- /dev/null
+++ b/community/nomacs/PKGBUILD
@@ -0,0 +1,30 @@
+# $Id: PKGBUILD 93593 2013-07-06 18:56:13Z speps $
+# Maintainer: speps <speps at aur dot archlinux dot org>
+
+pkgname=nomacs
+pkgver=1.2.0
+pkgrel=1
+pkgdesc="A Qt image viewer"
+arch=(i686 x86_64)
+url="http://www.nomacs.org/"
+license=('GPL3')
+depends=('qt4' 'exiv2' 'libraw' 'opencv')
+makedepends=('cmake')
+install="$pkgname.install"
+source=("http://downloads.sourceforge.net/project/$pkgname/$pkgname-$pkgver/$pkgname-$pkgver-source.tar.bz2")
+md5sums=('0fdef67b960276375024f270dfaa4b93')
+
+build() {
+  cd "$srcdir/$pkgname-$pkgver"
+  [ -d bld ] || mkdir bld && cd bld
+  cmake .. -DCMAKE_INSTALL_PREFIX=/usr \
+           -DQT_QMAKE_EXECUTABLE=/usr/bin/qmake-qt4
+  make
+}
+
+package() {
+  cd "$srcdir/$pkgname-$pkgver/bld"
+  make DESTDIR="$pkgdir/" install
+}
+
+# vim:set ts=2 sw=2 et:
diff --git a/community/nomacs/nomacs.install b/community/nomacs/nomacs.install
new file mode 100644
index 000000000..e111ef946
--- /dev/null
+++ b/community/nomacs/nomacs.install
@@ -0,0 +1,11 @@
+post_install() {
+  update-desktop-database -q
+}
+
+post_upgrade() {
+  post_install
+}
+
+post_remove() {
+  post_install
+}
diff --git a/community/omniorb/PKGBUILD b/community/omniorb/PKGBUILD
deleted file mode 100644
index 81e07273c..000000000
--- a/community/omniorb/PKGBUILD
+++ /dev/null
@@ -1,44 +0,0 @@
-# $Id: PKGBUILD 60722 2011-12-17 09:55:07Z lcarlier $
-# Maintainer: Giovanni Scafora <giovanni@archlinux.org>
-# Contributor: Essien Ita Essien <me@essienitaessien.com>
-# Contributor: Brice Mealier <mealier_brice@yahoo.fr>
-
-pkgname=omniorb
-pkgver=4.1.6
-pkgrel=1
-pkgdesc="A CORBA object request broker for C++ and Python."
-arch=('i686' 'x86_64' 'mips64el')
-url="http://omniorb.sourceforge.net/"
-license=('GPL2' 'LGPL2')
-depends=('gcc-libs' 'python2' 'openssl')
-makedepends=('pkgconfig')
-source=(http://downloads.sourceforge.net/omniorb/omniORB-$pkgver.tar.bz2)
-md5sums=('44990f8139c349b53ab43110de6c629b')
-
-build() {
-  cd $srcdir/omniORB-$pkgver
-
-  # python2 fix
-  for file in $(find . -name '*.py' -print); do
-    sed -i 's_^#!.*/usr/bin/python_#!/usr/bin/python2_' $file
-    sed -i 's_^#!.*/usr/bin/env.*python_#!/usr/bin/env python2_' $file
-  done
-
-  # Fix to build with OpenSSL 1.0.0
-  sed -i 's/SSL_METHOD/const SSL_METHOD/' \
-         src/lib/omniORB/orbcore/ssl/sslContext.cc \
-         include/omniORB4/sslContext.h
-  ./configure --prefix=/usr --with-omniORB-config=/etc/omniorb/omniORB.cfg \
-              --with-omniNames-logdir=/var/log/omniORB --with-openssl=/usr --build=$CHOST
-  make
-}
-package(){
-  cd $srcdir/omniORB-$pkgver
-
-  make DESTDIR=$pkgdir install
-
-  for i in man/man1/*.1; do
-    install -D -m 644 $i $pkgdir/usr/share/$i
-  done
-  chmod 755 $pkgdir/{usr,usr/bin,usr/lib,usr/share,usr/include,usr/share/idl,usr/lib/pkgconfig,usr/lib/python2.7,usr/lib/python2.7/site-packages}
-}
diff --git a/community/openbox/PKGBUILD b/community/openbox/PKGBUILD
index f5d92d960..21adc4775 100644
--- a/community/openbox/PKGBUILD
+++ b/community/openbox/PKGBUILD
@@ -1,4 +1,4 @@
-# $Id: PKGBUILD 70588 2012-05-12 09:12:54Z bpiotrowski $
+# $Id: PKGBUILD 93636 2013-07-08 07:28:15Z bpiotrowski $
 # Maintainer:  Bartłomiej Piotrowski <nospam@bpiotrowski.pl>
 # Contributor: Brad Fanella <bradfanella@archlinux.us>
 # Contributor: Andrea Scarpino <andrea@archlinux.org>
@@ -6,52 +6,55 @@
 
 pkgname=openbox
 pkgver=3.5.0
-pkgrel=7
-pkgdesc="A highly configurable and lightweight X11 window manager"
+pkgrel=9
+pkgdesc='Highly configurable and lightweight X11 window manager'
 arch=('i686' 'x86_64' 'mips64el')
-url="http://openbox.org"
+url='http://openbox.org'
 license=('GPL')
 depends=('startup-notification' 'libxml2' 'libxinerama' 'libxrandr'
          'libxcursor' 'pango' 'imlib2')
-optdepends=('pyxdg: for the xdg-autostart script')
+optdepends=('python2: for the xdg-autostart script')
 groups=('lxde')
-install=${pkgname}.install
 options=('!libtool')
-backup=('etc/xdg/openbox/menu.xml' 'etc/xdg/openbox/rc.xml')
-source=(http://www.icculus.org/openbox/releases/${pkgname}-${pkgver}.tar.gz
-        which-2.20.patch
-        movesize.patch
-        title-matching.patch)
+backup=('etc/xdg/openbox/menu.xml' 'etc/xdg/openbox/rc.xml'
+        'etc/xdg/openbox/autostart' 'etc/xdg/openbox/environment')
+source=(http://www.icculus.org/openbox/releases/$pkgname-$pkgver.tar.gz
+        openbox-3.5.0-Fix-crash-on-NET_WM_MOVERESIZE_CANCEL.patch
+        openbox-3.5.0-title-matching.patch
+        openbox-3.5.0-which-2.20.patch)
 md5sums=('00441b53cf14c03566c8e82643544ff9'
-         '7ca3b5244bb092d46f5bcf1e2bdf4a18'
-         'e09d77842aac9a0cd7eebe112df88383'
-         '6f99711eee0b1c413dca9fa691917b71')
+         'f2e5198a9dfc803c59fd42448a85f2da'
+         '0a11d7149da210a31ef88f8a9c717711'
+         '7ca3b5244bb092d46f5bcf1e2bdf4a18')
 
-build() {
-    cd "${srcdir}"/${pkgname}-${pkgver}
+prepare() {
+  cd $pkgname-$pkgver
+
+  patch -Np1 -i "$srcdir"/openbox-3.5.0-Fix-crash-on-NET_WM_MOVERESIZE_CANCEL.patch # FS#29812
+  patch -Np1 -i "$srcdir"/openbox-3.5.0-title-matching.patch  # OB#5277
+  patch -Np1 -i "$srcdir"/openbox-3.5.0-which-2.20.patch # FS#11455
 
-    patch -Np1 -i "${srcdir}"/which-2.20.patch      # FS#11455
-    patch -Np1 -i "${srcdir}"/movesize.patch        # FS#29812
-    patch -Np0 -i "${srcdir}"/title-matching.patch  # FS#5277 on Openbox bugtracker
+  sed -i 's|/usr/bin/env python|/usr/bin/env python2|' \
+    data/autostart/openbox-xdg-autostart
+}
 
-    sed -i 's|/usr/bin/env python|/usr/bin/env python2|' \
-            data/autostart/openbox-xdg-autostart
-  
-    ./configure --prefix=/usr \
-                --with-x \
-                --enable-startup-notification \
-                --sysconfdir=/etc \
-                --libexecdir=/usr/lib/openbox
-  
-    make
+build() {
+  cd $pkgname-$pkgver
+  ./configure --prefix=/usr \
+    --with-x \
+    --enable-startup-notification \
+    --sysconfdir=/etc \
+    --libexecdir=/usr/lib/openbox
+  make
 }
 
 package() {
-    cd "${srcdir}"/${pkgname}-${pkgver}
-    make DESTDIR="${pkgdir}" install
+  cd $pkgname-$pkgver
+  make DESTDIR="$pkgdir" install
+  rm "$pkgdir"/usr/bin/{gdm-control,gnome-panel-control}
 
-    sed -i "s:startkde:/usr/bin/\0:" \
-           "${pkgdir}"/usr/share/xsessions/openbox-kde.desktop
-    sed -i "s:=gnome-session:=/usr/bin/gnome-session:" \
-           "${pkgdir}"/usr/share/xsessions/openbox-gnome.desktop
+  sed -i 's:startkde:/usr/bin/\0:' \
+    "$pkgdir"/usr/share/xsessions/openbox-kde.desktop
+  sed -i 's:=gnome-session:=/usr/bin/gnome-session:' \
+    "$pkgdir"/usr/share/xsessions/openbox-gnome.desktop
 }
diff --git a/community/openbox/movesize.patch b/community/openbox/movesize.patch
deleted file mode 100644
index 4f0e8595e..000000000
--- a/community/openbox/movesize.patch
+++ /dev/null
@@ -1,19 +0,0 @@
---- openbox-3.5.0/openbox/moveresize.c.orig	2011-08-01 21:14:58.000000000 +0100
-+++ openbox-3.5.0/openbox/moveresize.c	2012-03-28 20:04:36.100459920 +0100
-@@ -326,6 +326,16 @@ void moveresize_end(gboolean cancel)
- #endif
-     }
- 
-+    if (!moveresize_client) {
-+        ob_debug("moveresize_end: moveresize_client is NULL!");
-+        return;
-+    }
-+
-+    if (!moveresize_in_progress) {
-+        ob_debug("moveresize_end: moveresize_in_progress is FALSE!");
-+        return;
-+    }
-+
-     /* don't use client_move() here, use the same width/height as
-        we've been using during the move, otherwise we get different results
-        when moving maximized windows between monitors of different sizes !
diff --git a/community/openbox/openbox-3.5.0-Fix-crash-on-NET_WM_MOVERESIZE_CANCEL.patch b/community/openbox/openbox-3.5.0-Fix-crash-on-NET_WM_MOVERESIZE_CANCEL.patch
new file mode 100644
index 000000000..174482da4
--- /dev/null
+++ b/community/openbox/openbox-3.5.0-Fix-crash-on-NET_WM_MOVERESIZE_CANCEL.patch
@@ -0,0 +1,28 @@
+From 339c19d1b3a7a5139aed8b59bad755ddd0e518ff Mon Sep 17 00:00:00 2001
+From: Mikael Magnusson <mikachu@gmail.com>
+Date: Sun, 3 Jun 2012 20:18:48 +0200
+Subject: [PATCH] Fix crash on unexpected NET_WM_MOVERESIZE_CANCEL messages
+
+gtk+ 3.4 apparently sends these randomly when you select text in a
+GtkEntry. This also fixes bug #5460.
+---
+ openbox/event.c |    3 ++-
+ 1 file changed, 2 insertions(+), 1 deletion(-)
+
+diff --git a/openbox/event.c b/openbox/event.c
+index b9ec1c5..4d091bf 100644
+--- a/openbox/event.c
++++ b/openbox/event.c
+@@ -1495,7 +1495,8 @@ static void event_handle_client(ObClient *client, XEvent *e)
+             }
+             else if ((Atom)e->xclient.data.l[2] ==
+                      OBT_PROP_ATOM(NET_WM_MOVERESIZE_CANCEL))
+-                moveresize_end(TRUE);
++                if (moveresize_client)
++                    moveresize_end(TRUE);
+         } else if (msgtype == OBT_PROP_ATOM(NET_MOVERESIZE_WINDOW)) {
+             gint ograv, x, y, w, h;
+ 
+-- 
+1.7.10
+
diff --git a/community/openbox/title-matching.patch b/community/openbox/openbox-3.5.0-title-matching.patch
index 88ed73546..fdfe28af0 100644
--- a/community/openbox/title-matching.patch
+++ b/community/openbox/openbox-3.5.0-title-matching.patch
@@ -1,5 +1,5 @@
---- openbox/client.c    2011-08-01 22:14:58.000000000 +0200
-+++ openbox/client.c    2011-10-22 14:59:56.000000000 +0200
+--- openbox-3.5.0/openbox/client.c    2011-08-01 22:14:58.000000000 +0200
++++ openbox-3.5.0/openbox/client.c    2011-10-22 14:59:56.000000000 +0200
 @@ -883,7 +883,7 @@
                   !g_pattern_match(app->role,
                                    strlen(self->role), self->role, NULL))
diff --git a/community/openbox/which-2.20.patch b/community/openbox/openbox-3.5.0-which-2.20.patch
index f947d6a98..f947d6a98 100644
--- a/community/openbox/which-2.20.patch
+++ b/community/openbox/openbox-3.5.0-which-2.20.patch
diff --git a/community/openbox/openbox.install b/community/openbox/openbox.install
deleted file mode 100644
index 762a3ef14..000000000
--- a/community/openbox/openbox.install
+++ /dev/null
@@ -1,4 +0,0 @@
-post_install() {
-    echo "Place menu.xml, rc.xml and autostart in ~/.config/openbox"
-    echo "They can be found in /etc/xdg/openbox"
-}
diff --git a/community/paps/PKGBUILD b/community/paps/PKGBUILD
new file mode 100644
index 000000000..e5d0721de
--- /dev/null
+++ b/community/paps/PKGBUILD
@@ -0,0 +1,27 @@
+# $Id: PKGBUILD 93533 2013-07-05 01:34:25Z bisson $
+# Maintainer: Gaetan Bisson <bisson@archlinux.org>
+# Contributor: Artyom 'logus' Pervukhin <logus9@gmail.com>
+# Contributor: Tim Yang <tdy@gmx.com>
+
+pkgname=paps
+pkgver=0.6.8
+pkgrel=5
+pkgdesc='UTF-8 to PostScript converter via Pango'
+url='http://paps.sourceforge.net/'
+license=('LGPL')
+depends=('pango')
+arch=('i686' 'x86_64')
+source=("http://downloads.sourceforge.net/paps/paps-${pkgver}.tar.gz")
+sha1sums=('83646b0de89deb8321f260c2c5a665bc7c8f5928')
+
+build() {
+	cd "${srcdir}/${pkgname}-${pkgver}"
+	export LDFLAGS=${LDFLAGS/,--as-needed/}
+	./configure --prefix=/usr --mandir=/usr/share/man --disable-static
+	make
+}
+
+package() {
+	cd "${srcdir}/${pkgname}-${pkgver}"
+	make DESTDIR="${pkgdir}" install
+}
diff --git a/community/passenger/PKGBUILD b/community/passenger/PKGBUILD
index 910bd0868..5ae07a8ca 100644
--- a/community/passenger/PKGBUILD
+++ b/community/passenger/PKGBUILD
@@ -1,8 +1,8 @@
-# $Id: PKGBUILD 92658 2013-06-10 17:17:32Z spupykin $
+# $Id: PKGBUILD 93666 2013-07-08 11:18:56Z spupykin $
 # Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com>
 
 pkgname=passenger
-pkgver=4.0.5
+pkgver=4.0.7
 pkgrel=1
 pkgdesc="mod_rails passenger"
 arch=('i686' 'x86_64' 'mips64el')
@@ -14,7 +14,7 @@ makedepends=('apache')
 install=passenger.install
 options=('!emptydirs')
 source=($pkgname-$pkgver.tar.gz::https://github.com/FooBarWidget/passenger/archive/release-$pkgver.tar.gz)
-md5sums=('c1818eb097edc3f13715f884d938b690')
+md5sums=('07f892d34164bfcc883a46d8b730b8e5')
 
 build(){
   cd $srcdir/passenger-release-$pkgver
diff --git a/community/patchutils/PKGBUILD b/community/patchutils/PKGBUILD
index 4ea4b2ff6..af555da4d 100644
--- a/community/patchutils/PKGBUILD
+++ b/community/patchutils/PKGBUILD
@@ -1,17 +1,17 @@
-# $Id: PKGBUILD 64864 2012-02-18 18:22:36Z lcarlier $
+# $Id: PKGBUILD 93496 2013-07-04 12:40:49Z lcarlier $
 # Contributor: Aurelien Foret <orelien@chez.com>
 # Maintainer: Douglas Soares de Andrade <douglas@archlinux.org>
 
 pkgname=patchutils
-pkgver=0.3.2
-pkgrel=2
+pkgver=0.3.3
+pkgrel=1
 pkgdesc="A small collection of programs that operate on patch files"
 license=('GPL')
 url="http://cyberelk.net/tim/patchutils/"
 depends=('perl')
 arch=('i686' 'x86_64' 'mips64el')
-source=(http://cyberelk.net/tim/data/patchutils/stable/$pkgname-$pkgver.tar.bz2)
-md5sums=('74607b4a28c9009c6aeeed0e91098917')
+source=(http://cyberelk.net/tim/data/patchutils/stable/$pkgname-$pkgver.tar.xz)
+md5sums=('b640b6b8af6183f83eacf7bd6d2460cb')
 
 build() {
   cd $srcdir/$pkgname-$pkgver
diff --git a/community/percona-server/PKGBUILD b/community/percona-server/PKGBUILD
index 584d016a3..0aee6e562 100644
--- a/community/percona-server/PKGBUILD
+++ b/community/percona-server/PKGBUILD
@@ -1,8 +1,8 @@
-# $Id: PKGBUILD 91599 2013-05-25 10:17:47Z mtorromeo $
+# $Id: PKGBUILD 93544 2013-07-05 09:53:28Z mtorromeo $
 # Maintainer: Massimiliano Torromeo <massimiliano.torromeo@gmail.com>
 
 pkgname=percona-server
-pkgver=5.5.31_rel30.3
+pkgver=5.5.32_rel31.0
 pkgrel=1
 pkgdesc="A backwards-compatible drop-in replacement for MySQL that provides improved performance, diagnostics and instrumentation"
 arch=('i686' 'x86_64' 'mips64el')
@@ -97,7 +97,7 @@ package() {
 	rm "${pkgdir}"/usr/share/man/man1/mysql-test-run.pl.1
 }
 
-sha256sums=('808fea7fa2a10e61a3767819f4f9275afc8e5a66a7567b7b6d9e3bde2b79fce3'
+sha256sums=('e34676cea5ceb398258408e31e8527724845f83bbbf1f22308f5069304118e8f'
             '82a241d9fa4032187a26597d044e94ba810b209b53a7ce14bb6eb92555993a48'
             '9bc66470f3f80534c0bb62f9f8325ccf60b164f421f74ad74a963f065d7b1869'
             'badf6a701d9dc6ea3b4ddca26cb0f42b6236432ccdbc14c64962147802594a60')
diff --git a/community/perl-berkeleydb/PKGBUILD b/community/perl-berkeleydb/PKGBUILD
index 108c806d7..b6405d193 100644
--- a/community/perl-berkeleydb/PKGBUILD
+++ b/community/perl-berkeleydb/PKGBUILD
@@ -1,11 +1,11 @@
-# $Id: PKGBUILD 91656 2013-05-26 09:24:46Z bluewind $
+# $Id: PKGBUILD 93668 2013-07-08 11:19:35Z spupykin $
 # Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com>
 # Maintainer: Charles Mauch <cmauch@gmail.com>
 # Contributor: Francois Charette <firmicus@gmx.net>
 
 pkgname=perl-berkeleydb
-pkgver=0.51
-pkgrel=2
+pkgver=0.52
+pkgrel=1
 pkgdesc="Interface to Berkeley DB version 2, 3 or 4"
 arch=('i686' 'x86_64' 'mips64el')
 url="http://search.cpan.org/dist/BerkeleyDB/"
@@ -13,7 +13,7 @@ license=('GPL' 'PerlArtistic')
 depends=('perl' 'db')
 options=('!emptydirs')
 source=(http://search.cpan.org/CPAN/authors/id/P/PM/PMQS/BerkeleyDB-$pkgver.tar.gz)
-md5sums=('50d0d18227a6568e2557a1b1b33f8f55')
+md5sums=('e1031f4cd3062fdb1597af4373789d79')
 
 build() {
   cd  $srcdir/BerkeleyDB-$pkgver
diff --git a/community/perl-gd/PKGBUILD b/community/perl-gd/PKGBUILD
index b51591150..4ffcdfad3 100644
--- a/community/perl-gd/PKGBUILD
+++ b/community/perl-gd/PKGBUILD
@@ -1,10 +1,10 @@
-# $Id: PKGBUILD 91671 2013-05-26 09:25:08Z bluewind $
+# $Id: PKGBUILD 93678 2013-07-08 11:29:22Z spupykin $
 # Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com>
 # Contributor: Sergej Pupykin <pupykin.s+aur@gmail.com>
 
 pkgname=perl-gd
-pkgver=2.49
-pkgrel=2
+pkgver=2.50
+pkgrel=1
 pkgdesc="Interface to Gd Graphics Library"
 arch=('i686' 'x86_64' 'mips64el')
 url="http://search.cpan.org/dist/GD"
@@ -12,7 +12,7 @@ license=('GPL' 'PerlArtistic')
 depends=('gd')
 options=('!emptydirs')
 source=(http://www.cpan.org/authors/id/L/LD/LDS/GD-$pkgver.tar.gz)
-md5sums=('c58b6556bddbe147c41f4e17a0de9bea')
+md5sums=('b2f1e47dfc1c4e4fdda3277f165d36e5')
 
 build() {
   cd  $srcdir/GD-$pkgver
diff --git a/community/pianobar/PKGBUILD b/community/pianobar/PKGBUILD
index 49680db24..43facc006 100644
--- a/community/pianobar/PKGBUILD
+++ b/community/pianobar/PKGBUILD
@@ -1,10 +1,10 @@
-# $Id: PKGBUILD 80751 2012-12-03 03:27:47Z dwallace $
+# $Id: PKGBUILD 93512 2013-07-04 21:18:29Z dwallace $
 # Maintainer: Daniel Wallace < danielwallace at gtmanfred dot com>
 # Contributor: Mitch Bigelow <ipha00@gmail.com>
 # Contributor: Patrick Palka <patrick@parcs.ath.cx>
 
 pkgname=pianobar
-pkgver=2012.12.01
+pkgver=2013.05.19
 pkgrel=1
 pkgdesc="console-based frontend for Pandora"
 url="http://6xq.net/0017"
@@ -12,16 +12,14 @@ arch=('i686' 'x86_64' 'mips64el')
 license=('MIT')
 depends=('libao' 'faad2' 'libmad' 'gnutls' 'json-c' 'libgcrypt')
 source=(http://6xq.net/projects/pianobar/$pkgname-$pkgver.tar.bz2)
-sha256sums=('a3909f796e7cef21b19d98282f332ecbcf9b2c60a2af22a0a2ce01e9c4d9f515')
+sha256sums=('cf88e82663d2b0aa4d73e761506eac4f3e7bc789b57d92377acd994d785e1046')
 
 build() {
-    cd "${srcdir}/${pkgname}-${pkgver}"
-    make
+    make -C "${srcdir}/${pkgname}-${pkgver}"
 }
 
 package() {
-    cd "${srcdir}/${pkgname}-${pkgver}"
-
-    make DESTDIR="$pkgdir" PREFIX=/usr install
-    install -Dm644 COPYING "$pkgdir/usr/share/licenses/$pkgname/LICENSE"
+    make -C "${srcdir}/${pkgname}-${pkgver}" DESTDIR="$pkgdir" PREFIX=/usr install
+    install -Dm644 "${srcdir}/${pkgname}-${pkgver}"/COPYING "$pkgdir/usr/share/licenses/$pkgname/LICENSE"
+    install -Dm755 $srcdir/$pkgname-$pkgver/contrib/headless_pianobar $pkgdir/usr/bin/pianoctl
 }
diff --git a/community/python-pytables/PKGBUILD b/community/python-pytables/PKGBUILD
index 86f60b82f..02b6a74a5 100644
--- a/community/python-pytables/PKGBUILD
+++ b/community/python-pytables/PKGBUILD
@@ -1,11 +1,11 @@
-# $Id: PKGBUILD 92633 2013-06-10 09:13:55Z aginiewicz $
+# $Id: PKGBUILD 93702 2013-07-08 14:16:08Z aginiewicz $
 # Maintainer: Andrzej Giniewicz <gginiu@gmail.com>
 # Contributor: Sebastien Binet <binet@cern.ch>
 
 pkgbase=python-pytables
 pkgname=('python2-pytables' 'python-pytables')
 pkgver=3.0.0
-pkgrel=1
+pkgrel=3
 arch=("i686" "x86_64")
 pkgdesc="A package for managing hierarchical datasets and designed to efficiently and easily cope with extremely large amounts of data"
 url="http://www.pytables.org"
@@ -34,6 +34,11 @@ package_python2-pytables() {
   python2 setup.py install --prefix=/usr --root="$pkgdir" --optimize=1
 
   install -Dm644 LICENSE.txt "$pkgdir/usr/share/licenses/$pkgname/LICENSE"
+
+  # see FS#36015
+  mv "$pkgdir"/usr/bin/pt2to3{,-2.7}
+  mv "$pkgdir"/usr/bin/ptdump{,-2.7}
+  mv "$pkgdir"/usr/bin/ptrepack{,-2.7}
 }
 
 package_python-pytables() {
diff --git a/community/qtcreator/PKGBUILD b/community/qtcreator/PKGBUILD
index b06e66b1d..605cbca4e 100644
--- a/community/qtcreator/PKGBUILD
+++ b/community/qtcreator/PKGBUILD
@@ -1,4 +1,4 @@
-# $Id: PKGBUILD 90973 2013-05-16 23:06:59Z svenstaro $
+# $Id: PKGBUILD 93684 2013-07-08 11:58:09Z svenstaro $
 # Maintainer: Imanol Celaya <ornitorrincos@archlinux-es.org>
 # Maintainer: Sven-Hendrik Haase <sh@lutzhaase.com>
 # Contributor: Lukas Jirkovsky <l.jirkovsky@gmail.com>
@@ -7,9 +7,9 @@
 # Contributor: delor <bartekpiech gmail com>
 
 pkgname=qtcreator
-pkgver=2.7.1
-_pkgver=2.7.1
-pkgrel=1
+pkgver=2.7.2
+_pkgver=2.7.2
+pkgrel=2
 pkgdesc='Lightweight, cross-platform integrated development environment'
 arch=('i686' 'x86_64')
 url='http://qt-project.org'
@@ -26,16 +26,16 @@ optdepends=('qt5-doc: for the integrated Qt documentation'
             'bzr: for bazaar support'
             'valgrind: for analyze support')
 install=qtcreator.install
-source=("https://qt.gitorious.org/qt-creator/qt-creator/archive-tarball/v${_pkgver}"
+source=("http://download.qt-project.org/official_releases/qtcreator/2.7/${pkgver}/qt-creator-${pkgver}-src.tar.gz"
         'qtcreator.desktop')
-md5sums=('3f552e173918b2705c9dbb17725057b5'
+md5sums=('7f1c10740784d3edf2347c27be21fd1a'
          '82888d4be900e7833d768050a135cd37')
 
 build() {
   [[ -d build ]] && rm -r build
   mkdir build && cd build
 
-  qmake ../qt-creator-qt-creator/qtcreator.pro
+  qmake ../qt-creator-${pkgver}-src/qtcreator.pro
   make
   make docs -j1
 }
@@ -47,5 +47,5 @@ package() {
   make INSTALL_ROOT="${pkgdir}/usr/" install_docs
 
   install -Dm644 ${srcdir}/qtcreator.desktop ${pkgdir}/usr/share/applications/qtcreator.desktop
-  install -Dm644 ${srcdir}/qt-creator-qt-creator/LGPL_EXCEPTION.TXT ${pkgdir}/usr/share/licenses/qtcreator/LGPL_EXCEPTION.TXT
+  install -Dm644 ${srcdir}/qt-creator-${pkgver}-src/LGPL_EXCEPTION.TXT ${pkgdir}/usr/share/licenses/qtcreator/LGPL_EXCEPTION.TXT
 }
diff --git a/community/recoll/PKGBUILD b/community/recoll/PKGBUILD
index 9dced31e5..73c967da2 100644
--- a/community/recoll/PKGBUILD
+++ b/community/recoll/PKGBUILD
@@ -1,4 +1,4 @@
-# $Id: PKGBUILD 91024 2013-05-18 10:14:53Z spupykin $
+# $Id: PKGBUILD 93674 2013-07-08 11:20:28Z spupykin $
 # Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com>
 # Contributor: Daniel J Griffiths <ghost1227@archlinux.us>
 # Contributor: Andrea Scarpino <andrea@archlinux.org>
@@ -6,7 +6,7 @@
 # Contributor: Robert Emil Berge <filoktetes@linuxophic.org>
 
 pkgname=recoll
-pkgver=1.19.2
+pkgver=1.19.5
 pkgrel=1
 pkgdesc="Full text search tool based on Xapian backend"
 arch=('i686' 'x86_64' 'mips64el')
@@ -31,7 +31,7 @@ optdepends=('libxslt: for XML based formats (fb2,etc)'
 	    'aspell-en: English stemming support')
 install=recoll.install
 source=("http://www.lesbonscomptes.com/$pkgname/$pkgname-$pkgver.tar.gz")
-md5sums=('caffd86c122476ca0bcdde55177b393b')
+md5sums=('4a770950d47dee4f6b4ef95e1bc16a5a')
 
 build() {
   cd "$srcdir/$pkgname-$pkgver"
diff --git a/community/rsyslog/PKGBUILD b/community/rsyslog/PKGBUILD
index ff163af5d..e3083daf9 100644
--- a/community/rsyslog/PKGBUILD
+++ b/community/rsyslog/PKGBUILD
@@ -1,8 +1,8 @@
-# $Id: PKGBUILD 92920 2013-06-19 10:05:52Z spupykin $
+# $Id: PKGBUILD 93676 2013-07-08 11:20:55Z spupykin $
 # Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com>
 
 pkgname=rsyslog
-pkgver=7.4.1
+pkgver=7.4.2
 pkgrel=1
 pkgdesc="An enhanced multi-threaded syslogd with a focus on security and reliability"
 url="http://www.rsyslog.com/"
@@ -22,7 +22,7 @@ options=('strip' 'zipman' '!libtool')
 source=("http://www.rsyslog.com/files/download/rsyslog/rsyslog-$pkgver.tar.gz"
 	'rsyslog.logrotate'
 	'rsyslog.conf')
-md5sums=('8e0e868a425bfa5c2c13bdc28338e1af'
+md5sums=('52ba87ddce153625ec4e4a2e60c4ec0e'
          '0d990373f5c70ddee989296007b4df5b'
          'd61dd424e660eb16401121eed20d98bc')
 
diff --git a/community/rust/PKGBUILD b/community/rust/PKGBUILD
index 7baa62a1a..c9530fd58 100644
--- a/community/rust/PKGBUILD
+++ b/community/rust/PKGBUILD
@@ -1,17 +1,17 @@
-# $Id: PKGBUILD 90170 2013-05-07 22:11:28Z thestinger $
+# $Id: PKGBUILD 93472 2013-07-04 02:25:38Z thestinger $
 # Maintainer: Daniel Micay <danielmicay@gmail.com>
 pkgname=rust
-pkgver=0.6
-pkgrel=4
+pkgver=0.7
+pkgrel=1
 arch=('i686' 'x86_64')
 pkgdesc='A safe, concurrent, practical language'
 url='http://www.rust-lang.org/'
 license=('MIT' 'Apache')
-depends=(gcc gcc-libs shared-mime-info)
-makedepends=(libffi perl python2 curl chrpath emacs)
+depends=(gcc shared-mime-info)
+makedepends=(libffi perl python2 curl chrpath emacs-nox)
 optdepends=('haskell-pandoc: documentation generator (rustdoc)')
 source=("http://static.rust-lang.org/dist/rust-${pkgver}.tar.gz")
-sha256sums=('e11cb529a1e20f27d99033181a9e0e131817136b46d2742f0fa1afa1210053e5')
+sha256sums=('0b88b8a4489382e0a69214eaab88e2e7c316ec33c164af0d3b53630b17590df0')
 install=rust.install
 
 build() {
@@ -34,20 +34,21 @@ package() {
   cd rust-$pkgver
   make DESTDIR="$pkgdir" install
 
-  mkdir -p "$pkgdir/usr/share/vim" "$pkgdir/usr/share/licenses/rust"
+  mkdir -p "$pkgdir/usr/share/vim" "$pkgdir/usr/share/licenses/$pkgname"
 
   cp -a src/etc/vim "$pkgdir/usr/share/vim/vimfiles"
   find "$pkgdir/usr/share/vim" -type f -exec chmod 644 {} +
   find "$pkgdir/usr/share/vim" -type d -exec chmod 755 {} +
 
+  install -Dm644 src/etc/zsh/_rust "$pkgdir/usr/share/zsh/site-functions/_rust"
   install -Dm644 src/etc/kate/rust.xml "$pkgdir/usr/share/apps/katepart/syntax/rust.xml"
   install -Dm644 src/etc/gedit/share/mime/packages/rust.xml \
     "$pkgdir/usr/share/mime/packages/rust.xml"
   install -Dm644 src/etc/gedit/share/gtksourceview-3.0/language-specs/rust.lang \
     "$pkgdir/usr/share/gtksourceview-3.0/language-specs/rust.lang"
 
-  install -m644 LICENSE-APACHE "$pkgdir/usr/share/licenses/rust"
-  install -m644 LICENSE-MIT "$pkgdir/usr/share/licenses/rust"
+  install -m644 LICENSE-APACHE "$pkgdir/usr/share/licenses/$pkgname"
+  install -m644 LICENSE-MIT "$pkgdir/usr/share/licenses/$pkgname"
 
   cd src/etc/emacs
   make
@@ -58,6 +59,4 @@ package() {
 
   # https://github.com/mozilla/rust/issues/5219
   chrpath -d bin/* lib/*.so lib/rustc/*/lib/*.so
-
-  cp lib/rustc/*/lib/{librustdoc-*-0.6.so,librustpkg-*-0.6.so} lib/
 }
diff --git a/community/rxvt-unicode/PKGBUILD b/community/rxvt-unicode/PKGBUILD
index 4881e7f10..7a0285a84 100644
--- a/community/rxvt-unicode/PKGBUILD
+++ b/community/rxvt-unicode/PKGBUILD
@@ -1,18 +1,17 @@
-# $Id: PKGBUILD 91706 2013-05-26 09:26:28Z bluewind $
+# $Id: PKGBUILD 93568 2013-07-05 17:54:59Z seblu $
 # Maintainer: Sébastien Luttringer
 # Contributor: Angel Velasquez <angvp@archlinux.org>
 # Contributor: tobias <tobias@archlinux.org>
 # Contributor: dibblethewrecker dibblethewrecker.at.jiwe.dot.org
 
-pkgname=rxvt-unicode
+pkgbase=rxvt-unicode
+pkgname=('rxvt-unicode' 'rxvt-unicode-terminfo')
 pkgver=9.18
-pkgrel=5
-pkgdesc='An unicode enabled rxvt-clone terminal emulator (urxvt)'
+pkgrel=7
 arch=('i686' 'x86_64' 'mips64el')
 url='http://software.schmorp.de/pkg/rxvt-unicode.html'
 license=('GPL')
-depends=('libxft' 'perl' 'startup-notification')
-optdepends=('gtk2-perl: to use the urxvt-tabbed')
+makedepends=('libxft' 'perl' 'startup-notification')
 source=(
   "http://dist.schmorp.de/rxvt-unicode/$pkgname-$pkgver.tar.bz2"
   'urxvt.desktop'
@@ -32,6 +31,7 @@ prepare() {
 
 build() {
   cd $pkgname-$pkgver
+  # we disable smart-resize (FS#34807)
   ./configure \
     --prefix=/usr \
     --with-terminfo=/usr/share/terminfo \
@@ -49,7 +49,7 @@ build() {
     --enable-rxvt-scroll \
     --enable-selectionscrolling \
     --enable-slipwheeling \
-    --enable-smart-resize \
+    --disable-smart-resize \
     --enable-startup-notification \
     --enable-transparency \
     --enable-unicode3 \
@@ -63,20 +63,30 @@ build() {
   make
 }
 
-package() {
-  pushd $pkgname-$pkgver
+package_rxvt-unicode() {
+  pkgdesc='An unicode enabled rxvt-clone terminal emulator (urxvt)'
+  depends=('rxvt-unicode-terminfo' 'libxft' 'perl' 'startup-notification')
+  optdepends=('gtk2-perl: to use the urxvt-tabbed')
+
+  # install freedesktop menu
+  for _f in urxvt urxvtc urxvt-tabbed; do
+    install -Dm644 $_f.desktop "$pkgdir/usr/share/applications/$_f.desktop"
+  done
+  cd $pkgname-$pkgver
   # workaround terminfo installation
-  export TERMINFO="$pkgdir/usr/share/terminfo"
+  export TERMINFO="$srcdir/terminfo"
   install -d "$TERMINFO"
   make DESTDIR="$pkgdir" install
   # install the tabbing wrapper ( requires gtk2-perl! )
   sed -i 's/\"rxvt\"/"urxvt"/' doc/rxvt-tabbed
   install -Dm 755 doc/rxvt-tabbed "$pkgdir/usr/bin/urxvt-tabbed"
-  popd
-  # install freedesktop menu
-  for _f in urxvt urxvtc urxvt-tabbed; do
-    install -Dm644 $_f.desktop "$pkgdir/usr/share/applications/$_f.desktop"
-  done
+}
+
+package_rxvt-unicode-terminfo() {
+  pkgdesc='Terminfo files for urxvt'
+  conflict=('rxvt-unicode<=9.18-6')
+  install -dm 755 "$pkgdir/usr/share/"
+  mv terminfo "$pkgdir/usr/share/"
 }
 
 # vim:set ts=2 sw=2 et:
diff --git a/community/scite/PKGBUILD b/community/scite/PKGBUILD
index 0d1e79138..e4d684e76 100644
--- a/community/scite/PKGBUILD
+++ b/community/scite/PKGBUILD
@@ -1,4 +1,4 @@
-# $Id: PKGBUILD 88149 2013-04-12 13:59:38Z arodseth $
+# $Id: PKGBUILD 93570 2013-07-05 18:26:15Z arodseth $
 # Maintainer: Alexander Rødseth <rodseth@gmail.com>
 # Contributor: Thomas S Hatch <thatch45@gmail.com>
 # Contributor: Corrado 'bardo' Primier <corrado.primier@mail.polimi.it>
@@ -6,7 +6,7 @@
 # Contributor: Daniel J Griffiths <ghost1227@archlinux.us>
 
 pkgname=scite
-pkgver=3.3.1
+pkgver=3.3.3
 pkgrel=1
 pkgdesc='Editor with facilities for building and running programs'
 arch=('i686' 'x86_64' 'mips64el')
@@ -17,7 +17,7 @@ makedepends=('setconf')
 backup=('usr/share/scite/SciTEGlobal.properties')
 install="$pkgname.install"
 source=("http://downloads.sourceforge.net/sourceforge/scintilla/${pkgname}${pkgver//./}.tgz")
-sha256sums=('96f1b74f728375e405a39f210b34dfabbbd2654b9c30ba886d8c3b4acbafc717')
+sha256sums=('ee4d8e976d1a13657cb1b60af392cef60fbb2c441932e0398f2c9562fbcbe6a3')
 
 prepare() {
   if [ $?CXXBASEFLAGS == 1 ]; then 
diff --git a/community/thttpd/PKGBUILD b/community/thttpd/PKGBUILD
new file mode 100644
index 000000000..95862d06f
--- /dev/null
+++ b/community/thttpd/PKGBUILD
@@ -0,0 +1,71 @@
+# $Id: PKGBUILD 93680 2013-07-08 11:41:45Z bisson $
+# Maintainer: Gaetan Bisson <bisson@archlinux.org>
+# Contributor: Damir Perisa <damir.perisa@bluewin.ch>
+# Contributor: Stewart Starbuck <stewart@stewartstarbuck.co.uk>
+
+pkgname=thttpd
+pkgver=2.25b
+pkgrel=11
+pkgdesc='Simple, small, portable, fast, and secure HTTP server'
+url='http://www.acme.com/software/thttpd/'
+license=('custom:BSD')
+arch=('i686' 'x86_64')
+backup=('etc/thttpd.conf')
+source=("http://www.acme.com/software/thttpd/${pkgname}-${pkgver}.tar.gz"
+        'forwarded-for.patch'
+        'discreet.patch'
+        'getline.patch'
+        'logrotate.d'
+        'service'
+        'config')
+sha1sums=('cd0e823233ad73e34ee1c9b871b01050feb9db52'
+          '1293fbaf83a489c65d6d2b107d797c687233d96a'
+          '1e73fca7d9ac2579da317f985c8666a181dc37c1'
+          '5ac14035a10b9155d813b363520e9aa74c5d91fc'
+          '36ffeefd1675ca4920605b1b5ca32dd5141a8f23'
+          '73bd76de0e89a9cc31e5605659837d83b3c8dfde'
+          '16640870a69cfc48021ee3acfea7c95834549d46')
+
+prepare() {
+	cd "${srcdir}/${pkgname}-${pkgver}"
+	patch -p1 -i ../forwarded-for.patch
+	patch -p1 -i ../discreet.patch
+	patch -p1 -i ../getline.patch
+	echo 'mkv	video/x-matroska' >> mime_types.txt
+}
+
+build() {
+	cd "${srcdir}/${pkgname}-${pkgver}"
+	CPPFLAGS= ./configure --prefix=/usr --mandir=/usr/share/man
+	sed \
+		-e 's/^CFLAGS =/CFLAGS +=/' \
+		-e '/^STATICFLAG =/c STATICFLAG =' \
+		-i Makefile */Makefile
+	make
+}
+
+package() {
+	cd "${srcdir}/${pkgname}-${pkgver}"
+	install -d "${pkgdir}"/usr/share/man/man{1,8}
+	make \
+		BINDIR="${pkgdir}"/usr/bin \
+		WEBDIR="${pkgdir}"/srv/http \
+		MANDIR="${pkgdir}"/usr/share/man \
+		WEBGROUP=root install
+
+	rm -fr "${pkgdir}"/srv
+	chown root:root -R "${pkgdir}"
+	chmod 755 -R "${pkgdir}"/usr/bin # strip needs u+w
+
+	install -Dm644 ../config "${pkgdir}"/etc/thttpd.conf
+	install -Dm644 ../service "${pkgdir}"/usr/lib/systemd/system/thttpd.service
+	install -Dm644 ../logrotate.d "${pkgdir}"/etc/logrotate.d/thttpd
+
+	install -d "${pkgdir}"/var/log/thttpd
+	install -d "${pkgdir}"/usr/share/licenses/"${pkgname}"
+	head -n 26 thttpd.c > "${pkgdir}"/usr/share/licenses/"${pkgname}"/LICENSE
+
+	# conflicts with apache
+	mv "${pkgdir}"/usr/bin/htpasswd{,-thttpd}
+	mv "${pkgdir}"/usr/share/man/man1/htpasswd{,-thttpd}.1
+}
diff --git a/community/thttpd/config b/community/thttpd/config
new file mode 100644
index 000000000..6be17f1f7
--- /dev/null
+++ b/community/thttpd/config
@@ -0,0 +1,7 @@
+dir=/srv/http
+vhost
+user=http
+cgipat=**.cgi
+logfile=/var/log/thttpd/thttpd.log
+pidfile=/var/run/thttpd.pid
+charset=utf-8
diff --git a/community/thttpd/discreet.patch b/community/thttpd/discreet.patch
new file mode 100644
index 000000000..b427ecc2c
--- /dev/null
+++ b/community/thttpd/discreet.patch
@@ -0,0 +1,34 @@
+diff -Naur old/libhttpd.c new/libhttpd.c
+--- old/libhttpd.c	2012-04-27 14:24:50.971711600 +0200
++++ new/libhttpd.c	2012-04-27 14:33:24.559135581 +0200
+@@ -744,7 +744,7 @@
+     (void) my_snprintf( buf, sizeof(buf), "\
+ <HTML>\n\
+ <HEAD><TITLE>%d %s</TITLE></HEAD>\n\
+-<BODY BGCOLOR=\"#cc9999\" TEXT=\"#000000\" LINK=\"#2020ff\" VLINK=\"#4040cc\">\n\
++<BODY>\n\
+ <H2>%d %s</H2>\n",
+ 	status, title, status, title );
+     add_response( hc, buf );
+@@ -769,11 +769,8 @@
+     char buf[1000];
+ 
+     (void) my_snprintf( buf, sizeof(buf), "\
+-<HR>\n\
+-<ADDRESS><A HREF=\"%s\">%s</A></ADDRESS>\n\
+ </BODY>\n\
+-</HTML>\n",
+-	SERVER_ADDRESS, EXPOSED_SERVER_SOFTWARE );
++</HTML>\n" );
+     add_response( hc, buf );
+     }
+ 
+@@ -2766,7 +2763,7 @@
+ 	    (void) fprintf( fp, "\
+ <HTML>\n\
+ <HEAD><TITLE>Index of %.80s</TITLE></HEAD>\n\
+-<BODY BGCOLOR=\"#99cc99\" TEXT=\"#000000\" LINK=\"#2020ff\" VLINK=\"#4040cc\">\n\
++<BODY>\n\
+ <H2>Index of %.80s</H2>\n\
+ <PRE>\n\
+ mode  links  bytes  last-changed  name\n\
diff --git a/community/thttpd/forwarded-for.patch b/community/thttpd/forwarded-for.patch
new file mode 100644
index 000000000..348eb00cf
--- /dev/null
+++ b/community/thttpd/forwarded-for.patch
@@ -0,0 +1,16 @@
+diff -Naur old/libhttpd.c new/libhttpd.c
+--- old/libhttpd.c	2005-06-30 03:50:39.000000000 +1000
++++ new/libhttpd.c	2012-10-24 12:12:17.144560917 +1100
+@@ -2207,6 +2207,12 @@
+ 		if ( strcasecmp( cp, "keep-alive" ) == 0 )
+ 		    hc->keep_alive = 1;
+ 		}
++	    else if ( strncasecmp( buf, "X-Forwarded-For:", 16 ) == 0 )
++		{
++		cp = &buf[16];
++		cp += strspn( cp, " \t" );
++		inet_aton( cp, &(hc->client_addr.sa_in.sin_addr) );
++		}
+ #ifdef LOG_UNKNOWN_HEADERS
+ 	    else if ( strncasecmp( buf, "Accept-Charset:", 15 ) == 0 ||
+ 		      strncasecmp( buf, "Accept-Language:", 16 ) == 0 ||
diff --git a/community/thttpd/getline.patch b/community/thttpd/getline.patch
new file mode 100644
index 000000000..1ec3946b1
--- /dev/null
+++ b/community/thttpd/getline.patch
@@ -0,0 +1,21 @@
+diff -Nur thttpd-2.25b.orig/extras/htpasswd.c thttpd-2.25b/extras/htpasswd.c
+--- thttpd-2.25b.orig/extras/htpasswd.c	2001-12-19 02:08:08.000000000 +0200
++++ thttpd-2.25b/extras/htpasswd.c	2010-04-11 14:43:31.037809054 +0300
+@@ -49,7 +49,7 @@
+     while((line[y++] = line[x++]));
+ }
+ 
+-static int getline(char *s, int n, FILE *f) {
++static int get_line(char *s, int n, FILE *f) {
+     register int i=0;
+ 
+     while(1) {
+@@ -189,7 +189,7 @@
+     strcpy(user,argv[2]);
+ 
+     found = 0;
+-    while(!(getline(line,MAX_STRING_LEN,f))) {
++    while(!(get_line(line,MAX_STRING_LEN,f))) {
+         if(found || (line[0] == '#') || (!line[0])) {
+             putline(tfp,line);
+             continue;
diff --git a/community/thttpd/logrotate.d b/community/thttpd/logrotate.d
new file mode 100644
index 000000000..efac62704
--- /dev/null
+++ b/community/thttpd/logrotate.d
@@ -0,0 +1,12 @@
+/var/log/thttpd/*log {
+	missingok
+	postrotate
+	test -d /sys/fs/cgroup/systemd && {
+		systemctl status thttpd.service | grep -q running &&
+		systemctl restart thttpd.service >/dev/null 
+	} || {
+		rc.d list thttpd | grep -q STARTED &&
+		/etc/rc.d/thttpd restart >/dev/null
+	}
+	endscript
+}
diff --git a/community/thttpd/service b/community/thttpd/service
new file mode 100644
index 000000000..2b40115ba
--- /dev/null
+++ b/community/thttpd/service
@@ -0,0 +1,10 @@
+[Unit]
+Description=Tiny HTTP Daemon
+
+[Service]
+PIDFile=/run/thttpd.pid
+ExecStart=/usr/bin/thttpd -D -C /etc/thttpd.conf
+Restart=always
+
+[Install]
+WantedBy=multi-user.target
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
diff --git a/community/tigervnc/cmakelists.patch b/community/tigervnc/cmakelists.patch
deleted file mode 100644
index cc6286699..000000000
--- a/community/tigervnc/cmakelists.patch
+++ /dev/null
@@ -1,70 +0,0 @@
-diff -ur tigervnc-1.2.0.orig/cmake/BuildPackages.cmake tigervnc-1.2.0/cmake/BuildPackages.cmake
---- tigervnc-1.2.0.orig/cmake/BuildPackages.cmake	2011-11-08 10:16:36.000000000 +0100
-+++ tigervnc-1.2.0/cmake/BuildPackages.cmake	2012-03-30 15:27:00.808919876 +0200
-@@ -86,5 +86,5 @@
- # Common
- #
- 
--install(FILES ${CMAKE_SOURCE_DIR}/LICENCE.TXT DESTINATION doc)
--install(FILES ${CMAKE_SOURCE_DIR}/README.txt DESTINATION doc)
-+install(FILES ${CMAKE_SOURCE_DIR}/LICENCE.TXT DESTINATION share/doc/${CMAKE_PROJECT_NAME}-${VERSION})
-+install(FILES ${CMAKE_SOURCE_DIR}/README.txt DESTINATION share/doc/${CMAKE_PROJECT_NAME}-${VERSION})
-diff -ur tigervnc-1.2.0.orig/CMakeLists.txt tigervnc-1.2.0/CMakeLists.txt
---- tigervnc-1.2.0.orig/CMakeLists.txt	2012-03-09 21:34:29.000000000 +0100
-+++ tigervnc-1.2.0/CMakeLists.txt	2012-03-30 15:28:59.716911575 +0200
-@@ -316,7 +316,8 @@
-   if(APPLE)
-     set(FLTK_LIBRARIES "-framework Carbon -framework Cocoa -framework ApplicationServices")
-   elseif(NOT WIN32)
--    set(FLTK_LIBRARIES "-ldl")
-+    find_library(FONTCONFIG_LIB fontconfig)
-+    set(FLTK_LIBRARIES "-ldl" ${FONTCONFIG_LIB})
-   endif()
-   message(STATUS "Using included FLTK library")
- endif()
-diff -ur tigervnc-1.2.0.orig/unix/CMakeLists.txt tigervnc-1.2.0/unix/CMakeLists.txt
---- tigervnc-1.2.0.orig/unix/CMakeLists.txt	2011-11-03 20:01:18.000000000 +0100
-+++ tigervnc-1.2.0/unix/CMakeLists.txt	2012-03-30 15:27:00.808919876 +0200
-@@ -5,4 +5,4 @@
- add_subdirectory(x0vncserver)
- 
- install(PROGRAMS vncserver DESTINATION bin)
--install(FILES vncserver.man DESTINATION man/man1 RENAME vncserver.1)
-+install(FILES vncserver.man DESTINATION share/man/man1 RENAME vncserver.1)
-diff -ur tigervnc-1.2.0.orig/unix/vncconfig/CMakeLists.txt tigervnc-1.2.0/unix/vncconfig/CMakeLists.txt
---- tigervnc-1.2.0.orig/unix/vncconfig/CMakeLists.txt	2011-06-25 09:32:34.000000000 +0200
-+++ tigervnc-1.2.0/unix/vncconfig/CMakeLists.txt	2012-03-30 15:27:00.808919876 +0200
-@@ -12,4 +12,4 @@
- target_link_libraries(vncconfig tx rfb network rdr ${X11_LIBRARIES})
- 
- install(TARGETS vncconfig DESTINATION bin)
--install(FILES vncconfig.man DESTINATION man/man1 RENAME vncconfig.1)
-+install(FILES vncconfig.man DESTINATION share/man/man1 RENAME vncconfig.1)
-diff -ur tigervnc-1.2.0.orig/unix/vncpasswd/CMakeLists.txt tigervnc-1.2.0/unix/vncpasswd/CMakeLists.txt
---- tigervnc-1.2.0.orig/unix/vncpasswd/CMakeLists.txt	2011-06-25 09:32:34.000000000 +0200
-+++ tigervnc-1.2.0/unix/vncpasswd/CMakeLists.txt	2012-03-30 15:27:00.808919876 +0200
-@@ -6,4 +6,4 @@
- target_link_libraries(vncpasswd tx rfb rdr os)
- 
- install(TARGETS vncpasswd DESTINATION bin)
--install(FILES vncpasswd.man DESTINATION man/man1 RENAME vncpasswd.1)
-+install(FILES vncpasswd.man DESTINATION share/man/man1 RENAME vncpasswd.1)
-diff -ur tigervnc-1.2.0.orig/unix/x0vncserver/CMakeLists.txt tigervnc-1.2.0/unix/x0vncserver/CMakeLists.txt
---- tigervnc-1.2.0.orig/unix/x0vncserver/CMakeLists.txt	2011-08-19 18:41:06.000000000 +0200
-+++ tigervnc-1.2.0/unix/x0vncserver/CMakeLists.txt	2012-03-30 15:27:00.809919874 +0200
-@@ -24,4 +24,4 @@
- endif()
- 
- install(TARGETS x0vncserver DESTINATION bin)
--install(FILES x0vncserver.man DESTINATION man/man1 RENAME x0vncserver.1)
-+install(FILES x0vncserver.man DESTINATION share/man/man1 RENAME x0vncserver.1)
-diff -ur tigervnc-1.2.0.orig/vncviewer/CMakeLists.txt tigervnc-1.2.0/vncviewer/CMakeLists.txt
---- tigervnc-1.2.0.orig/vncviewer/CMakeLists.txt	2011-10-05 11:32:28.000000000 +0200
-+++ tigervnc-1.2.0/vncviewer/CMakeLists.txt	2012-03-30 15:27:00.809919874 +0200
-@@ -55,5 +55,5 @@
-   install(TARGETS vncviewer DESTINATION bin)
- endif()
- if(UNIX)
--  install(FILES vncviewer.man DESTINATION man/man1 RENAME vncviewer.1)
-+  install(FILES vncviewer.man DESTINATION share/man/man1 RENAME vncviewer.1)
- endif()
diff --git a/community/tigervnc/gethomedir.patch b/community/tigervnc/gethomedir.patch
deleted file mode 100644
index 9114eea63..000000000
--- a/community/tigervnc/gethomedir.patch
+++ /dev/null
@@ -1,16 +0,0 @@
---- tigervnc-1.0.90/unix/xserver/hw/vnc/Makefile.am~	2011-04-20 13:46:16.993047050 +0200
-+++ tigervnc-1.0.90/unix/xserver/hw/vnc/Makefile.am	2011-04-20 14:03:35.942724608 +0200
-@@ -1,11 +1,12 @@
- TIGERVNC_SRCDIR=${top_srcdir}/../..
- LIB_DIR=${top_builddir}/../../common
- 
-+OS_LIB=$(LIB_DIR)/os/libos.a
- RFB_LIB=$(LIB_DIR)/rfb/librfb.la
- RDR_LIB=$(LIB_DIR)/rdr/librdr.la
- NETWORK_LIB=$(LIB_DIR)/network/libnetwork.la
- XREGION_LIB=$(LIB_DIR)/Xregion/libXregion.la
--COMMON_LIBS=$(NETWORK_LIB) $(RFB_LIB) $(RDR_LIB) $(XREGION_LIB)
-+COMMON_LIBS=$(NETWORK_LIB) $(OS_LIB) $(RFB_LIB) $(RDR_LIB) $(XREGION_LIB)
- 
- noinst_LTLIBRARIES = libvnccommon.la
- 
diff --git a/community/tigervnc/glx.patch b/community/tigervnc/glx.patch
deleted file mode 100644
index b2ecb672f..000000000
--- a/community/tigervnc/glx.patch
+++ /dev/null
@@ -1,85 +0,0 @@
-diff -ur tigervnc-1.2.0.orig/unix/xserver/hw/vnc/Makefile.am tigervnc-1.2.0/unix/xserver/hw/vnc/Makefile.am
---- tigervnc-1.2.0.orig/unix/xserver/hw/vnc/Makefile.am	2011-10-31 09:14:40.000000000 +0100
-+++ tigervnc-1.2.0/unix/xserver/hw/vnc/Makefile.am	2013-01-21 03:39:14.924841615 +0100
-@@ -7,6 +7,10 @@
- XREGION_LIB=$(LIB_DIR)/Xregion/libXregion.la
- COMMON_LIBS=$(NETWORK_LIB) $(RFB_LIB) $(RDR_LIB) $(XREGION_LIB)
- 
-+if GLX
-+GLX_LIB = $(top_srcdir)/glx/libglx.la
-+endif
-+
- noinst_LTLIBRARIES = libvnccommon.la
- 
- HDRS = RegionHelper.h vncExtInit.h vncHooks.h XserverDesktop.h xorg-version.h \
-@@ -34,7 +38,8 @@
- 	-UHAVE_CONFIG_H \
- 	-DXFree86Server -DVENDOR_RELEASE="$(VENDOR_RELEASE)" \
- 	-DVENDOR_STRING="\"$(VENDOR_STRING)\"" -I$(TIGERVNC_SRCDIR)/common \
--	-I$(top_srcdir)/include ${XSERVERLIBS_CFLAGS} -I$(includedir)
-+	-I$(top_srcdir)/include ${XSERVERLIBS_CFLAGS} -I$(includedir) \
-+	-I$(top_srcdir)/glx
- 
- Xvnc_LDADD = $(XVNC_LIBS) libvnccommon.la $(COMMON_LIBS) \
- 	$(XSERVER_LIBS) $(XSERVER_SYS_LIBS) $(XVNC_SYS_LIBS) -lX11
-@@ -55,7 +60,7 @@
- 
- libvnc_la_LDFLAGS = -module -avoid-version
- 
--libvnc_la_LIBADD = libvnccommon.la $(COMMON_LIBS)
-+libvnc_la_LIBADD = libvnccommon.la $(COMMON_LIBS) $(GLX_LIB)
- 
- EXTRA_DIST = Xvnc.man
- 
-diff -ur tigervnc-1.2.0.orig/unix/xserver/hw/vnc/xvnc.cc tigervnc-1.2.0/unix/xserver/hw/vnc/xvnc.cc
---- tigervnc-1.2.0.orig/unix/xserver/hw/vnc/xvnc.cc	2012-03-09 21:34:29.000000000 +0100
-+++ tigervnc-1.2.0/unix/xserver/hw/vnc/xvnc.cc	2013-01-21 03:38:38.187300899 +0100
-@@ -87,6 +87,17 @@
- #include "version-config.h"
- #include "site.h"
- #endif
-+
-+#if XORG >= 113
-+#ifdef GLXEXT
-+/* C++ really is the worst */
-+#define private _private
-+#include "glxserver.h"
-+#undef private
-+#include "glx_extinit.h"
-+#endif
-+#endif
-+
- #undef class
- #undef public
- }
-@@ -1305,6 +1316,16 @@
-   dispatchException &= ~DE_RESET;
- }
- 
-+#if XORG >= 113
-+#ifdef GLXEXT
-+static ExtensionModule vnc_glx_ext = {
-+    GlxExtensionInit,
-+    "GLX",
-+    &noGlxExtension
-+};
-+#endif
-+#endif
-+
- void
- InitOutput(ScreenInfo *screenInfo, int argc, char **argv)
- {
-@@ -1314,6 +1335,13 @@
-     int i;
-     int NumFormats = 0;
- 
-+#if XORG >= 113
-+#ifdef GLXEXT
-+    if (serverGeneration == 1)
-+        LoadExtension(&vnc_glx_ext, TRUE);
-+#endif
-+#endif
-+
-     /* initialize pixmap formats */
- 
-     /* must have a pixmap depth to match every screen depth */
diff --git a/community/tigervnc/gnutls.patch b/community/tigervnc/gnutls.patch
deleted file mode 100644
index d0b7ef861..000000000
--- a/community/tigervnc/gnutls.patch
+++ /dev/null
@@ -1,36 +0,0 @@
-diff -ur tigervnc-1.2.0.orig/CMakeLists.txt tigervnc-1.2.0/CMakeLists.txt
---- tigervnc-1.2.0.orig/CMakeLists.txt	2012-03-09 21:34:29.000000000 +0100
-+++ tigervnc-1.2.0/CMakeLists.txt	2012-03-27 23:14:12.292068145 +0200
-@@ -344,7 +344,7 @@
-       # system's version (if available) to perform this test.
-       set(CMAKE_REQUIRED_LIBRARIES ${CMAKE_REQUIRED_LIBRARIES};-lz)
-     endif()
--    check_function_exists(gnutls_transport_set_global_errno HAVE_OLD_GNUTLS)
-+    check_function_exists(gnutls_transport_set_global_errno HAVE_GNUTLS_GLOBAL_ERRNO)
-     check_function_exists(gnutls_x509_crt_print HAVE_GNUTLS_X509_CRT_PRINT)
-     check_type_size(gnutls_x509_crt_t GNUTLS_X509_CRT_T)
-     check_type_size(gnutls_datum_t GNUTLS_DATUM_T)
-diff -ur tigervnc-1.2.0.orig/common/rdr/TLSInStream.cxx tigervnc-1.2.0/common/rdr/TLSInStream.cxx
---- tigervnc-1.2.0.orig/common/rdr/TLSInStream.cxx	2010-09-30 08:25:28.000000000 +0200
-+++ tigervnc-1.2.0/common/rdr/TLSInStream.cxx	2012-03-27 23:14:11.166068223 +0200
-@@ -27,7 +27,7 @@
- #include <rdr/TLSInStream.h>
- #include <errno.h>
- 
--#ifdef HAVE_OLD_GNUTLS
-+#ifndef HAVE_GNUTLS_GLOBAL_ERRNO
- #define gnutls_transport_set_global_errno(A) do { errno = (A); } while(0)
- #endif
- 
-diff -ur tigervnc-1.2.0.orig/common/rdr/TLSOutStream.cxx tigervnc-1.2.0/common/rdr/TLSOutStream.cxx
---- tigervnc-1.2.0.orig/common/rdr/TLSOutStream.cxx	2010-09-30 08:25:28.000000000 +0200
-+++ tigervnc-1.2.0/common/rdr/TLSOutStream.cxx	2012-03-27 23:14:09.576068335 +0200
-@@ -27,7 +27,7 @@
- #include <rdr/TLSOutStream.h>
- #include <errno.h>
- 
--#ifdef HAVE_OLD_GNUTLS
-+#ifndef HAVE_GNUTLS_GLOBAL_ERRNO
- #define gnutls_transport_set_global_errno(A) do { errno = (A); } while(0)
- #endif
- 
diff --git a/community/tigervnc/xorg111.patch b/community/tigervnc/xorg111.patch
deleted file mode 100644
index ee0ddb999..000000000
--- a/community/tigervnc/xorg111.patch
+++ /dev/null
@@ -1,235 +0,0 @@
-diff -up tigervnc-1.1.0/unix/xserver/hw/vnc/Input.cc.xorg111 tigervnc-1.1.0/unix/xserver/hw/vnc/Input.cc
---- tigervnc-1.1.0/unix/xserver/hw/vnc/Input.cc.xorg111	2011-08-09 23:16:36.000000000 +0200
-+++ tigervnc-1.1.0/unix/xserver/hw/vnc/Input.cc	2011-11-11 11:59:14.226819903 +0100
-@@ -82,10 +82,11 @@ static KeyCode KeysymToKeycode(KeySymsPt
- /* Event queue is shared between all devices. */
- #if XORG == 15
- static xEvent *eventq = NULL;
--#else
-+#elif XORG < 111
- static EventList *eventq = NULL;
- #endif
- 
-+#if XORG < 111
- static void initEventq(void)
- {
- 	/* eventq is never free()-ed because it exists during server life. */
-@@ -100,7 +101,9 @@ static void initEventq(void)
- #endif
- 	}
- }
-+#endif /* XORG < 111 */
- 
-+#if XORG < 111
- static void enqueueEvents(DeviceIntPtr dev, int n)
- {
- 	int i;
-@@ -122,6 +125,7 @@ static void enqueueEvents(DeviceIntPtr d
- 			   );
- 	}
- }
-+#endif /* XORG < 111 */
- 
- InputDevice::InputDevice(rfb::VNCServerST *_server)
- 	: server(_server), oldButtonMask(0)
-@@ -141,12 +145,17 @@ InputDevice::InputDevice(rfb::VNCServerS
- 				     keyboardProc, TRUE);
- 	RegisterKeyboardDevice(keyboardDev);
- #endif
-+#if XORG < 111
- 	initEventq();
-+#endif
- }
- 
- void InputDevice::PointerButtonAction(int buttonMask)
- {
--	int i, n;
-+	int i;
-+#if XORG < 111
-+	int n;
-+#endif
- #if XORG >= 110
- 	ValuatorMask mask;
- #endif
-@@ -160,13 +169,17 @@ void InputDevice::PointerButtonAction(in
- #if XORG < 110
- 			n = GetPointerEvents(eventq, pointerDev, action, i + 1,
- 					     POINTER_RELATIVE, 0, 0, NULL);
--#else
-+			enqueueEvents(pointerDev, n);
-+#elif XORG < 111
- 			valuator_mask_set_range(&mask, 0, 0, NULL);
- 			n = GetPointerEvents(eventq, pointerDev, action, i + 1,
- 					     POINTER_RELATIVE, &mask);
--#endif
- 			enqueueEvents(pointerDev, n);
--
-+#else
-+			valuator_mask_set_range(&mask, 0, 0, NULL);
-+			QueuePointerEvents(pointerDev, action, i + 1,
-+					   POINTER_RELATIVE, &mask);
-+#endif
- 		}
- 	}
- 
-@@ -175,7 +188,10 @@ void InputDevice::PointerButtonAction(in
- 
- void InputDevice::PointerMove(const rfb::Point &pos)
- {
--	int n, valuators[2];
-+	int valuators[2];
-+#if XORG < 111
-+	int n;
-+#endif
- #if XORG >= 110
- 	ValuatorMask mask;
- #endif
-@@ -190,12 +206,16 @@ void InputDevice::PointerMove(const rfb:
- #if XORG < 110
- 	n = GetPointerEvents(eventq, pointerDev, MotionNotify, 0, POINTER_ABSOLUTE, 0,
- 			     2, valuators);
--#else
-+	enqueueEvents(pointerDev, n);
-+#elif XORG < 111
- 	valuator_mask_set_range(&mask, 0, 2, valuators);
- 	n = GetPointerEvents(eventq, pointerDev, MotionNotify, 0, POINTER_ABSOLUTE,
- 			     &mask);
--#endif
- 	enqueueEvents(pointerDev, n);
-+#else
-+	valuator_mask_set_range(&mask, 0, 2, valuators);
-+	QueuePointerEvents(pointerDev, MotionNotify, 0, POINTER_ABSOLUTE, &mask);
-+#endif
- 
- 	cursorPos = pos;
- }
-@@ -299,14 +319,20 @@ void InputDevice::initInputDevice(void)
- static inline void pressKey(DeviceIntPtr dev, int kc, bool down, const char *msg)
- {
- 	int action;
-+#if XORG < 111
- 	unsigned int n;
-+#endif
- 
- 	if (msg != NULL)
- 		vlog.debug("%s %d %s", msg, kc, down ? "down" : "up");
- 
- 	action = down ? KeyPress : KeyRelease;
--	n = GetKeyboardEvents(eventq, dev, action, kc);
-+#if XORG < 111
-+	n = GetKeyboardEvents(eventq, dev, action, kc, NULL);
- 	enqueueEvents(dev, n);
-+#else
-+	QueueKeyboardEvents(dev, action, kc, NULL);
-+#endif
- }
- 
- #define IS_PRESSED(keyc, keycode) \
-@@ -341,8 +367,11 @@ public:
- 		int state, maxKeysPerMod, keycode;
- #if XORG >= 17
- 		KeyCode *modmap = NULL;
--
-+#if XORG >= 111
-+		state = XkbStateFieldFromRec(&dev->master->key->xkbInfo->state);
-+#else /* XORG >= 111 */
- 		state = XkbStateFieldFromRec(&dev->u.master->key->xkbInfo->state);
-+#endif /* XORG >= 111 */
- #else
- 		KeyClassPtr keyc = dev->key;
- 		state = keyc->state;
-@@ -380,7 +409,11 @@ public:
- #if XORG >= 17
- 		KeyCode *modmap = NULL;
- 
-+#if XORG >= 111
-+		keyc = dev->master->key;
-+#else /* XORG >= 111 */
- 		keyc = dev->u.master->key;
-+#endif /* XORG >= 111 */
- 		state = XkbStateFieldFromRec(&keyc->xkbInfo->state);
- #else
- 		keyc = dev->key;
-@@ -596,7 +629,11 @@ void InputDevice::keyEvent(rdr::U32 keys
- 	}
- 
- #if XORG >= 17
-+#if XORG >= 111
-+	keyc = keyboardDev->master->key;
-+#else /* XORG >= 111 */
- 	keyc = keyboardDev->u.master->key;
-+#endif /* XORG >= 111 */
- 
- 	keymap = XkbGetCoreMap(keyboardDev);
- 	if (!keymap) {
-@@ -753,7 +790,11 @@ ModeSwitchFound:
- 			XkbApplyMappingChange(keyboardDev, keymap, minKeyCode,
- 					      maxKeyCode - minKeyCode + 1,
- 					      NULL, serverClient);
-+#if XORG >= 111
-+			XkbCopyDeviceKeymap(keyboardDev->master, keyboardDev);
-+#else
- 			XkbCopyDeviceKeymap(keyboardDev->u.master, keyboardDev);
-+#endif
- #endif /* XORG < 17 */
- 			break;
- 		}
-diff -up tigervnc-1.1.0/unix/xserver/hw/vnc/xorg-version.h.xorg111 tigervnc-1.1.0/unix/xserver/hw/vnc/xorg-version.h
---- tigervnc-1.1.0/unix/xserver/hw/vnc/xorg-version.h.xorg111	2011-08-09 23:16:36.000000000 +0200
-+++ tigervnc-1.1.0/unix/xserver/hw/vnc/xorg-version.h	2011-11-11 11:55:32.255835319 +0100
-@@ -36,6 +36,8 @@
- #define XORG 19
- #elif XORG_VERSION_CURRENT < ((1 * 10000000) + (10 * 100000) + (99 * 1000))
- #define XORG 110
-+#elif XORG_VERSION_CURRENT < ((1 * 10000000) + (11 * 100000) + (99 * 1000))
-+#define XORG 111
- #else
- #error "X.Org newer than 1.10 is not supported"
- #endif
-diff -up tigervnc-1.1.0/unix/xserver/hw/vnc/xvnc.cc.xorg111 tigervnc-1.1.0/unix/xserver/hw/vnc/xvnc.cc
---- tigervnc-1.1.0/unix/xserver/hw/vnc/xvnc.cc.xorg111	2011-08-09 23:16:36.000000000 +0200
-+++ tigervnc-1.1.0/unix/xserver/hw/vnc/xvnc.cc	2011-11-11 11:55:32.256835319 +0100
-@@ -211,7 +211,11 @@ static void vfbFreeFramebufferMemory(vfb
- 
- extern "C" {
- 
-+#if XORG < 111
- void ddxGiveUp()
-+#else
-+void ddxGiveUp(enum ExitCode error)
-+#endif
- {
-     int i;
- 
-@@ -221,9 +225,17 @@ void ddxGiveUp()
- }
- 
- void
-+#if XORG < 111
- AbortDDX()
-+#else
-+AbortDDX(enum ExitCode error)
-+#endif
- {
-+#if XORG < 111
-     ddxGiveUp();
-+#else
-+    ddxGiveUp(error);
-+#endif
- }
- 
- #ifdef __DARWIN__
-@@ -668,8 +680,13 @@ vfbUninstallColormap(ColormapPtr pmap)
-     {
- 	if (pmap->mid != pmap->pScreen->defColormap)
- 	{
-+#if XORG < 111
- 	    curpmap = (ColormapPtr) LookupIDByType(pmap->pScreen->defColormap,
- 						   RT_COLORMAP);
-+#else
-+	    dixLookupResourceByType((pointer *) &curpmap, pmap->pScreen->defColormap,
-+				    RT_COLORMAP, serverClient, DixUnknownAccess);
-+#endif
- 	    (*pmap->pScreen->InstallColormap)(curpmap);
- 	}
-     }
diff --git a/community/tigervnc/xorg112.patch b/community/tigervnc/xorg112.patch
deleted file mode 100644
index 51f259e19..000000000
--- a/community/tigervnc/xorg112.patch
+++ /dev/null
@@ -1,447 +0,0 @@
-diff -ur tigervnc-1.2.0.orig/unix/xserver/hw/vnc/Makefile.am tigervnc-1.2.0/unix/xserver/hw/vnc/Makefile.am
---- tigervnc-1.2.0.orig/unix/xserver/hw/vnc/Makefile.am	2011-10-31 09:14:40.000000000 +0100
-+++ tigervnc-1.2.0/unix/xserver/hw/vnc/Makefile.am	2012-04-15 12:19:00.995517546 +0200
-@@ -63,7 +63,7 @@
- BUILT_SOURCES = $(nodist_Xvnc_SOURCES)
- 
- fb.h: $(top_srcdir)/fb/fb.h
--	cat $(top_srcdir)/fb/fb.h | sed -e 's,and,c_and,' -e 's,xor,c_xor,' > $(srcdir)/fb.h
-+	cat $(top_srcdir)/fb/fb.h | sed -e 's,and,c_and,g' -e 's,xor,c_xor,g' > $(srcdir)/fb.h
- 
- pixman.h:
- 	for i in ${XSERVERLIBS_CFLAGS}; do \
-@@ -78,4 +78,4 @@
- 	fi
- 
- fbrop.h: $(top_srcdir)/fb/fbrop.h
--	cat $(top_srcdir)/fb/fbrop.h | sed -e 's,and,c_and,' -e 's,xor,c_xor,' > $(srcdir)/fbrop.h
-+	cat $(top_srcdir)/fb/fbrop.h | sed -e 's,and,c_and,g' -e 's,xor,c_xor,g' > $(srcdir)/fbrop.h
-diff -ur tigervnc-1.2.0.orig/unix/xserver/hw/vnc/vncExtInit.cc tigervnc-1.2.0/unix/xserver/hw/vnc/vncExtInit.cc
---- tigervnc-1.2.0.orig/unix/xserver/hw/vnc/vncExtInit.cc	2011-11-07 13:51:34.000000000 +0100
-+++ tigervnc-1.2.0/unix/xserver/hw/vnc/vncExtInit.cc	2012-04-15 12:18:57.819557251 +0200
-@@ -59,6 +59,7 @@
- #include "XserverDesktop.h"
- #include "vncHooks.h"
- #include "vncExtInit.h"
-+#include "xorg-version.h"
- 
- extern "C" {
- 
-@@ -449,10 +450,16 @@
-       ev.window = cur->window;
-       ev.time = GetTimeInMillis();
-       if (cur->client->swapped) {
-+#if XORG < 112
-         int n;
-         swaps(&ev.sequenceNumber, n);
-         swapl(&ev.window, n);
-         swapl(&ev.time, n);
-+#else
-+        swaps(&ev.sequenceNumber);
-+        swapl(&ev.window);
-+        swapl(&ev.time);
-+#endif
-       }
-       WriteToClient(cur->client, sizeof(xVncExtClientCutTextNotifyEvent),
-                     (char *)&ev);
-@@ -495,9 +502,14 @@
-       ev.sequenceNumber = cur->client->sequence;
-       ev.window = cur->window;
-       if (cur->client->swapped) {
-+#if XORG < 112
-         int n;
-         swaps(&ev.sequenceNumber, n);
-         swapl(&ev.window, n);
-+#else
-+        swaps(&ev.sequenceNumber);
-+        swapl(&ev.window);
-+#endif
-       }
-       WriteToClient(cur->client, sizeof(xVncExtQueryConnectNotifyEvent),
-                     (char *)&ev);
-@@ -538,10 +550,16 @@
-       ev.window = cur->window;
-       ev.selection = selection;
-       if (cur->client->swapped) {
-+#if XORG < 112
-         int n;
-         swaps(&ev.sequenceNumber, n);
-         swapl(&ev.window, n);
-         swapl(&ev.selection, n);
-+#else
-+        swaps(&ev.sequenceNumber);
-+        swapl(&ev.window);
-+        swapl(&ev.selection);
-+#endif
-       }
-       WriteToClient(cur->client, sizeof(xVncExtSelectionChangeNotifyEvent),
-                     (char *)&ev);
-@@ -562,7 +580,6 @@
-   param.buf[stuff->paramLen] = 0;
- 
-   xVncExtSetParamReply rep;
--  int n;
-   rep.type = X_Reply;
-   rep.length = 0;
-   rep.success = 0;
-@@ -603,8 +620,14 @@
- 
- deny:
-   if (client->swapped) {
-+#if XORG < 112
-+    int n;
-     swaps(&rep.sequenceNumber, n);
-     swapl(&rep.length, n);
-+#else
-+    swaps(&rep.sequenceNumber);
-+    swapl(&rep.length);
-+#endif
-   }
-   WriteToClient(client, sizeof(xVncExtSetParamReply), (char *)&rep);
-   return (client->noClientException);
-@@ -612,9 +635,13 @@
- 
- static int SProcVncExtSetParam(ClientPtr client)
- {
--  register char n;
-   REQUEST(xVncExtSetParamReq);
-+#if XORG < 112
-+  register char n;
-   swaps(&stuff->length, n);
-+#else
-+  swaps(&stuff->length);
-+#endif
-   REQUEST_AT_LEAST_SIZE(xVncExtSetParamReq);
-   return ProcVncExtSetParam(client);
- }
-@@ -628,7 +655,6 @@
-   param.buf[stuff->paramLen] = 0;
- 
-   xVncExtGetParamReply rep;
--  int n;
-   rep.type = X_Reply;
-   rep.sequenceNumber = client->sequence;
-   rep.success = 0;
-@@ -646,9 +672,16 @@
-   rep.length = (len + 3) >> 2;
-   rep.valueLen = len;
-   if (client->swapped) {
-+#if XORG < 112
-+    int n;
-     swaps(&rep.sequenceNumber, n);
-     swapl(&rep.length, n);
-     swaps(&rep.valueLen, n);
-+#else
-+    swaps(&rep.sequenceNumber);
-+    swapl(&rep.length);
-+    swaps(&rep.valueLen);
-+#endif
-   }
-   WriteToClient(client, sizeof(xVncExtGetParamReply), (char *)&rep);
-   if (value)
-@@ -659,9 +692,13 @@
- 
- static int SProcVncExtGetParam(ClientPtr client)
- {
--  register char n;
-   REQUEST(xVncExtGetParamReq);
-+#if XORG < 112
-+  register char n;
-   swaps(&stuff->length, n);
-+#else
-+  swaps(&stuff->length);
-+#endif
-   REQUEST_AT_LEAST_SIZE(xVncExtGetParamReq);
-   return ProcVncExtGetParam(client);
- }
-@@ -675,7 +712,6 @@
-   param.buf[stuff->paramLen] = 0;
- 
-   xVncExtGetParamDescReply rep;
--  int n;
-   rep.type = X_Reply;
-   rep.sequenceNumber = client->sequence;
-   rep.success = 0;
-@@ -690,9 +726,16 @@
-   rep.length = (len + 3) >> 2;
-   rep.descLen = len;
-   if (client->swapped) {
-+#if XORG < 112
-+    int n;
-     swaps(&rep.sequenceNumber, n);
-     swapl(&rep.length, n);
-     swaps(&rep.descLen, n);
-+#else
-+    swaps(&rep.sequenceNumber);
-+    swapl(&rep.length);
-+    swaps(&rep.descLen);
-+#endif
-   }
-   WriteToClient(client, sizeof(xVncExtGetParamDescReply), (char *)&rep);
-   if (desc)
-@@ -702,9 +745,13 @@
- 
- static int SProcVncExtGetParamDesc(ClientPtr client)
- {
--  register char n;
-   REQUEST(xVncExtGetParamDescReq);
-+#if XORG < 112
-+  register char n;
-   swaps(&stuff->length, n);
-+#else
-+  swaps(&stuff->length);
-+#endif
-   REQUEST_AT_LEAST_SIZE(xVncExtGetParamDescReq);
-   return ProcVncExtGetParamDesc(client);
- }
-@@ -715,7 +762,6 @@
-   REQUEST_SIZE_MATCH(xVncExtListParamsReq);
- 
-   xVncExtListParamsReply rep;
--  int n;
-   rep.type = X_Reply;
-   rep.sequenceNumber = client->sequence;
- 
-@@ -731,9 +777,16 @@
-   rep.length = (len + 3) >> 2;
-   rep.nParams = nParams;
-   if (client->swapped) {
-+#if XORG < 112
-+    int n;
-     swaps(&rep.sequenceNumber, n);
-     swapl(&rep.length, n);
-     swaps(&rep.nParams, n);
-+#else
-+    swaps(&rep.sequenceNumber);
-+    swapl(&rep.length);
-+    swaps(&rep.nParams);
-+#endif
-   }
-   WriteToClient(client, sizeof(xVncExtListParamsReply), (char *)&rep);
-   rdr::U8* data = new rdr::U8[len];
-@@ -753,9 +806,13 @@
- 
- static int SProcVncExtListParams(ClientPtr client)
- {
--  register char n;
-   REQUEST(xVncExtListParamsReq);
-+#if XORG < 112
-+  register char n;
-   swaps(&stuff->length, n);
-+#else
-+  swaps(&stuff->length);
-+#endif
-   REQUEST_SIZE_MATCH(xVncExtListParamsReq);
-   return ProcVncExtListParams(client);
- }
-@@ -778,11 +835,19 @@
- 
- static int SProcVncExtSetServerCutText(ClientPtr client)
- {
--  register char n;
-   REQUEST(xVncExtSetServerCutTextReq);
-+#if XORG < 112
-+  register char n;
-   swaps(&stuff->length, n);
-+#else
-+  swaps(&stuff->length);
-+#endif
-   REQUEST_AT_LEAST_SIZE(xVncExtSetServerCutTextReq);
-+#if XORG < 112
-   swapl(&stuff->textLen, n);
-+#else
-+  swapl(&stuff->textLen);
-+#endif
-   return ProcVncExtSetServerCutText(client);
- }
- 
-@@ -792,15 +857,21 @@
-   REQUEST_SIZE_MATCH(xVncExtGetClientCutTextReq);
- 
-   xVncExtGetClientCutTextReply rep;
--  int n;
-   rep.type = X_Reply;
-   rep.length = (clientCutTextLen + 3) >> 2;
-   rep.sequenceNumber = client->sequence;
-   rep.textLen = clientCutTextLen;
-   if (client->swapped) {
-+#if XORG < 112
-+    int n;
-     swaps(&rep.sequenceNumber, n);
-     swapl(&rep.length, n);
-     swapl(&rep.textLen, n);
-+#else
-+    swaps(&rep.sequenceNumber);
-+    swapl(&rep.length);
-+    swapl(&rep.textLen);
-+#endif
-   }
-   WriteToClient(client, sizeof(xVncExtGetClientCutTextReply), (char *)&rep);
-   if (clientCutText)
-@@ -810,9 +881,13 @@
- 
- static int SProcVncExtGetClientCutText(ClientPtr client)
- {
--  register char n;
-   REQUEST(xVncExtGetClientCutTextReq);
-+#if XORG < 112
-+  register char n;
-   swaps(&stuff->length, n);
-+#else
-+  swaps(&stuff->length);
-+#endif
-   REQUEST_SIZE_MATCH(xVncExtGetClientCutTextReq);
-   return ProcVncExtGetClientCutText(client);
- }
-@@ -842,12 +917,21 @@
- 
- static int SProcVncExtSelectInput(ClientPtr client)
- {
--  register char n;
-   REQUEST(xVncExtSelectInputReq);
-+#if XORG < 112
-+  register char n;
-   swaps(&stuff->length, n);
-+#else
-+  swaps(&stuff->length);
-+#endif
-   REQUEST_SIZE_MATCH(xVncExtSelectInputReq);
-+#if XORG < 112
-   swapl(&stuff->window, n);
-   swapl(&stuff->mask, n);
-+#else
-+  swapl(&stuff->window);
-+  swapl(&stuff->mask);
-+#endif
-   return ProcVncExtSelectInput(client);
- }
- 
-@@ -893,9 +977,14 @@
-   rep.length = 0;
-   rep.sequenceNumber = client->sequence;
-   if (client->swapped) {
-+#if XORG < 112
-     int n;
-     swaps(&rep.sequenceNumber, n);
-     swapl(&rep.length, n);
-+#else
-+    swaps(&rep.sequenceNumber);
-+    swapl(&rep.length);
-+#endif
-   }
-   WriteToClient(client, sizeof(xVncExtConnectReply), (char *)&rep);
-   return (client->noClientException);
-@@ -903,9 +992,13 @@
- 
- static int SProcVncExtConnect(ClientPtr client)
- {
--  register char n;
-   REQUEST(xVncExtConnectReq);
-+#if XORG < 112
-+  register char n;
-   swaps(&stuff->length, n);
-+#else
-+  swaps(&stuff->length);
-+#endif
-   REQUEST_AT_LEAST_SIZE(xVncExtConnectReq);
-   return ProcVncExtConnect(client);
- }
-@@ -925,7 +1018,6 @@
-     qcTimeout = 0;
- 
-   xVncExtGetQueryConnectReply rep;
--  int n;
-   rep.type = X_Reply;
-   rep.sequenceNumber = client->sequence;
-   rep.timeout = qcTimeout;
-@@ -934,11 +1026,20 @@
-   rep.opaqueId = (CARD32)(long)queryConnectId;
-   rep.length = (rep.userLen + rep.addrLen + 3) >> 2;
-   if (client->swapped) {
-+#if XORG < 112
-+    int n;
-     swaps(&rep.sequenceNumber, n);
-     swapl(&rep.userLen, n);
-     swapl(&rep.addrLen, n);
-     swapl(&rep.timeout, n);
-     swapl(&rep.opaqueId, n);
-+#else
-+    swaps(&rep.sequenceNumber);
-+    swapl(&rep.userLen);
-+    swapl(&rep.addrLen);
-+    swapl(&rep.timeout);
-+    swapl(&rep.opaqueId);
-+#endif
-   }
-   WriteToClient(client, sizeof(xVncExtGetQueryConnectReply), (char *)&rep);
-   if (qcTimeout)
-@@ -950,9 +1051,13 @@
- 
- static int SProcVncExtGetQueryConnect(ClientPtr client)
- {
--  register char n;
-   REQUEST(xVncExtGetQueryConnectReq);
-+#if XORG < 112
-+  register char n;
-   swaps(&stuff->length, n);
-+#else
-+  swaps(&stuff->length);
-+#endif
-   REQUEST_SIZE_MATCH(xVncExtGetQueryConnectReq);
-   return ProcVncExtGetQueryConnect(client);
- }
-@@ -977,10 +1082,15 @@
- 
- static int SProcVncExtApproveConnect(ClientPtr client)
- {
--  register char n;
-   REQUEST(xVncExtApproveConnectReq);
-+#if XORG < 112
-+  register char n;
-   swaps(&stuff->length, n);
-   swapl(&stuff->opaqueId, n);
-+#else
-+  swaps(&stuff->length);
-+  swapl(&stuff->opaqueId);
-+#endif
-   REQUEST_SIZE_MATCH(xVncExtApproveConnectReq);
-   return ProcVncExtApproveConnect(client);
- }
-diff -ur tigervnc-1.2.0.orig/unix/xserver/hw/vnc/xf86vncModule.cc tigervnc-1.2.0/unix/xserver/hw/vnc/xf86vncModule.cc
---- tigervnc-1.2.0.orig/unix/xserver/hw/vnc/xf86vncModule.cc	2010-04-23 15:55:10.000000000 +0200
-+++ tigervnc-1.2.0/unix/xserver/hw/vnc/xf86vncModule.cc	2012-04-15 12:18:57.820557239 +0200
-@@ -26,6 +26,8 @@
- #include <rfb/Logger_stdio.h>
- #include <rfb/LogWriter.h>
- 
-+#include "xorg-version.h"
-+
- extern "C" {
- #define class c_class
- #define private c_private
-@@ -89,7 +91,12 @@
-     ScrnInfoPtr pScrn = xf86Screens[scr];
- 
-     for (ParameterIterator i(Configuration::global()); i.param; i.next()) {
--      char* val = xf86FindOptionValue(pScrn->options, i.param->getName());
-+      const char *val;
-+#if XORG < 112
-+      val = xf86FindOptionValue(pScrn->options, i.param->getName());
-+#else
-+      val = xf86FindOptionValue((XF86OptionPtr)pScrn->options, i.param->getName());
-+#endif
-       if (val)
-         i.param->setParam(val);
-     }
-diff -ur tigervnc-1.2.0.orig/unix/xserver/hw/vnc/xorg-version.h tigervnc-1.2.0/unix/xserver/hw/vnc/xorg-version.h
---- tigervnc-1.2.0.orig/unix/xserver/hw/vnc/xorg-version.h	2012-04-15 12:18:21.272014160 +0200
-+++ tigervnc-1.2.0/unix/xserver/hw/vnc/xorg-version.h	2012-04-15 12:18:57.821557227 +0200
-@@ -38,6 +38,8 @@
- #define XORG 110
- #elif XORG_VERSION_CURRENT < ((1 * 10000000) + (11 * 100000) + (99 * 1000))
- #define XORG 111
-+#elif XORG_VERSION_CURRENT < ((1 * 10000000) + (12 * 100000) + (99 * 1000))
-+#define XORG 112
- #else
- #error "X.Org newer than 1.10 is not supported"
- #endif
diff --git a/community/tigervnc/xorg113.patch b/community/tigervnc/xorg113.patch
deleted file mode 100644
index 505e0a758..000000000
--- a/community/tigervnc/xorg113.patch
+++ /dev/null
@@ -1,275 +0,0 @@
-diff -ur tigervnc-1.2.0.orig/unix/xserver/hw/vnc/vncHooks.cc tigervnc-1.2.0/unix/xserver/hw/vnc/vncHooks.cc
---- tigervnc-1.2.0.orig/unix/xserver/hw/vnc/vncHooks.cc	2012-01-23 16:54:11.000000000 +0100
-+++ tigervnc-1.2.0/unix/xserver/hw/vnc/vncHooks.cc	2012-09-06 18:53:26.392282102 +0200
-@@ -116,7 +116,11 @@
- 
- // screen functions
- 
-+#if XORG < 112
- static Bool vncHooksCloseScreen(int i, ScreenPtr pScreen);
-+#else
-+static Bool vncHooksCloseScreen(ScreenPtr pScreen);
-+#endif
- static Bool vncHooksCreateGC(GCPtr pGC);
- static void vncHooksCopyWindow(WindowPtr pWin, DDXPointRec ptOldOrg,
-                                RegionPtr pOldRegion);
-@@ -133,8 +137,13 @@
- 				  DeviceIntPtr pDev,
- #endif
- 				  ScreenPtr pScreen, CursorPtr cursor);
-+#if XORG < 112
- static void vncHooksBlockHandler(int i, pointer blockData, pointer pTimeout,
-                                  pointer pReadmask);
-+#else
-+static void vncHooksBlockHandler(ScreenPtr pScreen, pointer pTimeout,
-+                                 pointer pReadmask);
-+#endif
- #ifdef RENDER
- static void vncHooksComposite(CARD8 op, PicturePtr pSrc, PicturePtr pMask, 
- 			      PicturePtr pDst, INT16 xSrc, INT16 ySrc, INT16 xMask, 
-@@ -335,7 +344,11 @@
- // CloseScreen - unwrap the screen functions and call the original CloseScreen
- // function
- 
-+#if XORG < 112
- static Bool vncHooksCloseScreen(int i, ScreenPtr pScreen_)
-+#else
-+static Bool vncHooksCloseScreen(ScreenPtr pScreen_)
-+#endif
- {
-   SCREEN_UNWRAP(pScreen_, CloseScreen);
- 
-@@ -366,7 +379,11 @@
- 
-   DBGPRINT((stderr,"vncHooksCloseScreen: unwrapped screen functions\n"));
- 
-+#if XORG < 112
-   return (*pScreen->CloseScreen)(i, pScreen);
-+#else
-+  return (*pScreen->CloseScreen)(pScreen);
-+#endif
- }
- 
- // CreateGC - wrap the "GC funcs"
-@@ -531,14 +548,27 @@
- // BlockHandler - ignore any changes during the block handler - it's likely
- // these are just drawing the cursor.
- 
-+#if XORG < 112
- static void vncHooksBlockHandler(int i, pointer blockData, pointer pTimeout,
-                                  pointer pReadmask)
-+#else
-+static void vncHooksBlockHandler(ScreenPtr pScreen_, pointer pTimeout,
-+                                 pointer pReadmask)
-+#endif
- {
-+#if XORG < 112
-   SCREEN_UNWRAP(screenInfo.screens[i], BlockHandler);
-+#else
-+  SCREEN_UNWRAP(pScreen_, BlockHandler);
-+#endif
- 
-   vncHooksScreen->desktop->ignoreHooks(true);
- 
-+#if XORG < 112
-   (*pScreen->BlockHandler) (i, blockData, pTimeout, pReadmask);
-+#else
-+  (*pScreen->BlockHandler) (pScreen, pTimeout, pReadmask);
-+#endif
- 
-   vncHooksScreen->desktop->ignoreHooks(false);
- 
-diff -ur tigervnc-1.2.0.orig/unix/xserver/hw/vnc/xf86vncModule.cc tigervnc-1.2.0/unix/xserver/hw/vnc/xf86vncModule.cc
---- tigervnc-1.2.0.orig/unix/xserver/hw/vnc/xf86vncModule.cc	2012-09-06 18:52:54.668284962 +0200
-+++ tigervnc-1.2.0/unix/xserver/hw/vnc/xf86vncModule.cc	2012-09-06 18:53:26.393282091 +0200
-@@ -53,8 +53,10 @@
- {
-     vncExtensionInitWithParams,
-     "VNC",
-+#if XORG < 112
-     NULL,
-     NULL,
-+#endif
-     NULL
- };
- 
-diff -ur tigervnc-1.2.0.orig/unix/xserver/hw/vnc/xorg-version.h tigervnc-1.2.0/unix/xserver/hw/vnc/xorg-version.h
---- tigervnc-1.2.0.orig/unix/xserver/hw/vnc/xorg-version.h	2012-09-06 18:52:54.669284923 +0200
-+++ tigervnc-1.2.0/unix/xserver/hw/vnc/xorg-version.h	2012-09-06 18:53:26.393282091 +0200
-@@ -40,8 +40,10 @@
- #define XORG 111
- #elif XORG_VERSION_CURRENT < ((1 * 10000000) + (12 * 100000) + (99 * 1000))
- #define XORG 112
-+#elif XORG_VERSION_CURRENT < ((1 * 10000000) + (13 * 100000) + (99 * 1000))
-+#define XORG 113
- #else
--#error "X.Org newer than 1.10 is not supported"
-+#error "X.Org newer than 1.13 is not supported"
- #endif
- 
- #endif
-diff -ur tigervnc-1.2.0.orig/unix/xserver/hw/vnc/xvnc.cc tigervnc-1.2.0/unix/xserver/hw/vnc/xvnc.cc
---- tigervnc-1.2.0.orig/unix/xserver/hw/vnc/xvnc.cc	2012-09-06 18:52:51.896283812 +0200
-+++ tigervnc-1.2.0/unix/xserver/hw/vnc/xvnc.cc	2012-09-06 18:59:25.784263082 +0200
-@@ -285,7 +285,11 @@
- }
- 
- void
-+#if XORG < 113
- OsVendorFatalError()
-+#else
-+OsVendorFatalError(const char *f, va_list args)
-+#endif
- {
- }
- 
-@@ -626,14 +630,25 @@
- }
- #endif
- 
-+#if XORG < 113
- static ColormapPtr InstalledMaps[MAXSCREENS];
-+#else
-+static DevPrivateKeyRec cmapScrPrivateKeyRec;
-+#define cmapScrPrivateKey (&cmapScrPrivateKeyRec)
-+#define GetInstalledColormap(s) ((ColormapPtr) dixLookupPrivate(&(s)->devPrivates, cmapScrPrivateKey))
-+#define SetInstalledColormap(s,c) (dixSetPrivate(&(s)->devPrivates, cmapScrPrivateKey, c))
-+#endif
- 
- static int 
- vfbListInstalledColormaps(ScreenPtr pScreen, Colormap *pmaps)
- {
-     /* By the time we are processing requests, we can guarantee that there
-      * is always a colormap installed */
-+#if XORG < 113
-     *pmaps = InstalledMaps[pScreen->myNum]->mid;
-+#else
-+    *pmaps = GetInstalledColormap(pScreen)->mid;
-+#endif
-     return (1);
- }
- 
-@@ -641,8 +656,16 @@
- static void 
- vfbInstallColormap(ColormapPtr pmap)
- {
-+#if XORG < 113
-     int index = pmap->pScreen->myNum;
--    ColormapPtr oldpmap = InstalledMaps[index];
-+#endif
-+    ColormapPtr oldpmap;
-+
-+#if XORG < 113
-+    oldpmap = InstalledMaps[index];
-+#else
-+    oldpmap = GetInstalledColormap(pmap->pScreen);
-+#endif
- 
-     if (pmap != oldpmap)
-     {
-@@ -656,7 +679,11 @@
- 	if(oldpmap != (ColormapPtr)None)
- 	    WalkTree(pmap->pScreen, TellLostMap, (char *)&oldpmap->mid);
- 	/* Install pmap */
-+#if XORG < 113
- 	InstalledMaps[index] = pmap;
-+#else
-+	SetInstalledColormap(pmap->pScreen, pmap);
-+#endif
- 	WalkTree(pmap->pScreen, TellGainedMap, (char *)&pmap->mid);
- 
- 	entries = pmap->pVisual->ColormapEntries;
-@@ -692,7 +719,11 @@
- static void
- vfbUninstallColormap(ColormapPtr pmap)
- {
-+#if XORG < 113
-     ColormapPtr curpmap = InstalledMaps[pmap->pScreen->myNum];
-+#else
-+    ColormapPtr curpmap = GetInstalledColormap(pmap->pScreen);
-+#endif
- 
-     if(pmap == curpmap)
-     {
-@@ -1153,31 +1184,66 @@
- #endif
- 
- static Bool
-+#if XORG < 113
- vfbCloseScreen(int index, ScreenPtr pScreen)
-+#else
-+vfbCloseScreen(ScreenPtr pScreen)
-+#endif
- {
-+#if XORG < 113
-     vfbScreenInfoPtr pvfb = &vfbScreens[index];
-+#else
-+    vfbScreenInfoPtr pvfb = &vfbScreens[pScreen->myNum];
-+#endif
-     int i;
-  
-     pScreen->CloseScreen = pvfb->closeScreen;
- 
-     /*
-      * XXX probably lots of stuff to clean.  For now,
--     * clear InstalledMaps[] so that server reset works correctly.
-+     * clear installed colormaps so that server reset works correctly.
-      */
-+#if XORG < 113
-     for (i = 0; i < MAXSCREENS; i++)
- 	InstalledMaps[i] = NULL;
- 
-     return pScreen->CloseScreen(index, pScreen);
-+#else
-+    for (i = 0; i < screenInfo.numScreens; i++)
-+	SetInstalledColormap(screenInfo.screens[i], NULL);
-+
-+    /*
-+     * fb overwrites miCloseScreen, so do this here
-+     */
-+    if (pScreen->devPrivate)
-+        (*pScreen->DestroyPixmap) ((PixmapPtr) pScreen->devPrivate);
-+    pScreen->devPrivate = NULL;
-+
-+    return pScreen->CloseScreen(pScreen);
-+#endif
- }
- 
- static Bool
-+#if XORG < 113
- vfbScreenInit(int index, ScreenPtr pScreen, int argc, char **argv)
-+#else
-+vfbScreenInit(ScreenPtr pScreen, int argc, char **argv)
-+#endif
- {
-+#if XORG < 113
-     vfbScreenInfoPtr pvfb = &vfbScreens[index];
-+#else
-+    vfbScreenInfoPtr pvfb = &vfbScreens[pScreen->myNum];
-+#endif
-     int dpi;
-     int ret;
-     void *pbits;
- 
-+#if XORG >= 113
-+    if (!dixRegisterPrivateKey(&cmapScrPrivateKeyRec, PRIVATE_SCREEN, 0))
-+	return FALSE;
-+#endif
-+
-     /* 96 is the default used by most other systems */
-     dpi = 96;
-     if (monitorResolution)
-@@ -1185,8 +1251,13 @@
- 
-     pbits = vfbAllocateFramebufferMemory(&pvfb->fb);
-     if (!pbits) return FALSE;
-+#if XORG < 113
-     vncFbptr[index] = pbits;
-     vncFbstride[index] = pvfb->fb.paddedWidth;
-+#else
-+    vncFbptr[pScreen->myNum] = pbits;
-+    vncFbstride[pScreen->myNum] = pvfb->fb.paddedWidth;
-+#endif
- 
-     miSetPixmapDepths();
- 
diff --git a/community/tigervnc/xorg114.patch b/community/tigervnc/xorg114.patch
deleted file mode 100644
index 702706d34..000000000
--- a/community/tigervnc/xorg114.patch
+++ /dev/null
@@ -1,28 +0,0 @@
-diff -ur tigervnc-1.2.0.orig/unix/xserver/hw/vnc/xorg-version.h tigervnc-1.2.0/unix/xserver/hw/vnc/xorg-version.h
---- tigervnc-1.2.0.orig/unix/xserver/hw/vnc/xorg-version.h	2013-03-19 16:22:42.240358422 +0100
-+++ tigervnc-1.2.0/unix/xserver/hw/vnc/xorg-version.h	2013-03-19 16:23:33.846355724 +0100
-@@ -42,8 +42,10 @@
- #define XORG 112
- #elif XORG_VERSION_CURRENT < ((1 * 10000000) + (13 * 100000) + (99 * 1000))
- #define XORG 113
-+#elif XORG_VERSION_CURRENT < ((1 * 10000000) + (14 * 100000) + (99 * 1000))
-+#define XORG 114
- #else
--#error "X.Org newer than 1.13 is not supported"
-+#error "X.Org newer than 1.14 is not supported"
- #endif
- 
- #endif
-diff -ur tigervnc-1.2.0.orig/unix/xserver/hw/vnc/xvnc.cc tigervnc-1.2.0/unix/xserver/hw/vnc/xvnc.cc
---- tigervnc-1.2.0.orig/unix/xserver/hw/vnc/xvnc.cc	2013-03-19 16:22:51.327357948 +0100
-+++ tigervnc-1.2.0/unix/xserver/hw/vnc/xvnc.cc	2013-03-19 16:23:33.847355727 +0100
-@@ -54,7 +54,9 @@
- #include "servermd.h"
- #include "fb.h"
- #include "mi.h"
-+#if XORG < 114
- #include "mibstore.h"
-+#endif
- #include "colormapst.h"
- #include "gcstruct.h"
- #include "input.h"
diff --git a/community/tigervnc/xserver113.patch b/community/tigervnc/xserver113.patch
deleted file mode 100644
index e4fabf3b0..000000000
--- a/community/tigervnc/xserver113.patch
+++ /dev/null
@@ -1,92 +0,0 @@
-diff -up tigervnc-1.2.0/unix/xserver/configure.ac.vnc tigervnc-1.2.0/unix/xserver/configure.ac
---- tigervnc-1.2.0/unix/xserver/configure.ac.vnc	2012-08-28 15:35:23.778810954 +0200
-+++ tigervnc-1.2.0/unix/xserver/configure.ac	2012-08-28 15:54:46.396743431 +0200
-@@ -31,7 +31,6 @@ RELEASE_DATE="2012-08-21"
- RELEASE_NAME="Splashing Orca"
- AC_CONFIG_SRCDIR([Makefile.am])
- AM_INIT_AUTOMAKE([foreign dist-bzip2])
--AM_MAINTAINER_MODE
- 
- # Require xorg-macros minimum of 1.14 for XORG_COMPILER_BRAND in XORG_DEFAULT_OPTIONS
- m4_ifndef([XORG_MACROS_VERSION],
-@@ -73,6 +72,7 @@ dnl forcing an entire recompile.x
- AC_CONFIG_HEADERS(include/version-config.h)
- 
- AM_PROG_AS
-+AC_PROG_CXX
- AC_PROG_LN_S
- AC_LIBTOOL_WIN32_DLL
- AC_DISABLE_STATIC
-@@ -1561,6 +1561,10 @@ if test "x$XVFB" = xyes; then
- 	AC_SUBST([XVFB_SYS_LIBS])
- fi
- 
-+dnl Xvnc DDX
-+AC_SUBST([XVNC_CPPFLAGS], ["-DHAVE_DIX_CONFIG_H $XSERVER_CFLAGS"])
-+AC_SUBST([XVNC_LIBS], ["$FB_LIB $FIXES_LIB $XEXT_LIB $CONFIG_LIB $DBE_LIB $RECORD_LIB $GLX_LIBS $RANDR_LIB $RENDER_LIB $DAMAGE_LIB $MIEXT_SYNC_LIB $MIEXT_DAMAGE_LIB $MIEXT_SHADOW_LIB $XI_LIB $XKB_LIB $XKB_STUB_LIB $COMPOSITE_LIB $MAIN_LIB"])
-+AC_SUBST([XVNC_SYS_LIBS], ["$GLX_SYS_LIBS"])
- 
- dnl Xnest DDX
- 
-@@ -1596,6 +1600,8 @@ if test "x$XORG" = xauto; then
- fi
- AC_MSG_RESULT([$XORG])
- 
-+AC_DEFINE_UNQUOTED(XORG_VERSION_CURRENT, [$VENDOR_RELEASE], [Current Xorg version])
-+
- if test "x$XORG" = xyes; then
- 	XORG_DDXINCS='-I$(top_srcdir)/hw/xfree86 -I$(top_srcdir)/hw/xfree86/include -I$(top_srcdir)/hw/xfree86/common'
- 	XORG_OSINCS='-I$(top_srcdir)/hw/xfree86/os-support -I$(top_srcdir)/hw/xfree86/os-support/bus -I$(top_srcdir)/os'
-@@ -1815,7 +1821,6 @@ if test "x$XORG" = xyes; then
- 	AC_DEFINE(XORG_SERVER, 1, [Building Xorg server])
- 	AC_DEFINE(XORGSERVER, 1, [Building Xorg server])
- 	AC_DEFINE(XFree86Server, 1, [Building XFree86 server])
--	AC_DEFINE_UNQUOTED(XORG_VERSION_CURRENT, [$VENDOR_RELEASE], [Current Xorg version])
- 	AC_DEFINE(NEED_XF86_TYPES, 1, [Need XFree86 typedefs])
- 	AC_DEFINE(NEED_XF86_PROTOTYPES, 1, [Need XFree86 helper functions])
- 	AC_DEFINE(__XSERVERNAME__, "Xorg", [Name of X server])
-@@ -2280,6 +2285,7 @@ hw/dmx/Makefile
- hw/dmx/man/Makefile
- hw/vfb/Makefile
- hw/vfb/man/Makefile
-+hw/vnc/Makefile
- hw/xnest/Makefile
- hw/xnest/man/Makefile
- hw/xwin/Makefile
-diff -up tigervnc-1.2.0/unix/xserver/hw/Makefile.am.vnc tigervnc-1.2.0/unix/xserver/hw/Makefile.am
---- tigervnc-1.2.0/unix/xserver/hw/Makefile.am.vnc	2012-08-28 15:35:23.856810890 +0200
-+++ tigervnc-1.2.0/unix/xserver/hw/Makefile.am	2012-08-28 15:35:42.272795917 +0200
-@@ -33,7 +33,8 @@ SUBDIRS =			\
- 	$(XNEST_SUBDIRS)	\
- 	$(DMX_SUBDIRS)		\
- 	$(KDRIVE_SUBDIRS)	\
--	$(XQUARTZ_SUBDIRS)
-+	$(XQUARTZ_SUBDIRS)	\
-+	vnc
- 
- DIST_SUBDIRS = dmx xfree86 vfb xnest xwin xquartz kdrive
- 
-diff -up tigervnc-1.2.0/unix/xserver/mi/miinitext.c.vnc xserver/mi/miinitext.c
---- tigervnc-1.2.0/unix/xserver/mi/miinitext.c.vnc	2012-08-28 15:35:23.000000000 +0200
-+++ tigervnc-1.2.0/unix/xserver/mi/miinitext.c	2012-09-05 15:07:40.714953972 +0200
-@@ -112,6 +112,10 @@ SOFTWARE.
- #include "micmap.h"
- #include "globals.h"
- 
-+#ifdef TIGERVNC
-+extern void vncExtensionInit(INITARGS);
-+#endif
-+
- /* The following is only a small first step towards run-time
-  * configurable extensions.
-  */
-@@ -299,6 +303,9 @@ static ExtensionModule staticExtensions[
- #ifdef XSELINUX
-     {SELinuxExtensionInit, SELINUX_EXTENSION_NAME, &noSELinuxExtension},
- #endif
-+#ifdef TIGERVNC
-+    {vncExtensionInit, "VNC-EXTENSION", NULL},
-+#endif
- };
- 
- static ExtensionModule *ExtensionModuleList = NULL;
diff --git a/community/virtualbox-modules-lts/PKGBUILD b/community/virtualbox-modules-lts/PKGBUILD
index 361c29a4c..603ad9195 100644
--- a/community/virtualbox-modules-lts/PKGBUILD
+++ b/community/virtualbox-modules-lts/PKGBUILD
@@ -1,26 +1,28 @@
-# $Id: PKGBUILD 93065 2013-06-23 17:40:20Z seblu $
+# $Id: PKGBUILD 93526 2013-07-05 00:46:38Z seblu $
 # Maintainer: Bartłomiej Piotrowski <nospam@bpiotrowski.pl>
 # Contributor: Ionut Biru <ibiru@archlinux.org>
 # Contributor: Sébastien Luttringer
 
 pkgbase=virtualbox-modules-lts
 pkgname=('virtualbox-host-modules-lts' 'virtualbox-guest-modules-lts')
-pkgver=4.2.14
+pkgver=4.2.16
 pkgrel=1
 arch=('i686' 'x86_64')
 url='http://virtualbox.org'
 license=('GPL')
-makedepends=('linux-lts'
-             'linux-lts-headers'
+makedepends=('linux-lts>=3.0' 'linux-lts<3.1'
+             'linux-lts-headers>=3.0' 'linux-lts-headers<3.1'
              "virtualbox-host-dkms>=$pkgver"
              "virtualbox-guest-dkms>=$pkgver"
              'expac'
              'sed'
              'bc')
 
+# remember to also adjust the .install files and the package deps below
+_extramodules=extramodules-3.0-lts
+
 build() {
-  _kernmaj=$(expac -Q '%v' linux-lts|sed -r 's/([[:digit:]]+\.[[:digit:]]+).*/\1/')
-  _kernver=$(< /usr/lib/modules/extramodules-$_kernmaj-lts/version)
+  _kernver=$(cat /usr/lib/modules/$_extramodules/version)
   # dkms need modification to be run as user
   cp -r /var/lib/dkms .
   echo "dkms_tree='$srcdir/dkms'" > dkms.conf
@@ -33,38 +35,34 @@ build() {
 }
 
 package_virtualbox-host-modules-lts(){
-  _kernmaj=$(expac -Q '%v' linux-lts|sed -r 's/([[:digit:]]+\.[[:digit:]]+).*/\1/')
-  _kernver=$(< /usr/lib/modules/extramodules-$_kernmaj-lts/version)
+  _kernver=$(cat /usr/lib/modules/$_extramodules/version)
   pkgdesc='Host kernel modules for VirtualBox'
-  depends=("linux-lts>=$_kernmaj" "linux-lts<$(echo "$_kernmaj+0.1"|bc)")
+  depends=('linux-lts>=3.0' 'linux-lts<3.1')
   replaces=('virtualbox-modules-lts')
   conflicts=('virtualbox-modules-lts')
   provides=("virtualbox-host-modules=$pkgver")
   install=virtualbox-host-modules-lts.install
 
   cd "dkms/vboxhost/$pkgver/$_kernver/$CARCH/module"
-  install -dm755 "$pkgdir/usr/lib/modules/extramodules-$_kernmaj-lts/"
-  install -m644 * "$pkgdir/usr/lib/modules/extramodules-$_kernmaj-lts/"
+  install -dm755 "$pkgdir/usr/lib/modules/$_extramodules/"
+  install -m644 * "$pkgdir/usr/lib/modules/$_extramodules/"
   find "$pkgdir" -name '*.ko' -exec gzip -9 {} +
-  sed -ie "s/VERSION='.*'/VERSION='$_kernver'/" "$startdir/virtualbox-host-modules-lts.install"
 }
 
 package_virtualbox-guest-modules-lts(){
-  _kernmaj=$(expac -Q '%v' linux-lts|sed -r 's/([[:digit:]]+\.[[:digit:]]+).*/\1/')
-  _kernver=$(< /usr/lib/modules/extramodules-$_kernmaj-lts/version)
+  _kernver=$(cat /usr/lib/modules/$_extramodules/version)
   pkgdesc='Guest kernel modules for VirtualBox'
   license=('GPL')
-  depends=("linux-lts>=$_kernmaj" "linux-lts<$(echo "$_kernmaj+0.1"|bc)")
+  depends=('linux-lts>=3.0' 'linux-lts<3.1')
   replaces=('virtualbox-archlinux-modules-lts')
   conflicts=('virtualbox-archlinux-modules-lts')
   provides=("virtualbox-host-modules=$pkgver")
   install=virtualbox-guest-modules-lts.install
 
   cd "dkms/vboxguest/$pkgver/$_kernver/$CARCH/module"
-  install -dm755 "$pkgdir/usr/lib/modules/extramodules-$_kernmaj-lts/"
-  install -m644 * "$pkgdir/usr/lib/modules/extramodules-$_kernmaj-lts/"
+  install -dm755 "$pkgdir/usr/lib/modules/$_extramodules/"
+  install -m644 * "$pkgdir/usr/lib/modules/$_extramodules/"
   find "$pkgdir" -name '*.ko' -exec gzip -9 {} +
-  sed -ie "s/VERSION='.*'/VERSION='$_kernver'/" "$startdir/virtualbox-guest-modules-lts.install"
 }
 
 # vim:set ts=2 sw=2 et:
diff --git a/community/virtualbox-modules-lts/virtualbox-guest-modules-lts.install b/community/virtualbox-modules-lts/virtualbox-guest-modules-lts.install
index 82bda9855..f7526e308 100644
--- a/community/virtualbox-modules-lts/virtualbox-guest-modules-lts.install
+++ b/community/virtualbox-modules-lts/virtualbox-guest-modules-lts.install
@@ -1,18 +1,21 @@
-VERSION=''
+_depmod() {
+  EXTRAMODULES='extramodules-3.0-lts'
+  depmod $(cat /usr/lib/modules/$EXTRAMODULES/version)
+}
 
 post_install() {
-cat << EOF
+  cat << EOF
 ===> You may want to load vboxguest, vboxsf and vboxvideo
 EOF
-  depmod $VERSION
+  _depmod
 }
 
 post_upgrade() {
-  depmod $VERSION
+  _depmod
 }
 
 post_remove() {
-  depmod $VERSION
+  _depmod
 }
 
 # vim:set ts=2 sw=2 et:
diff --git a/community/virtualbox-modules-lts/virtualbox-host-modules-lts.install b/community/virtualbox-modules-lts/virtualbox-host-modules-lts.install
index 6c1a57d3a..cddbffb43 100644
--- a/community/virtualbox-modules-lts/virtualbox-host-modules-lts.install
+++ b/community/virtualbox-modules-lts/virtualbox-host-modules-lts.install
@@ -1,20 +1,23 @@
-VERSION=''
+_depmod() {
+  EXTRAMODULES='extramodules-3.0-lts'
+  depmod $(cat /usr/lib/modules/$EXTRAMODULES/version)
+}
 
 post_install() {
-cat << EOF
+  cat << EOF
 ===> You must load vboxdrv module before starting VirtualBox:
 ===> # modprobe vboxdrv
 EOF
-  depmod $VERSION
+  _depmod
 }
 
 post_upgrade() {
-  depmod $VERSION
+  _depmod
   echo 'In order to use the new version, reload all virtualbox modules manually.'
 }
 
 post_remove() {
-  depmod $VERSION
+  _depmod
 }
 
 # vim:set ts=2 sw=2 et:
diff --git a/community/virtualbox-modules/PKGBUILD b/community/virtualbox-modules/PKGBUILD
index cc9ce02bf..4d220f40b 100644
--- a/community/virtualbox-modules/PKGBUILD
+++ b/community/virtualbox-modules/PKGBUILD
@@ -1,11 +1,11 @@
-# $Id: PKGBUILD 93232 2013-06-29 10:08:01Z foutrelis $
+# $Id: PKGBUILD 93524 2013-07-05 00:43:46Z seblu $
 # Maintainer: Ionut Biru <ibiru@archlinux.org>
 # Maintainer: Sébastien Luttringer
 
 pkgbase=virtualbox-modules
 pkgname=('virtualbox-host-modules' 'virtualbox-guest-modules')
-pkgver=4.2.14
-pkgrel=2
+pkgver=4.2.16
+pkgrel=1
 arch=('i686' 'x86_64')
 url='http://virtualbox.org'
 license=('GPL')
diff --git a/community/virtviewer/PKGBUILD b/community/virtviewer/PKGBUILD
index f02066c16..26ff46bcb 100644
--- a/community/virtviewer/PKGBUILD
+++ b/community/virtviewer/PKGBUILD
@@ -1,22 +1,22 @@
-# $Id: PKGBUILD 88339 2013-04-16 13:32:26Z spupykin $
+# $Id: PKGBUILD 93502 2013-07-04 14:27:03Z spupykin $
 # Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com>
 # Maintainer: Jonathan Wiersma <archaur at jonw dot org>
 
 pkgname=virtviewer
-pkgver=0.5.5
+pkgver=0.5.6
 pkgrel=1
 pkgdesc="A lightweight interface for interacting with the graphical display of virtualized guest OS."
-depends=('gtk-vnc' 'libglade>=2.6.0' 'libvirt')
+depends=('gtk-vnc' 'libglade>=2.6.0' 'libvirt' 'spice-gtk3')
 makedepends=('intltool')
 url="http://virt-manager.et.redhat.com"
 arch=('i686' 'x86_64' 'mips64el')
 license=('GPL')
 source=("http://virt-manager.et.redhat.com/download/sources/virt-viewer/virt-viewer-$pkgver.tar.gz")
-md5sums=('a5516d33a29df5d135611c4667c03f77')
+md5sums=('b1f55ad642df062028b24d8a77619ac5')
 
 build() {
   cd $srcdir/virt-viewer-$pkgver
-  ./configure --prefix=/usr
+  ./configure --prefix=/usr --with-gtk=3.0
   make
 }
author	Nicolás Reynolds <fauno@endefensadelsl.org>	2013-07-09 21:04:53 -0300
committer	Nicolás Reynolds <fauno@endefensadelsl.org>	2013-07-09 21:04:53 -0300
commit	fd5ff7e53a5b8dbabc85ab6e2ff1342b85e155b1 (patch)
tree	d2b16d75c64d947545149f37bda7cdb8873a4770 /community
parent	7823c9009a845174746fd0da09af46a138481851 (diff)
parent	10aa61ef39e662453e1d817046e359372fe3b326 (diff)