pool/kdepim-runtime
SHA256
12
0
Fork 1
Code Issues Pull Requests Activity

KDE release gear 24.02.1

Browse Source 
OBS-URL: https://build.opensuse.org/package/show/KDE:Applications/kdepim-runtime?expand=0&rev=349
This commit is contained in:
Christophe Marin
2024-03-21 13:54:33 +00:00
committed by Git OBS Bridge
parent 8cfec18b87
commit 34ea37a666
7 changed files with 37 additions and 144 deletions
Download Patch File Download Diff File Expand all files Collapse all files

120
0001-Bring-back-etesync-support.patch
View File

@@ -1,120 +0,0 @@
From 6f4914ac93e939e0f83b32a2eefe5d7f012a029f Mon Sep 17 00:00:00 2001
From: Carl Schwan <carl@carlschwan.eu>
Date: Tue, 12 Mar 2024 10:30:40 +0100
Subject: [PATCH] Bring back etesync support
BUG: 482600
---
CMakeLists.txt | 4 ++--
resources/etesync/CMakeLists.txt | 1 +
resources/etesync/entriesfetchjob.cpp | 5 +++--
resources/etesync/journalsfetchjob.cpp | 5 +++--
resources/etesync/loginjob.cpp | 5 +++--
5 files changed, 12 insertions(+), 8 deletions(-)
diff --git a/CMakeLists.txt b/CMakeLists.txt
index 4f9d3c275..316bcceaf 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -66,7 +66,7 @@ set_package_properties(Qca-qt6 PROPERTIES DESCRIPTION "Qt Cryptographic Architec
URL "https://invent.kde.org/libraries/qca" TYPE REQUIRED
PURPOSE "Needed for ews resource.")
option(KDEPIM_RUN_AKONADI_TEST "Enable autotest based on Akonadi." TRUE)
-# QT5 package
+# QT package
find_package(Qt6TextToSpeech ${QT_REQUIRED_VERSION} CONFIG)
set_package_properties(Qt6TextToSpeech PROPERTIES DESCRIPTION
"Add support for texttospeech"
@@ -75,7 +75,7 @@ set_package_properties(Qt6TextToSpeech PROPERTIES DESCRIPTION
if(Qt6TextToSpeech_FOUND)
set(HAVE_TEXT_TO_SPEECH_SUPPORT TRUE)
endif()
-find_package(Qt6 ${QT_REQUIRED_VERSION} CONFIG REQUIRED Network Widgets Test DBus NetworkAuth)
+find_package(Qt6 ${QT_REQUIRED_VERSION} CONFIG REQUIRED Network Widgets Test DBus NetworkAuth Concurrent)
find_package(Qt6WebEngineWidgets ${QT_REQUIRED_VERSION} CONFIG)
# KF6 package
diff --git a/resources/etesync/CMakeLists.txt b/resources/etesync/CMakeLists.txt
index 6a233f09b..2c16ff071 100644
--- a/resources/etesync/CMakeLists.txt
+++ b/resources/etesync/CMakeLists.txt
@@ -52,6 +52,7 @@ endif()
target_link_libraries(akonadi_etesync_resource
${ETEBASE_LIBRARIES}
Qt::DBus
+ Qt::Concurrent
KPim6::AkonadiAgentBase
KF6::ConfigCore
KF6::Contacts
diff --git a/resources/etesync/entriesfetchjob.cpp b/resources/etesync/entriesfetchjob.cpp
index cab76cefc..e2081292e 100644
--- a/resources/etesync/entriesfetchjob.cpp
+++ b/resources/etesync/entriesfetchjob.cpp
@@ -10,7 +10,8 @@
#include <KCalendarCore/Event>
#include <KCalendarCore/Todo>
#include <KContacts/Addressee>
-#include <QtConcurrent>
+#include <QFutureWatcher>
+#include <QtConcurrentRun>
#include "etesync_debug.h"
#include "settings.h"
@@ -39,7 +40,7 @@ void EntriesFetchJob::start()
qCDebug(ETESYNC_LOG) << "emitResult from EntriesFetchJob";
emitResult();
});
- QFuture<void> fetchEntriesFuture = QtConcurrent::run(this, &EntriesFetchJob::fetchEntries);
+ QFuture<void> fetchEntriesFuture = QtConcurrent::run(&EntriesFetchJob::fetchEntries, this);
watcher->setFuture(fetchEntriesFuture);
}
diff --git a/resources/etesync/journalsfetchjob.cpp b/resources/etesync/journalsfetchjob.cpp
index eab727c33..eef070771 100644
--- a/resources/etesync/journalsfetchjob.cpp
+++ b/resources/etesync/journalsfetchjob.cpp
@@ -12,7 +12,8 @@
#include <KCalendarCore/Todo>
#include <KContacts/Addressee>
#include <KContacts/ContactGroup>
-#include <QtConcurrent>
+#include <QFutureWatcher>
+#include <QtConcurrentRun>
#include "etesync_debug.h"
@@ -36,7 +37,7 @@ void JournalsFetchJob::start()
qCDebug(ETESYNC_LOG) << "emitResult from JournalsFetchJob";
emitResult();
});
- QFuture<void> fetchJournalsFuture = QtConcurrent::run(this, &JournalsFetchJob::fetchJournals);
+ QFuture<void> fetchJournalsFuture = QtConcurrent::run(&JournalsFetchJob::fetchJournals, this);
watcher->setFuture(fetchJournalsFuture);
}
diff --git a/resources/etesync/loginjob.cpp b/resources/etesync/loginjob.cpp
index 8dd533a61..7d65408dd 100644
--- a/resources/etesync/loginjob.cpp
+++ b/resources/etesync/loginjob.cpp
@@ -6,7 +6,8 @@
#include "loginjob.h"
-#include <QtConcurrent>
+#include <QFutureWatcher>
+#include <QtConcurrentRun>
#include "etesync_debug.h"
@@ -32,7 +33,7 @@ void LoginJob::start()
qCDebug(ETESYNC_LOG) << "emitResult from LoginJob";
emitResult();
});
- QFuture<void> loginFuture = QtConcurrent::run(this, &LoginJob::login);
+ QFuture<void> loginFuture = QtConcurrent::run(&LoginJob::login, this);
watcher->setFuture(loginFuture);
}
--
2.44.0

