Accepting request 981365 from home:1Antoine1:branches:M17N

- Update to version 3.1.7: * CMake build system improvements (better precompiled headers support). * Many updated translations and new wxTRANSLATE_IN_CONTEXT(). * Several previously missing attributes added to multiple XRC handlers. * Row reordering by dragging and UI enhancements in wxGrid. * Ability to suppress selected (or all) GTK warning messages in wxGTK. * And many bugs fixes, including for the regressions in 3.1.6. - Remove wxWidgets-3.1.6-fix-wxDVC-not-showing-empty-cells.patch: Fixed upstream. OBS-URL: https://build.opensuse.org/request/show/981365 OBS-URL: https://build.opensuse.org/package/show/X11:wxWidgets/wxWidgets-3_2?expand=0&rev=91
2022-06-10 08:29:03 +00:00 · 2022-06-10 08:29:03 +00:00 · ced3af6978
commit ced3af6978
parent 2ecff40c38
6 changed files with 36 additions and 159 deletions
--- a/soversion.diff
+++ b/soversion.diff
@ -12,9 +12,9 @@ to do it. As we have a vendor suffix, no filename conflicts can occur.
 The ABI may not always change, so one needs to look at the diff
 between versions for whether or not soversion.diff needs an update.

-diff -Nur wxWidgets-3.1.6/build/aclocal/bakefile.m4 new/build/aclocal/bakefile.m4
--- wxWidgets-3.1.6/build/aclocal/bakefile.m4	2022-04-04 15:41:33.000000000 +0200
-+++ new/build/aclocal/bakefile.m4	2022-04-13 18:55:02.094488718 +0200
+diff -Nur wxWidgets-3.1.7/build/aclocal/bakefile.m4 new/build/aclocal/bakefile.m4
+--- wxWidgets-3.1.7/build/aclocal/bakefile.m4	2022-06-07 22:02:56.047531296 +0200
+++ new/build/aclocal/bakefile.m4	2022-06-07 22:06:07.355539227 +0200
@@ -408,8 +408,7 @@
             SONAME_FLAG="-Wl,-soname,"
         fi
@ -25,10 +25,10 @@ diff -Nur wxWidgets-3.1.6/build/aclocal/bakefile.m4 new/build/aclocal/bakefile.m
       ;;
 
       *-*-solaris2* )
-diff -Nur wxWidgets-3.1.6/Makefile.in new/Makefile.in
--- wxWidgets-3.1.6/Makefile.in	2022-04-04 15:41:33.000000000 +0200
-+++ new/Makefile.in	2022-04-13 18:56:24.238890301 +0200
-@@ -2218,6 +2218,7 @@
+diff -Nur wxWidgets-3.1.7/Makefile.in new/Makefile.in
+--- wxWidgets-3.1.7/Makefile.in	2022-06-07 22:04:21.491534839 +0200
+++ new/Makefile.in	2022-06-07 22:09:04.099546555 +0200
+@@ -2226,6 +2226,7 @@
 @COND_OFFICIAL_BUILD_0_PLATFORM_WIN32_1@WXCOMPILER = _gcc
 @COND_OFFICIAL_BUILD_1_PLATFORM_WIN32_1@WXCOMPILER \
 @COND_OFFICIAL_BUILD_1_PLATFORM_WIN32_1@	= _gcc$(COMPILER_VERSION)
@ -36,7 +36,7 @@ diff -Nur wxWidgets-3.1.6/Makefile.in new/Makefile.in
 @COND_OFFICIAL_BUILD_0_PLATFORM_WIN32_1@VENDORTAG = _$(VENDOR)
 @COND_OFFICIAL_BUILD_1_PLATFORM_WIN32_1@VENDORTAG = 
 @COND_BUILD_debug@WXDEBUGFLAG = d
