From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits)) (No client certificate requested) by finch.gentoo.org (Postfix) with ESMTPS id C4FA615ACFC for ; Tue, 2 May 2023 16:56:44 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id EACA0E0899; Tue, 2 May 2023 16:56:43 +0000 (UTC) Received: from smtp.gentoo.org (woodpecker.gentoo.org [IPv6:2001:470:ea4a:1:5054:ff:fec7:86e4]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id D33C8E089B for ; Tue, 2 May 2023 16:56:43 +0000 (UTC) Received: from oystercatcher.gentoo.org (oystercatcher.gentoo.org [148.251.78.52]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id 11C643411F8 for ; Tue, 2 May 2023 16:56:43 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 8ED8BA40 for ; Tue, 2 May 2023 16:56:41 +0000 (UTC) From: "Ionen Wolkens" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Ionen Wolkens" Message-ID: <1683046577.6e58c4bee50fb1e19375cf3fbf2a80e4db0a052c.ionen@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: app-emulation/wine-proton/files/, app-emulation/wine-proton/ X-VCS-Repository: repo/gentoo X-VCS-Files: app-emulation/wine-proton/files/wine-proton-7.0.6-mingw64-11.0.0.patch app-emulation/wine-proton/wine-proton-7.0.6.ebuild X-VCS-Directories: app-emulation/wine-proton/ app-emulation/wine-proton/files/ X-VCS-Committer: ionen X-VCS-Committer-Name: Ionen Wolkens X-VCS-Revision: 6e58c4bee50fb1e19375cf3fbf2a80e4db0a052c X-VCS-Branch: master Date: Tue, 2 May 2023 16:56:41 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org X-Auto-Response-Suppress: DR, RN, NRN, OOF, AutoReply X-Archives-Salt: 2724b0be-7fb9-4978-9fa1-378873e3b58a X-Archives-Hash: 2ec9dc2da051d7b046821bc34257ae0c commit: 6e58c4bee50fb1e19375cf3fbf2a80e4db0a052c Author: Ionen Wolkens gentoo org> AuthorDate: Tue May 2 15:55:02 2023 +0000 Commit: Ionen Wolkens gentoo org> CommitDate: Tue May 2 16:56:17 2023 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=6e58c4be app-emulation/wine-proton: fix 7.0.6 build with mingw64 11.0.0 Mostly a dirty/quick hack, exact cause leading to this happening with wine-proton-7(32bit) but not 8 nor 7(64bit) haven't been fully dug into. Had tested wine-vanilla-7.0.2 with 11.0.0 and initially thought proton-7 was fine too, but unlike vanilla it defines __fastfail. Signed-off-by: Ionen Wolkens gentoo.org> .../files/wine-proton-7.0.6-mingw64-11.0.0.patch | 20 ++++++++++++++++++++ app-emulation/wine-proton/wine-proton-7.0.6.ebuild | 1 + 2 files changed, 21 insertions(+) diff --git a/app-emulation/wine-proton/files/wine-proton-7.0.6-mingw64-11.0.0.patch b/app-emulation/wine-proton/files/wine-proton-7.0.6-mingw64-11.0.0.patch new file mode 100644 index 000000000000..54ecc49c7235 --- /dev/null +++ b/app-emulation/wine-proton/files/wine-proton-7.0.6-mingw64-11.0.0.patch @@ -0,0 +1,20 @@ +Hack: this does not actually need stdarg.h, but including it ensures +that _mingw.h will be loaded before the rest of Wine's winnt.h avoiding +issues with mingw64-runtime-11.0.0, e.g.: + + _mingw.h:602:60: error: redefinition of ‘__fastfail’ + make[1]: *** [Makefile:5900: dlls/advapi32/crypt_des.cross.o] Error 1 + +(other crypt_*.c happen to include stdarg.h first and don't fail, but this +one does not, same for several other files in dlls/) + +Not an issue with non-proton Wine 7.0 as Wine did not define __fastfail +until ~wine-7.10. Wine 8 does define it but does not seem to be a problem +there (perhaps due to different header layout). A more "right" fix would +be welcome, but given Proton-7 seems EOL it is not judged important. +--- a/include/winnt.h ++++ b/include/winnt.h +@@ -32,2 +32,3 @@ + #include ++#include + #endif diff --git a/app-emulation/wine-proton/wine-proton-7.0.6.ebuild b/app-emulation/wine-proton/wine-proton-7.0.6.ebuild index 2c927df19297..0479380661a8 100644 --- a/app-emulation/wine-proton/wine-proton-7.0.6.ebuild +++ b/app-emulation/wine-proton/wine-proton-7.0.6.ebuild @@ -117,6 +117,7 @@ PATCHES=( "${FILESDIR}"/${PN}-7.0.4-noexecstack.patch "${FILESDIR}"/${PN}-7.0.4-restore-menubuilder.patch "${FILESDIR}"/${PN}-7.0.4-unwind.patch + "${FILESDIR}"/${PN}-7.0.6-mingw64-11.0.0.patch ) pkg_pretend() {