pkgsrc-Changes-HG archive

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]

[pkgsrc/trunk]: pkgsrc/databases/kyotocabinet kyotocabinet: Fix compilation w...



details:   https://anonhg.NetBSD.org/pkgsrc/rev/68faac9a1726
branches:  trunk
changeset: 376675:68faac9a1726
user:      wiz <wiz%pkgsrc.org@localhost>
date:      Tue Mar 06 15:20:27 2018 +0000

description:
kyotocabinet: Fix compilation with gcc-6.

'false' is not a valid char *.

diffstat:

 databases/kyotocabinet/distinfo                |   3 ++-
 databases/kyotocabinet/patches/patch-kcdbext.h |  15 +++++++++++++++
 2 files changed, 17 insertions(+), 1 deletions(-)

diffs (34 lines):

diff -r 78b8d77c4ee4 -r 68faac9a1726 databases/kyotocabinet/distinfo
--- a/databases/kyotocabinet/distinfo   Tue Mar 06 15:17:12 2018 +0000
+++ b/databases/kyotocabinet/distinfo   Tue Mar 06 15:20:27 2018 +0000
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.5 2015/11/03 01:56:13 agc Exp $
+$NetBSD: distinfo,v 1.6 2018/03/06 15:20:27 wiz Exp $
 
 SHA1 (kyotocabinet-1.2.76.tar.gz) = a4ec70d08ca6c8f510dbc329d5c27b55030d3521
 RMD160 (kyotocabinet-1.2.76.tar.gz) = 3bc2feb6e01310764c422cc93d9a98ced1da2cfb
@@ -6,4 +6,5 @@
 Size (kyotocabinet-1.2.76.tar.gz) = 951930 bytes
 SHA1 (patch-configure) = 67f2a01332236f7db88a5714ced8662b1c82a467
 SHA1 (patch-kccommon.h) = 93a4c003aa6bf069cf65f2a943314f2a332790c6
+SHA1 (patch-kcdbext.h) = 0e0bbb820742a1e0a6ecb4a171862b1a841f01de
 SHA1 (patch-kcthread.cc) = d09d280cd9589b10bbc10b29dc51d40ce074cc7f
diff -r 78b8d77c4ee4 -r 68faac9a1726 databases/kyotocabinet/patches/patch-kcdbext.h
--- /dev/null   Thu Jan 01 00:00:00 1970 +0000
+++ b/databases/kyotocabinet/patches/patch-kcdbext.h    Tue Mar 06 15:20:27 2018 +0000
@@ -0,0 +1,15 @@
+$NetBSD: patch-kcdbext.h,v 1.1 2018/03/06 15:20:27 wiz Exp $
+
+Fix compilation with gcc-6. 'false' is not a valid char *.
+
+--- kcdbext.h.orig     2012-05-24 16:27:59.000000000 +0000
++++ kcdbext.h
+@@ -1278,7 +1278,7 @@ class IndexDB {
+     if (omode_ == 0) {
+       set_error(_KCCODELINE_, BasicDB::Error::INVALID, "not opened");
+       *sp = 0;
+-      return false;
++      return NULL;
+     }
+     if (!cache_) return db_.get(kbuf, ksiz, sp);
+     size_t dvsiz = 0;



Home | Main Index | Thread Index | Old Index