.gitignore

@@ -1 +1 @@
-SOURCES/wxWidgets-3.2.5.tar.bz2
+SOURCES/wxWidgets-3.2.2.1.tar.bz2

.wxGTK.metadata

@@ -1 +1 @@
-4ffee63f4109cafe98b82b44adec6ed9a4e4ad1e  SOURCES/wxWidgets-3.2.5.tar.bz2
+d645cacbf2678cfc402ae163f2b0e0b05be5d239  SOURCES/wxWidgets-3.2.2.1.tar.bz2

SOURCES/tests-no-deprecated-copy-dtor.patch

@@ -1,14 +0,0 @@
-diff --git a/tests/allheaders.cpp b/tests/allheaders.cpp
-index ae0957dd78..e1a462435c 100644
---- a/tests/allheaders.cpp
-+++ b/tests/allheaders.cpp
-@@ -129,9 +129,6 @@
- #endif // 4.7
- #if CHECK_GCC_VERSION(9,1)
-     GCC_TURN_ON(deprecated-copy)
--#endif // 9.1
--#if CHECK_GCC_VERSION(9,1)
--    GCC_TURN_ON(deprecated-copy-dtor)
- #endif // 9.1
-     GCC_TURN_ON(disabled-optimization)
-     GCC_TURN_ON(double-promotion)

SPECS/wxGTK.spec

@@ -4,10 +4,10 @@
 %global sover 0
 
 Name:           wxGTK
-Version:        3.2.5
-Release:        4%{?dist}
+Version:        3.2.2.1
+Release:        1%{?dist}
 Summary:        GTK port of the wxWidgets GUI library
-License:        LGPL-2.0-or-later WITH WxWindows-exception-3.1
+License:        wxWidgets
 URL:            https://www.wxwidgets.org/
 
 Source0:        https://github.com/%{srcname}/%{srcname}/releases/download/v%{version}/%{srcname}-%{version}.tar.bz2
@@ -16,13 +16,11 @@ Source10:       wx-config
 # remove abort when ABI check fails
 # Backport from wxGTK
 Patch0:         %{name}-3.1.6-abicheck.patch
-Patch1:         tests-no-deprecated-copy-dtor.patch
 
 BuildRequires: make
 BuildRequires:  gcc-c++
 BuildRequires:  gtk3-devel
-BuildRequires:  autoconf
-BuildRequires:  webkit2gtk4.1-devel
+BuildRequires:  webkit2gtk3-devel
 BuildRequires:  zlib-devel
 BuildRequires:  libpng-devel
 BuildRequires:  libjpeg-devel
@@ -31,7 +29,8 @@ BuildRequires:  expat-devel
 BuildRequires:  SDL2-devel
 BuildRequires:  libGLU-devel
 BuildRequires:  libSM-devel
-BuildRequires:  gstreamer1-plugins-bad-free-devel
+BuildRequires:  gstreamer1-plugins-base-devel
+BuildRequires:  GConf2-devel
 BuildRequires:  gettext
 BuildRequires:  cppunit-devel
 BuildRequires:  libmspack-devel
@@ -47,22 +46,6 @@ BuildRequires:  xorg-x11-server-Xvfb
 BuildRequires:  python3-httpbin
 BuildRequires:  vulkan-loader
 
-# Can be removed in Fedora 42
-Provides:       wxGTK3 = %version-%{release}
-Obsoletes:      wxGTK3 < %version-%{release}
-Obsoletes:      compat-wxGTK3-gtk2 < %version-%{release}
-Obsoletes:      compat-wxGTK3-gtk2-devel < %version-%{release}
-Obsoletes:      compat-wxGTK3-gtk2-gl < %version-%{release}
-Obsoletes:      compat-wxGTK3-gtk2-media < %version-%{release}
-Obsoletes:      wxBase3 < %version-%{release}
-Obsoletes:      wxBase3-devel < %version-%{release}
-Obsoletes:      wxGTK3-devel < %version-%{release}
-Obsoletes:      wxGTK3-docs < %version-%{release}
-Obsoletes:      wxGTK3-gl < %version-%{release}
-Obsoletes:      wxGTK3-i18n < %version-%{release}
-Obsoletes:      wxGTK3-media < %version-%{release}
-Obsoletes:      wxGTK3-webview < %version-%{release}
-
 Provides:       %{srcname} = %{version}-%{release}
 Provides:       bundled(scintilla) = 3.7.2
 Requires:       %{wxbasename}%{?_isa} = %{version}-%{release}
@@ -188,10 +171,6 @@ sed -i -e 's|aclocal)|aclocal/wxwin32.m4)|' Makefile.in
 sed -i -e 's|/usr/lib\b|%{_libdir}|' wx-config.in configure
 sed -i -e 's|/lib|/%{_lib}|' src/unix/stdpaths.cpp
 
-# Since we're currently patching configure.in
-rm -f configure
-./autogen.sh
-
 
 %build
 %global _configure ../configure
