[packages/bacula] - fix building with wxWidgets 3.0 - rel 4
baggins
baggins at pld-linux.org
Sat Jan 18 20:12:08 CET 2014
commit 5abea8ea24e78d84866966bb8f80d3d802b65d58
Author: Jan Rękorajski <baggins at pld-linux.org>
Date: Sat Jan 18 20:11:53 2014 +0100
- fix building with wxWidgets 3.0
- rel 4
bacula.spec | 4 ++-
wxWidgets3.patch | 79 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++
2 files changed, 82 insertions(+), 1 deletion(-)
---
diff --git a/bacula.spec b/bacula.spec
index d68b143..e643ccc 100644
--- a/bacula.spec
+++ b/bacula.spec
@@ -32,7 +32,7 @@ Summary: Bacula - The Network Backup Solution
Summary(pl.UTF-8): Bacula - rozwiązanie do wykonywania kopii zapasowych po sieci
Name: bacula
Version: 5.2.13
-Release: 3
+Release: 4
License: AGPL v3
Group: Networking/Utilities
Source0: http://downloads.sourceforge.net/bacula/%{name}-%{version}.tar.gz
@@ -58,6 +58,7 @@ Patch3: %{name}-desktop.patch
Patch4: make_catalog_backup-setup-home.patch
Patch5: %{name}-wx-console-build.patch
Patch6: %{name}-no_lockmgr.patch
+Patch7: wxWidgets3.patch
URL: http://www.bacula.org/
BuildRequires: acl-devel
BuildRequires: autoconf
@@ -464,6 +465,7 @@ Nagios plugin to check bacula.
%patch4 -p1
%patch5 -p1
%patch6 -p1
+%patch7 -p1
tar -xf %{SOURCE2} && ln -s bacula-rescue-* rescue
diff --git a/wxWidgets3.patch b/wxWidgets3.patch
new file mode 100644
index 0000000..ac5d947
--- /dev/null
+++ b/wxWidgets3.patch
@@ -0,0 +1,79 @@
+diff -ur bacula-5.2.13/src/wx-console/wxbmainframe.cpp bacula-5.2.13.wx/src/wx-console/wxbmainframe.cpp
+--- bacula-5.2.13/src/wx-console/wxbmainframe.cpp 2014-01-18 20:03:40.675365632 +0100
++++ bacula-5.2.13.wx/src/wx-console/wxbmainframe.cpp 2014-01-18 20:03:00.478699256 +0100
+@@ -100,7 +100,7 @@
+
+ DEFINE_EVENT_TYPE(wxbTHREAD_EVENT)
+
+-typedef void (wxEvtHandler::*wxThreadEventFunction)(wxbThreadEvent&);
++//typedef void (wxEvtHandler::*wxThreadEventFunction)(wxbThreadEvent&);
+
+ #define EVT_THREAD_EVENT(id, fn) \
+ DECLARE_EVENT_TABLE_ENTRY( \
+@@ -850,7 +850,7 @@
+ evt.SetEventPrintObject(po);
+
+ if (wxbMainFrame::GetInstance()) {
+- wxbMainFrame::GetInstance()->AddPendingEvent(evt);
++ wxbMainFrame::GetInstance()->GetEventHandler()->AddPendingEvent(evt);
+ }
+ }
+
+diff -ur bacula-5.2.13/src/wx-console/wxbrestorepanel.cpp bacula-5.2.13.wx/src/wx-console/wxbrestorepanel.cpp
+--- bacula-5.2.13/src/wx-console/wxbrestorepanel.cpp 2014-01-18 20:03:40.675365632 +0100
++++ bacula-5.2.13.wx/src/wx-console/wxbrestorepanel.cpp 2014-01-18 20:00:54.408700169 +0100
+@@ -1276,8 +1276,8 @@
+ for (int i = tableparser->GetCount()-1; i > -1; i--) {
+ wxString str = (*tableparser)[i][3];
+ wxDateTime datetime;
+- const wxChar* chr;
+- if ( ( (chr = datetime.ParseDate(str.GetData()) ) != NULL ) && ( datetime.ParseTime(++chr) != NULL ) && ! lastdatetime.IsEqualTo(datetime) ) {
++ const wxChar* chr = datetime.ParseDate(str);
++ if ( (chr != NULL) && ( datetime.ParseTime(++chr) != NULL ) && ! lastdatetime.IsEqualTo(datetime) ) {
+ lastdatetime = datetime;
+ datetime += wxTimeSpan::Seconds(1);
+ configPanel->AddRowChoice(_("Before"),
+@@ -1937,9 +1937,9 @@
+ void wxbRestorePanel::SetStatus(status_enum newstatus) {
+ switch (newstatus) {
+ case disabled:
+- centerSizer->Remove(configPanel);
+- centerSizer->Remove(restorePanel);
+- centerSizer->Remove(treelistPanel);
++ centerSizer->Detach(configPanel);
++ centerSizer->Detach(restorePanel);
++ centerSizer->Detach(treelistPanel);
+ treelistPanel->Show(false);
+ restorePanel->Show(false);
+ centerSizer->Add(configPanel, 1, wxEXPAND);
+@@ -1958,9 +1958,9 @@
+ cancelled = 0;
+ break;
+ case finished:
+- centerSizer->Remove(configPanel);
+- centerSizer->Remove(restorePanel);
+- centerSizer->Remove(treelistPanel);
++ centerSizer->Detach(configPanel);
++ centerSizer->Detach(restorePanel);
++ centerSizer->Detach(treelistPanel);
+ treelistPanel->Show(false);
+ restorePanel->Show(false);
+ centerSizer->Add(configPanel, 1, wxEXPAND);
+@@ -2001,7 +2001,7 @@
+ case choosing:
+ start->Enable(true);
+ start->SetLabel(_("Restore"));
+- centerSizer->Remove(configPanel);
++ centerSizer->Detach(configPanel);
+ configPanel->Show(false);
+ centerSizer->Add(treelistPanel, 1, wxEXPAND);
+ treelistPanel->Show(true);
+@@ -2017,7 +2017,7 @@
+ configPanel->Enable(false);
+ tree->Enable(false);
+ list->Enable(false);
+- centerSizer->Remove(treelistPanel);
++ centerSizer->Detach(treelistPanel);
+ treelistPanel->Show(false);
+ centerSizer->Add(restorePanel, 1, wxEXPAND);
+ restorePanel->Show(true);
================================================================
---- gitweb:
http://git.pld-linux.org/gitweb.cgi/packages/bacula.git/commitdiff/5abea8ea24e78d84866966bb8f80d3d802b65d58
More information about the pld-cvs-commit
mailing list