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 36A97158064 for ; Tue, 7 May 2024 10:01:34 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 7DB35E2B7D; Tue, 7 May 2024 10:01:33 +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) server-digest SHA256) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id 5C8F4E2B7A for ; Tue, 7 May 2024 10:01:33 +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) server-digest SHA256) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id 7A77D343153 for ; Tue, 7 May 2024 10:01:32 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id B837D19F4 for ; Tue, 7 May 2024 10:01:30 +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: <1715075115.be7b8b731fca352feb69499b08fa3918bcb71309.ionen@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: app-emulation/wine-vanilla/files/, app-emulation/wine-vanilla/ X-VCS-Repository: repo/gentoo X-VCS-Files: app-emulation/wine-vanilla/files/wine-vanilla-9.8-musl-ioctls-header.patch app-emulation/wine-vanilla/wine-vanilla-9.8.ebuild X-VCS-Directories: app-emulation/wine-vanilla/files/ app-emulation/wine-vanilla/ X-VCS-Committer: ionen X-VCS-Committer-Name: Ionen Wolkens X-VCS-Revision: be7b8b731fca352feb69499b08fa3918bcb71309 X-VCS-Branch: master Date: Tue, 7 May 2024 10:01:30 +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: 58ff8eeb-87b0-44cd-9fe4-60780728c9d2 X-Archives-Hash: bfdcf2fe3b463f7ff6a9c57dbf757f55 commit: be7b8b731fca352feb69499b08fa3918bcb71309 Author: Ionen Wolkens gentoo org> AuthorDate: Tue May 7 09:44:31 2024 +0000 Commit: Ionen Wolkens gentoo org> CommitDate: Tue May 7 09:45:15 2024 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=be7b8b73 app-emulation/wine-vanilla: fix build with musl Closes: https://bugs.gentoo.org/931341 Signed-off-by: Ionen Wolkens gentoo.org> .../wine-vanilla-9.8-musl-ioctls-header.patch | 30 ++++++++++++++++++++++ app-emulation/wine-vanilla/wine-vanilla-9.8.ebuild | 1 + 2 files changed, 31 insertions(+) diff --git a/app-emulation/wine-vanilla/files/wine-vanilla-9.8-musl-ioctls-header.patch b/app-emulation/wine-vanilla/files/wine-vanilla-9.8-musl-ioctls-header.patch new file mode 100644 index 000000000000..7aa1a4c00587 --- /dev/null +++ b/app-emulation/wine-vanilla/files/wine-vanilla-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 +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 +--- a/dlls/ntdll/unix/serial.c ++++ b/dlls/ntdll/unix/serial.c +@@ -33,6 +33,7 @@ + #include + #ifdef HAVE_ASM_TERMBITS_H + # include ++# include + #else + # include + #endif +-- +GitLab + diff --git a/app-emulation/wine-vanilla/wine-vanilla-9.8.ebuild b/app-emulation/wine-vanilla/wine-vanilla-9.8.ebuild index 13bbfdc159ea..7a5546bbfd70 100644 --- a/app-emulation/wine-vanilla/wine-vanilla-9.8.ebuild +++ b/app-emulation/wine-vanilla/wine-vanilla-9.8.ebuild @@ -161,6 +161,7 @@ PATCHES=( "${FILESDIR}"/${PN}-7.0-noexecstack.patch "${FILESDIR}"/${PN}-7.20-unwind.patch "${FILESDIR}"/${PN}-8.13-rpath.patch + "${FILESDIR}"/${P}-musl-ioctls-header.patch ) pkg_pretend() {