1 diff -dur -x '*~' bacula-5.2.13.orig/src/baconfig.h bacula-5.2.13/src/baconfig.h
2 --- bacula-5.2.13.orig/src/baconfig.h 2013-02-19 20:21:35.000000000 +0100
3 +++ bacula-5.2.13/src/baconfig.h 2013-12-04 16:12:31.000000000 +0100
6 /* Groan, WxWidgets has its own way of doing NLS so cleanup */
12 diff -dur -x '*~' bacula-5.2.13.orig/src/wx-console/authenticate.c bacula-5.2.13/src/wx-console/authenticate.c
13 --- bacula-5.2.13.orig/src/wx-console/authenticate.c 2013-02-19 20:21:35.000000000 +0100
14 +++ bacula-5.2.13/src/wx-console/authenticate.c 2013-12-04 16:07:18.000000000 +0100
19 +#include <wx/string.h>
20 +#include <wx/thread.h>
23 #include "console_conf.h"
30 void senditf(char *fmt, ...);
31 diff -dur -x '*~' bacula-5.2.13.orig/src/wx-console/console_conf.c bacula-5.2.13/src/wx-console/console_conf.c
32 --- bacula-5.2.13.orig/src/wx-console/console_conf.c 2013-02-19 20:21:35.000000000 +0100
33 +++ bacula-5.2.13/src/wx-console/console_conf.c 2013-12-04 16:07:36.000000000 +0100
38 +#include <wx/string.h>
39 +#include <wx/thread.h>
42 #include "console_conf.h"
46 /* Define the first and last resource ID record
47 * types. Note, these should be unique for each
48 * daemon though not a requirement.
49 diff -dur -x '*~' bacula-5.2.13.orig/src/wx-console/console_thread.cpp bacula-5.2.13/src/wx-console/console_thread.cpp
50 --- bacula-5.2.13.orig/src/wx-console/console_thread.cpp 2013-02-19 20:21:35.000000000 +0100
51 +++ bacula-5.2.13/src/wx-console/console_thread.cpp 2013-12-04 16:07:54.000000000 +0100
56 +#include <wx/string.h>
57 +#include <wx/thread.h>
60 #include "console_conf.h"
64 #include <wx/wxprec.h>
66 -#include <wx/thread.h>
70 diff -dur -x '*~' bacula-5.2.13.orig/src/wx-console/console_thread.h bacula-5.2.13/src/wx-console/console_thread.h
71 --- bacula-5.2.13.orig/src/wx-console/console_thread.h 2013-02-19 20:21:35.000000000 +0100
72 +++ bacula-5.2.13/src/wx-console/console_thread.h 2013-12-04 16:08:10.000000000 +0100
74 #ifndef CONSOLE_THREAD_H
75 #define CONSOLE_THREAD_H
80 -#undef bindtextdomain
84 #include <wx/wxprec.h>
86 -#include <wx/string.h>
87 -#include <wx/thread.h> // inheriting class's header file
88 -#include <wx/intl.h> /* We need to have _ and N_ defined by wxWidgets before Bacula tries to redefine them */
92 diff -dur -x '*~' bacula-5.2.13.orig/src/wx-console/main.cpp bacula-5.2.13/src/wx-console/main.cpp
93 --- bacula-5.2.13.orig/src/wx-console/main.cpp 2013-02-19 20:21:35.000000000 +0100
94 +++ bacula-5.2.13/src/wx-console/main.cpp 2013-12-04 16:08:36.000000000 +0100
99 +#include <wx/string.h>
100 +#include <wx/thread.h>
101 +#include <wx/intl.h>
104 #include <wx/wxprec.h>
105 #include <wx/config.h>
106 -#include <wx/intl.h>
107 #include "wxbmainframe.h"
110 diff -dur -x '*~' bacula-5.2.13.orig/src/wx-console/wxbconfigfileeditor.cpp bacula-5.2.13/src/wx-console/wxbconfigfileeditor.cpp
111 --- bacula-5.2.13.orig/src/wx-console/wxbconfigfileeditor.cpp 2013-02-19 20:21:35.000000000 +0100
112 +++ bacula-5.2.13/src/wx-console/wxbconfigfileeditor.cpp 2013-12-04 16:08:55.000000000 +0100
117 +#include <wx/string.h>
118 +#include <wx/thread.h>
119 +#include <wx/intl.h>
121 #include "wxbconfigfileeditor.h"
123 diff -dur -x '*~' bacula-5.2.13.orig/src/wx-console/wxbconfigpanel.cpp bacula-5.2.13/src/wx-console/wxbconfigpanel.cpp
124 --- bacula-5.2.13.orig/src/wx-console/wxbconfigpanel.cpp 2013-02-19 20:21:35.000000000 +0100
125 +++ bacula-5.2.13/src/wx-console/wxbconfigpanel.cpp 2013-12-04 16:09:13.000000000 +0100
130 +#include <wx/string.h>
131 +#include <wx/thread.h>
132 +#include <wx/intl.h>
134 #include "wxbconfigpanel.h"
135 #include <wx/arrimpl.cpp>
136 diff -dur -x '*~' bacula-5.2.13.orig/src/wx-console/wxbhistorytextctrl.cpp bacula-5.2.13/src/wx-console/wxbhistorytextctrl.cpp
137 --- bacula-5.2.13.orig/src/wx-console/wxbhistorytextctrl.cpp 2013-02-19 20:21:35.000000000 +0100
138 +++ bacula-5.2.13/src/wx-console/wxbhistorytextctrl.cpp 2013-12-04 16:09:43.000000000 +0100
143 +#include <wx/string.h>
144 +#include <wx/thread.h>
145 +#include <wx/intl.h>
147 #include "wxbhistorytextctrl.h"
149 diff -dur -x '*~' bacula-5.2.13.orig/src/wx-console/wxblistctrl.cpp bacula-5.2.13/src/wx-console/wxblistctrl.cpp
150 --- bacula-5.2.13.orig/src/wx-console/wxblistctrl.cpp 2013-02-19 20:21:35.000000000 +0100
151 +++ bacula-5.2.13/src/wx-console/wxblistctrl.cpp 2013-12-04 16:10:01.000000000 +0100
156 +#include <wx/string.h>
157 +#include <wx/thread.h>
158 +#include <wx/intl.h>
161 #include "wxblistctrl.h"
162 diff -dur -x '*~' bacula-5.2.13.orig/src/wx-console/wxbmainframe.cpp bacula-5.2.13/src/wx-console/wxbmainframe.cpp
163 --- bacula-5.2.13.orig/src/wx-console/wxbmainframe.cpp 2013-02-19 20:21:35.000000000 +0100
164 +++ bacula-5.2.13/src/wx-console/wxbmainframe.cpp 2013-12-04 16:10:26.000000000 +0100
169 +#include <wx/string.h>
170 +#include <wx/thread.h>
171 +#include <wx/intl.h>
174 #include "wxbmainframe.h" // class's header file
175 diff -dur -x '*~' bacula-5.2.13.orig/src/wx-console/wxbrestorepanel.cpp bacula-5.2.13/src/wx-console/wxbrestorepanel.cpp
176 --- bacula-5.2.13.orig/src/wx-console/wxbrestorepanel.cpp 2013-02-19 20:21:35.000000000 +0100
177 +++ bacula-5.2.13/src/wx-console/wxbrestorepanel.cpp 2013-12-04 16:10:39.000000000 +0100
182 +#include <wx/string.h>
183 +#include <wx/thread.h>
184 +#include <wx/intl.h>
187 #include "wxbrestorepanel.h"
188 diff -dur -x '*~' bacula-5.2.13.orig/src/wx-console/wxbtableparser.cpp bacula-5.2.13/src/wx-console/wxbtableparser.cpp
189 --- bacula-5.2.13.orig/src/wx-console/wxbtableparser.cpp 2013-02-19 20:21:35.000000000 +0100
190 +++ bacula-5.2.13/src/wx-console/wxbtableparser.cpp 2013-12-04 16:10:59.000000000 +0100
195 +#include <wx/string.h>
196 +#include <wx/thread.h>
197 +#include <wx/intl.h>
200 #include "wxbtableparser.h" // class's header file
201 diff -dur -x '*~' bacula-5.2.13.orig/src/wx-console/wxbtreectrl.cpp bacula-5.2.13/src/wx-console/wxbtreectrl.cpp
202 --- bacula-5.2.13.orig/src/wx-console/wxbtreectrl.cpp 2013-02-19 20:21:35.000000000 +0100
203 +++ bacula-5.2.13/src/wx-console/wxbtreectrl.cpp 2013-12-04 16:11:22.000000000 +0100
208 +#include <wx/string.h>
209 +#include <wx/thread.h>
210 +#include <wx/intl.h>
213 #include "wxbtreectrl.h"
214 diff -dur -x '*~' bacula-5.2.13.orig/src/wx-console/wxbutils.cpp bacula-5.2.13/src/wx-console/wxbutils.cpp
215 --- bacula-5.2.13.orig/src/wx-console/wxbutils.cpp 2013-02-19 20:21:35.000000000 +0100
216 +++ bacula-5.2.13/src/wx-console/wxbutils.cpp 2013-12-04 16:11:43.000000000 +0100
221 +#include <wx/string.h>
222 +#include <wx/thread.h>
223 +#include <wx/intl.h>
225 #include "wxbutils.h"
226 #include "wxbmainframe.h"
227 --- bacula-5.2.13.orig/src/bacula.h 2013-02-19 20:21:35.000000000 +0100
228 +++ bacula-5.2.13/src/bacula.h 2013-12-04 16:29:31.000000000 +0100
231 #ifdef HAVE_WXCONSOLE