commit: f949b61b15f50aa8d58fc82001b03cc216dd3160 Author: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org> AuthorDate: Thu Jan 18 22:08:30 2018 +0000 Commit: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org> CommitDate: Thu Jan 18 23:01:28 2018 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=f949b61b
kde-apps/libkgapi: Fix Google token page URL Upstream commit fa572d93cfa463f61432dd92239e747f9642fbae Package-Manager: Portage-2.3.19, Repoman-2.3.6 .../files/libkgapi-17.12.1-gmail-tokenpage.patch | 40 ++++++++++++++++++++++ kde-apps/libkgapi/libkgapi-17.12.1-r1.ebuild | 36 +++++++++++++++++++ 2 files changed, 76 insertions(+) diff --git a/kde-apps/libkgapi/files/libkgapi-17.12.1-gmail-tokenpage.patch b/kde-apps/libkgapi/files/libkgapi-17.12.1-gmail-tokenpage.patch new file mode 100644 index 00000000000..61162ddf7c0 --- /dev/null +++ b/kde-apps/libkgapi/files/libkgapi-17.12.1-gmail-tokenpage.patch @@ -0,0 +1,40 @@ +From fa572d93cfa463f61432dd92239e747f9642fbae Mon Sep 17 00:00:00 2001 +From: David Kahles <[email protected]> +Date: Fri, 12 Jan 2018 15:23:53 +0100 +Subject: Fix token page URL + +Summary: +It seems like Google changed the URL of the token page. +Maybe we should use QString::startsWith, to be futureproof? + +BUG: 388483 + +Test Plan: +- Login in KOrganizer and KMail works again +- All tests pass (though i think there is no oauth2 test) + +Reviewers: dvratil, mlaurent + +Reviewed By: mlaurent + +Differential Revision: https://phabricator.kde.org/D9843 +--- + src/core/ui/authwidget_p.h | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/src/core/ui/authwidget_p.h b/src/core/ui/authwidget_p.h +index 78b0e7f..29ece44 100644 +--- a/src/core/ui/authwidget_p.h ++++ b/src/core/ui/authwidget_p.h +@@ -79,7 +79,7 @@ class Q_DECL_HIDDEN AuthWidgetPrivate: public QObject { + bool isSigninPage(const QUrl &url) const { return url.path() == QLatin1String("/signin/oauth"); } + bool isUsernameFrame(const QUrl &url) { return url.path() == QLatin1String("/signin/oauth/identifier"); } + bool isPasswordFrame(const QUrl &url) { return url.path() == QLatin1String("/signin/v2/challenge/pwd"); } +- bool isTokenPage(const QUrl &url) { return url.path() == QLatin1String("/o/oauth2/approval/v2"); } ++ bool isTokenPage(const QUrl &url) { return url.path() == QLatin1String("/o/oauth2/approval/v2/approvalnativeapp"); } + + void setSslIcon(const QString &icon); + +-- +cgit v0.11.2 + diff --git a/kde-apps/libkgapi/libkgapi-17.12.1-r1.ebuild b/kde-apps/libkgapi/libkgapi-17.12.1-r1.ebuild new file mode 100644 index 00000000000..d3c67b28e4f --- /dev/null +++ b/kde-apps/libkgapi/libkgapi-17.12.1-r1.ebuild @@ -0,0 +1,36 @@ +# Copyright 1999-2018 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 + +EAPI=6 + +KDE_BLOCK_SLOT4="false" +KDE_TEST="true" +VIRTUALX_REQUIRED="test" +inherit kde5 + +DESCRIPTION="Library for accessing Google calendar and contact resources" +HOMEPAGE="https://cgit.kde.org/libkgapi.git"; + +LICENSE="LGPL-2.1+" +KEYWORDS="~amd64 ~x86" +IUSE="nls" + +COMMON_DEPEND=" + $(add_frameworks_dep kio) + $(add_frameworks_dep kwindowsystem) + $(add_kdeapps_dep kcalcore) + $(add_kdeapps_dep kcontacts) + $(add_qt_dep qtgui) + $(add_qt_dep qtnetwork) + $(add_qt_dep qtwebengine 'widgets') + $(add_qt_dep qtwidgets) + $(add_qt_dep qtxml) +" +DEPEND="${COMMON_DEPEND} + nls? ( $(add_qt_dep linguist-tools) ) +" +RDEPEND="${COMMON_DEPEND} + !kde-apps/kdepim-l10n +" + +PATCHES=( "${FILESDIR}/${P}-gmail-tokenpage.patch" )
