[SCM] hydrogen/master: Remove scons specific patches.

[alessio at users.alioth.debian.org]

The following commit has been merged in the master branch:
commit 2099aee51a9c8fac0d0619063fad84512dcf91b5
Author: Alessio Treglia <alessio at debian.org>
Date:   Fri Jan 27 02:43:28 2012 +0100

    Remove scons specific patches.

diff --git a/debian/patches/1003_gcc45.patch b/debian/patches/1003_gcc45.patch
deleted file mode 100644
index a727959..0000000
--- a/debian/patches/1003_gcc45.patch
+++ /dev/null
@@ -1,17 +0,0 @@
-Description: Add linkage required with GCC 4.5
-Author: Jonas Smedegaard <dr at jones.dk>
-Last-Update: 2011-03-17
----
- Sconstruct |    1 +
- 1 file changed, 1 insertion(+)
-
---- hydrogen.orig/Sconstruct
-+++ hydrogen/Sconstruct
-@@ -94,6 +94,7 @@ def get_platform_flags( opts ):
- 	elif sys.platform[:6] == 'linux2':
- 		ldflags.append('-lpthread')
- 		ldflags.append('-lasound')
-+		ldflags.append('-lporttime')
- 	#	ldflags.append('-lrubberband')
- 
- 	elif sys.platform == "win32":
diff --git a/debian/patches/1004_indirect_linking.patch b/debian/patches/1004_indirect_linking.patch
deleted file mode 100644
index f7c2425..0000000
--- a/debian/patches/1004_indirect_linking.patch
+++ /dev/null
@@ -1,100 +0,0 @@
-Description: fix build with ld --as-needed
- libraries must be added to LIBS instead of ldflags so they are
- ordered correctly on the command line.
- With ld --as-needed the object files must be before the libraries providing
- the symbols they need.
-Bug-Ubuntu: https://bugs.launchpad.net/ubuntu/+source/hydrogen/+bug/803182
-Author: Julian Taylor <jtaylor.debian at googlemail.com>
-Forwarded: no
----
- Sconstruct |   23 ++++++++++++-----------
- 1 file changed, 12 insertions(+), 11 deletions(-)
-
---- hydrogen.orig/Sconstruct
-+++ hydrogen/Sconstruct
-@@ -44,6 +44,7 @@ def get_platform_flags( opts ):
- 	includes = []
- 	cppflags = []
- 	ldflags = []
-+	libs = []
- 
- 	env = Environment( options = opts )
- 
-@@ -92,10 +93,10 @@ def get_platform_flags( opts ):
- 		includes.append( '/usr/local/include/jack' )
- 
- 	elif sys.platform[:6] == 'linux2':
--		ldflags.append('-lpthread')
--		ldflags.append('-lasound')
--		ldflags.append('-lporttime')
--	#	ldflags.append('-lrubberband')
-+		libs.append('-lpthread')
-+		libs.append('-lasound')
-+		libs.append('-lporttime')
-+	#	libs.append('-lrubberband')
- 
- 	elif sys.platform == "win32":
- 		includes.append( '3rdparty\libsndfile-1_0_17' )
-@@ -106,7 +107,7 @@ def get_platform_flags( opts ):
- 	else:
- 		raise Exception( "Platform '%s' not supported" % sys.platform )
- 
--	return (includes, cppflags, ldflags)
-+	return (includes, cppflags, ldflags, libs)
- 
- 
- 
-@@ -175,7 +176,7 @@ def get_svn_revision():
- 
- 
- def get_hydrogen_lib( opts ):
--	includes, cppflags, ldflags = get_platform_flags( opts )
-+	includes, cppflags, ldflags, libs = get_platform_flags( opts )
- 
- 	includes.append( "libs/hydrogen/include" )
- 	
-@@ -185,7 +186,7 @@ def get_hydrogen_lib( opts ):
- 	#location of qt4.py
- 	qt4ToolLocation="."
- 
--	env = Environment(options = opts , tools=['default','qt4'], toolpath=[qt4ToolLocation], ENV=os.environ, CPPPATH = includes, CPPFLAGS = cppflags, CCFLAGS = "", LINKFLAGS=ldflags )
-+	env = Environment(options = opts , tools=['default','qt4'], toolpath=[qt4ToolLocation], ENV=os.environ, CPPPATH = includes, CPPFLAGS = cppflags, CCFLAGS = "", LINKFLAGS=ldflags, LIBS=libs )
- 	env.EnableQt4Modules( ['QtCore', 'QtGui','QtXml'], debug=False)
- 	env.CacheDir( "scons_cache" )
- 	
-@@ -223,7 +224,7 @@ def install_images( arg , dir , files):
- 			env.Alias(target="install", source=env.Install(dir= env['DESTDIR'] + env['prefix'] + '/share/hydrogen/' + dname, source= dir + "/" + file))
- 
- def get_hydrogen_gui( lib_hydrogen , opts ):
--	includes, cppflags, ldflags = get_platform_flags( opts )
-+	includes, cppflags, ldflags, libs = get_platform_flags( opts )
- 
- 	includes.append( "libs/hydrogen/include" )
- 	includes.append( "gui/src/UI" )
-@@ -231,7 +232,7 @@ def get_hydrogen_gui( lib_hydrogen , opt
- 	#location of qt4.py
- 	qt4ToolLocation="."
- 
--	env = Environment(options = opts , tools=['default','qt4'], toolpath=[qt4ToolLocation], ENV=os.environ, CPPPATH = includes, CPPFLAGS = cppflags, CCFLAGS = "", LINKFLAGS=ldflags )
-+	env = Environment(options = opts , tools=['default','qt4'], toolpath=[qt4ToolLocation], ENV=os.environ, CPPPATH = includes, CPPFLAGS = cppflags, CCFLAGS = "", LINKFLAGS=ldflags, LIBS=libs )
- 	
- 	if str(env['gui']) == "1":
- 	    env.EnableQt4Modules( ['QtCore', 'QtGui','QtNetwork','QtXml'], debug=False)
-@@ -259,7 +260,7 @@ def get_hydrogen_gui( lib_hydrogen , opt
- 
- 	src = scanFiles( directory, ['*.cpp', '*.cc', '*.c' ], [ 'moc_'] )
- 
--	env.Append( LIBS = lib_hydrogen )
-+	env.Prepend( LIBS = lib_hydrogen )
- 	
- 	if sys.platform != "win32":
- 		env.Append( LIBS = ["sndfile"] )
-@@ -378,7 +379,7 @@ else:
- 
- #get includes ( important if you compile on non-standard envorionments)
- 
--includes, a , b = get_platform_flags( opts )
-+includes, a , b, c = get_platform_flags( opts )
- 
- env = Environment(options = opts, CPPPATH = includes)
- 
diff --git a/debian/patches/series b/debian/patches/series
index 4c37773..5f1064c 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,7 +1,5 @@
 09_portaudio_v2.patch
 1001_rubberband_path.patch
-1003_gcc45.patch
-1004_indirect_linking.patch
 1005_name_shouldnt_repeat_genericname.patch
 1006_werror_format_security.patch
 1007_installation_error_fix.patch

-- 
hydrogen packaging