diff options
| author | Paul Sokolovsky <pmiscml@gmail.com> | 2007-05-03 05:21:22 +0000 |
|---|---|---|
| committer | Paul Sokolovsky <pmiscml@gmail.com> | 2007-05-03 05:21:22 +0000 |
| commit | 1d75eca295e3cdd1630098d20bff752a2c02de3b (patch) | |
| tree | 86569c66ceae9a83017c23dd75febb104b79b37c | |
| parent | 095c281a592681af4fb35adcc577f737ee0095f7 (diff) | |
opie-taskbar cvs: Don't bother to start qss from C++ code.
* Because it's useless - to have a separate process for sound server,
and then have mishacks to start/keep alive it hardcoded in C++. That doesn't
work somehow (h4000, hx4700, etc. machines have issues), and then it
completely non-debuggable.
* So instead, qss should be started separately, of course from a shell script.
* Partially fixes #2211.
| -rw-r--r-- | packages/opie-taskbar/opie-taskbar/no-builtin-qss-startup.patch | 11 | ||||
| -rw-r--r-- | packages/opie-taskbar/opie-taskbar_cvs.bb | 3 |
2 files changed, 13 insertions, 1 deletions
diff --git a/packages/opie-taskbar/opie-taskbar/no-builtin-qss-startup.patch b/packages/opie-taskbar/opie-taskbar/no-builtin-qss-startup.patch new file mode 100644 index 0000000000..349b28675b --- /dev/null +++ b/packages/opie-taskbar/opie-taskbar/no-builtin-qss-startup.patch @@ -0,0 +1,11 @@ +--- launcher/server.cpp.org 2007-05-01 20:55:01.000000000 +0000 ++++ launcher/server.cpp 2007-05-03 04:48:45.000000000 +0000 +@@ -1009,6 +1009,8 @@ + } + + void Server::startSoundServer() { ++ owarn << "Sound server (qss) now needs to be started standalone" << oendl; ++ return; + if ( !process ) { + process = new Opie::Core::OProcess( this ); + connect(process, SIGNAL(processExited(Opie::Core::OProcess*)), diff --git a/packages/opie-taskbar/opie-taskbar_cvs.bb b/packages/opie-taskbar/opie-taskbar_cvs.bb index 6ff5a5ef66..81e2131be9 100644 --- a/packages/opie-taskbar/opie-taskbar_cvs.bb +++ b/packages/opie-taskbar/opie-taskbar_cvs.bb @@ -1,6 +1,6 @@ require ${PN}.inc PV = "${OPIE_CVS_PV}" -PR = "r7" +PR = "r8" SRC_URI = "${HANDHELDS_CVS};module=opie/core/apps/calibrate \ ${HANDHELDS_CVS};module=opie/noncore/settings/mediummount \ @@ -10,5 +10,6 @@ SRC_URI = "${HANDHELDS_CVS};module=opie/core/apps/calibrate \ ${HANDHELDS_CVS};module=opie/root \ ${HANDHELDS_CVS};module=opie/etc \ file://nomax.patch;patch=1;pnum=3 \ + file://no-builtin-qss-startup.patch;patch=1 \ file://server.pro \ " |