20 files changed, 125 insertions, 79 deletions
diff --git a/multilib/binutils-multilib/PKGBUILD b/multilib/binutils-multilib/PKGBUILD
index e4f77c71d..f80d4cfe9 100644
--- a/multilib/binutils-multilib/PKGBUILD
+++ b/multilib/binutils-multilib/PKGBUILD
@@ -1,4 +1,4 @@
-# $Id: PKGBUILD 61592 2012-01-04 01:24:05Z allan $
+# $Id: PKGBUILD 62199 2012-01-18 10:46:41Z heftig $
 # Maintainer: Jan "heftig" Steffens <jan.steffens@gmail.com>
 # Contributor: Allan McRae <allan@archlinux.org>
 
@@ -6,7 +6,7 @@
 
 pkgname=binutils-multilib
 pkgver=2.22
-pkgrel=4
+pkgrel=4.1
 _date=20111227
 pkgdesc="A set of programs to assemble and manipulate binary and object files for multilib"
 arch=('x86_64')
diff --git a/multilib/chuck/PKGBUILD b/multilib/chuck/PKGBUILD
index 06811dea5..a06c7da6a 100644
--- a/multilib/chuck/PKGBUILD
+++ b/multilib/chuck/PKGBUILD
@@ -1,4 +1,4 @@
-# $Id: PKGBUILD 35414 2010-12-20 02:07:32Z heftig $
+# $Id: PKGBUILD 62200 2012-01-18 10:46:43Z heftig $
 # Maintainer: Brad Fanella <bradfanella@archlinux.us>
 # Contributor: SpepS <dreamspepser at yahoo dot it>
 # Contributor: Jeff Mickey <jeff@archlinux.org>
@@ -6,7 +6,7 @@
 
 pkgname=chuck
 pkgver=1.2.1.3
-pkgrel=5
+pkgrel=5.1
 pkgdesc="Concurrent, on-the-fly audio programming language."
 arch=('i686' 'x86_64')
 url="http://chuck.cs.princeton.edu/"
diff --git a/multilib/dev86/PKGBUILD b/multilib/dev86/PKGBUILD
index 634592a08..bde7ba3be 100644
--- a/multilib/dev86/PKGBUILD
+++ b/multilib/dev86/PKGBUILD
@@ -5,13 +5,17 @@
 
 pkgname=dev86
 pkgver=0.16.18
-pkgrel=2
+pkgrel=3
 pkgdesc="Simple C compiler to generate 8086 code"
 arch=('i686' 'x86_64')
 url="http://www.debath.co.uk/dev86/"
 license=(GPL)
