From 09234a155719bb37ce954611b076edcbe09874e6 Mon Sep 17 00:00:00 2001
From: Christian Muehlhaeuser <muesli@gmail.com>
Date: Thu, 24 Feb 2011 01:33:33 +0100
Subject: [PATCH 1/2] * Fixed Mac build system.

---
 admin/mac/deposx.sh | 18 +++++-------------
 1 file changed, 5 insertions(+), 13 deletions(-)

diff --git a/admin/mac/deposx.sh b/admin/mac/deposx.sh
index 5ea012bbd..116c0ece4 100755
--- a/admin/mac/deposx.sh
+++ b/admin/mac/deposx.sh
@@ -32,6 +32,7 @@ function import_lib
     cp -R -L $1 MacOS/`basename $1`
     chmod u+rw MacOS/`basename $1`
     deplib_change MacOS/`basename $1`
+    deposx_change MacOS/`basename $1`
 }
 
 function deposx_change 
@@ -63,7 +64,8 @@ function deplib_change
     install_name_tool -change /usr/local/Cellar/liblastfm/0.3.1/lib/liblastfm.0.dylib @executable_path/liblastfm.0.dylib $1
     install_name_tool -change libqjson.0.dylib @executable_path/libqjson.0.dylib $1
     install_name_tool -change /usr/local/lib/libechonest.1.1.dylib @executable_path/libechonest.1.1.dylib $1
-    install_name_tool -change /usr/local/Cellar/clucene/0.9.21/lib/libclucene.0.dylib @executable_path/libclucene.0.dylib $1
+    install_name_tool -change /usr/local/lib/libclucene-core.0.9.23.dylib @executable_path/libclucene-core.0.9.23.dylib $1
+    install_name_tool -change /usr/local/lib/libclucene-shared.0.9.23.dylib @executable_path/libclucene-shared.0.9.23.dylib $1
     install_name_tool -change /usr/local/Cellar/gloox/1.0/lib/libgloox.8.dylib @executable_path/libgloox.8.dylib $1
     install_name_tool -change /usr/local/Cellar/taglib/1.6.3/lib/libtag.1.dylib @executable_path/libtag.1.dylib $1
     install_name_tool -change /usr/local/Cellar/libogg/1.2.0/lib/libogg.0.dylib @executable_path/libogg.0.dylib $1
@@ -103,7 +105,8 @@ import_lib /usr/local/Cellar/mad/0.15.1b/lib/libmad.0.dylib
 import_lib /usr/local/Cellar/flac/1.2.1/lib/libFLAC++.6.dylib
 import_lib /usr/local/Cellar/flac/1.2.1/lib/libFLAC.8.dylib
 import_lib /usr/local/lib/libechonest.1.1.dylib
-import_lib /usr/local/Cellar/clucene/0.9.21/lib/libclucene.0.dylib
+import_lib /usr/local/lib/libclucene-core.0.9.23.dylib
+import_lib /usr/local/lib/libclucene-shared.0.9.23.dylib
 
 import_lib ../../libsip_jabber.dylib
 import_lib ../../libsip_twitter.dylib
@@ -112,17 +115,6 @@ import_lib ../../src/libtomahawk/libtomahawklib.dylib
 import_lib ../../thirdparty/jdns/libtomahawk_jdns.dylib
 import_lib ../../thirdparty/qtweetlib/libtomahawk_qtweetlib.dylib
 
-deposx_change MacOS/libqjson.0.dylib
-deposx_change MacOS/liblastfm.0.dylib
-deposx_change MacOS/libclucene.0.dylib
-deposx_change MacOS/libechonest.1.1.dylib
-deposx_change MacOS/libsip_jabber.dylib
-deposx_change MacOS/libsip_twitter.dylib
-deposx_change MacOS/libsip_zeroconf.dylib
-deposx_change MacOS/libtomahawklib.dylib
-deposx_change MacOS/libtomahawk_jdns.dylib
-deposx_change MacOS/libtomahawk_qtweetlib.dylib
-
 # now Qt
 for x in $QTLIBS
 do

From 15677b2f0fe45f19b1afb53dd19d04a932f12842 Mon Sep 17 00:00:00 2001
From: Christian Muehlhaeuser <muesli@gmail.com>
Date: Thu, 24 Feb 2011 02:18:47 +0100
Subject: [PATCH 2/2] * Don't load SourceList twice.

---
 src/libtomahawk/network/servent.cpp | 2 +-
 src/tomahawkapp.cpp                 | 3 ---
 2 files changed, 1 insertion(+), 4 deletions(-)

diff --git a/src/libtomahawk/network/servent.cpp b/src/libtomahawk/network/servent.cpp
index 49385adf3..e3eb71a9e 100644
--- a/src/libtomahawk/network/servent.cpp
+++ b/src/libtomahawk/network/servent.cpp
@@ -344,7 +344,7 @@ closeconnection:
 void
 Servent::createParallelConnection( Connection* orig_conn, Connection* new_conn, const QString& key )
 {
-    qDebug() << "Servent::createParallelConnection, key:" << key << thread();
+    qDebug() << "Servent::createParallelConnection, key:" << key << thread() << orig_conn;
     // if we can connect to them directly:
     if( orig_conn->outbound() )
     {
diff --git a/src/tomahawkapp.cpp b/src/tomahawkapp.cpp
index 13f63ec27..45b4053c8 100644
--- a/src/tomahawkapp.cpp
+++ b/src/tomahawkapp.cpp
@@ -158,7 +158,6 @@ TomahawkApp::TomahawkApp( int& argc, char *argv[] )
     new TomahawkSettings( this );
     m_audioEngine = new AudioEngine;
     new ScanManager( this );
-    
     new Pipeline( this );
     
     m_servent = new Servent( this );
@@ -167,8 +166,6 @@ TomahawkApp::TomahawkApp( int& argc, char *argv[] )
     qDebug() << "Init Database.";
     setupDatabase();
 
-    new SourceList( this );
-    
     qDebug() << "Init Echonest Factory.";
     GeneratorFactory::registerFactory( "echonest", new EchonestFactory );