KDE: Update KDE Gear to 22.04

Thursday, 21 April 2022

Welcome to KDE Gear ⚙️ 22.04!

Skip to What’s New

KDE Gear ⚙️ 22.04 brings you all the updates added to a long list of KDE
apps over the last four months. KDE programs allow you to work, create
and play without having to submit yourself to extortionate licenses and
intrusive advertising, or surrender your privacy to unscrupulous
corporations.

Below you will discover a selection of the changes added in the last
four months to software designed to make your life better. But remember,
there is much, much more: games, social media apps, utilities for
communicating, developing and creating stuff… All these things have been
worked on to give you more stability and boost your productivity.

If you want to see a full list of everything we have done, check out the
complete changelog.

WARNING: There’s a lot!

All the details can be found here:
	https://kde.org/announcements/gear/22.04.0/

3 files changed, 4 insertions, 72 deletions

diff --git a/net/kldap/distinfo b/net/kldap/distinfo
index e6820fa0dfc0..ae7357efe285 100644
--- a/net/kldap/distinfo
+++ b/net/kldap/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1646143113
-SHA256 (KDE/release-service/21.12.3/kldap-21.12.3.tar.xz) = 0abce0ebca12a6ee71e6b93a727579d20900fdbc750f059283dbd1d4a1d3948e
-SIZE (KDE/release-service/21.12.3/kldap-21.12.3.tar.xz) = 172104
+TIMESTAMP = 1650101859
+SHA256 (KDE/release-service/22.04.0/kldap-22.04.0.tar.xz) = 317853dc9a7291c4325336fbfef3003c955de93db00107c11b5f27e6f3acd3fc
+SIZE (KDE/release-service/22.04.0/kldap-22.04.0.tar.xz) = 172588
diff --git a/net/kldap/files/patch-UB.diff b/net/kldap/files/patch-UB.diff
deleted file mode 100644
index 6a8c2057156f..000000000000
--- a/net/kldap/files/patch-UB.diff
+++ /dev/null
@@ -1,68 +0,0 @@
-commit 1683a9d0749550b81ba3fd7ddeba4fc0884acb47
-Author: Adriaan de Groot <groot@kde.org>
-Date:   Mon Jan 24 11:27:29 2022 +0100
-
-    Fix crash in destructor when using libcxx (Clang STL, FreeBSD)
-    
-    This code crashes in the destructor of LdapClient on FreeBSD.
-    The crash is visible to uses who
-    - start KOrganizer
-    - click the "New Event" button
-    
-    The underlying issue is a lot like the one described in
-            https://blogs.kde.org/2021/02/20/uniqueptr-difference-between-libstdc-and-libc-crashes-your-application
-    There is a convoluted call-chain on destruction of LdapClient:
-    - ~LdapClient
-    - ~std::unique_ptr<LdapClientPrivate>
-    - ~LdapClientPrivate
-    - LdapClient::cancelQuery
-    - (accesses to members of LdapClientPrivate `d`)
-    
-    With libcxx, the pointer in `d` is already set to nullptr and
-    SEGV happens. I'm not sure it isn't UB, anyway, since the
-    destructor body for LdapClient has already run.
-    
-    The fix moves the implementation of `cancelQuery()` into
-    the private class. This means that the LdapClient class does
-    a little less poking-and-prodding in the private class,
-    but also cuts out the call-from-private-back-to-destroyed-
-    owning-LdapClient, fixing the SEGV and possible UB.
-diff --git src/widgets/ldapclient.cpp src/widgets/ldapclient.cpp
-index cf94ea9..012b3a7 100644
---- src/widgets/ldapclient.cpp
-+++ src/widgets/ldapclient.cpp
-@@ -31,9 +31,11 @@ public:
- 
-     ~LdapClientPrivate()
-     {
--        q->cancelQuery();
-+        cancelQuery();
-     }
- 
-+    void cancelQuery();
-+    
-     void startParseLDIF();
-     void parseLDIF(const QByteArray &data);
-     void endParseLDIF();
-@@ -133,12 +135,17 @@ void LdapClient::startQuery(const QString &filter)
- 
- void LdapClient::cancelQuery()
- {
--    if (d->mJob) {
--        d->mJob->kill();
--        d->mJob = nullptr;
-+    d->cancelQuery();
-+}
-+
-+void LdapClient::LdapClientPrivate::cancelQuery()
-+{
-+    if (mJob) {
-+        mJob->kill();
-+        mJob = nullptr;
-     }
- 
--    d->mActive = false;
-+    mActive = false;
- }
- 
- void LdapClient::LdapClientPrivate::slotData(KIO::Job *, const QByteArray &data)
diff --git a/net/kldap/pkg-plist b/net/kldap/pkg-plist
index 357df66e1b8e..f4f579dfdf14 100644
--- a/net/kldap/pkg-plist
+++ b/net/kldap/pkg-plist
@@ -39,7 +39,7 @@ include/KF5/KLDAP/kldap/ldapsearchclientreadconfigserverjob.h
 include/KF5/KLDAP/kldap/ldapserver.h
 include/KF5/KLDAP/kldap/ldapurl.h
 include/KF5/KLDAP/kldap/ldif.h
-include/KF5/kldap_version.h
+include/KF5/KLDAP/kldap_version.h
 lib/cmake/KF5Ldap/KF5LdapConfig.cmake
 lib/cmake/KF5Ldap/KF5LdapConfigVersion.cmake
 lib/cmake/KF5Ldap/KF5LdapTargets-%%CMAKE_BUILD_TYPE%%.cmake