gentoo resync : 14.07.2018

4 files changed, 0 insertions, 212 deletions

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 9c9115a284ef..000000000000
--- 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 236c98928ba7..000000000000
--- 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 51160d6296e0..000000000000
--- 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/files/geoclue-2.4.1-fix-GLIBC-features.patch b/app-misc/geoclue/files/geoclue-2.4.1-fix-GLIBC-features.patch
deleted file mode 100644
index b27bf5d44c01..000000000000
--- a/app-misc/geoclue/files/geoclue-2.4.1-fix-GLIBC-features.patch
+++ /dev/null
@@ -1,44 +0,0 @@
-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
-