[arch-commits] Commit in kyotocabinet/repos/community-x86_64 (3 files)

[Antonio Rojas]

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

archrelease: copy trunk to community-x86_64

Added:
  kyotocabinet/repos/community-x86_64/PKGBUILD
    (from rev 342112, kyotocabinet/trunk/PKGBUILD)
  kyotocabinet/repos/community-x86_64/kyotocabinet-gcc6.patch
    (from rev 342112, kyotocabinet/trunk/kyotocabinet-gcc6.patch)
Deleted:
  kyotocabinet/repos/community-x86_64/PKGBUILD

-------------------------+
 PKGBUILD                |   64 +++++++++++++++++++++++++---------------------
 kyotocabinet-gcc6.patch |   17 ++++++++++++
 2 files changed, 52 insertions(+), 29 deletions(-)

Deleted: PKGBUILD
===================================================================
--- PKGBUILD	2018-06-09 06:21:21 UTC (rev 342112)
+++ PKGBUILD	2018-06-09 06:21:48 UTC (rev 342113)
@@ -1,29 +0,0 @@
-# $Id$
-# Maintainer: Felix Yan <felixonmars at gmail.com>
-# Contributor: Alexander Duscheleit <jinks at archlinux.us>
-# Contributor: Joaquim Pedro (osmano807) <osmano807 at gmail.com>
-
-pkgname=kyotocabinet
-pkgver=1.2.76
-pkgrel=5
-pkgdesc="a modern implementation of DBM in C++"
-arch=('i686' 'x86_64')
-url="http://fallabs.com/kyotocabinet"
-license=('LGPL3')
-depends=('zlib' 'gcc-libs')
-source=("http://fallabs.com/${pkgname}/pkg/${pkgname}-${pkgver}.tar.gz")
-
-build() {
-  cd $pkgname-$pkgver
-
-  ./configure --prefix=/usr --disable-opt
-  make
-}
-
-package() {
-  cd $pkgname-$pkgver
-
-  make install DESTDIR="$pkgdir/"
-}
-
-sha512sums=('278db7b327eb4c21bf0137d9aa14fb67d74d5ce7ed1cb29fc9120d157a60de165ec0cf842903eb7952e8f998045ae585b958977fa973ba0e0773381de71d9f6a')

Copied: kyotocabinet/repos/community-x86_64/PKGBUILD (from rev 342112, kyotocabinet/trunk/PKGBUILD)
===================================================================
--- PKGBUILD	                        (rev 0)
+++ PKGBUILD	2018-06-09 06:21:48 UTC (rev 342113)
@@ -0,0 +1,35 @@
+# $Id$
+# Maintainer: Felix Yan <felixonmars at gmail.com>
+# Contributor: Alexander Duscheleit <jinks at archlinux.us>
+# Contributor: Joaquim Pedro (osmano807) <osmano807 at gmail.com>
+
+pkgname=kyotocabinet
+pkgver=1.2.76
+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" kyotocabinet-gcc6.patch)
+
+prepare() {
+  cd $pkgname-$pkgver
+  patch -p1 -i ../kyotocabinet-gcc6.patch # Fix build with GCC 6 (Debian)
+}
+
+build() {
+  cd $pkgname-$pkgver
+
+  ./configure --prefix=/usr --disable-opt
+  make
+}
+
+package() {
+  cd $pkgname-$pkgver
+
+  make install DESTDIR="$pkgdir/"
+}
+
+sha512sums=('278db7b327eb4c21bf0137d9aa14fb67d74d5ce7ed1cb29fc9120d157a60de165ec0cf842903eb7952e8f998045ae585b958977fa973ba0e0773381de71d9f6a'
+            'cd618524e30f7445f32bf33b3cab60f206cb5323898deda2b8ba07a593429f9e3b36f98507792b8fa664eccd581c9e321c52e7b38e878a5e390e41e70edfb1d1')

Copied: kyotocabinet/repos/community-x86_64/kyotocabinet-gcc6.patch (from rev 342112, kyotocabinet/trunk/kyotocabinet-gcc6.patch)
===================================================================
--- kyotocabinet-gcc6.patch	                        (rev 0)
+++ kyotocabinet-gcc6.patch	2018-06-09 06:21:48 UTC (rev 342113)
@@ -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;
+