diff options
author | Michael Nottebrock <lofi@FreeBSD.org> | 2004-03-09 19:41:12 +0000 |
---|---|---|
committer | Michael Nottebrock <lofi@FreeBSD.org> | 2004-03-09 19:41:12 +0000 |
commit | f64c6af4f4d0803346188ad60d5055ea8b8d63dc (patch) | |
tree | a4ccebaea6c27a0834589e8629dbcdc5ee328c8b /x11/kde4-baseapps/files/patch-kcontrol-arts.cpp | |
parent | . Build and install API documentation if NOPORTDOCS isn't set. (diff) |
Update to KDE 3.2.1 / QT 3.3.1
Important changes:
==================
KDE:
- Audio/arts does not install artswrapper anymore, instead it is provided by
audio/artswrapper. See UPDATING.
- misc/kdeaddons3 is now a metaport with
editors/kate-plugins
editors/vimpart
games/atlantikdesigner
misc/kaddressbook-plugins
misc/kfile-plugins
misc/kicker-applets
misc/knewsticker-scripts
misc/konq-plugins
misc/ksig
misc/renamedlgplugins
multimedia/noatun-plugins
net/kontact-plugins
as slave ports.
- A number of KDE ports now uses OPTIONS do make various WITH_* options more
visible.
- Plist fixes
- devel/kdevelop should be able to detect FreeBSD's autoconf/automake now for
newly created projects.
- kdebase will no longer remove previous KDM configurations. This won't take
effect during the update from 3.2.0 to 3.2.1 (as deinstalling 3.2.0 will still
remove the configuration), but subsequent updates will merge old configs.
QT:
- Previous versions of QT could be compiled with debugging-support enabled by
defining DEBUG. This switch has been renamed to the more unambiguous
WANT_QT_DEBUG (similar to WANT_KDE_DEBUG in the KDE ports).
Diffstat (limited to 'x11/kde4-baseapps/files/patch-kcontrol-arts.cpp')
-rw-r--r-- | x11/kde4-baseapps/files/patch-kcontrol-arts.cpp | 55 |
1 files changed, 18 insertions, 37 deletions
diff --git a/x11/kde4-baseapps/files/patch-kcontrol-arts.cpp b/x11/kde4-baseapps/files/patch-kcontrol-arts.cpp index e0e5a92ce25d..df11b254f150 100644 --- a/x11/kde4-baseapps/files/patch-kcontrol-arts.cpp +++ b/x11/kde4-baseapps/files/patch-kcontrol-arts.cpp @@ -1,39 +1,20 @@ -Index: kcontrol/arts/arts.cpp -=================================================================== -RCS file: /home/kde/kdebase/kcontrol/arts/arts.cpp,v -retrieving revision 1.100 -diff -u -3 -p -r1.100 arts.cpp ---- kcontrol/arts/arts.cpp 8 Nov 2003 23:43:47 -0000 1.100 -+++ kcontrol/arts/arts.cpp 29 Jan 2004 11:59:29 -0000 -@@ -51,6 +51,7 @@ - //#include <kparts/componentfactory.h> - //#include "midi.h" - #include "arts.h" -+#include <arts/artsversion.h> +--- kcontrol/arts/arts.cpp.orig Fri Mar 5 12:15:10 2004 ++++ kcontrol/arts/arts.cpp Fri Mar 5 12:08:16 2004 +@@ -541,13 +541,13 @@ - extern "C" { - void init_arts(); -@@ -601,7 +602,11 @@ void init_arts() - config->setGroup("Arts"); - bool startServer = config->readBoolEntry("StartServer",true); - bool startRealtime = config->readBoolEntry("StartRealtime",true); -+#if ARTS_MAJOR_VERSION >= 1 && ARTS_MINOR_VERSION >= 2 - QString args = config->readEntry("Arguments","-F 10 -S 4096 -s 60 -m artsmessage -c drkonqi -l 3 -f"); -+#else -+ QString args = config->readEntry("Arguments","-F 10 -S 4096 -s 60 -m artsmessage -l 3 -f"); -+#endif - - delete config; - -@@ -652,7 +657,11 @@ QString KArtsModule::createArgs(bool net - args += QChar(' ') + addOptions; - - args += QString::fromLatin1(" -m artsmessage"); + connect(checkProcess, SIGNAL(processExited(KProcess*)), + this, SLOT(slotArtsdExited(KProcess*))); +- checkProcess->start(KProcess::Block); +- +- if (latestProcessStatus == 0) ++ if (checkProcess->start(KProcess::Block) == false) ++ realtimePossible = false; ++ else if (latestProcessStatus == 0) + realtimePossible = true; + else + realtimePossible = false; +- + -+#if ARTS_MAJOR_VERSION >= 1 && ARTS_MINOR_VERSION >= 2 - args += QString::fromLatin1(" -c drkonqi"); -+#endif -+ - args += QString::fromLatin1(" -l 3"); - args += QString::fromLatin1(" -f"); - + checked = true; + + } |