[SCM] mixxx/master: Refresh patches.

[alessio at users.alioth.debian.org]

The following commit has been merged in the master branch:
commit bc6bb8079a36da9c4abed210e59aa1bd04db6272
Author: Alessio Treglia <alessio at debian.org>
Date:   Tue Nov 8 13:34:04 2011 +0100

    Refresh patches.

diff --git a/debian/patches/01-werror_format_security.patch b/debian/patches/01-werror_format_security.patch
index c3f8920..95b92ee 100644
--- a/debian/patches/01-werror_format_security.patch
+++ b/debian/patches/01-werror_format_security.patch
@@ -8,7 +8,7 @@ Forwarded: no
 
 --- mixxx.orig/src/main.cpp
 +++ mixxx/src/main.cpp
-@@ -185,7 +185,7 @@ int main(int argc, char * argv[])
+@@ -184,7 +184,7 @@ int main(int argc, char * argv[])
  
      // Construct a list of strings based on the command line arguments
      struct CmdlineArgs args;
@@ -17,7 +17,7 @@ Forwarded: no
  
      // Only match supported file types since command line options are also parsed elsewhere
      QRegExp fileRx(SoundSourceProxy::supportedFileExtensionsRegex(), Qt::CaseInsensitive);
-@@ -203,7 +203,7 @@ int main(int argc, char * argv[])
+@@ -202,7 +202,7 @@ int main(int argc, char * argv[])
  
              QString fileExtensions = SoundSourceProxy::supportedFileExtensionsString();
              QByteArray fileExtensionsBA = QString(fileExtensions).toUtf8();
diff --git a/debian/patches/20_norpath.patch b/debian/patches/20_norpath.patch
index 6e0588f..17aff5c 100644
--- a/debian/patches/20_norpath.patch
+++ b/debian/patches/20_norpath.patch
@@ -8,12 +8,12 @@ Forwarded: no
 
 --- mixxx.orig/build/depends.py
 +++ mixxx/build/depends.py
-@@ -190,8 +190,6 @@ class Qt(Dependence):
+@@ -179,8 +179,6 @@ class Qt(Dependence):
          compiling_on_104 = False
          if build.platform_is_osx:
              compiling_on_104 = (os.popen('sw_vers').readlines()[1].find('10.4') >= 0)
 -        if not build.platform_is_windows and not (using_104_sdk or compiling_on_104):
 -            build.env.Append(LINKFLAGS = "-Wl,-rpath,$QTDIR/lib")
  
- 
- class FidLib(Dependence):
+         #QtSQLite DLL
+         if build.platform_is_windows:
diff --git a/debian/patches/40-soundtouch.patch b/debian/patches/40-soundtouch.patch
index 226ff70..81bf7c4 100644
--- a/debian/patches/40-soundtouch.patch
+++ b/debian/patches/40-soundtouch.patch
@@ -9,7 +9,7 @@ Forwarded: yes
 
 --- mixxx.orig/build/depends.py
 +++ mixxx/build/depends.py
-@@ -231,60 +231,17 @@ class ReplayGain(Dependence):
+@@ -224,60 +224,17 @@ class ReplayGain(Dependence):
          build.env.Append(CPPPATH="#lib/replaygain")
  
  class SoundTouch(Dependence):

-- 
mixxx packaging