diff options
-rw-r--r-- | .SRCINFO | 4 | ||||
-rw-r--r-- | PKGBUILD | 4 | ||||
-rw-r--r-- | wine-25946b48148784e8275c1685f6498ab88f553ca3.patch | 68 |
3 files changed, 72 insertions, 4 deletions
@@ -229,7 +229,7 @@ pkgbase = proton source = https://dl.winehq.org/wine/wine-gecko/2.47.2/wine-gecko-2.47.2-x86_64.tar.xz source = https://github.com/madewokherd/wine-mono/releases/download/wine-mono-7.1.2/wine-mono-7.1.2-x86.tar.xz source = dxvk-async-1.9.4.patch::https://raw.githubusercontent.com/Sporif/dxvk-async/1.9.4/dxvk-async.patch - source = wine-25946b48148784e8275c1685f6498ab88f553ca3.patch::https://github.com/wine-mirror/wine/commit/25946b48148784e8275c1685f6498ab88f553ca3.patch + source = wine-25946b48148784e8275c1685f6498ab88f553ca3.patch source = wine-futex_waitv.patch source = wine-winevulkan_fsr.patch source = wine-more_8x5_res.patch @@ -262,7 +262,7 @@ pkgbase = proton sha256sums = b4476706a4c3f23461da98bed34f355ff623c5d2bb2da1e2fa0c6a310bc33014 sha256sums = 59f146dde0f0540ca4648fc648e6b16335c71921deaf111b5fe8c3967881661d sha256sums = ddde07c98045a3bc15fab5eaf3c6a756a6a4b4eaeec646d4339168b86ac00463 - sha256sums = 11aa65bb6b8da1814557edf18a3cdada80135b021634236feabf93d2a194838b + sha256sums = c94513348b9fe5342af3008b829856614ea04ffe84171ac6f323e61008afb805 sha256sums = 7d989e9b29643897eaadb970d65e71140b11f4d641ef8816bd17feb9ad2ca992 sha256sums = d76b87410047f623accc846f15f849fe13275924c685ccfb95a91a8b22943e51 sha256sums = 9005d8169266ba0b93be30e1475fe9a3697464796f553886c155ec1d77d71215 @@ -129,7 +129,7 @@ source=( https://dl.winehq.org/wine/wine-gecko/${_geckover}/wine-gecko-${_geckover}-x86{,_64}.tar.xz https://github.com/madewokherd/wine-mono/releases/download/wine-mono-${_monover}/wine-mono-${_monover}-x86.tar.xz dxvk-async-${_asyncver}.patch::https://raw.githubusercontent.com/Sporif/dxvk-async/${_asyncver}/dxvk-async.patch - wine-25946b48148784e8275c1685f6498ab88f553ca3.patch::https://github.com/wine-mirror/wine/commit/25946b48148784e8275c1685f6498ab88f553ca3.patch + wine-25946b48148784e8275c1685f6498ab88f553ca3.patch wine-futex_waitv.patch wine-winevulkan_fsr.patch wine-more_8x5_res.patch @@ -415,7 +415,7 @@ sha256sums=('SKIP' 'b4476706a4c3f23461da98bed34f355ff623c5d2bb2da1e2fa0c6a310bc33014' '59f146dde0f0540ca4648fc648e6b16335c71921deaf111b5fe8c3967881661d' 'ddde07c98045a3bc15fab5eaf3c6a756a6a4b4eaeec646d4339168b86ac00463' - '11aa65bb6b8da1814557edf18a3cdada80135b021634236feabf93d2a194838b' + 'c94513348b9fe5342af3008b829856614ea04ffe84171ac6f323e61008afb805' '7d989e9b29643897eaadb970d65e71140b11f4d641ef8816bd17feb9ad2ca992' 'd76b87410047f623accc846f15f849fe13275924c685ccfb95a91a8b22943e51' '9005d8169266ba0b93be30e1475fe9a3697464796f553886c155ec1d77d71215' diff --git a/wine-25946b48148784e8275c1685f6498ab88f553ca3.patch b/wine-25946b48148784e8275c1685f6498ab88f553ca3.patch new file mode 100644 index 000000000000..c65a533a7d9c --- /dev/null +++ b/wine-25946b48148784e8275c1685f6498ab88f553ca3.patch @@ -0,0 +1,68 @@ +From 25946b48148784e8275c1685f6498ab88f553ca3 Mon Sep 17 00:00:00 2001 +From: Eric Pouech <eric.pouech@gmail.com> +Date: Fri, 4 Feb 2022 09:34:49 +0100 +Subject: [PATCH] wldap32: Fix compilation in 32-bit. + +32-bit compilation has been broken by 8db1662d749991a77b8945c752ab024d2d6b1244. + +Signed-off-by: Eric Pouech <eric.pouech@gmail.com> +Signed-off-by: Hans Leidekker <hans@codeweavers.com> +Signed-off-by: Alexandre Julliard <julliard@winehq.org> +--- + dlls/wldap32/libldap.c | 18 ++++++++++++++---- + 1 file changed, 14 insertions(+), 4 deletions(-) + +diff --git a/dlls/wldap32/libldap.c b/dlls/wldap32/libldap.c +index 8872421dabcd..592e526ecdc0 100644 +--- a/dlls/wldap32/libldap.c ++++ b/dlls/wldap32/libldap.c +@@ -53,7 +53,14 @@ C_ASSERT( sizeof(LDAPSortKeyU) == sizeof(LDAPSortKey) ); + C_ASSERT( sizeof(LDAPVLVInfoU) == sizeof(LDAPVLVInfo) ); + C_ASSERT( sizeof(LDAPAPIInfoU) == sizeof(LDAPAPIInfo) ); + C_ASSERT( sizeof(LDAPAPIFeatureInfoU) == sizeof(LDAPAPIFeatureInfo) ); +-C_ASSERT( sizeof(struct timevalU) == sizeof(struct timeval) ); ++ ++static struct timeval *convert_timeval(const struct timevalU *tvu, struct timeval *tv) ++{ ++ if (!tvu) return NULL; ++ tv->tv_sec = tvu->tv_sec; ++ tv->tv_usec = tvu->tv_usec; ++ return tv; ++} + + #define WLDAP32_LBER_ERROR (~0l) + +@@ -488,8 +495,9 @@ static NTSTATUS wrap_ldap_rename_s( void *args ) + static NTSTATUS wrap_ldap_result( void *args ) + { + struct ldap_result_params *params = args; ++ struct timeval tv; + return ldap_result( params->ld, params->msgid, params->all, +- (struct timeval *)params->timeout, (LDAPMessage **)params->result ); ++ convert_timeval(params->timeout, &tv), (LDAPMessage **)params->result ); + } + + static NTSTATUS wrap_ldap_sasl_bind( void *args ) +@@ -555,18 +563,20 @@ static NTSTATUS wrap_ldap_sasl_interactive_bind_s( void *args ) + static NTSTATUS wrap_ldap_search_ext( void *args ) + { + struct ldap_search_ext_params *params = args; ++ struct timeval tv; + return ldap_search_ext( params->ld, params->base, params->scope, params->filter, params->attrs, + params->attrsonly, (LDAPControl **)params->serverctrls, +- (LDAPControl **)params->clientctrls, (struct timeval *)params->timeout, ++ (LDAPControl **)params->clientctrls, convert_timeval(params->timeout, &tv), + params->sizelimit, (int *)params->msg ); + } + + static NTSTATUS wrap_ldap_search_ext_s( void *args ) + { + struct ldap_search_ext_s_params *params = args; ++ struct timeval tv; + return ldap_search_ext_s( params->ld, params->base, params->scope, params->filter, params->attrs, + params->attrsonly, (LDAPControl **)params->serverctrls, +- (LDAPControl **)params->clientctrls, (struct timeval *)params->timeout, ++ (LDAPControl **)params->clientctrls, convert_timeval(params->timeout, &tv), + params->sizelimit, (LDAPMessage **)params->result ); + } + |