1 |
haubi 17/05/29 12:40:21 |
2 |
|
3 |
Modified: 001_all_nolibcheck.patch 003_all_pthread.patch |
4 |
004_all_aix.patch 005_all_hpux.patch |
5 |
006_all_as-needed.patch 007_all_qt4-nothread.patch |
6 |
008_all_drop-pgsql-header-check.patch |
7 |
009_all_check-const-overload.patch |
8 |
010_all_preserve-cflags.patch |
9 |
011_all_gtk-check-stdlib.patch |
10 |
012_all_early-header-check.patch |
11 |
014_all_idl-noresolve.patch |
12 |
Log: |
13 |
Have patches apply with -p1, for use with eapply in EAPI 6. |
14 |
|
15 |
Revision Changes Path |
16 |
1.3 src/patchsets/mico/2.3.13/001_all_nolibcheck.patch |
17 |
|
18 |
file : http://sources.gentoo.org/viewvc.cgi/gentoo/src/patchsets/mico/2.3.13/001_all_nolibcheck.patch?rev=1.3&view=markup |
19 |
plain: http://sources.gentoo.org/viewvc.cgi/gentoo/src/patchsets/mico/2.3.13/001_all_nolibcheck.patch?rev=1.3&content-type=text/plain |
20 |
diff : http://sources.gentoo.org/viewvc.cgi/gentoo/src/patchsets/mico/2.3.13/001_all_nolibcheck.patch?r1=1.2&r2=1.3 |
21 |
|
22 |
Index: 001_all_nolibcheck.patch |
23 |
=================================================================== |
24 |
RCS file: /var/cvsroot/gentoo/src/patchsets/mico/2.3.13/001_all_nolibcheck.patch,v |
25 |
retrieving revision 1.2 |
26 |
retrieving revision 1.3 |
27 |
diff -u -r1.2 -r1.3 |
28 |
--- 001_all_nolibcheck.patch 26 May 2011 09:12:31 -0000 1.2 |
29 |
+++ 001_all_nolibcheck.patch 29 May 2017 12:40:21 -0000 1.3 |
30 |
@@ -1,7 +1,7 @@ |
31 |
don't check for libbsd and libelf, they aren't needed anywhere. |
32 |
|
33 |
---- configure.in.orig 2009-02-02 14:34:14.000000000 +0100 |
34 |
-+++ configure.in 2009-02-02 14:37:45.000000000 +0100 |
35 |
+--- mico/configure.in |
36 |
++++ mico/configure.in |
37 |
@@ -1237,9 +1237,7 @@ |
38 |
|
39 |
|
40 |
|
41 |
|
42 |
|
43 |
1.4 src/patchsets/mico/2.3.13/003_all_pthread.patch |
44 |
|
45 |
file : http://sources.gentoo.org/viewvc.cgi/gentoo/src/patchsets/mico/2.3.13/003_all_pthread.patch?rev=1.4&view=markup |
46 |
plain: http://sources.gentoo.org/viewvc.cgi/gentoo/src/patchsets/mico/2.3.13/003_all_pthread.patch?rev=1.4&content-type=text/plain |
47 |
diff : http://sources.gentoo.org/viewvc.cgi/gentoo/src/patchsets/mico/2.3.13/003_all_pthread.patch?r1=1.3&r2=1.4 |
48 |
|
49 |
Index: 003_all_pthread.patch |
50 |
=================================================================== |
51 |
RCS file: /var/cvsroot/gentoo/src/patchsets/mico/2.3.13/003_all_pthread.patch,v |
52 |
retrieving revision 1.3 |
53 |
retrieving revision 1.4 |
54 |
diff -u -r1.3 -r1.4 |
55 |
--- 003_all_pthread.patch 28 Jun 2011 15:02:50 -0000 1.3 |
56 |
+++ 003_all_pthread.patch 29 May 2017 12:40:21 -0000 1.4 |
57 |
@@ -2,8 +2,8 @@ |
58 |
compiler flag to do all pthread specific things. |
59 |
|
60 |
http://sourceforge.net/mailarchive/forum.php?thread_name=4DDFA157.4040609%40gentoo.org&forum_name=mico-devel |
61 |
---- configure.in.orig 2009-04-02 17:25:45 +0200 |
62 |
-+++ configure.in 2009-04-02 17:32:00 +0200 |
63 |
+--- mico/configure.in |
64 |
++++ mico/configure.in |
65 |
@@ -524,7 +524,19 @@ |
66 |
) |
67 |
AC_CHECK_HEADERS(semaphore.h) |
68 |
|
69 |
|
70 |
|
71 |
1.2 src/patchsets/mico/2.3.13/004_all_aix.patch |
72 |
|
73 |
file : http://sources.gentoo.org/viewvc.cgi/gentoo/src/patchsets/mico/2.3.13/004_all_aix.patch?rev=1.2&view=markup |
74 |
plain: http://sources.gentoo.org/viewvc.cgi/gentoo/src/patchsets/mico/2.3.13/004_all_aix.patch?rev=1.2&content-type=text/plain |
75 |
diff : http://sources.gentoo.org/viewvc.cgi/gentoo/src/patchsets/mico/2.3.13/004_all_aix.patch?r1=1.1&r2=1.2 |
76 |
|
77 |
Index: 004_all_aix.patch |
78 |
=================================================================== |
79 |
RCS file: /var/cvsroot/gentoo/src/patchsets/mico/2.3.13/004_all_aix.patch,v |
80 |
retrieving revision 1.1 |
81 |
retrieving revision 1.2 |
82 |
diff -u -r1.1 -r1.2 |
83 |
--- 004_all_aix.patch 16 Aug 2010 15:07:30 -0000 1.1 |
84 |
+++ 004_all_aix.patch 29 May 2017 12:40:21 -0000 1.2 |
85 |
@@ -1,6 +1,6 @@ |
86 |
Do not add '-lstdc++' explicitly, this is c++ compiler's job. |
87 |
---- admin/mico-shld.aix.in.orig 2009-04-02 17:33:03 +0200 |
88 |
-+++ admin/mico-shld.aix.in 2009-04-02 17:33:22 +0200 |
89 |
+--- mico/admin/mico-shld.aix.in |
90 |
++++ mico/admin/mico-shld.aix.in |
91 |
@@ -87,7 +87,7 @@ |
92 |
|
93 |
|
94 |
|
95 |
|
96 |
|
97 |
1.3 src/patchsets/mico/2.3.13/005_all_hpux.patch |
98 |
|
99 |
file : http://sources.gentoo.org/viewvc.cgi/gentoo/src/patchsets/mico/2.3.13/005_all_hpux.patch?rev=1.3&view=markup |
100 |
plain: http://sources.gentoo.org/viewvc.cgi/gentoo/src/patchsets/mico/2.3.13/005_all_hpux.patch?rev=1.3&content-type=text/plain |
101 |
diff : http://sources.gentoo.org/viewvc.cgi/gentoo/src/patchsets/mico/2.3.13/005_all_hpux.patch?r1=1.2&r2=1.3 |
102 |
|
103 |
Index: 005_all_hpux.patch |
104 |
=================================================================== |
105 |
RCS file: /var/cvsroot/gentoo/src/patchsets/mico/2.3.13/005_all_hpux.patch,v |
106 |
retrieving revision 1.2 |
107 |
retrieving revision 1.3 |
108 |
diff -u -r1.2 -r1.3 |
109 |
--- 005_all_hpux.patch 26 May 2011 09:12:31 -0000 1.2 |
110 |
+++ 005_all_hpux.patch 29 May 2017 12:40:21 -0000 1.3 |
111 |
@@ -1,7 +1,7 @@ |
112 |
http://www.mico.org/pipermail/mico-devel/2009-April/010285.html |
113 |
|
114 |
---- configure.in.orig 2009-04-02 12:53:03 +0200 |
115 |
-+++ configure.in 2009-04-02 15:34:10 +0200 |
116 |
+--- mico/configure.in |
117 |
++++ mico/configure.in |
118 |
@@ -732,7 +732,9 @@ |
119 |
# -mmillicode-long-calls |
120 |
CONF_LDFLAGS=-Wl,+s |
121 |
|
122 |
|
123 |
|
124 |
1.3 src/patchsets/mico/2.3.13/006_all_as-needed.patch |
125 |
|
126 |
file : http://sources.gentoo.org/viewvc.cgi/gentoo/src/patchsets/mico/2.3.13/006_all_as-needed.patch?rev=1.3&view=markup |
127 |
plain: http://sources.gentoo.org/viewvc.cgi/gentoo/src/patchsets/mico/2.3.13/006_all_as-needed.patch?rev=1.3&content-type=text/plain |
128 |
diff : http://sources.gentoo.org/viewvc.cgi/gentoo/src/patchsets/mico/2.3.13/006_all_as-needed.patch?r1=1.2&r2=1.3 |
129 |
|
130 |
Index: 006_all_as-needed.patch |
131 |
=================================================================== |
132 |
RCS file: /var/cvsroot/gentoo/src/patchsets/mico/2.3.13/006_all_as-needed.patch,v |
133 |
retrieving revision 1.2 |
134 |
retrieving revision 1.3 |
135 |
diff -u -r1.2 -r1.3 |
136 |
--- 006_all_as-needed.patch 26 May 2011 09:09:36 -0000 1.2 |
137 |
+++ 006_all_as-needed.patch 29 May 2017 12:40:21 -0000 1.3 |
138 |
@@ -1,7 +1,7 @@ |
139 |
Link libmico.so against configured libraries, |
140 |
to get -Wl,--as-needed working. #280678. |
141 |
---- orb/Makefile.orig 2011-05-26 09:28:52.629834934 +0200 |
142 |
-+++ orb/Makefile 2011-05-26 09:28:59.519791273 +0200 |
143 |
+--- mico/orb/Makefile |
144 |
++++ mico/orb/Makefile |
145 |
@@ -30,7 +30,7 @@ |
146 |
endif |
147 |
endif |
148 |
|
149 |
|
150 |
|
151 |
1.3 src/patchsets/mico/2.3.13/007_all_qt4-nothread.patch |
152 |
|
153 |
file : http://sources.gentoo.org/viewvc.cgi/gentoo/src/patchsets/mico/2.3.13/007_all_qt4-nothread.patch?rev=1.3&view=markup |
154 |
plain: http://sources.gentoo.org/viewvc.cgi/gentoo/src/patchsets/mico/2.3.13/007_all_qt4-nothread.patch?rev=1.3&content-type=text/plain |
155 |
diff : http://sources.gentoo.org/viewvc.cgi/gentoo/src/patchsets/mico/2.3.13/007_all_qt4-nothread.patch?r1=1.2&r2=1.3 |
156 |
|
157 |
Index: 007_all_qt4-nothread.patch |
158 |
=================================================================== |
159 |
RCS file: /var/cvsroot/gentoo/src/patchsets/mico/2.3.13/007_all_qt4-nothread.patch,v |
160 |
retrieving revision 1.2 |
161 |
retrieving revision 1.3 |
162 |
diff -u -r1.2 -r1.3 |
163 |
--- 007_all_qt4-nothread.patch 26 May 2011 09:12:31 -0000 1.2 |
164 |
+++ 007_all_qt4-nothread.patch 29 May 2017 12:40:21 -0000 1.3 |
165 |
@@ -1,6 +1,6 @@ |
166 |
qt4 doesn't provide different libraries for threading. |
167 |
---- configure.in.orig 2010-01-12 16:40:06.935594142 +0100 |
168 |
-+++ configure.in 2010-01-12 16:40:37.742311509 +0100 |
169 |
+--- mico/configure.in |
170 |
++++ mico/configure.in |
171 |
@@ -1124,7 +1124,7 @@ |
172 |
AC_MSG_WARN(cannot find moc. QT parts disabled.) |
173 |
HAVE_QT=no |
174 |
|
175 |
|
176 |
|
177 |
1.3 src/patchsets/mico/2.3.13/008_all_drop-pgsql-header-check.patch |
178 |
|
179 |
file : http://sources.gentoo.org/viewvc.cgi/gentoo/src/patchsets/mico/2.3.13/008_all_drop-pgsql-header-check.patch?rev=1.3&view=markup |
180 |
plain: http://sources.gentoo.org/viewvc.cgi/gentoo/src/patchsets/mico/2.3.13/008_all_drop-pgsql-header-check.patch?rev=1.3&content-type=text/plain |
181 |
diff : http://sources.gentoo.org/viewvc.cgi/gentoo/src/patchsets/mico/2.3.13/008_all_drop-pgsql-header-check.patch?r1=1.2&r2=1.3 |
182 |
|
183 |
Index: 008_all_drop-pgsql-header-check.patch |
184 |
=================================================================== |
185 |
RCS file: /var/cvsroot/gentoo/src/patchsets/mico/2.3.13/008_all_drop-pgsql-header-check.patch,v |
186 |
retrieving revision 1.2 |
187 |
retrieving revision 1.3 |
188 |
diff -u -r1.2 -r1.3 |
189 |
--- 008_all_drop-pgsql-header-check.patch 26 May 2011 09:12:31 -0000 1.2 |
190 |
+++ 008_all_drop-pgsql-header-check.patch 29 May 2017 12:40:21 -0000 1.3 |
191 |
@@ -1,8 +1,8 @@ |
192 |
http://bugs.gentoo.org/show_bug.cgi?id=306255 |
193 |
|
194 |
Result of 'checking for pgsql/libpq-fe.h' is not used anywhere, just drop it. |
195 |
---- configure.in.orig 2010-02-24 10:27:45.043267799 +0100 |
196 |
-+++ configure.in 2010-02-24 10:28:09.016074329 +0100 |
197 |
+--- mico/configure.in |
198 |
++++ mico/configure.in |
199 |
@@ -1324,7 +1324,7 @@ |
200 |
AC_CHECK_HEADERS(netinet/tcp.h stdlib.h sys/time.h sunmath.h sys/stat.h) |
201 |
AC_CHECK_HEADERS(poll.h) |
202 |
|
203 |
|
204 |
|
205 |
1.3 src/patchsets/mico/2.3.13/009_all_check-const-overload.patch |
206 |
|
207 |
file : http://sources.gentoo.org/viewvc.cgi/gentoo/src/patchsets/mico/2.3.13/009_all_check-const-overload.patch?rev=1.3&view=markup |
208 |
plain: http://sources.gentoo.org/viewvc.cgi/gentoo/src/patchsets/mico/2.3.13/009_all_check-const-overload.patch?rev=1.3&content-type=text/plain |
209 |
diff : http://sources.gentoo.org/viewvc.cgi/gentoo/src/patchsets/mico/2.3.13/009_all_check-const-overload.patch?r1=1.2&r2=1.3 |
210 |
|
211 |
Index: 009_all_check-const-overload.patch |
212 |
=================================================================== |
213 |
RCS file: /var/cvsroot/gentoo/src/patchsets/mico/2.3.13/009_all_check-const-overload.patch,v |
214 |
retrieving revision 1.2 |
215 |
retrieving revision 1.3 |
216 |
diff -u -r1.2 -r1.3 |
217 |
--- 009_all_check-const-overload.patch 28 Jun 2011 15:02:50 -0000 1.2 |
218 |
+++ 009_all_check-const-overload.patch 29 May 2017 12:40:21 -0000 1.3 |
219 |
@@ -3,8 +3,8 @@ |
220 |
http://bugs.gentoo.org/show_bug.cgi?id=365117 |
221 |
|
222 |
http://sourceforge.net/mailarchive/forum.php?thread_name=4DDFA16F.6040109%40gentoo.org&forum_name=mico-devel |
223 |
---- aclocal.m4.orig 2011-05-25 14:20:01.626683873 +0200 |
224 |
-+++ aclocal.m4 2011-05-25 14:20:43.930773070 +0200 |
225 |
+--- mico/aclocal.m4 |
226 |
++++ mico/aclocal.m4 |
227 |
@@ -353,11 +353,12 @@ |
228 |
|
229 |
void bar (const int &, int &, const int *, int *, int *&); |
230 |
|
231 |
|
232 |
|
233 |
1.2 src/patchsets/mico/2.3.13/010_all_preserve-cflags.patch |
234 |
|
235 |
file : http://sources.gentoo.org/viewvc.cgi/gentoo/src/patchsets/mico/2.3.13/010_all_preserve-cflags.patch?rev=1.2&view=markup |
236 |
plain: http://sources.gentoo.org/viewvc.cgi/gentoo/src/patchsets/mico/2.3.13/010_all_preserve-cflags.patch?rev=1.2&content-type=text/plain |
237 |
diff : http://sources.gentoo.org/viewvc.cgi/gentoo/src/patchsets/mico/2.3.13/010_all_preserve-cflags.patch?r1=1.1&r2=1.2 |
238 |
|
239 |
Index: 010_all_preserve-cflags.patch |
240 |
=================================================================== |
241 |
RCS file: /var/cvsroot/gentoo/src/patchsets/mico/2.3.13/010_all_preserve-cflags.patch,v |
242 |
retrieving revision 1.1 |
243 |
retrieving revision 1.2 |
244 |
diff -u -r1.1 -r1.2 |
245 |
--- 010_all_preserve-cflags.patch 26 May 2011 09:14:13 -0000 1.1 |
246 |
+++ 010_all_preserve-cflags.patch 29 May 2017 12:40:21 -0000 1.2 |
247 |
@@ -1,8 +1,8 @@ |
248 |
Do not tweak CFLAGS/CXXFLAGS for -g/-O2 if not explicitly requested |
249 |
by configure arguments --*able-debug/--*able-optimize. |
250 |
|
251 |
---- configure.in.orig 2011-05-25 16:22:01.402618836 +0200 |
252 |
-+++ configure.in 2011-05-25 16:27:35.022640710 +0200 |
253 |
+--- mico/configure.in |
254 |
++++ mico/configure.in |
255 |
@@ -112,12 +112,12 @@ |
256 |
use_repo=$enableval, use_repo=no) |
257 |
|
258 |
|
259 |
|
260 |
|
261 |
1.3 src/patchsets/mico/2.3.13/011_all_gtk-check-stdlib.patch |
262 |
|
263 |
file : http://sources.gentoo.org/viewvc.cgi/gentoo/src/patchsets/mico/2.3.13/011_all_gtk-check-stdlib.patch?rev=1.3&view=markup |
264 |
plain: http://sources.gentoo.org/viewvc.cgi/gentoo/src/patchsets/mico/2.3.13/011_all_gtk-check-stdlib.patch?rev=1.3&content-type=text/plain |
265 |
diff : http://sources.gentoo.org/viewvc.cgi/gentoo/src/patchsets/mico/2.3.13/011_all_gtk-check-stdlib.patch?r1=1.2&r2=1.3 |
266 |
|
267 |
Index: 011_all_gtk-check-stdlib.patch |
268 |
=================================================================== |
269 |
RCS file: /var/cvsroot/gentoo/src/patchsets/mico/2.3.13/011_all_gtk-check-stdlib.patch,v |
270 |
retrieving revision 1.2 |
271 |
retrieving revision 1.3 |
272 |
diff -u -r1.2 -r1.3 |
273 |
--- 011_all_gtk-check-stdlib.patch 28 Jun 2011 15:03:34 -0000 1.2 |
274 |
+++ 011_all_gtk-check-stdlib.patch 29 May 2017 12:40:21 -0000 1.3 |
275 |
@@ -3,8 +3,8 @@ |
276 |
Also fix signed-unsigned-comparison warning. |
277 |
|
278 |
http://sourceforge.net/mailarchive/forum.php?thread_name=4DDFA182.40903%40gentoo.org&forum_name=mico-devel |
279 |
---- aclocal.m4.orig 2011-05-25 16:55:15.609086191 +0200 |
280 |
-+++ aclocal.m4 2011-05-25 16:55:22.999136294 +0200 |
281 |
+--- mico/aclocal.m4 |
282 |
++++ mico/aclocal.m4 |
283 |
@@ -765,6 +765,7 @@ |
284 |
AC_TRY_RUN([ |
285 |
#include <gtk/gtk.h> |
286 |
|
287 |
|
288 |
|
289 |
1.2 src/patchsets/mico/2.3.13/012_all_early-header-check.patch |
290 |
|
291 |
file : http://sources.gentoo.org/viewvc.cgi/gentoo/src/patchsets/mico/2.3.13/012_all_early-header-check.patch?rev=1.2&view=markup |
292 |
plain: http://sources.gentoo.org/viewvc.cgi/gentoo/src/patchsets/mico/2.3.13/012_all_early-header-check.patch?rev=1.2&content-type=text/plain |
293 |
diff : http://sources.gentoo.org/viewvc.cgi/gentoo/src/patchsets/mico/2.3.13/012_all_early-header-check.patch?r1=1.1&r2=1.2 |
294 |
|
295 |
Index: 012_all_early-header-check.patch |
296 |
=================================================================== |
297 |
RCS file: /var/cvsroot/gentoo/src/patchsets/mico/2.3.13/012_all_early-header-check.patch,v |
298 |
retrieving revision 1.1 |
299 |
retrieving revision 1.2 |
300 |
diff -u -r1.1 -r1.2 |
301 |
--- 012_all_early-header-check.patch 26 May 2011 09:17:03 -0000 1.1 |
302 |
+++ 012_all_early-header-check.patch 29 May 2017 12:40:21 -0000 1.2 |
303 |
@@ -2,8 +2,8 @@ |
304 |
run due to some condition, EGREP is unset for subsequent checks. |
305 |
This breaks the checks for function prototypes. |
306 |
|
307 |
---- configure.in.orig 2011-05-26 07:49:07.047082532 +0200 |
308 |
-+++ configure.in 2011-05-26 07:52:48.130834617 +0200 |
309 |
+--- mico/configure.in |
310 |
++++ mico/configure.in |
311 |
@@ -411,6 +411,8 @@ |
312 |
AC_SUBST(EXTRA_CXXFLAGS) |
313 |
ac_compile="$ac_compile "'$EXTRA_CXXFLAGS' |
314 |
|
315 |
|
316 |
|
317 |
1.2 src/patchsets/mico/2.3.13/014_all_idl-noresolve.patch |
318 |
|
319 |
file : http://sources.gentoo.org/viewvc.cgi/gentoo/src/patchsets/mico/2.3.13/014_all_idl-noresolve.patch?rev=1.2&view=markup |
320 |
plain: http://sources.gentoo.org/viewvc.cgi/gentoo/src/patchsets/mico/2.3.13/014_all_idl-noresolve.patch?rev=1.2&content-type=text/plain |
321 |
diff : http://sources.gentoo.org/viewvc.cgi/gentoo/src/patchsets/mico/2.3.13/014_all_idl-noresolve.patch?r1=1.1&r2=1.2 |
322 |
|
323 |
Index: 014_all_idl-noresolve.patch |
324 |
=================================================================== |
325 |
RCS file: /var/cvsroot/gentoo/src/patchsets/mico/2.3.13/014_all_idl-noresolve.patch,v |
326 |
retrieving revision 1.1 |
327 |
retrieving revision 1.2 |
328 |
diff -u -r1.1 -r1.2 |
329 |
--- 014_all_idl-noresolve.patch 24 Sep 2012 20:32:16 -0000 1.1 |
330 |
+++ 014_all_idl-noresolve.patch 29 May 2017 12:40:21 -0000 1.2 |
331 |
@@ -1,5 +1,5 @@ |
332 |
---- idl/main.cc.orig 2011-11-25 23:50:09.767034055 +0100 |
333 |
-+++ idl/main.cc 2011-11-25 23:52:43.149752575 +0100 |
334 |
+--- mico/idl/main.cc |
335 |
++++ mico/idl/main.cc |
336 |
@@ -82,6 +82,13 @@ |
337 |
DB db; |
338 |
|
339 |
@@ -14,8 +14,8 @@ |
340 |
CORBA::ORB_var orb = CORBA::ORB_init (argc, argv); |
341 |
|
342 |
#ifdef _WIN32 |
343 |
---- orb/address.cc.orig 2011-11-25 23:39:06.523042175 +0100 |
344 |
-+++ orb/address.cc 2011-11-25 23:52:43.149752575 +0100 |
345 |
+--- mico/orb/address.cc |
346 |
++++ mico/orb/address.cc |
347 |
@@ -635,8 +635,12 @@ |
348 |
{ |
349 |
if (hname.length() == 0) { |