webkit: 2.0.2 -> 2.0.3

This commit is contained in:
Danny Rawlins 2013-06-14 08:53:04 +10:00
parent dd03d65a97
commit 23c85c6dfb
4 changed files with 19 additions and 38 deletions

View File

@ -677,25 +677,25 @@ drwxr-xr-x root/root usr/include/webkitgtk-3.0/webkitdom/
-rw-r--r-- root/root usr/include/webkitgtk-3.0/webkitdom/webkitdomdefines.h
drwxr-xr-x root/root usr/lib/
-rwxr-xr-x root/root usr/lib/libjavascriptcoregtk-1.0.la
lrwxrwxrwx root/root usr/lib/libjavascriptcoregtk-1.0.so -> libjavascriptcoregtk-1.0.so.0.13.14
lrwxrwxrwx root/root usr/lib/libjavascriptcoregtk-1.0.so.0 -> libjavascriptcoregtk-1.0.so.0.13.14
-rwxr-xr-x root/root usr/lib/libjavascriptcoregtk-1.0.so.0.13.14
lrwxrwxrwx root/root usr/lib/libjavascriptcoregtk-1.0.so -> libjavascriptcoregtk-1.0.so.0.13.15
lrwxrwxrwx root/root usr/lib/libjavascriptcoregtk-1.0.so.0 -> libjavascriptcoregtk-1.0.so.0.13.15
-rwxr-xr-x root/root usr/lib/libjavascriptcoregtk-1.0.so.0.13.15
-rwxr-xr-x root/root usr/lib/libjavascriptcoregtk-3.0.la
lrwxrwxrwx root/root usr/lib/libjavascriptcoregtk-3.0.so -> libjavascriptcoregtk-3.0.so.0.13.14
lrwxrwxrwx root/root usr/lib/libjavascriptcoregtk-3.0.so.0 -> libjavascriptcoregtk-3.0.so.0.13.14
-rwxr-xr-x root/root usr/lib/libjavascriptcoregtk-3.0.so.0.13.14
lrwxrwxrwx root/root usr/lib/libjavascriptcoregtk-3.0.so -> libjavascriptcoregtk-3.0.so.0.13.15
lrwxrwxrwx root/root usr/lib/libjavascriptcoregtk-3.0.so.0 -> libjavascriptcoregtk-3.0.so.0.13.15
-rwxr-xr-x root/root usr/lib/libjavascriptcoregtk-3.0.so.0.13.15
-rwxr-xr-x root/root usr/lib/libwebkit2gtk-3.0.la
lrwxrwxrwx root/root usr/lib/libwebkit2gtk-3.0.so -> libwebkit2gtk-3.0.so.25.0.2
lrwxrwxrwx root/root usr/lib/libwebkit2gtk-3.0.so.25 -> libwebkit2gtk-3.0.so.25.0.2
-rwxr-xr-x root/root usr/lib/libwebkit2gtk-3.0.so.25.0.2
lrwxrwxrwx root/root usr/lib/libwebkit2gtk-3.0.so -> libwebkit2gtk-3.0.so.25.0.3
lrwxrwxrwx root/root usr/lib/libwebkit2gtk-3.0.so.25 -> libwebkit2gtk-3.0.so.25.0.3
-rwxr-xr-x root/root usr/lib/libwebkit2gtk-3.0.so.25.0.3
-rwxr-xr-x root/root usr/lib/libwebkitgtk-1.0.la
lrwxrwxrwx root/root usr/lib/libwebkitgtk-1.0.so -> libwebkitgtk-1.0.so.0.18.7
lrwxrwxrwx root/root usr/lib/libwebkitgtk-1.0.so.0 -> libwebkitgtk-1.0.so.0.18.7
-rwxr-xr-x root/root usr/lib/libwebkitgtk-1.0.so.0.18.7
lrwxrwxrwx root/root usr/lib/libwebkitgtk-1.0.so -> libwebkitgtk-1.0.so.0.18.8
lrwxrwxrwx root/root usr/lib/libwebkitgtk-1.0.so.0 -> libwebkitgtk-1.0.so.0.18.8
-rwxr-xr-x root/root usr/lib/libwebkitgtk-1.0.so.0.18.8
-rwxr-xr-x root/root usr/lib/libwebkitgtk-3.0.la
lrwxrwxrwx root/root usr/lib/libwebkitgtk-3.0.so -> libwebkitgtk-3.0.so.0.18.7
lrwxrwxrwx root/root usr/lib/libwebkitgtk-3.0.so.0 -> libwebkitgtk-3.0.so.0.18.7
-rwxr-xr-x root/root usr/lib/libwebkitgtk-3.0.so.0.18.7
lrwxrwxrwx root/root usr/lib/libwebkitgtk-3.0.so -> libwebkitgtk-3.0.so.0.18.8
lrwxrwxrwx root/root usr/lib/libwebkitgtk-3.0.so.0 -> libwebkitgtk-3.0.so.0.18.8
-rwxr-xr-x root/root usr/lib/libwebkitgtk-3.0.so.0.18.8
drwxr-xr-x root/root usr/lib/pkgconfig/
-rw-r--r-- root/root usr/lib/pkgconfig/javascriptcoregtk-1.0.pc
-rw-r--r-- root/root usr/lib/pkgconfig/javascriptcoregtk-3.0.pc

View File

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

View File

@ -5,17 +5,13 @@
# Depends on: enchant gst-plugins-base1 gtk3 harfbuzz-icu libsoup glu ruby gperf libwebp libsecret
name=webkit
version=2.0.2
release=2
source=(http://webkitgtk.org/releases/webkitgtk-$version.tar.xz
harfbuzz-icu.patch)
version=2.0.3
release=1
source=(http://webkitgtk.org/releases/webkitgtk-$version.tar.xz)
build() {
cd webkitgtk-$version
# http://trac.webkit.org/changeset/150963
patch -p2 -i $SRC/harfbuzz-icu.patch
mkdir build-gtk2 build-gtk3
local config="\

View File

@ -1,14 +0,0 @@
--- 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])