[jhbuild] 3.8,3.10: fix WebKit build with HarfBuzz >= 0.9.18

[Alberto Garcia <agarcia src gnome org>]

commit 1a9ebb3fedc0d981dab991f71d20098a26ef4504
Author: Alberto Garcia <agarcia igalia com>
Date:   Thu May 30 17:09:44 2013 +0200

    3.8,3.10: fix WebKit build with HarfBuzz >= 0.9.18
    
    https://bugs.webkit.org/show_bug.cgi?id=116978

 modulesets/gnome-suites-core-deps-3.10.modules |    1 +
 modulesets/gnome-suites-core-deps-3.8.modules  |    1 +
 patches/webkitgtk-fix-harfbuzz-icu.patch       |   20 ++++++++++++++++++++
 3 files changed, 22 insertions(+), 0 deletions(-)
---
diff --git a/modulesets/gnome-suites-core-deps-3.10.modules b/modulesets/gnome-suites-core-deps-3.10.modules
index 30c61b7..9e0feb4 100644
--- a/modulesets/gnome-suites-core-deps-3.10.modules
+++ b/modulesets/gnome-suites-core-deps-3.10.modules
@@ -1056,6 +1056,7 @@
             module="webkitgtk-2.1.1.tar.xz" version="2.1.1"
             hash="sha256:8c67512bb169a06aff145158bc76ea7cc0cdd5c9a45894ae820a94cb0fb4bbd2"
             size="9121880">
+      <patch file="webkitgtk-fix-harfbuzz-icu.patch" strip="1"/>
     </branch>
     <dependencies>
       <dep package="at-spi2-core"/>
diff --git a/modulesets/gnome-suites-core-deps-3.8.modules b/modulesets/gnome-suites-core-deps-3.8.modules
index a027cb9..3fd0a03 100644
--- a/modulesets/gnome-suites-core-deps-3.8.modules
+++ b/modulesets/gnome-suites-core-deps-3.8.modules
@@ -1028,6 +1028,7 @@
             module="webkitgtk-2.0.2.tar.xz" version="2.0.2"
             hash="sha256:c3685032545eb4c23f3f56826817783a6963ad59bd7bbf806705059b3d8caeb2"
             size="9845276">
+      <patch file="webkitgtk-fix-harfbuzz-icu.patch" strip="1"/>
     </branch>
     <dependencies>
       <dep package="at-spi2-core"/>
diff --git a/patches/webkitgtk-fix-harfbuzz-icu.patch b/patches/webkitgtk-fix-harfbuzz-icu.patch
new file mode 100644
index 0000000..4fc359c
--- /dev/null
+++ b/patches/webkitgtk-fix-harfbuzz-icu.patch
@@ -0,0 +1,20 @@
+https://bugs.webkit.org/show_bug.cgi?id=116978
+
+diff --git a/Source/autotools/FindDependencies.m4 b/Source/autotools/FindDependencies.m4
+index a9067c5..aead295 100644
+--- a/Source/autotools/FindDependencies.m4
++++ b/Source/autotools/FindDependencies.m4
+@@ -373,6 +373,13 @@
+     PKG_CHECK_MODULES([FREETYPE],
+         [cairo-ft fontconfig >= fontconfig_required_version freetype2 >= freetype2_required_version 
harfbuzz >= harfbuzz_required_version])
+ fi
++# HarfBuzz 0.9.18 splits harbuzz-icu into a separate library.
++# Since we support earlier HarfBuzz versions we keep this conditional for now.
++if $PKG_CONFIG --atleast-version 0.9.18 harfbuzz; then
++    PKG_CHECK_MODULES(HARFBUZZ_ICU, harfbuzz-icu >= $harfbuzz_required_version)
++    FREETYPE_CFLAGS+=" $HARFBUZZ_ICU_CFLAGS"
++    FREETYPE_LIBS+=" $HARFBUZZ_ICU_LIBS"
++fi
+ AC_SUBST([FREETYPE_CFLAGS])
+ AC_SUBST([FREETYPE_LIBS])
+