From 74955b33119751f1e55a593697ec24784b48c290 Mon Sep 17 00:00:00 2001 From: Andreas Sturmlechner Date: Wed, 6 Aug 2025 18:13:38 +0200 Subject: [PATCH] dev-libs/kdiagram: drop 2.8.0 Bug: https://bugs.gentoo.org/955181 Signed-off-by: Andreas Sturmlechner --- dev-libs/kdiagram/Manifest | 1 - .../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 | 37 -------- 4 files changed, 151 deletions(-) delete mode 100644 dev-libs/kdiagram/files/kdiagram-2.8.0-cmake4.patch delete mode 100644 dev-libs/kdiagram/files/kdiagram-2.8.0-ecm-warning.patch delete mode 100644 dev-libs/kdiagram/kdiagram-2.8.0.ebuild diff --git a/dev-libs/kdiagram/Manifest b/dev-libs/kdiagram/Manifest index 2d062d7d8781f..d39b5f569e5eb 100644 --- a/dev-libs/kdiagram/Manifest +++ b/dev-libs/kdiagram/Manifest @@ -1,2 +1 @@ -DIST kdiagram-2.8.0.tar.xz 691044 BLAKE2B c7b3a4ba992192b34d8cda90bb50a495cb88f8456ca1109140841fd885b710ce1193868be148c25f813c2d26dd7365999bdd8572e66163f0d5d1a169afc3e448 SHA512 d981bce4feeb65038772125e5af1c096537ec87991fdb93d9a91dd5c9f089b1001647c8a63b209683a67b2d7b3aadeb7dd6279261eefaf6b6e046d0ab72723ec DIST kdiagram-3.0.1.tar.xz 693440 BLAKE2B b11698eb94392208233fc5da64bca5496cc9b91f5e603aee6e0fa896d2180c140ac988763b96078b9ffbc1baba94c82b158c483b6f9f6d31cfff188293e9ca98 SHA512 767c5ba0a4dfcc8b5a5bbf1c65b30bb391537024618b29ea5d5d09da04f85e2665cad60a7477e1cebeed0606e17c992cba0af7a89c76699063bb47e741ea8e20 diff --git a/dev-libs/kdiagram/files/kdiagram-2.8.0-cmake4.patch b/dev-libs/kdiagram/files/kdiagram-2.8.0-cmake4.patch deleted file mode 100644 index 5045017d01a3b..0000000000000 --- a/dev-libs/kdiagram/files/kdiagram-2.8.0-cmake4.patch +++ /dev/null @@ -1,25 +0,0 @@ -From ad1a3af576499f68ab6bc4a7e5d08f0177c761be Mon Sep 17 00:00:00 2001 -From: Christophe Marin -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 deleted file mode 100644 index d7e448c721ea4..0000000000000 --- a/dev-libs/kdiagram/files/kdiagram-2.8.0-ecm-warning.patch +++ /dev/null @@ -1,88 +0,0 @@ -From 01386018108fbf1b1b1b334754f9a7b62004b371 Mon Sep 17 00:00:00 2001 -From: "Friedrich W. H. Kossebau" -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 deleted file mode 100644 index 223d15c8b89eb..0000000000000 --- a/dev-libs/kdiagram/kdiagram-2.8.0.ebuild +++ /dev/null @@ -1,37 +0,0 @@ -# Copyright 1999-2025 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=8 - -ECM_EXAMPLES="true" -ECM_QTHELP="true" -ECM_TEST="true" -KDE_ORG_CATEGORY="graphics" -QTMIN=5.15.1 -VIRTUALX_REQUIRED="test" -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/" -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 )" - -DEPEND=" - >=dev-qt/qtgui-${QTMIN}:5 - >=dev-qt/qtprintsupport-${QTMIN}:5 - >=dev-qt/qtsvg-${QTMIN}:5 - >=dev-qt/qtwidgets-${QTMIN}:5 -" -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 -)