From 8c09bf8df9469414565b606d4fd82a6ec2069057 Mon Sep 17 00:00:00 2001 From: oliver-cfc Date: Thu, 25 May 2023 14:32:09 -0400 Subject: [PATCH] datamash: update to 1.8. Co-authored-by: Duncaen Closes: https://github.com/void-linux/void-packages/pull/44080 --- srcpkgs/datamash/patches/musl-tests.patch | 11 +++++++++++ srcpkgs/datamash/template | 16 ++++++++++++---- 2 files changed, 23 insertions(+), 4 deletions(-) create mode 100644 srcpkgs/datamash/patches/musl-tests.patch diff --git a/srcpkgs/datamash/patches/musl-tests.patch b/srcpkgs/datamash/patches/musl-tests.patch new file mode 100644 index 00000000000..7666b0560a8 --- /dev/null +++ b/srcpkgs/datamash/patches/musl-tests.patch @@ -0,0 +1,11 @@ +--- a/tests/decorate-errors.pl ++++ b/tests/decorate-errors.pl +@@ -149,7 +149,7 @@ + {ERR=>"$prog: invalid dot-decimal IPv4 address 'FOO'\n" . + "$prog: conversion failed in line 1\n" }], + ['c4', '--decorate -k1,1:ipv4inet' , {IN_PIPE=>"FOO\n"}, {OUT => " "}, +- {EXIT=>2}, ++ {EXIT=>2}, {ERR_SUBST=>'s/: Invalid argument//'}, + {ERR=>"$prog: invalid IPv4 address 'FOO'\n" . + "$prog: conversion failed in line 1\n" }], + ['c5', '--decorate -k1,1:ipv6' , {IN_PIPE=>"FOO\n"}, {OUT => " "}, {EXIT=>2}, diff --git a/srcpkgs/datamash/template b/srcpkgs/datamash/template index 56495d251e8..b483a170950 100644 --- a/srcpkgs/datamash/template +++ b/srcpkgs/datamash/template @@ -1,11 +1,19 @@ # Template file for 'datamash' pkgname=datamash -version=1.7 +version=1.8 revision=1 build_style=gnu-configure +hostmakedepends="texinfo" +checkdepends="which" short_desc="Command-line program that performs simple calculations on input files" -maintainer="oliver JH " +maintainer="oliver " license="GPL-3.0-or-later" homepage="https://www.gnu.org/software/datamash/" -distfiles="${GNU_SITE}/${pkgname}/${pkgname}-${version}.tar.gz" -checksum=574a592bb90c5ae702ffaed1b59498d5e3e7466a8abf8530c5f2f3f11fa4adb3 +distfiles="${GNU_SITE}/datamash/datamash-${version}.tar.gz" +checksum=7ad97e8c7ef616dd03aa5bd67ae24c488272db3e7d1f5774161c18b75f29f6fd + +post_extract() { + if [ "$XBPS_TARGET_LIBC" = "musl" ]; then + vsed -e '/datamash-i18n-de\.pl/d' -i Makefile.in + fi +}