From 5b0358e6d179be2a1144f5e68003d3656dec58a09e0b6cb945a8ae6d86831434 Mon Sep 17 00:00:00 2001 From: Dirk Mueller Date: Wed, 25 May 2016 10:45:15 +0000 Subject: [PATCH] Accepting request 397912 from home:marxin:branches:devel:libraries:c_c++ Fix errors seen by GCC6. OBS-URL: https://build.opensuse.org/request/show/397912 OBS-URL: https://build.opensuse.org/package/show/devel:libraries:c_c++/kyotocabinet?expand=0&rev=15 --- gcc6-fix-errors.patch | 11 +++++++++++ kyotocabinet.changes | 5 +++++ kyotocabinet.spec | 5 ++++- 3 files changed, 20 insertions(+), 1 deletion(-) create mode 100644 gcc6-fix-errors.patch diff --git a/gcc6-fix-errors.patch b/gcc6-fix-errors.patch new file mode 100644 index 0000000..5039c52 --- /dev/null +++ b/gcc6-fix-errors.patch @@ -0,0 +1,11 @@ +--- kyotocabinet-1.2.76/kcdbext.h 2016-05-25 11:32:53.591866016 +0200 ++++ kyotocabinet-1.2.76/kcdbext.h 2012-05-24 18:27:59.000000000 +0200 +@@ -1278,7 +1278,7 @@ + if (omode_ == 0) { + set_error(_KCCODELINE_, BasicDB::Error::INVALID, "not opened"); + *sp = 0; +- return false; ++ return '\0'; + } + if (!cache_) return db_.get(kbuf, ksiz, sp); + size_t dvsiz = 0; diff --git a/kyotocabinet.changes b/kyotocabinet.changes index bf0f1c5..5da933d 100644 --- a/kyotocabinet.changes +++ b/kyotocabinet.changes @@ -1,3 +1,8 @@ +------------------------------------------------------------------- +Wed May 25 09:38:17 UTC 2016 - martin.liska@suse.com + +- Add gcc6-fix-errors.patch to remove errors seen by GCC6. + ------------------------------------------------------------------- Fri Jan 4 16:30:01 UTC 2013 - jengelh@inai.de diff --git a/kyotocabinet.spec b/kyotocabinet.spec index b52c3ff..df47a38 100644 --- a/kyotocabinet.spec +++ b/kyotocabinet.spec @@ -1,7 +1,7 @@ # # spec file for package kyotocabinet # -# Copyright (c) 2013 SUSE LINUX Products GmbH, Nuernberg, Germany. +# Copyright (c) 2016 SUSE LINUX GmbH, Nuernberg, Germany. # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -28,6 +28,8 @@ Source: http://fallabs.com/kyotocabinet/pkg/kyotocabinet-%{version}.tar. # PATCH-MISSING-TAG -- See http://wiki.opensuse.org/openSUSE:Packaging_Patches_guidelines Patch1: %{name}-fix_rpath.patch Patch2: configure-8-byte-atomics.patch +# PATCH-FIX-OPENSUSE gcc6-fix-errors.patch -- Fix errors seen by GCC6. +Patch3: gcc6-fix-errors.patch BuildRequires: autoconf BuildRequires: automake BuildRequires: gcc-c++ @@ -107,6 +109,7 @@ Kyoto Cabinet within a proprietary software, the commercial license is required. %setup -q %patch1 -p 1 %patch2 -p1 +%patch3 -p1 sed -ie "/ldconfig/d" Makefile.in sed -ie "/DOCDIR/d" Makefile.in