git: f339ae325a24 - main - emulators/wine-devel: Update to Wine 6.22

From: Gerald Pfeifer <gerald_at_FreeBSD.org>
Date: Mon, 22 Nov 2021 13:17:20 UTC
The branch main has been updated by gerald:

URL: https://cgit.FreeBSD.org/ports/commit/?id=f339ae325a2461f0062d935dc5ff6f76ec67ae86

commit f339ae325a2461f0062d935dc5ff6f76ec67ae86
Author:     Damjan Jovanovic <damjan.jov@gmail.com>
AuthorDate: 2021-11-22 09:30:55 +0000
Commit:     Gerald Pfeifer <gerald@FreeBSD.org>
CommitDate: 2021-11-22 13:16:30 +0000

    emulators/wine-devel: Update to Wine 6.22
    
    This includes the following changes:
     - More improvements to HID joystick support.
     - WoW64 thunks in a number of Unix libraries.
     - Beginnings of moving USER32 to Win32u.
     - Various bug fixes.
    
    The Mono engine has been updated to version 7.0.0 in a separate
    update to emulators/wine-mono-devel.
    
    Approved by:    maintainer (= author)
---
 emulators/wine-devel/Makefile  |   3 +-
 emulators/wine-devel/distinfo  |  10 +-
 emulators/wine-devel/pkg-plist | 412 ++++++++++++++++++++---------------------
 3 files changed, 211 insertions(+), 214 deletions(-)

diff --git a/emulators/wine-devel/Makefile b/emulators/wine-devel/Makefile
index 070fd637ed83..4750aadc358c 100644
--- a/emulators/wine-devel/Makefile
+++ b/emulators/wine-devel/Makefile
@@ -1,8 +1,7 @@
 # Created by: Gerald Pfeifer <gerald@FreeBSD.org>
 
 PORTNAME=	wine
-DISTVERSION=	6.21
-PORTREVISION=	1
+DISTVERSION=	6.22
 PORTEPOCH=	1
 CATEGORIES=	emulators
 MASTER_SITES=	SF/${PORTNAME}/Source \
diff --git a/emulators/wine-devel/distinfo b/emulators/wine-devel/distinfo
index 283a2f1b50bf..50c2a4d4b45b 100644
--- a/emulators/wine-devel/distinfo
+++ b/emulators/wine-devel/distinfo
@@ -1,5 +1,5 @@
-TIMESTAMP = 1636178163
-SHA256 (wine-6.21.tar.xz) = f7b67572b52a7150f3dcc43318b40cf10425171319edf6368a60274642e079ce
-SIZE (wine-6.21.tar.xz) = 26973172
-SHA256 (v6.21.tar.gz) = df986de7d6ce6536c18bba4dbeab05e2bd199cfa73e3194fd6c805cdc6d51dfd
-SIZE (v6.21.tar.gz) = 9627829
+TIMESTAMP = 1637468104
+SHA256 (wine-6.22.tar.xz) = 826042a181a9879732a3dacbbf8167605f305291bfcfaaf5eaa0ec9525d764ef
+SIZE (wine-6.22.tar.xz) = 27031604
+SHA256 (v6.22.tar.gz) = a74fd4343dca709918830b7393cb1f4e0ae29fce731c55f702905f126a9dced7
+SIZE (v6.22.tar.gz) = 9608891
diff --git a/emulators/wine-devel/pkg-plist b/emulators/wine-devel/pkg-plist
index dcc923c05c2e..1e550a42fe96 100644
--- a/emulators/wine-devel/pkg-plist
+++ b/emulators/wine-devel/pkg-plist
@@ -722,7 +722,6 @@ include/wine/windows/ole2.h
 include/wine/windows/ole2ver.h
 include/wine/windows/oleacc.h
 include/wine/windows/oleacc.idl
-include/wine/windows/oleacc.tlb
 include/wine/windows/oleauto.h
 include/wine/windows/olectl.h
 include/wine/windows/oledb.h
@@ -864,10 +863,6 @@ include/wine/windows/sqlucode.h
 include/wine/windows/srcrst.idl
 include/wine/windows/srrestoreptapi.h
 include/wine/windows/sspi.h
-include/wine/windows/stdole2.idl
-include/wine/windows/stdole2.tlb
-%%STAGING%%include/wine/windows/stdole32.idl
-%%STAGING%%include/wine/windows/stdole32.tlb
 include/wine/windows/stgprop.h
 include/wine/windows/sti.h
 include/wine/windows/storage.h
@@ -904,6 +899,7 @@ include/wine/windows/tpcshrd.h
 include/wine/windows/traffic.h
 include/wine/windows/transact.h
 include/wine/windows/transact.idl
+include/wine/windows/trnjoi.idl
 include/wine/windows/twain.h
 include/wine/windows/txcoord.h
 include/wine/windows/txcoord.idl
@@ -1702,126 +1698,125 @@ lib/wine/%%WINEARCH%%-unix/ksproxy.ax.so
 lib/wine/%%WINEARCH%%-unix/ksuser.dll.so
 lib/wine/%%WINEARCH%%-unix/ktmw32.dll.so
 lib/wine/%%WINEARCH%%-unix/l3codeca.acm.so
