From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from smtp.gentoo.org (woodpecker.gentoo.org [140.211.166.183]) (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 finch.gentoo.org (Postfix) with ESMTPS id 8FC4F1584AD for ; Wed, 30 Apr 2025 03:37:47 +0000 (UTC) Received: from lists.gentoo.org (bobolink.gentoo.org [140.211.166.189]) (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) (Authenticated sender: relay-lists.gentoo.org@gentoo.org) by smtp.gentoo.org (Postfix) with ESMTPSA id 7A88E342FDF for ; Wed, 30 Apr 2025 03:37:47 +0000 (UTC) Received: from bobolink.gentoo.org (localhost [127.0.0.1]) by bobolink.gentoo.org (Postfix) with ESMTP id 6ED4B110328; Wed, 30 Apr 2025 03:37:46 +0000 (UTC) Received: from smtp.gentoo.org (woodpecker.gentoo.org [140.211.166.183]) (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 bobolink.gentoo.org (Postfix) with ESMTPS id 61154110328 for ; Wed, 30 Apr 2025 03:37:46 +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 0A234342FDF for ; Wed, 30 Apr 2025 03:37:46 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 5DA96C3A for ; Wed, 30 Apr 2025 03:37:44 +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: <1745983741.6b909fb4e2273e7f27e04c44a85e34fd36ea3393.ionen@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: app-emulation/wine-proton/ X-VCS-Repository: repo/gentoo X-VCS-Files: app-emulation/wine-proton/wine-proton-10.0.1b.ebuild app-emulation/wine-proton/wine-proton-9.0.4-r2.ebuild app-emulation/wine-proton/wine-proton-9999.ebuild X-VCS-Directories: app-emulation/wine-proton/ X-VCS-Committer: ionen X-VCS-Committer-Name: Ionen Wolkens X-VCS-Revision: 6b909fb4e2273e7f27e04c44a85e34fd36ea3393 X-VCS-Branch: master Date: Wed, 30 Apr 2025 03:37:44 +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: 879ee21f-5859-4aff-8499-8b2fe2a76913 X-Archives-Hash: 301b09a35ea8b4e0ac3caf1a0ca49cca commit: 6b909fb4e2273e7f27e04c44a85e34fd36ea3393 Author: Ionen Wolkens gentoo org> AuthorDate: Wed Apr 30 03:27:23 2025 +0000 Commit: Ionen Wolkens gentoo org> CommitDate: Wed Apr 30 03:29:01 2025 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=6b909fb4 app-emulation/wine-proton: fix wine --version missing proton ...with wine.eclass. The sed was being ran after eautoreconf was run and thus never used. Purely informational so not going to revbump. Do not really like doing seds before patches are applied though, but this one should be fairly harmless. Signed-off-by: Ionen Wolkens gentoo.org> app-emulation/wine-proton/wine-proton-10.0.1b.ebuild | 6 +++--- app-emulation/wine-proton/wine-proton-9.0.4-r2.ebuild | 6 +++--- app-emulation/wine-proton/wine-proton-9999.ebuild | 3 +++ 3 files changed, 9 insertions(+), 6 deletions(-) diff --git a/app-emulation/wine-proton/wine-proton-10.0.1b.ebuild b/app-emulation/wine-proton/wine-proton-10.0.1b.ebuild index 99f3e85107f0..2a45acabcb62 100644 --- a/app-emulation/wine-proton/wine-proton-10.0.1b.ebuild +++ b/app-emulation/wine-proton/wine-proton-10.0.1b.ebuild @@ -138,6 +138,9 @@ PATCHES=( ) src_prepare() { + # similarly to staging, append to `wine --version` for identification + sed -i "s/wine_build[^1]*1/& (Proton-${WINE_PV})/" configure.ac || die + wine_src_prepare # this is kind-of best effort and ignores llvm slots, ideally @@ -150,9 +153,6 @@ src_prepare() { -i dlls/{ntdll,winevulkan}/Makefile.in || die fi - # similarly to staging, append to `wine --version` for identification - sed -i "s/wine_build[^1]*1/& (Proton-${WINE_PV})/" configure.ac || die - # proton variant also needs specfiles and vulkan tools/make_specfiles || die # perl dlls/winevulkan/make_vulkan -X video.xml -x vk.xml || die # python diff --git a/app-emulation/wine-proton/wine-proton-9.0.4-r2.ebuild b/app-emulation/wine-proton/wine-proton-9.0.4-r2.ebuild index 348806a7ad36..b00295ba0e43 100644 --- a/app-emulation/wine-proton/wine-proton-9.0.4-r2.ebuild +++ b/app-emulation/wine-proton/wine-proton-9.0.4-r2.ebuild @@ -127,6 +127,9 @@ PATCHES=( ) src_prepare() { + # similarly to staging, append to `wine --version` for identification + sed -i "s/wine_build[^1]*1/& (Proton-${WINE_PV})/" configure.ac || die + wine_src_prepare # this is kind-of best effort and ignores llvm slots, ideally @@ -139,9 +142,6 @@ src_prepare() { -i dlls/{ntdll,winevulkan}/Makefile.in || die fi - # similarly to staging, append to `wine --version` for identification - sed -i "s/wine_build[^1]*1/& (Proton-${WINE_PV})/" configure.ac || die - # proton variant also needs specfiles and vulkan tools/make_specfiles || die # perl dlls/winevulkan/make_vulkan -x vk.xml || die # python diff --git a/app-emulation/wine-proton/wine-proton-9999.ebuild b/app-emulation/wine-proton/wine-proton-9999.ebuild index 26d64e28a5c4..bf2fba43c22d 100644 --- a/app-emulation/wine-proton/wine-proton-9999.ebuild +++ b/app-emulation/wine-proton/wine-proton-9999.ebuild @@ -138,6 +138,9 @@ PATCHES=( ) src_prepare() { + # similarly to staging, append to `wine --version` for identification + sed -i "s/wine_build[^1]*1/& (Proton-${WINE_PV})/" configure.ac || die + wine_src_prepare # this is kind-of best effort and ignores llvm slots, ideally