From adce0c343935ba78e566c652e244bf85a7c0830b Mon Sep 17 00:00:00 2001 From: Nathan Owens Date: Mon, 21 Dec 2020 12:07:03 -0600 Subject: [PATCH] nwipe: update to 0.30. --- .../nwipe/patches/0001-musl-build-fix.patch | 27 +++++++++++++++++++ srcpkgs/nwipe/patches/musl.patch | 16 ----------- srcpkgs/nwipe/template | 6 ++--- 3 files changed, 30 insertions(+), 19 deletions(-) create mode 100644 srcpkgs/nwipe/patches/0001-musl-build-fix.patch delete mode 100644 srcpkgs/nwipe/patches/musl.patch diff --git a/srcpkgs/nwipe/patches/0001-musl-build-fix.patch b/srcpkgs/nwipe/patches/0001-musl-build-fix.patch new file mode 100644 index 00000000000..6d209269cde --- /dev/null +++ b/srcpkgs/nwipe/patches/0001-musl-build-fix.patch @@ -0,0 +1,27 @@ +From 8871bf692e3b5012fdb0ea069b81c6a8db8ef85f Mon Sep 17 00:00:00 2001 +From: Nathan Owens +Date: Mon, 21 Dec 2020 12:05:43 -0600 +Subject: [PATCH] musl build fix + +musl does not have bits/sigthread.h +--- + src/nwipe.c | 2 ++ + 1 file changed, 2 insertions(+) + +diff --git src/nwipe.c src/nwipe.c +index 2c9c851..487177e 100644 +--- src/nwipe.c ++++ src/nwipe.c +@@ -32,7 +32,9 @@ + #include + #include + #include ++#if defined(__GLIBC__) + #include ++#endif + + #include "nwipe.h" + #include "context.h" +-- +2.29.2 + diff --git a/srcpkgs/nwipe/patches/musl.patch b/srcpkgs/nwipe/patches/musl.patch deleted file mode 100644 index 1cdb928fe0a..00000000000 --- a/srcpkgs/nwipe/patches/musl.patch +++ /dev/null @@ -1,16 +0,0 @@ -diff --git src/nwipe.c src/nwipe.c -index c7586fd..ec2eb1d 100644 ---- src/nwipe.c -+++ src/nwipe.c -@@ -26,9 +26,10 @@ - #include - #include - #include -+#if defined(__GLIBC__) - #include - #include -- -+#endif - #include "nwipe.h" - #include "context.h" - #include "method.h" diff --git a/srcpkgs/nwipe/template b/srcpkgs/nwipe/template index b68af7a11b4..e3cbc2b3b65 100644 --- a/srcpkgs/nwipe/template +++ b/srcpkgs/nwipe/template @@ -1,6 +1,6 @@ # Template file for 'nwipe' pkgname=nwipe -version=0.28 +version=0.30 revision=1 build_style=gnu-configure hostmakedepends="automake pkg-config" @@ -10,10 +10,10 @@ maintainer="Orphaned " license="GPL-2.0-only" homepage="https://github.com/martijnvanbrummelen/nwipe" distfiles="${homepage}/archive/v${version}.tar.gz" -checksum=4f1ccf952cd3cdb00c8ccbfe4c47f94eaecf20a98248aaf83a0c1b2198e2ce13 +checksum=85faaa9c65557a6be187f0176c5b778e8cd080e1cd9b8a7168a8a9b8e410d46d CFLAGS="-D_FILE_OFFSET_BITS=64" pre_configure() { - sh init.sh + autoreconf -fi }