Pisilinux/main
5
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'master' into master

Browse Source
This commit is contained in:
Rmys
2024-12-24 11:03:07 +03:00
committed by GitHub
parent 3f0933832c 187ed2b959
commit e08369f01d
3 changed files with 66 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files
desktop/lxqt/lxqt-session/files/0001-Adopt-API-changes-for-procps-ng-4.0.5.patch
+53
View File
@@ -0,0 +1,53 @@
From c80cf37c5dcc6af2dc505ce8b319ce1915893107 Mon Sep 17 00:00:00 2001
From: Christian Hesse <mail@eworm.de>
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<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);
}
}
--
false
desktop/lxqt/lxqt-session/pspec.xml
+11 -2
View File
@@ -19,6 +19,7 @@
<Dependency>kwindowsystem-kf6-devel</Dependency>
<Dependency>libX11-devel</Dependency>
<Dependency>libgcc</Dependency>
<Dependency>procps</Dependency>
<Dependency versionFrom="2.1.0">liblxqt-devel</Dependency>
<Dependency versionFrom="4.0.0">libqtxdg-tools</Dependency>
<Dependency versionFrom="4.0.0">libqtxdg-devel</Dependency>
@@ -30,6 +31,7 @@
</BuildDependencies>
<Patches>
<Patch level="1">0001-Use-openbox-by-default.patch</Patch>
<Patch level="1">0001-Adopt-API-changes-for-procps-ng-4.0.5.patch</Patch>
</Patches>
</Source>
<Package>
@@ -61,10 +63,17 @@
</AdditionalFiles>
</Package>
<History>
<Update release="21">
<Update release="22">
<Date>2024-12-24</Date>
<Version>2.1.1</Version>
<Comment>Version bump.</Comment>
<Comment>Rebuild.</Comment>
<Name>Pisi Linux Community</Name>
<Email>admin@pisilinux.org</Email>
</Update>
<Update release="21">
<Date>2024-12-23</Date>
<Version>2.1.0</Version>
<Comment>Rebuild.</Comment>
<Name>Pisi Linux Community</Name>
<Email>admin@pisilinux.org</Email>
</Update>
game/puzzle/lmarbles/pspec.xml
+2 -2
View File
@@ -13,7 +13,7 @@
<IsA>app:gui</IsA>
<Summary>Marble puzzle game</Summary>
<Description>Puzzle game inspired by Atomix and written using the SDL library.</Description>
<Archive sha1sum="cd191ed12b57d92004c33bfb3acd520f45d83b29" type="targz">mirrors://sourceforge/lgames/lmarbles-1.1.9.tar.gz</Archive>
<Archive sha1sum="58db2447276bdf480e03964d729513f022f7790b" type="targz">mirrors://sourceforge/lgames/lmarbles-1.0.8.tar.gz</Archive>
<BuildDependencies>
<Dependency>libsdl-devel</Dependency>
<Dependency>sdl-mixer-devel</Dependency>
@@ -43,7 +43,7 @@
<History>
<Update release="5">
<Date>2024-11-29</Date>
<Version>1.1.9</Version>
<Version>1.0.8</Version>
<Comment>Version bump.</Comment>
<Name>Ümit Solmaz</Name>
<Email>admins@pisilinux.org</Email>