Undo KWindowSystem port

debian/changelog

@@ -1,3 +1,18 @@
+lxqt-runner (1.4.0-0ubuntu1~ppa1) jammy; urgency=medium
+
+  * Backport to Jammy.
+  * Revert KWindowSystem port to make the package compatible with Jammy.
+
+ -- Aaron Rainbolt <arraybolt3@gmail.com>  Mon, 13 Nov 2023 15:11:31 -0600
+
+lxqt-runner (1.4.0-0ubuntu1) noble; urgency=medium
+
+  * New upstream release.
+  * Fix copyright file.
+  * Bump build dependency versions.
+
+ -- Aaron Rainbolt <arraybolt3@gmail.com>  Mon, 13 Nov 2023 14:59:58 -0600
+
 lxqt-runner (1.3.0-0ubuntu1) mantic; urgency=medium
 
   * New upstream release.

debian/control

@@ -8,9 +8,9 @@ Section: x11
 Priority: optional
 Build-Depends: debhelper-compat (= 13),
                libkf5windowsystem-dev,
-               liblxqt-globalkeys-ui1-dev (>= 1.3.0),
+               liblxqt-globalkeys-ui1-dev (>= 1.4.0),
-               liblxqt-globalkeys1-dev (>= 1.3.0),
+               liblxqt-globalkeys1-dev (>= 1.4.0),
-               liblxqt1-dev (>= 1.3.0),
+               liblxqt1-dev (>= 1.4.0),
                libmuparser-dev,
                libqt5svg5-dev,
                libqt5x11extras5-dev,

debian/copyright

@@ -3,13 +3,19 @@ Upstream-Name: lxqt-runner
 Source: https://github.com/lxqt/lxqt-runner
 
 Files: *
-Copyright: 2012-2023, LXQt team
+Copyright: 2012-2023 LXQt team
-           2010-2013, Razor team
+           2010-2013 Razor team
 License: LGPL-2.1+
 
 Files: debian/*
-Copyright: 2021-2023, Lubuntu Developers <lubuntu-devel@lists.ubuntu.com>
+Copyright: 2014-2019 Alf Gaida <agaida@siduction.org>
-           2014-2019, Alf Gaida <agaida@siduction.org>
+           2015      Andrew Lee <ajqlee@debian.org>
+           2015      Shih-Yuan Lee (FourDollars) <fourdollars@gmail.com>
+           2015      ChangZhuo Chen <czchen@debian.org>
+           2021      apt-ghetto <apt-ghetto@protonmail.com>
+           2020-2021 Raman Sarda <theloudspeaker@lubuntu.me>
+           2018-2023 Simon Qugley <tsimonq2@ubuntu.com>
+           2023      Aaron Rainbolt <arraybolt3@gmail.com>
 License: LGPL-2.1+
 
 License: LGPL-2.1+

debian/patches/0001-revert-kwindowsystem-port.patch

@@ -0,0 +1,101 @@
+Description: Revert KWindowSystem port
+ Jammy still uses older KWindowSystem, revert back to using it.
+Author: Aaron Rainbolt
+Origin: vendor
+Last-Update: 2023-11-13
+---
+This patch header follows DEP-3: http://dep.debian.net/deps/dep3/
+diff --git a/CMakeLists.txt b/CMakeLists.txt
+index f0772f1..27c1bf5 100644
+--- a/CMakeLists.txt
++++ b/CMakeLists.txt
+@@ -25,7 +25,7 @@ cmake_dependent_option(RUNNER_VBOX_HEADLESS
+ )
+ 
+ # 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 --git a/dialog.cpp b/dialog.cpp
+index c0973e9..2f671a2 100644
+--- a/dialog.cpp
++++ b/dialog.cpp
+@@ -55,7 +55,6 @@
+ #include <QScrollBar>
+ 
+ #include <KWindowSystem/KWindowSystem>
+-#include <KWindowSystem/KX11Extras>
+ 
+ #define DEFAULT_SHORTCUT "Alt+F2"
+ 
+@@ -201,8 +200,8 @@ void Dialog::moveEvent(QMoveEvent *event)
+  ************************************************/
+ 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::showEvent(QShowEvent *event)
+ 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 @@ void Dialog::showHide()
+ {
+     // 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 @@ void Dialog::showHide()
+     {
+         realign();
+         show();
+-        KX11Extras::forceActiveWindow(winId());
++        KWindowSystem::forceActiveWindow(winId());
+         ui->commandEd->setFocus();
+         ui->commandEd->selectAll();
+     }
+@@ -378,7 +377,7 @@ void Dialog::realign()
+         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 @@ void Dialog::onActiveWindowChanged(WId id)
+         if (mDesktopChanged)
+         {
+             mDesktopChanged = false;
+-            KX11Extras::forceActiveWindow(winId());
++            KWindowSystem::forceActiveWindow(winId());
+         } else
+         {
+             hide();
+@@ -468,8 +467,8 @@ void Dialog::onCurrentDesktopChanged(int screen)
+ {
+     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

debian/patches/series

@@ -0,0 +1 @@
+0001-revert-kwindowsystem-port.patch