Compare commits

...

2 Commits

Author SHA1 Message Date
c4531bc604 Revert Yet Another KWindowSystem port. 2023-11-13 11:58:18 -06:00
7c367542ac Backport to Jammy. 2023-11-13 11:50:12 -06:00
3 changed files with 37 additions and 0 deletions

6
debian/changelog vendored
View File

@ -1,3 +1,9 @@
lxqt-powermanagement (1.4.0-0ubuntu1~ppa2) jammy; urgency=medium
* Backport to Jammy.
-- Simon Quigley <tsimonq2@ubuntu.com> Mon, 13 Nov 2023 11:49:56 -0600
lxqt-powermanagement (1.4.0-0ubuntu1) noble; urgency=medium lxqt-powermanagement (1.4.0-0ubuntu1) noble; urgency=medium
* New upstream release. * New upstream release.

View File

@ -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, [] {

View File

@ -1 +1,2 @@
battery-ux.patch battery-ux.patch
revert-kwindowsystem-port.patch