1 |
haubi 17/05/29 12:40:21 |
2 |
|
3 |
Modified: 001_all_nolibcheck.patch 004_all_aix.patch |
4 |
006_all_as-needed.patch 007_all_qt4-nothread.patch |
5 |
008_all_drop-pgsql-header-check.patch |
6 |
010_all_preserve-cflags.patch |
7 |
012_all_early-header-check.patch |
8 |
013_all_gtk-versions.patch |
9 |
014_all_idl-noresolve.patch |
10 |
Log: |
11 |
Have patches apply with -p1, for use with eapply in EAPI 6. |
12 |
|
13 |
Revision Changes Path |
14 |
1.3 src/patchsets/mico/9999/001_all_nolibcheck.patch |
15 |
|
16 |
file : http://sources.gentoo.org/viewvc.cgi/gentoo/src/patchsets/mico/9999/001_all_nolibcheck.patch?rev=1.3&view=markup |
17 |
plain: http://sources.gentoo.org/viewvc.cgi/gentoo/src/patchsets/mico/9999/001_all_nolibcheck.patch?rev=1.3&content-type=text/plain |
18 |
diff : http://sources.gentoo.org/viewvc.cgi/gentoo/src/patchsets/mico/9999/001_all_nolibcheck.patch?r1=1.2&r2=1.3 |
19 |
|
20 |
Index: 001_all_nolibcheck.patch |
21 |
=================================================================== |
22 |
RCS file: /var/cvsroot/gentoo/src/patchsets/mico/9999/001_all_nolibcheck.patch,v |
23 |
retrieving revision 1.2 |
24 |
retrieving revision 1.3 |
25 |
diff -u -r1.2 -r1.3 |
26 |
--- 001_all_nolibcheck.patch 27 May 2011 12:30:48 -0000 1.2 |
27 |
+++ 001_all_nolibcheck.patch 29 May 2017 12:40:21 -0000 1.3 |
28 |
@@ -2,8 +2,8 @@ |
29 |
and may break copying binaries from one linux to another, when |
30 |
they did exist on the build-machine but not on the target. |
31 |
|
32 |
---- configure.in.orig 2009-02-02 14:34:14.000000000 +0100 |
33 |
-+++ configure.in 2009-02-02 14:37:45.000000000 +0100 |
34 |
+--- mico/configure.in |
35 |
++++ mico/configure.in |
36 |
@@ -1237,9 +1237,7 @@ |
37 |
|
38 |
|
39 |
|
40 |
|
41 |
|
42 |
1.2 src/patchsets/mico/9999/004_all_aix.patch |
43 |
|
44 |
file : http://sources.gentoo.org/viewvc.cgi/gentoo/src/patchsets/mico/9999/004_all_aix.patch?rev=1.2&view=markup |
45 |
plain: http://sources.gentoo.org/viewvc.cgi/gentoo/src/patchsets/mico/9999/004_all_aix.patch?rev=1.2&content-type=text/plain |
46 |
diff : http://sources.gentoo.org/viewvc.cgi/gentoo/src/patchsets/mico/9999/004_all_aix.patch?r1=1.1&r2=1.2 |
47 |
|
48 |
Index: 004_all_aix.patch |
49 |
=================================================================== |
50 |
RCS file: /var/cvsroot/gentoo/src/patchsets/mico/9999/004_all_aix.patch,v |
51 |
retrieving revision 1.1 |
52 |
retrieving revision 1.2 |
53 |
diff -u -r1.1 -r1.2 |
54 |
--- 004_all_aix.patch 26 May 2011 09:20:02 -0000 1.1 |
55 |
+++ 004_all_aix.patch 29 May 2017 12:40:21 -0000 1.2 |
56 |
@@ -1,6 +1,6 @@ |
57 |
Do not add '-lstdc++' explicitly, this is c++ compiler's job. |
58 |
---- admin/mico-shld.aix.in.orig 2009-04-02 17:33:03 +0200 |
59 |
-+++ admin/mico-shld.aix.in 2009-04-02 17:33:22 +0200 |
60 |
+--- mico/admin/mico-shld.aix.in |
61 |
++++ mico/admin/mico-shld.aix.in |
62 |
@@ -87,7 +87,7 @@ |
63 |
|
64 |
|
65 |
|
66 |
|
67 |
|
68 |
1.2 src/patchsets/mico/9999/006_all_as-needed.patch |
69 |
|
70 |
file : http://sources.gentoo.org/viewvc.cgi/gentoo/src/patchsets/mico/9999/006_all_as-needed.patch?rev=1.2&view=markup |
71 |
plain: http://sources.gentoo.org/viewvc.cgi/gentoo/src/patchsets/mico/9999/006_all_as-needed.patch?rev=1.2&content-type=text/plain |
72 |
diff : http://sources.gentoo.org/viewvc.cgi/gentoo/src/patchsets/mico/9999/006_all_as-needed.patch?r1=1.1&r2=1.2 |
73 |
|
74 |
Index: 006_all_as-needed.patch |
75 |
=================================================================== |
76 |
RCS file: /var/cvsroot/gentoo/src/patchsets/mico/9999/006_all_as-needed.patch,v |
77 |
retrieving revision 1.1 |
78 |
retrieving revision 1.2 |
79 |
diff -u -r1.1 -r1.2 |
80 |
--- 006_all_as-needed.patch 26 May 2011 09:20:02 -0000 1.1 |
81 |
+++ 006_all_as-needed.patch 29 May 2017 12:40:21 -0000 1.2 |
82 |
@@ -1,7 +1,7 @@ |
83 |
Link libmico.so against configured libraries, |
84 |
to get -Wl,--as-needed working. #280678. |
85 |
---- orb/Makefile.orig 2011-05-26 09:28:52.629834934 +0200 |
86 |
-+++ orb/Makefile 2011-05-26 09:28:59.519791273 +0200 |
87 |
+--- mico/orb/Makefile |
88 |
++++ mico/orb/Makefile |
89 |
@@ -30,7 +30,7 @@ |
90 |
endif |
91 |
endif |
92 |
|
93 |
|
94 |
|
95 |
1.2 src/patchsets/mico/9999/007_all_qt4-nothread.patch |
96 |
|
97 |
file : http://sources.gentoo.org/viewvc.cgi/gentoo/src/patchsets/mico/9999/007_all_qt4-nothread.patch?rev=1.2&view=markup |
98 |
plain: http://sources.gentoo.org/viewvc.cgi/gentoo/src/patchsets/mico/9999/007_all_qt4-nothread.patch?rev=1.2&content-type=text/plain |
99 |
diff : http://sources.gentoo.org/viewvc.cgi/gentoo/src/patchsets/mico/9999/007_all_qt4-nothread.patch?r1=1.1&r2=1.2 |
100 |
|
101 |
Index: 007_all_qt4-nothread.patch |
102 |
=================================================================== |
103 |
RCS file: /var/cvsroot/gentoo/src/patchsets/mico/9999/007_all_qt4-nothread.patch,v |
104 |
retrieving revision 1.1 |
105 |
retrieving revision 1.2 |
106 |
diff -u -r1.1 -r1.2 |
107 |
--- 007_all_qt4-nothread.patch 26 May 2011 09:20:03 -0000 1.1 |
108 |
+++ 007_all_qt4-nothread.patch 29 May 2017 12:40:21 -0000 1.2 |
109 |
@@ -1,6 +1,6 @@ |
110 |
qt4 doesn't provide different libraries for threading. |
111 |
---- configure.in.orig 2010-01-12 16:40:06.935594142 +0100 |
112 |
-+++ configure.in 2010-01-12 16:40:37.742311509 +0100 |
113 |
+--- mico/configure.in |
114 |
++++ mico/configure.in |
115 |
@@ -1124,7 +1124,7 @@ |
116 |
AC_MSG_WARN(cannot find moc. QT parts disabled.) |
117 |
HAVE_QT=no |
118 |
|
119 |
|
120 |
|
121 |
1.2 src/patchsets/mico/9999/008_all_drop-pgsql-header-check.patch |
122 |
|
123 |
file : http://sources.gentoo.org/viewvc.cgi/gentoo/src/patchsets/mico/9999/008_all_drop-pgsql-header-check.patch?rev=1.2&view=markup |
124 |
plain: http://sources.gentoo.org/viewvc.cgi/gentoo/src/patchsets/mico/9999/008_all_drop-pgsql-header-check.patch?rev=1.2&content-type=text/plain |
125 |
diff : http://sources.gentoo.org/viewvc.cgi/gentoo/src/patchsets/mico/9999/008_all_drop-pgsql-header-check.patch?r1=1.1&r2=1.2 |
126 |
|
127 |
Index: 008_all_drop-pgsql-header-check.patch |
128 |
=================================================================== |
129 |
RCS file: /var/cvsroot/gentoo/src/patchsets/mico/9999/008_all_drop-pgsql-header-check.patch,v |
130 |
retrieving revision 1.1 |
131 |
retrieving revision 1.2 |
132 |
diff -u -r1.1 -r1.2 |
133 |
--- 008_all_drop-pgsql-header-check.patch 26 May 2011 09:20:03 -0000 1.1 |
134 |
+++ 008_all_drop-pgsql-header-check.patch 29 May 2017 12:40:21 -0000 1.2 |
135 |
@@ -1,8 +1,8 @@ |
136 |
http://bugs.gentoo.org/show_bug.cgi?id=306255 |
137 |
|
138 |
Result of 'checking for pgsql/libpq-fe.h' is not used anywhere, just drop it. |
139 |
---- configure.in.orig 2010-02-24 10:27:45.043267799 +0100 |
140 |
-+++ configure.in 2010-02-24 10:28:09.016074329 +0100 |
141 |
+--- mico/configure.in |
142 |
++++ mico/configure.in |
143 |
@@ -1324,7 +1324,7 @@ |
144 |
AC_CHECK_HEADERS(netinet/tcp.h stdlib.h sys/time.h sunmath.h sys/stat.h) |
145 |
AC_CHECK_HEADERS(poll.h) |
146 |
|
147 |
|
148 |
|
149 |
1.2 src/patchsets/mico/9999/010_all_preserve-cflags.patch |
150 |
|
151 |
file : http://sources.gentoo.org/viewvc.cgi/gentoo/src/patchsets/mico/9999/010_all_preserve-cflags.patch?rev=1.2&view=markup |
152 |
plain: http://sources.gentoo.org/viewvc.cgi/gentoo/src/patchsets/mico/9999/010_all_preserve-cflags.patch?rev=1.2&content-type=text/plain |
153 |
diff : http://sources.gentoo.org/viewvc.cgi/gentoo/src/patchsets/mico/9999/010_all_preserve-cflags.patch?r1=1.1&r2=1.2 |
154 |
|
155 |
Index: 010_all_preserve-cflags.patch |
156 |
=================================================================== |
157 |
RCS file: /var/cvsroot/gentoo/src/patchsets/mico/9999/010_all_preserve-cflags.patch,v |
158 |
retrieving revision 1.1 |
159 |
retrieving revision 1.2 |
160 |
diff -u -r1.1 -r1.2 |
161 |
--- 010_all_preserve-cflags.patch 26 May 2011 09:20:03 -0000 1.1 |
162 |
+++ 010_all_preserve-cflags.patch 29 May 2017 12:40:21 -0000 1.2 |
163 |
@@ -1,8 +1,8 @@ |
164 |
Do not tweak CFLAGS/CXXFLAGS for -g/-O2 if not explicitly requested |
165 |
by configure arguments --*able-debug/--*able-optimize. |
166 |
|
167 |
---- configure.in.orig 2011-05-25 16:22:01.402618836 +0200 |
168 |
-+++ configure.in 2011-05-25 16:27:35.022640710 +0200 |
169 |
+--- mico/configure.in |
170 |
++++ mico/configure.in |
171 |
@@ -112,12 +112,12 @@ |
172 |
use_repo=$enableval, use_repo=no) |
173 |
|
174 |
|
175 |
|
176 |
|
177 |
1.2 src/patchsets/mico/9999/012_all_early-header-check.patch |
178 |
|
179 |
file : http://sources.gentoo.org/viewvc.cgi/gentoo/src/patchsets/mico/9999/012_all_early-header-check.patch?rev=1.2&view=markup |
180 |
plain: http://sources.gentoo.org/viewvc.cgi/gentoo/src/patchsets/mico/9999/012_all_early-header-check.patch?rev=1.2&content-type=text/plain |
181 |
diff : http://sources.gentoo.org/viewvc.cgi/gentoo/src/patchsets/mico/9999/012_all_early-header-check.patch?r1=1.1&r2=1.2 |
182 |
|
183 |
Index: 012_all_early-header-check.patch |
184 |
=================================================================== |
185 |
RCS file: /var/cvsroot/gentoo/src/patchsets/mico/9999/012_all_early-header-check.patch,v |
186 |
retrieving revision 1.1 |
187 |
retrieving revision 1.2 |
188 |
diff -u -r1.1 -r1.2 |
189 |
--- 012_all_early-header-check.patch 26 May 2011 09:20:03 -0000 1.1 |
190 |
+++ 012_all_early-header-check.patch 29 May 2017 12:40:21 -0000 1.2 |
191 |
@@ -2,8 +2,8 @@ |
192 |
run due to some condition, EGREP is unset for subsequent checks. |
193 |
This breaks the checks for function prototypes. |
194 |
|
195 |
---- configure.in.orig 2011-05-26 07:49:07.047082532 +0200 |
196 |
-+++ configure.in 2011-05-26 07:52:48.130834617 +0200 |
197 |
+--- mico/configure.in |
198 |
++++ mico/configure.in |
199 |
@@ -411,6 +411,8 @@ |
200 |
AC_SUBST(EXTRA_CXXFLAGS) |
201 |
ac_compile="$ac_compile "'$EXTRA_CXXFLAGS' |
202 |
|
203 |
|
204 |
|
205 |
1.2 src/patchsets/mico/9999/013_all_gtk-versions.patch |
206 |
|
207 |
file : http://sources.gentoo.org/viewvc.cgi/gentoo/src/patchsets/mico/9999/013_all_gtk-versions.patch?rev=1.2&view=markup |
208 |
plain: http://sources.gentoo.org/viewvc.cgi/gentoo/src/patchsets/mico/9999/013_all_gtk-versions.patch?rev=1.2&content-type=text/plain |
209 |
diff : http://sources.gentoo.org/viewvc.cgi/gentoo/src/patchsets/mico/9999/013_all_gtk-versions.patch?r1=1.1&r2=1.2 |
210 |
|
211 |
Index: 013_all_gtk-versions.patch |
212 |
=================================================================== |
213 |
RCS file: /var/cvsroot/gentoo/src/patchsets/mico/9999/013_all_gtk-versions.patch,v |
214 |
retrieving revision 1.1 |
215 |
retrieving revision 1.2 |
216 |
diff -u -r1.1 -r1.2 |
217 |
--- 013_all_gtk-versions.patch 24 Sep 2012 20:30:36 -0000 1.1 |
218 |
+++ 013_all_gtk-versions.patch 29 May 2017 12:40:21 -0000 1.2 |
219 |
@@ -1,5 +1,5 @@ |
220 |
---- configure.in.orig 2011-06-06 14:26:10.529680983 +0200 |
221 |
-+++ configure.in 2011-06-06 15:14:01.246026167 +0200 |
222 |
+--- mico/configure.in |
223 |
++++ mico/configure.in |
224 |
@@ -152,8 +152,8 @@ |
225 |
QTDIR=$withval, QTDIR="") |
226 |
|
227 |
@@ -46,8 +46,8 @@ |
228 |
|
229 |
AC_SUBST(HAVE_TCL) |
230 |
AC_SUBST(TCL_LIBS) |
231 |
---- aclocal.m4.orig 2011-06-06 14:25:41.073169479 +0200 |
232 |
-+++ aclocal.m4 2011-06-06 14:33:38.022926510 +0200 |
233 |
+--- mico/aclocal.m4 |
234 |
++++ mico/aclocal.m4 |
235 |
@@ -878,3 +878,422 @@ |
236 |
AC_SUBST(GTK_LIBS) |
237 |
rm -f conf.gtktest |
238 |
|
239 |
|
240 |
|
241 |
1.2 src/patchsets/mico/9999/014_all_idl-noresolve.patch |
242 |
|
243 |
file : http://sources.gentoo.org/viewvc.cgi/gentoo/src/patchsets/mico/9999/014_all_idl-noresolve.patch?rev=1.2&view=markup |
244 |
plain: http://sources.gentoo.org/viewvc.cgi/gentoo/src/patchsets/mico/9999/014_all_idl-noresolve.patch?rev=1.2&content-type=text/plain |
245 |
diff : http://sources.gentoo.org/viewvc.cgi/gentoo/src/patchsets/mico/9999/014_all_idl-noresolve.patch?r1=1.1&r2=1.2 |
246 |
|
247 |
Index: 014_all_idl-noresolve.patch |
248 |
=================================================================== |
249 |
RCS file: /var/cvsroot/gentoo/src/patchsets/mico/9999/014_all_idl-noresolve.patch,v |
250 |
retrieving revision 1.1 |
251 |
retrieving revision 1.2 |
252 |
diff -u -r1.1 -r1.2 |
253 |
--- 014_all_idl-noresolve.patch 24 Sep 2012 20:32:16 -0000 1.1 |
254 |
+++ 014_all_idl-noresolve.patch 29 May 2017 12:40:21 -0000 1.2 |
255 |
@@ -1,5 +1,5 @@ |
256 |
---- idl/main.cc.orig 2011-11-25 23:50:09.767034055 +0100 |
257 |
-+++ idl/main.cc 2011-11-25 23:52:43.149752575 +0100 |
258 |
+--- mico/idl/main.cc |
259 |
++++ mico/idl/main.cc 2011-11-25 23:52:43.149752575 +0100 |
260 |
@@ -82,6 +82,13 @@ |
261 |
DB db; |
262 |
|
263 |
@@ -14,8 +14,8 @@ |
264 |
CORBA::ORB_var orb = CORBA::ORB_init (argc, argv); |
265 |
|
266 |
#ifdef _WIN32 |
267 |
---- orb/address.cc.orig 2011-11-25 23:39:06.523042175 +0100 |
268 |
-+++ orb/address.cc 2011-11-25 23:52:43.149752575 +0100 |
269 |
+--- mico/orb/address.cc |
270 |
++++ mico/orb/address.cc |
271 |
@@ -635,8 +635,12 @@ |
272 |
{ |
273 |
if (hname.length() == 0) { |