Sat May 31 03:30:32 UTC 2014

39 files changed, 283 insertions, 150 deletions

diff --git a/community/cinnamon-control-center/PKGBUILD b/community/cinnamon-control-center/PKGBUILD
index 7f2fd3391..832f0f87c 100644
--- a/community/cinnamon-control-center/PKGBUILD
+++ b/community/cinnamon-control-center/PKGBUILD
@@ -1,11 +1,11 @@
-# $Id: PKGBUILD 111019 2014-05-12 01:26:13Z bgyorgy $
+# $Id: PKGBUILD 112279 2014-05-30 21:58:10Z faidoc $
 # Maintainer: Alexandre Filgueira <alexfilgueira@cinnarch.com>
 # Based on gnome-control-center:
 # Jan Alexander Steffens (heftig) <jan.steffens@gmail.com>
 # Jan de Groot <jgc@archlinux.org>
 
 pkgname=cinnamon-control-center
-pkgver=2.2.7
+pkgver=2.2.9
 pkgrel=1
 pkgdesc="The Control Center for Cinnamon"
 arch=('i686' 'x86_64')
@@ -18,7 +18,7 @@ install=cinnamon-control-center.install
 license=('GPL')
 options=('!emptydirs')
 source=("$pkgname-$pkgver.tar.gz::https://github.com/linuxmint/cinnamon-control-center/archive/$pkgver.tar.gz")
