From f51dda0e29a48618fdfc8fd39e4b41fbc62f0b7e Mon Sep 17 00:00:00 2001 From: piernov Date: Sat, 17 Mar 2012 19:58:21 +0000 Subject: geoclue gnome3->nutyx-extra --- geoclue/.footprint.i686 | 75 +++++++++++++++++++++++++++++++++++++++++++ geoclue/.footprint.x86_64 | 75 +++++++++++++++++++++++++++++++++++++++++++ geoclue/.md5sum.i686 | 4 +++ geoclue/.md5sum.x86_64 | 4 +++ geoclue/Pkgfile | 33 +++++++++++++++++++ geoclue/geoclue-NMCrash.patch | 31 ++++++++++++++++++ geoclue/geoclue-nm08.patch | 11 +++++++ geoclue/gpsd-3.4.patch | 75 +++++++++++++++++++++++++++++++++++++++++++ 8 files changed, 308 insertions(+) create mode 100644 geoclue/.footprint.i686 create mode 100644 geoclue/.footprint.x86_64 create mode 100644 geoclue/.md5sum.i686 create mode 100644 geoclue/.md5sum.x86_64 create mode 100644 geoclue/Pkgfile create mode 100644 geoclue/geoclue-NMCrash.patch create mode 100644 geoclue/geoclue-nm08.patch create mode 100644 geoclue/gpsd-3.4.patch (limited to 'geoclue') diff --git a/geoclue/.footprint.i686 b/geoclue/.footprint.i686 new file mode 100644 index 000000000..d78912ccb --- /dev/null +++ b/geoclue/.footprint.i686 @@ -0,0 +1,75 @@ +drwxr-xr-x root/root usr/ +drwxr-xr-x root/root usr/bin/ +-rwxr-xr-x root/root usr/bin/geoclue-example +-rwxr-xr-x root/root usr/bin/geoclue-geonames +-rwxr-xr-x root/root usr/bin/geoclue-gpsd +-rwxr-xr-x root/root usr/bin/geoclue-gsmloc +-rwxr-xr-x root/root usr/bin/geoclue-gypsy +-rwxr-xr-x root/root usr/bin/geoclue-hostip +-rwxr-xr-x root/root usr/bin/geoclue-localnet +-rwxr-xr-x root/root usr/bin/geoclue-manual +-rwxr-xr-x root/root usr/bin/geoclue-master +-rwxr-xr-x root/root usr/bin/geoclue-nominatim +-rwxr-xr-x root/root usr/bin/geoclue-plazes +-rwxr-xr-x root/root usr/bin/geoclue-skyhook +-rwxr-xr-x root/root usr/bin/geoclue-yahoo +drwxr-xr-x root/root usr/include/ +drwxr-xr-x root/root usr/include/geoclue/ +-rw-r--r-- root/root usr/include/geoclue/gc-iface-address.h +-rw-r--r-- root/root usr/include/geoclue/gc-iface-geoclue.h +-rw-r--r-- root/root usr/include/geoclue/gc-iface-geocode.h +-rw-r--r-- root/root usr/include/geoclue/gc-iface-position.h +-rw-r--r-- root/root usr/include/geoclue/gc-iface-reverse-geocode.h +-rw-r--r-- root/root usr/include/geoclue/gc-iface-velocity.h +-rw-r--r-- root/root usr/include/geoclue/gc-provider.h +-rw-r--r-- root/root usr/include/geoclue/gc-web-service.h +-rw-r--r-- root/root usr/include/geoclue/geoclue-accuracy.h +-rw-r--r-- root/root usr/include/geoclue/geoclue-address-details.h +-rw-r--r-- root/root usr/include/geoclue/geoclue-address.h +-rw-r--r-- root/root usr/include/geoclue/geoclue-enum-types.h +-rw-r--r-- root/root usr/include/geoclue/geoclue-error.h +-rw-r--r-- root/root usr/include/geoclue/geoclue-geocode.h +-rw-r--r-- root/root usr/include/geoclue/geoclue-master-client.h +-rw-r--r-- root/root usr/include/geoclue/geoclue-master.h +-rw-r--r-- root/root usr/include/geoclue/geoclue-position.h +-rw-r--r-- root/root usr/include/geoclue/geoclue-provider.h +-rw-r--r-- root/root usr/include/geoclue/geoclue-reverse-geocode.h +-rw-r--r-- root/root usr/include/geoclue/geoclue-types.h +-rw-r--r-- root/root usr/include/geoclue/geoclue-velocity.h +drwxr-xr-x root/root usr/lib/ +-rw-r--r-- root/root usr/lib/libgeoclue.a +-rwxr-xr-x root/root usr/lib/libgeoclue.la +lrwxrwxrwx root/root usr/lib/libgeoclue.so -> libgeoclue.so.0.0.0 +lrwxrwxrwx root/root usr/lib/libgeoclue.so.0 -> libgeoclue.so.0.0.0 +-rwxr-xr-x root/root usr/lib/libgeoclue.so.0.0.0 +drwxr-xr-x root/root usr/lib/pkgconfig/ +-rw-r--r-- root/root usr/lib/pkgconfig/geoclue.pc +drwxr-xr-x root/root usr/share/ +drwxr-xr-x root/root usr/share/dbus-1/ +drwxr-xr-x root/root usr/share/dbus-1/services/ +-rw-r--r-- root/root usr/share/dbus-1/services/org.freedesktop.Geoclue.Master.service +-rw-r--r-- root/root usr/share/dbus-1/services/org.freedesktop.Geoclue.Providers.Example.service +-rw-r--r-- root/root usr/share/dbus-1/services/org.freedesktop.Geoclue.Providers.Geonames.service +-rw-r--r-- root/root usr/share/dbus-1/services/org.freedesktop.Geoclue.Providers.Gpsd.service +-rw-r--r-- root/root usr/share/dbus-1/services/org.freedesktop.Geoclue.Providers.Gsmloc.service +-rw-r--r-- root/root usr/share/dbus-1/services/org.freedesktop.Geoclue.Providers.Gypsy.service +-rw-r--r-- root/root usr/share/dbus-1/services/org.freedesktop.Geoclue.Providers.Hostip.service +-rw-r--r-- root/root usr/share/dbus-1/services/org.freedesktop.Geoclue.Providers.Localnet.service +-rw-r--r-- root/root usr/share/dbus-1/services/org.freedesktop.Geoclue.Providers.Manual.service +-rw-r--r-- root/root usr/share/dbus-1/services/org.freedesktop.Geoclue.Providers.Nominatim.service +-rw-r--r-- root/root usr/share/dbus-1/services/org.freedesktop.Geoclue.Providers.Plazes.service +-rw-r--r-- root/root usr/share/dbus-1/services/org.freedesktop.Geoclue.Providers.Skyhook.service +-rw-r--r-- root/root usr/share/dbus-1/services/org.freedesktop.Geoclue.Providers.Yahoo.service +drwxr-xr-x root/root usr/share/geoclue-providers/ +-rw-r--r-- root/root usr/share/geoclue-providers/geoclue-example.provider +-rw-r--r-- root/root usr/share/geoclue-providers/geoclue-geonames.provider +-rw-r--r-- root/root usr/share/geoclue-providers/geoclue-gpsd.provider +-rw-r--r-- root/root usr/share/geoclue-providers/geoclue-gsmloc.provider +-rw-r--r-- root/root usr/share/geoclue-providers/geoclue-gypsy.provider +-rw-r--r-- root/root usr/share/geoclue-providers/geoclue-hostip.provider +-rw-r--r-- root/root usr/share/geoclue-providers/geoclue-localnet.provider +-rw-r--r-- root/root usr/share/geoclue-providers/geoclue-manual.provider +-rw-r--r-- root/root usr/share/geoclue-providers/geoclue-nominatim.provider +-rw-r--r-- root/root usr/share/geoclue-providers/geoclue-plazes.provider +-rw-r--r-- root/root usr/share/geoclue-providers/geoclue-skyhook.provider +-rw-r--r-- root/root usr/share/geoclue-providers/geoclue-yahoo.provider diff --git a/geoclue/.footprint.x86_64 b/geoclue/.footprint.x86_64 new file mode 100644 index 000000000..d78912ccb --- /dev/null +++ b/geoclue/.footprint.x86_64 @@ -0,0 +1,75 @@ +drwxr-xr-x root/root usr/ +drwxr-xr-x root/root usr/bin/ +-rwxr-xr-x root/root usr/bin/geoclue-example +-rwxr-xr-x root/root usr/bin/geoclue-geonames +-rwxr-xr-x root/root usr/bin/geoclue-gpsd +-rwxr-xr-x root/root usr/bin/geoclue-gsmloc +-rwxr-xr-x root/root usr/bin/geoclue-gypsy +-rwxr-xr-x root/root usr/bin/geoclue-hostip +-rwxr-xr-x root/root usr/bin/geoclue-localnet +-rwxr-xr-x root/root usr/bin/geoclue-manual +-rwxr-xr-x root/root usr/bin/geoclue-master +-rwxr-xr-x root/root usr/bin/geoclue-nominatim +-rwxr-xr-x root/root usr/bin/geoclue-plazes +-rwxr-xr-x root/root usr/bin/geoclue-skyhook +-rwxr-xr-x root/root usr/bin/geoclue-yahoo +drwxr-xr-x root/root usr/include/ +drwxr-xr-x root/root usr/include/geoclue/ +-rw-r--r-- root/root usr/include/geoclue/gc-iface-address.h +-rw-r--r-- root/root usr/include/geoclue/gc-iface-geoclue.h +-rw-r--r-- root/root usr/include/geoclue/gc-iface-geocode.h +-rw-r--r-- root/root usr/include/geoclue/gc-iface-position.h +-rw-r--r-- root/root usr/include/geoclue/gc-iface-reverse-geocode.h +-rw-r--r-- root/root usr/include/geoclue/gc-iface-velocity.h +-rw-r--r-- root/root usr/include/geoclue/gc-provider.h +-rw-r--r-- root/root usr/include/geoclue/gc-web-service.h +-rw-r--r-- root/root usr/include/geoclue/geoclue-accuracy.h +-rw-r--r-- root/root usr/include/geoclue/geoclue-address-details.h +-rw-r--r-- root/root usr/include/geoclue/geoclue-address.h +-rw-r--r-- root/root usr/include/geoclue/geoclue-enum-types.h +-rw-r--r-- root/root usr/include/geoclue/geoclue-error.h +-rw-r--r-- root/root usr/include/geoclue/geoclue-geocode.h +-rw-r--r-- root/root usr/include/geoclue/geoclue-master-client.h +-rw-r--r-- root/root usr/include/geoclue/geoclue-master.h +-rw-r--r-- root/root usr/include/geoclue/geoclue-position.h +-rw-r--r-- root/root usr/include/geoclue/geoclue-provider.h +-rw-r--r-- root/root usr/include/geoclue/geoclue-reverse-geocode.h +-rw-r--r-- root/root usr/include/geoclue/geoclue-types.h +-rw-r--r-- root/root usr/include/geoclue/geoclue-velocity.h +drwxr-xr-x root/root usr/lib/ +-rw-r--r-- root/root usr/lib/libgeoclue.a +-rwxr-xr-x root/root usr/lib/libgeoclue.la +lrwxrwxrwx root/root usr/lib/libgeoclue.so -> libgeoclue.so.0.0.0 +lrwxrwxrwx root/root usr/lib/libgeoclue.so.0 -> libgeoclue.so.0.0.0 +-rwxr-xr-x root/root usr/lib/libgeoclue.so.0.0.0 +drwxr-xr-x root/root usr/lib/pkgconfig/ +-rw-r--r-- root/root usr/lib/pkgconfig/geoclue.pc +drwxr-xr-x root/root usr/share/ +drwxr-xr-x root/root usr/share/dbus-1/ +drwxr-xr-x root/root usr/share/dbus-1/services/ +-rw-r--r-- root/root usr/share/dbus-1/services/org.freedesktop.Geoclue.Master.service +-rw-r--r-- root/root usr/share/dbus-1/services/org.freedesktop.Geoclue.Providers.Example.service +-rw-r--r-- root/root usr/share/dbus-1/services/org.freedesktop.Geoclue.Providers.Geonames.service +-rw-r--r-- root/root usr/share/dbus-1/services/org.freedesktop.Geoclue.Providers.Gpsd.service +-rw-r--r-- root/root usr/share/dbus-1/services/org.freedesktop.Geoclue.Providers.Gsmloc.service +-rw-r--r-- root/root usr/share/dbus-1/services/org.freedesktop.Geoclue.Providers.Gypsy.service +-rw-r--r-- root/root usr/share/dbus-1/services/org.freedesktop.Geoclue.Providers.Hostip.service +-rw-r--r-- root/root usr/share/dbus-1/services/org.freedesktop.Geoclue.Providers.Localnet.service +-rw-r--r-- root/root usr/share/dbus-1/services/org.freedesktop.Geoclue.Providers.Manual.service +-rw-r--r-- root/root usr/share/dbus-1/services/org.freedesktop.Geoclue.Providers.Nominatim.service +-rw-r--r-- root/root usr/share/dbus-1/services/org.freedesktop.Geoclue.Providers.Plazes.service +-rw-r--r-- root/root usr/share/dbus-1/services/org.freedesktop.Geoclue.Providers.Skyhook.service +-rw-r--r-- root/root usr/share/dbus-1/services/org.freedesktop.Geoclue.Providers.Yahoo.service +drwxr-xr-x root/root usr/share/geoclue-providers/ +-rw-r--r-- root/root usr/share/geoclue-providers/geoclue-example.provider +-rw-r--r-- root/root usr/share/geoclue-providers/geoclue-geonames.provider +-rw-r--r-- root/root usr/share/geoclue-providers/geoclue-gpsd.provider +-rw-r--r-- root/root usr/share/geoclue-providers/geoclue-gsmloc.provider +-rw-r--r-- root/root usr/share/geoclue-providers/geoclue-gypsy.provider +-rw-r--r-- root/root usr/share/geoclue-providers/geoclue-hostip.provider +-rw-r--r-- root/root usr/share/geoclue-providers/geoclue-localnet.provider +-rw-r--r-- root/root usr/share/geoclue-providers/geoclue-manual.provider +-rw-r--r-- root/root usr/share/geoclue-providers/geoclue-nominatim.provider +-rw-r--r-- root/root usr/share/geoclue-providers/geoclue-plazes.provider +-rw-r--r-- root/root usr/share/geoclue-providers/geoclue-skyhook.provider +-rw-r--r-- root/root usr/share/geoclue-providers/geoclue-yahoo.provider diff --git a/geoclue/.md5sum.i686 b/geoclue/.md5sum.i686 new file mode 100644 index 000000000..6e0dcb12d --- /dev/null +++ b/geoclue/.md5sum.i686 @@ -0,0 +1,4 @@ +f6b6030c085ad61cbe66b7cd02a84b56 geoclue-0.12.tar.bz2 +a659858b9661dc49bf6dc9ffecf860ab geoclue-NMCrash.patch +fbc5a7d43c7010aab592622543044d08 geoclue-nm08.patch +56ac06e41459d576eb94504d3d4d3536 gpsd-3.4.patch diff --git a/geoclue/.md5sum.x86_64 b/geoclue/.md5sum.x86_64 new file mode 100644 index 000000000..6e0dcb12d --- /dev/null +++ b/geoclue/.md5sum.x86_64 @@ -0,0 +1,4 @@ +f6b6030c085ad61cbe66b7cd02a84b56 geoclue-0.12.tar.bz2 +a659858b9661dc49bf6dc9ffecf860ab geoclue-NMCrash.patch +fbc5a7d43c7010aab592622543044d08 geoclue-nm08.patch +56ac06e41459d576eb94504d3d4d3536 gpsd-3.4.patch diff --git a/geoclue/Pkgfile b/geoclue/Pkgfile new file mode 100644 index 000000000..fc0c0ddb0 --- /dev/null +++ b/geoclue/Pkgfile @@ -0,0 +1,33 @@ +# Description: Service de geoinformation modulaire. +# URL: http://geoclue.freedesktop.org +# Maintainer: NuTyX GNOME team +# Packager: piernov +# Depends on: gconf, gtk, gypsy, libgnome-keyring, sqlite3, libproxy, libsoup, gtk-doc, networkmanager, gpsd, nspr, nss +# Run on: gconf,gtk,gypsy,libgnome-keyring,sqlite3,libproxy,libsoup,networkmanager,gpsd,nspr,nss + +name=geoclue +version=0.12 +release=3 +source=(http://cgit.freedesktop.org/$name/snapshot/$name-$version.tar.bz2 + geoclue-NMCrash.patch + geoclue-nm08.patch + gpsd-3.4.patch) + +build() { + cd $name-$version + patch -p1 < ../geoclue-NMCrash.patch + patch -p1 < ../geoclue-nm08.patch + patch -p1 < ../gpsd-3.4.patch + ./autogen.sh + sed "s/-Werror//g" -i configure + ./configure --prefix=/usr \ + --libexecdir=/usr/bin \ + --disable-gtk-doc \ + --enable-gtk=yes \ + --enable-networkmanager=yes \ + --enable-gypsy=yes \ + --enable-gpsd=yes \ + --enable-skyhook=yes + make + make DESTDIR=$PKG install +} diff --git a/geoclue/geoclue-NMCrash.patch b/geoclue/geoclue-NMCrash.patch new file mode 100644 index 000000000..d2afc879e --- /dev/null +++ b/geoclue/geoclue-NMCrash.patch @@ -0,0 +1,31 @@ +From bcf9ee4f44625eddad4c267fedc507d9eeeaf3f4 Mon Sep 17 00:00:00 2001 +From: Bastien Nocera +Date: Tue, 29 Jun 2010 18:47:21 +0000 +Subject: Fix crasher when NetworkManager has no devices + +https://bugs.freedesktop.org/show_bug.cgi?id=28066 +--- +diff --git a/src/connectivity-networkmanager.c b/src/connectivity-networkmanager.c +index 1061201..a7b8971 100644 +--- a/src/connectivity-networkmanager.c ++++ b/src/connectivity-networkmanager.c +@@ -248,16 +248,12 @@ cache_ap_mac (GeoclueNetworkManager *self) + guint i; + + devices = nm_client_get_devices (self->client); +- if (devices == NULL) { +- g_free (self->cache_ap_mac); +- self->cache_ap_mac = NULL; +- } + + g_free (self->cache_ap_mac); + self->cache_ap_mac = NULL; + self->ap_strength = 0; + +- for (i = 0; i < devices->len; i++) { ++ for (i = 0; devices != NULL && i < devices->len; i++) { + NMDevice *device = g_ptr_array_index (devices, i); + if (NM_IS_DEVICE_WIFI (device)) { + get_best_ap (self, device); +-- +cgit v0.8.3-6-g21f6 diff --git a/geoclue/geoclue-nm08.patch b/geoclue/geoclue-nm08.patch new file mode 100644 index 000000000..a483c6608 --- /dev/null +++ b/geoclue/geoclue-nm08.patch @@ -0,0 +1,11 @@ +--- geoclue-0.11.1.1/configure.ac.orig 2009-10-26 10:49:36.000000000 +0000 ++++ geoclue-0.11.1.1/configure.ac 2009-10-26 10:50:03.000000000 +0000 +@@ -123,7 +123,7 @@ + if test "x$enable_networkmanager" != "xno"; then + PKG_CHECK_MODULES(NETWORK_MANAGER, + [ +- NetworkManager libnm_glib ++ NetworkManager libnm-glib + ], have_networkmanager="yes", have_networkmanager="no") + + if test "x$have_networkmanager" = "xyes"; then diff --git a/geoclue/gpsd-3.4.patch b/geoclue/gpsd-3.4.patch new file mode 100644 index 000000000..6a710173b --- /dev/null +++ b/geoclue/gpsd-3.4.patch @@ -0,0 +1,75 @@ +Description: Refactoring to support new libgps API +Author: James Page +Bug: https://bugs.freedesktop.org/show_bug.cgi?id=40996 +Forwarded: no + +Index: geoclue-providers-0.12.0/providers/gpsd/geoclue-gpsd.c +=================================================================== +--- geoclue-providers-0.12.0.orig/providers/gpsd/geoclue-gpsd.c 2011-12-14 10:57:44.000000000 +0000 ++++ geoclue-providers-0.12.0/providers/gpsd/geoclue-gpsd.c 2011-12-14 11:03:11.271878045 +0000 +@@ -40,7 +40,12 @@ + #include + #include + ++#if GPSD_API_MAJOR_VERSION >= 5 ++/* gps_data conflicts with gps_data function */ ++typedef struct gps_data_t gps_data_l; ++#else + typedef struct gps_data_t gps_data; ++#endif + typedef struct gps_fix_t gps_fix; + + /* only listing used tags */ +@@ -59,7 +64,11 @@ + char *host; + char *port; + ++#if GPSD_API_MAJOR_VERSION >= 5 ++ gps_data_l *gpsdata; ++#else + gps_data *gpsdata; ++#endif + + gps_fix *last_fix; + +@@ -394,10 +403,16 @@ + static gboolean + geoclue_gpsd_start_gpsd (GeoclueGpsd *self) + { ++#if GPSD_API_MAJOR_VERSION >= 5 ++ int status = gps_open (self->host, self->port, self->gpsdata); ++ if (status == 0) { ++ gps_stream(self->gpsdata, WATCH_ENABLE | WATCH_NMEA, NULL); ++#else + self->gpsdata = gps_open (self->host, self->port); + if (self->gpsdata) { + gps_stream(self->gpsdata, WATCH_ENABLE | WATCH_NMEA | POLL_NONBLOCK, NULL); + gps_set_raw_hook (self->gpsdata, gpsd_raw_hook); ++#endif + return TRUE; + } else { + g_warning ("gps_open() failed, is gpsd running (host=%s,port=%s)?", self->host, self->port); +@@ -410,10 +425,23 @@ + { + GeoclueGpsd *self = (GeoclueGpsd*)data; + if (self->gpsdata) { ++#if GPSD_API_MAJOR_VERSION >= 5 ++ /* gps_poll and gps_set_raw_hook no longer present in this API version */ ++ if (gps_waiting(self->gpsdata, 500)) { ++ if (gps_read(self->gpsdata) == -1) { ++ geoclue_gpsd_set_status (self, GEOCLUE_STATUS_ERROR); ++ geoclue_gpsd_stop_gpsd(self); ++ return FALSE; ++ } else { ++ /* Call existing raw_hook to process the data */ ++ gpsd_raw_hook(self->gpsdata, NULL, 0); ++ } ++#else + if (gps_poll(self->gpsdata) < 0) { + geoclue_gpsd_set_status (self, GEOCLUE_STATUS_ERROR); + geoclue_gpsd_stop_gpsd(self); + return FALSE; ++#endif + } + } + return TRUE; -- cgit v1.2.3-54-g00ecf