3
kdepim-runtime-24.02.0.tar.xz
View File

@@ -1,3 +0,0 @@
version https://git-lfs.github.com/spec/v1
oid sha256:5cda8aa7b3d8a7bd526fbdd20df30f56a2dcf10a844d88a6f71b9122067bab35
size 1676108

16
kdepim-runtime-24.02.0.tar.xz.sig
View File

@@ -1,16 +0,0 @@
-----BEGIN PGP SIGNATURE-----
iQIzBAABCgAdFiEE2BwMs463Je9mkcOFu0YzUNbvMe8FAmXVriMACgkQu0YzUNbv
Me/Q0w/+IibpjURYZBBLNF/y2oca4WRH4evKIeyMYECRNgirG0XeUuhR/a+D1PoM
S0ZfWbcME7RGYOiYcf4jbZNEjfVygsQsuY6VLjCYNlSCnQHYL6vCxasLH/K61DNL
ZjmUHebib8+bQDExeWpFVYbLnUzzfVJyFVT3X9MlanE0xjjoQrroFzHSJAEl5FS/
BNVmvlJGTphYWE3yytq14YuFiRqp8YR1VhlD9HbZHfQUDKmOx7KgsUnvo8shMWpK
MeRxfOlIkyo0JzWgpZcOi89c0nscmXZwZeqXIPjsy5FFzta0KwOOLl6L1KM5qiKk
MF8ISsVIWOf7kkiBeLRM0MV0Q3zkIibod+IGOgWuGKIk+Td+JLGgg/XZcLATvSNi
bZNLgMn4KhCilzyNw82L7S9QkyGnseRY8bYLVowNMQePuG5kS6e/gQQ6I2Hwle0f
C1kMWnJXqFLr/lX8x3vvXfvtW9wl3mlO3FLib+rKJrKJYZyvACpdglRYC29woBMm
Ix0VlKU31ZOHqXezzyfNJig1qCT8qatvOX7siHOoqTfap3mpndYQujXKc1jS4mh7
9R2bzIQVqjH5XBxt7Y4GqyW5MpeR811OMtYIA0wYQXxPrwuIavLAMvFx64lzdtQG
4xT5Hh22l1H0MT46Yx882uxPD3W2Ju0lETepOarokq1pGkG7oQ0=
=QTEG
-----END PGP SIGNATURE-----

3
kdepim-runtime-24.02.1.tar.xz Normal file
View File

@@ -0,0 +1,3 @@
version https://git-lfs.github.com/spec/v1
oid sha256:af23d43e112deae5c62ebf8411796146316f7c2e4bd2f2101a246a19ede58558
size 1677352

