summaryrefslogtreecommitdiff
path: root/user/liblxqt/revert-kwindowsystem-bump.patch
blob: 58419a8013a8ff134da5b4ac827c6c774dd308b8 (plain) (blame)
1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
diff '--color=auto' -Nurd liblxqt-1.4.0/CMakeLists.txt liblxqt-1.4.0.new/CMakeLists.txt
--- liblxqt-1.4.0/CMakeLists.txt	2023-11-05 02:54:50.000000000 -0800
+++ liblxqt-1.4.0.new/CMakeLists.txt	2023-11-27 06:01:14.963487658 -0800
@@ -8,7 +8,7 @@
 
 
 set(LXQTBT_MINIMUM_VERSION "0.13.0")
-set(KF5_MINIMUM_VERSION "5.101.0")
+set(KF5_MINIMUM_VERSION "5.36.0")
 set(QT_MINIMUM_VERSION "5.15.0")
 set(QTXDG_MINIMUM_VERSION "3.12.0")
 
diff '--color=auto' -Nurd liblxqt-1.4.0/lxqtsingleapplication.cpp liblxqt-1.4.0.new/lxqtsingleapplication.cpp
--- liblxqt-1.4.0/lxqtsingleapplication.cpp	2023-11-05 02:54:50.000000000 -0800
+++ liblxqt-1.4.0.new/lxqtsingleapplication.cpp	2023-11-27 06:03:46.852519095 -0800
@@ -28,7 +28,6 @@
 #include "lxqtsingleapplication.h"
 #include "singleapplicationadaptor.h"
 #include <KWindowSystem/KWindowSystem>
-#include <KWindowSystem/KX11Extras>
 #include <QDBusMessage>
 #include <QWidget>
 #include <QDebug>
@@ -99,13 +98,9 @@
         KWindowInfo info(window, KWindowSystem::WMDesktop);
         int windowDesktop = info.desktop();
 
-        if (windowDesktop != KX11Extras::currentDesktop())
-            KX11Extras::setCurrentDesktop(windowDesktop);
-
-        if (QWindow *w = mActivationWindow->windowHandle())
-            KWindowSystem::activateWindow(w);
-         else
-            qDebug() << Q_FUNC_INFO << "Got null windowHandle";
+        if (windowDesktop != KWindowSystem::currentDesktop())
+            KWindowSystem::setCurrentDesktop(windowDesktop);
+		KWindowSystem::activateWindow(window);
     } else {
         qDebug() << Q_FUNC_INFO << "activationWindow not set or null";
     }