mirror of
https://github.com/yann64/haikuports.git
synced 2026-04-08 21:00:05 +02:00
zsh: bump (#6709)
* zsh: bump * ZSH: gcc2 patch, reorder, bsd * debug * disable debug
This commit is contained in:
extrowerk
GitHub
@@ -1,4 +1,4 @@
|
||||
From 03161d425f5afaaca54089a82d337e9e9236288f Mon Sep 17 00:00:00 2001
|
||||
From 7069941ad1f2f038b3773cc332fdf09a0128e71b Mon Sep 17 00:00:00 2001
|
||||
From: Chris Roberts <cpr420@gmail.com>
|
||||
Date: Wed, 18 Sep 2013 03:11:28 -0600
|
||||
Subject: Fix for gcc2
|
||||
@@ -58,7 +58,7 @@ index 581ca49..ebe5a1b 100644
|
||||
int oldsize = sibuf;
|
||||
sibuf += (pastelen >= sibuf) ? pastelen + 1 : sibuf;
|
||||
diff --git a/Src/Zle/zle_vi.c b/Src/Zle/zle_vi.c
|
||||
index a5ff920..14a885b 100644
|
||||
index 0f198d0..03d6371 100644
|
||||
--- a/Src/Zle/zle_vi.c
|
||||
+++ b/Src/Zle/zle_vi.c
|
||||
@@ -183,11 +183,12 @@ getvirange(int wf)
|
||||
@@ -76,10 +76,10 @@ index a5ff920..14a885b 100644
|
||||
selectlocalmap(km);
|
||||
/* Now we need to execute the movement command, to see where it *
|
||||
diff --git a/Src/params.c b/Src/params.c
|
||||
index 089a958..0867be9 100644
|
||||
index 863b326..c6ac72e 100644
|
||||
--- a/Src/params.c
|
||||
+++ b/Src/params.c
|
||||
@@ -5036,7 +5036,7 @@ arrfixenv(char *s, char **t)
|
||||
@@ -5056,7 +5056,7 @@ arrfixenv(char *s, char **t)
|
||||
int
|
||||
zputenv(char *str)
|
||||
{
|
||||
@@ -89,10 +89,10 @@ index 089a958..0867be9 100644
|
||||
/*
|
||||
* If we are using unsetenv() to remove values from the
|
||||
diff --git a/configure.ac b/configure.ac
|
||||
index 5513e25..a58ccad 100644
|
||||
index af8c5bb..fa01cc2 100644
|
||||
--- a/configure.ac
|
||||
+++ b/configure.ac
|
||||
@@ -850,7 +850,7 @@ if test x$enable_cap = xyes; then
|
||||
@@ -901,7 +901,7 @@ if test x$enable_cap = xyes; then
|
||||
AC_CHECK_LIB(cap, cap_get_proc)
|
||||
fi
|
||||
|
||||
@@ -102,17 +102,17 @@ index 5513e25..a58ccad 100644
|
||||
|
||||
case $LIBS in
|
||||
--
|
||||
2.19.1
|
||||
2.30.2
|
||||
|
||||
|
||||
From d3f7f23df0647d793bece6670cc95e615ed4e8d9 Mon Sep 17 00:00:00 2001
|
||||
From 31279d64cc9229182b6b8c0e89ca1b7e3933eee1 Mon Sep 17 00:00:00 2001
|
||||
From: =?UTF-8?q?Zolt=C3=A1n=20Mizsei?= <zmizsei@extrowerk.com>
|
||||
Date: Wed, 11 Jan 2017 18:17:20 +0100
|
||||
Subject: Haiku rusage fix
|
||||
|
||||
|
||||
diff --git a/Src/jobs.c b/Src/jobs.c
|
||||
index 73d7f26..58ba389 100644
|
||||
index e743825..96837e9 100644
|
||||
--- a/Src/jobs.c
|
||||
+++ b/Src/jobs.c
|
||||
@@ -1026,7 +1026,7 @@ should_report_time(Job j)
|
||||
@@ -125,20 +125,20 @@ index 73d7f26..58ba389 100644
|
||||
j->procs->ti.ru_maxrss / 1024 > reportmemory)
|
||||
return 1;
|
||||
--
|
||||
2.19.1
|
||||
2.30.2
|
||||
|
||||
|
||||
From beb2648a711e98e64db897f1f4005bd32a98a131 Mon Sep 17 00:00:00 2001
|
||||
From da6bb93f40b1ec7a014e89bf7924c2c884db6626 Mon Sep 17 00:00:00 2001
|
||||
From: =?UTF-8?q?Zolt=C3=A1n=20Mizsei?= <zmizsei@extrowerk.com>
|
||||
Date: Thu, 17 Aug 2017 16:16:21 +0200
|
||||
Subject: Enable dynamic modules on Haiku
|
||||
|
||||
|
||||
diff --git a/configure.ac b/configure.ac
|
||||
index a58ccad..31cca13 100644
|
||||
index fa01cc2..8119cc0 100644
|
||||
--- a/configure.ac
|
||||
+++ b/configure.ac
|
||||
@@ -844,6 +844,7 @@ fi
|
||||
@@ -895,6 +895,7 @@ fi
|
||||
|
||||
if test "x$dynamic" = xyes; then
|
||||
AC_CHECK_LIB(dl, dlopen)
|
||||
@@ -146,7 +146,7 @@ index a58ccad..31cca13 100644
|
||||
fi
|
||||
|
||||
if test x$enable_cap = xyes; then
|
||||
@@ -2815,7 +2816,8 @@ char *argv[];
|
||||
@@ -2882,7 +2883,8 @@ char *argv[];
|
||||
aix*) DLLDFLAGS="${DLLDFLAGS=-G -bexpall -lc}" ;;
|
||||
solaris*|sysv4*|esix*) DLLDFLAGS="${DLLDFLAGS=-G}" ;;
|
||||
darwin*) DLLDFLAGS="${DLLDFLAGS=-bundle -flat_namespace -undefined suppress}" ;;
|
||||
@@ -157,20 +157,20 @@ index a58ccad..31cca13 100644
|
||||
if test x$zsh_cv_sys_elf = xyes; then
|
||||
DLLDFLAGS="${DLLDFLAGS=-shared -fPIC}"
|
||||
--
|
||||
2.19.1
|
||||
2.30.2
|
||||
|
||||
|
||||
From 37c853695e36913363546e17d7e9459ff71d8935 Mon Sep 17 00:00:00 2001
|
||||
From 13d11d66e5c8817af6c693bdbd077e98148c1fcf Mon Sep 17 00:00:00 2001
|
||||
From: fbrosson <fbrosson@localhost>
|
||||
Date: Sat, 14 Apr 2018 18:11:49 +0000
|
||||
Subject: C89 fixes for gcc2 compatibility
|
||||
|
||||
|
||||
diff --git a/Src/exec.c b/Src/exec.c
|
||||
index 042ba06..c21f627 100644
|
||||
index 5002765..0c55a5c 100644
|
||||
--- a/Src/exec.c
|
||||
+++ b/Src/exec.c
|
||||
@@ -3126,10 +3126,11 @@ execcmd_exec(Estate state, Execcmd_params eparams,
|
||||
@@ -3136,10 +3136,11 @@ execcmd_exec(Estate state, Execcmd_params eparams,
|
||||
}
|
||||
if (exec_argv0) {
|
||||
char *str, *s;
|
||||
@@ -184,10 +184,10 @@ index 042ba06..c21f627 100644
|
||||
strcpy(s, "ARGV0=");
|
||||
s+=6;
|
||||
diff --git a/Src/init.c b/Src/init.c
|
||||
index e7e62e2..3d8ecb3 100644
|
||||
index 99ccc16..bebefc0 100644
|
||||
--- a/Src/init.c
|
||||
+++ b/Src/init.c
|
||||
@@ -1277,8 +1277,9 @@ run_init_scripts(void)
|
||||
@@ -1300,8 +1300,9 @@ run_init_scripts(void)
|
||||
sourcehome(".profile");
|
||||
|
||||
if (interact) {
|
||||
@@ -199,7 +199,7 @@ index e7e62e2..3d8ecb3 100644
|
||||
s = dupstring(s);
|
||||
if (!parsestr(&s)) {
|
||||
diff --git a/Src/parse.c b/Src/parse.c
|
||||
index 83383f1..8e783be 100644
|
||||
index de1b279..f596c0e 100644
|
||||
--- a/Src/parse.c
|
||||
+++ b/Src/parse.c
|
||||
@@ -403,8 +403,9 @@ ecstrcode(char *s)
|
||||
@@ -214,7 +214,7 @@ index 83383f1..8e783be 100644
|
||||
case 4: c |= ((wordcode) STOUC(s[2])) << 19;
|
||||
case 3: c |= ((wordcode) STOUC(s[1])) << 11;
|
||||
diff --git a/Src/utils.c b/Src/utils.c
|
||||
index 32f6008..478b334 100644
|
||||
index f5667f3..465048f 100644
|
||||
--- a/Src/utils.c
|
||||
+++ b/Src/utils.c
|
||||
@@ -138,10 +138,11 @@ set_widearray(char *mb_array, Widechar_array wca)
|
||||
@@ -230,7 +230,7 @@ index 32f6008..478b334 100644
|
||||
|
||||
if (cmd) {
|
||||
if (unset(SHINSTDIN) || locallevel) {
|
||||
@@ -2802,6 +2803,7 @@ int
|
||||
@@ -2823,6 +2824,7 @@ int
|
||||
checkrmall(char *s)
|
||||
{
|
||||
DIR *rmd;
|
||||
@@ -238,7 +238,7 @@ index 32f6008..478b334 100644
|
||||
int count = 0;
|
||||
if (!shout)
|
||||
return 1;
|
||||
@@ -2811,7 +2813,6 @@ checkrmall(char *s)
|
||||
@@ -2832,7 +2834,6 @@ checkrmall(char *s)
|
||||
else
|
||||
s = dyncat("/", s);
|
||||
}
|
||||
@@ -247,17 +247,17 @@ index 32f6008..478b334 100644
|
||||
int ignoredots = !isset(GLOBDOTS);
|
||||
char *fname;
|
||||
--
|
||||
2.19.1
|
||||
2.30.2
|
||||
|
||||
|
||||
From d4255d3ea9c61387bf5b5f80e60863f73ba42f8f Mon Sep 17 00:00:00 2001
|
||||
From eb706f0fe03c8c4b2ad36fc4ef852fc9c3f2b261 Mon Sep 17 00:00:00 2001
|
||||
From: =?UTF-8?q?Zolt=C3=A1n=20Mizsei?= <zmizsei@extrowerk.com>
|
||||
Date: Sat, 27 Oct 2018 10:36:50 +0200
|
||||
Subject: Some other function resides in libroot
|
||||
|
||||
|
||||
diff --git a/configure.ac b/configure.ac
|
||||
index 31cca13..c20c2a1 100644
|
||||
index 8119cc0..c31387b 100644
|
||||
--- a/configure.ac
|
||||
+++ b/configure.ac
|
||||
@@ -746,10 +746,12 @@ dnl and might not be compiled into the zsh executable.
|
||||
@@ -274,10 +274,10 @@ index 31cca13..c20c2a1 100644
|
||||
dnl Various features of ncurses depend on having the right header
|
||||
dnl (the system's own curses.h may well not be good enough).
|
||||
--
|
||||
2.19.1
|
||||
2.30.2
|
||||
|
||||
|
||||
From e764303a114797ed36f8b8c8009cde82f0efc55c Mon Sep 17 00:00:00 2001
|
||||
From a7c2aadccb985847800cf550de5e59c6a4d7d48f Mon Sep 17 00:00:00 2001
|
||||
From: =?UTF-8?q?Zolt=C3=A1n=20Mizsei?= <zmizsei@extrowerk.com>
|
||||
Date: Mon, 18 Feb 2019 13:41:08 +0100
|
||||
Subject: Build fix for gcc2 from hanya
|
||||
@@ -307,5 +307,35 @@ index b49ee9a..44313ba 100644
|
||||
/* Observer. = 2 degrees, Illuminant = D65 */
|
||||
double X = (R * 0.4124 + G * 0.3576 + B * 0.1805) / 95.047;
|
||||
--
|
||||
2.19.1
|
||||
2.30.2
|
||||
|
||||
|
||||
From 58eb212be9f1497968c052a7b68212de8a15f52e Mon Sep 17 00:00:00 2001
|
||||
From: begasus <begasus@gmail.com>
|
||||
Date: Sun, 13 Mar 2022 15:56:24 +0000
|
||||
Subject: zsh, fix for gcc2
|
||||
|
||||
|
||||
diff --git a/Src/jobs.c b/Src/jobs.c
|
||||
index 96837e9..d830d39 100644
|
||||
--- a/Src/jobs.c
|
||||
+++ b/Src/jobs.c
|
||||
@@ -2933,6 +2933,7 @@ acquire_pgrp(void)
|
||||
sigaddset(&blockset, SIGTTOU);
|
||||
sigaddset(&blockset, SIGTSTP);
|
||||
oldset = signal_block(blockset);
|
||||
+ {
|
||||
int loop_count = 0;
|
||||
while ((ttpgrp = gettygrp()) != -1 && ttpgrp != mypgrp) {
|
||||
mypgrp = GETPGRP();
|
||||
@@ -2966,6 +2967,7 @@ acquire_pgrp(void)
|
||||
}
|
||||
lastpgrp = mypgrp;
|
||||
}
|
||||
+ }
|
||||
if (mypgrp != mypid) {
|
||||
if (setpgrp(0, 0) == 0) {
|
||||
mypgrp = mypid;
|
||||
--
|
||||
2.30.2
|
||||
|
||||
@@ -9,9 +9,9 @@ LICENSE="ZSH
|
||||
GNU GPL v2"
|
||||
REVISION="1"
|
||||
SOURCE_URI="https://downloads.sf.net/zsh/zsh-$portVersion.tar.xz"
|
||||
CHECKSUM_SHA256="dcc4b54cc5565670a65581760261c163d720991f0d06486da61f8d839b52de27"
|
||||
CHECKSUM_SHA256="b6973520bace600b4779200269b1e5d79e5f505ac4952058c11ad5bbf0dd9919"
|
||||
SOURCE_URI_2="https://downloads.sf.net/zsh/zsh-$portVersion-doc.tar.xz"
|
||||
CHECKSUM_SHA256_2="9b4e939593cb5a76564d2be2e2bfbb6242509c0c56fd9ba52f5dba6cf06fdcc4"
|
||||
CHECKSUM_SHA256_2="8b9cb53d6432f13e9767a8680b642e8e8a52c7f1b8decd211756ca20c667f917"
|
||||
PATCHES="zsh-$portVersion.patchset"
|
||||
ADDITIONAL_FILES="
|
||||
zprofile
|
||||
@@ -83,27 +83,30 @@ BUILD()
|
||||
cp -rut . "$sourceDir2/zsh-$portVersion"/*
|
||||
|
||||
export LIBS="-Wl,--as-needed -lnetwork -lbsd"
|
||||
export CPPFLAGS="-D_BSD_SOURCE"
|
||||
export CPPFLAGS="-D_DEFAULT_SOURCE"
|
||||
|
||||
autoupdate
|
||||
autoreconf -vfi
|
||||
|
||||
runConfigure ./configure \
|
||||
--htmldir="$developDocDir/html" \
|
||||
--enable-etcdir="$sysconfDir/zsh" \
|
||||
--enable-zshenv="$sysconfDir/zsh/zshenv" \
|
||||
--enable-zlogin="$sysconfDir/zsh/zlogin" \
|
||||
--enable-zlogout="$sysconfDir/zsh/zlogout" \
|
||||
--enable-zprofile="$sysconfDir/zsh/zprofile" \
|
||||
--enable-zshenv="$sysconfDir/zsh/zshenv" \
|
||||
--enable-zshrc="$sysconfDir/zsh/zshrc" \
|
||||
--enable-maildir-support \
|
||||
--with-term-lib='ncursesw' \
|
||||
--enable-multibyte \
|
||||
--enable-function-subdirs \
|
||||
--enable-pcre \
|
||||
--enable-dynamic \
|
||||
--enable-cap \
|
||||
--enable-unicode9 \
|
||||
--enable-maildir-support \
|
||||
--enable-fndir="$sysconfDir/zsh/functions" \
|
||||
--enable-scriptdir="$sysconfDir/zsh/scripts" \
|
||||
--with-tcsetpgrp \
|
||||
--enable-zsh-secure-free
|
||||
--enable-pcre \
|
||||
--enable-cap \
|
||||
--enable-zsh-secure-free \
|
||||
--enable-dynamic
|
||||
|
||||
make $jobArgs
|
||||
}
|
||||
Reference in New Issue
Block a user