summaryrefslogtreecommitdiffstats
path: root/meta-extras/packages/mozilla
diff options
context:
space:
mode:
Diffstat (limited to 'meta-extras/packages/mozilla')
-rw-r--r--meta-extras/packages/mozilla/files/eabi-fix.patch66
-rw-r--r--meta-extras/packages/mozilla/files/eabi-fix2.patch56
-rw-r--r--meta-extras/packages/mozilla/files/eabi-fix3.patch15
-rw-r--r--meta-extras/packages/mozilla/files/minimo.desktop9
-rw-r--r--meta-extras/packages/mozilla/files/minimo.pngbin0 -> 4323 bytes
-rw-r--r--meta-extras/packages/mozilla/minimo/bug-322806.diff13
-rw-r--r--meta-extras/packages/mozilla/minimo/minimo4
-rw-r--r--meta-extras/packages/mozilla/minimo/minimo.patch356
-rw-r--r--meta-extras/packages/mozilla/minimo/minimo.pngbin0 -> 4323 bytes
-rw-r--r--meta-extras/packages/mozilla/minimo/mozconfig36
-rw-r--r--meta-extras/packages/mozilla/minimo_cvs.bb153
11 files changed, 708 insertions, 0 deletions
diff --git a/meta-extras/packages/mozilla/files/eabi-fix.patch b/meta-extras/packages/mozilla/files/eabi-fix.patch
new file mode 100644
index 0000000000..fd3bb88683
--- /dev/null
+++ b/meta-extras/packages/mozilla/files/eabi-fix.patch
@@ -0,0 +1,66 @@
1http://lists.debian.org/debian-arm/2007/05/msg00039.html
2
3From: Lennert Buytenhek <buytenh@wantstofly.org>
4
5Hi,
6
7The reason that building nss (i.e., firefox) would segfault on ARM EABI
8systems is an assumption about the layout of the jmp_buf structure in
9the nspr library (which nss depends on) that does hold on old-ABI but
10no longer holds on EABI. The attached patch fixes this assumption,
11and fixes the shlibsign segfault during the building of nss (it also
12fixes a floating point byte order assumption.)
13
14Looks sane?
15
16It's of course a stupid idea to depend on a particular layout of the
17jmp_buf structure in application programs, but oh well. People write
18ugly buggy code, film at 11.
19
20
21--- mozilla/nsprpub/pr/src/misc/prdtoa.c.orig 2007-05-06 02:39:00.000000000 +0200
22+++ mozilla/nsprpub/pr/src/misc/prdtoa.c 2007-05-06 02:39:22.000000000 +0200
23@@ -59,8 +59,8 @@
24 /* FIXME: deal with freelist and p5s. */
25 }
26
27-#if defined(__arm) || defined(__arm__) || defined(__arm26__) \
28- || defined(__arm32__)
29+#if (defined(__arm) || defined(__arm__) || defined(__arm26__) \
30+ || defined(__arm32__)) && !defined(__ARM_EABI__) && !defined(__ARMEB__)
31 #define IEEE_ARM
32 #elif defined(IS_LITTLE_ENDIAN)
33 #define IEEE_8087
34--- mozilla/nsprpub/pr/include/md/_linux.h.orig 2007-05-06 02:39:45.000000000 +0200
35+++ mozilla/nsprpub/pr/include/md/_linux.h 2007-05-06 02:40:57.000000000 +0200
36@@ -346,7 +346,7 @@
37 #error "Linux/MIPS pre-glibc2 not supported yet"
38 #endif /* defined(__GLIBC__) && __GLIBC__ >= 2 */
39
40-#elif defined(__arm__)
41+#elif defined(__arm__) && !defined(__ARM_EABI__)
42 /* ARM/Linux */
43 #if defined(__GLIBC__) && __GLIBC__ >= 2
44 #define _MD_GET_SP(_t) (_t)->md.context[0].__jmpbuf[20]
45@@ -358,6 +358,18 @@
46 #error "ARM/Linux pre-glibc2 not supported yet"
47 #endif /* defined(__GLIBC__) && __GLIBC__ >= 2 */
48
49+#elif defined(__arm__) && defined(__ARM_EABI__)
50+/* ARM/Linux */
51+#if defined(__GLIBC__) && __GLIBC__ >= 2
52+#define _MD_GET_SP(_t) (_t)->md.context[0].__jmpbuf[8]
53+#define _MD_SET_FP(_t, val) ((_t)->md.context[0].__jmpbuf[7] = (val))
54+#define _MD_GET_SP_PTR(_t) &(_MD_GET_SP(_t))
55+#define _MD_GET_FP_PTR(_t) (&(_t)->md.context[0].__jmpbuf[7])
56+#define _MD_SP_TYPE __ptr_t
57+#else
58+#error "ARM/Linux pre-glibc2 not supported yet"
59+#endif /* defined(__GLIBC__) && __GLIBC__ >= 2 */
60+
61 #else
62
63 #error "Unknown CPU architecture"
64
65
66
diff --git a/meta-extras/packages/mozilla/files/eabi-fix2.patch b/meta-extras/packages/mozilla/files/eabi-fix2.patch
new file mode 100644
index 0000000000..5f64e7f796
--- /dev/null
+++ b/meta-extras/packages/mozilla/files/eabi-fix2.patch
@@ -0,0 +1,56 @@
1https://bugzilla.mozilla.org/show_bug.cgi?id=369722
2
3Index: js/src/jsnum.h
4===================================================================
5RCS file: /cvsroot/mozilla/js/src/jsnum.h,v
6retrieving revision 3.27
7diff -p -u -8 -r3.27 jsnum.h
8--- mozilla/js/src/jsnum.h 21 Dec 2006 01:00:32 -0000 3.27
9+++ mozilla/js/src/jsnum.h 8 Feb 2007 12:13:01 -0000
10@@ -52,23 +52,24 @@ JS_BEGIN_EXTERN_C
11
12 /*
13 * Stefan Hanske <sh990154@mail.uni-greifswald.de> reports:
14 * ARM is a little endian architecture but 64 bit double words are stored
15 * differently: the 32 bit words are in little endian byte order, the two words
16 * are stored in big endian`s way.
17 */
18
19-#if defined(__arm) || defined(__arm32__) || defined(__arm26__) || defined(__arm__)
20-#define CPU_IS_ARM
21+#if !defined(__ARM_EABI__) && \
22+ (defined(__arm) || defined(__arm32__) || defined(__arm26__) || defined(__arm__))
23+#define IEEE_ARM
24 #endif
25
26 typedef union jsdpun {
27 struct {
28-#if defined(IS_LITTLE_ENDIAN) && !defined(CPU_IS_ARM)
29+#if defined(IS_LITTLE_ENDIAN) && !defined(IEEE_ARM)
30 uint32 lo, hi;
31 #else
32 uint32 hi, lo;
33 #endif
34 } s;
35 jsdouble d;
36 } jsdpun;
37
38@@ -87,17 +88,17 @@ typedef union jsdpun {
39
40 #else /* not or old GNUC */
41
42 /*
43 * We don't know of any non-gcc compilers that perform alias optimization,
44 * so this code should work.
45 */
46
47-#if defined(IS_LITTLE_ENDIAN) && !defined(CPU_IS_ARM)
48+#if defined(IS_LITTLE_ENDIAN) && !defined(IEEE_ARM)
49 #define JSDOUBLE_HI32(x) (((uint32 *)&(x))[1])
50 #define JSDOUBLE_LO32(x) (((uint32 *)&(x))[0])
51 #else
52 #define JSDOUBLE_HI32(x) (((uint32 *)&(x))[0])
53 #define JSDOUBLE_LO32(x) (((uint32 *)&(x))[1])
54 #endif
55
56 #define JSDOUBLE_SET_HI32(x, y) (JSDOUBLE_HI32(x)=(y))
diff --git a/meta-extras/packages/mozilla/files/eabi-fix3.patch b/meta-extras/packages/mozilla/files/eabi-fix3.patch
new file mode 100644
index 0000000000..8bf8c2f4da
--- /dev/null
+++ b/meta-extras/packages/mozilla/files/eabi-fix3.patch
@@ -0,0 +1,15 @@
1From: Marcin Juszkiewicz <openembedded@hrw.one.pl>
2
3Index: mozilla/extensions/transformiix/source/base/Double.cpp
4===================================================================
5--- mozilla.orig/extensions/transformiix/source/base/Double.cpp 2007-05-09 11:21:34.000000000 +0200
6+++ mozilla/extensions/transformiix/source/base/Double.cpp 2007-05-09 11:23:59.000000000 +0200
7@@ -71,7 +71,7 @@
8 * are stored in big endian`s way.
9 */
10
11-#if defined(__arm) || defined(__arm32__) || defined(_arm26__) || defined(__arm__)
12+#if !defined(__ARM_EABI__) && defined(__arm) || defined(__arm32__) || defined(_arm26__) || defined(__arm__)
13 #define CPU_IS_ARM
14 #endif
15
diff --git a/meta-extras/packages/mozilla/files/minimo.desktop b/meta-extras/packages/mozilla/files/minimo.desktop
new file mode 100644
index 0000000000..5ef0f2075a
--- /dev/null
+++ b/meta-extras/packages/mozilla/files/minimo.desktop
@@ -0,0 +1,9 @@
1[Desktop Entry]
2Name=Minimo
3Comment=Minimo web browser
4Exec=minimo http://www.mozilla.org/projects/minimo/home.html
5Terminal=0
6Type=Application
7Icon=minimo.png
8Categories=Application;Network;
9StartupNotify=True
diff --git a/meta-extras/packages/mozilla/files/minimo.png b/meta-extras/packages/mozilla/files/minimo.png
new file mode 100644
index 0000000000..f8b2e2192b
--- /dev/null
+++ b/meta-extras/packages/mozilla/files/minimo.png
Binary files differ
diff --git a/meta-extras/packages/mozilla/minimo/bug-322806.diff b/meta-extras/packages/mozilla/minimo/bug-322806.diff
new file mode 100644
index 0000000000..e001e3fc67
--- /dev/null
+++ b/meta-extras/packages/mozilla/minimo/bug-322806.diff
@@ -0,0 +1,13 @@
1See https://bugzilla.mozilla.org/show_bug.cgi?id=322806 and http://bugs.openembedded.org/show_bug.cgi?id=1600
2
3--- /tmp/xptcinvoke_arm.cpp 2006-12-10 20:02:57.000000000 +0100
4+++ mozilla/xpcom/reflect/xptcall/src/md/unix/xptcinvoke_arm.cpp 2006-12-10 20:03:54.592227000 +0100
5@@ -212,7 +212,7 @@
6 "add sp, sp, r4 \n\t" /* restore stack pointer */
7 "mov %0, r0 \n\t" /* the result... */
8 : "=r" (result)
9- : "r" (&my_params)
10+ : "r" (&my_params), "m" (my_params)
11 : "r0", "r1", "r2", "r3", "r4", "ip", "lr", "sp"
12 );
13
diff --git a/meta-extras/packages/mozilla/minimo/minimo b/meta-extras/packages/mozilla/minimo/minimo
new file mode 100644
index 0000000000..d130173adf
--- /dev/null
+++ b/meta-extras/packages/mozilla/minimo/minimo
@@ -0,0 +1,4 @@
1#!/bin/sh
2export MOZILLA_FIVE_HOME=/usr/lib/mozilla-minimo
3export LD_LIBRARY_PATH=${MOZILLA_FIVE_HOME}
4exec ${MOZILLA_FIVE_HOME}/minimo "$@"
diff --git a/meta-extras/packages/mozilla/minimo/minimo.patch b/meta-extras/packages/mozilla/minimo/minimo.patch
new file mode 100644
index 0000000000..8894ee7f45
--- /dev/null
+++ b/meta-extras/packages/mozilla/minimo/minimo.patch
@@ -0,0 +1,356 @@
1Index: mozilla/content/html/content/src/nsFormSubmission.cpp
2===================================================================
3--- mozilla.orig/content/html/content/src/nsFormSubmission.cpp 2005-07-13 18:55:59.000000000 +0200
4+++ mozilla/content/html/content/src/nsFormSubmission.cpp 2007-05-10 12:11:20.000000000 +0200
5@@ -1315,11 +1315,6 @@
6 nsresult rv = NS_OK;
7
8 nsCAutoString charset(aCharset);
9- // canonical name is passed so that we just have to check against
10- // *our* canonical names listed in charsetaliases.properties
11- if (charset.EqualsLiteral("ISO-8859-1")) {
12- charset.AssignLiteral("windows-1252");
13- }
14
15 // use UTF-8 for UTF-16* and UTF-32* (per WHATWG and existing practice of
16 // MS IE/Opera).
17Index: mozilla/embedding/base/Makefile.in
18===================================================================
19--- mozilla.orig/embedding/base/Makefile.in 2006-02-14 06:28:31.000000000 +0100
20+++ mozilla/embedding/base/Makefile.in 2007-05-10 12:11:20.000000000 +0200
21@@ -43,6 +43,7 @@
22
23 MODULE = embed_base
24 LIBRARY_NAME = embed_base_s
25+EXPORT_LIBRARY = 1
26 XPIDL_MODULE = embed_base
27
28 include $(DEPTH)/config/autoconf.mk
29Index: mozilla/js/src/Makefile.in
30===================================================================
31--- mozilla.orig/js/src/Makefile.in 2006-07-28 00:56:20.000000000 +0200
32+++ mozilla/js/src/Makefile.in 2007-05-10 12:11:21.000000000 +0200
33@@ -46,6 +46,7 @@
34
35 MODULE = js
36 LIBRARY_NAME = mozjs
37+EXPORT_LIBRARY = 1
38 LIB_IS_C_ONLY = 1
39 GRE_MODULE = 1
40
41Index: mozilla/minimo/Makefile.in
42===================================================================
43--- mozilla.orig/minimo/Makefile.in 2006-07-24 21:40:53.000000000 +0200
44+++ mozilla/minimo/Makefile.in 2007-05-10 12:13:46.000000000 +0200
45@@ -41,6 +41,6 @@
46
47 include $(DEPTH)/config/autoconf.mk
48
49-DIRS = config components chrome locales customization base extensions
50+DIRS = config chrome locales customization base extensions
51
52 include $(topsrcdir)/config/rules.mk
53Index: mozilla/minimo/base/Makefile.in
54===================================================================
55--- mozilla.orig/minimo/base/Makefile.in 2006-08-09 17:42:26.000000000 +0200
56+++ mozilla/minimo/base/Makefile.in 2007-05-10 12:11:21.000000000 +0200
57@@ -96,7 +96,6 @@
58
59 # this should move into the toolkit!
60 LOCAL_INCLUDES = -I$(srcdir) -I$(topsrcdir)/xpfe/browser/src/
61-CPPSRCS += nsBrowserStatusFilter.cpp nsBrowserInstance.cpp
62
63 ifdef WINCE
64 RCINCLUDE = wince/SplashScreen.rc
65@@ -143,10 +142,6 @@
66 endif
67
68
69-FINAL_LINK_COMPS=$(topsrcdir)/minimo/base/$(FINAL_PLATFORM)/minimo-link-comps
70-FINAL_LINK_COMP_NAMES=$(topsrcdir)/minimo/base/$(FINAL_PLATFORM)/minimo-link-names
71-FINAL_LINK_LIBS=$(topsrcdir)/minimo/base/$(FINAL_PLATFORM)/minimo-link-libs
72-
73 include $(topsrcdir)/config/static-config.mk
74
75 EXTRA_DEPS += $(STATIC_EXTRA_DEPS)
76@@ -180,14 +175,11 @@
77 # (same as in mozilla/js/src/Makefile.in)
78 ifdef WINCE
79 LDFLAGS += -OPT:NOICF
80+else
81+# Hack to work around libxpcom_core.a / libunicharutil_s.a link order problem.
82+LDFLAGS += -u NS_StringGetData_P -u NS_StringGetMutableData_P
83 endif
84
85-export::
86- $(NSINSTALL) $(topsrcdir)/xpfe/browser/src/nsBrowserStatusFilter.cpp .
87- $(NSINSTALL) $(topsrcdir)/xpfe/browser/src/nsBrowserInstance.cpp .
88-
89-
90-GARBAGE += nsBrowserStatusFilter.cpp nsBrowserInstance.cpp
91
92 ifdef WINCE
93 package::
94Index: mozilla/minimo/base/Minimo.cpp
95===================================================================
96--- mozilla.orig/minimo/base/Minimo.cpp 2006-10-27 22:30:36.000000000 +0200
97+++ mozilla/minimo/base/Minimo.cpp 2007-05-10 12:13:21.000000000 +0200
98@@ -813,6 +813,8 @@
99 #ifdef MOZ_WIDGET_GTK2
100 gtk_set_locale();
101 gtk_init(&argc, &argv);
102+ gtk_widget_set_default_visual(gdk_rgb_get_visual());
103+ gtk_widget_set_default_colormap(gdk_rgb_get_cmap());
104 #endif
105
106 #ifdef HACKY_PRE_LOAD_LIBRARY
107Index: mozilla/minimo/base/SplashScreen.cpp
108===================================================================
109--- mozilla.orig/minimo/base/SplashScreen.cpp 2006-08-21 21:00:24.000000000 +0200
110+++ mozilla/minimo/base/SplashScreen.cpp 2007-05-10 12:11:22.000000000 +0200
111@@ -202,9 +202,24 @@
112 void KillSplashScreen() {}
113 void GetScreenSize(unsigned long* x, unsigned long* y)
114 {
115+#ifdef MOZ_WIDGET_GTK2
116+ GdkDisplay* display = gdk_display_get_default();
117+ if (display != NULL)
118+ {
119+ GdkScreen *screen;
120+ screen = gdk_display_get_default_screen(display);
121+ *x = gdk_screen_get_width(screen);
122+ *y = gdk_screen_get_height(screen);
123+ }
124+ else
125+ {
126+#endif
127 // we need to figure this out.
128 *x = 240;
129 *y = 320;
130+#ifdef MOZ_WIDGET_GTK2
131+ }
132+#endif
133 }
134
135
136Index: mozilla/minimo/config/linux_package.sh
137===================================================================
138--- mozilla.orig/minimo/config/linux_package.sh 2006-06-30 18:35:19.000000000 +0200
139+++ mozilla/minimo/config/linux_package.sh 2007-05-10 12:11:22.000000000 +0200
140@@ -29,9 +29,7 @@
141 cp -pRL bin/libnssckbi.so minimo
142 cp -pRL bin/libsmime3.so minimo
143 cp -pRL bin/libsoftokn3.so minimo
144-cp -pRL bin/libsoftokn3.chk minimo
145 cp -pRL bin/libfreebl3.so minimo
146-cp -pRL bin/libfreebl3.chk minimo
147 cp -pRL bin/libssl3.so minimo
148
149 mkdir -p minimo/chrome
150@@ -62,8 +60,6 @@
151 cp -pRL bin/components/nsHelperAppDlg.js minimo/components
152 cp -pRL bin/components/nsProgressDialog.js minimo/components
153
154-cp -pRL bin/extensions/spatial-navigation@extensions.mozilla.org/components/* minimo/components
155-
156 mkdir -p minimo/greprefs
157 cp -pRL bin/greprefs/* minimo/greprefs
158
159@@ -80,7 +76,7 @@
160
161 echo Linking XPT files.
162
163-bin/xpt_link minimo/components/all.xpt bin/components/*.xpt
164+host/bin/host_xpt_link minimo/components/all.xpt bin/components/*.xpt
165
166 echo Chewing on chrome
167
168Index: mozilla/profile/dirserviceprovider/src/Makefile.in
169===================================================================
170--- mozilla.orig/profile/dirserviceprovider/src/Makefile.in 2005-04-06 05:35:21.000000000 +0200
171+++ mozilla/profile/dirserviceprovider/src/Makefile.in 2007-05-10 12:11:23.000000000 +0200
172@@ -44,6 +44,7 @@
173
174 MODULE = profdirserviceprovider
175 LIBRARY_NAME = profdirserviceprovider_s
176+EXPORT_LIBRARY = 1
177 MOZILLA_INTERNAL_API = 1
178
179 REQUIRES = xpcom \
180Index: mozilla/security/coreconf/Linux.mk
181===================================================================
182--- mozilla.orig/security/coreconf/Linux.mk 2006-02-03 23:26:36.000000000 +0100
183+++ mozilla/security/coreconf/Linux.mk 2007-05-10 12:11:23.000000000 +0200
184@@ -117,6 +117,10 @@
185 OS_REL_CFLAGS = -DLINUX1_2 -D_XOPEN_SOURCE
186 CPU_ARCH = mips
187 else
188+ifeq ($(OS_TEST),arm)
189+ OS_REL_CFLAGS = -DLINUX1_2 -D_XOPEN_SOURCE
190+ CPU_ARCH = arm
191+else
192 OS_REL_CFLAGS = -DLINUX1_2 -Di386 -D_XOPEN_SOURCE
193 CPU_ARCH = x86
194 endif
195@@ -133,6 +137,7 @@
196 endif
197 endif
198 endif
199+endif
200
201
202 LIBC_TAG = _glibc
203Index: mozilla/security/coreconf/arch.mk
204===================================================================
205--- mozilla.orig/security/coreconf/arch.mk 2006-02-03 23:26:36.000000000 +0100
206+++ mozilla/security/coreconf/arch.mk 2007-05-10 12:11:24.000000000 +0200
207@@ -60,18 +60,14 @@
208 64BIT_TAG=
209 endif
210
211-OS_ARCH := $(subst /,_,$(shell uname -s))
212+OS_ARCH := Linux
213
214 #
215 # Attempt to differentiate between sparc and x86 Solaris
216 #
217
218-OS_TEST := $(shell uname -m)
219-ifeq ($(OS_TEST),i86pc)
220- OS_RELEASE := $(shell uname -r)_$(OS_TEST)
221-else
222- OS_RELEASE := $(shell uname -r)
223-endif
224+OS_TEST := arm
225+OS_RELEASE := 2.6
226
227 #
228 # Force the IRIX64 machines to use IRIX.
229Index: mozilla/toolkit/components/build/Makefile.in
230===================================================================
231--- mozilla.orig/toolkit/components/build/Makefile.in 2006-07-13 22:08:29.000000000 +0200
232+++ mozilla/toolkit/components/build/Makefile.in 2007-05-10 12:11:27.000000000 +0200
233@@ -112,7 +112,6 @@
234 $(NULL)
235
236 SHARED_LIBRARY_LIBS = \
237- ../startup/src/$(LIB_PREFIX)appstartup_s.$(LIB_SUFFIX) \
238 $(NULL)
239
240 ifdef MOZ_XPINSTALL
241Index: mozilla/toolkit/components/startup/src/Makefile.in
242===================================================================
243--- mozilla.orig/toolkit/components/startup/src/Makefile.in 2005-07-27 22:42:44.000000000 +0200
244+++ mozilla/toolkit/components/startup/src/Makefile.in 2007-05-10 12:11:27.000000000 +0200
245@@ -43,6 +43,7 @@
246
247 MODULE = toolkitcomps
248 LIBRARY_NAME = appstartup_s
249+EXPORT_LIBRARY = 1
250 FORCE_STATIC_LIB = 1
251 LIBXUL_LIBRARY = 1
252
253Index: mozilla/toolkit/xre/Makefile.in
254===================================================================
255--- mozilla.orig/toolkit/xre/Makefile.in 2007-02-06 08:13:20.000000000 +0100
256+++ mozilla/toolkit/xre/Makefile.in 2007-05-10 12:11:27.000000000 +0200
257@@ -45,7 +45,6 @@
258
259 MODULE = xulapp
260 LIBRARY_NAME = xulapp_s
261-EXPORT_LIBRARY = 1
262 LIBXUL_LIBRARY = 1
263
264 REQUIRES = \
265@@ -180,14 +179,6 @@
266
267 include $(topsrcdir)/config/rules.mk
268
269-ifdef BUILD_STATIC_LIBS
270-export::
271- @$(PERL) -I$(MOZILLA_DIR)/config $(MOZILLA_DIR)/config/build-list.pl $(FINAL_LINK_COMP_NAMES) Apprunner
272-# embedding/browser/gtk/src/Makefile.in sucks! we need to add an empty line to
273-# FINAL_LINK_COMPS to keep the two lists in sync :-(
274- @$(PERL) -I$(MOZILLA_DIR)/config $(MOZILLA_DIR)/config/build-list.pl $(FINAL_LINK_COMPS) ""
275-endif
276-
277 LOCAL_INCLUDES += \
278 -I$(srcdir) \
279 -I$(topsrcdir)/xpfe/bootstrap \
280Index: mozilla/xpcom/build/Makefile.in
281===================================================================
282--- mozilla.orig/xpcom/build/Makefile.in 2006-01-29 17:51:02.000000000 +0100
283+++ mozilla/xpcom/build/Makefile.in 2007-05-10 12:11:27.000000000 +0200
284@@ -61,7 +61,7 @@
285 endif
286
287 # Do not set EXPORT_LIBRARY as we do not want xpcom in the static libs list
288-#EXPORT_LIBRARY = 1
289+EXPORT_LIBRARY = 1
290 GRE_MODULE = 1
291 MOZILLA_INTERNAL_API = 1
292
293Index: mozilla/xpcom/reflect/xptcall/src/md/unix/xptcstubs_arm.cpp
294===================================================================
295--- mozilla.orig/xpcom/reflect/xptcall/src/md/unix/xptcstubs_arm.cpp 2004-04-18 16:18:18.000000000 +0200
296+++ mozilla/xpcom/reflect/xptcall/src/md/unix/xptcstubs_arm.cpp 2007-05-10 12:11:27.000000000 +0200
297@@ -45,9 +45,9 @@
298 #endif
299
300 /* Specify explicitly a symbol for this function, don't try to guess the c++ mangled symbol. */
301-static nsresult PrepareAndDispatch(nsXPTCStubBase* self, uint32 methodIndex, PRUint32* args) asm("_PrepareAndDispatch");
302+nsresult PrepareAndDispatch(nsXPTCStubBase* self, uint32 methodIndex, PRUint32* args) asm("_PrepareAndDispatch");
303
304-static nsresult
305+nsresult
306 PrepareAndDispatch(nsXPTCStubBase* self, uint32 methodIndex, PRUint32* args)
307 {
308 #define PARAM_BUFFER_COUNT 16
309Index: mozilla/xpfe/browser/src/Makefile.in
310===================================================================
311--- mozilla.orig/xpfe/browser/src/Makefile.in 2005-03-18 22:23:45.000000000 +0100
312+++ mozilla/xpfe/browser/src/Makefile.in 2007-05-10 12:11:27.000000000 +0200
313@@ -44,6 +44,7 @@
314
315 MODULE = browser
316 LIBRARY_NAME = mozbrwsr_s
317+EXPORT_LIBRARY = 1
318 FORCE_STATIC_LIB = 1
319 LIBXUL_LIBRARY = 1
320 MODULE_NAME = nsBrowserModule
321Index: mozilla/xpfe/components/build/Makefile.in
322===================================================================
323--- mozilla.orig/xpfe/components/build/Makefile.in 2005-09-27 02:15:25.000000000 +0200
324+++ mozilla/xpfe/components/build/Makefile.in 2007-05-10 12:11:27.000000000 +0200
325@@ -44,7 +44,6 @@
326
327 MODULE = appcomps
328 LIBRARY_NAME = appcomps
329-EXPORT_LIBRARY = 1
330 IS_COMPONENT = 1
331 MODULE_NAME = application
332 LIBXUL_LIBRARY = 1
333Index: mozilla/xpfe/components/filepicker/src/Makefile.in
334===================================================================
335--- mozilla.orig/xpfe/components/filepicker/src/Makefile.in 2006-05-22 18:29:32.000000000 +0200
336+++ mozilla/xpfe/components/filepicker/src/Makefile.in 2007-05-10 12:11:27.000000000 +0200
337@@ -47,7 +47,6 @@
338 MODULE = filepicker
339 LIBRARY_NAME = fileview
340 SHORT_LIBNAME = fileview
341-EXPORT_LIBRARY = 1
342 IS_COMPONENT = 1
343 MODULE_NAME = nsFileViewModule
344 MOZILLA_INTERNAL_API = 1
345Index: mozilla/xpfe/components/find/src/Makefile.in
346===================================================================
347--- mozilla.orig/xpfe/components/find/src/Makefile.in 2005-03-18 22:23:46.000000000 +0100
348+++ mozilla/xpfe/components/find/src/Makefile.in 2007-05-10 12:11:27.000000000 +0200
349@@ -45,7 +45,6 @@
350 MODULE = appcomps
351 XPIDL_MODULE = mozfind
352 LIBRARY_NAME = mozfind
353-EXPORT_LIBRARY = 1
354 IS_COMPONENT = 1
355 MODULE_NAME = nsFindComponent
356 LIBXUL_LIBRARY = 1
diff --git a/meta-extras/packages/mozilla/minimo/minimo.png b/meta-extras/packages/mozilla/minimo/minimo.png
new file mode 100644
index 0000000000..f8b2e2192b
--- /dev/null
+++ b/meta-extras/packages/mozilla/minimo/minimo.png
Binary files differ
diff --git a/meta-extras/packages/mozilla/minimo/mozconfig b/meta-extras/packages/mozilla/minimo/mozconfig
new file mode 100644
index 0000000000..393981e9fa
--- /dev/null
+++ b/meta-extras/packages/mozilla/minimo/mozconfig
@@ -0,0 +1,36 @@
1# mozilla/configure: Features and packages:
2
3ac_add_options --enable-application=minimo
4ac_add_options --enable-default-toolkit=gtk2
5ac_add_options --disable-freetype2
6ac_add_options --enable-xft
7ac_add_options --disable-postscript
8ac_add_options --disable-xprint
9ac_add_options --disable-gnomevfs
10ac_add_options --disable-gnomeui
11ac_add_options --disable-jsd
12ac_add_options --disable-plugins
13ac_add_options --disable-view-source
14ac_add_options --disable-accessibility
15ac_add_options --disable-xpinstall
16ac_add_options --enable-single-profile
17ac_add_options --disable-jsloader
18ac_add_options --disable-printing
19ac_add_options --enable-native-uconv
20ac_add_options --enable-plaintext-editor-only
21ac_add_options --disable-xpcom-obsolete
22ac_add_options --disable-pref-extensions
23ac_add_options --disable-extensions
24ac_add_options --enable-image-decoders=png,gif,jpeg
25ac_add_options --disable-mathml
26ac_add_options --disable-installer
27ac_add_options --disable-updater
28ac_add_options --disable-tests
29ac_add_options --enable-optimize=-Os
30ac_add_options --disable-logging
31ac_add_options --enable-strip
32ac_add_options --enable-elf-dynstr-gc
33ac_add_options --disable-shared
34ac_add_options --enable-static
35ac_add_options --disable-profilesharing
36ac_add_options --disable-profilelocking
diff --git a/meta-extras/packages/mozilla/minimo_cvs.bb b/meta-extras/packages/mozilla/minimo_cvs.bb
new file mode 100644
index 0000000000..5eec96d143
--- /dev/null
+++ b/meta-extras/packages/mozilla/minimo_cvs.bb
@@ -0,0 +1,153 @@
1DESCRIPTION = "A minimal version of the Mozilla web browser for mobile devices"
2SECTION = "x11/network"
3LICENSE = "MPL/GPL/LGPL"
4HOMEPAGE = "http://www.mozilla.org/projects/minimo/"
5PRIORITY = "optional"
6
7DEPENDS = "libxrender xt xft fontconfig freetype libidl dbus-glib pango atk gtk+ libidl-native"
8
9CVSSVR = "cvs-mirror.mozilla.org"
10BRTAG = "MOZILLA_1_8_BRANCH"
11MOZDATE = "20070510"
12
13PV = "0.02+cvs${MOZDATE}"
14PR = "r3"
15
16SRC_URI = "cvs://anonymous@${CVSSVR}/cvsroot;module=mozilla;tag=${BRTAG};date=${MOZDATE} \
17 file://minimo.patch;patch=1 \
18 file://bug-322806.diff;patch=1 \
19 file://mozconfig \
20 file://minimo \
21 file://eabi-fix.patch;patch=1 \
22 file://eabi-fix2.patch;patch=1 \
23 file://eabi-fix3.patch;patch=1 \
24 file://minimo.desktop \
25 file://minimo.png"
26
27inherit autotools
28
29S = "${WORKDIR}/mozilla"
30
31export MOZCONFIG = "${WORKDIR}/mozconfig"
32
33export CROSS_COMPILE="1"
34export ac_cv_prog_HOST_CC="${BUILD_CC}"
35export ac_cv_prog_HOST_CFLAGS="${BUILD_CFLAGS}"
36export ac_cv_prog_HOST_CXX="${BUILD_CXX}"
37export ac_cv_prog_HOST_CXXFLAGS="${BUILD_CXXFLAGS}"
38export HOST_LIBIDL_CONFIG = "${STAGING_BINDIR_NATIVE}/libIDL-config-2"
39
40mozdir="${libdir}/mozilla-minimo"
41
42EXTRA_OECONF += "--build=${BUILD_SYS} --host=${BUILD_SYS} --target=${TARGET_SYS} "
43
44do_configure() {
45 cd ${S}
46 oe_runmake -f client.mk CONFIGURE_ARGS="${EXTRA_OECONF}" configure
47 sed -i s:${TARGET_PREFIX}strip:echo:g config/autoconf.mk
48}
49
50do_compile() {
51 cd ${S}
52 oe_runmake -f client.mk build
53}
54
55do_install() {
56 cd ${WORKDIR}
57
58 install -d ${D}${bindir}
59 install -m 0755 minimo ${D}${bindir}
60
61 install -d ${D}${datadir}/applications
62 install -m 0644 minimo.desktop ${D}${datadir}/applications
63
64 install -d ${D}/${datadir}/pixmaps
65 install -m 0644 minimo.png ${D}${datadir}/pixmaps
66
67 cd ${S}
68
69 ./minimo/config/linux_package.sh ${S} ${S}/minimo/config
70
71 cd dist/minimo
72
73 install -d ${D}${mozdir}
74 install -m 0755 minimo ${D}${mozdir}
75 install -m 0755 libfreebl3.so ${D}${mozdir}
76 install -m 0755 libnspr4.so ${D}${mozdir}
77 install -m 0755 libnss3.so ${D}${mozdir}
78 install -m 0755 libnssckbi.so ${D}${mozdir}
79 install -m 0755 libplc4.so ${D}${mozdir}
80 install -m 0755 libplds4.so ${D}${mozdir}
81 install -m 0755 libsmime3.so ${D}${mozdir}
82 install -m 0755 libsoftokn3.so ${D}${mozdir}
83 install -m 0755 libssl3.so ${D}${mozdir}
84
85 install -d ${D}${mozdir}/chrome
86 install -m 0644 chrome/classic.jar ${D}${mozdir}/chrome
87 install -m 0644 chrome/classic.manifest ${D}${mozdir}/chrome
88 install -m 0644 chrome/en-US.jar ${D}${mozdir}/chrome
89 install -m 0644 chrome/en-US.manifest ${D}${mozdir}/chrome
90 install -m 0644 chrome/minimo-skin-vga.jar ${D}${mozdir}/chrome
91 install -m 0644 chrome/minimo-skin-vga.manifest ${D}${mozdir}/chrome
92 install -m 0644 chrome/minimo-skin.jar ${D}${mozdir}/chrome
93 install -m 0644 chrome/minimo-skin.manifest ${D}${mozdir}/chrome
94 install -m 0644 chrome/minimo.jar ${D}${mozdir}/chrome
95 install -m 0644 chrome/minimo.manifest ${D}${mozdir}/chrome
96 install -m 0644 chrome/pippki.jar ${D}${mozdir}/chrome
97 install -m 0644 chrome/pippki.manifest ${D}${mozdir}/chrome
98 install -m 0644 chrome/toolkit.jar ${D}${mozdir}/chrome
99 install -m 0644 chrome/toolkit.manifest ${D}${mozdir}/chrome
100
101 install -d ${D}${mozdir}/components
102 install -m 0644 components/all.xpt ${D}${mozdir}/components
103 install -m 0644 components/nsHelperAppDlg.js ${D}${mozdir}/components
104 install -m 0644 components/nsProgressDialog.js ${D}${mozdir}/components
105
106 install -d ${D}${mozdir}/greprefs
107 install -m 0644 greprefs/all.js ${D}${mozdir}/greprefs
108 install -m 0644 greprefs/security-prefs.js ${D}${mozdir}/greprefs
109
110 install -d ${D}${mozdir}/res
111 install -m 0644 res/forms.css ${D}${mozdir}/res
112 install -m 0644 res/html.css ${D}${mozdir}/res
113 install -m 0644 res/quirk.css ${D}${mozdir}/res
114 install -m 0644 res/ua.css ${D}${mozdir}/res
115 install -m 0644 res/arrow.gif ${D}${mozdir}/res
116 install -m 0644 res/arrowd.gif ${D}${mozdir}/res
117 install -m 0644 res/broken-image.gif ${D}${mozdir}/res
118 install -m 0644 res/loading-image.gif ${D}${mozdir}/res
119 install -m 0644 res/charsetData.properties ${D}${mozdir}/res
120 install -m 0644 res/charsetalias.properties ${D}${mozdir}/res
121 install -m 0644 res/langGroups.properties ${D}${mozdir}/res
122 install -m 0644 res/language.properties ${D}${mozdir}/res
123 install -m 0644 res/unixcharset.properties ${D}${mozdir}/res
124
125 install -d ${D}${mozdir}/res/dtd
126 install -m 0644 res/dtd/xhtml11.dtd ${D}${mozdir}/res/dtd
127
128 install -d ${D}${mozdir}/res/entityTables
129 install -m 0644 res/entityTables/html40Latin1.properties ${D}${mozdir}/res/entityTables
130 install -m 0644 res/entityTables/html40Special.properties ${D}${mozdir}/res/entityTables
131 install -m 0644 res/entityTables/html40Symbols.properties ${D}${mozdir}/res/entityTables
132 install -m 0644 res/entityTables/htmlEntityVersions.properties ${D}${mozdir}/res/entityTables
133 install -m 0644 res/entityTables/transliterate.properties ${D}${mozdir}/res/entityTables
134
135 install -d ${D}${mozdir}/res/fonts
136 install -m 0644 res/fonts/fontEncoding.properties ${D}${mozdir}/res/fonts
137 install -m 0644 res/fonts/pangoFontEncoding.properties ${D}${mozdir}/res/fonts
138
139 install -d ${D}${mozdir}/res/html
140 install -m 0644 res/html/gopher-audio.gif ${D}${mozdir}/res/html
141 install -m 0644 res/html/gopher-binary.gif ${D}${mozdir}/res/html
142 install -m 0644 res/html/gopher-find.gif ${D}${mozdir}/res/html
143 install -m 0644 res/html/gopher-image.gif ${D}${mozdir}/res/html
144 install -m 0644 res/html/gopher-menu.gif ${D}${mozdir}/res/html
145 install -m 0644 res/html/gopher-movie.gif ${D}${mozdir}/res/html
146 install -m 0644 res/html/gopher-sound.gif ${D}${mozdir}/res/html
147 install -m 0644 res/html/gopher-telnet.gif ${D}${mozdir}/res/html
148 install -m 0644 res/html/gopher-text.gif ${D}${mozdir}/res/html
149 install -m 0644 res/html/gopher-unknown.gif ${D}${mozdir}/res/html
150}
151
152FILES_${PN}-dbg += "${libdir}/mozilla-minimo/.debug*"
153FILES_${PN} += "${mozdir}"