From ddf9daa18140164e47827999332924a8dc5000e0 Mon Sep 17 00:00:00 2001 From: Enno Boland Date: Sat, 3 Aug 2019 09:52:10 +0200 Subject: [PATCH] kbd: ship error.h instead of downloading No revbump here, the resulting binary should be the same. --- srcpkgs/kbd/files/error.h | 20 ++++++++++++++++++++ srcpkgs/kbd/template | 2 +- 2 files changed, 21 insertions(+), 1 deletion(-) create mode 100644 srcpkgs/kbd/files/error.h diff --git a/srcpkgs/kbd/files/error.h b/srcpkgs/kbd/files/error.h new file mode 100644 index 0000000000..5eb8ed5115 --- /dev/null +++ b/srcpkgs/kbd/files/error.h @@ -0,0 +1,20 @@ +#ifndef ERROR_H +#define ERROR_H + +#include +#include +#include + +static inline void error(int status, int errnum, const char *fmt, ...) +{ + va_list ap; + void (*errfunc[2])(int, const char *, va_list) = { &verr, &verrx }; + void (*warnfunc[2])(const char *, va_list) = { &vwarn, &vwarnx }; + fflush(stdout); + va_start(ap, fmt); + if (status != 0) + errfunc[errnum==0](status, fmt, ap); /* does not return */ + warnfunc[errnum==0](fmt, ap); + va_end(ap); +} +#endif diff --git a/srcpkgs/kbd/template b/srcpkgs/kbd/template index 9a9b04e959..eb9a8fe300 100644 --- a/srcpkgs/kbd/template +++ b/srcpkgs/kbd/template @@ -40,7 +40,7 @@ pre_configure() { sed -e '/^PKG_CHECK_MODULES.*/d' -i configure.ac sed -e 's,tests ,,g' -i Makefile.am - $XBPS_FETCH_CMD http://git.alpinelinux.org/cgit/aports/plain/main/kbd/error.h + cp $FILESDIR/error.h . autoreconf -fi } post_install() {