Script 'mail_helper' called by obssrc Hello community, here is the log from the commit of package flamerobin for openSUSE:Factory checked in at 2021-03-29 18:21:48 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/flamerobin (Old) and /work/SRC/openSUSE:Factory/.flamerobin.new.2401 (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "flamerobin" Mon Mar 29 18:21:48 2021 rev:22 rq:881671 version:0.9.3.1 Changes: -------- --- /work/SRC/openSUSE:Factory/flamerobin/flamerobin.changes 2020-09-25 16:37:30.936208887 +0200 +++ /work/SRC/openSUSE:Factory/.flamerobin.new.2401/flamerobin.changes 2021-03-29 18:21:49.658265318 +0200 @@ -1,0 +2,6 @@ +Fri Mar 26 22:15:28 UTC 2021 - Michael Gorse <[email protected]> + +- Add flamerobin-wx31.patch: fix deprecated API in wx 3.1. +- Minor spec file clean-up. + +------------------------------------------------------------------- New: ---- flamerobin-wx31.patch ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ flamerobin.spec ++++++ --- /var/tmp/diff_new_pack.2721Rl/_old 2021-03-29 18:21:50.102265772 +0200 +++ /var/tmp/diff_new_pack.2721Rl/_new 2021-03-29 18:21:50.106265776 +0200 @@ -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 @@ 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 [email protected] -- 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 [email protected] -- 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 @@ toolkit. %prep -%setup -q -%patch0 -p1 +%autosetup -p1 %build # FIX A TRAILING SEMICOLON ISSUE FOR KEYWORDS TAG IN .desktop FILE @@ -84,7 +81,6 @@ %desktop_database_postun %files -%defattr(-,root,root) %doc docs/* %{_mandir}/man1/flamerobin.1* %{_bindir}/%{name} ++++++ flamerobin-wx31.patch ++++++ >From fa6353f1d6aa4f7ab38134e68c4834157ddab084 Mon Sep 17 00:00:00 2001 From: Popa Adrian Marius <[email protected]> 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<bool> DataGrid::getColumnsWithSelectedCells() { // fully selected rows cause all columns to have selected cells if (GetSelectedRows().size() > 0) - return std::vector<bool>(GetCols(), true); + return std::vector<bool>(GetNumberCols(), true); - std::vector<bool> ret(GetCols(), false); + std::vector<bool> 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<bool> DataGrid::getRowsWithSelectedCells() { // fully selected columns cause all rows to have selected cells if (GetSelectedCols().size() > 0) - return std::vector<bool>(GetRows(), true); + return std::vector<bool>(GetNumberRows(), true); - std::vector<bool> ret(GetRows(), false); + std::vector<bool> 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<bool> DataGrid::getSelectedCellsInRow(int row) for (size_t i = 0; i < rows.size(); i++) { if (rows[i] == row) - return std::vector<bool>(GetCols(), true); + return std::vector<bool>(GetNumberCols(), true); } - std::vector<bool> ret(GetCols(), false); + std::vector<bool> 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
