From d30b40805c8428c8f748ac0f4a296d1e9a5b07eb Mon Sep 17 00:00:00 2001
From: Michael Cronenworth <mike@cchtml.com>
Date: Mon, 16 Mar 2020 19:28:00 -0500
Subject: [PATCH] Update to 5.4

---
 .gitignore                |  6 +++---
 sources                   |  6 +++---
 wine-5.3-msvcrt-arm.patch | 41 ---------------------------------------
 wine.spec                 | 17 ++++++++++++----
 4 files changed, 19 insertions(+), 51 deletions(-)
 delete mode 100644 wine-5.3-msvcrt-arm.patch

diff --git a/.gitignore b/.gitignore
index 5016ea2..2198b46 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,3 +1,3 @@
-/wine-5.3.tar.xz
-/wine-5.3.tar.xz.sign
-/wine-staging-5.3.tar.gz
+/wine-5.4.tar.xz
+/wine-5.4.tar.xz.sign
+/wine-staging-5.4.tar.gz
diff --git a/sources b/sources
index f0064f0..0970a92 100644
--- a/sources
+++ b/sources
@@ -1,3 +1,3 @@
-SHA512 (wine-5.3.tar.xz) = 40528f46ad10c11758308e3bf21ba73c7af133d4dda386d542acec3a5cb31e01be0eb102b94f9d82a2358e45597bf49bd1e82c463e3a26aff8c0827b5a0894b6
-SHA512 (wine-5.3.tar.xz.sign) = b1f30a8a72b6efcfb2f7a492de85ab8613b1191d4eb0aff45ff81ab9736e7f877f971ddd040157c88a6bc7ad068d2e6e28bdba5bee6a8010cb098dc53022fec0
-SHA512 (wine-staging-5.3.tar.gz) = df14a61c04b134a72dc8662ee331fd234e2c82bf82824cb01443ae6516aba0bdcb579e2dbedc1ada47de0f3a1265c5fe9ef5f8183094d74451845b78d0a81702
+SHA512 (wine-5.4.tar.xz) = 892e8b875484ada01eaddab4ea50992f95cf3ced6730f8e2ca1f0765770d7fa53a21080c526772b9b3ac83b3559d3d68e83ad3af3afbe9d6f931d833afde7e98
+SHA512 (wine-5.4.tar.xz.sign) = f22d83532184b414925bd96b4014fe3eceda6616eaec01109625d410eb4995932da2b1380c893c4ae81ec5b9450c9af6f54fe241ed14d035c475eb15224c91cb
+SHA512 (wine-staging-5.4.tar.gz) = d4958e73cea34a4a722f516487116d9f77a22099cb80b9c79f2468fbe28855acec131dacecfd255a9934fb88bcf34809bfb2e2e518d89ac23bcae125b6d6c86b
diff --git a/wine-5.3-msvcrt-arm.patch b/wine-5.3-msvcrt-arm.patch
deleted file mode 100644
index 67948c7..0000000
--- a/wine-5.3-msvcrt-arm.patch
+++ /dev/null
@@ -1,41 +0,0 @@
-From: Jacek Caban <jacek@codeweavers.com>
-Subject: [PATCH] stdio.h: Fix calling convention of variadic inline functions.
-Message-Id: <bc92fe4e-2b7c-e139-fcf3-736d723db401@codeweavers.com>
-Date: Tue, 3 Mar 2020 14:37:00 +0100
-
-
-Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=48697
-Signed-off-by: Jacek Caban <jacek@codeweavers.com>
----
-  include/msvcrt/corecrt_wstdio.h | 2 +-
-  include/msvcrt/stdio.h          | 2 +-
-  2 files changed, 2 insertions(+), 2 deletions(-)
-
-diff --git a/include/msvcrt/corecrt_wstdio.h b/include/msvcrt/corecrt_wstdio.h
-index 3951a1c829..c1779fb81a 100644
---- a/include/msvcrt/corecrt_wstdio.h
-+++ b/include/msvcrt/corecrt_wstdio.h
-@@ -115,7 +115,7 @@ static inline int __cdecl _vsnwprintf_s(wchar_t *buffer, size_t size, size_t cou
-     return ret < 0 ? -1 : ret;
- }
- 
--static inline int __cdecl _snwprintf_s(wchar_t *buffer, size_t size, size_t count, const wchar_t *format, ...)
-+static inline int WINAPIV _snwprintf_s(wchar_t *buffer, size_t size, size_t count, const wchar_t *format, ...)
- {
-     int ret;
-     __ms_va_list args;
-diff --git a/include/msvcrt/stdio.h b/include/msvcrt/stdio.h
-index e184704eb9..f2aef46e6f 100644
---- a/include/msvcrt/stdio.h
-+++ b/include/msvcrt/stdio.h
-@@ -174,7 +174,7 @@ static inline int __cdecl _vsnprintf_s(char *buffer, size_t size, size_t count,
-     return ret < 0 ? -1 : ret;
- }
- 
--static inline int __cdecl _snprintf_s(char *buffer, size_t size, size_t count, const char *format, ...)
-+static inline int WINAPIV _snprintf_s(char *buffer, size_t size, size_t count, const char *format, ...)
- {
-     int ret;
-     __ms_va_list args;
-
-
diff --git a/wine.spec b/wine.spec
index b8f5dcb..1805f28 100644
--- a/wine.spec
+++ b/wine.spec
@@ -41,7 +41,7 @@
 %endif
 
 Name:           wine
-Version:        5.3
+Version:        5.4
 Release:        1%{?dist}
 Summary:        A compatibility layer for windows applications
 
@@ -72,8 +72,6 @@ Source109:      wine-oleview.desktop
 Source150:      wine.appdata.xml
 
 # wine bugs
-# https://bugs.winehq.org/show_bug.cgi?id=48697
-Patch100:       wine-5.3-msvcrt-arm.patch
 
 # desktop dir
 Source200:      wine.menu
@@ -680,7 +678,6 @@ This package adds the opencl driver for wine.
 
 %prep
 %setup -q -n wine-%{version}
-%patch100 -p1 -b.mscvrt
 %patch511 -p1 -b.cjk
 
 %if 0%{?wine_staging}
@@ -1189,6 +1186,7 @@ fi
 %{_libdir}/wine/termsv.%{wineexe}
 %{_libdir}/wine/view.%{wineexe}
 %{_libdir}/wine/wevtutil.%{wineexe}
+%{_libdir}/wine/whoami.%{wineexe}
 %{_libdir}/wine/wineboot.%{wineexe}
 %{_libdir}/wine/winebrowser.exe.so
 %{_libdir}/wine/wineconsole.exe.so
@@ -1973,6 +1971,14 @@ fi
 %{_libdir}/wine/x3daudio1_5.dll.so
 %{_libdir}/wine/x3daudio1_6.dll.so
 %{_libdir}/wine/x3daudio1_7.dll.so
+%{_libdir}/wine/xactengine3_0.dll.so
+%{_libdir}/wine/xactengine3_1.dll.so
+%{_libdir}/wine/xactengine3_2.dll.so
+%{_libdir}/wine/xactengine3_3.dll.so
+%{_libdir}/wine/xactengine3_4.dll.so
+%{_libdir}/wine/xactengine3_5.dll.so
+%{_libdir}/wine/xactengine3_6.dll.so
+%{_libdir}/wine/xactengine3_7.dll.so
 %{_libdir}/wine/xapofx1_1.dll.so
 %{_libdir}/wine/xapofx1_2.dll.so
 %{_libdir}/wine/xapofx1_3.dll.so
@@ -2290,6 +2296,9 @@ fi
 %endif
 
 %changelog
+* Mon Mar 16 2020 Michael Cronenworth <mike@cchtml.com> 5.4-1
+- version update
+
 * Mon Mar 02 2020 Michael Cronenworth <mike@cchtml.com> 5.3-1
 - version update