diff options
Diffstat (limited to 'app-emulation/wine-staging/files')
5 files changed, 88 insertions, 13 deletions
diff --git a/app-emulation/wine-staging/files/wine-staging-6.12-winegcc-equals-args.patch b/app-emulation/wine-staging/files/wine-staging-6.12-winegcc-equals-args.patch deleted file mode 100644 index 562b63af063a..000000000000 --- a/app-emulation/wine-staging/files/wine-staging-6.12-winegcc-equals-args.patch +++ /dev/null @@ -1,13 +0,0 @@ -https://bugs.winehq.org/show_bug.cgi?id=51413 -https://bugs.gentoo.org/800809 ---- a/tools/winegcc/winegcc.c -+++ b/tools/winegcc/winegcc.c -@@ -1982,7 +1982,7 @@ int main(int argc, char **argv) - if (strncmp("-Wl,", opts.args->base[i], 4) == 0) - { - unsigned int j; -- strarray* Wl = strarray_fromstring(opts.args->base[i] + 4, ",="); -+ strarray* Wl = strarray_fromstring(opts.args->base[i] + 4, ","); - for (j = 0; j < Wl->size; j++) - { - if (!strcmp(Wl->base[j], "--image-base") && j < Wl->size - 1) diff --git a/app-emulation/wine-staging/files/wine-staging-7.17-noexecstack.patch b/app-emulation/wine-staging/files/wine-staging-7.17-noexecstack.patch new file mode 100644 index 000000000000..4baa48cfc140 --- /dev/null +++ b/app-emulation/wine-staging/files/wine-staging-7.17-noexecstack.patch @@ -0,0 +1,7 @@ +Also write GNU-stack note on dummy files used for stub libraries. +--- a/tools/winebuild/import.c ++++ b/tools/winebuild/import.c +@@ -1676,2 +1676,3 @@ + output( "\t.text\n" ); ++ output_gnu_stack_note(); + } diff --git a/app-emulation/wine-staging/files/wine-staging-7.20-unwind.patch b/app-emulation/wine-staging/files/wine-staging-7.20-unwind.patch new file mode 100644 index 000000000000..f130ef5c23b3 --- /dev/null +++ b/app-emulation/wine-staging/files/wine-staging-7.20-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 +@@ -255,5 +255,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 +@@ -632,5 +632,5 @@ + int rc; + +-#ifdef __APPLE__ ++#if defined(__APPLE__) || defined(_LIBUNWIND_VERSION) || defined(____LIBUNWIND_CONFIG_H__) + rc = unw_getcontext( &unw_context ); + if (rc == UNW_ESUCCESS) +@@ -755,4 +755,5 @@ + { + 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 ); + +@@ -760,4 +761,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, diff --git a/app-emulation/wine-staging/files/wine-staging-8.13-rpath.patch b/app-emulation/wine-staging/files/wine-staging-8.13-rpath.patch new file mode 100644 index 000000000000..5f0d63b0ec33 --- /dev/null +++ b/app-emulation/wine-staging/files/wine-staging-8.13-rpath.patch @@ -0,0 +1,15 @@ +Patch Source: https://gitlab.alpinelinux.org/alpine/aports/-/blob/master/community/wine/rpath.patch +Alpine Bug: https://gitlab.alpinelinux.org/alpine/aports/-/issues/13249 + +--- a/configure.ac ++++ b/configure.ac +@@ -784,6 +784,9 @@ case $host_os in + [WINELOADER_LDFLAGS="$WINELOADER_LDFLAGS -Wl,-z,max-page-size=0x1000"]) + ;; + esac ++ ++ # do this at the end because it needs double dollar for makefile ++ WINE_TRY_CFLAGS([-Wl,-rpath,\\\$ORIGIN],[UNIXLDFLAGS="$UNIXLDFLAGS '-Wl,-rpath,\$\$ORIGIN'"]) + ;; + esac + diff --git a/app-emulation/wine-staging/files/wine-staging-9.8-musl-ioctls-header.patch b/app-emulation/wine-staging/files/wine-staging-9.8-musl-ioctls-header.patch new file mode 100644 index 000000000000..7aa1a4c00587 --- /dev/null +++ b/app-emulation/wine-staging/files/wine-staging-9.8-musl-ioctls-header.patch @@ -0,0 +1,30 @@ +https://bugs.gentoo.org/931341 +https://gitlab.winehq.org/wine/wine/-/commit/24ca848c568d5a2786abd26f2e7314b2e3f509f3 +From: Fotios Valasiadis <fvalasiad@gmail.com> +Date: Sun, 5 May 2024 03:34:57 +0300 +Subject: [PATCH] ntdll/unix: Fix building on musl by explicitly including + asm/ioctls.h. + +After commit 898ab8dab19d498c17859f39a55e317ee7e367a5 wine would no longer +build on musl. + +Issue is that apparently TCSETS2 isn't defined when including sys/ioctl.h. + +A little digging shows that glibc goes ahead and includes asm/ioctls.h in +sys/ioctl.h, providing said macro. Musl on the other hand doesn't and relies +on bits/ioctl.h, which lacks said macro. + +Signed-off-by: Fotios Valasiadis <fvalasiad@gmail.com> +--- a/dlls/ntdll/unix/serial.c ++++ b/dlls/ntdll/unix/serial.c +@@ -33,6 +33,7 @@ + #include <stdio.h> + #ifdef HAVE_ASM_TERMBITS_H + # include <asm/termbits.h> ++# include <asm/ioctls.h> + #else + # include <termios.h> + #endif +-- +GitLab + |