From e05f59e096d7ff3639aa76e437804f2d0f9f1819 Mon Sep 17 00:00:00 2001 From: Zeeshan Ali Date: Mon, 12 Sep 2016 12:12:40 +0200 Subject: geoclue: Update to 2.4.4 Also drop redundant and now unusable patch. Signed-off-by: Zeeshan Ali Signed-off-by: Martin Jansa --- .../geoclue/files/soup-session-fix.patch | 30 ------------ .../recipes-navigation/geoclue/geoclue_2.0.0.bb | 33 -------------- .../recipes-navigation/geoclue/geoclue_2.4.4.bb | 53 ++++++++++++++++++++++ 3 files changed, 53 insertions(+), 63 deletions(-) delete mode 100644 meta-oe/recipes-navigation/geoclue/files/soup-session-fix.patch delete mode 100644 meta-oe/recipes-navigation/geoclue/geoclue_2.0.0.bb create mode 100644 meta-oe/recipes-navigation/geoclue/geoclue_2.4.4.bb (limited to 'meta-oe/recipes-navigation') diff --git a/meta-oe/recipes-navigation/geoclue/files/soup-session-fix.patch b/meta-oe/recipes-navigation/geoclue/files/soup-session-fix.patch deleted file mode 100644 index 70fe3f55a7..0000000000 --- a/meta-oe/recipes-navigation/geoclue/files/soup-session-fix.patch +++ /dev/null @@ -1,30 +0,0 @@ -Upstream-Status: Upstream-Status: Inappropriate [poky 9.0 has older libsoup] - -Signed-off-by: Felipe F. Tonello - -diff --git a/src/gclue-ipclient.c b/src/gclue-ipclient.c -index 09add30..1771d5c 100644 ---- a/src/gclue-ipclient.c -+++ b/src/gclue-ipclient.c -@@ -83,7 +83,7 @@ gclue_ipclient_init (GClueIpclient *ipclient) - { - ipclient->priv = G_TYPE_INSTANCE_GET_PRIVATE ((ipclient), GCLUE_TYPE_IPCLIENT, GClueIpclientPrivate); - -- ipclient->priv->soup_session = soup_session_new (); -+ ipclient->priv->soup_session = soup_session_sync_new (); - } - - /** -diff --git a/src/geoip-server/geoip-update.c b/src/geoip-server/geoip-update.c -index 6cce7b2..ef672ba 100644 ---- a/src/geoip-server/geoip-update.c -+++ b/src/geoip-server/geoip-update.c -@@ -214,7 +214,7 @@ main (int argc, char **argv) - path = GEOIP_DATABASE_PATH; - } - -- session = soup_session_new (); -+ session = soup_session_sync_new (); - - for (i = 0; i < G_N_ELEMENTS (db_info_map); i++) { - SoupMessage *msg = NULL; diff --git a/meta-oe/recipes-navigation/geoclue/geoclue_2.0.0.bb b/meta-oe/recipes-navigation/geoclue/geoclue_2.0.0.bb deleted file mode 100644 index 90e8533abd..0000000000 --- a/meta-oe/recipes-navigation/geoclue/geoclue_2.0.0.bb +++ /dev/null @@ -1,33 +0,0 @@ -SUMMARY = "The Geolocation Service" -DESCRIPTION = "Geoclue is a D-Bus service that provides location information. \ -The primary goal of the Geoclue project is to make creating location-aware applications \ -as simple as possible, while the secondary goal is to ensure that no application \ -can access location information without explicit permission from user." -LICENSE = "GPLv2.0+" -SECTION = "console/network" - -LIC_FILES_CHKSUM = "file://COPYING;md5=8114b83a0435d8136b47bd70111ce5cd" - -DEPENDS = "glib-2.0 dbus dbus-glib json-glib libsoup-2.4 intltool-native" - -inherit autotools pkgconfig gtk-doc - -SRC_URI = " \ - http://www.freedesktop.org/software/geoclue/releases/2.0/geoclue-${PV}.tar.xz \ - file://soup-session-fix.patch \ -" - -SRC_URI[md5sum] = "401ff99d530b177c62afacef0a33efd9" -SRC_URI[sha256sum] = "4a82f184e55a163d86e0ad69bbe1bba9960bb5094220fe1f01350bceda8c67a1" - -PACKAGECONFIG[geoip] = "--enable-geoip-server,--disable-geoip-server,geoip" - -EXTRA_OECONF += " \ - --with-dbus-service-user=root \ - --with-dbus-sys-dir=${sysconfdir}/dbus-1/system.d \ -" - -FILES_${PN} += " \ - ${datadir}/dbus-1/system-services/org.freedesktop.GeoClue2.service \ - ${datadir}/geoclue-2.0/geoclue-interface.xml \ -" diff --git a/meta-oe/recipes-navigation/geoclue/geoclue_2.4.4.bb b/meta-oe/recipes-navigation/geoclue/geoclue_2.4.4.bb new file mode 100644 index 0000000000..3170d44eff --- /dev/null +++ b/meta-oe/recipes-navigation/geoclue/geoclue_2.4.4.bb @@ -0,0 +1,53 @@ +SUMMARY = "The Geolocation Service" +DESCRIPTION = "Geoclue is a D-Bus service that provides location information. \ +The primary goal of the Geoclue project is to make creating location-aware applications \ +as simple as possible, while the secondary goal is to ensure that no application \ +can access location information without explicit permission from user." +LICENSE = "GPLv2.0+" +SECTION = "console/network" + +LIC_FILES_CHKSUM = "file://COPYING;md5=8114b83a0435d8136b47bd70111ce5cd" + +DEPENDS = "glib-2.0 dbus json-glib libsoup-2.4 intltool-native" + +inherit autotools pkgconfig gtk-doc + +SRC_URI = " \ + http://www.freedesktop.org/software/geoclue/releases/2.4/geoclue-${PV}.tar.xz \ +" + +SRC_URI[md5sum] = "d2a5b05f4bad032673fe23afbce27926" +SRC_URI[sha256sum] = "9c43fb9d0c12067ea64400500abb0640194947d4c2c55e38545afe5d9c5c315c" + +export BUILD_SYS +export HOST_SYS +export STAGING_INCDIR +export STAGING_LIBDIR + +# Without this line, package is delcared a library and named libgeoclue* +AUTO_LIBNAME_PKGS = "" + +PACKAGECONFIG ??= "3g modem-gps cdma nmea lib" +PACKAGECONFIG[3g] = "--enable-3g-source,--disable-3g-source,modemmanager" +PACKAGECONFIG[modem-gps] = "--enable-modem-gps-source,--disable-modem-gps-source,modemmanager" +PACKAGECONFIG[cdma] = "--enable-cdma-source,--disable-cdma-source,modemmanager" +PACKAGECONFIG[nmea] = "--enable-nmea-source,--disable-nmea-source,avahi" +PACKAGECONFIG[lib] = "--enable-libgeoclue,--disable-libgeoclue,gobject-introspection" + +EXTRA_OECONF += " \ + --with-dbus-service-user=root \ + --with-dbus-sys-dir=${sysconfdir}/dbus-1/system.d \ + --enable-demo-agent=no \ +" + +FILES_${PN} += " \ + ${datadir}/dbus-1/system-services \ + ${libdir} \ + ${systemd_unitdir} \ + ${prefix}/libexec \ +" + +FILES_${PN}-dev += " \ + ${datadir}/dbus-1/interfaces \ + ${datadir}/gir-1.0 \ +" -- cgit 1.2.3-korg