haikuprojects/haikuports
1
0
Fork 0
mirror of https://github.com/yann64/haikuports.git synced 2026-05-04 22:18:55 +02:00
Code Issues Packages Projects Releases Wiki Activity

zsh: bump to 5.5.1.

Browse Source
This commit is contained in:
fbrosson
2018-04-18 16:23:07 +00:00
committed by Leorize
parent cdde99e18c
commit 65f2c797f7
2 changed files with 10 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
app-shells/zsh/patches/zsh-5.5.patchset → app-shells/zsh/patches/zsh-5.5.1.patchset
View File

@@ -89,7 +89,7 @@ index 36f5f06..c7d04db 100644
/* /*
* If we are using unsetenv() to remove values from the * If we are using unsetenv() to remove values from the
diff --git a/configure.ac b/configure.ac diff --git a/configure.ac b/configure.ac
index 1a498f8..75069c2 100644 index d15a6cd..5b8aec5 100644
--- a/configure.ac --- a/configure.ac
+++ b/configure.ac +++ b/configure.ac
@@ -874,7 +874,7 @@ if test x$enable_cap = xyes; then @@ -874,7 +874,7 @@ if test x$enable_cap = xyes; then
@@ -135,7 +135,7 @@ Subject: Enable dynamic modules on Haiku
diff --git a/configure.ac b/configure.ac diff --git a/configure.ac b/configure.ac
index 75069c2..7dc785d 100644 index 5b8aec5..395c7bb 100644
--- a/configure.ac --- a/configure.ac
+++ b/configure.ac +++ b/configure.ac
@@ -868,6 +868,7 @@ fi @@ -868,6 +868,7 @@ fi
@@ -146,7 +146,7 @@ index 75069c2..7dc785d 100644
fi fi
if test x$enable_cap = xyes; then if test x$enable_cap = xyes; then
@@ -2899,7 +2900,8 @@ char *argv[]; @@ -2902,7 +2903,8 @@ char *argv[];
aix*) DLLDFLAGS="${DLLDFLAGS=-G -bexpall -lc}" ;; aix*) DLLDFLAGS="${DLLDFLAGS=-G -bexpall -lc}" ;;
solaris*|sysv4*|esix*) DLLDFLAGS="${DLLDFLAGS=-G}" ;; solaris*|sysv4*|esix*) DLLDFLAGS="${DLLDFLAGS=-G}" ;;
darwin*) DLLDFLAGS="${DLLDFLAGS=-bundle -flat_namespace -undefined suppress}" ;; darwin*) DLLDFLAGS="${DLLDFLAGS=-bundle -flat_namespace -undefined suppress}" ;;
@@ -167,7 +167,7 @@ Subject: C89 fixes for gcc2 compatibility
diff --git a/Src/exec.c b/Src/exec.c diff --git a/Src/exec.c b/Src/exec.c
index e154d12..dba5f37 100644 index 216057a..9149489 100644
--- a/Src/exec.c --- a/Src/exec.c
+++ b/Src/exec.c +++ b/Src/exec.c
@@ -3034,10 +3034,11 @@ execcmd_exec(Estate state, Execcmd_params eparams, @@ -3034,10 +3034,11 @@ execcmd_exec(Estate state, Execcmd_params eparams,
@@ -214,7 +214,7 @@ index 47e5a24..38890e5 100644
case 4: c |= ((wordcode) STOUC(s[2])) << 19; case 4: c |= ((wordcode) STOUC(s[2])) << 19;
case 3: c |= ((wordcode) STOUC(s[1])) << 11; case 3: c |= ((wordcode) STOUC(s[1])) << 11;
diff --git a/Src/utils.c b/Src/utils.c diff --git a/Src/utils.c b/Src/utils.c
index 180693d..f7b36d6 100644 index b418517..d026e02 100644
--- a/Src/utils.c --- a/Src/utils.c
+++ b/Src/utils.c +++ b/Src/utils.c
@@ -138,10 +138,11 @@ set_widearray(char *mb_array, Widechar_array wca) @@ -138,10 +138,11 @@ set_widearray(char *mb_array, Widechar_array wca)
@@ -230,7 +230,7 @@ index 180693d..f7b36d6 100644
if (cmd) { if (cmd) {
if (unset(SHINSTDIN) || locallevel) { if (unset(SHINSTDIN) || locallevel) {
@@ -2763,6 +2764,7 @@ int @@ -2765,6 +2766,7 @@ int
checkrmall(char *s) checkrmall(char *s)
{ {
DIR *rmd; DIR *rmd;
@@ -238,14 +238,14 @@ index 180693d..f7b36d6 100644
int count = 0; int count = 0;
if (!shout) if (!shout)
return 1; return 1;
@@ -2772,7 +2774,6 @@ checkrmall(char *s) @@ -2774,7 +2776,6 @@ checkrmall(char *s)
else else
s = dyncat("/", s); s = dyncat("/", s);
} }
- const int max_count = 100; - const int max_count = 100;
if ((rmd = opendir(unmeta(s)))) { if ((rmd = opendir(unmeta(s)))) {
int ignoredots = !isset(GLOBDOTS); int ignoredots = !isset(GLOBDOTS);
/* ### TODO: Passing ignoredots here is wrong. See workers/41672 char *fname;
-- --
2.17.0 2.17.0

4
app-shells/zsh/zsh-5.5.recipe → app-shells/zsh/zsh-5.5.1.recipe
View File

@@ -9,9 +9,9 @@ LICENSE="ZSH
GNU GPL v2" GNU GPL v2"
REVISION="1" REVISION="1"
SOURCE_URI="https://downloads.sf.net/zsh/zsh-$portVersion.tar.xz" SOURCE_URI="https://downloads.sf.net/zsh/zsh-$portVersion.tar.xz"
CHECKSUM_SHA256="a8359b81d090425d497c6f3c724a7c21a81c614b03e7662ed347705d86958e53" CHECKSUM_SHA256="e1c38808fcbe0cc1344d55c9a758349f7ba1e317325b154621ac37eddac4aa80"
SOURCE_URI_2="https://downloads.sf.net/zsh/zsh-$portVersion-doc.tar.xz" SOURCE_URI_2="https://downloads.sf.net/zsh/zsh-$portVersion-doc.tar.xz"
CHECKSUM_SHA256_2="b995c16a2ded516b6e07883932640fcca8b53b1b8a1934094a8a32ef087f52fc" CHECKSUM_SHA256_2="41ce13a89a6bc7e709b6f110e54288d59f02ba2becd2646895d28188d4dd6283"
PATCHES="zsh-$portVersion.patchset" PATCHES="zsh-$portVersion.patchset"
ARCHITECTURES="x86_gcc2 ?x86 x86_64" ARCHITECTURES="x86_gcc2 ?x86 x86_64"