From cc42a445dd52c7e82d0cf7c82dde1fcd1f0739b9 Mon Sep 17 00:00:00 2001
From: Caolán McNamara <caolanm@redhat.com>
Date: Feb 02 2022 16:35:57 +0000
Subject: rhbz#2047319 drop the SolarMutex before QApplication::init()


---

diff --git a/0001-rhbz-2047319-drop-the-SolarMutex-during-QApplication.patch b/0001-rhbz-2047319-drop-the-SolarMutex-during-QApplication.patch
new file mode 100644
index 0000000..4b3de3a
--- /dev/null
+++ b/0001-rhbz-2047319-drop-the-SolarMutex-during-QApplication.patch
@@ -0,0 +1,73 @@
+From bea26e47a592c86df8d0f4c3695220452b4d77ab Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?Caol=C3=A1n=20McNamara?= <caolanm@redhat.com>
+Date: Wed, 2 Feb 2022 16:21:43 +0000
+Subject: [PATCH] rhbz#2047319 drop the SolarMutex during QApplication::init()
+
+https://invent.kde.org/qt/qt/qtwayland/-/merge_requests/24#note_383915
+
+reproducible with with qt5-qtwayland-5.15.2-17.fc35.x86_64 and
+export OOO_FORCE_DESKTOP=plasma5
+export SAL_USE_VCLPLUGIN=gtk3
+
+Change-Id: Icdf6b8709865c723c266e6400169b33639a1b0e4
+---
+ shell/Library_kf5be.mk                     |  1 +
+ shell/source/backends/kf5be/kf5backend.cxx | 23 ++++++++++++++--------
+ 2 files changed, 16 insertions(+), 8 deletions(-)
+
+diff --git a/shell/Library_kf5be.mk b/shell/Library_kf5be.mk
+index 628145176e0f..157f8b9836f8 100644
+--- a/shell/Library_kf5be.mk
++++ b/shell/Library_kf5be.mk
+@@ -20,6 +20,7 @@ $(eval $(call gb_Library_use_libraries,kf5be1,\
+ 	cppu \
+ 	cppuhelper \
+ 	sal \
++	vcl \
+ ))
+ 
+ $(eval $(call gb_Library_set_componentfile,kf5be1,shell/source/backends/kf5be/kf5be1))
+diff --git a/shell/source/backends/kf5be/kf5backend.cxx b/shell/source/backends/kf5be/kf5backend.cxx
+index e448c124d88a..bde5f85c1ae4 100644
+--- a/shell/source/backends/kf5be/kf5backend.cxx
++++ b/shell/source/backends/kf5be/kf5backend.cxx
+@@ -42,6 +42,7 @@
+ #include <rtl/ustring.hxx>
+ #include <sal/types.h>
+ #include <uno/current_context.hxx>
++#include <vcl/svapp.hxx>
+ 
+ #include <osl/process.h>
+ #include <osl/thread.h>
+@@ -170,14 +171,20 @@ void initQApp(std::map<OUString, css::beans::Optional<css::uno::Any>>& rSettings
+         unsetenv("SESSION_MANAGER");
+     }
+ 
+-    std::unique_ptr<QApplication> app(new QApplication(nFakeArgc, pFakeArgv));
+-    QObject::connect(app.get(), &QObject::destroyed, app.get(), [nFakeArgc, pFakeArgv]() {
+-        for (int i = 0; i < nFakeArgc; ++i)
+-            free(pFakeArgv[i]);
+-        delete[] pFakeArgv;
+-    });
+-
+-    readKDESettings(rSettings);
++    {
++        // rhbz#2047319 drop the SolarMutex during the execution of QApplication::init()
++        // https://invent.kde.org/qt/qt/qtwayland/-/merge_requests/24#note_383915
++        SolarMutexReleaser aReleaser; // rhbz#2047319 drop the SolarMutex during the execution
++
++        std::unique_ptr<QApplication> app(new QApplication(nFakeArgc, pFakeArgv));
++        QObject::connect(app.get(), &QObject::destroyed, app.get(), [nFakeArgc, pFakeArgv]() {
++            for (int i = 0; i < nFakeArgc; ++i)
++                free(pFakeArgv[i]);
++            delete[] pFakeArgv;
++        });
++
++        readKDESettings(rSettings);
++    }
+ 
+     if (session_manager != nullptr)
+     {
+-- 
+2.33.1
+
diff --git a/libreoffice.spec b/libreoffice.spec
index 894eaf6..125b3b2 100644
--- a/libreoffice.spec
+++ b/libreoffice.spec
@@ -259,6 +259,7 @@ Patch3: 0001-make-with-idlc-cpp-cpp-work-for-gcc-cpp-as-a-ucpp-re.patch
 Patch4: 0001-Revert-tdf-101630-gdrive-support-w-oAuth-and-Drive-A.patch
 Patch5: 0001-annocheck-warning-about-missing-.note.gnu.property-s.patch
 Patch6: 0001-tdf-146971-changing-a11y-desc-to-replace-PRODUCTNAME.patch
+Patch7: 0001-rhbz-2047319-drop-the-SolarMutex-during-QApplication.patch
 
 # not upstreamed
 Patch500: 0001-disable-libe-book-support.patch
@@ -2261,8 +2262,8 @@ gtk-update-icon-cache -q %{_datadir}/icons/hicolor &>/dev/null || :
 %{_includedir}/LibreOfficeKit
 
 %changelog
-* Mon Jan 31 2022 Caolán McNamara <caolanm@redhat.com> - 1:7.2.5.2-3
-- bump n-v-r
+* Wed Feb 02 2022 Caolán McNamara <caolanm@redhat.com> - 1:7.2.5.2-3
+- rhbz#2047319 drop the SolarMutex before QApplication::init()
 
 * Sat Jan 29 2022 Caolán McNamara <caolanm@redhat.com> - 1:7.2.5.2-2
 - tdf#146971 don't change a11y desc to replace PRODUCTNAME, may solve