[HarfBuzz] harfbuzz-ng: Branch 'master' - 2 commits

[Behdad Esfahbod]

 configure.ac        |   26 +++++++++++++++-----------
 src/hb-graphite2.cc |    8 ++++++++
 2 files changed, 23 insertions(+), 11 deletions(-)

New commits:
commit 880c1f0e4ede65890592d28dfb38bb06f5b57500
Author: Behdad Esfahbod <behdad at behdad.org>
Date:   Mon Sep 19 23:10:22 2011 -0400

    Rewrite ICU detection code with in-house macros
    
    At least works for cross-compiling now...

diff --git a/configure.ac b/configure.ac
index 2c5e728..856fb98 100644
--- a/configure.ac
+++ b/configure.ac
@@ -112,17 +112,21 @@ AM_CONDITIONAL(HAVE_CAIRO_FT, $have_cairo_ft)
 dnl ==========================================================================
 
 PKG_CHECK_MODULES(ICU, icu, have_icu=true, [
-	if test $cross_compiling == no; then
-		AC_CHECK_PROG([have_icu], [icu-config], [true], [false])
-		if $have_icu; then
-			ICU_CFLAGS=`icu-config --cppflags`
-			ICU_LIBS=`icu-config --ldflags-libsonly`
-			ICU_CFLAGS=`echo "$ICU_CFLAGS" | sed "s@ -I/usr/include @ @"`
-			AC_SUBST(ICU_CFLAGS)
-			AC_SUBST(ICU_LIBS)
-		fi
-	else
-		have_icu=false
+	have_icu=true
+	AC_CHECK_HEADERS(unicode/uchar.h,, have_icu=false)
+	AC_MSG_CHECKING([for libicuuc])
+	LIBS_old=$LIBS
+	LIBS="$LIBS -licuuc"
+	AC_TRY_LINK([#include <unicode/uchar.h>],
+		    [u_getIntPropertyValue (0, (UProperty)0);],
+		    AC_MSG_RESULT(yes),
+		    AC_MSG_RESULT(no);have_icu=false)
+	LIBS=$LIBS_old
+	if $have_icu; then
+		ICU_CFLAGS=-D_REENTRANT
+		ICU_LIBS="-licuuc"
+		AC_SUBST(ICU_CFLAGS)
+		AC_SUBST(ICU_LIBS)
 	fi
 ])
 if $have_icu; then
commit f83f0f4836691b04306c2ef80979f2e1d76a2f28
Author: Behdad Esfahbod <behdad at behdad.org>
Date:   Mon Sep 19 18:51:48 2011 -0400

    [graphite] Add note about graphite shaker brokenness

diff --git a/src/hb-graphite2.cc b/src/hb-graphite2.cc
index a3dc1b4..0675759 100644
--- a/src/hb-graphite2.cc
+++ b/src/hb-graphite2.cc
@@ -329,6 +329,14 @@ hb_graphite_shape (hb_font_t          *font,
     curradvy += pPos->y_advance;
   }
   pPos[-1].x_advance += gr_seg_advance_X(seg) - curradvx;
+
+  /* TODO(behdad):
+   * This shaper is badly broken with RTL text.  It returns glyphs
+   * in the logical order!
+   */
+//  if (HB_DIRECTION_IS_BACKWARD (buffer->props.direction))
+//    hb_buffer_reverse (buffer);
+
   success = 1;
 
 dieout: