harfbuzz/harfbuzz.configure.patch.1 | 8 +++++++-
1 file changed, 7 insertions(+), 1 deletion(-)
New commits:
commit a2e3f7786f78234a5b5d0fe19ea715c2ad2f3ad7
Author: Khaled Hosny <khaledho...@eglug.org>
Date: Wed May 22 12:04:22 2013 +0200
Blind attempt to fix HarfBuzz build
Change-Id: Iaa61bc2c82ab6bd6391c8c81951ca55c5ce133ab
diff --git a/harfbuzz/harfbuzz.configure.patch.1
b/harfbuzz/harfbuzz.configure.patch.1
index 937a06e..c66e2b7 100644
--- a/harfbuzz/harfbuzz.configure.patch.1
+++ b/harfbuzz/harfbuzz.configure.patch.1
@@ -64,7 +64,7 @@ diff -ur harfbuzz.org/configure harfbuzz/configure
fi
if test "$have_icu_le" != "true"; then
if test -n "$ac_tool_prefix"; then
-@@ -17555,7 +17555,7 @@
+@@ -17555,12 +17555,12 @@
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for ICU_LE by using
icu-config fallback" >&5
$as_echo_n "checking for ICU_LE by using icu-config fallback... " >&6; }
if test "$ICU_CONFIG" != "no" && "$ICU_CONFIG" --version >/dev/null;
then
@@ -73,6 +73,12 @@ diff -ur harfbuzz.org/configure harfbuzz/configure
# We don't use --cflags as this gives us a lot of things that
we don't
# necessarily want, like debugging and optimization flags
# See man (1) icu-config for more info.
+ ICU_LE_CFLAGS=`$ICU_CONFIG --cppflags`
+- ICU_LE_LIBS=`$ICU_CONFIG --ldflags-searchpath
--ldflags-libsonly --ldflags-layout`
++ ICU_LE_LIBS=`$ICU_CONFIG --ldflags-searchpath
--ldflags-libsonly --ldflags-layout | tr "\n" " "`
+
+
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
@@ -17654,7 +17654,7 @@
GRAPHITE2_LIBS=$pkg_cv_GRAPHITE2_LIBS
{ $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
_______________________________________________
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
