From c93a8b4278e0948aa1b6f9c8015456816b9c7b1b Mon Sep 17 00:00:00 2001 From: Eric Hameleers Date: Sat, 19 May 2012 15:31:39 +0000 Subject: Updated to 1.5.4 --- wine/build/wine.SlackBuild | 14 +++++++++----- 1 file changed, 9 insertions(+), 5 deletions(-) (limited to 'wine/build') diff --git a/wine/build/wine.SlackBuild b/wine/build/wine.SlackBuild index 728b2bb7..c907256a 100755 --- a/wine/build/wine.SlackBuild +++ b/wine/build/wine.SlackBuild @@ -88,6 +88,7 @@ # 1.2.2-1: 20/dec/2010 by Eric Hameleers # 1.3.37-1 18/jan/2012 by Eric Hameleers # 1.4-1 25/mar/2012 by Eric Hameleers +# 1.5.4-1 19/may/2012 by Eric Hameleers # # Run 'sh wine.SlackBuild' to build a Slackware package. # The package (.tgz) plus descriptive .txt file are created in /tmp . @@ -97,7 +98,7 @@ PRGNAM=wine -SRCVER=${SRCVER:-"1.4"} +SRCVER=${SRCVER:-"1.5.4"} VERSION=$(echo $SRCVER | tr '-' '.') BUILD=${BUILD:-1} TAG=${TAG:-alien} @@ -234,10 +235,13 @@ echo "Extracting the source archive(s) for $PRGNAM..." tar -xvf ${SOURCE} [ "$SRCVER" != "$VERSION" ] && mv ${PRGNAM}-${SRCVER} ${PRGNAM}-${VERSION} cd ${PRGNAM}-${VERSION} -# Starting with openssl-0.9.8h, a typedef was introduced named "X509_EXTENSIONS" -# into openssl/x509.h. Unfortunately, wine uses a define of the same name -# in include/wincrypt.h. You may need this patch: -#patch -p0 < $SRCDIR/wine_openssl.patch + +# Patches specifically for Diablo3 (should get merged into wine eventually): +cat $SRCDIR/wine_d3d_reset.patch | patch -p1 --verbose \ + 2>&1 | tee $OUTPUT/patch-$PRGNAM.log +cat $SRCDIR/wine_acceptex.patch | patch -p1 --verbose \ + 2>&1 | tee -a $OUTPUT/patch-$PRGNAM.log + chown -R root:root . chmod -R u+w,go+r-w,a+X-s . -- cgit v1.2.3-65-gdbad