[gentoo-commits] repo/gentoo:master commit in: kde-apps/kate/files/, kde-apps/kate/

[Andreas Sturmlechner]

commit:     ed4e6d1552269246fd472bc57b16edd38903768b
Author:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
AuthorDate: Sat Apr 24 16:16:08 2021 +0000
Commit:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Sat Apr 24 16:51:59 2021 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=ed4e6d15

kde-apps/kate: Fix and add implicit dependency

See also: https://invent.kde.org/utilities/kate/-/merge_requests/369

Reported-by: Marco Genasci <fedeliallalinea <AT> gmail.com>
Closes: https://bugs.gentoo.org/785412
Package-Manager: Portage-3.0.18, Repoman-3.0.3
Signed-off-by: Andreas Sturmlechner <asturm <AT> gentoo.org>

 .../kate/files/kate-21.04.0-implicit-dep.patch     |  70 +++++++++++++
 kde-apps/kate/kate-21.04.0-r1.ebuild               | 108 +++++++++++++++++++++
 2 files changed, 178 insertions(+)

diff --git a/kde-apps/kate/files/kate-21.04.0-implicit-dep.patch b/kde-apps/kate/files/kate-21.04.0-implicit-dep.patch
new file mode 100644
index 00000000000..055a6bc9bec
--- /dev/null
+++ b/kde-apps/kate/files/kate-21.04.0-implicit-dep.patch
@@ -0,0 +1,70 @@
+From 07e6813244435c93a944cca17dc3c4364a579606 Mon Sep 17 00:00:00 2001
+From: Andreas Sturmlechner <asturm@g.o>
+Date: Sat, 24 Apr 2021 18:08:33 +0200
+Subject: [PATCH] addons: Add missing Qt5Concurrent to project and search
+
+Implicit use via KIO.
+
+See also: https://invent.kde.org/frameworks/kio/-/merge_requests/426
+
+Signed-off-by: Andreas Sturmlechner <asturm@g.o>
+---
+ addons/project/CMakeLists.txt | 5 ++++-
+ addons/search/CMakeLists.txt  | 7 +++++--
+ 2 files changed, 9 insertions(+), 3 deletions(-)
+
+diff --git a/addons/project/CMakeLists.txt b/addons/project/CMakeLists.txt
+index 16487f6cc..6fbf5a819 100644
+--- a/addons/project/CMakeLists.txt
++++ b/addons/project/CMakeLists.txt
+@@ -1,3 +1,4 @@
++find_package(Qt5Concurrent ${QT_MIN_VERSION} QUIET)
+ find_package(
+   KF5 ${KF5_DEP_VERSION}
+   QUIET
+@@ -9,7 +10,7 @@ find_package(
+ set_package_properties(KFGuiAddons PROPERTIES PURPOSE "Required to build the project addon")
+ set_package_properties(KF5NewStuff PROPERTIES PURPOSE "Required to build the project addon")
+ 
+-if(NOT KF5_FOUND)
++if(NOT KF5_FOUND OR NOT Qt5Concurrent_FOUND)
+   return()
+ endif()
+ 
+@@ -18,6 +19,8 @@ target_compile_definitions(kateprojectplugin PRIVATE TRANSLATION_DOMAIN="katepro
+ 
+ target_link_libraries(
+   kateprojectplugin
++  PUBLIC
++    Qt5::Concurrent
+   PRIVATE
+     KF5::GuiAddons
+     KF5::NewStuff
+diff --git a/addons/search/CMakeLists.txt b/addons/search/CMakeLists.txt
+index 9bbe2c1c9..8dc18699b 100644
+--- a/addons/search/CMakeLists.txt
++++ b/addons/search/CMakeLists.txt
+@@ -1,7 +1,8 @@
++find_package(Qt5Concurrent ${QT_MIN_VERSION} QUIET)
+ find_package(KF5ItemViews ${KF5_DEP_VERSION} QUIET)
+ set_package_properties(KF5ItemViews PROPERTIES PURPOSE "Required to build the search addon")
+ 
+-if(NOT KF5ItemViews_FOUND)
++if(NOT KF5ItemViews_FOUND OR NOT Qt5Concurrent_FOUND)
+   return()
+ endif()
+ 
+@@ -9,7 +10,9 @@ add_library(katesearchplugin MODULE "")
+ target_compile_definitions(katesearchplugin PRIVATE TRANSLATION_DOMAIN="katesearch")
+ 
+ target_link_libraries(
+-  katesearchplugin 
++  katesearchplugin
++  PUBLIC
++    Qt5::Concurrent
+   PRIVATE
+     KF5::ItemViews
+     KF5::TextEditor
+-- 
+2.31.1
+

diff --git a/kde-apps/kate/kate-21.04.0-r1.ebuild b/kde-apps/kate/kate-21.04.0-r1.ebuild
new file mode 100644
index 00000000000..595730cc0ff
--- /dev/null
+++ b/kde-apps/kate/kate-21.04.0-r1.ebuild
@@ -0,0 +1,108 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+ECM_HANDBOOK="optional"
+ECM_TEST="true"
+KFMIN=5.80.0
+QTMIN=5.15.2
+VIRTUALX_REQUIRED="test"
+inherit ecm kde.org optfeature
+
+DESCRIPTION="Multi-document editor with network transparency, Plasma integration and more"
+HOMEPAGE="https://kate-editor.org/ https://apps.kde.org/en/kate"
+
+LICENSE="GPL-2" # TODO: CHECK
+SLOT="5"
+KEYWORDS="~amd64 ~arm64 ~ppc64 ~x86"
+IUSE="activities +filebrowser lspclient +projects plasma +snippets sql telemetry"
+
+# only addons/externaltools depends on kiconthemes, too small for USE
+DEPEND="
+	>=dev-qt/qtconcurrent-${QTMIN}:5
+	>=dev-qt/qtdbus-${QTMIN}:5
+	>=dev-qt/qtgui-${QTMIN}:5
+	>=dev-qt/qtwidgets-${QTMIN}:5
+	>=dev-qt/qtxml-${QTMIN}:5
+	>=kde-frameworks/kcodecs-${KFMIN}:5
+	>=kde-frameworks/kcompletion-${KFMIN}:5
+	>=kde-frameworks/kconfig-${KFMIN}:5
+	>=kde-frameworks/kconfigwidgets-${KFMIN}:5
+	>=kde-frameworks/kcoreaddons-${KFMIN}:5
+	>=kde-frameworks/kcrash-${KFMIN}:5
+	>=kde-frameworks/kdbusaddons-${KFMIN}:5
+	>=kde-frameworks/kguiaddons-${KFMIN}:5
+	>=kde-frameworks/ki18n-${KFMIN}:5
+	>=kde-frameworks/kiconthemes-${KFMIN}:5
+	>=kde-frameworks/kio-${KFMIN}:5
+	>=kde-frameworks/kitemviews-${KFMIN}:5
+	>=kde-frameworks/kjobwidgets-${KFMIN}:5
+	>=kde-frameworks/kparts-${KFMIN}:5
+	>=kde-frameworks/kservice-${KFMIN}:5
+	>=kde-frameworks/ktexteditor-${KFMIN}:5
+	>=kde-frameworks/ktextwidgets-${KFMIN}:5
+	>=kde-frameworks/kwidgetsaddons-${KFMIN}:5
+	>=kde-frameworks/kwindowsystem-${KFMIN}:5
+	>=kde-frameworks/kxmlgui-${KFMIN}:5
+	activities? ( >=kde-frameworks/kactivities-${KFMIN}:5 )
+	filebrowser? ( >=kde-frameworks/kbookmarks-${KFMIN}:5 )
+	lspclient? ( >=kde-frameworks/kitemmodels-${KFMIN}:5 )
+	plasma? ( >=kde-frameworks/plasma-${KFMIN}:5 )
+	projects? (
+		>=kde-frameworks/knewstuff-${KFMIN}:5
+		>=kde-frameworks/threadweaver-${KFMIN}:5
+	)
+	snippets? ( >=kde-frameworks/knewstuff-${KFMIN}:5 )
+	sql? (
+		>=dev-qt/qtsql-${QTMIN}:5
+		>=kde-frameworks/kwallet-${KFMIN}:5
+	)
+	telemetry? ( dev-libs/kuserfeedback:5 )
+"
+RDEPEND="${DEPEND}"
+
+PATCHES=( "${FILESDIR}/${P}-implicit-dep.patch" ) # bug 785412
+
+src_prepare() {
+	ecm_src_prepare
+
+	# delete colliding kwrite translations
+	if [[ ${KDE_BUILD_TYPE} = release ]]; then
+		find po -type f -name "*po" -and -name "kwrite*" -delete || die
+		rm -rf po/*/docs/kwrite || die
+	fi
+}
+
+src_configure() {
+	local mycmakeargs=(
+		$(cmake_use_find_package activities KF5Activities)
+		-DBUILD_filebrowser=$(usex filebrowser)
+		-DBUILD_lspclient=$(usex lspclient)
+		-DBUILD_sessionapplet=$(usex plasma)
+		-DBUILD_project=$(usex projects)
+		-DBUILD_snippets=$(usex snippets)
+		-DBUILD_katesql=$(usex sql)
+		-DBUILD_kwrite=FALSE
+		$(cmake_use_find_package telemetry KUserFeedback)
+	)
+
+	ecm_src_configure
+}
+
+src_test() {
+	# tests hang
+	local myctestargs=(
+		-E "(session_manager_test|sessions_action_test)"
+	)
+
+	ecm_src_test
+}
+
+pkg_postinst() {
+	if [[ -z "${REPLACING_VERSIONS}" ]]; then
+		optfeature "Markdown text previews" kde-misc/markdownpart:${SLOT} kde-misc/kmarkdownwebview:${SLOT}
+		optfeature "DOT graph file previews" media-gfx/kgraphviewer
+	fi
+	ecm_pkg_postinst
+}