Control: tags 811627 + patch
Control: tags 811627 + pending

Dear maintainer,

I've prepared an NMU for kyotocabinet (versioned as 1.2.76-4.2) and
uploaded it to DELAYED/2. Please feel free to tell me if I
should delay it longer.

Regards.
-- 
Sebastian Ramacher
diff -Nru kyotocabinet-1.2.76/debian/changelog kyotocabinet-1.2.76/debian/changelog
--- kyotocabinet-1.2.76/debian/changelog	2015-08-15 12:16:08.000000000 +0200
+++ kyotocabinet-1.2.76/debian/changelog	2016-09-24 17:59:10.000000000 +0200
@@ -1,3 +1,10 @@
+kyotocabinet (1.2.76-4.2) unstable; urgency=medium
+
+  * Non-maintainer upload.
+  * Fix incompatibility with C++14/GCC 6 (Closes: #811627)
+
+ -- Andreas Stührk <a...@hammerhartes.de>  Sat, 24 Sep 2016 17:58:05 +0200
+
 kyotocabinet (1.2.76-4.1) unstable; urgency=medium
 
   * Non-maintainer upload.
diff -Nru kyotocabinet-1.2.76/debian/patches/cpp-14.patch kyotocabinet-1.2.76/debian/patches/cpp-14.patch
--- kyotocabinet-1.2.76/debian/patches/cpp-14.patch	1970-01-01 01:00:00.000000000 +0100
+++ kyotocabinet-1.2.76/debian/patches/cpp-14.patch	2016-09-24 17:57:39.000000000 +0200
@@ -0,0 +1,16 @@
+Description: fix for c++14/GCC 6 compatibility
+Author: Andreas Stührk <a...@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;
diff -Nru kyotocabinet-1.2.76/debian/patches/series kyotocabinet-1.2.76/debian/patches/series
--- kyotocabinet-1.2.76/debian/patches/series	2012-07-13 14:07:13.000000000 +0200
+++ kyotocabinet-1.2.76/debian/patches/series	2016-09-24 17:55:25.000000000 +0200
@@ -6,3 +6,4 @@
 doc-kyotoproducts.pdf.patch
 kfreebsd-support-getsysinfo-on-GNU-kFreeBSD.patch
 gcc-4.7.patch
+cpp-14.patch

Attachment: signature.asc
Description: PGP signature

Reply via email to