diff --git a/srcpkgs/libzim-tools b/srcpkgs/libzim-tools deleted file mode 120000 index c81c71113c7..00000000000 --- a/srcpkgs/libzim-tools +++ /dev/null @@ -1 +0,0 @@ -libzim \ No newline at end of file diff --git a/srcpkgs/libzim/patches/execinfo.patch b/srcpkgs/libzim/patches/execinfo.patch new file mode 100644 index 00000000000..7e25dc32fd3 --- /dev/null +++ b/srcpkgs/libzim/patches/execinfo.patch @@ -0,0 +1,20 @@ +--- src/debug.h 2018-03-27 11:19:24.000000000 +0200 ++++ - 2018-03-29 14:57:52.942545918 +0200 +@@ -24,7 +24,7 @@ + # define ASSERT(left, operator, right) (void(0)) + #else + +-#if !defined(_WIN32) && !defined(__APPLE__) && !defined(__ANDROID__) ++#if !defined(_WIN32) && !defined(__APPLE__) && !defined(__ANDROID__) && defined(__GLIBC__) + #include + #endif + +@@ -35,7 +35,7 @@ + vara << "[" << a << "] " << op << " " << varb << "[" << b << "]" << + std::endl; + +-#if !defined(_WIN32) && !defined(__APPLE__) && !defined(__ANDROID__) ++#if !defined(_WIN32) && !defined(__APPLE__) && !defined(__ANDROID__) && defined(__GLIBC__) + void *callstack[64]; + size_t size; + size = backtrace(callstack, 64); diff --git a/srcpkgs/libzim/template b/srcpkgs/libzim/template index 9158e17d495..818fde2a625 100644 --- a/srcpkgs/libzim/template +++ b/srcpkgs/libzim/template @@ -1,6 +1,6 @@ # Template file for 'libzim' pkgname=libzim -version=3.0.0 +version=3.2.0 revision=1 build_style=meson hostmakedepends="pkg-config git" @@ -11,18 +11,12 @@ maintainer="John " license="GPL-2" homepage="http://www.openzim.org/" distfiles="https://github.com/openzim/libzim/archive/${version}.tar.gz" -checksum=eb2abc7cb99ba67e74004ded48c02fe4c2de40ee19f56896ee79e533af11159c +checksum=9b39a21b62b88b60fdb2f59870ed611c175b9b20c8cd7e51ed01589bf055c8af +replaces="libzim-tools>=0" build_options="zlib xapian" build_options_default="zlib xapian" -libzim-tools_package() { - short_desc+=" - tools" - pkg_install() { - vmove usr/bin - } -} - libzim-devel_package() { short_desc+=" - development files" depends="${sourcepkg}>=${version}_${revision}