[webkitgtk3] Link with harfbuzz-icu

[Kalev Lember]

commit b169d8f6b19bc9777ef7d083c078fb157f5e3608
Author: Kalev Lember <kalevlember at gmail.com>
Date:   Fri Jun 7 15:47:17 2013 +0200

    Link with harfbuzz-icu
    
    harfbuzz-icu was split into separate library in harfbuzz 0.9.18 and F19
    is getting the new HB now.
    
    https://bugzilla.redhat.com/show_bug.cgi?id=971795

 webkitgtk-fix-harfbuzz-icu.patch |   20 ++++++++++++++++++++
 webkitgtk3.spec                  |   14 +++++++++++++-
 2 files changed, 33 insertions(+), 1 deletions(-)
---
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])
+ 
diff --git a/webkitgtk3.spec b/webkitgtk3.spec
index a886ed6..2429db0 100644
--- a/webkitgtk3.spec
+++ b/webkitgtk3.spec
@@ -7,7 +7,7 @@
 
 Name:           webkitgtk3
 Version:        2.1.1
-Release:        2%{?dist}
+Release:        3%{?dist}
 Summary:        GTK+ Web content engine library
 
 Group:          Development/Libraries
@@ -22,6 +22,8 @@ Patch0:         webkit-1.1.14-nspluginwrapper.patch
 Patch1:         webkitgtk-2.1.1-yarr.patch
 # https://bugs.webkit.org/show_bug.cgi?id=103128
 Patch4:         webkit-1.11.90-double2intsPPC32.patch
+# https://bugs.webkit.org/show_bug.cgi?id=116978
+Patch5:         webkitgtk-fix-harfbuzz-icu.patch
 
 BuildRequires:  bison
 BuildRequires:  cairo-devel
@@ -55,6 +57,9 @@ BuildRequires:  perl-Switch
 BuildRequires:  ruby
 BuildRequires:  mesa-libGL-devel
 
+# Needed for patch5:
+BuildRequires:  autoconf automake libtool
+
 %description
 WebKitGTK+ is the port of the portable web rendering engine WebKit to the
 GTK+ platform.
@@ -97,6 +102,10 @@ This package contains developer documentation for %{name}.
 %ifarch ppc s390
 %patch4 -p1 -b .double2intsPPC32
 %endif
+%patch5 -p1 -b .harfbuzz-icu
+
+# Needed for patch5:
+autoreconf --verbose --install -I Source/autotools
 
 %build
 # Use linker flags to reduce memory consumption
@@ -212,6 +221,9 @@ find $RPM_BUILD_ROOT%{_libdir} -name "*.la" -delete
 
 
 %changelog
+* Fri Jun 07 2013 Kalev Lember <kalevlember at gmail.com> - 2.0.2-3
+- Link with harfbuzz-icu (split into separate library in harfbuzz 0.9.18)
+
 * Mon Jun 03 2013 Kalev Lember <kalevlember at gmail.com> - 2.1.1-2
 - Remove glib-compile-schemas scriptlets: the schemas are no longer installed
 - Add ldconfig calls to the libwebkit2gtk subpackage