[packages/libsbsms] - fix building with wxWidgets 3.0 - rel 5
baggins
baggins at pld-linux.org
Sat Jan 18 18:30:36 CET 2014
commit f27d6aca693ce4a685acd022e198fdcfd0f3341a
Author: Jan Rękorajski <baggins at pld-linux.org>
Date: Sat Jan 18 18:30:22 2014 +0100
- fix building with wxWidgets 3.0
- rel 5
libsbsms.spec | 4 +++-
wxWidgets3.patch | 32 ++++++++++++++++++++++++++++++++
2 files changed, 35 insertions(+), 1 deletion(-)
---
diff --git a/libsbsms.spec b/libsbsms.spec
index f9ce7d2..673639e 100644
--- a/libsbsms.spec
+++ b/libsbsms.spec
@@ -6,7 +6,7 @@ Summary: C++ library for high quality time stretching and pitch scaling
Summary(pl.UTF-8): Biblioteka C++ do wysokiej jakości zmiany szybkości i wysokości dźwięku
Name: libsbsms
Version: 1.7.0
-Release: 4
+Release: 5
License: GPL v2
Group: Libraries
Source0: http://downloads.sourceforge.net/sbsms/%{name}-%{version}.tar.gz
@@ -16,6 +16,7 @@ Patch1: %{name}-gcc.patch
Patch2: %{name}-link.patch
Patch3: %{name}-mad.patch
Patch4: %{name}-am.patch
+Patch5: wxWidgets3.patch
URL: http://sbsms.sourceforge.net/
BuildRequires: autoconf
BuildRequires: automake >= 1.5
@@ -80,6 +81,7 @@ Oparty na wxWidgets odtwarzacz wykorzystujący libsbsms.
%patch2 -p1
%patch3 -p1
%patch4 -p1
+%patch5 -p1
%build
%{__libtoolize}
diff --git a/wxWidgets3.patch b/wxWidgets3.patch
new file mode 100644
index 0000000..1ef01c7
--- /dev/null
+++ b/wxWidgets3.patch
@@ -0,0 +1,32 @@
+--- libsbsms-1.7.0/configure.in~ 2014-01-18 18:25:24.000000000 +0100
++++ libsbsms-1.7.0/configure.in 2014-01-18 18:27:19.885407481 +0100
+@@ -177,6 +177,9 @@
+
+ wx_version=`${WX_CONFIG} --version`
+ case "${wx_version}" in
++ 3.*)
++ echo "Great, you're using wxWidgets ${wx_version}!"
++ ;;
+ 2.8.*)
+ echo "Great, you're using wxWidgets ${wx_version}!"
+ ;;
+--- libsbsms-1.7.0/src/wxplayerframe.cpp~ 2008-11-13 06:35:51.000000000 +0100
++++ libsbsms-1.7.0/src/wxplayerframe.cpp 2014-01-18 18:29:18.292073291 +0100
+@@ -18,7 +18,7 @@
+
+ void wxPlayerFrame::OnOpen(wxCommandEvent& WXUNUSED(event))
+ {
+- wxFileDialog dlg(this, wxT("Choose a file"), wxT("."), wxT(""), wxT("All filetypes (*.sbsms;*.mp3;*.wav;*.aif;*.aiff;*.pcm)|*.sbsms;*.mp3;*.wav;*.aif;*.aiff;*.pcm"),wxOPEN);
++ wxFileDialog dlg(this, wxT("Choose a file"), wxT("."), wxT(""), wxT("All filetypes (*.sbsms;*.mp3;*.wav;*.aif;*.aiff;*.pcm)|*.sbsms;*.mp3;*.wav;*.aif;*.aiff;*.pcm"),wxFD_OPEN);
+ if(dlg.ShowModal() == wxID_OK) {
+ wxString pathStr = dlg.GetPath();
+ wxFileName path(pathStr);
+@@ -50,7 +50,7 @@
+ void wxPlayerFrame::OnSave(wxCommandEvent& WXUNUSED(event))
+ {
+ if(openFileName.Cmp(wxT("")) != 0) {
+- wxFileDialog dlg(this, wxT("Choose a file"), wxT("."), wxT(""), wxT("*.wav"),wxSAVE|wxOVERWRITE_PROMPT);
++ wxFileDialog dlg(this, wxT("Choose a file"), wxT("."), wxT(""), wxT("*.wav"),wxFD_SAVE|wxFD_OVERWRITE_PROMPT);
+ if(dlg.ShowModal() == wxID_OK) {
+ wxString pathStr = dlg.GetPath();
+ wxFileName path(pathStr);
================================================================
---- gitweb:
http://git.pld-linux.org/gitweb.cgi/packages/libsbsms.git/commitdiff/f27d6aca693ce4a685acd022e198fdcfd0f3341a
More information about the pld-cvs-commit
mailing list