system/wine-staging: Updated for version 3.10.

Signed-off-by: David Spencer <idlemoor@slackbuilds.org>

4 files changed, 43 insertions, 30 deletions

diff --git a/system/wine-staging/README b/system/wine-staging/README
index d5abdb9df2..56ea72ff4b 100644
--- a/system/wine-staging/README
+++ b/system/wine-staging/README
@@ -1,23 +1,23 @@
 wine-staging (Wine Staging is the testing area of winehq.org)
 
-It  contains  bug fixes and features, which have not been  integrated
-into the development branch yet.  The  idea  of  Wine  Staging  is to
-provide  experimental  features  faster  to  end  users  and  to give
-developers  the  possibility  to  discuss  and  improve their patches
+It contains bug fixes and features, which have not been integrated
+into the development branch yet. The idea of Wine Staging is to
+provide experimental features faster to end users and to give
+developers the possibility to discuss and improve their patches
 before they are integrated into the main branch.
 
-This  is  a  current  development  branch  of Wine appended with full
-patches of Staging area.
+This is a current development branch of Wine appended with full
+patches of the Staging branch.
 
-NOTE:  At  the moment, it only compiles a 32-bit version of Wine, this
-may change in the future with  the ability to compile both 64-bit  and
-32-bit version of Wine.  You'll  need  a  multilib  system in order to
-compile this.
+NOTE: At the moment, it only compiles a 32-bit version of Wine,
+this may change in the future with the ability to compile both
+64-bit and 32-bit versions of Wine. You'll need a full multilib
+system in order to compile this under x86_64 system.
 
-While  this  is  list  as a separate package, this WILL overwrite your
-normal Wine binaries! Please keep this in mind.
+While this is list as a separate package, this WILL overwrite
+your normal Wine binaries! Please keep this in mind.
 
-Compile  options/optional  dependences  (keep in mind, you need 32-bit
-libs of each):
+Compile options/optional dependences (keep in mind, you need
+32-bit libs of each):
 
 See README.SLACKWARE for a giant list of dependencies.
diff --git a/system/wine-staging/slack-desc b/system/wine-staging/slack-desc
index a3948eada0..721080c1bd 100644
--- a/system/wine-staging/slack-desc
+++ b/system/wine-staging/slack-desc
@@ -8,12 +8,12 @@
             |-----handy-ruler------------------------------------------------------|
 wine-staging: wine-staging (Wine Staging is the testing area of winehq.org)
 wine-staging:
-wine-staging: It  contains  bug fixes and features, which have not been  integrated
-wine-staging: into the development branch yet.  The  idea  of  Wine  Staging  is to
-wine-staging: provide  experimental  features  faster  to  end  users  and  to give
-wine-staging: developers  the  possibility  to  discuss  and  improve their patches
+wine-staging: It contains bug fixes and features, which have not been integrated
+wine-staging: into the development branch yet. The idea of Wine Staging is to
+wine-staging: provide experimental features faster to end users and to give
+wine-staging: developers the possibility to discuss and improve their patches
 wine-staging: before they are integrated into the main branch.
 wine-staging:
-wine-staging: Homepage: http://www.wine-staging.com/
+wine-staging: Homepage: https://wiki.winehq.org/Wine-Staging
 wine-staging:
 wine-staging:
diff --git a/system/wine-staging/wine-staging.SlackBuild b/system/wine-staging/wine-staging.SlackBuild
index 5994d836c4..1f9804679f 100644
--- a/system/wine-staging/wine-staging.SlackBuild
+++ b/system/wine-staging/wine-staging.SlackBuild
@@ -2,7 +2,7 @@
 #
 # Slackware build script for wine-staging.
 #
-# Copyright 2016-2017  Edinaldo P. Silva, Rio de Janeiro, Brazil.
+# Copyright 2016-2018  Edinaldo P. Silva, Rio de Janeiro, Brazil.
 # Copyright 2015 Gethyn ThomasQuail <gethyn@bloodbathsoftworks.com>
 #
 # All rights reserved.
@@ -30,7 +30,7 @@
 # ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
 PRGNAM=wine-staging
-VERSION=${VERSION:-2.21}
+VERSION=${VERSION:-3.10}
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
 
@@ -65,16 +65,27 @@ else
   LIBDIRSUFFIX=""
 fi
 
-SRCNAM=${SRCNAM:-wine-patched-staging}
-
 set -e
 
 rm -rf $PKG
 mkdir -p $TMP $PKG $OUTPUT
 cd $TMP
-rm -rf $SRCNAM-$VERSION
-tar xvf $CWD/$SRCNAM-$VERSION.tar.gz
-cd $SRCNAM-$VERSION
+rm -rf $PRGNAM-$VERSION
+rm -rf wine-$VERSION
+tar xvf $CWD/wine-$VERSION.tar.xz
+tar xvf $CWD/$PRGNAM-$VERSION.tar.gz
+
+cd $PRGNAM-$VERSION/patches
+chown -R root:root .
+find -L . \
+ \( -perm 777 -o -perm 775 -o -perm 750 -o -perm 711 -o -perm 555 \
+  -o -perm 511 \) -exec chmod 755 {} \; -o \
+ \( -perm 666 -o -perm 664 -o -perm 640 -o -perm 600 -o -perm 444 \
+  -o -perm 440 -o -perm 400 \) -exec chmod 644 {} \;
+
+./patchinstall.sh DESTDIR=$TMP/wine-$VERSION --all
+
+cd $TMP/wine-$VERSION
 chown -R root:root .
 find -L . \
  \( -perm 777 -o -perm 775 -o -perm 750 -o -perm 711 -o -perm 555 \
diff --git a/system/wine-staging/wine-staging.info b/system/wine-staging/wine-staging.info
index bdf7ee8ff7..e5b67042d6 100644
--- a/system/wine-staging/wine-staging.info
+++ b/system/wine-staging/wine-staging.info
@@ -1,8 +1,10 @@
 PRGNAM="wine-staging"
-VERSION="2.21"
-HOMEPAGE="http://www.wine-staging.com/"
-DOWNLOAD="https://github.com/wine-compholio/wine-patched/archive/staging-2.21/wine-patched-staging-2.21.tar.gz"
-MD5SUM="278bcb0f200511deba9120e41334db5e"
+VERSION="3.10"
+HOMEPAGE="https://wiki.winehq.org/Wine-Staging"
+DOWNLOAD="https://dl.winehq.org/wine/source/3.x/wine-3.10.tar.xz \
+          https://github.com/wine-staging/wine-staging/archive/v3.10/wine-staging-3.10.tar.gz"
+MD5SUM="eec9261ac33b46709f99537d359bd4ee \
+        c0b369d69af1ab6ab1dafc5d517e3a84"
 DOWNLOAD_x86_64="UNSUPPORTED"
 MD5SUM_x86_64=""
 REQUIRES=""