From ee730d01ffcb483fd6b0b53fa3376cdde4590d72 Mon Sep 17 00:00:00 2001
From: Manuel <manutortosa@chakra-project.org>
Date: Tue, 18 Dec 2012 20:01:31 +0000
Subject: [PATCH] Sync

---
 lib32-glib2/PKGBUILD                          |  2 +-
 {lib32-libpulse => lib32-pulseaudio}/PKGBUILD | 21 ++++++-----------
 wine/PKGBUILD                                 | 23 +++----------------
 3 files changed, 11 insertions(+), 35 deletions(-)
 rename {lib32-libpulse => lib32-pulseaudio}/PKGBUILD (71%)

diff --git a/lib32-glib2/PKGBUILD b/lib32-glib2/PKGBUILD
index edcafd3..c28c773 100644
--- a/lib32-glib2/PKGBUILD
+++ b/lib32-glib2/PKGBUILD
@@ -7,7 +7,7 @@ _pkgbasename=glib2
 pkgname="lib32-${_pkgbasename}"
 pkgver=2.32.1
 _pkgver=2.32
-pkgrel=3
+pkgrel=4
 pkgdesc="Common C routines used by GTK+ 2.4 and other libs. (ELF32)"
 url="http://www.gtk.org/"
 arch=('x86_64')
diff --git a/lib32-libpulse/PKGBUILD b/lib32-pulseaudio/PKGBUILD
similarity index 71%
rename from lib32-libpulse/PKGBUILD
rename to lib32-pulseaudio/PKGBUILD
index 02f1dab..a96c9b5 100644
--- a/lib32-libpulse/PKGBUILD
+++ b/lib32-pulseaudio/PKGBUILD
@@ -1,16 +1,9 @@
 # Lib32 Packages for Chakra, part of chakra-project.org
-#
-# maintainer (x86_64): Giuseppe Calà <jiveaxe@gmail.com>
-# maintainer (x86_64): Anke Boersma <abveritas[at]chakra-project[dot]org>
-# contributor: Jan Alexander Steffens (heftig) <jan.steffens@gmail.com>
-# Contributor: Daniel J Griffiths <ghost1227@archlinux.us>
-# Contributor: Corrado Primier <bardo@aur.archlinux.org>
-# Contributor: William Rea <sillywilly@gmail.com>
 
-_pkgbasename=libpulse
+_pkgbasename=pulseaudio
 pkgname="lib32-${_pkgbasename}"
 pkgdesc="A featureful, general-purpose sound server. (32-bit client libraries)"
-pkgver=2.1
+pkgver=3.0
 pkgrel=1
 arch=('x86_64')
 url="http://pulseaudio.org/"
@@ -18,16 +11,16 @@ license=('GPL' 'LGPL')
 depends=(lib32-{dbus-core,xcb-util,json-c}
          lib32-lib{asyncns,cap,xtst,sm,sndfile,samplerate}
          'webrtc-audio-processing' 'systemd>=189'
-         "${_pkgbasename}=${pkgver}")
+         "pulseaudio=${pkgver}")
 makedepends=('pkgconfig' 'gcc-multilib' 'lib32-libtool' 'intltool'
 		         'lib32-glib2' 'lib32-speex')
 optdepends=('lib32-alsa-plugins: ALSA support')
-provides=("lib32-pulseaudio=${pkgver}")
-conflicts=('lib32-pulseaudio')
-replaces=('lib32-pulseaudio')
+provides=("lib32-libpulse=${pkgver}")
+conflicts=('lib32-libpulse')
+replaces=('lib32-libpulse')
 options=(!emptydirs !libtool)
 source=("http://freedesktop.org/software/pulseaudio/releases/pulseaudio-${pkgver}.tar.xz")
-sha256sums=('ef6b347bf47abfb98080795f1583018ac959b4aeb4df916b879f9e1eaba0ca7f')
+sha256sums=('c90bfda29605942d08e3e218ef10e3c660506a06651a616bfbb6a6df8392836d')
 
 _libs="libpulse.la libpulse-simple.la libpulse-mainloop-glib.la"
 _pkglibs="libpulsecommon-$pkgver.la libpulsedsp.la"
diff --git a/wine/PKGBUILD b/wine/PKGBUILD
index c82c105..318e746 100644
--- a/wine/PKGBUILD
+++ b/wine/PKGBUILD
@@ -4,19 +4,16 @@
 # maintainer (x86_64): Anke Boersma <abveritas[at]chakra-project[dot]org>
 
 pkgname=wine
-pkgver=1.5.12
+pkgver=1.5.19
 pkgrel=2
-
 _pkgbasever=${pkgver/rc/-rc}
-
 source=(http://ibiblio.org/pub/linux/system/emulators/$pkgname/$pkgname-$_pkgbasever.tar.bz2)
-md5sums=('42d8a0b933768447aa73447c4f0ec2ed')
-
+md5sums=('713ad4e383abf4288c48c3cf9743a503')
 pkgdesc="A compatibility layer for running Windows programs"
 url="http://www.winehq.com"
 categories=('system')
 screenshot=('http://wstaw.org/m/2012/04/28/wine.png')
-arch=(i686 x86_64)
+arch=(x86_64)
 license=(LGPL)
 install=wine.install
 
@@ -73,14 +70,6 @@ optdepends=(
   samba
 )
 
-if [[ $CARCH == i686 ]]; then
-  # Strip lib32 etc. on i686
-  depends=(${depends[@]/*32-*/})
-  makedepends=(${makedepends[@]/*32-*/})
-  makedepends=(${makedepends[@]/*-multilib*/})
-  optdepends=(${optdepends[@]/*32-*/})
-fi
-
 build() {
   cd "$srcdir"
 
@@ -95,7 +84,6 @@ build() {
   export CFLAGS="${CFLAGS/-D_FORTIFY_SOURCE=2/} -D_FORTIFY_SOURCE=0"
   export CXXFLAGS="${CFLAGS/-D_FORTIFY_SOURCE=2/} -D_FORTIFY_SOURCE=0"
 
-  if [[ $CARCH == x86_64 ]]; then
     msg2 "Building Wine-64..."
 
     mkdir $pkgname-64-build
@@ -115,7 +103,6 @@ build() {
     )
 
     export PKG_CONFIG_PATH="/usr/lib32/pkgconfig"
-  fi
 
   msg2 "Building Wine-32..."
   cd "$srcdir/$pkgname-32-build"
@@ -133,9 +120,6 @@ package() {
   msg2 "Packaging Wine-32..."
   cd "$srcdir/$pkgname-32-build"
 
-  if [[ $CARCH == i686 ]]; then
-    make prefix="$pkgdir/usr" install
-  else
     make prefix="$pkgdir/usr" \
       libdir="$pkgdir/usr/lib32" \
       dlldir="$pkgdir/usr/lib32/wine" install
@@ -145,6 +129,5 @@ package() {
     make prefix="$pkgdir/usr" \
       libdir="$pkgdir/usr/lib" \
       dlldir="$pkgdir/usr/lib/wine" install
-  fi
 }