external/harfbuzz/UnpackedTarball_harfbuzz.mk | 5 -
external/harfbuzz/icu_75.patch.0 | 87 +++++++++++++++++++++++---
2 files changed, 79 insertions(+), 13 deletions(-)
New commits:
commit 59c123d62a7d155e0b5715e5d1804f2a0cee77fa
Author: Xisco Fauli <xiscofa...@libreoffice.org>
AuthorDate: Fri Sep 13 09:58:14 2024 +0200
Commit: Xisco Fauli <xiscofa...@libreoffice.org>
CommitDate: Fri Sep 13 12:08:30 2024 +0200
ICU: fix aclocal dependency
Patch configure directly instead of configure.ac
Change-Id: Iaaf3e10dc435d5d8f546c009b27c9a4aa7c09141
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/173315
Tested-by: Jenkins
Reviewed-by: Heiko Tietze <heiko.tie...@documentfoundation.org>
Reviewed-by: Xisco Fauli <xiscofa...@libreoffice.org>
diff --git a/external/harfbuzz/UnpackedTarball_harfbuzz.mk
b/external/harfbuzz/UnpackedTarball_harfbuzz.mk
index 9a771dffe279..6de80f0ea415 100644
--- a/external/harfbuzz/UnpackedTarball_harfbuzz.mk
+++ b/external/harfbuzz/UnpackedTarball_harfbuzz.mk
@@ -17,12 +17,7 @@ $(eval $(call gb_UnpackedTarball_set_patchlevel,harfbuzz,0))
$(eval $(call gb_UnpackedTarball_add_patches,harfbuzz, \
external/harfbuzz/tdf159529.patch.0 \
-))
-
-ifneq ($(filter-out MACOSX WNT,$(OS)),)
-$(eval $(call gb_UnpackedTarball_add_patches,harfbuzz, \
external/harfbuzz/icu_75.patch.0 \
))
-endif
# vim: set noet sw=4 ts=4:
diff --git a/external/harfbuzz/icu_75.patch.0 b/external/harfbuzz/icu_75.patch.0
index 4323716caa27..9b14433211b0 100644
--- a/external/harfbuzz/icu_75.patch.0
+++ b/external/harfbuzz/icu_75.patch.0
@@ -1,17 +1,88 @@
---- configure.ac 2024-06-12 16:35:18.736933604 +0200
-+++ configure.ac 2024-06-12 16:57:39.544214075 +0200
-@@ -249,7 +249,13 @@
+--- configure 2024-06-12 16:35:18.736933604 +0200
++++ configure 2024-06-12 16:57:39.544214075 +0200
+@@ -22533,7 +22362,83 @@
fi
-
+
if $have_icu; then
- CXXFLAGS="$CXXFLAGS `$PKG_CONFIG --variable=CXXFLAGS icu-uc`"
+ is_icu75=false
-+ PKG_CHECK_MODULES(ICU, icu-uc >= 75.1, is_icu75=true, :)
++
++pkg_failed=no
++{ printf "%s
" "$as_me:${as_lineno-$LINENO}: checking for icu-uc >= 75.1" >&5
++printf %s "checking for icu-uc >= 75.1... " >&6; }
++
++if test -n "$ICU_CFLAGS"; then
++ pkg_cv_ICU_CFLAGS="$ICU_CFLAGS"
++ elif test -n "$PKG_CONFIG"; then
++ if test -n "$PKG_CONFIG" && \
++ { { printf "%s
" "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"icu-uc
>= 75.1\""; } >&5
++ ($PKG_CONFIG --exists --print-errors "icu-uc >= 75.1") 2>&5
++ ac_status=$?
++ printf "%s
" "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
++ test $ac_status = 0; }; then
++ pkg_cv_ICU_CFLAGS=`$PKG_CONFIG --cflags "icu-uc >= 75.1" 2>/dev/null`
++ test "x$?" != "x0" && pkg_failed=yes
++else
++ pkg_failed=yes
++fi
++ else
++ pkg_failed=untried
++fi
++if test -n "$ICU_LIBS"; then
++ pkg_cv_ICU_LIBS="$ICU_LIBS"
++ elif test -n "$PKG_CONFIG"; then
++ if test -n "$PKG_CONFIG" && \
++ { { printf "%s
" "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"icu-uc
>= 75.1\""; } >&5
++ ($PKG_CONFIG --exists --print-errors "icu-uc >= 75.1") 2>&5
++ ac_status=$?
++ printf "%s
" "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
++ test $ac_status = 0; }; then
++ pkg_cv_ICU_LIBS=`$PKG_CONFIG --libs "icu-uc >= 75.1" 2>/dev/null`
++ test "x$?" != "x0" && pkg_failed=yes
++else
++ pkg_failed=yes
++fi
++ else
++ pkg_failed=untried
++fi
++
++
++
++if test $pkg_failed = yes; then
++ { printf "%s
" "$as_me:${as_lineno-$LINENO}: result: no" >&5
++printf "%s
" "no" >&6; }
++
++if $PKG_CONFIG --atleast-pkgconfig-version 0.20; then
++ _pkg_short_errors_supported=yes
++else
++ _pkg_short_errors_supported=no
++fi
++ if test $_pkg_short_errors_supported = yes; then
++ ICU_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors
--cflags --libs "icu-uc >= 75.1" 2>&1`
++ else
++ ICU_PKG_ERRORS=`$PKG_CONFIG --print-errors --cflags --libs
"icu-uc >= 75.1" 2>&1`
++ fi
++ # Put the nasty error message in config.log where it belongs
++ echo "$ICU_PKG_ERRORS" >&5
++
++ :
++elif test $pkg_failed = untried; then
++ { printf "%s
" "$as_me:${as_lineno-$LINENO}: result: no" >&5
++printf "%s
" "no" >&6; }
++ :
++else
++ ICU_CFLAGS=$pkg_cv_ICU_CFLAGS
++ ICU_LIBS=$pkg_cv_ICU_LIBS
++ { printf "%s
" "$as_me:${as_lineno-$LINENO}: result: yes" >&5
++printf "%s
" "yes" >&6; }
++ is_icu75=true
++fi
+ if $is_icu75; then
+ CXXFLAGS="$CXXFLAGS `$PKG_CONFIG --variable=CXXFLAGS -std=c++17
icu-uc`"
+ else
+ CXXFLAGS="$CXXFLAGS `$PKG_CONFIG --variable=CXXFLAGS icu-uc`"
+ fi
- AC_DEFINE(HAVE_ICU, 1, [Have ICU library])
- if test "x$with_icu" = "xbuiltin"; then
- AC_DEFINE(HAVE_ICU_BUILTIN, 1, [Use hb-icu Unicode callbacks])
+
+ printf "%s
" "#define HAVE_ICU 1" >>confdefs.h
+
+
