diff --git a/system/wine/README b/system/wine/README index bc82781a80..90ef84ef54 100644 --- a/system/wine/README +++ b/system/wine/README @@ -1,68 +1,71 @@ -Wine is an Open Source implementation of the Windows API on top of X -for Linux and Unix. +Wine is an Open Source implementation of the Windows API on +top of X for Linux and Unix. -NOTE: This builds the stable version of wine. If you need +NOTE: This builds the stable version of wine. If you need cutting-edge then you may want to check out wine-staging. -Options: -With no options this SlackBuild will build the 32bit wine package, -for which you need to have multilib installed (see below). +OPTIONS -To build a package for both 64bit and 32bit Windows executable -support, use: +With no options this SlackBuild will build a 32 bit package, +for which you need to have multilib installed. -WIN64=yes ./wine.SlackBuild +To enable 64 bit support use: + + WIN64=yes ./wine.SlackBuild To disable win32 support, use: -NOWIN32=yes ./wine.SlackBuild - -Or combine them both to build only a 64bit wine package. + WIN32=no ./wine.SlackBuild To disable OpenGL support, use: -OPENGL=no ./wine.SlackBuild + OPENGL=no ./wine.SlackBuild The above options can be combined. -Optional dependencies: + +OPTIONAL DEPENDENCIES fontforge: -(to build tahoma, tahomabd, and marlett fonts) + +To build tahoma, tahomabd, and marlett fonts. webcore-fonts: -(for tahoma, lucida console, MS fonts for the web and Win Vista) -==================================================================== +For tahoma, lucida console, MS fonts for the web and Win +Vista. + +============================================================ NOTES -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: +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: WINEPREFIX=~/.wine64 wine64 notepad -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 WIN64=yes NOWIN32=yes). +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/ -I have made a script that rsyncs with alienBOB's repo and installs -the multilib packages which can be found here: +I have a script that rsyncs with alienBOB's repo and +installs the multilib packages which can be found here: http://dawoodfall.net/files/scripts/slackware/alien-multilib-rysnc.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: +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 diff --git a/system/wine/wine.SlackBuild b/system/wine/wine.SlackBuild index 8967927c72..03ccb9bacc 100644 --- a/system/wine/wine.SlackBuild +++ b/system/wine/wine.SlackBuild @@ -24,17 +24,19 @@ # ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. PRGNAM=wine -VERSION=${VERSION:-3.0.2} +VERSION=${VERSION:-3.0.3} BUILD=${BUILD:-1} TAG=${TAG:-_SBo} 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, # then run the script like: OPENGL=NO ./wine.SlackBuild -if [ "${OPENGL:-YES}" = "YES" ]; then +if [ "${OPENGL:-yes}" = "yes" ]; then do_opengl="with" else do_opengl="without" @@ -48,7 +50,7 @@ if [ -z "$ARCH" ]; then 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 @@ -69,7 +71,6 @@ case "$ARCH" in SLKCFLAGS="-Os -march=$ARCH -mtune=i686" ;; x86_64) - [ -n "$WIN64" ] && WIN64="--enable-win64" SLKCFLAGS="-O2 -fPIC" LIBDIRSUFFIX="64" ;; @@ -98,7 +99,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 @@ -107,12 +108,12 @@ if [ -n "$WIN64" ]; then CFLAGS="$SLKCFLAGS" \ CXXFLAGS="$SLKCFLAGS" \ ../configure \ - --enable-win64 \ --prefix=/usr \ --libdir=/usr/lib64 \ --localstatedir=/var \ --sysconfdir=/etc \ --mandir=/usr/man \ + --enable-win64 \ --with-x \ --with-gnutls \ --${do_opengl}-opengl \ @@ -128,7 +129,7 @@ if [ -n "$WIN64" ]; then fi -if [ -z "$NOWIN32" ]; then +if [ "$WIN32" = "yes" ]; then mkdir wine32 cd wine32 diff --git a/system/wine/wine.info b/system/wine/wine.info index ac43555218..b079ef1490 100644 --- a/system/wine/wine.info +++ b/system/wine/wine.info @@ -1,8 +1,8 @@ PRGNAM="wine" -VERSION="3.0.2" +VERSION="3.0.3" HOMEPAGE="http://www.winehq.com/" -DOWNLOAD="https://dl.winehq.org/wine/source/3.0/wine-3.0.2.tar.xz" -MD5SUM="d17925891ce5365b185dc82e6f23c75f" +DOWNLOAD="https://dl.winehq.org/wine/source/3.0/wine-3.0.3.tar.xz" +MD5SUM="dd46aa7d44bb975948f49bbb53f5521e" DOWNLOAD_x86_64="" MD5SUM_x86_64="" REQUIRES=""