Split WebKit into release expression and svn-trunk expression; WebKitGtk had a release recently, so it is not a big featurewise change

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

7 files changed, 136 insertions, 11 deletions

diff --git a/pkgs/development/libraries/webkit/default.nix b/pkgs/development/libraries/webkit/default.nix
index 5eaaeec3d16..63c6574d32a 100644
--- a/pkgs/development/libraries/webkit/default.nix
+++ b/pkgs/development/libraries/webkit/default.nix
@@ -20,14 +20,13 @@ rec {
     gstreamer gstPluginsBase gstFfmpeg gstPluginsGood
     ];
 
-  configureCommand = "./autogen.sh ";
   configureFlags = [
     "--enable-3D-transforms"
     "--enable-web-sockets"
     "--enable-web-timing"
     
     # https://bugs.webkit.org/show_bug.cgi?id=55294
-    "--enable-image-resizer"
+    # "--enable-image-resizer"
 
     "--enable-geolocation"
 
@@ -36,7 +35,7 @@ rec {
 
     "--enable-mathml"
 
-    "--enable-wml"
+    #"--enable-wml"
     
     # https://bugs.webkit.org/show_bug.cgi?id=45110
     # "--enable-indexed-database"
diff --git a/pkgs/development/libraries/webkit/src-for-default.nix b/pkgs/development/libraries/webkit/src-for-default.nix
index f90bafbf6dc..5f5149fedfe 100644
--- a/pkgs/development/libraries/webkit/src-for-default.nix
+++ b/pkgs/development/libraries/webkit/src-for-default.nix
@@ -1,9 +1,9 @@
 rec {
-   version="r86499";
-   name="webkit-r86499";
-   hash="04sfwri81x2d9y3z0v7rhrr40vn0bxcbnhb8a0gymqkwa1ngpzmp";
-   url="http://builds.nightly.webkit.org/files/trunk/src/WebKit-r86499.tar.bz2";
-   advertisedUrl="http://builds.nightly.webkit.org/files/trunk/src/WebKit-r86499.tar.bz2";
+   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";
   
   
 }
diff --git a/pkgs/development/libraries/webkit/src-for-svn.nix b/pkgs/development/libraries/webkit/src-for-svn.nix
new file mode 100644
index 00000000000..f90bafbf6dc
--- /dev/null
+++ b/pkgs/development/libraries/webkit/src-for-svn.nix
@@ -0,0 +1,9 @@
+rec {
+   version="r86499";
+   name="webkit-r86499";
+   hash="04sfwri81x2d9y3z0v7rhrr40vn0bxcbnhb8a0gymqkwa1ngpzmp";
+   url="http://builds.nightly.webkit.org/files/trunk/src/WebKit-r86499.tar.bz2";
+   advertisedUrl="http://builds.nightly.webkit.org/files/trunk/src/WebKit-r86499.tar.bz2";
+  
+  
+}
diff --git a/pkgs/development/libraries/webkit/src-info-for-default.nix b/pkgs/development/libraries/webkit/src-info-for-default.nix
index 994cae544cb..c4e5b8a6fd6 100644
--- a/pkgs/development/libraries/webkit/src-info-for-default.nix
+++ b/pkgs/development/libraries/webkit/src-info-for-default.nix
@@ -1,6 +1,6 @@
 {
-  downloadPage = "http://nightly.webkit.org/";
-  versionExtractorSedScript = "s/.*-(r[0-9]+)[.].*/\\1/";
-  versionReferenceCreator = "s/-(r[0-9.]+)[.]/-\${version}./";
+  downloadPage = "http://webkitgtk.org/?page=download";
+  versionExtractorSedScript = "s/.*-([.0-9]+)[.].*/\\1/";
+  versionReferenceCreator = "s/-([.0-9.]+)[.]/-\${version}./";
   baseName = "webkit";
 }
diff --git a/pkgs/development/libraries/webkit/src-info-for-svn.nix b/pkgs/development/libraries/webkit/src-info-for-svn.nix
new file mode 100644
index 00000000000..994cae544cb
--- /dev/null
+++ b/pkgs/development/libraries/webkit/src-info-for-svn.nix
@@ -0,0 +1,6 @@
+{
+  downloadPage = "http://nightly.webkit.org/";
+  versionExtractorSedScript = "s/.*-(r[0-9]+)[.].*/\\1/";
+  versionReferenceCreator = "s/-(r[0-9.]+)[.]/-\${version}./";
+  baseName = "webkit";
+}
diff --git a/pkgs/development/libraries/webkit/svn.nix b/pkgs/development/libraries/webkit/svn.nix
new file mode 100644
index 00000000000..5eaaeec3d16
--- /dev/null
+++ b/pkgs/development/libraries/webkit/svn.nix
@@ -0,0 +1,91 @@
+args : with args; 
+let 
+  s = import ./src-for-default.nix;
+  version = lib.attrByPath ["version"] s.version args;
+in
+rec {
+  src = fetchurl {
+    url = s.url;
+    sha256 = s.hash;
+  };
+
+  buildInputs = [gtk glib atk cairo curl fontconfig freetype
+    gettext libjpeg libpng libtiff libxml2 libxslt pango
+    sqlite icu gperf bison flex autoconf automake libtool 
+    perl intltool pkgconfig libsoup gtkdoc libXt libproxy
+    enchant python ruby which renderproto libXrender geoclue
+    ];
+
+  propagatedBuildInputs = [
+    gstreamer gstPluginsBase gstFfmpeg gstPluginsGood
+    ];
+
+  configureCommand = "./autogen.sh ";
+  configureFlags = [
+    "--enable-3D-transforms"
+    "--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-mathml"
+
+    "--enable-wml"
+    
+    # https://bugs.webkit.org/show_bug.cgi?id=45110
+    # "--enable-indexed-database"
+
+    "--enable-xhtmlmp"
+
+    # "--enable-input-speech"
+
+    "--enable-file-writer"
+    "--enable-blob"
+
+    # https://bugs.webkit.org/show_bug.cgi?id=59430
+    # "--enable-directory-upload"
+
+    # https://bugs.webkit.org/show_bug.cgi?id=58443
+    # "--enable-file-system"
+    ];
+
+  /* doConfigure should be specified separately */
+  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 
+        sed -e 's@/usr/bin/gcc@gcc@' -i $i
+    done
+  '') ["minInit" "doUnpack"];
+
+  doAddPrograms = fullDepEntry (''
+    ensureDir $out/bin
+    for i in Programs/.libs/* Programs/*; do 
+        cp $i $out/bin/webkit-program-$(basename $i) || true
+    done
+  '') ["minInit" "doMake" "defEnsureDir"];
+      
+  paranoidFixComments = fullDepEntry (''
+    sed -re 's@( |^)//.*@/* & */@' -i $(find . -name '*.c' -o -name '*.h')
+  '') ["minInit" "doUnpack"];
+
+  name = s.name;
+  meta = {
+    description = "WebKit - a fast and correct HTML renderer";
+    maintainers = [stdenv.lib.maintainers.raskin];
+  };
+  passthru = {
+    inherit gstreamer gstPluginsBase gstPluginsGood gstFfmpeg;
+  };
+}
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index da185845c8d..b0ef803d18e 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -4310,6 +4310,26 @@ let
       gstPluginsGood;
     inherit (p.xlibs) libXt renderproto libXrender;
   });
+  webkitSVN = let p = applyGlobalOverrides (x : {
+    libsoup = x.gnome28.libsoup_2_33;
+    gnome28 = x.gnome28 // {
+      libsoup = x.gnome28.libsoup_2_33;
+    };
+  });
+  in
+  (p.builderDefsPackage ../development/libraries/webkit/svn.nix {
+    inherit (p.gnome28) gtkdoc;
+    inherit (p.gtkLibs) gtk atk pango glib;
+    inherit (p) freetype fontconfig gettext gperf curl
+      libjpeg libtiff libpng libxml2 libxslt sqlite
+      icu cairo perl intltool automake libtool
+      pkgconfig autoconf bison libproxy enchant
+      python ruby which flex geoclue libsoup;
+    inherit (p.gst_all) gstreamer gstPluginsBase gstFfmpeg
+      gstPluginsGood;
+    inherit (p.xlibs) libXt renderproto libXrender;
+  });
+
 
   wvstreams = callPackage ../development/libraries/wvstreams { };