minimo: update to use new cvs location and new mozconfig, based on work by Doug Turner

2 files changed, 11 insertions, 69 deletions

diff --git a/packages/mozilla/minimo/mozconfig b/packages/mozilla/minimo/mozconfig
index 5a84bcf87e..069ae35b3f 100644
--- a/packages/mozilla/minimo/mozconfig
+++ b/packages/mozilla/minimo/mozconfig
@@ -1,66 +1,12 @@
-# build minimo
-MINIMO=1
-mk_add_options MINIMO=1
+mk_add_options MOZ_CO_PROJECT=minimo
+ac_add_options --enable-application=minimo
 
-# enable building the browser
-ac_add_options --enable-application=browser
 
 # use GTK+-2 widget set with XFT font rendering
-
-MOZ_ENABLE_COREXFONTS=0
-mk_add_options MOZ_ENABLE_COREXFONTS=0
 ac_add_options --enable-default-toolkit=gtk2
 ac_add_options --enable-xft
 ac_add_options --disable-freetype2
 
-# disable XUL support to reduce codesize
-ac_add_options --disable-xul
-
-# enable minimal profile support
-ac_add_options --disable-profilesharing
-ac_add_options --disable-profilelocking
-ac_add_options --enable-single-profile
-
-# disable features and skip various build steps
-ac_add_options --disable-extensions
-ac_add_options --disable-accessibility
-ac_add_options --disable-composer
-ac_add_options --disable-extensions
-ac_add_options --disable-installer
-ac_add_options --disable-jsd
-ac_add_options --disable-jsloader
-ac_add_options --disable-ldap
-ac_add_options --disable-mailnews
-ac_add_options --disable-mathml
-ac_add_options --disable-necko-disk-cache
-ac_add_options --disable-postscript
-ac_add_options --disable-view-source
-ac_add_options --disable-xpfe-components
-ac_add_options --disable-xpinstall
-ac_add_options --disable-xprint
-ac_add_options --enable-native-uconv
-ac_add_options --enable-plaintext-editor-only
-ac_add_options --disable-v1-string-abi
-ac_add_options --disable-plugins
-
-# configure necko to allocate smaller network buffers
-ac_add_options --enable-necko-small-buffers
-
-# disable debug logging and tests
-ac_add_options --disable-dtd-debug
-ac_add_options --disable-logging
-ac_add_options --disable-tests
-
-# build crypto module (PSM + NSS)
-ac_add_options --enable-crypto
-
-# build minimal set of protocol handlers
-ac_add_options --enable-necko-protocols=http,file,res,jar
-
-# build minimal set of image decoders
-ac_add_options --enable-image-decoders=png,gif,jpeg
-
-# code generation options (optimize for size)
 ac_add_options --enable-optimize=-Os
 ac_add_options --enable-strip
 ac_add_options --disable-debug
diff --git a/packages/mozilla/minimo_cvs.bb b/packages/mozilla/minimo_cvs.bb
index a44ccd8e25..31430d2c61 100644
--- a/packages/mozilla/minimo_cvs.bb
+++ b/packages/mozilla/minimo_cvs.bb
@@ -1,7 +1,6 @@
 DESCRIPTION = "A minimal version of the Mozilla web browser"
 HOMEPAGE="http://www.mozilla.org/projects/minimo/"
 SRC_URI = "cvs://anonymous@cvs-mirror.mozilla.org/cvsroot;module=mozilla \
-           file://xptcstubs.patch;patch=1 \
 	   file://no-xmb.patch;patch=1 \
 	   file://host_ldflags_fix.patch;patch=1 \
 	   file://minimo.png file://minimo.desktop"
@@ -16,8 +15,8 @@ LICENSE = "MPL/LGPL/GPL"
 
 inherit mozilla
 
-EXTRA_OECONF += "--enable-application=suite --disable-native-uconv"
-export MOZ_CO_PROJECT="suite"
+EXTRA_OECONF += "--enable-application=minimo --disable-native-uconv"
+export MOZ_CO_PROJECT="minimo"
 
 export MINIMO=1
 export MOZ_OBJDIR="${WORKDIR}/build-${TARGET_SYS}"
@@ -26,29 +25,26 @@ include mozilla-cvs.inc
 
 do_compile () {
 	mozilla_do_compile
-	cd $MOZ_OBJDIR/embedding/minimo
-	oe_runmake
 }
 
 mozdir="${D}${libdir}/mozilla-minimo"
 
 do_install () {
-	cd ${S}/embedding/minimo/
-	sh ./package.sh
+	cd $MOZ_OBJDIR/minimo/base
+	oe_runmake package
 	cd ${S}
 	mkdir -p ${mozdir}
-	cp -rL $MOZ_OBJDIR/dist/Embed/* ${mozdir}/
-	rm -f ${mozdir}/TestGtkEmbed
+	cp -rL $MOZ_OBJDIR/dist/minimo/* ${mozdir}/
 	mkdir -p ${D}${datadir}/applications
 	install -m 0644 ${WORKDIR}/minimo.desktop ${D}${datadir}/applications/minimo.desktop
 	mkdir -p ${D}${datadir}/pixmaps
 	install -m 0644 ${WORKDIR}/minimo.png ${D}${datadir}/pixmaps/minimo.png
 	mkdir -p ${D}${bindir}
-	echo "#!/bin/sh" > ${D}${bindir}/minimo
-	cat >>${D}${bindir}/minimo << EOF
+	echo "#!/bin/sh" > ${D}${bindir}/Minimo
+	cat >>${D}${bindir}/Minimo << EOF
 cd ${libdir}/mozilla-minimo
 export LD_LIBRARY_PATH=${libdir}/mozilla-minimo
-exec ./Minimo http://www.mozilla.org/projects/minimo/home.html
+exec ./minimo
 EOF
-	chmod 755 ${D}${bindir}/minimo
+	chmod 755 ${D}${bindir}/Minimo
 }