]> git.pld-linux.org Git - packages/wxWidgets.git/blame - wxWidgets-format.patch
projects / packages / wxWidgets.git / blame
? search:
summary | shortlog | log | commit | commitdiff | tree
blob | blame (incremental) | history | HEAD
- more workarounds
[packages/wxWidgets.git] / wxWidgets-format.patch
CommitLineData
c885e705
JB		 1--- wxWidgets-2.8.12/src/common/appbase.cpp.orig 2011-03-22 12:59:40.000000000 +0100
2+++ wxWidgets-2.8.12/src/common/appbase.cpp 2012-09-30 08:02:00.981833952 +0200
3@@ -424,7 +424,7 @@
4 msg.Printf(_T("Mismatch between the program and library build versions detected.\nThe library used %s,\nand %s used %s."),
5 lib.c_str(), progName.c_str(), prog.c_str());
6
7- wxLogFatalError(msg.c_str());
8+ wxLogFatalError("%s", msg.c_str());
9
10 // normally wxLogFatalError doesn't return
11 return false;
b44bd5fb
JB		 12--- wxWidgets-2.8.12/src/common/file.cpp.orig 2011-03-22 12:59:40.000000000 +0100
13+++ wxWidgets-2.8.12/src/common/file.cpp 2012-09-30 08:19:02.785145988 +0200
14@@ -513,7 +513,7 @@
15 if ( chmod( (const char*) m_strTemp.fn_str(), mode) == -1 )
16 {
17 #ifndef __OS2__
18- wxLogSysError(_("Failed to set temporary file permissions"));
19+ wxLogSysError("%s", _("Failed to set temporary file permissions"));
20 #endif
21 }
22 #endif // Unix
23--- wxWidgets-2.8.12/src/common/fileconf.cpp.orig 2011-03-22 12:59:41.000000000 +0100
24+++ wxWidgets-2.8.12/src/common/fileconf.cpp 2012-09-30 08:20:45.761810510 +0200
25@@ -508,7 +508,7 @@
26
27 if ( err != wxSTREAM_NO_ERROR && err != wxSTREAM_EOF )
28 {
29- wxLogError(_("Error reading config options."));
30+ wxLogError("%s", _("Error reading config options."));
31 break;
32 }
33 }
34@@ -1043,7 +1043,7 @@
35
36 if ( !file.IsOpened() )
37 {
38- wxLogError(_("can't open user configuration file."));
39+ wxLogError("%s", _("can't open user configuration file."));
40 return false;
41 }
42
43@@ -1057,13 +1057,13 @@
44
45 if ( !file.Write(filetext, *m_conv) )
46 {
47- wxLogError(_("can't write user configuration file."));
48+ wxLogError("%s", _("can't write user configuration file."));
49 return false;
50 }
51
52 if ( !file.Commit() )
53 {
54- wxLogError(_("Failed to update user configuration file."));
55+ wxLogError("%s", _("Failed to update user configuration file."));
56
57 return false;
58 }
59@@ -1090,7 +1090,7 @@
60 wxCharBuffer buf(line.mb_str(conv));
61 if ( !os.Write(buf, strlen(buf)) )
62 {
63- wxLogError(_("Error saving user configuration data."));
64+ wxLogError("%s", _("Error saving user configuration data."));
65
66 return false;
67 }
8de26838
JB		 68--- wxWidgets-2.8.12/src/common/filename.cpp.orig 2011-03-22 12:59:41.000000000 +0100
69+++ wxWidgets-2.8.12/src/common/filename.cpp 2012-09-30 08:26:13.781803673 +0200
70@@ -859,7 +859,7 @@
71
72 if ( path.empty() )
73 {
74- wxLogSysError(_("Failed to create a temporary file name"));
75+ wxLogSysError("%s", _("Failed to create a temporary file name"));
76 }
77 else
78 {
79@@ -894,7 +894,7 @@
80 // fails, though of course it should be protected against
81 // possible infinite looping too.
82
83- wxLogError(_("Failed to open temporary file."));
84+ wxLogError("%s", _("Failed to open temporary file."));
85
86 path.clear();
87 }
84f99935
JB		 88--- wxWidgets-2.8.12/src/common/filefn.cpp.orig 2011-03-22 12:59:41.000000000 +0100
89+++ wxWidgets-2.8.12/src/common/filefn.cpp 2012-09-30 09:03:28.965090416 +0200
90@@ -1513,7 +1513,7 @@
91
92 if ( !ok )
93 {
94- wxLogSysError(_("Failed to get the working directory"));
95+ wxLogSysError("%s", _("Failed to get the working directory"));
96
97 // VZ: the old code used to return "." on error which didn't make any
98 // sense at all to me - empty string is a better error indicator
3593df53
JB		 99--- wxWidgets-2.8.12/src/common/init.cpp.orig 2011-03-22 12:59:41.000000000 +0100
100+++ wxWidgets-2.8.12/src/common/init.cpp 2012-09-30 09:06:52.951752832 +0200
101@@ -237,7 +237,7 @@
102
103 if ( !wxModule::InitializeModules() )
104 {
105- wxLogError(_("Initialization failed in post init, aborting."));
106+ wxLogError("%s", _("Initialization failed in post init, aborting."));
107 return false;
108 }
109
1b84f1e6
JB		 110--- wxWidgets-2.8.12/src/common/stopwatch.cpp.orig 2011-03-22 12:59:42.000000000 +0100
111+++ wxWidgets-2.8.12/src/common/stopwatch.cpp 2012-09-30 09:13:41.768410978 +0200
112@@ -228,7 +228,7 @@
113 if (( t0 != (time_t)-1 ) && ( t1 != (time_t)-1 ))
114 return (long)difftime(t1, t0) + (60 * 60 * 24 * 4);
115
116- wxLogSysError(_("Failed to get the local system time"));
117+ wxLogSysError("%s", _("Failed to get the local system time"));
118 return -1;
119 }
120
121@@ -286,7 +286,7 @@
122 }
123 else
124 {
125- wxLogError(_("wxGetTimeOfDay failed."));
4b62fc1e 126+ wxLogError("%s", _("wxGetTimeOfDay failed."));
1b84f1e6
JB		 127 return 0;
128 }
129 #elif defined(HAVE_FTIME)
fd5caa00
JB		 130--- wxWidgets-2.8.12/src/common/tarstrm.cpp.orig 2011-03-22 12:59:42.000000000 +0100
131+++ wxWidgets-2.8.12/src/common/tarstrm.cpp 2012-09-30 09:40:58.075043539 +0200
132@@ -790,7 +790,7 @@
133 while (!done) {
134 m_hdr->Read(*m_parent_i_stream);
135 if (m_parent_i_stream->Eof())
136- wxLogError(_("incomplete header block in tar"));
137+ wxLogError("%s", _("incomplete header block in tar"));
138 if (!*m_parent_i_stream)
139 return wxSTREAM_READ_ERROR;
140 m_offset += TAR_BLOCKSIZE;
141@@ -813,7 +813,7 @@
142 if (m_sumType == SUM_SIGNED)
143 ok = chksum == m_hdr->Sum(true);
144 if (!ok) {
145- wxLogError(_("checksum failure reading tar header block"));
146+ wxLogError("%s", _("checksum failure reading tar header block"));
147 return wxSTREAM_READ_ERROR;
148 }
149
150@@ -986,7 +986,7 @@
151 }
152
153 if (!ok || recPos < len || size != lastread) {
154- wxLogWarning(_("invalid data in extended tar header"));
155+ wxLogWarning("%s", _("invalid data in extended tar header"));
156 return false;
157 }
158
159@@ -996,7 +996,7 @@
160 wxFileOffset wxTarInputStream::OnSysSeek(wxFileOffset pos, wxSeekMode mode)
161 {
162 if (!IsOpened()) {
163- wxLogError(_("tar entry not open"));
164+ wxLogError("%s", _("tar entry not open"));
165 m_lasterror = wxSTREAM_READ_ERROR;
166 }
167 if (!IsOk())
168@@ -1018,7 +1018,7 @@
169 size_t wxTarInputStream::OnSysRead(void *buffer, size_t size)
170 {
171 if (!IsOpened()) {
172- wxLogError(_("tar entry not open"));
173+ wxLogError("%s", _("tar entry not open"));
174 m_lasterror = wxSTREAM_READ_ERROR;
175 }
176 if (!IsOk() || !size)
177@@ -1037,7 +1037,7 @@
178 } else if (!m_parent_i_stream->IsOk()) {
179 // any other error will have been reported by the underlying stream
180 if (m_parent_i_stream->Eof())
181- wxLogError(_("unexpected end of file"));
182+ wxLogError("%s", _("unexpected end of file"));
183 m_lasterror = wxSTREAM_READ_ERROR;
184 }
185
186@@ -1371,7 +1371,7 @@
187 }
188
189 if (sizePos == wxInvalidOffset || !m_hdr->SetOctal(TAR_SIZE, m_pos)) {
190- wxLogError(_("incorrect size given for tar entry"));
191+ wxLogError("%s", _("incorrect size given for tar entry"));
192 m_lasterror = wxSTREAM_WRITE_ERROR;
193 return false;
194 }
195@@ -1492,7 +1492,7 @@
196 wxFileOffset wxTarOutputStream::OnSysSeek(wxFileOffset pos, wxSeekMode mode)
197 {
198 if (!IsOpened()) {
199- wxLogError(_("tar entry not open"));
200+ wxLogError("%s", _("tar entry not open"));
201 m_lasterror = wxSTREAM_WRITE_ERROR;
202 }
203 if (!IsOk() || m_datapos == wxInvalidOffset)
204@@ -1514,7 +1514,7 @@
205 size_t wxTarOutputStream::OnSysWrite(const void *buffer, size_t size)
206 {
207 if (!IsOpened()) {
208- wxLogError(_("tar entry not open"));
209+ wxLogError("%s", _("tar entry not open"));
210 m_lasterror = wxSTREAM_WRITE_ERROR;
211 }
212 if (!IsOk() || !size)
bdb99308
JB		 213--- wxWidgets-2.8.12/src/common/zstream.cpp.orig 2011-03-22 12:59:43.000000000 +0100
214+++ wxWidgets-2.8.12/src/common/zstream.cpp 2012-09-30 09:47:40.141701824 +0200
215@@ -146,7 +146,7 @@
216 flags = wxZLIB_ZLIB;
217 }
218 else {
219- wxLogError(_("Gzip not supported by this version of zlib"));
220+ wxLogError("%s", _("Gzip not supported by this version of zlib"));
221 m_lasterror = wxSTREAM_READ_ERROR;
222 return;
223 }
224@@ -173,7 +173,7 @@
225 }
226 }
227
228- wxLogError(_("Can't initialize zlib inflate stream."));
229+ wxLogError("%s", _("Can't initialize zlib inflate stream."));
230 m_lasterror = wxSTREAM_READ_ERROR;
231 }
232
233@@ -236,7 +236,7 @@
234 m_lasterror = wxSTREAM_EOF;
235 else
236 #endif
237- wxLogError(_("Can't read inflate stream: unexpected EOF in underlying stream."));
238+ wxLogError("%s", _("Can't read inflate stream: unexpected EOF in underlying stream."));
239 break;
240
241 default:
242@@ -299,7 +299,7 @@
243
244 // if gzip is asked for but not supported...
245 if (flags == wxZLIB_GZIP && !CanHandleGZip()) {
246- wxLogError(_("Gzip not supported by this version of zlib"));
247+ wxLogError("%s", _("Gzip not supported by this version of zlib"));
248 m_lasterror = wxSTREAM_WRITE_ERROR;
249 return;
250 }
251@@ -327,7 +327,7 @@
252 }
253 }
254
255- wxLogError(_("Can't initialize zlib deflate stream."));
256+ wxLogError("%s", _("Can't initialize zlib deflate stream."));
257 m_lasterror = wxSTREAM_WRITE_ERROR;
258 }
259
260--- wxWidgets-2.8.12/src/common/zipstrm.cpp.orig 2011-03-22 12:59:42.000000000 +0100
261+++ wxWidgets-2.8.12/src/common/zipstrm.cpp 2012-09-30 09:49:19.005033098 +0200
262@@ -525,7 +525,7 @@
263 m_parent_o_stream = &stream;
264
265 if (deflateReset(m_deflate) != Z_OK) {
266- wxLogError(_("can't re-initialize zlib deflate stream"));
267+ wxLogError("%s", _("can't re-initialize zlib deflate stream"));
268 m_lasterror = wxSTREAM_WRITE_ERROR;
269 return false;
270 }
271@@ -550,7 +550,7 @@
272 m_parent_i_stream = &stream;
273
274 if (inflateReset(m_inflate) != Z_OK) {
275- wxLogError(_("can't re-initialize zlib inflate stream"));
276+ wxLogError("%s", _("can't re-initialize zlib inflate stream"));
277 m_lasterror = wxSTREAM_READ_ERROR;
278 return false;
279 }
280@@ -1269,7 +1269,7 @@
281
282 if (m_DiskNumber != 0 || m_StartDisk != 0 ||
283 m_EntriesHere != m_TotalEntries)
284- wxLogWarning(_("assuming this is a multi-part zip concatenated"));
285+ wxLogWarning("%s", _("assuming this is a multi-part zip concatenated"));
286
287 return true;
288 }
289@@ -1441,7 +1441,7 @@
290 // failed, so either this is a non-seekable stream (ok), or not a zip
291 if (m_parentSeekable) {
292 m_lasterror = wxSTREAM_READ_ERROR;
293- wxLogError(_("invalid zip file"));
294+ wxLogError("%s", _("invalid zip file"));
295 return false;
296 }
297 else {
298@@ -1484,7 +1484,7 @@
299 return true;
300 }
301
302- wxLogError(_("can't find central directory in zip"));
303+ wxLogError("%s", _("can't find central directory in zip"));
304 m_lasterror = wxSTREAM_READ_ERROR;
305 return false;
306 }
307@@ -1570,7 +1570,7 @@
308 return wxSTREAM_EOF;
309
310 if (m_signature != CENTRAL_MAGIC) {
311- wxLogError(_("error reading zip central directory"));
312+ wxLogError("%s", _("error reading zip central directory"));
313 return wxSTREAM_READ_ERROR;
314 }
315
316@@ -1661,7 +1661,7 @@
317 }
318 }
319
320- wxLogError(_("error reading zip local header"));
321+ wxLogError("%s", _("error reading zip local header"));
322 return wxSTREAM_READ_ERROR;
323 }
324
325@@ -1709,7 +1709,7 @@
326 == wxInvalidOffset)
327 return false;
328 if (ReadSignature() != LOCAL_MAGIC) {
329- wxLogError(_("bad zipfile offset to entry"));
330+ wxLogError("%s", _("bad zipfile offset to entry"));
331 return false;
332 }
333 }
334@@ -1776,7 +1776,7 @@
335 switch (m_entry.GetMethod()) {
336 case wxZIP_METHOD_STORE:
337 if (m_entry.GetSize() == wxInvalidOffset) {
338- wxLogError(_("stored file length not in Zip header"));
339+ wxLogError("%s", _("stored file length not in Zip header"));
340 break;
341 }
342 m_store->Open(m_entry.GetSize());
343@@ -1790,7 +1790,7 @@
344 return m_inflate;
345
346 default:
347- wxLogError(_("unsupported Zip compression method"));
348+ wxLogError("%s", _("unsupported Zip compression method"));
349 }
350
351 return NULL;
352@@ -2171,7 +2171,7 @@
353 }
354
355 default:
356- wxLogError(_("unsupported Zip compression method"));
357+ wxLogError("%s", _("unsupported Zip compression method"));
358 }
359
360 return NULL;
0e6feeaf
JB		 361--- wxWidgets-2.8.12/include/wx/unix/pipe.h.orig 2011-03-22 13:01:28.000000000 +0100
362+++ wxWidgets-2.8.12/include/wx/unix/pipe.h 2012-09-30 09:52:41.701695539 +0200
363@@ -44,7 +44,7 @@
364 {
365 if ( pipe(m_fds) == -1 )
366 {
367- wxLogSysError(_("Pipe creation failed"));
368+ wxLogSysError("%s", _("Pipe creation failed"));
369
370 return FALSE;
371 }
372--- wxWidgets-2.8.12/src/unix/baseunix.cpp.orig 2011-03-22 13:01:28.000000000 +0100
373+++ wxWidgets-2.8.12/src/unix/baseunix.cpp 2012-09-30 09:53:20.938361388 +0200
374@@ -75,7 +75,7 @@
375 int exitcode = 0;
376 if ( waitpid(execData.pid, &exitcode, 0) == -1 || !WIFEXITED(exitcode) )
377 {
378- wxLogSysError(_("Waiting for subprocess termination failed"));
379+ wxLogSysError("%s", _("Waiting for subprocess termination failed"));
380 }
381
382 return exitcode;
wxWidgets library
This page took 0.111145 seconds and 4 git commands to generate.