diff options
author | gutteridge <gutteridge@pkgsrc.org> | 2022-04-24 19:24:21 +0000 |
---|---|---|
committer | gutteridge <gutteridge@pkgsrc.org> | 2022-04-24 19:24:21 +0000 |
commit | 7f634a719afab3e395ddde6b46ba5e033b1967d3 (patch) | |
tree | dc9430cee0c7d1f3b3daa7ce3bde7c3e2b884e69 | |
parent | 80e254df25bfd2385fa02c10a981c711e97de042 (diff) | |
download | pkgsrc-7f634a719afab3e395ddde6b46ba5e033b1967d3.tar.gz |
lxqt-session: remove two patches that were merged upstream
-rw-r--r-- | x11/lxqt-session/patches/patch-lxqt-session_CMakeLists.txt | 18 | ||||
-rw-r--r-- | x11/lxqt-session/patches/patch-lxqt-session_src_procreaper.cpp | 57 |
2 files changed, 0 insertions, 75 deletions
diff --git a/x11/lxqt-session/patches/patch-lxqt-session_CMakeLists.txt b/x11/lxqt-session/patches/patch-lxqt-session_CMakeLists.txt deleted file mode 100644 index 6a3acc3cfe1..00000000000 --- a/x11/lxqt-session/patches/patch-lxqt-session_CMakeLists.txt +++ /dev/null @@ -1,18 +0,0 @@ -$NetBSD: patch-lxqt-session_CMakeLists.txt,v 1.1 2021/11/19 14:17:44 gutteridge Exp $ - -Add NetBSD support. -https://github.com/lxqt/lxqt-session/pull/403 - ---- lxqt-session/CMakeLists.txt.orig 2021-11-05 10:14:38.000000000 +0000 -+++ lxqt-session/CMakeLists.txt -@@ -75,6 +75,10 @@ elseif (CMAKE_SYSTEM_NAME STREQUAL "Free - target_link_libraries(lxqt-session - -lutil - ) -+elseif (CMAKE_SYSTEM_NAME STREQUAL "NetBSD") -+ target_link_libraries(lxqt-session -+ -lkvm -+ ) - endif() - - if (WITH_LIBUDEV) diff --git a/x11/lxqt-session/patches/patch-lxqt-session_src_procreaper.cpp b/x11/lxqt-session/patches/patch-lxqt-session_src_procreaper.cpp deleted file mode 100644 index 781f3bdd0df..00000000000 --- a/x11/lxqt-session/patches/patch-lxqt-session_src_procreaper.cpp +++ /dev/null @@ -1,57 +0,0 @@ -$NetBSD: patch-lxqt-session_src_procreaper.cpp,v 1.1 2021/11/19 14:17:44 gutteridge Exp $ - -Add NetBSD support, and make this at least possibly compile elsewhere, -as POSIX kill() is expected universally. -https://github.com/lxqt/lxqt-session/pull/403 - ---- lxqt-session/src/procreaper.cpp.orig 2021-11-05 10:14:38.000000000 +0000 -+++ lxqt-session/src/procreaper.cpp -@@ -34,11 +34,15 @@ - #include <sys/procctl.h> - #include <libutil.h> - #include <sys/user.h> --#include <signal.h> -+#elif defined(Q_OS_NETBSD) -+#include <kvm.h> -+#include <sys/param.h> -+#include <sys/sysctl.h> - #endif - #include <unistd.h> - #include <cstring> - #include <cerrno> -+#include <signal.h> - #include <sys/wait.h> - - ProcReaper::ProcReaper() -@@ -128,6 +132,31 @@ void ProcReaper::stop(const std::set<int - } - free(proc_info); - } -+#elif defined(Q_OS_NETBSD) -+ int cnt = 0; -+ kvm_t * kd; -+ char buf[_POSIX2_LINE_MAX]; -+ -+ if ((kd = kvm_openfiles(nullptr, nullptr, nullptr, KVM_NO_FILES, buf))) -+ { -+ if (kinfo_proc2 *proc_info = kvm_getproc2(kd, KERN_PROC_ALL, 0, sizeof(struct kinfo_proc2), &cnt)) -+ { -+ for (int i = 0; i < cnt; ++i) -+ { -+ if (proc_info[i].p_ppid == my_pid) -+ { -+ children.push_back(proc_info[i].p_pid); -+ } -+ } -+ free(proc_info); -+ } -+ else -+ qCWarning(SESSION) << "Unable to access process information: " << kvm_geterr(kd); -+ -+ free(kd); -+ } -+ else -+ qCWarning(SESSION) << "Unable to access kernel virtual memory: " << buf; - #endif - for (auto const & child : children) - { |