Update and fix WebKit

svn path=/nixpkgs/branches/glib-2.30-take2/; revision=33323

pkgs/development/libraries/libxml2/default.nix

@@ -3,11 +3,11 @@
 assert pythonSupport -> python != null;
 
 stdenv.mkDerivation {
-  name = "libxml2-2.7.7";
+  name = "libxml2-2.7.8";
 
   src = fetchurl {
-    url = ftp://xmlsoft.org/libxml2/libxml2-sources-2.7.7.tar.gz;
-    sha256 = "03kkknm7xl77qfdig8mzalsi8ljsyblzin18gy3h8zranffrpyzs";
+    url = ftp://xmlsoft.org/libxml2/libxml2-sources-2.7.8.tar.gz;
+    sha256 = "6a33c3a2d18b902cd049e0faa25dd39f9b554a5b09a3bb56ee07dd7938b11c54";
   };
 
   configureFlags = ''                                                  

pkgs/development/libraries/webkit/default.nix

@@ -14,6 +14,7 @@ rec {
     sqlite icu gperf bison flex autoconf automake libtool 
     perl intltool pkgconfig libsoup gtkdoc libXt libproxy
     enchant python ruby which renderproto libXrender geoclue
+    kbproto
     ];
 
   propagatedBuildInputs = [
@@ -25,22 +26,20 @@ rec {
     "--enable-web-sockets"
     "--enable-web-timing"
     
-    # https://bugs.webkit.org/show_bug.cgi?id=55294
-    # "--enable-image-resizer"
-
     "--enable-geolocation"
 
     # Not implemented?
-    # "--enable-web-audio"
+    #"--enable-web-audio"
 
     "--enable-mathml"
 
     #"--enable-wml"
     
     # https://bugs.webkit.org/show_bug.cgi?id=45110
-    # "--enable-indexed-database"
+    #"--enable-indexed-database"
 
-    "--enable-xhtmlmp"
+    # Doesn't work in release...
+    #"--enable-xhtmlmp"
 
     # "--enable-input-speech"
 
@@ -48,10 +47,10 @@ rec {
     "--enable-blob"
 
     # https://bugs.webkit.org/show_bug.cgi?id=59430
-    # "--enable-directory-upload"
+    #"--enable-directory-upload"
 
     # https://bugs.webkit.org/show_bug.cgi?id=58443
-    # "--enable-file-system"
+    #"--enable-file-system"
     ];
 
   /* doConfigure should be specified separately */

pkgs/development/libraries/webkit/src-for-default.nix

@@ -1,9 +1,9 @@
 rec {
-   version="1.4.0";
-   name="webkit-1.4.0";
-   hash="123zllzlnkjgw4d2ag73dvrjmkikbapxlz5730ps6y4qm43gxc1y";
-   url="http://webkitgtk.org/webkit-1.4.0.tar.gz";
-   advertisedUrl="http://webkitgtk.org/webkit-1.4.0.tar.gz";
+   version="1.6.3";
+   name="webkit-1.6.3";
+   hash="1hvph13ak7a85qmj1ikanwxf2nn53m5f6a50j627lp49db7dpl0j";
+   url="http://webkitgtk.org/webkit-1.6.3.tar.xz";
+   advertisedUrl="http://webkitgtk.org/webkit-1.6.3.tar.xz";
   
   
 }

pkgs/top-level/all-packages.nix

@@ -4734,7 +4734,8 @@ let
   webkit =
     builderDefsPackage ../development/libraries/webkit {
       inherit (gnome) gtkdoc libsoup;
-      inherit gtk atk pango glib;
+      inherit atk pango glib;
+      gtk = gtk3;
       inherit freetype fontconfig gettext gperf curl
         libjpeg libtiff libxml2 libxslt sqlite
         icu cairo perl intltool automake libtool
@@ -4742,7 +4743,7 @@ let
         python ruby which flex geoclue;
       inherit gstreamer gst_plugins_base gst_ffmpeg
         gst_plugins_good;
-      inherit (xlibs) libXt renderproto libXrender;
+      inherit (xlibs) libXt renderproto libXrender kbproto;
       libpng = libpng12;
     };