diff --git a/.cvsignore b/.cvsignore index e1385a4..e32683e 100644 --- a/.cvsignore +++ b/.cvsignore @@ -1 +1 @@ -audacity-src-1.2.1.tar.bz2 +audacity-src-1.2.4b.tar.gz diff --git a/audacity-1.2.3-gcc41.patch b/audacity-1.2.3-gcc41.patch new file mode 100644 index 0000000..6c881ee --- /dev/null +++ b/audacity-1.2.3-gcc41.patch @@ -0,0 +1,12 @@ +diff -Nur audacity-src-1.2.3-orig/lib-src/soundtouch/include/SoundTouch.h audacity-src-1.2.3/lib-src/soundtouch/include/SoundTouch.h +--- audacity-src-1.2.3-orig/lib-src/soundtouch/include/SoundTouch.h 2004-11-18 07:17:35.000000000 +0100 ++++ audacity-src-1.2.3/lib-src/soundtouch/include/SoundTouch.h 2006-03-17 21:26:04.000000000 +0100 +@@ -146,7 +146,7 @@ + static const char *getVersionString(); + + /// Get SoundTouch library version Id +- static uint SoundTouch::getVersionId(); ++ static uint getVersionId(); + + /// Sets new rate control value. Normal rate = 1.0, smaller values + /// represent slower rate, larger faster rates. diff --git a/audacity-1.2.4b-missing-pango.patch b/audacity-1.2.4b-missing-pango.patch new file mode 100644 index 0000000..c15eb88 --- /dev/null +++ b/audacity-1.2.4b-missing-pango.patch @@ -0,0 +1,12 @@ +diff -Nur audacity-src-1.2.4b-orig/src/Makefile.in audacity-src-1.2.4b/src/Makefile.in +--- audacity-src-1.2.4b-orig/src/Makefile.in 2005-11-27 03:33:31.000000000 +0100 ++++ audacity-src-1.2.4b/src/Makefile.in 2006-03-17 23:46:15.000000000 +0100 +@@ -28,7 +28,7 @@ + + EXTRAOBJS = @EXTRAOBJS@ + OPTOBJS = @OPTOBJS@ +-LIBS = @LIBS@ ++LIBS = @LIBS@ -lpangox-1.0 + EXTRATARGETS = @EXTRATARGETS@ + + ######################################## diff --git a/audacity.spec b/audacity.spec index 2565d9c..277a91d 100644 --- a/audacity.spec +++ b/audacity.spec @@ -1,28 +1,32 @@ Name: audacity -Version: 1.2.3 -Release: 5 +Version: 1.2.4 +Release: 0.1.b%{?dist} Summary: A multitrack audio editor Group: Applications/Multimedia License: GPL URL: http://audacity.sourceforge.net -Source: http://dl.sf.net/sourceforge/audacity/audacity-src-1.2.3.tar.gz +Source: http://dl.sf.net/sourceforge/audacity/audacity-src-1.2.4b.tar.gz Source1: audacity.png Patch1: audacity-1.2.2-aboutdialog.patch +Patch2: audacity-1.2.3-gcc41.patch +Patch3: audacity-1.2.4b-missing-pango.patch BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildRequires: libogg-devel, libvorbis-devel, zlib-devel, perl BuildRequires: gettext, zip, flac-devel, ladspa-devel BuildRequires: libsamplerate-devel, libsndfile-devel BuildRequires: libid3tag-devel, desktop-file-utils %{?_with_mp3:BuildRequires: libmad-devel} -%{?_with_gtk1:BuildRequires: wxGTK-devel} -%{!?_with_gtk1:BuildRequires: wxGTK2-devel} +%{?_with_gtk2:BuildRequires: compat-wxGTK2-devel} +%{!?_with_gtk2:BuildRequires: compat-wxGTK-devel} +# libwx_gtk2-2.4.so: undefined reference to `pango_x_get_context' +%{?_with_gtk2: BuildRequires: pango-devel} Requires(post): desktop-file-utils Requires(postun): desktop-file-utils # Compile options: # --with mp3 : enable mp3 support -# --with gtk1 : use GTK+ version of wxGTK, else GTK2 version +# --with gtk2 : use GTK+ 2.x version of wxGTK, else GTK+ 1.x version # --with portaudiov19 : enable version 19 of portaudio (disables portmixer) @@ -35,8 +39,10 @@ and the audio I/O currently uses OSS under Linux. Audacity runs on Linux/*BSD, MacOS, and Windows. %prep -%setup -q -n %{name}-src-%{version} +%setup -q -n %{name}-src-%{version}b %patch1 -p1 -b .aboutdialog +%patch2 -p1 -b .gcc4 +%{?_with_gtk2: %patch3 -p1 -b .missing-pango } cp -a src/Languages.cpp src/Languages.cpp.orig iconv -f ISO_8859-1 -t UTF-8 src/Languages.cpp.orig > src/Languages.cpp for i in help/wxhelp/audacity.hhk help/wxhelp/exportmp3.htm locale/*.po src/export/ExportMP3.cpp @@ -45,6 +51,13 @@ do done %build +# Push a softlink into PATH so the renamed wx-config inside +# the compat-wxGTK2-devel package is found and taken. +%define mybindir __mybin__ +mkdir %{mybindir} +ln -s $(which wx-2.4-config) %{mybindir}/wx-config +export PATH=$(pwd)/%{mybindir}:$PATH + %configure --with-help --with-libsndfile=system --with-libsamplerate=system --with-libflac=system --with-ladspa --with-vorbis=system --with-id3tag=system %{?_with_mp3:--with-libmad=system} %{?_with_portaudiov19:--with-portaudio=v19 --without-portmixer} make @@ -98,6 +111,13 @@ rm -rf ${RPM_BUILD_ROOT} %doc %{_datadir}/doc/* %changelog +* Fri Mar 17 2006 Michael Schwendt - 1.2.4-0.1.b +- Update to 1.2.4b (stable release). +- Follow upstream recommendation and use the GTK+ 1.x wxGTK. + This is because of various issues with fonts/layout/behaviour. +- Build with compat-wxGTK-devel. +- Modify build section to find wx-2.4-config instead of wx-config. + * Fri May 20 2005 David Woodhouse - 1.2.3-5 - Bump release number again due to spurious build system failure and the fact that the build system seems to be ignoring repeated build diff --git a/sources b/sources index 0359713..e1b76c7 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -dbfc1b401420aa694753d35acb5a8a28 audacity-src-1.2.3.tar.gz +37df5b6119302f7ab77ca16d25311756 audacity-src-1.2.4b.tar.gz