The package rpms/wine.git has added or updated architecture specific content in its
spec file (ExclusiveArch/ExcludeArch or %ifarch/%ifnarch) in commit(s):
https://src.fedoraproject.org/cgit/rpms/wine.git/commit/?id=85f25c8c1cfbd...
https://src.fedoraproject.org/cgit/rpms/wine.git/commit/?id=84981987dcd43....
Change:
+%ifnarch %{arm} aarch64
-%ifnarch %{arm} aarch64
Thanks.
Full change:
============
commit 84981987dcd43781fe5aea0f38a363318d394fe5
Author: Michael Cronenworth <mike(a)cchtml.com>
Date: Tue Mar 3 14:11:25 2020 -0600
Set activeds.tlb extension as this is not an arch problem
diff --git a/wine.spec b/wine.spec
index a1fd9b0..b8f5dcb 100644
--- a/wine.spec
+++ b/wine.spec
@@ -1204,6 +1204,7 @@ fi
%{_libdir}/wine/acledit.%{winedll}
%{_libdir}/wine/aclui.%{winedll}
%{_libdir}/wine/activeds.%{winedll}
+%{_libdir}/wine/activeds.%{winetlb}
%{_libdir}/wine/actxprxy.%{winedll}
%{_libdir}/wine/adsldp.%{winedll}
%{_libdir}/wine/adsldpc.%{winedll}
@@ -2008,10 +2009,6 @@ fi
%endif
%endif
-%ifnarch %{arm} aarch64
-%{_libdir}/wine/activeds.tlb
-%endif
-
# 16 bit and other non 64bit stuff
%ifnarch x86_64 %{arm} aarch64
%{_libdir}/wine/winevdm.exe.so
commit 85f25c8c1cfbda0aaaeb726f347a51e44865f017
Author: Michael Cronenworth <mike(a)cchtml.com>
Date: Tue Mar 3 12:32:30 2020 -0600
Don't ship activeds.tlb on ARM arches
diff --git a/wine.spec b/wine.spec
index ed7832c..a1fd9b0 100644
--- a/wine.spec
+++ b/wine.spec
@@ -1204,7 +1204,6 @@ fi
%{_libdir}/wine/acledit.%{winedll}
%{_libdir}/wine/aclui.%{winedll}
%{_libdir}/wine/activeds.%{winedll}
-%{_libdir}/wine/activeds.tlb
%{_libdir}/wine/actxprxy.%{winedll}
%{_libdir}/wine/adsldp.%{winedll}
%{_libdir}/wine/adsldpc.%{winedll}
@@ -2009,6 +2008,10 @@ fi
%endif
%endif
+%ifnarch %{arm} aarch64
+%{_libdir}/wine/activeds.tlb
+%endif
+
# 16 bit and other non 64bit stuff
%ifnarch x86_64 %{arm} aarch64
%{_libdir}/wine/winevdm.exe.so
commit c1f860d9509a452321307444de4880813b733daf
Author: Michael Cronenworth <mike(a)cchtml.com>
Date: Tue Mar 3 11:00:00 2020 -0600
Apply patch for arm
diff --git a/wine-5.3-msvcrt-arm.patch b/wine-5.3-msvcrt-arm.patch
new file mode 100644
index 0000000..67948c7
--- /dev/null
+++ b/wine-5.3-msvcrt-arm.patch
@@ -0,0 +1,41 @@
+From: Jacek Caban <jacek(a)codeweavers.com>
+Subject: [PATCH] stdio.h: Fix calling convention of variadic inline functions.
+Message-Id: <bc92fe4e-2b7c-e139-fcf3-736d723db401(a)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(a)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 a6fac00..ed7832c 100644
--- a/wine.spec
+++ b/wine.spec
@@ -72,6 +72,8 @@ 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
@@ -678,6 +680,7 @@ 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}
commit 958adb640ff976b5785dcd5ec00b7220244c8b50
Author: Michael Cronenworth <mike(a)cchtml.com>
Date: Mon Mar 2 22:29:41 2020 -0600
Update to 5.3
diff --git a/.gitignore b/.gitignore
index 16ce3a0..5016ea2 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,3 +1,3 @@
-/wine-5.2.tar.xz
-/wine-5.2.tar.xz.sign
-/wine-staging-5.2.tar.gz
+/wine-5.3.tar.xz
+/wine-5.3.tar.xz.sign
+/wine-staging-5.3.tar.gz
diff --git a/sources b/sources
index 44e73d9..f0064f0 100644
--- a/sources
+++ b/sources
@@ -1,3 +1,3 @@
-SHA512 (wine-5.2.tar.xz) =
57fa66885c3b5f43e51324e24b8524f663ad67ff15b464ac7d58096d5921f523a59ef5f1dc1ea7aa65fa10d64b7cd832f421c1b773c72bc312d8544a61c33f8f
-SHA512 (wine-5.2.tar.xz.sign) =
310d27ef2aa2ca166a65ee9638a666c3a3d70152eefcf4d36567492455b35829eab35b9059ef08af4bdabefa4d167e7f0ae3ae1c6509b4072c85109dbad1012f
-SHA512 (wine-staging-5.2.tar.gz) =
dd2066db1eb4d424579bdf8d25f476eae0b86a6bea7b1f7ff2a21d7bf0209b4ef00d9c0ed29a7cab50c5dea4684acb5d342ebf02554b16fd0938a03e607f6270
+SHA512 (wine-5.3.tar.xz) =
40528f46ad10c11758308e3bf21ba73c7af133d4dda386d542acec3a5cb31e01be0eb102b94f9d82a2358e45597bf49bd1e82c463e3a26aff8c0827b5a0894b6
+SHA512 (wine-5.3.tar.xz.sign) =
b1f30a8a72b6efcfb2f7a492de85ab8613b1191d4eb0aff45ff81ab9736e7f877f971ddd040157c88a6bc7ad068d2e6e28bdba5bee6a8010cb098dc53022fec0
+SHA512 (wine-staging-5.3.tar.gz) =
df14a61c04b134a72dc8662ee331fd234e2c82bf82824cb01443ae6516aba0bdcb579e2dbedc1ada47de0f3a1265c5fe9ef5f8183094d74451845b78d0a81702
diff --git a/wine.spec b/wine.spec
index c9f74c4..a6fac00 100644
--- a/wine.spec
+++ b/wine.spec
@@ -41,7 +41,7 @@
%endif
Name: wine
-Version: 5.2
+Version: 5.3
Release: 1%{?dist}
Summary: A compatibility layer for windows applications
@@ -1201,6 +1201,7 @@ fi
%{_libdir}/wine/acledit.%{winedll}
%{_libdir}/wine/aclui.%{winedll}
%{_libdir}/wine/activeds.%{winedll}
+%{_libdir}/wine/activeds.tlb
%{_libdir}/wine/actxprxy.%{winedll}
%{_libdir}/wine/adsldp.%{winedll}
%{_libdir}/wine/adsldpc.%{winedll}
@@ -1793,6 +1794,7 @@ fi
%{_libdir}/wine/propsys.%{winedll}
%{_libdir}/wine/psapi.%{winedll}
%{_libdir}/wine/pstorec.%{winedll}
+%{_libdir}/wine/qasf.%{winedll}
%{_libdir}/wine/qcap.dll.so
%{_libdir}/wine/qedit.%{winedll}
%{_libdir}/wine/qmgr.%{winedll}
@@ -2285,6 +2287,9 @@ fi
%endif
%changelog
+* Mon Mar 02 2020 Michael Cronenworth <mike(a)cchtml.com> 5.3-1
+- version update
+
* Tue Feb 18 2020 Michael Cronenworth <mike(a)cchtml.com> 5.2-1
- version update