Merge branch 'master' of ssh://parabolagnulinux.org:1863/home/parabola/abslibre-pre-mips64el

Conflicts:
	community-testing/tp_smapi/PKGBUILD
	community/fish/PKGBUILD
	community/supertux/PKGBUILD
	extra/gvfs/PKGBUILD
	multilib/wine/PKGBUILD
	testing/e2fsprogs/PKGBUILD
	testing/iptables/PKGBUILD
	testing/krb5/PKGBUILD
	testing/lm_sensors/PKGBUILD
	testing/lm_sensors/healthd
	testing/lm_sensors/healthd.rc

28 files changed, 227 insertions, 138 deletions

diff --git a/community/cegui/PKGBUILD b/community/cegui/PKGBUILD
index 22c6cb977..1e7a0e365 100644
--- a/community/cegui/PKGBUILD
+++ b/community/cegui/PKGBUILD
@@ -1,4 +1,4 @@
-# $Id: PKGBUILD 73986 2012-07-18 01:06:19Z ibiru $
+# $Id: PKGBUILD 74612 2012-07-31 19:55:33Z ebelanger $
 # Maintainer: Sven-Hendrik Haase <sh@lutzhaase.com>
 # Contributor: Juergen Hoetzel <juergen@archlinux.org> 
 # Contributor: William Rea <sillywilly@gmail.com>, 
@@ -6,7 +6,7 @@
 
 pkgname=cegui
 pkgver=0.7.6
-pkgrel=4
+pkgrel=5
 pkgdesc="A free library providing windowing and widgets for graphics APIs/engines"
 arch=('i686' 'x86_64' 'mips64el')
 url="http://crayzedsgui.sourceforge.net"
diff --git a/community/fbreader/PKGBUILD b/community/fbreader/PKGBUILD
index 66ab4a777..8e13c3831 100644
--- a/community/fbreader/PKGBUILD
+++ b/community/fbreader/PKGBUILD
@@ -1,9 +1,9 @@
-# $Id: PKGBUILD 73949 2012-07-17 11:17:34Z spupykin $
+# $Id: PKGBUILD 74589 2012-07-31 10:03:32Z spupykin $
 # Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com>
 # Contributor: William Rea <sillywilly@gmail.com>
 
 pkgname=fbreader
-pkgver=0.99.0
+pkgver=0.99.1
 pkgrel=1
 pkgdesc="An e-book reader for Linux"
 arch=('i686' 'x86_64' 'mips64el')
