Script 'mail_helper' called by obssrc Hello community, here is the log from the commit of package wxWidgets-3_2 for openSUSE:Factory checked in at 2021-07-02 13:26:19 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/wxWidgets-3_2 (Old) and /work/SRC/openSUSE:Factory/.wxWidgets-3_2.new.2625 (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "wxWidgets-3_2" Fri Jul 2 13:26:19 2021 rev:16 rq:902400 version:3.1.5 Changes: -------- --- /work/SRC/openSUSE:Factory/wxWidgets-3_2/wxWidgets-3_2.changes 2021-06-16 20:33:19.470964918 +0200 +++ /work/SRC/openSUSE:Factory/.wxWidgets-3_2.new.2625/wxWidgets-3_2.changes 2021-07-02 13:26:22.049272490 +0200 @@ -1,0 +2,5 @@ +Fri Jun 25 10:41:40 UTC 2021 - Antoine Belvire <antoine.belvire@opensuse.org> + +- Add wxWidgets-3.1.5-fix-wxIcon-wxDVC-columns.patch (boo#1187712). + +------------------------------------------------------------------- New: ---- wxWidgets-3.1.5-fix-wxIcon-wxDVC-columns.patch ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ wxWidgets-3_2.spec ++++++ --- /var/tmp/diff_new_pack.BjVEXe/_old 2021-07-02 13:26:22.637267929 +0200 +++ /var/tmp/diff_new_pack.BjVEXe/_new 2021-07-02 13:26:22.637267929 +0200 @@ -82,6 +82,7 @@ # identify and backport wxPython fixes to wxWidgets. Source6: wxpython-mkdiff.sh Patch1: soversion.diff +Patch2: wxWidgets-3.1.5-fix-wxIcon-wxDVC-columns.patch BuildRequires: autoconf BuildRequires: cppunit-devel BuildRequires: gcc-c++ ++++++ wxWidgets-3.1.5-fix-wxIcon-wxDVC-columns.patch ++++++ From c817a434d8d0d13a10f936af1eef0d8ffecb8069 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?V=C3=A1clav=20Slav=C3=ADk?= <vaclav@slavik.io> Date: Mon, 7 Jun 2021 16:15:53 +0200 Subject: [PATCH] Fix wxIcon wxDVC columns under wxGTK b376d1402bdc48614888704cf191f82a630d93c0 accidentally broke columns with wxIcon type. Contrary to that commit's assumption, operator<< cannot convert wxIcon to wxBitmap and asserts: src/common/bmpbase.cpp(33): assert "variant.GetType() == "wxBitmap"" failed in operator<<(). Fixed by restoring explicit conversion. --- src/gtk/dataview.cpp | 10 +++++++++- 1 file changed, 9 insertions(+), 1 deletion(-) diff --git a/src/gtk/dataview.cpp b/src/gtk/dataview.cpp index 8ffa7b7b3b5..767334e0043 100644 --- a/src/gtk/dataview.cpp +++ b/src/gtk/dataview.cpp @@ -2562,8 +2562,16 @@ wxDataViewBitmapRenderer::wxDataViewBitmapRenderer( const wxString &varianttype, bool wxDataViewBitmapRenderer::SetValue( const wxVariant &value ) { wxBitmap bitmap; - if (value.GetType() == wxS("wxBitmap") || value.GetType() == wxS("wxIcon")) + if (value.GetType() == wxS("wxBitmap")) + { bitmap << value; + } + else if (value.GetType() == wxS("wxIcon")) + { + wxIcon icon; + icon << value; + bitmap.CopyFromIcon(icon); + } #ifdef __WXGTK3__ WX_CELL_RENDERER_PIXBUF(m_renderer)->Set(bitmap);