[SCM] hydrogen/master: Update patches: Refresh with shortening quilt options.
js at users.alioth.debian.org
js at users.alioth.debian.org
Wed Jul 19 08:51:13 UTC 2017
The following commit has been merged in the master branch:
commit 1dc9c2f0bd5ba430bca703b194567db21f97c47f
Author: Jonas Smedegaard <dr at jones.dk>
Date: Wed Jul 19 09:07:34 2017 +0200
Update patches: Refresh with shortening quilt options.
diff --git a/debian/patches/1000_portaudio_v2.patch b/debian/patches/1000_portaudio_v2.patch
index ceabd4c..64b5144 100644
--- a/debian/patches/1000_portaudio_v2.patch
+++ b/debian/patches/1000_portaudio_v2.patch
@@ -6,10 +6,8 @@ Forwarded: mauser at smoors.de
src/core/src/IO/portaudio_driver.cpp | 10 ++++++++--
2 files changed, 11 insertions(+), 2 deletions(-)
-Index: hydrogen/src/core/include/hydrogen/IO/PortAudioDriver.h
-===================================================================
---- hydrogen.orig/src/core/include/hydrogen/IO/PortAudioDriver.h
-+++ hydrogen/src/core/include/hydrogen/IO/PortAudioDriver.h
+--- a/src/core/include/hydrogen/IO/PortAudioDriver.h
++++ b/src/core/include/hydrogen/IO/PortAudioDriver.h
@@ -30,6 +30,9 @@
#ifdef H2CORE_HAVE_PORTAUDIO
@@ -20,11 +18,9 @@ Index: hydrogen/src/core/include/hydrogen/IO/PortAudioDriver.h
#include <inttypes.h>
#include <portaudio.h>
-Index: hydrogen/src/core/src/IO/portaudio_driver.cpp
-===================================================================
---- hydrogen.orig/src/core/src/IO/portaudio_driver.cpp
-+++ hydrogen/src/core/src/IO/portaudio_driver.cpp
-@@ -68,7 +68,13 @@ int PortAudioDriver::connect()
+--- 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 ];
@@ -39,7 +35,7 @@ Index: hydrogen/src/core/src/IO/portaudio_driver.cpp
if ( err != paNoError ) {
-@@ -84,7 +90,7 @@ int PortAudioDriver::connect()
+@@ -84,7 +90,7 @@
m_nSampleRate, // sample rate
m_nBufferSize, // frames per buffer
portAudioCallback, /* specify our custom callback */
diff --git a/debian/patches/1001_rubberband_path.patch b/debian/patches/1001_rubberband_path.patch
index e77afa1..a8abc67 100644
--- a/debian/patches/1001_rubberband_path.patch
+++ b/debian/patches/1001_rubberband_path.patch
@@ -6,10 +6,8 @@ Forwarded: mauser at smoors.de
data/hydrogen.default.conf | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
-Index: hydrogen/data/hydrogen.default.conf
-===================================================================
---- hydrogen.orig/data/hydrogen.default.conf
-+++ hydrogen/data/hydrogen.default.conf
+--- a/data/hydrogen.default.conf
++++ b/data/hydrogen.default.conf
@@ -19,7 +19,7 @@
<hearNewNotes>true</hearNewNotes>
<recordEvents>false</recordEvents>
diff --git a/debian/patches/1005_name_shouldnt_repeat_genericname.patch b/debian/patches/1005_name_shouldnt_repeat_genericname.patch
index 66612a4..81e58bb 100644
--- a/debian/patches/1005_name_shouldnt_repeat_genericname.patch
+++ b/debian/patches/1005_name_shouldnt_repeat_genericname.patch
@@ -16,10 +16,8 @@ Forwarded: mauser at smoors.de
linux/hydrogen.desktop | 13 +++----------
1 file changed, 3 insertions(+), 10 deletions(-)
-Index: hydrogen/linux/hydrogen.desktop
-===================================================================
---- hydrogen.orig/linux/hydrogen.desktop
-+++ hydrogen/linux/hydrogen.desktop
+--- a/linux/hydrogen.desktop
++++ b/linux/hydrogen.desktop
@@ -1,11 +1,5 @@
[Desktop Entry]
-Name=Hydrogen Drum Machine
@@ -33,7 +31,7 @@ Index: hydrogen/linux/hydrogen.desktop
Comment=Create drum sequences
Comment[de]=Schlagzeugsequenzen erstellen
Comment[ru]=Создание партий ударных инструментов
-@@ -19,16 +13,14 @@ GenericName[ru]=Драм-машина
+@@ -19,16 +13,14 @@
GenericName[tr]=Davul Makinası
GenericName[fr]=Boîte à rythme
diff --git a/debian/patches/1006_porttime.patch b/debian/patches/1006_porttime.patch
index d621ab9..4bf470d 100644
--- a/debian/patches/1006_porttime.patch
+++ b/debian/patches/1006_porttime.patch
@@ -5,11 +5,9 @@ Forwarded: mauser at smoors.de
src/core/CMakeLists.txt | 1 +
1 file changed, 1 insertion(+)
-Index: hydrogen/src/core/CMakeLists.txt
-===================================================================
---- hydrogen.orig/src/core/CMakeLists.txt
-+++ hydrogen/src/core/CMakeLists.txt
-@@ -50,6 +50,7 @@ TARGET_LINK_LIBRARIES(hydrogen-core-${VE
+--- a/src/core/CMakeLists.txt
++++ b/src/core/CMakeLists.txt
+@@ -50,6 +50,7 @@
${ZLIB_LIBRARIES}
${CMAKE_THREAD_LIBS_INIT}
${NSMSESSION_LIBRARIES}
diff --git a/debian/patches/1008-ftbfs-gcc-4.7.diff b/debian/patches/1008-ftbfs-gcc-4.7.diff
index fe9d997..755e885 100644
--- a/debian/patches/1008-ftbfs-gcc-4.7.diff
+++ b/debian/patches/1008-ftbfs-gcc-4.7.diff
@@ -8,10 +8,8 @@ Forwarded: mauser at smoors.de
src/gui/src/SongEditor/SongEditor.cpp | 1 +
3 files changed, 3 insertions(+)
-Index: hydrogen/src/core/src/IO/portmidi_driver.cpp
-===================================================================
---- hydrogen.orig/src/core/src/IO/portmidi_driver.cpp
-+++ hydrogen/src/core/src/IO/portmidi_driver.cpp
+--- a/src/core/src/IO/portmidi_driver.cpp
++++ b/src/core/src/IO/portmidi_driver.cpp
@@ -33,6 +33,7 @@
#ifdef WIN32
#include <windows.h>
@@ -20,10 +18,8 @@ Index: hydrogen/src/core/src/IO/portmidi_driver.cpp
#ifdef H2CORE_HAVE_PORTMIDI
-Index: hydrogen/src/gui/src/SongEditor/SongEditor.cpp
-===================================================================
---- hydrogen.orig/src/gui/src/SongEditor/SongEditor.cpp
-+++ hydrogen/src/gui/src/SongEditor/SongEditor.cpp
+--- a/src/gui/src/SongEditor/SongEditor.cpp
++++ b/src/gui/src/SongEditor/SongEditor.cpp
@@ -21,6 +21,7 @@
*/
@@ -32,10 +28,8 @@ Index: hydrogen/src/gui/src/SongEditor/SongEditor.cpp
#include <algorithm>
#include <memory>
-Index: hydrogen/src/gui/src/MainForm.cpp
-===================================================================
---- hydrogen.orig/src/gui/src/MainForm.cpp
-+++ hydrogen/src/gui/src/MainForm.cpp
+--- a/src/gui/src/MainForm.cpp
++++ b/src/gui/src/MainForm.cpp
@@ -20,6 +20,7 @@
*
*/
diff --git a/debian/patches/1010-spelling.patch b/debian/patches/1010-spelling.patch
index bed4c65..682abf8 100644
--- a/debian/patches/1010-spelling.patch
+++ b/debian/patches/1010-spelling.patch
@@ -2,11 +2,9 @@ Description: Fix some spelling.
Author: Jaromír Mikeš <mira.mikes at seznam.cz>
Forwarded: mauser at smoors.de
-Index: hydrogen/src/core/src/IO/jack_output.cpp
-===================================================================
---- hydrogen.orig/src/core/src/IO/jack_output.cpp
-+++ hydrogen/src/core/src/IO/jack_output.cpp
-@@ -152,13 +152,13 @@ int JackOutput::connect()
+--- 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] ) {
@@ -22,11 +20,9 @@ Index: hydrogen/src/core/src/IO/jack_output.cpp
Hydrogen::get_instance()->raiseError( Hydrogen::JACK_CANNOT_CONNECT_OUTPUT_PORT );
return 2;
}
-Index: hydrogen/src/core/src/IO/midi_input.cpp
-===================================================================
---- hydrogen.orig/src/core/src/IO/midi_input.cpp
-+++ hydrogen/src/core/src/IO/midi_input.cpp
-@@ -254,7 +254,7 @@ void MidiInput::handleNoteOnMessage( con
+--- 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) {
@@ -35,11 +31,9 @@ Index: hydrogen/src/core/src/IO/midi_input.cpp
return;
}
nInstrument = instrList->index(pInstr);
-Index: hydrogen/src/core/src/helpers/legacy.cpp
-===================================================================
---- hydrogen.orig/src/core/src/helpers/legacy.cpp
-+++ hydrogen/src/core/src/helpers/legacy.cpp
-@@ -106,7 +106,7 @@ Drumkit* Legacy::load_drumkit( const QSt
+--- 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() ) {
@@ -48,11 +42,9 @@ Index: hydrogen/src/core/src/helpers/legacy.cpp
} else {
Sample* sample = new Sample( dk_path+"/"+sFilename );
-Index: hydrogen/src/core/src/helpers/xml.cpp
-===================================================================
---- hydrogen.orig/src/core/src/helpers/xml.cpp
-+++ hydrogen/src/core/src/helpers/xml.cpp
-@@ -159,7 +159,7 @@ bool XMLDoc::write( const QString& filep
+--- 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 ) ) {
@@ -61,10 +53,8 @@ Index: hydrogen/src/core/src/helpers/xml.cpp
return false;
}
QTextStream out( &file );
-Index: hydrogen/src/core/src/lilypond/lilypond.cpp
-===================================================================
---- hydrogen.orig/src/core/src/lilypond/lilypond.cpp
-+++ hydrogen/src/core/src/lilypond/lilypond.cpp
+--- 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.
@@ -74,11 +64,9 @@ Index: hydrogen/src/core/src/lilypond/lilypond.cpp
* "Hand Clap", so for those I did what I could and used the recommended
* triangle notehead to distinguish them for drum and cymbal notation.
*/
-Index: hydrogen/src/core/src/midi_action.cpp
-===================================================================
---- hydrogen.orig/src/core/src/midi_action.cpp
-+++ hydrogen/src/core/src/midi_action.cpp
-@@ -87,7 +87,7 @@ bool setSong( int songnumber ) {
+--- 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
@@ -87,11 +75,9 @@ Index: hydrogen/src/core/src/midi_action.cpp
* 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
*
-Index: hydrogen/src/core/src/preferences.cpp
-===================================================================
---- hydrogen.orig/src/core/src/preferences.cpp
-+++ hydrogen/src/core/src/preferences.cpp
-@@ -102,7 +102,7 @@ Preferences::Preferences()
+--- 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 ) {
@@ -100,11 +86,9 @@ Index: hydrogen/src/core/src/preferences.cpp
QString sLadspaPath = QString::fromLocal8Bit(ladpath);
int pos;
while ( ( pos = sLadspaPath.indexOf( ":" ) ) != -1 ) {
-Index: hydrogen/src/gui/src/ExportSongDialog.cpp
-===================================================================
---- hydrogen.orig/src/gui/src/ExportSongDialog.cpp
-+++ hydrogen/src/gui/src/ExportSongDialog.cpp
-@@ -66,7 +66,7 @@ ExportSongDialog::ExportSongDialog(QWidg
+--- 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"));
@@ -113,11 +97,9 @@ Index: hydrogen/src/gui/src/ExportSongDialog.cpp
exportTypeCombo->addItem(trUtf8("Both"));
HydrogenApp::get_instance()->addEventListener( this );
-Index: hydrogen/src/gui/src/PatternEditor/DrumPatternEditor.cpp
-===================================================================
---- hydrogen.orig/src/gui/src/PatternEditor/DrumPatternEditor.cpp
-+++ hydrogen/src/gui/src/PatternEditor/DrumPatternEditor.cpp
-@@ -92,7 +92,7 @@ void DrumPatternEditor::updateEditor()
+--- 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) ) {
@@ -126,11 +108,9 @@ Index: hydrogen/src/gui/src/PatternEditor/DrumPatternEditor.cpp
return;
}
-Index: hydrogen/src/gui/src/SampleEditor/SampleEditor_UI.ui
-===================================================================
---- hydrogen.orig/src/gui/src/SampleEditor/SampleEditor_UI.ui
-+++ hydrogen/src/gui/src/SampleEditor/SampleEditor_UI.ui
-@@ -641,7 +641,7 @@ p, li { white-space: pre-wrap; }
+--- 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>
@@ -139,11 +119,9 @@ Index: hydrogen/src/gui/src/SampleEditor/SampleEditor_UI.ui
<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>
-Index: hydrogen/src/gui/src/SoundLibrary/SoundLibraryPanel.cpp
-===================================================================
---- hydrogen.orig/src/gui/src/SoundLibrary/SoundLibraryPanel.cpp
-+++ hydrogen/src/gui/src/SoundLibrary/SoundLibraryPanel.cpp
-@@ -493,7 +493,7 @@ void SoundLibraryPanel::on_drumkitLoadAc
+--- a/src/gui/src/SoundLibrary/SoundLibraryPanel.cpp
++++ b/src/gui/src/SoundLibrary/SoundLibraryPanel.cpp
+@@ -493,7 +493,7 @@
bool conditionalLoad = false;
bool hasNotes = false;
@@ -152,7 +130,7 @@ Index: hydrogen/src/gui/src/SoundLibrary/SoundLibraryPanel.cpp
if ( newCount < oldCount )
{
-@@ -520,7 +520,7 @@ void SoundLibraryPanel::on_drumkitLoadAc
+@@ -520,7 +520,7 @@
QMessageBox msgBox;
msgBox.setWindowTitle("Hydrogen");
msgBox.setIcon( QMessageBox::Warning );
@@ -161,11 +139,9 @@ Index: hydrogen/src/gui/src/SoundLibrary/SoundLibraryPanel.cpp
msgBox.setStandardButtons(QMessageBox::Save);
msgBox.setButtonText(QMessageBox::Save, trUtf8("Keep"));
-Index: hydrogen/src/core/src/local_file_mgr.cpp
-===================================================================
---- hydrogen.orig/src/core/src/local_file_mgr.cpp
-+++ hydrogen/src/core/src/local_file_mgr.cpp
-@@ -1078,7 +1078,7 @@ bool LocalFileMng::checkTinyXMLCompatMod
+--- 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 "
diff --git a/debian/patches/1015-man_path.patch b/debian/patches/1015-man_path.patch
index 71b33ea..9002c15 100644
--- a/debian/patches/1015-man_path.patch
+++ b/debian/patches/1015-man_path.patch
@@ -2,11 +2,9 @@ Description: Fix install path for man pages.
Author: Jaromír Mikeš <mira.mikes at seznam.cz>
Forwarded: mauser at smoors.de
-Index: hydrogen/CMakeLists.txt
-===================================================================
---- hydrogen.orig/CMakeLists.txt
-+++ hydrogen/CMakeLists.txt
-@@ -358,7 +358,7 @@ ENDIF()
+--- a/CMakeLists.txt
++++ b/CMakeLists.txt
+@@ -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")
diff --git a/debian/patches/1020-cxx_flags.patch b/debian/patches/1020-cxx_flags.patch
index 9b3478c..7dfca4a 100644
--- a/debian/patches/1020-cxx_flags.patch
+++ b/debian/patches/1020-cxx_flags.patch
@@ -2,11 +2,9 @@ Description: Fix CXX Flags.
Author: Jaromír Mikeš <mira.mikes at seznam.cz>
Forwarded: mauser at smoors.de
-Index: hydrogen/CMakeLists.txt
-===================================================================
---- hydrogen.orig/CMakeLists.txt
-+++ hydrogen/CMakeLists.txt
-@@ -106,7 +106,7 @@ ELSE()
+--- a/CMakeLists.txt
++++ b/CMakeLists.txt
+@@ -106,7 +106,7 @@
ENDIF()
#SET(CMAKE_CXX_FLAGS "-fno-implement-inlines -finline-small-functions -findirect-inlining -fpartial-inlining")
--
hydrogen packaging
More information about the pkg-multimedia-commits
mailing list