summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAndreas Sturmlechner <asturm@gentoo.org>2020-04-23 13:44:57 +0200
committerAndreas Sturmlechner <asturm@gentoo.org>2020-04-24 00:06:57 +0200
commitc811e0a313e23ee2f734525583f701e04b1a55c6 (patch)
treed8caed909b550730d963b4bb2440a2173cf55adc
parentkde-misc/kio-gdrive: Pin 1.2.7 to =kde-apps/*-19.12* (diff)
downloadgentoo-c811e0a313e23ee2f734525583f701e04b1a55c6.tar.gz
gentoo-c811e0a313e23ee2f734525583f701e04b1a55c6.tar.bz2
gentoo-c811e0a313e23ee2f734525583f701e04b1a55c6.zip
kde-misc/kio-gdrive: Drop 1.2.7 (r0)
Package-Manager: Portage-2.3.99, Repoman-2.3.22 Signed-off-by: Andreas Sturmlechner <asturm@gentoo.org>
-rw-r--r--kde-misc/kio-gdrive/files/kio-gdrive-1.2.7-kaccounts-integration-20.04.patch97
-rw-r--r--kde-misc/kio-gdrive/kio-gdrive-1.2.7.ebuild58
2 files changed, 0 insertions, 155 deletions
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
deleted file mode 100644
index bc6e7536e82b..000000000000
--- a/kde-misc/kio-gdrive/files/kio-gdrive-1.2.7-kaccounts-integration-20.04.patch
+++ /dev/null
@@ -1,97 +0,0 @@
-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
deleted file mode 100644
index a36f78862b12..000000000000
--- a/kde-misc/kio-gdrive/kio-gdrive-1.2.7.ebuild
+++ /dev/null
@@ -1,58 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-ECM_HANDBOOK="forceoptional"
-ECM_TEST="optional"
-KFMIN=5.60.0
-QTMIN=5.12.3
-inherit ecm kde.org
-
-DESCRIPTION="KIO Slave for Google Drive service"
-HOMEPAGE="https://phabricator.kde.org/project/profile/72/"
-
-if [[ ${KDE_BUILD_TYPE} != live ]] ; then
- SRC_URI="mirror://kde/stable/${PN}/${PV}/src/${P}.tar.xz"
- KEYWORDS="amd64 ~arm64 x86"
-fi
-
-LICENSE="GPL-2+"
-SLOT="5"
-IUSE="+kaccounts"
-
-BDEPEND="dev-util/intltool"
-COMMON_DEPEND="
- >=dev-qt/qtwidgets-${QTMIN}:5
- >=kde-apps/libkgapi-19.08.0:5
- >=kde-frameworks/kcoreaddons-${KFMIN}:5
- >=kde-frameworks/ki18n-${KFMIN}:5
- >=kde-frameworks/kio-${KFMIN}:5
- >=kde-frameworks/knotifications-${KFMIN}:5
- kaccounts? ( kde-apps/kaccounts-integration:5 )
- !kaccounts? ( dev-libs/qtkeychain:=[qt5(+)] )
-"
-DEPEND="${COMMON_DEPEND}
- >=dev-qt/qtgui-${QTMIN}:5
- >=dev-qt/qtnetwork-${QTMIN}:5
-"
-RDEPEND="${COMMON_DEPEND}
- kaccounts? ( >=kde-apps/kaccounts-providers-19.08.0:5 )
-"
-
-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)
- )
- ecm_src_configure
-}