From 748817f00c438c4352c5489e999585a35ab19413 Mon Sep 17 00:00:00 2001
From: Toyam Cox <Vaelatern@gmail.com>
Date: Fri, 15 Jul 2016 02:29:18 -0400
Subject: [PATCH] watchman: update to 4.6.0.

---
 srcpkgs/watchman/patches/musl_configure.patch | 33 -------------------
 srcpkgs/watchman/template                     | 12 ++-----
 2 files changed, 3 insertions(+), 42 deletions(-)
 delete mode 100644 srcpkgs/watchman/patches/musl_configure.patch

diff --git a/srcpkgs/watchman/patches/musl_configure.patch b/srcpkgs/watchman/patches/musl_configure.patch
deleted file mode 100644
index be945de1923..00000000000
--- a/srcpkgs/watchman/patches/musl_configure.patch
+++ /dev/null
@@ -1,33 +0,0 @@
---- configure.ac
-+++ configure.ac
-@@ -251,6 +251,8 @@ AC_CHECK_HEADERS(CoreServices/CoreServices.h, [
- ])
- AC_CHECK_FUNCS(backtrace backtrace_symbols backtrace_symbols_fd)
- 
-+AC_CHECK_FUNCS_ONCE(sys_siglist)
-+
- if test -n "$ac_cv_header_sys_statvfs_h"; then
- AC_CHECK_MEMBERS([struct statvfs.f_fstypename,struct statvfs.f_basetype],
-   [AC_DEFINE([STATVFS_HAS_FSTYPE_AS_STRING], [1],[if statvfs holds fstype as string])],[],[[#include <sys/statvfs.h>]])
---- log.c
-+++ log.c
-@@ -78,11 +78,19 @@ static void crash_handler(int signo, siginfo_t *si, void *ucontext) {
-     dprintf(STDERR_FILENO,
-         "Terminating due to signal %d %s "
-         "generated by pid=%d uid=%d. %s (%p)\n",
-+#ifdef HAVE_SYS_SIGLIST
-         signo, sys_siglist[signo], si->si_pid, si->si_uid,
-+#else
-+        signo, strsignal(signo), si->si_pid, si->si_uid,
-+#endif
-         reason, si->si_value.sival_ptr);
-   } else {
-     dprintf(STDERR_FILENO, "Terminating due to signal %d %s. %s\n",
-+#ifdef HAVE_SYS_SIGLIST
-       signo, sys_siglist[signo], reason);
-+#else
-+      signo, strsignal(signo), reason);
-+#endif
-   }
- 
- #if defined(HAVE_BACKTRACE) && defined(HAVE_BACKTRACE_SYMBOLS_FD)
diff --git a/srcpkgs/watchman/template b/srcpkgs/watchman/template
index 0a51a05cf26..98ea32a4c71 100644
--- a/srcpkgs/watchman/template
+++ b/srcpkgs/watchman/template
@@ -1,7 +1,7 @@
 # Template file for 'watchman'
 pkgname=watchman
-version=4.5.0
-revision=2
+version=4.6.0
+revision=1
 build_style=gnu-configure
 configure_args="--disable-statedir"
 hostmakedepends="automake libtool"
@@ -11,14 +11,8 @@ maintainer="Juan RP <xtraeme@voidlinux.eu>"
 license="Apache-2.0"
 homepage="https://facebook.github.io/watchman/"
 distfiles="https://github.com/facebook/watchman/archive/v${version}.tar.gz"
-checksum=ef11ad11f3b79a09232a27d993331cc8b686fe06a8f0e7c777cb50cc198020f6
-
-# The next person to bump these packages should consider the effects of the 
-# following PRs on watchman:
-# https://github.com/facebook/watchman/pull/243
-# https://github.com/facebook/watchman/pull/242
+checksum=3a4ea5813967e984acb5bd32327926f2d431ea8a4ab7703510726ddb97d3d126
 
 pre_configure() {
-	sed -i 's,sys/poll.h,poll.h,g' *.[ch]
 	NOCONFIGURE=1 ./autogen.sh
 }