1 |
commit: 3215b30eb9108cd579c7e2cb9926d77b0228419c |
2 |
Author: Bernard Cafarelli <voyageur <AT> gentoo <DOT> org> |
3 |
AuthorDate: Mon Jan 4 12:15:03 2016 +0000 |
4 |
Commit: Bernard Cafarelli <voyageur <AT> gentoo <DOT> org> |
5 |
CommitDate: Mon Jan 4 12:56:48 2016 +0000 |
6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=3215b30e |
7 |
|
8 |
x11-plugins/wmgtemp: gcc 5 support, ebuild cleanup, bug #568994 |
9 |
|
10 |
Package-Manager: portage-2.2.26 |
11 |
|
12 |
x11-plugins/wmgtemp/files/wmgeneral-list.patch | 129 +++++++++++++++++++++++ |
13 |
x11-plugins/wmgtemp/files/wmgtemp-1.0-list.patch | 127 ++++++++++++++++++++++ |
14 |
x11-plugins/wmgtemp/wmgtemp-1.0-r1.ebuild | 43 ++++++++ |
15 |
3 files changed, 299 insertions(+) |
16 |
|
17 |
diff --git a/x11-plugins/wmgtemp/files/wmgeneral-list.patch b/x11-plugins/wmgtemp/files/wmgeneral-list.patch |
18 |
new file mode 100644 |
19 |
index 0000000..66d5c81 |
20 |
--- /dev/null |
21 |
+++ b/x11-plugins/wmgtemp/files/wmgeneral-list.patch |
22 |
@@ -0,0 +1,129 @@ |
23 |
+diff --git a/wmgeneral/list.c b/wmgeneral/list.c |
24 |
+index a63562f..0b69885 100644 |
25 |
+--- a/wmgeneral/list.c |
26 |
++++ b/wmgeneral/list.c |
27 |
+@@ -38,7 +38,7 @@ Boston, MA 02110-1301 USA. */ |
28 |
+ |
29 |
+ /* Return a cons cell produced from (head . tail) */ |
30 |
+ |
31 |
+-INLINE LinkedList* |
32 |
++LinkedList* |
33 |
+ list_cons(void* head, LinkedList* tail) |
34 |
+ { |
35 |
+ LinkedList* cell; |
36 |
+@@ -51,7 +51,7 @@ list_cons(void* head, LinkedList* tail) |
37 |
+ |
38 |
+ /* Return the length of a list, list_length(NULL) returns zero */ |
39 |
+ |
40 |
+-INLINE int |
41 |
++int |
42 |
+ list_length(LinkedList* list) |
43 |
+ { |
44 |
+ int i = 0; |
45 |
+@@ -66,7 +66,7 @@ list_length(LinkedList* list) |
46 |
+ /* Return the Nth element of LIST, where N count from zero. If N |
47 |
+ larger than the list length, NULL is returned */ |
48 |
+ |
49 |
+-INLINE void* |
50 |
++void* |
51 |
+ list_nth(int index, LinkedList* list) |
52 |
+ { |
53 |
+ while(index-- != 0) |
54 |
+@@ -81,7 +81,7 @@ list_nth(int index, LinkedList* list) |
55 |
+ |
56 |
+ /* Remove the element at the head by replacing it by its successor */ |
57 |
+ |
58 |
+-INLINE void |
59 |
++void |
60 |
+ list_remove_head(LinkedList** list) |
61 |
+ { |
62 |
+ if (!*list) return; |
63 |
+@@ -101,7 +101,7 @@ list_remove_head(LinkedList** list) |
64 |
+ |
65 |
+ /* Remove the element with `car' set to ELEMENT */ |
66 |
+ /* |
67 |
+-INLINE void |
68 |
++void |
69 |
+ list_remove_elem(LinkedList** list, void* elem) |
70 |
+ { |
71 |
+ while (*list) |
72 |
+@@ -112,7 +112,7 @@ list_remove_elem(LinkedList** list, void* elem) |
73 |
+ } |
74 |
+ }*/ |
75 |
+ |
76 |
+-INLINE LinkedList * |
77 |
++LinkedList * |
78 |
+ list_remove_elem(LinkedList* list, void* elem) |
79 |
+ { |
80 |
+ LinkedList *tmp; |
81 |
+@@ -132,7 +132,7 @@ list_remove_elem(LinkedList* list, void* elem) |
82 |
+ |
83 |
+ /* Return element that has ELEM as car */ |
84 |
+ |
85 |
+-INLINE LinkedList* |
86 |
++LinkedList* |
87 |
+ list_find(LinkedList* list, void* elem) |
88 |
+ { |
89 |
+ while(list) |
90 |
+@@ -146,7 +146,7 @@ list_find(LinkedList* list, void* elem) |
91 |
+ |
92 |
+ /* Free list (backwards recursive) */ |
93 |
+ |
94 |
+-INLINE void |
95 |
++void |
96 |
+ list_free(LinkedList* list) |
97 |
+ { |
98 |
+ if(list) |
99 |
+@@ -158,7 +158,7 @@ list_free(LinkedList* list) |
100 |
+ |
101 |
+ /* Map FUNCTION over all elements in LIST */ |
102 |
+ |
103 |
+-INLINE void |
104 |
++void |
105 |
+ list_mapcar(LinkedList* list, void(*function)(void*)) |
106 |
+ { |
107 |
+ while(list) |
108 |
+diff --git a/wmgeneral/list.h b/wmgeneral/list.h |
109 |
+index 92c3454..3d6bad5 100644 |
110 |
+--- a/wmgeneral/list.h |
111 |
++++ b/wmgeneral/list.h |
112 |
+@@ -29,31 +29,25 @@ Boston, MA 02110-1301 USA. */ |
113 |
+ #ifndef __LIST_H_ |
114 |
+ #define __LIST_H_ |
115 |
+ |
116 |
+-#if defined(__GNUC__) && !defined(__STRICT_ANSI__) |
117 |
+-# define INLINE inline |
118 |
+-#else |
119 |
+-# define INLINE |
120 |
+-#endif |
121 |
+- |
122 |
+ typedef struct LinkedList { |
123 |
+ void *head; |
124 |
+ struct LinkedList *tail; |
125 |
+ } LinkedList; |
126 |
+ |
127 |
+-INLINE LinkedList* list_cons(void* head, LinkedList* tail); |
128 |
++LinkedList* list_cons(void* head, LinkedList* tail); |
129 |
+ |
130 |
+-INLINE int list_length(LinkedList* list); |
131 |
++int list_length(LinkedList* list); |
132 |
+ |
133 |
+-INLINE void* list_nth(int index, LinkedList* list); |
134 |
++void* list_nth(int index, LinkedList* list); |
135 |
+ |
136 |
+-INLINE void list_remove_head(LinkedList** list); |
137 |
++void list_remove_head(LinkedList** list); |
138 |
+ |
139 |
+-INLINE LinkedList *list_remove_elem(LinkedList* list, void* elem); |
140 |
++LinkedList *list_remove_elem(LinkedList* list, void* elem); |
141 |
+ |
142 |
+-INLINE void list_mapcar(LinkedList* list, void(*function)(void*)); |
143 |
++void list_mapcar(LinkedList* list, void(*function)(void*)); |
144 |
+ |
145 |
+-INLINE LinkedList*list_find(LinkedList* list, void* elem); |
146 |
++LinkedList*list_find(LinkedList* list, void* elem); |
147 |
+ |
148 |
+-INLINE void list_free(LinkedList* list); |
149 |
++void list_free(LinkedList* list); |
150 |
+ |
151 |
+ #endif |
152 |
|
153 |
diff --git a/x11-plugins/wmgtemp/files/wmgtemp-1.0-list.patch b/x11-plugins/wmgtemp/files/wmgtemp-1.0-list.patch |
154 |
new file mode 100644 |
155 |
index 0000000..54a2eb2 |
156 |
--- /dev/null |
157 |
+++ b/x11-plugins/wmgtemp/files/wmgtemp-1.0-list.patch |
158 |
@@ -0,0 +1,127 @@ |
159 |
+diff -Naur src/wmgeneral.orig/list.c src/wmgeneral/list.c |
160 |
+--- src/wmgeneral.orig/list.c 2016-01-04 13:10:41.091981064 +0100 |
161 |
++++ src/wmgeneral/list.c 2016-01-04 13:10:56.428986326 +0100 |
162 |
+@@ -38,7 +38,7 @@ |
163 |
+ |
164 |
+ /* Return a cons cell produced from (head . tail) */ |
165 |
+ |
166 |
+-INLINE LinkedList* |
167 |
++LinkedList* |
168 |
+ list_cons(void* head, LinkedList* tail) |
169 |
+ { |
170 |
+ LinkedList* cell; |
171 |
+@@ -51,7 +51,7 @@ |
172 |
+ |
173 |
+ /* Return the length of a list, list_length(NULL) returns zero */ |
174 |
+ |
175 |
+-INLINE int |
176 |
++int |
177 |
+ list_length(LinkedList* list) |
178 |
+ { |
179 |
+ int i = 0; |
180 |
+@@ -66,7 +66,7 @@ |
181 |
+ /* Return the Nth element of LIST, where N count from zero. If N |
182 |
+ larger than the list length, NULL is returned */ |
183 |
+ |
184 |
+-INLINE void* |
185 |
++void* |
186 |
+ list_nth(int index, LinkedList* list) |
187 |
+ { |
188 |
+ while(index-- != 0) |
189 |
+@@ -81,7 +81,7 @@ |
190 |
+ |
191 |
+ /* Remove the element at the head by replacing it by its successor */ |
192 |
+ |
193 |
+-INLINE void |
194 |
++void |
195 |
+ list_remove_head(LinkedList** list) |
196 |
+ { |
197 |
+ if (!*list) return; |
198 |
+@@ -101,7 +101,7 @@ |
199 |
+ |
200 |
+ /* Remove the element with `car' set to ELEMENT */ |
201 |
+ /* |
202 |
+-INLINE void |
203 |
++void |
204 |
+ list_remove_elem(LinkedList** list, void* elem) |
205 |
+ { |
206 |
+ while (*list) |
207 |
+@@ -112,7 +112,7 @@ |
208 |
+ } |
209 |
+ }*/ |
210 |
+ |
211 |
+-INLINE LinkedList * |
212 |
++LinkedList * |
213 |
+ list_remove_elem(LinkedList* list, void* elem) |
214 |
+ { |
215 |
+ LinkedList *tmp; |
216 |
+@@ -132,7 +132,7 @@ |
217 |
+ |
218 |
+ /* Return element that has ELEM as car */ |
219 |
+ |
220 |
+-INLINE LinkedList* |
221 |
++LinkedList* |
222 |
+ list_find(LinkedList* list, void* elem) |
223 |
+ { |
224 |
+ while(list) |
225 |
+@@ -146,7 +146,7 @@ |
226 |
+ |
227 |
+ /* Free list (backwards recursive) */ |
228 |
+ |
229 |
+-INLINE void |
230 |
++void |
231 |
+ list_free(LinkedList* list) |
232 |
+ { |
233 |
+ if(list) |
234 |
+@@ -158,7 +158,7 @@ |
235 |
+ |
236 |
+ /* Map FUNCTION over all elements in LIST */ |
237 |
+ |
238 |
+-INLINE void |
239 |
++void |
240 |
+ list_mapcar(LinkedList* list, void(*function)(void*)) |
241 |
+ { |
242 |
+ while(list) |
243 |
+diff -Naur src/wmgeneral.orig/list.h src/wmgeneral/list.h |
244 |
+--- src/wmgeneral.orig/list.h 2016-01-04 13:10:41.091981064 +0100 |
245 |
++++ src/wmgeneral/list.h 2016-01-04 13:10:42.883981679 +0100 |
246 |
+@@ -29,31 +29,25 @@ |
247 |
+ #ifndef __LIST_H_ |
248 |
+ #define __LIST_H_ |
249 |
+ |
250 |
+-#if defined(__GNUC__) && !defined(__STRICT_ANSI__) |
251 |
+-# define INLINE inline |
252 |
+-#else |
253 |
+-# define INLINE |
254 |
+-#endif |
255 |
+- |
256 |
+ typedef struct LinkedList { |
257 |
+ void *head; |
258 |
+ struct LinkedList *tail; |
259 |
+ } LinkedList; |
260 |
+ |
261 |
+-INLINE LinkedList* list_cons(void* head, LinkedList* tail); |
262 |
++LinkedList* list_cons(void* head, LinkedList* tail); |
263 |
+ |
264 |
+-INLINE int list_length(LinkedList* list); |
265 |
++int list_length(LinkedList* list); |
266 |
+ |
267 |
+-INLINE void* list_nth(int index, LinkedList* list); |
268 |
++void* list_nth(int index, LinkedList* list); |
269 |
+ |
270 |
+-INLINE void list_remove_head(LinkedList** list); |
271 |
++void list_remove_head(LinkedList** list); |
272 |
+ |
273 |
+-INLINE LinkedList *list_remove_elem(LinkedList* list, void* elem); |
274 |
++LinkedList *list_remove_elem(LinkedList* list, void* elem); |
275 |
+ |
276 |
+-INLINE void list_mapcar(LinkedList* list, void(*function)(void*)); |
277 |
++void list_mapcar(LinkedList* list, void(*function)(void*)); |
278 |
+ |
279 |
+-INLINE LinkedList*list_find(LinkedList* list, void* elem); |
280 |
++LinkedList*list_find(LinkedList* list, void* elem); |
281 |
+ |
282 |
+-INLINE void list_free(LinkedList* list); |
283 |
++void list_free(LinkedList* list); |
284 |
+ |
285 |
+ #endif |
286 |
|
287 |
diff --git a/x11-plugins/wmgtemp/wmgtemp-1.0-r1.ebuild b/x11-plugins/wmgtemp/wmgtemp-1.0-r1.ebuild |
288 |
new file mode 100644 |
289 |
index 0000000..8974ea9 |
290 |
--- /dev/null |
291 |
+++ b/x11-plugins/wmgtemp/wmgtemp-1.0-r1.ebuild |
292 |
@@ -0,0 +1,43 @@ |
293 |
+# Copyright 1999-2016 Gentoo Foundation |
294 |
+# Distributed under the terms of the GNU General Public License v2 |
295 |
+# $Id$ |
296 |
+ |
297 |
+EAPI=5 |
298 |
+inherit eutils toolchain-funcs |
299 |
+ |
300 |
+DESCRIPTION="CPU and SYS temperature dockapp" |
301 |
+HOMEPAGE="http://www.fluxcode.net" |
302 |
+SRC_URI="http://www.fluxcode.net/${P}.tar.bz2" |
303 |
+ |
304 |
+LICENSE="Artistic" |
305 |
+SLOT="0" |
306 |
+KEYWORDS="~amd64 ~x86" |
307 |
+IUSE="" |
308 |
+ |
309 |
+RDEPEND="x11-libs/libX11 |
310 |
+ x11-libs/libXext |
311 |
+ x11-libs/libXpm" |
312 |
+DEPEND="${RDEPEND} |
313 |
+ x11-proto/xextproto |
314 |
+ =sys-apps/lm_sensors-3* |
315 |
+ >=sys-apps/sed-4" |
316 |
+ |
317 |
+src_prepare() { |
318 |
+ epatch "${FILESDIR}"/${P}-list.patch |
319 |
+ |
320 |
+ sed -i -e "s:-Wall -g:\$(CFLAGS):" src/Makefile || die "sed failed." |
321 |
+ |
322 |
+ #Honour Gentoo LDFLAGS, rationalizing Makefile - see bug #337411. |
323 |
+ sed -i -e "s:LDFLAGS =:LIBS =:" src/Makefile || die "sed failed." |
324 |
+ sed -i -e "s:\$(LDFLAGS) -o \$(BINARY):\$(LDFLAGS) -o \$(BINARY) \$(LIBS):" src/Makefile || die "sed failed." |
325 |
+} |
326 |
+ |
327 |
+src_compile() { |
328 |
+ emake CC=$(tc-getCC) |
329 |
+} |
330 |
+ |
331 |
+src_install() { |
332 |
+ dodoc BUGS CREDITS README TODO |
333 |
+ dobin src/wmgtemp |
334 |
+ doman wmgtemp.1 |
335 |
+} |