File fix_wxstring_to_wxchar.patch of Package rapidsvn
diff -ru rapidsvn-0.13.0.orig/librapidsvn/src/columns.cpp rapidsvn-0.13.0/librapidsvn/src/columns.cpp
--- rapidsvn-0.13.0.orig/librapidsvn/src/columns.cpp 2018-08-28 03:27:31.000000000 +0300
+++ rapidsvn-0.13.0/librapidsvn/src/columns.cpp 2019-04-04 20:34:15.139174000 +0300
@@ -42,28 +42,28 @@
* the order of column in src/columns.cpp.
* This order should be the same in all 3 cases.
*/
- COLUMNS[0] = Column(wxT("Name"), _("Name"), ID_Column_Name); // cannot show/hide name
- COLUMNS[1] = Column(wxT("Path"), _("Path"), ID_Column_Path); // cannot show/hide path
- COLUMNS[2] = Column(wxT("Revision"), _("Revision"), ID_Column_Rev);
- COLUMNS[3] = Column(wxT("RepRev"), _("Rep. Rev."), ID_Column_Cmt_Rev);
- COLUMNS[4] = Column(wxT("Author"), _("Author"), ID_Column_Author);
- COLUMNS[5] = Column(wxT("Status"), _("Status"), ID_Column_Text_Status);
- COLUMNS[6] = Column(wxT("PropStatus"), _("Prop Status"), ID_Column_Prop_Status);
- COLUMNS[7] = Column(wxT("LastChanged"), _("Last Changed"), ID_Column_Cmt_Date);
- COLUMNS[8] = Column(wxT("Extension"), _("Extension"), ID_Column_Extension);
- COLUMNS[9] = Column(wxT("Date"), _("Date"), ID_Column_Text_Time);
- COLUMNS[10] = Column(wxT("PropDate"), _("Prop Date"), ID_Column_Prop_Time);
- COLUMNS[11] = Column(wxT("LockOwner"), _("Lock Owner"), ID_Column_LockOwner);
- COLUMNS[12] = Column(wxT("LockComment"), _("Lock Comment"), ID_Column_LockComment);
- COLUMNS[13] = Column(wxT("Checksum"), _("Checksum"), ID_Column_Checksum);
- COLUMNS[14] = Column(wxT("URL"), _("URL"), ID_Column_Url);
- COLUMNS[15] = Column(wxT("Repository"), _("Repository"), ID_Column_Repos);
- COLUMNS[16] = Column(wxT("UUID"), _("UUID"), ID_Column_Uuid);
- COLUMNS[17] = Column(wxT("Schedule"), _("Schedule"), ID_Column_Schedule);
- COLUMNS[18] = Column(wxT("Copied"), _("Copied"), ID_Column_Copied);
- COLUMNS[19] = Column(wxT("ConflictOld"), _("Conflict BASE"), ID_Column_ConflictOld);
- COLUMNS[20] = Column(wxT("ConflictNew"), _("Conflict HEAD"), ID_Column_ConflictNew);
- COLUMNS[21] = Column(wxT("ConflictWork"), _("Conflict Work"), ID_Column_ConflictWrk);
+ COLUMNS[0] = Column((_("Name")).wc_str(), (_("Name")).wc_str(), ID_Column_Name); // cannot show/hide name
+ COLUMNS[1] = Column((_("Path")).wc_str(), (_("Path")).wc_str(), ID_Column_Path); // cannot show/hide path
+ COLUMNS[2] = Column((_("Revision")).wc_str(), (_("Revision")).wc_str(), ID_Column_Rev);
+ COLUMNS[3] = Column((_("RepRev")).wc_str(), (_("Rep. Rev.")).wc_str(), ID_Column_Cmt_Rev);
+ COLUMNS[4] = Column((_("Author")).wc_str(), (_("Author")).wc_str(), ID_Column_Author);
+ COLUMNS[5] = Column((_("Status")).wc_str(), (_("Status")).wc_str(), ID_Column_Text_Status);
+ COLUMNS[6] = Column((_("PropStatus")).wc_str(), (_("Prop Status")).wc_str(), ID_Column_Prop_Status);
+ COLUMNS[7] = Column((_("LastChanged")).wc_str(), (_("Last Changed")).wc_str(), ID_Column_Cmt_Date);
+ COLUMNS[8] = Column((_("Extension")).wc_str(), (_("Extension")).wc_str(), ID_Column_Extension);
+ COLUMNS[9] = Column((_("Date")).wc_str(), (_("Date")).wc_str(), ID_Column_Text_Time);
+ COLUMNS[10] = Column((_("PropDate")).wc_str(), (_("Prop Date")).wc_str(), ID_Column_Prop_Time);
+ COLUMNS[11] = Column((_("LockOwner")).wc_str(), (_("Lock Owner")).wc_str(), ID_Column_LockOwner);
+ COLUMNS[12] = Column((_("LockComment")).wc_str(), (_("Lock Comment")).wc_str(), ID_Column_LockComment);
+ COLUMNS[13] = Column((_("Checksum")).wc_str(), (_("Checksum")).wc_str(), ID_Column_Checksum);
+ COLUMNS[14] = Column((_("URL")).wc_str(), (_("URL")).wc_str(), ID_Column_Url);
+ COLUMNS[15] = Column((_("Repository")).wc_str(), (_("Repository")).wc_str(), ID_Column_Repos);
+ COLUMNS[16] = Column((_("UUID")).wc_str(), (_("UUID")).wc_str(), ID_Column_Uuid);
+ COLUMNS[17] = Column((_("Schedule")).wc_str(), (_("Schedule")).wc_str(), ID_Column_Schedule);
+ COLUMNS[18] = Column((_("Copied")).wc_str(), (_("Copied")).wc_str(), ID_Column_Copied);
+ COLUMNS[19] = Column((_("ConflictOld")).wc_str(), (_("Conflict BASE")).wc_str(), ID_Column_ConflictOld);
+ COLUMNS[20] = Column((_("ConflictNew")).wc_str(), (_("Conflict HEAD")).wc_str(), ID_Column_ConflictNew);
+ COLUMNS[21] = Column((_("ConflictWork")).wc_str(), (_("Conflict Work")).wc_str(), ID_Column_ConflictWrk);
}
Column
diff -ru rapidsvn-0.13.0.orig/librapidsvn/src/file_info.cpp rapidsvn-0.13.0/librapidsvn/src/file_info.cpp
--- rapidsvn-0.13.0.orig/librapidsvn/src/file_info.cpp 2018-08-28 03:27:31.000000000 +0300
+++ rapidsvn-0.13.0/librapidsvn/src/file_info.cpp 2019-04-04 20:40:30.735913000 +0300
@@ -180,13 +180,13 @@
str.Printf(_("Last Changed Rev: %ld"), entry.cmtRev());
addLine(str);
- info_print_time(entry.cmtDate(), _("Last Changed Date"), str);
+ info_print_time(entry.cmtDate(), (_("Last Changed Date")).wc_str(), str);
addLine(str);
- info_print_time(entry.textTime(), _("Text Last Updated"), str);
+ info_print_time(entry.textTime(), (_("Text Last Updated")).wc_str(), str);
addLine(str);
- info_print_time(entry.propTime(), _("Properties Last Updated"), str);
+ info_print_time(entry.propTime(), (_("Properties Last Updated")).wc_str(), str);
addLine(str);
if (entry.checksum()) {
@@ -240,7 +240,7 @@
tmp.c_str());
addLine(str);
- info_print_time(status.lockCreationDate(), _("Lock Creation Date"), str);
+ info_print_time(status.lockCreationDate(), (_("Lock Creation Date")).wc_str(), str);
}
}
diff -ru rapidsvn-0.13.0.orig/librapidsvn/src/preferences_dlg.cpp rapidsvn-0.13.0/librapidsvn/src/preferences_dlg.cpp
--- rapidsvn-0.13.0.orig/librapidsvn/src/preferences_dlg.cpp 2018-08-28 03:27:31.000000000 +0300
+++ rapidsvn-0.13.0/librapidsvn/src/preferences_dlg.cpp 2019-04-05 12:31:13.617053000 +0300
@@ -40,7 +40,7 @@
#else
// NOTE: (WX 2.4.0) On Motif, neither multiple extensions nor multiple file
// types are supported (wildcard is limited to a single "*.ext" string)
-static const wxChar * EXECUTABLE_WILDCARD = _("All files|*");
+static const wxChar * EXECUTABLE_WILDCARD = (_("All files|*")).wc_str();
#endif
