diff options
| author |   Ionen Wolkens <ionen@gentoo.org> | 2023-04-17 14:55:23 -0400 |
|---|---|---|
| committer | Ionen Wolkens <ionen@gentoo.org> | 2023-04-17 16:41:06 -0400 |
| commit | 0bf3a079c58b6615d9ef7624bc02b9e87cbbbb51 (patch) | |
| tree | 13642be07ce9c027bb09a6a88905f0d57fc0f1ae /app-emulation/wine-proton/files | |
| parent | app-emulation/wine-mono: add 7.4.1 (diff) | |
| download | gentoo-0bf3a079c58b6615d9ef7624bc02b9e87cbbbb51.tar.gz gentoo-0bf3a079c58b6615d9ef7624bc02b9e87cbbbb51.tar.bz2 gentoo-0bf3a079c58b6615d9ef7624bc02b9e87cbbbb51.zip | |
app-emulation/wine-proton: add 8.0.1c
Contains same changes as 7.0 -> 8.0 from wine-vanilla, plus
newer wine-mono.
No live ebuild yet, the experimental branch still hasn't been
created upstream (experimental releases are still for 7.0) and
assuming proton_8.0 branch will work the same as 7.0 where it's
updated only for releases.
Signed-off-by: Ionen Wolkens <ionen@gentoo.org>
Diffstat (limited to 'app-emulation/wine-proton/files')
| -rw-r--r-- | app-emulation/wine-proton/files/wine-proton-8.0.1c-unwind.patch | 36 |
1 files changed, 36 insertions, 0 deletions
diff --git a/app-emulation/wine-proton/files/wine-proton-8.0.1c-unwind.patch b/app-emulation/wine-proton/files/wine-proton-8.0.1c-unwind.patch new file mode 100644 index 000000000000..50fc5be57abc --- /dev/null +++ b/app-emulation/wine-proton/files/wine-proton-8.0.1c-unwind.patch @@ -0,0 +1,36 @@ +Fix build with llvm-libunwind, and also fix for non-llvm libunwind +when using clang+bfd given clang doesn't have _Unwind_Find_FDE in +its rtlib and expects it from llvm-libunwind. + +The _CONFIG_H_ check is for <llvm-libunwind-15 (adds _VERSION). +--- a/dlls/ntdll/unix/dwarf.h ++++ b/dlls/ntdll/unix/dwarf.h +@@ -257,5 +257,7 @@ + }; + ++#if defined(_LIBUNWIND_VERSION) || defined(____LIBUNWIND_CONFIG_H__) || !defined(__clang__) + extern const struct dwarf_fde *_Unwind_Find_FDE (void *, struct dwarf_eh_bases *); ++#endif + + static unsigned char dwarf_get_u1( const unsigned char **p ) +--- a/dlls/ntdll/unix/signal_x86_64.c ++++ b/dlls/ntdll/unix/signal_x86_64.c +@@ -648,5 +648,5 @@ + int rc; + +-#ifdef __APPLE__ ++#if defined(__APPLE__) || defined(_LIBUNWIND_VERSION) || defined(____LIBUNWIND_CONFIG_H__) + rc = unw_getcontext( &unw_context ); + if (rc == UNW_ESUCCESS) +@@ -774,4 +774,5 @@ + CONTEXT *context = params->context; + struct dwarf_eh_bases bases; ++#if defined(_LIBUNWIND_VERSION) || defined(____LIBUNWIND_CONFIG_H__) || !defined(__clang__) + const struct dwarf_fde *fde = _Unwind_Find_FDE( (void *)(context->Rip - 1), &bases ); + +@@ -779,4 +780,5 @@ + return dwarf_virtual_unwind( context->Rip, &dispatch->EstablisherFrame, context, fde, + &bases, &dispatch->LanguageHandler, &dispatch->HandlerData ); ++#endif + #ifdef HAVE_LIBUNWIND + return libunwind_virtual_unwind( context->Rip, &dispatch->EstablisherFrame, context, |