Index: networking/netlibs/geoclue.xml
===================================================================
--- networking/netlibs/geoclue.xml	(revision 41560e11c429ede8516edb8a1a6f779ab8cfda7f)
+++ networking/netlibs/geoclue.xml	(revision e1a827c618cc249841bfc63006ab481513e9bed8)
@@ -6,9 +6,9 @@
 
   <!ENTITY geoclue-download-http
-  "http://www.freedesktop.org/software/geoclue/releases/2.1/geoclue-&geoclue-version;">
+  "https://launchpad.net/geoclue/trunk/0.12/+download/geoclue-0.12.0.tar.gz">
   <!ENTITY geoclue-download-ftp  " ">
-  <!ENTITY geoclue-md5sum        "87f91ca7db6cc7726067fcd7bc3cf9bb">
-  <!ENTITY geoclue-size          "324 KB">
-  <!ENTITY geoclue-buildsize     "8.4 MB">
+  <!ENTITY geoclue-md5sum        "33af8307f332e0065af056ecba65fec2">
+  <!ENTITY geoclue-size          "556 KB">
+  <!ENTITY geoclue-buildsize     "11 MB">
   <!ENTITY geoclue-time          "0.1 SBU">
 ]>
@@ -74,10 +74,21 @@
     </itemizedlist>
 
+    <bridgehead renderas="sect3">Additional Downloads</bridgehead>
+    <itemizedlist spacing="compact">
+      <listitem>
+        <para>
+          Required patch (if GPSD is installed):
+          <ulink url="&patch-root;/geoclue-&geoclue-version;-gpsd_fix-1.patch"/>
+        </para>
+      </listitem>
+    </itemizedlist>
+
     <bridgehead renderas="sect3">GeoClue Dependencies</bridgehead>
 
     <bridgehead renderas="sect4">Required</bridgehead>
     <para role="required">
-      <xref linkend="dbus-glib"/>, and
-      <xref linkend="json-glib"/>
+      <xref linkend="dbus-glib"/>,
+      <xref linkend="GConf"/> and
+      <xref linkend="libxslt"/>
     </para>
 
@@ -90,6 +101,7 @@
     <bridgehead renderas="sect4">Optional</bridgehead>
     <para role="optional">
-      <ulink url="http://www.freedesktop.org/software/ModemManager/">ModemManager</ulink>, and
-      <xref linkend="gtk-doc"/>
+      <ulink url="https://savannah.nongnu.org/projects/gpsd">GPSD</ulink>,
+      <xref linkend="gtk2"/> and
+      <ulink url="http://ofono.org/">oFono</ulink>
     </para>
 
@@ -107,6 +119,10 @@
     </para>
 
-<screen><userinput>
-./configure --prefix=/usr --disable-modem-gps-source --disable-3g-source --sysconfdir=/etc &amp;&amp;
+<screen><userinput>patch -Np1 -i ../geoclue-&geoclue-version;-gpsd_fix-1.patch &amp;&amp;
+sed -i "s@ -Werror@@" configure &amp;&amp;
+sed -i "s@libnm_glib@libnm-glib@g" configure &amp;&amp;
+sed -i "s@geoclue/libgeoclue.la@&amp; -lgthread-2.0@g" \
+       providers/skyhook/Makefile.in &amp;&amp;
+./configure --prefix=/usr &amp;&amp;
 make</userinput></screen>
 
@@ -126,39 +142,30 @@
 
     <para>
-      <option>--disable-modem-gps-source</option>: This switch disables
-       the modem GPS backend.  Remove it if you have installed the
-       optional <application>ModemManager</application> application.
-    </para>
-
-    <para>
-      <option>--disable-3g-source</option>: This switch disables the
-      3G backend.  Remove it if you have installed the optional
-      <application>ModemManager</application> application.
-    </para>
-
-  </sect2>
-
-
-  <sect2 role="configuration">
-    <title>Configuring Geoclue</title>
-
-    <sect3  id="geoclue-init">
-      <title>Systemd Units</title>
-
-      <para>
-        To start the <command>geoclue-service</command> at boot, enable
-        the previously installed systemd unit by running the following command
-        as the <systemitem class="username">root</systemitem> user:
-      </para>
-
-      <indexterm zone="geoclue geoclue-init">
-        <primary sortas="f-geoclue">geoclue</primary>
-      </indexterm>
-
-<screen role="root"><userinput>systemctl enable geoclue</userinput></screen>
-
-    </sect3>
-
-</sect2>
+      <command>sed -i "s@ -Werror@@" configure</command>: This
+      <command>sed</command> removes <parameter>-Werror</parameter> from the
+      <envar>CFLAGS</envar> variable, otherwise the build will fail with
+      <application>gcc-4.7</application>.
+    </para>
+
+    <para>
+      <command>sed -i "s@libnm_glib@libnm-glib@g" configure</command>:
+      This <command>sed</command> fixes detection of
+      <application>NetworkManager</application> libraries.
+    </para>
+
+    <para>
+      <command>sed -i "s@geoclue/libgeoclue.la@&amp; -lgthread-2.0@g" ..
+      </command>: This <command>sed</command> fixes building
+      <application>GeoClue</application> with recent
+      <application>binutils</application>.
+    </para>
+
+    <para>
+      <option>--libexecdir=/usr/lib/geoclue</option>: This option installs
+      <application>GeoClue's</application> private executables into
+      <filename class="libraryfile">/usr/lib/geoclue</filename> in accordance
+      with the old version of the FHS used before LFS-7.5.
+    </para>
+  </sect2>
 
   <sect2 role="content">
@@ -175,12 +182,32 @@
         </seg>
         <seg>
-          None
+          libgeoclue.so
         </seg>
         <seg>
-          /etc/geoclue /usr/libexec/geoclue-2.0
+          /usr/include/geoclue, /usr/share/geoclue-providers,
+          and /usr/share/gtk-doc/html/geoclue
         </seg>
       </seglistitem>
     </segmentedlist>
 
+    <variablelist>
+      <bridgehead renderas="sect3">Short Descriptions</bridgehead>
+      <?dbfo list-presentation="list"?>
+      <?dbhtml list-presentation="table"?>
+
+      <varlistentry id="libgeoclue">
+        <term><filename class="libraryfile">libgeoclue.so</filename></term>
+        <listitem>
+          <para>
+            contains functions that provide the
+            <application>GeoClue</application> geoinformation application
+            programming interface.
+          </para>
+          <indexterm zone="geoclue libgeoclue">
+            <primary sortas="c-libgeoclue">libgeoclue.so</primary>
+          </indexterm>
+        </listitem>
+      </varlistentry>
+    </variablelist>
   </sect2>
 </sect1>
