Attachment 216525 Details for Bug 248056 – patch to update to 9.3.1

[patch] patch to update to 9.3.1

kiwix-lib-9.3.1-rev0.diff (text/plain), 3.31 KB, created by Steve Wills on 2020-07-18 00:25:20 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Steve Wills

Created: 2020-07-18 00:25:20 UTC

Size: 3.31 KB

patch

obsolete

>diff --git devel/kiwix-lib/Makefile devel/kiwix-lib/Makefile
>index 47f0b203f79b..7c77e208a12b 100644
>--- devel/kiwix-lib/Makefile
>+++ devel/kiwix-lib/Makefile
>@@ -1,8 +1,7 @@
> # $FreeBSD$
> 
> PORTNAME=	kiwix-lib
>-DISTVERSION=	5.1.0
>-PORTREVISION=	4
>+DISTVERSION=	9.3.1
> CATEGORIES=	devel
> 
> MAINTAINER=	me@int19h.org
>@@ -19,7 +18,8 @@ LIB_DEPENDS=	libzim.so:devel/libzim \
> 		libicuuc.so:devel/icu \
> 		libxapian.so:databases/xapian-core \
> 		libctpp2.so:textproc/ctpp2 \
>-		libcurl.so:ftp/curl
>+		libcurl.so:ftp/curl \
>+		libmicrohttpd.so:www/libmicrohttpd
> 
> USES=		compiler:c++11-lang meson pkgconfig python:3.6+ shebangfix
> USE_LDCONFIG=	yes
>@@ -27,11 +27,13 @@ USE_GITHUB=	yes
> 
> GH_ACCOUNT=	kiwix
> GH_TUPLE=	kiwix:${PORTNAME}:${PORTVERSION}:DEFAULT \
>-		kainjow:Mustache:40ddfe9:mustache
>+		kainjow:Mustache:a7eebc9:mustache
> 
> MESON_ARGS=	-Dctpp2-install-prefix=${LOCALBASE}
> CPPFLAGS+=	-I${WRKSRC_mustache}
> CXXFLAGS+=	-I${WRKSRC_mustache}
> SHEBANG_FILES=	scripts/kiwix-compile-resources
> 
>+PLIST_SUB=	PORTVERSION=${PORTVERSION} PORTMAJ=${PORTVERSION:C/\..*//}
>+
> .include <bsd.port.mk>
>diff --git devel/kiwix-lib/distinfo devel/kiwix-lib/distinfo
>index bed22b3e5a07..f2bb914fc780 100644
>--- devel/kiwix-lib/distinfo
>+++ devel/kiwix-lib/distinfo
>@@ -1,5 +1,5 @@
>-TIMESTAMP = 1559137520
>-SHA256 (kiwix-kiwix-lib-5.1.0_GH0.tar.gz) = 573e1176e351fedc8b49c7746aef10746bf13c9f5a1df18186e0e6589215c546
>-SIZE (kiwix-kiwix-lib-5.1.0_GH0.tar.gz) = 1343863
>-SHA256 (kainjow-Mustache-40ddfe9_GH0.tar.gz) = d1e391999428818472835fe90644719ef9b0fdb0a14c4f293c2a20aee0918912
>-SIZE (kainjow-Mustache-40ddfe9_GH0.tar.gz) = 98527
>+TIMESTAMP = 1595030328
>+SHA256 (kiwix-kiwix-lib-9.3.1_GH0.tar.gz) = b36500af589797e220d0a5fc551047f016c8914ac2d4b04666daef977aa0a4ce
>+SIZE (kiwix-kiwix-lib-9.3.1_GH0.tar.gz) = 1344101
>+SHA256 (kainjow-Mustache-a7eebc9_GH0.tar.gz) = 072cac4341ad8bb7eba7cc8a4169948d30757536caf3228c5a4ff9006ba105ca
>+SIZE (kainjow-Mustache-a7eebc9_GH0.tar.gz) = 141903
>diff --git devel/kiwix-lib/files/patch-src_server.cpp devel/kiwix-lib/files/patch-src_server.cpp
>new file mode 100644
>index 000000000000..1a9a0667e5a7
>--- /dev/null
>+++ devel/kiwix-lib/files/patch-src_server.cpp
>@@ -0,0 +1,10 @@
>+--- src/server.cpp.orig	2020-07-18 00:12:50 UTC
>++++ src/server.cpp
>+@@ -18,6 +18,7 @@
>+  */
>+ 
>+ #include "server.h"
>++#include <netinet/in.h>
>+ 
>+ #ifdef _WIN32
>+ # if !defined(__MINGW32__) && (_MSC_VER < 1600)
>diff --git devel/kiwix-lib/pkg-plist devel/kiwix-lib/pkg-plist
>index 150b88e74b48..42a0640a8643 100644
>--- devel/kiwix-lib/pkg-plist
>+++ devel/kiwix-lib/pkg-plist
>@@ -5,19 +5,25 @@ include/kiwix/common.h
> include/kiwix/downloader.h
> include/kiwix/entry.h
> include/kiwix/kiwix_config.h
>+include/kiwix/kiwixserve.h
> include/kiwix/library.h
> include/kiwix/libxml_dumper.h
> include/kiwix/manager.h
>+include/kiwix/name_mapper.h
> include/kiwix/opds_dumper.h
> include/kiwix/reader.h
>+include/kiwix/search_renderer.h
> include/kiwix/searcher.h
>+include/kiwix/server.h
> include/kiwix/tools/base64.h
>+include/kiwix/tools/lock.h
> include/kiwix/tools/networkTools.h
> include/kiwix/tools/otherTools.h
> include/kiwix/tools/pathTools.h
> include/kiwix/tools/regexTools.h
> include/kiwix/tools/stringTools.h
> lib/libkiwix.so
>-lib/libkiwix.so.5
>-lib/libkiwix.so.5.1.0
>+lib/libkiwix.so.%%PORTMAJ%%
>+lib/libkiwix.so.%%PORTVERSION%%
> libdata/pkgconfig/kiwix.pc
>+man/man1/kiwix-compile-resources.1.gz

Flags:

swills: maintainer-approval? (me)

Actions: View | Diff

Attachments on bug 248056: 216525