minimo_cvs.bb : update to 0.2+SRCDATE taken from poky, added PE = "1" as

ipkg thinkgs 0.016>0.02
minimo_0.016+cvs.bb : removed as _cvs is more uptodate.

3 files changed, 456 insertions, 715 deletions

diff --git a/packages/mozilla/minimo/minimo.patch b/packages/mozilla/minimo/minimo.patch
index a1f9291167..8894ee7f45 100644
--- a/packages/mozilla/minimo/minimo.patch
+++ b/packages/mozilla/minimo/minimo.patch
@@ -1,567 +1,356 @@
 Index: mozilla/content/html/content/src/nsFormSubmission.cpp
 ===================================================================
-RCS file: /cvsroot/mozilla/content/html/content/src/nsFormSubmission.cpp,v
-retrieving revision 1.46
-diff --context=3 -r1.46 nsFormSubmission.cpp
-*** mozilla/content/html/content/src/nsFormSubmission.cpp	13 Jul 2005 16:55:59 -0000	1.46
---- mozilla/content/html/content/src/nsFormSubmission.cpp	21 Jul 2006 00:27:14 -0000
-***************
-*** 1315,1325 ****
-    nsresult rv = NS_OK;
-  
-    nsCAutoString charset(aCharset);
--   // canonical name is passed so that we just have to check against
--   // *our* canonical names listed in charsetaliases.properties
--   if (charset.EqualsLiteral("ISO-8859-1")) {
--     charset.AssignLiteral("windows-1252");
--   }
-  
-    // use UTF-8 for UTF-16* and UTF-32* (per WHATWG and existing practice of
-    // MS IE/Opera). 
---- 1315,1320 ----
+--- mozilla.orig/content/html/content/src/nsFormSubmission.cpp	2005-07-13 18:55:59.000000000 +0200
++++ mozilla/content/html/content/src/nsFormSubmission.cpp	2007-05-10 12:11:20.000000000 +0200
+@@ -1315,11 +1315,6 @@
+   nsresult rv = NS_OK;
+ 
+   nsCAutoString charset(aCharset);
+-  // canonical name is passed so that we just have to check against
+-  // *our* canonical names listed in charsetaliases.properties
+-  if (charset.EqualsLiteral("ISO-8859-1")) {
+-    charset.AssignLiteral("windows-1252");
+-  }
+ 
+   // use UTF-8 for UTF-16* and UTF-32* (per WHATWG and existing practice of
+   // MS IE/Opera). 
 Index: mozilla/embedding/base/Makefile.in
 ===================================================================
-RCS file: /cvsroot/mozilla/embedding/base/Makefile.in,v
-retrieving revision 1.34.8.2
-diff --context=3 -r1.34.8.2 Makefile.in
-*** mozilla/embedding/base/Makefile.in	14 Feb 2006 05:28:31 -0000	1.34.8.2
---- mozilla/embedding/base/Makefile.in	21 Jul 2006 00:27:14 -0000
-***************
-*** 43,48 ****
---- 43,49 ----
-  
-  MODULE          = embed_base
-  LIBRARY_NAME    = embed_base_s
-+ EXPORT_LIBRARY	= 1
-  XPIDL_MODULE	= embed_base
-  
-  include $(DEPTH)/config/autoconf.mk
+--- mozilla.orig/embedding/base/Makefile.in	2006-02-14 06:28:31.000000000 +0100
++++ mozilla/embedding/base/Makefile.in	2007-05-10 12:11:20.000000000 +0200
+@@ -43,6 +43,7 @@
+ 
+ MODULE          = embed_base
+ LIBRARY_NAME    = embed_base_s
++EXPORT_LIBRARY	= 1
+ XPIDL_MODULE	= embed_base
+ 
+ include $(DEPTH)/config/autoconf.mk
 Index: mozilla/js/src/Makefile.in
 ===================================================================
-RCS file: /cvsroot/mozilla/js/src/Makefile.in,v
-retrieving revision 3.95.4.4
-diff --context=3 -r3.95.4.4 Makefile.in
-*** mozilla/js/src/Makefile.in	7 Jul 2006 02:12:02 -0000	3.95.4.4
---- mozilla/js/src/Makefile.in	21 Jul 2006 00:27:14 -0000
-***************
-*** 46,51 ****
---- 46,52 ----
-  
-  MODULE		= js
-  LIBRARY_NAME	= mozjs
-+ EXPORT_LIBRARY	= 1
-  LIB_IS_C_ONLY	= 1
-  GRE_MODULE	= 1
-  
+--- mozilla.orig/js/src/Makefile.in	2006-07-28 00:56:20.000000000 +0200
++++ mozilla/js/src/Makefile.in	2007-05-10 12:11:21.000000000 +0200
+@@ -46,6 +46,7 @@
+ 
+ MODULE		= js
+ LIBRARY_NAME	= mozjs
++EXPORT_LIBRARY	= 1
+ LIB_IS_C_ONLY	= 1
+ GRE_MODULE	= 1
+ 
 Index: mozilla/minimo/Makefile.in
 ===================================================================
-RCS file: /cvsroot/mozilla/minimo/Makefile.in,v
-retrieving revision 1.1.2.2
-diff --context=3 -r1.1.2.2 Makefile.in
-*** mozilla/minimo/Makefile.in	29 Jun 2006 06:11:30 -0000	1.1.2.2
---- mozilla/minimo/Makefile.in	21 Jul 2006 00:27:14 -0000
-***************
-*** 41,46 ****
-  
-  include $(DEPTH)/config/autoconf.mk
-  
-! DIRS = config components chrome locales customization base 
-  
-  include $(topsrcdir)/config/rules.mk
---- 41,46 ----
-  
-  include $(DEPTH)/config/autoconf.mk
-  
-! DIRS = config chrome locales customization base 
-  
-  include $(topsrcdir)/config/rules.mk
+--- mozilla.orig/minimo/Makefile.in	2006-07-24 21:40:53.000000000 +0200
++++ mozilla/minimo/Makefile.in	2007-05-10 12:13:46.000000000 +0200
+@@ -41,6 +41,6 @@
+ 
+ include $(DEPTH)/config/autoconf.mk
+ 
+-DIRS = config components chrome locales customization base extensions
++DIRS = config chrome locales customization base extensions
+ 
+ include $(topsrcdir)/config/rules.mk
 Index: mozilla/minimo/base/Makefile.in
 ===================================================================
