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