-@@ -2229,7 +2230,7 @@
+@@ -2237,7 +2238,7 @@
 @COND_PLATFORM_WIN32_0@WXDLLNAMEPREFIXGUI = wx_$(PORTNAME)$(WXUNIVNAME)
 @COND_PLATFORM_WIN32_1@WXDLLNAMEPREFIXGUI = \
 @COND_PLATFORM_WIN32_1@	wx$(PORTNAME)$(WXUNIVNAME)$(WX_VERSION_NODOT)
@ -45,12 +45,12 @@ diff -Nur wxWidgets-3.1.6/Makefile.in new/Makefile.in
 @COND_PLATFORM_WIN32_1@WXDLLVERSIONTAG = 
 COND_wxUSE_REGEX_builtin___wxregex___depname = \
 	$(LIBDIRNAME)/$(LIBPREFIX)wxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)-$(WX_RELEASE)$(HOST_SUFFIX)$(LIBEXT)
-@@ -13972,7 +13973,7 @@
- @COND_PLATFORM_MACOSX_1_USE_SOVERSION_1@	= .6.0.0.$(SO_SUFFIX)
- @COND_USE_SOVERCYGWIN_1_USE_SOVERSION_1@dll___targetsuf3 = -6.$(SO_SUFFIX)
+@@ -13981,7 +13982,7 @@
+ @COND_PLATFORM_MACOSX_1_USE_SOVERSION_1@	= .7.0.0.$(SO_SUFFIX)
+ @COND_USE_SOVERCYGWIN_1_USE_SOVERSION_1@dll___targetsuf3 = -7.$(SO_SUFFIX)
 @COND_USE_SOVERSION_0@dll___targetsuf3 = .$(SO_SUFFIX)
-@COND_USE_SOVERSION_1_USE_SOVERSOLARIS_1@dll___targetsuf3 = .$(SO_SUFFIX).6
-+@COND_USE_SOVERSION_1_USE_SOVERSOLARIS_1@dll___targetsuf3 = .$(SO_SUFFIX).6.0.0
+-@COND_USE_SOVERSION_1_USE_SOVERSOLARIS_1@dll___targetsuf3 = .$(SO_SUFFIX).7
+@COND_USE_SOVERSION_1_USE_SOVERSOLARIS_1@dll___targetsuf3 = .$(SO_SUFFIX).7.0.0
 @COND_TOOLKIT_MSW@__RCDEFDIR_p = --include-dir \
 @COND_TOOLKIT_MSW@	$(LIBDIRNAME)/wx/include/$(TOOLCHAIN_FULLNAME)
 @COND_USE_GUI_1_wxUSE_LIBTIFF_builtin@__LIB_TIFF_p \
