diff options
| -rw-r--r-- | extra/webkit/.footprint | 6 | ||||
| -rw-r--r-- | extra/webkit/.md5sum | 3 | ||||
| -rwxr-xr-x | extra/webkit/Pkgfile | 26 | ||||
| -rw-r--r-- | extra/webkit/webkit-1.2.6-introspection.patch | 22 |
4 files changed, 42 insertions, 15 deletions
diff --git a/extra/webkit/.footprint b/extra/webkit/.footprint index 52bf76015..5ef1fbc46 100644 --- a/extra/webkit/.footprint +++ b/extra/webkit/.footprint @@ -44,9 +44,9 @@ drwxr-xr-x root/root usr/lib/girepository-1.0/ -rw-r--r-- root/root usr/lib/girepository-1.0/JSCore-1.0.typelib -rw-r--r-- root/root usr/lib/girepository-1.0/WebKit-1.0.typelib -rwxr-xr-x root/root usr/lib/libwebkit-1.0.la -lrwxrwxrwx root/root usr/lib/libwebkit-1.0.so -> libwebkit-1.0.so.2.17.3 -lrwxrwxrwx root/root usr/lib/libwebkit-1.0.so.2 -> libwebkit-1.0.so.2.17.3 --rwxr-xr-x root/root usr/lib/libwebkit-1.0.so.2.17.3 +lrwxrwxrwx root/root usr/lib/libwebkit-1.0.so -> libwebkit-1.0.so.2.17.8 +lrwxrwxrwx root/root usr/lib/libwebkit-1.0.so.2 -> libwebkit-1.0.so.2.17.8 +-rwxr-xr-x root/root usr/lib/libwebkit-1.0.so.2.17.8 drwxr-xr-x root/root usr/lib/pkgconfig/ -rw-r--r-- root/root usr/lib/pkgconfig/webkit-1.0.pc drwxr-xr-x root/root usr/share/ diff --git a/extra/webkit/.md5sum b/extra/webkit/.md5sum index 9096a7039..a0900cdbc 100644 --- a/extra/webkit/.md5sum +++ b/extra/webkit/.md5sum @@ -1 +1,2 @@ -eb6f473d8d7be56ecd226e7dd55dcb9b webkit-1.2.1.tar.gz +e7e83312618cb30cc9a1567a21cd0e06 webkit-1.2.6-introspection.patch +7afb510040b2a49c65514a06bb8200fc webkit-1.2.6.tar.gz diff --git a/extra/webkit/Pkgfile b/extra/webkit/Pkgfile index 469c4a14c..3799b610e 100755 --- a/extra/webkit/Pkgfile +++ b/extra/webkit/Pkgfile @@ -5,20 +5,24 @@ # Depends on: curl, dbus, gconf, gnome-vfs, gperf, gstreamer, gst-plugins-base, gtk, icu, libpng, orbit2, pango, enchant, libsoup, gir-repository name=webkit -version=1.2.1 -release=2 -source=(http://webkitgtk.org/$name-$version.tar.gz) +version=1.2.6 +release=1 +source=(http://webkitgtk.org/$name-$version.tar.gz + webkit-1.2.6-introspection.patch) build() { -cd $name-$version + unset MAKEFLAGS + cd $name-$version + patch -Np0 -i ../webkit-1.2.6-introspection.patch ./configure --prefix=/usr \ - --localstatedir=/var \ - --enable-introspection \ - --with-font-backend=freetype \ - --disable-gtk-doc \ - --enable-jit \ - --sysconfdir=/etc \ - --enable-video + --localstatedir=/var \ + --enable-introspection \ + --with-font-backend=freetype \ + --disable-gtk-doc \ + --enable-jit \ + --sysconfdir=/etc \ + --with-unicode-backend=icu \ + --enable-video make make DESTDIR=$PKG install } diff --git a/extra/webkit/webkit-1.2.6-introspection.patch b/extra/webkit/webkit-1.2.6-introspection.patch new file mode 100644 index 000000000..f12e9e629 --- /dev/null +++ b/extra/webkit/webkit-1.2.6-introspection.patch @@ -0,0 +1,22 @@ +--- WebKit/gtk/JSCore-1.0.gir 2010-09-29 14:54:07.000000000 +0200 ++++ WebKit/gtk/JSCore-1.0.gir 2010-09-29 15:57:06.000000000 +0200 +@@ -1,12 +1,14 @@ + <?xml version="1.0"?> +-<repository version="1.0" ++<repository version="1.2" + xmlns="http://www.gtk.org/introspection/core/1.0" + xmlns:c="http://www.gtk.org/introspection/c/1.0"> + <namespace name="JSCore" version="1.0" shared-library="webkit-1.0"> +- <alias name="GlobalContextRef" +- target="none" +- c:type="JSGlobalContextRef"/> +- <alias name="ObjectRef" target="none" c:type="JSObjectRef"/> ++ <alias name="GlobalContextRef" target="none"> ++ <type name="JSGlobalContextRef" c:type="JSGlobalContextRef"/> ++ </alias> ++ <alias name="ObjectRef" target="none"> ++ <type name="JSObjectRef" c:type="JSObjectRef"/> ++ </alias> + <function name="EvaluateScript" c:identifier="JSEvaluateScript"> + <return-value transfer-ownership="none"> + <type name="none" c:type="void"/> |