From 6949e06312dc1dca06ee645a91a84aeb1700e605 Mon Sep 17 00:00:00 2001
From: Chongyun Lee <45286352+licy183@users.noreply.github.com>
Date: Sun, 4 Feb 2024 23:48:03 +0800
Subject: [PATCH] wine-staging: bump to 9.1

---
 ...x-winebuild-as-type.patch.beforehostbuild} |  0
 ...inegcc-flags-for-arm.patch.beforehostbuild | 27 -------------------
 tur-multilib/wine-staging/build.sh            |  9 +++----
 3 files changed, 3 insertions(+), 33 deletions(-)
 rename tur-multilib/wine-staging/{9997-fix-winebuild-as-type.patch.beforehostbuild => 9999-fix-winebuild-as-type.patch.beforehostbuild} (100%)
 delete mode 100644 tur-multilib/wine-staging/9999-fix-winegcc-flags-for-arm.patch.beforehostbuild

diff --git a/tur-multilib/wine-staging/9997-fix-winebuild-as-type.patch.beforehostbuild b/tur-multilib/wine-staging/9999-fix-winebuild-as-type.patch.beforehostbuild
similarity index 100%
rename from tur-multilib/wine-staging/9997-fix-winebuild-as-type.patch.beforehostbuild
rename to tur-multilib/wine-staging/9999-fix-winebuild-as-type.patch.beforehostbuild
diff --git a/tur-multilib/wine-staging/9999-fix-winegcc-flags-for-arm.patch.beforehostbuild b/tur-multilib/wine-staging/9999-fix-winegcc-flags-for-arm.patch.beforehostbuild
deleted file mode 100644
index 90411903f..000000000
--- a/tur-multilib/wine-staging/9999-fix-winegcc-flags-for-arm.patch.beforehostbuild
+++ /dev/null
@@ -1,27 +0,0 @@
-Link flag `--no-wchar-size-warning` is not supported by ld.lld until lld-16.
---- a/tools/winegcc/winegcc.c.orig
-+++ b/tools/winegcc/winegcc.c
-@@ -528,8 +528,8 @@
- 
-     strarray_add( &link_args, "-shared" );
-     strarray_add( &link_args, "-Wl,-Bsymbolic" );
--    if (!opts->noshortwchar && opts->target.cpu == CPU_ARM)
--        strarray_add( &flags, "-Wl,--no-wchar-size-warning" );
-+    // if (!opts->noshortwchar && opts->target.cpu == CPU_ARM)
-+    //     strarray_add( &flags, "-Wl,--no-wchar-size-warning" );
-     if (!try_link( opts->prefix, link_args, "-Wl,-z,defs" ))
-         strarray_add( &flags, "-Wl,-z,defs" );
- 
---- a/tools/winebuild/utils.c.orig
-+++ b/tools/winebuild/utils.c
-@@ -386,8 +386,8 @@
-         }
-     }
- 
--    if (target.cpu == CPU_ARM && !is_pe())
--        strarray_add( &args, "--no-wchar-size-warning" );
-+    // if (target.cpu == CPU_ARM && !is_pe())
-+    //     strarray_add( &args, "--no-wchar-size-warning" );
- 
-     return args;
- }
diff --git a/tur-multilib/wine-staging/build.sh b/tur-multilib/wine-staging/build.sh
index 66ddbdf47..1f193c250 100644
--- a/tur-multilib/wine-staging/build.sh
+++ b/tur-multilib/wine-staging/build.sh
@@ -1,15 +1,12 @@
 TERMUX_PKG_HOMEPAGE=https://www.winehq.org/
 TERMUX_PKG_DESCRIPTION="A compatibility layer for running Windows programs"
 TERMUX_PKG_LICENSE="LGPL-2.1"
-TERMUX_PKG_LICENSE_FILE="\
-LICENSE
-LICENSE.OLD
-COPYING.LIB"
+TERMUX_PKG_LICENSE_FILE="LICENSE, LICENSE.OLD, COPYING.LIB"
 TERMUX_PKG_MAINTAINER="@termux-user-repository"
-TERMUX_PKG_VERSION=9.0-rc4
+TERMUX_PKG_VERSION=9.1
 _VERSION_FOLDER="$(test "${TERMUX_PKG_VERSION:2:1}" = 0 && echo ${TERMUX_PKG_VERSION:0:3} || echo ${TERMUX_PKG_VERSION:0:2}x)"
 TERMUX_PKG_SRCURL=https://dl.winehq.org/wine/source/${_VERSION_FOLDER}/wine-$TERMUX_PKG_VERSION.tar.xz
-TERMUX_PKG_SHA256=ebff8b1763ffe3d1eb60b1302d78a662a46140e6f76e4a0caf58d3e4e4c9168f
+TERMUX_PKG_SHA256=01b3b91b6fc35cabe93b28f190a237ba95c8ac70c436d919586deaa3da258fff
 TERMUX_PKG_DEPENDS="fontconfig, freetype, krb5, libandroid-spawn, libc++, libgmp, libgnutls, libxcb, libxcomposite, libxcursor, libxfixes, libxrender, mesa, opengl, pulseaudio, sdl2, vulkan-loader, xorg-xrandr"
 TERMUX_PKG_ANTI_BUILD_DEPENDS="vulkan-loader"
 TERMUX_PKG_BUILD_DEPENDS="libandroid-spawn-static, vulkan-loader-generic"