-[ "${CARCH}" == "x86_64" ] && depends=('lib32-glibc')
-makedepends=('bin86')
+if [ "${CARCH}" == "x86_64" ]; then
+  depends=('lib32-glibc')
+  makedepends=('bin86' 'gcc-multilib')
+else
+  makedepends=('bin86')
+fi
 options=('!libtool' '!strip' '!makeflags')
 source=(http://www.debath.co.uk/dev86/Dev86src-$pkgver.tar.gz
 	dev86-pic.patch
diff --git a/multilib/gcc-multilib/PKGBUILD b/multilib/gcc-multilib/PKGBUILD
index fd906c6e5..f66432820 100644
--- a/multilib/gcc-multilib/PKGBUILD
+++ b/multilib/gcc-multilib/PKGBUILD
@@ -1,4 +1,4 @@
-# $Id: PKGBUILD 61593 2012-01-04 01:24:16Z allan $
+# $Id: PKGBUILD 62202 2012-01-18 10:46:56Z heftig $
 # Maintainer: Jan "heftig" Steffens <jan.steffens@gmail.com>
 # Contributor: Allan McRae <allan@archlinux.org>
 
@@ -8,7 +8,7 @@
 pkgbase='gcc-multilib'
 pkgname=('gcc-multilib' 'gcc-libs-multilib' 'lib32-gcc-libs' 'gcc-fortran-multilib' 'gcc-objc-multilib' 'gcc-ada-multilib' 'gcc-go-multilib')
 pkgver=4.6.2
-pkgrel=5
+pkgrel=5.1
 _snapshot=4.6-20111223
 _libstdcppmanver=20111215
 pkgdesc="The GNU Compiler Collection for multilib"
@@ -22,11 +22,11 @@ options=('!libtool' '!emptydirs')
 source=(#ftp://gcc.gnu.org/pub/gcc/releases/gcc-${pkgver}/gcc-${pkgver}.tar.bz2
 	ftp://gcc.gnu.org/pub/gcc/snapshots/${_snapshot}/gcc-${_snapshot}.tar.bz2
 	ftp://gcc.gnu.org/pub/gcc/libstdc++/doxygen/libstdc++-man.${_libstdcppmanver}.tar.bz2
-	gcc_pure64.patch
+	gcc_pure64-multilib.patch
 	gcc-hash-style-both.patch)
 md5sums=('4755b9f6ac0abecbaa2097ed9738406a'
          '450772ce32daed97d7383199f8797f33'
-         '4030ee1c08dd1e843c0225b772360e76'
+         '7da5b7ab75b3c29993f953b18bc38579'
          '4df25b623799b148a0703eaeec8fdf3f')
 
 if [ -n "${_snapshot}" ]; then
@@ -44,7 +44,7 @@ build() {
   # Do not run fixincludes
   sed -i 's@\./fixinc\.sh@-c true@' gcc/Makefile.in
 
-  patch -Np1 -i ${srcdir}/gcc_pure64.patch
+  patch -Np1 -i ${srcdir}/gcc_pure64-multilib.patch
   patch -Np0 -i ${srcdir}/gcc-hash-style-both.patch
 
   echo ${pkgver} > gcc/BASE-VER
diff --git a/multilib/gcc-multilib/gcc_pure64-multilib.patch b/multilib/gcc-multilib/gcc_pure64-multilib.patch
new file mode 100644
index 000000000..73df6b873
--- /dev/null
+++ b/multilib/gcc-multilib/gcc_pure64-multilib.patch
@@ -0,0 +1,24 @@
+diff -u -r gcc-4.6-20111223/gcc/config/i386/linux64.h gcc-4.6-20111223-pure64/gcc/config/i386/linux64.h
+--- gcc-4.6-20111223/gcc/config/i386/linux64.h	2011-09-08 11:12:35.000000000 +0200
++++ gcc-4.6-20111223-pure64/gcc/config/i386/linux64.h	2012-01-14 19:52:33.688573352 +0100
+@@ -63,7 +63,7 @@
+    done.  */
+ 
+ #define GLIBC_DYNAMIC_LINKER32 "/lib/ld-linux.so.2"
+-#define GLIBC_DYNAMIC_LINKER64 "/lib64/ld-linux-x86-64.so.2"
++#define GLIBC_DYNAMIC_LINKER64 "/lib/ld-linux-x86-64.so.2"
+ 
+ #if TARGET_64BIT_DEFAULT
+ #define SPEC_32 "m32"
+diff -u -r gcc-4.6-20111223/gcc/config/i386/t-linux64 gcc-4.6-20111223-pure64/gcc/config/i386/t-linux64
+--- gcc-4.6-20111223/gcc/config/i386/t-linux64	2009-04-21 21:03:23.000000000 +0200
++++ gcc-4.6-20111223-pure64/gcc/config/i386/t-linux64	2012-01-14 19:50:27.346242617 +0100
+@@ -25,7 +25,7 @@
+ 
+ MULTILIB_OPTIONS = m64/m32
+ MULTILIB_DIRNAMES = 64 32 
+-MULTILIB_OSDIRNAMES = ../lib64 $(if $(wildcard $(shell echo $(SYSTEM_HEADER_DIR))/../../usr/lib32),../lib32,../lib)
++MULTILIB_OSDIRNAMES = ../lib ../lib32
+ 
+ LIBGCC = stmp-multilib
+ INSTALL_LIBGCC = install-multilib
diff --git a/multilib/jack2-multilib/PKGBUILD b/multilib/jack2-multilib/PKGBUILD
index 7c61a3571..6c45b64d6 100644
--- a/multilib/jack2-multilib/PKGBUILD
+++ b/multilib/jack2-multilib/PKGBUILD
@@ -14,18 +14,19 @@ pkgbase=jack2-multilib
 pkgname=('jack2-multilib' 'jack2-dbus-multilib')
 #pkgname= # single build (overrides split)
 _tarname=jack
-pkgver=1.9.7
+pkgver=1.9.8
 pkgrel=1
 arch=('x86_64')
 url="http://jackaudio.org/"
 backup=(etc/security/limits.d/99-audio.conf)
 license=('GPL')
-makedepends=('python2' 'libffado' 'libsamplerate' 'celt'
-             'doxygen' 'gcc-multilib' 'lib32-dbus-core')
-source=("http://www.grame.fr/~letz/$_tarname-$pkgver.tar.bz2"
+makedepends=('python2' 'doxygen' 'libffado'
+             'libsamplerate' 'lib32-dbus-core' 'lib32-celt'
+             'gcc-multilib')
+source=("http://www.grame.fr/~letz/$_tarname-$pkgver.tgz"
         '99-audio.conf'
         '40-hpet-permissions.rules')
-md5sums=('9759670feecbd43eeccf1c0f743ec199'
+md5sums=('1dd2ff054cab79dfc11d134756f27165'
          'ae65b7c9ebe0fff6c918ba9d97ae342d'
          '471aad533ff56c5d3cbbf65ce32cadef')
 
@@ -52,7 +53,9 @@ _mklinks() {
 }
 
 build() {
-  cd "$srcdir"
+  cd "$srcdir/$_tarname-$pkgver"
+
+  export LINKFLAGS="$LDFLAGS"
 
   # fix doxygen building
   sed -i 's:build/default/html:html:' $_tarname-$pkgver/wscript
@@ -83,16 +86,15 @@ package_jack2-multilib() {
   ! _isbuild jack2-multilib && return 0
 
   pkgdesc="The next-generation JACK with SMP support & mixed mode"
-  depends=('libsamplerate' 'gcc-libs-multilib')
+  depends=('libsamplerate' 'lib32-celt' 'lib32-gcc-libs')
   optdepends=('libffado: FireWire support'
-              'celt: NetJACK2 driver'
               'lib32-dbus-core: jackdbus'
               'python2: jack_control')
   conflicts=('jack' 'jack2' 'lib32-jack')
-  provides=('jack' 'jack2' 'lib32-jack' 'jackmp'
-            'jackdmp' 'jackdbus' 'lib32-jack2')
+  provides=('jack' 'jackmp' 'jackdmp' 'jackdbus'
+            'jack2' 'lib32-jack' 'lib32-jack2')
 
-  cd "$srcdir/$_tarname-$pkgver"
+  cd "$srcdir/$_tarname-$pkgver/$_tarname-$pkgver"
 
   python2 waf install --destdir="$pkgdir"
 
@@ -116,15 +118,14 @@ package_jack2-dbus-multilib() {
   ! _isbuild jack2-dbus-multilib && return 0
 
   pkgdesc="The next-generation JACK with SMP support & mixed mode (for D-BUS interaction only)"
-  depends=('libsamplerate' 'lib32-dbus-core')
+  depends=('libsamplerate' 'lib32-celt' 'lib32-dbus-core' 'lib32-gcc-libs')
   optdepends=('libffado: FireWire support'
-              'celt: NetJACK2 driver'
               'python2: jack_control')
   conflicts=('jack' 'jack2' 'lib32-jack' 'jack2-multilib')
-  provides=('jack' 'jack2' 'lib32-jack' 'jack2-multilib'
-            'jackmp' 'jackdmp' 'jackdbus' 'lib32-jack2')
+  provides=('jack' 'jack2' 'jackmp' 'jackdmp' 'jackdbus'
+            'jack2-dbus' 'jack2-multilib' 'lib32-jack' 'lib32-jack2')
 
-  cd "$srcdir/$_tarname-dbus-$pkgver"
+  cd "$srcdir/$_tarname-$pkgver/$_tarname-dbus-$pkgver"
 
   python2 waf install --destdir="$pkgdir"
 
diff --git a/multilib/lib32-gdk-pixbuf2/PKGBUILD b/multilib/lib32-gdk-pixbuf2/PKGBUILD
index 2e5826a1b..eef9aca26 100644
--- a/multilib/lib32-gdk-pixbuf2/PKGBUILD
+++ b/multilib/lib32-gdk-pixbuf2/PKGBUILD
@@ -2,20 +2,19 @@
 # Maintainer: Ionut Biru <ibiru@archlinux.org>
 _pkgbasename=gdk-pixbuf2
 pkgname=lib32-$_pkgbasename
-pkgver=2.24.0
-pkgrel=2
-pkgdesc="An image loading library for gtk2 (32-bit)"
+pkgver=2.24.1
+pkgrel=1
+pkgdesc="An image loading library (32-bit)"
 arch=('x86_64')
 url="http://www.gtk.org/"
 license=('GPL2')
-depends=('lib32-glib2>=2.25.15'
-          lib32-lib{'png>=1.4.3','tiff>=3.9.4','jpeg>=8.0.2',x11}
-          $_pkgbasename)
+depends=(lib32-glib2 lib32-libpng lib32-libtiff lib32-libjpeg lib32-libx11
+         $_pkgbasename)
 makedepends=(gcc-multilib)
 options=('!libtool' '!docs')
 install=gdk-pixbuf2.install
-source=(http://download.gnome.org/sources/gdk-pixbuf/2.24/gdk-pixbuf-${pkgver}.tar.bz2)
-md5sums=('d8ece3a4ade4a91c768328620e473ab8')
+source=(http://download.gnome.org/sources/gdk-pixbuf/2.24/gdk-pixbuf-${pkgver}.tar.xz)
+sha256sums=('da7a3f00db360913716368e19e336402755cafa93769f3cfa28a969303e4bee1')
 
 build() {
   export CC="gcc -m32"
@@ -26,6 +25,7 @@ build() {
 
   ./configure --prefix=/usr  --libdir=/usr/lib32 \
     --without-libjasper \
+    --with-x11 \
     --with-included-loaders=png
   make
 }
diff --git a/multilib/lib32-glib2/PKGBUILD b/multilib/lib32-glib2/PKGBUILD
index b041355be..24695d4a6 100644
--- a/multilib/lib32-glib2/PKGBUILD
+++ b/multilib/lib32-glib2/PKGBUILD
@@ -1,4 +1,4 @@
-# $Id: PKGBUILD 60174 2011-12-06 15:20:01Z bluewind $
+# $Id: PKGBUILD 62205 2012-01-18 10:47:06Z heftig $
 # Maintainer:  Ionut Biru <ibiru@archlinux.org>
 # Contributor: Pierre Schmitz <pierre@archlinux.de>
 # Contributor: Mikko Seppälä <t-r-a-y@mbnet.fi>
@@ -6,7 +6,7 @@
 _pkgbasename=glib2
 pkgname=lib32-$_pkgbasename
 pkgver=2.30.2
-pkgrel=1
+pkgrel=2
 pkgdesc="Common C routines used by GTK+ 2.4 and other libs (32-bit)"
 url="http://www.gtk.org/"
 arch=('x86_64')
diff --git a/multilib/lib32-glibc/PKGBUILD b/multilib/lib32-glibc/PKGBUILD
index 4cca687a9..9b962e426 100644
--- a/multilib/lib32-glibc/PKGBUILD
+++ b/multilib/lib32-glibc/PKGBUILD
@@ -1,4 +1,4 @@
-# $Id: PKGBUILD 61594 2012-01-04 01:24:30Z allan $
+# $Id: PKGBUILD 62206 2012-01-18 10:47:20Z heftig $
 # Maintainer: Jan "heftig" Steffens <jan.steffens@gmail.com>
 # Contributor: Jan de Groot <jgc@archlinux.org>
 # Contributor: Allan McRae <allan@archlinux.org>
@@ -9,7 +9,7 @@
 _pkgbasename=glibc
 pkgname=lib32-$_pkgbasename
 pkgver=2.15
-pkgrel=3
+pkgrel=3.1
 _glibcdate=20111227
 pkgdesc="GNU C Library for multilib"
 arch=('x86_64')
@@ -43,7 +43,7 @@ md5sums=('6ffdf5832192b92f98bdd125317c0dfc'
          '3c219ddfb619b6df903cac4cc42c611d'
          '7ae3e426251ae33e73dbad71f9c91378'
          'dc7550e659ddd685bd78a930d15a01f2'
-         'a8f4549c716cd37244fbf1ed059497f8')
+         '6e052f1cb693d5d3203f50f9d4e8c33b')
 
 build() {
   cd ${srcdir}/glibc
@@ -100,7 +100,7 @@ build() {
   # Hack to fix NPTL issues with Xen, only required on 32bit platforms
   export CFLAGS="${CFLAGS} -mno-tls-direct-seg-refs"
 
-  echo "slibdir=/lib32" >> configparms
+  echo "slibdir=/usr/lib32" >> configparms
 
   # remove hardening options from CFLAGS for building libraries
   CFLAGS=${CFLAGS/-fstack-protector/}
@@ -158,15 +158,15 @@ package() {
 
   strip $STRIP_STATIC usr/lib32/*.a
 
-  strip $STRIP_SHARED lib32/{libanl,libBrokenLocale,libcidn,libcrypt}-${pkgver}.so \
-                      lib32/libnss_{compat,db,dns,files,hesiod,nis,nisplus}-${pkgver}.so \
-                      lib32/{libdl,libm,libnsl,libresolv,librt,libutil}-${pkgver}.so \
-                      lib32/{libmemusage,libpcprofile,libSegFault}.so \
+  strip $STRIP_SHARED usr/lib32/{libanl,libBrokenLocale,libcidn,libcrypt}-${pkgver}.so \
+                      usr/lib32/libnss_{compat,db,dns,files,hesiod,nis,nisplus}-${pkgver}.so \
+                      usr/lib32/{libdl,libm,libnsl,libresolv,librt,libutil}-${pkgver}.so \
+                      usr/lib32/{libmemusage,libpcprofile,libSegFault}.so \
                       usr/lib32/{pt_chown,{audit,gconv}/*.so}
 
   # Dynamic linker
   mkdir ${pkgdir}/lib
-  ln -s ../lib32/ld-linux.so.2 ${pkgdir}/lib/
+  ln -s ../usr/lib32/ld-linux.so.2 ${pkgdir}/lib/
 
   # Add lib32 paths to the default library search path
   install -Dm644 "$srcdir/lib32-glibc.conf" "$pkgdir/etc/ld.so.conf.d/lib32-glibc.conf"
diff --git a/multilib/lib32-glibc/lib32-glibc.conf b/multilib/lib32-glibc/lib32-glibc.conf
index a1c8c4199..9b08c3f43 100644
--- a/multilib/lib32-glibc/lib32-glibc.conf
+++ b/multilib/lib32-glibc/lib32-glibc.conf
@@ -1,2 +1 @@
-/lib32
 /usr/lib32
diff --git a/multilib/lib32-gtk2/PKGBUILD b/multilib/lib32-gtk2/PKGBUILD
index b3221c332..cb2033694 100644
--- a/multilib/lib32-gtk2/PKGBUILD
+++ b/multilib/lib32-gtk2/PKGBUILD
@@ -1,4 +1,4 @@
-# $Id: PKGBUILD 58554 2011-11-14 07:57:56Z ibiru $
+# $Id: PKGBUILD 62207 2012-01-18 10:47:25Z heftig $
 # Maintainer:  Ionut Biru <ibiru@archlinux.org
 # Contributor: Pierre Schmitz <pierre@archlinux.de>
 # Contributor: Mikko Seppälä <t-r-a-y@mbnet.fi>
@@ -6,7 +6,7 @@
 _pkgbasename=gtk2
 pkgname=lib32-$_pkgbasename
 pkgver=2.24.8
-pkgrel=1
+pkgrel=2
 pkgdesc="The GTK+ Toolkit (v2) (32-bit)"
 arch=('x86_64')
 url="http://www.gtk.org/"
diff --git a/multilib/lib32-libpulse/PKGBUILD b/multilib/lib32-libpulse/PKGBUILD
index ccf45e707..2118ef01b 100644
--- a/multilib/lib32-libpulse/PKGBUILD
+++ b/multilib/lib32-libpulse/PKGBUILD
@@ -1,4 +1,4 @@
-# $Id: PKGBUILD 57069 2011-10-20 15:38:49Z heftig $
+# $Id: PKGBUILD 62215 2012-01-18 10:54:20Z heftig $
 # Maintainer: Jan "heftig" Steffens <jan.steffens@gmail.com>
 # Contributor: Daniel J Griffiths <ghost1227@archlinux.us>
 # Contributor: Corrado Primier <bardo@aur.archlinux.org>
@@ -8,19 +8,19 @@ _pkgbasename=libpulse
 pkgname=lib32-$_pkgbasename
 pkgdesc="A featureful, general-purpose sound server (32-bit client libraries)"
 pkgver=1.1
-pkgrel=1
+pkgrel=2
 arch=(x86_64)
 url="http://pulseaudio.org/"
 license=(GPL LGPL)
-depends=(lib32-dbus-core lib32-xcb-util lib32-json-c 
+depends=(lib32-dbus-core lib32-json-c 
          lib32-libasyncns lib32-libcap lib32-libxtst lib32-libsm lib32-libsndfile
          $_pkgbasename)
-makedepends=(gcc-multilib libtool-multilib intltool lib32-glib2 lib32-speex)
+makedepends=(gcc-multilib libtool-multilib intltool lib32-glib2 lib32-speex lib32-gtk2)
 optdepends=('lib32-alsa-plugins: ALSA support')
 provides=("lib32-pulseaudio=$pkgver")
 conflicts=(lib32-pulseaudio)
 replaces=(lib32-pulseaudio)
-options=(!emptydirs !libtool !makeflags)
+options=(!emptydirs !libtool)
 source=("http://freedesktop.org/software/pulseaudio/releases/pulseaudio-$pkgver.tar.xz")
 sha256sums=('6fe531136f6ebce2d35872a2d2c914278cdc5dcdd5eea516dc52c81f9001f5ee')
 
@@ -43,11 +43,15 @@ build() {
     --disable-rpath \
     --disable-default-build-tests
 
+  # fight unused direct deps
+  sed -i -e 's/ -shared / -Wl,-O1,--as-needed\0/g' libtool
+
   make -C src $_libs
 }
 
 package() {
   cd "$srcdir/pulseaudio-$pkgver"
-  make -C src lib_LTLIBRARIES="$_libs" DESTDIR="$pkgdir" install-libLTLIBRARIES
-  make DESTDIR="$pkgdir" install-pkgconfigDATA
+  make -j1 -C src DESTDIR="$pkgdir" \
+    lib_LTLIBRARIES="$_libs" install-libLTLIBRARIES
+  make -j1 DESTDIR="$pkgdir" install-pkgconfigDATA
 }
diff --git a/multilib/lib32-pango/PKGBUILD b/multilib/lib32-pango/PKGBUILD
index ccb80357b..d1236f4a4 100644
--- a/multilib/lib32-pango/PKGBUILD
+++ b/multilib/lib32-pango/PKGBUILD
@@ -1,11 +1,11 @@
-# $Id: PKGBUILD 56312 2011-10-05 14:35:52Z bluewind $
+# $Id: PKGBUILD 62209 2012-01-18 10:47:32Z heftig $
 # Contributor: Pierre Schmitz <pierre@archlinux.de>
 # Contributor: Mikko Seppälä <t-r-a-y@mbnet.fi>
 # Maintainer: Biru Ionut <ionut@archlinux.ro>
 _pkgbasename=pango
 pkgname=lib32-$_pkgbasename
 pkgver=1.29.4
-pkgrel=1
+pkgrel=2
 pkgdesc="A library for layout and rendering of text (32-bit)"
 arch=('x86_64')
 license=('LGPL')
diff --git a/multilib/lib32-sdl_image/PKGBUILD b/multilib/lib32-sdl_image/PKGBUILD
index 70ccc252f..a0df01c37 100644
--- a/multilib/lib32-sdl_image/PKGBUILD
+++ b/multilib/lib32-sdl_image/PKGBUILD
@@ -1,11 +1,11 @@
-# $Id: PKGBUILD 29403 2010-10-14 00:20:35Z svenstaro $
+# $Id: PKGBUILD 62238 2012-01-18 17:43:15Z svenstaro $
 # Maintainer: Sven-Hendrik Haase <sh@lutzhaase.com>
 # Contributor: SpepS <dreamspepser at yahoo dot it>
 
 _pkgbasename=sdl_image
 pkgname=lib32-$_pkgbasename
-pkgver=1.2.10
-pkgrel=3
+pkgver=1.2.11
+pkgrel=1
 pkgdesc="A simple library to load images of various formats as SDL surfaces (32-bit)"
 arch=('x86_64')
 url="http://www.libsdl.org/projects/SDL_image/"
@@ -14,7 +14,7 @@ depends=('lib32-sdl' 'lib32-libpng' 'lib32-libjpeg' 'lib32-libtiff' 'lib32-zlib'
 makedepends=('gcc-multilib')
 options=('!libtool')
 source=(http://www.libsdl.org/projects/SDL_image/release/SDL_image-${pkgver}.tar.gz)
-md5sums=('6c06584b31559e2b59f2b982d0d1f628')
+md5sums=('1210d7a7e87ab95abebb4f3e79a0fd31')
 
 build() {
   export CC='gcc -m32'
diff --git a/multilib/lib32-sdl_ttf/PKGBUILD b/multilib/lib32-sdl_ttf/PKGBUILD
index 19f3f0014..cffc2c0a6 100644
--- a/multilib/lib32-sdl_ttf/PKGBUILD
+++ b/multilib/lib32-sdl_ttf/PKGBUILD
@@ -1,11 +1,11 @@
-# $Id: PKGBUILD 35154 2010-12-16 21:15:47Z heftig $
+# $Id: PKGBUILD 62239 2012-01-18 17:44:28Z svenstaro $
 # Maintainer: Sven-Hendrik Haase <sh@lutzhaase.com>
 # Contributor: Esa lakaniemi <esalaka@gmail.com>
 
 _pkgbasename=sdl_ttf
 pkgname=lib32-$_pkgbasename
-pkgver=2.0.10
-pkgrel=3
+pkgver=2.0.11
+pkgrel=1
 pkgdesc="A library that allows you to use TrueType fonts in your SDL applications (32-bit)"
 arch=('x86_64')
 url="http://www.libsdl.org/projects/SDL_ttf/"
@@ -14,7 +14,7 @@ options=('!libtool')
 depends=('lib32-sdl' 'lib32-freetype2' $_pkgbasename)
 makedepends=('gcc-multilib')
 source=(http://www.libsdl.org/projects/SDL_ttf/release/SDL_ttf-$pkgver.tar.gz)
-sha256sums=('7d38704bcc7c34029c2dcb73b2d4857e8ad76341c6e0faed279eb9f743c66c6a')
+md5sums=('61e29bd9da8d245bc2471d1b2ce591aa')
 
 build() {
   cd "${srcdir}"/SDL_ttf-${pkgver}
diff --git a/multilib/libtool-multilib/PKGBUILD b/multilib/libtool-multilib/PKGBUILD
index 0ab524cef..22767d11a 100644
--- a/multilib/libtool-multilib/PKGBUILD
+++ b/multilib/libtool-multilib/PKGBUILD
@@ -1,4 +1,4 @@
-# $Id: PKGBUILD 57527 2011-10-30 06:49:05Z allan $
+# $Id: PKGBUILD 62210 2012-01-18 10:47:35Z heftig $
 # Maintainer: Jan "heftig" Steffens <jan.steffens@gmail.com>
 # Contributor: Allan McRae <allan@archlinux.org>
 # Contributor: judd <jvinet@zeroflux.org>
@@ -8,7 +8,7 @@
 pkgbase=libtool-multilib
 pkgname=(libtool-multilib lib32-libltdl)
 pkgver=2.4.2
-pkgrel=2
+pkgrel=2.1
 pkgdesc="A generic library support script for multilib"
 arch=('x86_64')
 url="http://www.gnu.org/software/libtool"
diff --git a/multilib/nspluginwrapper/PKGBUILD b/multilib/nspluginwrapper/PKGBUILD
index 7e9d8b5fe..d02b29590 100644
--- a/multilib/nspluginwrapper/PKGBUILD
+++ b/multilib/nspluginwrapper/PKGBUILD
@@ -1,8 +1,8 @@
-# $Id: PKGBUILD 60061 2011-12-04 15:24:45Z bluewind $
+# $Id: PKGBUILD 62211 2012-01-18 10:47:40Z heftig $
 # Maintainer: Thomas Bächler <thomas@archlinux.org>
 pkgname=nspluginwrapper
 pkgver=1.4.4
-pkgrel=2
+pkgrel=2.1
 pkgdesc="Cross-platform NPAPI compatible plugin viewer"
 arch=('i686' 'x86_64')
 url="http://nspluginwrapper.davidben.net/"
@@ -15,8 +15,10 @@ depends=(
 )
 makedepends=('gcc-multilib')
 install="install"
-source=(http://nspluginwrapper.davidben.net/download/$pkgname-$pkgver.tar.gz)
-md5sums=('36f3e290fc4ce56f65ee695078961188')
+source=(http://nspluginwrapper.davidben.net/download/$pkgname-$pkgver.tar.gz
+        'fix_missing_lib.patch')
+md5sums=('36f3e290fc4ce56f65ee695078961188'
+         'd40ad2f55d9989e04e3ef0cf4326b1df')
 
 if [[ $CARCH == i686 ]]; then
   # Strip lib32 etc. on i686
@@ -29,6 +31,8 @@ fi
 build() {
   cd "$srcdir/$pkgname-$pkgver"
 
+  patch -p0 -i "$srcdir/fix_missing_lib.patch"
+
   configure_args=""
   if [[ $CARCH == x86_64 ]]; then
     configure_args="$configure_args --with-lib32=lib32 --with-lib64=lib"
diff --git a/multilib/nspluginwrapper/fix_missing_lib.patch b/multilib/nspluginwrapper/fix_missing_lib.patch
new file mode 100644
index 000000000..f239053f1
--- /dev/null
+++ b/multilib/nspluginwrapper/fix_missing_lib.patch
@@ -0,0 +1,11 @@
+--- Makefile	2012-01-15 13:25:28.922775770 +0100
++++ Makefile.new	2012-01-15 13:25:09.185815643 +0100
+@@ -142,7 +142,7 @@
+ npplayer_LDFLAGS  = $(LDFLAGS)
+ npplayer_LDFLAGS += $(libpthread_LDFLAGS)
+ npplayer_LIBS     = $(GTK_LIBS) $(GLIB_LIBS) $(CURL_LIBS) $(X_LIBS)
+-npplayer_LIBS    += $(libpthread_LIBS) $(libsocket_LIBS)
++npplayer_LIBS    += $(libpthread_LIBS) $(libsocket_LIBS) -ldl
+ 
+ libnoxshm_LIBRARY = libnoxshm.so
+ libnoxshm_RAWSRCS = libnoxshm.c
diff --git a/multilib/q4wine/PKGBUILD b/multilib/q4wine/PKGBUILD
index 150554ce3..0e1457979 100644
--- a/multilib/q4wine/PKGBUILD
+++ b/multilib/q4wine/PKGBUILD
@@ -1,17 +1,17 @@
-# $Id: PKGBUILD 49318 2011-06-14 11:07:14Z spupykin $
+# $Id: PKGBUILD 62212 2012-01-18 10:47:43Z heftig $
 # Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com>
 # Contributor: Chris Giles <Chris.G.27 (at) Gmail.com>
 
 pkgname=q4wine
 pkgver=0.121
-pkgrel=2
+pkgrel=3
 pkgdesc="A Qt4 GUI for Wine"
 arch=("i686" "x86_64")
 url="http://sourceforge.net/projects/${pkgname}/"
 license=("GPL3")
 depends=("qt" "wine" "sqlite3" "which" "icoutils")
 makedepends=("cmake")
-optdepends=("winetricks")
+optdepends=("winetricks" "fuseiso")
 options=('!emptydirs')
 source=(http://downloads.sourceforge.net/${pkgname}/${pkgname}-${pkgver/_/-}.tar.bz2)
 md5sums=('2de5de62f57ba6b26247198df339d81a')
@@ -28,5 +28,4 @@ build() {
 package() {
   cd ${srcdir}/${pkgname}-${pkgver/_/-}
   make DESTDIR=${pkgdir} install
-#  install -D ${srcdir}/${pkgname}.desktop ${pkgdir}/usr/share/applications/${pkgname}.desktop
 }
diff --git a/multilib/wine/PKGBUILD b/multilib/wine/PKGBUILD
index 0525851c1..984abe030 100644
--- a/multilib/wine/PKGBUILD
+++ b/multilib/wine/PKGBUILD
@@ -1,4 +1,4 @@
-# $Id: PKGBUILD 62007 2012-01-14 00:44:58Z svenstaro $
+# $Id: PKGBUILD 62213 2012-01-18 10:47:46Z heftig $
 # Maintainer: Sven-Hendrik Haase <sh@lutzhaase.com>
 # Contributor: Jan "heftig" Steffens <jan.steffens@gmail.com>
 # Contributor: Eduardo Romero <eduardo@archlinux.org>
@@ -6,7 +6,7 @@
 
 pkgname=wine
 pkgver=1.3.37
-pkgrel=1
+pkgrel=1.1
 
 _pkgbasever=${pkgver/rc/-rc}