1 |
vapier 13/03/30 20:37:24 |
2 |
|
3 |
Added: gpsd-3.7-no-export-t.patch |
4 |
gpsd-3.8-no-export-t.patch |
5 |
Log: |
6 |
Fix building when USE="-dbus -shm -sockets" #463850 by Agostino Sarubbo. |
7 |
|
8 |
(Portage version: 2.2.0_alpha169/cvs/Linux x86_64, signed Manifest commit with key FB7C4156) |
9 |
|
10 |
Revision Changes Path |
11 |
1.1 sci-geosciences/gpsd/files/gpsd-3.7-no-export-t.patch |
12 |
|
13 |
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sci-geosciences/gpsd/files/gpsd-3.7-no-export-t.patch?rev=1.1&view=markup |
14 |
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sci-geosciences/gpsd/files/gpsd-3.7-no-export-t.patch?rev=1.1&content-type=text/plain |
15 |
|
16 |
Index: gpsd-3.7-no-export-t.patch |
17 |
=================================================================== |
18 |
From b605a5fb47ab73412071b6571afcaef4b03c389d Mon Sep 17 00:00:00 2001 |
19 |
From: Mike Frysinger <vapier@g.o> |
20 |
Date: Sat, 30 Mar 2013 16:35:42 -0400 |
21 |
Subject: [PATCH] punt export_t |
22 |
|
23 |
Nothing is actually following the convention laid out by this enum, |
24 |
so punt it. |
25 |
|
26 |
Signed-off-by: Mike Frysinger <vapier@g.o> |
27 |
--- |
28 |
libgps.h | 17 ----------------- |
29 |
1 file changed, 17 deletions(-) |
30 |
|
31 |
diff --git a/libgps.h b/libgps.h |
32 |
index c16b6aa..d30353f 100644 |
33 |
--- a/libgps.h |
34 |
+++ b/libgps.h |
35 |
@@ -6,23 +6,6 @@ |
36 |
#ifndef _GPSD_LIBGPS_H_ |
37 |
#define _GPSD_LIBGPS_H_ |
38 |
|
39 |
-/* |
40 |
- * first member of each kind of privdata structure must be named |
41 |
- * 'export_type' and must be of this type. It's how we do runtime |
42 |
- * dispatch to the different transports. |
43 |
- */ |
44 |
-enum export_t { |
45 |
-#ifdef SOCKET_EXPORT_ENABLE |
46 |
- sockets, |
47 |
-#endif /* SOCKET_EXPORT_ENABLE */ |
48 |
-#ifdef SHM_EXPORT_ENABLE |
49 |
- shm, |
50 |
-#endif /* SHM_EXPORT_ENABLE */ |
51 |
-#ifdef DBUS_EXPORT_ENABLE |
52 |
- dbus, |
53 |
-#endif /* DBUS_EXPORT_ENABLE */ |
54 |
-}; |
55 |
- |
56 |
/* values to poke in the gps_fd member if we get it via something special */ |
57 |
#define SHM_PSEUDO_FD -1 |
58 |
#define DBUS_PSEUDO_FD -2 |
59 |
-- |
60 |
1.8.1.2 |
61 |
|
62 |
|
63 |
|
64 |
|
65 |
1.1 sci-geosciences/gpsd/files/gpsd-3.8-no-export-t.patch |
66 |
|
67 |
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sci-geosciences/gpsd/files/gpsd-3.8-no-export-t.patch?rev=1.1&view=markup |
68 |
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sci-geosciences/gpsd/files/gpsd-3.8-no-export-t.patch?rev=1.1&content-type=text/plain |
69 |
|
70 |
Index: gpsd-3.8-no-export-t.patch |
71 |
=================================================================== |
72 |
From b605a5fb47ab73412071b6571afcaef4b03c389d Mon Sep 17 00:00:00 2001 |
73 |
From: Mike Frysinger <vapier@g.o> |
74 |
Date: Sat, 30 Mar 2013 16:35:42 -0400 |
75 |
Subject: [PATCH] punt export_t |
76 |
|
77 |
Nothing is actually following the convention laid out by this enum, |
78 |
so punt it. |
79 |
|
80 |
Signed-off-by: Mike Frysinger <vapier@g.o> |
81 |
--- |
82 |
libgps.h | 17 ----------------- |
83 |
1 file changed, 17 deletions(-) |
84 |
|
85 |
diff --git a/libgps.h b/libgps.h |
86 |
index c16b6aa..d30353f 100644 |
87 |
--- a/libgps.h |
88 |
+++ b/libgps.h |
89 |
@@ -6,23 +6,6 @@ |
90 |
#ifndef _GPSD_LIBGPS_H_ |
91 |
#define _GPSD_LIBGPS_H_ |
92 |
|
93 |
-/* |
94 |
- * first member of each kind of privdata structure must be named |
95 |
- * 'export_type' and must be of this type. It's how we do runtime |
96 |
- * dispatch to the different transports. |
97 |
- */ |
98 |
-enum export_t { |
99 |
-#ifdef SOCKET_EXPORT_ENABLE |
100 |
- sockets, |
101 |
-#endif /* SOCKET_EXPORT_ENABLE */ |
102 |
-#ifdef SHM_EXPORT_ENABLE |
103 |
- shm, |
104 |
-#endif /* SHM_EXPORT_ENABLE */ |
105 |
-#ifdef DBUS_EXPORT_ENABLE |
106 |
- dbus, |
107 |
-#endif /* DBUS_EXPORT_ENABLE */ |
108 |
-}; |
109 |
- |
110 |
/* values to poke in the gps_fd member if we get it via something special */ |
111 |
#define SHM_PSEUDO_FD -1 |
112 |
#define DBUS_PSEUDO_FD -2 |
113 |
-- |
114 |
1.8.1.2 |