From c4531bc6042cb35d3ab80f7ca38c16148ea32e14 Mon Sep 17 00:00:00 2001
From: Simon Quigley <simon@tsimonq2.net>
Date: Mon, 13 Nov 2023 11:58:18 -0600
Subject: [PATCH] Revert Yet Another KWindowSystem port.

---
 debian/changelog                              |  2 +-
 .../patches/revert-kwindowsystem-port.patch   | 30 +++++++++++++++++++
 debian/patches/series                         |  1 +
 3 files changed, 32 insertions(+), 1 deletion(-)
 create mode 100644 debian/patches/revert-kwindowsystem-port.patch

diff --git a/debian/changelog b/debian/changelog
index 7212ada..287a0b8 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,4 +1,4 @@
-lxqt-powermanagement (1.4.0-0ubuntu1~ppa1) jammy; urgency=medium
+lxqt-powermanagement (1.4.0-0ubuntu1~ppa2) jammy; urgency=medium
 
   * Backport to Jammy.
 
diff --git a/debian/patches/revert-kwindowsystem-port.patch b/debian/patches/revert-kwindowsystem-port.patch
new file mode 100644
index 0000000..a1b8418
--- /dev/null
+++ b/debian/patches/revert-kwindowsystem-port.patch
@@ -0,0 +1,30 @@
+--- a/CMakeLists.txt
++++ b/CMakeLists.txt
+@@ -16,7 +16,7 @@ set(CMAKE_POSITION_INDEPENDENT_CODE ON)
+ option(UPDATE_TRANSLATIONS "Update source translation translations/*.ts files" OFF)
+ 
+ set(LXQTBT_MINIMUM_VERSION "0.13.0")
+-set(KF5_MINIMUM_VERSION "5.101.0")
++set(KF5_MINIMUM_VERSION "5.36.0")
+ set(LXQT_MINIMUM_VERSION "1.4.0")
+ set(QT_MINIMUM_VERSION "5.15.0")
+ 
+--- a/src/idlenesswatcher.cpp
++++ b/src/idlenesswatcher.cpp
+@@ -30,7 +30,6 @@
+ #include <Solid/Device>
+ #include <Solid/Battery>
+ #include <KWindowSystem/KWindowSystem>
+-#include <KWindowSystem/KX11Extras>
+ #include <KWindowSystem/KWindowInfo>
+ #include <QDebug>
+ #include <LXQt/lxqtnotification.h>
+@@ -162,7 +161,7 @@ void IdlenessWatcher::timeoutReached(int
+ 
+     // check if disable Idleness when fullscreen is enabled
+     if (mPSettings.isDisableIdlenessWhenFullscreenEnabled()) {
+-        WId w = KX11Extras::activeWindow();
++        WId w = KWindowSystem::activeWindow();
+         KWindowInfo info(w, NET::WMState);
+         if (info.hasState(NET::FullScreen)) {
+             QTimer::singleShot(0, this, [] {
diff --git a/debian/patches/series b/debian/patches/series
index a4919f2..4f5394f 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1 +1,2 @@
 battery-ux.patch
+revert-kwindowsystem-port.patch