[mingw-webkitgtk3] Link with harfbuzz-icu (split into separate library in harfbuzz 0.9.18)

[Kalev Lember]

commit ec5bdc374f0499966af80a29109d77200ef21ec3
Author: Kalev Lember <kalevlember at gmail.com>
Date:   Sun Jun 9 13:35:41 2013 +0200

    Link with harfbuzz-icu (split into separate library in harfbuzz 0.9.18)

 mingw-webkitgtk3.spec            |    8 +++++++-
 webkitgtk-fix-harfbuzz-icu.patch |   20 ++++++++++++++++++++
 2 files changed, 27 insertions(+), 1 deletions(-)
---
diff --git a/mingw-webkitgtk3.spec b/mingw-webkitgtk3.spec
index d4ce694..c1986e7 100644
--- a/mingw-webkitgtk3.spec
+++ b/mingw-webkitgtk3.spec
@@ -12,7 +12,7 @@
 
 Name:           mingw-webkitgtk3
 Version:        2.0.2
-Release:        2%{?dist}
+Release:        3%{?dist}
 Summary:        MinGW Windows GTK+ Web content engine library
 
 Group:          Development/Libraries
@@ -26,6 +26,8 @@ Source0:        http://webkitgtk.org/releases/webkitgtk-%{version}.tar.xz
 Patch2:         webkit-dont-build-dump-render-tree.patch
 # https://bugs.webkit.org/show_bug.cgi?id=108373
 Patch4:         webkitgtk-harfbuzz-cast.patch
+# https://bugs.webkit.org/show_bug.cgi?id=116978
+Patch5:         webkitgtk-fix-harfbuzz-icu.patch
 #https://bugs.webkit.org/show_bug.cgi?id=107965
 Patch7:         webkitgtk-jit-win64.patch
 #https://bugs.webkit.org/show_bug.cgi?id=114580
@@ -126,6 +128,7 @@ This is the MinGW port of WebKitGTK+ for GTK+ 3.
 
 %patch2 -p0 -b .dumprendertree
 %patch4 -p1 -b .harfbuzz-cast
+%patch5 -p1 -b .harfbuzz-icu
 %patch7 -p1 -b .jit-win64
 %patch8 -p1 -b .jit-mingw
 %patch9 -p1 -b .pkg_config
@@ -215,6 +218,9 @@ find $RPM_BUILD_ROOT -name "*.la" -delete
 
 
 %changelog
+* Sun Jun 09 2013 Kalev Lember <kalevlember at gmail.com> - 2.0.2-3
+- Link with harfbuzz-icu (split into separate library in harfbuzz 0.9.18)
+
 * Sun Jun  2 2013 Erik van Pienbroek <epienbro at fedoraproject.org> - 2.0.2-2
 - Fix FTBFS caused by the changed pkg-config behavior in mingw-filesystem
 
diff --git a/webkitgtk-fix-harfbuzz-icu.patch b/webkitgtk-fix-harfbuzz-icu.patch
new file mode 100644
index 0000000..4fc359c
--- /dev/null
+++ b/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])
+