summarylogtreecommitdiffstats
diff options
context:
space:
mode:
authorSree Harsha Totakura2018-09-19 15:38:56 +0200
committerSree Harsha Totakura2018-09-19 15:38:56 +0200
commit13d63f37ae3645318007f1e8db040520c4513e58 (patch)
tree7685714c38668f3b069135a5983dd51241eb74ee
parenta99411ee563fd5ba831de95aa9312853597ff7a8 (diff)
downloadaur-13d63f37ae3645318007f1e8db040520c4513e58.tar.gz
Update to v0.1.3 and fix build for new g++-8.2
-rw-r--r--PKGBUILD12
-rw-r--r--fix-gcc-c++14-version.patch13
2 files changed, 20 insertions, 5 deletions
diff --git a/PKGBUILD b/PKGBUILD
index a6870f1ba71f..3823e68d53c8 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -1,17 +1,19 @@
pkgname=capnproto-java
-pkgver=0.1.2
-pkgrel=2
+pkgver=0.1.3
+pkgrel=1
pkgdesc="Cap'n Proto for Java"
arch=('i686' 'x86_64')
url="https://github.com/capnproto/capnproto-java"
license=('MIT')
depends=('capnproto')
-source=("https://github.com/capnproto/capnproto-java/archive/v0.1.2.tar.gz")
-sha384sums=('33802b6bb48f67df8f3c9890e3740588de3435dd57134465e8da6344c241fe828b9fb915f5d1cee79ddfc9d99c9de76f')
+source=("https://github.com/capnproto/capnproto-java/archive/v0.1.3.tar.gz"
+ "fix-gcc-c++14-version.patch")
+sha256sums=('feb0cef6f4a64c9228ddc206c8a7322b8a069323b5a3c4ad496eb03fb14c0bbc'
+ 'f29dbc46ed874ef8f8dd15c0a50567ce65e3c05e5e09749339218d740049a255')
build() {
cd "$pkgname-$pkgver"
-
+ patch -p 1 < ../fix-gcc-c++14-version.patch
make
}
diff --git a/fix-gcc-c++14-version.patch b/fix-gcc-c++14-version.patch
new file mode 100644
index 000000000000..5a5f588cb1d9
--- /dev/null
+++ b/fix-gcc-c++14-version.patch
@@ -0,0 +1,13 @@
+diff --git a/Makefile b/Makefile
+index 91369c0..088383d 100644
+--- a/Makefile
++++ b/Makefile
+@@ -8,7 +8,7 @@ CAPNP_CXX_FLAGS=-I $(CAPNP_PREFIX)/include -L $(CAPNP_PREFIX)/lib -lkj -lcapnp
+ endif
+
+ CXX=g++
+-CXX_FLAGS=-std=c++11 $(CAPNP_CXX_FLAGS)
++CXX_FLAGS=-std=c++14 $(CAPNP_CXX_FLAGS)
+
+ CAPNPC_JAVA_SOURCES=compiler/src/main/cpp/capnpc-java.c++
+