rpms/ardour/F-10 ardour-2.7.1-gcc44.patch, NONE, 1.1 .cvsignore, 1.9, 1.10 ardour.spec, 1.22, 1.23 ardour2.desktop, 1.1, 1.2 sources, 1.10, 1.11 ardour-2.5-gcc43.patch, 1.2, NONE
Hans de Goede
jwrdegoede at fedoraproject.org
Mon Feb 23 08:41:10 UTC 2009
Author: jwrdegoede
Update of /cvs/extras/rpms/ardour/F-10
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv15178
Modified Files:
.cvsignore ardour.spec ardour2.desktop sources
Added Files:
ardour-2.7.1-gcc44.patch
Removed Files:
ardour-2.5-gcc43.patch
Log Message:
* Sun Feb 22 2009 Orcan Ogetbil <oget [DOT] fedora [AT] gmail [DOT] com> 2.7.1-1
- New upstream release 2.7.1.
- Replace gcc43 patch with a gcc44 patch
- Add GenericName to the .desktop file
- Fix encodings of French and Russian manpages
ardour-2.7.1-gcc44.patch:
--- NEW FILE ardour-2.7.1-gcc44.patch ---
diff -rupN ardour-2.7.1.old/gtk2_ardour/actions.cc ardour-2.7.1/gtk2_ardour/actions.cc
--- ardour-2.7.1.old/gtk2_ardour/actions.cc 2008-06-29 14:12:44.000000000 -0400
+++ ardour-2.7.1/gtk2_ardour/actions.cc 2009-02-22 16:52:59.000000000 -0500
@@ -319,7 +319,7 @@ ActionManager::set_sensitive (vector<Ref
void
ActionManager::uncheck_toggleaction (const char * name)
{
- char *last_slash = strrchr (name, '/');
+ const char *last_slash = strrchr (name, '/');
if (last_slash == 0) {
fatal << string_compose (_("programmer error: %1 %2"), X_("illegal toggle action name"), name) << endmsg;
@@ -334,7 +334,7 @@ ActionManager::uncheck_toggleaction (con
memcpy (group_name, name + 10, len);
group_name[len] = '\0';
- char* action_name = last_slash + 1;
+ const char* action_name = last_slash + 1;
RefPtr<Action> act = get_action (group_name, action_name);
if (act) {
diff -rupN ardour-2.7.1.old/libs/midi++2/midi.cc ardour-2.7.1/libs/midi++2/midi.cc
--- ardour-2.7.1.old/libs/midi++2/midi.cc 2008-10-11 08:34:00.000000000 -0400
+++ ardour-2.7.1/libs/midi++2/midi.cc 2009-02-22 16:27:23.000000000 -0500
@@ -158,7 +158,7 @@ MIDI::byte
MIDI::decode_controller_name (const char *name)
{
- char *lparen;
+ const char *lparen;
size_t len;
if ((lparen = strrchr (name, '(')) != 0) {
diff -rupN ardour-2.7.1.old/libs/pbd/convert.cc ardour-2.7.1/libs/pbd/convert.cc
--- ardour-2.7.1.old/libs/pbd/convert.cc 2008-04-13 14:40:34.000000000 -0400
+++ ardour-2.7.1/libs/pbd/convert.cc 2009-02-22 16:03:41.000000000 -0500
@@ -20,6 +20,7 @@
#include <cmath>
#include <locale>
#include <algorithm>
+#include <cstdio>
#include <stdint.h>
#ifndef __STDC_FORMAT_MACROS
#define __STDC_FORMAT_MACROS
diff -rupN ardour-2.7.1.old/libs/pbd/pbd/convert.h ardour-2.7.1/libs/pbd/pbd/convert.h
--- ardour-2.7.1.old/libs/pbd/pbd/convert.h 2008-04-13 14:40:34.000000000 -0400
+++ ardour-2.7.1/libs/pbd/pbd/convert.h 2009-02-22 16:35:33.000000000 -0500
@@ -25,7 +25,7 @@
#include <sstream>
#include <iostream>
#include <glibmm/ustring.h>
-
+#include <stdint.h>
namespace PBD {
std::string short_version (std::string, std::string::size_type target_length);
diff -rupN ardour-2.7.1.old/libs/pbd/shortpath.cc ardour-2.7.1/libs/pbd/shortpath.cc
--- ardour-2.7.1.old/libs/pbd/shortpath.cc 2008-04-13 14:40:34.000000000 -0400
+++ ardour-2.7.1/libs/pbd/shortpath.cc 2009-02-22 16:23:20.000000000 -0500
@@ -18,7 +18,7 @@
*/
#include <pbd/shortpath.h>
-
+#include <stdint.h>
using namespace Glib;
using namespace std;
diff -rupN ardour-2.7.1.old/libs/pbd/stacktrace.cc ardour-2.7.1/libs/pbd/stacktrace.cc
--- ardour-2.7.1.old/libs/pbd/stacktrace.cc 2008-09-04 05:32:52.000000000 -0400
+++ ardour-2.7.1/libs/pbd/stacktrace.cc 2009-02-22 16:09:20.000000000 -0500
@@ -19,7 +19,7 @@
#include <pbd/stacktrace.h>
#include <iostream>
-
+#include <cstdio>
/* Obtain a backtrace and print it to stdout. */
#ifdef HAVE_EXECINFO
Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/ardour/F-10/.cvsignore,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- .cvsignore 27 Oct 2008 13:42:31 -0000 1.9
+++ .cvsignore 23 Feb 2009 08:40:39 -0000 1.10
@@ -1 +1 @@
-ardour-2.6.1-4010.tar.bz2
+ardour-2.7.1.tar.bz2
Index: ardour.spec
===================================================================
RCS file: /cvs/extras/rpms/ardour/F-10/ardour.spec,v
retrieving revision 1.22
retrieving revision 1.23
diff -u -r1.22 -r1.23
--- ardour.spec 21 Nov 2008 12:52:50 -0000 1.22
+++ ardour.spec 23 Feb 2009 08:40:39 -0000 1.23
@@ -1,13 +1,13 @@
Summary: Multichannel Digital Audio Workstation
Name: ardour
-Version: 2.7
+Version: 2.7.1
Release: 1%{?dist}
-Source: http://ardour.org/files/releases/ardour-%{version}-4225.tar.bz2
+Source: http://ardour.org/files/releases/ardour-%{version}.tar.bz2
Source1: ardour2.desktop
Source2: ardour.script
Patch0: ardour-2.7-SConstruct.patch
Patch1: ardour-session.cc-no_stomp.patch
-Patch2: ardour-2.5-gcc43.patch
+Patch2: ardour-2.7.1-gcc44.patch
Patch3: ardour-2.5-HOST_NOT_FOUND.patch
URL: http://ardour.org
License: GPLv2+
@@ -55,9 +55,17 @@
%setup -q
%patch0 -p0 -b .SConstruct
%patch1 -p0
-%patch2 -p0
+%patch2 -p1
%patch3 -p0
+# Fix encodings:
+iconv -f ISO-8859-1 -t UTF8 ardour.1.fr > ardour.1.fr.tmp
+touch -r ardour.1.fr ardour.1.fr.tmp
+mv -f ardour.1.fr.tmp ardour.1.fr
+iconv -f KOI8-R -t UTF8 ardour.1.ru > ardour.1.ru.tmp
+touch -r ardour.1.ru ardour.1.ru.tmp
+mv -f ardour.1.ru.tmp ardour.1.ru
+
%build
# <sigh> ardours SConstruct script is a mess when it comes to determining
# opt_flags, so we override the lot using the ARCH= and DIST_TARGET= options
@@ -153,6 +161,12 @@
%{_mandir}/ru/man1/ardour.1*
%changelog
+* Sun Feb 22 2009 Orcan Ogetbil <oget [DOT] fedora [AT] gmail [DOT] com> 2.7.1-1
+- New upstream release 2.7.1.
+- Replace gcc43 patch with a gcc44 patch
+- Add GenericName to the .desktop file
+- Fix encodings of French and Russian manpages
+
* Fri Nov 21 2008 Anthony Green <green at redhat.com> 2.7-1
- New upstream release 2.7.
Index: ardour2.desktop
===================================================================
RCS file: /cvs/extras/rpms/ardour/F-10/ardour2.desktop,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- ardour2.desktop 12 Oct 2007 11:50:11 -0000 1.1
+++ ardour2.desktop 23 Feb 2009 08:40:39 -0000 1.2
@@ -1,5 +1,6 @@
[Desktop Entry]
Name=Ardour
+GenericName=Digital Audio Workstation
Comment=Ardour Digital Audio Workstation
Icon=ardour
Exec=ardour2
Index: sources
===================================================================
RCS file: /cvs/extras/rpms/ardour/F-10/sources,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- sources 21 Nov 2008 12:52:50 -0000 1.10
+++ sources 23 Feb 2009 08:40:39 -0000 1.11
@@ -1 +1 @@
-cda1db24e93bb443534bf7232bf02ca2 ardour-2.7-4225.tar.bz2
+0fd4b1a600c75447d633b796bad321e1 ardour-2.7.1.tar.bz2
--- ardour-2.5-gcc43.patch DELETED ---
More information about the fedora-extras-commits
mailing list