]> git.pld-linux.org Git - packages/bacula.git/blame - bacula-wx-console-build.patch
projects / packages / bacula.git / blame
? search:
summary | shortlog | log | commit | commitdiff | tree
blob | blame (incremental) | history | HEAD
drop broken obsolete
[packages/bacula.git] / bacula-wx-console-build.patch
CommitLineData
001b1705
JK		 1diff -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
4@@ -473,7 +473,6 @@
5 #else
6 /* Groan, WxWidgets has its own way of doing NLS so cleanup */
7 #ifndef ENABLE_NLS
8-#undef _
9 #undef setlocale
10 #undef textdomain
11 #undef bindtextdomain
12diff -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
15@@ -48,12 +48,13 @@
cec96a88
JK		 16
17 #undef _DEBUG
18
19+#include <wx/string.h>
001b1705
JK		 20+#include <wx/thread.h>
21+#include <wx/intl.h>
cec96a88
JK		 22 #include "bacula.h"
23 #include "console_conf.h"
24 #include "jcr.h"
001b1705
JK		 25
26-#include <wx/intl.h>
27-
28 #include "csprint.h"
29
30 void senditf(char *fmt, ...);
31diff -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
34@@ -57,11 +57,12 @@
cec96a88
JK		 35
36 #undef _DEBUG
37
38+#include <wx/string.h>
001b1705
JK		 39+#include <wx/thread.h>
40+#include <wx/intl.h>
cec96a88
JK		 41 #include "bacula.h"
42 #include "console_conf.h"
43
001b1705
JK		 44-#include <wx/intl.h>
45-
46 /* Define the first and last resource ID record
47 * types. Note, these should be unique for each
48 * daemon though not a requirement.
49diff -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
52@@ -46,6 +46,9 @@
cec96a88
JK		 53
54 #undef _DEBUG
55
56+#include <wx/string.h>
001b1705
JK		 57+#include <wx/thread.h>
58+#include <wx/intl.h>
cec96a88
JK		 59 #include "bacula.h"
60 #include "console_conf.h"
61
001b1705
JK		 62@@ -53,7 +56,6 @@
63
64 #include <wx/wxprec.h>
65
66-#include <wx/thread.h>
67 #include <wx/file.h>
68
69 #include "csprint.h"
70diff -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
73@@ -37,18 +37,8 @@
74 #ifndef CONSOLE_THREAD_H
75 #define CONSOLE_THREAD_H
76
77-#ifndef ENABLE_NLS
78-#undef setlocale
79-#undef textdomain
80-#undef bindtextdomain
81-#endif
82-
83-
84 #include <wx/wxprec.h>
85
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 */
89 #include "bacula.h"
90 #include "jcr.h"
91
92diff -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
95@@ -50,11 +50,13 @@
cec96a88
JK		 96
97 #undef _DEBUG
98
99+#include <wx/string.h>
001b1705
JK		 100+#include <wx/thread.h>
101+#include <wx/intl.h>
cec96a88
JK		 102 #include "bacula.h"
103
104 #include <wx/wxprec.h>
001b1705
JK		 105 #include <wx/config.h>
106-#include <wx/intl.h>
107 #include "wxbmainframe.h"
108 #include "csprint.h"
109
110diff -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
113@@ -41,6 +41,9 @@
cec96a88
JK		 114
115 #undef _DEBUG
116
117+#include <wx/string.h>
001b1705
JK		 118+#include <wx/thread.h>
119+#include <wx/intl.h>
cec96a88
JK		 120 #include "bacula.h"
121 #include "wxbconfigfileeditor.h"
122 #include <wx/file.h>
001b1705
JK		 123diff -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
126@@ -41,6 +41,9 @@
cec96a88
JK		 127
128 #undef _DEBUG
129
130+#include <wx/string.h>
001b1705
JK		 131+#include <wx/thread.h>
132+#include <wx/intl.h>
cec96a88
JK		 133 #include "bacula.h"
134 #include "wxbconfigpanel.h"
135 #include <wx/arrimpl.cpp>
001b1705
JK		 136diff -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
139@@ -41,6 +41,9 @@
cec96a88
JK		 140
141 #undef _DEBUG
142
143+#include <wx/string.h>
001b1705
JK		 144+#include <wx/thread.h>
145+#include <wx/intl.h>
cec96a88
JK		 146 #include "bacula.h"
147 #include "wxbhistorytextctrl.h"
148
001b1705
JK		 149diff -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
152@@ -42,6 +42,9 @@
cec96a88
JK		 153
154 #undef _DEBUG
155
156+#include <wx/string.h>
001b1705
JK		 157+#include <wx/thread.h>
158+#include <wx/intl.h>
cec96a88
JK		 159 #include "bacula.h"
160
161 #include "wxblistctrl.h"
001b1705
JK		 162diff -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
165@@ -41,6 +41,9 @@
cec96a88
JK		 166
167 #undef _DEBUG
168
169+#include <wx/string.h>
001b1705
JK		 170+#include <wx/thread.h>
171+#include <wx/intl.h>
cec96a88
JK		 172 #include "bacula.h"
173
174 #include "wxbmainframe.h" // class's header file
001b1705
JK		 175diff -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
178@@ -69,6 +69,9 @@
cec96a88
JK		 179
180 #undef _DEBUG
181
182+#include <wx/string.h>
001b1705
JK		 183+#include <wx/thread.h>
184+#include <wx/intl.h>
cec96a88
JK		 185 #include "bacula.h"
186
187 #include "wxbrestorepanel.h"
001b1705
JK		 188diff -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
191@@ -48,6 +48,9 @@
cec96a88
JK		 192
193 #undef _DEBUG
194
195+#include <wx/string.h>
001b1705
JK		 196+#include <wx/thread.h>
197+#include <wx/intl.h>
cec96a88
JK		 198 #include "bacula.h"
199
200 #include "wxbtableparser.h" // class's header file
001b1705
JK		 201diff -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
204@@ -42,6 +42,9 @@
cec96a88
JK		 205
206 #undef _DEBUG
207
208+#include <wx/string.h>
001b1705
JK		 209+#include <wx/thread.h>
210+#include <wx/intl.h>
cec96a88
JK		 211 #include "bacula.h"
212
213 #include "wxbtreectrl.h"
001b1705
JK		 214diff -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
217@@ -41,6 +41,9 @@
cec96a88
JK		 218
219 #undef _DEBUG
220
221+#include <wx/string.h>
001b1705
JK		 222+#include <wx/thread.h>
223+#include <wx/intl.h>
cec96a88
JK		 224 #include "bacula.h"
225 #include "wxbutils.h"
226 #include "wxbmainframe.h"
001b1705
JK		 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
229@@ -183,7 +183,6 @@
230 */
231 #ifdef HAVE_WXCONSOLE
232 #undef New
233-#undef _
234 #undef free
235 #undef malloc
236 #endif
Bacula - The Network Backup Solution
This page took 0.073895 seconds and 4 git commands to generate.