summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAli Mohammad Pur <ali.mpfard@gmail.com>2022-05-16 23:57:25 +0430
committerAli Mohammad Pur <Ali.mpfard@gmail.com>2022-05-19 20:17:10 +0430
commita3ff011fcb984fb4529195be2782b14b680dfeda (patch)
tree79688ebdf3bcca1d4cb2c8573b64bed0b2fa8020
parent26ca20a55d08daa6a159bf6888ed6b5b0983b6e3 (diff)
downloadserenity-a3ff011fcb984fb4529195be2782b14b680dfeda.zip
Ports: Update zsh's patches to use git patches
-rw-r--r--Ports/zsh/patches/0001-Let-zsh-define-the-rlimit-constants.patch26
-rw-r--r--Ports/zsh/patches/0002-add-serenity.patch11
-rw-r--r--Ports/zsh/patches/ReadMe.md8
3 files changed, 34 insertions, 11 deletions
diff --git a/Ports/zsh/patches/0001-Let-zsh-define-the-rlimit-constants.patch b/Ports/zsh/patches/0001-Let-zsh-define-the-rlimit-constants.patch
new file mode 100644
index 0000000000..28a24ec4f9
--- /dev/null
+++ b/Ports/zsh/patches/0001-Let-zsh-define-the-rlimit-constants.patch
@@ -0,0 +1,26 @@
+From 8d26e03f10054af3f81bd66b3200efeb91f69c7b Mon Sep 17 00:00:00 2001
+From: Thiago Henrique Hupner <thihup@gmail.com>
+Date: Sat, 5 Jun 2021 08:31:13 -0300
+Subject: [PATCH] Let zsh define the rlimit constants
+
+Serenity doesn't have those anyhow.
+---
+ Src/zsh_system.h | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/Src/zsh_system.h b/Src/zsh_system.h
+index 161b073..00286f2 100644
+--- a/Src/zsh_system.h
++++ b/Src/zsh_system.h
+@@ -556,7 +556,7 @@ int setresgid(gid_t, gid_t, gid_t);
+
+ #ifdef HAVE_SYS_RESOURCE_H
+ # include <sys/resource.h>
+-# if defined(__hpux) && !defined(RLIMIT_CPU)
++# if (defined(__hpux) && !defined(RLIMIT_CPU)) || defined(__serenity__)
+ /* HPUX does have the BSD rlimits in the kernel. Officially they are *
+ * unsupported but quite a few of them like RLIMIT_CORE seem to work. *
+ * All the following are in the <sys/resource.h> but made visible *
+--
+2.36.1
+
diff --git a/Ports/zsh/patches/0002-add-serenity.patch b/Ports/zsh/patches/0002-add-serenity.patch
deleted file mode 100644
index a7ccf37f71..0000000000
--- a/Ports/zsh/patches/0002-add-serenity.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- zsh-zsh-5.8/Src/original-zsh_system.h 2021-06-05 08:17:15.364000000 -0300
-+++ zsh-zsh-5.8/Src/zsh_system.h 2021-06-04 23:05:07.793197002 -0300
-@@ -556,7 +556,7 @@
-
- #ifdef HAVE_SYS_RESOURCE_H
- # include <sys/resource.h>
--# if defined(__hpux) && !defined(RLIMIT_CPU)
-+# if (defined(__hpux) && !defined(RLIMIT_CPU)) || defined(__serenity__)
- /* HPUX does have the BSD rlimits in the kernel. Officially they are *
- * unsupported but quite a few of them like RLIMIT_CORE seem to work. *
- * All the following are in the <sys/resource.h> but made visible *
diff --git a/Ports/zsh/patches/ReadMe.md b/Ports/zsh/patches/ReadMe.md
new file mode 100644
index 0000000000..37efec6914
--- /dev/null
+++ b/Ports/zsh/patches/ReadMe.md
@@ -0,0 +1,8 @@
+# Patches for zsh on SerenityOS
+
+## `0001-Let-zsh-define-the-rlimit-constants.patch`
+
+Let zsh define the rlimit constants
+
+Serenity doesn't have those anyhow.
+