diff --git a/desktop/lxqt/lxqt-session/files/0001-Adopt-API-changes-for-procps-ng-4.0.5.patch b/desktop/lxqt/lxqt-session/files/0001-Adopt-API-changes-for-procps-ng-4.0.5.patch new file mode 100644 index 0000000000..e7ca206f8b --- /dev/null +++ b/desktop/lxqt/lxqt-session/files/0001-Adopt-API-changes-for-procps-ng-4.0.5.patch @@ -0,0 +1,53 @@ +From c80cf37c5dcc6af2dc505ce8b319ce1915893107 Mon Sep 17 00:00:00 2001 +From: Christian Hesse +Date: Thu, 19 Dec 2024 10:19:11 +0100 +Subject: [PATCH 1/1] Adopt API changes for procps-ng 4.0.5 + +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 932f789..855a35f 100644 +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -40,6 +40,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 ea61453..8069c60 100644 +--- a/lxqt-session/src/procreaper.cpp ++++ b/lxqt-session/src/procreaper.cpp +@@ -121,10 +121,18 @@ void ProcReaper::stop(const std::set & 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); + } + } +-- +false + diff --git a/desktop/lxqt/lxqt-session/pspec.xml b/desktop/lxqt/lxqt-session/pspec.xml index b8534bcb6b..cfca46c185 100644 --- a/desktop/lxqt/lxqt-session/pspec.xml +++ b/desktop/lxqt/lxqt-session/pspec.xml @@ -19,6 +19,7 @@ kwindowsystem-kf6-devel libX11-devel libgcc + procps liblxqt-devel libqtxdg-tools libqtxdg-devel @@ -30,6 +31,7 @@ 0001-Use-openbox-by-default.patch + 0001-Adopt-API-changes-for-procps-ng-4.0.5.patch @@ -61,10 +63,17 @@ - + 2024-12-24 2.1.1 - Version bump. + Rebuild. + Pisi Linux Community + admin@pisilinux.org + + + 2024-12-23 + 2.1.0 + Rebuild. Pisi Linux Community admin@pisilinux.org diff --git a/game/puzzle/lmarbles/pspec.xml b/game/puzzle/lmarbles/pspec.xml index 4960f41041..97c25c00dc 100644 --- a/game/puzzle/lmarbles/pspec.xml +++ b/game/puzzle/lmarbles/pspec.xml @@ -13,7 +13,7 @@ app:gui Marble puzzle game Puzzle game inspired by Atomix and written using the SDL library. - mirrors://sourceforge/lgames/lmarbles-1.1.9.tar.gz + mirrors://sourceforge/lgames/lmarbles-1.0.8.tar.gz libsdl-devel sdl-mixer-devel @@ -43,7 +43,7 @@ 2024-11-29 - 1.1.9 + 1.0.8 Version bump. Ümit Solmaz admins@pisilinux.org