Attachment #216605 for bug #248055

Lines 1-8 Link Here

(-)devel/libzim/Makefile (-3 / +2 lines)
1	# $FreeBSD$	1	# $FreeBSD$
2		2
3	PORTNAME= libzim	3	PORTNAME= libzim
4	PORTVERSION= 5.0.0	4	PORTVERSION= 6.1.8
5	PORTREVISION= 4
6	CATEGORIES= devel	5	CATEGORIES= devel
7		6
8	MAINTAINER= swills@FreeBSD.org	7	MAINTAINER= swills@FreeBSD.org
Lines 20-25 USE_GITHUB= yes Link Here
20	GH_ACCOUNT= openzim	19	GH_ACCOUNT= openzim
21		20
22	BINARY_ALIAS= python3=python${PYTHON_VER} python3-config=python${PYTHON_VER}-config	21	BINARY_ALIAS= python3=python${PYTHON_VER} python3-config=python${PYTHON_VER}-config
23	PLIST_SUB= PORTVERSION=${PORTVERSION}	22	PLIST_SUB= PORTVERSION=${PORTVERSION} PORTMAJ=${PORTVERSION:C/\..*//}
24		23
25	.include <bsd.port.mk>	24	.include <bsd.port.mk>

Lines 1-3 Link Here

(-)devel/libzim/distinfo (-3 / +3 lines)
1	TIMESTAMP = 1559136305	1	TIMESTAMP = 1595027958
2	SHA256 (openzim-libzim-5.0.0_GH0.tar.gz) = dbec0a36155315037a6496a9be5c7ede17171fcde47063c97ce937057b437fdb	2	SHA256 (openzim-libzim-6.1.8_GH0.tar.gz) = 1be605b1d22a0a7c225e80eab2cb1a249bf0f1b500ec8ed42e1091fc96c49fb3
3	SIZE (openzim-libzim-5.0.0_GH0.tar.gz) = 1655189	3	SIZE (openzim-libzim-6.1.8_GH0.tar.gz) = 28589142




--- meson.build.orig	2020-07-15 14:24:54 UTC
+++ meson.build
@@ -7,7 +7,8 @@ if build_machine.system() != 'windows'
 project('libzim', ['c', 'cpp'],
   version : '4.0.7',
   license : 'GPL2',
-  default_options : ['c_std=c11', 'cpp_std=c++11', 'werror=true'])
+  default_options : ['c_std=c11', 'cpp_std=c++11'])
 
 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'))
 
-sizeof_off_t = meson.get_compiler('cpp').sizeof('off_t')
+cpp = meson.get_compiler('cpp')
+sizeof_off_t = cpp.sizeof('off_t')
 
 conf = configuration_data()
 conf.set('VERSION', '"@0@"'.format(meson.project_version()))
@@ -21,6 +22,9 @@ else
     conf.set('ENABLE_USE_MMAP', get_option('USE_MMAP'))
 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)
 
 static_linkage = get_option('static-linkage')
 static_linkage = static_linkage or get_option('default_library')=='static'
 
@@ -73,3 +76,4 @@ pkg_mod.generate(libraries : libzim,
                  filebase : 'libzim',
                  description : 'A Library to zim.',
                  requires : pkg_requires)
+

Lines 1-11 Link Here

