diff options
| author |   Eric Hameleers <alien@slackware.com> | 2015-10-07 21:09:54 +0000 |
|---|---|---|
| committer | Eric Hameleers <alien@slackware.com> | 2015-10-07 21:09:54 +0000 |
| commit | 41ec76818127d7df5e487018979e814bf070f796 (patch) | |
| tree | 02f9a55e017d1bf8c45811b9284cca33c7f21236 /wine/build | |
| parent | 14529bc32afd03eaadc106a665c19cceb415d2be (diff) | |
| download | asb-41ec76818127d7df5e487018979e814bf070f796.tar.gz asb-41ec76818127d7df5e487018979e814bf070f796.tar.xz | |
wine: updated to 1.7.52 now that tagged releases are also available for wine-staging and wine_d3d9
Diffstat (limited to 'wine/build')
| -rwxr-xr-x | wine/build/wine.SlackBuild | 11 |
1 files changed, 6 insertions, 5 deletions
diff --git a/wine/build/wine.SlackBuild b/wine/build/wine.SlackBuild index 62b35e21..1ac18c9c 100755 --- a/wine/build/wine.SlackBuild +++ b/wine/build/wine.SlackBuild @@ -100,7 +100,7 @@ # 1.7.33-1 02/jan/2015 by Eric Hameleers <alien@slackware.com> # 1.7.51-1 07/sep/2015 by Eric Hameleers <alien@slackware.com> # * Apply the wine-staging patch set from http://wine-staging.com/. -# 1.7.XX-1 XX/XXX/2015 by Eric Hameleers <alien@slackware.com> +# 1.7.52-1 07/oct/2015 by Eric Hameleers <alien@slackware.com> # * Apply the wine-d3d9 patch set if mesa was compiled with support # for d3dadapter. See https://wiki.ixit.cz/d3d9 # @@ -112,7 +112,7 @@ PRGNAM=wine -SRCVER=${SRCVER:-"1.7.51"} +SRCVER=${SRCVER:-"1.7.52"} VERSION=$(echo $SRCVER | tr '-' '.') BUILD=${BUILD:-1} TAG=${TAG:-alien} @@ -187,7 +187,7 @@ SRCURL[0]="http://downloads.sourceforge.net/project/${PRGNAM}/Source/${PRGNAM}-$ SOURCE[1]="$SRCDIR/${PRGNAM}-staging-${SRCVER}.tar.gz" SRCURL[1]="https://github.com/${PRGNAM}-compholio/${PRGNAM}-staging/archive/v${SRCVER}.tar.gz" -SOURCE[2]="$SRCDIR/${PRGNAM}-d3d9-${SRCVER}.patch" +SOURCE[2]="$SRCDIR/patches/${PRGNAM}-d3d9-${SRCVER}.patch" SRCURL[2]="" SOURCE[3]="$SRCDIR/wine_gecko-${GECKO}-x86.msi" @@ -335,9 +335,10 @@ tar -xf ${SOURCE[1]} --strip-components 1 ./patches/patchinstall.sh DESTDIR="$(pwd)" --all \ 2>&1 | tee -a $OUTPUT/patch-${PRGNAM}.log if [ "$USE_NINE" = "YES" ]; then - # Apply the Direct3D9 patch set: + # Apply the Direct3D9 patch set (some patch hunks will fail because of the + # previously applied wine-staging patches): echo -e "\n**\n** direct3d9:\n**" | tee -a $OUTPUT/patch-${PRGNAM}.log - cat $SOURCE[2] | patch -p1 --verbose \ + cat ${SOURCE[2]} | patch -p1 --verbose \ 2>&1 | tee -a $OUTPUT/patch-${PRGNAM}.log fi |