commit: 6b909fb4e2273e7f27e04c44a85e34fd36ea3393
Author: Ionen Wolkens <ionen <AT> gentoo <DOT> org>
AuthorDate: Wed Apr 30 03:27:23 2025 +0000
Commit: Ionen Wolkens <ionen <AT> gentoo <DOT> 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 <ionen <AT> 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