diff --git a/soversion.diff b/soversion.diff index dc8135c..9f8ab22 100644 --- a/soversion.diff +++ b/soversion.diff @@ -52,7 +52,7 @@ Index: wxWidgets-3.2.1/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).8.0.0 ++@COND_USE_SOVERSION_1_USE_SOVERSOLARIS_1@dll___targetsuf3 = .$(SO_SUFFIX).8.1.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.changes b/wxWidgets-3_2.changes index 182ee39..f0d5003 100644 --- a/wxWidgets-3_2.changes +++ b/wxWidgets-3_2.changes @@ -1,3 +1,8 @@ +------------------------------------------------------------------- +Thu Apr 27 22:50:58 UTC 2023 - Antoine Belvire + +- Enable wxWebRequest. + ------------------------------------------------------------------- Tue Apr 18 13:54:45 UTC 2023 - Antoine Belvire diff --git a/wxWidgets-3_2.spec b/wxWidgets-3_2.spec index 2e89af0..9ce7497 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 8_0_0 -%define sonum 8.0.0 +%define psonum 8_1_0 +%define sonum 8.1.0 Version: 3.2.2.1 Release: 0 %define wx_minor 3.2 @@ -94,6 +94,7 @@ BuildRequires: gcc-c++ BuildRequires: gstreamer-devel BuildRequires: gstreamer-plugins-base-devel BuildRequires: libSM-devel +BuildRequires: libcurl-devel BuildRequires: libexpat-devel BuildRequires: libjpeg-devel BuildRequires: libmspack-devel @@ -420,6 +421,7 @@ autoconf -f -i %{wx_debug:--enable-debug=%{wx_debug}} \ --enable-repro-build \ --disable-glcanvasegl \ + --enable-webrequest \ %if "%flavor" == "GTK3-nostl" --disable-stl \ --disable-plugins @@ -456,6 +458,8 @@ ln -sf $(echo %buildroot/%_libdir/wx/config/* | sed "s%%%buildroot%%%%") %buildr %if "%{flavor}" != "doc" %make_build -C tests all pushd tests +# Disable webrequest tests requiring network access +export WX_TEST_WEBREQUEST_URL=0 # Non-gui tests ./test -l || true # ExecTestCase depends on xclock, and is fragile