diff options
Diffstat (limited to 'meta')
| -rw-r--r-- | meta/packages/mozilla/files/eabi-fix.patch | 66 | ||||
| -rw-r--r-- | meta/packages/mozilla/files/eabi-fix2.patch | 56 | ||||
| -rw-r--r-- | meta/packages/mozilla/files/eabi-fix3.patch | 15 | ||||
| -rw-r--r-- | meta/packages/mozilla/minimo/bug-322806.diff | 13 | ||||
| -rw-r--r-- | meta/packages/mozilla/minimo/host_ldflags_fix.patch | 82 | ||||
| -rw-r--r-- | meta/packages/mozilla/minimo/minimo | 4 | ||||
| -rw-r--r-- | meta/packages/mozilla/minimo/minimo.patch | 567 | ||||
| -rw-r--r-- | meta/packages/mozilla/minimo/minimo.png | bin | 0 -> 4323 bytes | |||
| -rw-r--r-- | meta/packages/mozilla/minimo/mozconfig | 84 | ||||
| -rw-r--r-- | meta/packages/mozilla/minimo_0.016+cvs.bb | 150 |
10 files changed, 931 insertions, 106 deletions
diff --git a/meta/packages/mozilla/files/eabi-fix.patch b/meta/packages/mozilla/files/eabi-fix.patch new file mode 100644 index 0000000000..fd3bb88683 --- /dev/null +++ b/meta/packages/mozilla/files/eabi-fix.patch | |||
| @@ -0,0 +1,66 @@ | |||
| 1 | http://lists.debian.org/debian-arm/2007/05/msg00039.html | ||
| 2 | |||
| 3 | From: Lennert Buytenhek <buytenh@wantstofly.org> | ||
| 4 | |||
| 5 | Hi, | ||
| 6 | |||
| 7 | The reason that building nss (i.e., firefox) would segfault on ARM EABI | ||
| 8 | systems is an assumption about the layout of the jmp_buf structure in | ||
| 9 | the nspr library (which nss depends on) that does hold on old-ABI but | ||
| 10 | no longer holds on EABI. The attached patch fixes this assumption, | ||
| 11 | and fixes the shlibsign segfault during the building of nss (it also | ||
| 12 | fixes a floating point byte order assumption.) | ||
| 13 | |||
| 14 | Looks sane? | ||
| 15 | |||
| 16 | It's of course a stupid idea to depend on a particular layout of the | ||
| 17 | jmp_buf structure in application programs, but oh well. People write | ||
| 18 | ugly 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/packages/mozilla/files/eabi-fix2.patch b/meta/packages/mozilla/files/eabi-fix2.patch new file mode 100644 index 0000000000..5f64e7f796 --- /dev/null +++ b/meta/packages/mozilla/files/eabi-fix2.patch | |||
| @@ -0,0 +1,56 @@ | |||
| 1 | https://bugzilla.mozilla.org/show_bug.cgi?id=369722 | ||
| 2 | |||
| 3 | Index: js/src/jsnum.h | ||
| 4 | =================================================================== | ||
| 5 | RCS file: /cvsroot/mozilla/js/src/jsnum.h,v | ||
| 6 | retrieving revision 3.27 | ||
| 7 | diff -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/packages/mozilla/files/eabi-fix3.patch b/meta/packages/mozilla/files/eabi-fix3.patch new file mode 100644 index 0000000000..8bf8c2f4da --- /dev/null +++ b/meta/packages/mozilla/files/eabi-fix3.patch | |||
| @@ -0,0 +1,15 @@ | |||
| 1 | From: Marcin Juszkiewicz <openembedded@hrw.one.pl> | ||
| 2 | |||
| 3 | Index: 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/packages/mozilla/minimo/bug-322806.diff b/meta/packages/mozilla/minimo/bug-322806.diff new file mode 100644 index 0000000000..e001e3fc67 --- /dev/null +++ b/meta/packages/mozilla/minimo/bug-322806.diff | |||
| @@ -0,0 +1,13 @@ | |||
| 1 | See 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/packages/mozilla/minimo/host_ldflags_fix.patch b/meta/packages/mozilla/minimo/host_ldflags_fix.patch index 888f545e9d..de48d8eb8e 100644 --- a/meta/packages/mozilla/minimo/host_ldflags_fix.patch +++ b/meta/packages/mozilla/minimo/host_ldflags_fix.patch | |||
| @@ -1,62 +1,56 @@ | |||
| 1 | Index: mozilla/nsprpub/config/rules.mk | 1 | diff -Naur mozilla_old/configure mozilla/configure |
| 2 | =================================================================== | 2 | --- mozilla_old/configure 2006-06-03 23:44:17.000000000 +0300 |
| 3 | --- mozilla.orig/nsprpub/config/rules.mk 2005-01-04 21:27:36.000000000 +0000 | 3 | +++ mozilla/configure 2006-06-07 00:16:15.000000000 +0300 |
| 4 | +++ mozilla/nsprpub/config/rules.mk 2005-09-30 11:27:33.000000000 +0000 | 4 | @@ -18755,11 +18755,18 @@ |
| 5 | @@ -87,6 +87,9 @@ | ||
| 6 | CCC=$(HOST_CXX) | ||
| 7 | CFLAGS=$(HOST_CFLAGS) | ||
| 8 | CXXFLAGS=$(HOST_CXXFLAGS) | ||
| 9 | +LDFLAGS=$(HOST_LDFLAGS) | ||
| 10 | +RANLIB=$(HOST_RANLIB) | ||
| 11 | +AR=$(HOST_AR) | ||
| 12 | endif | ||
| 13 | endif | ||
| 14 | endif | ||
| 15 | Index: mozilla/configure.in | ||
| 16 | =================================================================== | ||
| 17 | --- mozilla.orig/configure.in 2005-03-30 17:57:38.000000000 +0000 | ||
| 18 | +++ mozilla/configure.in 2005-09-30 11:36:44.000000000 +0000 | ||
| 19 | @@ -5612,13 +5612,18 @@ | ||
| 20 | fi | ||
| 21 | 5 | ||
| 22 | if test -n "$CROSS_COMPILE"; then | 6 | if test -n "$CROSS_COMPILE"; then |
| 23 | - if test -z "$HOST_LIBIDL_CONFIG"; then | 7 | if test -z "$HOST_LIBIDL_CONFIG"; then |
| 24 | + if test -z "$HOST_LIBIDL_CONFIG"; then | 8 | + echo "HOST_LIBIDL_CONFIG not defined" |
| 25 | + AC_MSG_WARN([HOST_LIBIDL_CONFIG not defined]) | ||
| 26 | HOST_LIBIDL_CONFIG="$LIBIDL_CONFIG" | 9 | HOST_LIBIDL_CONFIG="$LIBIDL_CONFIG" |
| 27 | fi | 10 | fi |
| 28 | if test -n "$HOST_LIBIDL_CONFIG"; then | 11 | - if test -n "$HOST_LIBIDL_CONFIG" && test "$HOST_LIBIDL_CONFIG" != "no"; then |
| 29 | + AC_MSG_WARN([using $HOST_LIBIDL_CONFIG as config for libIDL on host]) | 12 | + if test -n "$HOST_LIBIDL_CONFIG" && test "$HOST_LIBIDL_CONFIG" != "no" && test -n "$HOST_PKG_CONFIG_PATH"; then |
| 13 | + echo "using $HOST_LIBIDL_CONFIG as HOST_LIBIDL_CONFIG with HOST_PKG_CONFIG_PATH=$HOST_PKG_CONFIG_PATH" | ||
| 14 | + _SAVE_PKG_CONFIG_PATH=$PKG_CONFIG_PATH | ||
| 15 | + PKG_CONFIG_PATH=$HOST_PKG_CONFIG_PATH | ||
| 30 | HOST_LIBIDL_CFLAGS=`${HOST_LIBIDL_CONFIG} --cflags` | 16 | HOST_LIBIDL_CFLAGS=`${HOST_LIBIDL_CONFIG} --cflags` |
| 31 | + AC_MSG_WARN([HOST_LIBIDL_CFLAGS=$HOST_LIBIDL_CFLAGS]) | 17 | + echo "HOST_LIBIDL_CFLAGS = $HOST_LIBIDL_CFLAGS" |
| 32 | HOST_LIBIDL_LIBS=`${HOST_LIBIDL_CONFIG} --libs` | 18 | HOST_LIBIDL_LIBS=`${HOST_LIBIDL_CONFIG} --libs` |
| 33 | + AC_MSG_WARN([HOST_LIBIDL_LIBS=$HOST_LIBIDL_LIBS]) | 19 | + echo "HOST_LIBIDL_LIBS = $HOST_LIBIDL_LIBS" |
| 20 | + PKG_CONFIG_PATH=$_SAVE_PKG_CONFIG_PATH | ||
| 34 | else | 21 | else |
| 35 | + AC_MSG_WARN([no config for libIDL found, using LIBIDL_CFLAGS and LIBIDL_LIBS]) | ||
| 36 | HOST_LIBIDL_CFLAGS="$LIBIDL_CFLAGS" | 22 | HOST_LIBIDL_CFLAGS="$LIBIDL_CFLAGS" |
| 37 | HOST_LIBIDL_LIBS="$LIBIDL_LIBS" | 23 | HOST_LIBIDL_LIBS="$LIBIDL_LIBS" |
| 38 | fi | 24 | diff -Naur mozilla_old/configure.in mozilla/configure.in |
| 39 | Index: mozilla/configure | 25 | --- mozilla_old/configure.in 2006-06-03 23:35:20.000000000 +0300 |
| 40 | =================================================================== | 26 | +++ mozilla/configure.in 2006-06-07 00:10:26.000000000 +0300 |
| 41 | --- mozilla.orig/configure 2005-03-30 17:58:47.000000000 +0000 | 27 | @@ -6870,12 +6870,17 @@ |
| 42 | +++ mozilla/configure 2005-09-30 11:38:36.000000000 +0000 | ||
| 43 | @@ -16572,11 +16572,18 @@ | ||
| 44 | 28 | ||
| 45 | if test -n "$CROSS_COMPILE"; then | 29 | if test -n "$CROSS_COMPILE"; then |
| 46 | if test -z "$HOST_LIBIDL_CONFIG"; then | 30 | if test -z "$HOST_LIBIDL_CONFIG"; then |
| 47 | + echo "HOST_LIBIDL_CONFIG nto defined" | 31 | + AC_MSG_WARN([HOST_LIBIDL_CONFIG not defined]) |
| 48 | HOST_LIBIDL_CONFIG="$LIBIDL_CONFIG" | 32 | HOST_LIBIDL_CONFIG="$LIBIDL_CONFIG" |
| 49 | fi | 33 | fi |
| 50 | - if test -n "$HOST_LIBIDL_CONFIG"; then | 34 | if test -n "$HOST_LIBIDL_CONFIG" && test "$HOST_LIBIDL_CONFIG" != "no"; then |
| 51 | + if test -n "$HOST_LIBIDL_CONFIG" && test -n "$HOST_PKG_CONFIG_PATH"; then | 35 | + AC_MSG_WARN([using $HOST_LIBIDL_CONFIG as config for libIDL on host]) |
| 52 | + echo "using $HOST_LIBIDL_CONFIG as HOST_LIBIDL_CONFIG with HOST_PKG_CONFIG_PATH=$HOST_PKG_CONFIG_PATH" | ||
| 53 | + _SAVE_PKG_CONFIG_PATH=$PKG_CONFIG_PATH | ||
| 54 | + PKG_CONFIG_PATH=$HOST_PKG_CONFIG_PATH | ||
| 55 | HOST_LIBIDL_CFLAGS=`${HOST_LIBIDL_CONFIG} --cflags` | 36 | HOST_LIBIDL_CFLAGS=`${HOST_LIBIDL_CONFIG} --cflags` |
| 56 | + echo "HOST_LIBIDL_CFLAGS = $HOST_LIBIDL_CFLAGS" | 37 | + AC_MSG_WARN([HOST_LIBIDL_CFLAGS=$HOST_LIBIDL_CFLAGS]) |
| 57 | HOST_LIBIDL_LIBS=`${HOST_LIBIDL_CONFIG} --libs` | 38 | HOST_LIBIDL_LIBS=`${HOST_LIBIDL_CONFIG} --libs` |
| 58 | + echo "HOST_LIBIDL_LIBS = $HOST_LIBIDL_LIBS" | 39 | + AC_MSG_WARN([HOST_LIBIDL_LIBS=$HOST_LIBIDL_LIBS]) |
| 59 | + PKG_CONFIG_PATH=$_SAVE_PKG_CONFIG_PATH | ||
| 60 | else | 40 | else |
| 41 | + AC_MSG_WARN([no config for libIDL found, using LIBIDL_CFLAGS and LIBIDL_LIBS]) | ||
| 61 | HOST_LIBIDL_CFLAGS="$LIBIDL_CFLAGS" | 42 | HOST_LIBIDL_CFLAGS="$LIBIDL_CFLAGS" |
| 62 | HOST_LIBIDL_LIBS="$LIBIDL_LIBS" | 43 | HOST_LIBIDL_LIBS="$LIBIDL_LIBS" |
| 44 | fi | ||
| 45 | diff -Naur mozilla_old/nsprpub/config/rules.mk mozilla/nsprpub/config/rules.mk | ||
| 46 | --- mozilla_old/nsprpub/config/rules.mk 2006-02-22 04:33:33.000000000 +0200 | ||
| 47 | +++ mozilla/nsprpub/config/rules.mk 2006-06-07 00:07:06.000000000 +0300 | ||
| 48 | @@ -90,6 +90,8 @@ | ||
| 49 | CFLAGS=$(HOST_CFLAGS) | ||
| 50 | CXXFLAGS=$(HOST_CXXFLAGS) | ||
| 51 | LDFLAGS=$(HOST_LDFLAGS) | ||
| 52 | +RANLIB=$(HOST_RANLIB) | ||
| 53 | +AR=$(HOST_AR) | ||
| 54 | endif | ||
| 55 | endif | ||
| 56 | endif | ||
diff --git a/meta/packages/mozilla/minimo/minimo b/meta/packages/mozilla/minimo/minimo new file mode 100644 index 0000000000..d130173adf --- /dev/null +++ b/meta/packages/mozilla/minimo/minimo | |||
| @@ -0,0 +1,4 @@ | |||
| 1 | #!/bin/sh | ||
| 2 | export MOZILLA_FIVE_HOME=/usr/lib/mozilla-minimo | ||
| 3 | export LD_LIBRARY_PATH=${MOZILLA_FIVE_HOME} | ||
| 4 | exec ${MOZILLA_FIVE_HOME}/minimo "$@" | ||
diff --git a/meta/packages/mozilla/minimo/minimo.patch b/meta/packages/mozilla/minimo/minimo.patch new file mode 100644 index 0000000000..a1f9291167 --- /dev/null +++ b/meta/packages/mozilla/minimo/minimo.patch | |||
| @@ -0,0 +1,567 @@ | |||
| 1 | Index: mozilla/content/html/content/src/nsFormSubmission.cpp | ||
| 2 | =================================================================== | ||
| 3 | RCS file: /cvsroot/mozilla/content/html/content/src/nsFormSubmission.cpp,v | ||
| 4 | retrieving revision 1.46 | ||
| 5 | diff --context=3 -r1.46 nsFormSubmission.cpp | ||
| 6 | *** mozilla/content/html/content/src/nsFormSubmission.cpp 13 Jul 2005 16:55:59 -0000 1.46 | ||
| 7 | --- mozilla/content/html/content/src/nsFormSubmission.cpp 21 Jul 2006 00:27:14 -0000 | ||
| 8 | *************** | ||
| 9 | *** 1315,1325 **** | ||
| 10 | nsresult rv = NS_OK; | ||
| 11 | |||
| 12 | nsCAutoString charset(aCharset); | ||
| 13 | - // canonical name is passed so that we just have to check against | ||
| 14 | - // *our* canonical names listed in charsetaliases.properties | ||
| 15 | - if (charset.EqualsLiteral("ISO-8859-1")) { | ||
| 16 | - charset.AssignLiteral("windows-1252"); | ||
| 17 | - } | ||
| 18 | |||
| 19 | // use UTF-8 for UTF-16* and UTF-32* (per WHATWG and existing practice of | ||
| 20 | // MS IE/Opera). | ||
| 21 | --- 1315,1320 ---- | ||
| 22 | Index: mozilla/embedding/base/Makefile.in | ||
| 23 | =================================================================== | ||
| 24 | RCS file: /cvsroot/mozilla/embedding/base/Makefile.in,v | ||
| 25 | retrieving revision 1.34.8.2 | ||
| 26 | diff --context=3 -r1.34.8.2 Makefile.in | ||
| 27 | *** mozilla/embedding/base/Makefile.in 14 Feb 2006 05:28:31 -0000 1.34.8.2 | ||
| 28 | --- mozilla/embedding/base/Makefile.in 21 Jul 2006 00:27:14 -0000 | ||
| 29 | *************** | ||
| 30 | *** 43,48 **** | ||
| 31 | --- 43,49 ---- | ||
| 32 | |||
| 33 | MODULE = embed_base | ||
| 34 | LIBRARY_NAME = embed_base_s | ||
| 35 | + EXPORT_LIBRARY = 1 | ||
| 36 | XPIDL_MODULE = embed_base | ||
| 37 | |||
| 38 | include $(DEPTH)/config/autoconf.mk | ||
| 39 | Index: mozilla/js/src/Makefile.in | ||
| 40 | =================================================================== | ||
| 41 | RCS file: /cvsroot/mozilla/js/src/Makefile.in,v | ||
| 42 | retrieving revision 3.95.4.4 | ||
| 43 | diff --context=3 -r3.95.4.4 Makefile.in | ||
| 44 | *** mozilla/js/src/Makefile.in 7 Jul 2006 02:12:02 -0000 3.95.4.4 | ||
| 45 | --- mozilla/js/src/Makefile.in 21 Jul 2006 00:27:14 -0000 | ||
| 46 | *************** | ||
| 47 | *** 46,51 **** | ||
| 48 | --- 46,52 ---- | ||
| 49 | |||
| 50 | MODULE = js | ||
| 51 | LIBRARY_NAME = mozjs | ||
| 52 | + EXPORT_LIBRARY = 1 | ||
| 53 | LIB_IS_C_ONLY = 1 | ||
| 54 | GRE_MODULE = 1 | ||
| 55 | |||
| 56 | Index: mozilla/minimo/Makefile.in | ||
| 57 | =================================================================== | ||
| 58 | RCS file: /cvsroot/mozilla/minimo/Makefile.in,v | ||
| 59 | retrieving revision 1.1.2.2 | ||
| 60 | diff --context=3 -r1.1.2.2 Makefile.in | ||
| 61 | *** mozilla/minimo/Makefile.in 29 Jun 2006 06:11:30 -0000 1.1.2.2 | ||
| 62 | --- mozilla/minimo/Makefile.in 21 Jul 2006 00:27:14 -0000 | ||
| 63 | *************** | ||
| 64 | *** 41,46 **** | ||
| 65 | |||
| 66 | include $(DEPTH)/config/autoconf.mk | ||
| 67 | |||
| 68 | ! DIRS = config components chrome locales customization base | ||
| 69 | |||
| 70 | include $(topsrcdir)/config/rules.mk | ||
| 71 | --- 41,46 ---- | ||
| 72 | |||
| 73 | include $(DEPTH)/config/autoconf.mk | ||
| 74 | |||
| 75 | ! DIRS = config chrome locales customization base | ||
| 76 | |||
| 77 | include $(topsrcdir)/config/rules.mk | ||
| 78 | Index: mozilla/minimo/base/Makefile.in | ||
| 79 | =================================================================== | ||
| 80 | RCS file: /cvsroot/mozilla/minimo/base/Makefile.in,v | ||
| 81 | retrieving revision 1.3.2.7 | ||
| 82 | diff --context=3 -r1.3.2.7 Makefile.in | ||
| 83 | *** mozilla/minimo/base/Makefile.in 18 Apr 2006 21:04:38 -0000 1.3.2.7 | ||
| 84 | --- mozilla/minimo/base/Makefile.in 21 Jul 2006 00:27:14 -0000 | ||
| 85 | *************** | ||
| 86 | *** 95,101 **** | ||
| 87 | |||
| 88 | # this should move into the toolkit! | ||
| 89 | LOCAL_INCLUDES = -I$(srcdir) -I$(topsrcdir)/xpfe/browser/src/ | ||
| 90 | - CPPSRCS += nsBrowserStatusFilter.cpp nsBrowserInstance.cpp | ||
| 91 | |||
| 92 | ifdef WINCE | ||
| 93 | RCINCLUDE = wince/SplashScreen.rc | ||
| 94 | --- 95,100 ---- | ||
| 95 | *************** | ||
| 96 | *** 139,148 **** | ||
| 97 | endif | ||
| 98 | |||
| 99 | |||
| 100 | - FINAL_LINK_COMPS=$(topsrcdir)/minimo/base/$(FINAL_PLATFORM)/minimo-link-comps | ||
| 101 | - FINAL_LINK_COMP_NAMES=$(topsrcdir)/minimo/base/$(FINAL_PLATFORM)/minimo-link-names | ||
| 102 | - FINAL_LINK_LIBS=$(topsrcdir)/minimo/base/$(FINAL_PLATFORM)/minimo-link-libs | ||
| 103 | - | ||
| 104 | include $(topsrcdir)/config/static-config.mk | ||
| 105 | |||
| 106 | EXTRA_DEPS += $(STATIC_EXTRA_DEPS) | ||
| 107 | --- 138,143 ---- | ||
| 108 | *************** | ||
| 109 | *** 176,189 **** | ||
| 110 | # (same as in mozilla/js/src/Makefile.in) | ||
| 111 | ifdef WINCE | ||
| 112 | LDFLAGS += -OPT:NOICF | ||
| 113 | endif | ||
| 114 | |||
| 115 | - export:: | ||
| 116 | - $(NSINSTALL) $(topsrcdir)/xpfe/browser/src/nsBrowserStatusFilter.cpp . | ||
| 117 | - $(NSINSTALL) $(topsrcdir)/xpfe/browser/src/nsBrowserInstance.cpp . | ||
| 118 | - | ||
| 119 | - | ||
| 120 | - GARBAGE += nsBrowserStatusFilter.cpp nsBrowserInstance.cpp | ||
| 121 | |||
| 122 | ifdef WINCE | ||
| 123 | package:: | ||
| 124 | --- 171,181 ---- | ||
| 125 | # (same as in mozilla/js/src/Makefile.in) | ||
| 126 | ifdef WINCE | ||
| 127 | LDFLAGS += -OPT:NOICF | ||
| 128 | + else | ||
| 129 | + # Hack to work around libxpcom_core.a / libunicharutil_s.a link order problem. | ||
| 130 | + LDFLAGS += -u NS_StringGetData_P -u NS_StringGetMutableData_P | ||
| 131 | endif | ||
| 132 | |||
| 133 | |||
| 134 | ifdef WINCE | ||
| 135 | package:: | ||
| 136 | Index: mozilla/minimo/base/Minimo.cpp | ||
| 137 | =================================================================== | ||
| 138 | RCS file: /cvsroot/mozilla/minimo/base/Minimo.cpp,v | ||
| 139 | retrieving revision 1.1.2.11 | ||
| 140 | diff --context=3 -r1.1.2.11 Minimo.cpp | ||
| 141 | *** mozilla/minimo/base/Minimo.cpp 11 Jul 2006 19:37:05 -0000 1.1.2.11 | ||
| 142 | --- mozilla/minimo/base/Minimo.cpp 21 Jul 2006 00:27:15 -0000 | ||
| 143 | *************** | ||
| 144 | *** 781,789 **** | ||
| 145 | CreateListenerWindow(); | ||
| 146 | #endif | ||
| 147 | |||
| 148 | ! #ifdef MOZ_WIDGET_GTK2 | ||
| 149 | gtk_set_locale(); | ||
| 150 | gtk_init(&argc, &argv); | ||
| 151 | #endif | ||
| 152 | |||
| 153 | #ifdef HACKY_PRE_LOAD_LIBRARY | ||
| 154 | --- 781,794 ---- | ||
| 155 | CreateListenerWindow(); | ||
| 156 | #endif | ||
| 157 | |||
| 158 | ! #if defined(MOZ_WIDGET_GTK) || defined(MOZ_WIDGET_GTK2) | ||
| 159 | ! #if defined(MOZ_WIDGET_GTK) | ||
| 160 | gtk_set_locale(); | ||
| 161 | + #endif | ||
| 162 | gtk_init(&argc, &argv); | ||
| 163 | + | ||
| 164 | + gtk_widget_set_default_visual(gdk_rgb_get_visual()); | ||
| 165 | + gtk_widget_set_default_colormap(gdk_rgb_get_cmap()); | ||
| 166 | #endif | ||
| 167 | |||
| 168 | #ifdef HACKY_PRE_LOAD_LIBRARY | ||
| 169 | Index: mozilla/minimo/base/SplashScreen.cpp | ||
| 170 | =================================================================== | ||
| 171 | RCS file: /cvsroot/mozilla/minimo/base/SplashScreen.cpp,v | ||
| 172 | retrieving revision 1.1.2.3 | ||
| 173 | diff --context=3 -r1.1.2.3 SplashScreen.cpp | ||
| 174 | *** mozilla/minimo/base/SplashScreen.cpp 11 Jul 2006 18:44:17 -0000 1.1.2.3 | ||
| 175 | --- mozilla/minimo/base/SplashScreen.cpp 21 Jul 2006 00:27:15 -0000 | ||
| 176 | *************** | ||
| 177 | *** 180,188 **** | ||
| 178 | --- 180,203 ---- | ||
| 179 | void KillSplashScreen() {} | ||
| 180 | void GetScreenSize(unsigned long* x, unsigned long* y) | ||
| 181 | { | ||
| 182 | + #ifdef MOZ_WIDGET_GTK2 | ||
| 183 | + GdkDisplay* display = gdk_display_get_default(); | ||
| 184 | + if (display != NULL) | ||
| 185 | + { | ||
| 186 | + GdkScreen *screen; | ||
| 187 | + screen = gdk_display_get_default_screen(display); | ||
| 188 | + *x = gdk_screen_get_width(screen); | ||
| 189 | + *y = gdk_screen_get_height(screen); | ||
| 190 | + } | ||
| 191 | + else | ||
| 192 | + { | ||
| 193 | + #endif | ||
| 194 | // we need to figure this out. | ||
| 195 | *x = 240; | ||
| 196 | *y = 320; | ||
| 197 | + #ifdef MOZ_WIDGET_GTK2 | ||
| 198 | + } | ||
| 199 | + #endif | ||
| 200 | } | ||
| 201 | |||
| 202 | |||
| 203 | Index: mozilla/minimo/chrome/content/minimo.js | ||
| 204 | =================================================================== | ||
| 205 | RCS file: /cvsroot/mozilla/minimo/chrome/content/minimo.js,v | ||
| 206 | retrieving revision 1.9.2.90 | ||
| 207 | diff --context=3 -r1.9.2.90 minimo.js | ||
| 208 | *** mozilla/minimo/chrome/content/minimo.js 11 Jul 2006 19:37:04 -0000 1.9.2.90 | ||
| 209 | --- mozilla/minimo/chrome/content/minimo.js 21 Jul 2006 00:27:16 -0000 | ||
| 210 | *************** | ||
| 211 | *** 1313,1319 **** | ||
| 212 | 43 const FIND_LINKS = 2; | ||
| 213 | http://lxr.mozilla.org/mozilla/source/toolkit/components/typeaheadfind/content/findBar.js | ||
| 214 | */ | ||
| 215 | ! gBrowser.fastFind.find(vQuery,0); | ||
| 216 | } | ||
| 217 | } catch (e) { | ||
| 218 | onErrorHandler(e); | ||
| 219 | --- 1313,1319 ---- | ||
| 220 | 43 const FIND_LINKS = 2; | ||
| 221 | http://lxr.mozilla.org/mozilla/source/toolkit/components/typeaheadfind/content/findBar.js | ||
| 222 | */ | ||
| 223 | ! gBrowser.fastFind.find(vQuery,0,this.mHasFocus); | ||
| 224 | } | ||
| 225 | } catch (e) { | ||
| 226 | onErrorHandler(e); | ||
| 227 | *************** | ||
| 228 | *** 1324,1330 **** | ||
| 229 | |||
| 230 | function DoBrowserFindNext() { | ||
| 231 | try { | ||
| 232 | ! gBrowser.fastFind.findNext(); | ||
| 233 | } catch (e) { | ||
| 234 | onErrorHandler(e); | ||
| 235 | } | ||
| 236 | --- 1324,1330 ---- | ||
| 237 | |||
| 238 | function DoBrowserFindNext() { | ||
| 239 | try { | ||
| 240 | ! gBrowser.fastFind.findNext(this.mHasFocus); | ||
| 241 | } catch (e) { | ||
| 242 | onErrorHandler(e); | ||
| 243 | } | ||
| 244 | Index: mozilla/minimo/config/linux_package.sh | ||
| 245 | =================================================================== | ||
| 246 | RCS file: /cvsroot/mozilla/minimo/config/linux_package.sh,v | ||
| 247 | retrieving revision 1.8.2.3 | ||
| 248 | diff --context=3 -r1.8.2.3 linux_package.sh | ||
| 249 | *** mozilla/minimo/config/linux_package.sh 30 Jun 2006 16:35:19 -0000 1.8.2.3 | ||
| 250 | --- mozilla/minimo/config/linux_package.sh 21 Jul 2006 00:27:16 -0000 | ||
| 251 | *************** | ||
| 252 | *** 29,37 **** | ||
| 253 | cp -pRL bin/libnssckbi.so minimo | ||
| 254 | cp -pRL bin/libsmime3.so minimo | ||
| 255 | cp -pRL bin/libsoftokn3.so minimo | ||
| 256 | - cp -pRL bin/libsoftokn3.chk minimo | ||
| 257 | cp -pRL bin/libfreebl3.so minimo | ||
| 258 | - cp -pRL bin/libfreebl3.chk minimo | ||
| 259 | cp -pRL bin/libssl3.so minimo | ||
| 260 | |||
| 261 | mkdir -p minimo/chrome | ||
| 262 | --- 29,35 ---- | ||
| 263 | *************** | ||
| 264 | *** 62,69 **** | ||
| 265 | cp -pRL bin/components/nsHelperAppDlg.js minimo/components | ||
| 266 | cp -pRL bin/components/nsProgressDialog.js minimo/components | ||
| 267 | |||
| 268 | - cp -pRL bin/extensions/spatial-navigation@extensions.mozilla.org/components/* minimo/components | ||
| 269 | - | ||
| 270 | mkdir -p minimo/greprefs | ||
| 271 | cp -pRL bin/greprefs/* minimo/greprefs | ||
| 272 | |||
| 273 | --- 60,65 ---- | ||
| 274 | *************** | ||
| 275 | *** 80,86 **** | ||
| 276 | |||
| 277 | echo Linking XPT files. | ||
| 278 | |||
| 279 | ! bin/xpt_link minimo/components/all.xpt bin/components/*.xpt | ||
| 280 | |||
| 281 | echo Chewing on chrome | ||
| 282 | |||
| 283 | --- 76,82 ---- | ||
| 284 | |||
| 285 | echo Linking XPT files. | ||
| 286 | |||
| 287 | ! host/bin/host_xpt_link minimo/components/all.xpt bin/components/*.xpt | ||
| 288 | |||
| 289 | echo Chewing on chrome | ||
| 290 | |||
| 291 | Index: mozilla/profile/dirserviceprovider/src/Makefile.in | ||
| 292 | =================================================================== | ||
| 293 | RCS file: /cvsroot/mozilla/profile/dirserviceprovider/src/Makefile.in,v | ||
| 294 | retrieving revision 1.7 | ||
| 295 | diff --context=3 -r1.7 Makefile.in | ||
| 296 | *** mozilla/profile/dirserviceprovider/src/Makefile.in 6 Apr 2005 03:35:21 -0000 1.7 | ||
| 297 | --- mozilla/profile/dirserviceprovider/src/Makefile.in 21 Jul 2006 00:27:16 -0000 | ||
| 298 | *************** | ||
| 299 | *** 44,49 **** | ||
| 300 | --- 44,50 ---- | ||
| 301 | |||
| 302 | MODULE = profdirserviceprovider | ||
| 303 | LIBRARY_NAME = profdirserviceprovider_s | ||
| 304 | + EXPORT_LIBRARY = 1 | ||
| 305 | MOZILLA_INTERNAL_API = 1 | ||
| 306 | |||
| 307 | REQUIRES = xpcom \ | ||
| 308 | Index: mozilla/security/coreconf/Linux.mk | ||
| 309 | =================================================================== | ||
| 310 | RCS file: /cvsroot/mozilla/security/coreconf/Linux.mk,v | ||
| 311 | retrieving revision 1.18.18.1 | ||
| 312 | diff --context=3 -r1.18.18.1 Linux.mk | ||
| 313 | *** mozilla/security/coreconf/Linux.mk 3 Feb 2006 22:26:36 -0000 1.18.18.1 | ||
| 314 | --- mozilla/security/coreconf/Linux.mk 21 Jul 2006 00:27:16 -0000 | ||
| 315 | *************** | ||
| 316 | *** 117,122 **** | ||
| 317 | --- 117,126 ---- | ||
| 318 | OS_REL_CFLAGS = -DLINUX1_2 -D_XOPEN_SOURCE | ||
| 319 | CPU_ARCH = mips | ||
| 320 | else | ||
| 321 | + ifeq ($(OS_TEST),arm) | ||
| 322 | + OS_REL_CFLAGS = -DLINUX1_2 -D_XOPEN_SOURCE | ||
| 323 | + CPU_ARCH = arm | ||
| 324 | + else | ||
| 325 | OS_REL_CFLAGS = -DLINUX1_2 -Di386 -D_XOPEN_SOURCE | ||
| 326 | CPU_ARCH = x86 | ||
| 327 | endif | ||
| 328 | *************** | ||
| 329 | *** 133,138 **** | ||
| 330 | --- 137,143 ---- | ||
| 331 | endif | ||
| 332 | endif | ||
| 333 | endif | ||
| 334 | + endif | ||
| 335 | |||
| 336 | |||
| 337 | LIBC_TAG = _glibc | ||
| 338 | Index: mozilla/security/coreconf/arch.mk | ||
| 339 | =================================================================== | ||
| 340 | RCS file: /cvsroot/mozilla/security/coreconf/arch.mk,v | ||
| 341 | retrieving revision 1.17.14.2 | ||
| 342 | diff --context=3 -r1.17.14.2 arch.mk | ||
| 343 | *** mozilla/security/coreconf/arch.mk 3 Feb 2006 22:26:36 -0000 1.17.14.2 | ||
| 344 | --- mozilla/security/coreconf/arch.mk 21 Jul 2006 00:27:16 -0000 | ||
| 345 | *************** | ||
| 346 | *** 60,77 **** | ||
| 347 | 64BIT_TAG= | ||
| 348 | endif | ||
| 349 | |||
| 350 | ! OS_ARCH := $(subst /,_,$(shell uname -s)) | ||
| 351 | |||
| 352 | # | ||
| 353 | # Attempt to differentiate between sparc and x86 Solaris | ||
| 354 | # | ||
| 355 | |||
| 356 | ! OS_TEST := $(shell uname -m) | ||
| 357 | ! ifeq ($(OS_TEST),i86pc) | ||
| 358 | ! OS_RELEASE := $(shell uname -r)_$(OS_TEST) | ||
| 359 | ! else | ||
| 360 | ! OS_RELEASE := $(shell uname -r) | ||
| 361 | ! endif | ||
| 362 | |||
| 363 | # | ||
| 364 | # Force the IRIX64 machines to use IRIX. | ||
| 365 | --- 60,73 ---- | ||
| 366 | 64BIT_TAG= | ||
| 367 | endif | ||
| 368 | |||
| 369 | ! OS_ARCH := Linux | ||
| 370 | |||
| 371 | # | ||
| 372 | # Attempt to differentiate between sparc and x86 Solaris | ||
| 373 | # | ||
| 374 | |||
| 375 | ! OS_TEST := arm | ||
| 376 | ! OS_RELEASE := 2.6 | ||
| 377 | |||
| 378 | # | ||
| 379 | # Force the IRIX64 machines to use IRIX. | ||
| 380 | Index: mozilla/toolkit/components/build/Makefile.in | ||
| 381 | =================================================================== | ||
| 382 | RCS file: /cvsroot/mozilla/toolkit/components/build/Makefile.in,v | ||
| 383 | retrieving revision 1.24.2.10 | ||
| 384 | diff --context=3 -r1.24.2.10 Makefile.in | ||
| 385 | *** mozilla/toolkit/components/build/Makefile.in 13 Jul 2006 20:08:29 -0000 1.24.2.10 | ||
| 386 | --- mozilla/toolkit/components/build/Makefile.in 21 Jul 2006 00:27:17 -0000 | ||
| 387 | *************** | ||
| 388 | *** 112,118 **** | ||
| 389 | $(NULL) | ||
| 390 | |||
| 391 | SHARED_LIBRARY_LIBS = \ | ||
| 392 | - ../startup/src/$(LIB_PREFIX)appstartup_s.$(LIB_SUFFIX) \ | ||
| 393 | $(NULL) | ||
| 394 | |||
| 395 | ifdef MOZ_XPINSTALL | ||
| 396 | --- 112,117 ---- | ||
| 397 | Index: mozilla/toolkit/components/startup/src/Makefile.in | ||
| 398 | =================================================================== | ||
| 399 | RCS file: /cvsroot/mozilla/toolkit/components/startup/src/Makefile.in,v | ||
| 400 | retrieving revision 1.7 | ||
| 401 | diff --context=3 -r1.7 Makefile.in | ||
| 402 | *** mozilla/toolkit/components/startup/src/Makefile.in 27 Jul 2005 20:42:44 -0000 1.7 | ||
| 403 | --- mozilla/toolkit/components/startup/src/Makefile.in 21 Jul 2006 00:27:17 -0000 | ||
| 404 | *************** | ||
| 405 | *** 43,48 **** | ||
| 406 | --- 43,49 ---- | ||
| 407 | |||
| 408 | MODULE = toolkitcomps | ||
| 409 | LIBRARY_NAME = appstartup_s | ||
| 410 | + EXPORT_LIBRARY = 1 | ||
| 411 | FORCE_STATIC_LIB = 1 | ||
| 412 | LIBXUL_LIBRARY = 1 | ||
| 413 | |||
| 414 | Index: mozilla/toolkit/xre/Makefile.in | ||
| 415 | =================================================================== | ||
| 416 | RCS file: /cvsroot/mozilla/toolkit/xre/Makefile.in,v | ||
| 417 | retrieving revision 1.48.2.3 | ||
| 418 | diff --context=3 -r1.48.2.3 Makefile.in | ||
| 419 | *** mozilla/toolkit/xre/Makefile.in 30 Sep 2005 19:52:44 -0000 1.48.2.3 | ||
| 420 | --- mozilla/toolkit/xre/Makefile.in 21 Jul 2006 00:27:17 -0000 | ||
| 421 | *************** | ||
| 422 | *** 45,51 **** | ||
| 423 | |||
| 424 | MODULE = xulapp | ||
| 425 | LIBRARY_NAME = xulapp_s | ||
| 426 | - EXPORT_LIBRARY = 1 | ||
| 427 | LIBXUL_LIBRARY = 1 | ||
| 428 | |||
| 429 | REQUIRES = \ | ||
| 430 | --- 45,50 ---- | ||
| 431 | *************** | ||
| 432 | *** 176,189 **** | ||
| 433 | |||
| 434 | include $(topsrcdir)/config/rules.mk | ||
| 435 | |||
| 436 | - ifdef BUILD_STATIC_LIBS | ||
| 437 | - export:: | ||
| 438 | - @$(PERL) -I$(MOZILLA_DIR)/config $(MOZILLA_DIR)/config/build-list.pl $(FINAL_LINK_COMP_NAMES) Apprunner | ||
| 439 | - # embedding/browser/gtk/src/Makefile.in sucks! we need to add an empty line to | ||
| 440 | - # FINAL_LINK_COMPS to keep the two lists in sync :-( | ||
| 441 | - @$(PERL) -I$(MOZILLA_DIR)/config $(MOZILLA_DIR)/config/build-list.pl $(FINAL_LINK_COMPS) "" | ||
| 442 | - endif | ||
| 443 | - | ||
| 444 | LOCAL_INCLUDES += \ | ||
| 445 | -I$(srcdir) \ | ||
| 446 | -I$(topsrcdir)/xpfe/bootstrap \ | ||
| 447 | --- 175,180 ---- | ||
| 448 | Index: mozilla/xpcom/build/Makefile.in | ||
| 449 | =================================================================== | ||
| 450 | RCS file: /cvsroot/mozilla/xpcom/build/Makefile.in,v | ||
| 451 | retrieving revision 1.90.2.2 | ||
| 452 | diff --context=3 -r1.90.2.2 Makefile.in | ||
| 453 | *** mozilla/xpcom/build/Makefile.in 29 Jan 2006 16:51:02 -0000 1.90.2.2 | ||
| 454 | --- mozilla/xpcom/build/Makefile.in 21 Jul 2006 00:27:17 -0000 | ||
| 455 | *************** | ||
| 456 | *** 61,67 **** | ||
| 457 | endif | ||
| 458 | |||
| 459 | # Do not set EXPORT_LIBRARY as we do not want xpcom in the static libs list | ||
| 460 | ! #EXPORT_LIBRARY = 1 | ||
| 461 | GRE_MODULE = 1 | ||
| 462 | MOZILLA_INTERNAL_API = 1 | ||
| 463 | |||
| 464 | --- 61,67 ---- | ||
| 465 | endif | ||
| 466 | |||
| 467 | # Do not set EXPORT_LIBRARY as we do not want xpcom in the static libs list | ||
| 468 | ! EXPORT_LIBRARY = 1 | ||
| 469 | GRE_MODULE = 1 | ||
| 470 | MOZILLA_INTERNAL_API = 1 | ||
| 471 | |||
| 472 | Index: mozilla/xpcom/reflect/xptcall/src/md/unix/xptcstubs_arm.cpp | ||
| 473 | =================================================================== | ||
| 474 | RCS file: /cvsroot/mozilla/xpcom/reflect/xptcall/src/md/unix/xptcstubs_arm.cpp,v | ||
| 475 | retrieving revision 1.7 | ||
| 476 | diff --context=3 -r1.7 xptcstubs_arm.cpp | ||
| 477 | *** mozilla/xpcom/reflect/xptcall/src/md/unix/xptcstubs_arm.cpp 18 Apr 2004 14:18:18 -0000 1.7 | ||
| 478 | --- mozilla/xpcom/reflect/xptcall/src/md/unix/xptcstubs_arm.cpp 21 Jul 2006 00:27:17 -0000 | ||
| 479 | *************** | ||
| 480 | *** 45,53 **** | ||
| 481 | #endif | ||
| 482 | |||
| 483 | /* Specify explicitly a symbol for this function, don't try to guess the c++ mangled symbol. */ | ||
| 484 | ! static nsresult PrepareAndDispatch(nsXPTCStubBase* self, uint32 methodIndex, PRUint32* args) asm("_PrepareAndDispatch"); | ||
| 485 | |||
| 486 | ! static nsresult | ||
| 487 | PrepareAndDispatch(nsXPTCStubBase* self, uint32 methodIndex, PRUint32* args) | ||
| 488 | { | ||
| 489 | #define PARAM_BUFFER_COUNT 16 | ||
| 490 | --- 45,53 ---- | ||
| 491 | #endif | ||
| 492 | |||
| 493 | /* Specify explicitly a symbol for this function, don't try to guess the c++ mangled symbol. */ | ||
| 494 | ! nsresult PrepareAndDispatch(nsXPTCStubBase* self, uint32 methodIndex, PRUint32* args) asm("_PrepareAndDispatch"); | ||
| 495 | |||
| 496 | ! nsresult | ||
| 497 | PrepareAndDispatch(nsXPTCStubBase* self, uint32 methodIndex, PRUint32* args) | ||
| 498 | { | ||
| 499 | #define PARAM_BUFFER_COUNT 16 | ||
| 500 | Index: mozilla/xpfe/browser/src/Makefile.in | ||
| 501 | =================================================================== | ||
| 502 | RCS file: /cvsroot/mozilla/xpfe/browser/src/Makefile.in,v | ||
| 503 | retrieving revision 1.70 | ||
| 504 | diff --context=3 -r1.70 Makefile.in | ||
| 505 | *** mozilla/xpfe/browser/src/Makefile.in 18 Mar 2005 21:23:45 -0000 1.70 | ||
| 506 | --- mozilla/xpfe/browser/src/Makefile.in 21 Jul 2006 00:27:17 -0000 | ||
| 507 | *************** | ||
| 508 | *** 44,49 **** | ||
| 509 | --- 44,50 ---- | ||
| 510 | |||
| 511 | MODULE = browser | ||
| 512 | LIBRARY_NAME = mozbrwsr_s | ||
| 513 | + EXPORT_LIBRARY = 1 | ||
| 514 | FORCE_STATIC_LIB = 1 | ||
| 515 | LIBXUL_LIBRARY = 1 | ||
| 516 | MODULE_NAME = nsBrowserModule | ||
| 517 | Index: mozilla/xpfe/components/build/Makefile.in | ||
| 518 | =================================================================== | ||
| 519 | RCS file: /cvsroot/mozilla/xpfe/components/build/Makefile.in,v | ||
| 520 | retrieving revision 1.69.8.1 | ||
| 521 | diff --context=3 -r1.69.8.1 Makefile.in | ||
| 522 | *** mozilla/xpfe/components/build/Makefile.in 27 Sep 2005 00:15:25 -0000 1.69.8.1 | ||
| 523 | --- mozilla/xpfe/components/build/Makefile.in 21 Jul 2006 00:27:17 -0000 | ||
| 524 | *************** | ||
| 525 | *** 44,50 **** | ||
| 526 | |||
| 527 | MODULE = appcomps | ||
| 528 | LIBRARY_NAME = appcomps | ||
| 529 | - EXPORT_LIBRARY = 1 | ||
| 530 | IS_COMPONENT = 1 | ||
| 531 | MODULE_NAME = application | ||
| 532 | LIBXUL_LIBRARY = 1 | ||
| 533 | --- 44,49 ---- | ||
| 534 | Index: mozilla/xpfe/components/filepicker/src/Makefile.in | ||
| 535 | =================================================================== | ||
| 536 | RCS file: /cvsroot/mozilla/xpfe/components/filepicker/src/Makefile.in,v | ||
| 537 | retrieving revision 1.9.8.1 | ||
| 538 | diff --context=3 -r1.9.8.1 Makefile.in | ||
| 539 | *** mozilla/xpfe/components/filepicker/src/Makefile.in 22 May 2006 16:29:32 -0000 1.9.8.1 | ||
| 540 | --- mozilla/xpfe/components/filepicker/src/Makefile.in 21 Jul 2006 00:27:17 -0000 | ||
| 541 | *************** | ||
| 542 | *** 47,53 **** | ||
| 543 | MODULE = filepicker | ||
| 544 | LIBRARY_NAME = fileview | ||
| 545 | SHORT_LIBNAME = fileview | ||
| 546 | - EXPORT_LIBRARY = 1 | ||
| 547 | IS_COMPONENT = 1 | ||
| 548 | MODULE_NAME = nsFileViewModule | ||
| 549 | MOZILLA_INTERNAL_API = 1 | ||
| 550 | --- 47,52 ---- | ||
| 551 | Index: mozilla/xpfe/components/find/src/Makefile.in | ||
| 552 | =================================================================== | ||
| 553 | RCS file: /cvsroot/mozilla/xpfe/components/find/src/Makefile.in,v | ||
| 554 | retrieving revision 1.37 | ||
| 555 | diff --context=3 -r1.37 Makefile.in | ||
| 556 | *** mozilla/xpfe/components/find/src/Makefile.in 18 Mar 2005 21:23:46 -0000 1.37 | ||
| 557 | --- mozilla/xpfe/components/find/src/Makefile.in 21 Jul 2006 00:27:17 -0000 | ||
| 558 | *************** | ||
| 559 | *** 45,51 **** | ||
| 560 | MODULE = appcomps | ||
| 561 | XPIDL_MODULE = mozfind | ||
| 562 | LIBRARY_NAME = mozfind | ||
| 563 | - EXPORT_LIBRARY = 1 | ||
| 564 | IS_COMPONENT = 1 | ||
| 565 | MODULE_NAME = nsFindComponent | ||
| 566 | LIBXUL_LIBRARY = 1 | ||
| 567 | --- 45,50 ---- | ||
diff --git a/meta/packages/mozilla/minimo/minimo.png b/meta/packages/mozilla/minimo/minimo.png new file mode 100644 index 0000000000..f8b2e2192b --- /dev/null +++ b/meta/packages/mozilla/minimo/minimo.png | |||
| Binary files differ | |||
diff --git a/meta/packages/mozilla/minimo/mozconfig b/meta/packages/mozilla/minimo/mozconfig index 5a84bcf87e..393981e9fa 100644 --- a/meta/packages/mozilla/minimo/mozconfig +++ b/meta/packages/mozilla/minimo/mozconfig | |||
| @@ -1,76 +1,36 @@ | |||
| 1 | # build minimo | 1 | # mozilla/configure: Features and packages: |
| 2 | MINIMO=1 | ||
| 3 | mk_add_options MINIMO=1 | ||
| 4 | 2 | ||
| 5 | # enable building the browser | 3 | ac_add_options --enable-application=minimo |
| 6 | ac_add_options --enable-application=browser | ||
| 7 | |||
| 8 | # use GTK+-2 widget set with XFT font rendering | ||
| 9 | |||
| 10 | MOZ_ENABLE_COREXFONTS=0 | ||
| 11 | mk_add_options MOZ_ENABLE_COREXFONTS=0 | ||
| 12 | ac_add_options --enable-default-toolkit=gtk2 | 4 | ac_add_options --enable-default-toolkit=gtk2 |
| 13 | ac_add_options --enable-xft | ||
| 14 | ac_add_options --disable-freetype2 | 5 | ac_add_options --disable-freetype2 |
| 15 | 6 | ac_add_options --enable-xft | |
| 16 | # disable XUL support to reduce codesize | ||
| 17 | ac_add_options --disable-xul | ||
| 18 | |||
| 19 | # enable minimal profile support | ||
| 20 | ac_add_options --disable-profilesharing | ||
| 21 | ac_add_options --disable-profilelocking | ||
| 22 | ac_add_options --enable-single-profile | ||
| 23 | |||
| 24 | # disable features and skip various build steps | ||
| 25 | ac_add_options --disable-extensions | ||
| 26 | ac_add_options --disable-accessibility | ||
| 27 | ac_add_options --disable-composer | ||
| 28 | ac_add_options --disable-extensions | ||
| 29 | ac_add_options --disable-installer | ||
| 30 | ac_add_options --disable-jsd | ||
| 31 | ac_add_options --disable-jsloader | ||
| 32 | ac_add_options --disable-ldap | ||
| 33 | ac_add_options --disable-mailnews | ||
| 34 | ac_add_options --disable-mathml | ||
| 35 | ac_add_options --disable-necko-disk-cache | ||
| 36 | ac_add_options --disable-postscript | 7 | ac_add_options --disable-postscript |
| 8 | ac_add_options --disable-xprint | ||
| 9 | ac_add_options --disable-gnomevfs | ||
| 10 | ac_add_options --disable-gnomeui | ||
| 11 | ac_add_options --disable-jsd | ||
| 12 | ac_add_options --disable-plugins | ||
| 37 | ac_add_options --disable-view-source | 13 | ac_add_options --disable-view-source |
| 38 | ac_add_options --disable-xpfe-components | 14 | ac_add_options --disable-accessibility |
| 39 | ac_add_options --disable-xpinstall | 15 | ac_add_options --disable-xpinstall |
| 40 | ac_add_options --disable-xprint | 16 | ac_add_options --enable-single-profile |
| 17 | ac_add_options --disable-jsloader | ||
| 18 | ac_add_options --disable-printing | ||
| 41 | ac_add_options --enable-native-uconv | 19 | ac_add_options --enable-native-uconv |
| 42 | ac_add_options --enable-plaintext-editor-only | 20 | ac_add_options --enable-plaintext-editor-only |
| 43 | ac_add_options --disable-v1-string-abi | 21 | ac_add_options --disable-xpcom-obsolete |
| 44 | ac_add_options --disable-plugins | 22 | ac_add_options --disable-pref-extensions |
| 45 | 23 | ac_add_options --disable-extensions | |
| 46 | # configure necko to allocate smaller network buffers | ||
| 47 | ac_add_options --enable-necko-small-buffers | ||
| 48 | |||
| 49 | # disable debug logging and tests | ||
| 50 | ac_add_options --disable-dtd-debug | ||
| 51 | ac_add_options --disable-logging | ||
| 52 | ac_add_options --disable-tests | ||
| 53 | |||
| 54 | # build crypto module (PSM + NSS) | ||
| 55 | ac_add_options --enable-crypto | ||
| 56 | |||
| 57 | # build minimal set of protocol handlers | ||
| 58 | ac_add_options --enable-necko-protocols=http,file,res,jar | ||
| 59 | |||
| 60 | # build minimal set of image decoders | ||
| 61 | ac_add_options --enable-image-decoders=png,gif,jpeg | 24 | ac_add_options --enable-image-decoders=png,gif,jpeg |
| 62 | 25 | ac_add_options --disable-mathml | |
| 63 | # code generation options (optimize for size) | 26 | ac_add_options --disable-installer |
| 27 | ac_add_options --disable-updater | ||
| 28 | ac_add_options --disable-tests | ||
| 64 | ac_add_options --enable-optimize=-Os | 29 | ac_add_options --enable-optimize=-Os |
| 30 | ac_add_options --disable-logging | ||
| 65 | ac_add_options --enable-strip | 31 | ac_add_options --enable-strip |
| 66 | ac_add_options --disable-debug | ||
| 67 | ac_add_options --enable-reorder | ||
| 68 | ac_add_options --enable-elf-dynstr-gc | 32 | ac_add_options --enable-elf-dynstr-gc |
| 69 | |||
| 70 | # enable static build | ||
| 71 | ac_add_options --disable-shared | 33 | ac_add_options --disable-shared |
| 72 | ac_add_options --enable-static | 34 | ac_add_options --enable-static |
| 73 | 35 | ac_add_options --disable-profilesharing | |
| 74 | # remove link dependency on libstdc++.so | 36 | ac_add_options --disable-profilelocking |
| 75 | LIBS=-lsupc++ | ||
| 76 | |||
diff --git a/meta/packages/mozilla/minimo_0.016+cvs.bb b/meta/packages/mozilla/minimo_0.016+cvs.bb new file mode 100644 index 0000000000..ad44c0523e --- /dev/null +++ b/meta/packages/mozilla/minimo_0.016+cvs.bb | |||
| @@ -0,0 +1,150 @@ | |||
| 1 | DESCRIPTION = "A minimal version of the Mozilla web browser for mobile devices" | ||
| 2 | SECTION = "x11/network" | ||
| 3 | LICENSE = "MPL/GPL/LGPL" | ||
| 4 | HOMEPAGE = "http://www.mozilla.org/projects/minimo/" | ||
| 5 | PRIORITY = "optional" | ||
| 6 | |||
| 7 | DEPENDS = "libxrender xt xft fontconfig freetype libidl dbus-glib pango atk gtk+" | ||
| 8 | |||
| 9 | CVSSVR="cvs-mirror.mozilla.org" | ||
| 10 | BRTAG = "MOZILLA_1_8_BRANCH" | ||
| 11 | MOZDATE = "20060720" | ||
| 12 | |||
| 13 | PV = "0.016+cvs${MOZDATE}" | ||
| 14 | PR = "r5" | ||
| 15 | |||
| 16 | SRC_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 file://minimo \ | ||
| 20 | file://eabi-fix.patch;patch=1 \ | ||
| 21 | file://eabi-fix2.patch;patch=1 \ | ||
| 22 | file://eabi-fix3.patch;patch=1 \ | ||
| 23 | file://minimo.desktop file://minimo.png" | ||
| 24 | |||
| 25 | inherit autotools | ||
| 26 | |||
| 27 | S = "${WORKDIR}/mozilla" | ||
| 28 | |||
| 29 | export MOZCONFIG = "${WORKDIR}/mozconfig" | ||
| 30 | |||
| 31 | export CROSS_COMPILE="1" | ||
| 32 | export ac_cv_prog_HOST_CC="${BUILD_CC}" | ||
| 33 | export ac_cv_prog_HOST_CFLAGS="${BUILD_CFLAGS}" | ||
| 34 | export ac_cv_prog_HOST_CXX="${BUILD_CXX}" | ||
| 35 | export ac_cv_prog_HOST_CXXFLAGS="${BUILD_CXXFLAGS}" | ||
| 36 | |||
| 37 | mozdir="${libdir}/mozilla-minimo" | ||
| 38 | |||
| 39 | EXTRA_OECONF += "--build=${BUILD_SYS} --host=${BUILD_SYS} --target=${TARGET_SYS} " | ||
| 40 | |||
| 41 | do_configure() { | ||
| 42 | cd ${S} | ||
| 43 | oe_runmake -f client.mk CONFIGURE_ARGS="${EXTRA_OECONF}" configure | ||
| 44 | sed -i s:${TARGET_PREFIX}strip:echo:g config/autoconf.mk | ||
| 45 | } | ||
| 46 | |||
| 47 | do_compile() { | ||
| 48 | cd ${S} | ||
| 49 | oe_runmake -f client.mk build | ||
| 50 | } | ||
| 51 | |||
| 52 | do_install() { | ||
| 53 | cd ${WORKDIR} | ||
| 54 | |||
| 55 | install -d ${D}${bindir} | ||
| 56 | install -m 0755 minimo ${D}${bindir} | ||
| 57 | |||
| 58 | install -d ${D}${datadir}/applications | ||
| 59 | install -m 0644 minimo.desktop ${D}${datadir}/applications | ||
| 60 | |||
| 61 | install -d ${D}/${datadir}/pixmaps | ||
| 62 | install -m 0644 minimo.png ${D}${datadir}/pixmaps | ||
| 63 | |||
| 64 | cd ${S} | ||
| 65 | |||
| 66 | ./minimo/config/linux_package.sh ${S} ${S}/minimo/config | ||
| 67 | |||
| 68 | cd dist/minimo | ||
| 69 | |||
| 70 | install -d ${D}${mozdir} | ||
| 71 | install -m 0755 minimo ${D}${mozdir} | ||
| 72 | install -m 0755 libfreebl3.so ${D}${mozdir} | ||
| 73 | install -m 0755 libnspr4.so ${D}${mozdir} | ||
| 74 | install -m 0755 libnss3.so ${D}${mozdir} | ||
| 75 | install -m 0755 libnssckbi.so ${D}${mozdir} | ||
| 76 | install -m 0755 libplc4.so ${D}${mozdir} | ||
| 77 | install -m 0755 libplds4.so ${D}${mozdir} | ||
| 78 | install -m 0755 libsmime3.so ${D}${mozdir} | ||
| 79 | install -m 0755 libsoftokn3.so ${D}${mozdir} | ||
| 80 | install -m 0755 libssl3.so ${D}${mozdir} | ||
| 81 | |||
| 82 | install -d ${D}${mozdir}/chrome | ||
| 83 | install -m 0644 chrome/classic.jar ${D}${mozdir}/chrome | ||
| 84 | install -m 0644 chrome/classic.manifest ${D}${mozdir}/chrome | ||
| 85 | install -m 0644 chrome/en-US.jar ${D}${mozdir}/chrome | ||
| 86 | install -m 0644 chrome/en-US.manifest ${D}${mozdir}/chrome | ||
| 87 | install -m 0644 chrome/minimo-skin-vga.jar ${D}${mozdir}/chrome | ||
| 88 | install -m 0644 chrome/minimo-skin-vga.manifest ${D}${mozdir}/chrome | ||
| 89 | install -m 0644 chrome/minimo-skin.jar ${D}${mozdir}/chrome | ||
| 90 | install -m 0644 chrome/minimo-skin.manifest ${D}${mozdir}/chrome | ||
| 91 | install -m 0644 chrome/minimo.jar ${D}${mozdir}/chrome | ||
| 92 | install -m 0644 chrome/minimo.manifest ${D}${mozdir}/chrome | ||
| 93 | install -m 0644 chrome/pippki.jar ${D}${mozdir}/chrome | ||
| 94 | install -m 0644 chrome/pippki.manifest ${D}${mozdir}/chrome | ||
| 95 | install -m 0644 chrome/toolkit.jar ${D}${mozdir}/chrome | ||
| 96 | install -m 0644 chrome/toolkit.manifest ${D}${mozdir}/chrome | ||
| 97 | |||
| 98 | install -d ${D}${mozdir}/components | ||
| 99 | install -m 0644 components/all.xpt ${D}${mozdir}/components | ||
| 100 | install -m 0644 components/nsHelperAppDlg.js ${D}${mozdir}/components | ||
| 101 | install -m 0644 components/nsProgressDialog.js ${D}${mozdir}/components | ||
| 102 | |||
| 103 | install -d ${D}${mozdir}/greprefs | ||
| 104 | install -m 0644 greprefs/all.js ${D}${mozdir}/greprefs | ||
| 105 | install -m 0644 greprefs/security-prefs.js ${D}${mozdir}/greprefs | ||
| 106 | |||
| 107 | install -d ${D}${mozdir}/res | ||
| 108 | install -m 0644 res/forms.css ${D}${mozdir}/res | ||
| 109 | install -m 0644 res/html.css ${D}${mozdir}/res | ||
| 110 | install -m 0644 res/quirk.css ${D}${mozdir}/res | ||
| 111 | install -m 0644 res/ua.css ${D}${mozdir}/res | ||
| 112 | install -m 0644 res/arrow.gif ${D}${mozdir}/res | ||
| 113 | install -m 0644 res/arrowd.gif ${D}${mozdir}/res | ||
| 114 | install -m 0644 res/broken-image.gif ${D}${mozdir}/res | ||
| 115 | install -m 0644 res/loading-image.gif ${D}${mozdir}/res | ||
| 116 | install -m 0644 res/charsetData.properties ${D}${mozdir}/res | ||
| 117 | install -m 0644 res/charsetalias.properties ${D}${mozdir}/res | ||
| 118 | install -m 0644 res/langGroups.properties ${D}${mozdir}/res | ||
| 119 | install -m 0644 res/language.properties ${D}${mozdir}/res | ||
| 120 | install -m 0644 res/unixcharset.properties ${D}${mozdir}/res | ||
| 121 | |||
| 122 | install -d ${D}${mozdir}/res/dtd | ||
| 123 | install -m 0644 res/dtd/xhtml11.dtd ${D}${mozdir}/res/dtd | ||
| 124 | |||
| 125 | install -d ${D}${mozdir}/res/entityTables | ||
| 126 | install -m 0644 res/entityTables/html40Latin1.properties ${D}${mozdir}/res/entityTables | ||
| 127 | install -m 0644 res/entityTables/html40Special.properties ${D}${mozdir}/res/entityTables | ||
| 128 | install -m 0644 res/entityTables/html40Symbols.properties ${D}${mozdir}/res/entityTables | ||
| 129 | install -m 0644 res/entityTables/htmlEntityVersions.properties ${D}${mozdir}/res/entityTables | ||
| 130 | install -m 0644 res/entityTables/transliterate.properties ${D}${mozdir}/res/entityTables | ||
| 131 | |||
| 132 | install -d ${D}${mozdir}/res/fonts | ||
| 133 | install -m 0644 res/fonts/fontEncoding.properties ${D}${mozdir}/res/fonts | ||
| 134 | install -m 0644 res/fonts/pangoFontEncoding.properties ${D}${mozdir}/res/fonts | ||
| 135 | |||
| 136 | install -d ${D}${mozdir}/res/html | ||
| 137 | install -m 0644 res/html/gopher-audio.gif ${D}${mozdir}/res/html | ||
| 138 | install -m 0644 res/html/gopher-binary.gif ${D}${mozdir}/res/html | ||
| 139 | install -m 0644 res/html/gopher-find.gif ${D}${mozdir}/res/html | ||
| 140 | install -m 0644 res/html/gopher-image.gif ${D}${mozdir}/res/html | ||
| 141 | install -m 0644 res/html/gopher-menu.gif ${D}${mozdir}/res/html | ||
| 142 | install -m 0644 res/html/gopher-movie.gif ${D}${mozdir}/res/html | ||
| 143 | install -m 0644 res/html/gopher-sound.gif ${D}${mozdir}/res/html | ||
| 144 | install -m 0644 res/html/gopher-telnet.gif ${D}${mozdir}/res/html | ||
| 145 | install -m 0644 res/html/gopher-text.gif ${D}${mozdir}/res/html | ||
| 146 | install -m 0644 res/html/gopher-unknown.gif ${D}${mozdir}/res/html | ||
| 147 | } | ||
| 148 | |||
| 149 | FILES_${PN}-dbg += "${libdir}/mozilla-minimo/.debug*" | ||
| 150 | FILES_${PN} += "${mozdir}" | ||
