[arch-commits] Commit in wine/trunk (PKGBUILD)

Sven-Hendrik Haase svenstaro at nymeria.archlinux.org
Sat Mar 2 15:20:28 UTC 2013


    Date: Saturday, March 2, 2013 @ 16:20:28
  Author: svenstaro
Revision: 85520

upgpkg: wine 1.5.25-1

Updating 1.5.25

Modified:
  wine/trunk/PKGBUILD

----------+
 PKGBUILD |   11 ++++++++---
 1 file changed, 8 insertions(+), 3 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2013-03-02 15:17:37 UTC (rev 85519)
+++ PKGBUILD	2013-03-02 15:20:28 UTC (rev 85520)
@@ -20,13 +20,14 @@
 license=(LGPL)
 install=wine.install
 
-depends=(
+_depends=(
   fontconfig      lib32-fontconfig
   libxcursor      lib32-libxcursor
   libxrandr       lib32-libxrandr
   libxdamage      lib32-libxdamage
   libxi           lib32-libxi
   gettext         lib32-gettext
+  freetype2       lib32-freetype2
   glu             lib32-glu
   libsm           lib32-libsm
   gcc-libs        lib32-gcc-libs
@@ -51,6 +52,7 @@
   alsa-lib        lib32-alsa-lib
   libxcomposite   lib32-libxcomposite
   mesa            lib32-mesa
+  mesa-libgl      lib32-mesa-libgl
   oss
   samba
 )
@@ -77,11 +79,12 @@
 
 if [[ $CARCH == i686 ]]; then
   # Strip lib32 etc. on i686
-  depends=(${depends[@]/*32-*/})
-  makedepends=(${makedepends[@]/*32-*/})
+  _depends=(${_depends[@]/*32-*/})
+  makedepends=(${makedepends[@]/*32-*/} ${_depends[@]})
   makedepends=(${makedepends[@]/*-multilib*/})
   optdepends=(${optdepends[@]/*32-*/})
 else
+  makedepends=(${makedepends[@]} ${_depends[@]})
   provides=("bin32-wine=$pkgver" "wine-wow64=$pkgver")
   conflicts=('bin32-wine' 'wine-wow64')
   replaces=('bin32-wine')
@@ -133,6 +136,8 @@
 }
 
 package() {
+  depends=(${_depends[@]})
+
   msg2 "Packaging Wine-32..."
   cd "$srcdir/$pkgname-32-build"
 




More information about the arch-commits mailing list