16
kdepim-runtime-24.02.1.tar.xz.sig Normal file
View File

@@ -0,0 +1,16 @@
-----BEGIN PGP SIGNATURE-----
iQIzBAABCgAdFiEE2BwMs463Je9mkcOFu0YzUNbvMe8FAmX5OJgACgkQu0YzUNbv
Me9HLRAAgajPJtp3Ab63YFZBtai2Fus295YvIU3xKhIXoR0LME/0dfIMeMLx2OSF
JvhfAPCANKWoNOCXSz0C4+Frqz2sxKiV1P+FxM9s2yaom4hSVXw1a3IG8LPbyqHg
SvtMiJKOTzfDmmrLijwFrt8FGFfvmL3rnZdaGZooi4mgG5qo8EmUK8Ci/Z9l26mg
mvD1lKvYC15iqtduegReb5D6kgSnG51pfzxBeVhzknYTcsKivyNk7RfhuNuwPt5u
pZASgV/H/sJnytdgACzZd8QbaFUGce04p5rZMgbdzb5BET6JyQ4Z9G/sh4ITSj7H
o46fkL3M/rjskEKfphrdAyZJxYOHvNDqQSwEHv9dnhGqUw9Ipd/EHu+CWGudXmXZ
PzFoojDtVxLxQWdPUoa63sCYU1Eb+GxORUihW2uQCQxGxzTazpHzAxc2OJAXG5ui
mrDrD3Bxmo0Z2jHd6NF5KCwv0zp+WEhFFLjqnY6qktYw1sBdWaH0vMbhs90crxkS
9Y9UeTMf/3xcGk0CDBMknxVcioJZlZJXYo8hA9fRK+70pyOfBvvE58yuzkbnrxol
3NoKVrf0cs4rpy8Q90gUuiYOSeQl7WnXX7orIvfVkgB5BTMqET8MDA+pWm/To4tN
2V2JyxpE3Ncpi53nNX8tLmVdvTtgJLaA24hYR3jPJ1aBjCqbHEg=
=/c78
-----END PGP SIGNATURE-----

15
kdepim-runtime.changes
View File

@@ -1,3 +1,18 @@
-------------------------------------------------------------------
Tue Mar 19 15:26:06 UTC 2024 - Christophe Marin <christophe@krop.fr>
- Update to 24.02.1
* New bugfix release
* For more details please see:
* https://kde.org/announcements/gear/24.02.1/
- Changes since 24.02.0:
* Bring back etesync support (kde#482600)
* Support NTLMv2
* Port EWS resource away from KIO Http
* Fix endless sync loop with some remote iCal sources (kde#384309)
- Drop patch, merged upstream:
* 0001-Bring-back-etesync-support.patch
-------------------------------------------------------------------
Wed Mar 13 19:28:04 UTC 2024 - Christophe Marin <christophe@krop.fr>

8
kdepim-runtime.spec
View File

@@ -18,7 +18,7 @@
%define kf6_version 5.246.0
%define qt6_version 6.6.0
%define kpim6_version 6.0.0
%define kpim6_version 6.0.1
%if 0%{?suse_version} > 1500 || 0%{?sle_version} > 150500
%bcond_without etebase
@@ -26,7 +26,7 @@
%bcond_without released
Name: kdepim-runtime
Version: 24.02.0
Version: 24.02.1
Release: 0
Summary: Akonadi resources for PIM applications
License: GPL-2.0-or-later AND GPL-3.0-or-later
@@ -36,8 +36,6 @@ Source: %{name}-%{version}.tar.xz
Source1: %{name}-%{version}.tar.xz.sig
Source2: applications.keyring
%endif
# PATCH-FIX-UPSTREAM
Patch0: 0001-Bring-back-etesync-support.patch
BuildRequires: cyrus-sasl-devel
BuildRequires: kf6-extra-cmake-modules >= %{kf6_version}
BuildRequires: libboost_atomic-devel
@@ -96,7 +94,7 @@ Provides: kio-pimlibs = %{version}
Obsoletes: kdepim4-runtime < %{version}
Obsoletes: kio-pimlibs < %{version}
# It can only build on the same platforms as Qt Webengine
ExclusiveArch: x86_64 aarch64 riscv64
ExclusiveArch: x86_64 %x86_64 aarch64 riscv64
%description
This package contains the Akonadi resources, agents and plugins needed to