Tue Jan 31 23:14:56 UTC 2012

14 files changed, 475 insertions, 7 deletions

diff --git a/multilib-testing/lib32-cairo/PKGBUILD b/multilib-testing/lib32-cairo/PKGBUILD
new file mode 100644
index 000000000..5c4f291a3
--- /dev/null
+++ b/multilib-testing/lib32-cairo/PKGBUILD
@@ -0,0 +1,36 @@
+# $Id: PKGBUILD 63333 2012-01-30 19:30:30Z ibiru $
+# Maintainer: Ionut Biru <ibiru@archlinux.org>
+
+_pkgbasename=cairo
+pkgname=lib32-$_pkgbasename
+pkgver=1.10.2
+pkgrel=3
+pkgdesc="Cairo vector graphics library (32-bit)"
+arch=('x86_64')
+url="http://cairographics.org/"
+license=('LGPL' 'MPL')
+depends=('lib32-libpng' 'lib32-libxrender' 'lib32-fontconfig'
+         'lib32-pixman' 'lib32-glib2' ${_pkgbasename})
+makedepends=('gcc-multilib')
+source=(http://cairographics.org/releases/${_pkgbasename}-${pkgver}.tar.gz
+        cairo-1.10.0-buggy_gradients.patch)
+sha1sums=('ccce5ae03f99c505db97c286a0c9a90a926d3c6e'
+          '8b843a9934e5112b6188e5bcf4adfc1fdaf9fa04')
+
+build() {
+  export CC="gcc -m32"
+  export CXX="g++ -m32"
+  export PKG_CONFIG_PATH="/usr/lib32/pkgconfig"
+
+  cd "${srcdir}/${_pkgbasename}-${pkgver}"
+  ./configure --prefix=/usr --libdir=/usr/lib32 \
+      --sysconfdir=/etc  --localstatedir=/var \
+      --disable-static --enable-tee
+  make
+}
+
+package() {
+  cd "${srcdir}/${_pkgbasename}-${pkgver}"
+  make DESTDIR="${pkgdir}" install
+  rm -rf "${pkgdir}"/usr/{include,share,bin}
+}
diff --git a/multilib-testing/lib32-cairo/cairo-1.10.0-buggy_gradients.patch b/multilib-testing/lib32-cairo/cairo-1.10.0-buggy_gradients.patch
new file mode 100644
index 000000000..368e356d3
--- /dev/null
+++ b/multilib-testing/lib32-cairo/cairo-1.10.0-buggy_gradients.patch
@@ -0,0 +1,13 @@
+--- a/src/cairo-xlib-display.c.ubuntu	2010-08-04 11:57:49.000000000 +0200

++++ b/src/cairo-xlib-display.c	2010-08-04 11:58:28.000000000 +0200

+@@ -353,11 +353,7 @@

+     /* Prior to Render 0.10, there is no protocol support for gradients and

+      * we call function stubs instead, which would silently consume the drawing.

+      */

+-#if RENDER_MAJOR == 0 && RENDER_MINOR < 10

+     display->buggy_gradients = TRUE;

+-#else

+-    display->buggy_gradients = FALSE;

+-#endif

+     display->buggy_pad_reflect = FALSE;

+     display->buggy_repeat = FALSE;

diff --git a/multilib-testing/lib32-gdk-pixbuf2/PKGBUILD b/multilib-testing/lib32-gdk-pixbuf2/PKGBUILD
index eef9aca26..28b102d55 100644
--- a/multilib-testing/lib32-gdk-pixbuf2/PKGBUILD
+++ b/multilib-testing/lib32-gdk-pixbuf2/PKGBUILD
@@ -3,7 +3,7 @@
 _pkgbasename=gdk-pixbuf2
 pkgname=lib32-$_pkgbasename
 pkgver=2.24.1
-pkgrel=1
+pkgrel=2
 pkgdesc="An image loading library (32-bit)"
 arch=('x86_64')
 url="http://www.gtk.org/"
