RPM Packaging: update mplayerthumbs, piklab, potracegui, qt4-tqt-theme-engine, rosegarden

7 files changed, 73 insertions, 858 deletions

diff --git a/redhat/applications/rosegarden/rosegarden-14.0.0.spec b/redhat/applications/rosegarden/rosegarden-14.0.0.spec
index 2eaaeebfe..6e81f99b9 100644
--- a/redhat/applications/rosegarden/rosegarden-14.0.0.spec
+++ b/redhat/applications/rosegarden/rosegarden-14.0.0.spec
@@ -1,56 +1,79 @@
-# Default version for this component
-%define tde_pkg rosegarden
+#
+# spec file for package rosegarden (version R14.0.0)
+#
+# Copyright (c) 2014 Trinity Desktop Environment
+#
+# All modifications and additions to the file contributed by third parties
+# remain the property of their copyright owners, unless otherwise agreed
+# upon. The license for this file, and modifications and additions to the
+# file, is the same license as for the pristine package itself (unless the
+# license for the pristine package is not an Open Source License, in which
+# case the license is the MIT License). An "Open Source License" is a
+# license that conforms to the Open Source Definition (Version 1.9)
+# published by the Open Source Initiative.
+#
+# Please submit bugfixes or comments via http://www.trinitydesktop.org/
+#
+
+# TDE variables
+%define tde_epoch 2
 %define tde_version 14.0.0
-
-# Required for Mageia 2: removes the ldflag '--no-undefined'
-%define _disable_ld_no_undefined 1
-
-# If TDE is built in a specific prefix (e.g. /opt/trinity), the release will be suffixed with ".opt".
-%if "%{?tde_prefix}" != "/usr"
-%define _variant .opt
-%endif
-
-# TDE specific building variables
+%define tde_pkg rosegarden
+%define tde_prefix /opt/trinity
 %define tde_bindir %{tde_prefix}/bin
 %define tde_datadir %{tde_prefix}/share
 %define tde_docdir %{tde_datadir}/doc
 %define tde_includedir %{tde_prefix}/include
 %define tde_libdir %{tde_prefix}/%{_lib}
 %define tde_mandir %{tde_datadir}/man
-%define tde_appdir %{tde_datadir}/applications
-
-%define tde_tdeappdir %{tde_appdir}/tde
+%define tde_tdeappdir %{tde_datadir}/applications/tde
 %define tde_tdedocdir %{tde_docdir}/tde
 %define tde_tdeincludedir %{tde_includedir}/tde
 %define tde_tdelibdir %{tde_libdir}/trinity
 
-%define _docdir %{tde_tdedocdir}
-
 
-Name:			trinity-%{tde_pkg}
-Summary:		music editor and MIDI/audio sequencer [Trinity]
-Version:		1.7.0
-Release:		%{?!preversion:7}%{?preversion:6_%{preversion}}%{?dist}%{?_variant}
+Name:		trinity-%{tde_pkg}
+Epoch:		%{tde_epoch}
+Version:	1.7.0
+Release:	%{?!preversion:1}%{?preversion:0_%{preversion}}%{?dist}%{?_variant}
+Summary:	Music editor and MIDI/audio sequencer [Trinity]
+Group:		Applications/Multimedia
+URL:		http://www.rosegardenmusic.com/
 
-License:		GPLv2+
-Group:			Applications/Multimedia
+%if 0%{?suse_version}
+License:	GPL-2.0+
+%else
+License:	GPLv2+
+%endif
 
-Vendor:			Trinity Project
-Packager:		Francois Andriot <francois.andriot@free.fr>
-URL:			http://www.rosegardenmusic.com/
+#Vendor:		Trinity Desktop
+#Packager:	Francois Andriot <francois.andriot@free.fr>
 
-Prefix:			%{tde_prefix}
-BuildRoot:		%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
+Prefix:		%{tde_prefix}
+BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 Source0:		%{name}-%{tde_version}%{?preversion:~%{preversion}}.tar.gz
 
-BuildRequires:	trinity-tqtinterface-devel >= %{tde_version}
-BuildRequires:	trinity-arts-devel >= 1:1.5.10
 BuildRequires:	trinity-tdelibs-devel >= %{tde_version}
 BuildRequires:	trinity-tdebase-devel >= %{tde_version}
 BuildRequires:	desktop-file-utils
-
 BuildRequires:	gettext
+
+BuildRequires:	cmake libtool
+BuildRequires:	gcc-c++
+BuildRequires:	pkgconfig
+BuildRequires:	fdupes
+
+# SUSE desktop files utility
+%if 0%{?suse_version}
+BuildRequires:	update-desktop-files
+%endif
+
+%if 0%{?opensuse_bs} && 0%{?suse_version}
+# for xdg-menu script
+BuildRequires:	brp-check-trinity
+%endif
+
 BuildRequires:	fftw-devel
 BuildRequires:	liblo-devel
 BuildRequires:	fontconfig-devel
@@ -78,6 +101,16 @@ BuildRequires:	jack-audio-connection-kit-devel
 BuildRequires:	lirc-devel
 %endif
 
+# IDN support
+BuildRequires:  libidn-devel
+
+# GAMIN support
+#  Not on openSUSE.
+%if 0%{?rhel} || 0%{?fedora} || 0%{?mgaversion} || 0%{?mdkversion}
+%define with_gamin 1
+BuildRequires:  gamin-devel
+%endif
+
 Requires:		lilypond
 Requires:		perl-XML-Twig
 
@@ -94,6 +127,7 @@ Requires:		libsndfile-utils
 
 Requires:		%{name}-data == %{version}-%{release}
 
+
 %description
 Rosegarden is a TDE application which provides a mixed Audio/MIDI
 sequencer (for playback and recording), a multi-track editor, music
@@ -114,10 +148,14 @@ lilypond and Csound files export, etc.
 This package provides the data files necessary for running Rosegarden
 
 
