fix some minimo issues - patch courtesy pb_.

BKrev: 4097e31ds9kgjLSO3C7iIRuIhBtBhQ

diff --git a/minimo/minimo-cvs.oe b/minimo/minimo-cvs.oe
index 4922f79..5f3ba5e 100644 (file)
--- a/minimo/minimo-cvs.oe
+++ b/minimo/minimo-cvs.oe
@@ -1,5 +1,6 @@
 DEPENDS = "virtual/libc xt gtk+ libidl"
-SRC_URI = "cvs://anonymous@cvs-mirror.mozilla.org/cvsroot;module=mozilla"
+SRC_URI = "cvs://anonymous@cvs-mirror.mozilla.org/cvsroot;module=mozilla \
+          file://${FILESDIR}/xptcstubs.patch;patch=1"
 S = "${WORKDIR}/mozilla"
 MAINTAINER = "Phil Blundell <pb@handhelds.org>"
 SECTION = "x11"
@@ -17,11 +18,13 @@ export MOZCONFIG="${FILESDIR}/mozconfig"
 do_fetch () {
        mkdir -p ${WORKDIR}
        cd ${WORKDIR}
-       cvs $CVSCOOPTS -d :pserver:anonymous@cvs-mirror.mozilla.org/cvsroot co mozilla/client.mk
-       cd mozilla
-       make -f client.mk checkout
-       cd ..
-       tar czf ${DL_DIR}/mozilla_cvs-mirror.mozilla.org__${CVSDATE}.tar.gz mozilla
+       if [ ! -f ${DL_DIR}/mozilla_cvs-mirror.mozilla.org__${CVSDATE}.tar.gz ]; then
+               cvs $CVSCOOPTS -d :pserver:anonymous@cvs-mirror.mozilla.org/cvsroot co mozilla/client.mk
+               cd mozilla
+               make -f client.mk checkout
+               cd ..
+               tar czf ${DL_DIR}/mozilla_cvs-mirror.mozilla.org__${CVSDATE}.tar.gz mozilla
+       fi
 }
 
 do_configure () {
@@ -35,12 +38,12 @@ do_compile () {
 }
 
 do_install () {
-       mkdir -p ${D}/${libdir}/mozilla-minimo
+       mkdir -p ${D}/${libdir}/mozilla/minimo
        cp -r $MOZ_OBJDIR/dist/bin/* ${D}/${libdir}/mozilla/minimo/
        mkdir -p ${D}/${datadir}/applications
-       install -m 0644 embedding/minimo/minimo/desktop ${D}/${datadir}/applications/minimo.desktop
+       install -m 0644 embedding/minimo/ipkg/minimo.desktop ${D}/${datadir}/applications/minimo.desktop
        mkdir -p ${D}/${datadir}/pixmaps
-       install -m 0644 embedding/minimo/minimo/png ${D}/${datadir}/applications/minimo.png
+       install -m 0644 embedding/minimo/ipkg/minimo.png ${D}/${datadir}/applications/minimo.png
        mkdir -p ${D}/${bindir}
        echo "#!/bin/sh" > ${D}/${bindir}/minimo
        cat >>${D}/${bindir}/minimo << EOF

diff --git a/minimo/minimo-cvs/xptcstubs.patch b/minimo/minimo-cvs/xptcstubs.patch
new file mode 100644 (file)
index 0000000..e69de29