[Git][debian-gis-team/spatialite-gui][experimental] 3 commits: Add patch to fix FTBFS without XlsxWriter support.
Bas Couwenberg
gitlab at salsa.debian.org
Mon Aug 3 08:00:29 BST 2020
Bas Couwenberg pushed to branch experimental at Debian GIS Project / spatialite-gui
Commits:
44cd0c2d by Bas Couwenberg at 2020-08-03T08:46:36+02:00
Add patch to fix FTBFS without XlsxWriter support.
- - - - -
ffdc0701 by Bas Couwenberg at 2020-08-03T08:49:14+02:00
Add patch to fix spelling errors.
- - - - -
f330a3b4 by Bas Couwenberg at 2020-08-03T08:49:33+02:00
Set distribution to experimental.
- - - - -
4 changed files:
- debian/changelog
- debian/patches/series
- + debian/patches/spelling-errors.patch
- + debian/patches/xlsxwriter.patch
Changes:
=====================================
debian/changelog
=====================================
@@ -1,4 +1,4 @@
-spatialite-gui (2.1.0~beta1-1) UNRELEASED; urgency=medium
+spatialite-gui (2.1.0~beta1-1~exp1) experimental; urgency=medium
* New upstream beta release.
* Bump Standards-Version to 4.5.0, no changes.
@@ -15,8 +15,10 @@ spatialite-gui (2.1.0~beta1-1) UNRELEASED; urgency=medium
* Add liblz4-dev to build dependencies.
* Add libzstd-dev to build dependencies.
* Disable XlsxWriter support.
+ * Add patch to fix FTBFS without XlsxWriter support.
+ * Add patch to fix spelling errors.
- -- Bas Couwenberg <sebastic at debian.org> Mon, 03 Aug 2020 07:51:22 +0200
+ -- Bas Couwenberg <sebastic at debian.org> Mon, 03 Aug 2020 08:49:19 +0200
spatialite-gui (2.1.0~beta0+really2.1.0~beta0-1~exp5) experimental; urgency=medium
=====================================
debian/patches/series
=====================================
@@ -1 +1,3 @@
01-fix_binary_name.patch
+xlsxwriter.patch
+spelling-errors.patch
=====================================
debian/patches/spelling-errors.patch
=====================================
@@ -0,0 +1,16 @@
+Description: Fix spelling errors.
+ * Emtpy -> Empty
+Author: Bas Couwenberg <sebastic at debian.org>
+Forwarded: https://www.gaia-gis.it/fossil/spatialite_gui/tktview/ab6d256f2383122cfa2cbdb4d476e08381087ad6
+
+--- a/ResultSetView.cpp
++++ b/ResultSetView.cpp
+@@ -796,7 +796,7 @@ bool MyResultSetView::ExecuteSqlPre(wxSt
+ }
+ if (strlen(pSql) == 0)
+ {
+- SqlErrorMsg = wxString::FromUTF8("Emtpy SQL Statement");
++ SqlErrorMsg = wxString::FromUTF8("Empty SQL Statement");
+ ::wxEndBusyCursor();
+ delete[]xSql;
+ return false;
=====================================
debian/patches/xlsxwriter.patch
=====================================
@@ -0,0 +1,121 @@
+Description: Fix FTBFS with --disable-xlsxwriter.
+Author: Bas Couwenberg <sebastic at debian.org>
+Bug: https://www.gaia-gis.it/fossil/spatialite_gui/tktview/de78c7158e87e94dd5a91d86e027569b52e9ef4f
+Forwarded: https://www.gaia-gis.it/fossil/spatialite_gui/info/de78c7158e87e94d
+
+--- a/ResultSetView.cpp
++++ b/ResultSetView.cpp
+@@ -185,8 +185,10 @@ wxPanel(parent, id, wxDefaultPosition, w
+ (wxObjectEventFunction) & MyResultSetView::OnCmdExpSylk);
+ Connect(Grid_ExpDbf, wxEVT_COMMAND_MENU_SELECTED,
+ (wxObjectEventFunction) & MyResultSetView::OnCmdExpDbf);
++#ifdef ENABLE_XLSXWRITER // only if XlsxWriter is supported
+ Connect(Grid_ExpXlsx, wxEVT_COMMAND_MENU_SELECTED,
+ (wxObjectEventFunction) & MyResultSetView::OnCmdExpXlsx);
++#endif // end XlsxWriter
+ Connect(Grid_Filter, wxEVT_COMMAND_MENU_SELECTED,
+ (wxObjectEventFunction) & MyResultSetView::OnCmdFilter);
+ Connect(Grid_MapShow, wxEVT_COMMAND_MENU_SELECTED,
+@@ -1976,10 +1978,12 @@ done:
+ exportMenu->Append(menuItem);
+ menuItem = new wxMenuItem(exportMenu, Grid_ExpDbf, wxT("as &DBF archive"));
+ exportMenu->Append(menuItem);
++#ifdef ENABLE_XLSXWRITER // only if XlsxWriter is supported
+ menuItem =
+ new wxMenuItem(exportMenu, Grid_ExpXlsx,
+ wxT("as MS &Excell Spreadsheet (XLSX)"));
+ exportMenu->Append(menuItem);
++#endif // end XlsxWriter
+ menu.AppendSubMenu(exportMenu, wxT("&Export ResultSet"));
+ menu.AppendSeparator();
+ if (MainFrame->IsValidSqlFilter() == true)
+@@ -3670,6 +3674,7 @@ void MyResultSetView::OnCmdExpDbf(wxComm
+ }
+ }
+
++#ifdef ENABLE_XLSXWRITER // only if XlsxWriter is supported
+ void MyResultSetView::OnCmdExpXlsx(wxCommandEvent & WXUNUSED(event))
+ {
+ //
+@@ -3705,3 +3710,4 @@ void MyResultSetView::OnCmdExpXlsx(wxCom
+ ::wxEndBusyCursor();
+ }
+ }
++#endif // end XlsxWriter
+--- a/TableTree.cpp
++++ b/TableTree.cpp
+@@ -317,8 +317,10 @@ MyTableTree::MyTableTree(MyFrame * paren
+ (wxObjectEventFunction) & MyTableTree::OnCmdDumpSylk);
+ Connect(Tree_DumpDbf, wxEVT_COMMAND_MENU_SELECTED,
+ (wxObjectEventFunction) & MyTableTree::OnCmdDumpDbf);
++#ifdef ENABLE_XLSXWRITER // only if XlsxWriter is supported
+ Connect(Tree_DumpXlsx, wxEVT_COMMAND_MENU_SELECTED,
+ (wxObjectEventFunction) & MyTableTree::OnCmdDumpXlsx);
++#endif // end XlsxWriter
+ Connect(Tree_DumpPostGIS, wxEVT_COMMAND_MENU_SELECTED,
+ (wxObjectEventFunction) & MyTableTree::OnCmdDumpPostGIS);
+ Connect(Tree_Edit, wxEVT_COMMAND_MENU_SELECTED,
+@@ -3091,9 +3093,11 @@ void MyTableTree::DoMainTableContextMenu
+ menu.Append(menuItem);
+ menuItem = new wxMenuItem(&menu, Tree_DumpDbf, wxT("Export as &DBF"));
+ menu.Append(menuItem);
++#ifdef ENABLE_XLSXWRITER // only if XlsxWriter is supported
+ menuItem =
+ new wxMenuItem(&menu, Tree_DumpXlsx, wxT("Export as MS &XLSX Spreadsheet"));
+ menu.Append(menuItem);
++#endif // end XlsxWriter
+ menuItem =
+ new wxMenuItem(&menu, Tree_DumpPostGIS, wxT("SQL Dump for &PostGIS"));
+ menu.Append(menuItem);
+@@ -3164,9 +3168,11 @@ void MyTableTree::DoMainViewContextMenu(
+ menu.Append(menuItem);
+ menuItem = new wxMenuItem(&menu, Tree_DumpDbf, wxT("Export as &DBF"));
+ menu.Append(menuItem);
++#ifdef ENABLE_XLSXWRITER // only if XlsxWriter is supported
+ menuItem =
+ new wxMenuItem(&menu, Tree_DumpXlsx, wxT("Export as MS &XLSX Spreadsheet"));
+ menu.Append(menuItem);
++#endif // end XlsxWriter
+ menuItem =
+ new wxMenuItem(&menu, Tree_DumpPostGIS, wxT("SQL Dump for &PostGIS"));
+ menu.Append(menuItem);
+@@ -3243,9 +3249,11 @@ void MyTableTree::DoAttachedTableContext
+ menu.Append(menuItem);
+ menuItem = new wxMenuItem(&menu, Tree_DumpDbf, wxT("Export as &DBF"));
+ menu.Append(menuItem);
++#ifdef ENABLE_XLSXWRITER // only if XlsxWriter is supported
+ menuItem =
+ new wxMenuItem(&menu, Tree_DumpXlsx, wxT("Export as MS &XLSX Spreadsheet"));
+ menu.Append(menuItem);
++#endif // end XlsxWriter
+ menuItem =
+ new wxMenuItem(&menu, Tree_DumpPostGIS, wxT("SQL Dump for &PostGIS"));
+ menu.Append(menuItem);
+@@ -3294,9 +3302,11 @@ void MyTableTree::DoAttachedViewContextM
+ menu.Append(menuItem);
+ menuItem = new wxMenuItem(&menu, Tree_DumpDbf, wxT("Export as &DBF"));
+ menu.Append(menuItem);
++#ifdef ENABLE_XLSXWRITER // only if XlsxWriter is supported
+ menuItem =
+ new wxMenuItem(&menu, Tree_DumpXlsx, wxT("Export as MS &XLSX Spreadsheet"));
+ menu.Append(menuItem);
++#endif // end XlsxWriter
+ menuItem =
+ new wxMenuItem(&menu, Tree_DumpPostGIS, wxT("SQL Dump for &PostGIS"));
+ menu.Append(menuItem);
+@@ -7300,6 +7310,7 @@ void MyTableTree::OnCmdDumpDbf(wxCommand
+ }
+ }
+
++#ifdef ENABLE_XLSXWRITER // only if XlsxWriter is supported
+ void MyTableTree::OnCmdDumpXlsx(wxCommandEvent & WXUNUSED(event))
+ {
+ //
+@@ -7338,6 +7349,7 @@ void MyTableTree::OnCmdDumpXlsx(wxComman
+ ::wxEndBusyCursor();
+ }
+ }
++#endif // end XlsxWriter
+
+ void MyTableTree::OnCmdDumpPostGIS(wxCommandEvent & WXUNUSED(event))
+ {
View it on GitLab: https://salsa.debian.org/debian-gis-team/spatialite-gui/-/compare/d8390bea87b11374c4a5c9ba360e19f08018ab46...f330a3b49dbb9a3db5efe786f2aac20f2ce65dd0
--
View it on GitLab: https://salsa.debian.org/debian-gis-team/spatialite-gui/-/compare/d8390bea87b11374c4a5c9ba360e19f08018ab46...f330a3b49dbb9a3db5efe786f2aac20f2ce65dd0
You're receiving this email because of your account on salsa.debian.org.
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://alioth-lists.debian.net/pipermail/pkg-grass-devel/attachments/20200803/b618931b/attachment-0001.html>
More information about the Pkg-grass-devel
mailing list