From nobody Mon Jun 12 19:45:29 2023 X-Original-To: dev-commits-ports-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4Qg2Gd2xWZz4ct62; Mon, 12 Jun 2023 19:45:29 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4Qg2Gd2SCzz3y7h; Mon, 12 Jun 2023 19:45:29 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1686599129; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=JWhlld8s9AfhZ0bHgBAq9tb6zAuMhgYW1BiozQwdajg=; b=qAT4lPCuS+Cyv3meXjHbMcPJ+cOGCqGUuLV5mjymg+dg1gOq0AGnUEE2EV1DzxM83HbewM vXEOfPikeoMWmOYk4J6kuUTCUdFHclMQywv0JyJ7q4aTh4J2iXX2ujwBIPYZE+XehC2TAi RHAqKkgvXMk/w57ST2j8VzKmYmRvJwHNvi/d0sEIeaZ7JycL4XC6i2p8w9xAQ/RWhz6IM7 8bN3ykxsydN5WJXmx2s911pkFOuvwPPqb11HW3fLgG7chpcWNNmwyQqH2f3wq7jMiUkT8f hce8c9bkXrCZsLMTLYanY9GqQ22RhR88p4bCdpBmyorbgC2ogI+DaCyhjXsNyg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1686599129; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=JWhlld8s9AfhZ0bHgBAq9tb6zAuMhgYW1BiozQwdajg=; b=E8BlSXsX+z8omurWJK4GyxLAmjciu2BkGMs0Xs86mFdIw1Zij2PkD4jzWRmVgssOYY82J1 V0nESlvYENzxBZCKcaYM2FiOplP6Jl3Z34ZpiaYhkvvbSChgh+f49ZyYhMRrbaWbfUza88 jwLz6+q/HkztIPdCiA8EpNgYP76HeDsirww6M4xo0OoINMv8GhP/0w13DqRglE6bYcYlGe 3sYwEaYjii+SxpDrdV+iS6VVOGfxjUANibIex26znREDoWalj/Ob9AshhvParfAlxYO0RX fBWKpRqApvMKLNAhdPAO2HfGGrMsEJoefbnw/x1Wnw0PdHgJuvXofyZCXpacfA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1686599129; a=rsa-sha256; cv=none; b=wqlv4hM88bzadB5jZOnimv9xWkHs03hcunJKJC96ZRXs79B7xaRGDRx4JZdijphoSpuKwA e6kANhfRQIOdFuU6o8gzAytbitISm3brwhjrTH+qFthWwFSlrfVsPvd4X5Okzjtpk2dJFL I2KqiDnllcKzqeACMl296/+V69zZzcy0n5OrWSwkIPQ+SUC7AxQ7vgYznib0ctcqdSkLMt m5zjdGZfIEl2R76uevOgRhbY/pWB7fd0PmZonyasQjJhuTJ8P3PAqDmK3xNIuaO4eSCwR8 sWxNp6J2tkZcidUJX2C3L3mWZ2skU5Q6NvzFCKFO+t+8t7RWqREy2u5Br4Y3QQ== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4Qg2Gd1QymzsYg; Mon, 12 Jun 2023 19:45:29 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.16.1/8.16.1) with ESMTP id 35CJjTQh074096; Mon, 12 Jun 2023 19:45:29 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 35CJjTbo074095; Mon, 12 Jun 2023 19:45:29 GMT (envelope-from git) Date: Mon, 12 Jun 2023 19:45:29 GMT Message-Id: <202306121945.35CJjTbo074095@gitrepo.freebsd.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org From: Muhammad Moinur Rahman Subject: git: 74535ecc140f - main - devel/{kiwix-lib,libkiwix}: Update version 9.4.1=>12.0.0 List-Id: Commits to the main branch of the FreeBSD ports repository List-Archive: https://lists.freebsd.org/archives/dev-commits-ports-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-ports-main@freebsd.org X-BeenThere: dev-commits-ports-main@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: bofh X-Git-Repository: ports X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 74535ecc140ff3ed89f831d13e4a26d9a0c78182 Auto-Submitted: auto-generated X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by bofh: URL: https://cgit.FreeBSD.org/ports/commit/?id=74535ecc140ff3ed89f831d13e4a26d9a0c78182 commit 74535ecc140ff3ed89f831d13e4a26d9a0c78182 Author: Olivier Certner AuthorDate: 2023-06-12 15:26:57 +0000 Commit: Muhammad Moinur Rahman CommitDate: 2023-06-12 19:45:15 +0000 devel/{kiwix-lib,libkiwix}: Update version 9.4.1=>12.0.0 - 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) --- MOVED | 1 + devel/Makefile | 2 +- devel/kiwix-lib/distinfo | 5 ----- devel/kiwix-lib/files/patch-meson.build | 11 ----------- .../kiwix-lib/files/patch-src_server_internalServer.cpp | 10 ---------- devel/{kiwix-lib => libkiwix}/Makefile | 14 +++++++------- devel/libkiwix/distinfo | 5 +++++ devel/libkiwix/files/patch-meson.build | 16 ++++++++++++++++ devel/{kiwix-lib => libkiwix}/pkg-descr | 0 devel/{kiwix-lib => libkiwix}/pkg-plist | 14 ++++---------- 10 files changed, 34 insertions(+), 44 deletions(-) diff --git a/MOVED b/MOVED index 9a9c9a630c4f..e047705d2fa7 100644 --- a/MOVED +++ b/MOVED @@ -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 diff --git a/devel/Makefile b/devel/Makefile index f1b93368ed7c..a84b232756da 100644 --- a/devel/Makefile +++ b/devel/Makefile @@ -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 @@ -1290,6 +1289,7 @@ SUBDIR += libixp SUBDIR += libjitterentropy SUBDIR += libk8055 + SUBDIR += libkwix SUBDIR += libklel SUBDIR += liblangtag SUBDIR += liblas diff --git a/devel/kiwix-lib/distinfo b/devel/kiwix-lib/distinfo deleted file mode 100644 index 8818d05de30f..000000000000 --- a/devel/kiwix-lib/distinfo +++ /dev/null @@ -1,5 +0,0 @@ -TIMESTAMP = 1607221685 -SHA256 (kiwix-kiwix-lib-9.4.1_GH0.tar.gz) = f76bfa90411c52d4d8c49ac5767928fc28d01ef26916d72df4856cf08b064202 -SIZE (kiwix-kiwix-lib-9.4.1_GH0.tar.gz) = 1347677 -SHA256 (kainjow-Mustache-a7eebc9_GH0.tar.gz) = 072cac4341ad8bb7eba7cc8a4169948d30757536caf3228c5a4ff9006ba105ca -SIZE (kainjow-Mustache-a7eebc9_GH0.tar.gz) = 141903 diff --git a/devel/kiwix-lib/files/patch-meson.build b/devel/kiwix-lib/files/patch-meson.build deleted file mode 100644 index 14a8a6950402..000000000000 --- a/devel/kiwix-lib/files/patch-meson.build +++ /dev/null @@ -1,11 +0,0 @@ ---- meson.build.orig 2021-06-09 23:37:27 UTC -+++ meson.build -@@ -19,7 +19,7 @@ if wrapper.contains('java') - endif - - # See https://github.com/kiwix/kiwix-lib/issues/371 --if ['arm', 'mips', 'm68k', 'ppc', 'sh4'].contains(target_machine.cpu_family()) -+if ['mips', 'm68k', 'sh4'].contains(target_machine.cpu_family()) - extra_libs += '-latomic' - endif - diff --git a/devel/kiwix-lib/files/patch-src_server_internalServer.cpp b/devel/kiwix-lib/files/patch-src_server_internalServer.cpp deleted file mode 100644 index 5a50c24e3e69..000000000000 --- a/devel/kiwix-lib/files/patch-src_server_internalServer.cpp +++ /dev/null @@ -1,10 +0,0 @@ ---- src/server/internalServer.cpp.orig 2020-12-06 02:30:03 UTC -+++ src/server/internalServer.cpp -@@ -18,6 +18,7 @@ - */ - - #include "internalServer.h" -+#include - - #ifdef _WIN32 - # if !defined(__MINGW32__) && (_MSC_VER < 1600) diff --git a/devel/kiwix-lib/Makefile b/devel/libkiwix/Makefile similarity index 84% rename from devel/kiwix-lib/Makefile rename to devel/libkiwix/Makefile index b269d89576f9..97d1ae7bbf20 100644 --- a/devel/kiwix-lib/Makefile +++ b/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 @@ -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/\..*//} diff --git a/devel/libkiwix/distinfo b/devel/libkiwix/distinfo new file mode 100644 index 000000000000..3526ae0576cf --- /dev/null +++ b/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 diff --git a/devel/libkiwix/files/patch-meson.build b/devel/libkiwix/files/patch-meson.build new file mode 100644 index 000000000000..f5aa75063095 --- /dev/null +++ b/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' + ) +- diff --git a/devel/kiwix-lib/pkg-descr b/devel/libkiwix/pkg-descr similarity index 100% rename from devel/kiwix-lib/pkg-descr rename to devel/libkiwix/pkg-descr diff --git a/devel/kiwix-lib/pkg-plist b/devel/libkiwix/pkg-plist similarity index 63% rename from devel/kiwix-lib/pkg-plist rename to devel/libkiwix/pkg-plist index 42a0640a8643..6a1e79cb3de8 100644 --- a/devel/kiwix-lib/pkg-plist +++ b/devel/libkiwix/pkg-plist @@ -1,9 +1,9 @@ +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 @@ -11,19 +11,13 @@ 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