commit: ee56416a639094e216afc46821293ccc5c55dd44 Author: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org> AuthorDate: Sun Jun 22 20:36:28 2025 +0000 Commit: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org> CommitDate: Sun Jun 22 20:52:48 2025 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=ee56416a
dev-libs/kdiagram: 2.8.0: Fix build w/ cmake-4, ECM warnings Closes: https://bugs.gentoo.org/958927 Closes: https://bugs.gentoo.org/958928 Signed-off-by: Andreas Sturmlechner <asturm <AT> gentoo.org> .../kdiagram/files/kdiagram-2.8.0-cmake4.patch | 25 ++++++ .../files/kdiagram-2.8.0-ecm-warning.patch | 88 ++++++++++++++++++++++ dev-libs/kdiagram/kdiagram-2.8.0.ebuild | 12 +-- 3 files changed, 120 insertions(+), 5 deletions(-) diff --git a/dev-libs/kdiagram/files/kdiagram-2.8.0-cmake4.patch b/dev-libs/kdiagram/files/kdiagram-2.8.0-cmake4.patch new file mode 100644 index 000000000000..5045017d01a3 --- /dev/null +++ b/dev-libs/kdiagram/files/kdiagram-2.8.0-cmake4.patch @@ -0,0 +1,25 @@ +From ad1a3af576499f68ab6bc4a7e5d08f0177c761be Mon Sep 17 00:00:00 2001 +From: Christophe Marin <[email protected]> +Date: Tue, 1 Apr 2025 15:25:41 +0200 +Subject: [PATCH] Fix build with CMake 4 + +--- + CMakeLists.txt | 4 ++-- + 1 file changed, 2 insertions(+), 2 deletions(-) + +diff --git a/CMakeLists.txt b/CMakeLists.txt +index 12dbdbb..d5e914f 100644 +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -1,6 +1,6 @@ +-cmake_minimum_required(VERSION 2.8.12) ++cmake_minimum_required(VERSION 3.16) + +-project( kdiagram ) ++project(kdiagram VERSION 2.8.0) + + set(KF5_MIN_VERSION "5.60.0") + find_package(ECM ${KF5_MIN_VERSION} REQUIRED NO_MODULE) +-- +2.49.0 + diff --git a/dev-libs/kdiagram/files/kdiagram-2.8.0-ecm-warning.patch b/dev-libs/kdiagram/files/kdiagram-2.8.0-ecm-warning.patch new file mode 100644 index 000000000000..d7e448c721ea --- /dev/null +++ b/dev-libs/kdiagram/files/kdiagram-2.8.0-ecm-warning.patch @@ -0,0 +1,88 @@ +From 01386018108fbf1b1b1b334754f9a7b62004b371 Mon Sep 17 00:00:00 2001 +From: "Friedrich W. H. Kossebau" <[email protected]> +Date: Wed, 23 Feb 2022 20:43:08 +0100 +Subject: [PATCH] Fixup last commits + +* asturm 2025-06-22: Extract parts that switched to CMakePackageConfigHelpers + and improved other ECM module includes (ordering, use KDECompilerSettings + instead of KDEFrameworkCompilerSettings) + +--- + CMakeLists.txt | 9 ++++----- + src/KChart/CMakeLists.txt | 3 ++- + src/KGantt/CMakeLists.txt | 3 ++- + 3 files changed, 8 insertions(+), 7 deletions(-) + +diff --git a/CMakeLists.txt b/CMakeLists.txt +index 35aefd20..80c7b861 100644 +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -8,21 +8,20 @@ + set(CMAKE_MODULE_PATH ${ECM_MODULE_PATH} ${ECM_KDE_MODULE_DIR}) + + include(KDEInstallDirs) +-include(KDEFrameworkCompilerSettings NO_POLICY_SCOPE) + include(KDECMakeSettings) +- +-include(FeatureSummary) +-include(GenerateExportHeader) ++include(KDECompilerSettings NO_POLICY_SCOPE) + + include(ECMGenerateHeaders) + include(ECMSetupVersion) +-include(ECMPackageConfigHelpers) + include(ECMGeneratePriFile) + include(ECMPoQmTools) + include(ECMAddTests) + set(QT_REQUIRED_VERSION "5.12.0") + ++include(CMakePackageConfigHelpers) + include(CMakeDependentOption) ++include(FeatureSummary) ++include(GenerateExportHeader) + + set(HAS_ECMAddQch TRUE) + include(ECMAddQch) +diff --git a/src/KChart/CMakeLists.txt b/src/KChart/CMakeLists.txt +index f7adf0b0..39380806 100644 +--- a/src/KChart/CMakeLists.txt ++++ b/src/KChart/CMakeLists.txt +@@ -340,7 +340,7 @@ if (BUILD_QCH) + set(PACKAGE_INCLUDE_QCHTARGETS "include(\"\${CMAKE_CURRENT_LIST_DIR}/KChartQchTargets.cmake\")") + endif() + +-ecm_configure_package_config_file( ++configure_package_config_file( + "${CMAKE_CURRENT_SOURCE_DIR}/KChartConfig.cmake.in" + "${CMAKE_CURRENT_BINARY_DIR}/KChartConfig.cmake" + INSTALL_DESTINATION ${CMAKECONFIG_INSTALL_DIR} +@@ -357,6 +357,7 @@ install(EXPORT KChartTargets + FILE KChartTargets.cmake) + + ecm_generate_pri_file( ++ VERSION ${KCHARTLIB_VERSION} + BASE_NAME KChart + LIB_NAME KChart + DEPS "widgets svg" +diff --git a/src/KGantt/CMakeLists.txt b/src/KGantt/CMakeLists.txt +--- a/src/KGantt/CMakeLists.txt ++++ b/src/KGantt/CMakeLists.txt +@@ -164,7 +164,7 @@ if (BUILD_QCH) + set(PACKAGE_INCLUDE_QCHTARGETS "include(\"\${CMAKE_CURRENT_LIST_DIR}/KGanttQchTargets.cmake\")") + endif() + +-ecm_configure_package_config_file( ++configure_package_config_file( + "${CMAKE_CURRENT_SOURCE_DIR}/KGanttConfig.cmake.in" + "${CMAKE_CURRENT_BINARY_DIR}/KGanttConfig.cmake" + INSTALL_DESTINATION ${CMAKECONFIG_INSTALL_DIR} +@@ -181,6 +181,7 @@ install(EXPORT KGanttTargets + FILE KGanttTargets.cmake) + + ecm_generate_pri_file( ++ VERSION ${KGANTTLIB_VERSION} + BASE_NAME KGantt + LIB_NAME KGantt + DEPS "widgets printsupport" +-- +GitLab diff --git a/dev-libs/kdiagram/kdiagram-2.8.0.ebuild b/dev-libs/kdiagram/kdiagram-2.8.0.ebuild index bd2466cea161..223d15c8b89e 100644 --- a/dev-libs/kdiagram/kdiagram-2.8.0.ebuild +++ b/dev-libs/kdiagram/kdiagram-2.8.0.ebuild @@ -14,14 +14,11 @@ inherit ecm kde.org DESCRIPTION="Powerful libraries (KChart, KGantt) for creating business diagrams" HOMEPAGE="https://api.kde.org/kdiagram/index.html https://www.kdab.com/development-resources/qt-tools/kd-chart/"; - -if [[ ${KDE_BUILD_TYPE} = release ]]; then - SRC_URI="mirror://kde/stable/${PN}/${PV}/${P}.tar.xz" - KEYWORDS="amd64 arm64 ~ppc64 ~riscv ~x86" -fi +SRC_URI="mirror://kde/stable/${PN}/${PV}/${P}.tar.xz" LICENSE="GPL-2" # TODO CHECK SLOT="5" +KEYWORDS="amd64 arm64 ~ppc64 ~riscv ~x86" REQUIRED_USE="test? ( examples )" @@ -33,3 +30,8 @@ DEPEND=" " RDEPEND="${DEPEND}" BDEPEND=">=dev-qt/linguist-tools-${QTMIN}:5" + +PATCHES=( + "${FILESDIR}/${P}-ecm-warning.patch" # in 3.0 + "${FILESDIR}/${P}-cmake4.patch" # thx opensuse; bugs 958927, 958928 +)
