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

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

[Michael Palimaka]

commit:     66320d258970ef4fb44f03cf9fab82bcb084f912
Author:     Andreas Sturmlechner <andreas.sturmlechner <AT> gmail <DOT> com>
AuthorDate: Tue Feb  3 17:15:24 2015 +0000
Commit:     Michael Palimaka <kensington <AT> gentoo <DOT> org>
CommitDate: Tue Feb  3 17:22:56 2015 +0000
URL:        http://sources.gentoo.org/gitweb/?p=proj/kde.git;a=commit;h=66320d25

[kde-apps/kate] Tests patch upstreamed

Package-Manager: portage-2.2.15

---
 kde-apps/kate/files/kate-9999-tests-optional.patch | 15 ---------------
 kde-apps/kate/kate-9999.ebuild                     |  2 --
 2 files changed, 17 deletions(-)

diff --git a/kde-apps/kate/files/kate-9999-tests-optional.patch b/kde-apps/kate/files/kate-9999-tests-optional.patch
deleted file mode 100644
index f7e29ef..0000000
--- a/kde-apps/kate/files/kate-9999-tests-optional.patch
+++ /dev/null
@@ -1,15 +0,0 @@
---- a/CMakeLists.txt	2015-01-21 21:44:44.786490427 +0100
-+++ b/CMakeLists.txt	2015-01-21 22:07:15.833138021 +0100
-@@ -30,7 +30,11 @@
- include(KDECMakeSettings)
- include(KDECompilerSettings)
- 
--find_package(Qt5 ${QT_MIN_VERSION} CONFIG REQUIRED Core DBus Widgets Script Sql Test)
-+find_package(Qt5 ${QT_MIN_VERSION} CONFIG REQUIRED Core DBus Widgets Script Sql)
-+
-+if(BUILD_TESTING)
-+  find_package(Qt5Test ${QT_MIN_VERSION} CONFIG REQUIRED)
-+endif()
- 
- # Load the frameworks we need
- find_package(KF5 REQUIRED COMPONENTS

diff --git a/kde-apps/kate/kate-9999.ebuild b/kde-apps/kate/kate-9999.ebuild
index 6f556c7..61b78ce 100644
--- a/kde-apps/kate/kate-9999.ebuild
+++ b/kde-apps/kate/kate-9999.ebuild
@@ -54,8 +54,6 @@ RDEPEND="${DEPEND}
 	!kde-base/kate:4
 "
 
-PATCHES=( "${FILESDIR}/${PN}-9999-tests-optional.patch" )
-
 src_configure() {
 	local mycmakeargs=(
 		$(cmake-utils_use_build addons)

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

[Andreas Sturmlechner]

commit:     5d3990053ff7154b2e569ea048446c2ef8106d4f
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 17:55:13 2021 +0000
URL:        https://gitweb.gentoo.org/proj/kde.git/commit/?id=5d399005

kde-apps/kate: Fix and add implicit dependency

Upstream commit: 93d8c2a1887ab70455f471d8e05f346921497a36

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

Reported-by: Marco Genasci <fedeliallalinea <AT> gmail.com>
Bug: 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     | 69 ++++++++++++++++++++++
 kde-apps/kate/kate-21.04.49.9999.ebuild            |  6 ++
 kde-apps/kate/kate-9999.ebuild                     |  1 +
 3 files changed, 76 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 0000000000..482d9a872c
--- /dev/null
+++ b/kde-apps/kate/files/kate-21.04.0-implicit-dep.patch
@@ -0,0 +1,69 @@
+From 93d8c2a1887ab70455f471d8e05f346921497a36 Mon Sep 17 00:00:00 2001
+From: Andreas Sturmlechner <asturm@gentoo.org>
+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@gentoo.org>
+---
+ addons/project/CMakeLists.txt | 4 +++-
+ addons/search/CMakeLists.txt  | 6 ++++--
+ 2 files changed, 7 insertions(+), 3 deletions(-)
+
+diff --git a/addons/project/CMakeLists.txt b/addons/project/CMakeLists.txt
+index 16487f6cc..b1f66ada3 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()
+ 
+@@ -19,6 +20,7 @@ target_compile_definitions(kateprojectplugin PRIVATE TRANSLATION_DOMAIN="katepro
+ target_link_libraries(
+   kateprojectplugin
+   PRIVATE
++    Qt5::Concurrent
+     KF5::GuiAddons
+     KF5::NewStuff
+     KF5::TextEditor
+diff --git a/addons/search/CMakeLists.txt b/addons/search/CMakeLists.txt
+index 9bbe2c1c9..a541f78b8 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,8 +10,9 @@ add_library(katesearchplugin MODULE "")
+ target_compile_definitions(katesearchplugin PRIVATE TRANSLATION_DOMAIN="katesearch")
+ 
+ target_link_libraries(
+-  katesearchplugin 
++  katesearchplugin
+   PRIVATE
++    Qt5::Concurrent
+     KF5::ItemViews
+     KF5::TextEditor
+ )
+-- 
+2.31.1
+

diff --git a/kde-apps/kate/kate-21.04.49.9999.ebuild b/kde-apps/kate/kate-21.04.49.9999.ebuild
index c5a0ab5919..20c4559309 100644
--- a/kde-apps/kate/kate-21.04.49.9999.ebuild
+++ b/kde-apps/kate/kate-21.04.49.9999.ebuild
@@ -20,6 +20,7 @@ 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
@@ -61,6 +62,11 @@ DEPEND="
 "
 RDEPEND="${DEPEND}"
 
+PATCHES=(
+	# bug 785412, master/21.08
+	"${FILESDIR}/${PN}-21.04.0-implicit-dep.patch"
+)
+
 src_prepare() {
 	ecm_src_prepare
 

diff --git a/kde-apps/kate/kate-9999.ebuild b/kde-apps/kate/kate-9999.ebuild
index cbe259e071..8440e6829b 100644
--- a/kde-apps/kate/kate-9999.ebuild
+++ b/kde-apps/kate/kate-9999.ebuild
@@ -20,6 +20,7 @@ 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