(-)devel/libzim/files/patch-src_buffer.cpp (-7 / +7 lines)
1	--- src/buffer.cpp.orig 2018-09-04 16:23:32 UTC	1	--- src/buffer.cpp.orig 2020-07-15 14:24:54 UTC
2	+++ src/buffer.cpp	2	+++ src/buffer.cpp
3	@@ -49,7 +49,7 @@ MMapBuffer::MMapBuffer(int fd, offset_t offset, zsize_	3	@@ -48,6 +48,8 @@ MMapBuffer::MMapBuffer(int fd, offset_t offset, zsize_
4	#if defined(__APPLE__)	4	_offset = offset-pa_offset;
		5	#if defined(__APPLE__) \|\| defined(__OpenBSD__)
5	#define MAP_FLAGS MAP_PRIVATE	6	#define MAP_FLAGS MAP_PRIVATE
6	#else	7	+#elif defined(__FreeBSD__)
7	- #define MAP_FLAGS MAP_PRIVATE\|MAP_POPULATE
8	+ #define MAP_FLAGS MAP_PRIVATE\|MAP_PREFAULT_READ	8	+ #define MAP_FLAGS MAP_PRIVATE\|MAP_PREFAULT_READ
		9	#else
		10	#define MAP_FLAGS MAP_PRIVATE\|MAP_POPULATE
9	#endif	11	#endif
10	#if !MMAP_SUPPORT_64
11	if(pa_offset.v >= INT32_MAX) {

Removed Link Here

(-)devel/libzim/files/patch-src_file__compound.h (-10 lines)
1	--- src/file_compound.h.orig 2018-07-11 01:26:16.144860000 +0000
2	+++ src/file_compound.h 2018-07-11 01:26:30.132058000 +0000
3	@@ -25,6 +25,7 @@
4	#include <map>
5	#include <memory>
6	#include <cstdio>
7	+#include <time.h>
8
9	namespace zim {
10

Lines 1-11 Link Here

(-)devel/libzim/files/patch-src_fs__unix.cpp (-3 / +3 lines)
1	--- src/fs_unix.cpp.orig 2018-12-04 23:56:33 UTC	1	--- src/fs_unix.cpp.orig 2020-07-15 14:24:54 UTC
2	+++ src/fs_unix.cpp	2	+++ src/fs_unix.cpp
3	@@ -34,7 +34,7 @@ namespace unix {	3	@@ -34,7 +34,7 @@ namespace unix {
4		4
5	zsize_t FD::readAt(char* dest, zsize_t size, offset_t offset) const	5	zsize_t FD::readAt(char* dest, zsize_t size, offset_t offset) const
6	{	6	{
7	-#ifdef __APPLE__	7	-#if defined(__APPLE__) \|\| defined(__OpenBSD__)
8	+#if defined(__APPLE__) \|\| defined(__FreeBSD__)	8	+#if defined(__APPLE__) \|\| defined(__OpenBSD__) \|\| defined(__FreeBSD__)
9	# define PREAD pread	9	# define PREAD pread
10	#else	10	#else
11	# define PREAD pread64	11	# define PREAD pread64

Lines 1-11 Link Here

(-)devel/libzim/files/patch-src_meson.build (-5 / +8 lines)
1	--- src/meson.build.orig 2018-09-04 16:23:32 UTC	1	--- src/meson.build.orig 2020-07-15 14:24:54 UTC
2	+++ src/meson.build	2	+++ src/meson.build
3	@@ -58,6 +58,10 @@ if zlib_dep.found()	3	@@ -56,6 +56,13 @@ if zstd_dep.found()
4	deps += [zlib_dep]	4	deps += [zstd_dep]
5	endif	5	endif
6		6
7	+if execinfo_dep.found()	7	+if target_machine.system() == 'freebsd'
8	+ deps += [execinfo_dep]	8	+execinfo_dep = cpp.find_library('execinfo', required : false)
		9	+ if execinfo_dep.found()
		10	+ deps += [execinfo_dep]
		11	+ endif
9	+endif	12	+endif
10	+	13	+
11	if xapian_dep.found()	14	if xapian_dep.found()

Lines 12-17 include/zim/writer/creator.h Link Here

(-)devel/libzim/pkg-plist (-1 / +1 lines)
12	include/zim/writer/url.h	12	include/zim/writer/url.h
13	include/zim/zim.h	13	include/zim/zim.h
14	lib/libzim.so	14	lib/libzim.so
15	lib/libzim.so.5	15	lib/libzim.so.%%PORTMAJ%%
16	lib/libzim.so.%%PORTVERSION%%	16	lib/libzim.so.%%PORTVERSION%%
17	libdata/pkgconfig/libzim.pc	17	libdata/pkgconfig/libzim.pc

Return to bug 248055

Lines 1-26 Link Here

(-)devel/libzim/files/patch-meson.build (-18 / +14 lines)
1	--- meson.build.orig 2019-04-15 13:10:25 UTC	1	--- meson.build.orig 2020-07-15 14:24:54 UTC
2	+++ meson.build	2	+++ meson.build
3	@@ -1,7 +1,7 @@	3	@@ -7,7 +7,8 @@ if build_machine.system() != 'windows'
4	project('libzim', ['c', 'cpp'],
5	version : '4.0.7',
6	license : 'GPL2',
7	- default_options : ['c_std=c11', 'cpp_std=c++11', 'werror=true'])
8	+ default_options : ['c_std=c11', 'cpp_std=c++11'])
9
10	if build_machine.system() != 'windows'
11	add_project_arguments('-D_LARGEFILE64_SOURCE=1', '-D_FILE_OFFSET_BITS=64', language: 'cpp')	4	add_project_arguments('-D_LARGEFILE64_SOURCE=1', '-D_FILE_OFFSET_BITS=64', language: 'cpp')
12	@@ -22,6 +22,9 @@ else
13	endif	5	endif
14	conf.set('ENABLE_USE_BUFFER_HEADER', get_option('USE_BUFFER_HEADER'))
15		6
		7	-sizeof_off_t = meson.get_compiler('cpp').sizeof('off_t')
		8	+cpp = meson.get_compiler('cpp')
		9	+sizeof_off_t = cpp.sizeof('off_t')
		10
		11	conf = configuration_data()
		12	conf.set('VERSION', '"@0@"'.format(meson.project_version()))
		13	@@ -21,6 +22,9 @@ else
		14	conf.set('ENABLE_USE_MMAP', get_option('USE_MMAP'))
		15	endif
		16	conf.set('ENABLE_USE_BUFFER_HEADER', get_option('USE_BUFFER_HEADER'))
		17	+
16	+cc = meson.get_compiler('c')	18	+cc = meson.get_compiler('c')
17	+execinfo_dep = cc.find_library('execinfo', required : false)	19	+execinfo_dep = cc.find_library('execinfo', required : false)
18	+	20
19	static_linkage = get_option('static-linkage')	21	static_linkage = get_option('static-linkage')
20	static_linkage = static_linkage or get_option('default_library')=='static'	22	static_linkage = static_linkage or get_option('default_library')=='static'
21
22	@@ -73,3 +76,4 @@ pkg_mod.generate(libraries : libzim,
23	filebase : 'libzim',
24	description : 'A Library to zim.',
25	requires : pkg_requires)
26	+