mirror of
https://github.com/void-linux/void-packages.git
synced 2025-09-07 04:23:19 +02:00
gawk: update to 5.3.2
This commit is contained in:
parent
c8554a2c42
commit
8214207443
2 changed files with 4 additions and 54 deletions
|
@ -1,50 +0,0 @@
|
||||||
commit e05040b5d81b5a0e809fc56df2a7c3d654c77e1d
|
|
||||||
Author: Arnold D. Robbins <arnold@skeeve.com>
|
|
||||||
Date: Sun Jan 28 20:24:09 2024 +0200
|
|
||||||
|
|
||||||
Bug fix in str2wstr.
|
|
||||||
|
|
||||||
diff --git a/node.c b/node.c
|
|
||||||
index de12f05d..5aac5e88 100644
|
|
||||||
--- a/node.c
|
|
||||||
+++ b/node.c
|
|
||||||
@@ -815,6 +815,20 @@ str2wstr(NODE *n, size_t **ptr)
|
|
||||||
|
|
||||||
assert((n->flags & (STRING|STRCUR)) != 0);
|
|
||||||
|
|
||||||
+ /*
|
|
||||||
+ * For use by do_match, create and fill in an array.
|
|
||||||
+ * For each byte `i' in n->stptr (the original string),
|
|
||||||
+ * a[i] is equal to `j', where `j' is the corresponding wchar_t
|
|
||||||
+ * in the converted wide string.
|
|
||||||
+ *
|
|
||||||
+ * This is needed even for Nnull_string or Null_field.
|
|
||||||
+ *
|
|
||||||
+ * Create the array.
|
|
||||||
+ */
|
|
||||||
+ if (ptr != NULL) {
|
|
||||||
+ ezalloc(*ptr, size_t *, sizeof(size_t) * (n->stlen + 1), "str2wstr");
|
|
||||||
+ }
|
|
||||||
+
|
|
||||||
/*
|
|
||||||
* Don't convert global null string or global null field
|
|
||||||
* variables to a wide string. They are both zero-length anyway.
|
|
||||||
@@ -848,18 +862,6 @@ str2wstr(NODE *n, size_t **ptr)
|
|
||||||
emalloc(n->wstptr, wchar_t *, sizeof(wchar_t) * (n->stlen + 1), "str2wstr");
|
|
||||||
wsp = n->wstptr;
|
|
||||||
|
|
||||||
- /*
|
|
||||||
- * For use by do_match, create and fill in an array.
|
|
||||||
- * For each byte `i' in n->stptr (the original string),
|
|
||||||
- * a[i] is equal to `j', where `j' is the corresponding wchar_t
|
|
||||||
- * in the converted wide string.
|
|
||||||
- *
|
|
||||||
- * Create the array.
|
|
||||||
- */
|
|
||||||
- if (ptr != NULL) {
|
|
||||||
- ezalloc(*ptr, size_t *, sizeof(size_t) * (n->stlen + 1), "str2wstr");
|
|
||||||
- }
|
|
||||||
-
|
|
||||||
sp = n->stptr;
|
|
||||||
src_count = n->stlen;
|
|
||||||
memset(& mbs, 0, sizeof(mbs));
|
|
|
@ -1,7 +1,7 @@
|
||||||
# Template file for 'gawk'
|
# Template file for 'gawk'
|
||||||
pkgname=gawk
|
pkgname=gawk
|
||||||
version=5.3.0
|
version=5.3.2
|
||||||
revision=2
|
revision=1
|
||||||
build_style=gnu-configure
|
build_style=gnu-configure
|
||||||
configure_args="--with-readline --disable-pma"
|
configure_args="--with-readline --disable-pma"
|
||||||
makedepends="readline-devel"
|
makedepends="readline-devel"
|
||||||
|
@ -11,7 +11,7 @@ license="GPL-3.0-or-later"
|
||||||
homepage="https://directory.fsf.org/wiki/Gawk"
|
homepage="https://directory.fsf.org/wiki/Gawk"
|
||||||
changelog="https://git.savannah.gnu.org/cgit/gawk.git/plain/NEWS"
|
changelog="https://git.savannah.gnu.org/cgit/gawk.git/plain/NEWS"
|
||||||
distfiles="${GNU_SITE}/gawk/gawk-${version}.tar.xz"
|
distfiles="${GNU_SITE}/gawk/gawk-${version}.tar.xz"
|
||||||
checksum=ca9c16d3d11d0ff8c69d79dc0b47267e1329a69b39b799895604ed447d3ca90b
|
checksum=f8c3486509de705192138b00ef2c00bbbdd0e84c30d5c07d23fc73a9dc4cc9cc
|
||||||
lib32disabled=yes
|
lib32disabled=yes
|
||||||
|
|
||||||
provides="awk-0_1"
|
provides="awk-0_1"
|
||||||
|
@ -20,7 +20,7 @@ alternatives="
|
||||||
awk:awk.1:/usr/share/man/man1/gawk.1"
|
awk:awk.1:/usr/share/man/man1/gawk.1"
|
||||||
|
|
||||||
pre_check() {
|
pre_check() {
|
||||||
vsed -i 's/done | more/done/g' test/Makefile
|
vsed -i 's/done | $${PAGER:-more}/done/g' test/Makefile
|
||||||
|
|
||||||
# This fixes tests on glibc, relevant tests on musl are disabled
|
# This fixes tests on glibc, relevant tests on musl are disabled
|
||||||
# because the locale command doesn't exist.
|
# because the locale command doesn't exist.
|
||||||
|
|
Loading…
Add table
Reference in a new issue