Skip to content

Commit

Permalink
devel/{kiwix-lib,libkiwix}: Update version 9.4.1=>12.0.0
Browse files Browse the repository at this point in the history
- Rename port to match upstream renaming
- Pet portclippy
- Update is done without MAINTAINER approval as currently this is BROKEN
  on 14 and this version fixes the build on 14.

Changelog: https://github.com/kiwix/libkiwix/releases
PR:		271649
Approved by:	portmgr (blanket)
  • Loading branch information
OlCe2 authored and 5u623l20 committed Jun 12, 2023
1 parent abdd4cf commit 74535ec
Show file tree
Hide file tree
Showing 10 changed files with 34 additions and 44 deletions.
1 change: 1 addition & 0 deletions MOVED
Expand Up @@ -7638,3 +7638,4 @@ x11/radare-cutter||2023-06-07|Has expired: Cutter for radare has been discontinu
security/py-sequoia||2023-06-09|Deprecated upstream, broken as based on older dependency
audio/hvl2wav|audio/ocp|2023-06-10|Has expired: Abandoned upstream, use audio/ocp instead
x11/thinglaunch|x11/thingylaunch|2023-06-10|Has expired: Abandonware, please use x11/thingylaunch instead
devel/kiwix-lib|devel/libkiwix|2023-06-12|Renamed to match upstream naming
2 changes: 1 addition & 1 deletion devel/Makefile
Expand Up @@ -1104,7 +1104,6 @@
SUBDIR += kf5-threadweaver
SUBDIR += kio-extras
SUBDIR += kirigami-gallery
SUBDIR += kiwix-lib
SUBDIR += klib
SUBDIR += kms-cmake-utils
SUBDIR += kodi-platform
Expand Down Expand Up @@ -1290,6 +1289,7 @@
SUBDIR += libixp
SUBDIR += libjitterentropy
SUBDIR += libk8055
SUBDIR += libkwix
SUBDIR += libklel
SUBDIR += liblangtag
SUBDIR += liblas
Expand Down
5 changes: 0 additions & 5 deletions devel/kiwix-lib/distinfo

This file was deleted.

11 changes: 0 additions & 11 deletions devel/kiwix-lib/files/patch-meson.build

This file was deleted.

10 changes: 0 additions & 10 deletions devel/kiwix-lib/files/patch-src_server_internalServer.cpp

This file was deleted.

14 changes: 7 additions & 7 deletions devel/kiwix-lib/Makefile → devel/libkiwix/Makefile
@@ -1,6 +1,5 @@
PORTNAME= kiwix-lib
DISTVERSION= 9.4.1
PORTREVISION= 8
PORTNAME= libkiwix
DISTVERSION= 12.0.0
CATEGORIES= devel

MAINTAINER= me@int19h.org
Expand All @@ -22,17 +21,18 @@ LIB_DEPENDS= libzim.so:devel/libzim \
libmicrohttpd.so:www/libmicrohttpd

USES= compiler:c++11-lang meson pkgconfig python:3.6+ shebangfix
USE_LDCONFIG= yes
USE_GITHUB= yes

GH_ACCOUNT= kiwix
GH_TUPLE= kiwix:${PORTNAME}:${PORTVERSION}:DEFAULT \
kainjow:Mustache:a7eebc9:mustache
kainjow:Mustache:v4.1:mustache
USE_LDCONFIG= yes

SHEBANG_FILES= scripts/format_code.sh
SHEBANG_REGEX= ./scripts/kiwix.*[^.].

CPPFLAGS+= -I${WRKSRC_mustache}
CXXFLAGS+= -I${WRKSRC_mustache}
LDFLAGS+= -lz
SHEBANG_FILES= scripts/kiwix-compile-resources

PLIST_SUB= PORTVERSION=${PORTVERSION} PORTMAJ=${PORTVERSION:C/\..*//}

Expand Down
5 changes: 5 additions & 0 deletions devel/libkiwix/distinfo
@@ -0,0 +1,5 @@
TIMESTAMP = 1686582304
SHA256 (kiwix-libkiwix-12.0.0_GH0.tar.gz) = 8608ef73fdaa34c28144eb5ad732a74ca94dd99710d08d7a1ddb1277d1985b02
SIZE (kiwix-libkiwix-12.0.0_GH0.tar.gz) = 1114076
SHA256 (kainjow-Mustache-v4.1_GH0.tar.gz) = acd66359feb4318b421f9574cfc5a511133a77d916d0b13c7caa3783c0bfe167
SIZE (kainjow-Mustache-v4.1_GH0.tar.gz) = 98905
16 changes: 16 additions & 0 deletions devel/libkiwix/files/patch-meson.build
@@ -0,0 +1,16 @@
--- meson.build.orig 2022-11-30 17:10:19 UTC
+++ meson.build
@@ -36,7 +36,7 @@ else
endif

libzim_dep = dependency('libzim', version : '>=8.1.0', static:static_deps)
-if not compiler.has_header_symbol('zim/zim.h', 'LIBZIM_WITH_XAPIAN')
+if not compiler.has_header_symbol('zim/zim.h', 'LIBZIM_WITH_XAPIAN', dependencies: libzim_dep)
error('Libzim seems to be compiled without xapian. Xapian support is mandatory.')
endif

@@ -86,4 +86,3 @@ configure_file(output : 'kiwix.pc',
input : 'kiwix.pc.in',
install_dir: get_option('libdir')+'/pkgconfig'
)
-
File renamed without changes.
14 changes: 4 additions & 10 deletions devel/kiwix-lib/pkg-plist → devel/libkiwix/pkg-plist
@@ -1,29 +1,23 @@
bin/kiwix-compile-i18n
bin/kiwix-compile-resources
include/kiwix/book.h
include/kiwix/bookmark.h
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
include/kiwix/tools.h
include/kiwix/version.h
lib/libkiwix.so
lib/libkiwix.so.%%PORTMAJ%%
lib/libkiwix.so.%%PORTVERSION%%
libdata/pkgconfig/kiwix.pc
man/man1/kiwix-compile-i18n.1.gz
man/man1/kiwix-compile-resources.1.gz

0 comments on commit 74535ec

Please sign in to comment.