-RCS file: /cvsroot/mozilla/minimo/base/Makefile.in,v
-retrieving revision 1.3.2.7
-diff --context=3 -r1.3.2.7 Makefile.in
-*** mozilla/minimo/base/Makefile.in	18 Apr 2006 21:04:38 -0000	1.3.2.7
---- mozilla/minimo/base/Makefile.in	21 Jul 2006 00:27:14 -0000
-***************
-*** 95,101 ****
-  
-  # this should move into the toolkit!
-  LOCAL_INCLUDES	= -I$(srcdir) -I$(topsrcdir)/xpfe/browser/src/
-- CPPSRCS    += nsBrowserStatusFilter.cpp nsBrowserInstance.cpp
-  
-  ifdef WINCE
-  RCINCLUDE  = wince/SplashScreen.rc
---- 95,100 ----
-***************
-*** 139,148 ****
-  endif
-  
-  
-- FINAL_LINK_COMPS=$(topsrcdir)/minimo/base/$(FINAL_PLATFORM)/minimo-link-comps
-- FINAL_LINK_COMP_NAMES=$(topsrcdir)/minimo/base/$(FINAL_PLATFORM)/minimo-link-names
-- FINAL_LINK_LIBS=$(topsrcdir)/minimo/base/$(FINAL_PLATFORM)/minimo-link-libs
-- 
-  include $(topsrcdir)/config/static-config.mk
-  
-  EXTRA_DEPS     += $(STATIC_EXTRA_DEPS)
---- 138,143 ----
-***************
-*** 176,189 ****
-  # (same as in mozilla/js/src/Makefile.in)
-  ifdef WINCE
-  LDFLAGS         += -OPT:NOICF
-  endif
-  
-- export::
-- 	$(NSINSTALL) $(topsrcdir)/xpfe/browser/src/nsBrowserStatusFilter.cpp .
-- 	$(NSINSTALL) $(topsrcdir)/xpfe/browser/src/nsBrowserInstance.cpp .
-- 
-- 
-- GARBAGE += nsBrowserStatusFilter.cpp nsBrowserInstance.cpp
-  
-  ifdef WINCE
-  package::
---- 171,181 ----
-  # (same as in mozilla/js/src/Makefile.in)
-  ifdef WINCE
-  LDFLAGS         += -OPT:NOICF
-+ else
-+ # Hack to work around libxpcom_core.a / libunicharutil_s.a link order problem.
-+ LDFLAGS		+= -u NS_StringGetData_P -u NS_StringGetMutableData_P
-  endif
-  
-  
-  ifdef WINCE
-  package::
+--- mozilla.orig/minimo/base/Makefile.in	2006-08-09 17:42:26.000000000 +0200
++++ mozilla/minimo/base/Makefile.in	2007-05-10 12:11:21.000000000 +0200
+@@ -96,7 +96,6 @@
+ 
+ # this should move into the toolkit!
+ LOCAL_INCLUDES	= -I$(srcdir) -I$(topsrcdir)/xpfe/browser/src/
+-CPPSRCS    += nsBrowserStatusFilter.cpp nsBrowserInstance.cpp
+ 
+ ifdef WINCE
+ RCINCLUDE  = wince/SplashScreen.rc
+@@ -143,10 +142,6 @@
+ endif
+ 
+ 
+-FINAL_LINK_COMPS=$(topsrcdir)/minimo/base/$(FINAL_PLATFORM)/minimo-link-comps
+-FINAL_LINK_COMP_NAMES=$(topsrcdir)/minimo/base/$(FINAL_PLATFORM)/minimo-link-names
+-FINAL_LINK_LIBS=$(topsrcdir)/minimo/base/$(FINAL_PLATFORM)/minimo-link-libs
+-
+ include $(topsrcdir)/config/static-config.mk
+ 
+ EXTRA_DEPS     += $(STATIC_EXTRA_DEPS)
+@@ -180,14 +175,11 @@
+ # (same as in mozilla/js/src/Makefile.in)
+ ifdef WINCE
+ LDFLAGS         += -OPT:NOICF
++else
++# Hack to work around libxpcom_core.a / libunicharutil_s.a link order problem.
++LDFLAGS		+= -u NS_StringGetData_P -u NS_StringGetMutableData_P
+ endif
+ 
+-export::
+-	$(NSINSTALL) $(topsrcdir)/xpfe/browser/src/nsBrowserStatusFilter.cpp .
+-	$(NSINSTALL) $(topsrcdir)/xpfe/browser/src/nsBrowserInstance.cpp .
+-
+-
+-GARBAGE += nsBrowserStatusFilter.cpp nsBrowserInstance.cpp
+ 
+ ifdef WINCE
+ package::
 Index: mozilla/minimo/base/Minimo.cpp
 ===================================================================
-RCS file: /cvsroot/mozilla/minimo/base/Minimo.cpp,v
-retrieving revision 1.1.2.11
-diff --context=3 -r1.1.2.11 Minimo.cpp
-*** mozilla/minimo/base/Minimo.cpp	11 Jul 2006 19:37:05 -0000	1.1.2.11
---- mozilla/minimo/base/Minimo.cpp	21 Jul 2006 00:27:15 -0000
-***************
-*** 781,789 ****
-    CreateListenerWindow();
-  #endif
-    
-! #ifdef MOZ_WIDGET_GTK2
-    gtk_set_locale();
-    gtk_init(&argc, &argv);
-  #endif
-    
-  #ifdef HACKY_PRE_LOAD_LIBRARY
---- 781,794 ----
-    CreateListenerWindow();
-  #endif
-    
-! #if defined(MOZ_WIDGET_GTK) || defined(MOZ_WIDGET_GTK2)
-! #if defined(MOZ_WIDGET_GTK)
-    gtk_set_locale();
-+ #endif
-    gtk_init(&argc, &argv);
-+ 
-+   gtk_widget_set_default_visual(gdk_rgb_get_visual());
-+   gtk_widget_set_default_colormap(gdk_rgb_get_cmap());
-  #endif
-    
-  #ifdef HACKY_PRE_LOAD_LIBRARY
+--- mozilla.orig/minimo/base/Minimo.cpp	2006-10-27 22:30:36.000000000 +0200
++++ mozilla/minimo/base/Minimo.cpp	2007-05-10 12:13:21.000000000 +0200
+@@ -813,6 +813,8 @@
+ #ifdef MOZ_WIDGET_GTK2
+   gtk_set_locale();
+   gtk_init(&argc, &argv);
++  gtk_widget_set_default_visual(gdk_rgb_get_visual());
++  gtk_widget_set_default_colormap(gdk_rgb_get_cmap());
+ #endif
+   
+ #ifdef HACKY_PRE_LOAD_LIBRARY
 Index: mozilla/minimo/base/SplashScreen.cpp
 ===================================================================
