commit: c07953455ae3acac71173fce431a120cd3d0c91f Author: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org> AuthorDate: Sun Apr 4 15:21:57 2021 +0000 Commit: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org> CommitDate: Sun Apr 4 16:30:20 2021 +0000 URL: https://gitweb.gentoo.org/proj/kde.git/commit/?id=c0795345
kde-apps/kaccounts-providers: Add IUSE=webengine (Nextcloud plugin) Bug: https://bugs.gentoo.org/753274 Package-Manager: Portage-3.0.18, Repoman-3.0.3 Signed-off-by: Andreas Sturmlechner <asturm <AT> gentoo.org> ...ts-providers-20.12.3-qtwebengine-optional.patch | 81 ++++++++++++++++++++++ .../kaccounts-providers-9999.ebuild | 13 +++- kde-apps/kaccounts-providers/metadata.xml | 3 + 3 files changed, 95 insertions(+), 2 deletions(-) diff --git a/kde-apps/kaccounts-providers/files/kaccounts-providers-20.12.3-qtwebengine-optional.patch b/kde-apps/kaccounts-providers/files/kaccounts-providers-20.12.3-qtwebengine-optional.patch new file mode 100644 index 0000000000..02e5c9ee1d --- /dev/null +++ b/kde-apps/kaccounts-providers/files/kaccounts-providers-20.12.3-qtwebengine-optional.patch @@ -0,0 +1,81 @@ +From 7a22a7fb85804c834c4597adca4a69dd5a82ffa4 Mon Sep 17 00:00:00 2001 +From: Andreas Sturmlechner <[email protected]> +Date: Sun, 4 Apr 2021 17:01:12 +0200 +Subject: [PATCH] Make Qt5WebEngine optional + +Qt5WebEngine is a very big package and not easily available on every +architecture. It should be optional at least when easily possible. + +Signed-off-by: Andreas Sturmlechner <[email protected]> +--- + CMakeLists.txt | 9 ++++++++- + plugins/CMakeLists.txt | 4 +++- + providers/CMakeLists.txt | 9 +++++---- + services/CMakeLists.txt | 9 +++++---- + 4 files changed, 21 insertions(+), 10 deletions(-) + +diff --git a/CMakeLists.txt b/CMakeLists.txt +index 3c7207b..906893e 100644 +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -16,10 +16,17 @@ set(CMAKE_CXX_STANDARD_REQUIRED ON) + find_package(ECM ${KF5_MIN_VERSION} REQUIRED NO_MODULE) + set(CMAKE_MODULE_PATH "${CMAKE_CURRENT_SOURCE_DIR}/cmake/modules" ${ECM_MODULE_PATH}) + ++include(FeatureSummary) ++ + find_package(Intltool REQUIRED) + find_package(KAccounts REQUIRED) + +-find_package(Qt5 ${QT_REQUIRED_VERSION} CONFIG REQUIRED Core Qml WebEngine) ++find_package(Qt5 ${QT_REQUIRED_VERSION} CONFIG REQUIRED Core Qml) ++find_package(Qt5WebEngine ${QT_REQUIRED_VERSION} CONFIG) ++set_package_properties(Qt5WebEngine ++ PROPERTIES TYPE OPTIONAL ++ PURPOSE "Required for Nextcloud Accounts plugin" ++ ) + find_package(KF5 ${KF5_MIN_VERSION} REQUIRED KIO I18n Declarative Package) + + include(KDEInstallDirs) +diff --git a/plugins/CMakeLists.txt b/plugins/CMakeLists.txt +index 3ea1817..f87b8f6 100644 +--- a/plugins/CMakeLists.txt ++++ b/plugins/CMakeLists.txt +@@ -1,2 +1,4 @@ + add_subdirectory(owncloud-ui) +-add_subdirectory(nextcloud-ui) +\ No newline at end of file ++if(Qt5WebEngine_FOUND) ++ add_subdirectory(nextcloud-ui) ++endif() +diff --git a/providers/CMakeLists.txt b/providers/CMakeLists.txt +index 987fb6e..cff3420 100644 +--- a/providers/CMakeLists.txt ++++ b/providers/CMakeLists.txt +@@ -1,4 +1,5 @@ +-file(GLOB provider_in_files *.provider.in) +-foreach(provider_in_file ${provider_in_files}) +- kaccounts_add_provider(${provider_in_file}) +-endforeach() ++kaccounts_add_provider(google.provider.in) ++kaccounts_add_provider(owncloud.provider.in) ++if(Qt5WebEngine_FOUND) ++ kaccounts_add_provider(nextcloud.provider.in) ++endif() +diff --git a/services/CMakeLists.txt b/services/CMakeLists.txt +index 93e14fc..cc58f91 100644 +--- a/services/CMakeLists.txt ++++ b/services/CMakeLists.txt +@@ -1,4 +1,5 @@ +-file(GLOB service_files_in *.service.in) +-foreach(service_file_in ${service_files_in}) +- kaccounts_add_service(${service_file_in}) +-endforeach() ++kaccounts_add_service(owncloud-storage.service.in) ++if(Qt5WebEngine_FOUND) ++ kaccounts_add_service(nextcloud-contacts.service.in) ++ kaccounts_add_service(nextcloud-storage.service.in) ++endif() +-- +2.31.1 + diff --git a/kde-apps/kaccounts-providers/kaccounts-providers-9999.ebuild b/kde-apps/kaccounts-providers/kaccounts-providers-9999.ebuild index a27d1f36cc..ea36346b76 100644 --- a/kde-apps/kaccounts-providers/kaccounts-providers-9999.ebuild +++ b/kde-apps/kaccounts-providers/kaccounts-providers-9999.ebuild @@ -14,7 +14,7 @@ HOMEPAGE="https://community.kde.org/KTp"; LICENSE="LGPL-2.1" SLOT="5" KEYWORDS="" -IUSE="" +IUSE="+webengine" BDEPEND=" dev-util/intltool @@ -22,7 +22,6 @@ BDEPEND=" DEPEND=" >=dev-qt/qtdeclarative-${QTMIN}:5 >=dev-qt/qtgui-${QTMIN}:5 - >=dev-qt/qtwebengine-${QTMIN}:5 >=dev-qt/qtxml-${QTMIN}:5 >=kde-apps/kaccounts-integration-${PVCUT}:5 >=kde-frameworks/kcoreaddons-${KFMIN}:5 @@ -30,8 +29,18 @@ DEPEND=" >=kde-frameworks/ki18n-${KFMIN}:5 >=kde-frameworks/kio-${KFMIN}:5 >=kde-frameworks/kpackage-${KFMIN}:5 + webengine? ( >=dev-qt/qtwebengine-${QTMIN}:5 ) " RDEPEND="${DEPEND} net-libs/signon-oauth2 net-libs/signon-ui " + +PATCHES=( "${FILESDIR}/${PN}-20.12.3-qtwebengine-optional.patch" ) # bug 753274 + +src_configure() { + local mycmakeargs=( + $(cmake_use_find_package webengine Qt5WebEngine) + ) + ecm_src_configure +} diff --git a/kde-apps/kaccounts-providers/metadata.xml b/kde-apps/kaccounts-providers/metadata.xml index 2fdbf33d96..915d461d65 100644 --- a/kde-apps/kaccounts-providers/metadata.xml +++ b/kde-apps/kaccounts-providers/metadata.xml @@ -5,4 +5,7 @@ <email>[email protected]</email> <name>Gentoo KDE Project</name> </maintainer> + <use> + <flag name="webengine">Enable Nextcloud KAccounts plugin using <pkg>dev-qt/qtwebengine</pkg></flag> + </use> </pkgmetadata>
