Hi,
I have submitted a patch for review:
https://gerrit.libreoffice.org/4134
To pull it, you can do:
git pull ssh://gerrit.libreoffice.org:29418/core refs/changes/34/4134/1
fix build with system-harfbuzz >= 0.9.18
.. as it split out the icu libs and thus we need to use harfbuzz-icu
for pkg-config to get the needed -lharfbuzz-icu
Change-Id: I6b3721ab37934881fbb876c0f4cb229b578b4121
---
M configure.ac
1 file changed, 9 insertions(+), 1 deletion(-)
diff --git a/configure.ac b/configure.ac
index c31a287..3463e21 100644
--- a/configure.ac
+++ b/configure.ac
@@ -8399,7 +8399,15 @@
if test "$_os" != "WINNT" -a "$_os" != "Darwin"; then
AC_MSG_RESULT([yes])
ENABLE_HARFBUZZ="TRUE"
- libo_CHECK_SYSTEM_MODULE([harfbuzz],[HARFBUZZ],[harfbuzz >= 0.9.10])
+ if test "$with_system_harfbuzz" = "yes"; then
+ if $PKG_CONFIG --atleast-version 0.9.18 harfbuzz; then
+ libo_CHECK_SYSTEM_MODULE([harfbuzz],[HARFBUZZ],[harfbuzz-icu >=
0.9.18])
+ else
+ libo_CHECK_SYSTEM_MODULE([harfbuzz],[HARFBUZZ],[harfbuzz >=
0.9.10])
+ fi
+ else
+ libo_CHECK_SYSTEM_MODULE([harfbuzz],[HARFBUZZ],[harfbuzz >= 0.9.10])
+ fi
else
AC_MSG_RESULT([no])
fi
--
To view, visit https://gerrit.libreoffice.org/4134
To unsubscribe, visit https://gerrit.libreoffice.org/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I6b3721ab37934881fbb876c0f4cb229b578b4121
Gerrit-PatchSet: 1
Gerrit-Project: core
Gerrit-Branch: master
Gerrit-Owner: Björn Michaelsen <bjoern.michael...@canonical.com>
Gerrit-Reviewer: Rene Engelhard <r...@debian.org>
_______________________________________________
LibreOffice mailing list
LibreOffice@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice
