[gentoo-commits] repo/gentoo:master commit in: kde-misc/kio-gdrive/files/, kde-misc/kio-gdrive/

["Andreas Sturmlechner" <asturm@gentoo.org>]

commit:     11c675b24fa3170d778ca75eb4e094616ff2840b
Author:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
AuthorDate: Mon Mar 16 16:29:16 2020 +0000
Commit:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Mon Mar 16 21:25:46 2020 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=11c675b2

kde-misc/kio-gdrive: Fix build with >=kaccounts-integration-20.04

Upstream commit 088fe1964fcf7150eb85dc66cbe3670489729f15

Package-Manager: Portage-2.3.94, Repoman-2.3.21
Signed-off-by: Andreas Sturmlechner <asturm <AT> gentoo.org>

 ...-gdrive-1.2.7-kaccounts-integration-20.04.patch | 97 ++++++++++++++++++++++
 kde-misc/kio-gdrive/kio-gdrive-1.2.7.ebuild        |  5 +-
 2 files changed, 101 insertions(+), 1 deletion(-)

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 00000000000..bc6e7536e82
--- /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 <nicolas.fella@gmx.de>
+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 <KNotification>
+ #include <KRun>
+ 
+-GoogleDrivePlugin::GoogleDrivePlugin(QObject *parent)
+-    : KAccountsDPlugin(parent)
++#include <KPluginFactory>
++
++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 038869b249e..1a713692b2a 100644
--- a/kde-misc/kio-gdrive/kio-gdrive-1.2.7.ebuild
+++ b/kde-misc/kio-gdrive/kio-gdrive-1.2.7.ebuild
@@ -42,7 +42,10 @@ RDEPEND="${COMMON_DEPEND}
 
 DOCS=( README.md )
 
-PATCHES=( "${FILESDIR}"/${PN}-1.2.6-refresh-credentials.patch )
+PATCHES=(
+	"${FILESDIR}"/${PN}-1.2.6-refresh-credentials.patch
+	"${FILESDIR}"/${P}-kaccounts-integration-20.04.patch
+)
 
 src_configure() {
 	local mycmakeargs=(