$ git diff --patch-with-stat --summary bb895a6f17a6af431794c3fbd3b1e4535b389ae5..5244db8664faef560fb00a4640a447f6c090d03b

 .abf.yml                           |  2 +-
 wxGTK3-3.0.3-abicheck.patch        | 16 +++++++++-------
 wxwidgets-3.2.4-fix-autoconf.patch | 32 ++++++++++++++++++++++++++++++++
 wxwidgets.spec                     | 32 ++++++++++++++++++++------------
 4 files changed, 62 insertions(+), 20 deletions(-)
 create mode 100644 wxwidgets-3.2.4-fix-autoconf.patch

diff --git a/.abf.yml b/.abf.yml
index 3850cbf..5506de9 100644
--- a/.abf.yml
+++ b/.abf.yml
@@ -1,3 +1,3 @@
 sources:
   catch.tar.gz: 10663da885912127f95ed81b994225fcaf9675ba
-  wxWidgets-3.1.5.tar.bz2: 725455d6324baa808259b56a42199237327e0638
+  wxWidgets-3.2.4.tar.bz2: 1fa54302c7ef6c86fa4311d303abd79a85b127a5
diff --git a/wxGTK3-3.0.3-abicheck.patch b/wxGTK3-3.0.3-abicheck.patch
index 03ddcd5..1c4e618 100644
--- a/wxGTK3-3.0.3-abicheck.patch
+++ b/wxGTK3-3.0.3-abicheck.patch
@@ -1,14 +1,16 @@
---- wxWidgets-3.0.2/src/common/appbase.cpp.abicheck	2015-05-28 12:36:40.697163073 +0900
-+++ wxWidgets-3.0.2/src/common/appbase.cpp	2015-05-28 12:38:30.597154298 +0900
-@@ -762,10 +762,7 @@
-         msg.Printf(wxT("Mismatch between the program and library build versions detected.\nThe library used %s,\nand %s used %s."),
-                    lib.c_str(), progName.c_str(), prog.c_str());
+diff -up wxWidgets-3.1.6/src/common/appbase.cpp.abicheck wxWidgets-3.1.6/src/common/appbase.cpp
+--- wxWidgets-3.1.6/src/common/appbase.cpp.abicheck	2022-04-04 09:41:33.000000000 -0400
++++ wxWidgets-3.1.6/src/common/appbase.cpp	2022-04-04 19:14:33.883814729 -0400
+@@ -843,11 +843,8 @@ bool wxAppConsoleBase::CheckBuildOptions
+         wxString prog = wxString::FromAscii(optionsSignature);
+         wxString progName = wxString::FromAscii(componentName);
  
--        wxLogFatalError(msg.c_str());
+-        wxLogFatalError(wxT("Mismatch between the program and library build versions detected.\nThe library used %s,\nand %s used %s."),
++        wxLogWarning(wxT("Mismatch between the program and library build versions detected.\nThe library used %s,\nand %s used %s."),
+                         lib, progName, prog);
 -
 -        // normally wxLogFatalError doesn't return
 -        return false;
-+        wxLogWarning(msg.c_str());
      }
  
      return true;
diff --git a/wxwidgets-3.2.4-fix-autoconf.patch b/wxwidgets-3.2.4-fix-autoconf.patch
new file mode 100644
index 0000000..a4423de
--- /dev/null
+++ b/wxwidgets-3.2.4-fix-autoconf.patch
@@ -0,0 +1,32 @@
+diff -up wxWidgets-3.2.4/configure.in.omv~ wxWidgets-3.2.4/configure.in
+--- wxWidgets-3.2.4/configure.in.omv~	2024-04-01 17:00:56.979021661 +0200
++++ wxWidgets-3.2.4/configure.in	2024-04-01 17:01:28.103366758 +0200
+@@ -6247,7 +6247,7 @@ AC_CHECK_FUNCS(gettimeofday ftime, break
+ 
+ if test "$ac_cv_func_gettimeofday" = "yes"; then
+     AC_CACHE_CHECK([whether gettimeofday takes two arguments],
+-                   wx_cv_func_gettimeofday_has_2_args,
++                   [wx_cv_func_gettimeofday_has_2_args],
+     [
+         dnl on some _really_ old systems it takes only 1 argument
+         AC_TRY_COMPILE(
+@@ -6259,8 +6259,8 @@ if test "$ac_cv_func_gettimeofday" = "ye
+                 struct timeval tv;
+                 gettimeofday(&tv, NULL);
+             ],
+-            wx_cv_func_gettimeofday_has_2_args=yes,
+-            AC_TRY_COMPILE(
++            [wx_cv_func_gettimeofday_has_2_args=yes],
++            [AC_TRY_COMPILE(
+                 [
+                     #include <sys/time.h>
+                     #include <unistd.h>
+@@ -6274,7 +6274,7 @@ if test "$ac_cv_func_gettimeofday" = "ye
+                     AC_MSG_WARN([failed to determine number of gettimeofday() arguments])
+                     wx_cv_func_gettimeofday_has_2_args=unknown
+                 ]
+-            )
++            )]
+         )
+     ])
+ 
diff --git a/wxwidgets.spec b/wxwidgets.spec
index d5e6f5c..dc8c93b 100644
--- a/wxwidgets.spec
+++ b/wxwidgets.spec
@@ -10,7 +10,7 @@
 %define oname	wxWidgets
 
 %define api	%(echo %{version} |cut -d. -f1-2)
