* [gentoo-commits] repo/gentoo:master commit in: kde-apps/ktouch/files/, kde-apps/ktouch/
@ 2016-12-19 20:08 Johannes Huber
0 siblings, 0 replies; 3+ messages in thread
From: Johannes Huber @ 2016-12-19 20:08 UTC (permalink / raw
To: gentoo-commits
commit: 37eeb8d60efea8ccaefb977428f20c9f12ae2513
Author: Andreas Sturmlechner <andreas.sturmlechner <AT> gmail <DOT> com>
AuthorDate: Mon Dec 19 19:58:16 2016 +0000
Commit: Johannes Huber <johu <AT> gentoo <DOT> org>
CommitDate: Mon Dec 19 20:08:29 2016 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=37eeb8d6
kde-apps/ktouch: Fix DEPENDs
Gentoo-bug: 602982
Package-Manager: portage-2.3.0
Signed-off-by: Johannes Huber <johu <AT> gentoo.org>
kde-apps/ktouch/files/ktouch-16.12.0-deps.patch | 78 +++++++++++++++++++++++++
kde-apps/ktouch/ktouch-16.12.0-r1.ebuild | 44 ++++++++++++++
2 files changed, 122 insertions(+)
diff --git a/kde-apps/ktouch/files/ktouch-16.12.0-deps.patch b/kde-apps/ktouch/files/ktouch-16.12.0-deps.patch
new file mode 100644
index 00000000..2dbfe76
--- /dev/null
+++ b/kde-apps/ktouch/files/ktouch-16.12.0-deps.patch
@@ -0,0 +1,78 @@
+commit 6bc9417c81e1c5792da313fb15b4e0b222f2d7ca
+Author: Andreas Sturmlechner <andreas.sturmlechner@gmail.com>
+Date: Mon Dec 19 20:47:50 2016 +0100
+
+ Fix and sort dependencies
+
+ REVIEW: 129676
+
+diff --git a/CMakeLists.txt b/CMakeLists.txt
+index 7a0099c..3175453 100644
+--- a/CMakeLists.txt
++++ b/CMakeLists.txt
+@@ -25,32 +25,32 @@ include(ECMSetupVersion)
+ include(FeatureSummary)
+
+ find_package(Qt5 5.5 REQUIRED COMPONENTS
+- Widgets
+- Sql
+- Script
+- XmlPatterns
++ Gui
+ Qml
+ Quick
+ QuickWidgets
++ Script
++ Sql
+ Test
++ Widgets
+ X11Extras
++ Xml
++ XmlPatterns
+ )
+
+ find_package(KF5 REQUIRED COMPONENTS
++ Completion
+ Config
+ ConfigWidgets
+ CoreAddons
+ Declarative
+ DocTools
+ I18n
+- KIO
+- NewStuff
+- WidgetsAddons
+- XmlGui
+ ItemViews
+ KCMUtils
+- TextEditor
+- WindowSystem
++ TextWidgets
++ WidgetsAddons
++ XmlGui
+ )
+
+ # subdirectories to build
+diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
+index 6633f35..1003a0b 100644
+--- a/src/CMakeLists.txt
++++ b/src/CMakeLists.txt
+@@ -131,16 +131,14 @@ target_link_libraries(ktouch
+ Qt5::Sql
+ Qt5::XmlPatterns
+ Qt5::X11Extras
++ KF5::Completion
+ KF5::ConfigWidgets
+ KF5::Declarative
+- KF5::KIOWidgets
+ KF5::ItemViews
+- KF5::NewStuff
+ KF5::XmlGui
+ KF5::I18n
+ KF5::KCMUtils
+- KF5::TextEditor
+- KF5::WindowSystem
++ KF5::TextWidgets
+ KF5::CoreAddons
+ ${ktouch_X11_DEPS}
+ )
diff --git a/kde-apps/ktouch/ktouch-16.12.0-r1.ebuild b/kde-apps/ktouch/ktouch-16.12.0-r1.ebuild
new file mode 100644
index 00000000..cd6216c
--- /dev/null
+++ b/kde-apps/ktouch/ktouch-16.12.0-r1.ebuild
@@ -0,0 +1,44 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=6
+
+KDE_HANDBOOK="forceoptional"
+inherit kde5
+
+DESCRIPTION="Program that helps to learn and practice touch typing"
+HOMEPAGE="https://www.kde.org/applications/education/ktouch/"
+KEYWORDS="~amd64 ~arm ~x86"
+IUSE=""
+
+DEPEND="
+ $(add_frameworks_dep kcmutils)
+ $(add_frameworks_dep kcompletion)
+ $(add_frameworks_dep kconfig)
+ $(add_frameworks_dep kconfigwidgets)
+ $(add_frameworks_dep kcoreaddons)
+ $(add_frameworks_dep kdeclarative)
+ $(add_frameworks_dep ki18n)
+ $(add_frameworks_dep kitemviews)
+ $(add_frameworks_dep kservice)
+ $(add_frameworks_dep ktextwidgets)
+ $(add_frameworks_dep kwidgetsaddons)
+ $(add_frameworks_dep kxmlgui)
+ $(add_qt_dep qtdeclarative)
+ $(add_qt_dep qtgui)
+ $(add_qt_dep qtsql)
+ $(add_qt_dep qtwidgets)
+ $(add_qt_dep qtx11extras)
+ $(add_qt_dep qtxml)
+ $(add_qt_dep qtxmlpatterns)
+ x11-libs/libICE
+ x11-libs/libSM
+ x11-libs/libX11
+ x11-libs/libxcb
+"
+RDEPEND="${DEPEND}
+ $(add_kdeapps_dep kqtquickcharts)
+"
+
+PATCHES=( "${FILESDIR}/${P}"-deps.patch )
^ permalink raw reply related [flat|nested] 3+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: kde-apps/ktouch/files/, kde-apps/ktouch/
@ 2025-07-19 11:03 Andreas Sturmlechner
0 siblings, 0 replies; 3+ messages in thread
From: Andreas Sturmlechner @ 2025-07-19 11:03 UTC (permalink / raw
To: gentoo-commits
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 <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
+
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)
^ permalink raw reply related [flat|nested] 3+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: kde-apps/ktouch/files/, kde-apps/ktouch/
@ 2025-08-25 18:54 Andreas Sturmlechner
0 siblings, 0 replies; 3+ messages in thread
From: Andreas Sturmlechner @ 2025-08-25 18:54 UTC (permalink / raw
To: gentoo-commits
commit: d0a2d3c3e3c66808658e373b66e23accc4e4ac62
Author: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
AuthorDate: Mon Aug 25 18:48:14 2025 +0000
Commit: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Mon Aug 25 18:54:01 2025 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=d0a2d3c3
kde-apps/ktouch: Use fixed upstreamed patch
See also:
https://invent.kde.org/education/ktouch/-/merge_requests/48
Thanks-to: Alfred Wingate <parona <AT> protonmail.com>
Closes: https://bugs.gentoo.org/960368
Signed-off-by: Andreas Sturmlechner <asturm <AT> gentoo.org>
.../ktouch-25.07.80-duplicate-kdoctools.patch | 29 --------------
.../files/ktouch-25.08.0-duplicate-kdoctools.patch | 46 ++++++++++++++++++++++
kde-apps/ktouch/ktouch-25.07.70_pre20250628.ebuild | 2 +-
kde-apps/ktouch/ktouch-25.08.0.ebuild | 2 +
4 files changed, 49 insertions(+), 30 deletions(-)
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
deleted file mode 100644
index eb85d650a898..000000000000
--- a/kde-apps/ktouch/files/ktouch-25.07.80-duplicate-kdoctools.patch
+++ /dev/null
@@ -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
-
diff --git a/kde-apps/ktouch/files/ktouch-25.08.0-duplicate-kdoctools.patch b/kde-apps/ktouch/files/ktouch-25.08.0-duplicate-kdoctools.patch
new file mode 100644
index 000000000000..08a125ee49c0
--- /dev/null
+++ b/kde-apps/ktouch/files/ktouch-25.08.0-duplicate-kdoctools.patch
@@ -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
+
diff --git a/kde-apps/ktouch/ktouch-25.07.70_pre20250628.ebuild b/kde-apps/ktouch/ktouch-25.07.70_pre20250628.ebuild
index 800af949ac14..6f92420ed872 100644
--- a/kde-apps/ktouch/ktouch-25.07.70_pre20250628.ebuild
+++ b/kde-apps/ktouch/ktouch-25.07.70_pre20250628.ebuild
@@ -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=(
diff --git a/kde-apps/ktouch/ktouch-25.08.0.ebuild b/kde-apps/ktouch/ktouch-25.08.0.ebuild
index 36ba5817b158..8999663b3d30 100644
--- a/kde-apps/ktouch/ktouch-25.08.0.ebuild
+++ b/kde-apps/ktouch/ktouch-25.08.0.ebuild
@@ -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)
^ permalink raw reply related [flat|nested] 3+ messages in thread
end of thread, other threads:[~2025-08-25 18:54 UTC | newest]
Thread overview: 3+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2025-08-25 18:54 [gentoo-commits] repo/gentoo:master commit in: kde-apps/ktouch/files/, kde-apps/ktouch/ Andreas Sturmlechner
-- strict thread matches above, loose matches on Subject: below --
2025-07-19 11:03 Andreas Sturmlechner
2016-12-19 20:08 Johannes Huber
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox