gentoo-mirror/gentoo
1
0
Fork 0
mirror of https://github.com/gentoo-mirror/gentoo.git synced 2025-12-21 21:17:37 -08:00
Code Issues Projects Releases Wiki Activity

games-emulation/dolphin: Fix build w/ Qt 6.10

Browse Source 
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>
This commit is contained in:
Andreas Sturmlechner 2025-12-10 22:46:05 +01:00 committed by Michał Górny
parent 948c8147a5
commit 2cdf0d9b43
No known key found for this signature in database
GPG Key ID: 8E32347AF4055AE8
2 changed files with 44 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
games-emulation/dolphin/dolphin-2509.ebuild
View File

@ -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() {

42
games-emulation/dolphin/files/dolphin-2509-qt-6.10.patch Normal file
View File

@ -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