From nobody Mon Jan 27 15:50:13 2025 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 4YhXtZ0TRXz5lr72; Mon, 27 Jan 2025 15:50: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 "R11" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4YhXtY6j7Qz3PyP; Mon, 27 Jan 2025 15:50:13 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1737993014; 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=onLcXqvxsoKq6Lp9hYTnEgnmER2XO3pYCTkglRRORTY=; b=GQA5OlP3q80G9nqIZb4e3FjfuuJPcuC/lOYzbMSblT8DxTpkizLD1qcTK0xQ1r9b2KoLOv UtJN8L/eS5w0bYjk0pcSocLHkaouulGVjG/1oWm89BldgxA4sOjWd5Iany3Sii5LI8gT5K i3U2n1Ph4lFVMbvSOBawDskDNpc/7mK6M2MwceoOzJjOE9zktUTJPy+cLbkj5brvnY2fFj Tz2qAcpQ/ILfT6fsGfAd8TNooQ+BtbWt5SFes9FmcwEfRAAgcN5x1g3y+L5vYNy8xww+LU pXgXzyoYf8AUefmnQyw6yYalLo9rHtt4qFQuH23o7Im+M33yfcBHswwp1wPH+Q== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1737993014; 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=onLcXqvxsoKq6Lp9hYTnEgnmER2XO3pYCTkglRRORTY=; b=bGf4DDrkJ3E2S3gOsap5UO/YFEhYU6qwB//ZfAEpsmQh73qsmH4gDfBJzjDA7HfyDJzFby ExpeYrNzXaNX2Hi5DnFD1cp+rbtrzCur3PDvR3nPbo9f3aDQrVZt1N0BjDzaiAbCLQs4mk ZH06FmcF/kiI92Y/QAxCXkEDwXEpIJhieYPDXI8+pcsxrLmsdrl1NYuTrwA5VZflXMOnlG krHOXir/7tDCAU+AIR3SN2CwdCzVIaU80P9Ijlc9gm4fZtuYqaVCCs4EnlBi5+HMBOiiDH MvDNW5gIOTB10Tmab1z3x0t1pHrbGdcymOyQge6ZpTZXcN1kG7GV0XDgUUiyQg== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1737993014; a=rsa-sha256; cv=none; b=kY11ewIMDQgA4xrQ5ueNMEoTheDkzq2PygfZv7EnNBHLCmu0WEnFajRiD9afNJJ27shDMG lyd8qRfsMeXZyS7tCEIm+mX6gLpkg8vqsP3fhFrNPiFXg8/gYbLYkJ/LjXru/GinnifvNd UGBrydbbuRjFr0R08O3Ga+qdOlA0aO/eXAz/dsAsXuAZGFIHvpVnQ0j6TQvc7qJNRGNaZJ vyP+MnkKq6TGPaoORJ8+DFea229F6kedPPzMHiUVRJJnPmaEOqakTmw7kmooyDa7kqFzAL cgTldsa1Cpg0ZWSN/D9yC/SCTrz3wRTtT4/POeIa4h69PyLEW4dti6kuKXI27g== ARC-Authentication-Results: i=1; mx1.freebsd.org; none 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 4YhXtY5yQ5zbfr; Mon, 27 Jan 2025 15:50:13 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.18.1/8.18.1) with ESMTP id 50RFoDY7018083; Mon, 27 Jan 2025 15:50:13 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 50RFoDPi018074; Mon, 27 Jan 2025 15:50:13 GMT (envelope-from git) Date: Mon, 27 Jan 2025 15:50:13 GMT Message-Id: <202501271550.50RFoDPi018074@gitrepo.freebsd.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org From: Olivier Certner Subject: git: 5aa6d53a0096 - main - devel/libkiwix*: Support ICU 76.1 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: X-BeenThere: dev-commits-ports-main@freebsd.org Sender: owner-dev-commits-ports-main@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: olce X-Git-Repository: ports X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 5aa6d53a0096a3d04f8637a035f9bc20db63b0d6 Auto-Submitted: auto-generated The branch main has been updated by olce: URL: https://cgit.FreeBSD.org/ports/commit/?id=5aa6d53a0096a3d04f8637a035f9bc20db63b0d6 commit 5aa6d53a0096a3d04f8637a035f9bc20db63b0d6 Author: Olivier Certner AuthorDate: 2025-01-27 15:27:17 +0000 Commit: Olivier Certner CommitDate: 2025-01-27 15:41:07 +0000 devel/libkiwix*: Support ICU 76.1 This change is similar to what was done to devel/libzim. It allows to build against ICU 76.1, without disturbing the build against older versions (e.g., 74.2). This is a maintainer update (olce.freebsd.ports@certner.fr). PR: 278420 Sponsored by: The FreeBSD Foundation --- devel/libkiwix/files/patch-meson.build | 10 ++++++++++ devel/libkiwix13/files/patch-meson.build | 12 +++++++++++- 2 files changed, 21 insertions(+), 1 deletion(-) diff --git a/devel/libkiwix/files/patch-meson.build b/devel/libkiwix/files/patch-meson.build index d8e45a01b520..005708da807c 100644 --- a/devel/libkiwix/files/patch-meson.build +++ b/devel/libkiwix/files/patch-meson.build @@ -50,3 +50,13 @@ included in next release (14.1.0), so remove this patch at next update. endif if (compiler.get_id() == 'gcc' and build_machine.system() == 'linux') or host_machine.system() == 'freebsd' +@@ -20,7 +46,8 @@ endif + else + thread_dep = dependency('', required:false) + endif +-libicu_dep = dependency('icu-i18n', static:static_deps) ++# Meson automatically flattens dependencies when passed to dependency() ++libicu_dep = [dependency('icu-i18n', static:static_deps), dependency('icu-uc', static:static_deps)] + pugixml_dep = dependency('pugixml', static:static_deps) + libcurl_dep = dependency('libcurl', static:static_deps) + microhttpd_dep = dependency('libmicrohttpd', static:static_deps) diff --git a/devel/libkiwix13/files/patch-meson.build b/devel/libkiwix13/files/patch-meson.build index d8e45a01b520..fc41fe5704b6 100644 --- a/devel/libkiwix13/files/patch-meson.build +++ b/devel/libkiwix13/files/patch-meson.build @@ -1,7 +1,7 @@ Has been upstreamed via https://github.com/kiwix/libkiwix/pull/1173 and will be included in next release (14.1.0), so remove this patch at next update. ---- meson.build.orig 2024-10-09 17:18:52 UTC +--- meson.build.orig 2024-02-25 14:11:31 UTC +++ meson.build @@ -4,14 +4,40 @@ compiler = meson.get_compiler('cpp') default_options : ['c_std=c11', 'cpp_std=c++17', 'werror=true']) @@ -50,3 +50,13 @@ included in next release (14.1.0), so remove this patch at next update. endif if (compiler.get_id() == 'gcc' and build_machine.system() == 'linux') or host_machine.system() == 'freebsd' +@@ -20,7 +46,8 @@ endif + else + thread_dep = dependency('', required:false) + endif +-libicu_dep = dependency('icu-i18n', static:static_deps) ++libicu_dep = [dependency('icu-i18n', static:static_deps), \ ++ dependency('icu-uc', static:static_deps)] + pugixml_dep = dependency('pugixml', static:static_deps) + libcurl_dep = dependency('libcurl', static:static_deps) + microhttpd_dep = dependency('libmicrohttpd', static:static_deps)