From 92c3fc84b2fc10ddd5a8c70ccdc14f3724aa3a66ee3085bf24730fca07765564 Mon Sep 17 00:00:00 2001
From: Jan Engelhardt <jengelh@inai.de>
Date: Thu, 14 Apr 2022 12:10:14 +0000
Subject: [PATCH 1/6] Accepting request 970135 from
 home:susnux:branches:X11:wxWidgets

Update to 3.1.6

OBS-URL: https://build.opensuse.org/request/show/970135
OBS-URL: https://build.opensuse.org/package/show/X11:wxWidgets/wxWidgets-3_2?expand=0&rev=89
---
 soversion.diff                                | 72 +++++++++----------
 ...dgets-3.1.5-fix-wxIcon-wxDVC-columns.patch | 38 ----------
 wxWidgets-3.1.5.tar.bz2                       |  3 -
 wxWidgets-3.1.6.tar.bz2                       |  3 +
 wxWidgets-3_2.changes                         | 26 +++++++
 wxWidgets-3_2.spec                            |  9 ++-
 6 files changed, 66 insertions(+), 85 deletions(-)
 delete mode 100644 wxWidgets-3.1.5-fix-wxIcon-wxDVC-columns.patch
 delete mode 100644 wxWidgets-3.1.5.tar.bz2
 create mode 100644 wxWidgets-3.1.6.tar.bz2

diff --git a/soversion.diff b/soversion.diff
index 2a57e43..d23f508 100644
--- a/soversion.diff
+++ b/soversion.diff
@@ -11,46 +11,11 @@ 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.
----
- Makefile.in               |    5 +++--
- build/aclocal/bakefile.m4 |    3 +--
- 2 files changed, 4 insertions(+), 4 deletions(-)
 
-Index: wxWidgets-3.1.0.2244/Makefile.in
-===================================================================
---- wxWidgets-3.1.0.2244.orig/Makefile.in
-+++ wxWidgets-3.1.0.2244/Makefile.in
-@@ -2158,6 +2158,7 @@ LOCALE_MSW_LINGUAS =  it
- @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)
-+VENDORTAG = -$(VENDOR)
- @COND_OFFICIAL_BUILD_0_PLATFORM_WIN32_1@VENDORTAG = _$(VENDOR)
- @COND_OFFICIAL_BUILD_1_PLATFORM_WIN32_1@VENDORTAG = 
- @COND_BUILD_debug@WXDEBUGFLAG = d
-@@ -2169,7 +2170,7 @@ LOCALE_MSW_LINGUAS =  it
- @COND_PLATFORM_WIN32_0@WXDLLNAMEPREFIXGUI = wx_$(PORTNAME)$(WXUNIVNAME)
- @COND_PLATFORM_WIN32_1@WXDLLNAMEPREFIXGUI = \
- @COND_PLATFORM_WIN32_1@	wx$(PORTNAME)$(WXUNIVNAME)$(WX_VERSION_NODOT)
--@COND_PLATFORM_WIN32_0@WXDLLVERSIONTAG = -$(WX_RELEASE)
-+@COND_PLATFORM_WIN32_0@WXDLLVERSIONTAG =
- @COND_PLATFORM_WIN32_1@WXDLLVERSIONTAG = 
- COND_wxUSE_REGEX_builtin___wxregex___depname = \
- 	$(LIBDIRNAME)/$(LIBPREFIX)wxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)-$(WX_RELEASE)$(HOST_SUFFIX)$(LIBEXT)
-@@ -13775,7 +13776,7 @@ COND_MONOLITHIC_0_SHARED_1_USE_GUI_1_USE_HTML_1___htmldll_library_link_LIBR_0 \
- @COND_PLATFORM_MACOSX_1_USE_SOVERSION_1@	= .5.0.0.$(SO_SUFFIX)
- @COND_USE_SOVERCYGWIN_1_USE_SOVERSION_1@dll___targetsuf3 = -5.$(SO_SUFFIX)
- @COND_USE_SOVERSION_0@dll___targetsuf3 = .$(SO_SUFFIX)
--@COND_USE_SOVERSION_1_USE_SOVERSOLARIS_1@dll___targetsuf3 = .$(SO_SUFFIX).5
-+@COND_USE_SOVERSION_1_USE_SOVERSOLARIS_1@dll___targetsuf3 = .$(SO_SUFFIX).5.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 \
-Index: wxWidgets-3.1.0.2244/build/aclocal/bakefile.m4
-===================================================================
---- wxWidgets-3.1.0.2244.orig/build/aclocal/bakefile.m4
-+++ wxWidgets-3.1.0.2244/build/aclocal/bakefile.m4
-@@ -443,8 +443,7 @@ AC_DEFUN([AC_BAKEFILE_SHARED_VERSIONS],
+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
+@@ -408,8 +408,7 @@
              SONAME_FLAG="-Wl,-soname,"
          fi
          USE_SOVERSION=1
@@ -60,3 +25,32 @@ Index: wxWidgets-3.1.0.2244/build/aclocal/bakefile.m4
        ;;
  
        *-*-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 @@
+ @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)
++VENDORTAG = -$(VENDOR)
+ @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 @@
+ @COND_PLATFORM_WIN32_0@WXDLLNAMEPREFIXGUI = wx_$(PORTNAME)$(WXUNIVNAME)
+ @COND_PLATFORM_WIN32_1@WXDLLNAMEPREFIXGUI = \
+ @COND_PLATFORM_WIN32_1@	wx$(PORTNAME)$(WXUNIVNAME)$(WX_VERSION_NODOT)
+-@COND_PLATFORM_WIN32_0@WXDLLVERSIONTAG = -$(WX_RELEASE)
++@COND_PLATFORM_WIN32_0@WXDLLVERSIONTAG =
+ @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)
+ @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_TOOLKIT_MSW@__RCDEFDIR_p = --include-dir \
+ @COND_TOOLKIT_MSW@	$(LIBDIRNAME)/wx/include/$(TOOLCHAIN_FULLNAME)
+ @COND_USE_GUI_1_wxUSE_LIBTIFF_builtin@__LIB_TIFF_p \
diff --git a/wxWidgets-3.1.5-fix-wxIcon-wxDVC-columns.patch b/wxWidgets-3.1.5-fix-wxIcon-wxDVC-columns.patch
deleted file mode 100644
index 2a6502e..0000000
--- a/wxWidgets-3.1.5-fix-wxIcon-wxDVC-columns.patch
+++ /dev/null
@@ -1,38 +0,0 @@
-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);
diff --git a/wxWidgets-3.1.5.tar.bz2 b/wxWidgets-3.1.5.tar.bz2
deleted file mode 100644
index e174308..0000000
--- a/wxWidgets-3.1.5.tar.bz2
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:d7b3666de33aa5c10ea41bb9405c40326e1aeb74ee725bb88f90f1d50270a224
-size 22220762
diff --git a/wxWidgets-3.1.6.tar.bz2 b/wxWidgets-3.1.6.tar.bz2
new file mode 100644
index 0000000..478332a
--- /dev/null
+++ b/wxWidgets-3.1.6.tar.bz2
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:4980e86c6494adcd527a41fc0a4e436777ba41d1893717d7b7176c59c2061c25
+size 25194403
diff --git a/wxWidgets-3_2.changes b/wxWidgets-3_2.changes
index 71964ae..9ad3c0e 100644
--- a/wxWidgets-3_2.changes
+++ b/wxWidgets-3_2.changes
@@ -1,3 +1,29 @@
+-------------------------------------------------------------------
+Wed Apr 13 16:45:53 UTC 2022 - Ferdinand Thiessen <rpm@fthiessen.de>
+
+- Update to 3.1.6
+  * Many bug fixes for Wayland-specific problem.
+  * Add wxUILocale: CompareStrings(), GetLocalizedName()
+  * Add support for std::string_view to wxPrintf()
+  * Add wxString::ToInt() and ToUInt()
+  * Add wxGetNativeCpuArchitectureName()
+  * Add wxSecureZeroMemory(), wxThread::SetName()
+  * Significantly speed up wxMBConv iconv-based implementation
+  * Support searching from end in wxArrayString in STL build
+  * Several improvements to parsing dates in wxDateTime
+  * Add support for using native spell checking in wxTextCtrl
+  * Add support for style to wxWizard XRC handler
+  * Implement drawing splines in wxSVGFileDC
+  * Improve wxSpinCtrlDouble significant digits handling.
+  * wxGTK:
+    * Fix missing mouse events after enabling touch events
+    * Allow suppressing GTK diagnostics
+    * Fix getting key events from wxDataViewCtrl.
+    * Fix getting wxPrintData from the print dialog.
+    * Fix wxMediaCtrl support when using Wayland
+    * Generate wxKeyEvents for GDK_KEY_LaunchX keys
+- Drop upstream fixed wxWidgets-3.1.5-fix-wxIcon-wxDVC-columns.patch
+
 -------------------------------------------------------------------
 Fri Feb 11 14:53:40 UTC 2022 - Bjørn Lie <bjorn.lie@gmail.com>
 
