system/wine-staging: Updated for version 6.0. rm old patch.

Signed-off-by: Dave Woodfall <dave@slackbuilds.org>

Signed-off-by: Willy Sudiarto Raharjo <willysr@slackbuilds.org>

3 files changed, 11 insertions, 216 deletions

diff --git a/system/wine-staging/wine-staging.SlackBuild b/system/wine-staging/wine-staging.SlackBuild
index b2d5833c36..8bcb1853b5 100644
--- a/system/wine-staging/wine-staging.SlackBuild
+++ b/system/wine-staging/wine-staging.SlackBuild
@@ -32,8 +32,8 @@
 # Now maintained by Dave Woodfall <dave@slackbuilds.org>
 
 PRGNAM=wine-staging
-VERSION=${VERSION:-5.20}
-WINEVERSION=$VERSION
+VERSION=${VERSION:-6.0}
+WINEVERSION=${WINEVERSION:-6.0}
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
 
@@ -65,12 +65,12 @@ if [ "$WIN32" = "no" ] && [ "$WIN64" = "no" ]; then
 fi
 
 # These should work for anything not specified below
-BUILD_ARCH=$ARCH"-slackware-linux"
+BUILD_ARCH="$ARCH-slackware-linux"
 SLKCFLAGS="-O2"
 
 case "$ARCH" in
   arm)
-    BUILD_ARCH=$ARCH"-slackware-linux-gnueabi"
+    BUILD_ARCH="$ARCH-slackware-linux-gnueabi"
     ;;
   i?86)
     # -Os was -O2, fix for:
@@ -118,11 +118,6 @@ patch -p1 --verbose < $CWD/0001-winhlp32-Workaround-a-bug-in-Flex.patch
 # fix path of opencl headers.
 sed 's|OpenCL/opencl.h|CL/opencl.h|g' -i configure*
 
-# Remove -fPIC for i?86 or the build will hang.
-if [ "$ARCH" == "i?86" ]; then
-  patch -p1 --verbose < $CWD/x86_remove_fpic.patch
-fi
-
 if [ "$WIN64" = "yes" ]; then
   wine64="--with-wine64=../wine64"
   mkdir wine64