-%if 0%{?suse_version} || 0%{?pclinuxos}
+##########
+
+%if 0%{?pclinuxos} || 0%{?suse_version} && 0%{?opensuse_bs} == 0
 %debug_package
 %endif
 
+##########
+
 
 %prep
 %setup -q -n %{name}-%{tde_version}%{?preversion:~%{preversion}}
@@ -177,14 +215,14 @@ export PATH="%{tde_bindir}:${PATH}"
 
 
 %post
-update-desktop-database %{tde_appdir} > /dev/null
+update-desktop-database %{tde_tdeappdir} > /dev/null
 for f in hicolor locolor; do
   touch --no-create %{tde_datadir}/icons/${f} || :
   gtk-update-icon-cache --quiet %{tde_datadir}/icons/${f} || :
 done
 
 %postun
-update-desktop-database %{tde_appdir} > /dev/null
+update-desktop-database %{tde_tdeappdir} > /dev/null
 for f in hicolor locolor; do
   touch --no-create %{tde_datadir}/icons/${f} || :
   gtk-update-icon-cache --quiet %{tde_datadir}/icons/${f} || :
@@ -217,5 +255,5 @@ done
 
 
 %changelog
-* Mon Jul 29 2013 Francois Andriot <francois.andriot@free.fr> - 1.7.0-7
+* Mon Jul 29 2013 Francois Andriot <francois.andriot@free.fr> - 2:1.7.0-1
 - Initial release for TDE 14.0.0
