From abaa75b10f899ada8dd05b23cc03205064394bc6 Mon Sep 17 00:00:00 2001 From: V3n3RiX Date: Fri, 22 Jan 2021 20:28:19 +0000 Subject: gentoo resync : 22.01.2021 --- kde-apps/libkgapi/Manifest | 3 +- ...ibkgapi-20.12.1-remember-gmail-auth-token.patch | 30 +++++++++++++++++++ kde-apps/libkgapi/libkgapi-20.12.1-r1.ebuild | 35 ++++++++++++++++++++++ kde-apps/libkgapi/libkgapi-20.12.1.ebuild | 33 -------------------- 4 files changed, 67 insertions(+), 34 deletions(-) create mode 100644 kde-apps/libkgapi/files/libkgapi-20.12.1-remember-gmail-auth-token.patch create mode 100644 kde-apps/libkgapi/libkgapi-20.12.1-r1.ebuild delete mode 100644 kde-apps/libkgapi/libkgapi-20.12.1.ebuild (limited to 'kde-apps/libkgapi') diff --git a/kde-apps/libkgapi/Manifest b/kde-apps/libkgapi/Manifest index ee56e0fba54f..65eb47cd5938 100644 --- a/kde-apps/libkgapi/Manifest +++ b/kde-apps/libkgapi/Manifest @@ -1,6 +1,7 @@ AUX libkgapi-20.08.3-fix-contactfetchjobtest-w-qt-5.15.patch 1048 BLAKE2B 749a388aff619216b076975bcddaccfb13f33a41606e3ca93dd7bf53264269460ab38ff1493bdd3e1085cf57c13186b82da0cad079b7e0725e43d39a49156444 SHA512 55f0a8a18334d5f0d9dfc1fad782ae723f53a663aa505ee87876a2f233cfba57b7721615dbbeb00162d1219983ddcbf3bc96452e8fe3dcacc23d9b92fea89ed7 +AUX libkgapi-20.12.1-remember-gmail-auth-token.patch 962 BLAKE2B 713eda482ccf851a2e814c8350993a745fc9cb42fd1d974f96df757dd1bad0941598c97fb1a1539cba4815705fded28e4abcaa992382c8a5d2766d8b345d2fbf SHA512 1a37ae3be31a0ee9ef37a73da0aa83178722cbbf7aac372ef471b8069f4a771306ef421e622692130d8778651f6df29d9a4467c9d10eb73047047fdf48bc7ef6 DIST libkgapi-20.08.3.tar.xz 242676 BLAKE2B 86b04cea376eb46081632fb571bdb3a67f4f44f3dd6c8a3af0144598634417ee39defb445324f33969420718daa999f43c5ea5d9c01634a0ec944bf457219fd7 SHA512 de7062632660777074f4d0d8b754b072c7f2b0550260e994d1db3e99d8f258f2507ad605d91cb6c465794ced92b740a742ab99947737edea73fd928c087d4388 DIST libkgapi-20.12.1.tar.xz 246024 BLAKE2B 108f811919bbf0c857a7f4ab42a4f58e698fed050b5129757db8a6093e83e09b1d41fc49a8a485cbc6878462c9f116de01e8edfbcf08d107bb401f4aca5cd296 SHA512 1cf6d9cd923bd4311abaf3fe8feb348970fe01c837845fb9980ed914d2a9d0b3dd3093ce81cfd281fba22622e9756a94da8124959c4ec71389494088965652a9 EBUILD libkgapi-20.08.3-r1.ebuild 964 BLAKE2B c0b64df147b671cd0195741608dd6ff4371ebff462501607379b7d3a2feb8d4445d0ee149113776acd79714077a1b589e6b8353aa870076302c5e45bd71ae2a6 SHA512 bbf84ea6f0e690c627fdde90be1206e2f8f8b62b56e4072a23b4459db3808914093fa258d6c7a11d1171f3a2cdd4246a88572d556b76345c196772606b97124b -EBUILD libkgapi-20.12.1.ebuild 763 BLAKE2B 186504179a196c8f8b950b640603ff6358d3647c922d690597d7826949fdebec1d0c1c1e767861432b457cc25d51160e2dd7b579ca688e8eafe1ed7b62af884b SHA512 9cd9c265970c31a8a703295cc4c93aa7271e22cdf88b551a12f4600c21a88127769cc8f167afb0a3aee3f28595bd70d6087ead9e4aca31823c31abf906fef72b +EBUILD libkgapi-20.12.1-r1.ebuild 844 BLAKE2B 58f252055fb30c36367839aed3cbbfef8345da0510a456df989eefe2ee4dfbc2876531f7c1e8c43ce69fe17cc0efb84dbae1e563283acaab42ed40ceb4348b4f SHA512 c0c314fd7517c9d7f26defa906279b898734492e10847e0112de0808e79034481a8f4b6ebd36c8ab1ddd0c422961414a39d6e7db4b96a58b35f1bf1a27ab80f5 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3 diff --git a/kde-apps/libkgapi/files/libkgapi-20.12.1-remember-gmail-auth-token.patch b/kde-apps/libkgapi/files/libkgapi-20.12.1-remember-gmail-auth-token.patch new file mode 100644 index 000000000000..4d777f1475f1 --- /dev/null +++ b/kde-apps/libkgapi/files/libkgapi-20.12.1-remember-gmail-auth-token.patch @@ -0,0 +1,30 @@ +From d81d247026ac993ac5717ca471c7fcf1778951f2 Mon Sep 17 00:00:00 2001 +From: Antonio Rojas +Date: Wed, 6 Jan 2021 15:54:52 +0100 +Subject: [PATCH] Don't reset account scopes if not necessary + +This triggers unnecesary authentication prompts + +BUG: 429406 +--- + src/core/accountmanager.cpp | 4 +++- + 1 file changed, 3 insertions(+), 1 deletion(-) + +diff --git a/src/core/accountmanager.cpp b/src/core/accountmanager.cpp +index b9af6c1..f68563e 100644 +--- a/src/core/accountmanager.cpp ++++ b/src/core/accountmanager.cpp +@@ -81,7 +81,9 @@ public: + currentScopes.push_back(requestedScope); + } + } +- account->setScopes(currentScopes); ++ if (currentScopes != account->scopes()) { ++ account->setScopes(currentScopes); ++ } + } + auto *job = new AuthJob(account, apiKey, apiSecret); + job->setUsername(account->accountName()); +-- +GitLab + diff --git a/kde-apps/libkgapi/libkgapi-20.12.1-r1.ebuild b/kde-apps/libkgapi/libkgapi-20.12.1-r1.ebuild new file mode 100644 index 000000000000..07016b6b5f89 --- /dev/null +++ b/kde-apps/libkgapi/libkgapi-20.12.1-r1.ebuild @@ -0,0 +1,35 @@ +# Copyright 1999-2021 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=7 + +ECM_TEST="true" +KFMIN=5.75.0 +QTMIN=5.15.1 +VIRTUALX_REQUIRED="test" +inherit ecm kde.org + +DESCRIPTION="Library for accessing Google calendar and contact resources" +HOMEPAGE="https://api.kde.org/kdepim/libkgapi/html/index.html" + +LICENSE="LGPL-2.1+" +SLOT="5" +KEYWORDS="~amd64 ~arm64 ~ppc64 ~x86" +IUSE="nls" + +BDEPEND=" + nls? ( >=dev-qt/linguist-tools-${QTMIN}:5 ) +" +DEPEND=" + dev-libs/cyrus-sasl:2 + >=dev-qt/qtgui-${QTMIN}:5 + >=dev-qt/qtnetwork-${QTMIN}:5 + >=dev-qt/qtwidgets-${QTMIN}:5 + >=dev-qt/qtxml-${QTMIN}:5 + >=kde-frameworks/kcalendarcore-${KFMIN}:5 + >=kde-frameworks/kcontacts-${KFMIN}:5 + >=kde-frameworks/kwallet-${KFMIN}:5 +" +RDEPEND="${DEPEND}" + +PATCHES=( "${FILESDIR}/${P}-remember-gmail-auth-token.patch" ) # KDE-Bug 429406 diff --git a/kde-apps/libkgapi/libkgapi-20.12.1.ebuild b/kde-apps/libkgapi/libkgapi-20.12.1.ebuild deleted file mode 100644 index 950dc581ce22..000000000000 --- a/kde-apps/libkgapi/libkgapi-20.12.1.ebuild +++ /dev/null @@ -1,33 +0,0 @@ -# Copyright 1999-2021 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 - -ECM_TEST="true" -KFMIN=5.75.0 -QTMIN=5.15.1 -VIRTUALX_REQUIRED="test" -inherit ecm kde.org - -DESCRIPTION="Library for accessing Google calendar and contact resources" -HOMEPAGE="https://api.kde.org/kdepim/libkgapi/html/index.html" - -LICENSE="LGPL-2.1+" -SLOT="5" -KEYWORDS="~amd64 ~arm64 ~ppc64 ~x86" -IUSE="nls" - -BDEPEND=" - nls? ( >=dev-qt/linguist-tools-${QTMIN}:5 ) -" -DEPEND=" - dev-libs/cyrus-sasl:2 - >=dev-qt/qtgui-${QTMIN}:5 - >=dev-qt/qtnetwork-${QTMIN}:5 - >=dev-qt/qtwidgets-${QTMIN}:5 - >=dev-qt/qtxml-${QTMIN}:5 - >=kde-frameworks/kcalendarcore-${KFMIN}:5 - >=kde-frameworks/kcontacts-${KFMIN}:5 - >=kde-frameworks/kwallet-${KFMIN}:5 -" -RDEPEND="${DEPEND}" -- cgit v1.2.3