commit: efa0fa211dbc67d3c0d7b8360d5b36ac49b4686e Author: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org> AuthorDate: Sun Dec 8 16:54:19 2019 +0000 Commit: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org> CommitDate: Sun Dec 8 16:55:59 2019 +0000 URL: https://gitweb.gentoo.org/proj/kde.git/commit/?id=efa0fa21
kde-frameworks/purpose: Add more missing RDEPENDs, use ecm_find_qmlmodule Upstream commit 8d7123896b988384c756cb948667ea08b86533f4 Bug: https://bugs.gentoo.org/700830 Package-Manager: Portage-2.3.81, Repoman-2.3.20 Signed-off-by: Andreas Sturmlechner <asturm <AT> gentoo.org> .../files/purpose-5.64.0-ecmqmlmodules.patch | 45 ++++++++++++++++++++++ kde-frameworks/purpose/purpose-5.65.0.ebuild | 5 +++ kde-frameworks/purpose/purpose-9999.ebuild | 3 ++ 3 files changed, 53 insertions(+) diff --git a/kde-frameworks/purpose/files/purpose-5.64.0-ecmqmlmodules.patch b/kde-frameworks/purpose/files/purpose-5.64.0-ecmqmlmodules.patch new file mode 100644 index 0000000000..08cb748dda --- /dev/null +++ b/kde-frameworks/purpose/files/purpose-5.64.0-ecmqmlmodules.patch @@ -0,0 +1,45 @@ +From 8d7123896b988384c756cb948667ea08b86533f4 Mon Sep 17 00:00:00 2001 +From: Andreas Sturmlechner <[email protected]> +Date: Sun, 8 Dec 2019 15:44:14 +0100 +Subject: [PATCH] Use standard ECMQMLModules + +Summary: Superseded by standard ECM modules. + +Test Plan: Build succeeds. + +Reviewers: nicolasfella + +Reviewed By: nicolasfella + +Subscribers: kde-frameworks-devel + +Tags: #frameworks + +Differential Revision: https://phabricator.kde.org/D25809 +--- + src/plugins/CMakeLists.txt | 9 ++--- + 1 file changed, 4 insertions(+), 5 deletions(-) + +diff --git a/src/plugins/CMakeLists.txt b/src/plugins/CMakeLists.txt +index fa4637b..9790e76 100644 +--- a/src/plugins/CMakeLists.txt ++++ b/src/plugins/CMakeLists.txt +@@ -19,11 +19,10 @@ function(kpackage_install_package dir component root) + PATTERN Messages.sh EXCLUDE) + endfunction() + +-set(CMAKE_MODULE_PATH "${CMAKE_CURRENT_SOURCE_DIR}/cmake" ${CMAKE_MODULE_PATH}) +-include(QMLModules) +-find_qmlmodule(Ubuntu.OnlineAccounts 0.1) +-find_qmlmodule(org.kde.kdeconnect 1.0) +-find_qmlmodule(org.kde.kquickcontrolsaddons 2.0) ++include(ECMQMLModules) ++ecm_find_qmlmodule(Ubuntu.OnlineAccounts 0.1) ++ecm_find_qmlmodule(org.kde.kdeconnect 1.0) ++ecm_find_qmlmodule(org.kde.kquickcontrolsaddons 2.0) + + find_package(KAccounts) + find_package(KF5KIO ${KF5_DEP_VERSION} REQUIRED) +-- +2.24.0 + diff --git a/kde-frameworks/purpose/purpose-5.65.0.ebuild b/kde-frameworks/purpose/purpose-5.65.0.ebuild index c17304a984..4101f82df4 100644 --- a/kde-frameworks/purpose/purpose-5.65.0.ebuild +++ b/kde-frameworks/purpose/purpose-5.65.0.ebuild @@ -29,12 +29,17 @@ DEPEND=" ) " RDEPEND="${DEPEND} + >=dev-qt/qtquickcontrols-${QTMIN}:5 + >=dev-qt/qtquickcontrols2-${QTMIN}:5 + >=kde-frameworks/kdeclarative-${PVCUT}:5 kaccounts? ( net-libs/accounts-qml ) " # requires running environment RESTRICT+=" test" +PATCHES=( "${FILESDIR}/${PN}-5.64.0-ecmqmlmodules.patch" ) # git master + src_configure() { local mycmakeargs=( $(cmake_use_find_package kaccounts KAccounts) diff --git a/kde-frameworks/purpose/purpose-9999.ebuild b/kde-frameworks/purpose/purpose-9999.ebuild index b65015472e..07f4e00902 100644 --- a/kde-frameworks/purpose/purpose-9999.ebuild +++ b/kde-frameworks/purpose/purpose-9999.ebuild @@ -29,6 +29,9 @@ DEPEND=" ) " RDEPEND="${DEPEND} + >=dev-qt/qtquickcontrols-${QTMIN}:5 + >=dev-qt/qtquickcontrols2-${QTMIN}:5 + >=kde-frameworks/kdeclarative-${PVCUT}:5 kaccounts? ( net-libs/accounts-qml ) "