@@ -214,6 +209,8 @@ cp $CWD/*.desktop $PKG/usr/share/applications/
 DOCS="ANNOUNCE AUTHORS COPYING.LIB LICENSE* MAINTAINERS README VERSION"
 FONTS_LICENSE="COPYING.arial COPYING.cour COPYING.msyh COPYING.times"
 
+VERSION=$( printf %s $VERSION | tr - _ )
+
 mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION
 cp $DOCS $FONTS_LICENSE $PKG/usr/doc/$PRGNAM-$VERSION
 cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild
diff --git a/system/wine-staging/wine-staging.info b/system/wine-staging/wine-staging.info
index e9b240774b..8bd895f0d6 100644
--- a/system/wine-staging/wine-staging.info
+++ b/system/wine-staging/wine-staging.info
@@ -1,10 +1,10 @@
 PRGNAM="wine-staging"
-VERSION="5.20"
+VERSION="6.0"
 HOMEPAGE="https://wiki.winehq.org/Wine-Staging"
-DOWNLOAD="https://dl.winehq.org/wine/source/5.x/wine-5.20.tar.xz \
-          https://github.com/wine-staging/wine-staging/archive/v5.20/wine-staging-5.20.tar.gz"
-MD5SUM="6cfefbef67048d2a8c54100c047af2aa \
-        995fe2e5b2cd716a9f49588ab98e56a0"
+DOWNLOAD="https://dl.winehq.org/wine/source/6.0/wine-6.0.tar.xz \
+          https://github.com/wine-staging/wine-staging/archive/v6.0/wine-staging-6.0.tar.gz"
+MD5SUM="1c8b7e1642a9e532106b88a7b1932ef3 \
+        1c1c78c356abc0b1da925f410c38ca2b"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
 REQUIRES=""
diff --git a/system/wine-staging/x86_remove_fpic.patch b/system/wine-staging/x86_remove_fpic.patch
deleted file mode 100644
index ac949dc86d..0000000000
--- a/system/wine-staging/x86_remove_fpic.patch
+++ /dev/null
@@ -1,202 +0,0 @@
-diff -Naur a/configure b/configure
---- a/configure	2018-01-02 20:58:13.000000000 +0000
-+++ b/configure	2018-01-08 18:31:55.480995247 +0000
-@@ -8072,7 +8072,7 @@
- done
- 
-     LIBEXT="dylib"
--    DLLFLAGS="$DLLFLAGS -fPIC"
-+    DLLFLAGS="$DLLFLAGS "
-     LDRPATH_INSTALL="-Wl,-rpath,@loader_path/\`\$(MAKEDEP) -R \${bindir} \${libdir}\`"
-     LDRPATH_LOCAL="-Wl,-rpath,@loader_path/\$(top_builddir)/libs/wine"
-         COREFOUNDATION_LIBS="-framework CoreFoundation"
-@@ -8304,14 +8304,14 @@
-     ;;
- 
-   linux-android*)
--    DLLFLAGS="$DLLFLAGS -fPIC"
--    { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether the compiler supports -fPIC -Wl,--export-dynamic" >&5
--$as_echo_n "checking whether the compiler supports -fPIC -Wl,--export-dynamic... " >&6; }
-+    DLLFLAGS="$DLLFLAGS "
-+    { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether the compiler supports  -Wl,--export-dynamic" >&5
-+$as_echo_n "checking whether the compiler supports  -Wl,--export-dynamic... " >&6; }
- if ${ac_cv_cflags__fPIC__Wl___export_dynamic+:} false; then :
-   $as_echo_n "(cached) " >&6
- else
-   ac_wine_try_cflags_saved=$CFLAGS
--CFLAGS="$CFLAGS -fPIC -Wl,--export-dynamic"
-+CFLAGS="$CFLAGS  -Wl,--export-dynamic"
- cat confdefs.h - <<_ACEOF >conftest.$ac_ext
- /* end confdefs.h.  */
- int main(int argc, char **argv) { return 0; }
-@@ -8330,14 +8330,14 @@
- if test "x$ac_cv_cflags__fPIC__Wl___export_dynamic" = xyes; then :
-   LDEXECFLAGS="-Wl,--export-dynamic"
- fi
--    as_ac_var=`$as_echo "ac_cv_cflags_-fPIC -Wl,--rpath,\\$ORIGIN/../lib" | $as_tr_sh`
--{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether the compiler supports -fPIC -Wl,--rpath,\$ORIGIN/../lib" >&5
--$as_echo_n "checking whether the compiler supports -fPIC -Wl,--rpath,\$ORIGIN/../lib... " >&6; }
-+    as_ac_var=`$as_echo "ac_cv_cflags_ -Wl,--rpath,\\$ORIGIN/../lib" | $as_tr_sh`
-+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether the compiler supports  -Wl,--rpath,\$ORIGIN/../lib" >&5
-+$as_echo_n "checking whether the compiler supports  -Wl,--rpath,\$ORIGIN/../lib... " >&6; }
- if eval \${$as_ac_var+:} false; then :
-   $as_echo_n "(cached) " >&6
- else
-   ac_wine_try_cflags_saved=$CFLAGS
--CFLAGS="$CFLAGS -fPIC -Wl,--rpath,\$ORIGIN/../lib"
-+CFLAGS="$CFLAGS  -Wl,--rpath,\$ORIGIN/../lib"
- cat confdefs.h - <<_ACEOF >conftest.$ac_ext
- /* end confdefs.h.  */
- int main(int argc, char **argv) { return 0; }
-@@ -8358,14 +8358,14 @@
-   LDRPATH_INSTALL="-Wl,--rpath,\\\$\$ORIGIN/\`\$(MAKEDEP) -R \${bindir} \${libdir}\`"
-                      LDRPATH_LOCAL="-Wl,--rpath,\\\$\$ORIGIN/\$(top_builddir)/libs/wine"
- else
--  as_ac_var=`$as_echo "ac_cv_cflags_-fPIC -Wl,-R,\\$ORIGIN/../lib" | $as_tr_sh`
--{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether the compiler supports -fPIC -Wl,-R,\$ORIGIN/../lib" >&5
--$as_echo_n "checking whether the compiler supports -fPIC -Wl,-R,\$ORIGIN/../lib... " >&6; }
-+  as_ac_var=`$as_echo "ac_cv_cflags_ -Wl,-R,\\$ORIGIN/../lib" | $as_tr_sh`
-+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether the compiler supports  -Wl,-R,\$ORIGIN/../lib" >&5
-+$as_echo_n "checking whether the compiler supports  -Wl,-R,\$ORIGIN/../lib... " >&6; }
- if eval \${$as_ac_var+:} false; then :
-   $as_echo_n "(cached) " >&6
- else
-   ac_wine_try_cflags_saved=$CFLAGS
--CFLAGS="$CFLAGS -fPIC -Wl,-R,\$ORIGIN/../lib"
-+CFLAGS="$CFLAGS  -Wl,-R,\$ORIGIN/../lib"
- cat confdefs.h - <<_ACEOF >conftest.$ac_ext
- /* end confdefs.h.  */
- int main(int argc, char **argv) { return 0; }
-@@ -8448,7 +8448,7 @@
-     ;;
- 
-   *)
--    DLLFLAGS="$DLLFLAGS -fPIC"
-+    DLLFLAGS="$DLLFLAGS "
-     LDEXECFLAGS=""
-     { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether we can build a GNU style ELF dll" >&5
- $as_echo_n "checking whether we can build a GNU style ELF dll... " >&6; }
-@@ -8456,7 +8456,7 @@
-   $as_echo_n "(cached) " >&6
- else
-   ac_wine_try_cflags_saved=$CFLAGS
--CFLAGS="$CFLAGS -fPIC -shared -Wl,-Bsymbolic"
-+CFLAGS="$CFLAGS  -shared -Wl,-Bsymbolic"
- cat confdefs.h - <<_ACEOF >conftest.$ac_ext
- /* end confdefs.h.  */
- void myfunc() {}
-@@ -8475,13 +8475,13 @@
-     if test "$ac_cv_c_dll_gnuelf" = "yes"
-     then
-       LIBWINE_LDFLAGS="-shared"
--      { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether the compiler supports -fPIC -shared -Wl,-soname,confest.so.1" >&5
--$as_echo_n "checking whether the compiler supports -fPIC -shared -Wl,-soname,confest.so.1... " >&6; }
-+      { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether the compiler supports  -shared -Wl,-soname,confest.so.1" >&5
-+$as_echo_n "checking whether the compiler supports  -shared -Wl,-soname,confest.so.1... " >&6; }
- if ${ac_cv_cflags__fPIC__shared__Wl__soname_confest_so_1+:} false; then :
-   $as_echo_n "(cached) " >&6
- else
-   ac_wine_try_cflags_saved=$CFLAGS
--CFLAGS="$CFLAGS -fPIC -shared -Wl,-soname,confest.so.1"
-+CFLAGS="$CFLAGS  -shared -Wl,-soname,confest.so.1"
- cat confdefs.h - <<_ACEOF >conftest.$ac_ext
- /* end confdefs.h.  */
- int main(int argc, char **argv) { return 0; }
-@@ -8500,13 +8500,13 @@
- if test "x$ac_cv_cflags__fPIC__shared__Wl__soname_confest_so_1" = xyes; then :
-   LIBWINE_LDFLAGS="-shared -Wl,-soname,libwine.so.$libwine_soversion"
- else
--  { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether the compiler supports -fPIC -shared -Wl,-h,confest.so.1" >&5
--$as_echo_n "checking whether the compiler supports -fPIC -shared -Wl,-h,confest.so.1... " >&6; }
-+  { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether the compiler supports  -shared -Wl,-h,confest.so.1" >&5
-+$as_echo_n "checking whether the compiler supports  -shared -Wl,-h,confest.so.1... " >&6; }
- if ${ac_cv_cflags__fPIC__shared__Wl__h_confest_so_1+:} false; then :
-   $as_echo_n "(cached) " >&6
- else
-   ac_wine_try_cflags_saved=$CFLAGS
--CFLAGS="$CFLAGS -fPIC -shared -Wl,-h,confest.so.1"
-+CFLAGS="$CFLAGS  -shared -Wl,-h,confest.so.1"
- cat confdefs.h - <<_ACEOF >conftest.$ac_ext
- /* end confdefs.h.  */
- int main(int argc, char **argv) { return 0; }
-@@ -8528,13 +8528,13 @@
- fi
- 
-       echo '{ global: *; };' >conftest.map
--      { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether the compiler supports -fPIC -shared -Wl,--version-script=conftest.map" >&5
--$as_echo_n "checking whether the compiler supports -fPIC -shared -Wl,--version-script=conftest.map... " >&6; }
-+      { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether the compiler supports  -shared -Wl,--version-script=conftest.map" >&5
-+$as_echo_n "checking whether the compiler supports  -shared -Wl,--version-script=conftest.map... " >&6; }
- if ${ac_cv_cflags__fPIC__shared__Wl___version_script_conftest_map+:} false; then :
-   $as_echo_n "(cached) " >&6
- else
-   ac_wine_try_cflags_saved=$CFLAGS
--CFLAGS="$CFLAGS -fPIC -shared -Wl,--version-script=conftest.map"
-+CFLAGS="$CFLAGS  -shared -Wl,--version-script=conftest.map"
- cat confdefs.h - <<_ACEOF >conftest.$ac_ext
- /* end confdefs.h.  */
- int main(int argc, char **argv) { return 0; }
-@@ -8555,13 +8555,13 @@
- fi
-       rm -f conftest.map
- 
--      { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether the compiler supports -fPIC -Wl,--export-dynamic" >&5
--$as_echo_n "checking whether the compiler supports -fPIC -Wl,--export-dynamic... " >&6; }
-+      { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether the compiler supports  -Wl,--export-dynamic" >&5
-+$as_echo_n "checking whether the compiler supports  -Wl,--export-dynamic... " >&6; }
- if ${ac_cv_cflags__fPIC__Wl___export_dynamic+:} false; then :
-   $as_echo_n "(cached) " >&6
- else
-   ac_wine_try_cflags_saved=$CFLAGS
--CFLAGS="$CFLAGS -fPIC -Wl,--export-dynamic"
-+CFLAGS="$CFLAGS  -Wl,--export-dynamic"
- cat confdefs.h - <<_ACEOF >conftest.$ac_ext
- /* end confdefs.h.  */
- int main(int argc, char **argv) { return 0; }
-@@ -8581,14 +8581,14 @@
-   LDEXECFLAGS="-Wl,--export-dynamic"
- fi
- 
--      as_ac_var=`$as_echo "ac_cv_cflags_-fPIC -Wl,--rpath,\\$ORIGIN/../lib" | $as_tr_sh`
--{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether the compiler supports -fPIC -Wl,--rpath,\$ORIGIN/../lib" >&5
--$as_echo_n "checking whether the compiler supports -fPIC -Wl,--rpath,\$ORIGIN/../lib... " >&6; }
-+      as_ac_var=`$as_echo "ac_cv_cflags_ -Wl,--rpath,\\$ORIGIN/../lib" | $as_tr_sh`
-+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether the compiler supports  -Wl,--rpath,\$ORIGIN/../lib" >&5
-+$as_echo_n "checking whether the compiler supports  -Wl,--rpath,\$ORIGIN/../lib... " >&6; }
- if eval \${$as_ac_var+:} false; then :
-   $as_echo_n "(cached) " >&6
- else
-   ac_wine_try_cflags_saved=$CFLAGS
--CFLAGS="$CFLAGS -fPIC -Wl,--rpath,\$ORIGIN/../lib"
-+CFLAGS="$CFLAGS  -Wl,--rpath,\$ORIGIN/../lib"
- cat confdefs.h - <<_ACEOF >conftest.$ac_ext
- /* end confdefs.h.  */
- int main(int argc, char **argv) { return 0; }
-@@ -8609,14 +8609,14 @@
-   LDRPATH_INSTALL="-Wl,--rpath,\\\$\$ORIGIN/\`\$(MAKEDEP) -R \${bindir} \${libdir}\`"
-                        LDRPATH_LOCAL="-Wl,--rpath,\\\$\$ORIGIN/\$(top_builddir)/libs/wine"
- else
--  as_ac_var=`$as_echo "ac_cv_cflags_-fPIC -Wl,-R,\\$ORIGIN/../lib" | $as_tr_sh`
--{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether the compiler supports -fPIC -Wl,-R,\$ORIGIN/../lib" >&5
--$as_echo_n "checking whether the compiler supports -fPIC -Wl,-R,\$ORIGIN/../lib... " >&6; }
-+  as_ac_var=`$as_echo "ac_cv_cflags_ -Wl,-R,\\$ORIGIN/../lib" | $as_tr_sh`
-+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether the compiler supports  -Wl,-R,\$ORIGIN/../lib" >&5
-+$as_echo_n "checking whether the compiler supports  -Wl,-R,\$ORIGIN/../lib... " >&6; }
- if eval \${$as_ac_var+:} false; then :
-   $as_echo_n "(cached) " >&6
- else
-   ac_wine_try_cflags_saved=$CFLAGS
--CFLAGS="$CFLAGS -fPIC -Wl,-R,\$ORIGIN/../lib"
-+CFLAGS="$CFLAGS  -Wl,-R,\$ORIGIN/../lib"
- cat confdefs.h - <<_ACEOF >conftest.$ac_ext
- /* end confdefs.h.  */
- int main(int argc, char **argv) { return 0; }
-@@ -8804,7 +8804,7 @@
-   $as_echo_n "(cached) " >&6
- else
-   ac_wine_try_cflags_saved=$CFLAGS
--CFLAGS="$CFLAGS -fPIC -Wl,-G,-h,conftest.so.1.0,-B,symbolic"
-+CFLAGS="$CFLAGS  -Wl,-G,-h,conftest.so.1.0,-B,symbolic"
- cat confdefs.h - <<_ACEOF >conftest.$ac_ext
- /* end confdefs.h.  */
- void myfunc() {}