diff options
Diffstat (limited to 'kde-misc')
| -rw-r--r-- | kde-misc/Manifest.gz | bin | 3721 -> 3718 bytes | |||
| -rw-r--r-- | kde-misc/kio-gdrive/Manifest | 5 | ||||
| -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-r2.ebuild | 73 | ||||
| -rw-r--r-- | kde-misc/kio-gdrive/metadata.xml | 1 |
5 files changed, 1 insertions, 131 deletions
diff --git a/kde-misc/Manifest.gz b/kde-misc/Manifest.gz Binary files differindex 3f0f0baf75c3..667d70746e28 100644 --- a/kde-misc/Manifest.gz +++ b/kde-misc/Manifest.gz diff --git a/kde-misc/kio-gdrive/Manifest b/kde-misc/kio-gdrive/Manifest index b7ccbdb2071f..bff3954e8e26 100644 --- a/kde-misc/kio-gdrive/Manifest +++ b/kde-misc/kio-gdrive/Manifest @@ -1,8 +1,5 @@ -AUX kio-gdrive-23.08.5-kaccounts-integration-24.02.patch 1753 BLAKE2B 113b3a8eb53fee9264ac1595a78e881b867a21e2c55a52bd016158943e1f285035076d61640d210c5c63f217b41be60c94fe5931951e85333adfe31b549b44d7 SHA512 5c3596d413b90ca80135b435c2ad04571b226416c8728080b0cc4faaa2d1b52cc5825b7335135a7c177ce582cdc47d2bc45cf4d82636886f54955a99efe4a429 -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 -EBUILD kio-gdrive-23.08.5-r2.ebuild 1618 BLAKE2B e7acc7ebe8f5bbca102e89d205c7c64997fdc64bfc16ff151f0280eb66667368b13fbd2969d5a69b2fdf108408e74a0034dc653195f9876007254f292fbff921 SHA512 46445cf637a8cf3c3eba202f2be910f0f809c90aa4096360e7b1add4e3e5a12474d52428c4fdedaad23c53b1a8e7dfdf679a397218e479b62d2ca80ad26cc678 EBUILD kio-gdrive-24.08.3.ebuild 1310 BLAKE2B ad249d51d322b3d7146271a79efbf0fc894621258660a730132aac4500a74a16bd58db7976d39aa7a7e667a5bbb50cb318ff128da46500c916d471a7bb55009a SHA512 aa2d0def8b6e93bd78e73aa8078132efa33f350dffa0812273634e35aedecca0870d916c3ce0ab5cccb32b6bc1e03ff667d569163ce115f816b36cd1b6e3f0fb EBUILD kio-gdrive-24.12.0.ebuild 1312 BLAKE2B f52affd0a054b81818ca4f51d5a80c2119abc6b8d4bc30b436255fb76f02c15b21da9ad9a49204d6b494c5b1039a177670dab7abbd8b4ea5173798df675c3eb2 SHA512 054506079bf5ef69aa33b5e07f4babeb78694a7e376d418c92d1679f1f23c796634036f02cde3f8cfa4cd0a6f8d0f7c8305044b5f730c11ba0894f916dc5691b -MISC metadata.xml 631 BLAKE2B a189fc3947f714e74b8c8537c6956dd9e6b77548617cdf1121815710a693b7aac736048b7963abaac15c128f2ecb60ea518dcf701c94dbd656dffac01acc19fb SHA512 f676fb95a4a01bf885f507d9733dcfe37d34c83a03674c18b54ebbafc96511734a63df23634e2466bca60b00bcb7ef640f8fa2228dbd3c5f4edd0281d6c40547 +MISC metadata.xml 527 BLAKE2B 147cc8bf3c7478384b592a136672917066eb23306046a0782694ca6ee185cab15db3ad01ce974c8618f49a21f3871641d7fa65e575e42ac49b2fb0f988188a2d SHA512 d737de034984d1e5f23da7c304f2f147ff4bb09f58a353fc11c51ceac6f735fc73972e4d07d879282606295d2c6399ef5d9c970671927081e20e873a7626a532 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 329b0f7ac503..000000000000 --- 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 <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-r2.ebuild b/kde-misc/kio-gdrive/kio-gdrive-23.08.5-r2.ebuild deleted file mode 100644 index ed3d4000eaf0..000000000000 --- 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 061e3c648d8e..f2580436ae2b 100644 --- a/kde-misc/kio-gdrive/metadata.xml +++ b/kde-misc/kio-gdrive/metadata.xml @@ -10,7 +10,6 @@ <remote-id type="kde-invent">network/kio-gdrive</remote-id> </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> |