[SCM] hydrogen/master: Drop already commented out patches 02 03 07 08 1001: Obsolete.

js at users.alioth.debian.org js at users.alioth.debian.org
Fri Mar 18 01:00:12 UTC 2011


The following commit has been merged in the master branch:
commit ee06a12c7cdb7f13eafe396226dfd66b905594f1
Author: Jonas Smedegaard <dr at jones.dk>
Date:   Thu Mar 17 21:48:52 2011 +0100

    Drop already commented out patches 02 03 07 08 1001: Obsolete.

diff --git a/debian/patches/02_gcc41.patch b/debian/patches/02_gcc41.patch
deleted file mode 100644
index daa4aa1..0000000
--- a/debian/patches/02_gcc41.patch
+++ /dev/null
@@ -1,15 +0,0 @@
-Fix compilation with gcc-4.1
-
-Index: hydrogen/libs/hydrogen/src/xml/tinyxml.cpp
-===================================================================
---- hydrogen.orig/libs/hydrogen/src/xml/tinyxml.cpp	2010-02-13 01:37:50.000000000 +0100
-+++ hydrogen/libs/hydrogen/src/xml/tinyxml.cpp	2010-02-13 01:36:51.000000000 +0100
-@@ -904,7 +904,7 @@
- }
- 
- 
--TiXmlDeclaration::TiXmlDeclaration( const char * _version,
-+TiXmlDeclaration( const char * _version,
- 	const char * _encoding,
- 	const char * _standalone )
- : TiXmlNode( TiXmlNode::DECLARATION )
diff --git a/debian/patches/03_gcc43.patch b/debian/patches/03_gcc43.patch
deleted file mode 100644
index 213567a..0000000
--- a/debian/patches/03_gcc43.patch
+++ /dev/null
@@ -1,76 +0,0 @@
-Fix compilation with gcc-4.3
-
-Index: hydrogen/src/tools/HydrogenPlayer.cpp
-===================================================================
---- hydrogen.orig/src/tools/HydrogenPlayer.cpp	2010-02-12 17:32:37.000000000 +0100
-+++ hydrogen/src/tools/HydrogenPlayer.cpp	2010-02-12 17:32:59.000000000 +0100
-@@ -25,6 +25,7 @@
- 
- #include <qapplication.h>
- 
-+#include <cstdlib>
- #include <iostream>
- #include <stdio.h>
- #include <string>
-Index: hydrogen/src/gui/DrumkitManager.cpp
-===================================================================
---- hydrogen.orig/src/gui/DrumkitManager.cpp	2010-02-12 17:32:37.000000000 +0100
-+++ hydrogen/src/gui/DrumkitManager.cpp	2010-02-12 17:32:59.000000000 +0100
-@@ -22,6 +22,7 @@
-  *
-  */
- #include <qcursor.h>
-+#include <cstdlib>
- 
- #include "config.h"
- #include "Skin.h"
-Index: hydrogen/src/gui/HydrogenApp.cpp
-===================================================================
---- hydrogen.orig/src/gui/HydrogenApp.cpp	2010-02-12 17:32:37.000000000 +0100
-+++ hydrogen/src/gui/HydrogenApp.cpp	2010-02-12 17:32:59.000000000 +0100
-@@ -46,6 +46,7 @@
- #include "LadspaFXProperties.h"
- #include "SongEditor/SongEditorPanel.h"
- 
-+#include <cstdlib>
- #include <qdockwindow.h>
- #include <qsplitter.h>
- #include <qhbox.h>
-Index: hydrogen/src/gui/main.cpp
-===================================================================
---- hydrogen.orig/src/gui/main.cpp	2010-02-12 17:32:37.000000000 +0100
-+++ hydrogen/src/gui/main.cpp	2010-02-12 17:32:59.000000000 +0100
-@@ -42,6 +42,7 @@
- #include "lib/DataPath.h"
- #include "lib/Exception.h"
- 
-+#include <cstdlib>
- #include <iostream>
- using namespace std;
- 
-Index: hydrogen/src/lib/FLACFile.cpp
-===================================================================
---- hydrogen.orig/src/lib/FLACFile.cpp	2010-02-12 17:32:37.000000000 +0100
-+++ hydrogen/src/lib/FLACFile.cpp	2010-02-12 17:32:59.000000000 +0100
-@@ -54,6 +54,8 @@
- 		string m_sFilename;
- };
- 
-+#include <cstring>
-+
- 
- 
- FLACFile_real::FLACFile_real() : Object( "FLACFile_real" )
-Index: hydrogen/src/lib/drivers/OssDriver.cpp
-===================================================================
---- hydrogen.orig/src/lib/drivers/OssDriver.cpp	2010-02-12 17:32:37.000000000 +0100
-+++ hydrogen/src/lib/drivers/OssDriver.cpp	2010-02-12 17:32:59.000000000 +0100
-@@ -31,6 +31,8 @@
- 
- #include <pthread.h>
- 
-+#include <cstring>
-+
- audioProcessCallback ossDriver_audioProcessCallback;
- bool ossDriver_running;
- pthread_t ossDriverThread;
diff --git a/debian/patches/07_gcc44.patch b/debian/patches/07_gcc44.patch
deleted file mode 100644
index 06cc5eb..0000000
--- a/debian/patches/07_gcc44.patch
+++ /dev/null
@@ -1,26 +0,0 @@
-Fix compilation with gcc-4.4
-
-Index: hydrogen/src/lib/Object.cpp
-===================================================================
---- hydrogen.orig/src/lib/Object.cpp	2010-02-12 17:12:07.000000000 +0100
-+++ hydrogen/src/lib/Object.cpp	2010-02-12 17:32:25.000000000 +0100
-@@ -26,6 +26,7 @@
- #include "config.h"
- 
- #include <pthread.h>
-+#include <cstdio>
- 
- #ifdef WIN32
- 	#include <windows.h>
-Index: hydrogen/src/lib/drivers/JackDriver.cpp
-===================================================================
---- hydrogen.orig/src/lib/drivers/JackDriver.cpp	2010-02-12 17:12:07.000000000 +0100
-+++ hydrogen/src/lib/drivers/JackDriver.cpp	2010-02-12 17:32:25.000000000 +0100
-@@ -29,6 +29,7 @@
- #include <unistd.h>
- #include "lib/Hydrogen.h"
- #include "lib/Preferences.h"
-+#include <cstdio>
- 
- unsigned long jack_server_sampleRate = 0;
- jack_nframes_t jack_server_bufferSize = 0;
diff --git a/debian/patches/08_550303_kbsd.patch b/debian/patches/08_550303_kbsd.patch
deleted file mode 100644
index 46d2e8d..0000000
--- a/debian/patches/08_550303_kbsd.patch
+++ /dev/null
@@ -1,15 +0,0 @@
-http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=550303
-
-Patch by Cyril Brulebois <kibi at debian.org>
-
-diff --git a/libs/hydrogen/src/hydrogen.cpp b/libs/hydrogen/src/hydrogen.cpp
---- a/libs/hydrogen/src/hydrogen.cpp
-+++ b/libs/hydrogen/src/hydrogen.cpp
-@@ -37,6 +37,7 @@
- #include <iostream>
- #include <ctime>
- #include <cmath>
-+#include <cstdlib>
- 
- #include <QtCore/QMutex>
- #include <QtCore/QMutexLocker>
diff --git a/debian/patches/1001_use_system_tinyxml.patch b/debian/patches/1001_use_system_tinyxml.patch
deleted file mode 100644
index 881e175..0000000
--- a/debian/patches/1001_use_system_tinyxml.patch
+++ /dev/null
@@ -1,46 +0,0 @@
-Description: Use system-installed TinyXml
-Author: Jonas Smedegaard <dr at jones.dk>
-Last-Update: 2010-03-20
---- a/Sconstruct
-+++ b/Sconstruct
-@@ -268,6 +268,7 @@
- 		env.Append( LIBS = [ "porttime" ] )
- 	if str(env['lash']) == "1":
- 	        env.ParseConfig('pkg-config --cflags --libs lash-1.0')
-+	env.ParseConfig('pkg-config --cflags --libs tinyxml-nostl')
- 
- 	if sys.platform == "darwin":
- 		env.Append( LIBS = ["z"] )
---- a/libs/hydrogen/src/local_file_mgr.cpp
-+++ b/libs/hydrogen/src/local_file_mgr.cpp
-@@ -48,7 +48,7 @@
- #include <QVector>
- #include <QLocale>
- 
--#include "xml/tinyxml.h"
-+#include <tinyxml.h>
- 
- #include <algorithm>
- //#include <cstdio>
---- a/libs/hydrogen/src/preferences.cpp
-+++ b/libs/hydrogen/src/preferences.cpp
-@@ -42,7 +42,7 @@
- #include "config.h"
- #include "version.h"
- 
--#include "xml/tinyxml.h"
-+#include <tinyxml.h>
- #include <QDir>
- #include <QApplication>
- 
---- a/libs/hydrogen/src/song.cpp
-+++ b/libs/hydrogen/src/song.cpp
-@@ -25,7 +25,7 @@
- 
- #include <cassert>
- 
--#include "xml/tinyxml.h"
-+#include <tinyxml.h>
- 
- #include <hydrogen/adsr.h>
- #include <hydrogen/data_path.h>
diff --git a/debian/patches/series b/debian/patches/series
index 0a0279e..82615bb 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,7 +1,2 @@
-#02_gcc41.patch
-#03_gcc43.patch
-#07_gcc44.patch
-#08_550303_kbsd.patch
 09_portaudio_v2.patch
-#1001_use_system_tinyxml.patch
 1002_relax_SCons_linux2_resolving.patch

-- 
hydrogen packaging



More information about the pkg-multimedia-commits mailing list