commit: ca693d932413f76f8769cf6f65c4d18fc5bc5b25 Author: Ionen Wolkens <ionen <AT> gentoo <DOT> org> AuthorDate: Fri Feb 14 03:40:24 2025 +0000 Commit: Ionen Wolkens <ionen <AT> gentoo <DOT> org> CommitDate: Fri Feb 14 05:27:34 2025 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=ca693d93
app-emulation/wine-*: backport mingw binutils-2.44 compat fix Technically needs a revbump, but this only affects the semi-unsupported USE=crossdev-mingw with ~arch toolchain given mingw64-toolchain is not using binutils-2.44 yet (no plans for a while in case of more issues). Little sense in having typical users rebuild all installed wine(s) esp. given haven't even gotten a downstream bug report yet beyond a mention on IRC. If you are affected (wine will be entirely broken, even winecfg won't start), then please re-emerge wine & update prefixes. May optionally want to consider switching to mingw64-toolchain if want to stick to a tested-with-wine toolchain while at it. Patch seems to work fine as-is for old versions beside offsets. For proton it is unclear if it will be still needed when Valve switches to 10.x given they will likely base it on stable 10.0 rather than >=10.2, albeit a fixed 10.0.1 might exists before then. Keeping it in live ebuild for now. Signed-off-by: Ionen Wolkens <ionen <AT> gentoo.org> .../files/wine-proton-9.0.4-binutils2.44.patch | 105 +++++++++++++++++++++ .../wine-proton/wine-proton-8.0.5c.ebuild | 3 +- app-emulation/wine-proton/wine-proton-9.0.2.ebuild | 3 +- app-emulation/wine-proton/wine-proton-9.0.4.ebuild | 3 +- app-emulation/wine-proton/wine-proton-9999.ebuild | 3 +- .../files/wine-staging-10.0-binutils2.44.patch | 105 +++++++++++++++++++++ .../wine-staging/wine-staging-10.0.ebuild | 1 + .../wine-staging/wine-staging-10.1.ebuild | 1 + app-emulation/wine-staging/wine-staging-9.0.ebuild | 3 +- .../files/wine-vanilla-10.0-binutils2.44.patch | 105 +++++++++++++++++++++ .../wine-vanilla/wine-vanilla-10.0.ebuild | 1 + .../wine-vanilla/wine-vanilla-10.1.ebuild | 1 + .../wine-vanilla/wine-vanilla-8.0.2.ebuild | 3 +- app-emulation/wine-vanilla/wine-vanilla-9.0.ebuild | 3 +- 14 files changed, 333 insertions(+), 7 deletions(-) diff --git a/app-emulation/wine-proton/files/wine-proton-9.0.4-binutils2.44.patch b/app-emulation/wine-proton/files/wine-proton-9.0.4-binutils2.44.patch new file mode 100644 index 000000000000..c0d4ef6f5287 --- /dev/null +++ b/app-emulation/wine-proton/files/wine-proton-9.0.4-binutils2.44.patch @@ -0,0 +1,105 @@ +Note that this is only an issue when using mingw (PE) binutils-2.44, +host (ELF) binutils-2.44 has no impact on this and, before this patch, +using 2.44 could only happen with off-by-default USE=crossdev-mingw. + +https://bugs.winehq.org/show_bug.cgi?id=57819 +https://sourceware.org/PR32675 +https://gitlab.winehq.org/wine/wine/-/merge_requests/7328 +--- a/dlls/ntdll/loader.c ++++ b/dlls/ntdll/loader.c +@@ -4047,5 +4047,5 @@ + NTSTATUS nts; + FARPROC fp; +- DWORD id; ++ INT_PTR id; + + TRACE( "(%p, %p, %p, %p, %p, 0x%08lx)\n", base, desc, dllhook, syshook, addr, flags ); +--- a/tools/winebuild/import.c ++++ b/tools/winebuild/import.c +@@ -1514,4 +1514,14 @@ + } + ++static void output_import_section( int index, int is_delay ) ++{ ++ if (!is_delay) ++ output( "\n\t.section .idata$%d\n", index ); ++ else if (index == 5) ++ output( "\n\t.section .data$didat%d\n", index ); ++ else ++ output( "\n\t.section .rdata$didat%d\n", index ); ++} ++ + /* create a Windows-style import library */ + static void build_windows_import_lib( const char *lib_name, DLLSPEC *spec, struct strarray files ) +@@ -1633,18 +1643,18 @@ + output( "\t.long 0\n" ); /* TimeDateStamp */ + +- output( "\n\t.section .idata$5\n" ); ++ output_import_section( 5, is_delay ); + output( "\t%s 0\n", get_asm_ptr_keyword() ); /* FirstThunk tail */ + output( ".L__wine_import_addrs:\n" ); + +- output( "\n\t.section .idata$4\n" ); ++ output_import_section( 4, is_delay ); + output( "\t%s 0\n", get_asm_ptr_keyword() ); /* OriginalFirstThunk tail */ + output( ".L__wine_import_names:\n" ); + + /* required to avoid internal linker errors with some binutils versions */ +- output( "\n\t.section .idata$2\n" ); ++ output_import_section( 2, is_delay ); + } + else + { +- output( "\n\t.section .idata$2\n" ); ++ output_import_section( 2, is_delay ); + output( "%s\n", asm_globl( import_desc ) ); + output_rva( ".L__wine_import_names" ); /* OriginalFirstThunk */ +@@ -1654,8 +1664,8 @@ + output_rva( ".L__wine_import_addrs" ); /* FirstThunk */ + +- output( "\n\t.section .idata$4\n" ); ++ output_import_section( 4, is_delay ); + output( ".L__wine_import_names:\n" ); /* OriginalFirstThunk head */ + +- output( "\n\t.section .idata$5\n" ); ++ output_import_section( 5, is_delay ); + output( ".L__wine_import_addrs:\n" ); /* FirstThunk head */ + } +@@ -1668,9 +1678,9 @@ + new_output_as_file(); + +- output( "\n\t.section .idata$4\n" ); ++ output_import_section( 4, is_delay ); + output( "\t%s 0\n", get_asm_ptr_keyword() ); /* OriginalFirstThunk tail */ +- output( "\n\t.section .idata$5\n" ); ++ output_import_section( 5, is_delay ); + output( "\t%s 0\n", get_asm_ptr_keyword() ); /* FirstThunk tail */ +- output( "\n\t.section .idata$7\n" ); ++ output_import_section( 7, is_delay ); + output( "%s\n", asm_globl( import_name ) ); + output( "\t%s \"%s\"\n", get_asm_string_keyword(), spec->file_name ); +@@ -1763,8 +1773,8 @@ + } + +- output( "\n\t.section .idata$4\n" ); ++ output_import_section( 4, is_delay ); + output_thunk_rva( by_name ? -1 : odp->ordinal, ".L__wine_import_name" ); + +- output( "\n\t.section .idata$5\n" ); ++ output_import_section( 5, is_delay ); + output( "%s\n", asm_globl( imp_name ) ); + if (is_delay) +@@ -1775,5 +1785,5 @@ + if (by_name) + { +- output( "\n\t.section .idata$6\n" ); ++ output_import_section( 6, is_delay ); + output( ".L__wine_import_name:\n" ); + output( "\t.short %d\n", odp->hint ); +@@ -1782,5 +1792,5 @@ + + /* reference head object to always pull its sections */ +- output( "\n\t.section .idata$7\n" ); ++ output_import_section( 7, is_delay ); + output_rva( "%s", asm_name( import_desc ) ); + diff --git a/app-emulation/wine-proton/wine-proton-8.0.5c.ebuild b/app-emulation/wine-proton/wine-proton-8.0.5c.ebuild index ca291e4a2bfa..c5e848376068 100644 --- a/app-emulation/wine-proton/wine-proton-8.0.5c.ebuild +++ b/app-emulation/wine-proton/wine-proton-8.0.5c.ebuild @@ -1,4 +1,4 @@ -# Copyright 2022-2024 Gentoo Authors +# Copyright 2022-2025 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=8 @@ -127,6 +127,7 @@ PATCHES=( "${FILESDIR}"/${PN}-8.0.1c-unwind.patch "${FILESDIR}"/${PN}-8.0.4-restore-menubuilder.patch "${FILESDIR}"/${PN}-8.0.5c-vulkan-libm.patch + "${FILESDIR}"/${PN}-9.0.4-binutils2.44.patch ) pkg_pretend() { diff --git a/app-emulation/wine-proton/wine-proton-9.0.2.ebuild b/app-emulation/wine-proton/wine-proton-9.0.2.ebuild index 21ce4922b7c7..4315a6ab2158 100644 --- a/app-emulation/wine-proton/wine-proton-9.0.2.ebuild +++ b/app-emulation/wine-proton/wine-proton-9.0.2.ebuild @@ -1,4 +1,4 @@ -# Copyright 2022-2024 Gentoo Authors +# Copyright 2022-2025 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=8 @@ -138,6 +138,7 @@ PATCHES=( "${FILESDIR}"/${PN}-8.0.4-restore-menubuilder.patch "${FILESDIR}"/${PN}-8.0.5c-vulkan-libm.patch "${FILESDIR}"/${PN}-9.0-rpath.patch + "${FILESDIR}"/${PN}-9.0.4-binutils2.44.patch ) pkg_pretend() { diff --git a/app-emulation/wine-proton/wine-proton-9.0.4.ebuild b/app-emulation/wine-proton/wine-proton-9.0.4.ebuild index 1755a53c0c96..3b56b56302d6 100644 --- a/app-emulation/wine-proton/wine-proton-9.0.4.ebuild +++ b/app-emulation/wine-proton/wine-proton-9.0.4.ebuild @@ -1,4 +1,4 @@ -# Copyright 2022-2024 Gentoo Authors +# Copyright 2022-2025 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=8 @@ -138,6 +138,7 @@ PATCHES=( "${FILESDIR}"/${PN}-8.0.4-restore-menubuilder.patch "${FILESDIR}"/${PN}-8.0.5c-vulkan-libm.patch "${FILESDIR}"/${PN}-9.0-rpath.patch + "${FILESDIR}"/${PN}-9.0.4-binutils2.44.patch ) pkg_pretend() { diff --git a/app-emulation/wine-proton/wine-proton-9999.ebuild b/app-emulation/wine-proton/wine-proton-9999.ebuild index 4319a3a8efc7..64c99557d831 100644 --- a/app-emulation/wine-proton/wine-proton-9999.ebuild +++ b/app-emulation/wine-proton/wine-proton-9999.ebuild @@ -1,4 +1,4 @@ -# Copyright 2022-2024 Gentoo Authors +# Copyright 2022-2025 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=8 @@ -138,6 +138,7 @@ PATCHES=( "${FILESDIR}"/${PN}-8.0.4-restore-menubuilder.patch "${FILESDIR}"/${PN}-8.0.5c-vulkan-libm.patch "${FILESDIR}"/${PN}-9.0-rpath.patch + "${FILESDIR}"/${PN}-9.0.4-binutils2.44.patch ) pkg_pretend() { diff --git a/app-emulation/wine-staging/files/wine-staging-10.0-binutils2.44.patch b/app-emulation/wine-staging/files/wine-staging-10.0-binutils2.44.patch new file mode 100644 index 000000000000..4b20dbf1344d --- /dev/null +++ b/app-emulation/wine-staging/files/wine-staging-10.0-binutils2.44.patch @@ -0,0 +1,105 @@ +Note that this is only an issue when using mingw (PE) binutils-2.44, +host (ELF) binutils-2.44 has no impact on this and, before this patch, +using 2.44 could only happen with off-by-default USE=crossdev-mingw. + +https://bugs.winehq.org/show_bug.cgi?id=57819 +https://sourceware.org/PR32675 +https://gitlab.winehq.org/wine/wine/-/merge_requests/7328 +--- a/dlls/ntdll/loader.c ++++ b/dlls/ntdll/loader.c +@@ -3848,5 +3848,5 @@ + NTSTATUS nts; + FARPROC fp; +- DWORD id; ++ INT_PTR id; + + TRACE( "(%p, %p, %p, %p, %p, 0x%08lx)\n", base, desc, dllhook, syshook, addr, flags ); +--- a/tools/winebuild/import.c ++++ b/tools/winebuild/import.c +@@ -1332,4 +1332,14 @@ + } + ++static void output_import_section( int index, int is_delay ) ++{ ++ if (!is_delay) ++ output( "\n\t.section .idata$%d\n", index ); ++ else if (index == 5) ++ output( "\n\t.section .data$didat%d\n", index ); ++ else ++ output( "\n\t.section .rdata$didat%d\n", index ); ++} ++ + /* create a Windows-style import library */ + static void build_windows_import_lib( const char *lib_name, DLLSPEC *spec, struct strarray files ) +@@ -1455,18 +1465,18 @@ + output( "\t.long 0\n" ); /* TimeDateStamp */ + +- output( "\n\t.section .idata$5\n" ); ++ output_import_section( 5, is_delay ); + output( "\t%s 0\n", get_asm_ptr_keyword() ); /* FirstThunk tail */ + output( ".L__wine_import_addrs:\n" ); + +- output( "\n\t.section .idata$4\n" ); ++ output_import_section( 4, is_delay ); + output( "\t%s 0\n", get_asm_ptr_keyword() ); /* OriginalFirstThunk tail */ + output( ".L__wine_import_names:\n" ); + + /* required to avoid internal linker errors with some binutils versions */ +- output( "\n\t.section .idata$2\n" ); ++ output_import_section( 2, is_delay ); + } + else + { +- output( "\n\t.section .idata$2\n" ); ++ output_import_section( 2, is_delay ); + output( "%s\n", asm_globl( import_desc ) ); + output_rva( ".L__wine_import_names" ); /* OriginalFirstThunk */ +@@ -1476,8 +1486,8 @@ + output_rva( ".L__wine_import_addrs" ); /* FirstThunk */ + +- output( "\n\t.section .idata$4\n" ); ++ output_import_section( 4, is_delay ); + output( ".L__wine_import_names:\n" ); /* OriginalFirstThunk head */ + +- output( "\n\t.section .idata$5\n" ); ++ output_import_section( 5, is_delay ); + output( ".L__wine_import_addrs:\n" ); /* FirstThunk head */ + } +@@ -1490,9 +1500,9 @@ + new_output_as_file(); + +- output( "\n\t.section .idata$4\n" ); ++ output_import_section( 4, is_delay ); + output( "\t%s 0\n", get_asm_ptr_keyword() ); /* OriginalFirstThunk tail */ +- output( "\n\t.section .idata$5\n" ); ++ output_import_section( 5, is_delay ); + output( "\t%s 0\n", get_asm_ptr_keyword() ); /* FirstThunk tail */ +- output( "\n\t.section .idata$7\n" ); ++ output_import_section( 7, is_delay ); + output( "%s\n", asm_globl( import_name ) ); + output( "\t%s \"%s\"\n", get_asm_string_keyword(), spec->file_name ); +@@ -1585,8 +1595,8 @@ + } + +- output( "\n\t.section .idata$4\n" ); ++ output_import_section( 4, is_delay ); + output_thunk_rva( by_name ? -1 : odp->ordinal, ".L__wine_import_name" ); + +- output( "\n\t.section .idata$5\n" ); ++ output_import_section( 5, is_delay ); + output( "%s\n", asm_globl( imp_name ) ); + if (is_delay) +@@ -1597,5 +1607,5 @@ + if (by_name) + { +- output( "\n\t.section .idata$6\n" ); ++ output_import_section( 6, is_delay ); + output( ".L__wine_import_name:\n" ); + output( "\t.short %d\n", odp->hint ); +@@ -1604,5 +1614,5 @@ + + /* reference head object to always pull its sections */ +- output( "\n\t.section .idata$7\n" ); ++ output_import_section( 7, is_delay ); + output_rva( "%s", asm_name( import_desc ) ); + diff --git a/app-emulation/wine-staging/wine-staging-10.0.ebuild b/app-emulation/wine-staging/wine-staging-10.0.ebuild index 18b40a459062..517e06a88c97 100644 --- a/app-emulation/wine-staging/wine-staging-10.0.ebuild +++ b/app-emulation/wine-staging/wine-staging-10.0.ebuild @@ -173,6 +173,7 @@ PATCHES=( "${FILESDIR}"/${PN}-7.17-noexecstack.patch "${FILESDIR}"/${PN}-7.20-unwind.patch "${FILESDIR}"/${PN}-8.13-rpath.patch + "${FILESDIR}"/${PN}-10.0-binutils2.44.patch ) pkg_pretend() { diff --git a/app-emulation/wine-staging/wine-staging-10.1.ebuild b/app-emulation/wine-staging/wine-staging-10.1.ebuild index 18b40a459062..517e06a88c97 100644 --- a/app-emulation/wine-staging/wine-staging-10.1.ebuild +++ b/app-emulation/wine-staging/wine-staging-10.1.ebuild @@ -173,6 +173,7 @@ PATCHES=( "${FILESDIR}"/${PN}-7.17-noexecstack.patch "${FILESDIR}"/${PN}-7.20-unwind.patch "${FILESDIR}"/${PN}-8.13-rpath.patch + "${FILESDIR}"/${PN}-10.0-binutils2.44.patch ) pkg_pretend() { diff --git a/app-emulation/wine-staging/wine-staging-9.0.ebuild b/app-emulation/wine-staging/wine-staging-9.0.ebuild index 7bd88b9de330..fc7dfd731bbc 100644 --- a/app-emulation/wine-staging/wine-staging-9.0.ebuild +++ b/app-emulation/wine-staging/wine-staging-9.0.ebuild @@ -1,4 +1,4 @@ -# Copyright 2022-2024 Gentoo Authors +# Copyright 2022-2025 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=8 @@ -177,6 +177,7 @@ PATCHES=( "${FILESDIR}"/${PN}-7.17-noexecstack.patch "${FILESDIR}"/${PN}-7.20-unwind.patch "${FILESDIR}"/${PN}-8.13-rpath.patch + "${FILESDIR}"/${PN}-10.0-binutils2.44.patch ) pkg_pretend() { diff --git a/app-emulation/wine-vanilla/files/wine-vanilla-10.0-binutils2.44.patch b/app-emulation/wine-vanilla/files/wine-vanilla-10.0-binutils2.44.patch new file mode 100644 index 000000000000..d7e30393569e --- /dev/null +++ b/app-emulation/wine-vanilla/files/wine-vanilla-10.0-binutils2.44.patch @@ -0,0 +1,105 @@ +Note that this is only an issue when using mingw (PE) binutils-2.44, +host (ELF) binutils-2.44 has no impact on this and, before this patch, +using 2.44 could only happen with off-by-default USE=crossdev-mingw. + +https://bugs.winehq.org/show_bug.cgi?id=57819 +https://sourceware.org/PR32675 +https://gitlab.winehq.org/wine/wine/-/merge_requests/7328 +--- a/dlls/ntdll/loader.c ++++ b/dlls/ntdll/loader.c +@@ -3750,5 +3750,5 @@ + NTSTATUS nts; + FARPROC fp; +- DWORD id; ++ INT_PTR id; + + TRACE( "(%p, %p, %p, %p, %p, 0x%08lx)\n", base, desc, dllhook, syshook, addr, flags ); +--- a/tools/winebuild/import.c ++++ b/tools/winebuild/import.c +@@ -1332,4 +1332,14 @@ + } + ++static void output_import_section( int index, int is_delay ) ++{ ++ if (!is_delay) ++ output( "\n\t.section .idata$%d\n", index ); ++ else if (index == 5) ++ output( "\n\t.section .data$didat%d\n", index ); ++ else ++ output( "\n\t.section .rdata$didat%d\n", index ); ++} ++ + /* create a Windows-style import library */ + static void build_windows_import_lib( const char *lib_name, DLLSPEC *spec, struct strarray files ) +@@ -1455,18 +1465,18 @@ + output( "\t.long 0\n" ); /* TimeDateStamp */ + +- output( "\n\t.section .idata$5\n" ); ++ output_import_section( 5, is_delay ); + output( "\t%s 0\n", get_asm_ptr_keyword() ); /* FirstThunk tail */ + output( ".L__wine_import_addrs:\n" ); + +- output( "\n\t.section .idata$4\n" ); ++ output_import_section( 4, is_delay ); + output( "\t%s 0\n", get_asm_ptr_keyword() ); /* OriginalFirstThunk tail */ + output( ".L__wine_import_names:\n" ); + + /* required to avoid internal linker errors with some binutils versions */ +- output( "\n\t.section .idata$2\n" ); ++ output_import_section( 2, is_delay ); + } + else + { +- output( "\n\t.section .idata$2\n" ); ++ output_import_section( 2, is_delay ); + output( "%s\n", asm_globl( import_desc ) ); + output_rva( ".L__wine_import_names" ); /* OriginalFirstThunk */ +@@ -1476,8 +1486,8 @@ + output_rva( ".L__wine_import_addrs" ); /* FirstThunk */ + +- output( "\n\t.section .idata$4\n" ); ++ output_import_section( 4, is_delay ); + output( ".L__wine_import_names:\n" ); /* OriginalFirstThunk head */ + +- output( "\n\t.section .idata$5\n" ); ++ output_import_section( 5, is_delay ); + output( ".L__wine_import_addrs:\n" ); /* FirstThunk head */ + } +@@ -1490,9 +1500,9 @@ + new_output_as_file(); + +- output( "\n\t.section .idata$4\n" ); ++ output_import_section( 4, is_delay ); + output( "\t%s 0\n", get_asm_ptr_keyword() ); /* OriginalFirstThunk tail */ +- output( "\n\t.section .idata$5\n" ); ++ output_import_section( 5, is_delay ); + output( "\t%s 0\n", get_asm_ptr_keyword() ); /* FirstThunk tail */ +- output( "\n\t.section .idata$7\n" ); ++ output_import_section( 7, is_delay ); + output( "%s\n", asm_globl( import_name ) ); + output( "\t%s \"%s\"\n", get_asm_string_keyword(), spec->file_name ); +@@ -1585,8 +1595,8 @@ + } + +- output( "\n\t.section .idata$4\n" ); ++ output_import_section( 4, is_delay ); + output_thunk_rva( by_name ? -1 : odp->ordinal, ".L__wine_import_name" ); + +- output( "\n\t.section .idata$5\n" ); ++ output_import_section( 5, is_delay ); + output( "%s\n", asm_globl( imp_name ) ); + if (is_delay) +@@ -1597,5 +1607,5 @@ + if (by_name) + { +- output( "\n\t.section .idata$6\n" ); ++ output_import_section( 6, is_delay ); + output( ".L__wine_import_name:\n" ); + output( "\t.short %d\n", odp->hint ); +@@ -1604,5 +1614,5 @@ + + /* reference head object to always pull its sections */ +- output( "\n\t.section .idata$7\n" ); ++ output_import_section( 7, is_delay ); + output_rva( "%s", asm_name( import_desc ) ); + diff --git a/app-emulation/wine-vanilla/wine-vanilla-10.0.ebuild b/app-emulation/wine-vanilla/wine-vanilla-10.0.ebuild index 9e662b350f3e..d912312e42aa 100644 --- a/app-emulation/wine-vanilla/wine-vanilla-10.0.ebuild +++ b/app-emulation/wine-vanilla/wine-vanilla-10.0.ebuild @@ -163,6 +163,7 @@ PATCHES=( "${FILESDIR}"/${PN}-7.0-noexecstack.patch "${FILESDIR}"/${PN}-7.20-unwind.patch "${FILESDIR}"/${PN}-8.13-rpath.patch + "${FILESDIR}"/${PN}-10.0-binutils2.44.patch ) pkg_pretend() { diff --git a/app-emulation/wine-vanilla/wine-vanilla-10.1.ebuild b/app-emulation/wine-vanilla/wine-vanilla-10.1.ebuild index 7ad0553e1237..0a51b2565e22 100644 --- a/app-emulation/wine-vanilla/wine-vanilla-10.1.ebuild +++ b/app-emulation/wine-vanilla/wine-vanilla-10.1.ebuild @@ -163,6 +163,7 @@ PATCHES=( "${FILESDIR}"/${PN}-7.0-noexecstack.patch "${FILESDIR}"/${PN}-7.20-unwind.patch "${FILESDIR}"/${PN}-8.13-rpath.patch + "${FILESDIR}"/${PN}-10.0-binutils2.44.patch ) pkg_pretend() { diff --git a/app-emulation/wine-vanilla/wine-vanilla-8.0.2.ebuild b/app-emulation/wine-vanilla/wine-vanilla-8.0.2.ebuild index 95f7ef5d7382..1a8afb08db8d 100644 --- a/app-emulation/wine-vanilla/wine-vanilla-8.0.2.ebuild +++ b/app-emulation/wine-vanilla/wine-vanilla-8.0.2.ebuild @@ -1,4 +1,4 @@ -# Copyright 2022-2024 Gentoo Authors +# Copyright 2022-2025 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=8 @@ -144,6 +144,7 @@ QA_TEXTRELS="usr/lib/*/wine/i386-unix/*.so" # uses -fno-PIC -Wl,-z,notext PATCHES=( "${FILESDIR}"/${PN}-7.0-noexecstack.patch "${FILESDIR}"/${PN}-7.20-unwind.patch + "${FILESDIR}"/${PN}-10.0-binutils2.44.patch ) pkg_pretend() { diff --git a/app-emulation/wine-vanilla/wine-vanilla-9.0.ebuild b/app-emulation/wine-vanilla/wine-vanilla-9.0.ebuild index 0ee385cb279a..300262a71242 100644 --- a/app-emulation/wine-vanilla/wine-vanilla-9.0.ebuild +++ b/app-emulation/wine-vanilla/wine-vanilla-9.0.ebuild @@ -1,4 +1,4 @@ -# Copyright 2022-2024 Gentoo Authors +# Copyright 2022-2025 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=8 @@ -161,6 +161,7 @@ PATCHES=( "${FILESDIR}"/${PN}-7.0-noexecstack.patch "${FILESDIR}"/${PN}-7.20-unwind.patch "${FILESDIR}"/${PN}-8.13-rpath.patch + "${FILESDIR}"/${PN}-10.0-binutils2.44.patch ) pkg_pretend() {
