[gentoo-commits] repo/gentoo:master commit in: games-emulation/pcsx2/, games-emulation/pcsx2/files/

[Ionen Wolkens]

commit:     33fc0d11821ab13f06bec4e8d1933b5e4a0a66e8
Author:     Ionen Wolkens <ionen <AT> gentoo <DOT> org>
AuthorDate: Mon Sep  8 02:58:23 2025 +0000
Commit:     Ionen Wolkens <ionen <AT> gentoo <DOT> org>
CommitDate: Mon Sep  8 05:56:55 2025 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=33fc0d11

games-emulation/pcsx2: fix build with Qt 6.10

Signed-off-by: Ionen Wolkens <ionen <AT> gentoo.org>

 .../pcsx2/files/pcsx2-2.4.0-qt610.patch            | 30 ++++++++++++++++++++++
 games-emulation/pcsx2/pcsx2-2.4.0-r1.ebuild        |  1 +
 games-emulation/pcsx2/pcsx2-9999.ebuild            |  1 +
 3 files changed, 32 insertions(+)

diff --git a/games-emulation/pcsx2/files/pcsx2-2.4.0-qt610.patch 
b/games-emulation/pcsx2/files/pcsx2-2.4.0-qt610.patch
new file mode 100644
index 000000000000..66dd75095f1b
--- /dev/null
+++ b/games-emulation/pcsx2/files/pcsx2-2.4.0-qt610.patch
@@ -0,0 +1,30 @@
+Qt6::Gui no longer finds GuiPrivate in Qt 6.10 and it needs to be
+done manually.
+
+For convenience, not patching the earlier "find_package(Qt6 ...)" so
+that the Qt version doesn't prevent applying the patch across versions
+(just a quick fix, not meant for upstream as-is).
+
+Note: unsure if upstream's workflow changed but, given past handling,
+upstream will likely only fix this when they bump Qt in the appimages
+and then bump the required version to >=6.10 rather than do conditions
+(may need to change the fix if 6.10 isn't quite ready for wider usage)
+--- a/cmake/SearchForStuff.cmake
++++ b/cmake/SearchForStuff.cmake
+@@ -115,2 +115,6 @@
+ 
++if (Qt6_VERSION VERSION_GREATER_EQUAL 6.10)
++  find_package(Qt6 COMPONENTS GuiPrivate REQUIRED)
++endif()
++
+ # Demangler for the debugger.
+--- a/pcsx2-qt/CMakeLists.txt
++++ b/pcsx2-qt/CMakeLists.txt
+@@ -256,3 +256,2 @@
+ target_include_directories(pcsx2-qt PRIVATE
+-      ${Qt6Gui_PRIVATE_INCLUDE_DIRS}
+       "${CMAKE_BINARY_DIR}/common/include"
+@@ -267,2 +266,3 @@
+       Qt6::Gui
++      Qt6::GuiPrivate
+       Qt6::Widgets

diff --git a/games-emulation/pcsx2/pcsx2-2.4.0-r1.ebuild 
b/games-emulation/pcsx2/pcsx2-2.4.0-r1.ebuild
index 77ed8e5335fc..8a9d035d1677 100644
--- a/games-emulation/pcsx2/pcsx2-2.4.0-r1.ebuild
+++ b/games-emulation/pcsx2/pcsx2-2.4.0-r1.ebuild
@@ -90,6 +90,7 @@ PATCHES=(
        "${FILESDIR}"/${PN}-1.7.5835-musl-header.patch
        "${FILESDIR}"/${PN}-1.7.5913-musl-cache.patch
        "${FILESDIR}"/${PN}-2.2.0-missing-header.patch
+       "${FILESDIR}"/${PN}-2.4.0-qt610.patch
 )
 
 CMAKE_QA_COMPAT_SKIP=1 #957976

diff --git a/games-emulation/pcsx2/pcsx2-9999.ebuild 
b/games-emulation/pcsx2/pcsx2-9999.ebuild
index 6fa376cd0129..0d03b9c74ca9 100644
--- a/games-emulation/pcsx2/pcsx2-9999.ebuild
+++ b/games-emulation/pcsx2/pcsx2-9999.ebuild
@@ -89,6 +89,7 @@ PATCHES=(
        "${FILESDIR}"/${PN}-1.7.5232-cubeb-automagic.patch
        "${FILESDIR}"/${PN}-1.7.5835-musl-header.patch
        "${FILESDIR}"/${PN}-1.7.5913-musl-cache.patch
+       "${FILESDIR}"/${PN}-2.4.0-qt610.patch
 )
 
 CMAKE_QA_COMPAT_SKIP=1 #957976