Script 'mail_helper' called by obssrc
Hello community,

here is the log from the commit of package libkgapi for openSUSE:Factory 
checked in at 2021-01-15 19:43:40
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/libkgapi (Old)
 and      /work/SRC/openSUSE:Factory/.libkgapi.new.28504 (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++

Package is "libkgapi"

Fri Jan 15 19:43:40 2021 rev:68 rq:861897 version:20.12.1

Changes:
--------
--- /work/SRC/openSUSE:Factory/libkgapi/libkgapi.changes        2021-01-08 
17:37:42.184730137 +0100
+++ /work/SRC/openSUSE:Factory/.libkgapi.new.28504/libkgapi.changes     
2021-01-15 19:43:42.117787427 +0100
@@ -1,0 +2,5 @@
+Sat Jan  9 10:22:40 UTC 2021 - Nico Kruber <nico.kru...@gmail.com>
+
+- add kde-429406-dont-reset-account-scopes.patch (kde#429406)
+
+-------------------------------------------------------------------

New:
----
  kde-429406-dont-reset-account-scopes.patch

++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++

Other differences:
------------------
++++++ libkgapi.spec ++++++
--- /var/tmp/diff_new_pack.zaw8wY/_old  2021-01-15 19:43:42.685788358 +0100
+++ /var/tmp/diff_new_pack.zaw8wY/_new  2021-01-15 19:43:42.689788365 +0100
@@ -27,6 +27,8 @@
 Group:          System/GUI/KDE
 URL:            https://www.kde.org
 Source:         
https://download.kde.org/stable/release-service/%{version}/src/%{name}-%{version}.tar.xz
+# PATCH-FIX-UPSTREAM Fix not remembering auth token
+Patch1:         kde-429406-dont-reset-account-scopes.patch
 BuildRequires:  cyrus-sasl-devel
 BuildRequires:  extra-cmake-modules >= 5.55.0
 BuildRequires:  kf5-filesystem
@@ -153,6 +155,7 @@
 
 %prep
 %setup -q -n libkgapi-%{version}
+%patch1 -p1
 
 %build
 # workaround, kio-gdrive crashes when loading libKPimGAPIDrive5 if built with 
LTO (boo#1148217)


++++++ kde-429406-dont-reset-account-scopes.patch ++++++
>From 160136cf5efa131806f46b04c97ad6988eda3ba8 Mon Sep 17 00:00:00 2001
From: Antonio Rojas <aro...@archlinux.org>
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

Reply via email to