From e8e1e8f5fb5feb862060bd0e71a657c8892adcb3 Mon Sep 17 00:00:00 2001
From: Rmys <muscnsl@gmail.com>
Date: Sun, 22 Dec 2024 12:06:53 +0300
Subject: [PATCH 1/4] lmarbles

---
 game/puzzle/lmarbles/pspec.xml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

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 @@
         <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>

From 53eaf56e9500515bea873db065c8e75361c8500e Mon Sep 17 00:00:00 2001
From: Rmys <muscnsl@gmail.com>
Date: Mon, 23 Dec 2024 13:45:58 +0300
Subject: [PATCH 2/4] lxqt-session rebuild

---
 desktop/lxqt/lxqt-session/pspec.xml | 8 ++++++++
 1 file changed, 8 insertions(+)

diff --git a/desktop/lxqt/lxqt-session/pspec.xml b/desktop/lxqt/lxqt-session/pspec.xml
index 4df5c2edb8..ee2443e83e 100644
--- a/desktop/lxqt/lxqt-session/pspec.xml
+++ b/desktop/lxqt/lxqt-session/pspec.xml
@@ -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>
@@ -61,6 +62,13 @@
         </AdditionalFiles>
     </Package>
     <History>
+        <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>
         <Update release="20">
             <Date>2024-11-05</Date>
             <Version>2.1.0</Version>

From ba0d570ff8be87c8c38480a3884232968d69ec64 Mon Sep 17 00:00:00 2001
From: Rmys <muscnsl@gmail.com>
Date: Mon, 23 Dec 2024 14:02:22 +0300
Subject: [PATCH 3/4] lxqt-session

---
 ...dopt-API-changes-for-procps-ng-4.0.5.patch | 53 +++++++++++++++++++
 1 file changed, 53 insertions(+)
 create mode 100644 desktop/lxqt/lxqt-session/files/0001-Adopt-API-changes-for-procps-ng-4.0.5.patch

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 <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
+

From ae1be2f4da7720de0559a21195157e680a5d0a4b Mon Sep 17 00:00:00 2001
From: Rmys <muscnsl@gmail.com>
Date: Mon, 23 Dec 2024 14:03:39 +0300
Subject: [PATCH 4/4] lxqt-session

---
 desktop/lxqt/lxqt-session/pspec.xml | 1 +
 1 file changed, 1 insertion(+)

diff --git a/desktop/lxqt/lxqt-session/pspec.xml b/desktop/lxqt/lxqt-session/pspec.xml
index ee2443e83e..a8624b3058 100644
--- a/desktop/lxqt/lxqt-session/pspec.xml
+++ b/desktop/lxqt/lxqt-session/pspec.xml
@@ -31,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>