diff options
author | Andreas Sturmlechner <asturm@gentoo.org> | 2021-11-28 14:07:52 +0100 |
---|---|---|
committer | Andreas Sturmlechner <asturm@gentoo.org> | 2021-11-29 14:51:43 +0100 |
commit | e88be3af29813b00b5ddb7a340327648bd5a1b26 (patch) | |
tree | 893e3f694067b1099eaee93cfdba42d8c24dbca7 /kde-apps/kaccounts-providers | |
parent | kde-apps/kaccounts-integration: drop 21.04.3* (diff) | |
download | gentoo-e88be3af29813b00b5ddb7a340327648bd5a1b26.tar.gz gentoo-e88be3af29813b00b5ddb7a340327648bd5a1b26.tar.bz2 gentoo-e88be3af29813b00b5ddb7a340327648bd5a1b26.zip |
kde-apps/kaccounts-providers: drop 21.04.3*
Signed-off-by: Andreas Sturmlechner <asturm@gentoo.org>
Diffstat (limited to 'kde-apps/kaccounts-providers')
3 files changed, 0 insertions, 128 deletions
diff --git a/kde-apps/kaccounts-providers/Manifest b/kde-apps/kaccounts-providers/Manifest index 3b967b6158e0..e27923a433ff 100644 --- a/kde-apps/kaccounts-providers/Manifest +++ b/kde-apps/kaccounts-providers/Manifest @@ -1,2 +1 @@ -DIST kaccounts-providers-21.04.3.tar.xz 62920 BLAKE2B 6f399fe0bc8127f085e8e8b3071b048f5c9dc52b6cb81d5ecf8e7383ef120b9954fe616f55564b06d7c189301bf9d7874338f6f2fad8274254c71a410a5838a0 SHA512 429bbe610c2613da430b3a641e374eb98d81f874c63a508a30f7acda2774a0dc31bf5fbf26a142dee15f4ec8556ecb2a28d78d67b6378177ec00d68204512055 DIST kaccounts-providers-21.08.3.tar.xz 63488 BLAKE2B 6ba3d6d093048fd4b71210ce207788288bb753f432805dfa1ea690e2e5a864f8b52bc09c1975936f7b31ca067891574c7453e7887a757556ae7ba28d95bc3ed0 SHA512 5cfd92a8b1c57745c349b6f4ceb4d0773d94129be3ab6a96fa489737800ad76514dd35b8bfe42ac6432179ed21d2f6761fc24471dacebcf64a98dd65cd4e7a88 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 deleted file mode 100644 index 02e5c9ee1d93..000000000000 --- a/kde-apps/kaccounts-providers/files/kaccounts-providers-20.12.3-qtwebengine-optional.patch +++ /dev/null @@ -1,81 +0,0 @@ -From 7a22a7fb85804c834c4597adca4a69dd5a82ffa4 Mon Sep 17 00:00:00 2001 -From: Andreas Sturmlechner <asturm@gentoo.org> -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 <asturm@gentoo.org> ---- - 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-21.04.3.ebuild b/kde-apps/kaccounts-providers/kaccounts-providers-21.04.3.ebuild deleted file mode 100644 index 1fd67a2841a7..000000000000 --- a/kde-apps/kaccounts-providers/kaccounts-providers-21.04.3.ebuild +++ /dev/null @@ -1,46 +0,0 @@ -# Copyright 1999-2021 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 - -PVCUT=$(ver_cut 1-3) -KFMIN=5.80.0 -QTMIN=5.15.2 -inherit ecm kde.org - -DESCRIPTION="KDE accounts providers" -HOMEPAGE="https://community.kde.org/KTp" - -LICENSE="LGPL-2.1" -SLOT="5" -KEYWORDS="amd64 arm64 ~ppc64 x86" -IUSE="+webengine" - -BDEPEND=" - dev-util/intltool -" -DEPEND=" - >=dev-qt/qtdeclarative-${QTMIN}:5 - >=dev-qt/qtgui-${QTMIN}:5 - >=dev-qt/qtxml-${QTMIN}:5 - >=kde-apps/kaccounts-integration-${PVCUT}:5 - >=kde-frameworks/kcoreaddons-${KFMIN}:5 - >=kde-frameworks/kdeclarative-${KFMIN}:5 - >=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 -} |