Date: Wed, 5 Dec 2018 00:05:50 +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: r486640 - in head/devel/libzim: . files Message-ID: <201812050005.wB505onO056319@repo.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: swills Date: Wed Dec 5 00:05:50 2018 New Revision: 486640 URL: https://svnweb.freebsd.org/changeset/ports/486640 Log: devel/libzim: update to 4.0.4 Added: head/devel/libzim/files/patch-src_fs__unix.cpp (contents, props changed) Deleted: head/devel/libzim/files/patch-src_file__reader.cpp Modified: head/devel/libzim/Makefile (contents, props changed) head/devel/libzim/distinfo (contents, props changed) 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_meson.build (contents, props changed) head/devel/libzim/pkg-plist (contents, props changed) Modified: head/devel/libzim/Makefile ============================================================================== --- head/devel/libzim/Makefile Tue Dec 4 23:59:47 2018 (r486639) +++ head/devel/libzim/Makefile Wed Dec 5 00:05:50 2018 (r486640) @@ -1,8 +1,7 @@ # $FreeBSD$ PORTNAME= libzim -PORTVERSION= 4.0.0 -PORTREVISION= 2 +PORTVERSION= 4.0.4 CATEGORIES= devel MAINTAINER= swills@FreeBSD.org @@ -17,5 +16,6 @@ USE_GITHUB= yes GH_ACCOUNT= openzim BINARY_ALIAS= python3=python${PYTHON_VER} python3-config=python${PYTHON_VER}-config +PLIST_SUB= PORTVERSION=${PORTVERSION} .include <bsd.port.mk> Modified: head/devel/libzim/distinfo ============================================================================== --- head/devel/libzim/distinfo Tue Dec 4 23:59:47 2018 (r486639) +++ head/devel/libzim/distinfo Wed Dec 5 00:05:50 2018 (r486640) @@ -1,3 +1,3 @@ -TIMESTAMP = 1531269487 -SHA256 (openzim-libzim-4.0.0_GH0.tar.gz) = e195d30ba1b55dd2b6529fdd84fcbed6ec35ed4ddc957ad7725edabd20c3126c -SIZE (openzim-libzim-4.0.0_GH0.tar.gz) = 1649903 +TIMESTAMP = 1543967332 +SHA256 (openzim-libzim-4.0.4_GH0.tar.gz) = 8f56a16d15e810150d3c3ee9acce3606f676c90b72936e11f77f2a2548cd4611 +SIZE (openzim-libzim-4.0.4_GH0.tar.gz) = 1653434 Modified: head/devel/libzim/files/patch-meson.build ============================================================================== --- head/devel/libzim/files/patch-meson.build Tue Dec 4 23:59:47 2018 (r486639) +++ head/devel/libzim/files/patch-meson.build Wed Dec 5 00:05:50 2018 (r486640) @@ -1,17 +1,17 @@ ---- meson.build.orig 2018-06-14 22:03:52 UTC +--- meson.build.orig 2018-09-04 16:23:32 UTC +++ meson.build @@ -1,7 +1,7 @@ project('libzim', ['c', 'cpp'], - version : '4.0.0', + version : '4.0.4', license : 'GPL2', - default_options : ['c_std=c11', 'cpp_std=c++11', 'werror=true']) + default_options : ['c_std=c11', 'cpp_std=c++11']) - conf = configuration_data() - conf.set('VERSION', '"@0@"'.format(meson.project_version())) -@@ -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')) + if build_machine.system() != 'windows' + add_project_arguments('-D_LARGEFILE64_SOURCE=1', '-D_FILE_OFFSET_BITS=64', language: 'cpp') +@@ -22,6 +22,9 @@ else + endif + conf.set('ENABLE_USE_BUFFER_HEADER', get_option('USE_BUFFER_HEADER')) +cc = meson.get_compiler('c') +execinfo_dep = cc.find_library('execinfo', required : false) @@ -19,7 +19,7 @@ zlib_dep = dependency('zlib', required:false) conf.set('ENABLE_ZLIB', zlib_dep.found()) -@@ -49,3 +52,4 @@ pkg_mod.generate(libraries : libzim, +@@ -70,3 +73,4 @@ pkg_mod.generate(libraries : libzim, filebase : 'libzim', description : 'A Library to zim.', requires : pkg_requires) Modified: head/devel/libzim/files/patch-src_buffer.cpp ============================================================================== --- head/devel/libzim/files/patch-src_buffer.cpp Tue Dec 4 23:59:47 2018 (r486639) +++ head/devel/libzim/files/patch-src_buffer.cpp Wed Dec 5 00:05:50 2018 (r486640) @@ -1,11 +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_ +--- src/buffer.cpp.orig 2018-09-04 16:23:32 UTC ++++ src/buffer.cpp +@@ -49,7 +49,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 ) + #if !MMAP_SUPPORT_64 + if(pa_offset.v >= INT32_MAX) { Added: head/devel/libzim/files/patch-src_fs__unix.cpp ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/devel/libzim/files/patch-src_fs__unix.cpp Wed Dec 5 00:05:50 2018 (r486640) @@ -0,0 +1,11 @@ +--- src/fs_unix.cpp.orig 2018-12-04 23:56:33 UTC ++++ src/fs_unix.cpp +@@ -34,7 +34,7 @@ namespace unix { + + zsize_t FD::readAt(char* dest, zsize_t size, offset_t offset) const + { +-#ifdef __APPLE__ ++#if defined(__APPLE__) || defined(__FreeBSD__) + # define PREAD pread + #else + # define PREAD pread64 Modified: head/devel/libzim/files/patch-src_meson.build ============================================================================== --- head/devel/libzim/files/patch-src_meson.build Tue Dec 4 23:59:47 2018 (r486639) +++ head/devel/libzim/files/patch-src_meson.build Wed Dec 5 00:05:50 2018 (r486640) @@ -1,6 +1,6 @@ ---- 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() +--- src/meson.build.orig 2018-09-04 16:23:32 UTC ++++ src/meson.build +@@ -58,6 +58,10 @@ if zlib_dep.found() deps += [zlib_dep] endif Modified: head/devel/libzim/pkg-plist ============================================================================== --- head/devel/libzim/pkg-plist Tue Dec 4 23:59:47 2018 (r486639) +++ head/devel/libzim/pkg-plist Wed Dec 5 00:05:50 2018 (r486640) @@ -12,5 +12,5 @@ include/zim/writer/zimcreator.h include/zim/zim.h lib/libzim.so lib/libzim.so.4 -lib/libzim.so.4.0.0 +lib/libzim.so.%%PORTVERSION%% libdata/pkgconfig/libzim.pc
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201812050005.wB505onO056319>