diff --git a/7.6.22.tar.gz b/7.6.22.tar.gz deleted file mode 100644 index d241b63..0000000 --- a/7.6.22.tar.gz +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:b5b2b211725bc46399d3504bd6b0b60a9f9506d9f6b5a04d524991f239c16585 -size 44305861 diff --git a/7.6.32.tar.gz b/7.6.32.tar.gz new file mode 100644 index 0000000..0458a21 --- /dev/null +++ b/7.6.32.tar.gz @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:83cb65b8be32d53623c5d6e3890e4ed82ecc57efe56994a5b647ccb5da569832 +size 43560071 diff --git a/_service b/_service deleted file mode 100644 index 59bfc08..0000000 --- a/_service +++ /dev/null @@ -1,7 +0,0 @@ - - - 7.6.22.tar.gz - sha256 - b5b2b211725bc46399d3504bd6b0b60a9f9506d9f6b5a04d524991f239c16585 - - diff --git a/boinc-client-AM_CONDITIONAL.patch b/boinc-client-AM_CONDITIONAL.patch deleted file mode 100644 index 512cb03..0000000 --- a/boinc-client-AM_CONDITIONAL.patch +++ /dev/null @@ -1,21 +0,0 @@ -Index: configure.ac -=================================================================== ---- configure.ac.orig -+++ configure.ac -@@ -64,6 +64,7 @@ m4_ifdef([AC_PROG_OBJCXX],[AC_PROG_OBJCX - dnl ------ - AC_PROG_F77 - AC_PROG_CPP -+AC_PROG_OBJCXX - AC_PROG_MAKE_SET - SAH_LINKS - AC_LANG_PUSH(C) -@@ -1071,6 +1072,8 @@ AM_CONDITIONAL(ENABLE_LIBRARIES, [test " - AM_CONDITIONAL(INSTALL_HEADERS, [test "${enable_install_headers}" = yes]) - AM_CONDITIONAL(HAVE_CUDA_LIB, [test "${enable_client}" = yes -a -f ./coprocs/CUDA/posix/${boinc_platform}/libcudart.so]) - -+PKG_CHECK_MODULES([GTK2], [gtk+-2.0]) -+ - dnl ====================================================================== - dnl some more vodoo required for building portable client-binary (client, clientgui) - dnl ====================================================================== diff --git a/boinc-client.changes b/boinc-client.changes index 009253b..4838b0b 100644 --- a/boinc-client.changes +++ b/boinc-client.changes @@ -1,3 +1,10 @@ +------------------------------------------------------------------- +Sun Apr 24 07:31:13 UTC 2016 - jengelh@inai.de + +- Update to new upstream release 7.6.32 +- Remove boinc-client-AM_CONDITIONAL.patch, boinc-configure.patch + (no longer needed) + ------------------------------------------------------------------- Fri Apr 22 21:48:48 UTC 2016 - aaronpuchert@alice-dsl.net diff --git a/boinc-client.spec b/boinc-client.spec index dfdad5a..913de87 100644 --- a/boinc-client.spec +++ b/boinc-client.spec @@ -23,13 +23,15 @@ %define soname 7 %define boinc_dir %{_localstatedir}/lib/boinc Name: boinc-client -Version: 7.6.22 +Version: 7.6.32 Release: 0 Summary: The BOINC client License: GPL-3.0+ or LGPL-3.0+ Group: Productivity/Clustering/Computing Url: http://boinc.berkeley.edu/ -Source: https://github.com/BOINC/boinc/archive/client_release/7.6/7.6.22.tar.gz + +#Git-Clone: git://github.com/BOINC/boinc +Source: https://github.com/BOINC/boinc/archive/client_release/7.6/%version.tar.gz Source1: boinc-icons.tar.bz2 Source2: boinc-gui.desktop Source3: README.SUSE @@ -46,21 +48,6 @@ Source100: %{name}-rpmlintrc Patch0: boinc-guirpcauth.patch # PATCH-FIX-OPENSUSE boinc-docbook2x.patch Patch4: boinc-docbook2x.patch -# PATCH-FIX-OPENSUSE coolo - #error: am__fastdepOBJCXX does not appear in AM_CONDITIONAL -Patch7: %{name}-AM_CONDITIONAL.patch -# PATCH-FIX-OPENSUSE computersalat - error: -# configure.ac:898: required file `test/version.inc.in' not found -# configure.ac:898: required file `py/Boinc/version.py.in' not found -Patch8: boinc-configure.patch -# PATCH-FIX-UPSTREAM boinc-remove-dead-code.patch -# This is a cherry-pick of commit 1c4f391 and removes dead code that wouldn't -# compile on openSUSE -Patch9: boinc-remove-dead-code.patch -# PATCH-FIX-UPSTREAM boinc-use-wxstring.patch -# This is a squashed cherry-pick of the commits 9604566, b7cc65a and 8c11cad. -# This solves the remaining compiler errors on openSUSE by replacing naked -# char* and wxChar* by wxStrings. -Patch10: boinc-use-wxstring.patch BuildRequires: Mesa-devel BuildRequires: docbook2x BuildRequires: docbook_4 @@ -157,11 +144,8 @@ This package contains documentation files for %{name}. %setup -q -n %{name}_release-7.6-%{version} -D -a 1 %patch0 %patch4 -%patch7 -%patch8 -%patch9 -p1 -%patch10 -p1 +%build # Install user hints install -m0644 %{SOURCE3} README.SUSE @@ -190,11 +174,7 @@ sed -i 's/\r//' clientgui/DlgItemProperties.cpp # modification rm coprocs/NVIDIA/include/nvapi.h -%build -#remove run libtoolize and ./_autosetup -%{_bindir}/libtoolize --force -./_autosetup - +autoreconf -fi %configure \ --enable-optimize \ --enable-shared \ diff --git a/boinc-configure.patch b/boinc-configure.patch deleted file mode 100644 index 5069f36..0000000 --- a/boinc-configure.patch +++ /dev/null @@ -1,20 +0,0 @@ -Index: configure.ac -=================================================================== ---- configure.ac.orig -+++ configure.ac -@@ -1305,7 +1305,6 @@ AC_CONFIG_FILES([ - lib/Makefile - locale/Makefile - Makefile -- py/Boinc/version.py - py/Makefile - py/boinc_path_config.py:py/boinc_path_config.py.in - py/setup.py -@@ -1328,7 +1327,6 @@ AC_CONFIG_FILES([ - samples/Makefile - test/boinc_path_config.py:py/boinc_path_config.py.in - test/Makefile -- test/version.inc - tools/boinc_path_config.py:py/boinc_path_config.py.in - tools/Makefile - vda/Makefile diff --git a/boinc-remove-dead-code.patch b/boinc-remove-dead-code.patch deleted file mode 100644 index 732ffc9..0000000 --- a/boinc-remove-dead-code.patch +++ /dev/null @@ -1,465 +0,0 @@ -diff --git a/clientgui/AdvancedFrame.cpp b/clientgui/AdvancedFrame.cpp -index e9b08e8..5c41497 100644 ---- a/clientgui/AdvancedFrame.cpp -+++ b/clientgui/AdvancedFrame.cpp -@@ -199,7 +199,6 @@ BEGIN_EVENT_TABLE (CAdvancedFrame, CBOINCBaseFrame) - // Custom Events & Timers - EVT_FRAME_CONNECT(CAdvancedFrame::OnConnect) - EVT_FRAME_NOTIFICATION(CAdvancedFrame::OnNotification) -- EVT_FRAME_UPDATESTATUS(CAdvancedFrame::OnUpdateStatus) - EVT_TIMER(ID_REFRESHSTATETIMER, CAdvancedFrame::OnRefreshState) - EVT_TIMER(ID_FRAMERENDERTIMER, CAdvancedFrame::OnFrameRender) - EVT_NOTEBOOK_PAGE_CHANGED(ID_FRAMENOTEBOOK, CAdvancedFrame::OnNotebookSelectionChanged) -@@ -1951,16 +1950,6 @@ void CAdvancedFrame::OnNotification(CFrameEvent& WXUNUSED(event)) { - } - - --void CAdvancedFrame::OnUpdateStatus(CFrameEvent& event) { -- wxLogTrace(wxT("Function Start/End"), wxT("CAdvancedFrame::OnUpdateStatus - Function Begin")); -- -- m_pStatusbar->SetStatusText(event.m_message); -- ::wxSleep(0); -- -- wxLogTrace(wxT("Function Start/End"), wxT("CAdvancedFrame::OnUpdateStatus - Function End")); --} -- -- - void CAdvancedFrame::OnRefreshState(wxTimerEvent& WXUNUSED(event)) { - wxLogTrace(wxT("Function Start/End"), wxT("CAdvancedFrame::OnRefreshState - Function Begin")); - -diff --git a/clientgui/AdvancedFrame.h b/clientgui/AdvancedFrame.h -index a44bce9..4ddfc60 100644 ---- a/clientgui/AdvancedFrame.h -+++ b/clientgui/AdvancedFrame.h -@@ -98,8 +98,6 @@ public: - void OnConnect( CFrameEvent& event ); - void OnNotification( CFrameEvent& event ); - -- void OnUpdateStatus( CFrameEvent& event ); -- - void ResetReminderTimers(); - - bool RestoreState(); -diff --git a/clientgui/BOINCBaseFrame.h b/clientgui/BOINCBaseFrame.h -index 3e226bf..0d4ef92 100644 ---- a/clientgui/BOINCBaseFrame.h -+++ b/clientgui/BOINCBaseFrame.h -@@ -87,8 +87,6 @@ public: - virtual void StopTimers(); - virtual void UpdateRefreshTimerInterval(); - -- inline void UpdateStatusText( const wxChar* ){} -- - void ShowAlert( - const wxString title, - const wxString message, -diff --git a/clientgui/MainDocument.cpp b/clientgui/MainDocument.cpp -index 9fa22c4..fa7b953 100644 ---- a/clientgui/MainDocument.cpp -+++ b/clientgui/MainDocument.cpp -@@ -581,7 +581,6 @@ int CMainDocument::OnPoll() { - } - - if (IsComputerNameLocal(hostName)) { -- pFrame->UpdateStatusText(_("Starting client")); - if (m_pClientManager->StartupBOINCCore()) { - Connect(wxT("localhost"), portNum, password, TRUE, TRUE); - } else { -@@ -589,11 +588,8 @@ int CMainDocument::OnPoll() { - pFrame->ShowDaemonStartFailedAlert(); - } - } else { -- pFrame->UpdateStatusText(_("Connecting to client")); - Connect(hostName, portNum, password, TRUE, password.IsEmpty()); - } -- -- pFrame->UpdateStatusText(wxEmptyString); - } - - // Check connection state, connect if needed. -@@ -1203,7 +1199,6 @@ int CMainDocument::ForceCacheUpdate(bool immediate) { - - if (IsConnected()) { - wxASSERT(wxDynamicCast(pFrame, CBOINCBaseFrame)); -- pFrame->UpdateStatusText(_("Retrieving system state; please wait...")); - - m_dtCachedStateTimestamp = wxDateTime::Now(); - m_iGet_state_rpc_result = rpc.get_state(state); -@@ -1213,7 +1208,6 @@ int CMainDocument::ForceCacheUpdate(bool immediate) { - m_pNetworkConnection->SetStateDisconnected(); - } - -- pFrame->UpdateStatusText(wxEmptyString); - } else { - retval = -1; - } -diff --git a/clientgui/ViewProjects.cpp b/clientgui/ViewProjects.cpp -index e7be8ba..d63f622 100644 ---- a/clientgui/ViewProjects.cpp -+++ b/clientgui/ViewProjects.cpp -@@ -390,7 +390,6 @@ void CViewProjects::OnProjectUpdate( wxCommandEvent& WXUNUSED(event) ) { - wxASSERT(wxDynamicCast(pFrame, CAdvancedFrame)); - wxASSERT(m_pListPane); - -- pFrame->UpdateStatusText(_("Updating project...")); - row = -1; - while (1) { - // Step through all selected items -@@ -399,7 +398,6 @@ void CViewProjects::OnProjectUpdate( wxCommandEvent& WXUNUSED(event) ) { - - pDoc->ProjectUpdate(m_iSortedIndexes[row]); - } -- pFrame->UpdateStatusText(wxT("")); - - m_bForceUpdateSelection = true; - UpdateSelection(); -@@ -432,13 +430,9 @@ void CViewProjects::OnProjectSuspend( wxCommandEvent& WXUNUSED(event) ) { - PROJECT* project = pDoc->project(m_iSortedIndexes[row]); - if (project) { - if (project->suspended_via_gui) { -- pFrame->UpdateStatusText(_("Resuming project...")); - pDoc->ProjectResume(m_iSortedIndexes[row]); -- pFrame->UpdateStatusText(wxT("")); - } else { -- pFrame->UpdateStatusText(_("Suspending project...")); - pDoc->ProjectSuspend(m_iSortedIndexes[row]); -- pFrame->UpdateStatusText(wxT("")); - } - } - } -@@ -473,13 +467,9 @@ void CViewProjects::OnProjectNoNewWork( wxCommandEvent& WXUNUSED(event) ) { - PROJECT* project = pDoc->project(m_iSortedIndexes[row]); - if (project) { - if (project->dont_request_more_work) { -- pFrame->UpdateStatusText(_("Telling project to allow additional task downloads...")); - pDoc->ProjectAllowMoreWork(m_iSortedIndexes[row]); -- pFrame->UpdateStatusText(wxT("")); - } else { -- pFrame->UpdateStatusText(_("Telling project to not fetch any additional tasks...")); - pDoc->ProjectNoMoreWork(m_iSortedIndexes[row]); -- pFrame->UpdateStatusText(wxT("")); - } - } - } -@@ -513,8 +503,6 @@ void CViewProjects::OnProjectReset( wxCommandEvent& WXUNUSED(event) ) { - if (!pDoc->IsUserAuthorized()) - return; - -- pFrame->UpdateStatusText(_("Resetting project...")); -- - row = -1; - while (1) { - // Step through all selected items -@@ -542,8 +530,6 @@ void CViewProjects::OnProjectReset( wxCommandEvent& WXUNUSED(event) ) { - } - } - -- pFrame->UpdateStatusText(wxT("")); -- - m_bForceUpdateSelection = true; - UpdateSelection(); - pFrame->FireRefreshView(); -@@ -571,8 +557,6 @@ void CViewProjects::OnProjectDetach( wxCommandEvent& WXUNUSED(event) ) { - if (!pDoc->IsUserAuthorized()) - return; - -- pFrame->UpdateStatusText(_("Removing project...")); -- - row = -1; - while (1) { - // Step through all selected items -@@ -600,8 +584,6 @@ void CViewProjects::OnProjectDetach( wxCommandEvent& WXUNUSED(event) ) { - } - } - -- pFrame->UpdateStatusText(wxT("")); -- - m_bForceUpdateSelection = true; - UpdateSelection(); - pFrame->FireRefreshView(); -@@ -631,15 +613,12 @@ void CViewProjects::OnProjectWebsiteClicked( wxEvent& event ) { - - wxASSERT(pFrame); - wxASSERT(wxDynamicCast(pFrame, CAdvancedFrame)); -- pFrame->UpdateStatusText(_("Launching browser...")); - - int website_task_index = event.GetId() - ID_TASK_PROJECT_WEB_PROJDEF_MIN; - wxLaunchDefaultBrowser( - m_TaskGroups[1]->m_Tasks[website_task_index]->m_strWebSiteLink - ); - -- pFrame->UpdateStatusText(wxT("")); -- - UpdateSelection(); - pFrame->FireRefreshView(); - -diff --git a/clientgui/ViewStatistics.cpp b/clientgui/ViewStatistics.cpp -index 6706d84..83564ce 100644 ---- a/clientgui/ViewStatistics.cpp -+++ b/clientgui/ViewStatistics.cpp -@@ -2074,12 +2074,10 @@ void CViewStatistics::OnStatisticsUserTotal( wxCommandEvent& WXUNUSED(event) ) { - wxASSERT(pFrame); - wxASSERT(wxDynamicCast(pFrame, CAdvancedFrame)); - -- pFrame->UpdateStatusText(_("Updating charts...")); - m_PaintStatistics->m_SelectedStatistic = show_user_total; - m_PaintStatistics->m_Zoom_Auto = true; - m_PaintStatistics->m_GraphMarker1 = false; - m_PaintStatistics->m_full_repaint = true; -- pFrame->UpdateStatusText(wxT("")); - - UpdateSelection(); - pFrame->FireRefreshView(); -@@ -2095,12 +2093,10 @@ void CViewStatistics::OnStatisticsUserAverage( wxCommandEvent& WXUNUSED(event) ) - wxASSERT(pFrame); - wxASSERT(wxDynamicCast(pFrame, CAdvancedFrame)); - -- pFrame->UpdateStatusText(_("Updating charts...")); - m_PaintStatistics->m_SelectedStatistic = show_user_average; - m_PaintStatistics->m_Zoom_Auto = true; - m_PaintStatistics->m_GraphMarker1 = false; - m_PaintStatistics->m_full_repaint = true; -- pFrame->UpdateStatusText(wxT("")); - - UpdateSelection(); - pFrame->FireRefreshView(); -@@ -2116,12 +2112,10 @@ void CViewStatistics::OnStatisticsHostTotal( wxCommandEvent& WXUNUSED(event) ) { - wxASSERT(pFrame); - wxASSERT(wxDynamicCast(pFrame, CAdvancedFrame)); - -- pFrame->UpdateStatusText(_("Updating charts...")); - m_PaintStatistics->m_SelectedStatistic = show_host_total; - m_PaintStatistics->m_Zoom_Auto = true; - m_PaintStatistics->m_GraphMarker1 = false; - m_PaintStatistics->m_full_repaint = true; -- pFrame->UpdateStatusText(wxT("")); - - UpdateSelection(); - pFrame->FireRefreshView(); -@@ -2138,12 +2132,10 @@ void CViewStatistics::OnStatisticsHostAverage( wxCommandEvent& WXUNUSED(event) ) - wxASSERT(pFrame); - wxASSERT(wxDynamicCast(pFrame, CAdvancedFrame)); - -- pFrame->UpdateStatusText(_("Updating charts...")); - m_PaintStatistics->m_SelectedStatistic = show_host_average; - m_PaintStatistics->m_Zoom_Auto = true; - m_PaintStatistics->m_GraphMarker1 = false; - m_PaintStatistics->m_full_repaint = true; -- pFrame->UpdateStatusText(wxT("")); - - UpdateSelection(); - pFrame->FireRefreshView(); -@@ -2159,12 +2151,10 @@ void CViewStatistics::OnStatisticsModeViewAllSeparate( wxCommandEvent& WXUNUSED( - wxASSERT(pFrame); - wxASSERT(wxDynamicCast(pFrame, CAdvancedFrame)); - -- pFrame->UpdateStatusText(_("Updating charts...")); - m_PaintStatistics->m_ModeViewStatistic = mode_all_separate; - m_PaintStatistics->m_Zoom_Auto = true; - m_PaintStatistics->m_GraphMarker1 = false; - m_PaintStatistics->m_full_repaint = true; -- pFrame->UpdateStatusText(wxT("")); - - UpdateSelection(); - pFrame->FireRefreshView(); -@@ -2180,12 +2170,10 @@ void CViewStatistics::OnStatisticsModeViewOneProject( wxCommandEvent& WXUNUSED(e - wxASSERT(pFrame); - wxASSERT(wxDynamicCast(pFrame, CAdvancedFrame)); - -- pFrame->UpdateStatusText(_("Updating charts...")); - m_PaintStatistics->m_ModeViewStatistic = mode_one_project; - m_PaintStatistics->m_Zoom_Auto = true; - m_PaintStatistics->m_GraphMarker1 = false; - m_PaintStatistics->m_full_repaint = true; -- pFrame->UpdateStatusText(wxT("")); - - UpdateSelection(); - pFrame->FireRefreshView(); -@@ -2201,12 +2189,10 @@ void CViewStatistics::OnStatisticsModeViewAllTogether( wxCommandEvent& WXUNUSED( - wxASSERT(pFrame); - wxASSERT(wxDynamicCast(pFrame, CAdvancedFrame)); - -- pFrame->UpdateStatusText(_("Updating charts...")); - m_PaintStatistics->m_ModeViewStatistic = mode_all_together; - m_PaintStatistics->m_Zoom_Auto = true; - m_PaintStatistics->m_GraphMarker1 = false; - m_PaintStatistics->m_full_repaint = true; -- pFrame->UpdateStatusText(wxT("")); - - UpdateSelection(); - pFrame->FireRefreshView(); -@@ -2222,12 +2208,10 @@ void CViewStatistics::OnStatisticsModeViewSum( wxCommandEvent& WXUNUSED(event) ) - wxASSERT(pFrame); - wxASSERT(wxDynamicCast(pFrame, CAdvancedFrame)); - -- pFrame->UpdateStatusText(_("Updating charts...")); - m_PaintStatistics->m_ModeViewStatistic = mode_sum; - m_PaintStatistics->m_Zoom_Auto = true; - m_PaintStatistics->m_GraphMarker1 = false; - m_PaintStatistics->m_full_repaint = true; -- pFrame->UpdateStatusText(wxT("")); - - UpdateSelection(); - pFrame->FireRefreshView(); -@@ -2243,7 +2227,6 @@ void CViewStatistics::OnStatisticsNextProject( wxCommandEvent& WXUNUSED(event) ) - wxASSERT(pFrame); - wxASSERT(wxDynamicCast(pFrame, CAdvancedFrame)); - -- pFrame->UpdateStatusText(_("Updating charts...")); - if (m_PaintStatistics->m_ModeViewStatistic == mode_one_project) m_PaintStatistics->m_NextProjectStatistic++; - m_PaintStatistics->m_Zoom_Auto = true; - m_PaintStatistics->m_GraphMarker1 = false; -@@ -2251,7 +2234,6 @@ void CViewStatistics::OnStatisticsNextProject( wxCommandEvent& WXUNUSED(event) ) - if (m_PaintStatistics->m_ModeViewStatistic == mode_all_separate) m_PaintStatistics->m_Legend_Shift_Mode2++; - if (m_PaintStatistics->m_ModeViewStatistic == mode_all_together) m_PaintStatistics->m_Legend_Shift_Mode2++; - if (m_PaintStatistics->m_ModeViewStatistic == mode_sum) m_PaintStatistics->m_Legend_Shift_Mode2++; -- pFrame->UpdateStatusText(wxT("")); - - UpdateSelection(); - pFrame->FireRefreshView(); -@@ -2267,7 +2249,6 @@ void CViewStatistics::OnStatisticsPrevProject( wxCommandEvent& WXUNUSED(event) ) - wxASSERT(pFrame); - wxASSERT(wxDynamicCast(pFrame, CAdvancedFrame)); - -- pFrame->UpdateStatusText(_("Updating charts...")); - if (m_PaintStatistics->m_ModeViewStatistic == mode_one_project) m_PaintStatistics->m_NextProjectStatistic--; - m_PaintStatistics->m_Zoom_Auto = true; - m_PaintStatistics->m_GraphMarker1 = false; -@@ -2275,7 +2256,6 @@ void CViewStatistics::OnStatisticsPrevProject( wxCommandEvent& WXUNUSED(event) ) - if (m_PaintStatistics->m_ModeViewStatistic == mode_all_separate) m_PaintStatistics->m_Legend_Shift_Mode2--; - if (m_PaintStatistics->m_ModeViewStatistic == mode_all_together) m_PaintStatistics->m_Legend_Shift_Mode2--; - if (m_PaintStatistics->m_ModeViewStatistic == mode_sum) m_PaintStatistics->m_Legend_Shift_Mode2--; -- pFrame->UpdateStatusText(wxT("")); - - UpdateSelection(); - pFrame->FireRefreshView(); -diff --git a/clientgui/ViewTransfers.cpp b/clientgui/ViewTransfers.cpp -index cc2c4da..fc54121 100644 ---- a/clientgui/ViewTransfers.cpp -+++ b/clientgui/ViewTransfers.cpp -@@ -381,7 +381,6 @@ void CViewTransfers::OnTransfersRetryNow( wxCommandEvent& WXUNUSED(event) ) { - return; - } - -- pFrame->UpdateStatusText(_("Retrying transfer now...")); - row = -1; - while (1) { - // Step through all selected items -@@ -390,7 +389,6 @@ void CViewTransfers::OnTransfersRetryNow( wxCommandEvent& WXUNUSED(event) ) { - - pDoc->TransferRetryNow(m_iSortedIndexes[row]); - } -- pFrame->UpdateStatusText(wxT("")); - - UpdateSelection(); - pFrame->ResetReminderTimers(); -@@ -419,8 +417,6 @@ void CViewTransfers::OnTransfersAbort( wxCommandEvent& WXUNUSED(event) ) { - if (!pDoc->IsUserAuthorized()) - return; - -- pFrame->UpdateStatusText(_("Aborting transfer...")); -- - row = -1; - while (1) { - // Step through all selected items -@@ -448,8 +444,6 @@ void CViewTransfers::OnTransfersAbort( wxCommandEvent& WXUNUSED(event) ) { - } - } - -- pFrame->UpdateStatusText(wxT("")); -- - UpdateSelection(); - pFrame->FireRefreshView(); - -diff --git a/clientgui/ViewWork.cpp b/clientgui/ViewWork.cpp -index cdc7147..a48548f 100644 ---- a/clientgui/ViewWork.cpp -+++ b/clientgui/ViewWork.cpp -@@ -451,17 +451,13 @@ void CViewWork::OnWorkSuspend( wxCommandEvent& WXUNUSED(event) ) { - RESULT* result = pDoc->result(m_iSortedIndexes[row]); - if (result) { - if (result->suspended_via_gui) { -- pFrame->UpdateStatusText(_("Resuming task...")); - pDoc->WorkResume(result->project_url, result->name); - } else { -- pFrame->UpdateStatusText(_("Suspending task...")); - pDoc->WorkSuspend(result->project_url, result->name); - } - } - } - -- pFrame->UpdateStatusText(wxT("")); -- - UpdateSelection(); - pFrame->FireRefreshView(); - -@@ -483,8 +479,6 @@ void CViewWork::OnWorkShowGraphics( wxCommandEvent& WXUNUSED(event) ) { - wxASSERT(wxDynamicCast(pFrame, CAdvancedFrame)); - wxASSERT(m_pListPane); - -- pFrame->UpdateStatusText(_("Showing graphics for task...")); -- - row = -1; - while (1) { - // Step through all selected items -@@ -497,8 +491,6 @@ void CViewWork::OnWorkShowGraphics( wxCommandEvent& WXUNUSED(event) ) { - } - } - -- pFrame->UpdateStatusText(wxT("")); -- - UpdateSelection(); - pFrame->FireRefreshView(); - -@@ -520,8 +512,6 @@ void CViewWork::OnWorkShowVMConsole( wxCommandEvent& WXUNUSED(event) ) { - wxASSERT(wxDynamicCast(pFrame, CAdvancedFrame)); - wxASSERT(m_pListPane); - -- pFrame->UpdateStatusText(_("Showing VM console for task...")); -- - row = -1; - while (1) { - // Step through all selected items -@@ -534,8 +524,6 @@ void CViewWork::OnWorkShowVMConsole( wxCommandEvent& WXUNUSED(event) ) { - } - } - -- pFrame->UpdateStatusText(wxT("")); -- - UpdateSelection(); - pFrame->FireRefreshView(); - -@@ -593,8 +581,6 @@ void CViewWork::OnWorkAbort( wxCommandEvent& WXUNUSED(event) ) { - return; - } - -- pFrame->UpdateStatusText(_("Aborting task...")); -- - row = -1; - while (1) { - // Step through all selected items -@@ -607,8 +593,6 @@ void CViewWork::OnWorkAbort( wxCommandEvent& WXUNUSED(event) ) { - } - } - -- pFrame->UpdateStatusText(wxT("")); -- - UpdateSelection(); - pFrame->FireRefreshView(); - -@@ -693,15 +677,11 @@ void CViewWork::OnProjectWebsiteClicked( wxEvent& event ) { - wxASSERT(m_pTaskPane); - wxASSERT(m_pListPane); - -- pFrame->UpdateStatusText(_("Launching browser...")); -- - int website_task_index = event.GetId() - ID_TASK_PROJECT_WEB_PROJDEF_MIN; - wxLaunchDefaultBrowser( - m_TaskGroups[1]->m_Tasks[website_task_index]->m_strWebSiteLink - ); - -- pFrame->UpdateStatusText(wxT("")); -- - UpdateSelection(); - pFrame->FireRefreshView(); - diff --git a/boinc-use-wxstring.patch b/boinc-use-wxstring.patch deleted file mode 100644 index 44e4447..0000000 --- a/boinc-use-wxstring.patch +++ /dev/null @@ -1,141 +0,0 @@ -diff --git a/clientgui/BOINCBaseView.cpp b/clientgui/BOINCBaseView.cpp -index 0c64159..4337afc 100644 ---- a/clientgui/BOINCBaseView.cpp -+++ b/clientgui/BOINCBaseView.cpp -@@ -913,11 +913,11 @@ void CBOINCBaseView::AppendColumn(int){ - } - - --void CBOINCBaseView::append_to_status(wxString& existing, const wxChar* additional) { -+void CBOINCBaseView::append_to_status(wxString& existing, const wxString& additional) { - if (existing.size() == 0) { - existing = additional; - } else { -- existing = existing + wxT(", ") + additional; -+ existing += wxT(", ") + additional; - } - } - -diff --git a/clientgui/BOINCBaseView.h b/clientgui/BOINCBaseView.h -index 811fecb..c7b4fb9 100644 ---- a/clientgui/BOINCBaseView.h -+++ b/clientgui/BOINCBaseView.h -@@ -193,7 +193,7 @@ protected: - bool _EnsureLastItemVisible(); - virtual bool EnsureLastItemVisible(); - -- static void append_to_status(wxString& existing, const wxChar* additional); -+ static void append_to_status(wxString& existing, const wxString& additional); - static wxString HtmlEntityEncode(wxString strRaw); - static wxString HtmlEntityDecode(wxString strRaw); - -diff --git a/clientgui/BOINCGUIApp.cpp b/clientgui/BOINCGUIApp.cpp -index 5674029..91d387a 100644 ---- a/clientgui/BOINCGUIApp.cpp -+++ b/clientgui/BOINCGUIApp.cpp -@@ -626,27 +626,23 @@ void CBOINCGUIApp::SaveState() { - /// - void CBOINCGUIApp::OnInitCmdLine(wxCmdLineParser &parser) { - wxApp::OnInitCmdLine(parser); -- static const wxCmdLineEntryDesc cmdLineDesc[] = { -- { wxCMD_LINE_SWITCH, "a", "autostart", _("BOINC Manager was started by the operating system automatically")}, -+ parser.AddSwitch("a", "autostart", _("BOINC Manager was started by the operating system automatically")); - #if defined(__WXMSW__) || defined(__WXMAC__) -- { wxCMD_LINE_SWITCH, "s", "systray", _("Startup BOINC so only the system tray icon is visible")}, -+ parser.AddSwitch("s", "systray", _("Startup BOINC so only the system tray icon is visible")); - #else -- { wxCMD_LINE_OPTION, "e", "clientdir", _("Directory containing the BOINC Client executable")}, -- { wxCMD_LINE_OPTION, "d", "datadir", _("BOINC data directory")}, -+ parser.AddOption("e", "clientdir", _("Directory containing the BOINC Client executable")); -+ parser.AddOption("d", "datadir", _("BOINC data directory")); - #endif -- { wxCMD_LINE_OPTION, "n", "namehost", _("Host name or IP address")}, -- { wxCMD_LINE_OPTION, "g", "gui_rpc_port", _("GUI RPC port number")}, -- { wxCMD_LINE_OPTION, "p", "password", _("Password")}, -- { wxCMD_LINE_OPTION, "b", "boincargs", _("Startup BOINC with these optional arguments")}, -- { wxCMD_LINE_SWITCH, "i","insecure", _("disable BOINC security users and permissions")}, -- { wxCMD_LINE_SWITCH, "c", "checkskins", _("set skin debugging mode to enable skin manager error messages")}, -- { wxCMD_LINE_SWITCH, "m", "multiple", _("multiple instances of BOINC Manager allowed")}, -+ parser.AddOption("n", "namehost", _("Host name or IP address")); -+ parser.AddOption("g", "gui_rpc_port", _("GUI RPC port number")); -+ parser.AddOption("p", "password", _("Password")); -+ parser.AddOption("b", "boincargs", _("Startup BOINC with these optional arguments")); -+ parser.AddSwitch("i", "insecure", _("disable BOINC security users and permissions")); -+ parser.AddSwitch("c", "checkskins", _("set skin debugging mode to enable skin manager error messages")); -+ parser.AddSwitch("m", "multiple", _("multiple instances of BOINC Manager allowed")); - #if (defined(__WXMAC__) && defined(_DEBUG)) -- { wxCMD_LINE_OPTION, "NSDocumentRevisionsDebugMode", NULL, _("Not used: workaround for bug in XCode 4.2")}, -+ parser.AddLongOption("NSDocumentRevisionsDebugMode", _("Not used: workaround for bug in XCode 4.2")); - #endif -- { wxCMD_LINE_NONE} //DON'T forget this line!! -- }; -- parser.SetDesc(cmdLineDesc); - } - - -diff --git a/clientgui/MainDocument.cpp b/clientgui/MainDocument.cpp -index fa7b953..1b0c165 100644 ---- a/clientgui/MainDocument.cpp -+++ b/clientgui/MainDocument.cpp -@@ -273,7 +273,7 @@ bool CNetworkConnection::IsComputerNameLocal(const wxString& strMachine) { - - - int CNetworkConnection::SetComputer( -- const wxChar* szComputer, const int iPort, const wxChar* szPassword, -+ const wxString& szComputer, const int iPort, const wxString& szPassword, - const bool bUseDefaultPassword - ) { - m_strNewComputerName.Empty(); -@@ -641,7 +641,7 @@ int CMainDocument::ResetState() { - } - - --int CMainDocument::Connect(const wxChar* szComputer, int iPort, const wxChar* szComputerPassword, const bool bDisconnect, const bool bUseDefaultPassword) { -+int CMainDocument::Connect(const wxString& szComputer, int iPort, const wxString& szComputerPassword, const bool bDisconnect, const bool bUseDefaultPassword) { - if (IsComputerNameLocal(szComputer)) { - // Restart client if not already running - m_pClientManager->AutoRestart(); -@@ -687,7 +687,7 @@ int CMainDocument::GetConnectingComputerName(wxString& strMachine) { - } - - --bool CMainDocument::IsComputerNameLocal(const wxString strMachine) { -+bool CMainDocument::IsComputerNameLocal(const wxString& strMachine) { - return m_pNetworkConnection->IsComputerNameLocal(strMachine); - } - -diff --git a/clientgui/MainDocument.h b/clientgui/MainDocument.h -index 3b88571..90c10b5 100644 ---- a/clientgui/MainDocument.h -+++ b/clientgui/MainDocument.h -@@ -75,8 +75,7 @@ public: - bool IsComputerNameLocal(const wxString& strMachine); - int GetLocalPassword(wxString& strPassword); - int SetComputer( -- const wxChar* szComputer, const int iPort, const wxChar* szPassword, -- const bool bUseDefaultPassword -+ const wxString& szComputer, const int iPort, const wxString& szPassword, const bool bUseDefaultPassword - ); - void SetStateError(); - void SetStateErrorAuthentication(); -@@ -134,9 +133,9 @@ public: - int ResetState(); - - int Connect( -- const wxChar* szComputer, -+ const wxString& szComputer, - const int iPort, -- const wxChar* szComputerPassword = wxEmptyString, -+ const wxString& szComputerPassword = wxEmptyString, - const bool bDisconnect = FALSE, - const bool bUseDefaultPassword = FALSE - ); -@@ -152,7 +151,7 @@ public: - int GetConnectedComputerName(wxString& strMachine); - int GetConnectedComputerVersion(wxString& strVersion); - int GetConnectingComputerName(wxString& strMachine); -- bool IsComputerNameLocal(const wxString strMachine); -+ bool IsComputerNameLocal(const wxString& strMachine); - bool IsConnected(); - bool IsReconnecting(); -