From nobody Thu Jan 16 13:49:38 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 4YYkkV5P9Zz5kT9d; Thu, 16 Jan 2025 13:49:38 +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 4YYkkV4H14z477F; Thu, 16 Jan 2025 13:49:38 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1737035378; 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=KUqzzWJ5IBTP5KMHvEUkH8IJgAvTqz4JmN28wwS82q0=; b=pOE3xcz3ujC/eV7uUbhgTerI1dbk3oN7Grf/yssGacOdTu8QwahyQLZythMcdJnuquyFRl HulFM37Ujz5nQLVsero5ZhT+tmJ2a7mEsEWM7xQT4DzmsgVBnSCDLFy1cdVuQXDElEK0eS Z4ha251zn1Kkwv57Shsb3TlS/oskPbIopfsniRqE3cZrBNdZ7931JvCqBQw+e5BFXKE5lM mOaCCJSdiBxLRLhjWiC2BUja7tjHlTbSXVKaHs6nkch6PaJ9MhYg03UuQDgXzGaWM84YcX 5xGcmD21B9pVYUZK3kifuGVeZnkdsZfBQb4c/dx4HOnfxn7bgzTJf55hZDy3UQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1737035378; 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=KUqzzWJ5IBTP5KMHvEUkH8IJgAvTqz4JmN28wwS82q0=; b=ltF4OuprBgb3T9xaBscOCm7xbukuriaNC4RwXPmiUacv8NGfLTjahl2HABxjqGP06K/0MW ItGyR1gn+FL42TWROXIXSfCgWOLC/gXNsvMZgVEhk8PkdBLQfLUIMSKeapVKBjvMdd1xy7 /EI9uPqIrq6Z2eBS0eFRZOC5saet/Dhs6CEGIKW/w+VxywIN15u89KV0xbPgfNo4/7e6bE 5Z7BHskJ5ut9t5mfFGrjNIuKo55kjz23ByipYptAhIOZkAaZl+oNfooOHueXCDihtM2brl XJQbiwbifOr6WH8yUNIr5K6a8G3ZZlHezftjfP9OLeM/hjf2HfhvI2et5sXGUA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1737035378; a=rsa-sha256; cv=none; b=pA7Wl5nqusYN0TTzm3GkOJh3yvoXU8mT2jfmKrABxe3EZNCzMRqtl1qdpYZcG95OgaB3lW Xd57N4sca2Kp54vkdSKMRGrfA6rPUs/A+rIUT8sZqcua5GTr8JdasCnxNRq1pNen5Vv4gj pLlJIk4uRKlbjjBmWrYUWTowLEWfLvSnKiYhbmG7VWj9FfoOoMiDBnZp5+dv/HdRDIv/23 kVHTQFUWVF2Sem/0yizU6w9gADb5III+GXRCqLF+55uu4xj62VKGEDYKbcubGG5VnmZhau aNOagXt4wQ24KSq6N7811H5gRKChU0v9y1NwYHPxqtVeAO0NxYPN09sFjXQc+w== 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 4YYkkV2fW9zb25; Thu, 16 Jan 2025 13:49:38 +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 50GDncMc001634; Thu, 16 Jan 2025 13:49:38 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 50GDncO5001631; Thu, 16 Jan 2025 13:49:38 GMT (envelope-from git) Date: Thu, 16 Jan 2025 13:49:38 GMT Message-Id: <202501161349.50GDncO5001631@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: eb6e7079decc - main - devel/libzim: 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: eb6e7079deccdb7b8b7376f6df1c4af91eed68b8 Auto-Submitted: auto-generated The branch main has been updated by olce: URL: https://cgit.FreeBSD.org/ports/commit/?id=eb6e7079deccdb7b8b7376f6df1c4af91eed68b8 commit eb6e7079deccdb7b8b7376f6df1c4af91eed68b8 Author: Olivier Certner AuthorDate: 2025-01-16 13:09:50 +0000 Commit: Olivier Certner CommitDate: 2025-01-16 13:48:23 +0000 devel/libzim: Support ICU 76.1 The added patch is an upstream's candidate to fix the build against ICU 76.1, and will make it in the next release in this or another form. In the meantime, adopt it in the ports tree as is as it does not disturb the build against older versions of ICU. This is a maintainer update (olce.freebsd.ports@certner.fr). PR: 283542 Sponsored by: The FreeBSD Foundation --- devel/libzim/files/patch-meson.build | 24 ++++++++++++++++++++++++ 1 file changed, 24 insertions(+) diff --git a/devel/libzim/files/patch-meson.build b/devel/libzim/files/patch-meson.build new file mode 100644 index 000000000000..0bbe8c48a233 --- /dev/null +++ b/devel/libzim/files/patch-meson.build @@ -0,0 +1,24 @@ +Candidate patch coming from https://github.com/openzim/libzim/pull/936, likely +to make it in one way or the other into next release (in which case, remove this +local patch). + +--- meson.build.orig 2024-08-28 18:56:57 UTC ++++ meson.build +@@ -77,9 +77,15 @@ if xapian_dep.found() + endif + + if xapian_dep.found() +- icu_dep = dependency('icu-i18n', static:static_linkage) ++ icu_dep = [ ++ dependency('icu-i18n', static:static_linkage), ++ dependency('icu-uc', static:static_linkage) ++ ] + else +- icu_dep = dependency('icu-i18n', required:false, static:static_linkage) ++ icu_dep = [ ++ dependency('icu-i18n', required:false, static:static_linkage), ++ dependency('icu-uc', required:false, static:static_linkage) ++ ] + endif + + gtest_dep = dependency('gtest', version: '>=1.10.0', main:true, fallback:['gtest', 'gtest_main_dep'], required:false)