gentoo resync : 19.01.2018

3 files changed, 44 insertions, 1 deletions

diff --git a/kde-apps/libkgapi/Manifest b/kde-apps/libkgapi/Manifest
index b63166e0b6de..890a7cad13cb 100644
--- a/kde-apps/libkgapi/Manifest
+++ b/kde-apps/libkgapi/Manifest
@@ -1,5 +1,6 @@
+AUX libkgapi-17.12.1-gmail-tokenpage.patch 1489 BLAKE2B e7bdc938d26b41e2e880f3932adc7e6db4aea6ea6d9fbfc6fd56143f783978617241ed61f3e8588c3c537a994406449c1ecb424ce5299698c0976637d71a0f71 SHA512 393da4cb35cc9e0c55e7073113cb51aecb72ab7d2c6b062512d1d7c46fafa3dbd7b091fd2377608930cb0a7413d7d7260580d565f07fd0531070a594136176e8
 DIST libkgapi-17.08.3.tar.xz 175300 BLAKE2B 80b1d6a19bd8953d4bae36f13da2b92d8f14314ec557ee61b0d1d86d0a856c0635fa2e0b96e0d8e2b2b2b5d9577d25a61b07af2a7226c3e57326171f3ad96334 SHA512 6f0c6afb39a0654d8cb5d03a43439fda3b3a1e508b579f46c8c6c7ace050b6b749e2c2673bc5fd9d8a502e91315d8f60f052c290ba31e9cd3cf9413d7ecd3906
 DIST libkgapi-17.12.1.tar.xz 175212 BLAKE2B e3a3792df13085bc6c18b3d36f120c4a49efd171524affe3f6f8a26d07acbc2e958cd812ddd0f46df17a8dda350a59d9cbdd57a68ef0c18279a3a374a5a9ff2b SHA512 62b6e392aa79469991d4293792fb1f21316f369c5f3c7885d073a82d5e1510ec45217dd5199023337108108aa043b66c51e8b3710c3aa6df80538df76a7844e4
 EBUILD libkgapi-17.08.3.ebuild 779 BLAKE2B ada0fc1706910256912f006c7a6832709cf8d8aa5544bfba952f2bafe7edb9a80b0e99db6c542cccda0adede7a42992305f0639404383183eff2e7e721d9610f SHA512 3f6c35f56a065c7e4bf75b9bf35d3d861288a05c8603fb63f74c3341d1560f7b84257c7aad10278d1f63e94d9499f2fded4ae215e89efeb968861428fe7ca068
-EBUILD libkgapi-17.12.1.ebuild 757 BLAKE2B 551e4d7347e476635b2800f3c45f66271ec8a71bf719faec7434f1bc44335d4b6393c5ea0b2379d53ade5f7b03f868985cb1075efe36804d8077ff2faaff3d74 SHA512 5f93d6951e92d348785e2d2145d115c28e686981629806acece86fc3d04e452649cafb41eec14cfab9555265d90c5ebf43b379527a02ee3ee299c7a2ef12e741
+EBUILD libkgapi-17.12.1-r1.ebuild 811 BLAKE2B 07f51a4a19b2f2f0831390277cac06dfb1fd49540c342d676e57d69681eea438673874379fb43e7c003433c925cdfdd205f89f9cef0fbf1bfdd66975aad87361 SHA512 15c2535c1842054a54a7f721d131bc2cae91869f4418c106e0156f1a95f62896106a5ff50ebd827211757ef888deb70ae6f5a5ff7dd5b1420304033556b219b2
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
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 000000000000..61162ddf7c0d
--- /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 <david.kahles96@gmail.com>
+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.ebuild b/kde-apps/libkgapi/libkgapi-17.12.1-r1.ebuild
index 9f3e37a77649..d3c67b28e4f0 100644
--- a/kde-apps/libkgapi/libkgapi-17.12.1.ebuild
+++ b/kde-apps/libkgapi/libkgapi-17.12.1-r1.ebuild
@@ -32,3 +32,5 @@ DEPEND="${COMMON_DEPEND}
 RDEPEND="${COMMON_DEPEND}
 	!kde-apps/kdepim-l10n
 "
+
+PATCHES=( "${FILESDIR}/${P}-gmail-tokenpage.patch" )