Hello community, here is the log from the commit of package espeakedit for openSUSE:Factory checked in at 2012-07-21 14:31:31 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/espeakedit (Old) and /work/SRC/openSUSE:Factory/.espeakedit.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "espeakedit", Maintainer is "" Changes: -------- New Changes file: --- /dev/null 2012-07-06 19:40:38.919402255 +0200 +++ /work/SRC/openSUSE:Factory/.espeakedit.new/espeakedit.changes 2012-07-21 14:31:44.000000000 +0200 @@ -0,0 +1,8 @@ +------------------------------------------------------------------- +Wed Jul 11 09:10:07 EEST 2012 - [email protected] +- Fix ability to use wxcontainer instead of stl variant for WxWidgets + +------------------------------------------------------------------- +Sat Jul 07 19:40:40 UTC 2012 - [email protected] +- Version 1.46.02 + New: ---- espeakedit-1.46.02.zip espeakedit.1 espeakedit.changes espeakedit.spec makefile_rpmoptflags_wxversion.patch ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ espeakedit.spec ++++++ # # spec file for package espeakedit # # Copyright (c) 2012 SUSE LINUX Products GmbH, Nuernberg, Germany. # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed # upon. The license for this file, and modifications and additions to the # file, is the same license as for the pristine package itself (unless the # license for the pristine package is not an Open Source License, in which # case the license is the MIT License). An "Open Source License" is a # license that conforms to the Open Source Definition (Version 1.9) # published by the Open Source Initiative. # Please submit bugfixes or comments via http://bugs.opensuse.org/ # Name: espeakedit Version: 1.46.02 Release: 0 %define _version %{version}-source License: GPL-3.0+ Summary: Software speech synthesizer (text-to-speech) Url: http://espeak.sourceforge.net Group: Productivity/Other Source: %{name}-%{version}.zip Source1: espeakedit.1 Patch0: makefile_rpmoptflags_wxversion.patch #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: gcc-c++ BuildRequires: portaudio-devel BuildRequires: pulseaudio-devel BuildRequires: unzip BuildRequires: wxWidgets-devel BuildRoot: %{_tmppath}/%{name}-%{version}-build #Fix ability to use wxcontainer instead of stl variant for WxWidgets %define _use_internal_dependency_generator 0 %define __find_requires %wx_requires %description eSpeak is a software speech synthesizer for English, and some other languages. eSpeakEdit provides a User Interface to edit the eSpeak voices. %prep %setup -q -n %{name}-%{version} %patch0 -p1 # Build against portaudio v19 (see ReadMe) %{__cp} -f src/portaudio19.h src/portaudio.h %ifarch i386 i486 i586 i686 sed "s/lib64/lib/g" -i src/Makefile %endif %build cd src make %{?_smp_mflags} CFLAGS="%{optflags}" cd .. %install cd src mkdir -p %{buildroot}/%{_bindir}/ cp espeakedit %{buildroot}/%{_bindir}/ 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 %doc %{_mandir}/man1/espeakedit.1.* %changelog ++++++ espeakedit.1 ++++++ .TH ESPEAKEDIT 1 "April 5, 2010" .SH NAME espeakedit \- eSpeak voice editor .SH SYNOPSIS .B espeakedit .RI [ --compile ] .SH DESCRIPTION \fBespeakedit\fP is an graphical editor for the eSpeak speech synthesizer. .SH OPTIONS .TP .B \--compile Compile phoneme data in espeak-data/phsource and dictionary data in espeak-data/dictsource .SH SEE ALSO .BR espeak (1), .br More information can be found in /usr/share/doc/espeakedit/docs/editor.html .SH AUTHOR espeakedit was written by Jonathan Duddington. .PP This manual page was written by Samuel Thibault <[email protected]>, for the Debian project (and may be used by others). ++++++ makefile_rpmoptflags_wxversion.patch ++++++ --- ./src/Makefile.orig 2011-09-14 14:59:35.000000000 +0300 +++ ./src/Makefile 2012-05-24 08:57:37.070235001 +0300 @@ -10,23 +10,21 @@ OBJS=$(patsubst %.cpp,%.o,$(SRCS)) -WX_LIBS = -pthread -lwx_gtk2u_xrc-2.6 -lwx_gtk2u_qa-2.6 -lwx_gtk2u_html-2.6 \ - -lwx_gtk2u_adv-2.6 -lwx_gtk2u_core-2.6 -lwx_baseu_xml-2.6 -lwx_baseu_net-2.6 -lwx_baseu-2.6 - +WX_VERSION = 2.8 +WX_LIBS = -pthread -L /usr/lib64/wx-$(WX_VERSION)-stl/ -lwx_gtk2u_xrc-$(WX_VERSION) -lwx_gtk2u_qa-$(WX_VERSION) -lwx_gtk2u_html-$(WX_VERSION) -lwx_gtk2u_adv-$(WX_VERSION) -lwx_gtk2u_core-$(WX_VERSION) -lwx_baseu_xml-$(WX_VERSION) -lwx_baseu_net-$(WX_VERSION) -lwx_baseu-$(WX_VERSION) +WX_INCLUDES = -I/usr/lib64/wx-$(WX_VERSION)-stl/wx/include/gtk2-unicode-release-$(WX_VERSION) -I/usr/include/wx-$(WX_VERSION) + LIBS=-lstdc++ -lportaudio -CPPFLAGS = -Wall -g -fexceptions -I/usr/lib/wx/include/gtk2-unicode-release-2.6 - -I/usr/include/wx-2.6 \ - -DGTK_NO_CHECK_CASTS -D__WXGTK__ -D_FILE_OFFSET_BITS=64 -D_LARGE_FILES - -D_LARGEFILE_SOURCE=1 -DNO_GCC_PRAGMA -D_ESPEAKEDIT +DEFS = -DGTK_NO_CHECK_CASTS -D__WXGTK__ -D_FILE_OFFSET_BITS=64 -D_LARGE_FILES -D_LARGEFILE_SOURCE=1 -DNO_GCC_PRAGMA -D_ESPEAKEDIT -CXXFLAGS = -O2 -Wall -fexceptions -I/usr/lib/wx/include/gtk2-unicode-release-2.6 -I/usr/include/wx-2.6 \ - -DGTK_NO_CHECK_CASTS -D__WXGTK__ -D_FILE_OFFSET_BITS=64 -D_LARGE_FILES -D_LARGEFILE_SOURCE=1 -DNO_GCC_PRAGMA -D_ESPEAKEDIT +CXXFLAGS = -O2 -Wall -fexceptions -I/usr/lib64/wx-$(WX_VERSION)-stl/wx/include/gtk2-unicode-release-$(WX_VERSION) -I/usr/include/wx-$(WX_VERSION) \ + -DGTK_NO_CHECK_CASTS -D__WXGTK__ -D_FILE_OFFSET_BITS=64 -D_LARGE_FILES -DLD_DYNAMIC_WEAK=0 -D_LARGEFILE_SOURCE=1 -DNO_GCC_PRAGMA -D_ESPEAKEDIT all: espeakedit .cpp.o: - $(CXX) $(CXXFLAGS) -I. -c -fno-exceptions $< + $(CXX) $(CXXFLAGS) $(WX_INCLUDES) $(DEFS) -I. -c -fno-exceptions $< espeakedit: $(OBJS) $(CXX) -o $@ $(OBJS) $(LIBS) $(WX_LIBS) -- To unsubscribe, e-mail: [email protected] For additional commands, e-mail: [email protected]
