commit: d47ad1c3f49faf2f6725de821b3dced26b3eec7e Author: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org> AuthorDate: Sat Jul 19 10:55:17 2025 +0000 Commit: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org> CommitDate: Sat Jul 19 11:02:43 2025 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=d47ad1c3
kde-apps/ktouch: Drop duplicate KF6DocTools requirement See also: https://invent.kde.org/education/ktouch/-/merge_requests/45 Closes: https://bugs.gentoo.org/960368 Signed-off-by: Andreas Sturmlechner <asturm <AT> gentoo.org> .../ktouch-25.07.80-duplicate-kdoctools.patch | 29 ++++++++++++++++++++++ kde-apps/ktouch/ktouch-25.07.70_pre20250628.ebuild | 2 ++ kde-apps/ktouch/ktouch-25.07.80.ebuild | 2 ++ 3 files changed, 33 insertions(+) diff --git a/kde-apps/ktouch/files/ktouch-25.07.80-duplicate-kdoctools.patch b/kde-apps/ktouch/files/ktouch-25.07.80-duplicate-kdoctools.patch new file mode 100644 index 000000000000..eb85d650a898 --- /dev/null +++ b/kde-apps/ktouch/files/ktouch-25.07.80-duplicate-kdoctools.patch @@ -0,0 +1,29 @@ +From fb41dbeac268d7be4563457afbe1194aa7ea898c Mon Sep 17 00:00:00 2001 +From: Andreas Sturmlechner <[email protected]> +Date: Sat, 19 Jul 2025 12:27:48 +0200 +Subject: [PATCH] Drop duplicate required KF6DocTools dependency + +It is already being searched for prior to the main KF6 dependencies, +and the docs subdir is being added conditionally, so that will have +been the intention. + +Signed-off-by: Andreas Sturmlechner <[email protected]> +--- + CMakeLists.txt | 1 - + 1 file changed, 1 deletion(-) + +diff --git a/CMakeLists.txt b/CMakeLists.txt +index 96f6919f..31f440a3 100644 +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -46,7 +46,6 @@ find_package(KF6 ${KF_MIN_VERSION} REQUIRED COMPONENTS + Config + ConfigWidgets + CoreAddons +- DocTools + I18n + ItemViews + KCMUtils +-- +2.50.1 + diff --git a/kde-apps/ktouch/ktouch-25.07.70_pre20250628.ebuild b/kde-apps/ktouch/ktouch-25.07.70_pre20250628.ebuild index 5f5a30ab1bb5..800af949ac14 100644 --- a/kde-apps/ktouch/ktouch-25.07.70_pre20250628.ebuild +++ b/kde-apps/ktouch/ktouch-25.07.70_pre20250628.ebuild @@ -50,6 +50,8 @@ RDEPEND="${COMMON_DEPEND} >=kde-apps/kqtquickcharts-25.07.70_pre20250625:6 " +PATCHES=( "${FILESDIR}/${PN}-25.07.80-duplicate-kdoctools.patch" ) # bug 960368 + src_configure() { local mycmakeargs=( -DWITHOUT_X11=$(usex !X) diff --git a/kde-apps/ktouch/ktouch-25.07.80.ebuild b/kde-apps/ktouch/ktouch-25.07.80.ebuild index 75f347705521..eac784dfd14b 100644 --- a/kde-apps/ktouch/ktouch-25.07.80.ebuild +++ b/kde-apps/ktouch/ktouch-25.07.80.ebuild @@ -49,6 +49,8 @@ RDEPEND="${COMMON_DEPEND} >=kde-apps/kqtquickcharts-${PVCUT}:6 " +PATCHES=( "${FILESDIR}/${P}-duplicate-kdoctools.patch" ) # bug 960368 + src_configure() { local mycmakeargs=( -DWITHOUT_X11=$(usex !X)
