commit: 5af0627f94f7f9088def4f47b9737bddd51e43b4
Author: Ionen Wolkens <ionen <AT> gentoo <DOT> org>
AuthorDate: Fri Jul 22 14:12:41 2022 +0000
Commit: Ionen Wolkens <ionen <AT> gentoo <DOT> org>
CommitDate: Fri Jul 22 14:23:04 2022 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=5af0627f
games-emulation/dolphin: disable qt6 automagic
In advance before Qt6 is in tree, works fine with 6 but don't
want it to be automagic without proper dependency checks.
Was hoping for a non-sed way to handle this but due to the method
used we can't use DISABLE_FIND_PACKAGE and such, maybe there is
some variable that'd work but well. It may make sense to just drop
Qt5 support in a future snapshot given 6 is the upstream preference.
Signed-off-by: Ionen Wolkens <ionen <AT> gentoo.org>
games-emulation/dolphin/dolphin-5.0_p20210506-r3.ebuild | 3 +++
games-emulation/dolphin/dolphin-5.0_p20220520-r1.ebuild | 3 +++
games-emulation/dolphin/dolphin-9999.ebuild | 3 +++
3 files changed, 9 insertions(+)
diff --git a/games-emulation/dolphin/dolphin-5.0_p20210506-r3.ebuild
b/games-emulation/dolphin/dolphin-5.0_p20210506-r3.ebuild
index 33218b7db9b5..6ff4a8dd29b9 100644
--- a/games-emulation/dolphin/dolphin-5.0_p20210506-r3.ebuild
+++ b/games-emulation/dolphin/dolphin-5.0_p20210506-r3.ebuild
@@ -129,6 +129,9 @@ src_prepare() {
# Remove dirty suffix: needed for netplay
sed -i -e 's/--dirty/&=""/' CMakeLists.txt || die
+
+ # Force Qt5 rather than automagic until support is properly handled here
+ sed -i -e '/NAMES Qt6 COMP/d' Source/Core/DolphinQt/CMakeLists.txt ||
die
}
src_configure() {
diff --git a/games-emulation/dolphin/dolphin-5.0_p20220520-r1.ebuild
b/games-emulation/dolphin/dolphin-5.0_p20220520-r1.ebuild
index abcdeec7c45b..5d4b0219d150 100644
--- a/games-emulation/dolphin/dolphin-5.0_p20220520-r1.ebuild
+++ b/games-emulation/dolphin/dolphin-5.0_p20220520-r1.ebuild
@@ -147,6 +147,9 @@ src_prepare() {
# Remove dirty suffix: needed for netplay
sed -i -e 's/--dirty/&=""/' CMakeLists.txt || die
+
+ # Force Qt5 rather than automagic until support is properly handled here
+ sed -i -e '/NAMES Qt6 COMP/d' Source/Core/DolphinQt/CMakeLists.txt ||
die
}
src_configure() {
diff --git a/games-emulation/dolphin/dolphin-9999.ebuild
b/games-emulation/dolphin/dolphin-9999.ebuild
index d888afe15b4d..ebe6fb575460 100644
--- a/games-emulation/dolphin/dolphin-9999.ebuild
+++ b/games-emulation/dolphin/dolphin-9999.ebuild
@@ -145,6 +145,9 @@ src_prepare() {
# Remove dirty suffix: needed for netplay
sed -i -e 's/--dirty/&=""/' CMakeLists.txt || die
+
+ # Force Qt5 rather than automagic until support is properly handled here
+ sed -i -e '/NAMES Qt6 COMP/d' Source/Core/DolphinQt/CMakeLists.txt ||
die
}
src_configure() {