@@ -203,7 +182,6 @@ pushd %{gtk3dir}
   --with-opengl \
   --with-sdl \
   --with-libmspack \
-  --with-liblzma \
   --enable-intl \
   --disable-rpath \
   --disable-glcanvasegl \
@@ -249,9 +227,6 @@ LD_LIBRARY_PATH=%{buildroot}%{_libdir} TZ=UTC wxUSE_XVFB=1 \
   WX_TEST_WEBREQUEST_URL="http://localhost:5000" xvfb-run -a ./test ~[.] \
 %ifarch s390x
   ~wxTextFile::Special ~wxFileName::GetSizeSpecial ~wxFile::Special \
-%endif
-%ifarch riscv64
-  ~wxTextFile::Special ~wxFile::Special ~URLTestCase::GetInputStream ~WebRequest::SSL::Error \
 %endif
   ~WebRequest::SSL::Ignore
 LD_LIBRARY_PATH=%{buildroot}%{_libdir} wxUSE_XVFB=1 xvfb-run -a \
@@ -261,9 +236,6 @@ LD_LIBRARY_PATH=%{buildroot}%{_libdir} wxUSE_XVFB=1 xvfb-run -a \
 %endif
 %ifarch s390x
   ~WebView \
-%endif
-%ifarch riscv64
-  ~TreeCtrlTestCase ~WebView ~wxImage::Paste \
 %endif
   ~wxHtmlPrintout::Pagination
 popd
@@ -342,60 +314,8 @@ fi
 %doc html
 
 %changelog
-* Thu Dec 26 2024 Dmitriy Samoylik <samoylikdv@msvsphere-os.ru> - 3.2.5-4
-- Rebuilt for MSVSphere 10
-
-* Wed Sep 11 2024 Scott Talbert <swt@techie.net> - 3.2.5-4
-- Add more wxGTK3 Obsoletes
-
-* Wed Jul 31 2024 Scott Talbert <swt@techie.net> - 3.2.5-3
-- Update License tag to use SPDX identifiers
-
-* Sat Jul 20 2024 Fedora Release Engineering <releng@fedoraproject.org> - 3.2.5-2
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_41_Mass_Rebuild
-
-* Sat May 18 2024 Scott Talbert <swt@techie.net> - 3.2.5-1
-- Update to new upstream release 3.2.5
-
-* Wed Feb 21 2024 David Abdurachmanov <davidlt@rivosinc.com> - 3.2.4-7
-- Skip failing tests on riscv64
-
-* Fri Feb 16 2024 Scott Talbert <swt@techie.net> - 3.2.4-6
-- Fix FTBFS with autoconf 2.72 (#2264449)
-
-* Sun Feb 04 2024 Scott Talbert <swt@techie.net> - 3.2.4-5
-- Enable wxLZMAInputStream (#2258458)
-
-* Wed Jan 31 2024 Scott Talbert <swt@techie.net> - 3.2.4-4
-- Fix FTBFS w/ GCC 14 (#2261535)
-- Fix FTBFS w/ WebKitGTK 2.43
-
-* Fri Jan 26 2024 Scott Talbert <swt@techie.net> - 3.2.4-3
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild
-
-* Sun Dec 10 2023 Scott Talbert <swt@techie.net> - 3.2.4-2
-- Rebuild wxMediaCtrl with gstplayer for Wayland support
-
-* Thu Nov 16 2023 Scott Talbert <swt@techie.net> - 3.2.4-1
-- Update to new upstream release 3.2.4
-
-* Wed Oct 11 2023 Scott Talbert <swt@techie.net> - 3.2.3-1
-- Update to new upstream release 3.2.3
-
-* Mon Aug 21 2023 Scott Talbert <swt@techie.net> - 3.2.2.1-6
-- Rebuild with webkit2gtk4.1 (#2232979)
-
-* Tue Jul 25 2023 Scott Talbert <swt@techie.net> - 3.2.2.1-5
-- Make wxGetLinuxDistributionInfo work without lsb_release (#2184391)
-
-* Sat Jul 22 2023 Fedora Release Engineering <releng@fedoraproject.org> - 3.2.2.1-4
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_39_Mass_Rebuild
-
-* Mon Jun 19 2023 Scott Talbert <swt@techie.net> - 3.2.2.1-3
-- Remove unused BR on GConf2-devel (unused since before 3.0)
-
-* Fri Jun 16 2023 Scott Talbert <swt@techie.net> - 3.2.2.1-2
-- Fix WebView selection test with WebKit 2.40+
+* Sat Oct 05 2024 Arkady L. Shane <tigro@msvsphere-os.ru> - 3.2.2.1-1
+- Rebuilt for MSVSphere 9.4
 
 * Tue Feb 21 2023 Scott Talbert <swt@techie.net> - 3.2.2.1-1
 - Update to new upstream release 3.2.2.1 (#2170238)