Roll back to older WebKit anyway pending a GTK update

svn path=/nixpkgs/trunk/; revision=16836

5 files changed, 15 insertions, 14 deletions

diff --git a/pkgs/applications/networking/browsers/uzbl/default.nix b/pkgs/applications/networking/browsers/uzbl/default.nix
index b58d273d6211..bb46ef054d35 100644
--- a/pkgs/applications/networking/browsers/uzbl/default.nix
+++ b/pkgs/applications/networking/browsers/uzbl/default.nix
@@ -32,9 +32,6 @@ rec {
     '';
 
   installFlags = "PREFIX=$out";
-  makeFlags = [
-    "CC='gcc ${a.glib}/lib/libglib-2.0.so ${a.glib}/lib/libgio-2.0.so ${a.glib}/lib/libgobject-2.0.so' "
-  ];
       
   name = "uzbl-" + version;
   meta = {
diff --git a/pkgs/development/libraries/webkit/default.nix b/pkgs/development/libraries/webkit/default.nix
index 9fd1b2415518..9b1ab8ee09fc 100644
--- a/pkgs/development/libraries/webkit/default.nix
+++ b/pkgs/development/libraries/webkit/default.nix
@@ -27,7 +27,11 @@ rec {
     "--enable-web-sockets"
     # Fails the build..
     # "--enable-shared-workers"
-    "--enable-wml"
+    # WML support causes crash on
+    # Slashdot.org. It is fixed upstream,
+    # but the required update is too big
+    # Let us wait for a GTK release..
+    #"--enable-wml"
     ];
 
   /* doConfigure should be specified separately */
diff --git a/pkgs/development/libraries/webkit/src-for-default.nix b/pkgs/development/libraries/webkit/src-for-default.nix
index 3e1c2fb472ff..099f9c0a9653 100644
--- a/pkgs/development/libraries/webkit/src-for-default.nix
+++ b/pkgs/development/libraries/webkit/src-for-default.nix
@@ -1,6 +1,6 @@
 rec {
-  advertisedUrl="http://builds.nightly.webkit.org/files/trunk/src/WebKit-r47686.tar.bz2";
-  version = "r47686";
+  advertisedUrl="http://builds.nightly.webkit.org/files/trunk/src/WebKit-r47291.tar.bz2";
+  version = "r47291";
   url="http://builds.nightly.webkit.org/files/trunk/src/WebKit-${version}.tar.bz2";
-  hash = "1h1frvvp8hfv3q2drjnrpgadgin55p7nv8747kxxhdkj4gv9dzqg";
+  hash = "14rggsgpsaxfph1967hbwlz814d8zyzl6xwzl7a25f6zf1nwcjdk";
 }
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 7040dbfeee7c..af20ab3c4c50 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -3202,7 +3202,7 @@ let
     inherit (gtkLibs) glib pango gtk;
     inherit (gnome) gnomevfs /* <- only passed for the no longer used older versions
              it is depreceated and didn't build on amd64 due to samba dependenccy */ gtkdoc;
-    libsoup = gnome26.libsoup_git_head;
+    libsoup = gnome26.libsoup;
   });
 
   gnet = import ../development/libraries/gnet {
@@ -4125,7 +4125,7 @@ let
   };
 
   webkit = builderDefsPackage (import ../development/libraries/webkit) {
-    libsoup = gnome26.libsoup_git_head;
+    libsoup = gnome26.libsoup;
     inherit (gnome) gtkdoc;
     inherit (gtkLibs) gtk atk pango;
     inherit freetype fontconfig gettext gperf curl
@@ -6767,8 +6767,8 @@ let
       which gettext makeWrapper file libidn sqlite docutils libnotify;
     inherit (gtkLibs) gtk;
     inherit (gnome) gtksourceview;
-    libsoup = gnome26.libsoup_git_head;
-    glib = gtkLibs.glib_2_21;
+    libsoup = gnome26.libsoup;
+    glib = gtkLibs.glib;
   };
 
   minicom = builderDefsPackage (selectVersion ../tools/misc/minicom "2.3") {
@@ -7211,8 +7211,8 @@ let
   uzbl = builderDefsPackage (import ../applications/networking/browsers/uzbl) {
     inherit pkgconfig webkit makeWrapper;
     inherit (gtkLibs) gtk;
-    libsoup = gnome26.libsoup_git_head;
-    glib = gtkLibs.glib_2_21;
+    libsoup = gnome26.libsoup;
+    glib = gtkLibs.glib;
   };
 
   valknut = import ../applications/networking/p2p/valknut {
diff --git a/pkgs/top-level/release.nix b/pkgs/top-level/release.nix
index 9827f2b65695..c5e00663cf96 100644
--- a/pkgs/top-level/release.nix
+++ b/pkgs/top-level/release.nix
@@ -238,7 +238,7 @@ in {
   mdadm = linux;
   mercurial = allBut "i686-cygwin";
   mesa = linux ++ darwin;
-  #midori = linux;
+  midori = linux;
   mingetty = linux;
   mk = linux;
   mktemp = all;