commit: f2db41015ee309f323fdd8268c43abfb2c9e3fe1 Author: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org> AuthorDate: Sun Jun 22 10:15:33 2025 +0000 Commit: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org> CommitDate: Sun Jun 22 10:16:47 2025 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=f2db4101
kde-plasma/kdeplasma-addons: Fix CMake 4 QA notice Inconsequential templates dir, so no revbump. Pending MR: https://invent.kde.org/plasma/kdeplasma-addons/-/merge_requests/873 Closes: https://bugs.gentoo.org/958360 Signed-off-by: Andreas Sturmlechner <asturm <AT> gentoo.org> .../files/kdeplasma-addons-6.3.5-cmake4.patch | 37 ++++++++++++++++++++++ .../kdeplasma-addons/kdeplasma-addons-6.3.5.ebuild | 2 ++ .../kdeplasma-addons/kdeplasma-addons-6.4.0.ebuild | 2 ++ 3 files changed, 41 insertions(+) diff --git a/kde-plasma/kdeplasma-addons/files/kdeplasma-addons-6.3.5-cmake4.patch b/kde-plasma/kdeplasma-addons/files/kdeplasma-addons-6.3.5-cmake4.patch new file mode 100644 index 000000000000..f5476fa5a859 --- /dev/null +++ b/kde-plasma/kdeplasma-addons/files/kdeplasma-addons-6.3.5-cmake4.patch @@ -0,0 +1,37 @@ +From f100cd519aa0800fe84bf3c44f4d84698ca445c5 Mon Sep 17 00:00:00 2001 +From: Andreas Sturmlechner <[email protected]> +Date: Thu, 19 Jun 2025 11:41:45 +0200 +Subject: [PATCH] Align with project root minimum versions and don't search for + Qt5(!) + +Signed-off-by: Andreas Sturmlechner <[email protected]> +--- + templates/plasmapotdprovider/CMakeLists.txt | 8 ++++---- + 1 file changed, 4 insertions(+), 4 deletions(-) + +diff --git a/templates/plasmapotdprovider/CMakeLists.txt b/templates/plasmapotdprovider/CMakeLists.txt +index 4cbfaba815..e6663fc461 100644 +--- a/templates/plasmapotdprovider/CMakeLists.txt ++++ b/templates/plasmapotdprovider/CMakeLists.txt +@@ -1,14 +1,14 @@ +-cmake_minimum_required(VERSION 3.0) ++cmake_minimum_required(VERSION 3.16) + + project(%{APPNAMEID}) + +-set(QT_MIN_VERSION "5.9.0") +-set(KF6_MIN_VERSION "5.42.0") ++set(QT_MIN_VERSION "6.8.0") ++set(KF6_MIN_VERSION "6.14.0") + + find_package(ECM ${KF6_MIN_VERSION} REQUIRED NO_MODULE) + set(CMAKE_MODULE_PATH ${ECM_MODULE_PATH}) + +-find_package(Qt5 ${QT_MIN_VERSION} CONFIG REQUIRED ++find_package(Qt6 ${QT_MIN_VERSION} CONFIG REQUIRED + COMPONENTS + Core + ) +-- +GitLab + diff --git a/kde-plasma/kdeplasma-addons/kdeplasma-addons-6.3.5.ebuild b/kde-plasma/kdeplasma-addons/kdeplasma-addons-6.3.5.ebuild index 957f6287ecdd..3ab18dc8ac46 100644 --- a/kde-plasma/kdeplasma-addons/kdeplasma-addons-6.3.5.ebuild +++ b/kde-plasma/kdeplasma-addons/kdeplasma-addons-6.3.5.ebuild @@ -54,6 +54,8 @@ RDEPEND="${DEPEND} >=kde-frameworks/kitemmodels-${KFMIN}:6 " +PATCHES=( "${FILESDIR}/${P}-cmake4.patch" ) # bug 958360, pending MR for 6.4 + src_configure() { local mycmakeargs=( $(cmake_use_find_package alternate-calendar ICU) diff --git a/kde-plasma/kdeplasma-addons/kdeplasma-addons-6.4.0.ebuild b/kde-plasma/kdeplasma-addons/kdeplasma-addons-6.4.0.ebuild index 3e21604a5609..a30eb28fa049 100644 --- a/kde-plasma/kdeplasma-addons/kdeplasma-addons-6.4.0.ebuild +++ b/kde-plasma/kdeplasma-addons/kdeplasma-addons-6.4.0.ebuild @@ -54,6 +54,8 @@ RDEPEND="${DEPEND} >=kde-frameworks/kitemmodels-${KFMIN}:6 " +PATCHES=( "${FILESDIR}/${PN}-6.3.5-cmake4.patch" ) # bug 958360, pending MR for 6.4 + src_configure() { local mycmakeargs=( $(cmake_use_find_package alternate-calendar ICU)
