Update to 1.7.14. Add wine64 (WoW64) on the x86_64 platform.

1 files changed, 8 insertions, 6 deletions

diff --git a/wine/build/wine.SlackBuild b/wine/build/wine.SlackBuild
index e6cab7ef..8e9e5bd4 100755
--- a/wine/build/wine.SlackBuild
+++ b/wine/build/wine.SlackBuild
@@ -28,6 +28,7 @@
 # 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>
@@ -94,6 +95,7 @@
 # 1.5.26-1    20/mar/2013 by Eric Hameleers <alien@slackware.com>
 # 1.7.9-1     23/dec/2013 by Eric Hameleers <alien@slackware.com>
 # 1.7.14-1    18/mar/2014 by Eric Hameleers <alien@slackware.com>
+#             * Added wine64 'shared installation', think 'WoW64'.
 # 
 # Run 'sh wine.SlackBuild' to build a Slackware package.
 # The package (.txz) plus descriptive .txt file are created in /tmp .
@@ -284,10 +286,10 @@ function wineconfigure ()
 }
 
 if [ "$ARCH" = "x86_64" ]; then
-# First, wine64:
+  # First, wine64:
   mkdir wine64
   cd wine64
-    wineconfigure --enable-win64 2>&1 | tee $OUTPUT/configure64-${PRGNAM}.log
+    wineconfigure --enable-win64 CC=/usr/bin/gcc 2>&1 | tee $OUTPUT/configure64-${PRGNAM}.log
     make depend 2>&1 | tee $OUTPUT/make64-${PRGNAM}.log
     make 2>&1 | tee -a $OUTPUT/make64-${PRGNAM}.log
     make DESTDIR=$PKG install 2>&1 |tee $OUTPUT/install64-${PRGNAM}.log
@@ -295,7 +297,7 @@ if [ "$ARCH" = "x86_64" ]; then
   # Next, wine:
   mkdir wine32
   cd wine32
-    wineconfigure --with-win64=../wine64 2>&1 | tee $OUTPUT/configure-${PRGNAM}.log
+    wineconfigure --with-wine64=../wine64 2>&1 | tee $OUTPUT/configure-${PRGNAM}.log
     make depend 2>&1 | tee $OUTPUT/make-${PRGNAM}.log
     make 2>&1 | tee -a $OUTPUT/make-${PRGNAM}.log
     make DESTDIR=$PKG install 2>&1 |tee $OUTPUT/install-${PRGNAM}.log
@@ -309,7 +311,7 @@ fi
 
 # Add the wine-gecko MSI installer to the Wine package:
 mkdir -p $PKG/usr/share/wine/gecko
-cp -a ${SOURCE[1]} $PKG/usr/share/wine/gecko/
+install -m0644 ${SOURCE[1]} $PKG/usr/share/wine/gecko/
 
 # Add the font converter programs if they were created using fontforge:
 # (useful if you need to convert a Windows .fon file to UNIX .bdf)
@@ -320,7 +322,7 @@ fi
 # Add a desktop menu for the winecfg program:
 mkdir -p $PKG/usr/share/{icons/hicolor/scalable/apps,pixmaps}
 convert $SRCDIR/wine.svg -scale 64 $PKG/usr/share/pixmaps/wine.png
-cp -a $SRCDIR/wine.svg $PKG/usr/share/icons/hicolor/scalable/apps/
+install -m0644 $SRCDIR/wine.svg $PKG/usr/share/icons/hicolor/scalable/apps/
 # I used karbon to extract a single picture out of the SVG:
 convert $SRCDIR/winecfg.png -scale 64 $PKG/usr/share/pixmaps/winecfg.png
 cp -a programs/winecfg/winecfg.svg $PKG/usr/share/icons/hicolor/scalable/apps/
@@ -339,7 +341,7 @@ _EOT_
 # Add some documentation to the package:
 mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION
 cp -a $DOCS $PKG/usr/doc/$PRGNAM-$VERSION || true
-cp -a $SRCDIR/$(basename $0) $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild
+install -m0644 $SRCDIR/$(basename $0) $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild
 chown -R root:root $PKG/usr/doc/$PRGNAM-$VERSION
 find $PKG/usr/doc -type f -exec chmod 644 {} \;