-lib/wine/%%WINEARCH%%-unix/libaclui.def
-lib/wine/%%WINEARCH%%-unix/libactiveds.def
+lib/wine/%%WINEARCH%%-unix/libaclui.a
+lib/wine/%%WINEARCH%%-unix/libactiveds.a
 lib/wine/%%WINEARCH%%-unix/libadsiid.a
-lib/wine/%%WINEARCH%%-unix/libadvapi32.def
-lib/wine/%%WINEARCH%%-unix/libadvpack.def
-lib/wine/%%WINEARCH%%-unix/libatl.def
-lib/wine/%%WINEARCH%%-unix/libatl100.def
-lib/wine/%%WINEARCH%%-unix/libatl80.def
-lib/wine/%%WINEARCH%%-unix/libatlthunk.def
-lib/wine/%%WINEARCH%%-unix/libavicap32.def
-lib/wine/%%WINEARCH%%-unix/libavifil32.def
-lib/wine/%%WINEARCH%%-unix/libavrt.def
-lib/wine/%%WINEARCH%%-unix/libbcrypt.def
-lib/wine/%%WINEARCH%%-unix/libcabinet.def
-lib/wine/%%WINEARCH%%-unix/libcards.def
-lib/wine/%%WINEARCH%%-unix/libcfgmgr32.def
-lib/wine/%%WINEARCH%%-unix/libclusapi.def
-lib/wine/%%WINEARCH%%-unix/libcombase.def
-lib/wine/%%WINEARCH%%-unix/libcomctl32.def
-lib/wine/%%WINEARCH%%-unix/libcomdlg32.def
-lib/wine/%%WINEARCH%%-unix/libcompstui.def
-lib/wine/%%WINEARCH%%-unix/libcomsvcs.def
-lib/wine/%%WINEARCH%%-unix/libcredui.def
-lib/wine/%%WINEARCH%%-unix/libcrypt32.def
-lib/wine/%%WINEARCH%%-unix/libcryptdll.def
-lib/wine/%%WINEARCH%%-unix/libcryptnet.def
-lib/wine/%%WINEARCH%%-unix/libcryptui.def
-lib/wine/%%WINEARCH%%-unix/libd2d1.def
-lib/wine/%%WINEARCH%%-unix/libd3d10.def
-lib/wine/%%WINEARCH%%-unix/libd3d10_1.def
-lib/wine/%%WINEARCH%%-unix/libd3d10core.def
-lib/wine/%%WINEARCH%%-unix/libd3d11.def
-%%X11%%lib/wine/%%WINEARCH%%-unix/libd3d12.def
-lib/wine/%%WINEARCH%%-unix/libd3d8.def
-lib/wine/%%WINEARCH%%-unix/libd3d9.def
-lib/wine/%%WINEARCH%%-unix/libd3dcompiler.def
-lib/wine/%%WINEARCH%%-unix/libd3dcompiler_43.def
-lib/wine/%%WINEARCH%%-unix/libd3dcompiler_46.def
-lib/wine/%%WINEARCH%%-unix/libd3drm.def
-lib/wine/%%WINEARCH%%-unix/libd3dx10.def
-lib/wine/%%WINEARCH%%-unix/libd3dx10_34.def
-lib/wine/%%WINEARCH%%-unix/libd3dx10_35.def
-lib/wine/%%WINEARCH%%-unix/libd3dx10_36.def
-lib/wine/%%WINEARCH%%-unix/libd3dx10_37.def
-lib/wine/%%WINEARCH%%-unix/libd3dx10_38.def
-lib/wine/%%WINEARCH%%-unix/libd3dx10_39.def
-lib/wine/%%WINEARCH%%-unix/libd3dx10_40.def
-lib/wine/%%WINEARCH%%-unix/libd3dx10_41.def
-lib/wine/%%WINEARCH%%-unix/libd3dx10_42.def
-lib/wine/%%WINEARCH%%-unix/libd3dx11.def
-lib/wine/%%WINEARCH%%-unix/libd3dx11_42.def
-lib/wine/%%WINEARCH%%-unix/libd3dx9.def
-lib/wine/%%WINEARCH%%-unix/libd3dxof.def
-lib/wine/%%WINEARCH%%-unix/libdbgeng.def
-lib/wine/%%WINEARCH%%-unix/libdbghelp.def
-lib/wine/%%WINEARCH%%-unix/libdciman32.def
-lib/wine/%%WINEARCH%%-unix/libddraw.def
-lib/wine/%%WINEARCH%%-unix/libdhcpcsvc.def
+lib/wine/%%WINEARCH%%-unix/libadvapi32.a
+lib/wine/%%WINEARCH%%-unix/libadvpack.a
+lib/wine/%%WINEARCH%%-unix/libatl.a
+lib/wine/%%WINEARCH%%-unix/libatl100.a
+lib/wine/%%WINEARCH%%-unix/libatl80.a
+lib/wine/%%WINEARCH%%-unix/libatlthunk.a
+lib/wine/%%WINEARCH%%-unix/libavicap32.a
+lib/wine/%%WINEARCH%%-unix/libavifil32.a
+lib/wine/%%WINEARCH%%-unix/libavrt.a
+lib/wine/%%WINEARCH%%-unix/libbcrypt.a
+lib/wine/%%WINEARCH%%-unix/libcabinet.a
+lib/wine/%%WINEARCH%%-unix/libcards.a
+lib/wine/%%WINEARCH%%-unix/libcfgmgr32.a
+lib/wine/%%WINEARCH%%-unix/libclusapi.a
+lib/wine/%%WINEARCH%%-unix/libcombase.a
+lib/wine/%%WINEARCH%%-unix/libcomctl32.a
+lib/wine/%%WINEARCH%%-unix/libcomdlg32.a
+lib/wine/%%WINEARCH%%-unix/libcompstui.a
+lib/wine/%%WINEARCH%%-unix/libcomsvcs.a
+lib/wine/%%WINEARCH%%-unix/libcredui.a
+lib/wine/%%WINEARCH%%-unix/libcrypt32.a
+lib/wine/%%WINEARCH%%-unix/libcryptdll.a
+lib/wine/%%WINEARCH%%-unix/libcryptnet.a
+lib/wine/%%WINEARCH%%-unix/libcryptui.a
+lib/wine/%%WINEARCH%%-unix/libd2d1.a
+lib/wine/%%WINEARCH%%-unix/libd3d10.a
+lib/wine/%%WINEARCH%%-unix/libd3d10_1.a
+lib/wine/%%WINEARCH%%-unix/libd3d10core.a
+lib/wine/%%WINEARCH%%-unix/libd3d11.a
+lib/wine/%%WINEARCH%%-unix/libd3d12.a
+lib/wine/%%WINEARCH%%-unix/libd3d8.a
+lib/wine/%%WINEARCH%%-unix/libd3d9.a
+lib/wine/%%WINEARCH%%-unix/libd3dcompiler.a
+lib/wine/%%WINEARCH%%-unix/libd3dcompiler_43.a
+lib/wine/%%WINEARCH%%-unix/libd3dcompiler_46.a
+lib/wine/%%WINEARCH%%-unix/libd3drm.a
+lib/wine/%%WINEARCH%%-unix/libd3dx10.a
+lib/wine/%%WINEARCH%%-unix/libd3dx10_34.a
+lib/wine/%%WINEARCH%%-unix/libd3dx10_35.a
+lib/wine/%%WINEARCH%%-unix/libd3dx10_36.a
+lib/wine/%%WINEARCH%%-unix/libd3dx10_37.a
+lib/wine/%%WINEARCH%%-unix/libd3dx10_38.a
+lib/wine/%%WINEARCH%%-unix/libd3dx10_39.a
+lib/wine/%%WINEARCH%%-unix/libd3dx10_40.a
+lib/wine/%%WINEARCH%%-unix/libd3dx10_41.a
+lib/wine/%%WINEARCH%%-unix/libd3dx10_42.a
+lib/wine/%%WINEARCH%%-unix/libd3dx11.a
+lib/wine/%%WINEARCH%%-unix/libd3dx11_42.a
+lib/wine/%%WINEARCH%%-unix/libd3dx9.a
+lib/wine/%%WINEARCH%%-unix/libd3dxof.a
+lib/wine/%%WINEARCH%%-unix/libdbgeng.a
+lib/wine/%%WINEARCH%%-unix/libdbghelp.a
+lib/wine/%%WINEARCH%%-unix/libdciman32.a
+lib/wine/%%WINEARCH%%-unix/libddraw.a
+lib/wine/%%WINEARCH%%-unix/libdhcpcsvc.a
 lib/wine/%%WINEARCH%%-unix/libdinput.a
 lib/wine/%%WINEARCH%%-unix/libdinput8.a
 lib/wine/%%WINEARCH%%-unix/libdmoguids.a
