From d4c2036994d18c8977e0c10989ca0f3b8af26819 Mon Sep 17 00:00:00 2001 From: Michael Cronenworth Date: Mon, 3 Feb 2020 13:43:53 -0600 Subject: [PATCH] Update to 5.1 --- .gitignore | 6 +- sources | 6 +- wine-5.0-gcc10.patch | 278 ------------------------------------------- wine.spec | 20 ++-- 4 files changed, 14 insertions(+), 296 deletions(-) delete mode 100644 wine-5.0-gcc10.patch diff --git a/.gitignore b/.gitignore index ae1e10c..ff3f354 100644 --- a/.gitignore +++ b/.gitignore @@ -1,3 +1,3 @@ -/wine-5.0.tar.xz -/wine-5.0.tar.xz.sign -/wine-staging-5.0.tar.gz +/wine-5.1.tar.xz +/wine-5.1.tar.xz.sign +/wine-staging-5.1.tar.gz diff --git a/sources b/sources index ef2c2fd..9e0e8a9 100644 --- a/sources +++ b/sources @@ -1,3 +1,3 @@ -SHA512 (wine-5.0.tar.xz) = 681de951804c3dd3ae8c677a0ea52d172b04cac58594698b191cd972b25899cd2030d01a25fc2ad2eb6b99976a30319d2bd5ba8b7ff98b1a8b43832fa6514b83 -SHA512 (wine-5.0.tar.xz.sign) = fad666dc0a0906ff1724e8fe9c7cfecd9f654d83c00ebd0b745b2086d1452f08394dec8ea3bbacb5378b6c0b84caa306cb3e037bd83012ff27b9374a11487932 -SHA512 (wine-staging-5.0.tar.gz) = 36849fc2c848db9949982619c4544b56468012a1f086cc92eb3e2027377c58c3c24daf508149e0e34a70e6b283edfd80833dc2f346c75f0be69f1fb2c5999cd6 +SHA512 (wine-5.1.tar.xz) = b842b533884f15a8fb71373258671d74aee997d9ed9ee0fb36f945cd2006b494f6cc6c91a8ca47e0ea5b0b39b108f2c4f155918823a7ddf3cd44b4e26ede9171 +SHA512 (wine-5.1.tar.xz.sign) = e53308ac307b7c5f058d2a96ab8d075f6c8dc923f56a9322244b36a29ec691a9a0108979192491ab7150b5386c53228292cd4465dd4a49db265fbf7f0f9c1927 +SHA512 (wine-staging-5.1.tar.gz) = ebb9bf0a0a3c7f108fff8b32ca79124d1da410fbfb320ad3298f3d92fabeb9ca81de6a4fefac344948a70c49771ffa3f0dc30de2ee6d6f61d158ed87a206a14e diff --git a/wine-5.0-gcc10.patch b/wine-5.0-gcc10.patch deleted file mode 100644 index a4a01e5..0000000 --- a/wine-5.0-gcc10.patch +++ /dev/null @@ -1,278 +0,0 @@ ---- a/dlls/crypt32/crypt32_private.h 2020-01-21 11:03:21.000000000 -0600 -+++ b/dlls/crypt32/crypt32_private.h 2020-01-22 09:09:42.545954092 -0600 -@@ -152,7 +152,7 @@ - */ - HCRYPTPROV WINAPI I_CryptGetDefaultCryptProv(ALG_ID); - --HINSTANCE hInstance DECLSPEC_HIDDEN; -+extern HINSTANCE hInstance DECLSPEC_HIDDEN; - - void crypt_oid_init(void) DECLSPEC_HIDDEN; - void crypt_oid_free(void) DECLSPEC_HIDDEN; ---- a/dlls/gphoto2.ds/gphoto2_i.h 2020-01-21 11:03:21.000000000 -0600 -+++ b/dlls/gphoto2.ds/gphoto2_i.h 2020-01-22 10:07:59.403974843 -0600 -@@ -100,7 +100,7 @@ - struct jpeg_decompress_struct jd; - struct jpeg_error_mgr jerr; - #endif --} activeDS DECLSPEC_HIDDEN; -+} extern activeDS DECLSPEC_HIDDEN; - - /* Helper functions */ - extern TW_UINT16 GPHOTO2_SaneCapability (pTW_CAPABILITY pCapability, TW_UINT16 action) DECLSPEC_HIDDEN; ---- a/dlls/gphoto2.ds/gphoto2_main.c 2020-01-22 10:22:39.110786117 -0600 -+++ b/dlls/gphoto2.ds/gphoto2_main.c 2020-01-22 10:22:51.743818190 -0600 -@@ -33,6 +33,8 @@ - - WINE_DEFAULT_DEBUG_CHANNEL(twain); - -+struct tagActiveDS activeDS; -+ - DSMENTRYPROC GPHOTO2_dsmentry; - - #ifdef HAVE_GPHOTO2 ---- a/dlls/secur32/secur32_priv.h 2020-01-21 11:03:21.000000000 -0600 -+++ b/dlls/secur32/secur32_priv.h 2020-01-22 10:31:24.606451345 -0600 -@@ -190,8 +190,8 @@ - #define NTLMSSP_NEGOTIATE_56 0x80000000 - - --SecPkgInfoW *ntlm_package_infoW DECLSPEC_HIDDEN; --SecPkgInfoA *ntlm_package_infoA DECLSPEC_HIDDEN; -+extern SecPkgInfoW *ntlm_package_infoW DECLSPEC_HIDDEN; -+extern SecPkgInfoA *ntlm_package_infoA DECLSPEC_HIDDEN; - - /* schannel internal interface */ - typedef struct schan_imp_session_opaque *schan_imp_session; ---- a/dlls/sane.ds/sane_i.h 2020-01-21 11:03:21.000000000 -0600 -+++ b/dlls/sane.ds/sane_i.h 2020-01-22 10:44:01.675004730 -0600 -@@ -36,7 +36,7 @@ - #include "twain.h" - - #ifdef SONAME_LIBSANE --#define MAKE_FUNCPTR(f) typeof(f) * p##f DECLSPEC_HIDDEN; -+#define MAKE_FUNCPTR(f) extern typeof(f) * p##f DECLSPEC_HIDDEN; - MAKE_FUNCPTR(sane_init) - MAKE_FUNCPTR(sane_exit) - MAKE_FUNCPTR(sane_get_devices) -@@ -84,7 +84,7 @@ - TW_FIX32 defaultXResolution; - BOOL YResolutionSet; - TW_FIX32 defaultYResolution; --} activeDS DECLSPEC_HIDDEN; -+} extern activeDS DECLSPEC_HIDDEN; - - /* Helper functions */ - extern TW_UINT16 SANE_SaneCapability (pTW_CAPABILITY pCapability, TW_UINT16 action) DECLSPEC_HIDDEN; ---- a/dlls/sane.ds/sane_main.c 2020-01-22 10:45:52.264351469 -0600 -+++ b/dlls/sane.ds/sane_main.c 2020-01-22 10:46:12.131414210 -0600 -@@ -33,8 +33,25 @@ - DSMENTRYPROC SANE_dsmentry; - - #ifdef SONAME_LIBSANE -+#define MAKE_FUNCPTR(f) typeof(f) * p##f; -+MAKE_FUNCPTR(sane_init) -+MAKE_FUNCPTR(sane_exit) -+MAKE_FUNCPTR(sane_get_devices) -+MAKE_FUNCPTR(sane_open) -+MAKE_FUNCPTR(sane_close) -+MAKE_FUNCPTR(sane_get_option_descriptor) -+MAKE_FUNCPTR(sane_control_option) -+MAKE_FUNCPTR(sane_get_parameters) -+MAKE_FUNCPTR(sane_start) -+MAKE_FUNCPTR(sane_read) -+MAKE_FUNCPTR(sane_cancel) -+MAKE_FUNCPTR(sane_set_io_mode) -+MAKE_FUNCPTR(sane_get_select_fd) -+MAKE_FUNCPTR(sane_strstatus) -+#undef MAKE_FUNCPTR - - HINSTANCE SANE_instance; -+struct tagActiveDS activeDS; - - static void *libsane_handle; - ---- a/dlls/winebus.sys/bus.h 2020-01-21 11:03:21.000000000 -0600 -+++ b/dlls/winebus.sys/bus.h 2020-01-22 13:35:57.841283330 -0600 -@@ -54,5 +54,5 @@ - DWORD check_bus_option(const UNICODE_STRING *option, DWORD default_value) DECLSPEC_HIDDEN; - BOOL is_xbox_gamepad(WORD vid, WORD pid) DECLSPEC_HIDDEN; - --HANDLE driver_key DECLSPEC_HIDDEN; --DEVICE_OBJECT *bus_pdo DECLSPEC_HIDDEN; -+extern HANDLE driver_key DECLSPEC_HIDDEN; -+extern DEVICE_OBJECT *bus_pdo DECLSPEC_HIDDEN; ---- a/dlls/dsound/dsound_private.h 2020-01-21 11:03:21.000000000 -0600 -+++ b/dlls/dsound/dsound_private.h 2020-01-22 13:56:10.367702536 -0600 -@@ -188,9 +188,9 @@ - IDirectSoundBufferImpl **ppdsb, - IDirectSoundBufferImpl *pdsb) DECLSPEC_HIDDEN; - void secondarybuffer_destroy(IDirectSoundBufferImpl *This) DECLSPEC_HIDDEN; --const IDirectSound3DListenerVtbl ds3dlvt DECLSPEC_HIDDEN; --const IDirectSound3DBufferVtbl ds3dbvt DECLSPEC_HIDDEN; --const IKsPropertySetVtbl iksbvt DECLSPEC_HIDDEN; -+extern const IDirectSound3DListenerVtbl ds3dlvt DECLSPEC_HIDDEN; -+extern const IDirectSound3DBufferVtbl ds3dbvt DECLSPEC_HIDDEN; -+extern const IKsPropertySetVtbl iksbvt DECLSPEC_HIDDEN; - - HRESULT IKsPrivatePropertySetImpl_Create(REFIID riid, void **ppv) DECLSPEC_HIDDEN; - ---- a/dlls/mshtml/mshtml_private.h 2020-01-21 11:03:21.000000000 -0600 -+++ b/dlls/mshtml/mshtml_private.h 2020-01-22 14:44:00.789960837 -0600 -@@ -355,12 +355,12 @@ - - DEFINE_GUID(IID_nsXPCOMCycleCollectionParticipant, 0x9674489b,0x1f6f,0x4550,0xa7,0x30, 0xcc,0xae,0xdd,0x10,0x4c,0xf9); - --nsrefcnt (__cdecl *ccref_incr)(nsCycleCollectingAutoRefCnt*,nsISupports*) DECLSPEC_HIDDEN; --nsrefcnt (__cdecl *ccref_decr)(nsCycleCollectingAutoRefCnt*,nsISupports*,ExternalCycleCollectionParticipant*) DECLSPEC_HIDDEN; --void (__cdecl *ccref_init)(nsCycleCollectingAutoRefCnt*,nsrefcnt) DECLSPEC_HIDDEN; --void (__cdecl *ccp_init)(ExternalCycleCollectionParticipant*,const CCObjCallback*) DECLSPEC_HIDDEN; --void (__cdecl *describe_cc_node)(nsCycleCollectingAutoRefCnt*,const char*,nsCycleCollectionTraversalCallback*) DECLSPEC_HIDDEN; --void (__cdecl *note_cc_edge)(nsISupports*,const char*,nsCycleCollectionTraversalCallback*) DECLSPEC_HIDDEN; -+extern nsrefcnt (__cdecl *ccref_incr)(nsCycleCollectingAutoRefCnt*,nsISupports*) DECLSPEC_HIDDEN; -+extern nsrefcnt (__cdecl *ccref_decr)(nsCycleCollectingAutoRefCnt*,nsISupports*,ExternalCycleCollectionParticipant*) DECLSPEC_HIDDEN; -+extern void (__cdecl *ccref_init)(nsCycleCollectingAutoRefCnt*,nsrefcnt) DECLSPEC_HIDDEN; -+extern void (__cdecl *ccp_init)(ExternalCycleCollectionParticipant*,const CCObjCallback*) DECLSPEC_HIDDEN; -+extern void (__cdecl *describe_cc_node)(nsCycleCollectingAutoRefCnt*,const char*,nsCycleCollectionTraversalCallback*) DECLSPEC_HIDDEN; -+extern void (__cdecl *note_cc_edge)(nsISupports*,const char*,nsCycleCollectionTraversalCallback*) DECLSPEC_HIDDEN; - - void init_dispex_with_compat_mode(DispatchEx*,IUnknown*,dispex_static_data_t*,compat_mode_t) DECLSPEC_HIDDEN; - void release_dispex(DispatchEx*) DECLSPEC_HIDDEN; ---- a/dlls/mshtml/htmlstyle.h 2020-01-22 14:45:04.824112648 -0600 -+++ b/dlls/mshtml/htmlstyle.h 2020-01-21 11:03:21.000000000 -0600 -@@ -142,7 +142,7 @@ - dispex_static_data_t*,compat_mode_t) DECLSPEC_HIDDEN; - - void CSSStyle_init_dispex_info(dispex_data_t *info, compat_mode_t mode) DECLSPEC_HIDDEN; --const dispex_static_data_vtbl_t CSSStyle_dispex_vtbl DECLSPEC_HIDDEN; -+extern const dispex_static_data_vtbl_t CSSStyle_dispex_vtbl DECLSPEC_HIDDEN; - - HRESULT get_style_property(CSSStyle*,styleid_t,BSTR*) DECLSPEC_HIDDEN; - HRESULT get_style_property_var(CSSStyle*,styleid_t,VARIANT*) DECLSPEC_HIDDEN; ---- a/dlls/mshtml/main.c 2020-01-22 15:13:00.207929201 -0600 -+++ b/dlls/mshtml/main.c 2020-01-22 15:13:10.037943213 -0600 -@@ -51,6 +51,13 @@ - HINSTANCE hInst; - DWORD mshtml_tls = TLS_OUT_OF_INDEXES; - -+void (__cdecl *ccp_init)(ExternalCycleCollectionParticipant*,const CCObjCallback*); -+nsrefcnt (__cdecl *ccref_decr)(nsCycleCollectingAutoRefCnt*,nsISupports*,ExternalCycleCollectionParticipant*); -+nsrefcnt (__cdecl *ccref_incr)(nsCycleCollectingAutoRefCnt*,nsISupports*); -+void (__cdecl *ccref_init)(nsCycleCollectingAutoRefCnt*,nsrefcnt); -+void (__cdecl *describe_cc_node)(nsCycleCollectingAutoRefCnt*,const char*,nsCycleCollectionTraversalCallback*); -+void (__cdecl *note_cc_edge)(nsISupports*,const char*,nsCycleCollectionTraversalCallback*); -+ - static HINSTANCE shdoclc = NULL; - static WCHAR *status_strings[IDS_STATUS_LAST-IDS_STATUS_FIRST+1]; - static IMultiLanguage2 *mlang; ---- a/dlls/msi/msipriv.h 2020-01-21 11:03:21.000000000 -0600 -+++ b/dlls/msi/msipriv.h 2020-01-22 15:40:15.362792925 -0600 -@@ -42,7 +42,7 @@ - #include "winemsi.h" - - static const BOOL is_64bit = sizeof(void *) > sizeof(int); --BOOL is_wow64 DECLSPEC_HIDDEN; -+extern BOOL is_wow64 DECLSPEC_HIDDEN; - - #define MSI_DATASIZEMASK 0x00ff - #define MSITYPE_VALID 0x0100 ---- a/dlls/msi/msi.c 2020-01-21 11:03:21.000000000 -0600 -+++ b/dlls/msi/msi.c 2020-01-22 15:42:12.934090382 -0600 -@@ -51,6 +51,8 @@ - - WINE_DEFAULT_DEBUG_CHANNEL(msi); - -+BOOL is_wow64; -+ - static const WCHAR installerW[] = {'\\','I','n','s','t','a','l','l','e','r',0}; - - UINT msi_locate_product(LPCWSTR szProduct, MSIINSTALLCONTEXT *context) ---- a/dlls/twain_32/twain_i.h 2020-01-21 11:03:21.000000000 -0600 -+++ b/dlls/twain_32/twain_i.h 2020-01-22 16:29:07.623205272 -0600 -@@ -45,11 +45,11 @@ - HWND event_window; - } activeDS; - --TW_UINT16 DSM_twCC DECLSPEC_HIDDEN; /* current condition code of Source Manager */ -+extern TW_UINT16 DSM_twCC DECLSPEC_HIDDEN; /* current condition code of Source Manager */ - --activeDS *activeSources DECLSPEC_HIDDEN; /* list of active data sources */ -+extern activeDS *activeSources DECLSPEC_HIDDEN; /* list of active data sources */ - --HINSTANCE DSM_hinstance DECLSPEC_HIDDEN; -+extern HINSTANCE DSM_hinstance DECLSPEC_HIDDEN; - - /* Implementation of operation triplets (From Application to Source Manager) */ - extern TW_UINT16 TWAIN_CloseDS ---- a/dlls/twain_32/twain32_main.c 2020-01-22 16:31:43.494607403 -0600 -+++ b/dlls/twain_32/twain32_main.c 2020-01-22 16:31:02.012503703 -0600 -@@ -29,7 +29,9 @@ - - WINE_DEFAULT_DEBUG_CHANNEL(twain); - --extern HINSTANCE DSM_hinstance; -+TW_UINT16 DSM_twCC; -+activeDS *activeSources; -+HINSTANCE DSM_hinstance; - - BOOL WINAPI DllMain (HINSTANCE hinstance, DWORD reason, LPVOID reserved) - { ---- a/dlls/wbemprox/wbemprox_private.h 2020-01-21 11:03:21.000000000 -0600 -+++ b/dlls/wbemprox/wbemprox_private.h 2020-01-22 17:19:26.786296263 -0600 -@@ -20,8 +20,8 @@ - #include "wine/heap.h" - #include "wine/list.h" - --IClientSecurity client_security DECLSPEC_HIDDEN; --struct list *table_list DECLSPEC_HIDDEN; -+extern IClientSecurity client_security DECLSPEC_HIDDEN; -+extern struct list *table_list DECLSPEC_HIDDEN; - - enum param_direction - { ---- a/dlls/wbemprox/main.c 2020-01-21 11:03:21.000000000 -0600 -+++ b/dlls/wbemprox/main.c 2020-01-22 17:21:03.556806147 -0600 -@@ -35,6 +35,8 @@ - - static HINSTANCE instance; - -+struct list *table_list; -+ - typedef HRESULT (*fnCreateInstance)( LPVOID *ppObj ); - - typedef struct ---- a/dlls/webservices/webservices_private.h 2020-01-21 11:03:21.000000000 -0600 -+++ b/dlls/webservices/webservices_private.h 2020-01-22 17:49:07.121885897 -0600 -@@ -18,7 +18,7 @@ - - #include "winhttp.h" - --_locale_t c_locale DECLSPEC_HIDDEN; -+extern _locale_t c_locale DECLSPEC_HIDDEN; - - #define STREAM_BUFSIZE 4096 - -@@ -50,8 +50,8 @@ - ULONG current_sequence; - ULONG *sequence; - }; --struct dictionary dict_builtin DECLSPEC_HIDDEN; --const struct dictionary dict_builtin_static DECLSPEC_HIDDEN; -+extern struct dictionary dict_builtin DECLSPEC_HIDDEN; -+extern const struct dictionary dict_builtin_static DECLSPEC_HIDDEN; - - int find_string( const struct dictionary *, const unsigned char *, ULONG, ULONG * ) DECLSPEC_HIDDEN; - HRESULT insert_string( struct dictionary *, unsigned char *, ULONG, int, ULONG * ) DECLSPEC_HIDDEN; ---- a/dlls/xinput1_3/xinput_private.h 2020-01-21 11:03:21.000000000 -0600 -+++ b/dlls/xinput1_3/xinput_private.h 2020-01-22 20:39:40.632230103 -0600 -@@ -26,8 +26,8 @@ - XINPUT_VIBRATION vibration; - } xinput_controller; - --CRITICAL_SECTION xinput_crit; --xinput_controller controllers[XUSER_MAX_COUNT]; -+extern CRITICAL_SECTION xinput_crit; -+extern xinput_controller controllers[XUSER_MAX_COUNT]; - - void HID_find_gamepads(xinput_controller *devices) DECLSPEC_HIDDEN; - void HID_destroy_gamepads(xinput_controller *devices) DECLSPEC_HIDDEN; diff --git a/wine.spec b/wine.spec index e3fce61..1baaf98 100644 --- a/wine.spec +++ b/wine.spec @@ -41,14 +41,14 @@ %endif Name: wine -Version: 5.0 -Release: 2%{?dist} +Version: 5.1 +Release: 1%{?dist} Summary: A compatibility layer for windows applications License: LGPLv2+ URL: https://www.winehq.org/ -Source0: https://dl.winehq.org/wine/source/5.0/wine-%{version}.tar.xz -Source10: https://dl.winehq.org/wine/source/5.0/wine-%{version}.tar.xz.sign +Source0: https://dl.winehq.org/wine/source/5.x/wine-%{version}.tar.xz +Source10: https://dl.winehq.org/wine/source/5.x/wine-%{version}.tar.xz.sign Source1: wine.init Source2: wine.systemd @@ -71,9 +71,6 @@ Source109: wine-oleview.desktop # AppData files Source150: wine.appdata.xml -# build fixes -Patch100: wine-5.0-gcc10.patch - # wine bugs # desktop dir @@ -681,7 +678,6 @@ This package adds the opencl driver for wine. %prep %setup -q -n wine-%{version} -%patch100 -p1 -b.gcc10 %patch511 -p1 -b.cjk %if 0%{?wine_staging} @@ -693,10 +689,6 @@ patches/patchinstall.sh DESTDIR="`pwd`" --all # fix parallelized build sed -i -e 's!^loader server: libs/port libs/wine tools.*!& include!' Makefile.in -# GCC 10 fix -sed -i 's/BOOL config_vaapi_drm DECLSPEC_HIDDEN;/extern BOOL config_vaapi_drm DECLSPEC_HIDDEN;/' dlls/dxva2/dxva2_private.h -sed -i 's/char config_vaapi_drm_path\[MAX_PATH\] DECLSPEC_HIDDEN;/extern char config_vaapi_drm_path\[MAX_PATH\] DECLSPEC_HIDDEN;/' dlls/dxva2/dxva2_private.h - %endif # 0%{?wine_staging} %build @@ -1892,6 +1884,7 @@ fi %{_libdir}/wine/vcomp120.%{winedll} %{_libdir}/wine/vcomp140.%{winedll} %{_libdir}/wine/vcruntime140.%{winedll} +%{_libdir}/wine/vcruntime140_1.%{winedll} %{_libdir}/wine/vdmdbg.%{winedll} %{_libdir}/wine/version.%{winedll} %{_libdir}/wine/virtdisk.%{winedll} @@ -2290,6 +2283,9 @@ fi %endif %changelog +* Mon Feb 03 2020 Michael Cronenworth 5.1-1 +- version update + * Fri Jan 31 2020 Fedora Release Engineering - 5.0-2 - Rebuilt for https://fedoraproject.org/wiki/Fedora_32_Mass_Rebuild