[notify] new dependency harfbuzz-icu

webkit/.md5sum

@@ -1 +1,2 @@
+f62fac3cf11a9868cdd9fcc5c284d10f  harfbuzz-icu.patch
 a4024f4b33d829ec1034179e94f9cab6  webkitgtk-2.0.2.tar.xz

webkit/Pkgfile

@@ -2,25 +2,26 @@
 # URL: http://www.webkitgtk.org/
 # Maintainer: Danny Rawlins, monster dot romster at gmail dot com
 # Packager: Brett Goulder, predatorfreak at dcaf-security dot org
-# Depends on: enchant gst-plugins-base1 gtk3 icu libsoup glu ruby gperf libwebp libsecret
-# Nice to have: geoclue
+# Depends on: enchant gst-plugins-base1 gtk3 harfbuzz-icu libsoup glu ruby gperf libwebp libsecret
 
 name=webkit
 version=2.0.2
-release=1
-source=(http://webkitgtk.org/releases/webkitgtk-$version.tar.xz)
+release=2
+source=(http://webkitgtk.org/releases/webkitgtk-$version.tar.xz
+	harfbuzz-icu.patch)
 
 build() {
 	cd webkitgtk-$version
+
+	# http://trac.webkit.org/changeset/150963
+	patch -p2 -i $SRC/harfbuzz-icu.patch
+
 	mkdir build-gtk2 build-gtk3
 
-	if [ -z "$(pkginfo -i | grep '^geoclue ')" ]; then
-		local config='--disable-geolocation '
-	fi
-
-	local config+="\
+	local config="\
 --prefix=/usr \
 --mandir=/usr/man \
+--disable-geolocation \
 --disable-gtk-doc-html \
 --disable-silent-rules \
 --enable-video \

webkit/README

@@ -1,9 +0,0 @@
-Be sure to compile harfbuzz with icu support,
-or webkit will fail to compile.
-
-You can check that harfbuzz has icu support by
-seeing if you have the following file present
-on your system
-
-ls /usr/include/harfbuzz/hb-icu.h
-/usr/include/harfbuzz/hb-icu.h

webkit/harfbuzz-icu.patch

@@ -0,0 +1,14 @@
+--- a/trunk/Source/autotools/FindDependencies.m4
++++ b/trunk/Source/autotools/FindDependencies.m4
+@@ -376,4 +376,11 @@
+         [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])