Update PKGBUILD due to numerous upstream changes

3 files changed, 72 insertions, 46 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 216e478ef8e3..b837a374ed39 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,20 +1,39 @@
-# Generated by mksrcinfo v8
-# Thu Oct 12 14:50:03 UTC 2017
 pkgbase = capnproto-git
 	pkgdesc = Cap'n Proto serialization/RPC system (git version)
-	pkgver = 0.7.r2236.365de898
+	pkgver = 0.9.r3463.b5ab41ea
 	pkgrel = 1
-	url = http://kentonv.github.io/capnproto/
-	arch = i686
+	url = https://capnproto.org/
 	arch = x86_64
 	license = MIT
+	makedepends = cmake
 	makedepends = git
-	provides = capnproto=0.7
+	depends = gcc-libs
+	depends = glibc
+	depends = openssl
+	depends = zlib
+	provides = capnproto
+	provides = capnproto=0.9
+	provides = libcapnp.so
+	provides = libcapnp.so=0.9
+	provides = libcapnp-json.so
+	provides = libcapnp-json.so=0.9
+	provides = libcapnp-rpc.so
+	provides = libcapnp-rpc.so=0.9
+	provides = libcapnpc.so
+	provides = libcapnpc.so=0.9
+	provides = libkj-async.so
+	provides = libkj-async.so=0.9
+	provides = libkj-gzip.so
+	provides = libkj-gzip.so=0.9
+	provides = libkj-http.so
+	provides = libkj-http.so=0.9
+	provides = libkj-test.so
+	provides = libkj-test.so=0.9
+	provides = libkj.so
+	provides = libkj.so=0.9
 	conflicts = capnproto
-	source = capnproto::git+https://github.com/kentonv/capnproto.git
-	source = https://github.com/google/googletest/archive/release-1.8.0.tar.gz
-	md5sums = SKIP
-	md5sums = 16877098823401d1bf2ed7891d7dce36
+	source = capnproto::git+https://github.com/capnproto/capnproto.git
+	sha512sums = SKIP
 
 pkgname = capnproto-git
 
diff --git a/.gitignore b/.gitignore
index 37c524cb7973..807932e0074c 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,7 +1,6 @@
 capnproto/
 capnproto-git-*.tar.xz
+capnproto-git-*.tar.zst
 capnproto-git-*.src.tar.gz
-release-*.tar.gz
 pkg/
 src/
-.AURINFO
diff --git a/PKGBUILD b/PKGBUILD
index bda7a923457e..ba54efdb376b 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -1,53 +1,61 @@
 # Maintainer:  Christopher Arndt <aur -at- chrisarndt -dot- de>
-# Contributor: Severen Redwood <severen@shrike.me
-# Contributor: Dave Reisner <dreisner@archlinux.org>
-# Contributor: Matthias Blaicher <matthias@blaicher.com>
+# Contributor: David Runge <dvzrv -at- archlinux -dot- org>
+# Contributor: Severen Redwood <severen -at- shrike -dot- me
+# Contributor: Dave Reisner <dreisner -at- archlinux -dot- org>
+# Contributor: Matthias Blaicher <matthias -at- blaicher -dot- com>
+# Contributor: pepijndevos <pepijndevos -at- gmail -dot- com>
 
 _pkgname=capnproto
-_gtest_ver="1.8.0"
-pkgname="${_pkgname}-git"
-pkgver=0.7.r2236.365de898
+pkgname=capnproto-git
+pkgver=0.9.r3463.b5ab41ea
 pkgrel=1
 pkgdesc="Cap'n Proto serialization/RPC system (git version)"
-arch=('i686' 'x86_64')
-url="http://kentonv.github.io/capnproto/"
+arch=('x86_64')
+url='https://capnproto.org/'
 license=('MIT')
-makedepends=('git')
 conflicts=("${_pkgname}")
-provides=("${_pkgname}=${pkgver/.r*/}")
-source=("${_pkgname}::git+https://github.com/kentonv/${_pkgname}.git"
-        "https://github.com/google/googletest/archive/release-${_gtest_ver}.tar.gz")
-md5sums=('SKIP'
-         '16877098823401d1bf2ed7891d7dce36')
+provides=("${_pkgname}" "${_pkgname}=${pkgver/.r*/}"
+          'libcapnp.so' "libcapnp.so=${pkgver/.r*/}"
+          'libcapnp-json.so' "libcapnp-json.so=${pkgver/.r*/}"
+          'libcapnp-rpc.so' "libcapnp-rpc.so=${pkgver/.r*/}"
+          'libcapnpc.so' "libcapnpc.so=${pkgver/.r*/}"
+          'libkj-async.so' "libkj-async.so=${pkgver/.r*/}"
+          'libkj-gzip.so' "libkj-gzip.so=${pkgver/.r*/}"
+          'libkj-http.so' "libkj-http.so=${pkgver/.r*/}"
+          'libkj-test.so' "libkj-test.so=${pkgver/.r*/}"
+          'libkj.so' "libkj.so=${pkgver/.r*/}"
+)
+depends=('gcc-libs' 'glibc' 'openssl' 'zlib')
+makedepends=('cmake' 'git')
+source=("${_pkgname}::git+https://github.com/${_pkgname}/${_pkgname}.git")
+sha512sums=('SKIP')
 
-pkgver() {
-  cd "${srcdir}/${_pkgname}/c++"
-  local ver="$(grep '^set(VERSION' CMakeLists.txt | sed -e 's/set(VERSION \([0-9]\+\.[0-9]\+.*\))/\1/')"
-  echo ${ver/-dev/}.r$(git rev-list --count HEAD).$(git rev-parse --short HEAD)
-}
 
-prepare() {
+pkgver() {
   cd "${srcdir}/${_pkgname}/c++"
-  ln -sf "${srcdir}/googletest-release-${_gtest_ver}"
+  local ver="$(grep '^set(VERSION' CMakeLists.txt | sed -e 's/set(VERSION \([0-9]\+\.[0-9]\+.*\))/\1/;s/-dev$//')"
+  ( set -o pipefail
+    git describe --long --tags 2>/dev/null | sed 's/^v//;s/\([^-]*-g\)/r\1/;s/-dev$//;s/-/./g' ||
+    printf "%s.r%s.%s" "$ver" "$(git rev-list --count HEAD)" "$(git rev-parse --short HEAD)"
+  )
 }
 
 build() {
-  cd "${srcdir}/${_pkgname}/c++"
-  autoreconf -i
-  ./configure --prefix=/usr
-  make
-}
-
-check() {
-  cd "${srcdir}/${_pkgname}/c++"
-  make check
+  cd "${srcdir}/${_pkgname}"
+  cmake -DCMAKE_INSTALL_PREFIX=/usr \
+        -DBUILD_SHARED_LIBS=ON \
+        -B build \
+        -S .
+  make VERBOSE=1 -C build
 }
 
 package() {
-  cd "${srcdir}/${_pkgname}/c++"
-  make DESTDIR="$pkgdir" install
-
-  install -D -m644 "../LICENSE" "${pkgdir}/usr/share/licenses/${pkgname}/LICENSE"
+  cd "${srcdir}/${_pkgname}"
+  make DESTDIR="${pkgdir}" install -C build
+  install -vDm 644 LICENSE \
+    -t "${pkgdir}/usr/share/licenses/${pkgname}"
+  install -vDm 644 {CONTRIBUTORS,README.md} \
+    -t "${pkgdir}/usr/share/doc/${_pkgname}"
 }
 
 # vim:set ts=2 sw=2 et: