From 03419cfc5a96682797a4f3fcc462c22a12c89bca Mon Sep 17 00:00:00 2001
From: Michael Raskin <7c6f434c@mail.ru>
Date: Sun, 2 Jan 2011 13:23:59 +0000
Subject: [PATCH] Adding geoclue - as framework only, feel free to build it
 with proper data providers if you have a reason for that

svn path=/nixpkgs/trunk/; revision=25335
---
 .../development/libraries/geoclue/default.nix | 49 +++++++++++++++++++
 pkgs/development/libraries/webkit/default.nix | 15 ++++--
 .../libraries/webkit/src-for-default.nix      | 10 ++--
 pkgs/top-level/all-packages.nix               |  2 +
 4 files changed, 67 insertions(+), 9 deletions(-)
 create mode 100644 pkgs/development/libraries/geoclue/default.nix

diff --git a/pkgs/development/libraries/geoclue/default.nix b/pkgs/development/libraries/geoclue/default.nix
new file mode 100644
index 000000000000..dcf3cd178934
--- /dev/null
+++ b/pkgs/development/libraries/geoclue/default.nix
@@ -0,0 +1,49 @@
+x@{builderDefsPackage
+  , dbus, dbus_glib, glib, pkgconfig, libxml2, gnome, libxslt
+  , ...}:
+builderDefsPackage
+(a :  
+let 
+  helperArgNames = ["stdenv" "fetchurl" "builderDefsPackage"] ++ 
+    ["gnome"];
+
+  buildInputs = map (n: builtins.getAttr n x)
+    (builtins.attrNames (builtins.removeAttrs x helperArgNames))
+    ++ [gnome.GConf];
+  sourceInfo = rec {
+    baseName="geoclue";
+    version="0.12.0";
+    name="${baseName}-${version}";
+    url="http://folks.o-hand.com/jku/geoclue-releases/${name}.tar.gz";
+    hash="15j619kvmdgj2hpma92mkxbzjvgn8147a7500zl3bap9g8bkylqg";
+  };
+in
+rec {
+  src = a.fetchurl {
+    url = sourceInfo.url;
+    sha256 = sourceInfo.hash;
+  };
+
+  inherit (sourceInfo) name version;
+  inherit buildInputs;
+
+  /* doConfigure should be removed if not needed */
+  phaseNames = ["doConfigure" "doMakeInstall"];
+      
+  meta = {
+    description = "Geolocation framework and some data providers";
+    maintainers = with a.lib.maintainers;
+    [
+      raskin
+    ];
+    platforms = with a.lib.platforms;
+      linux;
+    license = a.lib.licenses.lglp2;
+  };
+  passthru = {
+    updateInfo = {
+      downloadPage = "http://folks.o-hand.com/jku/geoclue-releases/";
+    };
+  };
+}) x
+
diff --git a/pkgs/development/libraries/webkit/default.nix b/pkgs/development/libraries/webkit/default.nix
index d7f3c03eb8aa..18e9909aa248 100644
--- a/pkgs/development/libraries/webkit/default.nix
+++ b/pkgs/development/libraries/webkit/default.nix
@@ -13,7 +13,7 @@ rec {
     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
+    enchant python ruby which renderproto libXrender geoclue
     ];
 
   propagatedBuildInputs = [
@@ -27,21 +27,28 @@ rec {
     "--enable-web-timing"
     "--enable-image-resizer"
 
+    "--enable-geolocation"
+
+    # Not implemented?
+    # "--enable-web-audio"
+
     "--enable-mathml"
 
     # https://bugs.webkit.org/show_bug.cgi?id=42943
-    # "--enable-wml"
+    # FIXED
+    "--enable-wml"
     
     # https://bugs.webkit.org/show_bug.cgi?id=45110
     # "--enable-indexed-database"
 
     # Related bug is marked as closed, but seems to persist
-    # "--enable-xhtmlmp"
+    "--enable-xhtmlmp"
 
     # "--enable-input-speech"
 
     # https://bugs.webkit.org/show_bug.cgi?id=43878
-    # "--enable-file-writer"
+    # Related bug FIXED
+    "--enable-file-writer"
     # "--enable-blob"
 
     # May be or not be triggering  https://bugs.webkit.org/show_bug.cgi?id=43878
diff --git a/pkgs/development/libraries/webkit/src-for-default.nix b/pkgs/development/libraries/webkit/src-for-default.nix
index 93085c99ab3e..f0faeb1f48f6 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="r70732";
-   name="webkit-r70732";
-   hash="1y81rir7mwqxd40i4zzq79c7wa0pvvgvk332k1j94xwqfrffnxzi";
-   url="http://builds.nightly.webkit.org/files/trunk/src/WebKit-r70732.tar.bz2";
-   advertisedUrl="http://builds.nightly.webkit.org/files/trunk/src/WebKit-r70732.tar.bz2";
+   version="r74228";
+   name="webkit-r74228";
+   hash="1vwh72zzvj2p9lrs847wmcxgpjl2411blfk6ry3wczcdwg712a46";
+   url="http://builds.nightly.webkit.org/files/trunk/src/WebKit-r74228.tar.bz2";
+   advertisedUrl="http://builds.nightly.webkit.org/files/trunk/src/WebKit-r74228.tar.bz2";
   
   
 }
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 5330733b730f..b77aa3387c30 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -2970,6 +2970,8 @@ let
     inherit (gtkLibs) pango glib gtk;
   };
 
+  geoclue = callPackage ../development/libraries/geoclue {};
+
   geoip = builderDefsPackage ../development/libraries/geoip {
     inherit zlib;
   };