diff options
Diffstat (limited to 'recipes/mozilla')
40 files changed, 685 insertions, 188 deletions
diff --git a/recipes/mozilla/fennec/mozilla-fennec.desktop b/recipes/mozilla/fennec/mozilla-fennec.desktop index 5c56d1d21d..6c9bd20a7b 100644 --- a/recipes/mozilla/fennec/mozilla-fennec.desktop +++ b/recipes/mozilla/fennec/mozilla-fennec.desktop @@ -1,5 +1,5 @@ [Desktop Entry] -Version=0.7 +Version=1.1beta1 Encoding=UTF-8 Name=Fennec Comment=Fennec mobile browser diff --git a/recipes/mozilla/fennec/use-native-bpp.patch b/recipes/mozilla/fennec/use-native-bpp.patch index fd3f9b71f8..1ecb9f3922 100644 --- a/recipes/mozilla/fennec/use-native-bpp.patch +++ b/recipes/mozilla/fennec/use-native-bpp.patch @@ -1,12 +1,6 @@ -diff -r f603fec24bf7 gfx/thebes/src/gfxPlatformGtk.cpp ---- a/gfx/thebes/src/gfxPlatformGtk.cpp Tue Dec 02 16:05:36 2008 -0500 -+++ b/gfx/thebes/src/gfxPlatformGtk.cpp Tue Dec 02 23:14:03 2008 -0500 -@@ -80,18 +80,23 @@ - - #define GDK_PIXMAP_SIZE_MAX 32767 - - #ifndef MOZ_PANGO - #include <ft2build.h> +--- a/gfx/thebes/src/gfxPlatformGtk.cpp 2010-04-19 18:02:04.000000000 +0000 ++++ b/gfx/thebes/src/gfxPlatformGtk.cpp 2010-04-25 11:36:49.000000000 +0000 +@@ -91,7 +91,12 @@ #include FT_FREETYPE_H #endif @@ -14,26 +8,15 @@ diff -r f603fec24bf7 gfx/thebes/src/gfxPlatformGtk.cpp +#include "nsIPrefBranch.h" +#include "nsServiceManagerUtils.h" + - double gfxPlatformGtk::sDPI = -1.0; gfxFontconfigUtils *gfxPlatformGtk::sFontconfigUtils = nsnull; +static PRBool gUseSystemVisualFormat = PR_FALSE; #ifndef MOZ_PANGO typedef nsDataHashtable<nsStringHashKey, nsRefPtr<FontFamily> > FontTable; - static FontTable *gPlatformFonts = NULL; - static FontTable *gPlatformFontAliases = NULL; - static FT_Library gPlatformFTLibrary = NULL; - #endif - -@@ -113,16 +118,26 @@ gfxPlatformGtk::gfxPlatformGtk() - gPlatformFonts = new FontTable(); - gPlatformFonts->Init(100); - gPlatformFontAliases = new FontTable(); - gPlatformFontAliases->Init(100); +@@ -127,6 +132,16 @@ + gCodepointsWithNoFonts = new gfxSparseBitSet(); UpdateFontList(); #endif - - InitDPI(); + + nsCOMPtr<nsIPrefBranch> prefs = do_GetService(NS_PREFSERVICE_CONTRACTID); + if (!prefs) @@ -47,17 +30,7 @@ diff -r f603fec24bf7 gfx/thebes/src/gfxPlatformGtk.cpp } gfxPlatformGtk::~gfxPlatformGtk() - { - gfxFontconfigUtils::Shutdown(); - sFontconfigUtils = nsnull; - - #ifdef MOZ_PANGO -@@ -184,18 +199,24 @@ gfxPlatformGtk::CreateOffscreenSurface(c - // XXX we really need a different interface here, something that passes - // in more context, including the display and/or target surface type that - // we should try to match - Display* display = GDK_DISPLAY(); - if (!display) +@@ -202,8 +217,14 @@ return nsnull; GdkPixmap* pixmap = nsnull; @@ -74,8 +47,3 @@ diff -r f603fec24bf7 gfx/thebes/src/gfxPlatformGtk.cpp if (xrenderFormat && sizeOk) { pixmap = gdk_pixmap_new(nsnull, size.width, size.height, - xrenderFormat->depth); - - if (pixmap) { - gdk_drawable_set_colormap(GDK_DRAWABLE(pixmap), nsnull); - newSurface = new gfxXlibSurface(display, diff --git a/recipes/mozilla/fennec_hg.bb b/recipes/mozilla/fennec_hg.bb index ada5fa8e87..482ea1da82 100644 --- a/recipes/mozilla/fennec_hg.bb +++ b/recipes/mozilla/fennec_hg.bb @@ -1,15 +1,15 @@ DESCRIPTION = "Mozilla Mobile browser" -PV = "0.9+1.0b4pre" -MOZPV = "1.0b4pre" -PR = "r7" +PV = "0.9+${MOZPV}" +MOZPV = "1.1b2" +PR = "r9" PE = "1" -SRC_URI = "hg://hg.mozilla.org/;module=mozilla-central;rev=37acc871cb55 \ - hg://hg.mozilla.org/;module=mobile-browser;rev=c725e5e30b9d \ +SRC_URI = "hg://hg.mozilla.org/;module=mozilla-central;rev=060ddfe5aa48 \ + hg://hg.mozilla.org/;module=mobile-browser;rev=ad254d8abbc9 \ + file://use-native-bpp.patch \ file://jsautocfg.h \ - file://jsautocfg-dontoverwrite.patch;patch=1 \ - file://use-native-bpp.patch;patch=1 \ + file://jsautocfg-dontoverwrite.patch \ " S = "${WORKDIR}/mozilla-central" diff --git a/recipes/mozilla/firefox-3.6.3/0001-Remove-Werror-from-build.patch b/recipes/mozilla/firefox-3.6.3/0001-Remove-Werror-from-build.patch new file mode 100644 index 0000000000..008dabbe8d --- /dev/null +++ b/recipes/mozilla/firefox-3.6.3/0001-Remove-Werror-from-build.patch @@ -0,0 +1,43 @@ +From 48a378ae647cbd6f8466bd0e8dbb04400bb175a8 Mon Sep 17 00:00:00 2001 +From: Eduardo Valentin <eduardo.valentin@openpossa.org> +Date: Thu, 24 Jul 2008 16:05:09 -0400 +Subject: [PATCH 1/1] Remove -Werror from build + +Remove -Werror from build + +Signed-off-by: Eduardo Valentin <eduardo.valentin@openpossa.org> +--- + configure | 6 +++--- + 1 files changed, 3 insertions(+), 3 deletions(-) + +Index: mozilla-1.9.1/configure +=================================================================== +--- mozilla-1.9.1.orig/configure ++++ mozilla-1.9.1/configure +@@ -5525,7 +5525,7 @@ if test "$GNU_CC"; then + # Don't allow undefined symbols in libraries + DSO_LDOPTS="$DSO_LDOPTS -Wl,-z,defs" + fi +- WARNINGS_AS_ERRORS='-Werror' ++ WARNINGS_AS_ERRORS='' + DSO_CFLAGS='' + DSO_PIC_CFLAGS='-fPIC' + ASFLAGS="$ASFLAGS -fPIC" +@@ -7104,7 +7104,7 @@ EOF + IMPLIB='emximp -o' + FILTER='emxexp -o' + LDFLAGS='-Zmap' +- WARNINGS_AS_ERRORS='-Werror' ++ WARNINGS_AS_ERRORS='' + MOZ_DEBUG_FLAGS="-g -fno-inline" + MOZ_OPTIMIZE_FLAGS="-O2" + MOZ_OPTIMIZE_LDFLAGS="-s -Zlinker /EXEPACK:2 -Zlinker /PACKCODE -Zlinker /PACKDATA" +@@ -7283,7 +7283,7 @@ else + fi + rm -f conftest* + fi +- WARNINGS_AS_ERRORS='-Werror' ++ WARNINGS_AS_ERRORS='' + MOZ_OPTIMIZE_FLAGS="-xO4" + MKSHLIB='$(CXX) $(CXXFLAGS) $(DSO_PIC_FLAGS) $(DSO_LDOPTS) -h $@ -o $@' + MKCSHLIB='$(CC) $(CFLAGS) $(DSO_PIC_FLAGS) -G -z muldefs -h $@ -o $@' diff --git a/recipes/mozilla/firefox-3.6.3/0002-Fix-security-cross-compile-cpu-detection-error.patch b/recipes/mozilla/firefox-3.6.3/0002-Fix-security-cross-compile-cpu-detection-error.patch new file mode 100644 index 0000000000..ce8d4d9948 --- /dev/null +++ b/recipes/mozilla/firefox-3.6.3/0002-Fix-security-cross-compile-cpu-detection-error.patch @@ -0,0 +1,42 @@ +From 599b26141d493ff19633796ce5e19b00315d3821 Mon Sep 17 00:00:00 2001 +From: Eduardo Valentin <eduardo.valentin@openpossa.org> +Date: Fri, 25 Jul 2008 11:20:02 -0400 +Subject: [PATCH 1/1] Fix security cross compile cpu detection error + +Fix security cross compile cpu detection error. +Reference to bug 376279. + +Signed-off-by: Eduardo Valentin <eduardo.valentin@openpossa.org> +--- + security/coreconf/arch.mk | 2 ++ + security/manager/Makefile.in | 1 + + 2 files changed, 3 insertions(+), 0 deletions(-) + +diff --git a/security/coreconf/arch.mk b/security/coreconf/arch.mk +index fba38ff..28da32e 100644 +--- a/security/coreconf/arch.mk ++++ b/security/coreconf/arch.mk +@@ -66,7 +66,9 @@ OS_ARCH := $(subst /,_,$(shell uname -s)) + # Attempt to differentiate between sparc and x86 Solaris + # + ++ifndef OE_TEST + OS_TEST := $(shell uname -m) ++endif + ifeq ($(OS_TEST),i86pc) + OS_RELEASE := $(shell uname -r)_$(OS_TEST) + else +diff --git a/security/manager/Makefile.in b/security/manager/Makefile.in +index 86119f7..86c09ca 100644 +--- a/security/manager/Makefile.in ++++ b/security/manager/Makefile.in +@@ -240,6 +240,7 @@ DEFAULT_GMAKE_FLAGS += \ + RC="$(RC) $(RCFLAGS)" \ + OS_ARCH="$(OS_ARCH)" \ + CPU_ARCH="$(TARGET_CPU)" \ ++ OS_TEST="$(TARGET_CPU)" \ + $(NULL) + SKIP_CHK=1 + endif +-- +1.5.4.3 diff --git a/recipes/mozilla/firefox-3.6.3/010_FPU_IS_ARM_FPA_xslt.diff b/recipes/mozilla/firefox-3.6.3/010_FPU_IS_ARM_FPA_xslt.diff new file mode 100644 index 0000000000..854100c4c3 --- /dev/null +++ b/recipes/mozilla/firefox-3.6.3/010_FPU_IS_ARM_FPA_xslt.diff @@ -0,0 +1,56 @@ +# Bug 369722 – prdtoa.c jsnum.h txDouble.h not required IEEE_ARM define on Codesourcery EABI gcc3.4.4 compiler +# +--- mozilla/content/xslt/public/txDouble.h.orig 2006-07-13 17:21:52.000000000 +0300 ++++ mozilla/content/xslt/public/txDouble.h 2007-10-25 15:01:25.000000000 +0300 +@@ -58,46 +58,48 @@ fp_except_t oldmask = fpsetmask(~allmask + /** + * Stefan Hanske <sh990154@mail.uni-greifswald.de> reports: + * ARM is a little endian architecture but 64 bit double words are stored + * differently: the 32 bit words are in little endian byte order, the two words + * are stored in big endian`s way. + */ + + #if defined(__arm) || defined(__arm32__) || defined(__arm26__) || defined(__arm__) +-#define CPU_IS_ARM ++#if !defined(__VFP_FP__) ++#define FPU_IS_ARM_FPA ++#endif + #endif + + #if (__GNUC__ == 2 && __GNUC_MINOR__ > 95) || __GNUC__ > 2 + /** + * This version of the macros is safe for the alias optimizations + * that gcc does, but uses gcc-specific extensions. + */ + + typedef union txdpun { + PRFloat64 d; + struct { +-#if defined(IS_LITTLE_ENDIAN) && !defined(CPU_IS_ARM) ++#if defined(IS_LITTLE_ENDIAN) && !defined(FPU_IS_ARM_FPA) + PRUint32 lo, hi; + #else + PRUint32 hi, lo; + #endif + } s; + } txdpun; + + #define TX_DOUBLE_HI32(x) (__extension__ ({ txdpun u; u.d = (x); u.s.hi; })) + #define TX_DOUBLE_LO32(x) (__extension__ ({ txdpun u; u.d = (x); u.s.lo; })) + + #else // __GNUC__ + + /* We don't know of any non-gcc compilers that perform alias optimization, + * so this code should work. + */ + +-#if defined(IS_LITTLE_ENDIAN) && !defined(CPU_IS_ARM) ++#if defined(IS_LITTLE_ENDIAN) && !defined(FPU_IS_ARM_FPA) + #define TX_DOUBLE_HI32(x) (((PRUint32 *)&(x))[1]) + #define TX_DOUBLE_LO32(x) (((PRUint32 *)&(x))[0]) + #else + #define TX_DOUBLE_HI32(x) (((PRUint32 *)&(x))[0]) + #define TX_DOUBLE_LO32(x) (((PRUint32 *)&(x))[1]) + #endif + + #endif // __GNUC__ diff --git a/recipes/mozilla/firefox-3.6.3/Bug339782.additional.fix.diff b/recipes/mozilla/firefox-3.6.3/Bug339782.additional.fix.diff new file mode 100644 index 0000000000..0848e730d3 --- /dev/null +++ b/recipes/mozilla/firefox-3.6.3/Bug339782.additional.fix.diff @@ -0,0 +1,39 @@ +# XPTC_InvokeByIndex crashes +# Bug 339782 [ARM] XPTC_InvokeByIndex crashes when cross-compiled under GCC 3.4.x with EABI (CodeSourcery) +Index: mozilla/xpcom/reflect/xptcall/src/md/unix/xptcinvoke_arm.cpp +=================================================================== +--- mozilla.orig/xpcom/reflect/xptcall/src/md/unix/xptcinvoke_arm.cpp ++++ mozilla/xpcom/reflect/xptcall/src/md/unix/xptcinvoke_arm.cpp +@@ -51,22 +51,32 @@ + #ifdef __ARM_EABI__ + #define DOUBLEWORD_ALIGN(p) ((PRUint32 *)((((PRUint32)(p)) + 7) & 0xfffffff8)) + #define VAR_STACK_SIZE_64 3 + #else + #define DOUBLEWORD_ALIGN(p) (p) + #define VAR_STACK_SIZE_64 2 + #endif + ++#ifdef __ARM_EABI__ ++#define DOUBLEWORD_ALIGN(p) ((PRUint32 *)((((PRUint32)(p)) + 7) & 0xfffffff8)) ++#else ++#define DOUBLEWORD_ALIGN(p) (p) ++#endif ++ + // Remember that these 'words' are 32bit DWORDS + + static PRUint32 + invoke_count_words(PRUint32 paramCount, nsXPTCVariant* s) + { + PRUint32 result = 0; ++ ++ /* Note that we give a "worst case" estimate of how much stack _might_ be ++ * needed, rather than the real count - this should be safe */ ++ + for(PRUint32 i = 0; i < paramCount; i++, s++) + { + if(s->IsPtrData()) + { + result++; + continue; + } + switch(s->type) diff --git a/recipes/mozilla/firefox-3.6.3/Bug385583.nspr.jmp_buf.eabi.diff b/recipes/mozilla/firefox-3.6.3/Bug385583.nspr.jmp_buf.eabi.diff new file mode 100644 index 0000000000..486440c30e --- /dev/null +++ b/recipes/mozilla/firefox-3.6.3/Bug385583.nspr.jmp_buf.eabi.diff @@ -0,0 +1,33 @@ +diff -up mozilla/nsprpub/pr/include/md/_linux.h.orig mozilla/nsprpub/pr/include/md/_linux.h +--- mozilla/nsprpub/pr/include/md/_linux.h.orig 2007-11-28 14:16:03.000000000 -0500 ++++ mozilla/nsprpub/pr/include/md/_linux.h 2007-11-28 14:12:09.000000000 -0500 +@@ -346,8 +346,8 @@ extern void _MD_CleanupBeforeExit(void); + #error "Linux/MIPS pre-glibc2 not supported yet" + #endif /* defined(__GLIBC__) && __GLIBC__ >= 2 */ + +-#elif defined(__arm__) +-/* ARM/Linux */ ++#elif defined(__arm__) && !defined(__ARM_EABI__) ++/* ARM/Linux (old-ABI) */ + #if defined(__GLIBC__) && __GLIBC__ >= 2 + #define _MD_GET_SP(_t) (_t)->md.context[0].__jmpbuf[20] + #define _MD_SET_FP(_t, val) ((_t)->md.context[0].__jmpbuf[19] = (val)) +@@ -358,6 +358,18 @@ extern void _MD_CleanupBeforeExit(void); + #error "ARM/Linux pre-glibc2 not supported yet" + #endif /* defined(__GLIBC__) && __GLIBC__ >= 2 */ + ++#elif defined(__arm__) && defined(__ARM_EABI__) ++/* ARM/Linux (EABI) */ ++#if defined(__GLIBC__) && __GLIBC__ >= 2 ++#define _MD_GET_SP(_t) (_t)->md.context[0].__jmpbuf[8] ++#define _MD_SET_FP(_t, val) ((_t)->md.context[0].__jmpbuf[7] = (val)) ++#define _MD_GET_SP_PTR(_t) &(_MD_GET_SP(_t)) ++#define _MD_GET_FP_PTR(_t) (&(_t)->md.context[0].__jmpbuf[7]) ++#define _MD_SP_TYPE __ptr_t ++#else ++#error "ARM/Linux pre-glibc2 not supported yet" ++#endif /* defined(__GLIBC__) && __GLIBC__ >= 2 */ ++ + #else + + #error "Unknown CPU architecture" diff --git a/recipes/mozilla/firefox-3.6.3/Bug405992.atomic.nspr.diff b/recipes/mozilla/firefox-3.6.3/Bug405992.atomic.nspr.diff new file mode 100644 index 0000000000..f54f916a6a --- /dev/null +++ b/recipes/mozilla/firefox-3.6.3/Bug405992.atomic.nspr.diff @@ -0,0 +1,48 @@ +# Add atomic operations for ARM. +diff --git a/nsprpub/pr/include/md/_linux.h b/nsprpub/pr/include/md/_linux.h +index 5b794c5..cb8d58e 100644 +--- a/nsprpub/pr/include/md/_linux.h ++++ b/nsprpub/pr/include/md/_linux.h +@@ -194,6 +194,42 @@ extern PRInt32 _PR_x86_64_AtomicSet(PRInt32 *val, PRInt32 newval); + }) + #endif + ++#if defined(__arm__) ++#define _PR_HAVE_ATOMIC_OPS ++#define _MD_INIT_ATOMIC() ++ ++typedef int (__kernel_cmpxchg_t)(int oldval, int newval, volatile int *ptr); ++#define __kernel_cmpxchg (*(__kernel_cmpxchg_t *)0xffff0fc0) ++ ++#define _MD_ATOMIC_INCREMENT(ptr) _MD_ATOMIC_ADD(ptr, 1) ++#define _MD_ATOMIC_DECREMENT(ptr) _MD_ATOMIC_ADD(ptr, -1) ++#define _MD_ATOMIC_ADD(ptr, n) \ ++ ({ \ ++ PRInt32 ov, nv; \ ++ volatile PRInt32 *vp = (ptr); \ ++ \ ++ do { \ ++ ov = *vp; \ ++ nv = ov + (n); \ ++ } \ ++ while (__kernel_cmpxchg(ov, nv, vp)); \ ++ \ ++ nv; \ ++ }) ++#define _MD_ATOMIC_SET(ptr, nv) \ ++ ({ \ ++ PRInt32 ov; \ ++ volatile PRInt32 *vp = (ptr); \ ++ \ ++ do { \ ++ ov = *vp; \ ++ } \ ++ while (__kernel_cmpxchg(ov, (nv), vp)); \ ++ \ ++ ov; \ ++ }) ++#endif ++ + #define USE_SETJMP + #if defined(__GLIBC__) && __GLIBC__ >= 2 + #define _PR_POLL_AVAILABLE diff --git a/recipes/mozilla/firefox-3.6.3/configure-wchart.patch b/recipes/mozilla/firefox-3.6.3/configure-wchart.patch new file mode 100644 index 0000000000..36ee2a0ba4 --- /dev/null +++ b/recipes/mozilla/firefox-3.6.3/configure-wchart.patch @@ -0,0 +1,11 @@ +--- a/configure.in 2008-04-15 12:56:35.000000000 +0300 ++++ b/configure.in.old 2008-03-20 21:17:09.000000000 +0200 +@@ -2743,7 +2743,7 @@ + + AC_CACHE_CHECK(for compiler -fshort-wchar option, + ac_cv_have_usable_wchar_option_v2, +- [AC_TRY_LINK([#include <stddef.h> ++ [AC_TRY_COMPILE([#include <stddef.h> + $configure_static_assert_macros], + [CONFIGURE_STATIC_ASSERT(sizeof(wchar_t) == 2); + CONFIGURE_STATIC_ASSERT((wchar_t)-1 > (wchar_t) 0)], diff --git a/recipes/mozilla/firefox-3.6.3/firefox-plugin.pc b/recipes/mozilla/firefox-3.6.3/firefox-plugin.pc new file mode 100644 index 0000000000..c9c1ce8d9c --- /dev/null +++ b/recipes/mozilla/firefox-3.6.3/firefox-plugin.pc @@ -0,0 +1,10 @@ +prefix=/usr +exec_prefix=/usr +libdir=/usr/lib +includedir=/usr/include/firefox-3.6.3 + +Name: Mozilla Plug-In API +Description: Mozilla Plug-In API +Version: 3.6 +Requires: firefox-xpcom = 3.6.3 +Cflags: -I${includedir}/java -I${includedir}/plugin diff --git a/recipes/mozilla/firefox-3.6.3/firefox-xpcom.pc b/recipes/mozilla/firefox-3.6.3/firefox-xpcom.pc new file mode 100644 index 0000000000..a0edec60de --- /dev/null +++ b/recipes/mozilla/firefox-3.6.3/firefox-xpcom.pc @@ -0,0 +1,13 @@ +prefix=/usr +exec_prefix=/usr +libdir=/usr/lib +includedir=/usr/include +mozdir=${includedir}/firefox-3.6.3 +idldir=${includedir}/firefox-3.6.3 + +Name: XPCOM +Description: The Mozilla Cross Platform Component Library +Version: 3.6.3 +Requires: nspr >= 4.8 +Libs: -L${libdir} -lxpcom -Wl,-R${libdir} +Cflags: -I${mozdir} -I${mozdir}/xpcom -I${mozdir}/string diff --git a/recipes/mozilla/firefox-3.6.3/jemalloc-tls.patch b/recipes/mozilla/firefox-3.6.3/jemalloc-tls.patch new file mode 100644 index 0000000000..d1d740989e --- /dev/null +++ b/recipes/mozilla/firefox-3.6.3/jemalloc-tls.patch @@ -0,0 +1,28 @@ +--- /tmp/jemalloc.c 2008-06-23 10:57:36.000000000 +0200 ++++ mozilla/memory/jemalloc/jemalloc.c 2008-06-23 11:20:13.000000000 +0200 +@@ -386,7 +386,7 @@ + #else + # define NO_TLS + #endif +-#if 0 ++ + #ifdef __i386__ + # define QUANTUM_2POW_MIN 4 + # define SIZEOF_PTR_2POW 2 +@@ -420,7 +420,6 @@ + # define QUANTUM_2POW_MIN 4 + # define SIZEOF_PTR_2POW 2 + #endif +-#endif + + #define SIZEOF_PTR (1U << SIZEOF_PTR_2POW) + +@@ -2582,7 +2581,7 @@ + * knowledge of how _pthread_self() calculates values, we can't + * easily do much better than this. + */ +- ind = (unsigned long) _pthread_self() % narenas; ++ ind = 255255 % narenas; + + /* + * Optimistially assume that arenas[ind] has been initialized. diff --git a/recipes/mozilla/firefox-3.6.3/linkage-problem.patch b/recipes/mozilla/firefox-3.6.3/linkage-problem.patch new file mode 100644 index 0000000000..28bffd1e22 --- /dev/null +++ b/recipes/mozilla/firefox-3.6.3/linkage-problem.patch @@ -0,0 +1,14 @@ +--- mozilla/layout/build/Makefile.in~ 2007-11-24 00:38:14.000000000 -0200 ++++ mozilla/layout/build/Makefile.in 2007-11-24 00:38:14.000000000 -0200 +@@ -229,6 +229,11 @@ + $(NULL) + endif + ++ifdef MOZ_ENABLE_XFT ++EXTRA_DSO_LDOPTS += $(MOZ_XFT_LIBS) \ ++ $(NULL) ++endif ++ + ifneq (,$(MOZ_ENABLE_CANVAS)$(MOZ_SVG_RENDERER_CAIRO)) + EXTRA_DSO_LDOPTS += $(MOZ_CAIRO_LIBS) \ + $(NULL) diff --git a/recipes/mozilla/firefox-3.6.3/mozconfig b/recipes/mozilla/firefox-3.6.3/mozconfig new file mode 100644 index 0000000000..883a396e53 --- /dev/null +++ b/recipes/mozilla/firefox-3.6.3/mozconfig @@ -0,0 +1,73 @@ +. $topsrcdir/browser/config/mozconfig + +# use GTK+-2 widget set with XFT font rendering +#ac_add_options --enable-default-toolkit=gtk2 +ac_add_options --enable-xft +ac_add_options --disable-freetype2 + +# enable minimal profile support +ac_add_options --disable-profilesharing +ac_add_options --disable-profilelocking +ac_add_options --enable-single-profile + +ac_add_options --with-system-zlib +ac_add_options --with-system-jpeg +ac_add_options --with-system-bz2 +#ac_add_options --with-system-png + +ac_add_options --disable-accessibility +ac_add_options --disable-composer +#ac_add_options --enable-plaintext-editor-only +ac_add_options --disable-mailnews +ac_add_options --disable-ldap +#ac_add_options --disable-postscript +ac_add_options --disable-mathml +ac_add_options --disable-jsd +ac_add_options --disable-installer +ac_add_options --disable-xprint +ac_add_options --enable-necko-disk-cache +ac_add_options --disable-necko-wifi +ac_add_options --disable-updater + +# configure necko to allocate smaller network buffers +ac_add_options --enable-necko-small-buffers + +# disable debug logging and tests +#ac_add_options --disable-dtd-debug +ac_add_options --disable-logging +ac_add_options --disable-gtktest +ac_add_options --disable-tests +ac_add_options --disable-printing +ac_add_options --disable-gnomevfs +ac_add_options --disable-gnomeui +ac_add_options --enable-debugger-info-modules + +# build crypto module (PSM + NSS) +ac_add_options --enable-crypto + +# build minimal set of protocol handlers +ac_add_options --enable-necko-protocols=http,file,res,ftp,about,viewsource + +# build minimal set of image decoders +#ac_add_options --enable-image-decoders=png,gif,jpeg + +#ac_add_options --enable-reorder +#ac_add_options --enable-elf-dynstr-gc + +# enable static build +#ac_add_options --disable-shared +#ac_add_options --enable-static +ac_add_options --enable-optimize=-O2 + +# Use cairo from system +ac_add_options --enable-system-cairo + +# Disable jemalloc +ac_add_options --disable-jemalloc + +# enable libxul +ac_add_options --enable-libxul + +# Disable striping +ac_add_options --disable-strip +ac_add_options --disable-install-strip diff --git a/recipes/mozilla/firefox-3.6.3/nspr.pc b/recipes/mozilla/firefox-3.6.3/nspr.pc new file mode 100644 index 0000000000..6e4499235f --- /dev/null +++ b/recipes/mozilla/firefox-3.6.3/nspr.pc @@ -0,0 +1,10 @@ +prefix=/usr +exec_prefix=/usr +libdir=/usr/lib +includedir=/usr/include/firefox-3.6.3 + +Name: NSPR +Description: The Netscape Portable Runtime +Version: 4.8 +Libs: -L${libdir} -lplds4 -lplc4 -lnspr4 -lpthread -ldl -Wl,-R${libdir} +Cflags: -I${includedir} diff --git a/recipes/mozilla/firefox-3.6.3/plugins-dir.patch b/recipes/mozilla/firefox-3.6.3/plugins-dir.patch new file mode 100644 index 0000000000..2c8b8e9bd1 --- /dev/null +++ b/recipes/mozilla/firefox-3.6.3/plugins-dir.patch @@ -0,0 +1,16 @@ +Index: mozilla-1.9.1/build/unix/mozilla.in +=================================================================== +--- mozilla-1.9.1.orig/build/unix/mozilla.in ++++ mozilla-1.9.1/build/unix/mozilla.in +@@ -52,6 +52,11 @@ + + moz_libdir=%MOZAPPDIR% + ++if test -d /usr/lib/mozilla/plugins; then ++ MOZ_PLUGIN_PATH="${MOZ_PLUGIN_PATH:+"$MOZ_PLUGIN_PATH:"}/usr/lib/mozilla/plugins" ++ export MOZ_PLUGIN_PATH ++fi ++ + # Use run-mozilla.sh in the current dir if it exists + # If not, then start resolving symlinks until we find run-mozilla.sh + found=0 diff --git a/recipes/mozilla/firefox-3.6.3/security-cross.patch b/recipes/mozilla/firefox-3.6.3/security-cross.patch new file mode 100644 index 0000000000..cfe57b28f0 --- /dev/null +++ b/recipes/mozilla/firefox-3.6.3/security-cross.patch @@ -0,0 +1,57 @@ +--- /tmp/Linux.mk 2010-03-23 18:52:06.000000000 +0100 ++++ mozilla-1.9.2/security/coreconf/Linux.mk 2010-03-23 18:52:57.000000000 +0100 +@@ -52,52 +52,8 @@ + + DEFAULT_COMPILER = gcc + +-ifeq ($(OS_TEST),ppc64) +- CPU_ARCH = ppc +-ifeq ($(USE_64),1) +- ARCHFLAG = -m64 +-endif +-else +-ifeq ($(OS_TEST),alpha) +- OS_REL_CFLAGS = -D_ALPHA_ +- CPU_ARCH = alpha +-else +-ifeq ($(OS_TEST),x86_64) +-ifeq ($(USE_64),1) +- CPU_ARCH = x86_64 +-else +- OS_REL_CFLAGS = -Di386 +- CPU_ARCH = x86 +- ARCHFLAG = -m32 +-endif +-else +-ifeq ($(OS_TEST),sparc64) +- CPU_ARCH = sparc +-else +-ifeq (,$(filter-out arm% sa110,$(OS_TEST))) +- CPU_ARCH = arm +-else +-ifeq (,$(filter-out parisc%,$(OS_TEST))) +- CPU_ARCH = hppa +-else +-ifeq (,$(filter-out i%86,$(OS_TEST))) +- OS_REL_CFLAGS = -Di386 +- CPU_ARCH = x86 +-else +-ifeq ($(OS_TEST),sh4a) +- CPU_ARCH = sh4 +-else +-# $(OS_TEST) == m68k, ppc, ia64, sparc, s390, s390x, mips, sh3, sh4 +- CPU_ARCH = $(OS_TEST) +-endif +-endif +-endif +-endif +-endif +-endif +-endif +-endif +- ++OS_REL_CFLAGS = -DLINUX1_2 -D_XOPEN_SOURCE ++CPU_ARCH = + + LIBC_TAG = _glibc + diff --git a/recipes/mozilla/firefox.inc b/recipes/mozilla/firefox.inc index 024858a64d..0c75e1002b 100644 --- a/recipes/mozilla/firefox.inc +++ b/recipes/mozilla/firefox.inc @@ -1,5 +1,5 @@ DESCRIPTION ?= "Browser made by mozilla" -DEPENDS += "alsa-lib" +DEPENDS += "alsa-lib curl" SRC_URI += "file://mozilla-${PN}.png file://mozilla-${PN}.desktop" ARM_INSTRUCTION_SET = "arm" diff --git a/recipes/mozilla/firefox_1.0.7.bb b/recipes/mozilla/firefox_1.0.7.bb index 28746f392d..f8f5d97539 100644 --- a/recipes/mozilla/firefox_1.0.7.bb +++ b/recipes/mozilla/firefox_1.0.7.bb @@ -1,14 +1,14 @@ PR = "r2" SRC_URI = "ftp://ftp.mozilla.org/pub/mozilla.org/firefox/releases/${PV}/source/firefox-${PV}-source.tar.bz2 \ - file://xptcstubs.patch;patch=1 \ - file://no-xmb.patch;patch=1 \ - file://firefox-cc-fix.patch;patch=1 \ + file://xptcstubs.patch \ + file://no-xmb.patch \ + file://firefox-cc-fix.patch \ file://jsautocfg.h \ - file://extensions-hack.patch;patch=1 \ - file://firefox-1.0-gcc4-compile.patch;patch=1;pnum=0 \ - file://xptcinvoke-arm.patch;patch=1 \ - file://mozilla-eabi.patch;patch=1" + file://extensions-hack.patch \ + file://firefox-1.0-gcc4-compile.patch;striplevel=0 \ + file://xptcinvoke-arm.patch \ + file://mozilla-eabi.patch" S = "${WORKDIR}/mozilla" inherit autotools mozilla diff --git a/recipes/mozilla/firefox_2.0.0.3.bb b/recipes/mozilla/firefox_2.0.0.3.bb index be33d679af..7a0f38d8ba 100644 --- a/recipes/mozilla/firefox_2.0.0.3.bb +++ b/recipes/mozilla/firefox_2.0.0.3.bb @@ -2,17 +2,17 @@ DEPENDS += "cairo" PR = "r3" SRC_URI = "ftp://ftp.mozilla.org/pub/mozilla.org/firefox/releases/${PV}/source/firefox-${PV}-source.tar.bz2 \ - file://xptcstubs.patch;patch=1 \ - file://no-xmb.patch;patch=1 \ + file://xptcstubs.patch \ + file://no-xmb.patch \ file://jsautocfg.h \ - file://extensions-hack.patch;patch=1 \ - file://security-cross.patch;patch=1 \ - file://jsautocfg-dontoverwrite.patch;patch=1 \ - file://xptcinvoke-arm.patch;patch=1 \ - file://eabi-fix.patch;patch=1 \ - file://eabi-fix2.patch;patch=1 \ - file://eabi-fix3.patch;patch=1 \ - file://linkage-problem.patch;patch=1 \ + file://extensions-hack.patch \ + file://security-cross.patch \ + file://jsautocfg-dontoverwrite.patch \ + file://xptcinvoke-arm.patch \ + file://eabi-fix.patch \ + file://eabi-fix2.patch \ + file://eabi-fix3.patch \ + file://linkage-problem.patch \ " S = "${WORKDIR}/mozilla" diff --git a/recipes/mozilla/firefox_3.0.1.bb b/recipes/mozilla/firefox_3.0.1.bb index 48013e6249..0e62cbe2f7 100644 --- a/recipes/mozilla/firefox_3.0.1.bb +++ b/recipes/mozilla/firefox_3.0.1.bb @@ -3,17 +3,17 @@ PR = "r9" SRC_URI = "ftp://ftp.mozilla.org/pub/mozilla.org/firefox/releases/${PV}/source/firefox-${PV}-source.tar.bz2 \ file://jsautocfg.h \ - file://security-cross.patch;patch=1 \ - file://jsautocfg-dontoverwrite.patch;patch=1 \ - file://Bug339782.additional.fix.diff;patch=1 \ - file://Bug385583.nspr.jmp_buf.eabi.diff;patch=1 \ - file://Bug405992.atomic.nspr.diff;patch=1 \ - file://random_to_urandom.diff;patch=1 \ - file://jemalloc-tls.patch;patch=1 \ - file://wchart.diff;patch=1 \ - file://0001-Remove-Werror-from-build.patch;patch=1 \ - file://0002-Fix-security-cross-compile-cpu-detection-error.patch;patch=1 \ - file://use-native-bpp.patch;patch=1 \ + file://security-cross.patch \ + file://jsautocfg-dontoverwrite.patch \ + file://Bug339782.additional.fix.diff \ + file://Bug385583.nspr.jmp_buf.eabi.diff \ + file://Bug405992.atomic.nspr.diff \ + file://random_to_urandom.diff \ + file://jemalloc-tls.patch \ + file://wchart.diff \ + file://0001-Remove-Werror-from-build.patch \ + file://0002-Fix-security-cross-compile-cpu-detection-error.patch \ + file://use-native-bpp.patch \ " S = "${WORKDIR}/mozilla" diff --git a/recipes/mozilla/firefox_3.0.4.bb b/recipes/mozilla/firefox_3.0.4.bb index 6f1e226088..988c435aba 100644 --- a/recipes/mozilla/firefox_3.0.4.bb +++ b/recipes/mozilla/firefox_3.0.4.bb @@ -3,16 +3,16 @@ PR = "r1" SRC_URI = "ftp://ftp.mozilla.org/pub/mozilla.org/firefox/releases/${PV}/source/firefox-${PV}-source.tar.bz2 \ file://jsautocfg.h \ - file://security-cross.patch;patch=1 \ - file://jsautocfg-dontoverwrite.patch;patch=1 \ - file://Bug339782.additional.fix.diff;patch=1 \ - file://Bug385583.nspr.jmp_buf.eabi.diff;patch=1 \ - file://Bug405992.atomic.nspr.diff;patch=1 \ - file://random_to_urandom.diff;patch=1 \ - file://jemalloc-tls.patch;patch=1 \ - file://0001-Remove-Werror-from-build.patch;patch=1 \ - file://0002-Fix-security-cross-compile-cpu-detection-error.patch;patch=1 \ - file://plugins-dir.patch;patch=1 \ + file://security-cross.patch \ + file://jsautocfg-dontoverwrite.patch \ + file://Bug339782.additional.fix.diff \ + file://Bug385583.nspr.jmp_buf.eabi.diff \ + file://Bug405992.atomic.nspr.diff \ + file://random_to_urandom.diff \ + file://jemalloc-tls.patch \ + file://0001-Remove-Werror-from-build.patch \ + file://0002-Fix-security-cross-compile-cpu-detection-error.patch \ + file://plugins-dir.patch \ " S = "${WORKDIR}/mozilla" diff --git a/recipes/mozilla/firefox_3.0.8.bb b/recipes/mozilla/firefox_3.0.8.bb index 12635287e8..a4659eca10 100644 --- a/recipes/mozilla/firefox_3.0.8.bb +++ b/recipes/mozilla/firefox_3.0.8.bb @@ -7,15 +7,15 @@ DEFAULT_PREFERENCE = "-1" SRC_URI = "ftp://ftp.mozilla.org/pub/mozilla.org/firefox/releases/${PV}/source/firefox-${PV}-source.tar.bz2 \ file://jsautocfg.h \ - file://security-cross.patch;patch=1 \ - file://jsautocfg-dontoverwrite.patch;patch=1 \ - file://Bug339782.additional.fix.diff;patch=1 \ - file://Bug385583.nspr.jmp_buf.eabi.diff;patch=1 \ - file://Bug405992.atomic.nspr.diff;patch=1 \ - file://jemalloc-tls.patch;patch=1 \ - file://0001-Remove-Werror-from-build.patch;patch=1 \ - file://0002-Fix-security-cross-compile-cpu-detection-error.patch;patch=1 \ - file://plugins-dir.patch;patch=1 \ + file://security-cross.patch \ + file://jsautocfg-dontoverwrite.patch \ + file://Bug339782.additional.fix.diff \ + file://Bug385583.nspr.jmp_buf.eabi.diff \ + file://Bug405992.atomic.nspr.diff \ + file://jemalloc-tls.patch \ + file://0001-Remove-Werror-from-build.patch \ + file://0002-Fix-security-cross-compile-cpu-detection-error.patch \ + file://plugins-dir.patch \ " S = "${WORKDIR}/mozilla" diff --git a/recipes/mozilla/firefox_3.1b1.bb b/recipes/mozilla/firefox_3.1b1.bb index 113f44e24d..8bd30f2390 100644 --- a/recipes/mozilla/firefox_3.1b1.bb +++ b/recipes/mozilla/firefox_3.1b1.bb @@ -6,8 +6,8 @@ PR = "r1" SRC_URI = "http://ftp.mozilla.org/pub/mozilla.org/firefox/nightly/${MOZPV}-candidates/build2/source/firefox-${MOZPV}-source.tar.bz2 \ file://jsautocfg.h \ - file://jsautocfg-dontoverwrite.patch;patch=1 \ - file://random_to_urandom.diff;patch=1 \ + file://jsautocfg-dontoverwrite.patch \ + file://random_to_urandom.diff \ " S = "${WORKDIR}/mozilla-central" diff --git a/recipes/mozilla/firefox_3.1b2.bb b/recipes/mozilla/firefox_3.1b2.bb index a74e8d2954..8ef9f5f2c9 100644 --- a/recipes/mozilla/firefox_3.1b2.bb +++ b/recipes/mozilla/firefox_3.1b2.bb @@ -6,7 +6,7 @@ PR = "r1" SRC_URI = "http://ftp.mozilla.org/pub/mozilla.org/firefox/nightly/${MOZPV}-candidates/build2/source/firefox-${MOZPV}-source.tar.bz2 \ file://jsautocfg.h \ - file://jsautocfg-dontoverwrite.patch;patch=1 \ + file://jsautocfg-dontoverwrite.patch \ " S = "${WORKDIR}/mozilla-central" diff --git a/recipes/mozilla/firefox_3.5.2.bb b/recipes/mozilla/firefox_3.5.2.bb index 282148c492..d77c71d065 100644 --- a/recipes/mozilla/firefox_3.5.2.bb +++ b/recipes/mozilla/firefox_3.5.2.bb @@ -4,15 +4,15 @@ PR = "r4" SRC_URI = "ftp://ftp.mozilla.org/pub/mozilla.org/firefox/releases/${PV}/source/firefox-${PV}-source.tar.bz2 \ file://jsautocfg.h \ - file://security-cross.patch;patch=1 \ - file://jsautocfg-dontoverwrite.patch;patch=1 \ - file://Bug339782.additional.fix.diff;patch=1 \ - file://Bug385583.nspr.jmp_buf.eabi.diff;patch=1 \ - file://Bug405992.atomic.nspr.diff;patch=1 \ - file://jemalloc-tls.patch;patch=1 \ - file://0001-Remove-Werror-from-build.patch;patch=1 \ - file://0002-Fix-security-cross-compile-cpu-detection-error.patch;patch=1 \ - file://plugins-dir.patch;patch=1 \ + file://security-cross.patch \ + file://jsautocfg-dontoverwrite.patch \ + file://Bug339782.additional.fix.diff \ + file://Bug385583.nspr.jmp_buf.eabi.diff \ + file://Bug405992.atomic.nspr.diff \ + file://jemalloc-tls.patch \ + file://0001-Remove-Werror-from-build.patch \ + file://0002-Fix-security-cross-compile-cpu-detection-error.patch \ + file://plugins-dir.patch \ file://firefox-plugin.pc \ file://firefox-xpcom.pc \ file://nspr.pc \ diff --git a/recipes/mozilla/firefox_3.5.4.bb b/recipes/mozilla/firefox_3.5.4.bb index 18e864d984..9331294237 100644 --- a/recipes/mozilla/firefox_3.5.4.bb +++ b/recipes/mozilla/firefox_3.5.4.bb @@ -4,15 +4,15 @@ PR = "r3" SRC_URI = "ftp://ftp.mozilla.org/pub/mozilla.org/firefox/releases/${PV}/source/firefox-${PV}.source.tar.bz2 \ file://jsautocfg.h \ - file://security-cross.patch;patch=1 \ - file://jsautocfg-dontoverwrite.patch;patch=1 \ - file://Bug339782.additional.fix.diff;patch=1 \ - file://Bug385583.nspr.jmp_buf.eabi.diff;patch=1 \ - file://Bug405992.atomic.nspr.diff;patch=1 \ - file://jemalloc-tls.patch;patch=1 \ - file://0001-Remove-Werror-from-build.patch;patch=1 \ - file://0002-Fix-security-cross-compile-cpu-detection-error.patch;patch=1 \ - file://plugins-dir.patch;patch=1 \ + file://security-cross.patch \ + file://jsautocfg-dontoverwrite.patch \ + file://Bug339782.additional.fix.diff \ + file://Bug385583.nspr.jmp_buf.eabi.diff \ + file://Bug405992.atomic.nspr.diff \ + file://jemalloc-tls.patch \ + file://0001-Remove-Werror-from-build.patch \ + file://0002-Fix-security-cross-compile-cpu-detection-error.patch \ + file://plugins-dir.patch \ file://firefox-plugin.pc \ file://firefox-xpcom.pc \ file://nspr.pc \ diff --git a/recipes/mozilla/firefox_3.5.5.bb b/recipes/mozilla/firefox_3.5.5.bb index 5de60b9777..8da7d3a39c 100644 --- a/recipes/mozilla/firefox_3.5.5.bb +++ b/recipes/mozilla/firefox_3.5.5.bb @@ -4,15 +4,15 @@ PR = "r4" SRC_URI = "ftp://ftp.mozilla.org/pub/mozilla.org/firefox/releases/${PV}/source/firefox-${PV}.source.tar.bz2 \ file://jsautocfg.h \ - file://security-cross.patch;patch=1 \ - file://jsautocfg-dontoverwrite.patch;patch=1 \ - file://Bug339782.additional.fix.diff;patch=1 \ - file://Bug385583.nspr.jmp_buf.eabi.diff;patch=1 \ - file://Bug405992.atomic.nspr.diff;patch=1 \ - file://jemalloc-tls.patch;patch=1 \ - file://0001-Remove-Werror-from-build.patch;patch=1 \ - file://0002-Fix-security-cross-compile-cpu-detection-error.patch;patch=1 \ - file://plugins-dir.patch;patch=1 \ + file://security-cross.patch \ + file://jsautocfg-dontoverwrite.patch \ + file://Bug339782.additional.fix.diff \ + file://Bug385583.nspr.jmp_buf.eabi.diff \ + file://Bug405992.atomic.nspr.diff \ + file://jemalloc-tls.patch \ + file://0001-Remove-Werror-from-build.patch \ + file://0002-Fix-security-cross-compile-cpu-detection-error.patch \ + file://plugins-dir.patch \ file://firefox-plugin.pc \ file://firefox-xpcom.pc \ file://nspr.pc \ diff --git a/recipes/mozilla/firefox_3.5b4.bb b/recipes/mozilla/firefox_3.5b4.bb index e8571cef37..3fbbf2aa71 100644 --- a/recipes/mozilla/firefox_3.5b4.bb +++ b/recipes/mozilla/firefox_3.5b4.bb @@ -6,7 +6,7 @@ PR = "r3" SRC_URI = "http://ftp.mozilla.org/pub/mozilla.org/firefox/nightly/${MOZPV}-candidates/build1/source/firefox-${MOZPV}-source.tar.bz2 \ file://jsautocfg.h \ - file://jsautocfg-dontoverwrite.patch;patch=1 \ + file://jsautocfg-dontoverwrite.patch \ " S = "${WORKDIR}/mozilla-1.9.1" diff --git a/recipes/mozilla/firefox_3.6.2.bb b/recipes/mozilla/firefox_3.6.2.bb index 1c975e0baf..dcc9fc50c6 100644 --- a/recipes/mozilla/firefox_3.6.2.bb +++ b/recipes/mozilla/firefox_3.6.2.bb @@ -3,14 +3,14 @@ DEPENDS += "cairo sqlite3 libnotify" # The .pc files below have "3.6" hardcoded, fix that before using them in a newer FF version! SRC_URI = "ftp://ftp.mozilla.org/pub/mozilla.org/firefox/releases/${PV}/source/firefox-${PV}.source.tar.bz2;name=archive \ file://jsautocfg.h \ - file://security-cross.patch;patch=1 \ - file://Bug339782.additional.fix.diff;patch=1 \ - file://Bug385583.nspr.jmp_buf.eabi.diff;patch=1 \ - file://Bug405992.atomic.nspr.diff;patch=1 \ - file://jemalloc-tls.patch;patch=1 \ - file://0001-Remove-Werror-from-build.patch;patch=1 \ - file://0002-Fix-security-cross-compile-cpu-detection-error.patch;patch=1 \ - file://plugins-dir.patch;patch=1 \ + file://security-cross.patch \ + file://Bug339782.additional.fix.diff \ + file://Bug385583.nspr.jmp_buf.eabi.diff \ + file://Bug405992.atomic.nspr.diff \ + file://jemalloc-tls.patch \ + file://0001-Remove-Werror-from-build.patch \ + file://0002-Fix-security-cross-compile-cpu-detection-error.patch \ + file://plugins-dir.patch \ file://firefox-plugin.pc \ file://firefox-xpcom.pc \ file://nspr.pc \ diff --git a/recipes/mozilla/firefox_3.6.3.bb b/recipes/mozilla/firefox_3.6.3.bb new file mode 100644 index 0000000000..98a0e400bd --- /dev/null +++ b/recipes/mozilla/firefox_3.6.3.bb @@ -0,0 +1,36 @@ +DEPENDS += "cairo sqlite3 libnotify" + +# The .pc files below have "3.6" hardcoded, fix that before using them in a newer FF version! +SRC_URI = "ftp://ftp.mozilla.org/pub/mozilla.org/firefox/releases/${PV}/source/firefox-${PV}.source.tar.bz2;name=archive \ + file://jsautocfg.h \ + file://security-cross.patch \ + file://Bug339782.additional.fix.diff \ + file://Bug385583.nspr.jmp_buf.eabi.diff \ + file://Bug405992.atomic.nspr.diff \ + file://jemalloc-tls.patch \ + file://0001-Remove-Werror-from-build.patch \ + file://0002-Fix-security-cross-compile-cpu-detection-error.patch \ + file://plugins-dir.patch \ + file://firefox-plugin.pc \ + file://firefox-xpcom.pc \ + file://nspr.pc \ +" + +SRC_URI[archive.md5sum] = "5e4541ab23084b7b14ba228291ce2688" +SRC_URI[archive.sha256sum] = "35a0b35d79baa502b6c5781ed3e9c4b5eb623bdaf1940460dcf465192848a2d0" + +S = "${WORKDIR}/mozilla-1.9.2" + +inherit mozilla +require firefox.inc + +EXTRA_OECONF += " --enable-official-branding --disable-crashreporter" + + +FULL_OPTIMIZATION = "-fexpensive-optimizations -fomit-frame-pointer -frename-registers -O2" + +do_compile_prepend() { + cp ${WORKDIR}/jsautocfg.h ${S}/js/src/ + sed -i "s|CPU_ARCH =|CPU_ARCH = ${TARGET_ARCH}|" security/coreconf/Linux.mk +} + diff --git a/recipes/mozilla/firefox_3.6.bb b/recipes/mozilla/firefox_3.6.bb index 573154f3aa..cb542cbc5d 100644 --- a/recipes/mozilla/firefox_3.6.bb +++ b/recipes/mozilla/firefox_3.6.bb @@ -5,14 +5,14 @@ PR = "r4" # The .pc files below have "3.6" hardcoded, fix that before using them in a newer FF version! SRC_URI = "ftp://ftp.mozilla.org/pub/mozilla.org/firefox/releases/${PV}/source/firefox-${PV}.source.tar.bz2;name=archive \ file://jsautocfg.h \ - file://security-cross.patch;patch=1 \ - file://Bug339782.additional.fix.diff;patch=1 \ - file://Bug385583.nspr.jmp_buf.eabi.diff;patch=1 \ - file://Bug405992.atomic.nspr.diff;patch=1 \ - file://jemalloc-tls.patch;patch=1 \ - file://0001-Remove-Werror-from-build.patch;patch=1 \ - file://0002-Fix-security-cross-compile-cpu-detection-error.patch;patch=1 \ - file://plugins-dir.patch;patch=1 \ + file://security-cross.patch \ + file://Bug339782.additional.fix.diff \ + file://Bug385583.nspr.jmp_buf.eabi.diff \ + file://Bug405992.atomic.nspr.diff \ + file://jemalloc-tls.patch \ + file://0001-Remove-Werror-from-build.patch \ + file://0002-Fix-security-cross-compile-cpu-detection-error.patch \ + file://plugins-dir.patch \ file://firefox-plugin.pc \ file://firefox-xpcom.pc \ file://nspr.pc \ diff --git a/recipes/mozilla/firefox_hg.bb b/recipes/mozilla/firefox_hg.bb index 37bb2608bd..c6ea7d1629 100644 --- a/recipes/mozilla/firefox_hg.bb +++ b/recipes/mozilla/firefox_hg.bb @@ -9,7 +9,7 @@ DEFAULT_PREFERENCE = "-1" SRC_URI = "hg://hg.mozilla.org/;module=mozilla-central;rev=8c9a6d851018 \ file://jsautocfg.h \ - file://jsautocfg-dontoverwrite.patch;patch=1 \ + file://jsautocfg-dontoverwrite.patch \ " S = "${WORKDIR}/mozilla-central" diff --git a/recipes/mozilla/minimo_cvs.bb b/recipes/mozilla/minimo_cvs.bb index 25ab87a181..3c274ea28b 100644 --- a/recipes/mozilla/minimo_cvs.bb +++ b/recipes/mozilla/minimo_cvs.bb @@ -16,14 +16,14 @@ PE = "1" PR = "r1" SRC_URI = "cvs://anonymous@${CVSSVR}/cvsroot;module=mozilla;tag=${BRTAG};date=${MOZDATE} \ - file://minimo.patch;patch=1 \ - file://bug-322806.diff;patch=1 \ + file://minimo.patch \ + file://bug-322806.diff \ file://mozconfig file://minimo \ - file://eabi-fix.patch;patch=1 \ - file://eabi-fix2.patch;patch=1 \ - file://eabi-fix3.patch;patch=1 \ - file://minimo-components-ssr-only.patch;patch=1 \ - file://minimo-disable-mode-switch.patch;patch=1 \ + file://eabi-fix.patch \ + file://eabi-fix2.patch \ + file://eabi-fix3.patch \ + file://minimo-components-ssr-only.patch \ + file://minimo-disable-mode-switch.patch \ file://minimo.desktop file://minimo.png" inherit autotools diff --git a/recipes/mozilla/nspr-tools-native_4.7.1.bb b/recipes/mozilla/nspr-tools-native_4.7.1.bb index 5fc9a32960..3aa38647c1 100644 --- a/recipes/mozilla/nspr-tools-native_4.7.1.bb +++ b/recipes/mozilla/nspr-tools-native_4.7.1.bb @@ -2,11 +2,11 @@ require nspr-tools-native.inc SRC_URI = "\ http://ftp.mozilla.org/pub/mozilla.org/nspr/releases/v${PV}/src/nspr-${PV}.tar.gz;name=archive \ - file://30_config_64bits.dpatch;patch=1 \ - file://30_pkgconfig.dpatch;patch=1 \ - file://81_sonames.dpatch;patch=1 \ - file://99_configure.dpatch;patch=1 \ - file://unbreak-build.diff;patch=1 \ + file://30_config_64bits.dpatch;apply=yes \ + file://30_pkgconfig.dpatch;apply=yes \ + file://81_sonames.dpatch;apply=yes \ + file://99_configure.dpatch;apply=yes \ + file://unbreak-build.diff \ " SRC_URI[archive.md5sum] = "7c6e75a0867ce2b9ec62e399a908b5ac" diff --git a/recipes/mozilla/nspr_4.7.1.bb b/recipes/mozilla/nspr_4.7.1.bb index 92ed18d3c3..7120764d17 100644 --- a/recipes/mozilla/nspr_4.7.1.bb +++ b/recipes/mozilla/nspr_4.7.1.bb @@ -2,11 +2,11 @@ require nspr.inc SRC_URI = "\ http://ftp.mozilla.org/pub/mozilla.org/nspr/releases/v${PV}/src/nspr-${PV}.tar.gz;name=archive \ - file://30_config_64bits.dpatch;patch=1 \ - file://30_pkgconfig.dpatch;patch=1 \ - file://81_sonames.dpatch;patch=1 \ - file://99_configure.dpatch;patch=1 \ - file://unbreak-build.diff;patch=1 \ + file://30_config_64bits.dpatch;apply=yes \ + file://30_pkgconfig.dpatch;apply=yes \ + file://81_sonames.dpatch;apply=yes \ + file://99_configure.dpatch;apply=yes \ + file://unbreak-build.diff \ " SRC_URI[archive.md5sum] = "7c6e75a0867ce2b9ec62e399a908b5ac" diff --git a/recipes/mozilla/nss_3.12.6.bb b/recipes/mozilla/nss_3.12.6.bb index 76ad318a7e..a1b97eb2f1 100644 --- a/recipes/mozilla/nss_3.12.6.bb +++ b/recipes/mozilla/nss_3.12.6.bb @@ -9,21 +9,21 @@ DEPENDS = "sqlite3 nspr" SRC_URI = "\ http://ftp.mozilla.org/pub/mozilla.org/security/nss/releases/NSS_3_12_6_RTM/src/${PN}-${PV}.tar.gz;name=archive \ - file://00_ckbi_1.79.patch;patch=1 \ - file://25_entropy.patch;patch=1 \ - file://38_hurd.patch;patch=1 \ - file://38_kbsd.patch;patch=1 \ - file://38_mips64_build.patch;patch=1 \ - file://80_security_build.patch;patch=1 \ - file://80_security_tools.patch;patch=1 \ - file://81_sonames.patch;patch=1 \ - file://85_security_load.patch;patch=1 \ - file://90_realpath.patch;patch=1 \ - file://91_build_pwdecrypt.patch;patch=1 \ - file://95_add_spi+cacert_ca_certs.patch;patch=1 \ - file://96_NSS_VersionCheck.patch;patch=1 \ - file://97_SSL_RENEGOTIATE_TRANSITIONAL.patch;patch=1 \ - file://build-fix.patch;patch=1;pnum=0 \ + file://00_ckbi_1.79.patch \ + file://25_entropy.patch \ + file://38_hurd.patch \ + file://38_kbsd.patch \ + file://38_mips64_build.patch \ + file://80_security_build.patch \ + file://80_security_tools.patch \ + file://81_sonames.patch \ + file://85_security_load.patch \ + file://90_realpath.patch \ + file://91_build_pwdecrypt.patch \ + file://95_add_spi+cacert_ca_certs.patch \ + file://96_NSS_VersionCheck.patch \ + file://97_SSL_RENEGOTIATE_TRANSITIONAL.patch \ + file://build-fix.patch;striplevel=0 \ file://nss.pc.in \ " diff --git a/recipes/mozilla/nss_3.12.bb b/recipes/mozilla/nss_3.12.bb index a6408954cb..ac0947f5e3 100644 --- a/recipes/mozilla/nss_3.12.bb +++ b/recipes/mozilla/nss_3.12.bb @@ -9,16 +9,16 @@ DEPENDS = "sqlite3 nspr" SRC_URI = "\ http://ftp.mozilla.org/pub/mozilla.org/security/nss/releases/NSS_3_12_RTM/src/${PN}-${PV}.tar.gz;name=archive \ - file://25_entropy.dpatch;patch=1 \ - file://38_mips64_build.dpatch;patch=1 \ - file://80_security_build.dpatch;patch=1 \ - file://80_security_tools.dpatch;patch=1 \ - file://81_sonames.dpatch;patch=1 \ - file://85_security_load.dpatch;patch=1 \ - file://90_realpath.dpatch;patch=1 \ - file://91_build_pwdecrypt.dpatch;patch=1 \ - file://95_add_spi+cacert_ca_certs.dpatch;patch=1 \ - file://build-fix.patch;patch=1 \ + file://25_entropy.dpatch;apply=yes \ + file://38_mips64_build.dpatch;apply=yes \ + file://80_security_build.dpatch;apply=yes \ + file://80_security_tools.dpatch;apply=yes \ + file://81_sonames.dpatch;apply=yes \ + file://85_security_load.dpatch;apply=yes \ + file://90_realpath.dpatch;apply=yes \ + file://91_build_pwdecrypt.dpatch;apply=yes \ + file://95_add_spi+cacert_ca_certs.dpatch;apply=yes \ + file://build-fix.patch \ file://nss.pc.in \ " diff --git a/recipes/mozilla/thunderbird_1.0.7.bb b/recipes/mozilla/thunderbird_1.0.7.bb index cc4e6744c0..e7f4d37c8e 100644 --- a/recipes/mozilla/thunderbird_1.0.7.bb +++ b/recipes/mozilla/thunderbird_1.0.7.bb @@ -8,10 +8,10 @@ IPCVER="1.1.3" SRC_URI = "http://ftp.mozilla.org/pub/mozilla.org/thunderbird/releases/${PV}/source/thunderbird-${PV}-source.tar.bz2;name=archive \ http://downloads.mozdev.org/enigmail/src/enigmail-${EMVER}.tar.gz;name=enigmail \ http://downloads.mozdev.org/enigmail/src/ipc-${IPCVER}.tar.gz;name=ipc \ - file://xptcstubs.patch;patch=1 \ - file://no-xmb.patch;patch=1 \ - file://extensions-hack.patch;patch=1 \ - file://firefox-1.0-gcc4-compile.patch;patch=1;pnum=0 \ + file://xptcstubs.patch \ + file://no-xmb.patch \ + file://extensions-hack.patch \ + file://firefox-1.0-gcc4-compile.patch;striplevel=0 \ file://mozilla-thunderbird.png file://mozilla-thunderbird.desktop" S = "${WORKDIR}/mozilla" |