Merge branch '3.0' into 3.1

This commit is contained in:
Danny Rawlins 2014-03-22 18:50:26 +11:00
commit bbad2353d6
3 changed files with 17 additions and 17 deletions

View File

@ -693,25 +693,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.15.9
lrwxrwxrwx root/root usr/lib/libjavascriptcoregtk-1.0.so.0 -> libjavascriptcoregtk-1.0.so.0.15.9
-rwxr-xr-x root/root usr/lib/libjavascriptcoregtk-1.0.so.0.15.9
lrwxrwxrwx root/root usr/lib/libjavascriptcoregtk-1.0.so -> libjavascriptcoregtk-1.0.so.0.15.11
lrwxrwxrwx root/root usr/lib/libjavascriptcoregtk-1.0.so.0 -> libjavascriptcoregtk-1.0.so.0.15.11
-rwxr-xr-x root/root usr/lib/libjavascriptcoregtk-1.0.so.0.15.11
-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.15.9
lrwxrwxrwx root/root usr/lib/libjavascriptcoregtk-3.0.so.0 -> libjavascriptcoregtk-3.0.so.0.15.9
-rwxr-xr-x root/root usr/lib/libjavascriptcoregtk-3.0.so.0.15.9
lrwxrwxrwx root/root usr/lib/libjavascriptcoregtk-3.0.so -> libjavascriptcoregtk-3.0.so.0.15.11
lrwxrwxrwx root/root usr/lib/libjavascriptcoregtk-3.0.so.0 -> libjavascriptcoregtk-3.0.so.0.15.11
-rwxr-xr-x root/root usr/lib/libjavascriptcoregtk-3.0.so.0.15.11
-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.4.6
lrwxrwxrwx root/root usr/lib/libwebkit2gtk-3.0.so.25 -> libwebkit2gtk-3.0.so.25.4.6
-rwxr-xr-x root/root usr/lib/libwebkit2gtk-3.0.so.25.4.6
lrwxrwxrwx root/root usr/lib/libwebkit2gtk-3.0.so -> libwebkit2gtk-3.0.so.25.4.8
lrwxrwxrwx root/root usr/lib/libwebkit2gtk-3.0.so.25 -> libwebkit2gtk-3.0.so.25.4.8
-rwxr-xr-x root/root usr/lib/libwebkit2gtk-3.0.so.25.4.8
-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.19.12
lrwxrwxrwx root/root usr/lib/libwebkitgtk-1.0.so.0 -> libwebkitgtk-1.0.so.0.19.12
-rwxr-xr-x root/root usr/lib/libwebkitgtk-1.0.so.0.19.12
lrwxrwxrwx root/root usr/lib/libwebkitgtk-1.0.so -> libwebkitgtk-1.0.so.0.19.14
lrwxrwxrwx root/root usr/lib/libwebkitgtk-1.0.so.0 -> libwebkitgtk-1.0.so.0.19.14
-rwxr-xr-x root/root usr/lib/libwebkitgtk-1.0.so.0.19.14
-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.19.12
lrwxrwxrwx root/root usr/lib/libwebkitgtk-3.0.so.0 -> libwebkitgtk-3.0.so.0.19.12
-rwxr-xr-x root/root usr/lib/libwebkitgtk-3.0.so.0.19.12
lrwxrwxrwx root/root usr/lib/libwebkitgtk-3.0.so -> libwebkitgtk-3.0.so.0.19.14
lrwxrwxrwx root/root usr/lib/libwebkitgtk-3.0.so.0 -> libwebkitgtk-3.0.so.0.19.14
-rwxr-xr-x root/root usr/lib/libwebkitgtk-3.0.so.0.19.14
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 +1 @@
d2af0d2d75f18cac33bd82ee63e22571 webkitgtk-2.2.4.tar.xz
245a9f8cac251662b7abf19903332038 webkitgtk-2.2.6.tar.xz

View File

@ -5,7 +5,7 @@
# Depends on: enchant gst-plugins-base1 gtk3 harfbuzz-icu libsoup glu ruby gperf libwebp libsecret
name=webkit
version=2.2.4
version=2.2.6
release=1
source=(http://webkitgtk.org/releases/webkitgtk-$version.tar.xz)