-RCS file: /cvsroot/mozilla/minimo/base/SplashScreen.cpp,v
-retrieving revision 1.1.2.3
-diff --context=3 -r1.1.2.3 SplashScreen.cpp
-*** mozilla/minimo/base/SplashScreen.cpp	11 Jul 2006 18:44:17 -0000	1.1.2.3
---- mozilla/minimo/base/SplashScreen.cpp	21 Jul 2006 00:27:15 -0000
-***************
-*** 180,188 ****
---- 180,203 ----
-  void KillSplashScreen() {}
-  void GetScreenSize(unsigned long* x, unsigned long* y)
-  {
-+ #ifdef MOZ_WIDGET_GTK2
-+   GdkDisplay* display = gdk_display_get_default();
-+   if (display != NULL)
-+   {
-+     GdkScreen *screen;
-+     screen = gdk_display_get_default_screen(display);
-+     *x = gdk_screen_get_width(screen);
-+     *y = gdk_screen_get_height(screen);
-+   }
-+   else
-+   {
-+ #endif
-    // we need to figure this out.
-    *x = 240;
-    *y = 320;
-+ #ifdef MOZ_WIDGET_GTK2
-+   }
-+ #endif
-  }
-  
-  
-Index: mozilla/minimo/chrome/content/minimo.js
-===================================================================
-RCS file: /cvsroot/mozilla/minimo/chrome/content/minimo.js,v
-retrieving revision 1.9.2.90
-diff --context=3 -r1.9.2.90 minimo.js
-*** mozilla/minimo/chrome/content/minimo.js	11 Jul 2006 19:37:04 -0000	1.9.2.90
---- mozilla/minimo/chrome/content/minimo.js	21 Jul 2006 00:27:16 -0000
-***************
-*** 1313,1319 ****
-           43 const FIND_LINKS = 2;
-           http://lxr.mozilla.org/mozilla/source/toolkit/components/typeaheadfind/content/findBar.js
-        */
-!       gBrowser.fastFind.find(vQuery,0);
-      }
-    } catch (e) {
-      onErrorHandler(e);
---- 1313,1319 ----
-           43 const FIND_LINKS = 2;
-           http://lxr.mozilla.org/mozilla/source/toolkit/components/typeaheadfind/content/findBar.js
-        */
-!       gBrowser.fastFind.find(vQuery,0,this.mHasFocus);
-      }
-    } catch (e) {
-      onErrorHandler(e);
-***************
-*** 1324,1330 ****
-  
-  function DoBrowserFindNext() {
-    try { 
-! 	gBrowser.fastFind.findNext();
-    } catch (e) {
-      onErrorHandler(e);
-    }  
---- 1324,1330 ----
-  
-  function DoBrowserFindNext() {
-    try { 
-! 	gBrowser.fastFind.findNext(this.mHasFocus);
-    } catch (e) {
-      onErrorHandler(e);
-    }  
+--- mozilla.orig/minimo/base/SplashScreen.cpp	2006-08-21 21:00:24.000000000 +0200
++++ mozilla/minimo/base/SplashScreen.cpp	2007-05-10 12:11:22.000000000 +0200
+@@ -202,9 +202,24 @@
+ void KillSplashScreen() {}
+ void GetScreenSize(unsigned long* x, unsigned long* y)
+ {
++#ifdef MOZ_WIDGET_GTK2
++  GdkDisplay* display = gdk_display_get_default();
++  if (display != NULL)
++  {
++    GdkScreen *screen;
++    screen = gdk_display_get_default_screen(display);
++    *x = gdk_screen_get_width(screen);
++    *y = gdk_screen_get_height(screen);
++  }
++  else
++  {
++#endif
+   // we need to figure this out.
+   *x = 240;
+   *y = 320;
++#ifdef MOZ_WIDGET_GTK2
++  }
++#endif
+ }
+ 
+ 
 Index: mozilla/minimo/config/linux_package.sh
 ===================================================================
-RCS file: /cvsroot/mozilla/minimo/config/linux_package.sh,v
-retrieving revision 1.8.2.3
-diff --context=3 -r1.8.2.3 linux_package.sh
-*** mozilla/minimo/config/linux_package.sh	30 Jun 2006 16:35:19 -0000	1.8.2.3
---- mozilla/minimo/config/linux_package.sh	21 Jul 2006 00:27:16 -0000
-***************
-*** 29,37 ****
-  cp -pRL bin/libnssckbi.so                                  minimo
-  cp -pRL bin/libsmime3.so                                   minimo
-  cp -pRL bin/libsoftokn3.so                                 minimo
-- cp -pRL bin/libsoftokn3.chk                                minimo
-  cp -pRL bin/libfreebl3.so                                  minimo
-- cp -pRL bin/libfreebl3.chk                                 minimo
-  cp -pRL bin/libssl3.so                                     minimo
-  
-  mkdir -p minimo/chrome
---- 29,35 ----
-***************
-*** 62,69 ****
-  cp -pRL bin/components/nsHelperAppDlg.js                   minimo/components
-  cp -pRL bin/components/nsProgressDialog.js                 minimo/components
-  
-- cp -pRL bin/extensions/spatial-navigation@extensions.mozilla.org/components/* minimo/components
-- 
-  mkdir -p minimo/greprefs
-  cp -pRL bin/greprefs/*                                     minimo/greprefs
-  
---- 60,65 ----
-***************
-*** 80,86 ****
-  
-  echo Linking XPT files.
-  
-! bin/xpt_link minimo/components/all.xpt          bin/components/*.xpt
-  
-  echo Chewing on chrome
-  
---- 76,82 ----
-  
-  echo Linking XPT files.
-  
-! host/bin/host_xpt_link minimo/components/all.xpt          bin/components/*.xpt
-  
-  echo Chewing on chrome
-  
+--- mozilla.orig/minimo/config/linux_package.sh	2006-06-30 18:35:19.000000000 +0200
++++ mozilla/minimo/config/linux_package.sh	2007-05-10 12:11:22.000000000 +0200
+@@ -29,9 +29,7 @@
+ cp -pRL bin/libnssckbi.so                                  minimo
+ cp -pRL bin/libsmime3.so                                   minimo
+ cp -pRL bin/libsoftokn3.so                                 minimo
+-cp -pRL bin/libsoftokn3.chk                                minimo
+ cp -pRL bin/libfreebl3.so                                  minimo
+-cp -pRL bin/libfreebl3.chk                                 minimo
+ cp -pRL bin/libssl3.so                                     minimo
+ 
+ mkdir -p minimo/chrome
+@@ -62,8 +60,6 @@
+ cp -pRL bin/components/nsHelperAppDlg.js                   minimo/components
+ cp -pRL bin/components/nsProgressDialog.js                 minimo/components
+ 
+-cp -pRL bin/extensions/spatial-navigation@extensions.mozilla.org/components/* minimo/components
+-
+ mkdir -p minimo/greprefs
+ cp -pRL bin/greprefs/*                                     minimo/greprefs
+ 
+@@ -80,7 +76,7 @@
+ 
+ echo Linking XPT files.
+ 
+-bin/xpt_link minimo/components/all.xpt          bin/components/*.xpt
++host/bin/host_xpt_link minimo/components/all.xpt          bin/components/*.xpt
+ 
+ echo Chewing on chrome
+ 
 Index: mozilla/profile/dirserviceprovider/src/Makefile.in
 ===================================================================
-RCS file: /cvsroot/mozilla/profile/dirserviceprovider/src/Makefile.in,v
-retrieving revision 1.7
-diff --context=3 -r1.7 Makefile.in
-*** mozilla/profile/dirserviceprovider/src/Makefile.in	6 Apr 2005 03:35:21 -0000	1.7
---- mozilla/profile/dirserviceprovider/src/Makefile.in	21 Jul 2006 00:27:16 -0000
-***************
-*** 44,49 ****
---- 44,50 ----
-  
-  MODULE		= profdirserviceprovider
-  LIBRARY_NAME	= profdirserviceprovider_s
-+ EXPORT_LIBRARY	= 1
-  MOZILLA_INTERNAL_API = 1
-  
-  REQUIRES	= xpcom \
+--- mozilla.orig/profile/dirserviceprovider/src/Makefile.in	2005-04-06 05:35:21.000000000 +0200
++++ mozilla/profile/dirserviceprovider/src/Makefile.in	2007-05-10 12:11:23.000000000 +0200
+@@ -44,6 +44,7 @@
+ 
+ MODULE		= profdirserviceprovider
+ LIBRARY_NAME	= profdirserviceprovider_s
++EXPORT_LIBRARY	= 1
+ MOZILLA_INTERNAL_API = 1
+ 
+ REQUIRES	= xpcom \
 Index: mozilla/security/coreconf/Linux.mk
 ===================================================================
-RCS file: /cvsroot/mozilla/security/coreconf/Linux.mk,v
-retrieving revision 1.18.18.1
-diff --context=3 -r1.18.18.1 Linux.mk
-*** mozilla/security/coreconf/Linux.mk	3 Feb 2006 22:26:36 -0000	1.18.18.1
---- mozilla/security/coreconf/Linux.mk	21 Jul 2006 00:27:16 -0000
-***************
-*** 117,122 ****
---- 117,126 ----
-  	OS_REL_CFLAGS   = -DLINUX1_2 -D_XOPEN_SOURCE
-  	CPU_ARCH        = mips
-  else
-+ ifeq ($(OS_TEST),arm)
-+ 	OS_REL_CFLAGS   = -DLINUX1_2 -D_XOPEN_SOURCE
-+ 	CPU_ARCH        = arm
-+ else
-  	OS_REL_CFLAGS	= -DLINUX1_2 -Di386 -D_XOPEN_SOURCE
-  	CPU_ARCH	= x86
-  endif
-***************
-*** 133,138 ****
---- 137,143 ----
-  endif
-  endif
-  endif
-+ endif
-  
-  
-  LIBC_TAG		= _glibc
+--- mozilla.orig/security/coreconf/Linux.mk	2006-02-03 23:26:36.000000000 +0100
++++ mozilla/security/coreconf/Linux.mk	2007-05-10 12:11:23.000000000 +0200
+@@ -117,6 +117,10 @@
+ 	OS_REL_CFLAGS   = -DLINUX1_2 -D_XOPEN_SOURCE
+ 	CPU_ARCH        = mips
+ else
++ifeq ($(OS_TEST),arm)
++	OS_REL_CFLAGS   = -DLINUX1_2 -D_XOPEN_SOURCE
++	CPU_ARCH        = arm
++else
+ 	OS_REL_CFLAGS	= -DLINUX1_2 -Di386 -D_XOPEN_SOURCE
+ 	CPU_ARCH	= x86
+ endif
+@@ -133,6 +137,7 @@
+ endif
+ endif
+ endif
++endif
+ 
+ 
+ LIBC_TAG		= _glibc
 Index: mozilla/security/coreconf/arch.mk
 ===================================================================
-RCS file: /cvsroot/mozilla/security/coreconf/arch.mk,v
-retrieving revision 1.17.14.2
-diff --context=3 -r1.17.14.2 arch.mk
-*** mozilla/security/coreconf/arch.mk	3 Feb 2006 22:26:36 -0000	1.17.14.2
---- mozilla/security/coreconf/arch.mk	21 Jul 2006 00:27:16 -0000
-***************
-*** 60,77 ****
-  	64BIT_TAG=
-  endif
-  
-! OS_ARCH := $(subst /,_,$(shell uname -s))
-  
-  #
-  # Attempt to differentiate between sparc and x86 Solaris
-  #
-  
-! OS_TEST := $(shell uname -m)
-! ifeq ($(OS_TEST),i86pc)
-!     OS_RELEASE := $(shell uname -r)_$(OS_TEST)
-! else
-!     OS_RELEASE := $(shell uname -r)
-! endif
-  
-  #
-  # Force the IRIX64 machines to use IRIX.
---- 60,73 ----
-  	64BIT_TAG=
-  endif
-  
-! OS_ARCH := Linux
-  
-  #
-  # Attempt to differentiate between sparc and x86 Solaris
-  #
-  
-! OS_TEST := arm
-! OS_RELEASE := 2.6
-  
-  #
-  # Force the IRIX64 machines to use IRIX.
+--- mozilla.orig/security/coreconf/arch.mk	2006-02-03 23:26:36.000000000 +0100
++++ mozilla/security/coreconf/arch.mk	2007-05-10 12:11:24.000000000 +0200
+@@ -60,18 +60,14 @@
+ 	64BIT_TAG=
+ endif
+ 
+-OS_ARCH := $(subst /,_,$(shell uname -s))
++OS_ARCH := Linux
+ 
+ #
+ # Attempt to differentiate between sparc and x86 Solaris
+ #
+ 
+-OS_TEST := $(shell uname -m)
+-ifeq ($(OS_TEST),i86pc)
+-    OS_RELEASE := $(shell uname -r)_$(OS_TEST)
+-else
+-    OS_RELEASE := $(shell uname -r)
+-endif
++OS_TEST := arm
++OS_RELEASE := 2.6
+ 
+ #
+ # Force the IRIX64 machines to use IRIX.
 Index: mozilla/toolkit/components/build/Makefile.in
 ===================================================================
-RCS file: /cvsroot/mozilla/toolkit/components/build/Makefile.in,v
-retrieving revision 1.24.2.10
-diff --context=3 -r1.24.2.10 Makefile.in
-*** mozilla/toolkit/components/build/Makefile.in	13 Jul 2006 20:08:29 -0000	1.24.2.10
---- mozilla/toolkit/components/build/Makefile.in	21 Jul 2006 00:27:17 -0000
-***************
-*** 112,118 ****
-  	$(NULL)
-  
-  SHARED_LIBRARY_LIBS = \
-- 	../startup/src/$(LIB_PREFIX)appstartup_s.$(LIB_SUFFIX) \
-  	$(NULL)
-  
-  ifdef MOZ_XPINSTALL
---- 112,117 ----
+--- mozilla.orig/toolkit/components/build/Makefile.in	2006-07-13 22:08:29.000000000 +0200
++++ mozilla/toolkit/components/build/Makefile.in	2007-05-10 12:11:27.000000000 +0200
+@@ -112,7 +112,6 @@
+ 	$(NULL)
+ 
+ SHARED_LIBRARY_LIBS = \
+-	../startup/src/$(LIB_PREFIX)appstartup_s.$(LIB_SUFFIX) \
+ 	$(NULL)
+ 
+ ifdef MOZ_XPINSTALL
 Index: mozilla/toolkit/components/startup/src/Makefile.in
 ===================================================================
-RCS file: /cvsroot/mozilla/toolkit/components/startup/src/Makefile.in,v
-retrieving revision 1.7
-diff --context=3 -r1.7 Makefile.in
-*** mozilla/toolkit/components/startup/src/Makefile.in	27 Jul 2005 20:42:44 -0000	1.7
---- mozilla/toolkit/components/startup/src/Makefile.in	21 Jul 2006 00:27:17 -0000
-***************
-*** 43,48 ****
---- 43,49 ----
-  
-  MODULE     = toolkitcomps
-  LIBRARY_NAME = appstartup_s
-+ EXPORT_LIBRARY = 1
-  FORCE_STATIC_LIB = 1
-  LIBXUL_LIBRARY = 1
-  
+--- mozilla.orig/toolkit/components/startup/src/Makefile.in	2005-07-27 22:42:44.000000000 +0200
++++ mozilla/toolkit/components/startup/src/Makefile.in	2007-05-10 12:11:27.000000000 +0200
+@@ -43,6 +43,7 @@
+ 
+ MODULE     = toolkitcomps
+ LIBRARY_NAME = appstartup_s
++EXPORT_LIBRARY = 1
+ FORCE_STATIC_LIB = 1
+ LIBXUL_LIBRARY = 1
+ 
 Index: mozilla/toolkit/xre/Makefile.in
 ===================================================================
-RCS file: /cvsroot/mozilla/toolkit/xre/Makefile.in,v
-retrieving revision 1.48.2.3
-diff --context=3 -r1.48.2.3 Makefile.in
-*** mozilla/toolkit/xre/Makefile.in	30 Sep 2005 19:52:44 -0000	1.48.2.3
---- mozilla/toolkit/xre/Makefile.in	21 Jul 2006 00:27:17 -0000
-***************
-*** 45,51 ****
-  
-  MODULE = xulapp
-  LIBRARY_NAME = xulapp_s
-- EXPORT_LIBRARY = 1
-  LIBXUL_LIBRARY = 1
-  
-  REQUIRES = \
---- 45,50 ----
-***************
-*** 176,189 ****
-  
-  include $(topsrcdir)/config/rules.mk
-  
-- ifdef BUILD_STATIC_LIBS
-- export::
-- 	@$(PERL) -I$(MOZILLA_DIR)/config $(MOZILLA_DIR)/config/build-list.pl $(FINAL_LINK_COMP_NAMES) Apprunner
-- #	embedding/browser/gtk/src/Makefile.in sucks! we need to add an empty line to 
-- # FINAL_LINK_COMPS to keep the two lists in sync :-(
-- 	@$(PERL) -I$(MOZILLA_DIR)/config $(MOZILLA_DIR)/config/build-list.pl $(FINAL_LINK_COMPS) ""
-- endif
-- 
-  LOCAL_INCLUDES += \
-  	-I$(srcdir) \
-  	-I$(topsrcdir)/xpfe/bootstrap \
---- 175,180 ----
+--- mozilla.orig/toolkit/xre/Makefile.in	2007-02-06 08:13:20.000000000 +0100
++++ mozilla/toolkit/xre/Makefile.in	2007-05-10 12:11:27.000000000 +0200
+@@ -45,7 +45,6 @@
+ 
+ MODULE = xulapp
+ LIBRARY_NAME = xulapp_s
+-EXPORT_LIBRARY = 1
+ LIBXUL_LIBRARY = 1
+ 
+ REQUIRES = \
+@@ -180,14 +179,6 @@
+ 
+ include $(topsrcdir)/config/rules.mk
+ 
+-ifdef BUILD_STATIC_LIBS
+-export::
+-	@$(PERL) -I$(MOZILLA_DIR)/config $(MOZILLA_DIR)/config/build-list.pl $(FINAL_LINK_COMP_NAMES) Apprunner
+-#	embedding/browser/gtk/src/Makefile.in sucks! we need to add an empty line to 
+-# FINAL_LINK_COMPS to keep the two lists in sync :-(
+-	@$(PERL) -I$(MOZILLA_DIR)/config $(MOZILLA_DIR)/config/build-list.pl $(FINAL_LINK_COMPS) ""
+-endif
+-
+ LOCAL_INCLUDES += \
+ 	-I$(srcdir) \
+ 	-I$(topsrcdir)/xpfe/bootstrap \
 Index: mozilla/xpcom/build/Makefile.in
 ===================================================================
-RCS file: /cvsroot/mozilla/xpcom/build/Makefile.in,v
-retrieving revision 1.90.2.2
-diff --context=3 -r1.90.2.2 Makefile.in
-*** mozilla/xpcom/build/Makefile.in	29 Jan 2006 16:51:02 -0000	1.90.2.2
---- mozilla/xpcom/build/Makefile.in	21 Jul 2006 00:27:17 -0000
-***************
-*** 61,67 ****
-  endif
-  
-  # Do not set EXPORT_LIBRARY as we do not want xpcom in the static libs list
-! #EXPORT_LIBRARY = 1
-  GRE_MODULE	= 1
-  MOZILLA_INTERNAL_API = 1
-  
---- 61,67 ----
-  endif
-  
-  # Do not set EXPORT_LIBRARY as we do not want xpcom in the static libs list
-! EXPORT_LIBRARY = 1
-  GRE_MODULE	= 1
-  MOZILLA_INTERNAL_API = 1
-  
+--- mozilla.orig/xpcom/build/Makefile.in	2006-01-29 17:51:02.000000000 +0100
++++ mozilla/xpcom/build/Makefile.in	2007-05-10 12:11:27.000000000 +0200
+@@ -61,7 +61,7 @@
+ endif
+ 
+ # Do not set EXPORT_LIBRARY as we do not want xpcom in the static libs list
+-#EXPORT_LIBRARY = 1
++EXPORT_LIBRARY = 1
+ GRE_MODULE	= 1
+ MOZILLA_INTERNAL_API = 1
+ 
 Index: mozilla/xpcom/reflect/xptcall/src/md/unix/xptcstubs_arm.cpp
 ===================================================================
-RCS file: /cvsroot/mozilla/xpcom/reflect/xptcall/src/md/unix/xptcstubs_arm.cpp,v
-retrieving revision 1.7
-diff --context=3 -r1.7 xptcstubs_arm.cpp
-*** mozilla/xpcom/reflect/xptcall/src/md/unix/xptcstubs_arm.cpp	18 Apr 2004 14:18:18 -0000	1.7
---- mozilla/xpcom/reflect/xptcall/src/md/unix/xptcstubs_arm.cpp	21 Jul 2006 00:27:17 -0000
-***************
-*** 45,53 ****
-  #endif
-  
-  /* Specify explicitly a symbol for this function, don't try to guess the c++ mangled symbol.  */
-! static nsresult PrepareAndDispatch(nsXPTCStubBase* self, uint32 methodIndex, PRUint32* args) asm("_PrepareAndDispatch");
-  
-! static nsresult
-  PrepareAndDispatch(nsXPTCStubBase* self, uint32 methodIndex, PRUint32* args)
-  {
-  #define PARAM_BUFFER_COUNT     16
---- 45,53 ----
-  #endif
-  
-  /* Specify explicitly a symbol for this function, don't try to guess the c++ mangled symbol.  */
-! nsresult PrepareAndDispatch(nsXPTCStubBase* self, uint32 methodIndex, PRUint32* args) asm("_PrepareAndDispatch");
-  
-! nsresult
-  PrepareAndDispatch(nsXPTCStubBase* self, uint32 methodIndex, PRUint32* args)
-  {
-  #define PARAM_BUFFER_COUNT     16
+--- mozilla.orig/xpcom/reflect/xptcall/src/md/unix/xptcstubs_arm.cpp	2004-04-18 16:18:18.000000000 +0200
++++ mozilla/xpcom/reflect/xptcall/src/md/unix/xptcstubs_arm.cpp	2007-05-10 12:11:27.000000000 +0200
+@@ -45,9 +45,9 @@
+ #endif
+ 
+ /* Specify explicitly a symbol for this function, don't try to guess the c++ mangled symbol.  */
+-static nsresult PrepareAndDispatch(nsXPTCStubBase* self, uint32 methodIndex, PRUint32* args) asm("_PrepareAndDispatch");
++nsresult PrepareAndDispatch(nsXPTCStubBase* self, uint32 methodIndex, PRUint32* args) asm("_PrepareAndDispatch");
+ 
+-static nsresult
++nsresult
+ PrepareAndDispatch(nsXPTCStubBase* self, uint32 methodIndex, PRUint32* args)
+ {
+ #define PARAM_BUFFER_COUNT     16
 Index: mozilla/xpfe/browser/src/Makefile.in
 ===================================================================
-RCS file: /cvsroot/mozilla/xpfe/browser/src/Makefile.in,v
-retrieving revision 1.70
-diff --context=3 -r1.70 Makefile.in
-*** mozilla/xpfe/browser/src/Makefile.in	18 Mar 2005 21:23:45 -0000	1.70
---- mozilla/xpfe/browser/src/Makefile.in	21 Jul 2006 00:27:17 -0000
-***************
-*** 44,49 ****
---- 44,50 ----
-  
-  MODULE		= browser
-  LIBRARY_NAME	= mozbrwsr_s
-+ EXPORT_LIBRARY	= 1
-  FORCE_STATIC_LIB = 1
-  LIBXUL_LIBRARY = 1
-  MODULE_NAME	= nsBrowserModule
+--- mozilla.orig/xpfe/browser/src/Makefile.in	2005-03-18 22:23:45.000000000 +0100
++++ mozilla/xpfe/browser/src/Makefile.in	2007-05-10 12:11:27.000000000 +0200
+@@ -44,6 +44,7 @@
+ 
+ MODULE		= browser
+ LIBRARY_NAME	= mozbrwsr_s
++EXPORT_LIBRARY	= 1
+ FORCE_STATIC_LIB = 1
+ LIBXUL_LIBRARY = 1
+ MODULE_NAME	= nsBrowserModule
 Index: mozilla/xpfe/components/build/Makefile.in
 ===================================================================
-RCS file: /cvsroot/mozilla/xpfe/components/build/Makefile.in,v
-retrieving revision 1.69.8.1
-diff --context=3 -r1.69.8.1 Makefile.in
-*** mozilla/xpfe/components/build/Makefile.in	27 Sep 2005 00:15:25 -0000	1.69.8.1
---- mozilla/xpfe/components/build/Makefile.in	21 Jul 2006 00:27:17 -0000
-***************
-*** 44,50 ****
-  
-  MODULE		= appcomps
-  LIBRARY_NAME	= appcomps
-- EXPORT_LIBRARY = 1
-  IS_COMPONENT	= 1
-  MODULE_NAME	= application
-  LIBXUL_LIBRARY	= 1
---- 44,49 ----
+--- mozilla.orig/xpfe/components/build/Makefile.in	2005-09-27 02:15:25.000000000 +0200
++++ mozilla/xpfe/components/build/Makefile.in	2007-05-10 12:11:27.000000000 +0200
+@@ -44,7 +44,6 @@
+ 
+ MODULE		= appcomps
+ LIBRARY_NAME	= appcomps
+-EXPORT_LIBRARY = 1
+ IS_COMPONENT	= 1
+ MODULE_NAME	= application
+ LIBXUL_LIBRARY	= 1
 Index: mozilla/xpfe/components/filepicker/src/Makefile.in
 ===================================================================
-RCS file: /cvsroot/mozilla/xpfe/components/filepicker/src/Makefile.in,v
-retrieving revision 1.9.8.1
-diff --context=3 -r1.9.8.1 Makefile.in
-*** mozilla/xpfe/components/filepicker/src/Makefile.in	22 May 2006 16:29:32 -0000	1.9.8.1
---- mozilla/xpfe/components/filepicker/src/Makefile.in	21 Jul 2006 00:27:17 -0000
-***************
-*** 47,53 ****
-  MODULE		= filepicker
-  LIBRARY_NAME	= fileview
-  SHORT_LIBNAME	= fileview
-- EXPORT_LIBRARY	= 1
-  IS_COMPONENT	= 1
-  MODULE_NAME	= nsFileViewModule
-  MOZILLA_INTERNAL_API = 1
---- 47,52 ----
+--- mozilla.orig/xpfe/components/filepicker/src/Makefile.in	2006-05-22 18:29:32.000000000 +0200
++++ mozilla/xpfe/components/filepicker/src/Makefile.in	2007-05-10 12:11:27.000000000 +0200
+@@ -47,7 +47,6 @@
+ MODULE		= filepicker
+ LIBRARY_NAME	= fileview
+ SHORT_LIBNAME	= fileview
+-EXPORT_LIBRARY	= 1
+ IS_COMPONENT	= 1
+ MODULE_NAME	= nsFileViewModule
+ MOZILLA_INTERNAL_API = 1
 Index: mozilla/xpfe/components/find/src/Makefile.in
 ===================================================================
-RCS file: /cvsroot/mozilla/xpfe/components/find/src/Makefile.in,v
-retrieving revision 1.37
-diff --context=3 -r1.37 Makefile.in
-*** mozilla/xpfe/components/find/src/Makefile.in	18 Mar 2005 21:23:46 -0000	1.37
---- mozilla/xpfe/components/find/src/Makefile.in	21 Jul 2006 00:27:17 -0000
-***************
-*** 45,51 ****
-  MODULE		= appcomps
-  XPIDL_MODULE	= mozfind
-  LIBRARY_NAME	= mozfind
-- EXPORT_LIBRARY = 1
-  IS_COMPONENT	= 1
-  MODULE_NAME	= nsFindComponent
-  LIBXUL_LIBRARY	= 1
---- 45,50 ----
+--- mozilla.orig/xpfe/components/find/src/Makefile.in	2005-03-18 22:23:46.000000000 +0100
++++ mozilla/xpfe/components/find/src/Makefile.in	2007-05-10 12:11:27.000000000 +0200
+@@ -45,7 +45,6 @@
+ MODULE		= appcomps
+ XPIDL_MODULE	= mozfind
+ LIBRARY_NAME	= mozfind
+-EXPORT_LIBRARY = 1
+ IS_COMPONENT	= 1
+ MODULE_NAME	= nsFindComponent
+ LIBXUL_LIBRARY	= 1
diff --git a/packages/mozilla/minimo_0.016+cvs.bb b/packages/mozilla/minimo_0.016+cvs.bb
deleted file mode 100644
index ad44c0523e..0000000000
--- a/packages/mozilla/minimo_0.016+cvs.bb
+++ /dev/null
@@ -1,150 +0,0 @@
-DESCRIPTION = "A minimal version of the Mozilla web browser for mobile devices"
-SECTION = "x11/network"
-LICENSE = "MPL/GPL/LGPL"
-HOMEPAGE = "http://www.mozilla.org/projects/minimo/"
-PRIORITY = "optional"
-
-DEPENDS = "libxrender xt xft fontconfig freetype libidl dbus-glib pango atk gtk+"
-
-CVSSVR="cvs-mirror.mozilla.org"
-BRTAG = "MOZILLA_1_8_BRANCH"
-MOZDATE = "20060720"
-
-PV = "0.016+cvs${MOZDATE}"
-PR = "r5"
-
-SRC_URI = "cvs://anonymous@${CVSSVR}/cvsroot;module=mozilla;tag=${BRTAG};date=${MOZDATE} \
-	   file://minimo.patch;patch=1 \
-           file://bug-322806.diff;patch=1 \
-	   file://mozconfig file://minimo \
-	   file://eabi-fix.patch;patch=1 \
-	   file://eabi-fix2.patch;patch=1 \
-	   file://eabi-fix3.patch;patch=1 \
-           file://minimo.desktop file://minimo.png"
-
-inherit autotools
-
-S = "${WORKDIR}/mozilla"
-
-export MOZCONFIG = "${WORKDIR}/mozconfig"
-
-export CROSS_COMPILE="1"
-export ac_cv_prog_HOST_CC="${BUILD_CC}"
-export ac_cv_prog_HOST_CFLAGS="${BUILD_CFLAGS}"
-export ac_cv_prog_HOST_CXX="${BUILD_CXX}"
-export ac_cv_prog_HOST_CXXFLAGS="${BUILD_CXXFLAGS}"
-
-mozdir="${libdir}/mozilla-minimo"
-
-EXTRA_OECONF += "--build=${BUILD_SYS} --host=${BUILD_SYS} --target=${TARGET_SYS} "
-
-do_configure() {
-	cd ${S}
-	oe_runmake -f client.mk CONFIGURE_ARGS="${EXTRA_OECONF}" configure
-	sed -i s:${TARGET_PREFIX}strip:echo:g config/autoconf.mk
-}
-
-do_compile() {
-	cd ${S}
-	oe_runmake -f client.mk build
-}
-
-do_install() {
-	cd ${WORKDIR}
-
-	install -d ${D}${bindir}
-	install -m 0755 minimo ${D}${bindir}
-
-	install -d ${D}${datadir}/applications
-	install -m 0644 minimo.desktop ${D}${datadir}/applications
-
-	install -d ${D}/${datadir}/pixmaps
-	install -m 0644 minimo.png ${D}${datadir}/pixmaps
-
-	cd ${S}
-
-	./minimo/config/linux_package.sh ${S} ${S}/minimo/config
-
-	cd dist/minimo
-
-	install -d ${D}${mozdir}
-	install -m 0755 minimo ${D}${mozdir}
-	install -m 0755 libfreebl3.so ${D}${mozdir}
-	install -m 0755 libnspr4.so ${D}${mozdir}
-	install -m 0755 libnss3.so ${D}${mozdir}
-	install -m 0755 libnssckbi.so ${D}${mozdir}
-	install -m 0755 libplc4.so ${D}${mozdir}
-	install -m 0755 libplds4.so ${D}${mozdir}
-	install -m 0755 libsmime3.so ${D}${mozdir}
-	install -m 0755 libsoftokn3.so ${D}${mozdir}
-	install -m 0755 libssl3.so ${D}${mozdir}
-
-	install -d ${D}${mozdir}/chrome
-	install -m 0644 chrome/classic.jar ${D}${mozdir}/chrome
-	install -m 0644 chrome/classic.manifest ${D}${mozdir}/chrome
-	install -m 0644 chrome/en-US.jar ${D}${mozdir}/chrome
-	install -m 0644 chrome/en-US.manifest ${D}${mozdir}/chrome
-	install -m 0644 chrome/minimo-skin-vga.jar ${D}${mozdir}/chrome
-	install -m 0644 chrome/minimo-skin-vga.manifest ${D}${mozdir}/chrome
-	install -m 0644 chrome/minimo-skin.jar ${D}${mozdir}/chrome
-	install -m 0644 chrome/minimo-skin.manifest ${D}${mozdir}/chrome
-	install -m 0644 chrome/minimo.jar ${D}${mozdir}/chrome
-	install -m 0644 chrome/minimo.manifest ${D}${mozdir}/chrome
-	install -m 0644 chrome/pippki.jar ${D}${mozdir}/chrome
-	install -m 0644 chrome/pippki.manifest ${D}${mozdir}/chrome
-	install -m 0644 chrome/toolkit.jar ${D}${mozdir}/chrome
-	install -m 0644 chrome/toolkit.manifest ${D}${mozdir}/chrome
-
-	install -d ${D}${mozdir}/components
-	install -m 0644 components/all.xpt ${D}${mozdir}/components
-	install -m 0644 components/nsHelperAppDlg.js ${D}${mozdir}/components
-	install -m 0644 components/nsProgressDialog.js ${D}${mozdir}/components
-
-	install -d ${D}${mozdir}/greprefs
-	install -m 0644 greprefs/all.js ${D}${mozdir}/greprefs
-	install -m 0644 greprefs/security-prefs.js ${D}${mozdir}/greprefs
-
-	install -d ${D}${mozdir}/res
-	install -m 0644 res/forms.css ${D}${mozdir}/res
-	install -m 0644 res/html.css ${D}${mozdir}/res
-	install -m 0644 res/quirk.css ${D}${mozdir}/res
-	install -m 0644 res/ua.css ${D}${mozdir}/res
-	install -m 0644 res/arrow.gif ${D}${mozdir}/res
-	install -m 0644 res/arrowd.gif ${D}${mozdir}/res
-	install -m 0644 res/broken-image.gif ${D}${mozdir}/res
-	install -m 0644 res/loading-image.gif ${D}${mozdir}/res
-	install -m 0644 res/charsetData.properties ${D}${mozdir}/res
-	install -m 0644 res/charsetalias.properties ${D}${mozdir}/res
-	install -m 0644 res/langGroups.properties ${D}${mozdir}/res
-	install -m 0644 res/language.properties ${D}${mozdir}/res
-	install -m 0644 res/unixcharset.properties ${D}${mozdir}/res
-
-	install -d ${D}${mozdir}/res/dtd
-	install -m 0644 res/dtd/xhtml11.dtd ${D}${mozdir}/res/dtd
-
-	install -d ${D}${mozdir}/res/entityTables
-	install -m 0644 res/entityTables/html40Latin1.properties ${D}${mozdir}/res/entityTables
-	install -m 0644 res/entityTables/html40Special.properties ${D}${mozdir}/res/entityTables
-	install -m 0644 res/entityTables/html40Symbols.properties ${D}${mozdir}/res/entityTables
-	install -m 0644 res/entityTables/htmlEntityVersions.properties ${D}${mozdir}/res/entityTables
-	install -m 0644 res/entityTables/transliterate.properties ${D}${mozdir}/res/entityTables
-
-	install -d ${D}${mozdir}/res/fonts
-	install -m 0644 res/fonts/fontEncoding.properties ${D}${mozdir}/res/fonts
-	install -m 0644 res/fonts/pangoFontEncoding.properties ${D}${mozdir}/res/fonts
-
-	install -d ${D}${mozdir}/res/html
-	install -m 0644 res/html/gopher-audio.gif ${D}${mozdir}/res/html
-	install -m 0644 res/html/gopher-binary.gif ${D}${mozdir}/res/html
-	install -m 0644 res/html/gopher-find.gif ${D}${mozdir}/res/html
-	install -m 0644 res/html/gopher-image.gif ${D}${mozdir}/res/html
-	install -m 0644 res/html/gopher-menu.gif ${D}${mozdir}/res/html
-	install -m 0644 res/html/gopher-movie.gif ${D}${mozdir}/res/html
-	install -m 0644 res/html/gopher-sound.gif ${D}${mozdir}/res/html
-	install -m 0644 res/html/gopher-telnet.gif ${D}${mozdir}/res/html
-	install -m 0644 res/html/gopher-text.gif ${D}${mozdir}/res/html
-	install -m 0644 res/html/gopher-unknown.gif ${D}${mozdir}/res/html
-}
-
-FILES_${PN}-dbg += "${libdir}/mozilla-minimo/.debug*"
-FILES_${PN} += "${mozdir}"
diff --git a/packages/mozilla/minimo_cvs.bb b/packages/mozilla/minimo_cvs.bb
index 2d6744a6c1..834192ad0f 100644
--- a/packages/mozilla/minimo_cvs.bb
+++ b/packages/mozilla/minimo_cvs.bb
@@ -1,49 +1,151 @@
-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://no-xmb.patch;patch=1 \
-	   file://host_ldflags_fix.patch;patch=1 \
-	   file://minimo.png file://minimo.desktop"
-S = "${WORKDIR}/mozilla"
-SECTION = "x11"
+DESCRIPTION = "A minimal version of the Mozilla web browser for mobile devices"
+SECTION = "x11/network"
+LICENSE = "MPL/GPL/LGPL"
+HOMEPAGE = "http://www.mozilla.org/projects/minimo/"
 PRIORITY = "optional"
-PV = "0.0+cvs${SRCDATE}"
-FILES_${PN} += "${libdir}/mozilla-minimo"
-PR = "r8"
-LICENSE = "MPL/LGPL/GPL"
 
-inherit mozilla
+DEPENDS = "libxrender xt xft fontconfig freetype libidl dbus-glib pango atk gtk+ libidl-native"
+
+CVSSVR="cvs-mirror.mozilla.org"
+BRTAG = "MOZILLA_1_8_BRANCH"
+MOZDATE = "20070510"
+
+PV = "0.02+cvs${MOZDATE}"
+PE = "1"
+
+SRC_URI = "cvs://anonymous@${CVSSVR}/cvsroot;module=mozilla;tag=${BRTAG};date=${MOZDATE} \
+	   file://minimo.patch;patch=1 \
+           file://bug-322806.diff;patch=1 \
+	   file://mozconfig file://minimo \
+	   file://eabi-fix.patch;patch=1 \
+	   file://eabi-fix2.patch;patch=1 \
+	   file://eabi-fix3.patch;patch=1 \
+           file://minimo.desktop file://minimo.png"
+
+inherit autotools
+
+S = "${WORKDIR}/mozilla"
+
+export MOZCONFIG = "${WORKDIR}/mozconfig"
 
-EXTRA_OECONF += "--enable-application=minimo --disable-native-uconv"
-export MOZ_CO_PROJECT="minimo"
+export CROSS_COMPILE="1"
+export ac_cv_prog_HOST_CC="${BUILD_CC}"
+export ac_cv_prog_HOST_CFLAGS="${BUILD_CFLAGS}"
+export ac_cv_prog_HOST_CXX="${BUILD_CXX}"
+export ac_cv_prog_HOST_CXXFLAGS="${BUILD_CXXFLAGS}"
+export HOST_LIBIDL_CONFIG = "libIDL-config-2"
 
-export MINIMO="1"
-export MOZ_OBJDIR="${WORKDIR}/build-${TARGET_SYS}"
+mozdir="${libdir}/mozilla-minimo"
 
-require mozilla-cvs.inc
+EXTRA_OECONF += "--build=${BUILD_SYS} --host=${BUILD_SYS} --target=${TARGET_SYS} "
 
-do_compile () {
-	mozilla_do_compile
+do_configure() {
+	cd ${S}
+	oe_runmake -f client.mk CONFIGURE_ARGS="${EXTRA_OECONF}" configure
+	sed -i s:${TARGET_PREFIX}strip:echo:g config/autoconf.mk
 }
 
-mozdir="${D}${libdir}/mozilla-minimo"
+do_compile() {
+	cd ${S}
+	oe_runmake -f client.mk build
+}
+
+do_install() {
+	cd ${WORKDIR}
+
+	install -d ${D}${bindir}
+	install -m 0755 minimo ${D}${bindir}
+
+	install -d ${D}${datadir}/applications
+	install -m 0644 minimo.desktop ${D}${datadir}/applications
+
+	install -d ${D}/${datadir}/pixmaps
+	install -m 0644 minimo.png ${D}${datadir}/pixmaps
 
-do_install () {
-	cd $MOZ_OBJDIR/minimo/base
-	oe_runmake package
 	cd ${S}
-	mkdir -p ${mozdir}
-	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
-cd ${libdir}/mozilla-minimo
-export LD_LIBRARY_PATH=${libdir}/mozilla-minimo
-exec ./minimo
-EOF
-	chmod 755 ${D}${bindir}/Minimo
+
+	./minimo/config/linux_package.sh ${S} ${S}/minimo/config
+
+	cd dist/minimo
+
+	install -d ${D}${mozdir}
+	install -m 0755 minimo ${D}${mozdir}
+	install -m 0755 libfreebl3.so ${D}${mozdir}
+	install -m 0755 libnspr4.so ${D}${mozdir}
+	install -m 0755 libnss3.so ${D}${mozdir}
+	install -m 0755 libnssckbi.so ${D}${mozdir}
+	install -m 0755 libplc4.so ${D}${mozdir}
+	install -m 0755 libplds4.so ${D}${mozdir}
+	install -m 0755 libsmime3.so ${D}${mozdir}
+	install -m 0755 libsoftokn3.so ${D}${mozdir}
+	install -m 0755 libssl3.so ${D}${mozdir}
+
+	install -d ${D}${mozdir}/chrome
+	install -m 0644 chrome/classic.jar ${D}${mozdir}/chrome
+	install -m 0644 chrome/classic.manifest ${D}${mozdir}/chrome
+	install -m 0644 chrome/en-US.jar ${D}${mozdir}/chrome
+	install -m 0644 chrome/en-US.manifest ${D}${mozdir}/chrome
+	install -m 0644 chrome/minimo-skin-vga.jar ${D}${mozdir}/chrome
+	install -m 0644 chrome/minimo-skin-vga.manifest ${D}${mozdir}/chrome
+	install -m 0644 chrome/minimo-skin.jar ${D}${mozdir}/chrome
+	install -m 0644 chrome/minimo-skin.manifest ${D}${mozdir}/chrome
+	install -m 0644 chrome/minimo.jar ${D}${mozdir}/chrome
+	install -m 0644 chrome/minimo.manifest ${D}${mozdir}/chrome
+	install -m 0644 chrome/pippki.jar ${D}${mozdir}/chrome
+	install -m 0644 chrome/pippki.manifest ${D}${mozdir}/chrome
+	install -m 0644 chrome/toolkit.jar ${D}${mozdir}/chrome
+	install -m 0644 chrome/toolkit.manifest ${D}${mozdir}/chrome
+
+	install -d ${D}${mozdir}/components
+	install -m 0644 components/all.xpt ${D}${mozdir}/components
+	install -m 0644 components/nsHelperAppDlg.js ${D}${mozdir}/components
+	install -m 0644 components/nsProgressDialog.js ${D}${mozdir}/components
+
+	install -d ${D}${mozdir}/greprefs
+	install -m 0644 greprefs/all.js ${D}${mozdir}/greprefs
+	install -m 0644 greprefs/security-prefs.js ${D}${mozdir}/greprefs
+
+	install -d ${D}${mozdir}/res
+	install -m 0644 res/forms.css ${D}${mozdir}/res
+	install -m 0644 res/html.css ${D}${mozdir}/res
+	install -m 0644 res/quirk.css ${D}${mozdir}/res
+	install -m 0644 res/ua.css ${D}${mozdir}/res
+	install -m 0644 res/arrow.gif ${D}${mozdir}/res
+	install -m 0644 res/arrowd.gif ${D}${mozdir}/res
+	install -m 0644 res/broken-image.gif ${D}${mozdir}/res
+	install -m 0644 res/loading-image.gif ${D}${mozdir}/res
+	install -m 0644 res/charsetData.properties ${D}${mozdir}/res
+	install -m 0644 res/charsetalias.properties ${D}${mozdir}/res
+	install -m 0644 res/langGroups.properties ${D}${mozdir}/res
+	install -m 0644 res/language.properties ${D}${mozdir}/res
+	install -m 0644 res/unixcharset.properties ${D}${mozdir}/res
+
+	install -d ${D}${mozdir}/res/dtd
+	install -m 0644 res/dtd/xhtml11.dtd ${D}${mozdir}/res/dtd
+
+	install -d ${D}${mozdir}/res/entityTables
+	install -m 0644 res/entityTables/html40Latin1.properties ${D}${mozdir}/res/entityTables
+	install -m 0644 res/entityTables/html40Special.properties ${D}${mozdir}/res/entityTables
+	install -m 0644 res/entityTables/html40Symbols.properties ${D}${mozdir}/res/entityTables
+	install -m 0644 res/entityTables/htmlEntityVersions.properties ${D}${mozdir}/res/entityTables
+	install -m 0644 res/entityTables/transliterate.properties ${D}${mozdir}/res/entityTables
+
+	install -d ${D}${mozdir}/res/fonts
+	install -m 0644 res/fonts/fontEncoding.properties ${D}${mozdir}/res/fonts
+	install -m 0644 res/fonts/pangoFontEncoding.properties ${D}${mozdir}/res/fonts
+
+	install -d ${D}${mozdir}/res/html
+	install -m 0644 res/html/gopher-audio.gif ${D}${mozdir}/res/html
+	install -m 0644 res/html/gopher-binary.gif ${D}${mozdir}/res/html
+	install -m 0644 res/html/gopher-find.gif ${D}${mozdir}/res/html
+	install -m 0644 res/html/gopher-image.gif ${D}${mozdir}/res/html
+	install -m 0644 res/html/gopher-menu.gif ${D}${mozdir}/res/html
+	install -m 0644 res/html/gopher-movie.gif ${D}${mozdir}/res/html
+	install -m 0644 res/html/gopher-sound.gif ${D}${mozdir}/res/html
+	install -m 0644 res/html/gopher-telnet.gif ${D}${mozdir}/res/html
+	install -m 0644 res/html/gopher-text.gif ${D}${mozdir}/res/html
+	install -m 0644 res/html/gopher-unknown.gif ${D}${mozdir}/res/html
 }
+
+FILES_${PN}-dbg += "${libdir}/mozilla-minimo/.debug*"
+FILES_${PN} += "${mozdir}"