git: 5aa6d53a0096 - main - devel/libkiwix*: Support ICU 76.1

The branch main has been updated by olce:

URL: https://cgit.FreeBSD.org/ports/commit/?id=5aa6d53a0096a3d04f8637a035f9bc20db63b0d6

commit 5aa6d53a0096a3d04f8637a035f9bc20db63b0d6
Author:     Olivier Certner <olce@FreeBSD.org>
AuthorDate: 2025-01-27 15:27:17 +0000
Commit:     Olivier Certner <olce@FreeBSD.org>
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)