Accepting request 405661 from home:jengelh:branches:Education

- Use wxWidgets 3.

It seems to build. Can you give it a spin?

OBS-URL: https://build.opensuse.org/request/show/405661
OBS-URL: https://build.opensuse.org/package/show/Education/espeakedit?expand=0&rev=5

espeakedit.spec

@@ -18,8 +18,6 @@
 
 %define _version %{version}-source
 #Fix ability to use wxcontainer instead of stl variant for WxWidgets
-%define _use_internal_dependency_generator 0
-%define __find_requires %{wx_requires}
 Name:           espeakedit
 Version:        1.48.03
 Release:        0
@@ -33,20 +31,12 @@ Source1:        espeakedit.1
 Patch1:         espeakedit-1.48.03-next-line.patch
 #PATCH-FIX-UPSTREAM marguerite@opensuse.org - fix narrowing conversion from int to char inside {} 
 Patch2:         espeakedit-1.48.03-gcc6.patch
+Patch3:         espeakedit-wx3.diff
 BuildRequires:  gcc-c++
 BuildRequires:  portaudio-devel
 BuildRequires:  pulseaudio-devel
 BuildRequires:  unzip
-BuildRequires:  wxWidgets-devel
-#To avoid library choise conflict: recomend to use -stl versions instead of -wxcontainer
-Requires:       libwx_baseu-2_8-0-stl
-Requires:       libwx_baseu-2_8_0-compat-lib-stl
-Requires:       libwx_gtk2u_adv-2_8-0-compat-lib-stl
-Requires:       libwx_gtk2u_core-2_8-0-compat-lib-stl
-Requires:       libwx_gtk2u_html-2_8-0-compat-lib-stl
-Requires:       wxWidgets-compat-lib-config
-Conflicts:      wxWidgets-ansi-compat-lib-config
-Conflicts:      wxWidgets-wxcontainer-compat-lib-config
+BuildRequires:  wxWidgets-devel >= 3
 BuildRoot:      %{_tmppath}/%{name}-%{version}-build
 
 %description
@@ -57,6 +47,7 @@ eSpeakEdit provides a User Interface to edit the eSpeak voices.
 %setup -q
 %patch1 -p1
 %patch2 -p1
+%patch -P 3 -p1
 # Build against portaudio v19 (see ReadMe)
 cp -f src/portaudio19.h src/portaudio.h
 
@@ -73,9 +64,6 @@ cd ..
 # Install manpage
 install -D -m 0644 %{SOURCE1} %{buildroot}%{_mandir}/man1/espeakedit.1
 
-%post -p /sbin/ldconfig
-%postun -p /sbin/ldconfig
-
 %files
 %defattr (-,root,root,755)
 %{_bindir}/espeakedit