[oe-commits] org.oe.dev opie-taskbar: restore opie's restartability

[polyonymous commit]

opie-taskbar: restore opie's restartability

Author: polyonymous at openembedded.org
Branch: org.openembedded.dev
Revision: ad674e0204e9c297078728d296e742da2788ebca
ViewMTN: http://monotone.openembedded.org/revision.psp?id=ad674e0204e9c297078728d296e742da2788ebca
Files:
1
packages/opie-taskbar/opie-taskbar/restart-from-bindir.patch
packages/opie-taskbar/opie-taskbar_cvs.bb
Diffs:

#
# mt diff -rd38a87ce5fde7b3ef0dad23da4c6211cadd6c9a8 -rad674e0204e9c297078728d296e742da2788ebca
#
# 
# 
# add_file "packages/opie-taskbar/opie-taskbar/restart-from-bindir.patch"
#  content [ea55d2e26ae2b028f7f4deb26fc7787b2ae9f059]
# 
# patch "packages/opie-taskbar/opie-taskbar_cvs.bb"
#  from [6ab03fd59add9cd0437b756d1e8d70378db9023c]
#    to [a271a76cff4b213a30069374a7c367ba10d00d16]
# 
============================================================
--- packages/opie-taskbar/opie-taskbar/restart-from-bindir.patch	ea55d2e26ae2b028f7f4deb26fc7787b2ae9f059
+++ packages/opie-taskbar/opie-taskbar/restart-from-bindir.patch	ea55d2e26ae2b028f7f4deb26fc7787b2ae9f059
@@ -0,0 +1,12 @@
+diff --git a/serverapp.cpp b/serverapp.cpp
+index 0e92040..b933340 100644
+--- a/serverapp.cpp
++++ b/serverapp.cpp
+@@ -763,6 +763,7 @@ void ServerApplication::restart()
+         for ( int fd = 3; fd < 100; fd++ )
+         close( fd );
+         execl( ( qpeDir() + "/bin/qpe" ).local8Bit(), "qpe", NULL );
++        execl( OPIE_BINDIR "/qpe", "qpe", NULL );
+         exit( 1 );
+ #endif
+     }
============================================================
--- packages/opie-taskbar/opie-taskbar_cvs.bb	6ab03fd59add9cd0437b756d1e8d70378db9023c
+++ packages/opie-taskbar/opie-taskbar_cvs.bb	a271a76cff4b213a30069374a7c367ba10d00d16
@@ -1,6 +1,6 @@ PV = "${OPIE_CVS_PV}"
 require ${PN}.inc
 PV = "${OPIE_CVS_PV}"
-PR = "r12"
+PR = "r13"
 
 SRC_URI = "${HANDHELDS_CVS};module=opie/core/apps/calibrate \
            ${HANDHELDS_CVS};module=opie/noncore/settings/mediummount \
@@ -13,4 +13,5 @@ SRC_URI = "${HANDHELDS_CVS};module=opie/
            file://no-builtin-qss-startup.patch;patch=1 \
            file://kbdlocks-runtime.patch;patch=1 \
            file://server.pro \
+	   file://restart-from-bindir.patch;patch=1 \
           "