diff options
| author | Andreas Sturmlechner <asturm@gentoo.org> | 2025-12-10 22:46:05 +0100 |
|---|---|---|
| committer | Michał Górny <mgorny@gentoo.org> | 2025-12-11 05:40:22 +0100 |
| commit | 2cdf0d9b43e7ad55d38f4c080a384b13d30193fa (patch) | |
| tree | b0a97560a539f46b7a8955ac7a43677928d2256b | |
| parent | 948c8147a5eeec2ee967aab61750d7dc1d0f4081 (diff) | |
| download | gentoo-2cdf0d9b43e7ad55d38f4c080a384b13d30193fa.tar.gz gentoo-2cdf0d9b43e7ad55d38f4c080a384b13d30193fa.tar.bz2 gentoo-2cdf0d9b43e7ad55d38f4c080a384b13d30193fa.zip | |
games-emulation/dolphin: Fix build w/ Qt 6.10
Closes: https://bugs.gentoo.org/965410
Signed-off-by: Andreas Sturmlechner <asturm@gentoo.org>
Part-of: https://github.com/gentoo/gentoo/pull/44984
Signed-off-by: Michał Górny <mgorny@gentoo.org>
| -rw-r--r-- | games-emulation/dolphin/dolphin-2509.ebuild | 2 | ||||
| -rw-r--r-- | games-emulation/dolphin/files/dolphin-2509-qt-6.10.patch | 42 |
2 files changed, 44 insertions, 0 deletions
diff --git a/games-emulation/dolphin/dolphin-2509.ebuild b/games-emulation/dolphin/dolphin-2509.ebuild index 8f686cb028ce..7fa7d8afeef5 100644 --- a/games-emulation/dolphin/dolphin-2509.ebuild +++ b/games-emulation/dolphin/dolphin-2509.ebuild @@ -150,6 +150,8 @@ declare -A KEEP_BUNDLED=( PATCHES=( "${FILESDIR}"/dolphin-2509-retroachievents-test.patch + # https://github.com/dolphin-emu/dolphin/pull/14008 + "${FILESDIR}/${P}-qt-6.10.patch" # bug #965410 ) add_bundled_licenses() { diff --git a/games-emulation/dolphin/files/dolphin-2509-qt-6.10.patch b/games-emulation/dolphin/files/dolphin-2509-qt-6.10.patch new file mode 100644 index 000000000000..096ac0ad1c01 --- /dev/null +++ b/games-emulation/dolphin/files/dolphin-2509-qt-6.10.patch @@ -0,0 +1,42 @@ +From b3bdad416ca0a6a604dca12bed7bd00542092d25 Mon Sep 17 00:00:00 2001 +From: Jordan Woyak <jordan.woyak@gmail.com> +Date: Sun, 12 Oct 2025 22:55:52 -0500 +Subject: [PATCH] CMakeLists: Fix build with Qt6.10. GuiPrivate component is + needed to #include qplatformnativeinterface.h in MainWindow.cpp. + +--- + Source/Core/DolphinQt/CMakeLists.txt | 14 ++++++++++++++ + 1 file changed, 14 insertions(+) + +diff --git a/Source/Core/DolphinQt/CMakeLists.txt b/Source/Core/DolphinQt/CMakeLists.txt +index 47df65334bd4..656537f71971 100644 +--- a/Source/Core/DolphinQt/CMakeLists.txt ++++ b/Source/Core/DolphinQt/CMakeLists.txt +@@ -15,6 +15,13 @@ set(CMAKE_AUTOMOC ON) + set(CMAKE_AUTORCC ON) + + find_package(Qt6 REQUIRED COMPONENTS Core Gui Widgets Svg) ++ ++if (LINUX AND Qt6_VERSION VERSION_GREATER_EQUAL 6.10.0) ++ # GuiPrivate is needed to #include qplatformnativeinterface.h in MainWindow.cpp with Qt 6.10+. ++ set(NEED_QT_GUI_PRIVATE_COMPONENT ON) ++ find_package(Qt6 REQUIRED COMPONENTS GuiPrivate) ++endif() ++ + message(STATUS "Found Qt version ${Qt6_VERSION}") + + set_property(TARGET Qt6::Core PROPERTY INTERFACE_COMPILE_FEATURES "") +@@ -440,6 +447,13 @@ PRIVATE + implot + ) + ++if (NEED_QT_GUI_PRIVATE_COMPONENT) ++ target_link_libraries(dolphin-emu ++ PRIVATE ++ Qt6::GuiPrivate ++ ) ++endif() ++ + if (WIN32) + target_link_libraries(dolphin-emu + PRIVATE |