* [gentoo-commits] repo/gentoo:master commit in: app-misc/geoclue/files/, app-misc/geoclue/
@ 2016-04-09 15:29 Anthony G. Basile
0 siblings, 0 replies; 2+ messages in thread
From: Anthony G. Basile @ 2016-04-09 15:29 UTC (permalink / raw
To: gentoo-commits
commit: ce62bb9af7af545ac2c02ddf8ab40313d0560774
Author: Anthony G. Basile <blueness <AT> gentoo <DOT> org>
AuthorDate: Sat Apr 9 15:36:14 2016 +0000
Commit: Anthony G. Basile <blueness <AT> gentoo <DOT> org>
CommitDate: Sat Apr 9 15:36:14 2016 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=ce62bb9a
app-misc/geoclue: fix build on uclibc, bug #577290
Package-Manager: portage-2.2.26
.../files/geoclue-2.4.1-fix-GLIBC-features.patch | 44 ++++++++++++++++++++++
app-misc/geoclue/geoclue-2.4.1.ebuild | 6 ++-
app-misc/geoclue/geoclue-2.4.3.ebuild | 6 ++-
3 files changed, 54 insertions(+), 2 deletions(-)
diff --git a/app-misc/geoclue/files/geoclue-2.4.1-fix-GLIBC-features.patch b/app-misc/geoclue/files/geoclue-2.4.1-fix-GLIBC-features.patch
new file mode 100644
index 0000000..b27bf5d
--- /dev/null
+++ b/app-misc/geoclue/files/geoclue-2.4.1-fix-GLIBC-features.patch
@@ -0,0 +1,44 @@
+This has been edited to fit geoclue that import the code from geocode-glib.
+--Anthony G. Basile
+
+From 3ce317a218c255b8a8025f8f2a6010ce500dc0ee Mon Sep 17 00:00:00 2001
+From: "Anthony G. Basile" <blueness@gentoo.org>
+Date: Tue, 22 Mar 2016 09:48:00 +0000
+Subject: [PATCH] Use __UCLIBC__ when checking for GLIBC features
+
+Commit f0f85d8d introduces __GLIBC__ to check for glibc only features.
+However this is not sufficient for uClibc because it shares code with
+glibc. To select for features in glibc but not uClibc, we need
+defined(__GLIBC__) && !defined(__UCLIBC__).
+
+https://bugzilla.gnome.org/show_bug.cgi?id=764021
+---
+ geocode-glib/geocode-glib.c | 4 ++--
+ geocode-glib/test-gcglib.c | 2 +-
+ 2 files changed, 3 insertions(+), 3 deletions(-)
+
+diff --git a/src/geocode-glib/geocode-glib.c b/src/geocode-glib/geocode-glib.c
+index 4e3b3fd..6215fd1 100644
+--- a/src/geocode-glib/geocode-glib.c
++++ b/src/geocode-glib/geocode-glib.c
+@@ -213,7 +213,7 @@ _geocode_object_get_lang (void)
+ return geocode_object_get_lang_for_locale (setlocale (LC_MESSAGES, NULL));
+ }
+
+-#ifdef __GLIBC__
++#if defined(__GLIBC__) && !defined(__UCLIBC__)
+ static gpointer
+ is_number_after_street (gpointer data)
+ {
+@@ -246,7 +246,7 @@ is_number_after_street (gpointer data)
+ gboolean
+ _geocode_object_is_number_after_street (void)
+ {
+-#ifndef __GLIBC__
++#if !defined(__GLIBC__) || defined(__UCLIBC__)
+ return FALSE;
+ #else
+ static GOnce once = G_ONCE_INIT;
+--
+2.7.3
+
diff --git a/app-misc/geoclue/geoclue-2.4.1.ebuild b/app-misc/geoclue/geoclue-2.4.1.ebuild
index 3138114..6bb7977 100644
--- a/app-misc/geoclue/geoclue-2.4.1.ebuild
+++ b/app-misc/geoclue/geoclue-2.4.1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2015 Gentoo Foundation
+# Copyright 1999-2016 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
# $Id$
@@ -35,6 +35,10 @@ DEPEND="${RDEPEND}
virtual/pkgconfig
"
+src_prepare() {
+ epatch "${FILESDIR}"/${P}-fix-GLIBC-features.patch
+}
+
src_configure() {
# debug only affects CFLAGS
gnome2_src_configure \
diff --git a/app-misc/geoclue/geoclue-2.4.3.ebuild b/app-misc/geoclue/geoclue-2.4.3.ebuild
index 64d892e..ff6d540 100644
--- a/app-misc/geoclue/geoclue-2.4.3.ebuild
+++ b/app-misc/geoclue/geoclue-2.4.3.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2015 Gentoo Foundation
+# Copyright 1999-2016 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
# $Id$
@@ -35,6 +35,10 @@ DEPEND="${RDEPEND}
virtual/pkgconfig
"
+src_prepare() {
+ epatch "${FILESDIR}"/${PN}-2.4.1-fix-GLIBC-features.patch
+}
+
src_configure() {
# debug only affects CFLAGS
gnome2_src_configure \
^ permalink raw reply related [flat|nested] 2+ messages in thread* [gentoo-commits] repo/gentoo:master commit in: app-misc/geoclue/files/, app-misc/geoclue/
@ 2019-02-14 19:05 Mart Raudsepp
0 siblings, 0 replies; 2+ messages in thread
From: Mart Raudsepp @ 2019-02-14 19:05 UTC (permalink / raw
To: gentoo-commits
commit: a22ae205881af4b0653fc6e89bf6037ea34429a3
Author: Mart Raudsepp <leio <AT> gentoo <DOT> org>
AuthorDate: Thu Feb 14 19:03:26 2019 +0000
Commit: Mart Raudsepp <leio <AT> gentoo <DOT> org>
CommitDate: Thu Feb 14 19:03:26 2019 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=a22ae205
app-misc/geoclue: drop ancient SLOT=0
The last consumer (qtpositioning) moved to the modern SLOT and
versions.
Package-Manager: Portage-2.3.52, Repoman-2.3.12
Signed-off-by: Mart Raudsepp <leio <AT> gentoo.org>
app-misc/geoclue/Manifest | 1 -
...geoclue-0.12.0_p20110307-use-fallback-mac.patch | 16 -----
.../files/geoclue-0.12.0_p20110307-use-flag.patch | 79 ----------------------
app-misc/geoclue/files/geoclue-0.12.99-gpsd.patch | 73 --------------------
app-misc/geoclue/geoclue-0.12.99.ebuild | 71 -------------------
app-misc/geoclue/metadata.xml | 9 ---
6 files changed, 249 deletions(-)
diff --git a/app-misc/geoclue/Manifest b/app-misc/geoclue/Manifest
index 807cc3225fe..a523d2e937b 100644
--- a/app-misc/geoclue/Manifest
+++ b/app-misc/geoclue/Manifest
@@ -1,3 +1,2 @@
-DIST geoclue-0.12.99.tar.gz 608074 BLAKE2B af0c8141ade57791159f87ee7725134f18ba07cfdf9207c26c1ce77fd46a41aabfec4ba37882816bd70341964db2a89c2bc327292c097ea2e413dcb4bd7385c8 SHA512 32f946c9ee66cff2a6564b275d5f7bdf0d42832166c9fbeccb0aa55f3c3370fd8de114ad26477df6a2ee9d22250a5b104ec384032b28c3a62c356baea05d1bc2
DIST geoclue-2.4.13.tar.bz2 108691 BLAKE2B 5ffc2aca51ad0943931c526da69225e3a0d9b0c850ea688a350c47696b83775dc078e928af8cb0996741386a41ab5ec1ac129676d7e3b4c8584b3720dd370c1e SHA512 ed9c295bbdc22836a548ca4d5014d109af214464d1dd2a00f1ec493a751d949930d9fa512e915c7d65b34c8706c3bf73e06dd5e170846edee9e764d144960e78
DIST geoclue-2.4.8.tar.xz 368404 BLAKE2B 244aaa01ebbac57839eb8e5a19f543f3940217de9ad076b55c6054ff818e3c2948d3419e7391e05ccc17a5234a76980dee0470ae806d437db95db4a9e128a678 SHA512 1741962b4bdce925af090961bd50f4d0d934f7b81e53968d5d8ea7957e8593c4c9a8084bbd149c454d76f2af35be036748f212c99506b475567384a43f579f3d
diff --git a/app-misc/geoclue/files/geoclue-0.12.0_p20110307-use-fallback-mac.patch b/app-misc/geoclue/files/geoclue-0.12.0_p20110307-use-fallback-mac.patch
deleted file mode 100644
index 9c9115a284e..00000000000
--- a/app-misc/geoclue/files/geoclue-0.12.0_p20110307-use-fallback-mac.patch
+++ /dev/null
@@ -1,16 +0,0 @@
-Force geoclue to use the "fallback" mac address fetching code.
-The NM-based code does not seem to work.
-
-Patch by Kevin McCarthy <signals@gentoo.org>
-
---- src/connectivity.c
-+++ src/connectivity.c
-@@ -218,7 +218,7 @@
- geoclue_connectivity_get_router_mac (GeoclueConnectivity *self)
- {
- if (self == NULL ||
-- GEOCLUE_CONNECTIVITY_GET_INTERFACE (self)->get_router_mac == NULL) {
-+ GEOCLUE_CONNECTIVITY_GET_INTERFACE (self)->get_router_mac == NULL || 1) {
- char *mac = NULL;
- guint i;
- int ret_val;
diff --git a/app-misc/geoclue/files/geoclue-0.12.0_p20110307-use-flag.patch b/app-misc/geoclue/files/geoclue-0.12.0_p20110307-use-flag.patch
deleted file mode 100644
index 236c98928ba..00000000000
--- a/app-misc/geoclue/files/geoclue-0.12.0_p20110307-use-flag.patch
+++ /dev/null
@@ -1,79 +0,0 @@
-Add configure options for all providers except localnet.
-
-Patch by Kevin McCarthy <signals@gentoo.org>
-
---- configure.ac
-+++ configure.ac
-@@ -158,7 +158,71 @@
- AC_SUBST(CONNECTIVITY_LIBS)
- AC_SUBST(CONNECTIVITY_CFLAGS)
-
--PROVIDER_SUBDIRS="example hostip geonames nominatim manual plazes localnet yahoo gsmloc"
-+PROVIDER_SUBDIRS="localnet"
-+
-+AC_ARG_ENABLE(hostip,
-+ AS_HELP_STRING([--enable-hostip=@<:@no/yes/auto@:>@],
-+ [build with hostip support]), ,
-+ enable_hostip=auto)
-+
-+if test "x$enable_hostip" != "xno"; then
-+ PROVIDER_SUBDIRS="$PROVIDER_SUBDIRS hostip"
-+fi
-+
-+AC_ARG_ENABLE(geonames,
-+ AS_HELP_STRING([--enable-geonames=@<:@no/yes/auto@:>@],
-+ [build with geonames support]), ,
-+ enable_geonames=auto)
-+
-+if test "x$enable_geonames" != "xno"; then
-+ PROVIDER_SUBDIRS="$PROVIDER_SUBDIRS geonames"
-+fi
-+
-+AC_ARG_ENABLE(nominatim,
-+ AS_HELP_STRING([--enable-nominatim=@<:@no/yes/auto@:>@],
-+ [build with nominatim support]), ,
-+ enable_nominatim=auto)
-+
-+if test "x$enable_nominatim" != "xno"; then
-+ PROVIDER_SUBDIRS="$PROVIDER_SUBDIRS nominatim"
-+fi
-+
-+AC_ARG_ENABLE(manual,
-+ AS_HELP_STRING([--enable-manual=@<:@no/yes/auto@:>@],
-+ [build with manual support]), ,
-+ enable_manual=auto)
-+
-+if test "x$enable_manual" != "xno"; then
-+ PROVIDER_SUBDIRS="$PROVIDER_SUBDIRS manual"
-+fi
-+
-+AC_ARG_ENABLE(plazes,
-+ AS_HELP_STRING([--enable-plazes=@<:@no/yes/auto@:>@],
-+ [build with plazes support]), ,
-+ enable_plazes=auto)
-+
-+if test "x$enable_plazes" != "xno"; then
-+ PROVIDER_SUBDIRS="$PROVIDER_SUBDIRS plazes"
-+fi
-+
-+AC_ARG_ENABLE(yahoo,
-+ AS_HELP_STRING([--enable-yahoo=@<:@no/yes/auto@:>@],
-+ [build with yahoo support]), ,
-+ enable_yahoo=auto)
-+
-+if test "x$enable_yahoo" != "xno"; then
-+ PROVIDER_SUBDIRS="$PROVIDER_SUBDIRS yahoo"
-+fi
-+
-+AC_ARG_ENABLE(gsmloc,
-+ AS_HELP_STRING([--enable-gsmloc=@<:@no/yes/auto@:>@],
-+ [build with gsmloc support]), ,
-+ enable_gsmloc=auto)
-+
-+if test "x$enable_gsmloc" != "xno"; then
-+ PROVIDER_SUBDIRS="$PROVIDER_SUBDIRS gsmloc"
-+fi
-+
-
- # -----------------------------------------------------------
- # gypsy / gpsd / skyhook
diff --git a/app-misc/geoclue/files/geoclue-0.12.99-gpsd.patch b/app-misc/geoclue/files/geoclue-0.12.99-gpsd.patch
deleted file mode 100644
index 51160d6296e..00000000000
--- a/app-misc/geoclue/files/geoclue-0.12.99-gpsd.patch
+++ /dev/null
@@ -1,73 +0,0 @@
-Description: Refactoring to support new libgps API
-Author: James Page <james.page@ubuntu.com>
-Bug: https://bugs.freedesktop.org/show_bug.cgi?id=40996
-Forwarded: no
-
---- providers/gpsd/geoclue-gpsd.c
-+++ providers/gpsd/geoclue-gpsd.c
-@@ -40,7 +40,12 @@
- #include <geoclue/gc-iface-position.h>
- #include <geoclue/gc-iface-velocity.h>
-
-+#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;
diff --git a/app-misc/geoclue/geoclue-0.12.99.ebuild b/app-misc/geoclue/geoclue-0.12.99.ebuild
deleted file mode 100644
index 2e7e56b9b28..00000000000
--- a/app-misc/geoclue/geoclue-0.12.99.ebuild
+++ /dev/null
@@ -1,71 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=4
-inherit autotools eutils
-
-DESCRIPTION="A geoinformation D-Bus service"
-HOMEPAGE="https://freedesktop.org/wiki/Software/GeoClue"
-SRC_URI="https://freedesktop.org/~hadess/${P}.tar.gz"
-
-LICENSE="LGPL-2"
-SLOT="0"
-KEYWORDS="alpha amd64 arm ~arm64 ia64 ~mips ppc ppc64 sparc x86 ~amd64-fbsd"
-IUSE="connman geonames gps gsmloc gtk hostip manual networkmanager nominatim plazes skyhook static-libs yahoo-geo"
-
-REQUIRED_USE="skyhook? ( networkmanager )"
-
-RDEPEND=">=dev-libs/dbus-glib-0.100
- >=dev-libs/glib-2
- dev-libs/libxml2
- sys-apps/dbus
- gps? ( sci-geosciences/gpsd )
- gtk? ( x11-libs/gtk+:2 )
- networkmanager? ( net-misc/networkmanager )
- skyhook? ( net-libs/libsoup )"
-DEPEND="${RDEPEND}
- dev-util/gtk-doc-am
- virtual/pkgconfig"
-
-src_prepare() {
- epatch \
- "${FILESDIR}"/${PN}-0.12.0_p20110307-use-flag.patch \
- "${FILESDIR}"/${PN}-0.12.0_p20110307-use-fallback-mac.patch \
- "${FILESDIR}"/${P}-gpsd.patch
-
- sed -i -e '/CFLAGS/s:-g ::' configure.ac || die #399177
- sed -e "s/AM_CONFIG_HEADER/AC_CONFIG_HEADERS/" -i configure.ac || die
- eautoreconf
-}
-
-src_configure() {
- # Conic is only for Maemo. Don't enable.
- # Gypsy has multiple vulnerabilities:
- # https://bugs.freedesktop.org/show_bug.cgi?id=33431
- econf \
- --disable-silent-rules \
- $(use_enable static-libs static) \
- --disable-schemas-compile \
- $(use_enable gtk tests) \
- $(use_enable gtk) \
- --disable-conic \
- $(use_enable connman) \
- $(use_enable networkmanager) \
- --disable-gypsy \
- $(use_enable gps gpsd) \
- $(use_enable skyhook) \
- $(use_enable geonames) \
- $(use_enable gsmloc) \
- $(use_enable hostip) \
- $(use_enable manual) \
- $(use_enable nominatim) \
- $(use_enable plazes) \
- $(use_enable yahoo-geo yahoo) \
- --with-html-dir=/usr/share/doc/${PF}/html
-}
-
-src_install() {
- emake DESTDIR="${D}" install
- use gtk && dobin test/.libs/geoclue-test-gui
- prune_libtool_files
-}
diff --git a/app-misc/geoclue/metadata.xml b/app-misc/geoclue/metadata.xml
index bd2c408ce28..96f4b41efcb 100644
--- a/app-misc/geoclue/metadata.xml
+++ b/app-misc/geoclue/metadata.xml
@@ -6,16 +6,7 @@
<name>Gentoo GNOME Desktop</name>
</maintainer>
<use>
- <flag name="geonames">Install geonames.org provider</flag>
- <flag name="gsmloc">Install GSM location provider</flag>
- <flag name="gtk">Install gtk-based geoclue-test-gui</flag>
- <flag name="hostip">Install hostip.info provder</flag>
- <flag name="manual">Install manual provider</flag>
<flag name="modemmanager">Enable geolocation through 3G or GPS enabled hardware through <pkg>net-misc/modemmanager</pkg>.</flag>
- <flag name="nominatim">Install openstreetmap.org provider</flag>
- <flag name="plazes">Install plazes.com provider</flag>
- <flag name="skyhook">Install skyhookwireless.com provider</flag>
- <flag name="yahoo-geo">Install Yahoo geolocation provider</flag>
<flag name="zeroconf">Enable retrieval of GPS location from Android devices with https://wiki.gnome.org/Apps/GeoclueShare</flag>
</use>
</pkgmetadata>
^ permalink raw reply related [flat|nested] 2+ messages in thread
end of thread, other threads:[~2019-02-14 19:05 UTC | newest]
Thread overview: 2+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2016-04-09 15:29 [gentoo-commits] repo/gentoo:master commit in: app-misc/geoclue/files/, app-misc/geoclue/ Anthony G. Basile
-- strict thread matches above, loose matches on Subject: below --
2019-02-14 19:05 Mart Raudsepp
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox