From f3de5fc9289e791b1f1b330d244e1859912928c0 Mon Sep 17 00:00:00 2001
From: Michael Gehring <mg@ebfe.org>
Date: Sat, 6 May 2017 19:58:26 +0000
Subject: [PATCH] capnproto: update to 0.6.0. (soname bump)

---
 common/shlibs                            | 13 ++++++++-----
 srcpkgs/capnproto/patches/musl_fix.patch | 20 --------------------
 srcpkgs/capnproto/template               | 17 ++++++++++-------
 3 files changed, 18 insertions(+), 32 deletions(-)
 delete mode 100644 srcpkgs/capnproto/patches/musl_fix.patch

diff --git a/common/shlibs b/common/shlibs
index c89b9121b95..e1333d097cb 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -2736,11 +2736,14 @@ libite.so.3 libite-1.8.2_1
 liblog4cplus-1.2.so.5 log4cplus-1.2.0_1
 libpng12.so.0 libpng12-1.2.56_2
 libpng.so.3 libpng12-1.2.56_2
-libcapnp-0.5.3.so capnproto-0.5.3_1
-libcapnp-rpc-0.5.3.so capnproto-0.5.3_1
-libcapnpc-0.5.3.so capnproto-0.5.3_1
-libkj-0.5.3.so capnproto-0.5.3_1
-libkj-async-0.5.3.so capnproto-0.5.3_1
+libcapnpc-0.6.0.so capnproto-0.6.0_1
+libcapnp-json-0.6.0.so capnproto-0.6.0_1
+libcapnp-rpc-0.6.0.so capnproto-0.6.0_1
+libcapnp-0.6.0.so capnproto-0.6.0_1
+libkj-http-0.6.0.so capnproto-0.6.0_1
+libkj-async-0.6.0.so capnproto-0.6.0_1
+libkj-test-0.6.0.so capnproto-0.6.0_1
+libkj-0.6.0.so capnproto-0.6.0_1
 libkea-log.so.2 libkea-1.1.0_1
 libkea-util.so.2 libkea-1.1.0_1
 libkea-exceptions.so.0 libkea-1.1.0_1
diff --git a/srcpkgs/capnproto/patches/musl_fix.patch b/srcpkgs/capnproto/patches/musl_fix.patch
deleted file mode 100644
index a2213b6ec76..00000000000
--- a/srcpkgs/capnproto/patches/musl_fix.patch
+++ /dev/null
@@ -1,20 +0,0 @@
---- src/kj/exception.c++.fix	2016-11-10 10:30:39.182645852 +0100
-+++ src/kj/exception.c++	2016-11-10 10:30:26.848646578 +0100
-@@ -28,7 +28,7 @@
- #include <exception>
- #include <new>
- 
--#if (__linux__ && !__ANDROID__) || __APPLE__
-+#if (__GLIBC__) || __APPLE__
- #define KJ_HAS_BACKTRACE 1
- #include <execinfo.h>
- #endif
-@@ -43,7 +43,7 @@
- namespace {
- 
- String getStackSymbols(ArrayPtr<void* const> trace) {
--#if (__linux__ || __APPLE__) && !__ANDROID__ && defined(KJ_DEBUG)
-+#if (__GLIBC__ || __APPLE__) && !__ANDROID__ && defined(KJ_DEBUG)
-   // We want to generate a human-readable stack trace.
- 
-   // TODO(someday):  It would be really great if we could avoid farming out to another process
diff --git a/srcpkgs/capnproto/template b/srcpkgs/capnproto/template
index 9d82e887839..969edabf08b 100644
--- a/srcpkgs/capnproto/template
+++ b/srcpkgs/capnproto/template
@@ -1,6 +1,6 @@
 # Template file for 'capnproto'
 pkgname=capnproto
-version=0.5.3
+version=0.6.0
 revision=1
 wrksrc="${pkgname}-c++-${version}"
 build_style=gnu-configure
@@ -9,7 +9,7 @@ maintainer="eater <hello@eaterofco.de>"
 license="MIT"
 homepage="https://capnproto.org"
 distfiles="${homepage}/capnproto-c++-${version}.tar.gz"
-checksum="cdb17c792493bdcd4a24bcd196eb09f70ee64c83a3eccb0bc6534ff560536afb"
+checksum=e50911191afc44d6ab03b8e0452cf8c00fd0edfcd34b39f169cea6a53b0bf73e
 nocross="Tries to execute compiled code during build"
 
 post_install() {
@@ -22,11 +22,14 @@ capnproto-devel_package() {
 		vmove usr/include
 		vmove usr/lib/*.a
 		vmove usr/lib/*.la
-		vmove usr/lib/libcapnp-rpc.so
-		vmove usr/lib/libcapnp.so
-		vmove usr/lib/libcapnpc.so
-		vmove usr/lib/libkj-async.so
-		vmove usr/lib/libkj.so
+		vmove /usr/lib/libkj.so
+		vmove /usr/lib/libkj-test.so
+		vmove /usr/lib/libkj-http.so
+		vmove /usr/lib/libkj-async.so
+		vmove /usr/lib/libcapnpc.so
+		vmove /usr/lib/libcapnp.so
+		vmove /usr/lib/libcapnp-rpc.so
+		vmove /usr/lib/libcapnp-json.so
 		vmove usr/lib/pkgconfig
 	}
 }