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

[Felix Yan]

    Date: Tuesday, November 24, 2015 @ 06:25:46
  Author: fyan
Revision: 147588

upgpkg: wine-staging 1.8rc1-1

Modified:
  wine-staging/trunk/PKGBUILD

----------+
 PKGBUILD |   26 ++++++++++++--------------
 1 file changed, 12 insertions(+), 14 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2015-11-24 04:16:43 UTC (rev 147587)
+++ PKGBUILD	2015-11-24 05:25:46 UTC (rev 147588)
@@ -6,14 +6,14 @@
 # Contributor: Giovanni Scafora <giovanni at archlinux.org>
 
 pkgname=wine-staging
-pkgver=1.7.55
+pkgver=1.8rc1
 pkgrel=1
 
 _pkgbasever=${pkgver/rc/-rc}
 
-source=("https://github.com/wine-compholio/wine-patched/archive/staging-$pkgver.tar.gz"
+source=("https://github.com/wine-compholio/wine-patched/archive/staging-$_pkgbasever.tar.gz"
         30-win32-aliases.conf)
-sha1sums=('18317cfdc7a9a751910eb31df4996bd430a23c18'
+sha1sums=('9e7171224002fa6d3bbf6d4a08e8e2b4e47d21de'
           '023a5c901c6a091c56e76b6a62d141d87cce9fdb')
 
 pkgdesc="A compatibility layer for running Windows programs - Staging branch"
@@ -105,27 +105,25 @@
 fi
 
 prepare() {
-  cd wine-patched-staging-$pkgver
+  # Allow ccache to work
+  mv wine-patched-staging-$_pkgbasever $pkgname
 
-  sed 's|OpenCL/opencl.h|CL/opencl.h|g' -i configure*
-}
+  sed 's|OpenCL/opencl.h|CL/opencl.h|g' -i $pkgname/configure*
 
-build() {
-  cd "$srcdir"
-
-  # remove once https://bugs.winehq.org/show_bug.cgi?id=38653 is resolved
+  # Remove once https://bugs.winehq.org/show_bug.cgi?id=38653 is resolved
   export CFLAGS="${CFLAGS/-O2/} -O0"
   export CXXFLAGS="${CXXFLAGS/-O2/} -O0"
 
-  # Allow ccache to work
-  mv wine-patched-staging-$pkgver $pkgname
+  # These additional CPPFLAGS solve FS#27662 and FS#34195
+  export CPPFLAGS="${CPPFLAGS/-D_FORTIFY_SOURCE=2/} -D_FORTIFY_SOURCE=0"
 
   # Get rid of old build dirs
   rm -rf $pkgname-{32,64}-build
   mkdir $pkgname-32-build
+}
 
-  # These additional CPPFLAGS solve FS#27662 and FS#34195
-  export CPPFLAGS="${CPPFLAGS/-D_FORTIFY_SOURCE=2/} -D_FORTIFY_SOURCE=0"
+build() {
+  cd "$srcdir"
 
   if [[ $CARCH == x86_64 ]]; then
     msg2 "Building Wine-64..."