[arch-commits] Commit in hydrogen/repos/community-x86_64 (21 files)

David Runge dvzrv at archlinux.org
Sun Mar 11 11:39:47 UTC 2018


    Date: Sunday, March 11, 2018 @ 11:39:45
  Author: dvzrv
Revision: 306171

archrelease: copy trunk to community-x86_64

Added:
  hydrogen/repos/community-x86_64/1000_portaudio_v2.patch
    (from rev 306170, hydrogen/trunk/1000_portaudio_v2.patch)
  hydrogen/repos/community-x86_64/1010-spelling.patch
    (from rev 306170, hydrogen/trunk/1010-spelling.patch)
  hydrogen/repos/community-x86_64/PKGBUILD
    (from rev 306170, hydrogen/trunk/PKGBUILD)
  hydrogen/repos/community-x86_64/fix_cmake_cache.patch
    (from rev 306170, hydrogen/trunk/fix_cmake_cache.patch)
  hydrogen/repos/community-x86_64/fix_cxx_flags.patch
    (from rev 306170, hydrogen/trunk/fix_cxx_flags.patch)
  hydrogen/repos/community-x86_64/fix_desktop_file.patch
    (from rev 306170, hydrogen/trunk/fix_desktop_file.patch)
  hydrogen/repos/community-x86_64/fix_dtd_version.patch
    (from rev 306170, hydrogen/trunk/fix_dtd_version.patch)
  hydrogen/repos/community-x86_64/fix_man_path.patch
    (from rev 306170, hydrogen/trunk/fix_man_path.patch)
  hydrogen/repos/community-x86_64/fix_missing_locale.patch
    (from rev 306170, hydrogen/trunk/fix_missing_locale.patch)
  hydrogen/repos/community-x86_64/fix_rubberband_path.patch
    (from rev 306170, hydrogen/trunk/fix_rubberband_path.patch)
Deleted:
  hydrogen/repos/community-x86_64/1000_portaudio_v2.patch
  hydrogen/repos/community-x86_64/1010-spelling.patch
  hydrogen/repos/community-x86_64/PKGBUILD
  hydrogen/repos/community-x86_64/fix_cmake_cache.patch
  hydrogen/repos/community-x86_64/fix_cxx_flags.patch
  hydrogen/repos/community-x86_64/fix_desktop_file.patch
  hydrogen/repos/community-x86_64/fix_dtd_version.patch
  hydrogen/repos/community-x86_64/fix_man_path.patch
  hydrogen/repos/community-x86_64/fix_missing_locale.patch
  hydrogen/repos/community-x86_64/fix_python2.patch
  hydrogen/repos/community-x86_64/fix_rubberband_path.patch

---------------------------+
 1000_portaudio_v2.patch   |   86 ++++++------
 1010-spelling.patch       |  306 ++++++++++++++++++++++----------------------
 PKGBUILD                  |  231 ++++++++++++++++-----------------
 fix_cmake_cache.patch     |   24 +--
 fix_cxx_flags.patch       |   22 +--
 fix_desktop_file.patch    |   50 +++----
 fix_dtd_version.patch     |   44 +++---
 fix_man_path.patch        |   22 +--
 fix_missing_locale.patch  |   20 +-
 fix_python2.patch         |    8 -
 fix_rubberband_path.patch |   22 +--
 11 files changed, 416 insertions(+), 419 deletions(-)

