Title: [151393] releases/WebKitGTK/webkit-2.0
- Revision
- 151393
- Author
- [email protected]
- Date
- 2013-06-10 06:16:13 -0700 (Mon, 10 Jun 2013)
Log Message
Merge r150963 - [GTK] Needs to check for harfbuzz-icu
https://bugs.webkit.org/show_bug.cgi?id=116978
Patch by Alberto Garcia <[email protected]> on 2013-05-30
Reviewed by Xan Lopez.
HarfBuzz 0.9.18 splits harbuzz-icu into a separate library so we
also need to check for it in order to get the necessary flags for
the compiler and the linker.
We keep this conditional for now since we still want to support
earlier versions of HarfBuzz.
* Source/autotools/FindDependencies.m4:
Modified Paths
Diff
Modified: releases/WebKitGTK/webkit-2.0/ChangeLog (151392 => 151393)
--- releases/WebKitGTK/webkit-2.0/ChangeLog 2013-06-10 13:10:40 UTC (rev 151392)
+++ releases/WebKitGTK/webkit-2.0/ChangeLog 2013-06-10 13:16:13 UTC (rev 151393)
@@ -1,3 +1,19 @@
+2013-05-30 Alberto Garcia <[email protected]>
+
+ [GTK] Needs to check for harfbuzz-icu
+ https://bugs.webkit.org/show_bug.cgi?id=116978
+
+ Reviewed by Xan Lopez.
+
+ HarfBuzz 0.9.18 splits harbuzz-icu into a separate library so we
+ also need to check for it in order to get the necessary flags for
+ the compiler and the linker.
+
+ We keep this conditional for now since we still want to support
+ earlier versions of HarfBuzz.
+
+ * Source/autotools/FindDependencies.m4:
+
2013-05-18 Alberto Garcia <[email protected]>
[GTK] Parallel build fails if gtk-doc is enabled
Modified: releases/WebKitGTK/webkit-2.0/Source/autotools/FindDependencies.m4 (151392 => 151393)
--- releases/WebKitGTK/webkit-2.0/Source/autotools/FindDependencies.m4 2013-06-10 13:10:40 UTC (rev 151392)
+++ releases/WebKitGTK/webkit-2.0/Source/autotools/FindDependencies.m4 2013-06-10 13:16:13 UTC (rev 151393)
@@ -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])
_______________________________________________
webkit-changes mailing list
[email protected]
https://lists.webkit.org/mailman/listinfo/webkit-changes