Qtopia Phone X11: Attempt to install the fdo .desktop files and a Xsession start script

    Not tested as Qtopia is still building.

3 files changed, 54 insertions, 5 deletions

diff --git a/packages/qtopia-phone/qtopia-phone-x11/Xsession.d/.mtn2git_empty b/packages/qtopia-phone/qtopia-phone-x11/Xsession.d/.mtn2git_empty
new file mode 100644
index 0000000000..e69de29bb2
--- /dev/null
+++ b/packages/qtopia-phone/qtopia-phone-x11/Xsession.d/.mtn2git_empty
diff --git a/packages/qtopia-phone/qtopia-phone-x11/Xsession.d/99qtopia b/packages/qtopia-phone/qtopia-phone-x11/Xsession.d/99qtopia
new file mode 100644
index 0000000000..3eca6bba91
--- /dev/null
+++ b/packages/qtopia-phone/qtopia-phone-x11/Xsession.d/99qtopia
@@ -0,0 +1,33 @@
+#!/bin/sh
+
+# path setup
+export QPEDIR=/opt/Qtopia
+export PATH=$QPEDIR/bin:$PATH
+
+#tell how to inform illume on incoming phone calls
+#export ILLUME_PHONE_CALL=
+
+
+# xmodmap to allow the soft-menu to work
+xmodmap -e "keycode 223 = 0x11000601"
+xmodmap -e "keycode 224 = 0x11000602"
+xmodmap -e "keycode 225 = 0x11000603"
+xmodmap -e "keycode 226 = 0x11000604"
+xmodmap -e "keycode 227 = 0x11000605"
+xmodmap -e "keycode 228 = 0x11000606"
+xmodmap -e "keycode 229 = 0x11000607"
+xmodmap -e "keycode 230 = 0x11000608"
+xmodmap -e "keycode 231 = 0x11000609"
+xmodmap -e "keycode 232 = 0x1100060A"
+xmodmap -e "keycode 232 = 0x1100060B"
+xmodmap -e "keycode 233 = 0x1100060B"
+xmodmap -e "keycode 232 = 0x1100060A"
+xmodmap -e "keycode 234 = 0x1100060C"
+xmodmap -e "keycode 235 = 0x1100060D"
+xmodmap -e "keycode 236 = 0x1100060E"
+xmodmap -e "keycode 237 = 0x1100060F"
+xmodmap -e "keycode 238 = 0x11000610"
+xmodmap -e "keycode 239 = 0x1008ff26"
+
+# Now start Qtopia
+exec qpe
diff --git a/packages/qtopia-phone/qtopia-phone-x11_4.3.1.bb b/packages/qtopia-phone/qtopia-phone-x11_4.3.1.bb
index 4c38d2db2c..0636409b35 100644
--- a/packages/qtopia-phone/qtopia-phone-x11_4.3.1.bb
+++ b/packages/qtopia-phone/qtopia-phone-x11_4.3.1.bb
@@ -16,11 +16,12 @@ PR = "r1"
 SRCREV = "${AUTOREV}"
 SRC_URI = "git://git.openmoko.org/git/qtopia.git;protocol=git \
            file://device-conf \
-           file://qplatformdefs.h"
+           file://qplatformdefs.h \
+           file://Xsession.d/99qtopia"
 
 S = "${WORKDIR}/git"
 
-inherit pkgconfig update-rc.d
+inherit pkgconfig
 
 TARGET-DEVICE="${@base_contains('MACHINE', 'nokia770', ' nokia770', '',d)}"
 TARGET-DEVICE="${@base_contains('MACHINE', 'nokia800', ' nokia770', '',d)}"
@@ -29,9 +30,6 @@ TARGET-DEVICE="${@base_contains('MACHINE', 'tosa', ' c3200', '',d)}"
 TARGET-DEVICE="${@base_contains('MACHINE', 'fic-gta01', 'ficgta01', '',d)}"
 TARGET-DEVICE="${@base_contains('MACHINE', 'fic-gta02', 'ficgta01', '',d)}"
 
-INITSCRIPT_NAME = "qpe"
-INITSCRIPT_PARAMS = "defaults 98"
-
 export QTOPIA_DEPOT_PATH = "${S}"
 
 require qtopia-phone_arch.inc
@@ -100,6 +98,24 @@ do_stage() {
 do_install() {
    cd ${BUILDDIR}
    oe_runmake install INSTALL_ROOT=${D}${OE_QT_RPREFIX} IMAGE=${D}${OE_QT_RPREFIX}
+
+   # Install freedesktop.org .desktop files for enlightenment
+   install -d ${D}${datadir}/applications
+   for app in "${S}/apps-fdo"*; do
+     for file in "$app"/*.desktop; do
+        install -m 0644 $file ${D}${datadir}/applications/
+     done
+   done 
+
+   # Install good icons for the desktop files
+
+   # Make sure qpe gets launched by X
+   install -d ${D}/${sysconfdir}/X11/Xsession.d
+   install -m 0755 ${WORKDIR}/Xsession.d/99qpe ${D}${sysconfdir}/X11/Xsession.d/
+
+   # Install some scripts
+   install -d ${D}${bindir}
+   install -m 0755 ${S}/bin/qcop-x11-launch ${D}${bindir}
 }
 
 FILES_${PN} += "${OE_QT_RPREFIX}/bin ${OE_QT_RPREFIX}/help  \