diff --git a/.files b/.files
index 01e856a..5d697b2 100644
Binary files a/.files and b/.files differ
diff --git a/.rev b/.rev
index 157f7b5..0639262 100644
--- a/.rev
+++ b/.rev
@@ -158,4 +158,12 @@ See the Readme - mostly MIT (including the IBPP) but some icons are LGPL-2.1+ (f
837286
+
+ 3e6120d20e7fd86421111fc89b4da603
+ 0.9.3.1
+
+ RBrownSUSE
+
+ 881671
+
diff --git a/flamerobin-wx31.patch b/flamerobin-wx31.patch
new file mode 100644
index 0000000..4f84810
--- /dev/null
+++ b/flamerobin-wx31.patch
@@ -0,0 +1,95 @@
+From fa6353f1d6aa4f7ab38134e68c4834157ddab084 Mon Sep 17 00:00:00 2001
+From: Popa Adrian Marius
+Date: Thu, 31 Mar 2016 18:15:02 +0300
+Subject: [PATCH] Fix #3 with deprecated methods in wx3.1
+
+https://github.com/mariuz/flamerobin/issues/3
+---
+ src/gui/ExecuteSqlFrame.cpp | 4 ++--
+ src/gui/InsertDialog.cpp | 4 ++--
+ src/gui/controls/DataGrid.cpp | 14 +++++++-------
+ 3 files changed, 11 insertions(+), 11 deletions(-)
+
+diff --git a/src/gui/ExecuteSqlFrame.cpp b/src/gui/ExecuteSqlFrame.cpp
+index 6627a78c..31ca2d3b 100644
+--- a/src/gui/ExecuteSqlFrame.cpp
++++ b/src/gui/ExecuteSqlFrame.cpp
+@@ -1849,8 +1849,8 @@ void ExecuteSqlFrame::OnMenuGridSetFieldToNULL(wxCommandEvent& WXUNUSED(event))
+
+ // if visible, update BLOB editor
+ if (editBlobDlgM && editBlobDlgM->IsShown()
+- && grid_data->GetCursorColumn() == col
+- && grid_data->GetCursorRow() == row)
++ && grid_data->GetGridCursorCol() == col
++ && grid_data->GetGridCursorRow() == row)
+ {
+ editBlobDlgM->setBlob(grid_data, dgt, &statementM, row, col, false);
+ }
+diff --git a/src/gui/InsertDialog.cpp b/src/gui/InsertDialog.cpp
+index 315ff4c4..d696d8a9 100644
+--- a/src/gui/InsertDialog.cpp
++++ b/src/gui/InsertDialog.cpp
+@@ -223,8 +223,8 @@ InsertDialog::InsertDialog(wxWindow* parent, const wxString& tableName,
+ gridM->SetCellValue(row, 0, c->getName_());
+ gridM->SetCellValue(row, 1, c->getDatatype());
+
+- gridM->SetCellAlignment(
+- def->isNumeric() ? wxALIGN_RIGHT : wxALIGN_LEFT, row, 3);
++ gridM->SetCellAlignment(row, 3,
++ def->isNumeric() ? wxALIGN_RIGHT : wxALIGN_LEFT, wxALIGN_CENTER);
+
+ wxString defaultValue;
+ if (c->getDefault(ReturnDomainDefault, defaultValue))
+diff --git a/src/gui/controls/DataGrid.cpp b/src/gui/controls/DataGrid.cpp
+index c17bb600..04c5943b 100644
+--- a/src/gui/controls/DataGrid.cpp
++++ b/src/gui/controls/DataGrid.cpp
+@@ -706,9 +706,9 @@ std::vector DataGrid::getColumnsWithSelectedCells()
+ {
+ // fully selected rows cause all columns to have selected cells
+ if (GetSelectedRows().size() > 0)
+- return std::vector(GetCols(), true);
++ return std::vector(GetNumberCols(), true);
+
+- std::vector ret(GetCols(), false);
++ std::vector ret(GetNumberCols(), false);
+ // first mark all completely selected columns
+ wxArrayInt cols(GetSelectedCols());
+ for (size_t i = 0; i < cols.size(); i++)
+@@ -740,9 +740,9 @@ std::vector DataGrid::getRowsWithSelectedCells()
+ {
+ // fully selected columns cause all rows to have selected cells
+ if (GetSelectedCols().size() > 0)
+- return std::vector(GetRows(), true);
++ return std::vector(GetNumberRows(), true);
+
+- std::vector ret(GetRows(), false);
++ std::vector ret(GetNumberRows(), false);
+ // first mark all completely selected rows
+ wxArrayInt rows(GetSelectedRows());
+ for (size_t i = 0; i < rows.size(); i++)
+@@ -777,10 +777,10 @@ std::vector DataGrid::getSelectedCellsInRow(int row)
+ for (size_t i = 0; i < rows.size(); i++)
+ {
+ if (rows[i] == row)
+- return std::vector(GetCols(), true);
++ return std::vector(GetNumberCols(), true);
+ }
+
+- std::vector ret(GetCols(), false);
++ std::vector ret(GetNumberCols(), false);
+ // first mark cells of all completely selected columns
+ wxArrayInt cols(GetSelectedCols());
+ for (size_t i = 0; i < cols.size(); i++)
+@@ -833,7 +833,7 @@ wxGridCellCoordsArray DataGrid::getSelectedCells()
+ }
+
+ if (result.size() == 0)
+- result.Add(wxGridCellCoords(wxGrid::GetCursorRow(),wxGrid::GetCursorColumn()));
++ result.Add(wxGridCellCoords(wxGrid::GetGridCursorRow(),wxGrid::GetGridCursorCol()));
+
+ return result;
+ }
+--
+2.30.2
+
diff --git a/flamerobin.changes b/flamerobin.changes
index 088ea2b..6ef025d 100644
--- a/flamerobin.changes
+++ b/flamerobin.changes
@@ -1,4 +1,10 @@
-------------------------------------------------------------------
+Fri Mar 26 22:15:28 UTC 2021 - Michael Gorse
+
+- Add flamerobin-wx31.patch: fix deprecated API in wx 3.1.
+- Minor spec file clean-up.
+
+-------------------------------------------------------------------
Sat Sep 19 19:15:09 UTC 2020 - Markus Beth
- cleanup spec file to fix missing dependencies
diff --git a/flamerobin.spec b/flamerobin.spec
index ac31c68..3919a11 100644
--- a/flamerobin.spec
+++ b/flamerobin.spec
@@ -1,7 +1,7 @@
#
# spec file for package flamerobin
#
-# Copyright (c) 2020 SUSE LLC
+# Copyright (c) 2021 SUSE LLC
#
# All modifications and additions to the file contributed by third parties
# remain the property of their copyright owners, unless otherwise agreed
@@ -20,26 +20,24 @@ Name: flamerobin
Version: 0.9.3.1
Release: 0
Summary: Graphical client for Firebird
-License: MIT AND LGPL-2.1-or-later
+License: LGPL-2.1-or-later AND MIT
Group: Productivity/Databases/Tools
URL: http://www.flamerobin.org/
Source0: https://github.com/mariuz/flamerobin/archive/%{version}.tar.gz
# PATCH-FIX-UPSTREAM flamerobin-desktop-file.patch gh#mariuz/flamerobin#5 badshah400@gmail.com -- Unhardcode icon path in GNU/Linux laucher; patch taken from upstream git
Patch0: flamerobin-desktop-file.patch
-%if 0%{?suse_version} > 1325
-BuildRequires: libboost_system-devel
-BuildRequires: libboost_thread-devel
-%else
-BuildRequires: boost-devel
-%endif
+# PATCH-FIX-UPSTREAM flamerobin-wx31.patch gh#mariuz/flamerobin#3 mgorse@suse.com -- Fix deprecated methods in wx 3.1; patch taken from upstream git
+Patch1: flamerobin-wx31.patch
BuildRequires: desktop-file-utils
BuildRequires: gcc-c++
BuildRequires: icns-utils
+BuildRequires: libboost_system-devel
+BuildRequires: libboost_thread-devel
BuildRequires: libfbclient2-devel >= 2.0.0.12748
BuildRequires: update-desktop-files
BuildRequires: wxWidgets-devel >= 3.0
Requires(post): update-desktop-files
-Requires(postun): update-desktop-files
+Requires(postun):update-desktop-files
BuildRoot: %{_tmppath}/%{name}-%{version}-build
%description
@@ -47,8 +45,7 @@ FlameRobin is a database administration tool for Firebird DBMS based on wxgtk
toolkit.
%prep
-%setup -q
-%patch0 -p1
+%autosetup -p1
%build
# FIX A TRAILING SEMICOLON ISSUE FOR KEYWORDS TAG IN .desktop FILE
@@ -84,7 +81,6 @@ rm %{buildroot}%{_datadir}/pixmaps/*.png
%desktop_database_postun
%files
-%defattr(-,root,root)
%doc docs/*
%{_mandir}/man1/flamerobin.1*
%{_bindir}/%{name}