Author: kwizart Update of /cvs/free/rpms/traverso/F-17 In directory old02.ovh.rpmfusion.lan:/tmp/cvs-serv21311/F-17 Modified Files: traverso.spec Added Files: traverso-gcc47.patch traverso-link.patch Log Message: Fix build traverso-gcc47.patch: core/FileHelpers.cpp | 2 ++ traverso/Main.cpp | 1 + 2 files changed, 3 insertions(+) --- NEW FILE traverso-gcc47.patch --- diff -up traverso-0.49.2/src/core/FileHelpers.cpp.gcc47 traverso-0.49.2/src/core/FileHelpers.cpp --- traverso-0.49.2/src/core/FileHelpers.cpp.gcc47 2009-03-28 09:48:39.000000000 +0100 +++ traverso-0.49.2/src/core/FileHelpers.cpp 2012-05-04 00:18:03.732512179 +0200 @@ -31,6 +31,8 @@ $Id: FileHelpers.cpp,v 1.10 2007/11/05 1 #include "Debugger.h" +#include <unistd.h> // read,write + // delete file/dir pName after prepending $HOME/traversoprojects/ to it // // if it is a directory, calls itself recursively on any file/dir in the directory diff -up traverso-0.49.2/src/traverso/Main.cpp.gcc47 traverso-0.49.2/src/traverso/Main.cpp --- traverso-0.49.2/src/traverso/Main.cpp.gcc47 2009-03-28 09:48:39.000000000 +0100 +++ traverso-0.49.2/src/traverso/Main.cpp 2012-05-04 00:23:34.002666113 +0200 @@ -31,6 +31,7 @@ Foundation, Inc., 51 Franklin St, Fifth #include "Main.h" #include "../config.h" #include <cstdlib> +#include <unistd.h> // getpgrp // Always put me below _all_ includes, this is needed // in case we run with memory leak detection enabled! traverso-link.patch: plugins/CMakeLists.txt | 2 ++ sheetcanvas/CMakeLists.txt | 2 ++ traverso/CMakeLists.txt | 2 ++ 3 files changed, 6 insertions(+) --- NEW FILE traverso-link.patch --- diff -up traverso-0.49.2/src/plugins/CMakeLists.txt.link traverso-0.49.2/src/plugins/CMakeLists.txt --- traverso-0.49.2/src/plugins/CMakeLists.txt.link 2009-03-28 09:48:39.000000000 +0100 +++ traverso-0.49.2/src/plugins/CMakeLists.txt 2012-05-04 00:18:03.734512187 +0200 @@ -6,6 +6,8 @@ ${CMAKE_SOURCE_DIR}/src/commands ${CMAKE_SOURCE_DIR}/src/plugins/native ${CMAKE_SOURCE_DIR}/src/plugins/LV2 ${QT_QTXML_INCLUDE_DIR} +/usr/include/raptor2 +/usr/include/rasqal ) IF(USE_INTERNAL_SLV2_LIB) diff -up traverso-0.49.2/src/sheetcanvas/CMakeLists.txt.link traverso-0.49.2/src/sheetcanvas/CMakeLists.txt --- traverso-0.49.2/src/sheetcanvas/CMakeLists.txt.link 2009-03-28 09:48:39.000000000 +0100 +++ traverso-0.49.2/src/sheetcanvas/CMakeLists.txt 2012-05-04 00:21:26.842273593 +0200 @@ -11,6 +11,8 @@ ${CMAKE_SOURCE_DIR}/src/traverso ${CMAKE_SOURCE_DIR}/src/traverso/dialogs ${QT_QTGUI_INCLUDE_DIR} ${QT_QTXML_INCLUDE_DIR} +/usr/include/raptor2 +/usr/include/rasqal ) # IF(HAVE_OPENGL) diff -up traverso-0.49.2/src/traverso/CMakeLists.txt.link traverso-0.49.2/src/traverso/CMakeLists.txt --- traverso-0.49.2/src/traverso/CMakeLists.txt.link 2009-03-28 09:48:39.000000000 +0100 +++ traverso-0.49.2/src/traverso/CMakeLists.txt 2012-05-04 00:25:14.675893528 +0200 @@ -11,6 +11,8 @@ ${CMAKE_SOURCE_DIR}/src/plugins/native ${CMAKE_SOURCE_DIR}/src/sheetcanvas ${QT_QTGUI_INCLUDE_DIR} ${QT_QTXML_INCLUDE_DIR} +/usr/include/raptor2 +/usr/include/rasqal ) IF(USE_INTERNAL_SLV2_LIB) Index: traverso.spec =================================================================== RCS file: /cvs/free/rpms/traverso/F-17/traverso.spec,v retrieving revision 1.7 retrieving revision 1.8 diff -u -r1.7 -r1.8 --- traverso.spec 2 Mar 2012 15:09:36 -0000 1.7 +++ traverso.spec 3 May 2012 22:30:16 -0000 1.8 @@ -15,7 +15,7 @@ Name: traverso Version: 0.49.2 -Release: 4%{?dist} +Release: 5%{?dist} Summary: Multitrack Audio Recording and Editing Suite Group: Applications/Multimedia License: GPLv2+ @@ -27,6 +27,8 @@ Patch0: %{name}-priority.patch # Fix DSO linking Patch1: %{name}-linking.patch +Patch2: traverso-gcc47.patch +Patch3: traverso-link.patch BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildRequires: alsa-lib-devel BuildRequires: cmake @@ -73,6 +75,8 @@ %setup -q %patch0 -p1 -b .priority %patch1 -p1 -b .dso.linking +%patch2 -p1 -b .gcc47 +%patch3 -p1 -b .link # Fix permission issues @@ -161,6 +165,9 @@ %{_datadir}/mime/packages/*.xml %changelog +* Thu May 03 2012 Nicolas Chauvet <kwizart(a)gmail.com&gt; - 0.49.2-5 +- Fix for gcc47 and missing cflags + * Fri Mar 02 2012 Nicolas Chauvet <kwizart(a)gmail.com&gt; - 0.49.2-4 - Rebuilt for c++ ABI breakage