@@ -12,7 +12,7 @@ license=('GPL')
 depends=('fribidi' 'bzip2' 'curl' 'qt' 'liblinebreak' 'sqlite')
 makedepends=('ccache')
 source=(http://www.fbreader.org/files/desktop/fbreader-sources-$pkgver.tgz)
-md5sums=('2afbfa07dda09a979d5cf8797e2b648d')
+md5sums=('af424a825e091bb33b65c04882c0b93a')
 
 build() {
   export TARGET_ARCH=desktop
@@ -20,6 +20,7 @@ build() {
   export TARGET_STATUS=release
   cd $srcdir/fbreader-$pkgver
   sed -i 's|moc-qt4|moc|g' makefiles/arch/desktop.mk
+  sed -i 's|-lunibreak|-llinebreak|g' makefiles/config.mk zlibrary/text/Makefile
   make ZLSHARED=no
   make ZLSHARED=no DESTDIR=$pkgdir install
 }
diff --git a/community/fish/PKGBUILD b/community/fish/PKGBUILD
index 2fc566612..37d8fecc3 100644
--- a/community/fish/PKGBUILD
+++ b/community/fish/PKGBUILD
@@ -1,32 +1,36 @@
-# $Id: PKGBUILD 66524 2012-02-25 23:19:41Z lfleischer $
+# $Id: PKGBUILD 74604 2012-07-31 12:48:32Z bpiotrowski $
 # Maintainer: Kaiting Chen <kaitocracy@gmail.com>
+# Maintainer:  Bartłomiej Piotrowski <nospam@bpiotrowski.pl>
 # Contributor: Abhishek Dasgupta <abhidg@gmail.com>
 # Contributor: Eric Belanger <eric@archlinux.org>
 # Contributor: Jan Fader <jan.fader@web.de>
 
 pkgname=fish
-pkgver=1.23.1
-pkgrel=5
-pkgdesc="User friendly shell intended mostly for interactive use"
+pkgver=2.0b2
+pkgrel=1
+pkgdesc='Smart and user friendly shell intended mostly for interactive use'
 arch=('i686' 'x86_64' 'mips64el')
-url="http://fishshell.com/"
-license=("GPL" "LGPL" "BSD" "MIT")
-depends=('ncurses' 'bc')
+url='http://ridiculousfish.com/shell/'
+license=('GPL2')
+depends=('python')
+makedepends=('doxygen')
 install=fish.install
-source=(http://fishshell.com/files/$pkgver/$pkgname-$pkgver.tar.bz2)
-md5sums=('ead6b7c6cdb21f35a3d4aa1d5fa596f1')
+source=($pkgname-$pkgver.tar.gz::http://ridiculousfish.com/shell/files/fishfish.tar.gz)
+md5sums=('ebe5fe17f6925b9142aadc8ebae5fba1')
 
 build() {
-  cd "$srcdir/$pkgname-$pkgver"
-
-  ./configure --prefix=/usr --sysconfdir=/etc  \
-     --docdir=/usr/share/doc/fish --without-xsel
+  cd "$srcdir"/fishfish
+  autoconf
+  ./configure --prefix=/usr \
+              --sysconfdir=/etc  \
+              --without-xsel
   make
 }
 
 package() {
-  cd "$srcdir/$pkgname-$pkgver"
-
+  cd "$srcdir"/fishfish
   make DESTDIR="$pkgdir" install
-  install -D -m644 user_doc/html/license.html "$pkgdir/usr/share/licenses/$pkgname/license.html"
+
+  # compress man pages
+  find "$pkgdir"/usr/share/fish/man/ -type f | xargs gzip -9
 }
diff --git a/community/fish/fish.install b/community/fish/fish.install
index c3f89cd84..765006f95 100644
--- a/community/fish/fish.install
+++ b/community/fish/fish.install
@@ -1,15 +1,11 @@
 post_install() {
-  if [ ! "`grep /usr/bin/fish etc/shells`" ]; then
-    echo "updating /etc/shells... done."
-    sed -i "s|/bin/bash|/bin/bash\n/usr/bin/fish|" etc/shells
-  fi
+	grep -q '/usr/bin/zsh' etc/shells || echo '/usr/bin/zsh' >> etc/shells
 }
 
 post_upgrade() {
-  post_install $1
+  post_install
 }
 
 pre_remove() {
-  echo -ne "updating /etc/shells... \n"
   sed -i '/^\/usr\/bin\/fish/d' /etc/shells
 }
diff --git a/community/freerdp/PKGBUILD b/community/freerdp/PKGBUILD
index ea583a75a..e08282d2e 100644
--- a/community/freerdp/PKGBUILD
+++ b/community/freerdp/PKGBUILD
@@ -1,10 +1,10 @@
-# $Id: PKGBUILD 74308 2012-07-24 11:07:33Z spupykin $
+# $Id: PKGBUILD 74601 2012-07-31 12:43:27Z spupykin $
 # Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com>
 # Contributor: Stijn Segers <francesco dot borromini at gmail dot com>
 
 pkgname=freerdp
 pkgver=1.0.1
-pkgrel=6
+pkgrel=7
 pkgdesc="Free RDP client"
 arch=('i686' 'x86_64' 'mips64el')
 url="http://freerdp.sourceforge.net"
diff --git a/community/freewrl/PKGBUILD b/community/freewrl/PKGBUILD
index c6d81864e..d4e2be246 100644
--- a/community/freewrl/PKGBUILD
+++ b/community/freewrl/PKGBUILD
@@ -1,10 +1,10 @@
-# $Id: PKGBUILD 73160 2012-07-02 14:55:08Z spupykin $
+# $Id: PKGBUILD 74614 2012-07-31 19:55:47Z ebelanger $
 # Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com>
 # Contributor: Sergej Pupykin <pupykin.s+arch@gmail.com>
 
 pkgname=freewrl
 pkgver=1.22.13
-pkgrel=1
+pkgrel=2
 pkgdesc="VRML viewer"
 arch=('i686' 'x86_64' 'mips64el')
 url="http://freewrl.sourceforge.net/"
diff --git a/community/gambas3/PKGBUILD b/community/gambas3/PKGBUILD
index 5420497c6..ed3e9a710 100644
--- a/community/gambas3/PKGBUILD
+++ b/community/gambas3/PKGBUILD
@@ -1,4 +1,4 @@
-# $Id: PKGBUILD 74141 2012-07-22 09:16:14Z lcarlier $
+# $Id: PKGBUILD 74616 2012-07-31 19:56:01Z ebelanger $
 # Maintainer: Laurent Carlier <lordheavym@gmail.com>
 # Contributor : sebikul <sebikul@gmail.com>
 
@@ -7,7 +7,7 @@ pkgname=('gambas3-runtime' 'gambas3-devel' 'gambas3-ide' 'gambas3-script' 'gamba
          'gambas3-gb-dbus' 'gambas3-gb-compress' 'gambas3-gb-crypt' 'gambas3-gb-db' 'gambas3-gb-db-form' 'gambas3-gb-db-mysql'
          'gambas3-gb-db-odbc' 'gambas3-gb-db-postgresql' 'gambas3-gb-db-sqlite2' 'gambas3-gb-db-sqlite3'
          'gambas3-gb-desktop' 'gambas3-gb-eval-highlight' 'gambas3-gb-form' 'gambas3-gb-form-dialog' 'gambas3-gb-form-mdi'
-	 'gambas3-gb-form-stock' 'gambas3-gb-gsl' 'gambas3-gb-gtk' 'gambas3-gb-gtk-opengl' 'gambas3-gb-gui' 'gambas3-gb-image'
+	 'gambas3-gb-form-stock' 'gambas3-gb-gsl' 'gambas3-gb-gtk' 'gambas3-gb-gtk-opengl' 'gambas3-gb-image'
          'gambas3-gb-image-effect' 'gambas3-gb-image-imlib' 'gambas3-gb-image-io' 'gambas3-gb-jit' 'gambas3-gb-media'
          'gambas3-gb-ncurses' 'gambas3-gb-net' 'gambas3-gb-net-curl' 'gambas3-gb-net-smtp' 'gambas3-gb-opengl' 'gambas3-gb-opengl-glu'
          'gambas3-gb-opengl-glsl' 'gambas3-gb-option' 'gambas3-gb-pcre' 'gambas3-gb-pdf' 'gambas3-gb-qt4' 'gambas3-gb-qt4-ext'
@@ -15,7 +15,7 @@ pkgname=('gambas3-runtime' 'gambas3-devel' 'gambas3-ide' 'gambas3-script' 'gamba
          'gambas3-gb-signal' 'gambas3-gb-v4l' 'gambas3-gb-vb' 'gambas3-gb-xml' 'gambas3-gb-xml-html' 'gambas3-gb-xml-rpc'
          'gambas3-gb-xml-xslt' 'gambas3-gb-web') 
 pkgver=3.2.1
-pkgrel=1
+pkgrel=3
 pkgdesc="A free development environment based on a Basic interpreter."
 arch=('i686' 'x86_64' 'mips64el')
 url="http://gambas.sourceforge.net/"
@@ -46,6 +46,8 @@ build() {
 package_gambas3-runtime() {
   depends=('libffi' 'xdg-utils')
   pkgdesc="Runtime environment"
+  conflicts=('gambas3-gb-gui')
+  replaces=('gambas3-gb-gui')
   install=gambas3-runtime.install
 
   cd ${srcdir}/${pkgbase}-${pkgver}/main/gbc
@@ -74,9 +76,23 @@ package_gambas3-runtime() {
   install -d -m755 ${pkgdir}/usr/share/gambas3/icons
   install -D -m644 mime/application-x-gambas3.png \
     ${pkgdir}/usr/share/gambas3/icons/application-x-gambas3.png
- 
-  cd gbc
+
+  ## workaround for splitting
+  cd ${srcdir}/${pkgbase}-${pkgver}/gb.qt4
+  make XDG_UTILS='' DESTDIR="${pkgdir}" install
+  ##
+
+  cd ${srcdir}/${pkgbase}-${pkgver}/main/lib/gui
+  make XDG_UTILS='' DESTDIR="${pkgdir}" install
+  cd ${srcdir}/${pkgbase}-${pkgver}/main/lib/gui.opengl
+  make XDG_UTILS='' DESTDIR="${pkgdir}" install
+
+  ## cleanup the workaround
+  cd ${srcdir}/${pkgbase}-${pkgver}/gb.qt4
+  make XDG_UTILS='' DESTDIR="${pkgdir}" uninstall
+  cd ${srcdir}/${pkgbase}-${pkgver}/main/gbc
   make DESTDIR="${pkgdir}" uninstall
+  ##  
 }
 
 package_gambas3-devel() {
@@ -131,7 +147,7 @@ package_gambas3-examples() {
   depends=('gambas3-gb-cairo' 'gambas3-gb-chart' 'gambas3-gb-dbus' 'gambas3-gb-compress' 'gambas3-gb-crypt' 'gambas3-gb-db'
            'gambas3-gb-db-form' 'gambas3-gb-db-mysql' 'gambas3-gb-db-odbc' 'gambas3-gb-db-postgresql' 'gambas3-gb-db-sqlite2'
            'gambas3-gb-db-sqlite3' 'gambas3-gb-desktop' 'gambas3-gb-eval-highlight' 'gambas3-gb-form' 'gambas3-gb-form-dialog'
-           'gambas3-gb-form-mdi' 'gambas3-gb-gtk' 'gambas3-gb-gui' 'gambas3-gb-image' 'gambas3-gb-image-effect' 'gambas3-gb-image-imlib'
+           'gambas3-gb-form-mdi' 'gambas3-gb-gtk' 'gambas3-gb-image' 'gambas3-gb-image-effect' 'gambas3-gb-image-imlib'
            'gambas3-gb-image-io' 'gambas3-gb-net' 'gambas3-gb-net-curl' 'gambas3-gb-net-smtp' 'gambas3-gb-opengl' 'gambas3-gb-opengl-glsl'
            'gambas3-gb-option' 'gambas3-gb-pcre' 'gambas3-gb-pdf' 'gambas3-gb-qt4' 'gambas3-gb-qt4-ext' 'gambas3-gb-qt4-opengl'
            'gambas3-gb-qt4-webkit' 'gambas3-gb-report' 'gambas3-gb-sdl' 'gambas3-gb-sdl-sound' 'gambas3-gb-settings' 'gambas3-gb-signal'
@@ -424,7 +440,7 @@ package_gambas3-gb-eval-highlight() {
 }
 
 package_gambas3-gb-form() {
-  depends=('gambas3-gb-gui')
+  depends=('gambas3-runtime')
   pkgdesc="Form component"
 
   ## Workaround for splitting
@@ -593,29 +609,6 @@ package_gambas3-gb-gsl() {
   ##
 }
 
-package_gambas3-gb-gui() {
-  depends=('gambas3-gb-qt4' 'gambas3-gb-gtk')
-  pkgdesc="Automatic gui toolkit chooser"
-
-  ## workaround for splitting
-  cd ${srcdir}/${pkgbase}-${pkgver}/main
-  make XDG_UTILS='' DESTDIR="${pkgdir}" install
-  cd ${srcdir}/${pkgbase}-${pkgver}/gb.qt4
-  make XDG_UTILS='' DESTDIR="${pkgdir}" install
-  ##
-
-  cd ${srcdir}/${pkgbase}-${pkgver}/main/lib/gui
-  make XDG_UTILS='' DESTDIR="${pkgdir}" install
-
-  ## cleanup the workaround
-  cd ${srcdir}/${pkgbase}-${pkgver}/gb.qt4
-  make XDG_UTILS='' DESTDIR="${pkgdir}" uninstall
-  rm -r ${pkgdir}/usr/bin
-  rm -r ${pkgdir}/usr/lib/gambas3/{gb.[c-e]*,gb.[i-z]*}
-  rm -r ${pkgdir}/usr/share/gambas3/info/{gb.[c-e]*,gb.[i-z]*}
-  ##
-}
-
 package_gambas3-gb-image() {
   depends=('gambas3-runtime')
   pkgdesc="Image component"
diff --git a/community/gource/PKGBUILD b/community/gource/PKGBUILD
index e0d603088..0989f108c 100644
--- a/community/gource/PKGBUILD
+++ b/community/gource/PKGBUILD
@@ -1,10 +1,10 @@
-# $Id: PKGBUILD 73995 2012-07-18 01:07:06Z ibiru $
+# $Id: PKGBUILD 74617 2012-07-31 19:56:05Z ebelanger $
 # Maintainer: Sven-Hendrik Haase <sh@lutzhaase.com>
 # Contributor: Jose Valecillos <valecillosjg (at) gmail (dot) com>
 # Contributor: Olivier Ramonat <olivier at ramonat dot fr>
 pkgname=gource
 pkgver=0.38
-pkgrel=2
+pkgrel=3
 pkgdesc="software version control visualization"
 license=(GPL3)
 arch=(i686 x86_64 'mips64el')
diff --git a/community/ifuse/PKGBUILD b/community/ifuse/PKGBUILD
index 6708dd7a7..04ec13ca0 100644
--- a/community/ifuse/PKGBUILD
+++ b/community/ifuse/PKGBUILD
@@ -1,10 +1,10 @@
-# $Id: PKGBUILD 70102 2012-04-29 11:48:29Z andrea $
+# $Id: PKGBUILD 74618 2012-07-31 19:56:08Z ebelanger $
 # Maintainer: Thomas Dziedzic < gostrc at gmail >
 # Contributor: Gabriel Martinez < reitaka at gmail dot com >
 
 pkgname=ifuse
 pkgver=1.1.2
-pkgrel=1
+pkgrel=2
 pkgdesc='A fuse filesystem to access the contents of an iPhone or iPod Touch'
 url='http://libimobiledevice.org/'
 arch=('i686' 'x86_64' 'mips64el')
diff --git a/community/liblinebreak/PKGBUILD b/community/liblinebreak/PKGBUILD
index 0a3d47a39..a32dd8179 100644
--- a/community/liblinebreak/PKGBUILD
+++ b/community/liblinebreak/PKGBUILD
@@ -1,10 +1,10 @@
-# $Id: PKGBUILD 66198 2012-02-23 03:08:54Z spupykin $
+# $Id: PKGBUILD 74591 2012-07-31 10:04:29Z spupykin $
 # Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com>
 # Contributor: Orivej Desh <smpuj@bk.ru>
 
 pkgname=liblinebreak
-pkgver=2.0
-pkgrel=2
+pkgver=2.1
+pkgrel=1
 pkgdesc="An implementation of the line breaking algorithm as described in Unicode 5.2.0 Standard Annex 14, Revision 24"
 arch=("i686" "x86_64" 'mips64el')
 url="http://vimgadgets.sourceforge.net/liblinebreak/"
@@ -13,7 +13,7 @@ depends=("glibc")
 makedepends=()
 options=("!libtool")
 source=("http://downloads.sourceforge.net/vimgadgets/liblinebreak-$pkgver.tar.gz")
-md5sums=('c4ac2052b9e1883822662ecee483c542')
+md5sums=('9fe73b4b230434765be2305e50f8fe45')
 
 build() {
   cd "$srcdir/liblinebreak-$pkgver"
diff --git a/community/libmemcached/PKGBUILD b/community/libmemcached/PKGBUILD
index f1638e2a7..a73b95e44 100644
--- a/community/libmemcached/PKGBUILD
+++ b/community/libmemcached/PKGBUILD
@@ -1,8 +1,8 @@
-# $Id: PKGBUILD 73390 2012-07-07 05:46:41Z foutrelis $
+# $Id: PKGBUILD 74634 2012-07-31 20:58:13Z foutrelis $
 # Maintainer: Evangelos Foutras <evangelos@foutrelis.com>
 
 pkgname=libmemcached
-pkgver=1.0.9
+pkgver=1.0.10
 pkgrel=1
 pkgdesc="C and C++ client library to the memcached server"
 arch=('i686' 'x86_64' 'mips64el')
@@ -12,7 +12,7 @@ depends=('glibc' 'libsasl' 'libevent')
 makedepends=('perl')
 options=('!libtool')
 source=(http://launchpad.net/$pkgname/1.0/$pkgver/+download/$pkgname-$pkgver.tar.gz)
-sha256sums=('795c51ef53ffc7d877f79c549db1f46ba71d190c7f03a3c2f00455bb948bda34')
+sha256sums=('0bbb5e310b3d175dfbde99a463ba4474aa22b4ad88ffea2afe76c868d6e1290b')
 
 build() {
   cd "$srcdir/$pkgname-$pkgver"
diff --git a/community/megaglest/PKGBUILD b/community/megaglest/PKGBUILD
index 27ae318b8..1c1804fe7 100644
--- a/community/megaglest/PKGBUILD
+++ b/community/megaglest/PKGBUILD
@@ -1,29 +1,33 @@
-# $Id: PKGBUILD 64173 2012-02-09 17:40:27Z svenstaro $
+# $Id: PKGBUILD 74620 2012-07-31 19:56:16Z ebelanger $
 # Maintainer: Sven-Hendrik Haase <sh@lutzhaase.com>
 # Contributor: Larry Hajali <larryhaja [at] gmail [dot] com>
- 
+
 pkgname=megaglest
 pkgver=3.6.0.3
-pkgrel=2
+pkgrel=3
 pkgdesc="Fork of Glest, a 3D real-time strategy game in a fantastic world."
 arch=('i686' 'x86_64' 'mips64el')
 url="http://sourceforge.net/projects/megaglest/"
 license=('GPL3')
 depends=('curl' 'megaglest-data' 'xerces-c' 'sdl' 'libvorbis' 'openal' 'libgl' 'lua' 'icu' 'ftgl' 'glew'
-         'libircclient' 'miniupnpc' 'wxgtk')
+'libircclient' 'miniupnpc' 'wxgtk')
 makedepends=('ftjam' 'cmake' 'mesa')
-source=("http://downloads.sourceforge.net/${pkgname}/${pkgname}-source-${pkgver}.tar.xz")
-md5sums=('5a4a2429435031d9f9cc5d9535a9de9d')
+source=("http://downloads.sourceforge.net/${pkgname}/${pkgname}-source-${pkgver}.tar.xz"
+        lol.patch)
+md5sums=('5a4a2429435031d9f9cc5d9535a9de9d'
+         '68fd326b73ed1c75981004fbdef6b73a')
 
 build() {
   cd "${srcdir}"/"${pkgname}"-"${pkgver}"/
 
+  patch -Np1 < $srcdir/lol.patch
+
   [[ -d build ]] && rm -r build
   mkdir build && cd build
   cmake .. \
-   -DWANT_SVN_STAMP=OFF \
- 	 -DCMAKE_INSTALL_PREFIX=/usr \
-   -DCMAKE_BUILD_TYPE=Release # set =Debug for debugging version
+    -DWANT_SVN_STAMP=OFF \
+    -DCMAKE_INSTALL_PREFIX=/usr \
+    -DCMAKE_BUILD_TYPE=Release # set =Debug for debugging version
   make
 }
 
diff --git a/community/megaglest/lol.patch b/community/megaglest/lol.patch
new file mode 100644
index 000000000..56f94c852
--- /dev/null
+++ b/community/megaglest/lol.patch
@@ -0,0 +1,43 @@
+diff --git a/source/shared_lib/include/graphics/math_util.h b/source/shared_lib/include/graphics/math_util.h
+index 8fcfb27..3cb7a41 100644
+--- a/source/shared_lib/include/graphics/math_util.h
++++ b/source/shared_lib/include/graphics/math_util.h
+@@ -184,10 +184,10 @@ public:
+ 
+ 	Rect2<T> computeBoundingRect() const{
+ 		return Rect2i(
+-			min(p[0].x, p[1].x), 
+-			min(p[0].y, p[2].y), 
+-			max(p[2].x, p[3].x), 
+-			max(p[1].y, p[3].y));
++			std::min(p[0].x, p[1].x),
++			std::min(p[0].y, p[2].y),
++			std::max(p[2].x, p[3].x),
++			std::max(p[1].y, p[3].y));
+ 	}
+ 
+ 	bool isInside(const Vec2<T> &pt) const{
+diff --git a/source/shared_lib/sources/platform/posix/ircclient.cpp b/source/shared_lib/sources/platform/posix/ircclient.cpp
+index b09c972..ddebd03 100644
+--- a/source/shared_lib/sources/platform/posix/ircclient.cpp
++++ b/source/shared_lib/sources/platform/posix/ircclient.cpp
+@@ -13,6 +13,7 @@
+ #include "ircclient.h"
+ #include "util.h"
+ #include "platform_common.h"
++#include "libirc_rfcnumeric.h"
+ #include "libircclient.h"
+ 
+ #include <stdio.h>
+diff --git a/source/shared_lib/sources/util/util.cpp b/source/shared_lib/sources/util/util.cpp
+index 05478fc..c27aa62 100644
+--- a/source/shared_lib/sources/util/util.cpp
++++ b/source/shared_lib/sources/util/util.cpp
+@@ -19,6 +19,7 @@
+ #include <stdarg.h>
+ #include <time.h>
+ #include <fcntl.h> // for open()
++#include <unistd.h>
+ 
+ #ifdef WIN32
+   #include <io.h> // for open()
diff --git a/community/openimageio/PKGBUILD b/community/openimageio/PKGBUILD
index 0249f83e7..d19e13a0d 100644
--- a/community/openimageio/PKGBUILD
+++ b/community/openimageio/PKGBUILD
@@ -1,9 +1,9 @@
-# $Id: PKGBUILD 74002 2012-07-18 01:07:47Z ibiru $
+# $Id: PKGBUILD 74621 2012-07-31 19:56:19Z ebelanger $
 # Contributor: SpepS <dreamspepser at yahoo dot it>
 # Maintainer: Sven-Hendrik Haase <sh@lutzhaase.com>
 
 pkgname=openimageio
-pkgver=1.0.6
+pkgver=1.0.8
 pkgrel=1
 pkgdesc="A library for reading and writing images, including classes, utilities, and applications."
 arch=(i686 x86_64)
@@ -14,7 +14,7 @@ makedepends=('cmake' 'qt' 'python2' 'boost')
 optdepends=('qt: iv image viewer'
             'python2: bindings support')
 source=(https://github.com/OpenImageIO/oiio/tarball/Release-$pkgver)
-md5sums=('fa6e3f4be98d8e1868b389410b56563a')
+md5sums=('7d8ee962f29cea749d02ab992e2874df')
 
 build() {
   cd "$srcdir"/$_pkgname*/src
diff --git a/community/openssh-askpass/PKGBUILD b/community/openssh-askpass/PKGBUILD
index 5c0e75678..22127b289 100644
--- a/community/openssh-askpass/PKGBUILD
+++ b/community/openssh-askpass/PKGBUILD
@@ -3,7 +3,7 @@
 # Contributor: Massimiliano Torromeo <Massimiliano.Torromeo AT gmail DOT com>
 
 pkgname=openssh-askpass
-pkgver=1.3.3
+pkgver=1.3.4
 pkgrel=1
 pkgdesc='A plasma-like passphrase dialog for ssh'
 arch=('i686' 'x86_64' 'mips64el')
@@ -29,5 +29,5 @@ package() {
   install -Dm755 ../$pkgname.sh "$pkgdir/etc/profile.d/$pkgname.sh"
 }
 
-md5sums=('717375e71d95469de334cbf7fade8699'
+md5sums=('2fb1303879c663ec0df7979b3ee8da2c'
          '961738244318f3723ba99cdcaac91a21')
diff --git a/community/performous/PKGBUILD b/community/performous/PKGBUILD
index ae0b6b929..08aad6fad 100644
--- a/community/performous/PKGBUILD
+++ b/community/performous/PKGBUILD
@@ -1,10 +1,10 @@
-# $Id: PKGBUILD 74003 2012-07-18 01:07:58Z ibiru $
+# $Id: PKGBUILD 74622 2012-07-31 19:56:30Z ebelanger $
 # Maintainer : Laurent Carlier <lordheavym@gmail.com>
 # Contributor: Christoph Zeiler <archNOSPAM_at_moonblade.dot.org>
 
 pkgname=performous
 pkgver=0.6.1
-pkgrel=15
+pkgrel=16
 pkgdesc='A free game like "Singstar", "Rockband" or "Stepmania"'
 arch=('i686' 'x86_64' 'mips64el')
 url="http://performous.org/"
diff --git a/community/pigz/PKGBUILD b/community/pigz/PKGBUILD
index 404b821fb..da52e82c9 100755
--- a/community/pigz/PKGBUILD
+++ b/community/pigz/PKGBUILD
@@ -1,10 +1,10 @@
-# $Id: PKGBUILD 68038 2012-03-17 08:29:09Z bpiotrowski $
+# $Id: PKGBUILD 74606 2012-07-31 12:59:28Z bpiotrowski $
 # Maintainer:  Bartłomiej Piotrowski
 # Contributor: Laszlo Papp <djszapi2@gmail.com>
 # Contributor: Stefan Husmann <stefan-husmann@t-online.de>
 
 pkgname=pigz
-pkgver=2.2.4
+pkgver=2.2.5
 pkgrel=1
 pkgdesc="Parallel implementation of the gzip file compressor"
 arch=('i686' 'x86_64' 'mips64el')
@@ -12,7 +12,7 @@ url="http://www.zlib.net/pigz/"
 license=('custom')
 depends=('zlib')
 source=(http://www.zlib.net/$pkgname/$pkgname-$pkgver.tar.gz)
-md5sums=('9df2a3c742524446fa4e797c17e8fd85')
+md5sums=('188f769ccedc403893d03049ad31e969')
 
 build() {
   cd "${srcdir}/$pkgname-$pkgver"
diff --git a/community/pingus/PKGBUILD b/community/pingus/PKGBUILD
index 3d48a42f7..f54af971e 100644
--- a/community/pingus/PKGBUILD
+++ b/community/pingus/PKGBUILD
@@ -1,9 +1,9 @@
-# $Id: PKGBUILD 74004 2012-07-18 01:08:07Z ibiru $
+# $Id: PKGBUILD 74636 2012-08-01 00:58:24Z ebelanger $
 # Maintainer: Eric Belanger <eric@archlinux.org>
 
 pkgname=pingus
 pkgver=0.7.6
-pkgrel=4
+pkgrel=5
 pkgdesc="A Lemmings clone, i.e. a level-based puzzle game."
 arch=('i686' 'x86_64' 'mips64el')
 url="http://pingus.seul.org"
diff --git a/community/projectm/PKGBUILD b/community/projectm/PKGBUILD
index 6fbf605a3..c0f9d5b41 100644
--- a/community/projectm/PKGBUILD
+++ b/community/projectm/PKGBUILD
@@ -1,10 +1,10 @@
-# $Id: PKGBUILD 66284 2012-02-23 10:51:41Z giovanni $
+# $Id: PKGBUILD 74623 2012-07-31 19:56:37Z ebelanger $
 # Maintainer: Lukas Fleischer <archlinux at cryptocrack dot de>
 # Contributor: Alexander Baldeck <alexander@archlinux.org>
 
 pkgname=projectm
 pkgver=2.0.1
-pkgrel=5
+pkgrel=6
 pkgdesc='A music visualizer which uses 3D accelerated iterative image based rendering.'
 arch=('i686' 'x86_64' 'mips64el')
 url='http://projectm.sourceforge.net/'
diff --git a/community/rss-glx/PKGBUILD b/community/rss-glx/PKGBUILD
index f1e4c060c..57248ced1 100644
--- a/community/rss-glx/PKGBUILD
+++ b/community/rss-glx/PKGBUILD
@@ -1,11 +1,11 @@
-# $Id: PKGBUILD 55897 2011-09-24 16:49:31Z stephane $
+# $Id: PKGBUILD 74624 2012-07-31 19:56:44Z ebelanger $
 # Maintainer : Ionut Biru <ibiru@archlinux.org>
 # Contributor: Corrado 'bardo' Primier <corrado.primier@mail.polimi.it>
 # Contributor: Tate "Tatey" Johnson <tatey86@tpg.com.au>
 
 pkgname=rss-glx
 pkgver=0.9.1
-pkgrel=8
+pkgrel=9
 pkgdesc="The Really Slick Screensavers port to GLX"
 arch=('i686' 'x86_64' 'mips64el')
 url="http://rss-glx.sourceforge.net/"
diff --git a/community/sdcc/PKGBUILD b/community/sdcc/PKGBUILD
index d1358029e..5eac9b6df 100644
--- a/community/sdcc/PKGBUILD
+++ b/community/sdcc/PKGBUILD
@@ -1,9 +1,9 @@
-# $Id: PKGBUILD 61264 2011-12-27 15:33:34Z spupykin $
+# $Id: PKGBUILD 74603 2012-07-31 12:45:11Z spupykin $
 # Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com>
 # Maintainer: Jose Negron <josenj.arch@mailnull.net>
 
 pkgname=sdcc
-pkgver=3.1.0
+pkgver=3.2.0
 pkgrel=1
 pkgdesc="Retargettable ANSI C compiler (Intel 8051, Maxim 80DS390, Zilog Z80 and the Motorola 68HC08)"
 arch=('i686' 'x86_64' 'mips64el')
@@ -14,20 +14,19 @@ optdepends=('python')
 url="http://sdcc.sourceforge.net/"
 options=(!strip)
 source=(http://downloads.sourceforge.net/sourceforge/sdcc/$pkgname-src-$pkgver.tar.bz2)
-md5sums=('92202e970071a8b506fea62a913bd2d2')
+md5sums=('0808a9b4109d2ba6046ddd7b679a0012')
 
 build() {
   cd $srcdir/$pkgname
-  LDFLAGS="-lm" ./configure --prefix=$pkgdir/usr
-
-  # gcc -O2 bug workaround
-  [ $CARCH == "i686" ] && (
-	cd src &&
-	make SDCCy.h &&
-	gcc -g -O0  -I. -I.. -I./../support/util -c SDCCicode.c -o SDCCicode.o
-  )
-
+  ./configure \
+	--prefix=/usr \
+	--includedir=/usr/include/sdcc \
+	--libdir=/usr/lib/sdcc
   make
-  make install
-  strip $pkgdir/usr/bin/* || true
+  make install DESTDIR=$pkgdir
+
+  if [ -d $pkgdir/usr/lib/lib ]; then
+    mv $pkgdir/usr/lib/lib/* $pkgdir/usr/lib/sdcc/
+    rm -rf $pkgdir/usr/lib/lib
+  fi
 }
diff --git a/community/sfml/PKGBUILD b/community/sfml/PKGBUILD
index 368711e89..356101672 100644
--- a/community/sfml/PKGBUILD
+++ b/community/sfml/PKGBUILD
@@ -1,10 +1,10 @@
-# $Id: PKGBUILD 69315 2012-04-13 15:58:59Z svenstaro $
+# $Id: PKGBUILD 74625 2012-07-31 19:56:49Z ebelanger $
 # Maintainer: Sven-Hendrik Haase <sh@lutzhaase.com>
 # Contributor: Ondrej Martinak <omartinak@gmail.com>
 
 pkgname=sfml
 pkgver=2.0rc1
-pkgrel=1
+pkgrel=2
 pkgdesc='A simple, fast, cross-platform, and object-oriented multimedia API'
 arch=('i686' 'x86_64' 'mips64el')
 url='http://www.sfml-dev.org/'
diff --git a/community/spring/PKGBUILD b/community/spring/PKGBUILD
index 1b1c989b2..098679bbc 100644
--- a/community/spring/PKGBUILD
+++ b/community/spring/PKGBUILD
@@ -1,4 +1,4 @@
-# $Id: PKGBUILD 74011 2012-07-18 01:09:05Z ibiru $
+# $Id: PKGBUILD 74626 2012-07-31 19:56:56Z ebelanger $
 # Maintainer: Sven-Hendrik Haase <sh@lutzhaase.com>
 # Contributor: Arkham <arkham at archlinux dot us>
 # Contributor: Christoph Zeiler <archNOSPAM_at_moonblade.dot.org>
@@ -6,16 +6,17 @@
 pkgname=spring
 pkgver=0.89.0
 _pkgver=89.0
-pkgrel=1
+pkgrel=2
 pkgdesc='A free 3D real-time-strategy (RTS) game engine'
 arch=('i686' 'x86_64' 'mips64el')
 url="http://springrts.com/"
 license=('GPL')
 depends=('openal' 'glew' 'boost-libs' 'freetype2' 'devil' 'libvorbis' 'sdl'
-         'libxcursor')
+         'libxcursor' 'curl' 'shared-mime-info' 'desktop-file-utils')
 makedepends=('boost' 'cmake' 'zip' 'xz' 'p7zip' 'python2' 'java-environment')
 optdepends=('python2: python-based bots'
             'java-runtime: java-based bots')
+install=spring.install
 source=(http://downloads.sourceforge.net/sourceforge/springrts/${pkgname}_${_pkgver}_src.tar.lzma
         boost-1.50.patch)
 md5sums=('36fc266e925bc3790a68bf1bc7ebb315'
@@ -27,21 +28,21 @@ build() {
   cd spring_${_pkgver}
 
   sed "s/TIME_UTC/TIME_UTC_/g" -i AI/Skirmish/E323AI/CScopedTimer.h
-  patch -Np1 < $srcdir/boost-1.50.patch
+  patch -Np1 < "$srcdir/boost-1.50.patch"
  
   cmake	. \
     -DCMAKE_INSTALL_PREFIX=/usr \
-	-DDATADIR=share/spring
+	-DDATADIR=share/spring -DCMAKE_SKIP_RPATH:BOOL=YES
   make
 }
 
 package() {
   cd spring_${_pkgver}
 
-  make DESTDIR=$pkgdir install
+  make DESTDIR="$pkgdir" install
 
-  install -d $pkgdir/etc/spring
-  echo '$HOME/.spring' > $pkgdir/etc/spring/datadir
+  install -d "$pkgdir/etc/spring"
+  echo '$HOME/.spring' > "$pkgdir/etc/spring/datadir"
 }
 
 # vim sw=2:ts=2 et:
diff --git a/community/spring/spring.install b/community/spring/spring.install
new file mode 100644
index 000000000..41f09f887
--- /dev/null
+++ b/community/spring/spring.install
@@ -0,0 +1,12 @@
+post_install() {
+  update-desktop-database -q
+  update-mime-database usr/share/mime &> /dev/null
+}
+
+post_upgrade() {
+  post_install $1
+}
+
+post_remove() {
+  post_install $1
+}
diff --git a/community/supertux/PKGBUILD b/community/supertux/PKGBUILD
index 152a2d7da..b8d394894 100644
--- a/community/supertux/PKGBUILD
+++ b/community/supertux/PKGBUILD
@@ -1,28 +1,27 @@
+# $Id: PKGBUILD 74627 2012-07-31 19:57:01Z ebelanger $
 # Contributor: Jaroslaw Swierczynski <swiergot@aur.archlinux.org>
-# Contributor: Eric Belanger <belanger@astro.umontreal.ca>
+# Contributor: Eric Bélanger <eric@archlinux.org>
 # Contributor: vande198
 # Maintainer: Daniel J Griffiths <ghost1227@archlinux.us>
 
 pkgname=supertux
 pkgver=0.3.3
-pkgrel=5.1
+pkgrel=6
 pkgdesc="A classic 2D jump'n run sidescroller game in a style similar to the original SuperMario games"
 arch=('i686' 'x86_64' 'mips64el')
 url="http://super-tux.sourceforge.net/"
 license=('GPL')
 depends=('sdl_image' 'curl' 'physfs' 'openal' 'libvorbis' 'libgl' 'glew')
 makedepends=('cmake' 'boost')
-source=("http://download.berlios.de/supertux/${pkgname}-${pkgver}.tar.bz2"
-	'squirrel.patch')
+source=(http://download.berlios.de/supertux/${pkgname}-${pkgver}.tar.bz2 
+        supertux2-0.3.3-squirrel-gcc47.patch)
 md5sums=('f3f803e629ee51a9de0b366a036e393d'
-	 'eb06315514be4f200428f14b927beb66')
+         'eb06315514be4f200428f14b927beb66')
 
 build() {
-  cd ${srcdir}/${pkgname}-${pkgver}
-
-  # The following patch was taken from https://supertux.lethargik.org/bugs/view.php?id=933&nbn=3
-  patch -Np1 -i "$srcdir/squirrel.patch"
+  cd "${srcdir}/${pkgname}-${pkgver}"
 
+  patch -p1 -i "${srcdir}/supertux2-0.3.3-squirrel-gcc47.patch"
   sed -i '1i#include <cstddef>' src/supertux/screen_manager.hpp
   sed -i '/types\.h/d' src/addon/addon_manager.cpp
   cmake -D CMAKE_INSTALL_PREFIX=/usr -D INSTALL_SUBDIR_BIN=bin .
@@ -30,7 +29,7 @@ build() {
 }
 
 package() {
-  cd ${srcdir}/${pkgname}-${pkgver}
+  cd "${srcdir}/${pkgname}-${pkgver}"
 
-  make DESTDIR=${pkgdir} install
+  make DESTDIR="${pkgdir}" install
 }
diff --git a/community/supertux/supertux2-0.3.3-squirrel-gcc47.patch b/community/supertux/supertux2-0.3.3-squirrel-gcc47.patch
new file mode 100644
index 000000000..16781b610
--- /dev/null
+++ b/community/supertux/supertux2-0.3.3-squirrel-gcc47.patch
@@ -0,0 +1,36 @@
+diff -Naur supertux2-0.3.3.orig/external/squirrel/squirrel/sqmem.h supertux2-0.3.3/external/squirrel/squirrel/sqmem.h
+--- supertux2-0.3.3.orig/external/squirrel/squirrel/sqmem.h	1970-01-01 01:00:00.000000000 +0100
++++ supertux2-0.3.3/external/squirrel/squirrel/sqmem.h	2012-05-01 11:59:37.000000000 +0200
+@@ -0,0 +1,8 @@
++/*	see copyright notice in squirrel.h */
++#ifndef _SQMEM_H_
++#define _SQMEM_H_
++
++void *sq_vm_malloc(SQUnsignedInteger size);
++void *sq_vm_realloc(void *p,SQUnsignedInteger oldsize,SQUnsignedInteger size);
++void sq_vm_free(void *p,SQUnsignedInteger size);
++#endif //_SQMEM_H_
+diff -Naur supertux2-0.3.3.orig/external/squirrel/squirrel/sqstate.h supertux2-0.3.3/external/squirrel/squirrel/sqstate.h
+--- supertux2-0.3.3.orig/external/squirrel/squirrel/sqstate.h	2010-03-01 13:40:58.000000000 +0100
++++ supertux2-0.3.3/external/squirrel/squirrel/sqstate.h	2012-05-01 11:59:37.000000000 +0200
+@@ -136,8 +136,4 @@
+ extern SQObjectPtr _minusone_;
+ 
+ bool CompileTypemask(SQIntVec &res,const SQChar *typemask);
+-
+-void *sq_vm_malloc(SQUnsignedInteger size);
+-void *sq_vm_realloc(void *p,SQUnsignedInteger oldsize,SQUnsignedInteger size);
+-void sq_vm_free(void *p,SQUnsignedInteger size);
+ #endif //_SQSTATE_H_
+diff -Naur supertux2-0.3.3.orig/external/squirrel/squirrel/squtils.h supertux2-0.3.3/external/squirrel/squirrel/squtils.h
+--- supertux2-0.3.3.orig/external/squirrel/squirrel/squtils.h	2010-03-01 13:40:58.000000000 +0100
++++ supertux2-0.3.3/external/squirrel/squirrel/squtils.h	2012-05-01 11:59:37.000000000 +0200
+@@ -2,6 +2,8 @@
+ #ifndef _SQUTILS_H_
+ #define _SQUTILS_H_
+ 
++#include "sqmem.h"
++
+ #define sq_new(__ptr,__type) {__ptr=(__type *)sq_vm_malloc(sizeof(__type));new (__ptr) __type;}
+ #define sq_delete(__ptr,__type) {__ptr->~__type();sq_vm_free(__ptr,sizeof(__type));}
+ #define SQ_MALLOC(__size) sq_vm_malloc((__size));
diff --git a/community/vdrift/PKGBUILD b/community/vdrift/PKGBUILD
index a85ea7973..e6845d2be 100644
--- a/community/vdrift/PKGBUILD
+++ b/community/vdrift/PKGBUILD
@@ -1,16 +1,17 @@
-# $Id: PKGBUILD 69896 2012-04-25 19:15:46Z svenstaro $
+# $Id: PKGBUILD 74628 2012-07-31 19:57:06Z ebelanger $
 # Maintainer: Sven-Hendrik Haase <sh@lutzhaase.com>
 # Contributor: Anton Bazhenov <anton.bazhenov at gmail>
 # Contributor: Lone_Wolf lonewolf@xs4all.nl
 
 pkgname=vdrift
 pkgver=2011.10.22
-pkgrel=6
+pkgrel=7
 pkgdesc="Open source driving simulation made with drift racing in mind"
 arch=('i686' 'x86_64')
 url="http://vdrift.net/"
 license=('GPL')
-depends=('bullet' 'curl' 'sdl_gfx' 'sdl_image' 'glew' 'libvorbis' 'vdrift-data')
+depends=('bullet' 'curl' 'sdl_gfx' 'sdl_image' 'glew' 'libvorbis' 'vdrift-data' 
+         'gtk-update-icon-cache' 'hicolor-icon-theme' 'libarchive')
 makedepends=('scons' 'boost' 'asio')
 source=(http://downloads.sourceforge.net/sourceforge/$pkgname/$pkgname-${pkgver//./-}.tar.bz2)
 md5sums=('6f8806ab1be303e9e1e47522c9eee890')
@@ -61,6 +62,6 @@ package() {
   install -Dm644 data/textures/icons/vdrift-64x64.png \
     "$pkgdir/usr/share/pixmaps/$pkgname.png"
 
-  rm -r $pkgdir/usr/share/vdrift
+  rm -r "$pkgdir"/usr/share/vdrift
 }
 # vim: sw=2:ts=2 et:
diff --git a/community/widelands/PKGBUILD b/community/widelands/PKGBUILD
index caacfc079..16a6ddd6d 100644
--- a/community/widelands/PKGBUILD
+++ b/community/widelands/PKGBUILD
@@ -1,4 +1,4 @@
-# $Id: PKGBUILD 70033 2012-04-28 14:02:07Z svenstaro $
+# $Id: PKGBUILD 74629 2012-07-31 19:57:21Z ebelanger $
 # Maintainer: Sven-Hendrik Haase <sh@lutzhaase.com>
 # Contributor: Arkham <arkham at archlinux dot us>
 # Contributor: Christoph Zeiler <rabyte*gmail>
@@ -6,7 +6,7 @@
 pkgname=widelands
 pkgver=17
 _realver=build17
-pkgrel=2
+pkgrel=3
 pkgdesc="A realtime strategy game with emphasis on economy and transport"
 arch=('i686' 'x86_64' 'mips64el')
 url="http://widelands.org/"