wine: update to 6.12

1 files changed, 14 insertions, 9 deletions

diff --git a/wine/build/wine.SlackBuild b/wine/build/wine.SlackBuild
index 79a916a5..5049a875 100755
--- a/wine/build/wine.SlackBuild
+++ b/wine/build/wine.SlackBuild
@@ -138,6 +138,8 @@
 #             * Update.
 # 6.1-1       11/feb/2021 by Eric Hameleers <alien@slackware.com>
 #             * Update.
+# 6.12-1      15/jul/2021 by Eric Hameleers <alien@slackware.com>
+#             * Update.
 #
 # Run 'sh wine.SlackBuild' to build a Slackware package.
 # The package (.txz) plus descriptive .txt file are created in /tmp .
@@ -147,7 +149,8 @@
 
 
 PRGNAM=wine
-SRCVER=${SRCVER:-"6.1"}
+SRCVER=${SRCVER:-"6.12"}
+STAGING=${STAGING:-"6.12.1"}
 VERSION=$(echo $SRCVER | tr '-' '.')
 VERMAJ=$(echo $VERSION | cut -d. -f1)
 VERMIN=$(echo $VERSION | cut -d. -f2) ; [ $VERMIN -ne 0 ] && VERMIN="x"
@@ -171,7 +174,7 @@ GECKO=${GECKO:-2.47.2}
 # In a 64 bit wineprefix, substitute wine64 for wine in the above command.
 # If you do not want to add mono, define MONO=NO instead of a number.
 # See https://wiki.winehq.org/Mono
-MONO=${MONO:-6.0.0}
+MONO=${MONO:-6.2.0}
 
 # Set the variable OPENGL to "NO" if you don't have a card that
 # supports hardware accelerated OpenGL:
@@ -244,8 +247,8 @@ SOURCE[$DLI]="$SRCDIR/${PRGNAM}-${SRCVER}.tar.xz"
 SRCURL[$DLI]="https://dl.winehq.org/wine/source/${VERMAJ}.${VERMIN}/${PRGNAM}-${SRCVER}.tar.xz"
 
 DLI=$(($DLI+1))
-SOURCE[$DLI]="$SRCDIR/${PRGNAM}-staging-${SRCVER}.tar.gz"
-SRCURL[$DLI]="https://github.com/${PRGNAM}-staging/${PRGNAM}-staging/archive/v${SRCVER}.tar.gz"
+SOURCE[$DLI]="$SRCDIR/${PRGNAM}-staging-${STAGING}.tar.gz"
+SRCURL[$DLI]="https://github.com/${PRGNAM}-staging/${PRGNAM}-staging/archive/v${STAGING}.tar.gz"
 STAGINGSRC="${SOURCE[$DLI]}"
 
 DLI=$(($DLI+1))
@@ -411,7 +414,7 @@ if [ "$ARCH" = "x86_64" -a "$DO_WINE64" = "yes" ]; then
   # First, wine64:
   mkdir wine64
   cd wine64
-    wineconfigure --enable-win64 PKG_CONFIG_PATH="$OLD_PKG_CONFIG_PATH" CC=/usr/bin/gcc 2>&1 | tee $OUTPUT/configure64-${PRGNAM}.log
+    wineconfigure --libdir=/usr/lib64 --enable-win64 PKG_CONFIG_PATH="$OLD_PKG_CONFIG_PATH" CC=/usr/bin/gcc 2>&1 | tee $OUTPUT/configure64-${PRGNAM}.log
     make $NUMJOBS depend 2>&1 | tee $OUTPUT/make64-${PRGNAM}.log
     make $NUMJOBS 2>&1 | tee -a $OUTPUT/make64-${PRGNAM}.log
     make DESTDIR=$PKG install 2>&1 |tee $OUTPUT/install64-${PRGNAM}.log
@@ -419,7 +422,7 @@ if [ "$ARCH" = "x86_64" -a "$DO_WINE64" = "yes" ]; then
   # Next, wine:
   mkdir wine32
   cd wine32
-    wineconfigure --with-wine64=../wine64 2>&1 | tee $OUTPUT/configure-${PRGNAM}.log
+    wineconfigure --libdir=/usr/lib --with-wine64=../wine64 2>&1 | tee $OUTPUT/configure-${PRGNAM}.log
     make $NUMJOBS depend 2>&1 | tee $OUTPUT/make-${PRGNAM}.log
     make $NUMJOBS 2>&1 | tee -a $OUTPUT/make-${PRGNAM}.log
     make DESTDIR=$PKG install 2>&1 |tee $OUTPUT/install-${PRGNAM}.log
@@ -428,7 +431,7 @@ else
   # No 64-bit wine requested, or we are on 32-bit Slackware:
   mkdir wine32
   cd wine32
-    wineconfigure 2>&1 | tee $OUTPUT/configure-${PRGNAM}.log
+    wineconfigure --libdir=/usr/lib 2>&1 | tee $OUTPUT/configure-${PRGNAM}.log
     make $NUMJOBS depend 2>&1 | tee $OUTPUT/make-${PRGNAM}.log
     make $NUMJOBS 2>&1 | tee -a $OUTPUT/make-${PRGNAM}.log
     make DESTDIR=$PKG install 2>&1 |tee $OUTPUT/install-${PRGNAM}.log
@@ -491,9 +494,11 @@ fi
 find $PKG | xargs file | grep -e "executable" -e "shared object" \
   | grep ELF | cut -f1 -d: | xargs strip --strip-unneeded 2>/dev/null || true
 if which ${WIN_COMPILERS} 1>/dev/null 2>/dev/null ; then
-  ${WIN32_ARCH}-w64-mingw32-strip --strip-unneeded $PKG/usr/lib/wine/*.dll
+  find $PKG/usr/lib/wine/ -name "*.dll" \
+    | xargs ${WIN32_ARCH}-w64-mingw32-strip --strip-unneeded
   if [ "$ARCH" == "x86_64" ]; then
-    x86_64-w64-mingw32-strip --strip-unneeded $PKG/usr/lib64/wine/*.dll
+    find $PKG/usr/lib64/wine/ -name "*.dll" \
+      | xargs x86_64-w64-mingw32-strip --strip-unneeded
   fi
 fi