-%define major	%(echo %{version} |cut -d. -f3)
+%define major	0
 %define apind	%(echo %{api} |tr -d .)
 %define dev	%mklibname wxu %{api} -d
 %define qtdev	%mklibname wxqtu %{api} -d
@@ -21,8 +21,8 @@
 
 Summary:        The Wx widgets library
 Name:           wxwidgets
-Version:        3.1.5
-Release:        1
+Version:        3.2.4
+Release:        3
 License:        wxWidgets Library Licence
 Group:          System/Libraries
 URL:            http://www.wxwidgets.org/
@@ -34,8 +34,12 @@ Patch1:         wxWidgets-2.9.5-multiarch-includes.patch
 Patch2:         wxWidgets-3.0.4-collision.patch
 # From Fedora
 Patch3:		wxGTK3-3.0.3-abicheck.patch
+# OM
 Patch4:		wxwidgets-3.1.5-qt-flags.patch
+Patch5:		wxwidgets-3.2.4-fix-autoconf.patch
 
+BuildRequires:	gettext
+BuildRequires:	which
 #BuildRequires:  bakefile
 BuildRequires:  pkgconfig(libjpeg)
 BuildRequires:	jbig-devel
@@ -55,7 +59,7 @@ BuildRequires:	pkgconfig(Qt5Test)
 %endif
 %if %{with gtk}
 BuildRequires:  pkgconfig(gtk+-3.0)
-BuildRequires:  pkgconfig(webkit2gtk-4.0)
+BuildRequires:  pkgconfig(webkit2gtk-4.1)
 %endif
 %if %{with wine}
 BuildRequires:	wine-devel
@@ -172,8 +176,8 @@ done)}
 %%files -n %%{libname$lib}
 %{_libdir}/lib$lib-%{api}.so.%{major}{,.*}
 %if "$lib" == "wx_gtk3u_webview"
-%dir %{_libdir}/wx/%{version}/web-extensions/
-%{_libdir}/wx/%{version}/web-extensions/webkit2_extu-%{version}.so
+%dir %{_libdir}/wx/%{api}/web-extensions/
+%{_libdir}/wx/%{api}/web-extensions/webkit2_extu-%{api}.so
 %endif
 EOF
 done)}
@@ -254,6 +258,8 @@ sed -i -e 's|/lib|/%{_lib}|' src/unix/stdpaths.cpp
 
 find samples demos -name .cvsignore -delete
 
+# Modern autoconf no longer sets $EGREP
+sed -i -e 's,\$EGREP,grep -E,g' configure.in
 aclocal --force -I$PWD/build/aclocal
 autoconf -f
 libtoolize --copy --force
@@ -539,6 +545,8 @@ CC="%{__cc}" CXX="%{__cxx}" ../configure \
 cd ..
 %endif
 
+find . -name Makefile |xargs sed -i -e 's|--version-script|--undefined-version,--version-script|g'
+
 %build
 %if %{with gtk}
 %make_build -C build-gtk
@@ -561,13 +569,13 @@ cd ..
 
 #gw prepare samples
 pushd build-qt/demos
-        make clean
-        rm -f makefile* demos.bkl
+	make clean
+	rm -f makefile* demos.bkl
 popd
 
 pushd build-qt/samples
-        make clean
-        rm -f makefile* samples.bkl
+	make clean
+	rm -f makefile* samples.bkl
 popd
 
 find build-qt/demos build-qt/samples -name Makefile|xargs perl -pi -e 's^CXXC =.*^CXXC=\$(CXX) `wx-config --cflags`^'
@@ -642,7 +650,7 @@ fi
 %ghost %{_bindir}/wx-config
 %ghost %{_bindir}/wx-config-%{api}
 %ghost %{_bindir}/wxrc
-%ghost %{_bindir}/wxrc-%{api}
+%{_bindir}/wxrc-%{api}
 %{_includedir}/wx-%{api}/
 %if %{with qt}
 %exclude %{_includedir}/wx-%{api}/wx/qt
@@ -661,7 +669,7 @@ fi
 %{_libdir}/libwx_baseu_xml-%{api}.so
 %{_datadir}/bakefile/presets/wx*
 %{_datadir}/aclocal/wxwin%{apind}.m4
-%{_libdir}/wx/%{version}/sound_sdlu-%{version}.so
+%{_libdir}/wx/%{api}/sound_sdlu-%{api}.so
 
 %if %{with qt}
 %files -n %{qtdev}