Hello community, here is the log from the commit of package arts checked in at Mon Nov 6 19:15:29 CET 2006. -------- --- KDE/arts/arts.changes 2006-10-20 13:24:33.000000000 +0200 +++ /mounts/work_src_done/STABLE/arts/arts.changes 2006-11-06 14:57:46.000000000 +0100 @@ -1,0 +2,5 @@ +Mon Nov 6 14:57:26 CET 2006 - ltinkl@suse.cz + +- fix #178930: aRts starts in multiple instances + +------------------------------------------------------------------- ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ arts.spec ++++++ --- /var/tmp/diff_new_pack.nz83q0/_old 2006-11-06 19:13:39.000000000 +0100 +++ /var/tmp/diff_new_pack.nz83q0/_new 2006-11-06 19:13:39.000000000 +0100 @@ -22,7 +22,7 @@ Summary: Modular Software Synthesizer PreReq: permissions Version: 1.5.5 -Release: 7 +Release: 14 Source0: %{name}-%{version}.tar.bz2 Source1: artswrapper.7.gz #Patch0: 1_5_BRANCH.diff @@ -193,6 +193,8 @@ /opt/kde3/%_lib/*.la %changelog -n arts +* Mon Nov 06 2006 - ltinkl@suse.cz +- fix #178930: aRts starts in multiple instances * Fri Oct 20 2006 - dmueller@suse.de - fix build with automake 1.10 * Tue Oct 03 2006 - stbinner@suse.de ++++++ arts-start-on-demand.diff ++++++ --- /var/tmp/diff_new_pack.nz83q0/_old 2006-11-06 19:13:39.000000000 +0100 +++ /var/tmp/diff_new_pack.nz83q0/_new 2006-11-06 19:13:39.000000000 +0100 @@ -1,22 +1,16 @@ -Index: mcop/tmpglobalcomm.cc -================================================================================ ---- mcop/tmpglobalcomm.cc -+++ mcop/tmpglobalcomm.cc -@@ -54,8 +54,17 @@ - { - string result = ""; - string filename = MCOPUtils::createFilePath(variable); -+ static bool started_arts = false; +diff -ur arts-orig/mcop/objectmanager.cc arts-1.5.5/mcop/objectmanager.cc +--- mcop/objectmanager.cc 2005-09-10 10:13:32.000000000 +0200 ++++ mcop/objectmanager.cc 2006-11-04 15:43:47.000000000 +0100 +@@ -267,6 +267,12 @@ + + string ObjectManager::getGlobalReference(const string& name) + { ++ static bool started_arts = false; ++ if (!started_arts) ++ { ++ system("kcminit arts"); ++ started_arts = true; ++ } + return Dispatcher::the()->globalComm().get(name); + } - int fd = open(filename.c_str(),O_RDONLY); -+ if (fd == -1 && !started_arts) -+ { -+ fprintf(stderr, "starting artsd!\n"); -+ system("kcminit arts"); -+ fd = open(filename.c_str(),O_RDONLY); -+ started_arts = true; -+ } -+ - if(fd != -1) - { - char buffer[8192]; ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Remember to have fun... --------------------------------------------------------------------- To unsubscribe, e-mail: opensuse-commit+unsubscribe@opensuse.org For additional commands, e-mail: opensuse-commit+help@opensuse.org