aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--community/kaccounts-providers/APKBUILD6
-rw-r--r--community/kaccounts-providers/fix-online-accounts-google.patch55
2 files changed, 2 insertions, 59 deletions
diff --git a/community/kaccounts-providers/APKBUILD b/community/kaccounts-providers/APKBUILD
index af1dc6763a..24f1a6a4f0 100644
--- a/community/kaccounts-providers/APKBUILD
+++ b/community/kaccounts-providers/APKBUILD
@@ -9,8 +9,7 @@ pkgdesc="Small system to administer web accounts for the sites and services acro
license="GPL-2.0-or-later"
depends="kaccounts-integration"
makedepends="extra-cmake-modules qt5-qtbase-dev qt5-qtdeclarative-dev kio-dev ki18n-dev kdeclarative-dev kpackage-dev kaccounts-integration-dev intltool"
-source="https://download.kde.org/stable/release-service/$pkgver/src/kaccounts-providers-$pkgver.tar.xz
- fix-online-accounts-google.patch"
+source="https://download.kde.org/stable/release-service/$pkgver/src/kaccounts-providers-$pkgver.tar.xz"
subpackages="$pkgname-lang"
prepare() {
@@ -33,5 +32,4 @@ package() {
DESTDIR="$pkgdir" make install
}
-sha512sums="6905bafdc872054c108ec5f4be0c0deb36f237434fa37531524a5f9e0ae7e884229a547003fab45d2d42c233c38e2a0db6a4c121f0675c7bcfaa75c86feac5b6 kaccounts-providers-19.12.2.tar.xz
-736b84854dad5da887c9d270b8bfe5782ded908c4fa463d7ecfa8218dfdc12956123515e86eb41f75d5427d5ae9c20c194ff5cead62e81afb3bcb59d77235d9c fix-online-accounts-google.patch"
+sha512sums="6905bafdc872054c108ec5f4be0c0deb36f237434fa37531524a5f9e0ae7e884229a547003fab45d2d42c233c38e2a0db6a4c121f0675c7bcfaa75c86feac5b6 kaccounts-providers-19.12.2.tar.xz"
diff --git a/community/kaccounts-providers/fix-online-accounts-google.patch b/community/kaccounts-providers/fix-online-accounts-google.patch
deleted file mode 100644
index e303e5ce24..0000000000
--- a/community/kaccounts-providers/fix-online-accounts-google.patch
+++ /dev/null
@@ -1,55 +0,0 @@
-From 0a71da4e3caae0defe200a85954fc7e2012010c1 Mon Sep 17 00:00:00 2001
-From: =?UTF-8?q?Daniel=20Vr=C3=A1til?= <dvratil@kde.org>
-Date: Mon, 13 Jan 2020 13:48:37 +0100
-Subject: Google provider: limit requested OAuth scopes
-
-Summary:
-Limit the scopes to what is actually permitted in the Google App settings:
-contacts and calendars for future PIM integration, GDrive for KIO-GDrive,
-and Youtube (upload-only) for the Purpose sharing plugin. We can extend
-this in the future if needed easilly, it's easier for us to get the
-Google App verified if we can proof and show how the individual scopes
-are used by KDE.
-
-Reviewers: elvisangelaccio, bshah
-
-Reviewed By: elvisangelaccio, bshah
-
-Differential Revision: https://phabricator.kde.org/D26454
----
- providers/google.provider.in | 13 +++----------
- 1 file changed, 3 insertions(+), 10 deletions(-)
-
-diff --git a/providers/google.provider.in b/providers/google.provider.in
-index 638c1a9..97307af 100644
---- a/providers/google.provider.in
-+++ b/providers/google.provider.in
-@@ -21,22 +21,15 @@
- order to return a refresh token -->
- <setting name="ResponseType">code</setting>
- <setting name="Scope" type="as">[
-- 'https://docs.google.com/feeds/',
-- 'https://www.googleapis.com/auth/googletalk',
-- 'https://www.googleapis.com/auth/youtube.upload',
-- 'https://www.googleapis.com/auth/youtube',
- 'https://www.googleapis.com/auth/userinfo.email',
- 'https://www.googleapis.com/auth/userinfo.profile',
-- 'https://picasaweb.google.com/data/',
- 'https://www.googleapis.com/auth/calendar',
-- 'https://www.google.com/m8/feeds/',
- 'https://www.googleapis.com/auth/tasks',
-+ 'https://www.google.com/m8/feeds/',
- 'https://www.googleapis.com/auth/drive',
-- 'https://www.googleapis.com/auth/drive.file',
-- 'https://www.googleapis.com/auth/drive.metadata.readonly',
-- 'https://www.googleapis.com/auth/drive.readonly'
-+ 'https://www.googleapis.com/auth/youtube.upload',
- ]</setting>
-- <setting name="AllowedSchemes" type="as">['https','http']</setting>
-+ <setting name="AllowedSchemes" type="as">['https']</setting>
- <setting name="ClientId">317066460457-pkpkedrvt2ldq6g2hj1egfka2n7vpuoo.apps.googleusercontent.com</setting>
- <setting name="ClientSecret">Y8eFAaWfcanV3amZdDvtbYUq</setting>
- <setting name="ForceClientAuthViaRequestBody" type="b">true</setting>
---
-cgit v1.1
-