-lib/wine/%%WINEARCH%%-unix/libdnsapi.def
-lib/wine/%%WINEARCH%%-unix/libdplayx.def
-lib/wine/%%WINEARCH%%-unix/libdpnet.def
-lib/wine/%%WINEARCH%%-unix/libdsound.def
-lib/wine/%%WINEARCH%%-unix/libdwmapi.def
-lib/wine/%%WINEARCH%%-unix/libdwrite.def
+lib/wine/%%WINEARCH%%-unix/libdnsapi.a
+lib/wine/%%WINEARCH%%-unix/libdplayx.a
+lib/wine/%%WINEARCH%%-unix/libdpnet.a
+lib/wine/%%WINEARCH%%-unix/libdsound.a
+lib/wine/%%WINEARCH%%-unix/libdwmapi.a
+lib/wine/%%WINEARCH%%-unix/libdwrite.a
 lib/wine/%%WINEARCH%%-unix/libdxerr8.a
 lib/wine/%%WINEARCH%%-unix/libdxerr9.a
-lib/wine/%%WINEARCH%%-unix/libdxgi.def
+lib/wine/%%WINEARCH%%-unix/libdxgi.a
 lib/wine/%%WINEARCH%%-unix/libdxguid.a
-lib/wine/%%WINEARCH%%-unix/libdxva2.def
-lib/wine/%%WINEARCH%%-unix/libevr.def
+lib/wine/%%WINEARCH%%-unix/libdxva2.a
+lib/wine/%%WINEARCH%%-unix/libevr.a
 lib/wine/%%WINEARCH%%-unix/libfaudio.a
