commit: 646a1609f13d8adc87c3a877e4bb9a098da3882e Author: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org> AuthorDate: Tue Dec 16 21:23:02 2025 +0000 Commit: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org> CommitDate: Tue Dec 16 21:23:53 2025 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=646a1609
x11-misc/copyq: Fix CMake for build w/ Qt 6.10 Closes: https://bugs.gentoo.org/966739 Signed-off-by: Andreas Sturmlechner <asturm <AT> gentoo.org> x11-misc/copyq/copyq-13.0.0.ebuild | 1 + .../files/copyq-13.0.0-fix-cmake-qt-6.10.patch | 23 ++++++++++++++++++++++ 2 files changed, 24 insertions(+) diff --git a/x11-misc/copyq/copyq-13.0.0.ebuild b/x11-misc/copyq/copyq-13.0.0.ebuild index 9deb1d759b3c..2a6d1f40d7da 100644 --- a/x11-misc/copyq/copyq-13.0.0.ebuild +++ b/x11-misc/copyq/copyq-13.0.0.ebuild @@ -51,6 +51,7 @@ BDEPEND=" PATCHES=( # used in tests "${FILESDIR}/${PN}-7.1.0-support-plugin-dir-envvar-r1.patch" + "${FILESDIR}/${P}-fix-cmake-qt-6.10.patch" # bug #966739 ) src_configure() { diff --git a/x11-misc/copyq/files/copyq-13.0.0-fix-cmake-qt-6.10.patch b/x11-misc/copyq/files/copyq-13.0.0-fix-cmake-qt-6.10.patch new file mode 100644 index 000000000000..0141c93686f7 --- /dev/null +++ b/x11-misc/copyq/files/copyq-13.0.0-fix-cmake-qt-6.10.patch @@ -0,0 +1,23 @@ +From 5bd157c3bf6127f33c4c8a16c28140b6cd171ed1 Mon Sep 17 00:00:00 2001 +From: "Jason E. Hale" <[email protected]> +Date: Mon, 1 Dec 2025 04:43:23 -0500 +Subject: [PATCH] Fix typo. QT_VERSION is undefined. + +We must test for Qt6_VERSION here. +--- + src/platform/x11/x11platform.cmake | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/src/platform/x11/x11platform.cmake b/src/platform/x11/x11platform.cmake +index c23f172dae..4c824d07bf 100644 +--- a/src/platform/x11/x11platform.cmake ++++ b/src/platform/x11/x11platform.cmake +@@ -39,7 +39,7 @@ if (WITH_X11) + set(copyq_LIBRARIES ${copyq_LIBRARIES} ${X11_LIBRARIES} ${X11_Xfixes_LIB}) + + if(WITH_QT6) +- if (QT_VERSION VERSION_GREATER_EQUAL "6.10.0") ++ if (Qt6_VERSION VERSION_GREATER_EQUAL "6.10.0") + find_package(${copyq_qt} ${QT_MIN_VERSION} CONFIG REQUIRED COMPONENTS GuiPrivate) + endif() + list(APPEND copyq_LIBRARIES Qt::GuiPrivate)
