[Libreoffice-commits] core.git: 2 commits - harfbuzz/harfbuzz.configure.patch.1

[Fridrich Å trba]

 harfbuzz/harfbuzz.configure.patch.1 |   11 ++++++++++-
 1 file changed, 10 insertions(+), 1 deletion(-)

New commits:
commit cc24106366af9e22ba20caf27aa96cc65dbbbd3e
Author: Fridrich Å trba <fridrich.strba at bluewin.ch>
Date:   Tue Apr 23 10:53:02 2013 +0200

    Disable coretex again
    
    Change-Id: I0372ccce744caace0dc43b69c3e26af928d81fa9

diff --git a/harfbuzz/harfbuzz.configure.patch.1 b/harfbuzz/harfbuzz.configure.patch.1
index 4c83b55..937a06e 100644
--- a/harfbuzz/harfbuzz.configure.patch.1
+++ b/harfbuzz/harfbuzz.configure.patch.1
@@ -91,3 +91,12 @@ diff -ur harfbuzz.org/configure harfbuzz/configure
  fi
  if $have_freetype; then
  
+@@ -17825,7 +17897,7 @@
+ ac_fn_c_check_type "$LINENO" "CTFontRef" "ac_cv_type_CTFontRef" "#include <ApplicationServices/ApplicationServices.h>
+ "
+ if test "x$ac_cv_type_CTFontRef" = xyes; then :
+-  have_coretext=true
++  have_coretext=false
+ else
+   have_coretext=false
+ fi
commit 20131d6903cb83fcf1744c8c8bb434f087703e5f
Author: Fridrich Å trba <fridrich.strba at bluewin.ch>
Date:   Tue Apr 23 10:52:34 2013 +0200

    Revert "Disable coretex again"
    
    This reverts commit 0ef5a4bb954e16e4e5e009c78da9196cbf0706fa.

diff --git a/harfbuzz/harfbuzz.configure.patch.1 b/harfbuzz/harfbuzz.configure.patch.1
index dc83c86..4c83b55 100644
--- a/harfbuzz/harfbuzz.configure.patch.1
+++ b/harfbuzz/harfbuzz.configure.patch.1
@@ -64,7 +64,16 @@ diff -ur harfbuzz.org/configure harfbuzz/configure
  fi
  if test "$have_icu_le" != "true"; then
  	if test -n "$ac_tool_prefix"; then
-@@ -17654,7 +17726,7 @@
+@@ -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
+-		have_icu_le=true
++		have_icu_le=false
+ 		# 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.
+@@ -17654,7 +17654,7 @@
  	GRAPHITE2_LIBS=$pkg_cv_GRAPHITE2_LIBS
          { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
  $as_echo "yes" >&6; }
@@ -82,12 +91,3 @@ diff -ur harfbuzz.org/configure harfbuzz/configure
  fi
  if $have_freetype; then
  
-@@ -17825,7 +17897,7 @@
- ac_fn_c_check_type "$LINENO" "CTFontRef" "ac_cv_type_CTFontRef" "#include <ApplicationServices/ApplicationServices.h>
- "
- if test "x$ac_cv_type_CTFontRef" = xyes; then :
--  have_coretext=true
-+  have_coretext=false
- else
-   have_coretext=false
- fi