diff options
| author |   Andreas Sturmlechner <asturm@gentoo.org> | 2021-04-24 18:16:08 +0200 |
|---|---|---|
| committer | Andreas Sturmlechner <asturm@gentoo.org> | 2021-04-24 19:55:13 +0200 |
| commit | 5d3990053ff7154b2e569ea048446c2ef8106d4f (patch) | |
| tree | 68a1988790cb500ade0d211b5772d9e43dc69bd6 | |
| parent | sys-libs/kpmcore: drop 21.04.0* (diff) | |
| download | kde-5d399005.tar.gz kde-5d399005.tar.bz2 kde-5d399005.zip | |
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@gmail.com>
Bug: https://bugs.gentoo.org/785412
Package-Manager: Portage-3.0.18, Repoman-3.0.3
Signed-off-by: Andreas Sturmlechner <asturm@gentoo.org>
| -rw-r--r-- | kde-apps/kate/files/kate-21.04.0-implicit-dep.patch | 69 | ||||
| -rw-r--r-- | kde-apps/kate/kate-21.04.49.9999.ebuild | 6 | ||||
| -rw-r--r-- | kde-apps/kate/kate-9999.ebuild | 1 |
3 files changed, 76 insertions, 0 deletions
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 |