Orcan Ogetbil | 3 May 14:50 2012

[ardour] gcc-4.7 FTBFS fix RHBZ#818364

commit 44ab38958830494b3350b40836ede374bdb99dcf
Author: Orcan Ogetbil <oget.fedora <at> gmail.com>
Date:   Thu May 3 08:50:19 2012 -0400

    gcc-4.7 FTBFS fix RHBZ#818364

    - some specfile cleanup

 ardour-gcc47.patch |   22 ++++++++++++++++++++++
 ardour.spec        |   17 ++++++++---------
 2 files changed, 30 insertions(+), 9 deletions(-)
---
diff --git a/ardour-gcc47.patch b/ardour-gcc47.patch
new file mode 100644
index 0000000..053b6b1
--- /dev/null
+++ b/ardour-gcc47.patch
 <at>  <at>  -0,0 +1,22  <at>  <at> 
+diff -rupN ardour-2.8.12.old/libs/pbd/path.cc ardour-2.8.12/libs/pbd/path.cc
+--- ardour-2.8.12.old/libs/pbd/path.cc	2009-02-24 07:38:16.000000000 -0500
++++ ardour-2.8.12/libs/pbd/path.cc	2012-05-02 23:39:41.446682468 -0400
+ <at>  <at>  -17,6 +17,7  <at>  <at> 
+ */
+ 
+ #include <cerrno>
++#include <unistd.h>
+ 
+ #include <glib.h>
+ #include <glib/gstdio.h>
+diff -rupN ardour-2.8.12.old/libs/rubberband/src/main.cpp ardour-2.8.12/libs/rubberband/src/main.cpp
+--- ardour-2.8.12.old/libs/rubberband/src/main.cpp	2009-02-24 07:38:17.000000000 -0500
++++ ardour-2.8.12/libs/rubberband/src/main.cpp	2012-05-03 00:00:47.390285238 -0400
+ <at>  <at>  -21,6 +21,7  <at>  <at> 
+ #include <time.h>
+ #include <cstdlib>
+ #include <cstring>
++#include <unistd.h>
+ #include "sysutils.h"
+ 
+ #ifdef __MSVC__
diff --git a/ardour.spec b/ardour.spec
index 14c4dfc..6c16193 100644
--- a/ardour.spec
+++ b/ardour.spec
 <at>  <at>  -1,19 +1,19  <at>  <at> 
 Summary:       Multichannel Digital Audio Workstation
 Name:          ardour
 Version:       2.8.12
-Release:       3%{?dist}
+Release:       4%{?dist}
 # No more direct links. Download from
 # http://ardour.org/download
 Source:        ardour-%{version}.tar.bz2
 Source2:       ardour.script
 Patch0:        ardour-SConscript.patch
+# gcc-4.7 patch. from upstream trunk
+Patch1:        ardour-gcc47.patch
 Patch3:        ardour-2.5-HOST_NOT_FOUND.patch
 URL:           http://ardour.org
 License:       GPLv2+
 Group:         Applications/Multimedia

-BuildRoot:     %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
-
 BuildRequires: alsa-lib-devel
 BuildRequires: aubio-devel
 BuildRequires: boost-devel
 <at>  <at>  -61,6 +61,7  <at>  <at>  digital mixers.
 %prep
 %setup -q
 %patch0 -p1 -b .SConscript
+%patch1 -p1 -b .gcc47
 %patch3 -p0 -b .host.not.found

 # Fix encodings:
 <at>  <at>  -97,8 +98,6  <at>  <at>  scons PREFIX=%{_prefix} LIBDIR=%{_lib} SYSLIBS=1 \
       WIIMOTE=1

 %install
-rm -rf $RPM_BUILD_ROOT
-mkdir -p $RPM_BUILD_ROOT
 scons DESTDIR=$RPM_BUILD_ROOT install

 # Replace ardour2 with a script
 <at>  <at>  -139,9 +138,6  <at>  <at>  cat libardour2.lang >> ardour.lang
 %find_lang libgtkmm2ext
 cat libgtkmm2ext.lang >> ardour.lang

-%clean
-rm -rf $RPM_BUILD_ROOT
-
 %post
 touch --no-create %{_datadir}/icons/hicolor &>/dev/null
 update-desktop-database &> /dev/null
 <at>  <at>  -160,7 +156,6  <at>  <at>  gtk-update-icon-cache %{_datadir}/icons/hicolor &>/dev/null || :

 
 %files -f ardour.lang
-%defattr(-,root,root,-)
 %doc README COPYING
 %config(noreplace) %{_sysconfdir}/ardour2
 %{_bindir}/ardour2
 <at>  <at>  -176,6 +171,10  <at>  <at>  gtk-update-icon-cache %{_datadir}/icons/hicolor &>/dev/null || :
 %{_mandir}/ru/man1/ardour.1*

 %changelog
+* Thu May 03 2012 Orcan Ogetbil <oget [DOT] fedora [AT] gmail [DOT] com> 2.8.12-4
+- gcc-4.7 FTBFS fix RHBZ#818364
+- some specfile cleanup
+
 * Tue Feb 28 2012 Fedora Release Engineering <rel-eng <at> lists.fedoraproject.org> - 2.8.12-3
 - Rebuilt for c++ ABI breakage

--

-- 
scm-commits mailing list
scm-commits <at> lists.fedoraproject.org
https://admin.fedoraproject.org/mailman/listinfo/scm-commits

Gmane