forked from pool/wxWidgets-3_2
Accepting request 1084562 from X11:wxWidgets
- Enable wxWebRequest. OBS-URL: https://build.opensuse.org/request/show/1084562 OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/wxWidgets-3_2?expand=0&rev=22
This commit is contained in:
commit
c317060a99
@ -10,7 +10,7 @@ did so between 3.0.1 and 3.0.2) without changing the SONAME, we have
|
|||||||
to do it. As we have a vendor suffix, no filename conflicts can occur.
|
to do it. As we have a vendor suffix, no filename conflicts can occur.
|
||||||
|
|
||||||
One needs to look at the diff between versions. If in doubt, just
|
One needs to look at the diff between versions. If in doubt, just
|
||||||
always bump.
|
always bump, specifically(!) the SO major.
|
||||||
|
|
||||||
Index: wxWidgets-3.2.1/build/aclocal/bakefile.m4
|
Index: wxWidgets-3.2.1/build/aclocal/bakefile.m4
|
||||||
===================================================================
|
===================================================================
|
||||||
@ -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_SOVERCYGWIN_1_USE_SOVERSION_1@dll___targetsuf3 = -0.$(SO_SUFFIX)
|
||||||
@COND_USE_SOVERSION_0@dll___targetsuf3 = .$(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).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).9.0.0
|
||||||
@COND_TOOLKIT_MSW@__RCDEFDIR_p = --include-dir \
|
@COND_TOOLKIT_MSW@__RCDEFDIR_p = --include-dir \
|
||||||
@COND_TOOLKIT_MSW@ $(LIBDIRNAME)/wx/include/$(TOOLCHAIN_FULLNAME)
|
@COND_TOOLKIT_MSW@ $(LIBDIRNAME)/wx/include/$(TOOLCHAIN_FULLNAME)
|
||||||
@COND_USE_GUI_1_wxUSE_LIBTIFF_builtin@__LIB_TIFF_p \
|
@COND_USE_GUI_1_wxUSE_LIBTIFF_builtin@__LIB_TIFF_p \
|
||||||
|
@ -1,3 +1,8 @@
|
|||||||
|
-------------------------------------------------------------------
|
||||||
|
Thu Apr 27 22:50:58 UTC 2023 - Antoine Belvire <antoine.belvire@opensuse.org>
|
||||||
|
|
||||||
|
- Enable wxWebRequest.
|
||||||
|
|
||||||
-------------------------------------------------------------------
|
-------------------------------------------------------------------
|
||||||
Tue Apr 18 13:54:45 UTC 2023 - Antoine Belvire <antoine.belvire@opensuse.org>
|
Tue Apr 18 13:54:45 UTC 2023 - Antoine Belvire <antoine.belvire@opensuse.org>
|
||||||
|
|
||||||
|
@ -67,8 +67,8 @@ Name: wxQt-3_2
|
|||||||
# Use default debug level, enabling exceptions
|
# Use default debug level, enabling exceptions
|
||||||
# Other valid values: yes/no/max
|
# Other valid values: yes/no/max
|
||||||
%define wx_debug %nil
|
%define wx_debug %nil
|
||||||
%define psonum 8_0_0
|
%define psonum 9_0_0
|
||||||
%define sonum 8.0.0
|
%define sonum 9.0.0
|
||||||
Version: 3.2.2.1
|
Version: 3.2.2.1
|
||||||
Release: 0
|
Release: 0
|
||||||
%define wx_minor 3.2
|
%define wx_minor 3.2
|
||||||
@ -94,6 +94,7 @@ BuildRequires: gcc-c++
|
|||||||
BuildRequires: gstreamer-devel
|
BuildRequires: gstreamer-devel
|
||||||
BuildRequires: gstreamer-plugins-base-devel
|
BuildRequires: gstreamer-plugins-base-devel
|
||||||
BuildRequires: libSM-devel
|
BuildRequires: libSM-devel
|
||||||
|
BuildRequires: libcurl-devel
|
||||||
BuildRequires: libexpat-devel
|
BuildRequires: libexpat-devel
|
||||||
BuildRequires: libjpeg-devel
|
BuildRequires: libjpeg-devel
|
||||||
BuildRequires: libmspack-devel
|
BuildRequires: libmspack-devel
|
||||||
@ -420,6 +421,7 @@ autoconf -f -i
|
|||||||
%{wx_debug:--enable-debug=%{wx_debug}} \
|
%{wx_debug:--enable-debug=%{wx_debug}} \
|
||||||
--enable-repro-build \
|
--enable-repro-build \
|
||||||
--disable-glcanvasegl \
|
--disable-glcanvasegl \
|
||||||
|
--enable-webrequest \
|
||||||
%if "%flavor" == "GTK3-nostl"
|
%if "%flavor" == "GTK3-nostl"
|
||||||
--disable-stl \
|
--disable-stl \
|
||||||
--disable-plugins
|
--disable-plugins
|
||||||
@ -456,6 +458,8 @@ ln -sf $(echo %buildroot/%_libdir/wx/config/* | sed "s%%%buildroot%%%%") %buildr
|
|||||||
%if "%{flavor}" != "doc"
|
%if "%{flavor}" != "doc"
|
||||||
%make_build -C tests all
|
%make_build -C tests all
|
||||||
pushd tests
|
pushd tests
|
||||||
|
# Disable webrequest tests requiring network access
|
||||||
|
export WX_TEST_WEBREQUEST_URL=0
|
||||||
# Non-gui tests
|
# Non-gui tests
|
||||||
./test -l || true
|
./test -l || true
|
||||||
# ExecTestCase depends on xclock, and is fragile
|
# ExecTestCase depends on xclock, and is fragile
|
||||||
|
Loading…
Reference in New Issue
Block a user