summarylogtreecommitdiffstats
diff options
context:
space:
mode:
authorMike Swanson2020-06-04 10:04:54 -0700
committerMike Swanson2020-06-04 10:04:54 -0700
commit96d80e6d2d02da46b5dd15710cf51c0f8f6857f4 (patch)
tree551e4244511c0fb9c203d93f616d7d3c67f83396
parent364032d77f0171d448bce63d0654ca9c17516aef (diff)
downloadaur-96d80e6d2d02da46b5dd15710cf51c0f8f6857f4.tar.gz
Update to 5.0.1: remove cherry-picked patches
-rw-r--r--.SRCINFO44
-rw-r--r--0001-winedump-Add-a-default-case-to-numeric_leaf.patch32
-rw-r--r--0002-msi-Properly-declare-variables-in-msi-tests-utils.h-.patch46
-rw-r--r--0003-crypt32-Global-variable-compatibility-update-for-gcc.patch28
-rw-r--r--0004-dsound-Global-variable-compatibility-update-for-gcc-.patch33
-rw-r--r--0005-mshtml-Global-variable-compatibility-update-for-gcc-.patch71
-rw-r--r--0006-secur32-Global-variable-compatibility-update-for-gcc.patch45
-rw-r--r--0007-winebus-Global-variable-compatibility-update-for-gcc.patch27
-rw-r--r--0008-wbemprox-Global-variable-compatibility-update-for-gc.patch44
-rw-r--r--0009-xinput-Global-variable-compatibility-update-for-gcc-.patch30
-rw-r--r--0010-twain_32-Global-variable-compatibility-update-for-gc.patch50
-rw-r--r--0011-msi-Global-variable-compatibility-update-for-gcc-10.patch42
-rw-r--r--0012-webservices-Global-variable-compatibility-update-for.patch40
-rw-r--r--0013-gphoto2.ds-Global-variable-compatibility-update-for-.patch44
-rw-r--r--0014-sane.ds-Global-variable-compatibility-update-for-gcc.patch72
-rw-r--r--0015-schedsvc-tests-Fix-compilation-with-recent-gcc-clang.patch129
-rw-r--r--PKGBUILD40
17 files changed, 12 insertions, 805 deletions
diff --git a/.SRCINFO b/.SRCINFO
index 395fc04db62..fc48b06a640 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,7 +1,7 @@
pkgbase = wine-stable
pkgdesc = A compatibility layer for running Windows programs
- pkgver = 5.0
- pkgrel = 3
+ pkgver = 5.0.1
+ pkgrel = 1
url = http://www.winehq.com
install = wine.install
arch = x86_64
@@ -134,50 +134,20 @@ pkgbase = wine-stable
optdepends = lib32-v4l-utils
optdepends = lib32-vkd3d
optdepends = lib32-vulkan-icd-loader
- provides = wine=5.0
- provides = wine-stable=5.0
+ provides = wine=5.0.1
+ provides = wine-stable=5.0.1
conflicts = wine
conflicts = wine-stable
options = staticlibs
- source = https://dl.winehq.org/wine/source/5.0/wine-5.0.tar.xz
- source = https://dl.winehq.org/wine/source/5.0/wine-5.0.tar.xz.sign
+ source = https://dl.winehq.org/wine/source/5.0/wine-5.0.1.tar.xz
+ source = https://dl.winehq.org/wine/source/5.0/wine-5.0.1.tar.xz.sign
source = 30-win32-aliases.conf
source = wine-binfmt.conf
- source = 0001-winedump-Add-a-default-case-to-numeric_leaf.patch
- source = 0002-msi-Properly-declare-variables-in-msi-tests-utils.h-.patch
- source = 0003-crypt32-Global-variable-compatibility-update-for-gcc.patch
- source = 0004-dsound-Global-variable-compatibility-update-for-gcc-.patch
- source = 0005-mshtml-Global-variable-compatibility-update-for-gcc-.patch
- source = 0006-secur32-Global-variable-compatibility-update-for-gcc.patch
- source = 0007-winebus-Global-variable-compatibility-update-for-gcc.patch
- source = 0008-wbemprox-Global-variable-compatibility-update-for-gc.patch
- source = 0009-xinput-Global-variable-compatibility-update-for-gcc-.patch
- source = 0010-twain_32-Global-variable-compatibility-update-for-gc.patch
- source = 0011-msi-Global-variable-compatibility-update-for-gcc-10.patch
- source = 0012-webservices-Global-variable-compatibility-update-for.patch
- source = 0013-gphoto2.ds-Global-variable-compatibility-update-for-.patch
- source = 0014-sane.ds-Global-variable-compatibility-update-for-gcc.patch
- source = 0015-schedsvc-tests-Fix-compilation-with-recent-gcc-clang.patch
validpgpkeys = DA23579A74D4AD9AF9D3F945CEFAC8EAAF17519D
- b2sums = d26938e707545d31ed932c67eaaa9fd137e42daa6facadeaea2897797ec816658edc1b89c649e0cb5c453ca53ebea5d7156fdd188f1afe2a55ca7834e012e276
+ b2sums = 8fd7729812c0144b6c9ec7f28ecc25bca5bc7801d9927346928f43fc46ca0be89ecb4caefb7a93cf2f3365e088d11e6bd53a028ea8cc9e170ef864ff63f21a5a
b2sums = SKIP
b2sums = 45db34fb35a679dc191b4119603eba37b8008326bd4f7d6bd422fbbb2a74b675bdbc9f0cc6995ed0c564cf088b7ecd9fbe2d06d42ff8a4464828f3c4f188075b
b2sums = e9de76a32493c601ab32bde28a2c8f8aded12978057159dd9bf35eefbf82f2389a4d5e30170218956101331cf3e7452ae82ad0db6aad623651b0cc2174a61588
- b2sums = 3bad385a7c432f33a2ff0c5697e0fd43bfc178b184b2dfdb6dbf2861552b93a743b5fe9838069152df586eda547697033299a3b11620280250fa72913d41468c
- b2sums = 4f6516f0eb27adf96016f62fe29edc47abb1e27a4843a42dee88afad55c96f51082fcdfbb3bcbaded5e7df529f363eaadc0c05a55f604a020e56bf07befa5ccb
- b2sums = 8589ce198b76a53e65cf75328b6ab164beee5cf82e7baf4de9d4c86b403db9ddfe6ea1d219763da2ced58a70e7525f5c1755a466d38104ac8189c128ae291d95
- b2sums = 6deae909005d358eb3602aba4f1cdfbb3a01bd4005b7c75adbd9a91f07736b041e1342da32d62842aa48b6a7f835f049b95433621a2e769ac842d7bd4b4d89f0
- b2sums = 53becc8e020a1d87c1448b8c2ec50f267cd2b906f57647d48405cc0a0a74dd70b1d234564ce054a05b66b4713d5d2c7048f1ebca1497c0899782b0828889bed9
- b2sums = 6584b229179f8bb7df79c9bb6df73170a7230c6a8617ab017cef00b5aac7eacc13cc671aa0c0cf4f3180b56142d989bc9d9fd087b6a3fe695180b2089a0a8e35
- b2sums = e7ae9a5e0a7c0dab900e8a735cd050f5eab31932cc03efc8065fdc9a1c1ee9c364930794f788fd91b2fe0eb2444464777f923bdf41c19230f284933ca73d8768
- b2sums = e146764111a3aa048b711ddee585bec5a5e87bddea3d6447787af7338114a69e4905ea43d64994fff26fc35b1461e0049798df7db07bb85a84062cbbd9a16a6f
- b2sums = 0dcec6681ddae79783391e25d13d6184fab39443d07e378fbe24f421634f408f71dd4d16f7c0f39cfdd92c829aed806f8fd4a24bde9b2d570219dff0e7e6f6d6
- b2sums = bbd131630657a3984eab4d1a4a33f4e67502db373896ac706b3bddd3cc59c10e25bf8ec3183c488eedfea0780acb436f7f9c8c79390ba7ad409d6ea996109865
- b2sums = 8b7cb73646dece70f4629908103190e62144f2ef83f2afd23bf571f22c7b9eaa9e9321c35b69f7e5be906558e5bbdb6955a83820be9823cce436c60a544541a7
- b2sums = cdc92b181e5a4c1c39d4cd11c87676909252998a81361cb7618120c036f36ead08cf9549b835c7f5ff3b804f9f64feab1f6f0b38ae378e26b2305acc6530963f
- b2sums = b6cf97520d3e32f95378787faa5e7445ce24b02a0a4a58180aa441599ef7bbc8fea8bf086249e50a2247235d00fdb79d1c29dc260d00fcd31e6cedc15c7d901a
- b2sums = a352cb565394b5e5c734723d7aba7cb13fc0ca64231aaee757033b8001f4b7ff70202d7bf63cb65702be6fbb93678a62e983fb3e4f5e266630aa4abf69bb9842
- b2sums = 0343481010c5a68e19692207b9d95e90b7bda6da03204bc6a95e26b9dada862f75fa1cabc74bdcb71cbe5c3282318edd3cd1ad5d45cfcc5f66908dace8bda60d
pkgname = wine-stable
diff --git a/0001-winedump-Add-a-default-case-to-numeric_leaf.patch b/0001-winedump-Add-a-default-case-to-numeric_leaf.patch
deleted file mode 100644
index 5e4b4df134c..00000000000
--- a/0001-winedump-Add-a-default-case-to-numeric_leaf.patch
+++ /dev/null
@@ -1,32 +0,0 @@
-From 7e210f15577c25e6b90ce523b4db63d972172e3a Mon Sep 17 00:00:00 2001
-From: Gerald Pfeifer <gerald@pfeifer.com>
-Date: Thu, 23 Jan 2020 23:09:00 +0100
-Subject: [PATCH 01/15] winedump: Add a default case to numeric_leaf().
-
-This addresses two warnings issues by GCC 10 (currently in development
-stage 4, so this is unlikely to change):
-
-msc.c:687:9: warning: 'value' may be used uninitialized in this function
-msc.c:301:13: warning: 'value' may be used uninitialized in this function
-
-Signed-off-by: Gerald Pfeifer <gerald@pfeifer.com>
-Signed-off-by: Alexandre Julliard <julliard@winehq.org>
----
- tools/winedump/msc.c | 1 +
- 1 file changed, 1 insertion(+)
-
-diff --git a/tools/winedump/msc.c b/tools/winedump/msc.c
-index fbe7f9e541..6843f899b1 100644
---- a/tools/winedump/msc.c
-+++ b/tools/winedump/msc.c
-@@ -206,6 +206,7 @@ static int numeric_leaf(int* value, const unsigned short int* leaf)
- {
- case fv_integer: *value = fv.v.i; break;
- case fv_longlong: *value = (unsigned)fv.v.llu; printf("bad conversion\n"); break;
-+ default: assert( 0 ); *value = 0;
- }
- return len;
- }
---
-2.26.2
-
diff --git a/0002-msi-Properly-declare-variables-in-msi-tests-utils.h-.patch b/0002-msi-Properly-declare-variables-in-msi-tests-utils.h-.patch
deleted file mode 100644
index 661c4a6d5bc..00000000000
--- a/0002-msi-Properly-declare-variables-in-msi-tests-utils.h-.patch
+++ /dev/null
@@ -1,46 +0,0 @@
-From cedf3db7f6b542ae4709e9bb1dc41e7be7bcc00c Mon Sep 17 00:00:00 2001
-From: Gerald Pfeifer <gerald@pfeifer.com>
-Date: Tue, 28 Jan 2020 22:40:25 +0100
-Subject: [PATCH 02/15] msi: Properly declare variables in msi/tests/utils.h as
- extern.
-
-Omitting the extern storage qualifier when declaring a global variable in
-a header file is mistake. If that header is included by several files it
-results in multiple definitions of the same variable (unless -fcommon is
-specified or assumed, the latter being the case for GCC 9.x and earlier).
-
-This fixes building with GCC 10.
-
-Signed-off-by: Gerald Pfeifer <gerald@pfeifer.com>
-Signed-off-by: Hans Leidekker <hans@codeweavers.com>
-Signed-off-by: Alexandre Julliard <julliard@winehq.org>
----
- dlls/msi/tests/utils.h | 12 ++++++------
- 1 file changed, 6 insertions(+), 6 deletions(-)
-
-diff --git a/dlls/msi/tests/utils.h b/dlls/msi/tests/utils.h
-index f16e2d5ff5..0880553863 100644
---- a/dlls/msi/tests/utils.h
-+++ b/dlls/msi/tests/utils.h
-@@ -16,12 +16,12 @@
- * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
- */
-
--char PROG_FILES_DIR[MAX_PATH];
--char PROG_FILES_DIR_NATIVE[MAX_PATH];
--char COMMON_FILES_DIR[MAX_PATH];
--char APP_DATA_DIR[MAX_PATH];
--char WINDOWS_DIR[MAX_PATH];
--char CURR_DIR[MAX_PATH];
-+extern char PROG_FILES_DIR[MAX_PATH];
-+extern char PROG_FILES_DIR_NATIVE[MAX_PATH];
-+extern char COMMON_FILES_DIR[MAX_PATH];
-+extern char APP_DATA_DIR[MAX_PATH];
-+extern char WINDOWS_DIR[MAX_PATH];
-+extern char CURR_DIR[MAX_PATH];
-
- BOOL get_system_dirs(void);
- BOOL get_user_dirs(void);
---
-2.26.2
-
diff --git a/0003-crypt32-Global-variable-compatibility-update-for-gcc.patch b/0003-crypt32-Global-variable-compatibility-update-for-gcc.patch
deleted file mode 100644
index 574048eaeb4..00000000000
--- a/0003-crypt32-Global-variable-compatibility-update-for-gcc.patch
+++ /dev/null
@@ -1,28 +0,0 @@
-From 86f5e75a30e10e691c08d7eb88f76f2313b79440 Mon Sep 17 00:00:00 2001
-From: Michael Cronenworth <mike@cchtml.com>
-Date: Thu, 23 Jan 2020 17:05:19 -0600
-Subject: [PATCH 03/15] crypt32: Global variable compatibility update for gcc
- 10.
-
-Signed-off-by: Michael Cronenworth <mike@cchtml.com>
-Signed-off-by: Alexandre Julliard <julliard@winehq.org>
----
- dlls/crypt32/crypt32_private.h | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/dlls/crypt32/crypt32_private.h b/dlls/crypt32/crypt32_private.h
-index 3d0129e7d4..d92eb1a157 100644
---- a/dlls/crypt32/crypt32_private.h
-+++ b/dlls/crypt32/crypt32_private.h
-@@ -152,7 +152,7 @@ BOOL WINAPI CRYPT_AsnEncodePubKeyInfoNoNull(DWORD dwCertEncodingType,
- */
- 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;
---
-2.26.2
-
diff --git a/0004-dsound-Global-variable-compatibility-update-for-gcc-.patch b/0004-dsound-Global-variable-compatibility-update-for-gcc-.patch
deleted file mode 100644
index b202c1a64a9..00000000000
--- a/0004-dsound-Global-variable-compatibility-update-for-gcc-.patch
+++ /dev/null
@@ -1,33 +0,0 @@
-From 4ed8ec7b19ae8ddce24b71b772af2d5079df1cfa Mon Sep 17 00:00:00 2001
-From: Michael Cronenworth <mike@cchtml.com>
-Date: Thu, 23 Jan 2020 17:05:20 -0600
-Subject: [PATCH 04/15] dsound: Global variable compatibility update for gcc
- 10.
-
-Signed-off-by: Michael Cronenworth <mike@cchtml.com>
-Signed-off-by: Andrew Eikum <aeikum@codeweavers.com>
-Signed-off-by: Alexandre Julliard <julliard@winehq.org>
----
- dlls/dsound/dsound_private.h | 6 +++---
- 1 file changed, 3 insertions(+), 3 deletions(-)
-
-diff --git a/dlls/dsound/dsound_private.h b/dlls/dsound/dsound_private.h
-index 69c4a2f390..930c3e92ec 100644
---- a/dlls/dsound/dsound_private.h
-+++ b/dlls/dsound/dsound_private.h
-@@ -188,9 +188,9 @@ HRESULT IDirectSoundBufferImpl_Duplicate(
- 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;
-
---
-2.26.2
-
diff --git a/0005-mshtml-Global-variable-compatibility-update-for-gcc-.patch b/0005-mshtml-Global-variable-compatibility-update-for-gcc-.patch
deleted file mode 100644
index 48a1be5e615..00000000000
--- a/0005-mshtml-Global-variable-compatibility-update-for-gcc-.patch
+++ /dev/null
@@ -1,71 +0,0 @@
-From 4d4ea44107cd6b59ae3d05c1d917a7e32eb101f6 Mon Sep 17 00:00:00 2001
-From: Michael Cronenworth <mike@cchtml.com>
-Date: Thu, 23 Jan 2020 17:05:22 -0600
-Subject: [PATCH 05/15] mshtml: Global variable compatibility update for gcc
- 10.
-
-Signed-off-by: Jacek Caban <jacek@codeweavers.com>
-Signed-off-by: Alexandre Julliard <julliard@winehq.org>
----
- dlls/mshtml/htmlstyle.h | 2 +-
- dlls/mshtml/main.c | 7 +++++++
- dlls/mshtml/mshtml_private.h | 12 ++++++------
- 3 files changed, 14 insertions(+), 7 deletions(-)
-
-diff --git a/dlls/mshtml/htmlstyle.h b/dlls/mshtml/htmlstyle.h
-index 9dcf3d9eed..7a83897043 100644
---- a/dlls/mshtml/htmlstyle.h
-+++ b/dlls/mshtml/htmlstyle.h
-@@ -142,7 +142,7 @@ void init_css_style(CSSStyle*,nsIDOMCSSStyleDeclaration*,style_qi_t,
- 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;
-diff --git a/dlls/mshtml/main.c b/dlls/mshtml/main.c
-index 29396a5475..e2c927c5f9 100644
---- a/dlls/mshtml/main.c
-+++ b/dlls/mshtml/main.c
-@@ -51,6 +51,13 @@ WINE_DEFAULT_DEBUG_CHANNEL(mshtml);
- 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;
-diff --git a/dlls/mshtml/mshtml_private.h b/dlls/mshtml/mshtml_private.h
-index 9612b32608..cc9eefc528 100644
---- a/dlls/mshtml/mshtml_private.h
-+++ b/dlls/mshtml/mshtml_private.h
-@@ -355,12 +355,12 @@ typedef struct {
-
- 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;
---
-2.26.2
-
diff --git a/0006-secur32-Global-variable-compatibility-update-for-gcc.patch b/0006-secur32-Global-variable-compatibility-update-for-gcc.patch
deleted file mode 100644
index 6790624cd8c..00000000000
--- a/0006-secur32-Global-variable-compatibility-update-for-gcc.patch
+++ /dev/null
@@ -1,45 +0,0 @@
-From a948b9059160028681e79f3bf3a7f867841568f0 Mon Sep 17 00:00:00 2001
-From: Michael Cronenworth <mike@cchtml.com>
-Date: Thu, 23 Jan 2020 17:05:25 -0600
-Subject: [PATCH 06/15] secur32: Global variable compatibility update for gcc
- 10.
-
-Signed-off-by: Michael Cronenworth <mike@cchtml.com>
-Signed-off-by: Alexandre Julliard <julliard@winehq.org>
----
- dlls/secur32/ntlm.c | 4 ++--
- dlls/secur32/secur32_priv.h | 3 ---
- 2 files changed, 2 insertions(+), 5 deletions(-)
-
-diff --git a/dlls/secur32/ntlm.c b/dlls/secur32/ntlm.c
-index b368a5f016..4e3fda3ea9 100644
---- a/dlls/secur32/ntlm.c
-+++ b/dlls/secur32/ntlm.c
-@@ -1387,8 +1387,8 @@ static const SecPkgInfoA infoA = {
- ntlm_comment_A
- };
-
--SecPkgInfoA *ntlm_package_infoA = (SecPkgInfoA *)&infoA;
--SecPkgInfoW *ntlm_package_infoW = (SecPkgInfoW *)&infoW;
-+static SecPkgInfoA *ntlm_package_infoA = (SecPkgInfoA *)&infoA;
-+static SecPkgInfoW *ntlm_package_infoW = (SecPkgInfoW *)&infoW;
-
- static SecPkgInfoW *build_package_infoW( const SecPkgInfoW *info )
- {
-diff --git a/dlls/secur32/secur32_priv.h b/dlls/secur32/secur32_priv.h
-index 5ed26d67ef..1bff1372b0 100644
---- a/dlls/secur32/secur32_priv.h
-+++ b/dlls/secur32/secur32_priv.h
-@@ -190,9 +190,6 @@ void SECUR32_arc4Cleanup(arc4_info *a4i) DECLSPEC_HIDDEN;
- #define NTLMSSP_NEGOTIATE_56 0x80000000
-
-
--SecPkgInfoW *ntlm_package_infoW DECLSPEC_HIDDEN;
--SecPkgInfoA *ntlm_package_infoA DECLSPEC_HIDDEN;
--
- /* schannel internal interface */
- typedef struct schan_imp_session_opaque *schan_imp_session;
-
---
-2.26.2
-
diff --git a/0007-winebus-Global-variable-compatibility-update-for-gcc.patch b/0007-winebus-Global-variable-compatibility-update-for-gcc.patch
deleted file mode 100644
index ecb1c5845a3..00000000000
--- a/0007-winebus-Global-variable-compatibility-update-for-gcc.patch
+++ /dev/null
@@ -1,27 +0,0 @@
-From a01d7bbbd9a8d8ea0bbd37887330648ccb82417b Mon Sep 17 00:00:00 2001
-From: Michael Cronenworth <mike@cchtml.com>
-Date: Thu, 23 Jan 2020 17:05:29 -0600
-Subject: [PATCH 07/15] winebus: Global variable compatibility update for gcc
- 10.
-
-Signed-off-by: Michael Cronenworth <mike@cchtml.com>
-Signed-off-by: Alexandre Julliard <julliard@winehq.org>
----
- dlls/winebus.sys/bus.h | 4 ++--
- 1 file changed, 2 insertions(+), 2 deletions(-)
-
-diff --git a/dlls/winebus.sys/bus.h b/dlls/winebus.sys/bus.h
-index 041a37ad04..22a4b46a51 100644
---- a/dlls/winebus.sys/bus.h
-+++ b/dlls/winebus.sys/bus.h
-@@ -54,5 +54,5 @@ DEVICE_OBJECT* bus_enumerate_hid_devices(const platform_vtbl *vtbl, enum_func fu
- 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;
---
-2.26.2
-
diff --git a/0008-wbemprox-Global-variable-compatibility-update-for-gc.patch b/0008-wbemprox-Global-variable-compatibility-update-for-gc.patch
deleted file mode 100644
index 923d8edd970..00000000000
--- a/0008-wbemprox-Global-variable-compatibility-update-for-gc.patch
+++ /dev/null
@@ -1,44 +0,0 @@
-From 7ddbb2e5231d78ca74cac93f00320da9bf74ee66 Mon Sep 17 00:00:00 2001
-From: Michael Cronenworth <mike@cchtml.com>
-Date: Thu, 23 Jan 2020 17:05:27 -0600
-Subject: [PATCH 08/15] wbemprox: Global variable compatibility update for gcc
- 10.
-
-Signed-off-by: Michael Cronenworth <mike@cchtml.com>
-Signed-off-by: Alexandre Julliard <julliard@winehq.org>
----
- dlls/wbemprox/main.c | 2 ++
- dlls/wbemprox/wbemprox_private.h | 4 ++--
- 2 files changed, 4 insertions(+), 2 deletions(-)
-
-diff --git a/dlls/wbemprox/main.c b/dlls/wbemprox/main.c
-index d90f4f8cc6..0908441498 100644
---- a/dlls/wbemprox/main.c
-+++ b/dlls/wbemprox/main.c
-@@ -35,6 +35,8 @@ WINE_DEFAULT_DEBUG_CHANNEL(wbemprox);
-
- static HINSTANCE instance;
-
-+struct list *table_list;
-+
- typedef HRESULT (*fnCreateInstance)( LPVOID *ppObj );
-
- typedef struct
-diff --git a/dlls/wbemprox/wbemprox_private.h b/dlls/wbemprox/wbemprox_private.h
-index 9d39a7c92b..9096b392e3 100644
---- a/dlls/wbemprox/wbemprox_private.h
-+++ b/dlls/wbemprox/wbemprox_private.h
-@@ -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
- {
---
-2.26.2
-
diff --git a/0009-xinput-Global-variable-compatibility-update-for-gcc-.patch b/0009-xinput-Global-variable-compatibility-update-for-gcc-.patch
deleted file mode 100644
index 60a99108933..00000000000
--- a/0009-xinput-Global-variable-compatibility-update-for-gcc-.patch
+++ /dev/null
@@ -1,30 +0,0 @@
-From 5299b6126e677a3183af99c776ef06a4babcbf9e Mon Sep 17 00:00:00 2001
-From: Michael Cronenworth <mike@cchtml.com>
-Date: Thu, 23 Jan 2020 17:05:30 -0600
-Subject: [PATCH 09/15] xinput: Global variable compatibility update for gcc
- 10.
-
-Signed-off-by: Andrew Eikum <aeikum@codeweavers.com>
-Signed-off-by: Alexandre Julliard <julliard@winehq.org>
----
- dlls/xinput1_3/xinput_private.h | 4 ++--
- 1 file changed, 2 insertions(+), 2 deletions(-)
-
-diff --git a/dlls/xinput1_3/xinput_private.h b/dlls/xinput1_3/xinput_private.h
-index f3456cd8e7..9a0e03c1de 100644
---- a/dlls/xinput1_3/xinput_private.h
-+++ b/dlls/xinput1_3/xinput_private.h
-@@ -26,8 +26,8 @@ typedef struct _xinput_controller
- 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;
---
-2.26.2
-
diff --git a/0010-twain_32-Global-variable-compatibility-update-for-gc.patch b/0010-twain_32-Global-variable-compatibility-update-for-gc.patch
deleted file mode 100644
index 600d912d1e0..00000000000
--- a/0010-twain_32-Global-variable-compatibility-update-for-gc.patch
+++ /dev/null
@@ -1,50 +0,0 @@
-From 3304bad49c12f996e5bc236a2d94b88914279c48 Mon Sep 17 00:00:00 2001
-From: Michael Cronenworth <mike@cchtml.com>
-Date: Thu, 23 Jan 2020 17:05:26 -0600
-Subject: [PATCH 10/15] twain_32: Global variable compatibility update for gcc
- 10.
-
-Signed-off-by: Michael Cronenworth <mike@cchtml.com>
-Signed-off-by: Alexandre Julliard <julliard@winehq.org>
----
- dlls/twain_32/twain32_main.c | 4 +++-
- dlls/twain_32/twain_i.h | 6 +++---
- 2 files changed, 6 insertions(+), 4 deletions(-)
-
-diff --git a/dlls/twain_32/twain32_main.c b/dlls/twain_32/twain32_main.c
-index b1beb96958..0f8ee14430 100644
---- a/dlls/twain_32/twain32_main.c
-+++ b/dlls/twain_32/twain32_main.c
-@@ -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)
- {
-diff --git a/dlls/twain_32/twain_i.h b/dlls/twain_32/twain_i.h
-index 7939d233bb..ad513458cd 100644
---- a/dlls/twain_32/twain_i.h
-+++ b/dlls/twain_32/twain_i.h
-@@ -45,11 +45,11 @@ typedef struct tagActiveDS
- 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
---
-2.26.2
-
diff --git a/0011-msi-Global-variable-compatibility-update-for-gcc-10.patch b/0011-msi-Global-variable-compatibility-update-for-gcc-10.patch
deleted file mode 100644
index 906f8884096..00000000000
--- a/0011-msi-Global-variable-compatibility-update-for-gcc-10.patch
+++ /dev/null
@@ -1,42 +0,0 @@
-From ec9a259d932f723e82ca55ce9d00ad9a0cc5ef5a Mon Sep 17 00:00:00 2001
-From: Michael Cronenworth <mike@cchtml.com>
-Date: Thu, 23 Jan 2020 17:05:23 -0600
-Subject: [PATCH 11/15] msi: Global variable compatibility update for gcc 10.
-
-Signed-off-by: Michael Cronenworth <mike@cchtml.com>
-Signed-off-by: Hans Leidekker <hans@codeweavers.com>
-Signed-off-by: Alexandre Julliard <julliard@winehq.org>
----
- dlls/msi/msi.c | 2 ++
- dlls/msi/msipriv.h | 2 +-
- 2 files changed, 3 insertions(+), 1 deletion(-)
-
-diff --git a/dlls/msi/msi.c b/dlls/msi/msi.c
-index 7bf5004bed..6387b0a937 100644
---- a/dlls/msi/msi.c
-+++ b/dlls/msi/msi.c
-@@ -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)
-diff --git a/dlls/msi/msipriv.h b/dlls/msi/msipriv.h
-index fca2f9e7b4..6b87cfb3d8 100644
---- a/dlls/msi/msipriv.h
-+++ b/dlls/msi/msipriv.h
-@@ -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
---
-2.26.2
-
diff --git a/0012-webservices-Global-variable-compatibility-update-for.patch b/0012-webservices-Global-variable-compatibility-update-for.patch
deleted file mode 100644
index 29949a7a82f..00000000000
--- a/0012-webservices-Global-variable-compatibility-update-for.patch
+++ /dev/null
@@ -1,40 +0,0 @@
-From 3f67c969ef4a532e2fbf9a0743de56a73901ed8e Mon Sep 17 00:00:00 2001
-From: Michael Cronenworth <mike@cchtml.com>
-Date: Thu, 23 Jan 2020 17:05:28 -0600
-Subject: [PATCH 12/15] webservices: Global variable compatibility update for
- gcc 10.
-
-Signed-off-by: Michael Cronenworth <mike@cchtml.com>
-Signed-off-by: Hans Leidekker <hans@codeweavers.com>
-Signed-off-by: Alexandre Julliard <julliard@winehq.org>
----
- dlls/webservices/webservices_private.h | 6 +++---
- 1 file changed, 3 insertions(+), 3 deletions(-)
-
-diff --git a/dlls/webservices/webservices_private.h b/dlls/webservices/webservices_private.h
-index 6f2b90dad2..b352aa52d4 100644
---- a/dlls/webservices/webservices_private.h
-+++ b/dlls/webservices/webservices_private.h
-@@ -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 @@ struct dictionary
- 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;
---
-2.26.2
-
diff --git a/0013-gphoto2.ds-Global-variable-compatibility-update-for-.patch b/0013-gphoto2.ds-Global-variable-compatibility-update-for-.patch
deleted file mode 100644
index f8cfad3a5f2..00000000000
--- a/0013-gphoto2.ds-Global-variable-compatibility-update-for-.patch
+++ /dev/null
@@ -1,44 +0,0 @@
-From 9c2e60675e7c39ba1d73069c5d4c6740eae4fcbb Mon Sep 17 00:00:00 2001
-From: Michael Cronenworth <mike@cchtml.com>
-Date: Thu, 23 Jan 2020 17:05:21 -0600
-Subject: [PATCH 13/15] gphoto2.ds: Global variable compatibility update for
- gcc 10.
-
-Signed-off-by: Michael Cronenworth <mike@cchtml.com>
-Signed-off-by: Alexandre Julliard <julliard@winehq.org>
----
- dlls/gphoto2.ds/gphoto2_i.h | 4 +++-
- dlls/gphoto2.ds/gphoto2_main.c | 2 ++
- 2 files changed, 5 insertions(+), 1 deletion(-)
-
-diff --git a/dlls/gphoto2.ds/gphoto2_i.h b/dlls/gphoto2.ds/gphoto2_i.h
-index 9ab8bbbf33..4171fcae4f 100644
---- a/dlls/gphoto2.ds/gphoto2_i.h
-+++ b/dlls/gphoto2.ds/gphoto2_i.h
-@@ -100,7 +100,9 @@ struct tagActiveDS
- struct jpeg_decompress_struct jd;
- struct jpeg_error_mgr jerr;
- #endif
--} activeDS DECLSPEC_HIDDEN;
-+};
-+
-+extern struct tagActiveDS activeDS DECLSPEC_HIDDEN;
-
- /* Helper functions */
- extern TW_UINT16 GPHOTO2_SaneCapability (pTW_CAPABILITY pCapability, TW_UINT16 action) DECLSPEC_HIDDEN;
-diff --git a/dlls/gphoto2.ds/gphoto2_main.c b/dlls/gphoto2.ds/gphoto2_main.c
-index 28100414cc..4d71c89e2e 100644
---- a/dlls/gphoto2.ds/gphoto2_main.c
-+++ b/dlls/gphoto2.ds/gphoto2_main.c
-@@ -33,6 +33,8 @@
-
- WINE_DEFAULT_DEBUG_CHANNEL(twain);
-
-+struct tagActiveDS activeDS;
-+
- DSMENTRYPROC GPHOTO2_dsmentry;
-
- #ifdef HAVE_GPHOTO2
---
-2.26.2
-
diff --git a/0014-sane.ds-Global-variable-compatibility-update-for-gcc.patch b/0014-sane.ds-Global-variable-compatibility-update-for-gcc.patch
deleted file mode 100644
index bf0f9ea3cc1..00000000000
--- a/0014-sane.ds-Global-variable-compatibility-update-for-gcc.patch
+++ /dev/null
@@ -1,72 +0,0 @@
-From 5bca9742ab71828c297e23fb1513a21bbd0ea0fb Mon Sep 17 00:00:00 2001
-From: Michael Cronenworth <mike@cchtml.com>
-Date: Thu, 23 Jan 2020 17:05:24 -0600
-Subject: [PATCH 14/15] sane.ds: Global variable compatibility update for gcc
- 10.
-
-Signed-off-by: Michael Cronenworth <mike@cchtml.com>
-Signed-off-by: Alexandre Julliard <julliard@winehq.org>
----
- dlls/sane.ds/sane_i.h | 6 ++++--
- dlls/sane.ds/sane_main.c | 18 ++++++++++++++++++
- 2 files changed, 22 insertions(+), 2 deletions(-)
-
-diff --git a/dlls/sane.ds/sane_i.h b/dlls/sane.ds/sane_i.h
-index 941e8b9e1b..9351bdc222 100644
---- a/dlls/sane.ds/sane_i.h
-+++ b/dlls/sane.ds/sane_i.h
-@@ -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,9 @@ struct tagActiveDS
- TW_FIX32 defaultXResolution;
- BOOL YResolutionSet;
- TW_FIX32 defaultYResolution;
--} activeDS DECLSPEC_HIDDEN;
-+};
-+
-+extern struct tagActiveDS activeDS DECLSPEC_HIDDEN;
-
- /* Helper functions */
- extern TW_UINT16 SANE_SaneCapability (pTW_CAPABILITY pCapability, TW_UINT16 action) DECLSPEC_HIDDEN;
-diff --git a/dlls/sane.ds/sane_main.c b/dlls/sane.ds/sane_main.c
-index 7af0a2321a..0cf211d098 100644
---- a/dlls/sane.ds/sane_main.c
-+++ b/dlls/sane.ds/sane_main.c
-@@ -30,9 +30,27 @@
-
- WINE_DEFAULT_DEBUG_CHANNEL(twain);
-
-+struct tagActiveDS activeDS;
-+
- 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;
-
---
-2.26.2
-
diff --git a/0015-schedsvc-tests-Fix-compilation-with-recent-gcc-clang.patch b/0015-schedsvc-tests-Fix-compilation-with-recent-gcc-clang.patch
deleted file mode 100644
index 61b7cf51269..00000000000
--- a/0015-schedsvc-tests-Fix-compilation-with-recent-gcc-clang.patch
+++ /dev/null
@@ -1,129 +0,0 @@
-From 85fa39ac5e307904378bbee903c87ac230bce52e Mon Sep 17 00:00:00 2001
-From: Dmitry Timoshkov <dmitry@baikal.ru>
-Date: Wed, 15 Apr 2020 21:43:42 +0800
-Subject: [PATCH 15/15] schedsvc/tests: Fix compilation with recent gcc/clang
- versions.
-
-Signed-off-by: Dmitry Timoshkov <dmitry@baikal.ru>
-Signed-off-by: Alexandre Julliard <julliard@winehq.org>
----
- dlls/schedsvc/tests/atsvcapi.c | 6 +++---
- dlls/schedsvc/tests/rpcapi.c | 6 +++---
- dlls/taskschd/task.c | 4 ++--
- include/wine/atsvc.idl | 2 +-
- include/wine/schrpc.idl | 2 +-
- 5 files changed, 10 insertions(+), 10 deletions(-)
-
-diff --git a/dlls/schedsvc/tests/atsvcapi.c b/dlls/schedsvc/tests/atsvcapi.c
-index d7d48a122c..f10c9d0723 100644
---- a/dlls/schedsvc/tests/atsvcapi.c
-+++ b/dlls/schedsvc/tests/atsvcapi.c
-@@ -31,7 +31,7 @@
- #define JOB_ADD_CURRENT_DATE 0x08
- #define JOB_NONINTERACTIVE 0x10
-
--extern handle_t rpc_handle;
-+extern handle_t atsvc_handle;
-
- static int test_failures, test_skipped;
-
-@@ -69,7 +69,7 @@ START_TEST(atsvcapi)
-
- hr = RpcStringBindingComposeA(NULL, ncalrpc, NULL, NULL, NULL, &binding_str);
- ok(hr == RPC_S_OK, "RpcStringBindingCompose error %#x\n", hr);
-- hr = RpcBindingFromStringBindingA(binding_str, &rpc_handle);
-+ hr = RpcBindingFromStringBindingA(binding_str, &atsvc_handle);
- ok(hr == RPC_S_OK, "RpcBindingFromStringBinding error %#x\n", hr);
- hr = RpcStringFreeA(&binding_str);
- ok(hr == RPC_S_OK, "RpcStringFree error %#x\n", hr);
-@@ -173,7 +173,7 @@ skip_tests_delete:
- skip_tests:
- SetUnhandledExceptionFilter(old_exception_filter);
-
-- hr = RpcBindingFree(&rpc_handle);
-+ hr = RpcBindingFree(&atsvc_handle);
- ok(hr == RPC_S_OK, "RpcBindingFree error %#x\n", hr);
- }
-
-diff --git a/dlls/schedsvc/tests/rpcapi.c b/dlls/schedsvc/tests/rpcapi.c
-index 9d9557fe1c..b791a047dc 100644
---- a/dlls/schedsvc/tests/rpcapi.c
-+++ b/dlls/schedsvc/tests/rpcapi.c
-@@ -25,7 +25,7 @@
-
- #include "wine/test.h"
-
--extern handle_t rpc_handle;
-+extern handle_t schrpc_handle;
-
- static LONG CALLBACK rpc_exception_filter(EXCEPTION_POINTERS *ptrs)
- {
-@@ -103,7 +103,7 @@ START_TEST(rpcapi)
-
- hr = RpcStringBindingComposeA(NULL, ncalrpc, NULL, NULL, NULL, &binding_str);
- ok(hr == RPC_S_OK, "RpcStringBindingCompose error %#x\n", hr);
-- hr = RpcBindingFromStringBindingA(binding_str, &rpc_handle);
-+ hr = RpcBindingFromStringBindingA(binding_str, &schrpc_handle);
- ok(hr == RPC_S_OK, "RpcBindingFromStringBinding error %#x\n", hr);
- hr = RpcStringFreeA(&binding_str);
- ok(hr == RPC_S_OK, "RpcStringFree error %#x\n", hr);
-@@ -537,7 +537,7 @@ todo_wine
- MIDL_user_free(path);
- }
-
-- hr = RpcBindingFree(&rpc_handle);
-+ hr = RpcBindingFree(&schrpc_handle);
- ok(hr == RPC_S_OK, "RpcBindingFree error %#x\n", hr);
- }
-
-diff --git a/dlls/taskschd/task.c b/dlls/taskschd/task.c
-index b75cfff8af..8d81a18b3f 100644
---- a/dlls/taskschd/task.c
-+++ b/dlls/taskschd/task.c
-@@ -3843,7 +3843,7 @@ static HRESULT WINAPI TaskService_Connect(ITaskService *iface, VARIANT server, V
- DWORD len;
- HRESULT hr;
- RPC_WSTR binding_str;
-- extern handle_t rpc_handle;
-+ extern handle_t schrpc_handle;
-
- TRACE("%p,%s,%s,%s,%s\n", iface, debugstr_variant(&server), debugstr_variant(&user),
- debugstr_variant(&domain), debugstr_variant(&password));
-@@ -3882,7 +3882,7 @@ static HRESULT WINAPI TaskService_Connect(ITaskService *iface, VARIANT server, V
-
- hr = RpcStringBindingComposeW(NULL, ncalrpc, NULL, NULL, NULL, &binding_str);
- if (hr != RPC_S_OK) return hr;
-- hr = RpcBindingFromStringBindingW(binding_str, &rpc_handle);
-+ hr = RpcBindingFromStringBindingW(binding_str, &schrpc_handle);
- RpcStringFreeW(&binding_str);
- if (hr != RPC_S_OK) return hr;
-
-diff --git a/include/wine/atsvc.idl b/include/wine/atsvc.idl
-index e95e6cf110..5e7121d016 100644
---- a/include/wine/atsvc.idl
-+++ b/include/wine/atsvc.idl
-@@ -23,7 +23,7 @@ import "ocidl.idl";
-
- [
- uuid(1ff70682-0a51-30e8-076d-740be8cee98b),
-- implicit_handle(handle_t rpc_handle),
-+ implicit_handle(handle_t atsvc_handle),
- version(1.0),
- pointer_default(unique)
- ]
-diff --git a/include/wine/schrpc.idl b/include/wine/schrpc.idl
-index 4af709d8dd..944f283081 100644
---- a/include/wine/schrpc.idl
-+++ b/include/wine/schrpc.idl
-@@ -26,7 +26,7 @@ import "ocidl.idl";
-
- [
- uuid(86d35949-83c9-4044-b424-db363231fd0c),
-- implicit_handle(handle_t rpc_handle),
-+ implicit_handle(handle_t schrpc_handle),
- version(1.0),
- pointer_default(unique)
- ]
---
-2.26.2
-
diff --git a/PKGBUILD b/PKGBUILD
index fe1d0bf22bf..d08d047d50d 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -5,46 +5,16 @@
# Try to make a clean WINEPREFIX, such as by doing “rm -rf ~/.wine”
pkgname=wine-stable
-pkgver=5.0
-pkgrel=3
+pkgver=5.0.1
+pkgrel=1
source=(https://dl.winehq.org/wine/source/5.0/wine-$pkgver.tar.xz{,.sign}
30-win32-aliases.conf
- wine-binfmt.conf
- 0001-winedump-Add-a-default-case-to-numeric_leaf.patch
- 0002-msi-Properly-declare-variables-in-msi-tests-utils.h-.patch
- 0003-crypt32-Global-variable-compatibility-update-for-gcc.patch
- 0004-dsound-Global-variable-compatibility-update-for-gcc-.patch
- 0005-mshtml-Global-variable-compatibility-update-for-gcc-.patch
- 0006-secur32-Global-variable-compatibility-update-for-gcc.patch
- 0007-winebus-Global-variable-compatibility-update-for-gcc.patch
- 0008-wbemprox-Global-variable-compatibility-update-for-gc.patch
- 0009-xinput-Global-variable-compatibility-update-for-gcc-.patch
- 0010-twain_32-Global-variable-compatibility-update-for-gc.patch
- 0011-msi-Global-variable-compatibility-update-for-gcc-10.patch
- 0012-webservices-Global-variable-compatibility-update-for.patch
- 0013-gphoto2.ds-Global-variable-compatibility-update-for-.patch
- 0014-sane.ds-Global-variable-compatibility-update-for-gcc.patch
- 0015-schedsvc-tests-Fix-compilation-with-recent-gcc-clang.patch)
-b2sums=('d26938e707545d31ed932c67eaaa9fd137e42daa6facadeaea2897797ec816658edc1b89c649e0cb5c453ca53ebea5d7156fdd188f1afe2a55ca7834e012e276'
+ wine-binfmt.conf)
+b2sums=('8fd7729812c0144b6c9ec7f28ecc25bca5bc7801d9927346928f43fc46ca0be89ecb4caefb7a93cf2f3365e088d11e6bd53a028ea8cc9e170ef864ff63f21a5a'
'SKIP'
'45db34fb35a679dc191b4119603eba37b8008326bd4f7d6bd422fbbb2a74b675bdbc9f0cc6995ed0c564cf088b7ecd9fbe2d06d42ff8a4464828f3c4f188075b'
- 'e9de76a32493c601ab32bde28a2c8f8aded12978057159dd9bf35eefbf82f2389a4d5e30170218956101331cf3e7452ae82ad0db6aad623651b0cc2174a61588'
- '3bad385a7c432f33a2ff0c5697e0fd43bfc178b184b2dfdb6dbf2861552b93a743b5fe9838069152df586eda547697033299a3b11620280250fa72913d41468c'
- '4f6516f0eb27adf96016f62fe29edc47abb1e27a4843a42dee88afad55c96f51082fcdfbb3bcbaded5e7df529f363eaadc0c05a55f604a020e56bf07befa5ccb'
- '8589ce198b76a53e65cf75328b6ab164beee5cf82e7baf4de9d4c86b403db9ddfe6ea1d219763da2ced58a70e7525f5c1755a466d38104ac8189c128ae291d95'
- '6deae909005d358eb3602aba4f1cdfbb3a01bd4005b7c75adbd9a91f07736b041e1342da32d62842aa48b6a7f835f049b95433621a2e769ac842d7bd4b4d89f0'
- '53becc8e020a1d87c1448b8c2ec50f267cd2b906f57647d48405cc0a0a74dd70b1d234564ce054a05b66b4713d5d2c7048f1ebca1497c0899782b0828889bed9'
- '6584b229179f8bb7df79c9bb6df73170a7230c6a8617ab017cef00b5aac7eacc13cc671aa0c0cf4f3180b56142d989bc9d9fd087b6a3fe695180b2089a0a8e35'
- 'e7ae9a5e0a7c0dab900e8a735cd050f5eab31932cc03efc8065fdc9a1c1ee9c364930794f788fd91b2fe0eb2444464777f923bdf41c19230f284933ca73d8768'
- 'e146764111a3aa048b711ddee585bec5a5e87bddea3d6447787af7338114a69e4905ea43d64994fff26fc35b1461e0049798df7db07bb85a84062cbbd9a16a6f'
- '0dcec6681ddae79783391e25d13d6184fab39443d07e378fbe24f421634f408f71dd4d16f7c0f39cfdd92c829aed806f8fd4a24bde9b2d570219dff0e7e6f6d6'
- 'bbd131630657a3984eab4d1a4a33f4e67502db373896ac706b3bddd3cc59c10e25bf8ec3183c488eedfea0780acb436f7f9c8c79390ba7ad409d6ea996109865'
- '8b7cb73646dece70f4629908103190e62144f2ef83f2afd23bf571f22c7b9eaa9e9321c35b69f7e5be906558e5bbdb6955a83820be9823cce436c60a544541a7'
- 'cdc92b181e5a4c1c39d4cd11c87676909252998a81361cb7618120c036f36ead08cf9549b835c7f5ff3b804f9f64feab1f6f0b38ae378e26b2305acc6530963f'
- 'b6cf97520d3e32f95378787faa5e7445ce24b02a0a4a58180aa441599ef7bbc8fea8bf086249e50a2247235d00fdb79d1c29dc260d00fcd31e6cedc15c7d901a'
- 'a352cb565394b5e5c734723d7aba7cb13fc0ca64231aaee757033b8001f4b7ff70202d7bf63cb65702be6fbb93678a62e983fb3e4f5e266630aa4abf69bb9842'
- '0343481010c5a68e19692207b9d95e90b7bda6da03204bc6a95e26b9dada862f75fa1cabc74bdcb71cbe5c3282318edd3cd1ad5d45cfcc5f66908dace8bda60d')
+ 'e9de76a32493c601ab32bde28a2c8f8aded12978057159dd9bf35eefbf82f2389a4d5e30170218956101331cf3e7452ae82ad0db6aad623651b0cc2174a61588')
validpgpkeys=(DA23579A74D4AD9AF9D3F945CEFAC8EAAF17519D)
pkgdesc="A compatibility layer for running Windows programs"