From a41a4de1c4f4cad02361853eda79ad2088887683f133fe80410ce57a5d9efb87 Mon Sep 17 00:00:00 2001 From: Jan Engelhardt Date: Thu, 4 May 2023 07:44:14 +0000 Subject: [PATCH] Accepting request 1083535 from home:1Antoine1:branches:X11:wxWidgets Enable wxWebRequest. From 3.1.5 changelog: > New wxWebRequest and related classes provide a simple way to > use HTTPS and HTTP/2 from wxWidgets applications using native > libraries or libcurl. Introduced in 3.1.5 but wasn't built until now. Apparently, no package in Factory depend on it yet. Noticed this when trying to update package golly (not in Factory, just in Education) whose last version seems to use this feature. Not sure if I correctly updated the soversion, please let me know if something's wrong. The new symbols are in libwx_baseu_net-suse. OBS-URL: https://build.opensuse.org/request/show/1083535 OBS-URL: https://build.opensuse.org/package/show/X11:wxWidgets/wxWidgets-3_2?expand=0&rev=103 --- soversion.diff | 2 +- wxWidgets-3_2.changes | 5 +++++ wxWidgets-3_2.spec | 8 ++++++-- 3 files changed, 12 insertions(+), 3 deletions(-) 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