1 |
commit: 6a6ce709cfce859fe40ea4d4cbe0d7f2c7e1365e |
2 |
Author: Bernard Cafarelli <voyageur <AT> gentoo <DOT> org> |
3 |
AuthorDate: Mon Jan 4 12:27:39 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=6a6ce709 |
7 |
|
8 |
x11-plugins/wmtop: fix compilation with gcc 5, bug #569276 |
9 |
|
10 |
Package-Manager: portage-2.2.26 |
11 |
|
12 |
x11-plugins/wmtop/files/wmtop-0.9.0-list.patch | 127 +++++++++++++++++++++++++ |
13 |
x11-plugins/wmtop/wmtop-0.9.0-r1.ebuild | 3 +- |
14 |
2 files changed, 129 insertions(+), 1 deletion(-) |
15 |
|
16 |
diff --git a/x11-plugins/wmtop/files/wmtop-0.9.0-list.patch b/x11-plugins/wmtop/files/wmtop-0.9.0-list.patch |
17 |
new file mode 100644 |
18 |
index 0000000..e6a77a3 |
19 |
--- /dev/null |
20 |
+++ b/x11-plugins/wmtop/files/wmtop-0.9.0-list.patch |
21 |
@@ -0,0 +1,127 @@ |
22 |
+diff -Naur wmgeneral.orig/list.c wmgeneral/list.c |
23 |
+--- wmgeneral.orig/list.c 2016-01-04 13:25:53.717286654 +0100 |
24 |
++++ wmgeneral/list.c 2016-01-04 13:26:06.948290980 +0100 |
25 |
+@@ -38,7 +38,7 @@ |
26 |
+ |
27 |
+ /* Return a cons cell produced from (head . tail) */ |
28 |
+ |
29 |
+-INLINE LinkedList* |
30 |
++LinkedList* |
31 |
+ list_cons(void* head, LinkedList* tail) |
32 |
+ { |
33 |
+ LinkedList* cell; |
34 |
+@@ -51,7 +51,7 @@ |
35 |
+ |
36 |
+ /* Return the length of a list, list_length(NULL) returns zero */ |
37 |
+ |
38 |
+-INLINE int |
39 |
++int |
40 |
+ list_length(LinkedList* list) |
41 |
+ { |
42 |
+ int i = 0; |
43 |
+@@ -66,7 +66,7 @@ |
44 |
+ /* Return the Nth element of LIST, where N count from zero. If N |
45 |
+ larger than the list length, NULL is returned */ |
46 |
+ |
47 |
+-INLINE void* |
48 |
++void* |
49 |
+ list_nth(int index, LinkedList* list) |
50 |
+ { |
51 |
+ while(index-- != 0) |
52 |
+@@ -81,7 +81,7 @@ |
53 |
+ |
54 |
+ /* Remove the element at the head by replacing it by its successor */ |
55 |
+ |
56 |
+-INLINE void |
57 |
++void |
58 |
+ list_remove_head(LinkedList** list) |
59 |
+ { |
60 |
+ if (!*list) return; |
61 |
+@@ -101,7 +101,7 @@ |
62 |
+ |
63 |
+ /* Remove the element with `car' set to ELEMENT */ |
64 |
+ /* |
65 |
+-INLINE void |
66 |
++void |
67 |
+ list_remove_elem(LinkedList** list, void* elem) |
68 |
+ { |
69 |
+ while (*list) |
70 |
+@@ -112,7 +112,7 @@ |
71 |
+ } |
72 |
+ }*/ |
73 |
+ |
74 |
+-INLINE LinkedList * |
75 |
++LinkedList * |
76 |
+ list_remove_elem(LinkedList* list, void* elem) |
77 |
+ { |
78 |
+ LinkedList *tmp; |
79 |
+@@ -132,7 +132,7 @@ |
80 |
+ |
81 |
+ /* Return element that has ELEM as car */ |
82 |
+ |
83 |
+-INLINE LinkedList* |
84 |
++LinkedList* |
85 |
+ list_find(LinkedList* list, void* elem) |
86 |
+ { |
87 |
+ while(list) |
88 |
+@@ -146,7 +146,7 @@ |
89 |
+ |
90 |
+ /* Free list (backwards recursive) */ |
91 |
+ |
92 |
+-INLINE void |
93 |
++void |
94 |
+ list_free(LinkedList* list) |
95 |
+ { |
96 |
+ if(list) |
97 |
+@@ -158,7 +158,7 @@ |
98 |
+ |
99 |
+ /* Map FUNCTION over all elements in LIST */ |
100 |
+ |
101 |
+-INLINE void |
102 |
++void |
103 |
+ list_mapcar(LinkedList* list, void(*function)(void*)) |
104 |
+ { |
105 |
+ while(list) |
106 |
+diff -Naur wmgeneral.orig/list.h wmgeneral/list.h |
107 |
+--- wmgeneral.orig/list.h 2016-01-04 13:25:53.717286654 +0100 |
108 |
++++ wmgeneral/list.h 2016-01-04 13:25:56.934287706 +0100 |
109 |
+@@ -29,31 +29,25 @@ |
110 |
+ #ifndef __LIST_H_ |
111 |
+ #define __LIST_H_ |
112 |
+ |
113 |
+-#if defined(__GNUC__) && !defined(__STRICT_ANSI__) |
114 |
+-# define INLINE inline |
115 |
+-#else |
116 |
+-# define INLINE |
117 |
+-#endif |
118 |
+- |
119 |
+ typedef struct LinkedList { |
120 |
+ void *head; |
121 |
+ struct LinkedList *tail; |
122 |
+ } LinkedList; |
123 |
+ |
124 |
+-INLINE LinkedList* list_cons(void* head, LinkedList* tail); |
125 |
++LinkedList* list_cons(void* head, LinkedList* tail); |
126 |
+ |
127 |
+-INLINE int list_length(LinkedList* list); |
128 |
++int list_length(LinkedList* list); |
129 |
+ |
130 |
+-INLINE void* list_nth(int index, LinkedList* list); |
131 |
++void* list_nth(int index, LinkedList* list); |
132 |
+ |
133 |
+-INLINE void list_remove_head(LinkedList** list); |
134 |
++void list_remove_head(LinkedList** list); |
135 |
+ |
136 |
+-INLINE LinkedList *list_remove_elem(LinkedList* list, void* elem); |
137 |
++LinkedList *list_remove_elem(LinkedList* list, void* elem); |
138 |
+ |
139 |
+-INLINE void list_mapcar(LinkedList* list, void(*function)(void*)); |
140 |
++void list_mapcar(LinkedList* list, void(*function)(void*)); |
141 |
+ |
142 |
+-INLINE LinkedList*list_find(LinkedList* list, void* elem); |
143 |
++LinkedList*list_find(LinkedList* list, void* elem); |
144 |
+ |
145 |
+-INLINE void list_free(LinkedList* list); |
146 |
++void list_free(LinkedList* list); |
147 |
+ |
148 |
+ #endif |
149 |
|
150 |
diff --git a/x11-plugins/wmtop/wmtop-0.9.0-r1.ebuild b/x11-plugins/wmtop/wmtop-0.9.0-r1.ebuild |
151 |
index 14757a5..eaeb37c 100644 |
152 |
--- a/x11-plugins/wmtop/wmtop-0.9.0-r1.ebuild |
153 |
+++ b/x11-plugins/wmtop/wmtop-0.9.0-r1.ebuild |
154 |
@@ -1,4 +1,4 @@ |
155 |
-# Copyright 1999-2014 Gentoo Foundation |
156 |
+# Copyright 1999-2016 Gentoo Foundation |
157 |
# Distributed under the terms of the GNU General Public License v2 |
158 |
# $Id$ |
159 |
|
160 |
@@ -24,6 +24,7 @@ DEPEND="${RDEPEND} |
161 |
src_prepare() { |
162 |
sed -ie "s/\$(FLAGS) -o wmtop/\$(DEBUG) \$(LDFLAGS) -D\$(OS) -o wmtop/" Makefile || die "sed failed" |
163 |
epatch "${FILESDIR}"/${P}-meminfo.patch |
164 |
+ epatch "${FILESDIR}"/${P}-list.patch |
165 |
} |
166 |
|
167 |
src_compile() { |