-lib/wine/%%WINEARCH%%-unix/libfaultrep.def
-%%STAGING%%lib/wine/%%WINEARCH%%-unix/libfltmgr.def
-lib/wine/%%WINEARCH%%-unix/libgdi32.def
-lib/wine/%%WINEARCH%%-unix/libgdiplus.def
-lib/wine/%%WINEARCH%%-unix/libglu32.def
+lib/wine/%%WINEARCH%%-unix/libfaultrep.a
+%%STAGING%%lib/wine/%%WINEARCH%%-unix/libfltmgr.a
+lib/wine/%%WINEARCH%%-unix/libgdi32.a
+lib/wine/%%WINEARCH%%-unix/libgdiplus.a
+lib/wine/%%WINEARCH%%-unix/libglu32.a
 lib/wine/%%WINEARCH%%-unix/libgsm.a
-lib/wine/%%WINEARCH%%-unix/libhal.def
-lib/wine/%%WINEARCH%%-unix/libhid.def
-lib/wine/%%WINEARCH%%-unix/libhidclass.def
-lib/wine/%%WINEARCH%%-unix/libhidparse.def
-lib/wine/%%WINEARCH%%-unix/libhlink.def
-lib/wine/%%WINEARCH%%-unix/libhtmlhelp.def
-lib/wine/%%WINEARCH%%-unix/libhttpapi.def
-lib/wine/%%WINEARCH%%-unix/libieframe.def
-lib/wine/%%WINEARCH%%-unix/libimagehlp.def
-lib/wine/%%WINEARCH%%-unix/libimm32.def
-lib/wine/%%WINEARCH%%-unix/libinetcomm.def
-lib/wine/%%WINEARCH%%-unix/libiphlpapi.def
+lib/wine/%%WINEARCH%%-unix/libhal.a
+lib/wine/%%WINEARCH%%-unix/libhid.a
+lib/wine/%%WINEARCH%%-unix/libhidclass.a
+lib/wine/%%WINEARCH%%-unix/libhidparse.a
+lib/wine/%%WINEARCH%%-unix/libhlink.a
+lib/wine/%%WINEARCH%%-unix/libhtmlhelp.a
+lib/wine/%%WINEARCH%%-unix/libhttpapi.a
+lib/wine/%%WINEARCH%%-unix/libieframe.a
+lib/wine/%%WINEARCH%%-unix/libimagehlp.a
+lib/wine/%%WINEARCH%%-unix/libimm32.a
+lib/wine/%%WINEARCH%%-unix/libinetcomm.a
+lib/wine/%%WINEARCH%%-unix/libiphlpapi.a
 lib/wine/%%WINEARCH%%-unix/libjpeg.a
-lib/wine/%%WINEARCH%%-unix/libjsproxy.def
+lib/wine/%%WINEARCH%%-unix/libjsproxy.a
 lib/wine/%%WINEARCH%%-unix/libjxr.a
-%%WINE32%%lib/wine/%%WINEARCH%%-unix/libkernel.def
-lib/wine/%%WINEARCH%%-unix/libkernel32.def
-lib/wine/%%WINEARCH%%-unix/libkernelbase.def
+lib/wine/%%WINEARCH%%-unix/libkernel32.a
+lib/wine/%%WINEARCH%%-unix/libkernelbase.a
 lib/wine/%%WINEARCH%%-unix/liblcms2.a
-lib/wine/%%WINEARCH%%-unix/libloadperf.def
-lib/wine/%%WINEARCH%%-unix/liblz32.def
-lib/wine/%%WINEARCH%%-unix/libmapi32.def
-lib/wine/%%WINEARCH%%-unix/libmf.def
-lib/wine/%%WINEARCH%%-unix/libmfmediaengine.def
-lib/wine/%%WINEARCH%%-unix/libmfplat.def
-lib/wine/%%WINEARCH%%-unix/libmfplay.def
-lib/wine/%%WINEARCH%%-unix/libmfreadwrite.def
+lib/wine/%%WINEARCH%%-unix/libloadperf.a
+lib/wine/%%WINEARCH%%-unix/liblz32.a
+lib/wine/%%WINEARCH%%-unix/libmapi32.a
+lib/wine/%%WINEARCH%%-unix/libmf.a
+lib/wine/%%WINEARCH%%-unix/libmfmediaengine.a
+lib/wine/%%WINEARCH%%-unix/libmfplat.a
+lib/wine/%%WINEARCH%%-unix/libmfplay.a
+lib/wine/%%WINEARCH%%-unix/libmfreadwrite.a
 lib/wine/%%WINEARCH%%-unix/libmfuuid.a
