From nobody Sun Sep 10 16:14:14 2023 X-Original-To: dev-commits-ports-all@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 4RkFKL36DQz4s2d7; Sun, 10 Sep 2023 16:14:14 +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 4RkFKL2NdXz3RYq; Sun, 10 Sep 2023 16:14:14 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1694362454; 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=unc0Q9PvvdUEW7mxE9f2mq5UKPcxAUG+73OaTHXArr0=; b=mjKTs8X5kxFXTdlFp7Fvn6ufuiEIe8KePIrEWm0yIB0zkuZCEQ+T7q1qjPpa/AygKq7/D+ VTNdae/TB9sovOVfH2tbZd3o+EuWS5JwCkm5vIptysD9a6QoYnieKNoJyUgCpMJjlWtcsP w/lNM7eL/jsRH2nsOhgrgMSYrNLazm8zqEFAKWYOZufSEhs+5ESwSREduqzU+cFy9gk+ki rvM6y0+qnnHUARdn8XzuYzj7O3WuqgyZqgzNiVx8lwxZnW1nOPR6z7ZZ9Rtt5juyYQkIis OLFMGBauZM4OfDod1XsBo4Cp8nyORVSQ307KK7PC65YJA+aQaK1oRZDyMOhJKw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1694362454; a=rsa-sha256; cv=none; b=yZuBVpTB2aBedzZ5+WS86ACzCf6YmCIl8Slzyrre/DaTz4iINFFi6tNcJ8dXaHWMtdM4M0 6wkYVdc9IWAkeyIeoY1Msa5xTwXkimtsfWE1iai66mDGlDkytQ1P5M+6/EB47aKseSBnoK kc+U4fd062qioGqksJLgpV56dxDIY+Saib/tRoCOuedKCGvV7t10P6VV/Pmn5h8DE499Bj wD5qV5qXz/ysfPklMvE9U8rtdC8iv27Xl9f+kHUMSI/0Wa9+JYuPTdSsWmajl91ZMZZNf3 H3gf2gjClmMlE5m+c7aJnnF0OBn0OzYZQlNgDMacpU0vvdS3QXu1P317Oj93qw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1694362454; 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=unc0Q9PvvdUEW7mxE9f2mq5UKPcxAUG+73OaTHXArr0=; b=JRfJWacZpkh8j9mzEsiSgm7xGnuoNpw+dyHl3N1OxHSb0z4GRA29l9gDaQKk0ec0v3yQAG 6PXt4Gj3s/Ipx6xlwLCxgqGcG5j5Z9npPD5J7GWgZxyF4J7GSwgdadxOVUYYdpgb8x6Ju9 hA0BARD0SbNT+lT+C8KxCRFexUm2gNqbr1fHMpze92G2xYNhvQoxBo6A0mbFrLLNzmV9+2 6pFBUYKeFcJbQicUidvj55DVhuS6iv3rGyKzHFgcfCgROr0ipLG/dqhAJ26AhJajCtJa3I qPtY3HSIuv9Qq2a+/oYjXVFs1yY9dSjt0xwMatKnIFNYAW4UXfZXsa5iGQICxQ== 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 4RkFKL14V0z1CqK; Sun, 10 Sep 2023 16:14:14 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 38AGEEHH026191; Sun, 10 Sep 2023 16:14:14 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 38AGEE1E026188; Sun, 10 Sep 2023 16:14:14 GMT (envelope-from git) Date: Sun, 10 Sep 2023 16:14:14 GMT Message-Id: <202309101614.38AGEE1E026188@gitrepo.freebsd.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org From: Robert Clausecker Subject: git: 48a52b7c6452 - main - devel/libkiwix: Update to 12.1.0 List-Id: Commit messages for all branches of the ports repository List-Archive: https://lists.freebsd.org/archives/dev-commits-ports-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-ports-all@freebsd.org X-BeenThere: dev-commits-ports-all@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: fuz X-Git-Repository: ports X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 48a52b7c645234ad0b6ac4f5a1c3b0f3d5281ca9 Auto-Submitted: auto-generated The branch main has been updated by fuz: URL: https://cgit.FreeBSD.org/ports/commit/?id=48a52b7c645234ad0b6ac4f5a1c3b0f3d5281ca9 commit 48a52b7c645234ad0b6ac4f5a1c3b0f3d5281ca9 Author: Olivier Certner AuthorDate: 2023-09-08 20:41:44 +0000 Commit: Robert Clausecker CommitDate: 2023-09-10 16:13:06 +0000 devel/libkiwix: Update to 12.1.0 Notably, a new /nojs endpoint (still leaves much to be desired), and lots of bug fixes, including our local patch for meson that was integrated upstream. More details here: https://github.com/kiwix/libkiwix/releases/tag/12.1.0 PR: 273644 --- devel/libkiwix/Makefile | 3 +-- devel/libkiwix/distinfo | 6 +++--- devel/libkiwix/files/patch-meson.build | 26 +++++++++++++------------- 3 files changed, 17 insertions(+), 18 deletions(-) diff --git a/devel/libkiwix/Makefile b/devel/libkiwix/Makefile index 1c5a5ccd4a6b..e33da8db2a4b 100644 --- a/devel/libkiwix/Makefile +++ b/devel/libkiwix/Makefile @@ -1,6 +1,5 @@ PORTNAME= libkiwix -DISTVERSION= 12.0.0 -PORTREVISION= 1 +DISTVERSION= 12.1.0 CATEGORIES= devel MAINTAINER= olce.freebsd.ports@certner.fr diff --git a/devel/libkiwix/distinfo b/devel/libkiwix/distinfo index 3526ae0576cf..39023c5f8af9 100644 --- a/devel/libkiwix/distinfo +++ b/devel/libkiwix/distinfo @@ -1,5 +1,5 @@ -TIMESTAMP = 1686582304 -SHA256 (kiwix-libkiwix-12.0.0_GH0.tar.gz) = 8608ef73fdaa34c28144eb5ad732a74ca94dd99710d08d7a1ddb1277d1985b02 -SIZE (kiwix-libkiwix-12.0.0_GH0.tar.gz) = 1114076 +TIMESTAMP = 1692892288 +SHA256 (kiwix-libkiwix-12.1.0_GH0.tar.gz) = 42e8f9f973054e11f17381c988790c8f8267898b5a611741f0aa03cc4ccf3f75 +SIZE (kiwix-libkiwix-12.1.0_GH0.tar.gz) = 1098820 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 index f5aa75063095..eb9c07cc45fe 100644 --- a/devel/libkiwix/files/patch-meson.build +++ b/devel/libkiwix/files/patch-meson.build @@ -1,16 +1,16 @@ ---- meson.build.orig 2022-11-30 17:10:19 UTC +--- meson.build.orig 2023-09-09 03:15:43 UTC +++ meson.build -@@ -36,7 +36,7 @@ else - endif +@@ -7,12 +7,7 @@ compiler = meson.get_compiler('cpp') - 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 + static_deps = get_option('static-linkage') or get_option('default_library') == 'static' -@@ -86,4 +86,3 @@ configure_file(output : 'kiwix.pc', - input : 'kiwix.pc.in', - install_dir: get_option('libdir')+'/pkgconfig' - ) -- +-# See https://github.com/kiwix/libkiwix/issues/371 +-if ['arm', 'mips', 'm68k', 'ppc', 'sh4'].contains(host_machine.cpu_family()) +- extra_libs = ['-latomic'] +-else +- extra_libs = [] +-endif ++extra_libs = [] + + if (compiler.get_id() == 'gcc' and build_machine.system() == 'linux') or host_machine.system() == 'freebsd' + # C++ std::thread is implemented using pthread on linux by gcc