diff --git a/srcpkgs/berry/patches/no-zombies.patch b/srcpkgs/berry/patches/no-zombies.patch deleted file mode 100644 index a43d050baa9..00000000000 --- a/srcpkgs/berry/patches/no-zombies.patch +++ /dev/null @@ -1,41 +0,0 @@ -https://patch-diff.githubusercontent.com/raw/JLErvin/berry/pull/198.patch - -From 3501ee006ee9bdddc817fd71750e431b4186a0c7 Mon Sep 17 00:00:00 2001 -From: Joseph Eib -Date: Wed, 30 Nov 2022 17:10:43 -0500 -Subject: [PATCH] Avoid creation of zombie process by load_config - -Previously, a zombie process was created when the process forked in -load_config terminates because the parent does not call wait or waitpid. -It is unreasonable to wait for the child because a user may exec their -autostart script into a long-running process. Instead, the parent now -simply ignores SIGCHLD which allows the child to be reaped immediately -upon termination. ---- - wm.c | 5 ++++- - 1 file changed, 4 insertions(+), 1 deletion(-) - -diff --git a/wm.c b/wm.c -index f3a01b8..b863bea 100644 ---- a/wm.c -+++ b/wm.c -@@ -4,6 +4,7 @@ - #include "config.h" - - #include -+#include - #include - #include - #include -@@ -2536,8 +2537,10 @@ main(int argc, char *argv[]) - LOGN("Successfully opened display"); - - setup(); -- if (conf_found) -+ if (conf_found) { -+ signal(SIGCHLD, SIG_IGN); - load_config(conf_path); -+ } - run(); - close_wm(); - free(font_name); diff --git a/srcpkgs/berry/template b/srcpkgs/berry/template index 5ea22d9a413..b14eb94fa0f 100644 --- a/srcpkgs/berry/template +++ b/srcpkgs/berry/template @@ -1,7 +1,7 @@ # Template file for 'berry' pkgname=berry -version=0.1.12 -revision=2 +version=0.1.13 +revision=1 build_style=configure configure_args="--prefix=/usr" hostmakedepends="pkg-config which" @@ -11,7 +11,7 @@ maintainer="Andrew Benson " license="MIT" homepage="https://github.com/JLErvin/berry" distfiles="https://github.com/JLErvin/berry/archive/${version}.tar.gz" -checksum=d5a5099f90f0bea3fa93ead72b1f4fe8205fe0540743a8cf23f5a0c9971b4cf1 +checksum=839c0bdafbecbcb999e519a6fc32edbd37d9f010a205ccc34d71aa25ece1a768 post_install() { vlicense LICENSE