gentoo-mirror/gentoo
1
0
Fork 0
mirror of https://github.com/gentoo-mirror/gentoo.git synced 2026-01-06 02:17:34 -08:00
Code Issues Projects Releases Wiki Activity

kde-apps/ktouch: Use fixed upstreamed patch

Browse Source 
See also:
https://invent.kde.org/education/ktouch/-/merge_requests/48

Thanks-to: Alfred Wingate <parona@protonmail.com>
Closes: https://bugs.gentoo.org/960368
Signed-off-by: Andreas Sturmlechner <asturm@gentoo.org>
This commit is contained in:
Andreas Sturmlechner 2025-08-25 20:48:14 +02:00
parent 0024378c52
commit d0a2d3c3e3
No known key found for this signature in database
GPG Key ID: AE591BBC73E4DD5E
4 changed files with 49 additions and 30 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

29
kde-apps/ktouch/files/ktouch-25.07.80-duplicate-kdoctools.patch
View File

@ -1,29 +0,0 @@
From fb41dbeac268d7be4563457afbe1194aa7ea898c Mon Sep 17 00:00:00 2001
From: Andreas Sturmlechner <asturm@gentoo.org>
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 <asturm@gentoo.org>
---
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

46
kde-apps/ktouch/files/ktouch-25.08.0-duplicate-kdoctools.patch Normal file
View File

@ -0,0 +1,46 @@
From fe4489c44971fa10f5cd48ec81aa7dc5b4f720e8 Mon Sep 17 00:00:00 2001
From: Andreas Sturmlechner <asturm@gentoo.org>
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 <asturm@gentoo.org>
(cherry picked from commit ba806f96ff3081fe70f02f27b74ebd936ba2d0ad)
---
CMakeLists.txt | 3 +--
1 file changed, 1 insertion(+), 2 deletions(-)
diff --git a/CMakeLists.txt b/CMakeLists.txt
index 47e67c1b..eef9a2b1 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
@@ -93,7 +92,6 @@ ecm_set_disabled_deprecation_versions(QT 5.15.2 KF 5.101.0)
# subdirectories to build
ecm_optional_add_subdirectory(data)
-ecm_optional_add_subdirectory(doc)
ecm_optional_add_subdirectory(src)
# ecm_optional_add_subdirectory(sounds)
ecm_optional_add_subdirectory(icons)
@@ -101,6 +99,7 @@ ecm_optional_add_subdirectory(icons)
# files to install in the ktouch project root directory
ki18n_install(po)
if (KF6DocTools_FOUND)
+ ecm_optional_add_subdirectory(doc)
kdoctools_install(po)
endif()
install( PROGRAMS org.kde.ktouch.desktop DESTINATION ${KDE_INSTALL_APPDIR} )
--
2.51.0

2
kde-apps/ktouch/ktouch-25.07.70_pre20250628.ebuild
View File

@ -50,7 +50,7 @@ RDEPEND="${COMMON_DEPEND}
>=kde-apps/kqtquickcharts-25.07.70_pre20250625:6
"
PATCHES=( "${FILESDIR}/${PN}-25.07.80-duplicate-kdoctools.patch" ) # bug 960368
PATCHES=( "${FILESDIR}/${PN}-25.08.0-duplicate-kdoctools.patch" ) # bug 960368
src_configure() {
local mycmakeargs=(

2
kde-apps/ktouch/ktouch-25.08.0.ebuild
View File

@ -49,6 +49,8 @@ RDEPEND="${COMMON_DEPEND}
>=kde-apps/kqtquickcharts-${PVCUT}:6
"
PATCHES=( "${FILESDIR}/${PN}-25.08.0-duplicate-kdoctools.patch" ) # bug 960368
src_configure() {
local mycmakeargs=(
-DWITHOUT_X11=$(usex !X)