merge of 'a8e3405d3042e589c04a355a17ed9bf28f95cf20'

     and 'db859e2581bdaa1ea9e72a0a6f92806562fe7a12'

8 files changed, 44 insertions, 7 deletions

diff --git a/packages/opie-init/opie-init/opie b/packages/opie-init/opie-init/opie
index 3fe4d0cdf8..8f08732797 100755
--- a/packages/opie-init/opie-init/opie
+++ b/packages/opie-init/opie-init/opie
@@ -64,6 +64,8 @@ case $1 in
         fi           
         echo Starting Opie....
         $SSHAGENT $OPIEDIR/bin/qpe -terminal 3
+	sleep 1
+	$OPIEDIR/bin/qss </dev/null >/var/log/opie-qss.log 2>&1 &
     fi
 
     ;;
diff --git a/packages/opie-init/opie-init_1.2.2.bb b/packages/opie-init/opie-init_1.2.2.bb
index 271ff62e51..47cca4f066 100644
--- a/packages/opie-init/opie-init_1.2.2.bb
+++ b/packages/opie-init/opie-init_1.2.2.bb
@@ -1,5 +1,5 @@
 require ${PN}.inc
-PR = "r0"
+PR = "r1"
 
 SRC_URI = "file://opie-reorgfiles \
            file://opie \
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 \
           "
diff --git a/packages/opie-todo/files/.mtn2git_empty b/packages/opie-todo/files/.mtn2git_empty
new file mode 100644
index 0000000000..e69de29bb2
--- /dev/null
+++ b/packages/opie-todo/files/.mtn2git_empty
diff --git a/packages/opie-todo/files/unbreak-logging.patch b/packages/opie-todo/files/unbreak-logging.patch
new file mode 100644
index 0000000000..c76b8b4dc7
--- /dev/null
+++ b/packages/opie-todo/files/unbreak-logging.patch
@@ -0,0 +1,21 @@
+Index: opie/core/pim/todo/main.cpp
+===================================================================
+RCS file: /cvs/opie/core/pim/todo/main.cpp,v
+retrieving revision 1.11
+diff -u -r1.11 main.cpp
+--- main.cpp	6 Apr 2005 21:39:47 -0000	1.11
++++ main.cpp	3 May 2007 02:57:14 -0000
+@@ -34,13 +34,8 @@
+ 
+ #include <qpe/qpeapplication.h>
+ 
+-void myMessages( QtMsgType, const char*  ) {
+-
+-}
+-
+ int main( int argc, char **argv )
+ {
+-    qInstallMsgHandler( myMessages );
+     QPEApplication a( argc, argv );
+ 
+     QTime time;
diff --git a/packages/opie-todo/opie-todo_cvs.bb b/packages/opie-todo/opie-todo_cvs.bb
index dabbdfd4fb..239780520d 100644
--- a/packages/opie-todo/opie-todo_cvs.bb
+++ b/packages/opie-todo/opie-todo_cvs.bb
@@ -1,6 +1,8 @@
 require ${PN}.inc
 
 PV = "${OPIE_CVS_PV}"
+PR = "r1"
 
 SRC_URI = "${HANDHELDS_CVS};module=opie/core/pim/todo \
-           ${HANDHELDS_CVS};module=opie/apps"
+           ${HANDHELDS_CVS};module=opie/apps \
+           file://unbreak-logging.patch;patch=1"
diff --git a/packages/tasks/task-opie.bb b/packages/tasks/task-opie.bb
index c4f493b80d..960770ef7c 100644
--- a/packages/tasks/task-opie.bb
+++ b/packages/tasks/task-opie.bb
@@ -5,7 +5,7 @@ ALLOW_EMPTY = "1"
 LICENSE = "MIT"
 PROVIDES = "task-opie-everything"
 
-PR = "r6"
+PR = "r7"
 
 PACKAGES = "task-opie-applets task-opie-apps task-opie-base \
             task-opie-base-applets task-opie-base-apps \
@@ -27,9 +27,9 @@ PACKAGES += "task-opie-everything"
 #
 # Dependencies to get the launcher up and running
 #
-RDEPENDS_task-opie-base = "opie-init opie-alarm opie-qcop opie-quicklauncher opie-taskbar \
-                           opie-pics opie-sounds opie-freetype ttf-dejavu-sans \
-			   ttf-dejavu-sans-mono"
+RDEPENDS_task-opie-base = "opie-init opie-alarm opie-qcop opie-qss opie-quicklauncher \
+                           opie-taskbar opie-pics opie-sounds opie-freetype \
+                           ttf-dejavu-sans ttf-dejavu-sans-mono"
 
 #
 # things for reasonable bootstrap image