diff --git a/debian/changelog b/debian/changelog index 61713f8..7620cc5 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,4 +1,4 @@ -liblxqt (1.4.0-0ubuntu1~ppa1) jammy; urgency=medium +liblxqt (1.4.0-0ubuntu1~ppa3) jammy; urgency=medium * Backport to Jammy. diff --git a/debian/patches/revert-kx11extras-port.patch b/debian/patches/revert-kx11extras-port.patch new file mode 100644 index 0000000..0bda9c9 --- /dev/null +++ b/debian/patches/revert-kx11extras-port.patch @@ -0,0 +1,49 @@ +Description: Revert port away from deprecated KWindowSystem +Author: Simon Quigley +Origin: backport +Bug: https://github.com/lxqt/liblxqt/issues/334 +Applied-Upstream: fae257647adc8729b597d9cf9617c81b99f9df42, reverted +Last-Update: 2023-11-10 + +--- liblxqt-1.4.0.orig/CMakeLists.txt ++++ liblxqt-1.4.0/CMakeLists.txt +@@ -8,7 +8,7 @@ project(liblxqt) + + + 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") + +--- liblxqt-1.4.0.orig/lxqtsingleapplication.cpp ++++ liblxqt-1.4.0/lxqtsingleapplication.cpp +@@ -28,7 +28,6 @@ + #include "lxqtsingleapplication.h" + #include "singleapplicationadaptor.h" + #include +-#include + #include + #include + #include +@@ -96,16 +95,13 @@ void SingleApplication::activateWindow() + if (mActivationWindow) { + mActivationWindow->show(); + WId window = mActivationWindow->effectiveWinId(); ++ + 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"; + } diff --git a/debian/patches/series b/debian/patches/series new file mode 100644 index 0000000..87b771b --- /dev/null +++ b/debian/patches/series @@ -0,0 +1 @@ +revert-kx11extras-port.patch