From afdef498028112c60b29fd74c4eaec102c2a7dc8 Mon Sep 17 00:00:00 2001 From: Andreas Sturmlechner Date: Sun, 8 Dec 2019 18:18:01 +0100 Subject: kde-frameworks/purpose: Add USE dolphin, RDEPENDs, ecm_find_qmlmodule Add USE dolphin and missing RDEPEND Upstream commit 8d7123896b988384c756cb948667ea08b86533f4 Bug: https://bugs.gentoo.org/700830 Package-Manager: Portage-2.3.81, Repoman-2.3.20 Signed-off-by: Andreas Sturmlechner --- .../files/purpose-5.64.0-ecmqmlmodules.patch | 32 ++++++++++++ kde-frameworks/purpose/metadata.xml | 1 + kde-frameworks/purpose/purpose-5.64.0-r2.ebuild | 60 ++++++++++++++++++++++ 3 files changed, 93 insertions(+) create mode 100644 kde-frameworks/purpose/files/purpose-5.64.0-ecmqmlmodules.patch create mode 100644 kde-frameworks/purpose/purpose-5.64.0-r2.ebuild (limited to 'kde-frameworks/purpose') 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 000000000000..2cae935c7329 --- /dev/null +++ b/kde-frameworks/purpose/files/purpose-5.64.0-ecmqmlmodules.patch @@ -0,0 +1,32 @@ +From 7ba45fdc2b9d0c599497495387a70d3d5ddad5c4 Mon Sep 17 00:00:00 2001 +From: Andreas Sturmlechner +Date: Sun, 8 Dec 2019 15:26:18 +0100 +Subject: [PATCH] Use standard ECMQMLModules + +--- + 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/metadata.xml b/kde-frameworks/purpose/metadata.xml index 69186b245f38..6732ba335aca 100644 --- a/kde-frameworks/purpose/metadata.xml +++ b/kde-frameworks/purpose/metadata.xml @@ -6,6 +6,7 @@ Gentoo KDE Project + Enable support for sharing files from kde-apps/dolphin Enable support for system-wide defined KAccounts diff --git a/kde-frameworks/purpose/purpose-5.64.0-r2.ebuild b/kde-frameworks/purpose/purpose-5.64.0-r2.ebuild new file mode 100644 index 000000000000..409caa0c2954 --- /dev/null +++ b/kde-frameworks/purpose/purpose-5.64.0-r2.ebuild @@ -0,0 +1,60 @@ +# Copyright 1999-2019 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=7 + +ECM_QTHELP="false" +ECM_TEST="forceoptional" +PVCUT=$(ver_cut 1-2) +QTMIN=5.12.3 +inherit ecm kde.org + +DESCRIPTION="Library for providing abstractions to get the developer's purposes fulfilled" +LICENSE="LGPL-2.1+" +KEYWORDS="~amd64 ~x86" +IUSE="+dolphin +kaccounts" + +DEPEND=" + >=dev-qt/qtdeclarative-${QTMIN}:5 + >=dev-qt/qtgui-${QTMIN}:5 + >=dev-qt/qtnetwork-${QTMIN}:5 + >=dev-qt/qtwidgets-${QTMIN}:5 + >=kde-frameworks/kcoreaddons-${PVCUT}:5 + >=kde-frameworks/ki18n-${PVCUT}:5 + >=kde-frameworks/kio-${PVCUT}:5 + >=kde-frameworks/kirigami-${PVCUT}:5 + dolphin? ( >=kde-frameworks/knotifications-${PVCUT}:5 ) + kaccounts? ( + >=kde-apps/kaccounts-integration-19.04.3:5 + net-libs/accounts-qt + ) +" +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 dolphin KF5Notifications) + $(cmake_use_find_package kaccounts KAccounts) + ) + + ecm_src_configure +} + +pkg_postinst(){ + ecm_pkg_postinst + + if ! has_version "kde-misc/kdeconnect[app]" ; then + elog "Optional runtime dependency:" + elog "kde-misc/kdeconnect[app] (send through KDE Connect)" + fi +} -- cgit v1.2.3-65-gdbad