diff --git a/wxWidgets-3_2.spec b/wxWidgets-3_2.spec
index ef8f135..b165be2 100644
--- 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 5_0_0
-%define sonum 5.0.0
-Version:        3.1.5
+%define psonum 6_0_0
+%define sonum 6.0.0
+Version:        3.1.6
 Release:        0
 %define wx_minor 3.1
-%define wx_micro 3.1.5
+%define wx_micro 3.1.6
 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,7 +82,6 @@ Source5:        wxWidgets-3_2-rpmlintrc
 # 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++

From 2ecff40c3846f6d3036e73d3326f2fadd1bbc6f5eb63f784a97ade6e18dd0512 Mon Sep 17 00:00:00 2001
From: Jan Engelhardt <jengelh@inai.de>
Date: Wed, 11 May 2022 16:18:24 +0000
Subject: [PATCH 2/6] Accepting request 976441 from
 home:1Antoine1:branches:M17N

- Add wxWidgets-3.1.6-fix-wxDVC-not-showing-empty-cells.patch
  (gh#wxWidgets/wxWidgets#22359).
- Remove _service file: Unused.
- Fix some rpmlint warnings:
  * Remove unused rpmlintrc filters.
  * Remove non-breaking spaces.

OBS-URL: https://build.opensuse.org/request/show/976441
OBS-URL: https://build.opensuse.org/package/show/X11:wxWidgets/wxWidgets-3_2?expand=0&rev=90
---
 _service                                      |  15 --
 ....6-fix-wxDVC-not-showing-empty-cells.patch | 137 ++++++++++++++++++
 wxWidgets-3_2-rpmlintrc                       |   6 -
 wxWidgets-3_2.changes                         |  10 ++
 wxWidgets-3_2.spec                            |   6 +-
 5 files changed, 151 insertions(+), 23 deletions(-)
 delete mode 100644 _service
 create mode 100644 wxWidgets-3.1.6-fix-wxDVC-not-showing-empty-cells.patch

diff --git a/_service b/_service
deleted file mode 100644
index 8b8771f..0000000
--- a/_service
+++ /dev/null
@@ -1,15 +0,0 @@
-<services>
-	<service name="tar_scm" mode="disabled">
-		<param name="scm">git</param>
-		<param name="url">git://github.com/wxWidgets/wxWidgets</param>
-		<param name="revision">6cc1d63d68f746cf9e48b75edd119a4cb4309f25</param>
-		<param name="parent-tag">v3.1.4</param>
-		<param name="versionformat">3.1.5~g@TAG_OFFSET@</param>
-		<param name="versionrewrite-pattern">v(.*)</param>
-	</service>
-	<service name="recompress" mode="disabled">
-		<param name="file">*.tar</param>
-		<param name="compression">xz</param>
-	</service>
-	<service name="set_version" mode="disabled"/>
-</services>
diff --git a/wxWidgets-3.1.6-fix-wxDVC-not-showing-empty-cells.patch b/wxWidgets-3.1.6-fix-wxDVC-not-showing-empty-cells.patch
new file mode 100644
index 0000000..ecbaa7b
--- /dev/null
+++ b/wxWidgets-3.1.6-fix-wxDVC-not-showing-empty-cells.patch
@@ -0,0 +1,137 @@
+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 );
diff --git a/wxWidgets-3_2-rpmlintrc b/wxWidgets-3_2-rpmlintrc
index 9f3fbd0..6aee80f 100644
--- a/wxWidgets-3_2-rpmlintrc
+++ b/wxWidgets-3_2-rpmlintrc
@@ -1,10 +1,4 @@
 # Project name just starts with lowercase.
 addFilter("summary-not-capitalized")
-# We know what we are doing. %{wxlibdir}/wx can be owned by more package instances at once.
-addFilter("shlib-policy-nonversioned-dir")
 # There is no such package.
 addFilter("no-dependency-on")
-# Package splits to many library packages, we just need to obsolete old one.
-addFilter("obsolete-not-provided")
-# Yes, there are macros in comments.
-addFilter("macro-in-comment")
diff --git a/wxWidgets-3_2.changes b/wxWidgets-3_2.changes
index 9ad3c0e..690f119 100644
--- a/wxWidgets-3_2.changes
+++ b/wxWidgets-3_2.changes
@@ -1,3 +1,13 @@
+-------------------------------------------------------------------
+Sun May  8 09:56:40 UTC 2022 - Antoine Belvire <antoine.belvire@opensuse.org>
+
+- Add wxWidgets-3.1.6-fix-wxDVC-not-showing-empty-cells.patch
+  (gh#wxWidgets/wxWidgets#22359).
+- Remove _service file: Unused.
+- Fix some rpmlint warnings:
+  * Remove unused rpmlintrc filters.
+  * Remove non-breaking spaces.
+
 -------------------------------------------------------------------
 Wed Apr 13 16:45:53 UTC 2022 - Ferdinand Thiessen <rpm@fthiessen.de>
 
diff --git a/wxWidgets-3_2.spec b/wxWidgets-3_2.spec
index b165be2..bd350dc 100644
--- a/wxWidgets-3_2.spec
+++ b/wxWidgets-3_2.spec
@@ -82,6 +82,8 @@ 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++
@@ -210,7 +212,7 @@ Group:          System/Libraries
 %description -n libwx_%{toolkit}u_html-%variant%psonum
 The wxHTML library provides classes for parsing and displaying HTML.
 It is not intended to be a high-end HTML browser. wxHTML can be used
-as a generic rich text viewer – for example, to display an About Box
+as a generic rich text viewer – for example, to display an About Box
 or the result of a database search.
 %{?extra_description}
 
@@ -271,7 +273,7 @@ Group:          System/Libraries
 
 %description -n libwx_%{toolkit}u_webview-%variant%psonum
 Library for a wxWidgets control that can be used to render web
-(HTML / CSS / JavaScript) documents.
+(HTML / CSS / JavaScript) documents.
 
 %package -n libwx_%{toolkit}u_xrc-%variant%psonum
 Summary:        wxWidgets's XML-based resource system

From ced3af69786e753d0d634ba0e20a287ed3a46007984073772962c9065531bb76 Mon Sep 17 00:00:00 2001
From: Jan Engelhardt <jengelh@inai.de>
Date: Fri, 10 Jun 2022 08:29:03 +0000
Subject: [PATCH 3/6] 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
---
 soversion.diff                                |  26 ++--
 ....6-fix-wxDVC-not-showing-empty-cells.patch | 137 ------------------
 wxWidgets-3.1.6.tar.bz2                       |   3 -
 wxWidgets-3.1.7.tar.bz2                       |   3 +
 wxWidgets-3_2.changes                         |  16 ++
 wxWidgets-3_2.spec                            |  10 +-
 6 files changed, 36 insertions(+), 159 deletions(-)
 delete mode 100644 wxWidgets-3.1.6-fix-wxDVC-not-showing-empty-cells.patch
 delete mode 100644 wxWidgets-3.1.6.tar.bz2
 create mode 100644 wxWidgets-3.1.7.tar.bz2

diff --git a/soversion.diff b/soversion.diff
index d23f508..6eb14e8 100644
--- 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 \
diff --git a/wxWidgets-3.1.6-fix-wxDVC-not-showing-empty-cells.patch b/wxWidgets-3.1.6-fix-wxDVC-not-showing-empty-cells.patch
deleted file mode 100644
index ecbaa7b..0000000
--- a/wxWidgets-3.1.6-fix-wxDVC-not-showing-empty-cells.patch
+++ /dev/null
@@ -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 );
diff --git a/wxWidgets-3.1.6.tar.bz2 b/wxWidgets-3.1.6.tar.bz2
deleted file mode 100644
index 478332a..0000000
--- a/wxWidgets-3.1.6.tar.bz2
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:4980e86c6494adcd527a41fc0a4e436777ba41d1893717d7b7176c59c2061c25
-size 25194403
diff --git a/wxWidgets-3.1.7.tar.bz2 b/wxWidgets-3.1.7.tar.bz2
new file mode 100644
index 0000000..32307c6
--- /dev/null
+++ b/wxWidgets-3.1.7.tar.bz2
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:3d666e47d86192f085c84089b850c90db7a73a5d26b684b617298d89dce84f19
+size 25380640
diff --git a/wxWidgets-3_2.changes b/wxWidgets-3_2.changes
index 690f119..2d7c1a4 100644
--- 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>
 
diff --git a/wxWidgets-3_2.spec b/wxWidgets-3_2.spec
index bd350dc..5d15daf 100644
--- 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++

From 66872e5549483af7f7718e0de439b3742027239ef75350fb241d84ac257387f2 Mon Sep 17 00:00:00 2001
From: Jan Engelhardt <jengelh@inai.de>
Date: Tue, 28 Jun 2022 15:43:38 +0000
Subject: [PATCH 4/6] Accepting request 985562 from
 home:StefanBruens:branches:X11:wxWidgets

The xml files are required when bootstrapping wxWindows from a git checkout.

- Install missing header added in 3.1.7, add
  0001-Add-new-wx-filedlgcustomize.h-to-the-list-of-files.patch
- Add doc generation using _multibuild
- Enable non-gui tests

OBS-URL: https://build.opensuse.org/request/show/985562
OBS-URL: https://build.opensuse.org/package/show/X11:wxWidgets/wxWidgets-3_2?expand=0&rev=92
---
 ...edlgcustomize.h-to-the-list-of-files.patch | 66 ++++++++++++++
 _multibuild                                   |  1 +
 wxWidgets-3_2-rpmlintrc                       |  4 +-
 wxWidgets-3_2.changes                         | 12 +++
 wxWidgets-3_2.spec                            | 90 +++++++++++++++++--
 5 files changed, 166 insertions(+), 7 deletions(-)
 create mode 100644 0001-Add-new-wx-filedlgcustomize.h-to-the-list-of-files.patch

diff --git a/0001-Add-new-wx-filedlgcustomize.h-to-the-list-of-files.patch b/0001-Add-new-wx-filedlgcustomize.h-to-the-list-of-files.patch
new file mode 100644
index 0000000..0e95e86
--- /dev/null
+++ b/0001-Add-new-wx-filedlgcustomize.h-to-the-list-of-files.patch
@@ -0,0 +1,66 @@
+From 5f1c1e9eb6856c92bbba242f854baab18b9ff566 Mon Sep 17 00:00:00 2001
+From: Vadim Zeitlin <vadim@wxwidgets.org>
+Date: Sat, 11 Jun 2022 15:13:38 +0200
+Subject: [PATCH] Add new wx/filedlgcustomize.h to the list of files
+
+Notably install it together with the other headers.
+
+Closes #22516.
+---
+ Makefile.in                       |  1 +
+ build/bakefiles/files.bkl         |  1 +
+ build/cmake/files.cmake           |  1 +
+ build/files                       |  1 +
+ 4 files changed, 4 insertions(+)
+
+diff --git a/Makefile.in b/Makefile.in
+index 9c3919ffaa..65ee6e1817 100644
+--- a/Makefile.in
++++ b/Makefile.in
+@@ -4063,6 +4063,7 @@ COND_USE_GUI_1_ALL_GUI_HEADERS =  \
+ 	wx/generic/creddlgg.h \
+ 	wx/creddlg.h \
+ 	wx/bmpbndl.h \
++	wx/filedlgcustomize.h \
+ 	$(LOWLEVEL_HDR) \
+ 	$(GUI_CORE_HEADERS) \
+ 	wx/mediactrl.h \
+diff --git a/build/bakefiles/files.bkl b/build/bakefiles/files.bkl
+index 0b16b7d632..5007c6ab97 100644
+--- a/build/bakefiles/files.bkl
++++ b/build/bakefiles/files.bkl
+@@ -1310,6 +1310,7 @@ IMPORTANT: please read docs/tech/tn0016.txt before modifying this file!
+     wx/generic/creddlgg.h
+     wx/creddlg.h
+     wx/bmpbndl.h
++    wx/filedlgcustomize.h
+ </set>
+ 
+ <!-- ====================================================================== -->
+diff --git a/build/cmake/files.cmake b/build/cmake/files.cmake
+index 8c9bcf58b5..0b5ea94dcf 100644
+--- a/build/cmake/files.cmake
++++ b/build/cmake/files.cmake
+@@ -1213,6 +1213,7 @@ set(GUI_CMN_HDR
+     wx/generic/creddlgg.h
+     wx/generic/animate.h
+     wx/bmpbndl.h
++    wx/filedlgcustomize.h
+ )
+ 
+ set(UNIX_SRC
+diff --git a/build/files b/build/files
+index ca7e119b61..e918da31ba 100644
+--- a/build/files
++++ b/build/files
+@@ -1017,6 +1017,7 @@ GUI_CMN_HDR =
+     wx/fdrepdlg.h
+     wx/filectrl.h
+     wx/filedlg.h
++    wx/filedlgcustomize.h
+     wx/filehistory.h
+     wx/filepicker.h
+     wx/fmappriv.h
+-- 
+2.36.1
+
diff --git a/_multibuild b/_multibuild
index eb2fa5c..6f050c6 100644
--- a/_multibuild
+++ b/_multibuild
@@ -2,4 +2,5 @@
   <package>GTK3</package>
   <package>GTK3-nostl</package>
   <package>Qt</package>
+  <package>doc</package>
 </multibuild>
diff --git a/wxWidgets-3_2-rpmlintrc b/wxWidgets-3_2-rpmlintrc
index 6aee80f..4ed5e47 100644
--- a/wxWidgets-3_2-rpmlintrc
+++ b/wxWidgets-3_2-rpmlintrc
@@ -1,4 +1,4 @@
 # Project name just starts with lowercase.
 addFilter("summary-not-capitalized")
-# There is no such package.
-addFilter("no-dependency-on")
+# rpmlint does not detect dates matching SOURCE_DATE_EPOCH
+addFilter("wxWidgets-3_2-doc-html.noarch:.*file-contains-date-and-time /usr/share/doc/packages/wxWidgets-3_2-doc-html/.*.html")
diff --git a/wxWidgets-3_2.changes b/wxWidgets-3_2.changes
index 2d7c1a4..a24052a 100644
--- a/wxWidgets-3_2.changes
+++ b/wxWidgets-3_2.changes
@@ -1,3 +1,15 @@
+-------------------------------------------------------------------
+Sun Jun 26 17:37:54 UTC 2022 - Stefan Brüns <stefan.bruens@rwth-aachen.de>
+
+- Install missing header added in 3.1.7, add
+  0001-Add-new-wx-filedlgcustomize.h-to-the-list-of-files.patch
+
+-------------------------------------------------------------------
+Sat Jun 25 01:11:47 UTC 2022 - Stefan Brüns <stefan.bruens@rwth-aachen.de>
+
+- Add doc generation using _multibuild
+- Enable non-gui tests
+
 -------------------------------------------------------------------
 Tue Jun  7 20:20:58 UTC 2022 - Antoine Belvire <antoine.belvire@opensuse.org>
 
diff --git a/wxWidgets-3_2.spec b/wxWidgets-3_2.spec
index 5d15daf..af5377c 100644
--- a/wxWidgets-3_2.spec
+++ b/wxWidgets-3_2.spec
@@ -20,7 +20,6 @@
 %if "%flavor" == ""
 # default flavor is GTK2
 Name:           wxWidgets-3_2
-%define pkgname wxWidgets-3_2
 %define variant suse
 %define gtk_version 2
 %define toolkit gtk%gtk_version
@@ -28,9 +27,14 @@ Name:           wxWidgets-3_2
 %bcond_with webview
 %endif
 
+%if "%{flavor}" == "doc"
+Name:           wxWidgets-3_2-doc
+%define variant %{nil}
+%define toolkit %{nil}
+%endif
+
 %if "%flavor" == "GTK3"
 Name:           wxGTK3-3_2
-%define pkgname wxGTK3-3_2
 %define variant suse
 %define gtk_version 3
 %define toolkit gtk%gtk_version
@@ -41,7 +45,6 @@ Name:           wxGTK3-3_2
 
 %if "%flavor" == "GTK3-nostl"
 Name:           wxWidgets-3_2-nostl
-%define pkgname wxWidgets-3_2-nostl
 %define variant suse-nostl
 %define gtk_version 3
 %define toolkit gtk%gtk_version
@@ -54,7 +57,6 @@ wxString and instead rely on the wxChar pointer API.
 
 %if "%flavor" == "Qt"
 Name:           wxQt-3_2
-%define pkgname wxQt-3_2
 %define variant suse
 %define toolkit qt
 %define base_packages 0
@@ -82,6 +84,13 @@ Source5:        wxWidgets-3_2-rpmlintrc
 # identify and backport wxPython fixes to wxWidgets.
 Source6:        wxpython-mkdiff.sh
 Patch1:         soversion.diff
+# PATCH-FIX-UPSTREAM
+Patch2:         0001-Add-new-wx-filedlgcustomize.h-to-the-list-of-files.patch
+%if "%{flavor}" == "doc"
+BuildRequires:  doxygen
+BuildRequires:  fdupes
+BuildRequires:  graphviz
+%else
 BuildRequires:  autoconf
 BuildRequires:  cppunit-devel
 BuildRequires:  gcc-c++
@@ -120,6 +129,7 @@ BuildRequires:  pkgconfig(sdl)
 BuildRequires:  pkgconfig(sdl2)
 %endif
 BuildRequires:  pkgconfig(xtst)
+%endif
 
 %description
 wxWidgets is a C++ library abstraction layer for a number of GUI
@@ -350,16 +360,49 @@ This package contains all files needed for developing with %name.
 Note: wxWidgets variant devel packages are mutually exclusive. Please
 read %_docdir/%name/README.SUSE to pick a correct variant.
 
+%package xml
+Summary:        wxWidgets interface description
+Group:          Development/Libraries/C and C++
+BuildArch:      noarch
+
+%description xml
+wxWidgets is a C++ library abstraction layer for a number of GUI
+backends. Applications can be created for different GUIs (GTK+,
+Motif, MS Windows, MacOS X, Windows CE, GPE) from the same source
+code.
+
+This package contains the interface description in XML format,
+useful for generating bindings.
+
+%package html
+Summary:        wxWidgets API documentation
+Group:          Development/Libraries/C and C++
+BuildArch:      noarch
+
+%description html
+wxWidgets is a C++ library abstraction layer for a number of GUI
+backends. Applications can be created for different GUIs (GTK+,
+Motif, MS Windows, MacOS X, Windows CE, GPE) from the same source
+code.
+
+This package contains the API documentation in HTML format.
+
 %prep
 %autosetup -n wxWidgets-%version -p1
 cp %{S:2} .
 
 %build
+%if "%{flavor}" == "doc"
+pushd  docs/doxygen
+echo "DOT_IMAGE_FORMAT = svg" >> Doxyfile
+WX_SKIP_DOXYGEN_VERSION_CHECK=1 ./regen.sh xml
+WX_SKIP_DOXYGEN_VERSION_CHECK=1 ./regen.sh html
+
+%else
 autoconf -f -i
 # NOTE: gnome-vfs is deprecated. Disabled by default upstream.
 #
 # With 2.9.1:
-# --enable-objc_uniquifying is relevant only for Cocoa
 # --enable-accessibility is currently supported only in msw
 # --enable-extended_rtti does not compile
 
@@ -389,8 +432,16 @@ autoconf -f -i
 %endif
 
 %make_build
+%endif
 
 %install
+%if "%{flavor}" == "doc"
+find docs/doxygen/out/xml/ -iname \*.png -print -delete
+find docs/doxygen/out/html/ -iname \*.dot -print -delete
+%fdupes -s docs/doxygen/out/html/
+
+%else
+
 export VENDORTAG='-$variant' # only needed for non-MSW
 %make_install
 %if !%base_packages
@@ -402,6 +453,19 @@ rm -Rfv %buildroot/%_datadir/locale
 
 # HACK: Fix wx-config symlink (bug introduced in 2.9.4).
 ln -sf $(echo %buildroot/%_libdir/wx/config/* | sed "s%%%buildroot%%%%") %buildroot/%_bindir/wx-config
+%endif
+
+%check
+%if "%{flavor}" != "doc"
+%make_build -C tests all
+pushd tests
+# Non-gui tests
+./test -l || true
+# ExecTestCase depends on xclock, and is fragile
+./test exclude:ExecTestCase exclude:[.]
+# Tests depending on a running X server
+# ./test_gui -l || true
+%endif
 
 %post   -n libwx_baseu-%variant%psonum -p /sbin/ldconfig
 %postun -n libwx_baseu-%variant%psonum -p /sbin/ldconfig
@@ -436,6 +500,21 @@ ln -sf $(echo %buildroot/%_libdir/wx/config/* | sed "s%%%buildroot%%%%") %buildr
 %post   -n libwx_%{toolkit}u_xrc-%variant%psonum -p /sbin/ldconfig
 %postun -n libwx_%{toolkit}u_xrc-%variant%psonum -p /sbin/ldconfig
 
+%if "%{flavor}" == "doc"
+%files xml
+%doc docs/doxygen/out/xml/*.{xml,xslt}
+
+%files html
+%doc docs/doxygen/out/html/*.css
+%doc docs/doxygen/out/html/*.html
+%doc docs/doxygen/out/html/*.js
+%doc docs/doxygen/out/html/*.png
+%doc docs/doxygen/out/html/*.svg
+%doc docs/doxygen/out/html/generic
+%doc docs/doxygen/out/html/search
+
+%else
+
 %if %base_packages
 %files -n libwx_base-%variant-devel
 %_libdir/libwx_baseu*.so
@@ -519,5 +598,6 @@ ln -sf $(echo %buildroot/%_libdir/wx/config/* | sed "s%%%buildroot%%%%") %buildr
 %dir %_libdir/wx
 %_libdir/wx/config
 %_libdir/wx/include
+%endif
 
 %changelog

From 564bb5fb481120cf0f8d002fd7f6dfd7652a56a4d45625fde8026fb93329b455 Mon Sep 17 00:00:00 2001
From: Jan Engelhardt <jengelh@inai.de>
Date: Thu, 7 Jul 2022 16:13:52 +0000
Subject: [PATCH 5/6] Accepting request 987433 from
 home:polslinux:branches:X11:wxWidgets
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

- Update to version 3.2.0:
  All:
    * Build fixes for Unix systems using older Cairo or glibc versions.
    * Fix wxFileName::ReplaceHomeDir() when HOME=="/".
    * Fix wxLocale::IsAvailable(wxLANGUAGE_DEFAULT) regression.
    * Provide CMake config file for the library.
    * Add a 'revision' component to wxVersionInfo (Ronny Krüger).
  All (GUI):
    * Make loading bitmaps using BI_BITFIELDS work again.
    * Fix wxGenericListCtrl::GetColumnCount() for wxLC_LIST (Kvaz1r).
    * Fix refresh after calling wxGenericListCtrl::EnsureVisible() (taler21).
    * Add wxMenuItem::GetBitmapBundle().
    * Support additional wxWizard properties in XRC (Randalphwa).
  wxGTK:
    * Fix wxDC::Blit() and wxBitmap::GetSubBitmap() with HiDPI bitmaps.
    * Fix TAB navigation in wxSimplebook (Adrian Lopez).
    * Support wxINVERT logical operation on wxDC with white source colour.
    * Don't assert in wxGtkImage (used in e.g. wxToolBar) when bitmap is missing.
    * Fix wxListBox selection colors with non-default background (alilie).
    * Fix wxCURSOR_SIZING with Wayland.
    * Recognize modern versions of GNOME in GetDesktopEnvironment() (Ulrich Telle).
- Drop 0001-Add-new-wx-filedlgcustomize.h-to-the-list-of-files.patch

OBS-URL: https://build.opensuse.org/request/show/987433
OBS-URL: https://build.opensuse.org/package/show/X11:wxWidgets/wxWidgets-3_2?expand=0&rev=93
---
 ...edlgcustomize.h-to-the-list-of-files.patch | 66 -------------------
 soversion.diff                                | 26 ++++----
 wxWidgets-3.1.7.tar.bz2                       |  3 -
 wxWidgets-3.2.0.tar.bz2                       |  3 +
 wxWidgets-3_2.changes                         | 26 ++++++++
 wxWidgets-3_2.spec                            | 17 ++---
 6 files changed, 49 insertions(+), 92 deletions(-)
 delete mode 100644 0001-Add-new-wx-filedlgcustomize.h-to-the-list-of-files.patch
 delete mode 100644 wxWidgets-3.1.7.tar.bz2
 create mode 100644 wxWidgets-3.2.0.tar.bz2

diff --git a/0001-Add-new-wx-filedlgcustomize.h-to-the-list-of-files.patch b/0001-Add-new-wx-filedlgcustomize.h-to-the-list-of-files.patch
deleted file mode 100644
index 0e95e86..0000000
--- a/0001-Add-new-wx-filedlgcustomize.h-to-the-list-of-files.patch
+++ /dev/null
@@ -1,66 +0,0 @@
-From 5f1c1e9eb6856c92bbba242f854baab18b9ff566 Mon Sep 17 00:00:00 2001
-From: Vadim Zeitlin <vadim@wxwidgets.org>
-Date: Sat, 11 Jun 2022 15:13:38 +0200
-Subject: [PATCH] Add new wx/filedlgcustomize.h to the list of files
-
-Notably install it together with the other headers.
-
-Closes #22516.
----
- Makefile.in                       |  1 +
- build/bakefiles/files.bkl         |  1 +
- build/cmake/files.cmake           |  1 +
- build/files                       |  1 +
- 4 files changed, 4 insertions(+)
-
-diff --git a/Makefile.in b/Makefile.in
-index 9c3919ffaa..65ee6e1817 100644
---- a/Makefile.in
-+++ b/Makefile.in
-@@ -4063,6 +4063,7 @@ COND_USE_GUI_1_ALL_GUI_HEADERS =  \
- 	wx/generic/creddlgg.h \
- 	wx/creddlg.h \
- 	wx/bmpbndl.h \
-+	wx/filedlgcustomize.h \
- 	$(LOWLEVEL_HDR) \
- 	$(GUI_CORE_HEADERS) \
- 	wx/mediactrl.h \
-diff --git a/build/bakefiles/files.bkl b/build/bakefiles/files.bkl
-index 0b16b7d632..5007c6ab97 100644
---- a/build/bakefiles/files.bkl
-+++ b/build/bakefiles/files.bkl
-@@ -1310,6 +1310,7 @@ IMPORTANT: please read docs/tech/tn0016.txt before modifying this file!
-     wx/generic/creddlgg.h
-     wx/creddlg.h
-     wx/bmpbndl.h
-+    wx/filedlgcustomize.h
- </set>
- 
- <!-- ====================================================================== -->
-diff --git a/build/cmake/files.cmake b/build/cmake/files.cmake
-index 8c9bcf58b5..0b5ea94dcf 100644
---- a/build/cmake/files.cmake
-+++ b/build/cmake/files.cmake
-@@ -1213,6 +1213,7 @@ set(GUI_CMN_HDR
-     wx/generic/creddlgg.h
-     wx/generic/animate.h
-     wx/bmpbndl.h
-+    wx/filedlgcustomize.h
- )
- 
- set(UNIX_SRC
-diff --git a/build/files b/build/files
-index ca7e119b61..e918da31ba 100644
---- a/build/files
-+++ b/build/files
-@@ -1017,6 +1017,7 @@ GUI_CMN_HDR =
-     wx/fdrepdlg.h
-     wx/filectrl.h
-     wx/filedlg.h
-+    wx/filedlgcustomize.h
-     wx/filehistory.h
-     wx/filepicker.h
-     wx/fmappriv.h
--- 
-2.36.1
-
diff --git a/soversion.diff b/soversion.diff
index 6eb14e8..f198eb8 100644
--- 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.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
+diff -ru wx317/build/aclocal/bakefile.m4 wx320/build/aclocal/bakefile.m4
+--- wx317/build/aclocal/bakefile.m4	2022-07-06 16:19:50.000000000 +0200
++++ wx320/build/aclocal/bakefile.m4	2022-07-07 11:43:18.218792711 +0200
 @@ -408,8 +408,7 @@
              SONAME_FLAG="-Wl,-soname,"
          fi
@@ -25,10 +25,10 @@ diff -Nur wxWidgets-3.1.7/build/aclocal/bakefile.m4 new/build/aclocal/bakefile.m
        ;;
  
        *-*-solaris2* )
-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 @@
+diff -ru wx317/Makefile.in wx320/Makefile.in
+--- wx317/Makefile.in	2022-07-06 16:19:50.000000000 +0200
++++ wx320/Makefile.in	2022-07-07 11:45:22.215445509 +0200
+@@ -2225,6 +2225,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,20 +36,20 @@ diff -Nur wxWidgets-3.1.7/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
-@@ -2237,7 +2238,7 @@
+@@ -2236,7 +2237,7 @@
  @COND_PLATFORM_WIN32_0@WXDLLNAMEPREFIXGUI = wx_$(PORTNAME)$(WXUNIVNAME)
  @COND_PLATFORM_WIN32_1@WXDLLNAMEPREFIXGUI = \
- @COND_PLATFORM_WIN32_1@	wx$(PORTNAME)$(WXUNIVNAME)$(WX_VERSION_NODOT)
+ @COND_PLATFORM_WIN32_1@	wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)
 -@COND_PLATFORM_WIN32_0@WXDLLVERSIONTAG = -$(WX_RELEASE)
-+@COND_PLATFORM_WIN32_0@WXDLLVERSIONTAG =
++@COND_PLATFORM_WIN32_0@WXDLLVERSIONTAG = 
  @COND_PLATFORM_WIN32_1@WXDLLVERSIONTAG = 
  COND_wxUSE_REGEX_builtin___wxregex___depname = \
  	$(LIBDIRNAME)/$(LIBPREFIX)wxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)-$(WX_RELEASE)$(HOST_SUFFIX)$(LIBEXT)
 @@ -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_PLATFORM_MACOSX_1_USE_SOVERSION_1@	= .0.0.0.$(SO_SUFFIX)
+ @COND_USE_SOVERCYGWIN_1_USE_SOVERSION_1@dll___targetsuf3 = -0.$(SO_SUFFIX)
  @COND_USE_SOVERSION_0@dll___targetsuf3 = .$(SO_SUFFIX)
--@COND_USE_SOVERSION_1_USE_SOVERSOLARIS_1@dll___targetsuf3 = .$(SO_SUFFIX).7
+-@COND_USE_SOVERSION_1_USE_SOVERSOLARIS_1@dll___targetsuf3 = .$(SO_SUFFIX).0
 +@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)
diff --git a/wxWidgets-3.1.7.tar.bz2 b/wxWidgets-3.1.7.tar.bz2
deleted file mode 100644
index 32307c6..0000000
--- a/wxWidgets-3.1.7.tar.bz2
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:3d666e47d86192f085c84089b850c90db7a73a5d26b684b617298d89dce84f19
-size 25380640
diff --git a/wxWidgets-3.2.0.tar.bz2 b/wxWidgets-3.2.0.tar.bz2
new file mode 100644
index 0000000..9251024
--- /dev/null
+++ b/wxWidgets-3.2.0.tar.bz2
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:356e9b55f1ae3d58ae1fed61478e9b754d46b820913e3bfbc971c50377c1903a
+size 25296814
diff --git a/wxWidgets-3_2.changes b/wxWidgets-3_2.changes
index a24052a..a46bda7 100644
--- a/wxWidgets-3_2.changes
+++ b/wxWidgets-3_2.changes
@@ -1,3 +1,29 @@
+-------------------------------------------------------------------
+Thu Jul  7 09:40:20 UTC 2022 - Paolo Stivanin <info@paolostivanin.com>
+
+- Update to version 3.2.0:
+  All:
+    * Build fixes for Unix systems using older Cairo or glibc versions.
+    * Fix wxFileName::ReplaceHomeDir() when HOME=="/".
+    * Fix wxLocale::IsAvailable(wxLANGUAGE_DEFAULT) regression.
+    * Provide CMake config file for the library.
+    * Add a 'revision' component to wxVersionInfo (Ronny Krüger).
+  All (GUI):
+    * Make loading bitmaps using BI_BITFIELDS work again.
+    * Fix wxGenericListCtrl::GetColumnCount() for wxLC_LIST (Kvaz1r).
+    * Fix refresh after calling wxGenericListCtrl::EnsureVisible() (taler21).
+    * Add wxMenuItem::GetBitmapBundle().
+    * Support additional wxWizard properties in XRC (Randalphwa).
+  wxGTK:
+    * Fix wxDC::Blit() and wxBitmap::GetSubBitmap() with HiDPI bitmaps.
+    * Fix TAB navigation in wxSimplebook (Adrian Lopez).
+    * Support wxINVERT logical operation on wxDC with white source colour.
+    * Don't assert in wxGtkImage (used in e.g. wxToolBar) when bitmap is missing.
+    * Fix wxListBox selection colors with non-default background (alilie).
+    * Fix wxCURSOR_SIZING with Wayland.
+    * Recognize modern versions of GNOME in GetDesktopEnvironment() (Ulrich Telle).
+- Drop 0001-Add-new-wx-filedlgcustomize.h-to-the-list-of-files.patch
+
 -------------------------------------------------------------------
 Sun Jun 26 17:37:54 UTC 2022 - Stefan Brüns <stefan.bruens@rwth-aachen.de>
 
diff --git a/wxWidgets-3_2.spec b/wxWidgets-3_2.spec
index af5377c..76ad03e 100644
--- a/wxWidgets-3_2.spec
+++ b/wxWidgets-3_2.spec
@@ -69,10 +69,9 @@ Name:           wxQt-3_2
 %define wx_debug %nil
 %define psonum 7_0_0
 %define sonum 7.0.0
-Version:        3.1.7
+Version:        3.2.0
 Release:        0
-%define wx_minor 3.1
-%define wx_micro 3.1.7
+%define wx_minor 3.2
 Summary:        C++ Library for Cross-Platform Development
 License:        LGPL-2.1-or-later WITH WxWindows-exception-3.1
 Group:          Development/Libraries/C and C++
@@ -84,8 +83,6 @@ Source5:        wxWidgets-3_2-rpmlintrc
 # identify and backport wxPython fixes to wxWidgets.
 Source6:        wxpython-mkdiff.sh
 Patch1:         soversion.diff
-# PATCH-FIX-UPSTREAM
-Patch2:         0001-Add-new-wx-filedlgcustomize.h-to-the-list-of-files.patch
 %if "%{flavor}" == "doc"
 BuildRequires:  doxygen
 BuildRequires:  fdupes
@@ -447,7 +444,7 @@ export VENDORTAG='-$variant' # only needed for non-MSW
 %if !%base_packages
 # Drop libraries already supplied by another packages
 rm -fv "%buildroot/%_libdir"/libwx_baseu*.so* \
-	"%buildroot/%_libdir/wx/%wx_micro"/sound_sdlu-*.so
+	"%buildroot/%_libdir/wx/%wx_minor"/sound_sdlu-*.so
 %endif
 rm -Rfv %buildroot/%_datadir/locale
 
@@ -566,8 +563,8 @@ pushd tests
 %files -n libwx_%{toolkit}u_webview-%variant%psonum
 %_libdir/libwx_%{toolkit}u_webview-%variant.so.%{sonum}*
 %dir %_libdir/wx
-%dir %_libdir/wx/%wx_micro
-%_libdir/wx/%wx_micro/web-extensions/
+%dir %_libdir/wx/%wx_minor
+%_libdir/wx/%wx_minor/web-extensions/
 %endif
 
 %files -n libwx_%{toolkit}u_xrc-%variant%psonum
@@ -577,8 +574,8 @@ pushd tests
 %if "%flavor" != "GTK3-nostl"
 %files -n %{base_name}-plugin-sound_sdlu-3_2
 %dir %_libdir/wx
-%dir %_libdir/wx/%wx_micro
-%_libdir/wx/%wx_micro/sound_sdlu-%wx_micro.so
+%dir %_libdir/wx/%wx_minor
+%_libdir/wx/%wx_minor/sound_sdlu-%wx_minor.so
 %endif
 %endif
 

From fdb1292811b194d33f7105876df50427a177cb3e781570b398418b6628d26929 Mon Sep 17 00:00:00 2001
From: Jan Engelhardt <jengelh@inai.de>
Date: Thu, 7 Jul 2022 16:56:00 +0000
Subject: [PATCH 6/6] bump sover to suse8

OBS-URL: https://build.opensuse.org/package/show/X11:wxWidgets/wxWidgets-3_2?expand=0&rev=94
---
 soversion.diff     | 8 ++++----
 wxWidgets-3_2.spec | 4 ++--
 2 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/soversion.diff b/soversion.diff
index f198eb8..40a8e01 100644
--- a/soversion.diff
+++ b/soversion.diff
@@ -9,8 +9,8 @@ In addition, because wxWidgets changes the ABI midway (for example,
 did so between 3.0.1 and 3.0.2) without changing the SONAME, we have
 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.
+One needs to look at the diff between versions. If in doubt, just
+always bump.
 
 diff -ru wx317/build/aclocal/bakefile.m4 wx320/build/aclocal/bakefile.m4
 --- wx317/build/aclocal/bakefile.m4	2022-07-06 16:19:50.000000000 +0200
@@ -41,7 +41,7 @@ diff -ru wx317/Makefile.in wx320/Makefile.in
  @COND_PLATFORM_WIN32_1@WXDLLNAMEPREFIXGUI = \
  @COND_PLATFORM_WIN32_1@	wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)
 -@COND_PLATFORM_WIN32_0@WXDLLVERSIONTAG = -$(WX_RELEASE)
-+@COND_PLATFORM_WIN32_0@WXDLLVERSIONTAG = 
++@COND_PLATFORM_WIN32_0@WXDLLVERSIONTAG =
  @COND_PLATFORM_WIN32_1@WXDLLVERSIONTAG = 
  COND_wxUSE_REGEX_builtin___wxregex___depname = \
  	$(LIBDIRNAME)/$(LIBPREFIX)wxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)-$(WX_RELEASE)$(HOST_SUFFIX)$(LIBEXT)
@@ -50,7 +50,7 @@ diff -ru wx317/Makefile.in wx320/Makefile.in
  @COND_USE_SOVERCYGWIN_1_USE_SOVERSION_1@dll___targetsuf3 = -0.$(SO_SUFFIX)
  @COND_USE_SOVERSION_0@dll___targetsuf3 = .$(SO_SUFFIX)
 -@COND_USE_SOVERSION_1_USE_SOVERSOLARIS_1@dll___targetsuf3 = .$(SO_SUFFIX).0
-+@COND_USE_SOVERSION_1_USE_SOVERSOLARIS_1@dll___targetsuf3 = .$(SO_SUFFIX).7.0.0
++@COND_USE_SOVERSION_1_USE_SOVERSOLARIS_1@dll___targetsuf3 = .$(SO_SUFFIX).8.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 \
diff --git a/wxWidgets-3_2.spec b/wxWidgets-3_2.spec
index 76ad03e..e817d6e 100644
--- a/wxWidgets-3_2.spec
+++ b/wxWidgets-3_2.spec
@@ -67,8 +67,8 @@ Name:           wxQt-3_2
 # Use default debug level, enabling exceptions
 # Other valid values: yes/no/max
 %define wx_debug %nil
-%define psonum 7_0_0
-%define sonum 7.0.0
+%define psonum 8_0_0
+%define sonum 8.0.0
 Version:        3.2.0
 Release:        0
 %define wx_minor 3.2