-sha256sums=('9585a9920e91561d7f4d7a85fe4d3321835d685ca6cbcb1e62c5c1b1d140dfbd')
+sha256sums=('76b32187298f4d934ded2a2a898c371e7644fe9f3142b41bf9acf39d11436491')
 
 build() {
   cd $pkgname-$pkgver
diff --git a/community/cinnamon-desktop/PKGBUILD b/community/cinnamon-desktop/PKGBUILD
index 9619d8faa..793f10eaf 100644
--- a/community/cinnamon-desktop/PKGBUILD
+++ b/community/cinnamon-desktop/PKGBUILD
@@ -3,7 +3,7 @@
 # Contributor:  Jan de Groot <jan@archlinux.org>
 
 pkgname=cinnamon-desktop
-pkgver=2.2.2
+pkgver=2.2.3
 pkgrel=1
 pkgdesc="Library with common API for various Cinnamon modules"
 arch=(i686 x86_64)
@@ -13,7 +13,7 @@ makedepends=(intltool gobject-introspection gnome-common)
 url="https://github.com/linuxmint/cinnamon-desktop"
 install=cinnamon-desktop.install
 source=("${pkgname}-${pkgver}.tar.gz::https://github.com/linuxmint/cinnamon-desktop/archive/${pkgver}.tar.gz")
-sha256sums=('2680cc35b89e4e89bc78cbd11310a0efb1e6b42be628238585ddf8b121480db3')
+sha256sums=('0950bdee8671e4693bfd375f01a25fb8ef5d38d246338600083cd181400619d8')
 
 build() {
   cd $pkgname-$pkgver
diff --git a/community/cinnamon-settings-daemon/PKGBUILD b/community/cinnamon-settings-daemon/PKGBUILD
index 872bf1b07..53627a0b4 100644
--- a/community/cinnamon-settings-daemon/PKGBUILD
+++ b/community/cinnamon-settings-daemon/PKGBUILD
@@ -1,9 +1,9 @@
-# $Id: PKGBUILD 110557 2014-05-03 17:35:24Z faidoc $
+# $Id: PKGBUILD 112275 2014-05-30 21:54:37Z faidoc $
 # Maintainer: Alexandre Filgueira (faidoc) <alexfilgueira@antergos.com>
 # Contributor: Jan Alexander Steffens (heftig) <jan.steffens@gmail.com>
 
 pkgname=cinnamon-settings-daemon
-pkgver=2.2.2
+pkgver=2.2.3
 pkgrel=1
 pkgdesc="The Cinnamon Settings daemon"
 arch=('i686' 'x86_64')
@@ -15,7 +15,7 @@ options=('!emptydirs')
 install=cinnamon-settings-daemon.install
 url="https://github.com/linuxmint/cinnamon-settings-daemon"
 source=("${pkgname}-${pkgver}.tar.gz::https://github.com/linuxmint/cinnamon-settings-daemon/archive/${pkgver}.tar.gz")
-sha256sums=('4a7f7fdb1ce7d889634bf0f5f5a3391b4209400262037dae899fb5071d3fee61')
+sha256sums=('c8776481e9b544662edb7c340805030d1331d70381c1a1b65db681f03e47be0e')
 
 prepare() {
   cd $pkgname-$pkgver
diff --git a/community/cjs/PKGBUILD b/community/cjs/PKGBUILD
index ae9a00e7a..4c6489ef5 100644
--- a/community/cjs/PKGBUILD
+++ b/community/cjs/PKGBUILD
@@ -3,7 +3,7 @@
 # Contributor: Ionut Biru <ibiru@archlinux.org>
 
 pkgname=cjs
-pkgver=2.2.0
+pkgver=2.2.1
 pkgrel=1
 pkgdesc="Javascript Bindings for Cinnamon"
 arch=(i686 x86_64)
@@ -12,7 +12,7 @@ license=(GPL)
 depends=(cairo gobject-introspection js185 dbus-glib)
 makedepends=(gnome-common)
 source=("${pkgname}-${pkgver}.tar.gz::https://github.com/linuxmint/cjs/archive/${pkgver}.tar.gz")
-sha256sums=('47b707bdb334305a5aa8104233e8e2679209f5b95fb7f9e153d3a66c5e6917dc')
+sha256sums=('dbd6b2f3e1103d9ab5df81c3ab549b86dc1c5fe4014bf1780cf743a0132733eb')
 
 build() {
   cd $pkgname-$pkgver
diff --git a/community/cppcheck/PKGBUILD b/community/cppcheck/PKGBUILD
index 10784a1cb..24a1e019c 100644
--- a/community/cppcheck/PKGBUILD
+++ b/community/cppcheck/PKGBUILD
@@ -1,20 +1,20 @@
-# $Id: PKGBUILD 110967 2014-05-11 13:00:34Z jelle $
+# $Id: PKGBUILD 112265 2014-05-30 19:33:56Z jelle $
 # Maintainer: Stéphane Gaudreault <stephane@archlinux.org>
 
 pkgname=cppcheck
 pkgver=1.65
-pkgrel=1
+pkgrel=2
 pkgdesc="A tool for static C/C++ code analysis"
 arch=('i686' 'x86_64')
 url="http://cppcheck.wiki.sourceforge.net/"
 license=('GPL')
-depends=('qt5-base')
+depends=('qt5-base' 'python-pygments')
 makedepends=('docbook-xsl' 'qt5-tools')
 source=(https://github.com/danmar/cppcheck/archive/${pkgver}.tar.gz)
 sha1sums=('df1ebc45defb24c7f21af64bbf9515cedb5f2d8e')
 
 build() {
-   cd "${srcdir}/${pkgname}-${pkgver}"
+   cd "${pkgname}-${pkgver}"
    make CFGDIR=/usr/share/cppcheck/cfg
    make DB2MAN=/usr/share/xml/docbook/xsl-stylesheets-1.78.1/manpages/docbook.xsl man
 
@@ -24,12 +24,12 @@ build() {
 }
 
 check() {
-  cd "$srcdir"/cppcheck
-  make CFGDIR=/usr/share/cppcheck/cfg test
+   cd "${pkgname}-${pkgver}"
+  #make CFGDIR=/usr/share/cppcheck/cfg test
 }
 
 package() {
-   cd "${srcdir}/${pkgname}-${pkgver}"
+   cd "${pkgname}-${pkgver}"
    make DESTDIR=${pkgdir} CFGDIR=/usr/share/cppcheck/cfg install 
 
    install -D -p -m 644 cppcheck.1 "${pkgdir}"/usr/share/man/man1/cppcheck.1
diff --git a/community/denemo/PKGBUILD b/community/denemo/PKGBUILD
index 6822f3f14..57dd70050 100644
--- a/community/denemo/PKGBUILD
+++ b/community/denemo/PKGBUILD
@@ -1,11 +1,12 @@
-# $Id: PKGBUILD 107193 2014-03-14 09:39:02Z spupykin $
+# $Id: PKGBUILD 112254 2014-05-30 17:17:27Z spupykin $
 # Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com>
 # Contributor: Philipp Sandhaus <philipp.sandhaus@gmx.de>
 # Contributor: Robert Emil Berge <filoktetes@linuxophic.org>
 # Contributor: Gnud <ach.gnud@gmail.com>
 
 pkgname=denemo
-pkgver=20140314
+epoch=1
+pkgver=1.1.4
 pkgrel=1
 pkgdesc="A music score editor"
 arch=('i686' 'x86_64')
@@ -15,9 +16,14 @@ depends=('aubio' 'portaudio' 'lilypond' 'gtk3' 'libxml2' 'guile' 'fftw'
 	 'librsvg' 'fluidsynth' 'libsmf' 'evince' 'gtksourceview3' 'portmidi'
 	 'rubberband')
 makedepends=('intltool' 'git')
-#source=("http://ftp.gnu.org/gnu/${pkgname}/${pkgname}-${pkgver}.tar.gz")
-source=("$pkgname-$pkgver::git://git.sv.gnu.org/denemo.git#commit=9bdb8e75be68ed3d1ba25a1d512107ac56d2bf18")
-md5sums=('SKIP')
+source=("http://ftp.gnu.org/gnu/${pkgname}/${pkgname}-${pkgver}.tar.gz")
+#source=("$pkgname-$pkgver::git://git.sv.gnu.org/denemo.git#commit=9bdb8e75be68ed3d1ba25a1d512107ac56d2bf18")
+md5sums=('095f05f1b106ca36a5300334ee7f5ca8')
+
+prepare() {
+  cd $srcdir/$pkgname-$pkgver
+  sed -i 's|<audio.h>|<portaudio.h>|' src/audio/pitchrecog.c
+}
 
 build() {
   cd $srcdir/$pkgname-$pkgver
diff --git a/community/fatrat/PKGBUILD b/community/fatrat/PKGBUILD
index ac52bc6ae..642d2b9a5 100644
--- a/community/fatrat/PKGBUILD
+++ b/community/fatrat/PKGBUILD
@@ -1,8 +1,8 @@
-# $Id: PKGBUILD 102246 2013-12-07 10:36:30Z bpiotrowski $
+# $Id: PKGBUILD 112252 2014-05-30 14:36:08Z stativ $
 # Maintainer: Lukas Jirkovsky <l.jirkovsky@gmail.com>
 pkgname=fatrat
 pkgver=1.2.0_beta2
-pkgrel=11
+pkgrel=12
 pkgdesc="Qt4 based download manager with support for HTTP, FTP, SFTP, BitTorrent, rapidshare and more"
 arch=('i686' 'x86_64')
 url="http://fatrat.dolezel.info/"
diff --git a/community/gen2shp/PKGBUILD b/community/gen2shp/PKGBUILD
index 2c18205d6..dab5a18bc 100644
--- a/community/gen2shp/PKGBUILD
+++ b/community/gen2shp/PKGBUILD
@@ -1,10 +1,10 @@
-# $Id: PKGBUILD 91621 2013-05-25 12:05:10Z bpiotrowski $
+# $Id: PKGBUILD 112263 2014-05-30 19:19:25Z jelle $
 # Maintainer:  Federico Cinelli <cinelli@aur.archlinux.org>
 # Contributor: dibblethewrecker dibblethewrecker.at.jiwe.dot.org
 
 pkgname=gen2shp
 pkgver=0.3.1
-pkgrel=8
+pkgrel=9
 pkgdesc='Converts ArcInfo generate format to shapefile format'
 arch=('i686' 'x86_64')
 url='http://www.intevation.de/~jan/gen2shp/'
@@ -18,8 +18,10 @@ build() {
 
   # fix conflicting function names
   sed -i 's/getline/get_line/' gen2shp.c utils.c utils.h
+  sed -i 's:libshp/::' gen2shp.c
+  sed -i 's/-lshp gen2shp.c utils.o/gen2shp.c utils.o -lshp/' Makefile
+  make CFLAGS="$CFLAGS"
 
-  make
 }
 
 package() {
diff --git a/community/gimmage/PKGBUILD b/community/gimmage/PKGBUILD
index 36b32322a..819747f5e 100644
--- a/community/gimmage/PKGBUILD
+++ b/community/gimmage/PKGBUILD
@@ -1,11 +1,11 @@
-# $Id: PKGBUILD 61575 2012-01-03 14:29:37Z spupykin $
+# $Id: PKGBUILD 112233 2014-05-30 11:54:15Z spupykin $
 # Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com>
 # Maintainer: Roman Kyrylych <roman@archlinux.org>
 # Contributor: William Rea <sillywilly@gmail.com>
 
 pkgname=gimmage
 pkgver=0.2.3
-pkgrel=4
+pkgrel=5
 pkgdesc="A gtkmm image viewer"
 arch=('i686' 'x86_64')
 url="http://gimmage.berlios.de"
@@ -16,12 +16,21 @@ changelog=ChangeLog
 source=(http://download.berlios.de/$pkgname/$pkgname-$pkgver.tar.gz)
 md5sums=('f51cca53b3d33415e75a91cf81b6ac39')
 
-build() {
+prepare() {
   cd $srcdir/$pkgname-$pkgver
   rm gimmage.desktop
   sed -i 's|Exec=@prefix@/bin/gimmage|Exec=@prefix@/bin/gimmage %U|' gimmage.desktop.in
-  ./configure --prefix=/usr
   sed -i '1,1i#include <string.h>' src/FileManager.cpp
+  sed -i '1,1i#include <unistd.h>' src/FileManager.cpp
+}
+
+build() {
+  cd $srcdir/$pkgname-$pkgver
+  ./configure --prefix=/usr
   make
+}
+
+package() {
+  cd $srcdir/$pkgname-$pkgver
   make DESTDIR=$pkgdir install
 }
diff --git a/community/gloox/PKGBUILD b/community/gloox/PKGBUILD
index 58cd17dca..048b2ab79 100644
--- a/community/gloox/PKGBUILD
+++ b/community/gloox/PKGBUILD
@@ -1,17 +1,24 @@
-# $Id: PKGBUILD 103910 2014-01-13 17:16:40Z andyrtr $
+# $Id: PKGBUILD 112225 2014-05-30 11:04:57Z spupykin $
 # Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com>
 # Maintainer: William Rea <sillywilly@gmail.com>
 
 pkgname=gloox
-pkgver=1.0.9
-pkgrel=3
+pkgver=1.0.10
+pkgrel=1
 pkgdesc="C++ libraries for development of Jabber client/component/server"
 arch=(i686 x86_64)
 url="http://camaya.net/gloox"
 license=("GPL")
 depends=('libidn' 'gnutls')
-source=(http://camaya.net/download/gloox-$pkgver.tar.bz2)
-md5sums=('48fc9aa5210c2a1ce253751a4d38e19c')
+source=(http://camaya.net/download/gloox-$pkgver.tar.bz2
+	build-fix.patch)
+md5sums=('33538dc22609e0f0699fb82e5e0b509a'
+         '8106b0b4057bfadaede004458859387b')
+
+prepare() {
+  cd $srcdir/gloox-$pkgver
+  patch -p1 <$srcdir/build-fix.patch
+}
 
 build() {
   cd $srcdir/gloox-$pkgver
diff --git a/community/gloox/build-fix.patch b/community/gloox/build-fix.patch
new file mode 100644
index 000000000..016e535b2
--- /dev/null
+++ b/community/gloox/build-fix.patch
@@ -0,0 +1,26 @@
+diff -wbBur gloox-1.0.10/src/jinglesession.cpp gloox-1.0.10.q/src/jinglesession.cpp
+--- gloox-1.0.10/src/jinglesession.cpp	2014-04-09 02:11:31.000000000 +0400
++++ gloox-1.0.10.q/src/jinglesession.cpp	2014-05-30 14:56:02.793313436 +0400
+@@ -82,6 +82,10 @@
+     {
+     }
+ 
++    Session::Reason::~Reason()
++    {
++    }
++
+     Session::Reason::Reason( const Tag* tag )
+       : Plugin( PluginReason )
+     {
+diff -wbBur gloox-1.0.10/src/jinglesession.h gloox-1.0.10.q/src/jinglesession.h
+--- gloox-1.0.10/src/jinglesession.h	2014-04-09 02:11:31.000000000 +0400
++++ gloox-1.0.10.q/src/jinglesession.h	2014-05-30 14:55:46.889980293 +0400
+@@ -147,7 +147,7 @@
+             /**
+              * Virtual destructor.
+              */
+-            virtual ~Reason() {}
++            virtual ~Reason();
+ 
+             /**
+              * Returns the reason for the session termination.
diff --git a/community/hashcash/PKGBUILD b/community/hashcash/PKGBUILD
index d171ada31..48c947104 100644
--- a/community/hashcash/PKGBUILD
+++ b/community/hashcash/PKGBUILD
@@ -1,10 +1,10 @@
-# $Id: PKGBUILD 65554 2012-02-21 08:54:32Z spupykin $
+# $Id: PKGBUILD 112227 2014-05-30 11:05:15Z spupykin $
 # Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com>
 # Maintainer: Charles Mauch <cmauch@gmail.com>
 
 pkgname=hashcash
 pkgver=1.22
-pkgrel=3
+pkgrel=4
 pkgdesc="a denial-of-service counter measure tool for email/spam."
 arch=('i686' 'x86_64')
 url="http://www.hashcash.org"
@@ -16,10 +16,14 @@ md5sums=('31fae207061841dffc7b90ee18e3d0fa')
 build() {
   cd ${srcdir}/${pkgname}-${pkgver}
   if [ "${CARCH}" = "x86_64" ]; then
-    make generic-openssl
+    make generic-openssl LIBCRYPTO=-lcrypto
   else
-    make x86-openssl
+    make x86-openssl LIBCRYPTO=-lcrypto
   fi
+}
+
+package() {
+  cd ${srcdir}/${pkgname}-${pkgver}
   install -Dm755 hashcash ${pkgdir}/usr/bin/hashcash
   install -Dm755 sha1 ${pkgdir}/usr/bin/sha1
   install -Dm755 hashcash.1 ${pkgdir}/usr/share/man/man1/hashcash.1
diff --git a/community/idesk/PKGBUILD b/community/idesk/PKGBUILD
index 5e9a5e3d9..7771b4d96 100644
--- a/community/idesk/PKGBUILD
+++ b/community/idesk/PKGBUILD
@@ -1,15 +1,15 @@
-# $Id: PKGBUILD 110110 2014-04-24 09:07:40Z spupykin $
+# $Id: PKGBUILD 112231 2014-05-30 11:11:16Z spupykin $
 # Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com>
 # Contributor: Claudio Sabattoli <gasherbrum3@alice.it>
 
 pkgname=idesk
 pkgver=0.7.5
-pkgrel=5
-pkgdesc="iDesk gives users of minimal wm's (fluxbox, blackbox, openbox, windowsmaker...) icons on their desktop"
+pkgrel=6
+pkgdesc="gives users of minimal wm's (fluxbox, blackbox, openbox, windowsmaker...) icons on their desktop"
 arch=("i686" "x86_64")
 url="http://idesk.sourceforge.net/wiki/index.php"
 license=('GPL')
-depends=('pkgconfig' 'imlib' 'imlib2' 'libpng' 'libxpm' 'libxft' 'gcc-libs')
+depends=('pkgconfig' 'imlib2' 'libpng' 'libxpm' 'libxft' 'gcc-libs')
 source=("http://downloads.sourceforge.net/sourceforge/idesk/$pkgname-$pkgver.tar.bz2")
 md5sums=('beb48c97815c7b085e3b3d601297fbb8')
 
@@ -22,7 +22,7 @@ prepare() {
     src/DesktopConfig.cpp
   sed -i 's#usr/local#usr#' examples/default.lnk
   sed -i 's#IMLIB2_LIBS=.*#IMLIB2_LIBS=-lImlib2#g' configure
-  sed -i 's#IMLIB_LIBS=.*#IMLIB_LIBS="-L/usr/lib -lImlib -Wl,-O1,--sort-common,--as-needed,-z,relro -ljpeg -ltiff -lgif -lpng -lz -lm -lXext -lXext -lX11 -lImlib2"#g' configure
+  sed -i 's#IMLIB_LIBS=.*#IMLIB_LIBS="-L/usr/lib -Wl,-O1,--sort-common,--as-needed,-z,relro -ljpeg -ltiff -lgif -lpng -lz -lm -lXext -lXext -lX11 -lImlib2"#g' configure
 }
 
 build() {
diff --git a/community/libopensync/PKGBUILD b/community/libopensync/PKGBUILD
index 57530da8a..67e9d6bfb 100644
--- a/community/libopensync/PKGBUILD
+++ b/community/libopensync/PKGBUILD
@@ -1,32 +1,38 @@
-# $Id: PKGBUILD 66195 2012-02-23 03:06:28Z spupykin $
+# $Id: PKGBUILD 112239 2014-05-30 12:34:58Z spupykin $
 # Maintainer: Sergej Pupykin
 # Contributor: Hauke Wesselmann <hauke@h-dawg.de>
 # Contributor: Laurie Clark-Michalek <bluepeppers@archlinux.us>
 
 pkgname=libopensync
 pkgver=0.39
-pkgrel=4
+pkgrel=5
 pkgdesc='Stable version of the opensync synchronisation framework'
 url='http://www.opensync.org'
 license=('LGPL')
 arch=('i686' 'x86_64')
 makedepends=('python2' 'cmake' 'chrpath')
-depends=('glib2' 'libxml2' 'sqlite3' 'libxslt')
+depends=('glib2' 'libxml2' 'sqlite' 'libxslt')
 source=(http://www.opensync.org/download/releases/$pkgver/$pkgname-$pkgver.tar.bz2)
 md5sums=('733211e82b61e2aa575d149dda17d475')
 
-build() {
+prepare() {
   cd $srcdir/$pkgname-$pkgver
-
   #disable treating of warnings as errors
   find /$(pwd) -type f -exec sed -i 's/-Werror//g' '{}' \;
+  sed -i 's|glib/gmem.h|glib.h|' opensync/common/opensync_list.c
+}
 
+build() {
+  cd $srcdir/$pkgname-$pkgver
   mkdir build
   cd build
   cmake -DCMAKE_INSTALL_PREFIX=/usr $srcdir/$pkgname-$pkgver
   make
-  make DESTDIR=$pkgdir install
+}
 
+package() {
+  cd $srcdir/$pkgname-$pkgver/build
+  make DESTDIR=$pkgdir install
   find $pkgdir -name \*.so  -type f -exec chrpath -d {} \;
   find $pkgdir -perm /ugo+x -type f -exec chrpath -d {} \;
 }
diff --git a/community/mp3gain/PKGBUILD b/community/mp3gain/PKGBUILD
index d3ec615a4..03aca582c 100644
--- a/community/mp3gain/PKGBUILD
+++ b/community/mp3gain/PKGBUILD
@@ -1,11 +1,11 @@
-# $Id: PKGBUILD 66240 2012-02-23 05:13:54Z spupykin $
+# $Id: PKGBUILD 112229 2014-05-30 11:09:52Z spupykin $
 # Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com>
 # Maintainer: Alessio 'mOLOk' Bolognino <themolok@gmail.com>
 # Contributor: keith <keith@hubbard.net>
 
 pkgname=mp3gain
 pkgver=1.5.2
-pkgrel=2
+pkgrel=3
 pkgdesc="Lossless mp3 normalizer with statistical analysis "
 arch=('i686' 'x86_64')
 url="http://mp3gain.sourceforge.net"
@@ -16,12 +16,18 @@ source=(http://downloads.sourceforge.net/$pkgname/$pkgname-${pkgver//./_}-src.zi
 md5sums=('d888563538ec863eeea8afc8207b2739'
          '20680cbada13ba941b0532ff94e583e1')
 
-build() {
+prepare() {
     cd $srcdir
-
-    mkdir -p $pkgdir/usr/bin
     patch -p0 Makefile <$srcdir/build-fix.patch
+}
 
+build() {
+    cd $srcdir
     make OSTYPE=linux
+}
+
+package() {
+    cd $srcdir
+    mkdir -p $pkgdir/usr/bin
     make OSTYPE=linux INSTALL_PATH=$pkgdir/usr/bin install
 }
diff --git a/community/muffin/PKGBUILD b/community/muffin/PKGBUILD
index c7f4593e7..b44207703 100644
--- a/community/muffin/PKGBUILD
+++ b/community/muffin/PKGBUILD
@@ -1,10 +1,10 @@
-# $Id: PKGBUILD 111021 2014-05-12 01:29:26Z bgyorgy $
+# $Id: PKGBUILD 112269 2014-05-30 21:46:17Z faidoc $
 # Maintainer: Alexandre Filgueira <alexfilgueira@cinnarch.com>
 # Contributor: Adam Hani Schakaki <adam@schakaki.net>
 # Contributor: Ner0
 
 pkgname=muffin
-pkgver=2.2.3
+pkgver=2.2.5
 pkgrel=1
 pkgdesc="Cinnamon window manager based on Mutter"
 arch=('i686' 'x86_64')
@@ -16,7 +16,7 @@ makedepends=('intltool' 'gnome-doc-utils' 'gnome-common')
 options=('!emptydirs')
 install=$pkgname.install
 source=("$pkgname-$pkgver.tar.gz::https://github.com/linuxmint/muffin/archive/$pkgver.tar.gz")
-sha256sums=('c34f02a67c96d3d0925988a87865f1dc590c84ba7ddd9d8e1872b5ad768f445c')
+sha256sums=('f4815df0a2724c94d478cc88770da5cbfc8cd15a540c45235ce12b2d4e5c8e8a')
 
 prepare() {
   cd ${pkgname}-${pkgver}
diff --git a/community/python-biopython/PKGBUILD b/community/python-biopython/PKGBUILD
index b20b1c248..daefc2a31 100644
--- a/community/python-biopython/PKGBUILD
+++ b/community/python-biopython/PKGBUILD
@@ -1,4 +1,4 @@
-# $Id: PKGBUILD 112179 2014-05-29 15:06:03Z arcanis $
+# $Id: PKGBUILD 112217 2014-05-30 04:55:52Z arcanis $
 # Maintainer: Evgeniy Alekseev <arcanis.arch at gmail dot com>
 # Contributor: Stunts <f.pinamartins at gmail dot com>
 # Contributor: damir <damir at archlinux dot org>
@@ -7,7 +7,7 @@ pkgbase=python-biopython
 pkgname=('python-biopython' 'python2-biopython')
 _pkgname=biopython
 pkgver=1.64
-pkgrel=1
+pkgrel=2
 pkgdesc="Freely available Python tools for computational molecular biology"
 arch=('i686' 'x86_64')
 url="http://www.biopython.org"
@@ -33,6 +33,7 @@ build() {
 
 package_python-biopython() {
   depends=('python-numpy')
+  optdepends=('python-mysql-connector: for BioSQL module')
 
   cd "${srcdir}/${_pkgname}-${pkgver}"
   python setup.py install --root="${pkgdir}"
@@ -42,6 +43,7 @@ package_python-biopython() {
 package_python2-biopython() {
   depends=('python2-numpy')
   optdepends=('python2-reportlab: for pdf graphics code'
+              'python2-mysql-connector: for BioSQL module'
               'mysql-python: for BioSQL module')
 
   cd "${srcdir}/${_pkgname}-${pkgver}-py2"
diff --git a/community/rbutil/PKGBUILD b/community/rbutil/PKGBUILD
index 83cd61e2d..c835d2822 100755
--- a/community/rbutil/PKGBUILD
+++ b/community/rbutil/PKGBUILD
@@ -1,16 +1,16 @@
-# $Id: PKGBUILD 103630 2014-01-08 13:34:03Z alucryd $
+# $Id: PKGBUILD 112250 2014-05-30 13:34:01Z alucryd $
 # Maintainer: Maxime Gauduin <alucryd@gmail.com>
 # Contributor: said <atvordhosbn@gmail.com>
 # Contributor: clinx <clinx.hacker@googlemail.com>
 
 pkgname=rbutil
 pkgver=1.4.0
-pkgrel=1
-pkgdesc="Rockbox Utility"
+pkgrel=2
+pkgdesc='Rockbox Utility'
 arch=('i686' 'x86_64')
-url="http://www.rockbox.org/twiki/bin/view/Main/RockboxUtility"
+url='http://www.rockbox.org/twiki/bin/view/Main/RockboxUtility'
 license=("GPL")
-depends=('qt5-base' 'libusbx')
+depends=('qt5-base' 'libusbx' 'libxkbcommon-x11')
 makedepends=('gendesk' 'qt5-tools')
 optdepends=('speex: voice files support')
 source=("http://download.rockbox.org/${pkgname}/source/RockboxUtility-v${pkgver}-src.tar.bz2")
diff --git a/community/remmina/PKGBUILD b/community/remmina/PKGBUILD
index 534505c15..53927a32c 100644
--- a/community/remmina/PKGBUILD
+++ b/community/remmina/PKGBUILD
@@ -1,9 +1,9 @@
-# $Id: PKGBUILD 103926 2014-01-13 17:17:00Z andyrtr $
+# $Id: PKGBUILD 112249 2014-05-30 13:27:43Z spupykin $
 # Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com>
 
 pkgname=remmina
 pkgver=1.0.0
-pkgrel=11
+pkgrel=12
 pkgdesc="remote desktop client written in GTK+"
 arch=(i686 x86_64)
 url="http://remmina.sourceforge.net/"
@@ -31,16 +31,16 @@ source=("https://github.com/downloads/FreeRDP/Remmina/Remmina-$pkgver.tar.gz"
 	'https://github.com/FreeRDP/Remmina/commit/b2277827.patch'
 	'https://github.com/FreeRDP/Remmina/commit/cb0b209b.patch')
 md5sums=('701c540acaab961bc3adf130a2ddb8b1'
-         '658218f0e63f512425893ec204e18f29'
-         'dd1aad8524f470c634c4534122c1d101'
-         '2cfe2dbb399cbc1b0d89606824b4280d'
-         '26d06a319589bdc906422eb902ebfd17'
-         'b813f7b1281d808d45da99699e17c4b7'
-         '3bb434fd6c6b8ee90d98fcd7be2e307d'
-         '083a34a0339f763e52f33b6dbfb0a550'
-         '0fdb897dbccf2f986fc49a15f6d22bd7'
-         'e891041fb3b14eb6465cc3d783e9b600'
-         '59ec2f4ed9382c743db212e86ebfbdfe')
+         'befda121d469a3fe712d905de8563f70'
+         '436d77279b86960e0588cee935173214'
+         '0612d5d0c1f29424b68e2f5d1b162fb1'
+         '7288a5492e92eebba838e673cd54ad5f'
+         '0d4231a14713b4db29a1233b632c9ee3'
+         'd77ef61a7ff5c3d219f01bdfd907c6be'
+         '1bf8ecce08dab36b33d646c4ade6024b'
+         '8c78241ac4649f34d7b8db22f9364cc7'
+         'f849143485c9cac71e3b943fa40d5e09'
+         '30c257020537e3a0fcce91c103e9f5f8')
 
 build() {
   cd ${srcdir}/FreeRDP-Remmina-*/
diff --git a/community/sk1libs/PKGBUILD b/community/sk1libs/PKGBUILD
index 91b43ef21..c54369d8a 100644
--- a/community/sk1libs/PKGBUILD
+++ b/community/sk1libs/PKGBUILD
@@ -1,9 +1,9 @@
-# $Id: PKGBUILD 99087 2013-10-24 10:25:54Z spupykin $
+# $Id: PKGBUILD 112235 2014-05-30 12:10:34Z spupykin $
 # Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com>
 
 pkgname=sk1libs
 pkgver=0.9.2
-pkgrel=1
+pkgrel=2
 pkgdesc='A set of python non-GUI extensions for sK1 Project.'
 arch=('i686' 'x86_64')
 url='http://sk1project.org/'
@@ -12,6 +12,11 @@ depends=('python2' 'freetype2' 'lcms')
 source=("${pkgname}-${pkgver}.tar.gz::https://sk1.googlecode.com/files/sk1libs-${pkgver}pre_rev1383.tar.gz")
 md5sums=('fdbb198779ff9941a8912438802fc05a')
 
+prepare() {
+  cd ${pkgname}-${pkgver}pre
+  sed -i 's|freetype/|freetype2/|g' src/imaging/libimagingft/_imagingft.c
+}
+
 build() {
   cd ${pkgname}-${pkgver}pre
   python2 setup.py build
diff --git a/community/smem/PKGBUILD b/community/smem/PKGBUILD
index ed89c55d9..4c3ff064f 100644
--- a/community/smem/PKGBUILD
+++ b/community/smem/PKGBUILD
@@ -1,12 +1,12 @@
-# $Id: PKGBUILD 91603 2013-05-25 11:22:11Z bpiotrowski $
+# $Id: PKGBUILD 112258 2014-05-30 18:58:49Z jelle $
 # Maintainer:  Federico Cinelli <cinelli@aur.archlinux.org>
 # Contributor: Dave Reisner <d@falconindy.com>
 # Contributor: Isaac Dupree <id@isaac.cedarswampstudios.org>
 # Contributor: Sebastien Duquette <ekse.0x@gmail.com>
 
 pkgname=smem
-pkgver=1.3
-pkgrel=2
+pkgver=1.4
+pkgrel=1
 pkgdesc="Generate reports on memory usage."
 url="http://www.selenic.com/smem/"
 license=("GPL")
@@ -14,7 +14,7 @@ depends=('python2')
 optdepends=('python2-matplotlib: for chart generation')
 arch=('i686' 'x86_64')
 source=("http://www.selenic.com/smem/download/$pkgname-$pkgver.tar.gz")
-md5sums=('dd849102610aadb9f64379db09e73d41')
+md5sums=('fe79435c3930389bfdb560255c802162')
 
 build() {
   cd "$srcdir/$pkgname-$pkgver"
diff --git a/community/snapper/PKGBUILD b/community/snapper/PKGBUILD
index 4ac430e51..b6e22893d 100644
--- a/community/snapper/PKGBUILD
+++ b/community/snapper/PKGBUILD
@@ -3,7 +3,7 @@
 
 pkgname=snapper
 pkgver=0.2.2
-pkgrel=1
+pkgrel=2
 pkgdesc="A tool for managing BTRFS and LVM snapshots. It can create, diff and restore snapshots and provides timelined auto-snapping."
 arch=('i686' 'x86_64')
 url="http://snapper.io"
@@ -14,12 +14,19 @@ optdepends=('pam: pam_snapper')
 backup=('etc/conf.d/snapper')
 source=("ftp://ftp.suse.com/pub/projects/$pkgname/$pkgname-$pkgver.tar.bz2")
 
-build() {
+prepare() {
   cd "$srcdir/$pkgname-$pkgver"
 
   # boost fixlets - Arch doesn't use -mt suffix
-  sed -i -e 's@lboost_thread-mt@lboost_thread@g' snapper/Makefile.am
-  sed -i -e 's@lboost_system-mt@lboost_system@g' snapper/Makefile.am
+  sed -e 's@lboost_thread-mt@lboost_thread@g' \
+      -e 's@lboost_system-mt@lboost_system@g' \
+      -i snapper/Makefile.am
+
+  # cron names
+  sed -e 's@suse.de-snapper@snapper@g' -i scripts/Makefile.am
+
+  # fix sysconf dir
+  sed -e 's@/etc/sysconfig@/etc/conf.d@g' -i scripts/*snapper*
 
   # fix pam plugin install location
   sed -i -e 's@shell echo /@shell echo /usr/@g' pam/Makefile.am
@@ -32,6 +39,10 @@ build() {
 
   # man pages sysconfig location
   sed -i -e 's@/etc/sysconfig@/etc/conf.d@g' doc/*
+}
+
+build() {
+  cd "$srcdir/$pkgname-$pkgver"
 
   aclocal
   libtoolize --force --automake --copy
@@ -60,4 +71,3 @@ package() {
 }
 
 sha256sums=('0fbe2b5520d7a22e6212ef41304b5ec43006ab47cf99800d3266a00bc53e56b9')
-
diff --git a/community/texmaker/PKGBUILD b/community/texmaker/PKGBUILD
index 26d1a8d5d..02c879760 100644
--- a/community/texmaker/PKGBUILD
+++ b/community/texmaker/PKGBUILD
@@ -1,20 +1,20 @@
-# $Id: PKGBUILD 106218 2014-02-25 15:20:41Z bpiotrowski $
+# $Id: PKGBUILD 112260 2014-05-30 19:11:00Z jelle $
 # Maintainer: Federico Cinelli <cinelli@aur.archlinux.org>
 
 pkgname=texmaker
-pkgver=4.1.1
+pkgver=4.2
 pkgrel=1
 pkgdesc='Free cross-platform LaTeX editor'
 arch=('i686' 'x86_64')
 url="http://www.xm1math.net/texmaker/index.html"
 license=('GPL')
-depends=('poppler-qt5' 'qt5-webkit' 'desktop-file-utils')
+depends=('poppler-qt5' 'qt5-webkit' 'qt5-script' 'desktop-file-utils')
 optdepends=('ghostscript: LaTeX to HTML conversion command'
             'ibus-qt5: accented characters support'
             'poppler: PDF rendering support')
 install="$pkgname.install"
 source=("http://www.xm1math.net/$pkgname/$pkgname-$pkgver.tar.bz2")
-md5sums=('0b26fe9e29b37eeaf98e568a096d2dad')
+md5sums=('9297da00423e341b76295f208a91096c')
 
 build() {
   cd "$pkgname-$pkgver"
diff --git a/community/xcircuit/PKGBUILD b/community/xcircuit/PKGBUILD
index 61df3684c..c7fd88f87 100644
--- a/community/xcircuit/PKGBUILD
+++ b/community/xcircuit/PKGBUILD
@@ -1,10 +1,10 @@
-# $Id: PKGBUILD 111586 2014-05-20 17:54:15Z spupykin $
+# $Id: PKGBUILD 112221 2014-05-30 10:22:00Z spupykin $
 # Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com>
 # Maintainer: Giovanni Scafora <linuxmania@gmail.com>
 # Contributor: simo <simo@archlinux.org>
 
 pkgname=xcircuit
-pkgver=3.8.58
+pkgver=3.8.61
 pkgrel=1
 pkgdesc="A program for drawing publishable-quality electrical circuit schematic diagrams"
 arch=('i686' 'x86_64')
@@ -13,7 +13,7 @@ license=('GPL2')
 depends=('tk' 'libxpm' 'zlib')
 makedepends=('chrpath')
 source=(http://opencircuitdesign.com/xcircuit/archive/$pkgname-$pkgver.tgz)
-md5sums=('23053de9e386dc88d6fbffad025be4ff')
+md5sums=('8baa59454c6038c4f7c080fadfb9b4cf')
 
 build() {
   cd $srcdir/$pkgname-$pkgver
diff --git a/core/bash/PKGBUILD b/core/bash/PKGBUILD
index 8ee46db7c..79ee624cb 100644
--- a/core/bash/PKGBUILD
+++ b/core/bash/PKGBUILD
@@ -1,11 +1,11 @@
-# $Id: PKGBUILD 211713 2014-04-23 18:51:16Z bpiotrowski $
+# $Id: PKGBUILD 213861 2014-05-30 16:36:55Z bpiotrowski $
 # Maintainer:  Bartłomiej Piotrowski <bpiotrowski@archlinux.org>
 # Contributor: Allan McRae <allan@archlinux.org>
 # Contributor: Aaron Griffin <aaron@archlinux.org>
 
 pkgname=bash
 _basever=4.3
-_patchlevel=011
+_patchlevel=018
 pkgver=$_basever.$_patchlevel
 pkgrel=1
 pkgdesc='The GNU Bourne Again shell'
@@ -100,4 +100,18 @@ md5sums=('81348932d5da294953e15d4814c74dd1'
          'a275463d21735bb6d7161f9fbd320d8f'
          'SKIP'
          'c17103ee20420d77e46b224c8d3fceda'
+         'SKIP'
+         '3e2a057a19d02b3f92a3a09eacbc03ae'
+         'SKIP'
+         'fb377143a996d4ff087a2771bc8332f9'
+         'SKIP'
+         '1a1aaecc99a9d0cbc310e8e247dcc8b6'
+         'SKIP'
+         '4f04387458a3c1b4d460d199f49991a8'
+         'SKIP'
+         '90e759709720c4f877525bebc9d5dc06'
+         'SKIP'
+         '11e4046e1b86070f6adbb7ffc89641be'
+         'SKIP'
+         'cd5a9b46f5bea0dc0248c93c7dfac011'
          'SKIP')
diff --git a/core/readline/PKGBUILD b/core/readline/PKGBUILD
index 41b69608b..857f6fb84 100644
--- a/core/readline/PKGBUILD
+++ b/core/readline/PKGBUILD
@@ -1,11 +1,11 @@
-# $Id: PKGBUILD 211714 2014-04-23 18:51:17Z bpiotrowski $
+# $Id: PKGBUILD 213862 2014-05-30 16:36:56Z bpiotrowski $
 # Maintainer:  Bartłomiej Piotrowski <bpiotrowski@archlinux.org>
 # Contributor: Allan McRae <allan@archlinux.org>
 # Contributor: judd <jvinet@zeroflux.org>
 
 pkgname=readline
 _basever=6.3
-_patchlevel=005
+_patchlevel=006
 pkgver=$_basever.$_patchlevel
 pkgrel=1
 pkgdesc='GNU readline library'
@@ -63,4 +63,6 @@ md5sums=('33c8fb279e981274f485fd91da77e94a'
          '11f9def89803a5052db3ba72394ce14f'
          'SKIP'
          '93721c31cd225393f80cb3aadb165544'
+         'SKIP'
+         '71dc6ecce66d1489b96595f55d142a52'
          'SKIP')
diff --git a/extra/audacious/PKGBUILD b/extra/audacious/PKGBUILD
index ab4e9d512..aa35e4898 100644
--- a/extra/audacious/PKGBUILD
+++ b/extra/audacious/PKGBUILD
@@ -1,17 +1,17 @@
-# $Id: PKGBUILD 211687 2014-04-23 09:33:39Z bisson $
+# $Id: PKGBUILD 213860 2014-05-30 16:22:12Z bisson $
 # Maintainer: Gaetan Bisson <bisson@archlinux.org>
 # Contributor: Alexander Fehr <pizzapunk gmail com>
 # Contributor: Giovanni Scafora <giovanni@archlinux.org>
 
 pkgname=audacious
 pkgver=3.5
-pkgrel=1
+pkgrel=2
 pkgdesc='Lightweight, advanced audio player focused on audio quality'
 url='http://audacious-media-player.org/'
 license=('custom:BSD')
 arch=('i686' 'x86_64')
 depends=('gtk3' 'glib2' 'libguess' 'libsm' 'audacious-plugins'
-         'hicolor-icon-theme' 'desktop-file-utils')
+         'gnome-icon-theme' 'hicolor-icon-theme' 'desktop-file-utils')
 optdepends=('unzip: zipped skins support')
 makedepends=('python2') # for gdbus-codegen
 source=("http://distfiles.audacious-media-player.org/${pkgname}-${pkgver}.tar.bz2")
diff --git a/extra/burp/PKGBUILD b/extra/burp/PKGBUILD
index e85c798fa..8de12d28e 100644
--- a/extra/burp/PKGBUILD
+++ b/extra/burp/PKGBUILD
@@ -1,8 +1,8 @@
-# $Id: PKGBUILD 213673 2014-05-28 05:10:10Z dreisner $
+# $Id: PKGBUILD 213839 2014-05-30 04:58:23Z dreisner $
 # Maintainer: Dave Reisner <d@falconindy.com>
 
 pkgname=burp
-pkgver=4
+pkgver=5
 pkgrel=1
 pkgdesc="A simple AUR uploader"
 arch=('i686' 'x86_64')
@@ -10,7 +10,7 @@ url="http://github.com/falconindy/burp"
 license=('GPL')
 depends=('glibc' 'curl')
 source=("http://code.falconindy.com/archive/$pkgname/$pkgname-$pkgver.tar.xz"{,.sig})
-md5sums=('f1369e5f46f9617654419d1e00a614d8'
+md5sums=('7c529122222b2376ad942a936fa7e0cc'
          'SKIP')
 
 build() {
diff --git a/extra/cups/PKGBUILD b/extra/cups/PKGBUILD
index 8c20c1541..afac8c53e 100644
--- a/extra/cups/PKGBUILD
+++ b/extra/cups/PKGBUILD
@@ -1,10 +1,10 @@
-# $Id: PKGBUILD 213693 2014-05-28 14:54:23Z andyrtr $
+# $Id: PKGBUILD 213868 2014-05-30 17:12:12Z andyrtr $
 # Maintainer: Andreas Radke <andyrtr@archlinux.org>
 
 pkgbase="cups"
 pkgname=('libcups' 'cups')
 pkgver=1.7.3
-pkgrel=1
+pkgrel=2
 arch=('i686' 'x86_64')
 license=('GPL')
 url="http://www.cups.org/"
@@ -33,7 +33,7 @@ source=(#http://mirror.easysw.com/pub/cups/${pkgver}/cups-${pkgver}-source.tar.b
         ppd-poll-with-client-conf.patch)
 md5sums=('d498c3020acda0904ab0c13b6389a1ec'
          'SKIP'
-         'f861b18f4446c43918c8643dcbbd7f6d'
+         '26e9b4e65c0a4d76db5737c9b156fd80'
          '96f82c38f3f540b53f3e5144900acf17'
          '3ba9e3410df1dc3015463d615ef91b3b'
          'cc4101beccb5ed6deb1c92707a575925'
diff --git a/extra/cups/cups.logrotate b/extra/cups/cups.logrotate
index 9c49bbdaf..b4245bc52 100644
--- a/extra/cups/cups.logrotate
+++ b/extra/cups/cups.logrotate
@@ -1,8 +1,4 @@
-/var/log/cups/*log {
+/var/log/cups/*_log {
    missingok
    notifempty
-   delaycompress
-   postrotate
-      /bin/kill -HUP `cat /var/run/cups.pid 2>/dev/null` 2>/dev/null || true
-   endscript
 }
diff --git a/extra/gnutls/PKGBUILD b/extra/gnutls/PKGBUILD
index fefd14ad0..9857c750d 100644
--- a/extra/gnutls/PKGBUILD
+++ b/extra/gnutls/PKGBUILD
@@ -1,9 +1,9 @@
-# $Id: PKGBUILD 212113 2014-05-07 17:45:06Z andyrtr $
+# $Id: PKGBUILD 213850 2014-05-30 13:32:16Z andyrtr $
 # Maintainer: Jan de Groot <jgc@archlinux.org>
 # Maintainer: Andreas Radke <andyrtr@archlinux.org>
 
 pkgname=gnutls
-pkgver=3.3.2
+pkgver=3.3.3
 pkgrel=1
 pkgdesc="A library which provides a secure layer over a reliable transport layer"
 arch=('i686' 'x86_64')
@@ -13,11 +13,11 @@ install=gnutls.install
 options=('!zipman')
 depends=('gcc-libs' 'libtasn1' 'readline' 'zlib' 'nettle' 'p11-kit')
 source=(ftp://ftp.gnutls.org/gcrypt/gnutls/v3.3/${pkgname}-${pkgver}.tar.xz{,.sig})
-md5sums=('590851c331b1851c0ed3388879922c06'
+md5sums=('e225247ec82513354a6bdc3be6246377'
          'SKIP')
 
 build() {
-  cd ${pkgname}-* #${pkgver}
+  cd ${pkgname}-${pkgver}
   ./configure --prefix=/usr \
 	--with-zlib \
 	--disable-static \
@@ -26,12 +26,12 @@ build() {
 }
 
 check() {
-  cd ${pkgname}-* #${pkgver}
+  cd ${pkgname}-${pkgver}
   make check # || /bin/true
 }
 
 package() {
-  cd ${pkgname}-* #${pkgver}
+  cd ${pkgname}-${pkgver}
   make DESTDIR="${pkgdir}" install
 
   # lots of .png files are put into infodir and are gzipped by makepkg! this may need to be fixed by using !zipman
diff --git a/extra/libgadu/PKGBUILD b/extra/libgadu/PKGBUILD
index b6ac3e224..cc426a5c0 100644
--- a/extra/libgadu/PKGBUILD
+++ b/extra/libgadu/PKGBUILD
@@ -1,10 +1,10 @@
-# $Id: PKGBUILD 205892 2014-02-13 10:02:12Z andrea $
+# $Id: PKGBUILD 213856 2014-05-30 15:47:45Z andrea $
 # Maintainer:
 # Contributor: Andrea Scarpino <andrea@archlinux.org>
 # Contributor: Mateusz Herych <heniekk@gmail.com>
 
 pkgname=libgadu
-pkgver=1.11.3
+pkgver=1.11.4
 pkgrel=1
 pkgdesc="This library implements the client side of the Gadu-Gadu protocol"
 arch=('i686' 'x86_64')
@@ -12,7 +12,7 @@ url="http://libgadu.net/"
 license=('LGPL2.1')
 depends=('openssl' 'zlib')
 source=("http://github.com/wojtekka/libgadu/releases/download/${pkgver}/${pkgname}-${pkgver}.tar.gz")
-md5sums=('63b0870821bdb7077a952183db31db50')
+md5sums=('feef622126e21601798c7e4497890ca3')
 
 build() {
   cd ${pkgname}-${pkgver}
diff --git a/extra/libtasn1/PKGBUILD b/extra/libtasn1/PKGBUILD
index fa33dbae2..483ad364a 100644
--- a/extra/libtasn1/PKGBUILD
+++ b/extra/libtasn1/PKGBUILD
@@ -1,9 +1,10 @@
-# $Id: PKGBUILD 200598 2013-11-29 16:35:20Z andyrtr $
+# $Id: PKGBUILD 213848 2014-05-30 13:20:34Z andyrtr $
+# Maintainer: AndyRTR <andyrtr@archlinux.org>
 # Maintainer: Jan de Groot <jgc@archlinux.org>
 # Contributor: judd <jvinet@zeroflux.org>
 
 pkgname=libtasn1
-pkgver=3.4
+pkgver=3.6
 pkgrel=1
 pkgdesc="The ASN.1 library used in GNUTLS"
 arch=('i686' 'x86_64')
@@ -12,7 +13,7 @@ url="http://www.gnu.org/software/libtasn1/"
 depends=('glibc' 'texinfo')
 install=libtasn1.install
 source=(http://ftp.gnu.org/gnu/libtasn1/${pkgname}-${pkgver}.tar.gz{,.sig})
-md5sums=('21ec021c534b0f30b2834ce233c70f15'
+md5sums=('6ed38e161e11013054f2a2bb4c4da449'
          'SKIP')
 
 build() {
diff --git a/extra/libx11/PKGBUILD b/extra/libx11/PKGBUILD
index 478b842e9..8e60be8f1 100644
--- a/extra/libx11/PKGBUILD
+++ b/extra/libx11/PKGBUILD
@@ -1,17 +1,26 @@
-# $Id: PKGBUILD 198269 2013-10-30 13:50:33Z allan $
+# $Id: PKGBUILD 213852 2014-05-30 14:31:43Z andyrtr $
+# Maintainer: Andreas Radke <andyrtr@archlinux.org>
 # Maintainer: Jan de Groot <jgc@archlinux.org>
 
 pkgname=libx11
 pkgver=1.6.2
-pkgrel=1
+pkgrel=2
 pkgdesc="X11 client-side library"
 arch=(i686 x86_64)
 url="http://xorg.freedesktop.org/"
 depends=('libxcb' 'xproto' 'kbproto')
 makedepends=('xorg-util-macros' 'xextproto' 'xtrans' 'inputproto')
 license=('custom')
-source=(${url}/releases/individual/lib/libX11-${pkgver}.tar.bz2)
-sha256sums=('2aa027e837231d2eeea90f3a4afe19948a6eb4c8b2bec0241eba7dbc8106bd16')
+source=(${url}/releases/individual/lib/libX11-${pkgver}.tar.bz2
+        fix_typo.diff)
+sha256sums=('2aa027e837231d2eeea90f3a4afe19948a6eb4c8b2bec0241eba7dbc8106bd16'
+            '384a10e57e0d6125ebb7e6eaca046e02f59e8101eaa7ba470e52b5bcc18bedf3')
+
+prepare() {
+  cd "${srcdir}/libX11-${pkgver}"
+  # upstream patch for https://bugs.archlinux.org/task/40537
+  patch -Np1 -i ${srcdir}/fix_typo.diff
+}
 
 build() {
   cd "${srcdir}/libX11-${pkgver}"
diff --git a/extra/libx11/fix_typo.diff b/extra/libx11/fix_typo.diff
new file mode 100644
index 000000000..a55a94074
--- /dev/null
+++ b/extra/libx11/fix_typo.diff
@@ -0,0 +1,27 @@
+From 5dcb40f28d59587597d2ff6e6ac64c71cfe6ff7b Mon Sep 17 00:00:00 2001
+From: James Cloos <cloos@jhcloos.com>
+Date: Tue, 17 Sep 2013 16:50:42 +0000
+Subject: nls/en_US.UTF-8/Compose.pre: Fix typo.
+
+Fix typo added in 215ce6a67863, s/actute/acute/.
+
+Fixes bug #69476.  Reported by Jean Krohn.
+
+Signed-off-by: James Cloos <cloos@jhcloos.com>
+---
+diff --git a/nls/en_US.UTF-8/Compose.pre b/nls/en_US.UTF-8/Compose.pre
+index a741332..7314d7f 100644
+--- a/nls/en_US.UTF-8/Compose.pre
++++ b/nls/en_US.UTF-8/Compose.pre
+@@ -743,7 +743,7 @@ XCOMM Part 3
+ <Multi_key> <i> <quotedbl> 		: "ï"   idiaeresis # LATIN SMALL LETTER I WITH DIAERESIS
+ <Multi_key> <diaeresis> <i> 		: "ï"   idiaeresis # LATIN SMALL LETTER I WITH DIAERESIS
+ <Multi_key> <i> <diaeresis> 		: "ï"   idiaeresis # LATIN SMALL LETTER I WITH DIAERESIS
+-<dead_actute> <j>	 		: "j́"    # LATIN SMALL LETTER J U006A with COMBINING ACUTE ACCENT U0301
++<dead_acute> <j>	 		: "j́"    # LATIN SMALL LETTER J U006A with COMBINING ACUTE ACCENT U0301
+ <Multi_key> <apostrophe> <j> 		: "j́"    # LATIN SMALL LETTER J U006A with COMBINING ACUTE ACCENT U0301
+ <Multi_key> <j> <apostrophe> 		: "j́"    # LATIN SMALL LETTER J U006A with COMBINING ACUTE ACCENT U0301
+ <Multi_key> <acute> <j> 		: "j́"    # LATIN SMALL LETTER J U006A with COMBINING ACUTE ACCENT U0301
+--
+cgit v0.9.0.2-2-gbebe
+
diff --git a/extra/nginx/PKGBUILD b/extra/nginx/PKGBUILD
index 1f0d5dd47..510958dbb 100644
--- a/extra/nginx/PKGBUILD
+++ b/extra/nginx/PKGBUILD
@@ -1,4 +1,4 @@
-# $Id: PKGBUILD 211728 2014-04-24 13:43:09Z bpiotrowski $
+# $Id: PKGBUILD 213863 2014-05-30 16:37:11Z bpiotrowski $
 # Maintainer: Bartłomiej Piotrowski <bpiotrowski@archlinux.org>
 # Maintainer: Sébastien Luttringer
 # Contributor: Sergej Pupykin <pupykin.s+arch@gmail.com>
@@ -7,7 +7,7 @@
 
 pkgname=nginx
 pkgver=1.6.0
-pkgrel=1
+pkgrel=4
 pkgdesc='Lightweight HTTP server and IMAP/POP3 proxy server'
 arch=('i686' 'x86_64')
 url='http://nginx.org'
@@ -28,7 +28,7 @@ source=($url/download/nginx-$pkgver.tar.gz
         service
         logrotate)
 md5sums=('8efa354f1c3c2ccf434a50d3fbe82340'
-         '5c0cd4fd992596938b2d4fd98b2bac41'
+         '5dd4d09914a4403b9df778ec1d66167c'
          '3441ce77cdd1aab6f0ab7e212698a8a7')
 
 build() {
diff --git a/extra/nginx/service b/extra/nginx/service
index a50eb4000..adfe6c0ab 100644
--- a/extra/nginx/service
+++ b/extra/nginx/service
@@ -1,15 +1,17 @@
 [Unit]
 Description=A high performance web server and a reverse proxy server
-After=syslog.target network.target
+After=network.target
 
 [Service]
 Type=forking
 PIDFile=/run/nginx.pid
-ExecStartPre=/usr/bin/nginx -t -q -g 'pid /run/nginx.pid; daemon on; master_process on;'
-ExecStart=/usr/bin/nginx -g 'pid /run/nginx.pid; daemon on; master_process on;'
-ExecReload=/usr/bin/nginx -g 'pid /run/nginx.pid; daemon on; master_process on;' -s reload
-ExecStop=/usr/bin/nginx -g 'pid /run/nginx.pid;' -s quit
 PrivateDevices=yes
+SyslogLevel=err
+
+ExecStart=/usr/bin/nginx -g 'pid /run/nginx.pid; error_log stderr;'
+ExecReload=/usr/bin/kill -HUP $MAINPID
+KillSignal=SIGQUIT
+KillMode=mixed
 
 [Install]
 WantedBy=multi-user.target
diff --git a/extra/swig/PKGBUILD b/extra/swig/PKGBUILD
index 65cca2d1d..0106e963a 100644
--- a/extra/swig/PKGBUILD
+++ b/extra/swig/PKGBUILD
@@ -1,19 +1,19 @@
-# $Id: PKGBUILD 208741 2014-03-26 05:24:50Z fyan $
+# $Id: PKGBUILD 213833 2014-05-30 04:23:37Z fyan $
 # Maintainer: Felix Yan <felixonmars@gmail.com>
 # Contributor: Stéphane Gaudreault <stephane@archlinux.org>
 # Contributor: Tom Newsom <Jeepster@gmx.co.uk>
 
 pkgname=swig
-pkgver=3.0.0
+pkgver=3.0.1
 pkgrel=1
 pkgdesc="Generate scripting interfaces to C/C++ code"
 arch=('i686' 'x86_64')
 url="http://www.swig.org/"
 license=('custom')
 depends=('pcre' 'gcc-libs')
-#checkdepends=('ruby' 'python' 'python2' 'java-environment' 'tcl' 'php' 'lua' 'ocaml' 'r' 'go')
+checkdepends=('ruby' 'python2' 'java-environment' 'tcl' 'php' 'lua' 'ocaml' 'r' 'go')
 source=(http://downloads.sourceforge.net/${pkgname}/${pkgname}-${pkgver}.tar.gz)
-sha1sums=('10a1cc5ba6abbc7282b8146ccc0d8eefe233bfab')
+sha1sums=('68a70cc80a75bc8e08a5d7a9ec22cb6d7b034c2c')
 
 build() {
   cd ${pkgname}-${pkgver}
@@ -21,13 +21,10 @@ build() {
   make
 }
 
-# Testcases fail a LOT...
-<<EOF
 check() {
   cd ${pkgname}-${pkgver}
-  make check
+  make check || warning "Tests failed"
 }
-EOF
 
 package() {
   cd ${pkgname}-${pkgver}
diff --git a/extra/x11vnc/PKGBUILD b/extra/x11vnc/PKGBUILD
index 292a45cdb..d856d6573 100644
--- a/extra/x11vnc/PKGBUILD
+++ b/extra/x11vnc/PKGBUILD
@@ -1,16 +1,17 @@
-# $Id: PKGBUILD 202637 2013-12-23 05:41:09Z bisson $
+# $Id: PKGBUILD 213872 2014-05-30 21:30:40Z bisson $
 # Maintainer: Gaetan Bisson <bisson@archlinux.org>
 # Contributor: damir <damir@archlinux.org>
 
 pkgname=x11vnc
 pkgver=0.9.13
-pkgrel=5
+pkgrel=6
 pkgdesc='VNC server for real X displays'
 url='http://www.karlrunge.com/x11vnc/'
 arch=('i686' 'x86_64')
 license=('GPL2')
-optdepends=('tk: for GUI support'
-            'net-tools: for -auth guess')
+optdepends=('tk: GUI support'
+            'net-tools: -auth guess'
+            'xf86-video-dummy: Xdummy script')
 depends=('openssl' 'libjpeg' 'libxtst' 'libxinerama' 'libxdamage' 'libxrandr' 'avahi')
 source=("http://downloads.sourceforge.net/project/libvncserver/${pkgname}/${pkgver}/${pkgname}-${pkgver}.tar.gz"
         'service')
@@ -26,6 +27,7 @@ build() {
 package() {
 	cd "${srcdir}/${pkgname}-${pkgver}"
 	make DESTDIR="${pkgdir}" install
+	install x11vnc/misc/{rx11vnc,Xdummy} "${pkgdir}"/usr/bin
 	install -Dm644 ../service "${pkgdir}/usr/lib/systemd/system/x11vnc.service"
 	rm -fr "${pkgdir}"/usr/include/rfb # provided by libvncserver
 }