[arch-commits] Commit in kyotocabinet/trunk (PKGBUILD kyotocabinet-gcc6.patch)

[Antonio Rojas]

    Date: Saturday, June 9, 2018 @ 06:21:21
  Author: arojas
Revision: 342112

BUILDINFO rebuild

Added:
  kyotocabinet/trunk/kyotocabinet-gcc6.patch
Modified:
  kyotocabinet/trunk/PKGBUILD

-------------------------+
 PKGBUILD                |   12 +++++++++---
 kyotocabinet-gcc6.patch |   17 +++++++++++++++++
 2 files changed, 26 insertions(+), 3 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2018-06-09 06:18:03 UTC (rev 342111)
+++ PKGBUILD	2018-06-09 06:21:21 UTC (rev 342112)
@@ -5,14 +5,19 @@
 
 pkgname=kyotocabinet
 pkgver=1.2.76
-pkgrel=5
+pkgrel=6
 pkgdesc="a modern implementation of DBM in C++"
 arch=('x86_64')
 url="http://fallabs.com/kyotocabinet"
 license=('LGPL3')
 depends=('zlib' 'gcc-libs')
-source=("http://fallabs.com/${pkgname}/pkg/${pkgname}-${pkgver}.tar.gz")
+source=("http://fallabs.com/${pkgname}/pkg/${pkgname}-${pkgver}.tar.gz" kyotocabinet-gcc6.patch)
 
+prepare() {
+  cd $pkgname-$pkgver
+  patch -p1 -i ../kyotocabinet-gcc6.patch # Fix build with GCC 6 (Debian)
+}
+
 build() {
   cd $pkgname-$pkgver
 
@@ -26,4 +31,5 @@
   make install DESTDIR="$pkgdir/"
 }
 
-sha512sums=('278db7b327eb4c21bf0137d9aa14fb67d74d5ce7ed1cb29fc9120d157a60de165ec0cf842903eb7952e8f998045ae585b958977fa973ba0e0773381de71d9f6a')
+sha512sums=('278db7b327eb4c21bf0137d9aa14fb67d74d5ce7ed1cb29fc9120d157a60de165ec0cf842903eb7952e8f998045ae585b958977fa973ba0e0773381de71d9f6a'
+            'cd618524e30f7445f32bf33b3cab60f206cb5323898deda2b8ba07a593429f9e3b36f98507792b8fa664eccd581c9e321c52e7b38e878a5e390e41e70edfb1d1')

Added: kyotocabinet-gcc6.patch
===================================================================
--- kyotocabinet-gcc6.patch	                        (rev 0)
+++ kyotocabinet-gcc6.patch	2018-06-09 06:21:21 UTC (rev 342112)
@@ -0,0 +1,17 @@
+Description: fix for c++14/GCC 6 compatibility
+Author: Andreas Stührk <andy at hammerhartes.de>
+Bug-Debian: https://bugs.debian.org/811627
+Last-Update: <2016-09-24>
+
+--- kyotocabinet-1.2.76.orig/kcdbext.h
++++ kyotocabinet-1.2.76/kcdbext.h
+@@ -1278,7 +1278,7 @@ class IndexDB {
+     if (omode_ == 0) {
+       set_error(_KCCODELINE_, BasicDB::Error::INVALID, "not opened");
+       *sp = 0;
+-      return false;
++      return nullptr;
+     }
+     if (!cache_) return db_.get(kbuf, ksiz, sp);
+     size_t dvsiz = 0;
+