Updated to 1.7.9, incorporated wine_gecko

1 files changed, 39 insertions, 29 deletions

diff --git a/wine/build/wine.SlackBuild b/wine/build/wine.SlackBuild
index 14523828..310e6f97 100755
--- a/wine/build/wine.SlackBuild
+++ b/wine/build/wine.SlackBuild
@@ -92,20 +92,24 @@
 # 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>
+# 1.7.9-1     23/dec/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 .
+# The package (.txz) plus descriptive .txt file are created in /tmp .
 # Install using 'installpkg'. 
 #
 # -----------------------------------------------------------------------------
 
 
 PRGNAM=wine
-SRCVER=${SRCVER:-"1.5.26"}
+SRCVER=${SRCVER:-"1.7.9"}
 VERSION=$(echo $SRCVER | tr '-' '.')
 BUILD=${BUILD:-1}
 TAG=${TAG:-alien}
 
+# For matching wine_gecko & wine versions, see http://wiki.winehq.org/Gecko
+GECKO=${GECKO:-2.24}
+
 DOCS="ANNOUNCE AUTHORS COPYING.LIB ChangeLog LICENSE* README VERSION"
 
 # Set the variable OPENGL to "NO" if you don't have a card that
@@ -125,8 +129,11 @@ TMP=${TMP:-/tmp/build}
 PKG=$TMP/package-$PRGNAM
 OUTPUT=${OUTPUT:-/tmp}
 
-SOURCE="$SRCDIR/${PRGNAM}-${SRCVER}.tar.bz2"
-SRCURL="http://downloads.sourceforge.net/project/${PRGNAM}/Source/${PRGNAM}-${SRCVER}.tar.bz2"
+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 --- ##
@@ -179,24 +186,26 @@ rm -rf $OUTPUT/{configure,make,install,error,makepkg}-$PRGNAM.log
                           # remove old log files
 
 # Source files availability:
-if ! [ -f ${SOURCE} ]; then
-  echo "Source '$(basename ${SOURCE})' not available yet..."
-  # Check if the $SRCDIR is writable at all - if not, download to $OUTPUT
-  [ -w "$SRCDIR" ] || SOURCE="$OUTPUT/$(basename $SOURCE)"
-  if [ -f ${SOURCE} ]; then echo "Ah, found it!"; continue; fi
-  if ! [ "x${SRCURL}" == "x" ]; then
-    echo "Will download file to $(dirname $SOURCE)"
-    wget -nv -T 20 -O "${SOURCE}" "${SRCURL}" || true
-    if [ $? -ne 0 -o ! -s "${SOURCE}" ]; then
-      echo "Downloading '$(basename ${SOURCE})' failed... aborting the build."
-      mv -f "${SOURCE}" "${SOURCE}".FAIL
+for (( i = 0; i < ${#SOURCE[*]}; i++ )) ; do
+  if ! [ -f ${SOURCE[$i]} ]; then
+    echo "Source '$(basename ${SOURCE[$i]})' not available yet..."
+    # Check if the $SRCDIR is writable at all - if not, download to $OUTPUT
+    [ -w "$SRCDIR" ] || SOURCE[$i]="$OUTPUT/$(basename ${SOURCE[$i]})"
+    if [ -f ${SOURCE[$i]} ]; then echo "Ah, found it!"; continue; fi
+    if ! [ "x${SRCURL[$i]}" == "x" ]; then
+      echo "Will download file to $(dirname $SOURCE[$i])"
+      wget -nv -T 20 -O "${SOURCE[$i]}" "${SRCURL[$i]}" || true
+      if [ $? -ne 0 -o ! -s "${SOURCE[$i]}" ]; then
+        echo "Fail to download '$(basename ${SOURCE[$i]})'. Aborting the build."
+        mv -f "${SOURCE[$i]}" "${SOURCE[$i]}".FAIL
+        exit 1
+      fi
+    else
+      echo "File '$(basename ${SOURCE[$i]})' not available. Aborting the build."
       exit 1
     fi
-  else
-    echo "File '$(basename ${SOURCE})' not available... aborting the build."
-    exit 1
   fi
-fi
+done
 
 if [ "$P1" == "--download" ]; then
   echo "Download complete."
@@ -235,17 +244,10 @@ fi
 cd $TMP/tmp-$PRGNAM
 
 echo "Extracting the source archive(s) for $PRGNAM..."
-tar -xvf ${SOURCE}
+tar -xvf ${SOURCE[0]}
 [ "$SRCVER" != "$VERSION" ] && mv ${PRGNAM}-${SRCVER} ${PRGNAM}-${VERSION}
 cd ${PRGNAM}-${VERSION}
 
-# 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
-
-# Because the patch touched configure.ac:
-autoreconf -vif
-
 chown -R root:root .
 chmod -R u+w,go+r-w,a+X-s .
 
@@ -261,6 +263,10 @@ CCAS="as" \
 CFLAGS="$SLKCFLAGS" \
 CXXFLAGS="$SLKCFLAGS" \
 LDFLAGS="-L/usr/lib -ldl" \
+if [ "$ARCH" = "x86_64" ]; then
+  export PKG_CONFIG_PATH="/usr/lib/pkgconfig:PKG_CONFIG_PATH"
+fi
+
 ./configure \
   --prefix=/usr \
   --localstatedir=/var \
@@ -277,6 +283,10 @@ 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
 
+# 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/
+
 # Add the font converter programs if they were created using fontforge:
 # (useful if you need to convert a Windows .fon file to UNIX .bdf)
 install -m 755 tools/{fnt2fon,sfnt2fnt} $PKG/usr/bin
@@ -330,9 +340,9 @@ fi
 
 # Build the package:
 cd $PKG
-makepkg --linkadd y --chown n $OUTPUT/${PRGNAM}-${VERSION}-${ARCH}-${BUILD}${TAG}.tgz 2>&1 | tee $OUTPUT/makepkg-${PRGNAM}.log
+makepkg --linkadd y --chown n $OUTPUT/${PRGNAM}-${VERSION}-${ARCH}-${BUILD}${TAG}.txz 2>&1 | tee $OUTPUT/makepkg-${PRGNAM}.log
 cd $OUTPUT
-md5sum ${PRGNAM}-${VERSION}-${ARCH}-${BUILD}${TAG}.tgz > ${PRGNAM}-${VERSION}-${ARCH}-${BUILD}${TAG}.tgz.md5
+md5sum ${PRGNAM}-${VERSION}-${ARCH}-${BUILD}${TAG}.txz > ${PRGNAM}-${VERSION}-${ARCH}-${BUILD}${TAG}.txz.md5
 cd -
 cat $PKG/install/slack-desc | grep "^${PRGNAM}" > $OUTPUT/${PRGNAM}-${VERSION}-${ARCH}-${BUILD}${TAG}.txt
 if [ -f $PKG/install/slack-required ]; then