[Libreoffice-commits] core.git: Branch 'libreoffice-4-1' - 2 commits - download.lst harfbuzz/harfbuzz.configure.patch.1

[Khaled Hosny]

 download.lst                        |    2 +-
 harfbuzz/harfbuzz.configure.patch.1 |    8 ++++----
 2 files changed, 5 insertions(+), 5 deletions(-)

New commits:
commit 0ba159e33bb8f47250f57f377af40f7ca941c89c
Author: Khaled Hosny <khaledhosny at 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
commit 1cabbe033b395d5de985dd77ecd26dfc39a6feeb
Author: Khaled Hosny <khaledhosny at eglug.org>
Date:   Tue May 21 19:46:06 2013 +0200

    Update HarfBuzz to 0.9.17
    
    Change-Id: If84a1eb7dbd54b4f1e3d876eb63cc3f2f8e51938
    Reviewed-on: https://gerrit.libreoffice.org/3993
    Reviewed-by: Fridrich Strba <fridrich at documentfoundation.org>
    Tested-by: Fridrich Strba <fridrich at documentfoundation.org>

diff --git a/download.lst b/download.lst
index f02392e..f827956 100644
--- a/download.lst
+++ b/download.lst
@@ -38,7 +38,7 @@ export GRAPHITE_TARBALL := f5ef3f7f10fa8c3542c6a085a233080b-graphite2-1.2.0.tgz
 export GLIBC_TARBALL := 4a660ce8466c9df01f19036435425c3a-glibc-2.1.3-stub.tar.gz
 export HSQLDB_TARBALL := 17410483b5b5f267aa18b7e00b65e6e0-hsqldb_1_8_0.zip
 export HUNSPELL_TARBALL := 3121aaf3e13e5d88dfff13fb4a5f1ab8-hunspell-1.3.2.tar.gz
-export HARFBUZZ_TARBALL := 90855e670c790c1fec4592908be3c0b8-harfbuzz-0.9.16.tar.bz2
+export HARFBUZZ_TARBALL := c48827713e93539dc7285f9e86ffbdc5-harfbuzz-0.9.17.tar.bz2
 export HYPHEN_TARBALL := a2f6010987e1c601274ab5d63b72c944-hyphen-2.8.4.tar.gz
 export ICU_TARBALL := 6eef33b229d0239d654983028c9c7053-icu4c-51_1-src.tgz
 export ICU_51_LAYOUT_FIX_TARBALL := 7650341b04f05ff2595bf064f3e41f41-icu-51-layout-fix-10107.tgz
diff --git a/harfbuzz/harfbuzz.configure.patch.1 b/harfbuzz/harfbuzz.configure.patch.1
index ffabde5..937a06e 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,12 +17555,12 @@
+@@ -17555,7 +17555,7 @@
  	{ $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,12 +73,6 @@ 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-libsonly --ldflags-layout`
-+		ICU_LE_LIBS=`$ICU_CONFIG --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