-lib/wine/%%WINEARCH%%-unix/libmlang.def
+lib/wine/%%WINEARCH%%-unix/libmlang.a
 lib/wine/%%WINEARCH%%-unix/libmpg123.a
-lib/wine/%%WINEARCH%%-unix/libmpr.def
-lib/wine/%%WINEARCH%%-unix/libmprapi.def
-lib/wine/%%WINEARCH%%-unix/libmsacm32.def
-lib/wine/%%WINEARCH%%-unix/libmsasn1.def
-lib/wine/%%WINEARCH%%-unix/libmscms.def
-lib/wine/%%WINEARCH%%-unix/libmsdmo.def
-lib/wine/%%WINEARCH%%-unix/libmshtml.def
-lib/wine/%%WINEARCH%%-unix/libmsi.def
-lib/wine/%%WINEARCH%%-unix/libmsimg32.def
-lib/wine/%%WINEARCH%%-unix/libmspatcha.def
+lib/wine/%%WINEARCH%%-unix/libmpr.a
+lib/wine/%%WINEARCH%%-unix/libmprapi.a
+lib/wine/%%WINEARCH%%-unix/libmsacm32.a
+lib/wine/%%WINEARCH%%-unix/libmsasn1.a
+lib/wine/%%WINEARCH%%-unix/libmscms.a
+lib/wine/%%WINEARCH%%-unix/libmsdmo.a
+lib/wine/%%WINEARCH%%-unix/libmshtml.a
+lib/wine/%%WINEARCH%%-unix/libmsi.a
+lib/wine/%%WINEARCH%%-unix/libmsimg32.a
+lib/wine/%%WINEARCH%%-unix/libmspatcha.a
 lib/wine/%%WINEARCH%%-unix/libmsvcr100.a
 lib/wine/%%WINEARCH%%-unix/libmsvcr110.a
 lib/wine/%%WINEARCH%%-unix/libmsvcr120.a
@@ -1831,115 +1826,114 @@ lib/wine/%%WINEARCH%%-unix/libmsvcr80.a
 lib/wine/%%WINEARCH%%-unix/libmsvcr90.a
 lib/wine/%%WINEARCH%%-unix/libmsvcrt.a
 lib/wine/%%WINEARCH%%-unix/libmsvcrtd.a
-lib/wine/%%WINEARCH%%-unix/libmsvfw32.def
-lib/wine/%%WINEARCH%%-unix/libmswsock.def
-lib/wine/%%WINEARCH%%-unix/libnddeapi.def
-lib/wine/%%WINEARCH%%-unix/libnetapi32.def
-lib/wine/%%WINEARCH%%-unix/libnetio.def
-lib/wine/%%WINEARCH%%-unix/libnewdev.def
-lib/wine/%%WINEARCH%%-unix/libninput.def
-lib/wine/%%WINEARCH%%-unix/libnormaliz.def
-lib/wine/%%WINEARCH%%-unix/libnsi.def
-lib/wine/%%WINEARCH%%-unix/libntdll.def
-lib/wine/%%WINEARCH%%-unix/libntdsapi.def
-lib/wine/%%WINEARCH%%-unix/libntoskrnl.def
-lib/wine/%%WINEARCH%%-unix/libodbc32.def
-lib/wine/%%WINEARCH%%-unix/libodbccp32.def
-lib/wine/%%WINEARCH%%-unix/libole32.def
-lib/wine/%%WINEARCH%%-unix/liboleacc.def
-lib/wine/%%WINEARCH%%-unix/liboleaut32.def
-lib/wine/%%WINEARCH%%-unix/libolecli32.def
-lib/wine/%%WINEARCH%%-unix/liboledlg.def
-lib/wine/%%WINEARCH%%-unix/libolepro32.def
-lib/wine/%%WINEARCH%%-unix/libolesvr32.def
-lib/wine/%%WINEARCH%%-unix/libopengl32.def
-lib/wine/%%WINEARCH%%-unix/libpdh.def
+lib/wine/%%WINEARCH%%-unix/libmsvfw32.a
+lib/wine/%%WINEARCH%%-unix/libmswsock.a
+lib/wine/%%WINEARCH%%-unix/libnddeapi.a
+lib/wine/%%WINEARCH%%-unix/libnetapi32.a
+lib/wine/%%WINEARCH%%-unix/libnetio.a
+lib/wine/%%WINEARCH%%-unix/libnewdev.a
+lib/wine/%%WINEARCH%%-unix/libninput.a
+lib/wine/%%WINEARCH%%-unix/libnormaliz.a
+lib/wine/%%WINEARCH%%-unix/libnsi.a
+lib/wine/%%WINEARCH%%-unix/libntdll.a
+lib/wine/%%WINEARCH%%-unix/libntdsapi.a
+lib/wine/%%WINEARCH%%-unix/libntoskrnl.a
+lib/wine/%%WINEARCH%%-unix/libodbc32.a
+lib/wine/%%WINEARCH%%-unix/libodbccp32.a
+lib/wine/%%WINEARCH%%-unix/libole32.a
+lib/wine/%%WINEARCH%%-unix/liboleacc.a
+lib/wine/%%WINEARCH%%-unix/liboleaut32.a
+lib/wine/%%WINEARCH%%-unix/libolecli32.a
+lib/wine/%%WINEARCH%%-unix/liboledlg.a
+lib/wine/%%WINEARCH%%-unix/libolepro32.a
+lib/wine/%%WINEARCH%%-unix/libolesvr32.a
+lib/wine/%%WINEARCH%%-unix/libopengl32.a
+lib/wine/%%WINEARCH%%-unix/libpdh.a
 lib/wine/%%WINEARCH%%-unix/libpng.a
