cirros-testvm/src-cirros/buildroot-2015.05/package/webkit/0003-detect-harfbuzz-icu.patch

   1 harfbuzz-icu detections based on the following upstream commits
   2
   3 - 5f3ae29ffb29c499c1825578ba7f3ffcbf1aa8b9
   4 - ad2a23ec44b692bde43a13b658990770caa8dfc5
   5 - 22b4786377142424bfb6562ff029997acd0846d1
   6
   7 Signed-off-by: Markos Chandras <markos.chandras@imgtec.com>
   8
   9 Index: webkit-1.11.5/configure.ac
  10 ===================================================================
  11 --- webkit-1.11.5.orig/configure.ac
  12 +++ webkit-1.11.5/configure.ac
  13 @@ -938,6 +938,15 @@ PKG_CHECK_MODULES([FREETYPE],
  14                    freetype2 >= $FREETYPE2_REQUIRED_VERSION
  15                    harfbuzz])
  16  fi
  17 +# HarfBuzz 0.9.18 splits harbuzz-icu into a separate library.
  18 +# Since we support earlier HarfBuzz versions we keep this conditional for now.
  19 +m4_define([harfbuzz_required_version], [0.9.7])
  20 +if $PKG_CONFIG --atleast-version 0.9.18 harfbuzz; then
  21 +       PKG_CHECK_MODULES([HARFBUZZ_ICU], [harfbuzz-icu >= $harfbuzz_required_version])
  22 +       FREETYPE_CFLAGS+=" $HARFBUZZ_ICU_CFLAGS"
  23 +       FREETYPE_LIBS+=" $HARFBUZZ_ICU_LIBS"
  24 +fi
  25 +
  26  AC_SUBST([FREETYPE_CFLAGS])
  27  AC_SUBST([FREETYPE_LIBS])
  28