aboutsummaryrefslogtreecommitdiff
path: root/package/webkit/webkit-detect-harfbuzz-icu.patch
diff options
context:
space:
mode:
authorGravatar Markos Chandras <markos.chandras@imgtec.com>2013-09-05 12:37:02 +0100
committerGravatar Peter Korsgaard <jacmet@sunsite.dk>2013-09-08 22:50:06 +0200
commit52fcc6a256bcfd541486257bfd05ff12d47aef75 (patch)
tree2314d214305822a55a554b0d967973283794024c /package/webkit/webkit-detect-harfbuzz-icu.patch
parent62146ea3ad78b74d0c17c0fbeaffa2be51070424 (diff)
downloadbuildroot-52fcc6a256bcfd541486257bfd05ff12d47aef75.tar.gz
buildroot-52fcc6a256bcfd541486257bfd05ff12d47aef75.tar.bz2
webkit: Version bump to 1.11.5
Also apply the following patches: - upstream fix for 32-bit autotools - upstream fix for conditional gstreamer build of gtklauncher - upstream fix for detecting the latest harfbuzz - Update existing patch for disabling docs - Update existing patch for execinfo_h - upstream patch for the MIPS DFG support. This fixes compilation problems on MIPS. Signed-off-by: Markos Chandras <markos.chandras@imgtec.com> Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
Diffstat (limited to 'package/webkit/webkit-detect-harfbuzz-icu.patch')
-rw-r--r--package/webkit/webkit-detect-harfbuzz-icu.patch28
1 files changed, 28 insertions, 0 deletions
diff --git a/package/webkit/webkit-detect-harfbuzz-icu.patch b/package/webkit/webkit-detect-harfbuzz-icu.patch
new file mode 100644
index 0000000000..dc93c67e33
--- /dev/null
+++ b/package/webkit/webkit-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])
+