3 files changed, 66 insertions, 57 deletions
diff --git a/system/wine-staging/README b/system/wine-staging/README
index 3387801ff404..cdb6a408dca3 100644
--- a/system/wine-staging/README
+++ b/system/wine-staging/README
@@ -9,60 +9,75 @@ before they are integrated into the main branch.
 This is a current development branch of Wine appended with full
 patches of the Staging branch.
 
-MULTILIB.
+============================================================
 
-With no options this script will build the 32bit wine-staging
-package ONLY!, for which you need to have a FULL multilib
-system installed (see below).
+OPTIONS
 
-To build a package for both 64bit and 32bit Windows executable
-support, use this:
+With no options this SlackBuild will build a 32 bit package,
+for which you need to have either have multilib installed, or
+building in a 32 OS, or in a 32 bit chroot.
 
- # WIN64=yes sh wine-staging.SlackBuild
+To enable 64 bit support use:
 
-See README.SLACKWARE for a giant list of dependencies and
-AlienBOB's multilib readme and repo:
+  WIN64=yes ./wine.SlackBuild
 
-https://docs.slackware.com/slackware:multilib
-http://www.slackware.com/~alien/multilib/
+To disable win32 support, use:
 
-From wine's maintainer David Woodfall you can grab a script
-to get and install the multilib packages:
+  WIN32=no ./wine.SlackBuild
 
-http://tty1.uk/scripts/slackware/alien-multilib-rsync.sh
+To disable OpenGL support, use:
 
-Be sure to read the short instructions at the top. If you use
-slackpkg then you will also want to blacklist his packages in
-/etc/slackpkg/blacklist:
+  OPENGL=no ./wine.SlackBuild
 
- [0-9]+alien
- [0-9]+compat32
+The above options can be combined.
 
-WINEPREFIX.
+============================================================
 
-With 64bit support you would use the wine64 binary. If you have a
-combined 32 and 64bit package you need to set the environmental
-variable WINEPREFIX to point to the 64bit wine directory when running
-wine64, which should be different to the 32bit directory (~/.wine by
-default). Example:
+OPTIONAL DEPENDENCIES
 
- $ WINEPREFIX=~/.wine64 wine64 notepad
+fontforge:
 
-To build the 32bit wine on x86_64 you will need to have multilib
-packages installed, unless you want to build for Windows 64 bit
-applications only using:
+To build tahoma, tahomabd, and marlett fonts.
 
- # WIN64=yes NOWIN32=yes sh wine-staging.SlackBuild
+webcore-fonts:
 
-OPENGL.
+For tahoma, lucida console, MS fonts for the web and Win
+Vista.
 
-To disable OpenGL support, use:
+============================================================
+
+MULTILIB
+
+To build the 32 bit wine on x86_64 you will need to have
+multilib packages installed, unless you want to build for
+Windows 64 bit applications only (using WIN64=yes WIN32=no.)
+
+alienBOB's multilib readme and repo:
+
+https://docs.slackware.com/slackware:multilib
+http://www.slackware.com/~alien/multilib/
+
+A script that rsyncs with alienBOB's repo and installs the
+multilib packages which can be found here:
+
+http://tty1.uk/scripts/slackware/alien-multilib-rsync.sh
+
+Be sure to read the short instructions at the top.  If you
+use slackpkg then you will also want to blacklist his
+packages in /etc/slackpkg/blacklist:
+
+[0-9]+alien
+[0-9]+compat32
 
- # OPENGL=no ./wine.SlackBuild
+============================================================
 
-Optional dependencies: fontforge, webcore-fonts, winetricks
+NOTES
 
-NOTE: you can increase buildtime passing some like that to the
-SlackBuild script:
+With 64 bit support you would use the wine64 binary.  If you
+have a combined 32 and 64 bit package you need to set the
+environmental variable WINEPREFIX to point to the 64 bit
+wine directory when running wine64, which should be
+different to the 32 bit directory (~/.wine by default).
+Example:
 
