Update to 0.49.5

6 files changed, 21 insertions, 392 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 244a23a5c821..68981815ad19 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,29 +1,22 @@
 pkgbase = traverso
 	pkgdesc = Digital Audio Workstation with an innovative User Interface
-	pkgver = 0.49.4
+	pkgver = 0.49.5
 	pkgrel = 1
 	url = http://traverso-daw.org/
-	install = traverso.install
 	arch = i686
 	arch = x86_64
 	license = GPL
 	makedepends = cmake
-	depends = qt4
+	depends = qt5-base
 	depends = jack
 	depends = fftw
 	depends = wavpack
 	depends = lame
 	depends = libmad
-	depends = shared-mime-info
 	depends = lilv
-	source = http://ftp.debian.org/debian/pool/main/t/traverso/traverso_0.49.4.orig.tar.gz
-	source = traverso.1
-	source = 01-fix_build.patch
-	source = 02-fix_spelling.patch
-	md5sums = 35711db624ccb09044ea1a8dad2695ed
-	md5sums = da7454cb60b276aa1637ad79250e9ffb
-	md5sums = cb4c62ff0f38600c235216f87bace9f0
-	md5sums = d9839ac123cddb63692fc1258297877f
+	depends = hicolor-icon-theme
+	source = http://traverso-daw.org/traverso-0.49.5.tar.gz
+	sha256sums = 75980d93e600d9cca0ee086819e2c8c07740631c4da096b78aec00e432d62d99
 
 pkgname = traverso
 