--- a/wxWidgets-3.1.6-fix-wxDVC-not-showing-empty-cells.patch
+++ b/wxWidgets-3.1.6-fix-wxDVC-not-showing-empty-cells.patch
@ -1,137 +0,0 @@
-From 1c9c48c34606ef4c26cf92dfb2b5abd4ac65f8d1 Mon Sep 17 00:00:00 2001
-From: Vadim Zeitlin <vadim@wxwidgets.org>
-Date: Sun, 8 May 2022 00:27:45 +0200
-Subject: [PATCH 1/3] Don't show value-less wxDataViewVirtualListModel cells in
- wxGTK
-
-For some reason, calls to wxGtkTreeSetVisibleProp() were skipped when
-using virtual list model in wxGTK implementation, resulting in showing
-the value of the previous (i.e. upper) cell for the rows of this model
-for which no value was available.
-
-Simply remove IsVirtualListModel() checks and always set the cell
-visibility to fix this.
-
-This commit is best viewed ignoring whitespace-only changes.
---
- src/gtk/dataview.cpp | 20 +++++---------------
- 1 file changed, 5 insertions(+), 15 deletions(-)
-
-diff --git a/src/gtk/dataview.cpp b/src/gtk/dataview.cpp
-index 22f7f25cc359..85e64d69adec 100644
--- a/src/gtk/dataview.cpp
-+++ b/src/gtk/dataview.cpp
-@@ -3233,25 +3233,15 @@ static void wxGtkTreeCellDataFunc( GtkTreeViewColumn *WXUNUSED(column),
- 
-     wxDataViewModel *wx_model = tree_model->internal->GetDataViewModel();
- 
-    if (!wx_model->IsVirtualListModel())
-+    gboolean visible = wx_model->HasValue(item, column);
-+    if ( visible )
-     {
-        gboolean visible = wx_model->HasValue(item, column);
-        wxGtkTreeSetVisibleProp(renderer, visible);
-+        cell->GtkSetCurrentItem(item);
- 
-        if ( !visible )
-            return;
-+        visible = cell->PrepareForItem(wx_model, item, column);
-     }
- 
-    cell->GtkSetCurrentItem(item);
-
-    if (!cell->PrepareForItem(wx_model, item, column))
-    {
-        // We don't have any value in this cell, after all, so hide it.
-        if (!wx_model->IsVirtualListModel())
-        {
-            wxGtkTreeSetVisibleProp(renderer, FALSE);
-        }
-    }
-+    wxGtkTreeSetVisibleProp(renderer, visible);
- }
- 
- } // extern "C"
-
-From 610eeb476ba4e0e87c0cd9d9fff17fa38e098a6a Mon Sep 17 00:00:00 2001
-From: Vadim Zeitlin <vadim@wxwidgets.org>
-Date: Sun, 8 May 2022 00:32:06 +0200
-Subject: [PATCH 2/3] Inline wxGtkTreeSetVisibleProp() function
-
-No real changes, just get rid of a trivial helper function which is only
-used once since the changes of the previous commit and copy its code
-directly into the caller.
---
- src/gtk/dataview.cpp | 12 +++---------
- 1 file changed, 3 insertions(+), 9 deletions(-)
-
-diff --git a/src/gtk/dataview.cpp b/src/gtk/dataview.cpp
-index 85e64d69adec..5b3b391c98b7 100644
--- a/src/gtk/dataview.cpp
-+++ b/src/gtk/dataview.cpp
-@@ -3199,14 +3199,6 @@ gtk_dataview_header_button_press_callback( GtkWidget *WXUNUSED(widget),
-     return FALSE;
- }
- 
-// Helper for wxGtkTreeCellDataFunc() below.
-static void wxGtkTreeSetVisibleProp(GtkCellRenderer *renderer, gboolean visible)
-{
-    wxGtkValue gvalue( G_TYPE_BOOLEAN );
-    g_value_set_boolean( gvalue, visible );
-    g_object_set_property( G_OBJECT(renderer), "visible", gvalue );
-}
-
- extern "C"
- {
- 
-@@ -3241,7 +3233,9 @@ static void wxGtkTreeCellDataFunc( GtkTreeViewColumn *WXUNUSED(column),
-         visible = cell->PrepareForItem(wx_model, item, column);
-     }
- 
-    wxGtkTreeSetVisibleProp(renderer, visible);
-+    wxGtkValue gvalue( G_TYPE_BOOLEAN );
-+    g_value_set_boolean( gvalue, visible );
-+    g_object_set_property( G_OBJECT(renderer), "visible", gvalue );
- }
- 
- } // extern "C"
-
-From 8aefedcb456c32fac72a691001eb47f23447f559 Mon Sep 17 00:00:00 2001
-From: Vadim Zeitlin <vadim@wxwidgets.org>
-Date: Sun, 8 May 2022 18:24:01 +0200
-Subject: [PATCH 3/3] Remove duplicated HasValue() call from wxGTK
- wxDataViewCtrl code
-
-HasValue() is already called by PrepareForItem(), so there is no need to
-call it explicitly from wxGTK code, just rely on PrepareForItem()
-returning false if there is no value to show -- we can skip the call to
-GtkSetCurrentItem() in this case, this function is cheap, and we lose
-more by calling HasValue() twice in the common case than we save on not
-calling it.
-
-No real changes.
---
- src/gtk/dataview.cpp | 9 +++------
- 1 file changed, 3 insertions(+), 6 deletions(-)
-
-diff --git a/src/gtk/dataview.cpp b/src/gtk/dataview.cpp
-index 5b3b391c98b7..115299de1365 100644
--- a/src/gtk/dataview.cpp
-+++ b/src/gtk/dataview.cpp
-@@ -3225,13 +3225,10 @@ static void wxGtkTreeCellDataFunc( GtkTreeViewColumn *WXUNUSED(column),
- 
-     wxDataViewModel *wx_model = tree_model->internal->GetDataViewModel();
- 
-    gboolean visible = wx_model->HasValue(item, column);
-    if ( visible )
-    {
-        cell->GtkSetCurrentItem(item);
-+    cell->GtkSetCurrentItem(item);
- 
-        visible = cell->PrepareForItem(wx_model, item, column);
-    }
-+    // Cells without values shouldn't be rendered at all.
-+    const bool visible = cell->PrepareForItem(wx_model, item, column);
- 
-     wxGtkValue gvalue( G_TYPE_BOOLEAN );
-     g_value_set_boolean( gvalue, visible );
--- a/wxWidgets-3.1.6.tar.bz2
+++ b/wxWidgets-3.1.6.tar.bz2
@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:4980e86c6494adcd527a41fc0a4e436777ba41d1893717d7b7176c59c2061c25
-size 25194403
--- a/wxWidgets-3.1.7.tar.bz2
+++ b/wxWidgets-3.1.7.tar.bz2
@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:3d666e47d86192f085c84089b850c90db7a73a5d26b684b617298d89dce84f19
+size 25380640
--- a/wxWidgets-3_2.changes
+++ b/wxWidgets-3_2.changes
@ -1,3 +1,19 @@
+-------------------------------------------------------------------
+Tue Jun  7 20:20:58 UTC 2022 - Antoine Belvire <antoine.belvire@opensuse.org>
+
+- Update to version 3.1.7:
+  * CMake build system improvements (better precompiled headers
+    support).
+  * Many updated translations and new wxTRANSLATE_IN_CONTEXT().
+  * Several previously missing attributes added to multiple XRC
+    handlers.
+  * Row reordering by dragging and UI enhancements in wxGrid.
+  * Ability to suppress selected (or all) GTK warning messages in
+    wxGTK.
+  * And many bugs fixes, including for the regressions in 3.1.6.
+- Remove wxWidgets-3.1.6-fix-wxDVC-not-showing-empty-cells.patch:
+  Fixed upstream.
+
 -------------------------------------------------------------------
 Sun May  8 09:56:40 UTC 2022 - Antoine Belvire <antoine.belvire@opensuse.org>

--- a/wxWidgets-3_2.spec
+++ b/wxWidgets-3_2.spec
@ -65,12 +65,12 @@ Name:           wxQt-3_2
 # Use default debug level, enabling exceptions
 # Other valid values: yes/no/max
 %define wx_debug %nil
-%define psonum 6_0_0
-%define sonum 6.0.0
-Version:        3.1.6
+%define psonum 7_0_0
+%define sonum 7.0.0
+Version:        3.1.7
 Release:        0
 %define wx_minor 3.1
-%define wx_micro 3.1.6
+%define wx_micro 3.1.7
 Summary:        C++ Library for Cross-Platform Development
 License:        LGPL-2.1-or-later WITH WxWindows-exception-3.1
 Group:          Development/Libraries/C and C++
@ -82,8 +82,6 @@ Source5:        wxWidgets-3_2-rpmlintrc
 # identify and backport wxPython fixes to wxWidgets.
 Source6:        wxpython-mkdiff.sh
 Patch1:         soversion.diff
-# PATCH-FIX-UPSTREAM wxWidgets-3.1.6-fix-wxDVC-not-showing-empty-cells.patch -- https://github.com/wxWidgets/wxWidgets/issues/22359
-Patch2:         wxWidgets-3.1.6-fix-wxDVC-not-showing-empty-cells.patch
 BuildRequires:  autoconf
 BuildRequires:  cppunit-devel
 BuildRequires:  gcc-c++