-lib/wine/%%WINEARCH%%-unix/libpowrprof.def
-lib/wine/%%WINEARCH%%-unix/libprntvpt.def
-lib/wine/%%WINEARCH%%-unix/libpropsys.def
-lib/wine/%%WINEARCH%%-unix/libpsapi.def
-lib/wine/%%WINEARCH%%-unix/libquartz.def
-lib/wine/%%WINEARCH%%-unix/libqwave.def
-lib/wine/%%WINEARCH%%-unix/librasapi32.def
-lib/wine/%%WINEARCH%%-unix/librasdlg.def
-lib/wine/%%WINEARCH%%-unix/libresutils.def
-lib/wine/%%WINEARCH%%-unix/libriched20.def
-lib/wine/%%WINEARCH%%-unix/librpcrt4.def
-lib/wine/%%WINEARCH%%-unix/librsaenh.def
-lib/wine/%%WINEARCH%%-unix/librtutils.def
-lib/wine/%%WINEARCH%%-unix/librtworkq.def
-lib/wine/%%WINEARCH%%-unix/libsechost.def
-lib/wine/%%WINEARCH%%-unix/libsecur32.def
-lib/wine/%%WINEARCH%%-unix/libsensapi.def
-lib/wine/%%WINEARCH%%-unix/libsetupapi.def
-lib/wine/%%WINEARCH%%-unix/libsfc.def
-lib/wine/%%WINEARCH%%-unix/libsfc_os.def
-lib/wine/%%WINEARCH%%-unix/libshcore.def
-lib/wine/%%WINEARCH%%-unix/libshdocvw.def
-lib/wine/%%WINEARCH%%-unix/libshell32.def
-lib/wine/%%WINEARCH%%-unix/libshfolder.def
-lib/wine/%%WINEARCH%%-unix/libshlwapi.def
-lib/wine/%%WINEARCH%%-unix/libslc.def
-lib/wine/%%WINEARCH%%-unix/libsnmpapi.def
-lib/wine/%%WINEARCH%%-unix/libspoolss.def
-lib/wine/%%WINEARCH%%-unix/libsti.def
+lib/wine/%%WINEARCH%%-unix/libpowrprof.a
+lib/wine/%%WINEARCH%%-unix/libprntvpt.a
+lib/wine/%%WINEARCH%%-unix/libpropsys.a
+lib/wine/%%WINEARCH%%-unix/libpsapi.a
+lib/wine/%%WINEARCH%%-unix/libquartz.a
+lib/wine/%%WINEARCH%%-unix/libqwave.a
+lib/wine/%%WINEARCH%%-unix/librasapi32.a
+lib/wine/%%WINEARCH%%-unix/librasdlg.a
+lib/wine/%%WINEARCH%%-unix/libresutils.a
+lib/wine/%%WINEARCH%%-unix/libriched20.a
+lib/wine/%%WINEARCH%%-unix/librpcrt4.a
+lib/wine/%%WINEARCH%%-unix/librsaenh.a
+lib/wine/%%WINEARCH%%-unix/librtutils.a
+lib/wine/%%WINEARCH%%-unix/librtworkq.a
+lib/wine/%%WINEARCH%%-unix/libsechost.a
+lib/wine/%%WINEARCH%%-unix/libsecur32.a
+lib/wine/%%WINEARCH%%-unix/libsensapi.a
+lib/wine/%%WINEARCH%%-unix/libsetupapi.a
+lib/wine/%%WINEARCH%%-unix/libsfc.a
+lib/wine/%%WINEARCH%%-unix/libsfc_os.a
+lib/wine/%%WINEARCH%%-unix/libshcore.a
+lib/wine/%%WINEARCH%%-unix/libshdocvw.a
+lib/wine/%%WINEARCH%%-unix/libshell32.a
+lib/wine/%%WINEARCH%%-unix/libshfolder.a
+lib/wine/%%WINEARCH%%-unix/libshlwapi.a
+lib/wine/%%WINEARCH%%-unix/libslc.a
+lib/wine/%%WINEARCH%%-unix/libsnmpapi.a
+lib/wine/%%WINEARCH%%-unix/libspoolss.a
+lib/wine/%%WINEARCH%%-unix/libsti.a
 lib/wine/%%WINEARCH%%-unix/libstrmbase.a
 lib/wine/%%WINEARCH%%-unix/libstrmiids.a
