diff options
| author |   Eric Hameleers <alien@slackware.com> | 2013-03-20 08:04:55 +0000 |
|---|---|---|
| committer | Eric Hameleers <alien@slackware.com> | 2013-03-20 08:04:55 +0000 |
| commit | 6faa8369d31a40faaa55f76fb396d78c58c2c57a (patch) | |
| tree | 1b3f967000c9047d4e5fca8914e55e2565850c0e /wine | |
| parent | 3760f1fe08fd9b2c99b022c6bbe71134fdb63834 (diff) | |
| download | asb-6faa8369d31a40faaa55f76fb396d78c58c2c57a.tar.gz asb-6faa8369d31a40faaa55f76fb396d78c58c2c57a.tar.xz | |
Update to 1.5.26
Diffstat (limited to 'wine')
| -rwxr-xr-x | wine/build/wine.SlackBuild | 18 |
1 files changed, 9 insertions, 9 deletions
diff --git a/wine/build/wine.SlackBuild b/wine/build/wine.SlackBuild index 1561d809..14523828 100755 --- a/wine/build/wine.SlackBuild +++ b/wine/build/wine.SlackBuild @@ -1,6 +1,6 @@ #!/bin/sh # $Id$ -# Copyright 2006-2012 Eric Hameleers, Eindhoven, NL +# Copyright 2006-2013 Eric Hameleers, Eindhoven, NL # All rights reserved. # # Permission to use, copy, modify, and distribute this software for @@ -91,6 +91,7 @@ # 1.4-1 25/mar/2012 by Eric Hameleers <alien@slackware.com> # 1.5.4-1 19/may/2012 by Eric Hameleers <alien@slackware.com> # 1.5.5-1 28/may/2012 by Eric Hameleers <alien@slackware.com> +# 1.5.26-1 20/mar/2013 by Eric Hameleers <alien@slackware.com> # # Run 'sh wine.SlackBuild' to build a Slackware package. # The package (.tgz) plus descriptive .txt file are created in /tmp . @@ -100,7 +101,7 @@ PRGNAM=wine -SRCVER=${SRCVER:-"1.5.5"} +SRCVER=${SRCVER:-"1.5.26"} VERSION=$(echo $SRCVER | tr '-' '.') BUILD=${BUILD:-1} TAG=${TAG:-alien} @@ -238,14 +239,12 @@ tar -xvf ${SOURCE} [ "$SRCVER" != "$VERSION" ] && mv ${PRGNAM}-${SRCVER} ${PRGNAM}-${VERSION} cd ${PRGNAM}-${VERSION} -# Patches specifically for Diablo3 (should get merged into wine eventually): -cat $SRCDIR/wine_d3d_reset.patch | patch -p1 --verbose \ +# Do not fail if clang is installed but we do not want to use it: +cat $SRCDIR/wine_winebuild-CCAS.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 -# This is required if the wine_acceptex.patch was applied: -./tools/make_requests 2>&1 | tee -a $OUTPUT/patch-$PRGNAM.log +# Because the patch touched configure.ac: +autoreconf -vif chown -R root:root . chmod -R u+w,go+r-w,a+X-s . @@ -258,9 +257,10 @@ else do_opengl="out" fi -LDFLAGS="-L/usr/lib -ldl" \ +CCAS="as" \ CFLAGS="$SLKCFLAGS" \ CXXFLAGS="$SLKCFLAGS" \ +LDFLAGS="-L/usr/lib -ldl" \ ./configure \ --prefix=/usr \ --localstatedir=/var \ |