pool/espeakedit
SHA256
12
0
Fork 1
Code Issues Pull Requests Activity

Accepting request 405661 from home:jengelh:branches:Education

Browse Source 
- 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
This commit is contained in:
Marguerite Su
2016-06-30 13:06:47 +00:00
committed by Git OBS Bridge
parent e323e7b982
commit 34d49ac063
3 changed files with 53 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

45
espeakedit-wx3.diff Normal file
View File

@@ -0,0 +1,45 @@
From: Jan Engelhardt <jengelh@inai.de>
Date: 2016-06-29 16:03:01.838755093 +0200
Make espeakedit build with wxWidgets 3.
---
src/espeakedit.cpp | 17 +++--------------
1 file changed, 3 insertions(+), 14 deletions(-)
Index: espeakedit-1.48.03/src/espeakedit.cpp
===================================================================
--- espeakedit-1.48.03.orig/src/espeakedit.cpp
+++ espeakedit-1.48.03/src/espeakedit.cpp
@@ -116,20 +116,10 @@ static const char *help_text =
// Initialise this in OnInit, not statically
bool MyApp::OnInit(void)
{//=====================
-
-int j;
-wxChar *p;
-char param[120];
-
-
if(argc > 1)
{
- p = argv[1];
- j = 0;
- while((param[j] = p[j]) != 0) j++;
-
- if((strcmp(param,"--help")==0) || (strcmp(param,"-h")==0))
- {
+ wxString param = argv[1];
+ if (param == "--help" || param == "-h") {
printf(about_string2,espeak_Info(NULL));
printf("%s", help_text);
exit(0);
@@ -137,8 +127,7 @@ if(argc > 1)
ConfigInit();
- if(strcmp(param,"--compile")==0)
- {
+ if (param == "--compile") {
samplerate_native = samplerate = 22050;
LoadPhData(NULL);
if(LoadVoice("", 0) == NULL)

5
espeakedit.changes
View File

@@ -1,3 +1,8 @@
-------------------------------------------------------------------
Thu Jun 30 11:12:38 UTC 2016 - jengelh@inai.de
- Use wxWidgets 3.
-------------------------------------------------------------------
Fri Jun 24 18:52:01 UTC 2016 - i@marguerite.su

18
espeakedit.spec
View File

@@ -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