-lib/wine/%%WINEARCH%%-unix/libsxs.def
-lib/wine/%%WINEARCH%%-unix/libt2embed.def
-lib/wine/%%WINEARCH%%-unix/libtapi32.def
+lib/wine/%%WINEARCH%%-unix/libsxs.a
+lib/wine/%%WINEARCH%%-unix/libt2embed.a
+lib/wine/%%WINEARCH%%-unix/libtapi32.a
 lib/wine/%%WINEARCH%%-unix/libtiff.a
 lib/wine/%%WINEARCH%%-unix/libucrtbase.a
-lib/wine/%%WINEARCH%%-unix/libuiautomationcore.def
-lib/wine/%%WINEARCH%%-unix/libunicows.def
-lib/wine/%%WINEARCH%%-unix/liburl.def
-lib/wine/%%WINEARCH%%-unix/liburlmon.def
-lib/wine/%%WINEARCH%%-unix/libusbd.def
-lib/wine/%%WINEARCH%%-unix/libuser32.def
-lib/wine/%%WINEARCH%%-unix/libuserenv.def
-lib/wine/%%WINEARCH%%-unix/libusp10.def
+lib/wine/%%WINEARCH%%-unix/libuiautomationcore.a
+lib/wine/%%WINEARCH%%-unix/libunicows.a
+lib/wine/%%WINEARCH%%-unix/liburl.a
+lib/wine/%%WINEARCH%%-unix/liburlmon.a
+lib/wine/%%WINEARCH%%-unix/libusbd.a
+lib/wine/%%WINEARCH%%-unix/libuser32.a
+lib/wine/%%WINEARCH%%-unix/libuserenv.a
+lib/wine/%%WINEARCH%%-unix/libusp10.a
 lib/wine/%%WINEARCH%%-unix/libuuid.a
-lib/wine/%%WINEARCH%%-unix/libuxtheme.def
-lib/wine/%%WINEARCH%%-unix/libvdmdbg.def
-lib/wine/%%WINEARCH%%-unix/libversion.def
-lib/wine/%%WINEARCH%%-unix/libvulkan-1.def
+lib/wine/%%WINEARCH%%-unix/libuxtheme.a
+lib/wine/%%WINEARCH%%-unix/libvdmdbg.a
+lib/wine/%%WINEARCH%%-unix/libversion.a
+lib/wine/%%WINEARCH%%-unix/libvulkan-1.a
 lib/wine/%%WINEARCH%%-unix/libwbemuuid.a
-lib/wine/%%WINEARCH%%-unix/libwebservices.def
-lib/wine/%%WINEARCH%%-unix/libwer.def
-lib/wine/%%WINEARCH%%-unix/libwevtapi.def
-lib/wine/%%WINEARCH%%-unix/libwin32u.def
+lib/wine/%%WINEARCH%%-unix/libwebservices.a
+lib/wine/%%WINEARCH%%-unix/libwer.a
+lib/wine/%%WINEARCH%%-unix/libwevtapi.a
+lib/wine/%%WINEARCH%%-unix/libwin32u.a
 lib/wine/%%WINEARCH%%-unix/libwindowscodecs.a
-lib/wine/%%WINEARCH%%-unix/libwindowscodecsext.def
+lib/wine/%%WINEARCH%%-unix/libwindowscodecsext.a
 lib/wine/%%WINEARCH%%-unix/libwine.so.1
 lib/wine/%%WINEARCH%%-unix/libwine.so.1.0
 lib/wine/%%WINEARCH%%-unix/libwinecrt0.a
-lib/wine/%%WINEARCH%%-unix/libwined3d.def
-lib/wine/%%WINEARCH%%-unix/libwinevulkan.def
-lib/wine/%%WINEARCH%%-unix/libwinhttp.def
-lib/wine/%%WINEARCH%%-unix/libwininet.def
-lib/wine/%%WINEARCH%%-unix/libwinmm.def
-lib/wine/%%WINEARCH%%-unix/libwinnls32.def
-lib/wine/%%WINEARCH%%-unix/libwinscard.def
-lib/wine/%%WINEARCH%%-unix/libwinspool.def
-lib/wine/%%WINEARCH%%-unix/libwintab32.def
-lib/wine/%%WINEARCH%%-unix/libwintrust.def
-lib/wine/%%WINEARCH%%-unix/libwlanapi.def
-lib/wine/%%WINEARCH%%-unix/libwldap32.def
+lib/wine/%%WINEARCH%%-unix/libwined3d.a
+lib/wine/%%WINEARCH%%-unix/libwinevulkan.a
+lib/wine/%%WINEARCH%%-unix/libwinhttp.a
+lib/wine/%%WINEARCH%%-unix/libwininet.a
+lib/wine/%%WINEARCH%%-unix/libwinmm.a
+lib/wine/%%WINEARCH%%-unix/libwinnls32.a
+lib/wine/%%WINEARCH%%-unix/libwinscard.a
+lib/wine/%%WINEARCH%%-unix/libwinspool.a
+lib/wine/%%WINEARCH%%-unix/libwintab32.a
+lib/wine/%%WINEARCH%%-unix/libwintrust.a
+lib/wine/%%WINEARCH%%-unix/libwlanapi.a
+lib/wine/%%WINEARCH%%-unix/libwldap32.a
 lib/wine/%%WINEARCH%%-unix/libwmcodecdspuuid.a
