summaryrefslogtreecommitdiff
path: root/user/lxqt-runner/revert-kwindowsystem-bump.patch
diff options
context:
space:
mode:
authorSíle Ekaterin Liszka <sheila@vulpine.house>2023-11-26 05:49:39 -0800
committerA. Wilcox <awilcox@wilcox-tech.com>2023-11-27 09:59:05 +0000
commit0f75de74e7cb642a4b8130ec7d833048f977167e (patch)
treefb355827a40dbf4c0a503278eddd7311e4511757 /user/lxqt-runner/revert-kwindowsystem-bump.patch
parent81d3b01f349be1349b49328c572eaa3121a85b70 (diff)
downloadpackages-0f75de74e7cb642a4b8130ec7d833048f977167e.tar.gz
packages-0f75de74e7cb642a4b8130ec7d833048f977167e.tar.bz2
packages-0f75de74e7cb642a4b8130ec7d833048f977167e.tar.xz
packages-0f75de74e7cb642a4b8130ec7d833048f977167e.zip
user/lxqt-runner: upgrade to 1.4.0
The patch accompanying this upgrade should be removed when kwindowsystem is bumped.
Diffstat (limited to 'user/lxqt-runner/revert-kwindowsystem-bump.patch')
-rw-r--r--user/lxqt-runner/revert-kwindowsystem-bump.patch92
1 files changed, 92 insertions, 0 deletions
diff --git a/user/lxqt-runner/revert-kwindowsystem-bump.patch b/user/lxqt-runner/revert-kwindowsystem-bump.patch
new file mode 100644
index 000000000..a640b193a
--- /dev/null
+++ b/user/lxqt-runner/revert-kwindowsystem-bump.patch
@@ -0,0 +1,92 @@
+diff '--color=auto' -Nurd lxqt-runner-1.4.0/CMakeLists.txt lxqt-runner-1.4.0.new/CMakeLists.txt
+--- lxqt-runner-1.4.0/CMakeLists.txt 2023-11-05 04:08:33.000000000 -0800
++++ lxqt-runner-1.4.0.new/CMakeLists.txt 2023-11-26 05:46:06.721141501 -0800
+@@ -25,7 +25,7 @@
+ )
+
+ # Minimum Versions
+-set(KF5_MINIMUM_VERSION "5.101.0")
++set(KF5_MINIMUM_VERSION "5.36.0")
+ set(LIBMENUCACHE_MINIMUM_VERSION "1.1.0")
+ set(LXQT_MINIMUM_VERSION "1.4.0")
+ set(LXQT_GLOBALKEYS_MINIMUM_VERSION "1.4.0")
+diff '--color=auto' -Nurd lxqt-runner-1.4.0/dialog.cpp lxqt-runner-1.4.0.new/dialog.cpp
+--- lxqt-runner-1.4.0/dialog.cpp 2023-11-05 04:08:33.000000000 -0800
++++ lxqt-runner-1.4.0.new/dialog.cpp 2023-11-26 05:46:44.460840536 -0800
+@@ -55,7 +55,6 @@
+ #include <QScrollBar>
+
+ #include <KWindowSystem/KWindowSystem>
+-#include <KWindowSystem/KX11Extras>
+
+ #define DEFAULT_SHORTCUT "Alt+F2"
+
+@@ -201,8 +200,8 @@
+ ************************************************/
+ void Dialog::showEvent(QShowEvent *event)
+ {
+- connect(KX11Extras::self(), &KX11Extras::activeWindowChanged, this, &Dialog::onActiveWindowChanged);
+- connect(KX11Extras::self(), &KX11Extras::currentDesktopChanged, this, &Dialog::onCurrentDesktopChanged);
++ connect(KWindowSystem::self(), &KWindowSystem::activeWindowChanged, this, &Dialog::onActiveWindowChanged);
++ connect(KWindowSystem::self(), &KWindowSystem::currentDesktopChanged, this, &Dialog::onCurrentDesktopChanged);
+ return QDialog::showEvent(event);
+ }
+
+@@ -213,8 +212,8 @@
+ void Dialog::hideEvent(QHideEvent *event)
+ {
+ QDialog::hideEvent(event);
+- disconnect(KX11Extras::self(), &KX11Extras::currentDesktopChanged, this, &Dialog::onCurrentDesktopChanged);
+- disconnect(KX11Extras::self(), &KX11Extras::activeWindowChanged, this, &Dialog::onActiveWindowChanged);
++ disconnect(KWindowSystem::self(), &KWindowSystem::currentDesktopChanged, this, &Dialog::onCurrentDesktopChanged);
++ disconnect(KWindowSystem::self(), &KWindowSystem::activeWindowChanged, this, &Dialog::onActiveWindowChanged);
+ }
+
+
+@@ -349,7 +348,7 @@
+ {
+ // Using KWindowSystem to detect the active window since
+ // QWidget::isActiveWindow is not working reliably.
+- if (isVisible() && (KX11Extras::activeWindow() == winId()))
++ if (isVisible() && (KWindowSystem::activeWindow() == winId()))
+ {
+ hide();
+ }
+@@ -357,7 +356,7 @@
+ {
+ realign();
+ show();
+- KX11Extras::forceActiveWindow(winId());
++ KWindowSystem::forceActiveWindow(winId());
+ ui->commandEd->setFocus();
+ ui->commandEd->selectAll();
+ }
+@@ -378,7 +377,7 @@
+ screenNumber = screen ? screens.indexOf(screen) : 0;
+ }
+
+- desktop = screens.at(screenNumber)->availableGeometry().intersected(KX11Extras::workArea(screenNumber));
++ desktop = screens.at(screenNumber)->availableGeometry().intersected(KWindowSystem::workArea(screenNumber));
+
+ QRect rect = this->geometry();
+ rect.moveCenter(desktop.center());
+@@ -452,7 +451,7 @@
+ if (mDesktopChanged)
+ {
+ mDesktopChanged = false;
+- KX11Extras::forceActiveWindow(winId());
++ KWindowSystem::forceActiveWindow(winId());
+ } else
+ {
+ hide();
+@@ -468,8 +467,8 @@
+ {
+ if (isVisible())
+ {
+- KX11Extras::setOnDesktop(winId(), screen);
+- KX11Extras::forceActiveWindow(winId());
++ KWindowSystem::setOnDesktop(winId(), screen);
++ KWindowSystem::forceActiveWindow(winId());
+ //Note: workaround for changing desktop while runner is shown
+ // The KWindowSystem::forceActiveWindow may fail to correctly activate runner if there
+ // are any other windows on the new desktop (probably because of the sequence while WM