diff options
| author | Arnout Vandecappelle <arnout@mind.be> | 2013-10-24 11:46:11 +0200 |
|---|---|---|
| committer | Peter Korsgaard <peter@korsgaard.com> | 2013-10-27 10:52:14 +0100 |
| commit | 5bc39dcf41cca2faabba72f41540a653afc9c836 (patch) | |
| tree | 5a5cb2bcfc27a04fafa7bb4e3e18eee9249df4ee /package/webkit/webkit-0003-detect-harfbuzz-icu.patch | |
| parent | e12fab456540b5f378bd4a7ecbf0825df147c43e (diff) | |
| download | buildroot-5bc39dcf41cca2faabba72f41540a653afc9c836.tar.gz buildroot-5bc39dcf41cca2faabba72f41540a653afc9c836.zip | |
webkit: number the patches
Signed-off-by: Arnout Vandecappelle (Essensium/Mind) <arnout@mind.be>
Signed-off-by: Peter Korsgaard <peter@korsgaard.com>
Diffstat (limited to 'package/webkit/webkit-0003-detect-harfbuzz-icu.patch')
| -rw-r--r-- | package/webkit/webkit-0003-detect-harfbuzz-icu.patch | 28 |
1 files changed, 28 insertions, 0 deletions
diff --git a/package/webkit/webkit-0003-detect-harfbuzz-icu.patch b/package/webkit/webkit-0003-detect-harfbuzz-icu.patch new file mode 100644 index 0000000000..dc93c67e33 --- /dev/null +++ b/package/webkit/webkit-0003-detect-harfbuzz-icu.patch @@ -0,0 +1,28 @@ +harfbuzz-icu detections based on the following upstream commits + +- 5f3ae29ffb29c499c1825578ba7f3ffcbf1aa8b9 +- ad2a23ec44b692bde43a13b658990770caa8dfc5 +- 22b4786377142424bfb6562ff029997acd0846d1 + +Signed-off-by: Markos Chandras <markos.chandras@imgtec.com> + +Index: webkit-1.11.5/configure.ac +=================================================================== +--- webkit-1.11.5.orig/configure.ac ++++ webkit-1.11.5/configure.ac +@@ -938,6 +938,15 @@ PKG_CHECK_MODULES([FREETYPE], + freetype2 >= $FREETYPE2_REQUIRED_VERSION + harfbuzz]) + fi ++# HarfBuzz 0.9.18 splits harbuzz-icu into a separate library. ++# Since we support earlier HarfBuzz versions we keep this conditional for now. ++m4_define([harfbuzz_required_version], [0.9.7]) ++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]) + |
