From 4fe74782ec6a83363514a18e23ca2f0e1ef070b3 Mon Sep 17 00:00:00 2001 From: Andreas Sturmlechner Date: Tue, 10 Sep 2024 22:18:30 +0200 Subject: [PATCH] kde-misc/kio-gdrive: drop 23.08.5-r2 Signed-off-by: Andreas Sturmlechner --- kde-misc/kio-gdrive/Manifest | 1 - ...-23.08.5-kaccounts-integration-24.02.patch | 53 -------------- .../kio-gdrive/kio-gdrive-23.08.5-r2.ebuild | 73 ------------------- kde-misc/kio-gdrive/metadata.xml | 1 - 4 files changed, 128 deletions(-) delete mode 100644 kde-misc/kio-gdrive/files/kio-gdrive-23.08.5-kaccounts-integration-24.02.patch delete mode 100644 kde-misc/kio-gdrive/kio-gdrive-23.08.5-r2.ebuild diff --git a/kde-misc/kio-gdrive/Manifest b/kde-misc/kio-gdrive/Manifest index 0629a333d033b..3bc4aeb0efe01 100644 --- a/kde-misc/kio-gdrive/Manifest +++ b/kde-misc/kio-gdrive/Manifest @@ -1,3 +1,2 @@ -DIST kio-gdrive-23.08.5.tar.xz 79452 BLAKE2B 7fab730a2781a0cf534beda35a48a2663cdd9e067759991e277775d1d5a492596cbdf9b3427e67da0d10415bf717ba46dd0d3d11c143de3733065e836b4fb345 SHA512 9535e64997b026aa6a5b6a092986486f726151948614f76c1f044e9fab6c0651f861776e928613a757c656fdd12cbba529dd63d04e1f58d5a43966b8d9d448c8 DIST kio-gdrive-24.08.3.tar.xz 82152 BLAKE2B 5fb212bd189f8f1f12572d928654affaa0c28254a436ae3a4f2d03b0ad2db2d2320143c7d3bfcd7822ea461e46f737c0bac163941179fd4dfa59d9118991f3ac SHA512 26c2d647263504b7afd66de84573d5a84f211b901c819368a2823fc95625b3ff81f7d58aefbfba71cf9f2861bdef550e9e3db832ee2b9ddfcb2cc7ab28a10751 DIST kio-gdrive-24.12.0.tar.xz 80120 BLAKE2B ca0a453e90bb9d738764025e3285ed1f8e193d8e0d7309369e10a807fe4041070b1fbb23d198b8d91c90f08850264a58bac02ea0ce4dabfa7c7fedcf4844def5 SHA512 6361fad1a770cf4b9d9da2a2350842af90d68efe422dbbead21b849b6a5fd49fffd65cb6e6ccda7bb2b3828ef871bd9cd46ff5d041569177471be786ddd777ba diff --git a/kde-misc/kio-gdrive/files/kio-gdrive-23.08.5-kaccounts-integration-24.02.patch b/kde-misc/kio-gdrive/files/kio-gdrive-23.08.5-kaccounts-integration-24.02.patch deleted file mode 100644 index 329b0f7ac5036..0000000000000 --- a/kde-misc/kio-gdrive/files/kio-gdrive-23.08.5-kaccounts-integration-24.02.patch +++ /dev/null @@ -1,53 +0,0 @@ -From f3a8d9dbc22d3743e03b1b0092baa3b060a1c001 Mon Sep 17 00:00:00 2001 -From: Nicolas Fella -Date: Sun, 10 Dec 2023 22:27:46 +0100 -Subject: [PATCH] Adapt to KAccounts API change - ---- - kaccounts/kaccountsplugin.cpp | 2 +- - kaccounts/kaccountsplugin.h | 2 +- - src/kaccountsmanager.cpp | 2 +- - 3 files changed, 3 insertions(+), 3 deletions(-) - -diff --git a/kaccounts/kaccountsplugin.cpp b/kaccounts/kaccountsplugin.cpp -index 676bc4a..9ba2d17 100644 ---- a/kaccounts/kaccountsplugin.cpp -+++ b/kaccounts/kaccountsplugin.cpp -@@ -18,7 +18,7 @@ - K_PLUGIN_CLASS_WITH_JSON(GoogleDrivePlugin, "kaccountsplugin.json") - - GoogleDrivePlugin::GoogleDrivePlugin(QObject *parent, const QVariantList &args) -- : KAccountsDPlugin(parent, args) -+ : KAccounts::KAccountsDPlugin(parent, args) - { - } - -diff --git a/kaccounts/kaccountsplugin.h b/kaccounts/kaccountsplugin.h -index d330c64..748feac 100644 ---- a/kaccounts/kaccountsplugin.h -+++ b/kaccounts/kaccountsplugin.h -@@ -9,7 +9,7 @@ - - #include - --class GoogleDrivePlugin : public KAccountsDPlugin -+class GoogleDrivePlugin : public KAccounts::KAccountsDPlugin - { - Q_OBJECT - public: -diff --git a/src/kaccountsmanager.cpp b/src/kaccountsmanager.cpp -index 6660a4e..c6d4273 100644 ---- a/src/kaccountsmanager.cpp -+++ b/src/kaccountsmanager.cpp -@@ -151,7 +151,7 @@ void KAccountsManager::loadAccounts() - - AccountPtr KAccountsManager::getAccountCredentials(Accounts::AccountId id, const QString& displayName) - { -- auto job = new GetCredentialsJob(id, nullptr); -+ auto job = new KAccounts::GetCredentialsJob(id, nullptr); - job->exec(); - if (job->error()) { - qCWarning(GDRIVE) << "GetCredentialsJob failed:" << job->errorString(); --- -GitLab - diff --git a/kde-misc/kio-gdrive/kio-gdrive-23.08.5-r2.ebuild b/kde-misc/kio-gdrive/kio-gdrive-23.08.5-r2.ebuild deleted file mode 100644 index ed3d4000eaf09..0000000000000 --- a/kde-misc/kio-gdrive/kio-gdrive-23.08.5-r2.ebuild +++ /dev/null @@ -1,73 +0,0 @@ -# Copyright 1999-2024 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=8 - -ECM_HANDBOOK="forceoff" -ECM_TEST="optional" -KDE_ORG_CATEGORY="network" -KFMIN=5.106.0 -QTMIN=5.15.9 -inherit ecm gear.kde.org - -DESCRIPTION="KIO worker for Google Drive service" -HOMEPAGE="https://apps.kde.org/kio_gdrive/" - -LICENSE="GPL-2+" -SLOT="5" -KEYWORDS="amd64 arm64" -IUSE="kf6compat +share" - -COMMON_DEPEND=" - >=dev-qt/qtgui-${QTMIN}:5 - >=dev-qt/qtwidgets-${QTMIN}:5 - || ( - kde-apps/kaccounts-integration:6[qt5] - >=kde-apps/kaccounts-integration-23.08:5 - ) - kde-apps/libkgapi:5 - >=kde-frameworks/kcoreaddons-${KFMIN}:5 - >=kde-frameworks/ki18n-${KFMIN}:5 - >=kde-frameworks/kio-${KFMIN}:5 - >=kde-frameworks/knotifications-${KFMIN}:5 - share? ( >=kde-frameworks/purpose-${KFMIN}:5 ) -" -DEPEND="${COMMON_DEPEND} - >=dev-qt/qtnetwork-${QTMIN}:5 -" -RDEPEND="${COMMON_DEPEND} - kde-apps/kaccounts-providers:* - ${CATEGORY}/${PN}-common -" -BDEPEND="dev-util/intltool" - -DOCS=( README.md ) - -ECM_REMOVE_FROM_INSTALL=( - /usr/share/accounts/services/kde/google-drive.service - /usr/share/metainfo/org.kde.kio_gdrive.metainfo.xml - /usr/share/remoteview/gdrive-network.desktop -) - -src_prepare() { - if has_version -b "kde-apps/kaccounts-integration:6[qt5]"; then - PATCHES+=( "${FILESDIR}/${P}-kaccounts-integration-24.02.patch" ) - fi - ecm_src_prepare - ecm_punt_po_install -} - -src_configure() { - local mycmakeargs=( - $(cmake_use_find_package share KF5Purpose) - ) - ecm_src_configure -} - -src_install() { - ecm_src_install - - if use kf6compat && use share; then - rm -r "${D}"/usr/share/purpose/purpose_gdrive_config.qml || die - fi -} diff --git a/kde-misc/kio-gdrive/metadata.xml b/kde-misc/kio-gdrive/metadata.xml index 061e3c648d8e6..f2580436ae2b5 100644 --- a/kde-misc/kio-gdrive/metadata.xml +++ b/kde-misc/kio-gdrive/metadata.xml @@ -10,7 +10,6 @@ network/kio-gdrive - Disable components colliding with KF6, depend on KF6 components instead Enable support for a share menu using kde-frameworks/purpose