diff options
Diffstat (limited to 'user/lxqt-session')
| -rw-r--r-- | user/lxqt-session/APKBUILD | 9 | ||||
| -rw-r--r-- | user/lxqt-session/procps405.patch | 50 |
2 files changed, 56 insertions, 3 deletions
diff --git a/user/lxqt-session/APKBUILD b/user/lxqt-session/APKBUILD index 6defb32e8..fbc0b5a1a 100644 --- a/user/lxqt-session/APKBUILD +++ b/user/lxqt-session/APKBUILD @@ -3,7 +3,7 @@ pkgname=lxqt-session pkgver=1.4.0 _lxqt=0.13.0 -pkgrel=0 +pkgrel=1 pkgdesc="Session management utilities for LXQt" url="https://lxqt.github.io/" arch="all" @@ -13,7 +13,9 @@ depends="qtxdg-tools xdg-user-dirs" makedepends="cmake extra-cmake-modules lxqt-build-tools>=$_lxqt eudev-dev liblxqt-dev>=${pkgver%.*} procps-dev qt5-qttools-dev kwindowsystem-dev" subpackages="$pkgname-doc" -source="https://github.com/lxde/lxqt-session/releases/download/$pkgver/lxqt-session-$pkgver.tar.xz" +source="https://github.com/lxde/lxqt-session/releases/download/$pkgver/lxqt-session-$pkgver.tar.xz + procps405.patch + " build() { if [ "$CBUILD" != "$CHOST" ]; then @@ -40,4 +42,5 @@ package() { rm "$pkgdir"/usr/share/man/man1/start* } -sha512sums="4f5731969582222eef9d0d2f2b37c4a160c3c6469f3a16cb4b1804ba76a9320d36b0ed91cada6ee905339ed8cfbd443851804086d978424c4d79045cc90e1629 lxqt-session-1.4.0.tar.xz" +sha512sums="4f5731969582222eef9d0d2f2b37c4a160c3c6469f3a16cb4b1804ba76a9320d36b0ed91cada6ee905339ed8cfbd443851804086d978424c4d79045cc90e1629 lxqt-session-1.4.0.tar.xz +d5957c971414c64e5ce80b8b9a9e9f0811f7ac9ffdf3f8a017f4bd7723746771b717e58dfb2bb13df836531fb787b96383bb6aa0c076cf5f856fbf028bfe452d procps405.patch" diff --git a/user/lxqt-session/procps405.patch b/user/lxqt-session/procps405.patch new file mode 100644 index 000000000..9e49ecc9e --- /dev/null +++ b/user/lxqt-session/procps405.patch @@ -0,0 +1,50 @@ +From 4e5d62200fceb75a7867005c29103aa502733270 Mon Sep 17 00:00:00 2001 +From: Christian Hesse <mail@eworm.de> +Date: Mon, 23 Dec 2024 16:13:31 +0100 +Subject: [PATCH] Adopt API changes for procps-ng 4.0.5 (#565) + +The 'info' parameter was dropped in 'VAL' macros. + +https://gitlab.com/procps-ng/procps/-/commit/967fdcfb06e20aad0f31073474cb94545c9bdea5 +--- + CMakeLists.txt | 3 +++ + lxqt-session/src/procreaper.cpp | 8 ++++++++ + 2 files changed, 11 insertions(+) + +diff --git a/CMakeLists.txt b/CMakeLists.txt +index 932f7894..855a35f9 100644 +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -39,6 +39,9 @@ if (CMAKE_SYSTEM_NAME STREQUAL "Linux") + message(STATUS "Using PROCPS -> ${PROCPS_MODULE_NAME} v${PROCPS_VERSION}") + if (PROCPS_VERSION VERSION_GREATER_EQUAL 4.0.0) + add_definitions("-DUSING_LIBPROC2") ++ if (PROCPS_VERSION VERSION_GREATER_EQUAL 4.0.5) ++ add_definitions("-DUSING_LIBPROC2_1") ++ endif() + endif() + endif() + +diff --git a/lxqt-session/src/procreaper.cpp b/lxqt-session/src/procreaper.cpp +index ea614530..8069c606 100644 +--- a/lxqt-session/src/procreaper.cpp ++++ b/lxqt-session/src/procreaper.cpp +@@ -121,10 +121,18 @@ void ProcReaper::stop(const std::set<int64_t> & excludedPids) + pids_stack * stack = nullptr; + while ((stack = procps_pids_get(info, PIDS_FETCH_TASKS_ONLY))) + { ++# if defined(USING_LIBPROC2_1) ++ const int ppid = PIDS_VAL(rel_ppid, s_int, stack); ++# else + const int ppid = PIDS_VAL(rel_ppid, s_int, stack, info); ++# endif + if (ppid == my_pid) + { ++# if defined(USING_LIBPROC2_1) ++ const int tgid = PIDS_VAL(rel_tgid, s_int, stack); ++# else + const int tgid = PIDS_VAL(rel_tgid, s_int, stack, info); ++# endif + children.push_back(tgid); + } + } |