commit: 694c616e8d8556cd5a1b4ed7d0c70f9dd9c16c61 Author: Joe Kappus <joe <AT> wt <DOT> gd> AuthorDate: Sun Nov 30 19:26:49 2025 +0000 Commit: Joe Kappus <joe <AT> wt <DOT> gd> CommitDate: Sun Nov 30 19:26:49 2025 +0000 URL: https://gitweb.gentoo.org/repo/proj/guru.git/commit/?id=694c616e
net-im/nheko: 0.12.1, fix qt6.10 build Closes: https://bugs.gentoo.org/966878 Signed-off-by: Joe Kappus <joe <AT> wt.gd> net-im/nheko/files/nheko-0.12.1-qt610.patch | 39 +++++++++++++++++++++++++++++ net-im/nheko/nheko-0.12.1.ebuild | 2 ++ 2 files changed, 41 insertions(+) diff --git a/net-im/nheko/files/nheko-0.12.1-qt610.patch b/net-im/nheko/files/nheko-0.12.1-qt610.patch new file mode 100644 index 0000000000..47f8f47734 --- /dev/null +++ b/net-im/nheko/files/nheko-0.12.1-qt610.patch @@ -0,0 +1,39 @@ +From af2ca72030deb14a920a888e807dc732d93e3714 Mon Sep 17 00:00:00 2001 +From: Heiko Becker <[email protected]> +Date: Thu, 4 Sep 2025 17:29:17 +0200 +Subject: [PATCH] Search for private modules with Qt 6.10 + +Usage of private Qt modules requires a call to + +`find_package(Qt6 COMPONENTS FooPrivate)` since 6.10 [1]. + +The build complains about + +'CMake Error at CMakeLists.txt:909 (target_link_libraries): + Target "nheko" links to: + + Qt::QmlPrivate + + but the target was not found.' + +otherwise. + +[1] https://doc-snapshots.qt.io/qt6-dev/whatsnew610.html#build-system-changes +--- + CMakeLists.txt | 3 +++ + 1 file changed, 3 insertions(+) + +diff --git a/CMakeLists.txt b/CMakeLists.txt +index 8c0854174..3476f51ae 100644 +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -247,6 +247,9 @@ endif() + # Discover Qt dependencies. + # + find_package(Qt6 6.5 COMPONENTS Core Widgets Gui LinguistTools Svg Multimedia Qml QuickControls2 REQUIRED) ++if (Qt6Qml_VERSION VERSION_GREATER_EQUAL "6.10.0") ++ find_package(Qt6 REQUIRED COMPONENTS GuiPrivate QmlPrivate) ++endif() + find_package(Qt6DBus) + + if(USE_BUNDLED_QTKEYCHAIN) diff --git a/net-im/nheko/nheko-0.12.1.ebuild b/net-im/nheko/nheko-0.12.1.ebuild index 82bae4e558..42ac8049fe 100644 --- a/net-im/nheko/nheko-0.12.1.ebuild +++ b/net-im/nheko/nheko-0.12.1.ebuild @@ -95,6 +95,8 @@ BDEPEND=" ) " +PATCHES=( "${FILESDIR}/${P}-qt610.patch" ) + src_configure() { local -a mycmakeargs=( -DUSE_BUNDLED_CPPHTTPLIB=no
