rpms/kyotocabinet
7
0
Fork 0
Code Issues Pull Requests Releases Activity

Update to 1.2.77

Browse Source
This commit is contained in:
Robert Scheck 2019-03-25 21:17:10 +01:00
parent eb93de7467
commit ce02aa84d0
3 changed files with 8 additions and 52 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

45
kyotocabinet-1.2.76-gcc6.patch
View File

@ -1,45 +0,0 @@
Patch from Andreas Stührk <andy@hammerhartes.de> to work around build
failures with GCC >= 6 like:
In file included from kcdbext.cc:16:0:
kcdbext.h: In member function 'char* kyotocabinet::IndexDB::get(const char*, size_t, size_t*)':
kcdbext.h:1281:14: error: cannot convert 'bool' to 'char*' in return
return false;
^~~~~
In file included from kclangc.cc:17:0:
kcdbext.h: In member function 'char* kyotocabinet::IndexDB::get(const char*, size_t, size_t*)':
kcdbext.h:1281:14: error: cannot convert 'bool' to 'char*' in return
return false;
^~~~~
Note that using '\0' rather nullptr (like the patch from openSUSE is
doing) just leads to new build failures with GCC >= 7 like:
In file included from kcdbext.cc:16:0:
kcdbext.h: In member function 'char* kyotocabinet::IndexDB::get(const char*, size_t, size_t*)':
kcdbext.h:1281:14: error: invalid conversion from 'char' to 'char*' [-fpermissive]
return '\0';
^~~~
In file included from kclangc.cc:17:0:
kcdbext.h: In member function 'char* kyotocabinet::IndexDB::get(const char*, size_t, size_t*)':
kcdbext.h:1281:14: error: invalid conversion from 'char' to 'char*' [-fpermissive]
return '\0';
^~~~
See also:
- https://bugzilla.redhat.com/show_bug.cgi?id=1307706
- https://build.opensuse.org/package/view_file/devel:libraries:c_c++/kyotocabinet/gcc6-fix-errors.patch?expand=1
- https://bugs.debian.org/811627
--- 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 nullptr;
}
if (!cache_) return db_.get(kbuf, ksiz, sp);
size_t dvsiz = 0;

13
kyotocabinet.spec
View File

@ -1,13 +1,12 @@
Summary: A straightforward implementation of DBM
Name: kyotocabinet
Version: 1.2.76
Release: 21%{?dist}
Version: 1.2.77
Release: 1%{?dist}
License: GPLv3
URL: http://fallabs.com/%{name}/
Source: http://fallabs.com/%{name}/pkg/%{name}-%{version}.tar.gz
URL: https://fallabs.com/%{name}/
Source: https://fallabs.com/%{name}/pkg/%{name}-%{version}.tar.gz
Patch0: kyotocabinet-1.2.76-cflags.patch
Patch1: kyotocabinet-1.2.76-8-byte-atomics.patch
Patch2: kyotocabinet-1.2.76-gcc6.patch
Requires: %{name}-libs%{?_isa} = %{version}-%{release}
BuildRequires: gcc-c++, zlib-devel, lzo-devel, xz-devel
@ -52,7 +51,6 @@ applications that use Kyoto Cabinet.
%setup -q
%patch0 -p1 -b .cflags
%patch1 -p1 -b .8-byte-atomics
%patch2 -p1 -b .gcc6
%build
%configure --disable-opt --enable-lzo --enable-lzma
@ -142,6 +140,9 @@ make check
%doc COPYING doc/api/* kyotocabinet.idl
%changelog
* Mon Mar 25 2019 Robert Scheck <robert@fedoraproject.org> 1.2.77
- Update to 1.2.77
* Fri Mar 1 2019 Peng Wu <pwu@redhat.com> - 1.2.76-21
- Switch back to use -O2 for s390x

2
sources
View File

@ -1 +1 @@
SHA512 (kyotocabinet-1.2.76.tar.gz) = 278db7b327eb4c21bf0137d9aa14fb67d74d5ce7ed1cb29fc9120d157a60de165ec0cf842903eb7952e8f998045ae585b958977fa973ba0e0773381de71d9f6a
SHA512 (kyotocabinet-1.2.77.tar.gz) = f38794c11faa3f4b64097a2e314307e1a6b75ddc495103647ebe52786a689336754496e7083697417ea90436e7fad681f16440975abec9ae917874aa25153e0f