wine: update to 1.7.51.

Also apply the wine-staging patches from now on.

1 files changed, 23 insertions, 8 deletions

diff --git a/wine/build/wine.SlackBuild b/wine/build/wine.SlackBuild
index aeef2516..10de7acd 100755
--- a/wine/build/wine.SlackBuild
+++ b/wine/build/wine.SlackBuild
@@ -27,6 +27,7 @@
 # For:       wine
 # Descr:     Wine Is Not an Emulator
 # URL:       http://winehq.com/
+#            http://wine-staging.com/
 # Needs:     OpenAL
 #            fontforge (builds better fonts when compiling wine)
 # Changelog:
@@ -97,6 +98,8 @@
 #             * Added wine64 'shared installation', think 'WoW64'.
 # 1.7.24-1    09/aug/2014 by Eric Hameleers <alien@slackware.com>
 # 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.
 # 
 # Run 'sh wine.SlackBuild' to build a Slackware package.
 # The package (.txz) plus descriptive .txt file are created in /tmp .
@@ -106,7 +109,7 @@
 
 
 PRGNAM=wine
-SRCVER=${SRCVER:-"1.7.33"}
+SRCVER=${SRCVER:-"1.7.51"}
 VERSION=$(echo $SRCVER | tr '-' '.')
 BUILD=${BUILD:-1}
 TAG=${TAG:-alien}
@@ -116,7 +119,7 @@ DO_WINE64=${DO_WINE64:-"yes"}
 
 # Add the "Gecko", Wine's own implementation of Internet Explorer.
 # For matching wine_gecko & wine versions, see http://wiki.winehq.org/Gecko
-GECKO=${GECKO:-2.34}
+GECKO=${GECKO:-2.40}
 
 DOCS="ANNOUNCE AUTHORS COPYING.LIB ChangeLog LICENSE* README VERSION"
 
@@ -171,12 +174,15 @@ esac
 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"
+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/wine_gecko-${GECKO}-x86.msi"
+SRCURL[2]="http://downloads.sourceforge.net/wine/wine_gecko-${GECKO}-x86.msi"
 
 if [ "$ARCH" = "x86_64" -a "$DO_WINE64" = "yes" ]; then
-  SOURCE[2]="$SRCDIR/wine_gecko-${GECKO}-x86_64.msi"
-  SRCURL[2]="http://downloads.sourceforge.net/wine/wine_gecko-${GECKO}-x86_64.msi"
+  SOURCE[3]="$SRCDIR/wine_gecko-${GECKO}-x86_64.msi"
+  SRCURL[3]="http://downloads.sourceforge.net/wine/wine_gecko-${GECKO}-x86_64.msi"
 fi
 
 # Exit the script on errors:
@@ -262,6 +268,13 @@ tar -xvf ${SOURCE[0]}
 [ "$SRCVER" != "$VERSION" ] && mv ${PRGNAM}-${SRCVER} ${PRGNAM}-${VERSION}
 cd ${PRGNAM}-${VERSION}
 
+# Apply the wine-staging patches:
+tar -xf ${SOURCE[1]}
+cd ${PRGNAM}-staging-*
+make -C patches/ DESTDIR=$(cd ../${PRGNAM}-${VERSION}; pwd) install \
+  2>&1 | tee $OUTPUT/patch-${PRGNAM}.log
+cd ../${PRGNAM}-${VERSION}
+
 chown -R root:root .
 chmod -R u+w,go+r-w,a+X-s .
 
@@ -300,6 +313,8 @@ function wineconfigure ()
     $*
 }
 
+autoreconf -vif 2>&1 | tee $OUTPUT/autoreconf-${PRGNAM}.log
+
 if [ "$ARCH" = "x86_64" -a "$DO_WINE64" = "yes" ]; then
   # First, wine64:
   mkdir wine64
@@ -330,9 +345,9 @@ fi
 
 # Add the wine-gecko MSI installer(s) to the Wine package:
 mkdir -p $PKG/usr/share/wine/gecko
-install -m0644 ${SOURCE[1]} $PKG/usr/share/wine/gecko/
+install -m0644 ${SOURCE[2]} $PKG/usr/share/wine/gecko/
 if [ "$ARCH" = "x86_64" -a "$DO_WINE64" = "yes" ]; then
-  install -m0644 ${SOURCE[2]} $PKG/usr/share/wine/gecko/
+  install -m0644 ${SOURCE[3]} $PKG/usr/share/wine/gecko/
 fi
 
 # Add the font converter programs if they were created using fontforge: