Accepting request 987433 from home:polslinux:branches:X11:wxWidgets

- 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

0001-Add-new-wx-filedlgcustomize.h-to-the-list-of-files.patch

@@ -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
-

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
+diff -ru wx317/build/aclocal/bakefile.m4 wx320/build/aclocal/bakefile.m4
---- wxWidgets-3.1.7/build/aclocal/bakefile.m4	2022-06-07 22:02:56.047531296 +0200
+--- wx317/build/aclocal/bakefile.m4	2022-07-06 16:19:50.000000000 +0200
-+++ new/build/aclocal/bakefile.m4	2022-06-07 22:06:07.355539227 +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
+diff -ru wx317/Makefile.in wx320/Makefile.in
---- wxWidgets-3.1.7/Makefile.in	2022-06-07 22:04:21.491534839 +0200
+--- wx317/Makefile.in	2022-07-06 16:19:50.000000000 +0200
-+++ new/Makefile.in	2022-06-07 22:09:04.099546555 +0200
++++ wx320/Makefile.in	2022-07-07 11:45:22.215445509 +0200
-@@ -2226,6 +2226,7 @@
+@@ -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_PLATFORM_MACOSX_1_USE_SOVERSION_1@	= .0.0.0.$(SO_SUFFIX)
- @COND_USE_SOVERCYGWIN_1_USE_SOVERSION_1@dll___targetsuf3 = -7.$(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)

wxWidgets-3.1.7.tar.bz2

@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:3d666e47d86192f085c84089b850c90db7a73a5d26b684b617298d89dce84f19
-size 25380640

wxWidgets-3.2.0.tar.bz2

@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:356e9b55f1ae3d58ae1fed61478e9b754d46b820913e3bfbc971c50377c1903a
+size 25296814

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>
 

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_minor 3.2
-%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++
@@ -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
+%dir %_libdir/wx/%wx_minor
-%_libdir/wx/%wx_micro/web-extensions/
+%_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
+%dir %_libdir/wx/%wx_minor
-%_libdir/wx/%wx_micro/sound_sdlu-%wx_micro.so
+%_libdir/wx/%wx_minor/sound_sdlu-%wx_minor.so
 %endif
 %endif