Date: Wed, 11 Jul 2018 11:42:29 +0000 (UTC) From: Steve Wills <swills@FreeBSD.org> To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r474436 - in head/devel/libzim: . files Message-ID: <201807111142.w6BBgTOx058582@repo.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: swills Date: Wed Jul 11 11:42:29 2018 New Revision: 474436 URL: https://svnweb.freebsd.org/changeset/ports/474436 Log: devel/libzim: update to 4.0.0 Added: head/devel/libzim/files/ head/devel/libzim/files/patch-meson.build (contents, props changed) head/devel/libzim/files/patch-src_buffer.cpp (contents, props changed) head/devel/libzim/files/patch-src_file__compound.h (contents, props changed) head/devel/libzim/files/patch-src_file__reader.cpp (contents, props changed) head/devel/libzim/files/patch-src_meson.build (contents, props changed) Modified: head/devel/libzim/Makefile (contents, props changed) head/devel/libzim/distinfo (contents, props changed) head/devel/libzim/pkg-plist (contents, props changed) Modified: head/devel/libzim/Makefile ============================================================================== --- head/devel/libzim/Makefile Wed Jul 11 11:00:30 2018 (r474435) +++ head/devel/libzim/Makefile Wed Jul 11 11:42:29 2018 (r474436) @@ -1,19 +1,22 @@ # $FreeBSD$ PORTNAME= libzim -PORTVERSION= 2.0.0 -PORTREVISION= 2 +PORTVERSION= 4.0.0 CATEGORIES= devel MAINTAINER= swills@FreeBSD.org COMMENT= Reference implementation of the ZIM specification +BUILD_DEPENDS= python3-config:lang/python3 + LIB_DEPENDS= libicui18n.so:devel/icu \ libxapian.so:databases/xapian-core -USES= meson pkgconfig +USES= compiler:c++11-lang meson pkgconfig python:3.4+ USE_LDCONFIG= yes USE_GITHUB= yes GH_ACCOUNT= openzim +# Using gcc6 and libstdc++ leads to error because xapian-core is linked with libc++ +BROKEN_FreeBSD_10= /usr/include/c++/v1/memory:4004:35: error: no viable overloaded '=' .include <bsd.port.mk> Modified: head/devel/libzim/distinfo ============================================================================== --- head/devel/libzim/distinfo Wed Jul 11 11:00:30 2018 (r474435) +++ head/devel/libzim/distinfo Wed Jul 11 11:42:29 2018 (r474436) @@ -1,3 +1,3 @@ -TIMESTAMP = 1505422546 -SHA256 (openzim-libzim-2.0.0_GH0.tar.gz) = c148aa62a346628447093b0b1eb0b2f1a7236c7555ed2bdd74515b0cc75b167c -SIZE (openzim-libzim-2.0.0_GH0.tar.gz) = 86835 +TIMESTAMP = 1531269487 +SHA256 (openzim-libzim-4.0.0_GH0.tar.gz) = e195d30ba1b55dd2b6529fdd84fcbed6ec35ed4ddc957ad7725edabd20c3126c +SIZE (openzim-libzim-4.0.0_GH0.tar.gz) = 1649903 Added: head/devel/libzim/files/patch-meson.build ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/devel/libzim/files/patch-meson.build Wed Jul 11 11:42:29 2018 (r474436) @@ -0,0 +1,17 @@ +--- meson.build.orig 2018-07-11 01:42:53.056789000 +0000 ++++ meson.build 2018-07-11 01:42:55.616640000 +0000 +@@ -9,6 +9,9 @@ conf.set('DIRENT_CACHE_SIZE', get_option('DIRENT_CACHE + conf.set('CLUSTER_CACHE_SIZE', get_option('CLUSTER_CACHE_SIZE')) + conf.set('LZMA_MEMORY_SIZE', get_option('LZMA_MEMORY_SIZE')) + ++cc = meson.get_compiler('c') ++execinfo_dep = cc.find_library('execinfo', required : false) ++ + zlib_dep = dependency('zlib', required:false) + conf.set('ENABLE_ZLIB', zlib_dep.found()) + +@@ -49,3 +52,4 @@ pkg_mod.generate(libraries : libzim, + filebase : 'libzim', + description : 'A Library to zim.', + requires : pkg_requires) ++ Added: head/devel/libzim/files/patch-src_buffer.cpp ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/devel/libzim/files/patch-src_buffer.cpp Wed Jul 11 11:42:29 2018 (r474436) @@ -0,0 +1,11 @@ +--- src/buffer.cpp.orig 2018-07-11 01:24:59.809896000 +0000 ++++ src/buffer.cpp 2018-07-11 01:25:29.007975000 +0000 +@@ -48,7 +48,7 @@ MMapBuffer::MMapBuffer(int fd, offset_t offset, zsize_ + #if defined(__APPLE__) + #define MAP_FLAGS MAP_PRIVATE + #else +- #define MAP_FLAGS MAP_PRIVATE|MAP_POPULATE ++ #define MAP_FLAGS MAP_PRIVATE|MAP_PREFAULT_READ + #endif + _data = (char*)mmap(NULL, size.v + _offset.v, PROT_READ, MAP_FLAGS, fd, pa_offset.v); + if (_data == MAP_FAILED ) Added: head/devel/libzim/files/patch-src_file__compound.h ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/devel/libzim/files/patch-src_file__compound.h Wed Jul 11 11:42:29 2018 (r474436) @@ -0,0 +1,10 @@ +--- src/file_compound.h.orig 2018-07-11 01:26:16.144860000 +0000 ++++ src/file_compound.h 2018-07-11 01:26:30.132058000 +0000 +@@ -25,6 +25,7 @@ + #include <map> + #include <memory> + #include <cstdio> ++#include <time.h> + + namespace zim { + Added: head/devel/libzim/files/patch-src_file__reader.cpp ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/devel/libzim/files/patch-src_file__reader.cpp Wed Jul 11 11:42:29 2018 (r474436) @@ -0,0 +1,10 @@ +--- src/file_reader.cpp.orig 2018-07-11 01:18:06.970719000 +0000 ++++ src/file_reader.cpp 2018-07-11 01:18:17.646078000 +0000 +@@ -28,6 +28,7 @@ + #include <fcntl.h> + #include <lzma.h> + #include <pthread.h> ++#include <unistd.h> + + #if defined(ENABLE_ZLIB) + #include <zlib.h> Added: head/devel/libzim/files/patch-src_meson.build ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/devel/libzim/files/patch-src_meson.build Wed Jul 11 11:42:29 2018 (r474436) @@ -0,0 +1,13 @@ +--- src/meson.build.orig 2018-07-11 01:43:01.888587000 +0000 ++++ src/meson.build 2018-07-11 01:43:07.416631000 +0000 +@@ -51,6 +51,10 @@ if zlib_dep.found() + deps += [zlib_dep] + endif + ++if execinfo_dep.found() ++ deps += [execinfo_dep] ++endif ++ + if xapian_dep.found() + sources += xapian_sources + sources += lib_resources Modified: head/devel/libzim/pkg-plist ============================================================================== --- head/devel/libzim/pkg-plist Wed Jul 11 11:00:30 2018 (r474435) +++ head/devel/libzim/pkg-plist Wed Jul 11 11:42:29 2018 (r474436) @@ -1,28 +1,16 @@ -bin/zimdump -bin/zimsearch include/zim/article.h include/zim/blob.h -include/zim/cache.h -include/zim/cluster.h -include/zim/dirent.h include/zim/error.h include/zim/file.h include/zim/fileheader.h -include/zim/fileimpl.h include/zim/fileiterator.h -include/zim/fstream.h -include/zim/noncopyable.h -include/zim/refcounted.h include/zim/search.h include/zim/search_iterator.h -include/zim/smartptr.h -include/zim/template.h include/zim/uuid.h -include/zim/writer/articlesource.h -include/zim/writer/dirent.h +include/zim/writer/article.h include/zim/writer/zimcreator.h include/zim/zim.h lib/libzim.so -lib/libzim.so.2 -lib/libzim.so.2.0.0 +lib/libzim.so.4 +lib/libzim.so.4.0.0 libdata/pkgconfig/libzim.pc
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201807111142.w6BBgTOx058582>