Update WebKit and Midori

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

pkgs/applications/networking/browsers/midori/default.nix

@@ -5,18 +5,18 @@ let
   doPatchShebangs = args.doPatchShebangs;
   makeManyWrappers = args.makeManyWrappers;
 
-  version = lib.attrByPath ["version"] "0.0.21" args; 
+  version = lib.attrByPath ["version"] "0.1.7" args; 
   buildInputs = with args; [
     intltool python imagemagick gtk glib webkit libxml2 
     gtksourceview pkgconfig which gettext makeWrapper 
-    file
+    file libidn sqlite docutils libnotify libsoup
   ];
 in
 rec {
   src = fetchurl {
     url = "http://goodies.xfce.org/releases/midori/midori-${version}.tar.bz2";
-    sha256 = if version == "0.0.21" then 
-      "0cbpvjdfzgbqwn8rfkp3l35scfvz9cc8hip8v35vkxpac9igcqg5"
+    sha256 = if version == "0.1.7" then 
+      "1bxs4nlwvhzwiq73lf1gvx7qqdm1hm4x1hym1b0q0dhwhdvafx4v"
     else null;
   };
 

pkgs/desktops/gnome/default.nix

@@ -275,7 +275,8 @@ rec {
   };
 
   libsoup = import ./libsoup.nix {
-    inherit stdenv fetchurl pkgconfig libxml2 glib;
+    inherit stdenv fetchurl pkgconfig libxml2 glib 
+      libproxy GConf sqlite;
     input = desktop.libsoup;
   };
   

pkgs/desktops/gnome/libsoup.nix

@@ -1,6 +1,8 @@
-{input, stdenv, fetchurl, pkgconfig, libxml2, glib}:
+{input, stdenv, fetchurl, pkgconfig, libxml2, glib
+  , libproxy, GConf, sqlite}:
 
 stdenv.mkDerivation {
   inherit (input) name src;
-  buildInputs = [pkgconfig libxml2 glib];
+  buildInputs = [pkgconfig libxml2 glib libproxy 
+    GConf sqlite];
 }

pkgs/development/libraries/webkit/default.nix

@@ -1,21 +1,28 @@
 args : with args; 
-let version = lib.attrByPath ["version"] "r34824" args; in
+let version = lib.attrByPath ["version"] "r44341" args; in
 rec {
   src = fetchurl {
     url = "http://nightly.webkit.org/files/trunk/src/WebKit-${version}.tar.bz2";
-    sha256 = "10h295niz1np0rfjqchvjda8kdxf9z0qrk2r3x8xbrbva1y6dfn6";
+    sha256 = "17byp4v47xk6xdxq6adpf0b9vswasrhj4f5pw0y2z80lgd1sxcly";
   };
 
   buildInputs = [gtk atk cairo curl fontconfig freetype
     gettext libjpeg libpng libtiff libxml2 libxslt pango
     sqlite icu gperf bison flex autoconf automake libtool 
-    perl intltool pkgconfig];
+    perl intltool pkgconfig libsoup gtkdoc libXt libproxy
+    enchant gstreamer gstPluginsBase gstFfmpeg
+    ];
 
   configureCommand = "./autogen.sh ";
   configureFlags = [];
 
   /* doConfigure should be specified separately */
-  phaseNames = ["doConfigure" (doPatchShebangs ".") "doReplaceUsrBin" "doMakeInstall" "doAddPrograms"];
+  phaseNames = ["setVars" "paranoidFixComments" "doConfigure" (doPatchShebangs ".") 
+    "doReplaceUsrBin" "doMakeInstall" "doAddPrograms"];
+
+  setVars = fullDepEntry (''
+    export NIX_LDFLAGS="$NIX_LDFLAGS -lXt"
+  '') ["minInit"];
 
   doReplaceUsrBin = fullDepEntry (''
     for i in $(find . -name '*.pl') $(find . -name '*.pm'); do 
@@ -29,6 +36,10 @@ rec {
     done
   '') ["minInit" "doMake" "defEnsureDir"];
       
+  paranoidFixComments = fullDepEntry (''
+    sed -re 's@( |^)//.*@/* & */@' -i $(find . -name '*.c' -o -name '*.h')
+  '') ["minInit" "doUnpack"];
+
   name = "webkit-" + version;
   meta = {
     description = "WebKit - a fast and correct HTML renderer";

pkgs/top-level/all-packages.nix

@@ -3579,6 +3579,9 @@ let
     inherit fetchurl stdenv zlib;
   };
 
+  libproxy = builderDefsPackage (import ../development/libraries/libproxy) {
+  };
+
   libproxy = import ../development/libraries/libproxy {
     inherit stdenv fetchurl;
   };
@@ -4047,12 +4050,14 @@ let
   };
 
   webkit = builderDefsPackage (import ../development/libraries/webkit) {
-    inherit (gtkLibs) gtk atk pango;
+    inherit (gnome) gtk atk pango libsoup gtkdoc;
     inherit freetype fontconfig gettext gperf curl
       libjpeg libtiff libpng libxml2 libxslt sqlite
       icu cairo perl intltool automake libtool
-      pkgconfig autoconf bison;
+      pkgconfig autoconf bison libproxy enchant;
+    inherit (gst_all) gstreamer gstPluginsBase gstFfmpeg;
     flex = flex2535;
+    inherit (xlibs) libXt;
   };
 
   wxGTK = wxGTK26;
@@ -6535,9 +6540,9 @@ let
 
   midori = builderDefsPackage (import ../applications/networking/browsers/midori) {
     inherit imagemagick intltool python pkgconfig webkit libxml2
-      which gettext makeWrapper file;
+      which gettext makeWrapper file libidn sqlite docutils libnotify;
     inherit (gtkLibs) gtk glib;
-    inherit (gnome) gtksourceview;
+    inherit (gnome) gtksourceview libsoup;
   };
 
   minicom = builderDefsPackage (selectVersion ../tools/misc/minicom "2.3") {
@@ -7431,7 +7436,8 @@ let
       gettext x11 libtiff libjpeg libpng gtkLibs xlibs bzip2
       libcm python dbus dbus_glib ncurses which libxml2Python
       iconnamingutils openssl hal samba fam libgcrypt libtasn1
-      xmlto docbook2x docbook_xsl intltool enchant isocodes policyKit;
+      xmlto docbook2x docbook_xsl intltool enchant isocodes policyKit
+      libproxy sqlite;
   });
   
   gnome26 = import ../desktops/gnome-2.26 pkgs;

pkgs/top-level/release.nix

@@ -229,6 +229,7 @@ in {
   mdadm = linux;
   mercurial = allBut "i686-cygwin";
   mesa = linux;
+  midori = linux;
   mingetty = linux;
   mk = linux;
   mktemp = all;