Fix Amarok FTBFS on oneiric

git-svn-id: svn://anonsvn.kde.org/home/kde/branches/trinity/applications/amarok@1258863 283d02a7-25f6-0310-bc7c-ecb5cbfe19da
v3.5.13-sru
tpearson 13 years ago
parent 442a3ecae6
commit 599b939c28

@ -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

@ -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() );

@ -95,7 +95,7 @@ const TQString *AtomicString::ptr() const
{
if( m_string )
return m_string;
return &TQString();
return &null_tqstring;
}
uint AtomicString::refcount() const

@ -180,6 +180,7 @@ private:
static void checkLazyDeletes();
Data *m_string;
TQString null_tqstring;
// static data
static set_type s_store; // main string store

@ -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)

Loading…
Cancel
Save