diff options
Diffstat (limited to 'sci-geosciences/gpsd')
-rw-r--r-- | sci-geosciences/gpsd/ChangeLog | 7 | ||||
-rw-r--r-- | sci-geosciences/gpsd/files/gpsd-3.7-no-export-t.patch | 44 | ||||
-rw-r--r-- | sci-geosciences/gpsd/files/gpsd-3.8-no-export-t.patch | 44 | ||||
-rw-r--r-- | sci-geosciences/gpsd/gpsd-3.7.ebuild | 3 | ||||
-rw-r--r-- | sci-geosciences/gpsd/gpsd-3.8.ebuild | 3 | ||||
-rw-r--r-- | sci-geosciences/gpsd/gpsd-9999.ebuild | 3 |
6 files changed, 100 insertions, 4 deletions
diff --git a/sci-geosciences/gpsd/ChangeLog b/sci-geosciences/gpsd/ChangeLog index b5ef0c09a117..619f3737a2b1 100644 --- a/sci-geosciences/gpsd/ChangeLog +++ b/sci-geosciences/gpsd/ChangeLog @@ -1,6 +1,11 @@ # ChangeLog for sci-geosciences/gpsd # Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/sci-geosciences/gpsd/ChangeLog,v 1.97 2013/03/27 20:12:36 vapier Exp $ +# $Header: /var/cvsroot/gentoo-x86/sci-geosciences/gpsd/ChangeLog,v 1.98 2013/03/30 20:37:24 vapier Exp $ + + 30 Mar 2013; Mike Frysinger <vapier@gentoo.org> + +files/gpsd-3.7-no-export-t.patch, +files/gpsd-3.8-no-export-t.patch, + gpsd-3.7.ebuild, gpsd-3.8.ebuild, gpsd-9999.ebuild: + Fix building when USE="-dbus -shm -sockets" #463850 by Agostino Sarubbo. 27 Mar 2013; Mike Frysinger <vapier@gentoo.org> +files/gpsd-3.7-gps_regress.patch, gpsd-3.7.ebuild, gpsd-3.8.ebuild, diff --git a/sci-geosciences/gpsd/files/gpsd-3.7-no-export-t.patch b/sci-geosciences/gpsd/files/gpsd-3.7-no-export-t.patch new file mode 100644 index 000000000000..bcfcaf185580 --- /dev/null +++ b/sci-geosciences/gpsd/files/gpsd-3.7-no-export-t.patch @@ -0,0 +1,44 @@ +From b605a5fb47ab73412071b6571afcaef4b03c389d Mon Sep 17 00:00:00 2001 +From: Mike Frysinger <vapier@gentoo.org> +Date: Sat, 30 Mar 2013 16:35:42 -0400 +Subject: [PATCH] punt export_t + +Nothing is actually following the convention laid out by this enum, +so punt it. + +Signed-off-by: Mike Frysinger <vapier@gentoo.org> +--- + libgps.h | 17 ----------------- + 1 file changed, 17 deletions(-) + +diff --git a/libgps.h b/libgps.h +index c16b6aa..d30353f 100644 +--- a/libgps.h ++++ b/libgps.h +@@ -6,23 +6,6 @@ + #ifndef _GPSD_LIBGPS_H_ + #define _GPSD_LIBGPS_H_ + +-/* +- * first member of each kind of privdata structure must be named +- * 'export_type' and must be of this type. It's how we do runtime +- * dispatch to the different transports. +- */ +-enum export_t { +-#ifdef SOCKET_EXPORT_ENABLE +- sockets, +-#endif /* SOCKET_EXPORT_ENABLE */ +-#ifdef SHM_EXPORT_ENABLE +- shm, +-#endif /* SHM_EXPORT_ENABLE */ +-#ifdef DBUS_EXPORT_ENABLE +- dbus, +-#endif /* DBUS_EXPORT_ENABLE */ +-}; +- + /* values to poke in the gps_fd member if we get it via something special */ + #define SHM_PSEUDO_FD -1 + #define DBUS_PSEUDO_FD -2 +-- +1.8.1.2 + diff --git a/sci-geosciences/gpsd/files/gpsd-3.8-no-export-t.patch b/sci-geosciences/gpsd/files/gpsd-3.8-no-export-t.patch new file mode 100644 index 000000000000..c56929abb14a --- /dev/null +++ b/sci-geosciences/gpsd/files/gpsd-3.8-no-export-t.patch @@ -0,0 +1,44 @@ +From b605a5fb47ab73412071b6571afcaef4b03c389d Mon Sep 17 00:00:00 2001 +From: Mike Frysinger <vapier@gentoo.org> +Date: Sat, 30 Mar 2013 16:35:42 -0400 +Subject: [PATCH] punt export_t + +Nothing is actually following the convention laid out by this enum, +so punt it. + +Signed-off-by: Mike Frysinger <vapier@gentoo.org> +--- + libgps.h | 17 ----------------- + 1 file changed, 17 deletions(-) + +diff --git a/libgps.h b/libgps.h +index c16b6aa..d30353f 100644 +--- a/libgps.h ++++ b/libgps.h +@@ -6,23 +6,6 @@ + #ifndef _GPSD_LIBGPS_H_ + #define _GPSD_LIBGPS_H_ + +-/* +- * first member of each kind of privdata structure must be named +- * 'export_type' and must be of this type. It's how we do runtime +- * dispatch to the different transports. +- */ +-enum export_t { +-#ifdef SOCKET_EXPORT_ENABLE +- sockets, +-#endif /* SOCKET_EXPORT_ENABLE */ +-#ifdef SHM_EXPORT_ENABLE +- shm, +-#endif /* SHM_EXPORT_ENABLE */ +-#ifdef DBUS_EXPORT_ENABLE +- dbus, +-#endif /* DBUS_EXPORT_ENABLE */ +-}; +- + /* values to poke in the gps_fd member if we get it via something special */ + #define SHM_PSEUDO_FD -1 + #define DBUS_PSEUDO_FD -2 +-- +1.8.1.2 + diff --git a/sci-geosciences/gpsd/gpsd-3.7.ebuild b/sci-geosciences/gpsd/gpsd-3.7.ebuild index 2eab06dae4b7..71c5ed3502b1 100644 --- a/sci-geosciences/gpsd/gpsd-3.7.ebuild +++ b/sci-geosciences/gpsd/gpsd-3.7.ebuild @@ -1,6 +1,6 @@ # Copyright 1999-2013 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/sci-geosciences/gpsd/gpsd-3.7.ebuild,v 1.5 2013/03/27 20:12:36 vapier Exp $ +# $Header: /var/cvsroot/gentoo-x86/sci-geosciences/gpsd/gpsd-3.7.ebuild,v 1.6 2013/03/30 20:37:24 vapier Exp $ EAPI="4" @@ -66,6 +66,7 @@ src_prepare() { epatch "${FILESDIR}"/${PN}-3.4-no-man-gen.patch epatch "${FILESDIR}"/${PN}-3.7-rpath.patch epatch "${FILESDIR}"/${PN}-3.7-gps_regress.patch #441760 + epatch "${FILESDIR}"/${PN}-3.7-no-export-t.patch #463850 # Avoid useless -L paths to the install dir sed -i \ diff --git a/sci-geosciences/gpsd/gpsd-3.8.ebuild b/sci-geosciences/gpsd/gpsd-3.8.ebuild index 646e10c9f66a..b6844e418212 100644 --- a/sci-geosciences/gpsd/gpsd-3.8.ebuild +++ b/sci-geosciences/gpsd/gpsd-3.8.ebuild @@ -1,6 +1,6 @@ # Copyright 1999-2013 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/sci-geosciences/gpsd/gpsd-3.8.ebuild,v 1.3 2013/03/27 20:12:36 vapier Exp $ +# $Header: /var/cvsroot/gentoo-x86/sci-geosciences/gpsd/gpsd-3.8.ebuild,v 1.4 2013/03/30 20:37:24 vapier Exp $ EAPI="4" @@ -82,6 +82,7 @@ src_prepare() { epatch "${FILESDIR}"/${PN}-3.4-no-man-gen.patch epatch "${FILESDIR}"/${PN}-3.7-rpath.patch epatch "${FILESDIR}"/${PN}-3.7-gps_regress.patch #441760 + epatch "${FILESDIR}"/${PN}-3.8-no-export-t.patch #463850 # Avoid useless -L paths to the install dir sed -i \ diff --git a/sci-geosciences/gpsd/gpsd-9999.ebuild b/sci-geosciences/gpsd/gpsd-9999.ebuild index c2c83af26df4..0bfebe0e453f 100644 --- a/sci-geosciences/gpsd/gpsd-9999.ebuild +++ b/sci-geosciences/gpsd/gpsd-9999.ebuild @@ -1,6 +1,6 @@ # Copyright 1999-2013 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/sci-geosciences/gpsd/gpsd-9999.ebuild,v 1.11 2013/03/27 20:12:36 vapier Exp $ +# $Header: /var/cvsroot/gentoo-x86/sci-geosciences/gpsd/gpsd-9999.ebuild,v 1.12 2013/03/30 20:37:24 vapier Exp $ EAPI="4" @@ -82,6 +82,7 @@ src_prepare() { epatch "${FILESDIR}"/${PN}-3.4-no-man-gen.patch epatch "${FILESDIR}"/${PN}-3.7-rpath.patch epatch "${FILESDIR}"/${PN}-3.7-gps_regress.patch #441760 + epatch "${FILESDIR}"/${PN}-3.8-no-export-t.patch #463850 # Avoid useless -L paths to the install dir sed -i \ |