summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authortpearson <tpearson@283d02a7-25f6-0310-bc7c-ecb5cbfe19da>2011-10-11 07:47:22 +0000
committertpearson <tpearson@283d02a7-25f6-0310-bc7c-ecb5cbfe19da>2011-10-11 07:47:22 +0000
commitae35c8f0c0d258e1fdb44dab6360528e7943e53a (patch)
tree1f443ebec3424e0020ca28a3d5d06111173504ef
parent2bf98fe80123692057a58a267f921cf014d61ef5 (diff)
downloadtdemultimedia-ae35c8f0c0d258e1fdb44dab6360528e7943e53a.tar.gz
tdemultimedia-ae35c8f0c0d258e1fdb44dab6360528e7943e53a.zip
Fix kdemultimedia FTBFS under oneiric
git-svn-id: svn://anonsvn.kde.org/home/kde/branches/trinity/kdemultimedia@1258292 283d02a7-25f6-0310-bc7c-ecb5cbfe19da
-rw-r--r--arts/builder/Makefile.am4
-rw-r--r--arts/gui/kde/kpoti.cpp3
-rw-r--r--arts/midi/Makefile.am16
-rw-r--r--arts/tools/Makefile.am8
4 files changed, 16 insertions, 15 deletions
diff --git a/arts/builder/Makefile.am b/arts/builder/Makefile.am
index aacc576..a6e9b4d 100644
--- a/arts/builder/Makefile.am
+++ b/arts/builder/Makefile.am
@@ -21,11 +21,11 @@ noinst_HEADERS = qttableview.h
METASOURCES = AUTO
-artsbuilder_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_KDECORE) $(LIB_KDEUI) -lkdefx $(LIB_KIO) -lktexteditor
+artsbuilder_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_KDECORE) $(LIB_KDEUI) -lkdefx $(LIB_KIO) -lktexteditor -lmcop -lartsflow_idl
# the libraries to link against. Be aware of the order. First the libraries,
# that depend on the following ones.
-artsbuilder_LDADD = $(LIB_KFILE) -lqtmcop $(LIB_X11) $(LIBPTHREAD) $(top_builddir)/arts/runtime/libartsbuilder.la -lsoundserver_idl -lartskde
+artsbuilder_LDADD = $(LIB_KFILE) -lqtmcop $(LIB_X11) $(LIBPTHREAD) $(top_builddir)/arts/runtime/libartsbuilder.la -lsoundserver_idl -lartskde -lmcop -lartsflow_idl
rcdir = $(kde_datadir)/artsbuilder
rc_DATA = artsbuilderui.rc
diff --git a/arts/gui/kde/kpoti.cpp b/arts/gui/kde/kpoti.cpp
index 03a99c2..cea2a10 100644
--- a/arts/gui/kde/kpoti.cpp
+++ b/arts/gui/kde/kpoti.cpp
@@ -209,7 +209,8 @@ KPoti::~KPoti()
void KPoti::init(int value)
{
d = new KPotiPrivate;
- const_cast<QFont*>(&font())->setPointSize( 8 );
+ TQFont pifnt = font();
+ const_cast<QFont*>(&pifnt)->setPointSize( 8 );
d->potiColor.setNamedColor( "red" );
timer = 0;
diff --git a/arts/midi/Makefile.am b/arts/midi/Makefile.am
index b7d655a..d097dc8 100644
--- a/arts/midi/Makefile.am
+++ b/arts/midi/Makefile.am
@@ -9,19 +9,19 @@ bin_PROGRAMS = midisend
noinst_PROGRAMS = midisynctest
midisend_SOURCES = midisend.cc midimsg.c
-midisend_LDFLAGS = $(all_libraries) $(LIB_QT) $(KDE_RPATH) $(LIBPTHREAD)
-midisend_LDADD = libartsmidi_idl.la
+midisend_LDFLAGS = $(all_libraries) $(LIB_QT) $(KDE_RPATH) $(LIBPTHREAD) $(LIB_QT) -lmcop -lartsflow_idl
+midisend_LDADD = libartsmidi_idl.la -lartsflow_idl
midisend_COMPILE_FIRST = artsmidi.h
midisynctest_SOURCES = midisynctest.cc
-midisynctest_LDFLAGS = $(all_libraries) $(LIB_QT) $(KDE_RPATH) $(LIBPTHREAD)
-midisynctest_LDADD = libartsmidi.la -lsoundserver_idl
+midisynctest_LDFLAGS = $(all_libraries) $(LIB_QT) $(KDE_RPATH) $(LIBPTHREAD) $(LIB_QT) -lmcop -lartsflow_idl -lartsmidi_idl
+midisynctest_LDADD = libartsmidi.la -lsoundserver_idl -lartsflow_idl -lartsmidi_idl
midisynctest_COMPILE_FIRST = artsmidi.h
libartsmidi_idl_la_SOURCES = artsmidi.cc
-libartsmidi_idl_la_LIBADD = -lmcop -lartsflow
+libartsmidi_idl_la_LIBADD = -lmcop -lartsflow -lartsflow_idl
libartsmidi_idl_la_LDFLAGS = $(all_libraries) -L$(arts_libraries) \
- -no-undefined
+ -no-undefined -lartsflow_idl
libartsmidi_la_SOURCES = midimanager_impl.cc midiclient_impl.cc \
miditest_impl.cc midimanagerport_impl.cc rawmidiport_impl.cc \
@@ -30,9 +30,9 @@ libartsmidi_la_SOURCES = midimanager_impl.cc midiclient_impl.cc \
alsamidiport_impl.cc midisyncgroup_impl.cc timestampmath.cc
libartsmidi_la_COMPILE_FIRST = artsmidi.h
-libartsmidi_la_LIBADD = libartsmidi_idl.la -lartsflow $(ARTS_LIBASOUND)
+libartsmidi_la_LIBADD = libartsmidi_idl.la -lartsflow_idl -lartsflow $(ARTS_LIBASOUND)
libartsmidi_la_LDFLAGS = $(all_libraries) -L$(arts_libraries) \
- -no-undefined
+ -no-undefined -lartsflow_idl
artsmidi.mcopclass: artsmidi.h
artsmidi.mcoptype: artsmidi.h
diff --git a/arts/tools/Makefile.am b/arts/tools/Makefile.am
index 806856a..942b8dd 100644
--- a/arts/tools/Makefile.am
+++ b/arts/tools/Makefile.am
@@ -32,8 +32,8 @@ SOMAJOR = 1
SOMINOR = 0
SOSUBMINOR = 0
-libartscontrolapplet_la_LDFLAGS = $(all_libraries) -version-info $(SOMAJOR):$(SOMINOR):$(SOSUBMINOR) -no-undefined -module
-libartscontrolsupport_la_LDFLAGS = $(all_libraries) -version-info $(SOMAJOR):$(SOMINOR):$(SOSUBMINOR) -no-undefined
+libartscontrolapplet_la_LDFLAGS = $(all_libraries) -lmcop -lartsflow_idl -L../gui/common -lartsgui_idl -L../gui/kde -lartsgui_kde -L../midi -lartsmidi -lartsmidi_idl -L../modules/effects -lartsmoduleseffects -L../modules/synth -lartsmodulessynth -L../modules/common -lartsmodulescommon $(LIB_QT) -lDCOP $(LIB_KDECORE) $(LIB_KDEUI) -version-info $(SOMAJOR):$(SOMINOR):$(SOSUBMINOR) -no-undefined -module
+libartscontrolsupport_la_LDFLAGS = $(all_libraries) -lmcop -lartsflow_idl -L../gui/common -lartsgui_idl -L../gui/kde -lartsgui_kde -L../midi -lartsmidi -lartsmidi_idl -L../modules/effects -lartsmoduleseffects -L../modules/synth -lartsmodulessynth -L../modules/common -lartsmodulescommon $(LIB_QT) -lDCOP $(LIB_KDECORE) $(LIB_KDEUI) -version-info $(SOMAJOR):$(SOMINOR):$(SOSUBMINOR) -no-undefined
libartscontrolapplet_la_LIBADD = \
-lartsflow -lartsflow_idl -lmcop -lqtmcop $(LIBDL) -lsoundserver_idl -lartskde \
@@ -57,10 +57,10 @@ libartscontrolsupport_la_LIBADD = \
bin_PROGRAMS = artscontrol
artscontrol_SOURCES = main.cpp levelmeters.cpp
-artscontrol_LDFLAGS = $(all_libraries) $(KDE_RPATH) -lartsflow
+artscontrol_LDFLAGS = $(all_libraries) $(KDE_RPATH) -lartsflow -lmcop -lartsflow_idl -L../gui/common -lartsgui_idl -L../gui/kde -lartsgui_kde -L../midi -lartsmidi -lartsmidi_idl -L../modules/effects -lartsmoduleseffects -L../modules/synth -lartsmodulessynth -L../modules/common -lartsmodulescommon $(LIB_QT) -lDCOP $(LIB_KDECORE) $(LIB_KDEUI)
artscontrol_LDADD = libartscontrolsupport.la \
$(LIB_KDEUI) $(LIB_KSYCOCA) $(LIB_KFILE) \
- -lqtmcop -lartsflow -lartsflow_idl -lsoundserver_idl -lartskde
+ -lqtmcop -lartsflow -lartsflow_idl -lsoundserver_idl -lartskde -lmcop -lartsflow_idl -L../gui/common -lartsgui_idl -L../gui/kde -lartsgui_kde -L../midi -lartsmidi -lartsmidi_idl -L../modules/effects -lartsmoduleseffects -L../modules/synth -lartsmodulessynth -L../modules/common -lartsmodulescommon $(LIB_QT) -lDCOP $(LIB_KDECORE) $(LIB_KDEUI)
xdg_apps_DATA = artscontrol.desktop