summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorSíle Ekaterin Liszka <sheila@vulpine.house>2023-11-26 05:41:23 -0800
committerA. Wilcox <awilcox@wilcox-tech.com>2023-11-27 09:59:05 +0000
commit81d3b01f349be1349b49328c572eaa3121a85b70 (patch)
tree1f9ab1c94d01fc5420f423c291a25deb9651f9b1
parent6ee3bf9267b67e2758528ea43afcd66a66e4b7fd (diff)
downloadpackages-81d3b01f349be1349b49328c572eaa3121a85b70.tar.gz
packages-81d3b01f349be1349b49328c572eaa3121a85b70.tar.bz2
packages-81d3b01f349be1349b49328c572eaa3121a85b70.tar.xz
packages-81d3b01f349be1349b49328c572eaa3121a85b70.zip
user/lxqt-powermanagement: upgrade to 1.4.0
The patch accompanying this upgrade should be removed when kwindowsystem is bumped.
-rw-r--r--user/lxqt-powermanagement/APKBUILD10
-rw-r--r--user/lxqt-powermanagement/revert-kwindowsystem-bump.patch32
2 files changed, 38 insertions, 4 deletions
diff --git a/user/lxqt-powermanagement/APKBUILD b/user/lxqt-powermanagement/APKBUILD
index f6a29f8ff..0c571e7e0 100644
--- a/user/lxqt-powermanagement/APKBUILD
+++ b/user/lxqt-powermanagement/APKBUILD
@@ -1,7 +1,7 @@
# Contributor: Síle Ekaterin Liszka <sheila@vulpine.house>
# Maintainer: Síle Ekaterin Liszka <sheila@vulpine.house>
pkgname=lxqt-powermanagement
-pkgver=1.3.0
+pkgver=1.4.0
_lxqt=0.13.0
pkgrel=0
pkgdesc="Power management utilities for LXQt"
@@ -11,9 +11,10 @@ options="!check" # No test suite.
license="LGPL-2.1+"
depends=""
makedepends="cmake extra-cmake-modules lxqt-build-tools>=$_lxqt upower-dev
- liblxqt-dev>=${pkgver%.*}.0 kidletime-dev qt5-qtsvg-dev qt5-qttools-dev
+ liblxqt-dev>=${pkgver%.*} kidletime-dev qt5-qtsvg-dev qt5-qttools-dev
solid-dev kwindowsystem-dev lxqt-globalkeys-dev>=${pkgver%.*}"
-source="https://github.com/lxqt/lxqt-powermanagement/releases/download/$pkgver/lxqt-powermanagement-$pkgver.tar.xz"
+source="https://github.com/lxqt/lxqt-powermanagement/releases/download/$pkgver/lxqt-powermanagement-$pkgver.tar.xz
+ revert-kwindowsystem-bump.patch"
build() {
if [ "$CBUILD" != "$CHOST" ]; then
@@ -38,4 +39,5 @@ package() {
make DESTDIR="$pkgdir" -C build install
}
-sha512sums="79891ba791a167c8b4b27acd309908b0badafcf273aca880c4db592b776d8672d240bc8d4a9552cb83195a9a9929e5b1722a6d20be3ea810c3dcb61dc83fd323 lxqt-powermanagement-1.3.0.tar.xz"
+sha512sums="20b6b541fbf0eda1471af233f09744861428d74743b248b95be27c82a3d6fa1c71bfb7f4b5ff7a5408a37a6975a831b525290e8ec012e3546b0e69dfe63ccf7c lxqt-powermanagement-1.4.0.tar.xz
+076827624da9b85dc0bf3928e88f2144268f7ffcd87b369e634d4e4dd8a7f817b48a9e388f1c37a75de295d7db927af9e3b2442c655361eb57bc21a22905b7c2 revert-kwindowsystem-bump.patch"
diff --git a/user/lxqt-powermanagement/revert-kwindowsystem-bump.patch b/user/lxqt-powermanagement/revert-kwindowsystem-bump.patch
new file mode 100644
index 000000000..b7bc62975
--- /dev/null
+++ b/user/lxqt-powermanagement/revert-kwindowsystem-bump.patch
@@ -0,0 +1,32 @@
+diff '--color=auto' -Nurd lxqt-powermanagement-1.4.0/CMakeLists.txt lxqt-powermanagement-1.4.0.new/CMakeLists.txt
+--- lxqt-powermanagement-1.4.0/CMakeLists.txt 2023-11-05 03:52:24.000000000 -0800
++++ lxqt-powermanagement-1.4.0.new/CMakeLists.txt 2023-11-26 05:38:24.944824050 -0800
+@@ -16,7 +16,7 @@
+ 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")
+
+diff '--color=auto' -Nurd lxqt-powermanagement-1.4.0/src/idlenesswatcher.cpp lxqt-powermanagement-1.4.0.new/src/idlenesswatcher.cpp
+--- lxqt-powermanagement-1.4.0/src/idlenesswatcher.cpp 2023-11-05 03:52:24.000000000 -0800
++++ lxqt-powermanagement-1.4.0.new/src/idlenesswatcher.cpp 2023-11-26 05:38:48.084639516 -0800
+@@ -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 @@
+
+ // 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, [] {