Add upstream patch to fix the Google provider

epel9
Daniel Vrátil 5 years ago
parent 3dd4c36519
commit 7bbc91cfb5

@ -0,0 +1,50 @@
commit 0a71da4e3caae0defe200a85954fc7e2012010c1
Author: Daniel Vrátil <dvratil@kde.org>
Date: Mon Jan 13 13:48:37 2020 +0100
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
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>

@ -0,0 +1,20 @@
commit fd6b3ebfa73782de44f952f95394a6cbccd74ca4
Author: Luca Beltrame <lbeltrame@kde.org>
Date: Fri Aug 9 15:28:13 2019 +0200
Fix build with Qt 5.13
QWindow include is no longer included transitively.
diff --git a/plugins/owncloud-ui/owncloud.cpp b/plugins/owncloud-ui/owncloud.cpp
index 4330871..423faad 100644
--- a/plugins/owncloud-ui/owncloud.cpp
+++ b/plugins/owncloud-ui/owncloud.cpp
@@ -25,6 +25,7 @@
#include <QQmlEngine>
#include <QQmlContext>
+#include <QWindow>
OwnCloudWizard::OwnCloudWizard(QObject *parent)
: KAccountsUiPlugin(parent)

@ -1,6 +1,6 @@
Name: kaccounts-providers Name: kaccounts-providers
Version: 19.08.3 Version: 19.08.3
Release: 1%{?dist} Release: 2%{?dist}
Summary: Additional service providers for KAccounts framework Summary: Additional service providers for KAccounts framework
License: GPLv2 License: GPLv2
URL: https://cgit.kde.org/%{name}.git URL: https://cgit.kde.org/%{name}.git
@ -13,6 +13,9 @@ URL: https://cgit.kde.org/%{name}.git
%endif %endif
Source0: http://download.kde.org/%{stable}/applications/%{version}/src/%{name}-%{version}.tar.xz Source0: http://download.kde.org/%{stable}/applications/%{version}/src/%{name}-%{version}.tar.xz
Patch0: 0001-google-provider.patch
Patch1: 0002-fix-qt5.13-build.patch
BuildRequires: extra-cmake-modules BuildRequires: extra-cmake-modules
BuildRequires: intltool BuildRequires: intltool
%global majmin_ver %(echo %{version} | cut -d. -f1,2) %global majmin_ver %(echo %{version} | cut -d. -f1,2)
@ -64,6 +67,9 @@ make install/fast DESTDIR=%{buildroot} -C %{_target_platform}
%changelog %changelog
* Mon Jan 13 2020 Daniel Vrátil <dvratil@fedoraproject.org> - 19.08.3-2
- Add upstream patch to fix Google login
* Tue Nov 12 2019 Rex Dieter <rdieter@fedoraproject.org> - 19.08.3-1 * Tue Nov 12 2019 Rex Dieter <rdieter@fedoraproject.org> - 19.08.3-1
- 19.08.3 - 19.08.3

Loading…
Cancel
Save