[jhbuild] Add back the harfbuzz-icu patch



commit e852d1c8e747827b614d5627691a221ba3b42485
Author: Kalev Lember <kalevlember gmail com>
Date:   Tue Jun 11 21:34:25 2013 +0200

    Add back the harfbuzz-icu patch
    
    Previous commit removed webkitgtk-fix-harfbuzz-icu.patch, but it's still
    needed by the core-deps-3.10 moduleset.

 patches/webkitgtk-fix-harfbuzz-icu.patch |   20 ++++++++++++++++++++
 1 files changed, 20 insertions(+), 0 deletions(-)
---
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])
+ 


[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]