[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]

rpms/audacity/FC-5 audacity-1.2.3-gcc41.patch, NONE, 1.1 audacity-1.2.4b-missing-pango.patch, NONE, 1.1 .cvsignore, 1.2, 1.3 audacity.spec, 1.12, 1.13 sources, 1.4, 1.5



Author: mschwendt

Update of /cvs/extras/rpms/audacity/FC-5
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv9337

Modified Files:
	.cvsignore audacity.spec sources 
Added Files:
	audacity-1.2.3-gcc41.patch audacity-1.2.4b-missing-pango.patch 
Log Message:
* Fri Mar 17 2006 Michael Schwendt <mschwendt[AT]users.sf.net> - 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.


audacity-1.2.3-gcc41.patch:

--- NEW FILE audacity-1.2.3-gcc41.patch ---
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.

audacity-1.2.4b-missing-pango.patch:

--- NEW FILE audacity-1.2.4b-missing-pango.patch ---
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@
 
 ########################################


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/audacity/FC-5/.cvsignore,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- .cvsignore	8 Nov 2004 04:04:07 -0000	1.2
+++ .cvsignore	17 Mar 2006 23:23:18 -0000	1.3
@@ -1 +1 @@
-audacity-src-1.2.1.tar.bz2
+audacity-src-1.2.4b.tar.gz


Index: audacity.spec
===================================================================
RCS file: /cvs/extras/rpms/audacity/FC-5/audacity.spec,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -r1.12 -r1.13
--- audacity.spec	21 May 2005 10:36:06 -0000	1.12
+++ audacity.spec	17 Mar 2006 23:23:18 -0000	1.13
@@ -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 @@
 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 @@
 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 @@
 %doc %{_datadir}/doc/*
 
 %changelog
+* Fri Mar 17 2006 Michael Schwendt <mschwendt[AT]users.sf.net> - 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 <dwmw2 infradead org> - 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


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/audacity/FC-5/sources,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- sources	4 Dec 2004 16:24:36 -0000	1.4
+++ sources	17 Mar 2006 23:23:18 -0000	1.5
@@ -1 +1 @@
-dbfc1b401420aa694753d35acb5a8a28  audacity-src-1.2.3.tar.gz
+37df5b6119302f7ab77ca16d25311756  audacity-src-1.2.4b.tar.gz


[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]