From 599b939c28542921fe8e64e363f5a1b081a178ec Mon Sep 17 00:00:00 2001
From: tpearson <tpearson@283d02a7-25f6-0310-bc7c-ecb5cbfe19da>
Date: Fri, 14 Oct 2011 00:20:12 +0000
Subject: [PATCH] Fix Amarok FTBFS on oneiric

git-svn-id: svn://anonsvn.kde.org/home/kde/branches/trinity/applications/amarok@1258863 283d02a7-25f6-0310-bc7c-ecb5cbfe19da
---
 amarok/src/Makefile.am                   | 12 ++++++++++--
 amarok/src/actionclasses.cpp             |  4 ++--
 amarok/src/atomicstring.cpp              |  2 +-
 amarok/src/atomicstring.h                |  1 +
 amarok/src/collectionscanner/Makefile.am | 10 ++++++++--
 5 files changed, 22 insertions(+), 7 deletions(-)

diff --git a/amarok/src/Makefile.am b/amarok/src/Makefile.am
index 92d18bfc..cbdb0a34 100644
--- a/amarok/src/Makefile.am
+++ b/amarok/src/Makefile.am
@@ -166,7 +166,11 @@ libamarok_la_LIBADD = \
 
 libamarok_la_LDFLAGS = \
     $(all_libraries) \
-    $(KDE_RPATH)
+    $(KDE_RPATH) \
+    $(LIB_QT) \
+    -lDCOP \
+    $(LIB_KDECORE) \
+    $(LIB_KDEUI)
 
 METASOURCES = \
     AUTO
@@ -201,7 +205,11 @@ amarokapp_LDADD = \
 
 amarokapp_LDFLAGS = \
     $(all_libraries) \
-    $(KDE_RPATH)
+    $(KDE_RPATH) \
+    $(LIB_QT) \
+    -lDCOP \
+    $(LIB_KDECORE) \
+    $(LIB_KDEUI)
 
 rcdir = \
     $(kde_datadir)/amarok
diff --git a/amarok/src/actionclasses.cpp b/amarok/src/actionclasses.cpp
index 3fd5c490..cdaa3ff6 100644
--- a/amarok/src/actionclasses.cpp
+++ b/amarok/src/actionclasses.cpp
@@ -30,6 +30,8 @@
 #include <ktoolbarbutton.h>
 #include <kurl.h>
 
+extern KAboutData aboutData;
+
 namespace Amarok
 {
     bool repeatNone() { return AmarokConfig::repeat() == AmarokConfig::EnumRepeat::Off; }
@@ -171,8 +173,6 @@ Menu::instance()
 KPopupMenu*
 Menu::helpMenu( TQWidget *parent ) //STATIC
 {
-    extern KAboutData aboutData;
-
     if ( s_helpMenu == 0 )
         s_helpMenu = new KHelpMenu( parent, &aboutData, Amarok::actionCollection() );
 
diff --git a/amarok/src/atomicstring.cpp b/amarok/src/atomicstring.cpp
index a384ee72..ced1b89a 100644
--- a/amarok/src/atomicstring.cpp
+++ b/amarok/src/atomicstring.cpp
@@ -95,7 +95,7 @@ const TQString *AtomicString::ptr() const
 {
     if( m_string )
         return m_string;
-    return &TQString();
+    return &null_tqstring;
 }
 
 uint AtomicString::refcount() const
diff --git a/amarok/src/atomicstring.h b/amarok/src/atomicstring.h
index 4cee7fff..30b4667c 100644
--- a/amarok/src/atomicstring.h
+++ b/amarok/src/atomicstring.h
@@ -180,6 +180,7 @@ private:
     static void checkLazyDeletes();
 
     Data *m_string;
+    TQString null_tqstring;
 
     // static data
     static set_type s_store;    // main string store
diff --git a/amarok/src/collectionscanner/Makefile.am b/amarok/src/collectionscanner/Makefile.am
index 51c2f386..9d028d8c 100644
--- a/amarok/src/collectionscanner/Makefile.am
+++ b/amarok/src/collectionscanner/Makefile.am
@@ -21,8 +21,14 @@ amarokcollectionscanner_LDADD = \
     $(top_builddir)/amarok/src/libamarok.la \
     $(LIB_QT) \
     $(LIB_KDECORE) \
-    $(TAGLIB_LIBS)
+    $(TAGLIB_LIBS) \
+    $(LIB_KIO)
 
 amarokcollectionscanner_LDFLAGS = \
     $(all_libraries) \
-    $(KDE_RPATH)
+    $(KDE_RPATH) \
+    $(LIB_QT) \
+    -lDCOP \
+    $(LIB_KDECORE) \
+    $(LIB_KDEUI) \
+    $(LIB_KIO)