From 7986272cc08b0d7d63da00033bb0ce9957d4f529 Mon Sep 17 00:00:00 2001
From: Juan RP <xtraeme@voidlinux.eu>
Date: Wed, 6 Jul 2016 08:16:50 +0200
Subject: [PATCH] btrfs-progs: musl-1.1.15 has pthread_tryjoin_np() now.

Get rid of the patch that replaced this with pthread_join().
---
 ...e-pthread_join-instead-of-pthread_tryjoin_np.patch | 11 -----------
 srcpkgs/btrfs-progs/template                          |  2 +-
 2 files changed, 1 insertion(+), 12 deletions(-)
 delete mode 100644 srcpkgs/btrfs-progs/patches/0001-use-pthread_join-instead-of-pthread_tryjoin_np.patch

diff --git a/srcpkgs/btrfs-progs/patches/0001-use-pthread_join-instead-of-pthread_tryjoin_np.patch b/srcpkgs/btrfs-progs/patches/0001-use-pthread_join-instead-of-pthread_tryjoin_np.patch
deleted file mode 100644
index 5ea6daa16d4..00000000000
--- a/srcpkgs/btrfs-progs/patches/0001-use-pthread_join-instead-of-pthread_tryjoin_np.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- chunk-recover.c.orig
-+++ chunk-recover.c
-@@ -883,7 +883,7 @@
- 		for (i = 0; i < devidx; i++) {
- 			if (dev_scans[i].bytenr == -1)
- 				continue;
--			ret = pthread_tryjoin_np(t_scans[i],
-+			ret = pthread_join(t_scans[i],
- 						 (void **)&t_rets[i]);
- 			if (ret == EBUSY) {
- 				all_done = 0;
diff --git a/srcpkgs/btrfs-progs/template b/srcpkgs/btrfs-progs/template
index 15cc921c0bc..db176db0832 100644
--- a/srcpkgs/btrfs-progs/template
+++ b/srcpkgs/btrfs-progs/template
@@ -1,7 +1,7 @@
 # Template file for 'btrfs-progs'
 pkgname=btrfs-progs
 version=4.6
-revision=1
+revision=2
 wrksrc=${pkgname}-v${version}
 build_style=gnu-configure
 configure_args="--disable-backtrace"