[gnome-ostree] manifest: Attempt to follow new geoclue release

[Colin Walters <walters src gnome org>]

commit f4dfad9d35049d20406f8f3ca52a86e7b734da6a
Author: Colin Walters <walters verbum org>
Date:   Sat Aug 3 09:08:57 2013 -0400

    manifest: Attempt to follow new geoclue release
    
    Add maxmind geoip, and geocode-glib.

 manifest.json                            |   10 ++++-
 patches/geoip-1.4.8-add-pkg-config.patch |   62 ++++++++++++++++++++++++++++++
 2 files changed, 70 insertions(+), 2 deletions(-)
---
diff --git a/manifest.json b/manifest.json
index 079c0d5..b9e18b0 100644
--- a/manifest.json
+++ b/manifest.json
@@ -648,8 +648,14 @@
                                 "--disable-examples",
                                 "--disable-fatal-warnings"]},
 
-               {"src": "fd:geoclue",
-                "patches": ["geoclue-autogen-Honor-NOCONFIGURE-1.patch"]},
+               {"src": "tarball:http://www.maxmind.com/download/geoip/api/c/GeoIP-1.4.8.tar.gz";,
+                "name": "geoip",
+                "checksum": "cf0f6b2bac1153e34d6ef55ee3851479b347d2b5c191fda8ff6a51fab5291ff4",
+                "patches": ["geoip-1.4.8-add-pkg-config.patch"]},
+
+               {"src": "gnome:geocode-glib"},
+
+               {"src": "fd:geoclue"},
       
                 {"src": "git:http://git.chromium.org/webm/libwebp.git"},
 
diff --git a/patches/geoip-1.4.8-add-pkg-config.patch b/patches/geoip-1.4.8-add-pkg-config.patch
new file mode 100644
index 0000000..01b77af
--- /dev/null
+++ b/patches/geoip-1.4.8-add-pkg-config.patch
@@ -0,0 +1,62 @@
+From 997e1423b762922d1ed7b21379ac9e4a76184ff0 Mon Sep 17 00:00:00 2001
+From: Bastien Nocera <hadess hadess net>
+Date: Fri, 11 Jan 2013 16:56:45 +0100
+Subject: [PATCH] Add pkg-config file
+
+For modern Linux distributions and development to use.
+
+The .pc file also exposes the "databasedir" variable for a default
+location to load the databases from, for use by application
+developers.
+---
+ Makefile.am  |  5 ++++-
+ configure.in |  1 +
+ geoip.pc.in  | 11 +++++++++++
+ 3 files changed, 16 insertions(+), 1 deletion(-)
+ create mode 100644 geoip.pc.in
+
+diff --git a/Makefile.am b/Makefile.am
+index bd4da3a..746ac6e 100644
+--- a/Makefile.am
++++ b/Makefile.am
+@@ -8,4 +8,7 @@ SUBDIRS =              \
+       test            \
+       man
+ 
+-EXTRA_DIST = README.OSX READMEwin32static.txt README.MinGW READMEwin32.txt GeoIPWinDLL.patch TODO bootstrap 
GeoIP.spec GeoIP.spec.in Makefile.netware Makefile.vc Makefile.win32 get_ver.awk geoip.ico
++pkgconfigdir = $(libdir)/pkgconfig/
++nodist_pkgconfig_DATA = geoip.pc
++
++EXTRA_DIST = README.OSX READMEwin32static.txt README.MinGW READMEwin32.txt GeoIPWinDLL.patch TODO bootstrap 
GeoIP.spec GeoIP.spec.in Makefile.netware Makefile.vc Makefile.win32 get_ver.awk geoip.ico geoip.pc.in
+diff --git a/configure.in b/configure.in
+index 77309b1..971b4aa 100644
+--- a/configure.in
++++ b/configure.in
+@@ -41,6 +41,7 @@ AC_CHECK_FUNC(gethostbyname_r, [
+ AC_OUTPUT([
+ Makefile
+ GeoIP.spec
++geoip.pc
+ libGeoIP/Makefile
+ apps/Makefile
+ conf/Makefile
+diff --git a/geoip.pc.in b/geoip.pc.in
+new file mode 100644
+index 0000000..d943880
+--- /dev/null
++++ b/geoip.pc.in
+@@ -0,0 +1,11 @@
++prefix= prefix@
++libdir= libdir@
++includedir= includedir@
++datadir= datarootdir@
++
++Name: geoip
++Description: A non-DNS IP-to-country resolver library.
++Version: @VERSION@
++Libs: -L${libdir} -lGeoIP
++Cflags: -I${includedir}/
++databasedir=${datadir}/GeoIP
+-- 
+1.8.0.1
+