diff --git a/01-fix_build.patch b/01-fix_build.patch
deleted file mode 100644
index 8974d574a4df..000000000000
--- a/01-fix_build.patch
+++ /dev/null
@@ -1,17 +0,0 @@
-Author: Jaromír Mikeš <mira.mikes@seznam.cz>
-Description: Fixing build. Thanks to Fabian Greffrath <fabian@greffrath.com>
-Forwarded: yes
-
-Index: traverso/src/core/InputEngine.cpp
-===================================================================
---- traverso.orig/src/core/InputEngine.cpp
-+++ traverso/src/core/InputEngine.cpp
-@@ -1519,7 +1519,7 @@ int InputEngine::init_map(const QString&
- 				exists = true;
- 				QString errorstring = QString("InputEngine:: keyfact with: type=%1, key1='%2', key2='%3' already exists!\n"
- 						"You should only define keyfact types one time!!\n").arg(keyFactType).arg(key1).arg(key2); 
--				printf(QS_C(errorstring));
-+				printf("%s",QS_C(errorstring));
- 				info().warning(errorstring);
- 				break;
- 			}
diff --git a/02-fix_spelling.patch b/02-fix_spelling.patch
deleted file mode 100644
index 74c086fe88e4..000000000000
--- a/02-fix_spelling.patch
+++ /dev/null
@@ -1,276 +0,0 @@
-Author: Jaromír Mikeš <mira.mikes@seznam.cz>
-Description: Fix spelling.
-Forwarded: yes
-
-Index: traverso/src/core/InputEngine.cpp
-===================================================================
---- traverso.orig/src/core/InputEngine.cpp
-+++ traverso/src/core/InputEngine.cpp
-@@ -194,7 +194,7 @@ InputEngine::InputEngine()
- 		CommandPlugin* plug = qobject_cast<CommandPlugin*>(loader.instance());
- 		if (plug) {
- 			m_commandplugins.insert(plug->metaObject()->className(), plug);
--			printf("InputEngine:: Succesfully loaded plugin: %s\n", plug->metaObject()->className());
-+			printf("InputEngine:: Successfully loaded plugin: %s\n", plug->metaObject()->className());
- 		} else {
- 			printf("InputEngine:: Plugin load failed with %s\n", QS_C(loader.errorString()));
- 		}
-Index: traverso/src/engine/PADriver.cpp
-===================================================================
---- traverso.orig/src/engine/PADriver.cpp
-+++ traverso/src/engine/PADriver.cpp
-@@ -130,7 +130,7 @@ int PADriver::setup(bool capture, bool p
- 		Pa_Terminate();
- 		return -1;
- 	} else {
--		printf("PADriver:: Succesfully initialized portaudio\n");
-+		printf("PADriver:: Successfully initialized portaudio\n");
- 	}
- 	
- 	
-@@ -218,7 +218,7 @@ int PADriver::setup(bool capture, bool p
- 		Pa_Terminate();
- 		return -1;
- 	} else {
--		printf("PADriver:: Succesfully opened portaudio stream\n");
-+		printf("PADriver:: Successfully opened portaudio stream\n");
- 	}
- 	
- 	AudioChannel* audiochannel;
-@@ -264,7 +264,7 @@ int PADriver::start( )
- 		Pa_Terminate();
- 		return -1;
- 	} else {
--		printf("PADriver:: Succesfully started portaudio stream\n");
-+		printf("PADriver:: Successfully started portaudio stream\n");
- 	}
- 	
- 	return 1;
-@@ -279,7 +279,7 @@ int PADriver::stop( )
- 		device->message((tr("PADriver:: PortAudio error: %1").arg(Pa_GetErrorText( err ))), AudioDevice::WARNING);
- 		Pa_Terminate();
- 	} else {
--		printf("PADriver:: Succesfully closed portaudio stream\n\n");
-+		printf("PADriver:: Successfully closed portaudio stream\n\n");
- 	}
- 	
- 	return 1;
-Index: traverso/src/plugins/LV2/LV2Plugin.cpp
-===================================================================
---- traverso.orig/src/plugins/LV2/LV2Plugin.cpp
-+++ traverso/src/plugins/LV2/LV2Plugin.cpp
-@@ -238,7 +238,7 @@ int LV2Plugin::create_instance()
- 		printf("Failed to instantiate plugin.\n");
- 		return -1;
- 	} else {
--// 		printf("Succesfully instantiated plugin.\n\n");
-+// 		printf("Successfully instantiated plugin.\n\n");
- 	}
- 	
- 	return 1;
-Index: traverso/src/sheetcanvas/AudioClipView.cpp
-===================================================================
---- traverso.orig/src/sheetcanvas/AudioClipView.cpp
-+++ traverso/src/sheetcanvas/AudioClipView.cpp
-@@ -1010,7 +1010,7 @@ Command * AudioClipView::set_audio_file(
- 		// but it's not the proper place to do so!!
- 		m_clip->set_sheet(m_sheet);
- 		
--		info().information(tr("Succesfully set AudioClip file to %1").arg(filename));
-+		info().information(tr("Successfully set AudioClip file to %1").arg(filename));
- 		
- 		return ie().succes();
- 	}
-Index: traverso/src/traverso/dialogs/RestoreProjectBackupDialog.cpp
-===================================================================
---- traverso.orig/src/traverso/dialogs/RestoreProjectBackupDialog.cpp
-+++ traverso/src/traverso/dialogs/RestoreProjectBackupDialog.cpp
-@@ -47,7 +47,7 @@ void RestoreProjectBackupDialog::accept(
- 	
- 	if (sucess) {
- 		pm().load_project(m_projectname);
--		info().information(tr("Succesfully restored backup from %1").arg(QDateTime::fromTime_t(restoretime).toString()));
-+		info().information(tr("Successfully restored backup from %1").arg(QDateTime::fromTime_t(restoretime).toString()));
- 		hide();
- 	}
- 	
-Index: traverso/resources/translations/traverso_bg.ts
-===================================================================
---- traverso.orig/resources/translations/traverso_bg.ts
-+++ traverso/resources/translations/traverso_bg.ts
-@@ -526,7 +526,7 @@ effect after restarting Traverso!</sourc
-     </message>
-     <message>
-         <location filename="../../src/sheetcanvas/AudioClipView.cpp" line="1013"/>
--        <source>Succesfully set AudioClip file to %1</source>
-+        <source>Successfully set AudioClip file to %1</source>
-         <translation>Успешно бе зададен АудиоКлип файл за %1</translation>
-     </message>
- </context>
-@@ -2852,7 +2852,7 @@ p, li { white-space: pre-wrap; }
-     </message>
-     <message>
-         <location filename="../../src/core/ProjectConverter.cpp" line="304"/>
--        <source>Conversion finished succesfully</source>
-+        <source>Conversion finished successfully</source>
-         <translation>Конвертирането завърши успешно</translation>
-     </message>
-     <message>
-Index: traverso/resources/translations/traverso_cs.ts
-===================================================================
---- traverso.orig/resources/translations/traverso_cs.ts
-+++ traverso/resources/translations/traverso_cs.ts
-@@ -562,7 +562,7 @@ projeví až po novém spuštění Trave
-     </message>
-     <message>
-         <location filename="../../src/sheetcanvas/AudioClipView.cpp" line="1013"/>
--        <source>Succesfully set AudioClip file to %1</source>
-+        <source>Successfully set AudioClip file to %1</source>
-         <translation>Soubor se zvukovou ukázkou byl úspěšně nastaven na %1</translation>
-     </message>
- </context>
-@@ -3004,7 +3004,7 @@ p, li { white-space: pre-wrap; }
-     </message>
-     <message>
-         <location filename="../../src/core/ProjectConverter.cpp" line="304"/>
--        <source>Conversion finished succesfully</source>
-+        <source>Conversion finished successfully</source>
-         <translation>Převod byl dokončen úspěšně</translation>
-     </message>
-     <message>
-Index: traverso/resources/translations/traverso_de.ts
-===================================================================
---- traverso.orig/resources/translations/traverso_de.ts
-+++ traverso/resources/translations/traverso_de.ts
-@@ -553,7 +553,7 @@ effect after restarting Traverso!</sourc
-     </message>
-     <message>
-         <location filename="../../src/sheetcanvas/AudioClipView.cpp" line="1013"/>
--        <source>Succesfully set AudioClip file to %1</source>
-+        <source>Successfully set AudioClip file to %1</source>
-         <translation>AudioClip Datei erfolgreich auf %1 gesetzt</translation>
-     </message>
- </context>
-@@ -2981,7 +2981,7 @@ nach (Neu)laden des Projektes angewandt.
-     </message>
-     <message>
-         <location filename="../../src/core/ProjectConverter.cpp" line="304"/>
--        <source>Conversion finished succesfully</source>
-+        <source>Conversion finished successfully</source>
-         <translation>Konvertierung erfolgreich beendet</translation>
-     </message>
-     <message>
-Index: traverso/resources/translations/traverso_es.ts
-===================================================================
---- traverso.orig/resources/translations/traverso_es.ts
-+++ traverso/resources/translations/traverso_es.ts
-@@ -564,7 +564,7 @@ efecto al reiniciar Traverso!</translati
-     </message>
-     <message>
-         <location filename="../../src/sheetcanvas/AudioClipView.cpp" line="1013"/>
--        <source>Succesfully set AudioClip file to %1</source>
-+        <source>Successfully set AudioClip file to %1</source>
-         <translation>Archivo de AudioClip asignado correctamente  a %1</translation>
-     </message>
- </context>
-@@ -3014,7 +3014,7 @@ p, li { white-space: pre-wrap; }
-     </message>
-     <message>
-         <location filename="../../src/core/ProjectConverter.cpp" line="304"/>
--        <source>Conversion finished succesfully</source>
-+        <source>Conversion finished successfully</source>
-         <translation>La conversión finalizó con éxito</translation>
-     </message>
-     <message>
-Index: traverso/resources/translations/traverso_fr.ts
-===================================================================
---- traverso.orig/resources/translations/traverso_fr.ts
-+++ traverso/resources/translations/traverso_fr.ts
-@@ -525,7 +525,7 @@ effect after restarting Traverso!</sourc
-     </message>
-     <message>
-         <location filename="../../src/sheetcanvas/AudioClipView.cpp" line="1013"/>
--        <source>Succesfully set AudioClip file to %1</source>
-+        <source>Successfully set AudioClip file to %1</source>
-         <translation type="unfinished"></translation>
-     </message>
- </context>
-@@ -2863,7 +2863,7 @@ p, li { white-space: pre-wrap; }
-     </message>
-     <message>
-         <location filename="../../src/core/ProjectConverter.cpp" line="304"/>
--        <source>Conversion finished succesfully</source>
-+        <source>Conversion finished successfully</source>
-         <translation>Conversion réalisée avec succès</translation>
-     </message>
-     <message>
-Index: traverso/resources/translations/traverso_nl.ts
-===================================================================
---- traverso.orig/resources/translations/traverso_nl.ts
-+++ traverso/resources/translations/traverso_nl.ts
-@@ -553,7 +553,7 @@ effect after restarting Traverso!</sourc
-     </message>
-     <message>
-         <location filename="../../src/sheetcanvas/AudioClipView.cpp" line="1013"/>
--        <source>Succesfully set AudioClip file to %1</source>
-+        <source>Successfully set AudioClip file to %1</source>
-         <translation>Bestand %1 succesvol toegewezen aan AudioClip</translation>
-     </message>
- </context>
-@@ -2956,7 +2956,7 @@ laden van het project.</translation>
-     </message>
-     <message>
-         <location filename="../../src/core/ProjectConverter.cpp" line="304"/>
--        <source>Conversion finished succesfully</source>
-+        <source>Conversion finished successfully</source>
-         <translation>Omzetting met succes afgerond</translation>
-     </message>
-     <message>
-Index: traverso/resources/translations/traverso_pt.ts
-===================================================================
---- traverso.orig/resources/translations/traverso_pt.ts
-+++ traverso/resources/translations/traverso_pt.ts
-@@ -525,7 +525,7 @@ effect after restarting Traverso!</sourc
-     </message>
-     <message>
-         <location filename="../../src/sheetcanvas/AudioClipView.cpp" line="1013"/>
--        <source>Succesfully set AudioClip file to %1</source>
-+        <source>Successfully set AudioClip file to %1</source>
-         <translation type="unfinished"></translation>
-     </message>
- </context>
-@@ -2837,7 +2837,7 @@ p, li { white-space: pre-wrap; }
-     </message>
-     <message>
-         <location filename="../../src/core/ProjectConverter.cpp" line="304"/>
--        <source>Conversion finished succesfully</source>
-+        <source>Conversion finished successfully</source>
-         <translation type="unfinished"></translation>
-     </message>
-     <message>
-Index: traverso/src/core/ProjectConverter.cpp
-===================================================================
---- traverso.orig/src/core/ProjectConverter.cpp
-+++ traverso/src/core/ProjectConverter.cpp
-@@ -301,7 +301,7 @@ int ProjectConverter::save_converted_doc
- 
- void ProjectConverter::conversion_finished()
- {
--	emit message(tr("Conversion finished succesfully"));
-+	emit message(tr("Conversion finished successfully"));
- }
- 
- QString ProjectConverter::get_conversion_description()
-Index: traverso/src/engine/AudioDevice.h
-===================================================================
---- traverso.orig/src/engine/AudioDevice.h
-+++ traverso/src/engine/AudioDevice.h
-@@ -233,7 +233,7 @@ signals:
- 	void stopped();
- 	
- 	/**
--	 *      The started() signal is emited ones the AudioThread and AudioDriver have been succesfully
-+	 *      The started() signal is emited ones the AudioThread and AudioDriver have been successfully
- 	 *	setup.
- 	 */
- 	void started();
diff --git a/PKGBUILD b/PKGBUILD
index 37cf51738b61..cd4b5029fb70 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -3,56 +3,39 @@
 # Contributor: Philipp Überbacher <murks at lavabit dot com>
 
 pkgname=traverso
-pkgver=0.49.4
+pkgver=0.49.5
 pkgrel=1
 pkgdesc="Digital Audio Workstation with an innovative User Interface"
 arch=('i686' 'x86_64')
 url="http://traverso-daw.org/"
 license=('GPL')
-depends=('qt4' 'jack' 'fftw' 'wavpack' 'lame' 'libmad' 'shared-mime-info' 'lilv')
+depends=('qt5-base' 'jack' 'fftw' 'wavpack' 'lame' 'libmad' 'lilv' 'hicolor-icon-theme')
 makedepends=('cmake')
-install="traverso.install"
-# files traverso.1 01-fix_build.patch 02-fix_spelling.patch taken from:
-# http://ftp.debian.org/debian/pool/main/t/traverso/traverso_0.49.4-1.debian.tar.xz
-source=("http://ftp.debian.org/debian/pool/main/t/traverso/traverso_$pkgver.orig.tar.gz"
-		traverso.1 01-fix_build.patch 02-fix_spelling.patch )
-
-md5sums=('35711db624ccb09044ea1a8dad2695ed'
-         'da7454cb60b276aa1637ad79250e9ffb'
-         'cb4c62ff0f38600c235216f87bace9f0'
-         'd9839ac123cddb63692fc1258297877f')
+source=("http://traverso-daw.org/traverso-0.49.5.tar.gz")
+sha256sums=('75980d93e600d9cca0ee086819e2c8c07740631c4da096b78aec00e432d62d99')
 
 prepare() {
-	cd "$pkgname-$pkgver"
-	patch -p1 -i ../01-fix_build.patch
-	patch -p1 -i ../02-fix_spelling.patch
+  mkdir -p build
 }
 
 build() {
-	cd "$pkgname-$pkgver"
-	[[ -d bld ]] || mkdir bld && cd bld
-	cmake .. -DCMAKE_INSTALL_PREFIX="/usr" \
-        -DCMAKE_SHARED_LINKER_FLAGS+=" -Wl,--no-undefined -Wl,--as-needed" \
-        -DCMAKE_MODULE_LINKER_FLAGS+=" -Wl,--no-undefined -Wl,--as-needed" \
-        -DUSE_SYSTEM_SLV2_LIBRARY=ON \
-        -DWANT_MP3_ENCODE=ON
-	make
+  cd build
+  cmake ../$pkgname-$pkgver \
+     -DCMAKE_INSTALL_PREFIX="/usr" \
+     -DWANT_MP3_ENCODE=ON
+  make
 }
 
 package(){
-  cd "$pkgname-$pkgver"
-  cd bld; make DESTDIR="$pkgdir/" install
-  cd ../resources
-  # desktop file
-  sed '/Path/d' -i traverso.desktop 
-  install -Dm644  traverso.desktop "$pkgdir"/usr/share/applications/traverso.desktop
+  cd build
+  make DESTDIR="$pkgdir" install
+
+  cd ../$pkgname-$pkgver/resources
+  install -Dm644 traverso.desktop "$pkgdir"/usr/share/applications/traverso.desktop
 
-  # icons
-  install -dm755 "$pkgdir"/usr/share/icons/hicolor
+  install -d "$pkgdir"/usr/share/icons/hicolor
   cp -a freedesktop/icons/* "$pkgdir"/usr/share/icons/hicolor
 
-  # mime & docs & man
   install -Dm644 x-traverso.xml "$pkgdir"/usr/share/mime/packages/x-traverso.xml
   install -Dm644 help.text "$pkgdir"/usr/share/doc/traverso/help.txt
-  install -Dm644 "${srcdir}"/traverso.1 "$pkgdir"/usr/share/man/man1/traverso.1
 }
diff --git a/traverso.1 b/traverso.1
deleted file mode 100644
index 1de8d431cc16..000000000000
--- a/traverso.1
+++ /dev/null
@@ -1,41 +0,0 @@
-.TH TRAVERSO 1 "November  5, 2007"
-.SH NAME
-traverso \- a multitrack audio recorder and editor
-.SH SYNOPSIS
-.B traverso
-.RI [ options ]
-.SH DESCRIPTION
-This manual page documents briefly the
-.B traverso
-command.
-.PP
-\fBtraverso\fP is a multitrack audio recording and editing 
-suite, with an innovative and easy to master user interface.
-.SH OPTIONS
-A summary of options is included below.
-.TP
-.B \-h, \-\-help
-Show summary of options.
-.TP
-.B \-v
-Show version of program.
-.TP
-.B \-\-d1
-Set debug level to 1 (BASIC).
-.TP
-.B \-\-d2
-Set debug level to 2 (FLOOD).
-.TP
-.B \-\-d3
-Set debug level to 3 (SUPER_FLOOD).
-.TP
-.B \-\-d4
-Set debug level to 4 (ALL).
-.TP
-.B \-\-log
-Create a ~/traverso.log file instead of dumping debug messages to stdout.
-.SH AUTHOR
-traverso was written by Remon Sijrier.
-.PP
-This manual page was written by G\[:u]rkan Seng\[:u]n <gurkan@phys.ethz.ch>,
-for the Debian project (but may be used by others).
diff --git a/traverso.install b/traverso.install
deleted file mode 100644
index aede1a2910c9..000000000000
--- a/traverso.install
+++ /dev/null
@@ -1,13 +0,0 @@
-post_install() {
-  gtk-update-icon-cache -q -t -f usr/share/icons/hicolor
-  update-mime-database usr/share/mime
-  update-desktop-database -q
-}
-
-post_upgrade() {
-  post_install
-}
-
-post_remove() {
-  post_install
-}