diff options
Diffstat (limited to 'kde-misc/kio-gdrive')
| -rw-r--r-- | kde-misc/kio-gdrive/Manifest | 6 | ||||
| -rw-r--r-- | kde-misc/kio-gdrive/files/kio-gdrive-23.08.5-kaccounts-integration-24.02.patch | 53 | ||||
| -rw-r--r-- | kde-misc/kio-gdrive/kio-gdrive-23.08.5-r1.ebuild | 67 | ||||
| -rw-r--r-- | kde-misc/kio-gdrive/kio-gdrive-24.02.0.ebuild | 47 | ||||
| -rw-r--r-- | kde-misc/kio-gdrive/metadata.xml | 1 |
5 files changed, 173 insertions, 1 deletions
diff --git a/kde-misc/kio-gdrive/Manifest b/kde-misc/kio-gdrive/Manifest index ca7faaf19701..500506bfa0d3 100644 --- a/kde-misc/kio-gdrive/Manifest +++ b/kde-misc/kio-gdrive/Manifest @@ -1,5 +1,9 @@ +AUX kio-gdrive-23.08.5-kaccounts-integration-24.02.patch 1753 BLAKE2B 113b3a8eb53fee9264ac1595a78e881b867a21e2c55a52bd016158943e1f285035076d61640d210c5c63f217b41be60c94fe5931951e85333adfe31b549b44d7 SHA512 5c3596d413b90ca80135b435c2ad04571b226416c8728080b0cc4faaa2d1b52cc5825b7335135a7c177ce582cdc47d2bc45cf4d82636886f54955a99efe4a429 DIST kio-gdrive-23.08.4.tar.xz 79452 BLAKE2B a17eb3f93435fa16ff0a62df8924c2b418351f25f553a826a38164abb077869a3ce5b5cd6a66e4b9deb00ae8bf4ab85e0552675d19c35bc500c9585d9a99f639 SHA512 f29bb8c0471daa13bb558b896dbf296768a4a5e1854ffb134e771acea02b97b04f5810c91845adb59d4a66a7179871be23d0db51be607bac05ce3cdb9e8534bd DIST kio-gdrive-23.08.5.tar.xz 79452 BLAKE2B 7fab730a2781a0cf534beda35a48a2663cdd9e067759991e277775d1d5a492596cbdf9b3427e67da0d10415bf717ba46dd0d3d11c143de3733065e836b4fb345 SHA512 9535e64997b026aa6a5b6a092986486f726151948614f76c1f044e9fab6c0651f861776e928613a757c656fdd12cbba529dd63d04e1f58d5a43966b8d9d448c8 +DIST kio-gdrive-24.02.0.tar.xz 80384 BLAKE2B 99c5c0868dac0d5204dbb5226f121f17476fed330a3fbf17f2a236aa72dd98cbffbf89a37a40345579481ceee502e6c31c8f8b5492e24a86343a74d98ca77350 SHA512 ad9507d9f9f496172d439f11e1443d8b38e244140590a17fa582e314661060e32cb58c87906a46db2e72435ae7617f997a8aef7843ef9051eb5deefce35ecd9b EBUILD kio-gdrive-23.08.4.ebuild 1050 BLAKE2B f7224b62208804a775a4c191853dfc6849c43247624dc487722f644a09baaab35c7f9e09c7ab07b33c762c4c12290a0b6504392bc33a35374f71e095c49d5cc5 SHA512 1c40f38b62b43d7b0bbbad7984ebff1f5d0e78461b4983167ba5e2c093822766e9756c31eb5ed5a3802a4752b27a88eb3dfb491cd0115541329044e634aae267 +EBUILD kio-gdrive-23.08.5-r1.ebuild 1577 BLAKE2B b4592630b27a7d1cb8b434f75251b5c7cdce3bc405c9fe9e8bc879869fe4a01772bfa719d5818d2fc1f0918c5210320c30f913c85f3367bbb0e154eb462ada92 SHA512 92a1e82d2b43398976a8e92431f3b325bc6f89f48f5ffe3d2064059196a87ffba637ab3c0ff04c3738b1a2e5938b8da5b2ea4366db1a79ed7fe6988c084d0d1a EBUILD kio-gdrive-23.08.5.ebuild 1072 BLAKE2B 41fcd0b3bd4ab57ddef3a0da710924e4734541562fae353267571fabe7b0feec2e23bf55509a795a3e3eb2a49c3658c0107e68c97c7d8a02d93ec043af963be4 SHA512 cc3ad2b9fa1d876aa54a96e1ef2674ff7f5c89f9d8b80acfd302fd4c62040b191f0292de789f2c951f0764ca97fd28ada575b360176304aab482ace4d2eaa578 -MISC metadata.xml 433 BLAKE2B aa15f0a819a00c6b039f74d707659bf6beb6ee9c2ac9cd5a1c69163cd684c46d928105e832d93ac8096f128cb479bc30a85866979773cefc5a800ade4a7fd254 SHA512 2df906f333d8f522e66d7977570f8fd35efd329fb797cc4998a9eadfb7405748207f895e8b741004fdcde5dddff58a746337a33edbb7e4a748106fcf366675b0 +EBUILD kio-gdrive-24.02.0.ebuild 1024 BLAKE2B 8eeb011ab6a7a361c3aeb4555f8816f9894f98d97f694b681fb533a86039788f12612e3d6d759e0bf9004122d87f9e196d37a4d37144c9d1a8aeafa03d04e2f8 SHA512 d8b1f370b952ffb33330b452f26069f88bd6e51a256e77122d4e9a9f57baabb3fa36cffeab7f1ab9add6a499ea94bd36a3f5978ae7feac23cd02e8f15f6d6665 +MISC metadata.xml 537 BLAKE2B 717f1e8e64d1e119f7132ad20b6bba8f443d6599d469da64b40bb94676404396b4ed296eee3db2e5069220a85c37ea6575d117859c47d692b223e9b7471cc97f SHA512 fb4ffa1ecb05cabcc2ea1e408f715870bc7c62abe587f90718102e9a90caaf03b77e6fa6b358ea2eafd998c991e1509b9ef9969e5f484b05c6b02581cbf77645 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 new file mode 100644 index 000000000000..329b0f7ac503 --- /dev/null +++ b/kde-misc/kio-gdrive/files/kio-gdrive-23.08.5-kaccounts-integration-24.02.patch @@ -0,0 +1,53 @@ +From f3a8d9dbc22d3743e03b1b0092baa3b060a1c001 Mon Sep 17 00:00:00 2001 +From: Nicolas Fella <nicolas.fella@gmx.de> +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 <KAccounts/KAccountsDPlugin> + +-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-r1.ebuild b/kde-misc/kio-gdrive/kio-gdrive-23.08.5-r1.ebuild new file mode 100644 index 000000000000..86ad6360a782 --- /dev/null +++ b/kde-misc/kio-gdrive/kio-gdrive-23.08.5-r1.ebuild @@ -0,0 +1,67 @@ +# Copyright 1999-2024 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +ECM_HANDBOOK="forceoptional" +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" +IUSE="kf6compat +share" + +COMMON_DEPEND=" + >=dev-qt/qtgui-${QTMIN}:5 + >=dev-qt/qtwidgets-${QTMIN}:5 + kde-apps/kaccounts-integration:6[qt5] + 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:* + kf6compat? ( kde-misc/kio-gdrive:6 ) +" +BDEPEND="dev-util/intltool" + +DOCS=( README.md ) + +PATCHES=( "${FILESDIR}/${P}-kaccounts-integration-24.02.patch" ) + +src_configure() { + local mycmakeargs=( + $(cmake_use_find_package share KF5Purpose) + ) + ecm_src_configure +} + +src_install() { + ecm_src_install + + if use kf6compat; then + rm "${D}"/usr/share/accounts/services/kde/google-drive.service \ + "${D}"/usr/share/metainfo/org.kde.kio_gdrive.metainfo.xml \ + "${D}"/usr/share/remoteview/gdrive-network.desktop || die + if use handbook; then + rm -r "${D}"/usr/share/help || die + fi + if use share; then + rm -r "${D}"/usr/share/purpose/purpose_gdrive_config.qml || die + fi + rm -r "${D}"/usr/share/locale || die + fi +} diff --git a/kde-misc/kio-gdrive/kio-gdrive-24.02.0.ebuild b/kde-misc/kio-gdrive/kio-gdrive-24.02.0.ebuild new file mode 100644 index 000000000000..436183445884 --- /dev/null +++ b/kde-misc/kio-gdrive/kio-gdrive-24.02.0.ebuild @@ -0,0 +1,47 @@ +# Copyright 1999-2024 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +ECM_HANDBOOK="forceoptional" +ECM_TEST="optional" +KDE_ORG_CATEGORY="network" +KFMIN=6.0 +QTMIN=6.6.2 +inherit ecm gear.kde.org + +DESCRIPTION="KIO worker for Google Drive service" +HOMEPAGE="https://apps.kde.org/kio_gdrive/" + +LICENSE="GPL-2+" +SLOT="6" +KEYWORDS="~amd64" +IUSE="+share" + +COMMON_DEPEND=" + >=dev-qt/qtbase-${QTMIN}:6[gui,widgets] + kde-apps/kaccounts-integration:6 + kde-apps/libkgapi:6 + >=kde-frameworks/kcoreaddons-${KFMIN}:6 + >=kde-frameworks/ki18n-${KFMIN}:6 + >=kde-frameworks/kio-${KFMIN}:6 + >=kde-frameworks/knotifications-${KFMIN}:6 + share? ( >=kde-frameworks/purpose-${KFMIN}:6 ) +" +DEPEND="${COMMON_DEPEND} + >=dev-qt/qtbase-${QTMIN}:6[network] +" +RDEPEND="${COMMON_DEPEND} + !${CATEGORY}/${PN}:5[-kf6compat(-)] + kde-apps/kaccounts-providers:6 +" +BDEPEND="dev-util/intltool" + +DOCS=( README.md ) + +src_configure() { + local mycmakeargs=( + $(cmake_use_find_package share KF6Purpose) + ) + ecm_src_configure +} diff --git a/kde-misc/kio-gdrive/metadata.xml b/kde-misc/kio-gdrive/metadata.xml index 8213019cba2d..3517d3c77ec1 100644 --- a/kde-misc/kio-gdrive/metadata.xml +++ b/kde-misc/kio-gdrive/metadata.xml @@ -9,6 +9,7 @@ <bugs-to>https://bugs.kde.org/</bugs-to> </upstream> <use> + <flag name="kf6compat">Disable components colliding with KF6, depend on KF6 components instead</flag> <flag name="share">Enable support for a share menu using <pkg>kde-frameworks/purpose</pkg></flag> </use> </pkgmetadata> |