- # MAKEFLAGS=-j6 ./wine-staging.SlackBuild
+WINEPREFIX=~/.wine64 wine64 notepad
diff --git a/system/wine-staging/wine-staging.SlackBuild b/system/wine-staging/wine-staging.SlackBuild
index b92c4a6ec47a..c04d2e0b45a2 100644
--- a/system/wine-staging/wine-staging.SlackBuild
+++ b/system/wine-staging/wine-staging.SlackBuild
@@ -29,8 +29,10 @@
 # OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
 # ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
+# Now maintained by Dave Woodfall <dave@slackbuilds.org>
+
 PRGNAM=wine-staging
-VERSION=${VERSION:-4.21}
+VERSION=${VERSION:-5.0}
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
 
@@ -46,6 +48,8 @@ CWD=$(pwd)
 TMP=${TMP:-/tmp/SBo}
 PKG=$TMP/package-$PRGNAM
 OUTPUT=${OUTPUT:-/tmp}
+WIN32=${WIN32:-yes}
+WIN64=${WIN64:-no}
 
 # If your video card does not support hardware accelerated OpenGL,
 # run the script like:   OPENGL=NO ./wine.SlackBuild
@@ -54,16 +58,7 @@ if [ "${OPENGL:-YES}" = "YES" ]; then
 else
   do_opengl="without"
 fi
-
-if [ -z "$ARCH" ]; then
-  case "$(uname -m)" in
-    i?86) ARCH=i586 ;;
-    arm*) ARCH=arm ;;
-    *) ARCH=$(uname -m) ;;
-  esac
-fi
-
-if [ -n "$NOWIN32" ] && [ -z "$WIN64" ]; then
+if [ "$WIN32" = "no" ] && [ "$WIN64" = "no" ]; then
   echo "Both 64 and 32 bit builds disabled. Nothing to do."
   exit 1
 fi
@@ -84,7 +79,6 @@ case "$ARCH" in
     SLKCFLAGS="-Os -march=$ARCH -mtune=i686"
     ;;
   x86_64)
-    [ -n "$WIN64" ] && WIN64="--enable-win64"
     SLKCFLAGS="-O2 -fPIC"
     LIBDIRSUFFIX="64"
     ;;
@@ -128,7 +122,7 @@ if [ "$ARCH" == "i?86" ]; then
   patch -p1 --verbose < $CWD/x86_remove_fpic.patch
 fi
 
-if [ -n "$WIN64" ]; then
+if [ "$WIN64" = "yes" ]; then
   wine64="--with-wine64=../wine64"
   mkdir wine64
   cd wine64
@@ -157,7 +151,7 @@ if [ -n "$WIN64" ]; then
   cd ..
 fi
 
-if [ -z "$NOWIN32" ]; then
+if [ "$WIN32" = "yes" ]; then
   mkdir wine32
   cd wine32
 
diff --git a/system/wine-staging/wine-staging.info b/system/wine-staging/wine-staging.info
index 7c51635e6e82..738f8c9f29e3 100644
--- a/system/wine-staging/wine-staging.info
+++ b/system/wine-staging/wine-staging.info
@@ -1,11 +1,11 @@
 PRGNAM="wine-staging"
-VERSION="4.21"
+VERSION="5.0"
 HOMEPAGE="https://wiki.winehq.org/Wine-Staging"
-DOWNLOAD="https://dl.winehq.org/wine/source/4.x/wine-4.21.tar.xz \
-          https://github.com/wine-staging/wine-staging/archive/v4.21/wine-staging-4.21.tar.gz"
-MD5SUM="8c0b7b7f16c9fcbad663a35903b4613b \
-        c253c253bdfb5ece6b7889bb642894a7"
-DOWNLOAD_x86_64="UNSUPPORTED"
+DOWNLOAD="https://dl.winehq.org/wine/source/5.0/wine-5.0.tar.xz \
+          https://github.com/wine-staging/wine-staging/archive/v5.0/wine-staging-5.0.tar.gz"
+MD5SUM="95993144d0c63bdd31110ae5a90c77b2 \
+        7f2c5081233bc4a8a69316b750789880"
+DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
 REQUIRES=""
 MAINTAINER="Dave Woodfall"