summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAndreas Proschofsky <suka@gentoo.org>2010-03-19 19:40:52 +0000
committerAndreas Proschofsky <suka@gentoo.org>2010-03-19 19:40:52 +0000
commit9d74077b571b814c83ea47f7cc3c7998c0322258 (patch)
tree5d9106ac3a3956c047138c6458b1bcc10ce2dba7 /gnome-extra
parentSimple version bump (diff)
downloadsuka-9d74077b571b814c83ea47f7cc3c7998c0322258.tar.gz
suka-9d74077b571b814c83ea47f7cc3c7998c0322258.tar.bz2
suka-9d74077b571b814c83ea47f7cc3c7998c0322258.zip
Fix HostIP provider to work with latest web API
svn path=/; revision=224
Diffstat (limited to 'gnome-extra')
-rw-r--r--gnome-extra/geoclue/Manifest3
-rw-r--r--gnome-extra/geoclue/files/geoclue-hostip-api.diff38
-rw-r--r--gnome-extra/geoclue/geoclue-0.11.1.ebuild1
3 files changed, 41 insertions, 1 deletions
diff --git a/gnome-extra/geoclue/Manifest b/gnome-extra/geoclue/Manifest
index bbf2965..d98349e 100644
--- a/gnome-extra/geoclue/Manifest
+++ b/gnome-extra/geoclue/Manifest
@@ -1,4 +1,5 @@
AUX 0001-Remove-automagic-deps-and-add-switches-to-enable-dis.patch 7048 RMD160 cba53196a9ae95430e2dee9511259f98308132a2 SHA1 8d432e6cdf9e1b409a7307c5829d738b1183b5fd SHA256 1220b53b93972c6f317b6258272ce53a4718cf0070f5a012bc85f3d1d66ee11a
AUX 0002-Fix-NM-pkgcheck.patch 727 RMD160 837959313c457eebfff5262124b01fdcd1943112 SHA1 50bf343fbb0d8bccec77b50c947cb50d8cbb3551 SHA256 17b04dd9a1bc6c3ce9e404b104bc7bf10c3c0a9b920afff5a8880950fc5c45cd
+AUX geoclue-hostip-api.diff 1737 RMD160 b808627eabb7b358fb56adf07a495180b397234c SHA1 27b0ee9922fcf4e0abe88a573553999e1d10385c SHA256 8b32518b605e6bf143974944152f6dc16eeeef593ccf2161281b6be84011a7cf
DIST geoclue-0.11.1.tar.gz 557743 RMD160 7727f8ca2278244512068e38daef0653a926b6e5 SHA1 16a2084e2a47cbd4570b2cb31fc13c95c265cec1 SHA256 9c3b38aa8de51063651f93b4d1ba66266605722ecaa436d36791789cae970205
-EBUILD geoclue-0.11.1.ebuild 1380 RMD160 65b746a696e77a0cfa793a656c4d24ddd68f49ab SHA1 858e974ede1610d5ab16a0f802f1155fcaa9b8ac SHA256 1999558d475ed0e32d6bc6eceee3a0eb1e73d841028becd9b7867856a417c53a
+EBUILD geoclue-0.11.1.ebuild 1426 RMD160 d9af38fbb1a3420858768839f16d6cd0156f9ade SHA1 718e6384984b3359814dd5d496bd33d56ef0facf SHA256 1605c405c828fea00a8f4f91dc1821b529e93e5526baf0e36778b25f495e9180
diff --git a/gnome-extra/geoclue/files/geoclue-hostip-api.diff b/gnome-extra/geoclue/files/geoclue-hostip-api.diff
new file mode 100644
index 0000000..0dc7511
--- /dev/null
+++ b/gnome-extra/geoclue/files/geoclue-hostip-api.diff
@@ -0,0 +1,38 @@
+--- a/providers/hostip/geoclue-hostip.c
++++ b/providers/hostip/geoclue-hostip.c
+@@ -42,13 +42,11 @@
+
+ #define HOSTIP_NS_GML_NAME "gml"
+ #define HOSTIP_NS_GML_URI "http://www.opengis.net/gml"
+-#define HOSTIP_NS_HOSTIP_NAME "hostip"
+-#define HOSTIP_NS_HOSTIP_URI "http://www.hostip.info/api"
+
+-#define HOSTIP_COUNTRY_XPATH "//gml:featureMember/hostip:Hostip/hostip:countryName"
+-#define HOSTIP_COUNTRYCODE_XPATH "//gml:featureMember/hostip:Hostip/hostip:countryAbbrev"
+-#define HOSTIP_LOCALITY_XPATH "//gml:featureMember/hostip:Hostip/gml:name"
+-#define HOSTIP_LATLON_XPATH "//gml:featureMember/hostip:Hostip//gml:coordinates"
++#define HOSTIP_COUNTRY_XPATH "//gml:featureMember/Hostip/countryName"
++#define HOSTIP_COUNTRYCODE_XPATH "//gml:featureMember/Hostip/countryAbbrev"
++#define HOSTIP_LOCALITY_XPATH "//gml:featureMember/Hostip/gml:name"
++#define HOSTIP_LATLON_XPATH "//gml:featureMember/Hostip//gml:coordinates"
+
+ static void geoclue_hostip_init (GeoclueHostip *obj);
+ static void geoclue_hostip_position_init (GcIfacePositionClass *iface);
+@@ -101,7 +99,6 @@ geoclue_hostip_get_position (GcIfacePosition *iface,
+ return FALSE;
+ }
+
+-
+ if (gc_web_service_get_string (obj->web_service,
+ &coord_str, HOSTIP_LATLON_XPATH)) {
+ if (sscanf (coord_str, "%lf,%lf", longitude , latitude) == 2) {
+@@ -240,8 +237,6 @@ geoclue_hostip_init (GeoclueHostip *obj)
+ gc_web_service_set_base_url (obj->web_service, HOSTIP_URL);
+ gc_web_service_add_namespace (obj->web_service,
+ HOSTIP_NS_GML_NAME, HOSTIP_NS_GML_URI);
+- gc_web_service_add_namespace (obj->web_service,
+- HOSTIP_NS_HOSTIP_NAME, HOSTIP_NS_HOSTIP_URI);
+ }
+
+ static void
+
diff --git a/gnome-extra/geoclue/geoclue-0.11.1.ebuild b/gnome-extra/geoclue/geoclue-0.11.1.ebuild
index d42524c..52920ed 100644
--- a/gnome-extra/geoclue/geoclue-0.11.1.ebuild
+++ b/gnome-extra/geoclue/geoclue-0.11.1.ebuild
@@ -32,6 +32,7 @@ src_unpack() {
# Remove automagic deps b.fd.o #22416
epatch "${FILESDIR}/0001-Remove-automagic-deps-and-add-switches-to-enable-dis.patch"
epatch "${FILESDIR}/0002-Fix-NM-pkgcheck.patch"
+ epatch "${FILESDIR}/geoclue-hostip-api.diff"
eautoreconf
}