diff --git a/redhat/applications/rosegarden/rosegarden-3.5.13-fix_gcc47_compilation.patch b/redhat/applications/rosegarden/rosegarden-3.5.13-fix_gcc47_compilation.patch
deleted file mode 100644
index 596cddfd6..000000000
--- a/redhat/applications/rosegarden/rosegarden-3.5.13-fix_gcc47_compilation.patch
+++ /dev/null
@@ -1,334 +0,0 @@
-commit 15276f365c15527fbb10d42e3f5896f540de7413
-Author: Darrell Anderson <humanreadable@yahoo.com>
-Date:   1334351761 -0500
-
-    Updated to build with gcc 4.7.
-
-diff --git a/src/base/Sets.h b/src/base/Sets.h
-index 4fe14d1..2a59ed0 100644
---- a/src/base/Sets.h
-+++ b/src/base/Sets.h
-@@ -287,7 +287,7 @@ AbstractSet<Element, Container>::initialise()
-     m_final = m_baseIterator;
-     sample(m_baseIterator, true);
- 
--    if (getAsEvent(m_baseIterator)->isa(Note::EventType)) {
-+    if (AbstractSet::getAsEvent(m_baseIterator)->isa(Note::EventType)) {
-         m_initialNote = m_baseIterator;
-         m_finalNote = m_baseIterator;
-     }
-@@ -300,7 +300,7 @@ AbstractSet<Element, Container>::initialise()
-     for (i = j = m_baseIterator; i != getContainer().begin() && test(--j); i = j){
-         if (sample(j, false)) {
-             m_initial = j;
--            if (getAsEvent(j)->isa(Note::EventType)) {
-+            if (AbstractSet::getAsEvent(j)->isa(Note::EventType)) {
- 		m_initialNote = j;
- 		if (m_finalNote == getContainer().end()) {
- 		    m_finalNote = j;
-@@ -317,7 +317,7 @@ AbstractSet<Element, Container>::initialise()
-     for (i = j = m_baseIterator; ++j != getContainer().end() && test(j); i = j) {
-         if (sample(j, true)) {
-             m_final = j;
--            if (getAsEvent(j)->isa(Note::EventType)) {
-+            if (AbstractSet::getAsEvent(j)->isa(Note::EventType)) {
- 		m_finalNote = j;
- 		if (m_initialNote == getContainer().end()) {
- 		    m_initialNote = j;
-@@ -332,17 +332,17 @@ bool
- AbstractSet<Element, Container>::sample(const Iterator &i, bool)
- {
-     const Quantizer &q(getQuantizer());
--    Event *e = getAsEvent(i);
-+    Event *e = AbstractSet::getAsEvent(i);
-     timeT d(q.getQuantizedDuration(e));
-     
-     if (e->isa(Note::EventType) || d > 0) {
-         if (m_longest == getContainer().end() ||
--            d > q.getQuantizedDuration(getAsEvent(m_longest))) {
-+            d > q.getQuantizedDuration(AbstractSet::getAsEvent(m_longest))) {
- //          std::cerr << "New longest in set at duration " << d << " and time " << e->getAbsoluteTime() << std::endl;
-             m_longest = i;
-         }
-         if (m_shortest == getContainer().end() ||
--            d < q.getQuantizedDuration(getAsEvent(m_shortest))) {
-+            d < q.getQuantizedDuration(AbstractSet::getAsEvent(m_shortest))) {
- //          std::cerr << "New shortest in set at duration " << d << " and time " << e->getAbsoluteTime() << std::endl;
-             m_shortest = i;
-         }
-@@ -352,12 +352,12 @@ AbstractSet<Element, Container>::sample(const Iterator &i, bool)
-         long p = get__Int(e, BaseProperties::PITCH);
- 
-         if (m_highest == getContainer().end() ||
--            p > get__Int(getAsEvent(m_highest), BaseProperties::PITCH)) {
-+            p > get__Int(AbstractSet::getAsEvent(m_highest), BaseProperties::PITCH)) {
- //          std::cerr << "New highest in set at pitch " << p << " and time " << e->getAbsoluteTime() << std::endl;
-             m_highest = i;
-         }
-         if (m_lowest == getContainer().end() ||
--            p < get__Int(getAsEvent(m_lowest), BaseProperties::PITCH)) {
-+            p < get__Int(AbstractSet::getAsEvent(m_lowest), BaseProperties::PITCH)) {
- //          std::cerr << "New lowest in set at pitch " << p << " and time " << e->getAbsoluteTime() << std::endl;
-             m_lowest = i;
-         }
-@@ -376,8 +376,8 @@ GenericChord<Element, Container, singleStaff>::GenericChord(Container &c,
-                                                             PropertyName stemUpProperty) :
-     AbstractSet<Element, Container>(c, i, q),
-     m_stemUpProperty(stemUpProperty),
--    m_time(q->getQuantizedAbsoluteTime(getAsEvent(i))),
--    m_subordering(getAsEvent(i)->getSubOrdering()),
-+    m_time(q->getQuantizedAbsoluteTime(GenericChord::getAsEvent(i))),
-+    m_subordering(GenericChord::getAsEvent(i)->getSubOrdering()),
-     m_firstReject(c.end())
- {
-     AbstractSet<Element, Container>::initialise();
-@@ -416,7 +416,7 @@ template <class Element, class Container, bool singleStaff>
- bool
- GenericChord<Element, Container, singleStaff>::test(const Iterator &i)
- {
--    Event *e = getAsEvent(i);
-+    Event *e = GenericChord::getAsEvent(i);
-     if (AbstractSet<Element, Container>::
- 	getQuantizer().getQuantizedAbsoluteTime(e) != m_time) {
- 	return false;
-@@ -452,7 +452,7 @@ bool
- GenericChord<Element, Container, singleStaff>::sample(const Iterator &i,
-                                                       bool goingForwards)
- {
--    Event *e1 = getAsEvent(i);
-+    Event *e1 = GenericChord::getAsEvent(i);
-     if (!e1->isa(Note::EventType)) {
-         if (goingForwards && m_firstReject == AbstractSet<Element, Container>::getContainer().end()) m_firstReject = i;
-         return false;
-@@ -472,7 +472,7 @@ GenericChord<Element, Container, singleStaff>::sample(const Iterator &i,
- 
-         if (AbstractSet<Element, Container>::m_baseIterator != AbstractSet<Element, Container>::getContainer().end()) {
- 
--            Event *e0 = getAsEvent(AbstractSet<Element, Container>::m_baseIterator);
-+            Event *e0 = GenericChord::getAsEvent(AbstractSet<Element, Container>::m_baseIterator);
- 
-             if (!(m_stemUpProperty == PropertyName::EmptyPropertyName)) {
- 
-@@ -518,7 +518,7 @@ GenericChord<Element, Container, singleStaff>::sample(const Iterator &i,
-     }
- 
-     AbstractSet<Element, Container>::sample(i, goingForwards);
--    push_back(i);
-+    this->push_back(i);
-     return true;
- }
- 
-@@ -560,7 +560,7 @@ GenericChord<Element, Container, singleStaff>::getMarkCountForChord() const
- 
-     for (unsigned int i = 0; i < std::vector<typename Container::iterator>::size(); ++i) {
- 
--        Event *e = getAsEvent((*this)[i]);
-+        Event *e = GenericChord::getAsEvent((*this)[i]);
-         std::vector<Mark> marks(Marks::getMarks(*e));
- 
-         for (std::vector<Mark>::iterator j = marks.begin(); j != marks.end(); ++j) {
-@@ -580,7 +580,7 @@ GenericChord<Element, Container, singleStaff>::getMarksForChord() const
- 
-     for (unsigned int i = 0; i < std::vector<typename Container::iterator>::size(); ++i) {
- 
--        Event *e = getAsEvent((*this)[i]);
-+        Event *e = GenericChord::getAsEvent((*this)[i]);
-         std::vector<Mark> marks(Marks::getMarks(*e));
- 
- 
-@@ -607,9 +607,9 @@ GenericChord<Element, Container, singleStaff>::getPitches() const
- 
-     for (typename std::vector<typename Container::iterator>::const_iterator
-              i = std::vector<typename Container::iterator>::begin(); i != std::vector<typename Container::iterator>::end(); ++i) {
--        if (getAsEvent(*i)->has(BaseProperties::PITCH)) {
-+        if (GenericChord::getAsEvent(*i)->has(BaseProperties::PITCH)) {
-             int pitch = get__Int
--                (getAsEvent(*i), BaseProperties::PITCH);
-+                (GenericChord::getAsEvent(*i), BaseProperties::PITCH);
-             if (pitches.size() > 0 && pitches[pitches.size()-1] == pitch) 
-                 continue;
-             pitches.push_back(pitch);
-@@ -641,7 +641,7 @@ GenericChord<Element, Container, singleStaff>::getPreviousNote()
-     while (1) {
-         if (i == AbstractSet<Element, Container>::getContainer().begin()) return AbstractSet<Element, Container>::getContainer().end();
-         --i;
--        if (getAsEvent(i)->isa(Note::EventType)) {
-+        if (GenericChord::getAsEvent(i)->isa(Note::EventType)) {
-             return i;
-         }
-     }
-@@ -655,7 +655,7 @@ GenericChord<Element, Container, singleStaff>::getNextNote()
-     Iterator i(AbstractSet<Element, Container>::getFinalElement());
-     while (  i != AbstractSet<Element, Container>::getContainer().end() &&
-            ++i != AbstractSet<Element, Container>::getContainer().end()) {
--        if (getAsEvent(i)->isa(Note::EventType)) {
-+        if (GenericChord::getAsEvent(i)->isa(Note::EventType)) {
-             return i;
-         }
-     }
-@@ -677,8 +677,8 @@ GenericChord<Element, Container, singleStaff>::PitchGreater::operator()(const It
-                                                            const Iterator &b)
- {
-     try {
--        long ap = get__Int(getAsEvent(a), BaseProperties::PITCH);
--        long bp = get__Int(getAsEvent(b), BaseProperties::PITCH);
-+        long ap = get__Int(GenericChord::getAsEvent(a), BaseProperties::PITCH);
-+        long bp = get__Int(GenericChord::getAsEvent(b), BaseProperties::PITCH);
-         return (ap < bp);
-     } catch (Event::NoData) {
-         std::cerr << "Bad karma: PitchGreater failed to find one or both pitches" << std::endl;
-diff --git a/src/document/RosegardenGUIDoc.cpp b/src/document/RosegardenGUIDoc.cpp
-index 3ec8e94..fab09c3 100644
---- a/src/document/RosegardenGUIDoc.cpp
-+++ b/src/document/RosegardenGUIDoc.cpp
-@@ -2106,15 +2106,15 @@ RosegardenGUIDoc::stopRecordingMidi()
- 
-         bool meaningless = true;
- 
--        for (Segment::iterator i = s->begin(); i != s->end(); ++i) {
-+        for (Segment::iterator j = s->begin(); j != s->end(); ++j) {
- 
--            if ((*i)->isa(Clef::EventType)) continue;
-+            if ((*j)->isa(Clef::EventType)) continue;
- 
-             // no rests in the segment yet, so anything else is meaningful
-             meaningless = false;
- 
--            if (!haveMeaning || (*i)->getAbsoluteTime() < earliestMeaning) {
--                earliestMeaning = (*i)->getAbsoluteTime();
-+            if (!haveMeaning || (*j)->getAbsoluteTime() < earliestMeaning) {
-+                earliestMeaning = (*j)->getAbsoluteTime();
-             }
- 
-             haveMeaning = true;
-@@ -2149,13 +2149,13 @@ RosegardenGUIDoc::stopRecordingMidi()
-          ++i) {
- 
-         Segment *s = i->second;
--        Segment::iterator i = s->begin();
-+        Segment::iterator j = s->begin();
- 
--        if (i == s->end() || !(*i)->isa(Clef::EventType)) continue;
-+        if (j == s->end() || !(*j)->isa(Clef::EventType)) continue;
- 
--        if ((*i)->getAbsoluteTime() < meaningfulBarStart) {
--            Event *e = new Event(**i, meaningfulBarStart);
--            s->erase(i);
-+        if ((*j)->getAbsoluteTime() < meaningfulBarStart) {
-+            Event *e = new Event(**j, meaningfulBarStart);
-+            s->erase(j);
-             s->insert(e);
-         }
-     }
-diff --git a/src/gui/application/LircClient.cpp b/src/gui/application/LircClient.cpp
-index 7664b9e..8b20c84 100644
---- a/src/gui/application/LircClient.cpp
-+++ b/src/gui/application/LircClient.cpp
-@@ -36,6 +36,7 @@
- #include <tqsocketnotifier.h>
- #include <fcntl.h>
- #include <cstdlib>
-+#include <unistd.h>
- 
- namespace Rosegarden
- {
-diff --git a/src/gui/application/LircCommander.cpp b/src/gui/application/LircCommander.cpp
-index e323539..61afaca 100644
---- a/src/gui/application/LircCommander.cpp
-+++ b/src/gui/application/LircCommander.cpp
-@@ -37,7 +37,7 @@
- #include "RosegardenGUIView.h"
- 
- #include <tqobject.h>
--
-+#include <unistd.h>
- 
- namespace Rosegarden
- {
-diff --git a/src/gui/application/main.cpp b/src/gui/application/main.cpp
-index b3147de..0744afa 100644
---- a/src/gui/application/main.cpp
-+++ b/src/gui/application/main.cpp
-@@ -22,6 +22,7 @@
- #include <tqtimer.h>
- #include <kapplication.h>
- #include <sys/time.h>
-+#include <unistd.h>
- #include "base/RealTime.h"
- 
- #include <kcmdlineargs.h>
-diff --git a/src/gui/seqmanager/ControlBlockMmapper.cpp b/src/gui/seqmanager/ControlBlockMmapper.cpp
-index 6e4560d..2417c67 100644
---- a/src/gui/seqmanager/ControlBlockMmapper.cpp
-+++ b/src/gui/seqmanager/ControlBlockMmapper.cpp
-@@ -42,6 +42,7 @@
- #include <fcntl.h>
- #include <sys/mman.h>
- #include <errno.h>
-+#include <unistd.h>
- 
- namespace Rosegarden
- {
-diff --git a/src/gui/seqmanager/SegmentMmapper.cpp b/src/gui/seqmanager/SegmentMmapper.cpp
-index b859aa6..29fe715 100644
---- a/src/gui/seqmanager/SegmentMmapper.cpp
-+++ b/src/gui/seqmanager/SegmentMmapper.cpp
-@@ -45,7 +45,7 @@
- #include <fcntl.h>
- #include <sys/mman.h>
- #include <errno.h>
--
-+#include <unistd.h>
- 
- namespace Rosegarden
- {
-diff --git a/src/gui/seqmanager/SequencerMapper.cpp b/src/gui/seqmanager/SequencerMapper.cpp
-index eec66a0..3a051e3 100644
---- a/src/gui/seqmanager/SequencerMapper.cpp
-+++ b/src/gui/seqmanager/SequencerMapper.cpp
-@@ -40,7 +40,7 @@
- #include <fcntl.h>
- #include <sys/mman.h>
- #include <errno.h>
--
-+#include <unistd.h>
- 
- namespace Rosegarden
- {
-diff --git a/src/gui/studio/AudioPluginManager.cpp b/src/gui/studio/AudioPluginManager.cpp
-index 24b49f2..4457493 100644
---- a/src/gui/studio/AudioPluginManager.cpp
-+++ b/src/gui/studio/AudioPluginManager.cpp
-@@ -37,7 +37,7 @@
- #include <tqmutex.h>
- #include <tqstring.h>
- #include <tqthread.h>
--
-+#include <unistd.h>
- 
- namespace Rosegarden
- {
-diff --git a/src/gui/studio/AudioPluginOSCGUIManager.cpp b/src/gui/studio/AudioPluginOSCGUIManager.cpp
-index 13da726..7b8bbd3 100644
---- a/src/gui/studio/AudioPluginOSCGUIManager.cpp
-+++ b/src/gui/studio/AudioPluginOSCGUIManager.cpp
-@@ -25,6 +25,7 @@
- #ifdef HAVE_LIBLO
- 
- #include <lo/lo.h>
-+#include <unistd.h>
- 
- #include "AudioPluginOSCGUIManager.h"
- 
-diff --git a/src/sound/RingBuffer.h b/src/sound/RingBuffer.h
-index 0cc5dc6..6ea0d4e 100644
---- a/src/sound/RingBuffer.h
-+++ b/src/sound/RingBuffer.h
-@@ -24,6 +24,7 @@
- 
- #include <sys/types.h>
- #include <sys/mman.h>
-+#include <string.h>
- 
- #include "Scavenger.h"
- 
diff --git a/redhat/applications/rosegarden/rosegarden-3.5.13-fix_gcc47_compilation_2.patch b/redhat/applications/rosegarden/rosegarden-3.5.13-fix_gcc47_compilation_2.patch
deleted file mode 100644
index 99bbd7f17..000000000
--- a/redhat/applications/rosegarden/rosegarden-3.5.13-fix_gcc47_compilation_2.patch
+++ /dev/null
@@ -1,20 +0,0 @@
---- rosegarden/src/gui/editors/segment/segmentcanvas/AudioPreviewUpdater.cpp.ORI	2012-05-06 12:31:01.464997883 +0200
-+++ rosegarden/src/gui/editors/segment/segmentcanvas/AudioPreviewUpdater.cpp	2012-05-06 12:31:19.271625694 +0200
-@@ -22,6 +22,7 @@
-     COPYING included with this distribution for more information.
- */
- 
-+#include <unistd.h>
- 
- #include "AudioPreviewUpdater.h"
- 
---- rosegarden/src/gui/editors/segment/segmentcanvas/AudioPreviewUpdater.h.ORI	2012-05-06 12:32:47.222788008 +0200
-+++ rosegarden/src/gui/editors/segment/segmentcanvas/AudioPreviewUpdater.h	2012-05-06 12:33:01.046499259 +0200
-@@ -26,6 +26,7 @@
- #ifndef _RG_AUDIOPREVIEWUPDATER_H_
- #define _RG_AUDIOPREVIEWUPDATER_H_
- 
-+#include <unistd.h>
- #include <tqobject.h>
- #include <tqrect.h>
- #include <vector>
diff --git a/redhat/applications/rosegarden/rosegarden-3.5.13-ftbfs.patch b/redhat/applications/rosegarden/rosegarden-3.5.13-ftbfs.patch
deleted file mode 100644
index 6967f300c..000000000
--- a/redhat/applications/rosegarden/rosegarden-3.5.13-ftbfs.patch
+++ /dev/null
@@ -1,10 +0,0 @@
---- rosegarden/src/CMakeLists.txt.ORI	2011-11-26 23:09:57.776046683 +0100
-+++ rosegarden/src/CMakeLists.txt	2011-11-26 23:10:07.534844583 +0100
-@@ -148,6 +148,7 @@
- 
- TARGET_LINK_LIBRARIES(rosegarden
-     dl
-+    fontconfig
-     lo
-     ${QT_AND_KDECORE_LIBS} 
-     ${LIBLO_LIBS}
diff --git a/redhat/applications/rosegarden/rosegarden-3.5.13-missing_ldflags.patch b/redhat/applications/rosegarden/rosegarden-3.5.13-missing_ldflags.patch
deleted file mode 100644
index f4e7d4b98..000000000
--- a/redhat/applications/rosegarden/rosegarden-3.5.13-missing_ldflags.patch
+++ /dev/null
@@ -1,15 +0,0 @@
---- rosegarden/src/CMakeLists.txt.ORI	2012-08-06 15:14:11.135307943 +0200
-+++ rosegarden/src/CMakeLists.txt	2012-08-06 15:14:13.950244825 +0200
-@@ -150,11 +150,11 @@
- TARGET_LINK_LIBRARIES(rosegarden
-     dl
-     lo
-+    ${XFT_LIBS}
-     ${QT_AND_KDECORE_LIBS} 
-     ${LIBLO_LIBS}
-     ${LRDF_LIBS}
-     ${FFTW3F_LIBS}
--    ${XFT_LIBS}
-     ${LIRC_LIBS}
-     ${JACK_LIBS}
-     kio
diff --git a/redhat/applications/rosegarden/rosegarden-3.5.13.1.spec b/redhat/applications/rosegarden/rosegarden-3.5.13.1.spec
deleted file mode 100644
index 081bc5d98..000000000
--- a/redhat/applications/rosegarden/rosegarden-3.5.13.1.spec
+++ /dev/null
@@ -1,222 +0,0 @@
-# Default version for this component
-%define kdecomp rosegarden
-
-# Required for Mageia 2: removes the ldflag '--no-undefined'
-%define _disable_ld_no_undefined 1
-
-# If TDE is built in a specific prefix (e.g. /opt/trinity), the release will be suffixed with ".opt".
-%if "%{?tde_prefix}" != "/usr"
-%define _variant .opt
-%endif
-
-# TDE 3.5.13 specific building variables
-%define tde_bindir %{tde_prefix}/bin
-%define tde_datadir %{tde_prefix}/share
-%define tde_docdir %{tde_datadir}/doc
-%define tde_includedir %{tde_prefix}/include
-%define tde_libdir %{tde_prefix}/%{_lib}
-%define tde_mandir %{tde_datadir}/man
-%define tde_appdir %{tde_datadir}/applications
-
-%define tde_tdeappdir %{tde_appdir}/kde
-%define tde_tdedocdir %{tde_docdir}/tde
-%define tde_tdeincludedir %{tde_includedir}/tde
-%define tde_tdelibdir %{tde_libdir}/trinity
-
-%define _docdir %{tde_tdedocdir}
-
-
-Name:		trinity-%{kdecomp}
-Summary:	music editor and MIDI/audio sequencer [Trinity]
-Version:	1.7.0
-Release:	3%{?dist}%{?_variant}
-
-License:	GPLv2+
-Group: 	    Applications/Multimedia
-
-Vendor:		Trinity Project
-Packager:	Francois Andriot <francois.andriot@free.fr>
-URL:		http://www.rosegardenmusic.com/
-
-Prefix:    %{tde_prefix}
-BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
-
-Source0:	%{kdecomp}-3.5.13.1.tar.gz
-
-Patch0:		rosegarden-3.5.13-ftbfs.patch
-
-BuildRequires:	trinity-tqtinterface-devel >= 3.5.13.1
-BuildRequires:	trinity-tdelibs-devel >= 3.5.13.1
-BuildRequires:	trinity-tdebase-devel >= 3.5.13.1
-BuildRequires:	desktop-file-utils
-BuildRequires:	gettext
-
-BuildRequires:	fftw-devel
-BuildRequires:	dssi-devel
-BuildRequires:	liblo-devel
-BuildRequires:	liblrdf-devel
-BuildRequires:	fontconfig-devel
-
-%if 0%{?mgaversion} || 0%{?mdkversion}
-BuildRequires:	%{_lib}jack-devel
-%else
-BuildRequires:	lirc-devel
-BuildRequires:	jack-audio-connection-kit-devel
-%endif
-
-Requires:	lilypond
-Requires:	perl-XML-Twig
-
-%if 0%{?mgaversion} || 0%{?mdkversion} || 0%{?suse_version}
-Requires:	libsndfile-progs
-%else
-%if 0%{?rhel}
-Requires:	libsndfile
-%else
-Requires:	libsndfile-utils
-%endif
-%endif
-
-# LIRC does not exist on RHEL.
-%if 0%{?fedora} > 0
-BuildRequires:	lirc-devel
-%endif
-
-Requires:	%{name}-data == %{version}-%{release}
-
-%description
-Rosegarden is a KDE application which provides a mixed Audio/MIDI
-sequencer (for playback and recording), a multi-track editor, music
-editing using both piano-roll and score notation, MIDI file IO,
-lilypond and Csound files export, etc.
-
-%package data
-Group: 	    Applications/Multimedia
-Requires:	%{name} == %{version}-%{release}
-Summary:	music editor and MIDI/audio sequencer data files [Trinity]
-
-%description data
-Rosegarden is a KDE application which provides a mixed Audio/MIDI
-sequencer (for playback and recording), a multi-track editor, music
-editing using both piano-roll and score notation, MIDI file IO,
-lilypond and Csound files export, etc.
-
-This package provides the data files necessary for running Rosegarden
-
-
-%if 0%{?suse_version} || 0%{?pclinuxos}
-%debug_package
-%endif
-
-
-%prep
-%setup -q -n %{kdecomp}-3.5.13.1
-%patch0 -p1
-
-# Hard-coded path to TQT binaries spotted !!!
-%__sed -i CMakeLists.txt \
-	-e "s|/usr/bin/uic-tqt|%{tde_bindir}/uic-tqt|g" \
-	-e "s|/usr/bin/tmoc|%{tde_bindir}/tmoc|g" \
-	-e "s|/usr/include/tqt|%{tde_includedir}/tqt|g"
-
-%build
-unset QTDIR && . %{_sysconfdir}/profile.d/qt3.sh
-export PATH="%{tde_bindir}:${PATH}"
-export LDFLAGS="-L%{tde_libdir} -I%{tde_includedir}"
-export CMAKE_INCLUDE_PATH="%{tde_includedir}:%{tde_includedir}/tqt:%{tde_tdeincludedir}"
-
-%if 0%{?rhel} || 0%{?fedora} || 0%{?suse_version}
-%__mkdir_p build
-cd build
-%endif
-
-### FIXME FIXME FIXME !!! FTBFS on Mageia 2 / Mandriva 2011
-export LDFLAGS="${LDFLAGS} -lXft -lfontconfig -lkio -lkdeprint -llrdf -lfftw3f -llirc_client -ljack"
-
-%cmake \
-  -DCMAKE_INSTALL_PREFIX=%{tde_prefix} \
-  -DBIN_INSTALL_DIR=%{tde_bindir} \
-  -DINCLUDE_INSTALL_DIR=%{tde_tdeincludedir} \
-  -DLIB_INSTALL_DIR=%{tde_libdir} \
-  -DSHARE_INSTALL_PREFIX=%{tde_datadir} \
-  -DCMAKE_SKIP_RPATH="OFF" \
-  -DWANT_DEBUG=OFF \
-  -DWANT_FULLDBG=OFF \
-  -DWANT_SOUND=ON \
-  -DWANT_JACK=ON \
-  -DWANT_DSSI=ON \
-%if 0%{?fedora} || 0%{?mgaversion} || 0%{?mdkversion}
-  -DWANT_LIRC=ON \
-%else
-  -DWANT_LIRC=OFF \
-%endif
-  -DWANT_PCH=OFF \
-  -DWANT_TEST=OFF \
-  -DBUILD_ALL=ON \
-  ..
-
-%__make %{?_smp_mflags}
-
-
-%install
-export PATH="%{tde_bindir}:${PATH}"
-%__rm -rf %{buildroot}
-%__make install DESTDIR=%{buildroot} -C build
-
-
-%find_lang %{kdecomp}
-
-%clean
-%__rm -rf %{buildroot}
-
-
-%post
-update-desktop-database %{tde_appdir} > /dev/null
-for f in hicolor locolor; do
-  touch --no-create %{tde_datadir}/icons/${f} || :
-  gtk-update-icon-cache --quiet %{tde_datadir}/icons/${f} || :
-done
-
-%postun
-update-desktop-database %{tde_appdir} > /dev/null
-for f in hicolor locolor; do
-  touch --no-create %{tde_datadir}/icons/${f} || :
-  gtk-update-icon-cache --quiet %{tde_datadir}/icons/${f} || :
-done
-
-
-%files
-%defattr(-,root,root,-)
-%{tde_bindir}/rosegarden
-%{tde_bindir}/rosegarden-audiofile-importer
-%{tde_bindir}/rosegarden-lilypondview
-%{tde_bindir}/rosegarden-project-package
-%{tde_bindir}/rosegardensequencer
-
-%files data -f %{kdecomp}.lang
-%defattr(-,root,root,-)
-%{tde_tdeappdir}/rosegarden.desktop
-%{tde_datadir}/apps/profiles/rosegarden.profile.xml
-%lang(en) %{tde_tdedocdir}/HTML/en/rosegarden
-%lang(es) %{tde_tdedocdir}/HTML/es/rosegarden
-%lang(ja) %{tde_tdedocdir}/HTML/ja/rosegarden
-%lang(sv) %{tde_tdedocdir}/HTML/sv/rosegarden
-%{tde_datadir}/apps/rosegarden
-%{tde_datadir}/icons/hicolor/*/*/*
-%{tde_datadir}/icons/locolor/*/*/*
-%{tde_datadir}/mimelnk/audio/x-rosegarden-device.desktop
-%{tde_datadir}/mimelnk/audio/x-rosegarden.desktop
-%{tde_datadir}/mimelnk/audio/x-rosegarden21.desktop
-%{tde_datadir}/mimelnk/audio/x-soundfont.desktop
-
-
-%changelog
-* Wed Oct 03 2012 Francois Andriot <francois.andriot@free.fr> - 1.7.0-3
-- Initial release for TDE 3.5.13.1
-
-* Sun Apr 06 2012 Francois Andriot <francois.andriot@free.fr> - 1.7.0-2
-- Updated to build with gcc 4.7. [Commit #15276f36]
-- Enables JACK support
-
-* Sat Nov 26 2011 Francois Andriot <francois.andriot@free.fr> - 1.7.0-1
-- Initial release for RHEL 5, RHEL 6, Fedora 15, Fedora 16
diff --git a/redhat/applications/rosegarden/rosegarden-3.5.13.spec b/redhat/applications/rosegarden/rosegarden-3.5.13.spec
deleted file mode 100644
index f80dc9573..000000000
--- a/redhat/applications/rosegarden/rosegarden-3.5.13.spec
+++ /dev/null
@@ -1,222 +0,0 @@
-# Default version for this component
-%define kdecomp rosegarden
-
-# Required for Mageia 2: removes the ldflag '--no-undefined'
-%define _disable_ld_no_undefined 1
-
-# If TDE is built in a specific prefix (e.g. /opt/trinity), the release will be suffixed with ".opt".
-%if "%{?tde_prefix}" != "/usr"
-%define _variant .opt
-%endif
-
-# TDE 3.5.13 specific building variables
-%define tde_bindir %{tde_prefix}/bin
-%define tde_datadir %{tde_prefix}/share
-%define tde_docdir %{tde_datadir}/doc
-%define tde_includedir %{tde_prefix}/include
-%define tde_libdir %{tde_prefix}/%{_lib}
-%define tde_mandir %{tde_datadir}/man
-%define tde_appdir %{tde_datadir}/applications
-
-%define tde_tdeappdir %{tde_appdir}/kde
-%define tde_tdedocdir %{tde_docdir}/kde
-%define tde_tdeincludedir %{tde_includedir}/kde
-%define tde_tdelibdir %{tde_libdir}/trinity
-
-%define _docdir %{tde_tdedocdir}
-
-
-Name:		trinity-%{kdecomp}
-Summary:	music editor and MIDI/audio sequencer [Trinity]
-Version:	1.7.0
-Release:	2%{?dist}%{?_variant}
-
-License:	GPLv2+
-Group: 	    Applications/Multimedia
-
-Vendor:		Trinity Project
-Packager:	Francois Andriot <francois.andriot@free.fr>
-URL:		http://www.rosegardenmusic.com/
-
-Prefix:    %{tde_prefix}
-BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
-
-Source0:	%{kdecomp}-3.5.13.tar.gz
-
-Patch0:		rosegarden-3.5.13-ftbfs.patch
-
-# [rosegarden] Updated to build with gcc 4.7. [Commit #15276f36]
-Patch1:		rosegarden-3.5.13-fix_gcc47_compilation.patch
-
-# [rosegarden] Updated to build with gcc 4.7. [Bug #958]
-Patch2:		rosegarden-3.5.13-fix_gcc47_compilation_2.patch
-
-BuildRequires:	tqtinterface-devel
-BuildRequires:	trinity-tdelibs-devel
-BuildRequires:	trinity-tdebase-devel
-BuildRequires:	desktop-file-utils
-BuildRequires:	gettext
-
-BuildRequires:	fftw-devel
-BuildRequires:	dssi-devel
-BuildRequires:	liblo-devel
-BuildRequires:	liblrdf-devel
-BuildRequires:	fontconfig-devel
-
-%if 0%{?mgaversion} || 0%{?mdkversion}
-BuildRequires:	%{_lib}jack-devel
-%else
-BuildRequires:	lirc-devel
-BuildRequires:	jack-audio-connection-kit-devel
-%endif
-
-Requires:	lilypond
-Requires:	perl-XML-Twig
-
-%if 0%{?mgaversion} || 0%{?mdkversion}
-Requires:	libsndfile-progs
-%else
-%if 0%{?rhel}
-Requires:	libsndfile
-%else
-Requires:	libsndfile-utils
-%endif
-%endif
-
-# LIRC does not exist on RHEL.
-%if 0%{?fedora} > 0
-BuildRequires:	lirc-devel
-%endif
-
-Requires:	%{name}-data == %{version}-%{release}
-
-%description
-Rosegarden is a KDE application which provides a mixed Audio/MIDI
-sequencer (for playback and recording), a multi-track editor, music
-editing using both piano-roll and score notation, MIDI file IO,
-lilypond and Csound files export, etc.
-
-%package data
-Group: 	    Applications/Multimedia
-Requires:	%{name} == %{version}-%{release}
-Summary:	music editor and MIDI/audio sequencer data files [Trinity]
-
-%description data
-Rosegarden is a KDE application which provides a mixed Audio/MIDI
-sequencer (for playback and recording), a multi-track editor, music
-editing using both piano-roll and score notation, MIDI file IO,
-lilypond and Csound files export, etc.
-
-This package provides the data files necessary for running Rosegarden
-
-
-%prep
-%setup -q -n applications/%{kdecomp}
-%patch0 -p1
-%patch1 -p1
-%patch2 -p1
-
-# Hard-coded path to TQT binaries spotted !!!
-%__sed -i CMakeLists.txt \
-	-e "s|/usr/bin/uic-tqt|%{tde_bindir}/uic-tqt|g" \
-	-e "s|/usr/bin/tmoc|%{tde_bindir}/tmoc|g" \
-	-e "s|/usr/include/tqt|%{tde_includedir}/tqt|g"
-
-%build
-unset QTDIR && . %{_sysconfdir}/profile.d/qt.sh
-export PATH="%{tde_bindir}:${PATH}"
-export LDFLAGS="-L%{tde_libdir} -I%{tde_includedir}"
-export CMAKE_INCLUDE_PATH="%{tde_includedir}:%{tde_includedir}/tqt:%{tde_tdeincludedir}"
-
-%if 0%{?rhel} || 0%{?fedora}
-%__mkdir_p build
-cd build
-%endif
-
-### FIXME FIXME FIXME !!! FTBFS on Mageia 2 / Mandriva 2011
-export LDFLAGS="${LDFLAGS} -lXft -lfontconfig -lkio -lkdeprint -llrdf -lfftw3f -llirc_client -ljack"
-
-%cmake \
-  -DCMAKE_INSTALL_PREFIX=%{tde_prefix} \
-  -DBIN_INSTALL_DIR=%{tde_bindir} \
-  -DINCLUDE_INSTALL_DIR=%{tde_tdeincludedir} \
-  -DLIB_INSTALL_DIR=%{tde_libdir} \
-  -DSHARE_INSTALL_PREFIX=%{tde_datadir} \
-  -DCMAKE_SKIP_RPATH="OFF" \
-  -DWANT_DEBUG=OFF \
-  -DWANT_FULLDBG=OFF \
-  -DWANT_SOUND=ON \
-  -DWANT_JACK=ON \
-  -DWANT_DSSI=ON \
-%if 0%{?fedora} || 0%{?mgaversion} || 0%{?mdkversion}
-  -DWANT_LIRC=ON \
-%else
-  -DWANT_LIRC=OFF \
-%endif
-  -DWANT_PCH=OFF \
-  -DWANT_TEST=OFF \
-  -DBUILD_ALL=ON \
-  ..
-
-%__make %{?_smp_mflags}
-
-
-%install
-export PATH="%{tde_bindir}:${PATH}"
-%__rm -rf %{buildroot}
-%__make install DESTDIR=%{buildroot} -C build
-
-
-%find_lang %{kdecomp}
-
-%clean
-%__rm -rf %{buildroot}
-
-
-%post
-update-desktop-database %{tde_appdir} > /dev/null
-for f in hicolor locolor; do
-  touch --no-create %{tde_datadir}/icons/${f} || :
-  gtk-update-icon-cache --quiet %{tde_datadir}/icons/${f} || :
-done
-
-%postun
-update-desktop-database %{tde_appdir} > /dev/null
-for f in hicolor locolor; do
-  touch --no-create %{tde_datadir}/icons/${f} || :
-  gtk-update-icon-cache --quiet %{tde_datadir}/icons/${f} || :
-done
-
-
-%files
-%defattr(-,root,root,-)
-%{tde_bindir}/rosegarden
-%{tde_bindir}/rosegarden-audiofile-importer
-%{tde_bindir}/rosegarden-lilypondview
-%{tde_bindir}/rosegarden-project-package
-%{tde_bindir}/rosegardensequencer
-
-%files data -f %{kdecomp}.lang
-%defattr(-,root,root,-)
-%{tde_tdeappdir}/rosegarden.desktop
-%{tde_datadir}/apps/profiles/rosegarden.profile.xml
-%lang(en) %{tde_tdedocdir}/HTML/en/rosegarden
-%lang(es) %{tde_tdedocdir}/HTML/es/rosegarden
-%lang(ja) %{tde_tdedocdir}/HTML/ja/rosegarden
-%lang(sv) %{tde_tdedocdir}/HTML/sv/rosegarden
-%{tde_datadir}/apps/rosegarden
-%{tde_datadir}/icons/hicolor/*/*/*
-%{tde_datadir}/icons/locolor/*/*/*
-%{tde_datadir}/mimelnk/audio/x-rosegarden-device.desktop
-%{tde_datadir}/mimelnk/audio/x-rosegarden.desktop
-%{tde_datadir}/mimelnk/audio/x-rosegarden21.desktop
-%{tde_datadir}/mimelnk/audio/x-soundfont.desktop
-
-
-%Changelog
-* Sun Apr 06 2012 Francois Andriot <francois.andriot@free.fr> - 1.7.0-2
-- Updated to build with gcc 4.7. [Commit #15276f36]
-- Enables JACK support
-
-* Sat Nov 26 2011 Francois Andriot <francois.andriot@free.fr> - 1.7.0-1
-- Initial release for RHEL 5, RHEL 6, Fedora 15, Fedora 16