diff --git a/multilib-testing/lib32-libcanberra/PKGBUILD b/multilib-testing/lib32-libcanberra/PKGBUILD
new file mode 100644
index 000000000..c9bb0e0ce
--- /dev/null
+++ b/multilib-testing/lib32-libcanberra/PKGBUILD
@@ -0,0 +1,63 @@
+# $Id: PKGBUILD 63335 2012-01-30 19:30:40Z ibiru $
+# Maintainer: Florian Pritz <flo@xssn.at>
+# Contributor: Jan de Groot <jgc@archlinux.org>
+
+_pkgbasename=libcanberra
+pkgbase=lib32-$_pkgbasename
+pkgname=(lib32-libcanberra lib32-libcanberra-pulse)
+pkgver=0.28
+pkgrel=2
+pkgdesc="A small and lightweight implementation of the XDG Sound Theme Specification (32-bit)"
+arch=(x86_64)
+license=('LGPL')
+depends=('lib32-libvorbis' 'lib32-libtool' 'lib32-gtk2' 'lib32-alsa-lib' 'lib32-tdb'
+         $_pkgbasename)
+makedepends=('gtk-doc' lib32-libpulse gcc-multilib libtool-multilib)
+options=(!emptydirs)
+url=http://0pointer.de/lennart/projects/libcanberra
+source=("$url/$_pkgbasename-$pkgver.tar.gz")
+md5sums=('c198b4811598c4c161ff505e4531b02c')
+
+build() {
+  cd "$srcdir/$_pkgbasename-$pkgver"
+
+  export CC="gcc -m32"
+  export CXX="g++ -m32"
+  export PKG_CONFIG_PATH="/usr/lib32/pkgconfig"
+
+  ./configure --sysconfdir=/etc --prefix=/usr --localstatedir=/var \
+      --disable-static --with-builtin=dso --enable-null --disable-oss \
+      --enable-alsa --disable-gstreamer --enable-pulse --disable-udev \
+      --libdir=/usr/lib32
+
+  sed -i -e 's/ -shared / -Wl,-O1,--as-needed\0 /g' -e 's/    if test "$export_dynamic" = yes && test -n "$export_dynamic_flag_spec"; then/      func_append compile_command " -Wl,-O1,--as-needed"\n      func_append finalize_command " -Wl,-O1,--as-needed"\n\0/' libtool
+
+  make
+}
+
+package_lib32-libcanberra() {
+  optdepends=("$pkgbase-pulse: PulseAudio driver")
+
+  cd "$srcdir/$_pkgbasename-$pkgver"
+
+  make -j1 DESTDIR="${pkgdir}" install
+  rm -f "${pkgdir}/usr/lib32/libcanberra-gtk.la"
+  rm -f "${pkgdir}/usr/lib32/gtk-2.0/modules/"*.la
+
+
+  # Split libcanberra-pulse
+  mkdir pulse-plugin
+  mv "${pkgdir}"/usr/lib32/${_pkgbasename}-${pkgver}/${_pkgbasename}-pulse.* pulse-plugin
+
+  rm -rf "${pkgdir}"/{etc,usr/{include,share,bin,lib32/gnome-settings-daemon-3.0}}
+}
+
+package_lib32-libcanberra-pulse() {
+  pkgdesc="PulseAudio plugin for libcanberra (32-bit)"
+  depends=("$pkgbase=$pkgver-$pkgrel" 'lib32-libpulse')
+
+  cd "$srcdir/$_pkgbasename-$pkgver"
+
+  mkdir -p "${pkgdir}/usr/lib32/${_pkgbasename}-${pkgver}"
+  mv pulse-plugin/* "${pkgdir}/usr/lib32/${_pkgbasename}-${pkgver}" 
+}
diff --git a/multilib-testing/lib32-libcups/PKGBUILD b/multilib-testing/lib32-libcups/PKGBUILD
new file mode 100644
index 000000000..7b0456700
--- /dev/null
+++ b/multilib-testing/lib32-libcups/PKGBUILD
@@ -0,0 +1,38 @@
+# $Id: PKGBUILD 63336 2012-01-30 19:30:45Z ibiru $
+# Maintainer: Andreas Radke <andyrtr@archlinux.org>
+
+_pkgbasename=libcups
+pkgname=lib32-$_pkgbasename
+pkgver=1.5.0
+pkgrel=2
+pkgdesc="The CUPS Printing System - client libraries (32-bit)"
+arch=('x86_64')
+license=('GPL')
+url="http://www.cups.org/"
+depends=(lib32-krb5 lib32-libtiff lib32-libpng $_pkgbasename)
+makedepends=(gcc-multilib)
+source=(ftp://ftp.easysw.com/pub/cups/${pkgver}/cups-${pkgver}-source.tar.bz2)
+md5sums=('e54ed09ede2340fc3014913333520fe4')
+
+build() {
+  export CC="gcc -m32"
+  export CXX="g++ -m32"
+  export PKG_CONFIG_PATH="/usr/lib32/pkgconfig"
+
+  cd ${srcdir}/cups-${pkgver}
+  
+  aclocal -I config-scripts
+  autoconf -I config-scripts
+
+  ./configure --prefix=/usr --sysconfdir=/etc --localstatedir=/var \
+     --disable-ldap --enable-raw-printing --disable-gssapi --disable-dbus \
+     --enable-ssl=no --disable-gnutls --enable-threads \
+     --with-optim="$CFLAGS" --libdir=/usr/lib32
+  make
+}
+
+package() {
+  cd ${srcdir}/cups-${pkgver}
+  make BUILDROOT=${pkgdir} install-libs
+}
+
diff --git a/multilib-testing/lib32-libglade/PKGBUILD b/multilib-testing/lib32-libglade/PKGBUILD
new file mode 100644
index 000000000..ebea314ea
--- /dev/null
+++ b/multilib-testing/lib32-libglade/PKGBUILD
@@ -0,0 +1,37 @@
+# $Id: $
+# Maintainer: Pierre Schmitz <pierre@archlinux.de>
+# Contributor: TryA <tryagainprod {at} gmail.com>
+# Contributor: Jan de Groot <jgc@archlinux.org>
+
+_pkgbasename=libglade
+pkgname=lib32-libglade
+pkgver=2.6.4
+pkgrel=5
+pkgdesc="Allows you to load glade interface files in a program at runtime (32-bit)"
+arch=('x86_64')
+license=('LGPL')
+depends=('lib32-gtk2' 'lib32-libxml2' "${_pkgbasename}")
+makedepends=('python2' 'pkgconfig' 'gcc-multilib')
+options=('!libtool')
+source=("http://ftp.gnome.org/pub/gnome/sources/${_pkgbasename}/2.6/${_pkgbasename}-${pkgver}.tar.bz2"
+        'libglade-2.0.1-nowarning.patch')
+url='http://www.gnome.org'
+md5sums=('d1776b40f4e166b5e9c107f1c8fe4139'
+         '4f879c0ce550004905aa0fb24f25c353')
+
+build() {
+	export CC="gcc -m32"
+	export CXX="g++ -m32"
+	export PKG_CONFIG_PATH="/usr/lib32/pkgconfig"
+
+	cd "${srcdir}/${_pkgbasename}-${pkgver}"
+	patch -Np1 -i "${srcdir}/libglade-2.0.1-nowarning.patch"
+	PYTHON=python2 ./configure --sysconfdir=/etc --prefix=/usr --localstatedir=/var --libdir=/usr/lib32
+	make
+}
+
+package() {
+	cd "${srcdir}/${_pkgbasename}-${pkgver}"
+	make DESTDIR="${pkgdir}" install
+	rm -rf ${pkgdir}/usr/{bin,include,share}
+}
diff --git a/multilib-testing/lib32-libglade/libglade-2.0.1-nowarning.patch b/multilib-testing/lib32-libglade/libglade-2.0.1-nowarning.patch
new file mode 100644
index 000000000..fd071215f
--- /dev/null
+++ b/multilib-testing/lib32-libglade/libglade-2.0.1-nowarning.patch
@@ -0,0 +1,39 @@
+--- libglade-2.0.1/glade/glade-gtk.c.nowarning	2003-08-29 14:50:10.000000000 -0400
++++ libglade-2.0.1/glade/glade-gtk.c	2003-08-29 14:58:41.000000000 -0400
+@@ -639,9 +639,8 @@
+ 		if (!strcmp (childinfo->properties[j].name, "label")) {
+ 		    label = childinfo->properties[j].value;
+ 		    break;
+-		} else {
+-		    g_warning ("Unknown CList child property: %s", childinfo->properties[j].name);
+ 		}
++		/* Ignore all other properties */
+ 	    }
+ 
+ 	    if (label) {
+@@ -683,6 +682,7 @@
+ 	    char *icon = NULL;
+ 	    gboolean use_stock = FALSE, active = FALSE, new_group = FALSE;
+ 	    gboolean use_underline = FALSE;
++	    gboolean sensitive = TRUE;
+ 	    GtkWidget *iconw = NULL;
+ 	    int j;
+ 
+@@ -708,6 +708,8 @@
+ 		    group_name = value;
+ 		} else if (!strcmp (name, "new_group")) {
+ 		    new_group = BOOL (value);
++		} else if (!strcmp (name, "sensitive")) {
++		    sensitive = BOOL (value);
+ 		} else if (!strcmp (name, "visible")) {
+ 		    /* ignore for now */
+ 		} else if (!strcmp (name, "tooltip")) {
+@@ -785,6 +787,8 @@
+ 		gtk_label_set_use_underline (GTK_LABEL (toolbar_child->label),
+ 					     TRUE);
+ 	    }
++	    
++	    gtk_widget_set_sensitive (child, sensitive);
+ 
+ 	    glade_xml_set_common_params (xml, child, childinfo->child);
+ 	} else {
diff --git a/multilib-testing/lib32-libpng/PKGBUILD b/multilib-testing/lib32-libpng/PKGBUILD
new file mode 100644
index 000000000..a435c516a
--- /dev/null
+++ b/multilib-testing/lib32-libpng/PKGBUILD
@@ -0,0 +1,50 @@
+# $Id: PKGBUILD 63343 2012-01-30 19:40:53Z ibiru $
+# Maintainer: Jan de Groot <jgc@archlinux.org>
+# Contributor: dorphell <dorphell@archlinux.org>
+# Contributor: Travis Willard <travis@archlinux.org>
+# Contributor: Douglas Soares de Andrade <douglas@archlinux.org>
+
+_pkgbasename=libpng
+pkgname=lib32-$_pkgbasename
+pkgver=1.5.7
+_apngver=1.5.7
+pkgrel=1
+pkgdesc="A collection of routines used to create PNG format graphics files (32-bit)"
+arch=('x86_64')
+url="http://www.libpng.org/pub/png/libpng.html"
+license=('custom')
+depends=('lib32-zlib' $_pkgbasename)
+makedepends=(gcc-multilib)
+options=('!libtool')
+source=("http://downloads.sourceforge.net/sourceforge/${_pkgbasename}/${_pkgbasename}-${pkgver}.tar.xz"
+        "http://downloads.sourceforge.net/sourceforge/libpng-apng/libpng-${_apngver}-apng.patch.gz")
+md5sums=('c3ae9ce4e81ec0aafdd4ac961586ee0d'
+         '6c6a674048cec94db1bc35decf0d142c')
+
+build() {
+  export CC="gcc -m32"
+  export CXX="g++ -m32"
+  export PKG_CONFIG_PATH="/usr/lib32/pkgconfig"
+
+  cd "${srcdir}/${_pkgbasename}-${pkgver}"
+
+  # Add animated PNG (apng) support
+  # see http://sourceforge.net/projects/libpng-apng/
+  patch -p1 -i "${srcdir}/libpng-${_apngver}-apng.patch"
+
+  ./configure --prefix=/usr --libdir=/usr/lib32
+  make
+}
+
+package() {
+  cd "${srcdir}/${_pkgbasename}-${pkgver}"
+
+  make DESTDIR="${pkgdir}" install
+
+  cd contrib/pngminus
+  make PNGLIB="-L${pkgdir}/usr/lib32 -lpng" -f makefile.std png2pnm pnm2png
+
+  rm -rf "${pkgdir}"/usr/{include,share,bin}
+  mkdir -p "$pkgdir/usr/share/licenses"
+  ln -s $_pkgbasename "$pkgdir/usr/share/licenses/$pkgname"
+}
diff --git a/multilib-testing/lib32-libtiff/PKGBUILD b/multilib-testing/lib32-libtiff/PKGBUILD
new file mode 100644
index 000000000..2e3e109e7
--- /dev/null
+++ b/multilib-testing/lib32-libtiff/PKGBUILD
@@ -0,0 +1,41 @@
+# $Id: PKGBUILD 63338 2012-01-30 19:30:53Z ibiru $
+# Maintainer: Eric Belanger <eric@archlinux.org>
+# Contributor: dorphell <dorphell@archlinux.org>
+
+_pkgbasename=libtiff
+pkgname=lib32-$_pkgbasename
+pkgver=4.0.0
+pkgrel=1
+pkgdesc="Library for manipulation of TIFF images (32-bit)"
+arch=('x86_64')
+url="http://www.remotesensing.org/libtiff/"
+license=('custom')
+depends=('lib32-libjpeg' 'lib32-zlib' $_pkgbasename)
+makedepends=(gcc-multilib)
+options=('!libtool')
+source=(ftp://ftp.remotesensing.org/pub/libtiff/tiff-${pkgver}.tar.gz)
+sha1sums=('85d85520fea40fc9291995a60e3d40cf980b5522')
+
+build() {
+  export CC="gcc -m32"
+  export CXX="g++ -m32"
+  export PKG_CONFIG_PATH="/usr/lib32/pkgconfig"
+
+  cd "${srcdir}/tiff-${pkgver}"
+  ./configure --prefix=/usr --sysconfdir=/etc --mandir=/usr/share/man --libdir=/usr/lib32
+  make
+}
+
+check() {
+ cd "${srcdir}/tiff-${pkgver}"
+ make check
+}
+
+package() {
+  cd "${srcdir}/tiff-${pkgver}"
+  make DESTDIR="${pkgdir}" install
+  
+  rm -rf "${pkgdir}"/usr/{include,share,bin}
+  mkdir -p "$pkgdir/usr/share/licenses"
+  ln -s $_pkgbasename "$pkgdir/usr/share/licenses/$pkgname"
+}
diff --git a/multilib-testing/lib32-libtiff/libtiff-CVE-2009-2285.patch b/multilib-testing/lib32-libtiff/libtiff-CVE-2009-2285.patch
new file mode 100644
index 000000000..435a84b53
--- /dev/null
+++ b/multilib-testing/lib32-libtiff/libtiff-CVE-2009-2285.patch
@@ -0,0 +1,22 @@
+Index: tiff-3.8.2/libtiff/tif_lzw.c
+===================================================================
+--- tiff-3.8.2.orig/libtiff/tif_lzw.c
++++ tiff-3.8.2/libtiff/tif_lzw.c
+@@ -421,7 +421,7 @@ LZWDecode(TIFF* tif, tidata_t op0, tsize
+ 			NextCode(tif, sp, bp, code, GetNextCode);
+ 			if (code == CODE_EOI)
+ 				break;
+-			if (code == CODE_CLEAR) {
++			if (code >= CODE_CLEAR) {
+ 				TIFFErrorExt(tif->tif_clientdata, tif->tif_name,
+ 				"LZWDecode: Corrupted LZW table at scanline %d",
+ 				tif->tif_row);
+@@ -624,7 +624,7 @@ LZWDecodeCompat(TIFF* tif, tidata_t op0,
+ 			NextCode(tif, sp, bp, code, GetNextCodeCompat);
+ 			if (code == CODE_EOI)
+ 				break;
+-			if (code == CODE_CLEAR) {
++			if (code >= CODE_CLEAR) {
+ 				TIFFErrorExt(tif->tif_clientdata, tif->tif_name,
+ 				"LZWDecode: Corrupted LZW table at scanline %d",
+ 				tif->tif_row);
diff --git a/multilib-testing/lib32-pango/PKGBUILD b/multilib-testing/lib32-pango/PKGBUILD
index e0c677b12..04cb097c6 100644
--- a/multilib-testing/lib32-pango/PKGBUILD
+++ b/multilib-testing/lib32-pango/PKGBUILD
@@ -1,11 +1,11 @@
-# $Id: PKGBUILD 62109 2012-01-16 01:55:13Z heftig $
+# $Id: PKGBUILD 63339 2012-01-30 19:30:57Z ibiru $
 # 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=2
+pkgrel=3
 pkgdesc="A library for layout and rendering of text (32-bit)"
 arch=('x86_64')
 license=('LGPL')
diff --git a/multilib-testing/lib32-qt/PKGBUILD b/multilib-testing/lib32-qt/PKGBUILD
new file mode 100644
index 000000000..4cbc5b7a4
--- /dev/null
+++ b/multilib-testing/lib32-qt/PKGBUILD
@@ -0,0 +1,86 @@
+# $Id: PKGBUILD 63340 2012-01-30 19:30:59Z ibiru $
+# Maintainer: Florian Pritz <flo@xssn.at>
+# Contributor: Andrea Scarpino <andrea@archlinux.org>
+# Contributor: Pierre Schmitz <pierre@archlinux.de>
+
+_pkgbasename=qt
+pkgname=lib32-$_pkgbasename
+pkgver=4.8.0
+pkgrel=2
+pkgdesc='A cross-platform application and UI framework (32-bit)'
+arch=('x86_64')
+url='http://qt-project.org/'
+license=('GPL3' 'LGPL')
+depends=(lib32-{fontconfig,sqlite3,alsa-lib,glib2,dbus-core,openssl}
+         lib32-lib{png,tiff,mng,gl,sm,xrandr,xv,xi} $_pkgbasename)
+optdepends=('lib32-libxinerama: Xinerama support'
+            'lib32-libxcursor: Xcursor support'
+            'lib32-libxfixes: Xfixes support')
+makedepends=(cups gcc-multilib lib32-{mesa,libcups,libxfixes,gtk2})
+options=('!libtool')
+_pkgfqn="${_pkgbasename}-everywhere-opensource-src-${pkgver}"
+source=("ftp://get.qt.nokia.com/qt/source/${_pkgfqn}.tar.gz")
+md5sums=('e8a5fdbeba2927c948d9f477a6abe904')
+
+build() {
+  cd $srcdir/$_pkgfqn
+
+  export QT4DIR=$srcdir/$_pkgfqn
+  export LD_LIBRARY_PATH=${QT4DIR}/lib:${LD_LIBRARY_PATH}
+  export PKG_CONFIG_PATH="/usr/lib32/pkgconfig"
+
+  # some of those are likely unnecessary, but I'm too lazy to find and remove them
+  sed -i "/^QMAKE_LINK\s/s|g++|g++ -m32|g" mkspecs/common/g++-base.conf
+  sed -i "s|-O2|${CXXFLAGS} -m32|" mkspecs/common/g++-base.conf
+  sed -i "s|-O2|${CXXFLAGS} -m32|" mkspecs/common/gcc-base.conf
+  sed -i "/^QMAKE_LFLAGS_RPATH/s| -Wl,-rpath,||g" mkspecs/common/gcc-base-unix.conf
+  sed -i "/^QMAKE_LFLAGS\s/s|+=|+= ${LDFLAGS} -m32|g" mkspecs/common/gcc-base.conf
+  sed -i "s|-Wl,-O1|-m32 -Wl,-O1|" mkspecs/common/g++-unix.conf
+  sed -e "s|-O2|$CXXFLAGS -m32|" \
+      -e "/^QMAKE_RPATH/s| -Wl,-rpath,||g" \
+      -e "/^QMAKE_LINK\s/s|g++|g++ -m32|g" \
+      -e "/^QMAKE_LFLAGS\s/s|+=|+= $LDFLAGS|g" \
+      -i mkspecs/common/g++.conf
+
+  ./configure -confirm-license -opensource -v -platform linux-g++-32 \
+    -prefix /usr \
+    -libdir /usr/lib32 \
+    -plugindir /usr/lib32/qt/plugins \
+    -importdir /usr/lib32/qt/imports \
+    -datadir /usr/share/qt \
+    -translationdir /usr/share/qt/translations \
+    -sysconfdir /etc \
+    -system-sqlite \
+    -no-phonon \
+    -no-phonon-backend \
+    -no-webkit \
+    -graphicssystem raster \
+    -openssl-linked \
+    -nomake demos \
+    -nomake examples \
+    -nomake docs \
+    -nomake tools \
+    -optimized-qmake \
+    -no-rpath \
+    -dbus-linked \
+    -reduce-relocations \
+    -no-openvg
+
+  make
+}
+
+package() {
+  cd $srcdir/$_pkgfqn
+  make INSTALL_ROOT=$pkgdir install
+
+  # Fix wrong path in pkgconfig files
+  find ${pkgdir}/usr/lib32/pkgconfig -type f -name '*.pc' \
+    -exec perl -pi -e "s, -L${srcdir}/?\S+,,g" {} \;
+  # Fix wrong path in prl files
+  find ${pkgdir}/usr/lib32 -type f -name '*.prl' \
+    -exec sed -i -e '/^QMAKE_PRL_BUILD_DIR/d;s/\(QMAKE_PRL_LIBS =\).*/\1/' {} \;
+
+  rm -rf "${pkgdir}"/usr/{include,share,bin}
+  mkdir -p "$pkgdir/usr/share/licenses"
+  ln -s $_pkgbasename "$pkgdir/usr/share/licenses/$pkgname"
+}
diff --git a/multilib-testing/lib32-zlib/PKGBUILD b/multilib-testing/lib32-zlib/PKGBUILD
new file mode 100644
index 000000000..0233e90ab
--- /dev/null
+++ b/multilib-testing/lib32-zlib/PKGBUILD
@@ -0,0 +1,41 @@
+# $Id: PKGBUILD 63029 2012-01-30 16:33:32Z pschmitz $
+# Maintainer: Ionut Biru <ibiru@archlinux.org>
+# Contributor: Pierre Schmitz <pierre@archlinux.de>
+
+_pkgbasename=zlib
+pkgname=lib32-$_pkgbasename
+pkgver=1.2.6
+pkgrel=1
+pkgdesc='Compression library implementing the deflate compression method found in gzip and PKZIP (32-bit)'
+arch=('x86_64')
+license=('custom')
+url="http://www.zlib.net/"
+depends=('lib32-glibc' "$_pkgbasename")
+makedepends=('gcc-multilib')
+source=("http://zlib.net/current/zlib-${pkgver}.tar.gz")
+md5sums=('618e944d7c7cd6521551e30b32322f4a')
+
+build() {
+	export CC="gcc -m32"
+	export CXX="g++ -m32"
+	export PKG_CONFIG_PATH="/usr/lib32/pkgconfig"
+
+	cd ${srcdir}/zlib-$pkgver
+	./configure --prefix=/usr \
+		--libdir=/usr/lib32
+	make
+}
+
+check() {
+	cd ${srcdir}/zlib-$pkgver
+	make test -j 1
+}
+
+package() {
+	cd ${srcdir}/zlib-$pkgver
+	make install DESTDIR=${pkgdir}
+
+	rm -rf "${pkgdir}"/usr/{include,share,bin}
+	mkdir -p "$pkgdir/usr/share/licenses"
+	ln -s $_pkgbasename "$pkgdir/usr/share/licenses/$pkgname"
+}
diff --git a/multilib-testing/wine/PKGBUILD b/multilib-testing/wine/PKGBUILD
index ef3a5008f..8a98d607a 100644
--- a/multilib-testing/wine/PKGBUILD
+++ b/multilib-testing/wine/PKGBUILD
@@ -1,17 +1,17 @@
-# $Id: PKGBUILD 62113 2012-01-16 01:55:33Z heftig $
+# $Id: PKGBUILD 63341 2012-01-30 19:31:02Z ibiru $
 # Maintainer: Sven-Hendrik Haase <sh@lutzhaase.com>
 # Contributor: Jan "heftig" Steffens <jan.steffens@gmail.com>
 # Contributor: Eduardo Romero <eduardo@archlinux.org>
 # Contributor: Giovanni Scafora <giovanni@archlinux.org>
 
 pkgname=wine
-pkgver=1.3.37
-pkgrel=1.1
+pkgver=1.4rc1
+pkgrel=1
 
 _pkgbasever=${pkgver/rc/-rc}
 
 source=(http://ibiblio.org/pub/linux/system/emulators/$pkgname/$pkgname-$_pkgbasever.tar.bz2)
-md5sums=('4bf25be22c130765283d9953d03b65c4')
+md5sums=('c8b7c5c1adaeebc8be1de01f5aa5b6c6')
 
 pkgdesc="A compatibility layer for running Windows programs"
 url="http://www.winehq.com"
@@ -34,6 +34,7 @@ makedepends=(autoconf ncurses bison perl fontforge flex prelink
   'gcc>=4.5.0-2'  'gcc-multilib>=4.5.0-2'
   giflib          lib32-giflib
   libpng          lib32-libpng
+  gnutls          lib32-gnutls
   libxinerama     lib32-libxinerama
   libxcomposite   lib32-libxcomposite
   libxmu          lib32-libxmu
@@ -52,6 +53,7 @@ optdepends=(
   giflib          lib32-giflib
   libpng          lib32-libpng
   libldap         lib32-libldap
+  gnutls          lib32-gnutls
   lcms            lib32-lcms
   libxml2         lib32-libxml2
   mpg123          lib32-mpg123