From 11e655762928c6140f8c81301796a66bfa8e01e3 Mon Sep 17 00:00:00 2001 From: Tim Jackson Date: Dec 30 2006 23:36:12 +0000 Subject: Add patch to build against wxGTK 2.8 --- diff --git a/rapidsvn-wx28.patch b/rapidsvn-wx28.patch new file mode 100644 index 0000000..997747e --- /dev/null +++ b/rapidsvn-wx28.patch @@ -0,0 +1,190 @@ +Index: rapidsvn_frame.cpp +=================================================================== +--- rapidsvn_frame.cpp (revision 7623) ++++ rapidsvn_frame.cpp (working copy) +@@ -1150,7 +1150,7 @@ + void + RapidSvnFrame::OnColumn (wxCommandEvent & event) + { +- int eventId = event.m_id; ++ int eventId = event.GetId (); + int col = 0; + while (col < FileListCtrl::COL_COUNT && + m->ColumnList[col].id != eventId) +@@ -1192,7 +1192,7 @@ + RapidSvnFrame::OnColumnSorting (wxCommandEvent & event) + { + // we dont want to list FileListCtrl::COL_NAME/COL_PATH/... here +- int col = event.m_id - ID_ColumnSort_Name; ++ int col = event.GetId () - ID_ColumnSort_Name; + + m->listCtrl->SetSortColumn (col); + m->listCtrl->SetSortAscending (true); +@@ -1294,7 +1294,7 @@ + void + RapidSvnFrame::OnUpdateCommand (wxUpdateUIEvent & updateUIEvent) + { +- updateUIEvent.Enable (ValidateIDActionFlags (updateUIEvent.m_id, GetSelectionActionFlags ())); ++ updateUIEvent.Enable (ValidateIDActionFlags (updateUIEvent.GetId (), GetSelectionActionFlags ())); + } + + void +@@ -1514,13 +1514,13 @@ + { + Action* action = NULL; + +- if ((event.m_id >= ID_Verb_Min) && (event.m_id <= ID_Verb_Max)) ++ if ((event.GetId () >= ID_Verb_Min) && (event.GetId () <= ID_Verb_Max)) + { +- action = new ExternalProgramAction (this, event.m_id - ID_Verb_Min, false); ++ action = new ExternalProgramAction (this, event.GetId () - ID_Verb_Min, false); + } + else + { +- switch (event.m_id) ++ switch (event.GetId ()) + { + case ID_Explore: + action = new ExternalProgramAction (this, -1, true); +Index: add_action.cpp +=================================================================== +--- add_action.cpp (revision 7623) ++++ add_action.cpp (working copy) +@@ -23,12 +23,12 @@ + * ==================================================================== + */ + ++// wxWidgets ++#include "wx/intl.h" ++ + // svncpp + #include "svncpp/client.hpp" + +-// wxWidgets +-#include "wx/intl.h" +- + // app + #include "ids.hpp" + #include "add_action.hpp" +Index: checkout_dlg.cpp +=================================================================== +--- checkout_dlg.cpp (revision 7623) ++++ checkout_dlg.cpp (working copy) +@@ -256,7 +256,6 @@ + + BEGIN_EVENT_TABLE (CheckoutDlg, wxDialog) + EVT_BUTTON (ID_BUTTON_BROWSE, CheckoutDlg::OnBrowse) +- EVT_BUTTON (wxID_OK, CheckoutDlg::OnOK) + EVT_CHECKBOX (ID_USELATEST, CheckoutDlg::OnUseLatest) + EVT_TEXT (-1, CheckoutDlg::OnText) + // EVT_BUTTON (wxID_HELP, CheckoutDlg::OnHelp) +Index: log_dlg.cpp +=================================================================== +--- log_dlg.cpp (revision 7623) ++++ log_dlg.cpp (working copy) +@@ -32,6 +32,7 @@ + #include "wx/valgen.h" + #include "wx/listctrl.h" + #include "wx/splitter.h" ++#include "wx/notebook.h" + + + // svncpp +Index: resolve_action.cpp +=================================================================== +--- resolve_action.cpp (revision 7623) ++++ resolve_action.cpp (working copy) +@@ -23,12 +23,12 @@ + * ==================================================================== + */ + ++// wxWidgets ++#include "wx/intl.h" ++ + // svncpp + #include "svncpp/client.hpp" + +-// wxWidgets +-#include "wx/intl.h" +- + // app + #include "resolve_action.hpp" + +Index: preferences_dlg.cpp +=================================================================== +--- preferences_dlg.cpp (revision 7623) ++++ preferences_dlg.cpp (working copy) +@@ -114,9 +114,14 @@ + */ + bool SelectExecutable (const wxString & title, wxTextCtrl * textCtrl) + { ++#if wxCHECK_VERSION (2, 7, 0) ++ wxFileDialog dlg (this, title, wxEmptyString, wxEmptyString, _("*.*"), wxFD_OPEN); ++#else + wxFileDialog dlg (this, title); + + dlg.SetStyle (wxHIDE_READONLY | wxOPEN); ++#endif ++ + dlg.SetWildcard (EXECUTABLE_WILDCARD); + dlg.SetPath (textCtrl->GetValue ()); + +Index: import_dlg.cpp +=================================================================== +--- import_dlg.cpp (revision 7623) ++++ import_dlg.cpp (working copy) +@@ -196,7 +196,11 @@ + } + } + +- wxDialog::OnOK(event); ++#if wxCHECK_VERSION (2, 7, 0) ++ wxDialog::EndModal (wxID_OK); ++#else ++ wxDialog::OnOK (event); ++#endif + } + + void +Index: export_dlg.cpp +=================================================================== +--- export_dlg.cpp (revision 7623) ++++ export_dlg.cpp (working copy) +@@ -295,7 +295,6 @@ + + BEGIN_EVENT_TABLE (ExportDlg, wxDialog) + EVT_BUTTON (ID_BUTTON_BROWSE, ExportDlg::OnBrowse) +- EVT_BUTTON (wxID_OK, ExportDlg::OnOK) + EVT_CHECKBOX (ID_USE_LATEST, ExportDlg::OnUseLatest) + EVT_CHECKBOX (ID_NOT_SPECIFIED, ExportDlg::OnNotSpecified) + EVT_COMBOBOX (ID_NATIVE_EOL, ExportDlg::OnNativeEol) +Index: listener.cpp +=================================================================== +--- listener.cpp (revision 7623) ++++ listener.cpp (working copy) +@@ -253,7 +253,7 @@ + void + handleEvent (wxCommandEvent & event) + { +- switch (event.m_id) ++ switch (event.GetId ()) + { + case SIG_GET_LOG_MSG: + callbackGetLogMessage (); +Index: merge_dlg.cpp +=================================================================== +--- merge_dlg.cpp (revision 7623) ++++ merge_dlg.cpp (working copy) +@@ -113,7 +113,11 @@ + } + } + +- wxDialog::OnOK(event); ++#if wxCHECK_VERSION (2, 7, 0) ++ wxDialog::EndModal (wxID_OK); ++#else ++ wxDialog::OnOK (event); ++#endif + } + + void diff --git a/rapidsvn.spec b/rapidsvn.spec index c8b74a4..a3d32ab 100644 --- a/rapidsvn.spec +++ b/rapidsvn.spec @@ -1,12 +1,15 @@ Name: rapidsvn Version: 0.9.4 -Release: 3%{?dist} +Release: 4%{?dist} Summary: Graphical interface for the Subversion revision control system Group: Development/Tools License: GPL URL: http://www.rapidsvn.org/ Source0: http://rapidsvn.org/download/rapidsvn-%{version}.tar.gz + +# From http://rapidsvn.tigris.org/issues/show_bug.cgi?id=489, attachment 162 +Patch0: rapidsvn-wx28.patch BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) # Has to be a manual requirement, because the library version appears to not @@ -58,6 +61,10 @@ Install this package if you need to compile an application that requires the %prep %setup -q +pushd src +%patch0 -p0 +popd + %{__cat} <rapidsvn.desktop [Desktop Entry] Encoding=UTF-8 @@ -140,6 +147,9 @@ rm -rf %{buildroot} %changelog * Sat Dec 30 2006 Tim Jackson 0.9.4-3 +- Apply patches to build against wxGTK 2.8 + +* Sat Dec 30 2006 Tim Jackson 0.9.4-3 - Rebuild for new wxGTK * Sat Dec 09 2006 Tim Jackson 0.9.4-2