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

[Sven-Hendrik Haase]

    Date: Wednesday, December 13, 2017 @ 04:59:49
  Author: svenstaro
Revision: 274108

upgpkg: wine 3.0rc1-1

Modified:
  wine/trunk/PKGBUILD

----------+
 PKGBUILD |   83 ++++++++++++++++++++++---------------------------------------
 1 file changed, 30 insertions(+), 53 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2017-12-13 04:59:35 UTC (rev 274107)
+++ PKGBUILD	2017-12-13 04:59:49 UTC (rev 274108)
@@ -5,15 +5,15 @@
 # Contributor: Giovanni Scafora <giovanni at archlinux.org>
 
 pkgname=wine
-pkgver=2.22
+pkgver=3.0rc1
 pkgrel=1
 
 _pkgbasever=${pkgver/rc/-rc}
 
-source=(https://dl.winehq.org/wine/source/2.x/$pkgname-$_pkgbasever.tar.xz{,.sign}
+source=(https://dl.winehq.org/wine/source/3.0/$pkgname-$_pkgbasever.tar.xz{,.sign}
         harmony-fix.diff
         30-win32-aliases.conf)
-sha512sums=('14ecc25c3012c4eb9b1d3207372d0a4187f62593f986caca3196811b8aac0a7b898ae9acd94c707e0d63b6702019cf5051a964ada606b1ff8fb034bb353116bb'
+sha512sums=('d9d1062be7f843681113f3fe669522cd5d47209ddc47625fa9b82b2e17c1d239d72846640d849e7fd9d5055db8623999bfbda34312ae67500f14345cbf12b73d'
             'SKIP'
             'b86edf07bfc560f403fdfd5a71f97930ee2a4c3f76c92cc1a0dbb2e107be9db3bed3a727a0430d8a049583c63dd11f5d4567fb7aa69b193997c6da241acc4f2e'
             '6e54ece7ec7022b3c9d94ad64bdf1017338da16c618966e8baf398e6f18f80f7b0576edf1d1da47ed77b96d577e4cbb2bb0156b0b11c183a0accf22654b0a2bb')
@@ -25,8 +25,7 @@
 arch=(x86_64)
 options=(staticlibs)
 license=(LGPL)
-
-_depends=(
+depends=(
   fontconfig      lib32-fontconfig
   lcms2           lib32-lcms2
   libxml2         lib32-libxml2
@@ -42,9 +41,8 @@
   libpcap         lib32-libpcap
   desktop-file-utils
 )
-
 makedepends=(autoconf ncurses bison perl fontforge flex
-  'gcc>=4.5.0-2'  'gcc-multilib>=4.5.0-2'
+  'gcc>=4.5.0-2'
   giflib                lib32-giflib
   libpng                lib32-libpng
   gnutls                lib32-gnutls
@@ -67,7 +65,6 @@
   samba
   opencl-headers
 )
-
 optdepends=(
   giflib                lib32-giflib
   libpng                lib32-libpng
@@ -89,20 +86,8 @@
   cups
   samba           dosbox
 )
+makedepends=(${makedepends[@]} ${depends[@]})
 
-if [[ $CARCH == i686 ]]; then
-  # Strip lib32 etc. on i686
-  _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')
-fi
-
 prepare() {
   # Allow ccache to work
   mv $pkgname-$_pkgbasever $pkgname
@@ -123,28 +108,26 @@
 build() {
   cd "$srcdir"
 
-  if [[ $CARCH == x86_64 ]]; then
-    msg2 "Building Wine-64..."
+  msg2 "Building Wine-64..."
 
-    mkdir $pkgname-64-build
-    cd "$srcdir/$pkgname-64-build"
-    ../$pkgname/configure \
-      --prefix=/usr \
-      --libdir=/usr/lib \
-      --with-x \
-      --with-gstreamer \
-      --enable-win64
-    # Gstreamer was disabled for FS#33655
+  mkdir $pkgname-64-build
+  cd "$srcdir/$pkgname-64-build"
+  ../$pkgname/configure \
+    --prefix=/usr \
+    --libdir=/usr/lib \
+    --with-x \
+    --with-gstreamer \
+    --enable-win64
+  # Gstreamer was disabled for FS#33655
 
-    make
+  make
 
-    _wine32opts=(
-      --libdir=/usr/lib32
-      --with-wine64="$srcdir/$pkgname-64-build"
-    )
+  _wine32opts=(
+    --libdir=/usr/lib32
+    --with-wine64="$srcdir/$pkgname-64-build"
+  )
 
-    export PKG_CONFIG_PATH="/usr/lib32/pkgconfig"
-  fi
+  export PKG_CONFIG_PATH="/usr/lib32/pkgconfig"
 
   msg2 "Building Wine-32..."
   cd "$srcdir/$pkgname-32-build"
@@ -158,24 +141,18 @@
 }
 
 package() {
-  depends=(${_depends[@]})
-
   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
+  make prefix="$pkgdir/usr" \
+    libdir="$pkgdir/usr/lib32" \
+    dlldir="$pkgdir/usr/lib32/wine" install
 
-    msg2 "Packaging Wine-64..."
-    cd "$srcdir/$pkgname-64-build"
-    make prefix="$pkgdir/usr" \
-      libdir="$pkgdir/usr/lib" \
-      dlldir="$pkgdir/usr/lib/wine" install
-  fi
+  msg2 "Packaging Wine-64..."
+  cd "$srcdir/$pkgname-64-build"
+  make prefix="$pkgdir/usr" \
+    libdir="$pkgdir/usr/lib" \
+    dlldir="$pkgdir/usr/lib/wine" install
 
   # Font aliasing settings for Win32 applications
   install -d "$pkgdir"/etc/fonts/conf.{avail,d}