From 623ee73d661e5ed8475cb264511f683407d87365 Mon Sep 17 00:00:00 2001 From: V3n3RiX Date: Sun, 12 Apr 2020 03:41:30 +0100 Subject: gentoo Easter resync : 12.04.2020 --- kde-misc/kio-gdrive/Manifest | 3 +- ...-gdrive-1.2.7-kaccounts-integration-20.04.patch | 97 ++++++++++++++++++++++ kde-misc/kio-gdrive/kio-gdrive-1.2.7.ebuild | 6 ++ 3 files changed, 105 insertions(+), 1 deletion(-) create mode 100644 kde-misc/kio-gdrive/files/kio-gdrive-1.2.7-kaccounts-integration-20.04.patch (limited to 'kde-misc/kio-gdrive') diff --git a/kde-misc/kio-gdrive/Manifest b/kde-misc/kio-gdrive/Manifest index 35b51adac763..f73bad16827e 100644 --- a/kde-misc/kio-gdrive/Manifest +++ b/kde-misc/kio-gdrive/Manifest @@ -1,4 +1,5 @@ AUX kio-gdrive-1.2.6-refresh-credentials.patch 4224 BLAKE2B f70a40eef14d31f296effb554308303fe9b82c21b8e3c3a56020d5548dfbd9a967ef27d24ac4b44398c681db64dabff87a088ad3e47fe9e5f962af2080471f31 SHA512 8fc99adb52f1e9b9c49c94357103a51d3de367ea1d5a98afe361910307fe1a424b9f0c5fb0ec1e5f0cc2183ac87f2d6cb1730ed12fecc76b68e8860317dfbedf +AUX kio-gdrive-1.2.7-kaccounts-integration-20.04.patch 3116 BLAKE2B 53ef65fff7e28afb813582131f69e8317eddff5689c6e2c046d62015163ab27d406697df8b75c1f1c120b56bcacd49f9502ff5c724ad6e02f0353e0f207bcd79 SHA512 f4eedfe7c2e83f7efe426797f27ea17cad5c9996cedddd341c190c3073e4a45a06d402603b15f4ea992a3a60d624b50d2cd48bd04202d39151cf4d7f3addb6b1 DIST kio-gdrive-1.2.7.tar.xz 46748 BLAKE2B 308c7d8d55c4eef175e2ef6030f1fbcdb59fdc6cd33f6c0bd5c35efe7bd21cf7f6cf7293b355f30b7b05effae79b91e357cc5a93ed866db850953f392bd65e0f SHA512 f1eedad2cd244e38f6cdf397e9488cb7f31fe7c4b17825f3b0882ff46f7f62f087e7b2bc59db434b4a55641920b8b03f3dec6adf7031ccc2277c7a0b166f9c80 -EBUILD kio-gdrive-1.2.7.ebuild 1221 BLAKE2B ab13eab2f2d26f78a5aaace01dd5a998bf2dd793ea1625f125adc76a1763cf3a68781188b0b710857292afb817445fe0969b8ac741543f2aea2b7fa4ec08b16a SHA512 2170bde2760adb8e134d802c5d66c2040353d4cd57e4269e0686f68503e354311d7e71e43aca111a87edd5e321e179f6a399449c8585bd0aff1771396369a83d +EBUILD kio-gdrive-1.2.7.ebuild 1383 BLAKE2B 758f52b4a494feb1f9dad578fce05caf322599af76a19e3c7482bd2bf12ae02e1677f77375c6fccc48c7ecb5f3bad98de982f8c0b00c5c51afaf5f5a2322816f SHA512 84dbfa0d327837bf40b57ee6024e22805b307ab77359c37de4fd8a302f1090aae996dd62ab781e7f31d84f3b1dfda26a587b818748850a1a705aa88fc9b6afef MISC metadata.xml 402 BLAKE2B 80f60bca3fa59b7e22727709066453e1002c786c2eda688aa437f86fd99d73aa4b8c35a22571d3f774c55d16b1a4267fb0242253fd38a45890701755cca72afa SHA512 2c94ff5a07cb0a89d93cf798ee2b9a9f163f448e9d6d3185c06d58b42c1a9ef480adfafd540a021d4f9ebab6bb78e979c74e9a83867abff13f66b2b35eaafd21 diff --git a/kde-misc/kio-gdrive/files/kio-gdrive-1.2.7-kaccounts-integration-20.04.patch b/kde-misc/kio-gdrive/files/kio-gdrive-1.2.7-kaccounts-integration-20.04.patch new file mode 100644 index 000000000000..bc6e7536e82b --- /dev/null +++ b/kde-misc/kio-gdrive/files/kio-gdrive-1.2.7-kaccounts-integration-20.04.patch @@ -0,0 +1,97 @@ +From 088fe1964fcf7150eb85dc66cbe3670489729f15 Mon Sep 17 00:00:00 2001 +From: Nicolas Fella +Date: Mon, 16 Mar 2020 10:39:08 +0100 +Subject: Adapt to new KAccounts plugin system + +Summary: KAccounts was ported from QPluginLoader to KPluginLoader in D27633. Adapt the KAccounts plugin to stay compatible + +Test Plan: Added a google account. Got a notification that my drive can now be used + +Reviewers: #kio_gdrive, elvisangelaccio + +Reviewed By: #kio_gdrive, elvisangelaccio + +Differential Revision: https://phabricator.kde.org/D27656 +--- + kaccounts/CMakeLists.txt | 1 + + kaccounts/kaccountsplugin.cpp | 10 ++++++++-- + kaccounts/kaccountsplugin.h | 5 +---- + kaccounts/kaccountsplugin.json | 12 ++++++++++++ + 4 files changed, 22 insertions(+), 6 deletions(-) + create mode 100644 kaccounts/kaccountsplugin.json + +diff --git a/kaccounts/CMakeLists.txt b/kaccounts/CMakeLists.txt +index 2a7e796..bb26513 100644 +--- a/kaccounts/CMakeLists.txt ++++ b/kaccounts/CMakeLists.txt +@@ -4,6 +4,7 @@ find_package(Intltool REQUIRED) + kaccounts_add_service(${CMAKE_CURRENT_SOURCE_DIR}/google-drive.service.in) + + kcoreaddons_add_plugin(kaccounts_gdrive ++ JSON kaccountsplugin.json + SOURCES kaccountsplugin.cpp + INSTALL_NAMESPACE kaccounts/daemonplugins) + +diff --git a/kaccounts/kaccountsplugin.cpp b/kaccounts/kaccountsplugin.cpp +index 5499f13..3e6fb7c 100644 +--- a/kaccounts/kaccountsplugin.cpp ++++ b/kaccounts/kaccountsplugin.cpp +@@ -25,8 +25,12 @@ + #include + #include + +-GoogleDrivePlugin::GoogleDrivePlugin(QObject *parent) +- : KAccountsDPlugin(parent) ++#include ++ ++K_PLUGIN_CLASS_WITH_JSON(GoogleDrivePlugin, "kaccountsplugin.json") ++ ++GoogleDrivePlugin::GoogleDrivePlugin(QObject *parent, const QVariantList &args) ++ : KAccountsDPlugin(parent, args) + { + } + +@@ -72,3 +76,5 @@ void GoogleDrivePlugin::onServiceDisabled(const Accounts::AccountId accountId, c + Q_UNUSED(accountId) + Q_UNUSED(service) + } ++ ++#include "kaccountsplugin.moc" +diff --git a/kaccounts/kaccountsplugin.h b/kaccounts/kaccountsplugin.h +index 82ae739..8613041 100644 +--- a/kaccounts/kaccountsplugin.h ++++ b/kaccounts/kaccountsplugin.h +@@ -24,11 +24,8 @@ + class GoogleDrivePlugin : public KAccountsDPlugin + { + Q_OBJECT +- Q_PLUGIN_METADATA(IID "org.kde.kaccounts.DPlugin") +- Q_INTERFACES(KAccountsDPlugin) +- + public: +- GoogleDrivePlugin(QObject *parent = nullptr); ++ explicit GoogleDrivePlugin(QObject *parent, const QVariantList &args); + + public slots: + void onAccountCreated(const Accounts::AccountId accountId, const Accounts::ServiceList &serviceList) override; +diff --git a/kaccounts/kaccountsplugin.json b/kaccounts/kaccountsplugin.json +new file mode 100644 +index 0000000..89e8142 +--- /dev/null ++++ b/kaccounts/kaccountsplugin.json +@@ -0,0 +1,12 @@ ++{ ++ "KPlugin": { ++ "Description": "Integrate KIO gdrive", ++ "EnabledByDefault": true, ++ "Icon": "system-file-manager", ++ "Id": "kaccounts_kio_gdrive", ++ "License": "GPL", ++ "Name": "KIO gdrive", ++ "Version": "0.1" ++ } ++} ++ +-- +cgit v1.1 + diff --git a/kde-misc/kio-gdrive/kio-gdrive-1.2.7.ebuild b/kde-misc/kio-gdrive/kio-gdrive-1.2.7.ebuild index 038869b249e7..a36f78862b12 100644 --- a/kde-misc/kio-gdrive/kio-gdrive-1.2.7.ebuild +++ b/kde-misc/kio-gdrive/kio-gdrive-1.2.7.ebuild @@ -44,6 +44,12 @@ DOCS=( README.md ) PATCHES=( "${FILESDIR}"/${PN}-1.2.6-refresh-credentials.patch ) +src_prepare() { + has_version ">=kde-apps/kaccounts-providers-20.03.80" && + PATCHES+=( "${FILESDIR}"/${P}-kaccounts-integration-20.04.patch ) + ecm_src_prepare +} + src_configure() { local mycmakeargs=( $(cmake_use_find_package kaccounts KAccounts) -- cgit v1.2.3