diff options
| author |   Eric Hameleers <alien@slackware.com> | 2014-03-19 11:57:59 +0000 |
|---|---|---|
| committer | Eric Hameleers <alien@slackware.com> | 2014-03-19 11:57:59 +0000 |
| commit | cd27097199cd48363614839c6ff82faf164e4417 (patch) | |
| tree | f8aaaded15c9b6f16431dbd40a0391120d4da639 /wine | |
| parent | 62164a56d3ee51c780853700b774e9428f3a0635 (diff) | |
| download | asb-cd27097199cd48363614839c6ff82faf164e4417.tar.gz asb-cd27097199cd48363614839c6ff82faf164e4417.tar.xz | |
On x86_64 we also need a 64-bit wine_gecko
Diffstat (limited to 'wine')
| -rwxr-xr-x | wine/build/wine.SlackBuild | 22 |
1 files changed, 15 insertions, 7 deletions
diff --git a/wine/build/wine.SlackBuild b/wine/build/wine.SlackBuild index 8e9e5bd4..841e42ae 100755 --- a/wine/build/wine.SlackBuild +++ b/wine/build/wine.SlackBuild @@ -28,7 +28,6 @@ # Descr: Wine Is Not an Emulator # URL: http://winehq.com/ # Needs: OpenAL -# On x86_64, also multilib and OpenAL-compat32 # fontforge (builds better fonts when compiling wine) # Changelog: # 0.9.23-1: 24/Oct/2006 by Eric Hameleers <alien@slackware.com> @@ -132,12 +131,6 @@ TMP=${TMP:-/tmp/build} PKG=$TMP/package-$PRGNAM OUTPUT=${OUTPUT:-/tmp} -SOURCE[0]="$SRCDIR/${PRGNAM}-${SRCVER}.tar.bz2" -SRCURL[0]="http://downloads.sourceforge.net/project/${PRGNAM}/Source/${PRGNAM}-${SRCVER}.tar.bz2" - -SOURCE[1]="$SRCDIR/wine_gecko-${GECKO}-x86.msi" -SRCURL[1]="http://downloads.sourceforge.net/wine/wine_gecko-${GECKO}-x86.msi" - ## ## --- with a little luck, you won't have to edit below this point --- ## ## @@ -168,6 +161,18 @@ case "$ARCH" in *) TARGET=$ARCH-slackware-linux ;; esac +# Download locations: +SOURCE[0]="$SRCDIR/${PRGNAM}-${SRCVER}.tar.bz2" +SRCURL[0]="http://downloads.sourceforge.net/project/${PRGNAM}/Source/${PRGNAM}-${SRCVER}.tar.bz2" + +SOURCE[1]="$SRCDIR/wine_gecko-${GECKO}-x86.msi" +SRCURL[1]="http://downloads.sourceforge.net/wine/wine_gecko-${GECKO}-x86.msi" + +if [ "$ARCH" = "x86_64" ]; then + SOURCE[2]="$SRCDIR/wine_gecko-${GECKO}-x86_64.msi" + SRCURL[2]="http://downloads.sourceforge.net/wine/wine_gecko-${GECKO}-x86_64.msi" +fi + # Exit the script on errors: set -e trap 'echo "$0 FAILED on line $LINENO!" | tee $OUTPUT/error-${PRGNAM}.log' ERR @@ -312,6 +317,9 @@ fi # Add the wine-gecko MSI installer to the Wine package: mkdir -p $PKG/usr/share/wine/gecko install -m0644 ${SOURCE[1]} $PKG/usr/share/wine/gecko/ +if [ "$ARCH" = "x86_64" ]; then + install -m0644 ${SOURCE[2]} $PKG/usr/share/wine/gecko/ +fi # Add the font converter programs if they were created using fontforge: # (useful if you need to convert a Windows .fon file to UNIX .bdf) |