Deleted: 1000_portaudio_v2.patch
===================================================================
--- 1000_portaudio_v2.patch	2018-03-11 11:39:17 UTC (rev 306170)
+++ 1000_portaudio_v2.patch	2018-03-11 11:39:45 UTC (rev 306171)
@@ -1,43 +0,0 @@
-Description: ???
-Author: ???
-Forwarded: mauser at smoors.de
----
-This patch header follows DEP-3: http://dep.debian.net/deps/dep3/
---- a/src/core/include/hydrogen/IO/PortAudioDriver.h
-+++ b/src/core/include/hydrogen/IO/PortAudioDriver.h
-@@ -30,6 +30,9 @@
- 
- #ifdef H2CORE_HAVE_PORTAUDIO
- 
-+#define PortAudioStream PaStream
-+#define PaTimestamp PaTime
-+
- #include <inttypes.h>
- #include <portaudio.h>
- 
---- a/src/core/src/IO/portaudio_driver.cpp
-+++ b/src/core/src/IO/portaudio_driver.cpp
-@@ -68,7 +68,13 @@
- 	m_pOut_L = new float[ m_nBufferSize ];
- 	m_pOut_R = new float[ m_nBufferSize ];
- 
--	int err = Pa_Initialize();
-+	PaError err = Pa_Initialize();
-+
-+	typedef struct
-+	{
-+    		float left_phase;
-+    		float right_phase;
-+	} paTestData;
- 
- 
- 	if ( err != paNoError ) {
-@@ -84,7 +90,7 @@
- 				m_nSampleRate,          // sample rate
- 				m_nBufferSize,            // frames per buffer
- 				portAudioCallback, /* specify our custom callback */
--				this );        /* pass our data through to callback */
-+				(void*)this );        /* pass our data through to callback */
- 
- 
- 	if ( err != paNoError ) {

Copied: hydrogen/repos/community-x86_64/1000_portaudio_v2.patch (from rev 306170, hydrogen/trunk/1000_portaudio_v2.patch)
===================================================================
--- 1000_portaudio_v2.patch	                        (rev 0)
+++ 1000_portaudio_v2.patch	2018-03-11 11:39:45 UTC (rev 306171)
@@ -0,0 +1,43 @@
+Description: ???
+Author: ???
+Forwarded: mauser at smoors.de
+---
+This patch header follows DEP-3: http://dep.debian.net/deps/dep3/
+--- a/src/core/include/hydrogen/IO/PortAudioDriver.h
++++ b/src/core/include/hydrogen/IO/PortAudioDriver.h
+@@ -30,6 +30,9 @@
+ 
+ #ifdef H2CORE_HAVE_PORTAUDIO
+ 
++#define PortAudioStream PaStream
++#define PaTimestamp PaTime
++
+ #include <inttypes.h>
+ #include <portaudio.h>
+ 
+--- a/src/core/src/IO/portaudio_driver.cpp
++++ b/src/core/src/IO/portaudio_driver.cpp
+@@ -68,7 +68,13 @@
+ 	m_pOut_L = new float[ m_nBufferSize ];
+ 	m_pOut_R = new float[ m_nBufferSize ];
+ 
+-	int err = Pa_Initialize();
++	PaError err = Pa_Initialize();
++
++	typedef struct
++	{
++    		float left_phase;
++    		float right_phase;
++	} paTestData;
+ 
+ 
+ 	if ( err != paNoError ) {
+@@ -84,7 +90,7 @@
+ 				m_nSampleRate,          // sample rate
+ 				m_nBufferSize,            // frames per buffer
+ 				portAudioCallback, /* specify our custom callback */
+-				this );        /* pass our data through to callback */
++				(void*)this );        /* pass our data through to callback */
+ 
+ 
+ 	if ( err != paNoError ) {

Deleted: 1010-spelling.patch
===================================================================
--- 1010-spelling.patch	2018-03-11 11:39:17 UTC (rev 306170)
+++ 1010-spelling.patch	2018-03-11 11:39:45 UTC (rev 306171)
@@ -1,153 +0,0 @@
-Description:  Fix some spelling.
-Author: Jaromír Mikeš <mira.mikes at seznam.cz>
-Forwarded: mauser at smoors.de
----
-This patch header follows DEP-3: http://dep.debian.net/deps/dep3/
---- a/src/core/src/IO/jack_output.cpp
-+++ b/src/core/src/IO/jack_output.cpp
-@@ -152,13 +152,13 @@
- 		INFOLOG( "Could not connect so saved out-ports. Connecting to first pair of in-ports" );
- 		const char ** portnames = jack_get_ports ( client, NULL, NULL, JackPortIsInput );
- 		if ( !portnames || !portnames[0] || !portnames[1] ) {
--			ERRORLOG( "Could't locate two Jack input port" );
-+			ERRORLOG( "Couldn't locate two Jack input ports" );
- 			Hydrogen::get_instance()->raiseError( Hydrogen::JACK_CANNOT_CONNECT_OUTPUT_PORT );
- 			return 2;
- 		}
- 		if ( jack_connect( client, jack_port_name( output_port_1 ), portnames[0] ) != 0 ||
- 			 jack_connect( client, jack_port_name( output_port_2 ), portnames[1] ) != 0 ) {
--			ERRORLOG( "Could't connect to first pair of Jack input ports" );
-+			ERRORLOG( "Couldn't connect to first pair of Jack input ports" );
- 			Hydrogen::get_instance()->raiseError( Hydrogen::JACK_CANNOT_CONNECT_OUTPUT_PORT );
- 			return 2;
- 		}
---- a/src/core/src/IO/midi_input.cpp
-+++ b/src/core/src/IO/midi_input.cpp
-@@ -254,7 +254,7 @@
- 		else if(Preferences::get_instance()->m_bMidiFixedMapping ){
- 			pInstr = instrList->findMidiNote( nNote );
- 			if(pInstr == NULL) {
--				ERRORLOG( QString( "Can't find correponding Intrument for note %1" ).arg( nNote ));
-+				ERRORLOG( QString( "Can't find corresponding Instrument for note %1" ).arg( nNote ));
- 				return;
- 			}
- 			nInstrument = instrList->index(pInstr);
---- a/src/core/src/helpers/legacy.cpp
-+++ b/src/core/src/helpers/legacy.cpp
-@@ -106,7 +106,7 @@
- 					DEBUGLOG( "Using back compatibility code. filename node found" );
- 					QString sFilename = instrument_node.read_string( "filename", "" );
- 					if( sFilename.isEmpty() ) {
--						ERRORLOG( "filename back compability node is empty" );
-+						ERRORLOG( "filename back compatibility node is empty" );
- 					} else {
- 
- 						Sample* sample = new Sample( dk_path+"/"+sFilename );
---- a/src/core/src/helpers/xml.cpp
-+++ b/src/core/src/helpers/xml.cpp
-@@ -159,7 +159,7 @@
- {
- 	QFile file( filepath );
- 	if ( !file.open( QIODevice::WriteOnly | QIODevice::Text | QIODevice::Truncate ) ) {
--		ERRORLOG( QString( "Unable to open %1 for writting" ).arg( filepath ) );
-+		ERRORLOG( QString( "Unable to open %1 for writing" ).arg( filepath ) );
- 		return false;
- 	}
- 	QTextStream out( &file );
---- a/src/core/src/lilypond/lilypond.cpp
-+++ b/src/core/src/lilypond/lilypond.cpp
-@@ -30,7 +30,7 @@
-  * It contains the notation style (states the position of notes), and for this
-  * it follows the "Guide to Standardized Drumset Notation" by Norman Weinberg.
-  *
-- * Note that the GM-kit uses two unconventionnal intruments: "Stick" and
-+ * Note that the GM-kit uses two unconventionnal instruments: "Stick" and
-  * "Hand Clap", so for those I did what I could and used the recommended
-  * triangle notehead to distinguish them for drum and cymbal notation.
-  */
---- a/src/core/src/midi_action.cpp
-+++ b/src/core/src/midi_action.cpp
-@@ -87,7 +87,7 @@
- * in midi_input.cpp .
- *
- * Each action has two independ parameters. The two parameters are optional and
--* can be used to carry additional informations, which mean
-+* can be used to carry additional information, which mean
- * only something to this very Action. They can have totally different meanings for other Actions.
- * Example: parameter1 is the Mixer strip and parameter 2 a multiplier for the volume change on this strip
- *
---- a/src/core/src/preferences.cpp
-+++ b/src/core/src/preferences.cpp
-@@ -102,7 +102,7 @@
- 
- 	char * ladpath = getenv( "LADSPA_PATH" );	// read the Environment variable LADSPA_PATH
- 	if ( ladpath ) {
--		INFOLOG( "Found LADSPA_PATH enviroment variable" );
-+		INFOLOG( "Found LADSPA_PATH environment variable" );
- 		QString sLadspaPath = QString::fromLocal8Bit(ladpath);
- 		int pos;
- 		while ( ( pos = sLadspaPath.indexOf( ":" ) ) != -1 ) {
---- a/src/gui/src/ExportSongDialog.cpp
-+++ b/src/gui/src/ExportSongDialog.cpp
-@@ -66,7 +66,7 @@
- 	setWindowTitle( trUtf8( "Export song" ) );
- 
- 	exportTypeCombo->addItem(trUtf8("Export to a single track"));
--	exportTypeCombo->addItem(trUtf8("Export to seperate tracks"));
-+	exportTypeCombo->addItem(trUtf8("Export to separate tracks"));
- 	exportTypeCombo->addItem(trUtf8("Both"));
- 
- 	HydrogenApp::get_instance()->addEventListener( this );
---- a/src/gui/src/PatternEditor/DrumPatternEditor.cpp
-+++ b/src/gui/src/PatternEditor/DrumPatternEditor.cpp
-@@ -92,7 +92,7 @@
- 	// check engine state
- 	int state = engine->getState();
- 	if ( (state != STATE_READY) && (state != STATE_PLAYING) ) {
--		ERRORLOG( "FIXME: skipping pattern editor update (state shoud be READY or PLAYING)" );
-+		ERRORLOG( "FIXME: skipping pattern editor update (state should be READY or PLAYING)" );
- 		return;
- 	}
- 
---- a/src/gui/src/SampleEditor/SampleEditor_UI.ui
-+++ b/src/gui/src/SampleEditor/SampleEditor_UI.ui
-@@ -641,7 +641,7 @@
- <p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;">  4   default processing options</p>
- <p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;">  5   equivalent to --no-lamination --window-short (may be good for drums)</p>
- <p style="-qt-paragraph-type:empty; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"></p>
--<p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;">more informations about you can find here:</p>
-+<p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;">you can find more information here:</p>
- <p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"><a href="http://www.breakfastquay.com/rubberband/ "><span style=" text-decoration: underline; color:#0000ff;">http://www.breakfastquay.com/rubberband/ </span></a></p></body></html></string>
-            </property>
-            <item>
---- a/src/gui/src/SoundLibrary/SoundLibraryPanel.cpp
-+++ b/src/gui/src/SoundLibrary/SoundLibraryPanel.cpp
-@@ -493,7 +493,7 @@
- 	bool conditionalLoad = false;
- 	bool hasNotes = false;
- 
--	INFOLOG("Old kit has " + QString::number( oldCount ) + " intruments, new one has " + QString::number( newCount ) );
-+	INFOLOG("Old kit has " + QString::number( oldCount ) + " instruments, new one has " + QString::number( newCount ) );
- 
- 	if ( newCount < oldCount )
- 	{
-@@ -520,7 +520,7 @@
- 			QMessageBox msgBox;
- 			msgBox.setWindowTitle("Hydrogen");
- 			msgBox.setIcon( QMessageBox::Warning );
--			msgBox.setText( tr( "The existing kit has %1 instruments but the new one only has %2.\nThe first %2 instruments will be replaced with the new intruments and will keep their notes, but some of the remaining instruments have notes.\nWould you like to keep or discard the remaining instruments and notes?\n").arg( QString::number( oldCount ),QString::number( newCount ) ) );
-+			msgBox.setText( tr( "The existing kit has %1 instruments but the new one only has %2.\nThe first %2 instruments will be replaced with the new instruments and will keep their notes, but some of the remaining instruments have notes.\nWould you like to keep or discard the remaining instruments and notes?\n").arg( QString::number( oldCount ),QString::number( newCount ) ) );
- 
- 			msgBox.setStandardButtons(QMessageBox::Save);
- 			msgBox.setButtonText(QMessageBox::Save, trUtf8("Keep"));
---- a/src/core/src/local_file_mgr.cpp
-+++ b/src/core/src/local_file_mgr.cpp
-@@ -1078,7 +1078,7 @@
- 		return false;
- 	} else  {
- 		_WARNINGLOG( QString("File '%1' is being read in "
--							 "TinyXML compatability mode")
-+							 "TinyXML compatibility mode")
- 					 .arg(filename) );
- 		return true;
- 	}

Copied: hydrogen/repos/community-x86_64/1010-spelling.patch (from rev 306170, hydrogen/trunk/1010-spelling.patch)
===================================================================
--- 1010-spelling.patch	                        (rev 0)
+++ 1010-spelling.patch	2018-03-11 11:39:45 UTC (rev 306171)
@@ -0,0 +1,153 @@
+Description:  Fix some spelling.
+Author: Jaromír Mikeš <mira.mikes at seznam.cz>
+Forwarded: mauser at smoors.de
+---
+This patch header follows DEP-3: http://dep.debian.net/deps/dep3/
+--- a/src/core/src/IO/jack_output.cpp
++++ b/src/core/src/IO/jack_output.cpp
+@@ -152,13 +152,13 @@
+ 		INFOLOG( "Could not connect so saved out-ports. Connecting to first pair of in-ports" );
+ 		const char ** portnames = jack_get_ports ( client, NULL, NULL, JackPortIsInput );
+ 		if ( !portnames || !portnames[0] || !portnames[1] ) {
+-			ERRORLOG( "Could't locate two Jack input port" );
++			ERRORLOG( "Couldn't locate two Jack input ports" );
+ 			Hydrogen::get_instance()->raiseError( Hydrogen::JACK_CANNOT_CONNECT_OUTPUT_PORT );
+ 			return 2;
+ 		}
+ 		if ( jack_connect( client, jack_port_name( output_port_1 ), portnames[0] ) != 0 ||
+ 			 jack_connect( client, jack_port_name( output_port_2 ), portnames[1] ) != 0 ) {
+-			ERRORLOG( "Could't connect to first pair of Jack input ports" );
++			ERRORLOG( "Couldn't connect to first pair of Jack input ports" );
+ 			Hydrogen::get_instance()->raiseError( Hydrogen::JACK_CANNOT_CONNECT_OUTPUT_PORT );
+ 			return 2;
+ 		}
+--- a/src/core/src/IO/midi_input.cpp
++++ b/src/core/src/IO/midi_input.cpp
+@@ -254,7 +254,7 @@
+ 		else if(Preferences::get_instance()->m_bMidiFixedMapping ){
+ 			pInstr = instrList->findMidiNote( nNote );
+ 			if(pInstr == NULL) {
+-				ERRORLOG( QString( "Can't find correponding Intrument for note %1" ).arg( nNote ));
++				ERRORLOG( QString( "Can't find corresponding Instrument for note %1" ).arg( nNote ));
+ 				return;
+ 			}
+ 			nInstrument = instrList->index(pInstr);
+--- a/src/core/src/helpers/legacy.cpp
++++ b/src/core/src/helpers/legacy.cpp
+@@ -106,7 +106,7 @@
+ 					DEBUGLOG( "Using back compatibility code. filename node found" );
+ 					QString sFilename = instrument_node.read_string( "filename", "" );
+ 					if( sFilename.isEmpty() ) {
+-						ERRORLOG( "filename back compability node is empty" );
++						ERRORLOG( "filename back compatibility node is empty" );
+ 					} else {
+ 
+ 						Sample* sample = new Sample( dk_path+"/"+sFilename );
+--- a/src/core/src/helpers/xml.cpp
++++ b/src/core/src/helpers/xml.cpp
+@@ -159,7 +159,7 @@
+ {
+ 	QFile file( filepath );
+ 	if ( !file.open( QIODevice::WriteOnly | QIODevice::Text | QIODevice::Truncate ) ) {
+-		ERRORLOG( QString( "Unable to open %1 for writting" ).arg( filepath ) );
++		ERRORLOG( QString( "Unable to open %1 for writing" ).arg( filepath ) );
+ 		return false;
+ 	}
+ 	QTextStream out( &file );
+--- a/src/core/src/lilypond/lilypond.cpp
++++ b/src/core/src/lilypond/lilypond.cpp
+@@ -30,7 +30,7 @@
+  * It contains the notation style (states the position of notes), and for this
+  * it follows the "Guide to Standardized Drumset Notation" by Norman Weinberg.
+  *
+- * Note that the GM-kit uses two unconventionnal intruments: "Stick" and
++ * Note that the GM-kit uses two unconventionnal instruments: "Stick" and
+  * "Hand Clap", so for those I did what I could and used the recommended
+  * triangle notehead to distinguish them for drum and cymbal notation.
+  */
+--- a/src/core/src/midi_action.cpp
++++ b/src/core/src/midi_action.cpp
+@@ -87,7 +87,7 @@
+ * in midi_input.cpp .
+ *
+ * Each action has two independ parameters. The two parameters are optional and
+-* can be used to carry additional informations, which mean
++* can be used to carry additional information, which mean
+ * only something to this very Action. They can have totally different meanings for other Actions.
+ * Example: parameter1 is the Mixer strip and parameter 2 a multiplier for the volume change on this strip
+ *
+--- a/src/core/src/preferences.cpp
++++ b/src/core/src/preferences.cpp
+@@ -102,7 +102,7 @@
+ 
+ 	char * ladpath = getenv( "LADSPA_PATH" );	// read the Environment variable LADSPA_PATH
+ 	if ( ladpath ) {
+-		INFOLOG( "Found LADSPA_PATH enviroment variable" );
++		INFOLOG( "Found LADSPA_PATH environment variable" );
+ 		QString sLadspaPath = QString::fromLocal8Bit(ladpath);
+ 		int pos;
+ 		while ( ( pos = sLadspaPath.indexOf( ":" ) ) != -1 ) {
+--- a/src/gui/src/ExportSongDialog.cpp
++++ b/src/gui/src/ExportSongDialog.cpp
+@@ -66,7 +66,7 @@
+ 	setWindowTitle( trUtf8( "Export song" ) );
+ 
+ 	exportTypeCombo->addItem(trUtf8("Export to a single track"));
+-	exportTypeCombo->addItem(trUtf8("Export to seperate tracks"));
++	exportTypeCombo->addItem(trUtf8("Export to separate tracks"));
+ 	exportTypeCombo->addItem(trUtf8("Both"));
+ 
+ 	HydrogenApp::get_instance()->addEventListener( this );
+--- a/src/gui/src/PatternEditor/DrumPatternEditor.cpp
++++ b/src/gui/src/PatternEditor/DrumPatternEditor.cpp
+@@ -92,7 +92,7 @@
+ 	// check engine state
+ 	int state = engine->getState();
+ 	if ( (state != STATE_READY) && (state != STATE_PLAYING) ) {
+-		ERRORLOG( "FIXME: skipping pattern editor update (state shoud be READY or PLAYING)" );
++		ERRORLOG( "FIXME: skipping pattern editor update (state should be READY or PLAYING)" );
+ 		return;
+ 	}
+ 
+--- a/src/gui/src/SampleEditor/SampleEditor_UI.ui
++++ b/src/gui/src/SampleEditor/SampleEditor_UI.ui
+@@ -641,7 +641,7 @@
+ <p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;">  4   default processing options</p>
+ <p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;">  5   equivalent to --no-lamination --window-short (may be good for drums)</p>
+ <p style="-qt-paragraph-type:empty; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"></p>
+-<p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;">more informations about you can find here:</p>
++<p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;">you can find more information here:</p>
+ <p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"><a href="http://www.breakfastquay.com/rubberband/ "><span style=" text-decoration: underline; color:#0000ff;">http://www.breakfastquay.com/rubberband/ </span></a></p></body></html></string>
+            </property>
+            <item>
+--- a/src/gui/src/SoundLibrary/SoundLibraryPanel.cpp
++++ b/src/gui/src/SoundLibrary/SoundLibraryPanel.cpp
+@@ -493,7 +493,7 @@
+ 	bool conditionalLoad = false;
+ 	bool hasNotes = false;
+ 
+-	INFOLOG("Old kit has " + QString::number( oldCount ) + " intruments, new one has " + QString::number( newCount ) );
++	INFOLOG("Old kit has " + QString::number( oldCount ) + " instruments, new one has " + QString::number( newCount ) );
+ 
+ 	if ( newCount < oldCount )
+ 	{
+@@ -520,7 +520,7 @@
+ 			QMessageBox msgBox;
+ 			msgBox.setWindowTitle("Hydrogen");
+ 			msgBox.setIcon( QMessageBox::Warning );
+-			msgBox.setText( tr( "The existing kit has %1 instruments but the new one only has %2.\nThe first %2 instruments will be replaced with the new intruments and will keep their notes, but some of the remaining instruments have notes.\nWould you like to keep or discard the remaining instruments and notes?\n").arg( QString::number( oldCount ),QString::number( newCount ) ) );
++			msgBox.setText( tr( "The existing kit has %1 instruments but the new one only has %2.\nThe first %2 instruments will be replaced with the new instruments and will keep their notes, but some of the remaining instruments have notes.\nWould you like to keep or discard the remaining instruments and notes?\n").arg( QString::number( oldCount ),QString::number( newCount ) ) );
+ 
+ 			msgBox.setStandardButtons(QMessageBox::Save);
+ 			msgBox.setButtonText(QMessageBox::Save, trUtf8("Keep"));
+--- a/src/core/src/local_file_mgr.cpp
++++ b/src/core/src/local_file_mgr.cpp
+@@ -1078,7 +1078,7 @@
+ 		return false;
+ 	} else  {
+ 		_WARNINGLOG( QString("File '%1' is being read in "
+-							 "TinyXML compatability mode")
++							 "TinyXML compatibility mode")
+ 					 .arg(filename) );
+ 		return true;
+ 	}

Deleted: PKGBUILD
===================================================================
--- PKGBUILD	2018-03-11 11:39:17 UTC (rev 306170)
+++ PKGBUILD	2018-03-11 11:39:45 UTC (rev 306171)
@@ -1,113 +0,0 @@
-# $Id$
-# Maintainer: David Runge <dave at sleepmap.de>
-# Contributor: Rob Til Freedmen <rob.til.freedman at gmail.com>
-# Contributor: Ray Rashif <schiv at archlinux.org>
-# Contributor: tobias <tobias at archlinux.org>
-
-pkgname=hydrogen
-pkgver=0.9.7
-pkgrel=1
-pkgdesc="An advanced drum machine"
-arch=('x86_64')
-license=('GPL')
-url="http://www.hydrogen-music.org/"
-depends=('jack' 'ladspa' 'lash' 'libarchive' 'liblrdf' 'liblo' 'portaudio'
-'portmidi' 'libpulse' 'qt4')
-makedepends=('cmake' 'cppunit' 'docbook-xml' 'docbook-sgml' 'docbook-utils'
-'docbook-xsl' 'poxml' 'xmlto')
-source=("${pkgname}-${pkgver}.tar.gz::https://github.com/${pkgname}-music/${pkgname}/archive/${pkgver}.tar.gz"
-        '1000_portaudio_v2.patch'
-        '1010-spelling.patch'
-        'fix_cmake_cache.patch'
-        'fix_cxx_flags.patch'
-        'fix_desktop_file.patch'
-        'fix_dtd_version.patch'
-        'fix_man_path.patch'
-        'fix_missing_locale.patch'
-        'fix_python2.patch'
-        'fix_rubberband_path.patch')
-sha512sums=('1480a18d1181d12e92a53e89a4d1c8f4ae9a8a9a02271e6af4089afaaca9d658abb3876dc7db08a453bbe3ab7f66f31567d992f30102818782b62ebba5141f58'
-            '1fa94eeeec1b1d5e685d5fd5dc0a5cce0ed59f38107589ca226bea79c45db9e7377b5a3e13c0f568b6b2611250b70d44d37bc1e29609d959c4eaccbfb2fd47a5'
-            '843ab2a1c74f26fe124c7324f52fb22c3d85274de0ccf4552df0a90a83669571db320287f00fc737d1731da7e21b42d883d64c889ac9193cae8ce745eb44d8bb'
-            '1bc99593ba75af5ffac932bd48d294fdf7c0005530e76145908485d8f79e7ef35cac50fca9df3fbbe672ab8250f76613c3d73ca89253198bfd5d8d6d298a452e'
-            '3bea26ce1fc4fd9518e2a43d3b6474867cf2cb2abbb207a29fd001d95224b6d481aecd32ff6f7231a62ad4b612e107204f4e043c1b8adad09a580b87bb9bed74'
-            '520c11da80610e4ccc5c03066de8ab1e9b0027b24d76c25146a622fffa2e94da9b89961e8f80b50f5e6ea5ea84efb5e314ea2bd7b221a02a0061e781b6f54c00'
-            'f1024ed99711c18f6e80ccacee119c91ee14cfdc5493ac07c6c152a9ca9875de349f6fcd818dc9a036e79577101ae7afc2ce5b324660a4ebb89a9e0a72129510'
-            '1f640706182cffbf1c11fe639bc749ec1bdfa9e0def77fd2673f64fa314586a8067bbea224d7f9be6c534ac9854ae44c6c9de3ba4b6229d3691a95aeb9036420'
-            '833c57f342b2a7088df28762a9a0ada4ff5351013f63cc9c499db9da9713ac5612cc06ac359816f2d0ad7e6b7291dcc2e81094e4aed348c38583b31d6115b6b3'
-            '38c473173ceda0a3880eadce7e706f0f22fd8ff79bbbcb023b7948ffdd499f47c148d627766c78530663c396547654e04b4fe1a9f383cdd8b77a83071c28a173'
-            '514d77d2207322ca57d0e9f872b8d3d5f1a6e41c9765f54d6a5bb88cb68d2c308234a77235e5012c4a12d01137f1772eb1b4ea9454a31c9d1199cb6772b78322')
-
-prepare() {
-  cd "${pkgname}-${pkgver}"
-  # fix libpulse requirement
-  sed -i 's|pulseaudio pulse/|libpulse pulse/|' CMakeLists.txt
-  # fix raptor2 include path
-  sed -i 's|${RAPTOR_INCLUDE_DIR}|/usr/include/raptor2|' src/core/CMakeLists.txt
-  # patches from debian
-  msg "1000_portaudio_v2.patch"
-  patch -Np1 -i "${srcdir}/1000_portaudio_v2.patch"
-  msg "1010-spelling.patch"
-  patch -Np1 -i "${srcdir}/1010-spelling.patch"
-  # various fixes
-  msg "fix_dtd_version.patch"
-  patch -Np1 -i "${srcdir}/fix_dtd_version.patch"
-  msg "fix_rubberband_path.patch"
-  patch -Np1 -i "${srcdir}/fix_rubberband_path.patch"
-  msg "fix_missing_locale.patch"
-  msg "fix_missing_locale.patch"
-  patch -Np1 -i "${srcdir}/fix_missing_locale.patch"
-  msg "fix_desktop_file.patch"
-  patch -Np1 -i "${srcdir}/fix_desktop_file.patch"
-  msg "fix_cmake_cache.patch"
-  patch -Np1 -i "${srcdir}/fix_cmake_cache.patch"
-  msg "fix_cxx_flags.patch"
-  patch -Np1 -i "${srcdir}/fix_cxx_flags.patch"
-  msg "fix_man_path.patch"
-  patch -Np1 -i "${srcdir}/fix_man_path.patch"
-  msg "fix_python2.patch"
-  patch -Np1 -i "${srcdir}/fix_python2.patch"
-  # out-of-tree build
-  mkdir -v build
-}
-
-build() {
-  cd "${pkgname}-${pkgver}/build"
-  # rubberband is disabled (not properly discovered and apparently broken)
-  cmake .. -DCMAKE_BUILD_TYPE=Release \
-           -DCMAKE_INSTALL_PREFIX=/usr \
-           -DWANT_DEBUG=OFF \
-           -DWANT_CPPUNIT=ON \
-           -DWANT_LASH=ON \
-           -DWANT_LRDF=ON \
-           -DWANT_PORTAUDIO=ON \
-           -DWANT_PORTMIDI=ON \
-           -DWANT_PULSEAUDIO=ON \
-           -DWANT_RUBBERBAND=OFF
-  make
-  # build html manual & tutorial
-  cd ../data/doc
-  make
-  # update translations
-  cd ../i18n
-  ./updateTranslations.sh
-}
-
-package() {
-  cd "${pkgname}-${pkgver}/build"
-  make DESTDIR="$pkgdir" install
-
-  # TODO: tell upstream to comply with freedesktop.org icon conventions
-  sed -i 's:Icon=h2-icon:Icon=/usr/share/hydrogen/data/img/gray/h2-icon.svg:' \
-    "${pkgdir}/usr/share/applications/${pkgname}.desktop"
-
-  # docs
-  install -t "${pkgdir}/usr/share/doc/${pkgname}" \
-    -vDm644 ../{ChangeLog,DEVELOPERS,INSTALL.txt,README.txt}
-
-  # clean up data dir
-  rm "$pkgdir/usr/share/${pkgname}/data/i18n/"{*.ts,stats.py,updateTranslations.sh} \
-   "$pkgdir/usr/share/${pkgname}/data/doc/"{*.docbook,*.po,*.pot,Makefile,TODO,README.DOCUMENTATION.txt}
-}
-
-# vim:set ts=2 sw=2 et:

Copied: hydrogen/repos/community-x86_64/PKGBUILD (from rev 306170, hydrogen/trunk/PKGBUILD)
===================================================================
--- PKGBUILD	                        (rev 0)
+++ PKGBUILD	2018-03-11 11:39:45 UTC (rev 306171)
@@ -0,0 +1,118 @@
+# $Id$
+# Maintainer: David Runge <dave at sleepmap.de>
+# Contributor: Rob Til Freedmen <rob.til.freedman at gmail.com>
+# Contributor: Ray Rashif <schiv at archlinux.org>
+# Contributor: tobias <tobias at archlinux.org>
+
+pkgname=hydrogen
+pkgver=0.9.7
+pkgrel=2
+pkgdesc="An advanced drum machine"
+arch=('x86_64')
+license=('GPL')
+url="http://www.hydrogen-music.org/"
+depends=('jack' 'ladspa' 'lash' 'libarchive' 'liblrdf' 'liblo' 'portaudio'
+'portmidi' 'libpulse' 'qt4')
+optdepends=('rubberband: Time stretch samples')
+makedepends=('cmake' 'cppunit' 'docbook-xml' 'docbook-sgml' 'docbook-utils'
+'docbook-xsl' 'poxml' 'xmlto')
+source=("${pkgname}-${pkgver}.tar.gz::https://github.com/${pkgname}-music/${pkgname}/archive/${pkgver}.tar.gz"
+        '1000_portaudio_v2.patch'
+        '1010-spelling.patch'
+        'fix_cmake_cache.patch'
+        'fix_cxx_flags.patch'
+        'fix_desktop_file.patch'
+        'fix_dtd_version.patch'
+        'fix_man_path.patch'
+        'fix_missing_locale.patch'
+        'fix_rubberband_path.patch')
+sha512sums=('1480a18d1181d12e92a53e89a4d1c8f4ae9a8a9a02271e6af4089afaaca9d658abb3876dc7db08a453bbe3ab7f66f31567d992f30102818782b62ebba5141f58'
+            '1fa94eeeec1b1d5e685d5fd5dc0a5cce0ed59f38107589ca226bea79c45db9e7377b5a3e13c0f568b6b2611250b70d44d37bc1e29609d959c4eaccbfb2fd47a5'
+            '843ab2a1c74f26fe124c7324f52fb22c3d85274de0ccf4552df0a90a83669571db320287f00fc737d1731da7e21b42d883d64c889ac9193cae8ce745eb44d8bb'
+            '1bc99593ba75af5ffac932bd48d294fdf7c0005530e76145908485d8f79e7ef35cac50fca9df3fbbe672ab8250f76613c3d73ca89253198bfd5d8d6d298a452e'
+            '3bea26ce1fc4fd9518e2a43d3b6474867cf2cb2abbb207a29fd001d95224b6d481aecd32ff6f7231a62ad4b612e107204f4e043c1b8adad09a580b87bb9bed74'
+            '656a4f8f6fec88e678f71dd6d77437d66429d9863149ceb850e270b4ae8668a33baeebf4ce8f3b72b3643826bc0404d235dc123f4f194dfa0caf858356798a21'
+            'f1024ed99711c18f6e80ccacee119c91ee14cfdc5493ac07c6c152a9ca9875de349f6fcd818dc9a036e79577101ae7afc2ce5b324660a4ebb89a9e0a72129510'
+            '1f640706182cffbf1c11fe639bc749ec1bdfa9e0def77fd2673f64fa314586a8067bbea224d7f9be6c534ac9854ae44c6c9de3ba4b6229d3691a95aeb9036420'
+            '833c57f342b2a7088df28762a9a0ada4ff5351013f63cc9c499db9da9713ac5612cc06ac359816f2d0ad7e6b7291dcc2e81094e4aed348c38583b31d6115b6b3'
+            '514d77d2207322ca57d0e9f872b8d3d5f1a6e41c9765f54d6a5bb88cb68d2c308234a77235e5012c4a12d01137f1772eb1b4ea9454a31c9d1199cb6772b78322')
+
+prepare() {
+  cd "${pkgname}-${pkgver}"
+
+  # fix libpulse requirement
+  sed -e 's|pulseaudio pulse/|libpulse pulse/|' -i CMakeLists.txt
+
+  # fix raptor2 include path
+  sed -e 's|${RAPTOR_INCLUDE_DIR}|/usr/include/raptor2|' \
+    -i src/core/CMakeLists.txt
+
+  # fix python2 shebang
+  sed -e 's/python/python2/' -i data/i18n/stats.py
+
+  # patches from debian
+  patch -Np1 -i "${srcdir}/1000_portaudio_v2.patch"
+  patch -Np1 -i "${srcdir}/1010-spelling.patch"
+
+  # various fixes
+  patch -Np1 -i "${srcdir}/fix_dtd_version.patch"
+  # set path of rubberband executable
+  patch -Np1 -i "${srcdir}/fix_rubberband_path.patch"
+
+  # https://github.com/hydrogen-music/hydrogen/issues/559
+  patch -Np1 -i "${srcdir}/fix_cmake_cache.patch"
+
+  patch -Np1 -i "${srcdir}/fix_cxx_flags.patch"
+  patch -Np1 -i "${srcdir}/fix_man_path.patch"
+  patch -Np1 -i "${srcdir}/fix_missing_locale.patch"
+
+  #fix desktop file icon (and other inconsistencies)
+  # https://github.com/hydrogen-music/hydrogen/issues/558
+  patch -Np1 -i "${srcdir}/fix_desktop_file.patch"
+
+  # out-of-tree build
+  mkdir -v build
+}
+
+build() {
+  cd "${pkgname}-${pkgver}/build"
+  # rubberband is disabled (not properly discovered and apparently broken)
+  cmake .. -DCMAKE_BUILD_TYPE=Release \
+           -DCMAKE_INSTALL_PREFIX=/usr \
+           -DWANT_DEBUG=OFF \
+           -DWANT_CPPUNIT=ON \
+           -DWANT_LASH=ON \
+           -DWANT_LRDF=ON \
+           -DWANT_PORTAUDIO=ON \
+           -DWANT_PORTMIDI=ON \
+           -DWANT_PULSEAUDIO=ON \
+           -DWANT_RUBBERBAND=OFF
+  make
+  # build html manual & tutorial
+  cd ../data/doc
+  make
+  # update translations
+  cd ../i18n
+  ./updateTranslations.sh
+}
+
+package() {
+  cd "${pkgname}-${pkgver}/build"
+  make DESTDIR="$pkgdir" install
+
+  # install desktop file icon to correct location
+  # https://github.com/hydrogen-music/hydrogen/issues/558
+  install -vDm644 "${pkgdir}/usr/share/${pkgname}/data/img/gray/h2-icon.svg" \
+    "${pkgdir}/usr/share/icons/hicolor/scalable/apps/${pkgname}.svg"
+
+  # docs
+  install -t "${pkgdir}/usr/share/doc/${pkgname}" \
+    -vDm644 ../{ChangeLog,DEVELOPERS,INSTALL.txt,README.txt}
+
+  # clean up data dir
+  # https://github.com/hydrogen-music/hydrogen/issues/559
+  rm -v "$pkgdir/usr/share/${pkgname}/data/i18n/"{*.ts,stats.py,updateTranslations.sh} \
+   "$pkgdir/usr/share/${pkgname}/data/doc/"{*.docbook,*.po,*.pot,Makefile,TODO,README.DOCUMENTATION.txt}
+}
+
+# vim:set ts=2 sw=2 et:

Deleted: fix_cmake_cache.patch
===================================================================
--- fix_cmake_cache.patch	2018-03-11 11:39:17 UTC (rev 306170)
+++ fix_cmake_cache.patch	2018-03-11 11:39:45 UTC (rev 306171)
@@ -1,12 +0,0 @@
-# Hydrogen can only be built with empty cmake cache
-# https://github.com/hydrogen-music/hydrogen/issues/539
---- a/cmake/FindHelper.cmake	2016-11-05 09:22:50.000000000 +0100
-+++ b/cmake/FindHelper.cmake	2017-11-20 11:35:19.412334235 +0200
-@@ -18,6 +18,7 @@
- 
-     if(${prefix}_INCLUDE_DIR AND ${prefix}_LIBRARIES)
-         set(${prefix}_FIND_QUIETLY TRUE)
-+        set(${prefix}_FOUND TRUE)
-     else()
-         if(NOT WIN32)
-             FIND_PACKAGE(PkgConfig)

Copied: hydrogen/repos/community-x86_64/fix_cmake_cache.patch (from rev 306170, hydrogen/trunk/fix_cmake_cache.patch)
===================================================================
--- fix_cmake_cache.patch	                        (rev 0)
+++ fix_cmake_cache.patch	2018-03-11 11:39:45 UTC (rev 306171)
@@ -0,0 +1,12 @@
+# Hydrogen can only be built with empty cmake cache
+# https://github.com/hydrogen-music/hydrogen/issues/539
+--- a/cmake/FindHelper.cmake	2016-11-05 09:22:50.000000000 +0100
++++ b/cmake/FindHelper.cmake	2017-11-20 11:35:19.412334235 +0200
+@@ -18,6 +18,7 @@
+ 
+     if(${prefix}_INCLUDE_DIR AND ${prefix}_LIBRARIES)
+         set(${prefix}_FIND_QUIETLY TRUE)
++        set(${prefix}_FOUND TRUE)
+     else()
+         if(NOT WIN32)
+             FIND_PACKAGE(PkgConfig)

Deleted: fix_cxx_flags.patch
===================================================================
--- fix_cxx_flags.patch	2018-03-11 11:39:17 UTC (rev 306170)
+++ fix_cxx_flags.patch	2018-03-11 11:39:45 UTC (rev 306171)
@@ -1,11 +0,0 @@
---- a/CMakeLists.txt	2016-11-05 09:22:50.000000000 +0100
-+++ b/CMakeLists.txt	2017-07-28 11:35:19.412334235 +0200
-@@ -106,7 +106,7 @@
- ENDIF()
- 
- #SET(CMAKE_CXX_FLAGS "-fno-implement-inlines -finline-small-functions -findirect-inlining -fpartial-inlining")
--SET(CMAKE_CXX_FLAGS "-O2 -std=gnu++11 -Wno-deprecated-register")
-+SET(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -O2 -std=gnu++11 -Wno-deprecated-register")
- IF (NOT CMAKE_CXX_COMPILER_ID MATCHES "Clang")
-     SET(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -fno-implement-inlines")
- ENDIF()

Copied: hydrogen/repos/community-x86_64/fix_cxx_flags.patch (from rev 306170, hydrogen/trunk/fix_cxx_flags.patch)
===================================================================
--- fix_cxx_flags.patch	                        (rev 0)
+++ fix_cxx_flags.patch	2018-03-11 11:39:45 UTC (rev 306171)
@@ -0,0 +1,11 @@
+--- a/CMakeLists.txt	2016-11-05 09:22:50.000000000 +0100
++++ b/CMakeLists.txt	2017-07-28 11:35:19.412334235 +0200
+@@ -106,7 +106,7 @@
+ ENDIF()
+ 
+ #SET(CMAKE_CXX_FLAGS "-fno-implement-inlines -finline-small-functions -findirect-inlining -fpartial-inlining")
+-SET(CMAKE_CXX_FLAGS "-O2 -std=gnu++11 -Wno-deprecated-register")
++SET(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -O2 -std=gnu++11 -Wno-deprecated-register")
+ IF (NOT CMAKE_CXX_COMPILER_ID MATCHES "Clang")
+     SET(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -fno-implement-inlines")
+ ENDIF()

Deleted: fix_desktop_file.patch
===================================================================
--- fix_desktop_file.patch	2018-03-11 11:39:17 UTC (rev 306170)
+++ fix_desktop_file.patch	2018-03-11 11:39:45 UTC (rev 306171)
@@ -1,25 +0,0 @@
---- a/linux/hydrogen.desktop	2016-11-05 09:22:50.000000000 +0100
-+++ b/linux/hydrogen.desktop	2017-07-28 15:25:19.412346723 +0200
-@@ -19,19 +13,17 @@
- GenericName[tr]=Davul Makinası
- GenericName[fr]=Boîte à rythme
- 
--Encoding=UTF-8
- Version=1.0
- 
- Type=Application
--Categories=Application;AudioVideo;Sound;Audio;Qt;
-+Categories=AudioVideo;Audio;Qt;
- Keywords=audio;sound;jackd;sampler;drum;
- 
--MimeType=text/xml
-+MimeType=text/xml;
- 
--FilePattern=hydrogen
- Exec=hydrogen %F
- TryExec=hydrogen
- Terminal=false
- StartupNotify=true
- 
--Icon=h2-icon
-+Icon=h2-icon.svg

Copied: hydrogen/repos/community-x86_64/fix_desktop_file.patch (from rev 306170, hydrogen/trunk/fix_desktop_file.patch)
===================================================================
--- fix_desktop_file.patch	                        (rev 0)
+++ fix_desktop_file.patch	2018-03-11 11:39:45 UTC (rev 306171)
@@ -0,0 +1,25 @@
+--- a/linux/hydrogen.desktop	2016-11-05 09:22:50.000000000 +0100
++++ b/linux/hydrogen.desktop	2017-07-28 15:25:19.412346723 +0200
+@@ -19,19 +13,17 @@
+ GenericName[tr]=Davul Makinası
+ GenericName[fr]=Boîte à rythme
+ 
+-Encoding=UTF-8
+ Version=1.0
+ 
+ Type=Application
+-Categories=Application;AudioVideo;Sound;Audio;Qt;
++Categories=AudioVideo;Audio;Qt;
+ Keywords=audio;sound;jackd;sampler;drum;
+ 
+-MimeType=text/xml
++MimeType=text/xml;
+ 
+-FilePattern=hydrogen
+ Exec=hydrogen %F
+ TryExec=hydrogen
+ Terminal=false
+ StartupNotify=true
+ 
+-Icon=h2-icon
++Icon=hydrogen

Deleted: fix_dtd_version.patch
===================================================================
--- fix_dtd_version.patch	2018-03-11 11:39:17 UTC (rev 306170)
+++ fix_dtd_version.patch	2018-03-11 11:39:45 UTC (rev 306171)
@@ -1,22 +0,0 @@
---- a/data/doc/manual.docbook	2016-11-05 09:22:50.000000000 +0100
-+++ b/data/doc/manual.docbook	2017-07-28 18:03:51.938394459 +0200
-@@ -1,6 +1,6 @@
- <?xml version="1.0" encoding="UTF-8"?> <!-- -*- mode:nxml; indent-tabs-mode:nil; fill-column:80; -*- -->
--  <!DOCTYPE book PUBLIC "-//OASIS//DTD DocBook V4.0//EN"
--                      "http://www.oasis-open.org/docbook/xml/4.0/docbookx.dtd">
-+  <!DOCTYPE book PUBLIC "-//OASIS//DTD DocBook V4.2//EN"
-+                      "http://www.oasis-open.org/docbook/xml/4.2/docbookx.dtd">
- <book id="Hydrogen-manual" lang="en">
- 
-   <bookinfo>
---- a/data/doc/tutorial.docbook	2016-11-05 09:22:50.000000000 +0100
-+++ b/data/doc/tutorial.docbook	2017-07-28 18:03:51.938394459 +0200
-@@ -1,6 +1,6 @@
- <?xml version="1.0" encoding="UTF-8"?>
--<!DOCTYPE book PUBLIC "-//OASIS//DTD DocBook V4.0//EN"
--               "http://www.oasis-open.org/docbook/xml/4.0/docbookx.dtd">
-+<!DOCTYPE book PUBLIC "-//OASIS//DTD DocBook V4.2//EN"
-+               "http://www.oasis-open.org/docbook/xml/4.2/docbookx.dtd">
- <book id="Hydrogen-tutorial" lang="en">
- 
- <bookinfo>

Copied: hydrogen/repos/community-x86_64/fix_dtd_version.patch (from rev 306170, hydrogen/trunk/fix_dtd_version.patch)
===================================================================
--- fix_dtd_version.patch	                        (rev 0)
+++ fix_dtd_version.patch	2018-03-11 11:39:45 UTC (rev 306171)
@@ -0,0 +1,22 @@
+--- a/data/doc/manual.docbook	2016-11-05 09:22:50.000000000 +0100
++++ b/data/doc/manual.docbook	2017-07-28 18:03:51.938394459 +0200
+@@ -1,6 +1,6 @@
+ <?xml version="1.0" encoding="UTF-8"?> <!-- -*- mode:nxml; indent-tabs-mode:nil; fill-column:80; -*- -->
+-  <!DOCTYPE book PUBLIC "-//OASIS//DTD DocBook V4.0//EN"
+-                      "http://www.oasis-open.org/docbook/xml/4.0/docbookx.dtd">
++  <!DOCTYPE book PUBLIC "-//OASIS//DTD DocBook V4.2//EN"
++                      "http://www.oasis-open.org/docbook/xml/4.2/docbookx.dtd">
+ <book id="Hydrogen-manual" lang="en">
+ 
+   <bookinfo>
+--- a/data/doc/tutorial.docbook	2016-11-05 09:22:50.000000000 +0100
++++ b/data/doc/tutorial.docbook	2017-07-28 18:03:51.938394459 +0200
+@@ -1,6 +1,6 @@
+ <?xml version="1.0" encoding="UTF-8"?>
+-<!DOCTYPE book PUBLIC "-//OASIS//DTD DocBook V4.0//EN"
+-               "http://www.oasis-open.org/docbook/xml/4.0/docbookx.dtd">
++<!DOCTYPE book PUBLIC "-//OASIS//DTD DocBook V4.2//EN"
++               "http://www.oasis-open.org/docbook/xml/4.2/docbookx.dtd">
+ <book id="Hydrogen-tutorial" lang="en">
+ 
+ <bookinfo>

Deleted: fix_man_path.patch
===================================================================
--- fix_man_path.patch	2018-03-11 11:39:17 UTC (rev 306170)
+++ fix_man_path.patch	2018-03-11 11:39:45 UTC (rev 306171)
@@ -1,11 +0,0 @@
---- a/CMakeLists.txt	2016-11-05 09:22:50.000000000 +0100
-+++ b/CMakeLists.txt	2017-07-28 14:35:19.488234235 +0200
-@@ -358,7 +358,7 @@
- IF(NOT MINGW AND NOT APPLE)
- 	INSTALL(FILES ${CMAKE_SOURCE_DIR}/linux/hydrogen.appdata.xml DESTINATION "${CMAKE_INSTALL_PREFIX}/share/appdata")
- 	INSTALL(FILES ${CMAKE_SOURCE_DIR}/linux/hydrogen.desktop DESTINATION "${CMAKE_INSTALL_PREFIX}/share/applications")
--	INSTALL(FILES ${CMAKE_SOURCE_DIR}/linux/hydrogen.1 DESTINATION "${CMAKE_INSTALL_PREFIX}/man/man1")
-+	INSTALL(FILES ${CMAKE_SOURCE_DIR}/linux/hydrogen.1 DESTINATION "${CMAKE_INSTALL_PREFIX}/share/man/man1")
- ENDIF()
- 
- #

Copied: hydrogen/repos/community-x86_64/fix_man_path.patch (from rev 306170, hydrogen/trunk/fix_man_path.patch)
===================================================================
--- fix_man_path.patch	                        (rev 0)
+++ fix_man_path.patch	2018-03-11 11:39:45 UTC (rev 306171)
@@ -0,0 +1,11 @@
+--- a/CMakeLists.txt	2016-11-05 09:22:50.000000000 +0100
++++ b/CMakeLists.txt	2017-07-28 14:35:19.488234235 +0200
+@@ -358,7 +358,7 @@
+ IF(NOT MINGW AND NOT APPLE)
+ 	INSTALL(FILES ${CMAKE_SOURCE_DIR}/linux/hydrogen.appdata.xml DESTINATION "${CMAKE_INSTALL_PREFIX}/share/appdata")
+ 	INSTALL(FILES ${CMAKE_SOURCE_DIR}/linux/hydrogen.desktop DESTINATION "${CMAKE_INSTALL_PREFIX}/share/applications")
+-	INSTALL(FILES ${CMAKE_SOURCE_DIR}/linux/hydrogen.1 DESTINATION "${CMAKE_INSTALL_PREFIX}/man/man1")
++	INSTALL(FILES ${CMAKE_SOURCE_DIR}/linux/hydrogen.1 DESTINATION "${CMAKE_INSTALL_PREFIX}/share/man/man1")
+ ENDIF()
+ 
+ #

Deleted: fix_missing_locale.patch
===================================================================
--- fix_missing_locale.patch	2018-03-11 11:39:17 UTC (rev 306170)
+++ fix_missing_locale.patch	2018-03-11 11:39:45 UTC (rev 306171)
@@ -1,10 +0,0 @@
---- a/data/i18n/updateTranslations.sh	2016-11-05 09:22:50.000000000 +0100
-+++ b/data/i18n/updateTranslations.sh	2017-07-28 12:25:19.230534851 +0200
-@@ -35,6 +35,7 @@
- $CMD ../../data/i18n/hydrogen.de.ts
- $CMD ../../data/i18n/hydrogen.sv.ts
- $CMD ../../data/i18n/hydrogen.hr.ts
-+$CMD ../../data/i18n/hydrogen.ca.ts
- $CMD ../../data/i18n/hydrogen.cs.ts
- $CMD ../../data/i18n/hydrogen.el.ts
- $CMD ../../data/i18n/hydrogen.gl.ts

Copied: hydrogen/repos/community-x86_64/fix_missing_locale.patch (from rev 306170, hydrogen/trunk/fix_missing_locale.patch)
===================================================================
--- fix_missing_locale.patch	                        (rev 0)
+++ fix_missing_locale.patch	2018-03-11 11:39:45 UTC (rev 306171)
@@ -0,0 +1,10 @@
+--- a/data/i18n/updateTranslations.sh	2016-11-05 09:22:50.000000000 +0100
++++ b/data/i18n/updateTranslations.sh	2017-07-28 12:25:19.230534851 +0200
+@@ -35,6 +35,7 @@
+ $CMD ../../data/i18n/hydrogen.de.ts
+ $CMD ../../data/i18n/hydrogen.sv.ts
+ $CMD ../../data/i18n/hydrogen.hr.ts
++$CMD ../../data/i18n/hydrogen.ca.ts
+ $CMD ../../data/i18n/hydrogen.cs.ts
+ $CMD ../../data/i18n/hydrogen.el.ts
+ $CMD ../../data/i18n/hydrogen.gl.ts

Deleted: fix_python2.patch
===================================================================
--- fix_python2.patch	2018-03-11 11:39:17 UTC (rev 306170)
+++ fix_python2.patch	2018-03-11 11:39:45 UTC (rev 306171)
@@ -1,8 +0,0 @@
---- a/data/i18n/stats.py	2016-11-05 09:22:50.000000000 +0100
-+++ b/data/i18n/stats.py	2017-07-28 18:03:51.908394459 +0200
-@@ -1,4 +1,4 @@
--#!/usr/bin/env python
-+#!/usr/bin/env python2
- 
- from xml.dom import minidom, Node
- 

Deleted: fix_rubberband_path.patch
===================================================================
--- fix_rubberband_path.patch	2018-03-11 11:39:17 UTC (rev 306170)
+++ fix_rubberband_path.patch	2018-03-11 11:39:45 UTC (rev 306171)
@@ -1,11 +0,0 @@
---- a/data/hydrogen.default.conf	2016-11-05 09:22:50.000000000 +0100
-+++ b/data/hydrogen.default.conf	2017-07-28 11:05:14.481532464 +0200
-@@ -19,7 +19,7 @@
- 	<hearNewNotes>true</hearNewNotes>
- 	<recordEvents>false</recordEvents>
- 	<quantizeEvents>true</quantizeEvents>
--	<path_to_rubberband>Path to Rubberband-CLI</path_to_rubberband>
-+	<path_to_rubberband>/usr/bin/rubberband</path_to_rubberband>
- 	<recentUsedSongs />
- 	<recentlyUsedEffects />
- 	<serverList>

Copied: hydrogen/repos/community-x86_64/fix_rubberband_path.patch (from rev 306170, hydrogen/trunk/fix_rubberband_path.patch)
===================================================================
--- fix_rubberband_path.patch	                        (rev 0)
+++ fix_rubberband_path.patch	2018-03-11 11:39:45 UTC (rev 306171)
@@ -0,0 +1,11 @@
+--- a/data/hydrogen.default.conf	2016-11-05 09:22:50.000000000 +0100
++++ b/data/hydrogen.default.conf	2017-07-28 11:05:14.481532464 +0200
+@@ -19,7 +19,7 @@
+ 	<hearNewNotes>true</hearNewNotes>
+ 	<recordEvents>false</recordEvents>
+ 	<quantizeEvents>true</quantizeEvents>
+-	<path_to_rubberband>Path to Rubberband-CLI</path_to_rubberband>
++	<path_to_rubberband>/usr/bin/rubberband</path_to_rubberband>
+ 	<recentUsedSongs />
+ 	<recentlyUsedEffects />
+ 	<serverList>



More information about the arch-commits mailing list