-lib/wine/%%WINEARCH%%-unix/libwmvcore.def
-lib/wine/%%WINEARCH%%-unix/libwnaspi32.def
-%%WINE32%%lib/wine/%%WINEARCH%%-unix/libwow32.def
-%%WINE64%%lib/wine/%%WINEARCH%%-unix/libwow64.def
-lib/wine/%%WINEARCH%%-unix/libws2_32.def
-lib/wine/%%WINEARCH%%-unix/libwsdapi.def
-lib/wine/%%WINEARCH%%-unix/libwsnmp32.def
-lib/wine/%%WINEARCH%%-unix/libwsock32.def
-lib/wine/%%WINEARCH%%-unix/libwtsapi32.def
-%%STAGING%%lib/wine/%%WINEARCH%%-unix/libx3daudio1_7.def
-lib/wine/%%WINEARCH%%-unix/libxinput.def
+lib/wine/%%WINEARCH%%-unix/libwmvcore.a
+lib/wine/%%WINEARCH%%-unix/libwnaspi32.a
+lib/wine/%%WINEARCH%%-unix/libwow64.a
+lib/wine/%%WINEARCH%%-unix/libws2_32.a
+lib/wine/%%WINEARCH%%-unix/libwsdapi.a
+lib/wine/%%WINEARCH%%-unix/libwsnmp32.a
+lib/wine/%%WINEARCH%%-unix/libwsock32.a
+lib/wine/%%WINEARCH%%-unix/libwtsapi32.a
+%%STAGING%%lib/wine/%%WINEARCH%%-unix/libx3daudio1_7.a
+lib/wine/%%WINEARCH%%-unix/libxinput.a
 lib/wine/%%WINEARCH%%-unix/libxml2.a
-lib/wine/%%WINEARCH%%-unix/libxmllite.def
+lib/wine/%%WINEARCH%%-unix/libxmllite.a
 lib/wine/%%WINEARCH%%-unix/libxslt.a
 lib/wine/%%WINEARCH%%-unix/libz.a
 lib/wine/%%WINEARCH%%-unix/light.msstyles.so
@@ -1988,6 +1982,7 @@ lib/wine/%%WINEARCH%%-unix/mscms.dll.so
 lib/wine/%%WINEARCH%%-unix/mscoree.dll.so
 lib/wine/%%WINEARCH%%-unix/mscorwks.dll.so
 lib/wine/%%WINEARCH%%-unix/msctf.dll.so
+lib/wine/%%WINEARCH%%-unix/msctfmonitor.dll.so
 lib/wine/%%WINEARCH%%-unix/msctfp.dll.so
 lib/wine/%%WINEARCH%%-unix/msdaps.dll.so
 lib/wine/%%WINEARCH%%-unix/msdasql.dll.so
@@ -2035,6 +2030,7 @@ lib/wine/%%WINEARCH%%-unix/msvcp70.dll.so
 lib/wine/%%WINEARCH%%-unix/msvcp71.dll.so
 lib/wine/%%WINEARCH%%-unix/msvcp80.dll.so
 lib/wine/%%WINEARCH%%-unix/msvcp90.dll.so
+lib/wine/%%WINEARCH%%-unix/msvcp_win.dll.so
 lib/wine/%%WINEARCH%%-unix/msvcr100.dll.so
 lib/wine/%%WINEARCH%%-unix/msvcr110.dll.so
 lib/wine/%%WINEARCH%%-unix/msvcr120.dll.so
@@ -3033,6 +3029,7 @@ lib/wine/%%WINEARCH%%-windows/mscms.dll
 lib/wine/%%WINEARCH%%-windows/mscoree.dll
 lib/wine/%%WINEARCH%%-windows/mscorwks.dll
 lib/wine/%%WINEARCH%%-windows/msctf.dll
+lib/wine/%%WINEARCH%%-windows/msctfmonitor.dll
 lib/wine/%%WINEARCH%%-windows/msctfp.dll
 lib/wine/%%WINEARCH%%-windows/msdaps.dll
 lib/wine/%%WINEARCH%%-windows/msdasql.dll
@@ -3079,6 +3076,7 @@ lib/wine/%%WINEARCH%%-windows/msvcp70.dll
 lib/wine/%%WINEARCH%%-windows/msvcp71.dll
 lib/wine/%%WINEARCH%%-windows/msvcp80.dll
 lib/wine/%%WINEARCH%%-windows/msvcp90.dll
+lib/wine/%%WINEARCH%%-windows/msvcp_win.dll
 lib/wine/%%WINEARCH%%-windows/msvcr100.dll
 lib/wine/%%WINEARCH%%-windows/msvcr110.dll
 lib/wine/%%WINEARCH%%-windows/msvcr120.dll