diff options
Diffstat (limited to 'recipes/mozilla')
181 files changed, 87 insertions, 13163 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..e693f639b9 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/gfxPlatformGtk.cpp 2010-04-19 18:02:04.000000000 +0000 ++++ b/gfx/thebes/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; @@ -72,10 +45,5 @@ diff -r f603fec24bf7 gfx/thebes/src/gfxPlatformGtk.cpp + } + if (!xrenderFormat) xrenderFormat = XRenderFindStandardFormat(display, xrenderFormatID); - if (xrenderFormat && sizeOk) { + if (xrenderFormat) { 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 1e69aed469..2d44e9ae10 100644 --- a/recipes/mozilla/fennec_hg.bb +++ b/recipes/mozilla/fennec_hg.bb @@ -1,14 +1,14 @@ DESCRIPTION = "Mozilla Mobile browser" PV = "0.9+${MOZPV}" -MOZPV = "1.1b2" -PR = "r8" +MOZPV = "2.0a1pre" +PR = "r10" PE = "1" -SRC_URI = "hg://hg.mozilla.org/;module=mozilla-central;rev=060ddfe5aa48 \ - hg://hg.mozilla.org/;module=mobile-browser;rev=ad254d8abbc9 \ +SRC_URI = "hg://hg.mozilla.org;module=mozilla-central;rev=ad5644e101fd \ + hg://hg.mozilla.org;module=mobile-browser;rev=457ffb726aeb \ file://jsautocfg.h \ - file://jsautocfg-dontoverwrite.patch;patch=1 \ + file://jsautocfg-dontoverwrite.patch \ " S = "${WORKDIR}/mozilla-central" diff --git a/recipes/mozilla/firefox-2.0.0.3/jsautocfg-dontoverwrite.patch b/recipes/mozilla/firefox-2.0.0.3/jsautocfg-dontoverwrite.patch deleted file mode 100644 index 39978cfd11..0000000000 --- a/recipes/mozilla/firefox-2.0.0.3/jsautocfg-dontoverwrite.patch +++ /dev/null @@ -1,23 +0,0 @@ ---- mozilla/js/src/Makefile.in.orig 2006-12-12 11:46:02.000000000 +0000 -+++ mozilla/js/src/Makefile.in 2006-12-12 11:46:27.000000000 +0000 -@@ -319,20 +319,8 @@ - - jsopcode.h jsopcode.c: jsopcode.tbl - --ifeq (,$(CROSS_COMPILE)$(filter-out WINNT,$(OS_ARCH))) - jsautocfg.h: - touch $@ --else --ifeq ($(OS_ARCH),WINCE) --jsautocfg.h: -- touch $@ --else --jsautocfg.h: jscpucfg$(HOST_BIN_SUFFIX) -- @rm -f $@ jsautocfg.tmp -- ./jscpucfg > jsautocfg.tmp -- mv jsautocfg.tmp $@ --endif --endif - - # jscpucfg is a strange target - # Needs to be built with the host compiler but needs to include diff --git a/recipes/mozilla/firefox-2.0.0.3/jsdtoa-float-type.patch b/recipes/mozilla/firefox-2.0.0.3/jsdtoa-float-type.patch deleted file mode 100644 index 028900fa1b..0000000000 --- a/recipes/mozilla/firefox-2.0.0.3/jsdtoa-float-type.patch +++ /dev/null @@ -1,13 +0,0 @@ -Index: mozilla/js/src/jsdtoa.c -=================================================================== ---- mozilla.orig/js/src/jsdtoa.c -+++ mozilla/js/src/jsdtoa.c -@@ -175,7 +175,7 @@ - * #define NO_IEEE_Scale to disable new (Feb. 1997) logic in strtod that - * avoids underflows on inputs whose result does not underflow. - */ --#ifdef IS_LITTLE_ENDIAN -+#if defined(IS_LITTLE_ENDIAN) && (!defined(__arm__) || defined(__VFP_FP__)) - #define IEEE_8087 - #else - #define IEEE_MC68k diff --git a/recipes/mozilla/firefox-2.0.0.3/mozconfig b/recipes/mozilla/firefox-2.0.0.3/mozconfig deleted file mode 100644 index 96caace6bb..0000000000 --- a/recipes/mozilla/firefox-2.0.0.3/mozconfig +++ /dev/null @@ -1,60 +0,0 @@ -. $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-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 --disable-necko-disk-cache - -# 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 --enable-debug=-ggdb -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 - -# build crypto module (PSM + NSS) -ac_add_options --enable-crypto - -# build minimal set of protocol handlers -ac_add_options --enable-necko-protocols=http,file,res,jar,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=-O1 - -# Use cairo from system -ac_add_options --enable-system-cairo diff --git a/recipes/mozilla/firefox-2.0.0.3/mozilla-eabi.patch b/recipes/mozilla/firefox-2.0.0.3/mozilla-eabi.patch deleted file mode 100644 index fe9adf088e..0000000000 --- a/recipes/mozilla/firefox-2.0.0.3/mozilla-eabi.patch +++ /dev/null @@ -1,42 +0,0 @@ ---- nspr-4.6.6/mozilla/nsprpub/pr/src/misc/prdtoa.c.orig 2007-05-06 02:39:00.000000000 +0200 -+++ nspr-4.6.6/mozilla/nsprpub/pr/src/misc/prdtoa.c 2007-05-06 02:39:22.000000000 +0200 -@@ -59,8 +59,8 @@ - /* FIXME: deal with freelist and p5s. */ - } - --#if defined(__arm) || defined(__arm__) || defined(__arm26__) \ -- || defined(__arm32__) -+#if (defined(__arm) || defined(__arm__) || defined(__arm26__) \ -+ || defined(__arm32__)) && !defined(__ARM_EABI__) && !defined(__ARMEB__) - #define IEEE_ARM - #elif defined(IS_LITTLE_ENDIAN) - #define IEEE_8087 ---- nspr-4.6.6/mozilla/nsprpub/pr/include/md/_linux.h.orig 2007-05-06 02:39:45.000000000 +0200 -+++ nspr-4.6.6/mozilla/nsprpub/pr/include/md/_linux.h 2007-05-06 02:40:57.000000000 +0200 -@@ -346,7 +346,7 @@ - #error "Linux/MIPS pre-glibc2 not supported yet" - #endif /* defined(__GLIBC__) && __GLIBC__ >= 2 */ - --#elif defined(__arm__) -+#elif defined(__arm__) && !defined(__ARM_EABI__) - /* ARM/Linux */ - #if defined(__GLIBC__) && __GLIBC__ >= 2 - #define _MD_GET_SP(_t) (_t)->md.context[0].__jmpbuf[20] - <at> <at> -358,6 +358,18 <at> <at> - #error "ARM/Linux pre-glibc2 not supported yet" - #endif /* defined(__GLIBC__) && __GLIBC__ >= 2 */ - -+#elif defined(__arm__) && defined(__ARM_EABI__) -+/* ARM/Linux */ -+#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 - diff --git a/recipes/mozilla/firefox-2.0.0.3/mult-crash-fix.patch b/recipes/mozilla/firefox-2.0.0.3/mult-crash-fix.patch deleted file mode 100644 index cb30f896ed..0000000000 --- a/recipes/mozilla/firefox-2.0.0.3/mult-crash-fix.patch +++ /dev/null @@ -1,14 +0,0 @@ -$OpenBSD: patch-nsprpub_pr_src_misc_prdtoa_c,v 1.1 2005/11/03 00:59:43 pvalchev Exp $ -Index: mozilla/nsprpub/pr/src/misc/prdtoa.c -=================================================================== ---- mozilla.orig/nsprpub/pr/src/misc/prdtoa.c -+++ mozilla/nsprpub/pr/src/misc/prdtoa.c -@@ -855,7 +855,7 @@ mult - wc = wa + wb; - if (wc > a->maxwds) - k++; -- c = Balloc(k); -+ c = Balloc(k*2); - for(x = c->x, xa = x + wc; x < xa; x++) - *x = 0; - xa = a->x; diff --git a/recipes/mozilla/firefox-2.0.0.3/security-cross.patch b/recipes/mozilla/firefox-2.0.0.3/security-cross.patch deleted file mode 100644 index 56c8d04a9e..0000000000 --- a/recipes/mozilla/firefox-2.0.0.3/security-cross.patch +++ /dev/null @@ -1,93 +0,0 @@ ---- mozilla/security/coreconf/Linux.mk.orig 2006-12-12 10:53:12.000000000 +0000 -+++ mozilla/security/coreconf/Linux.mk 2006-12-12 10:54:13.000000000 +0000 -@@ -52,88 +52,8 @@ - - DEFAULT_COMPILER = gcc - --ifeq ($(OS_TEST),m68k) -- OS_REL_CFLAGS = -DLINUX1_2 -D_XOPEN_SOURCE -- CPU_ARCH = m68k --else --ifeq ($(OS_TEST),ppc64) -- OS_REL_CFLAGS = -DLINUX1_2 -D_XOPEN_SOURCE -- CPU_ARCH = ppc --ifeq ($(USE_64),1) -- ARCHFLAG = -m64 --endif --else --ifeq ($(OS_TEST),ppc) -- OS_REL_CFLAGS = -DLINUX1_2 -D_XOPEN_SOURCE -- CPU_ARCH = ppc --else --ifeq ($(OS_TEST),alpha) -- OS_REL_CFLAGS = -D_ALPHA_ -DLINUX1_2 -D_XOPEN_SOURCE -- CPU_ARCH = alpha --else --ifeq ($(OS_TEST),ia64) -- OS_REL_CFLAGS = -DLINUX1_2 -D_XOPEN_SOURCE -- CPU_ARCH = ia64 --else --ifeq ($(OS_TEST),x86_64) --ifeq ($(USE_64),1) -- OS_REL_CFLAGS = -DLINUX1_2 -D_XOPEN_SOURCE -- CPU_ARCH = x86_64 --else -- OS_REL_CFLAGS = -DLINUX1_2 -Di386 -D_XOPEN_SOURCE -- CPU_ARCH = x86 -- ARCHFLAG = -m32 --endif --else --ifeq ($(OS_TEST),sparc) -- OS_REL_CFLAGS = -DLINUX1_2 -D_XOPEN_SOURCE -- CPU_ARCH = sparc --else --ifeq ($(OS_TEST),sparc64) -- OS_REL_CFLAGS = -DLINUX1_2 -D_XOPEN_SOURCE -- CPU_ARCH = sparc --else --ifeq (,$(filter-out arm% sa110,$(OS_TEST))) -- OS_REL_CFLAGS = -DLINUX1_2 -D_XOPEN_SOURCE -- CPU_ARCH = arm --else --ifeq ($(OS_TEST),parisc) -- OS_REL_CFLAGS = -DLINUX1_2 -D_XOPEN_SOURCE -- CPU_ARCH = hppa --else --ifeq ($(OS_TEST),parisc64) -- OS_REL_CFLAGS = -DLINUX1_2 -D_XOPEN_SOURCE -- CPU_ARCH = hppa --else --ifeq ($(OS_TEST),s390) -- OS_REL_CFLAGS = -DLINUX1_2 -D_XOPEN_SOURCE -- CPU_ARCH = s390 --else --ifeq ($(OS_TEST),s390x) -- OS_REL_CFLAGS = -DLINUX1_2 -D_XOPEN_SOURCE -- CPU_ARCH = s390x --else --ifeq ($(OS_TEST),mips) -- OS_REL_CFLAGS = -DLINUX1_2 -D_XOPEN_SOURCE -- CPU_ARCH = mips --else -- OS_REL_CFLAGS = -DLINUX1_2 -Di386 -D_XOPEN_SOURCE -- CPU_ARCH = x86 --endif --endif --endif --endif --endif --endif --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-2.0.0.3/xptcinvoke-arm.patch b/recipes/mozilla/firefox-2.0.0.3/xptcinvoke-arm.patch deleted file mode 100644 index bc0c6f4e5c..0000000000 --- a/recipes/mozilla/firefox-2.0.0.3/xptcinvoke-arm.patch +++ /dev/null @@ -1,11 +0,0 @@ ---- iceweasel-2.0.0.1+dfsg.orig/xpcom/reflect/xptcall/src/md/unix/xptcinvoke_arm.cpp -+++ iceweasel-2.0.0.1+dfsg/xpcom/reflect/xptcall/src/md/unix/xptcinvoke_arm.cpp -@@ -212,7 +212,7 @@ - "add sp, sp, r4 \n\t" /* restore stack pointer */ - "mov %0, r0 \n\t" /* the result... */ - : "=r" (result) -- : "r" (&my_params) -+ : "r" (&my_params), "m" (my_params) - : "r0", "r1", "r2", "r3", "r4", "ip", "lr", "sp" - ); - diff --git a/recipes/mozilla/firefox-2.0.0.3/xptcstubs.patch b/recipes/mozilla/firefox-2.0.0.3/xptcstubs.patch deleted file mode 100644 index f2645690f4..0000000000 --- a/recipes/mozilla/firefox-2.0.0.3/xptcstubs.patch +++ /dev/null @@ -1,13 +0,0 @@ ---- iceweasel-2.0.0.1+dfsg.orig/xpcom/reflect/xptcall/src/md/unix/xptcstubs_arm.cpp -+++ iceweasel-2.0.0.1+dfsg/xpcom/reflect/xptcall/src/md/unix/xptcstubs_arm.cpp -@@ -45,7 +45,8 @@ - #endif - - /* Specify explicitly a symbol for this function, don't try to guess the c++ mangled symbol. */ --static nsresult PrepareAndDispatch(nsXPTCStubBase* self, uint32 methodIndex, PRUint32* args) asm("_PrepareAndDispatch"); -+static nsresult PrepareAndDispatch(nsXPTCStubBase* self, uint32 methodIndex, PRUint32* args) asm("_PrepareAndDispatch") -+__attribute__((used)); - - static nsresult - PrepareAndDispatch(nsXPTCStubBase* self, uint32 methodIndex, PRUint32* args) - diff --git a/recipes/mozilla/firefox-3.0.1+3.1b1/arm/mozconfig b/recipes/mozilla/firefox-3.0.1+3.1b1/arm/mozconfig deleted file mode 100644 index 094a0ff642..0000000000 --- a/recipes/mozilla/firefox-3.0.1+3.1b1/arm/mozconfig +++ /dev/null @@ -1,67 +0,0 @@ -. $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-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 --disable-necko-disk-cache - -# 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 -ac_add_options --with-arm-kuser - -# Use cairo from system -ac_add_options --enable-system-cairo - -# Disable jemalloc -ac_add_options --disable-jemalloc - -# enable libxul -ac_add_options --enable-libxul diff --git a/recipes/mozilla/firefox-3.0.1+3.1b1/jsautocfg-dontoverwrite.patch b/recipes/mozilla/firefox-3.0.1+3.1b1/jsautocfg-dontoverwrite.patch deleted file mode 100644 index 39978cfd11..0000000000 --- a/recipes/mozilla/firefox-3.0.1+3.1b1/jsautocfg-dontoverwrite.patch +++ /dev/null @@ -1,23 +0,0 @@ ---- mozilla/js/src/Makefile.in.orig 2006-12-12 11:46:02.000000000 +0000 -+++ mozilla/js/src/Makefile.in 2006-12-12 11:46:27.000000000 +0000 -@@ -319,20 +319,8 @@ - - jsopcode.h jsopcode.c: jsopcode.tbl - --ifeq (,$(CROSS_COMPILE)$(filter-out WINNT,$(OS_ARCH))) - jsautocfg.h: - touch $@ --else --ifeq ($(OS_ARCH),WINCE) --jsautocfg.h: -- touch $@ --else --jsautocfg.h: jscpucfg$(HOST_BIN_SUFFIX) -- @rm -f $@ jsautocfg.tmp -- ./jscpucfg > jsautocfg.tmp -- mv jsautocfg.tmp $@ --endif --endif - - # jscpucfg is a strange target - # Needs to be built with the host compiler but needs to include diff --git a/recipes/mozilla/firefox-3.0.1+3.1b1/mozconfig b/recipes/mozilla/firefox-3.0.1+3.1b1/mozconfig deleted file mode 100644 index f7ab5dd3a3..0000000000 --- a/recipes/mozilla/firefox-3.0.1+3.1b1/mozconfig +++ /dev/null @@ -1,66 +0,0 @@ -. $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-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 --disable-necko-disk-cache - -# 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 diff --git a/recipes/mozilla/firefox-3.0.1+3.1b1/random_to_urandom.diff b/recipes/mozilla/firefox-3.0.1+3.1b1/random_to_urandom.diff deleted file mode 100644 index f969752381..0000000000 --- a/recipes/mozilla/firefox-3.0.1+3.1b1/random_to_urandom.diff +++ /dev/null @@ -1,26 +0,0 @@ -# Component manager should not use /dev/random for generation ranodm numbers -# It cause hangs on embedding platforms,which does not have enough devices for generation required entropy -# Bug somewhere exists but it is very old -Index: nsprpub/pr/src/md/unix/uxrng.c -=================================================================== ---- mozilla/nsprpub/pr/src/md/unix/uxrng.c.orig -+++ mozilla/nsprpub/pr/src/md/unix/uxrng.c -@@ -144,17 +144,17 @@ - #include <sys/stat.h> - #include <fcntl.h> - - static int fdDevRandom; - static PRCallOnceType coOpenDevRandom; - - static PRStatus OpenDevRandom( void ) - { -- fdDevRandom = open( "/dev/random", O_RDONLY ); -+ fdDevRandom = open( "/dev/urandom", O_RDONLY ); - return((-1 == fdDevRandom)? PR_FAILURE : PR_SUCCESS ); - } /* end OpenDevRandom() */ - - static size_t GetDevRandom( void *buf, size_t size ) - { - int bytesIn; - int rc; - diff --git a/recipes/mozilla/firefox-3.0.1+3.1b2/arm/mozconfig b/recipes/mozilla/firefox-3.0.1+3.1b2/arm/mozconfig deleted file mode 100644 index 094a0ff642..0000000000 --- a/recipes/mozilla/firefox-3.0.1+3.1b2/arm/mozconfig +++ /dev/null @@ -1,67 +0,0 @@ -. $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-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 --disable-necko-disk-cache - -# 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 -ac_add_options --with-arm-kuser - -# Use cairo from system -ac_add_options --enable-system-cairo - -# Disable jemalloc -ac_add_options --disable-jemalloc - -# enable libxul -ac_add_options --enable-libxul diff --git a/recipes/mozilla/firefox-3.0.1+3.1b2/jsautocfg-dontoverwrite.patch b/recipes/mozilla/firefox-3.0.1+3.1b2/jsautocfg-dontoverwrite.patch deleted file mode 100644 index 39978cfd11..0000000000 --- a/recipes/mozilla/firefox-3.0.1+3.1b2/jsautocfg-dontoverwrite.patch +++ /dev/null @@ -1,23 +0,0 @@ ---- mozilla/js/src/Makefile.in.orig 2006-12-12 11:46:02.000000000 +0000 -+++ mozilla/js/src/Makefile.in 2006-12-12 11:46:27.000000000 +0000 -@@ -319,20 +319,8 @@ - - jsopcode.h jsopcode.c: jsopcode.tbl - --ifeq (,$(CROSS_COMPILE)$(filter-out WINNT,$(OS_ARCH))) - jsautocfg.h: - touch $@ --else --ifeq ($(OS_ARCH),WINCE) --jsautocfg.h: -- touch $@ --else --jsautocfg.h: jscpucfg$(HOST_BIN_SUFFIX) -- @rm -f $@ jsautocfg.tmp -- ./jscpucfg > jsautocfg.tmp -- mv jsautocfg.tmp $@ --endif --endif - - # jscpucfg is a strange target - # Needs to be built with the host compiler but needs to include diff --git a/recipes/mozilla/firefox-3.0.1+3.1b2/mozconfig b/recipes/mozilla/firefox-3.0.1+3.1b2/mozconfig deleted file mode 100644 index f7ab5dd3a3..0000000000 --- a/recipes/mozilla/firefox-3.0.1+3.1b2/mozconfig +++ /dev/null @@ -1,66 +0,0 @@ -. $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-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 --disable-necko-disk-cache - -# 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 diff --git a/recipes/mozilla/firefox-3.0.1/0001-Remove-Werror-from-build.patch b/recipes/mozilla/firefox-3.0.1/0001-Remove-Werror-from-build.patch deleted file mode 100644 index 8fe1087b4d..0000000000 --- a/recipes/mozilla/firefox-3.0.1/0001-Remove-Werror-from-build.patch +++ /dev/null @@ -1,45 +0,0 @@ -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(-) - -diff --git a/configure b/configure -index a2d84ab..402e70a 100755 ---- a/configure -+++ b/configure -@@ -5344,7 +5344,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' - _MOZ_RTTI_FLAGS_ON=${_COMPILER_PREFIX}-frtti -@@ -6811,7 +6811,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" -@@ -7048,7 +7048,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 $@' --- -1.5.4.3 diff --git a/recipes/mozilla/firefox-3.0.1/jsautocfg-dontoverwrite.patch b/recipes/mozilla/firefox-3.0.1/jsautocfg-dontoverwrite.patch deleted file mode 100644 index 39978cfd11..0000000000 --- a/recipes/mozilla/firefox-3.0.1/jsautocfg-dontoverwrite.patch +++ /dev/null @@ -1,23 +0,0 @@ ---- mozilla/js/src/Makefile.in.orig 2006-12-12 11:46:02.000000000 +0000 -+++ mozilla/js/src/Makefile.in 2006-12-12 11:46:27.000000000 +0000 -@@ -319,20 +319,8 @@ - - jsopcode.h jsopcode.c: jsopcode.tbl - --ifeq (,$(CROSS_COMPILE)$(filter-out WINNT,$(OS_ARCH))) - jsautocfg.h: - touch $@ --else --ifeq ($(OS_ARCH),WINCE) --jsautocfg.h: -- touch $@ --else --jsautocfg.h: jscpucfg$(HOST_BIN_SUFFIX) -- @rm -f $@ jsautocfg.tmp -- ./jscpucfg > jsautocfg.tmp -- mv jsautocfg.tmp $@ --endif --endif - - # jscpucfg is a strange target - # Needs to be built with the host compiler but needs to include diff --git a/recipes/mozilla/firefox-3.0.1/linkage-problem.patch b/recipes/mozilla/firefox-3.0.1/linkage-problem.patch deleted file mode 100644 index 28bffd1e22..0000000000 --- a/recipes/mozilla/firefox-3.0.1/linkage-problem.patch +++ /dev/null @@ -1,14 +0,0 @@ ---- 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.0.1/mozconfig b/recipes/mozilla/firefox-3.0.1/mozconfig deleted file mode 100644 index 652c780bbd..0000000000 --- a/recipes/mozilla/firefox-3.0.1/mozconfig +++ /dev/null @@ -1,67 +0,0 @@ -. $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 --disable-necko-disk-cache - -# 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 diff --git a/recipes/mozilla/firefox-3.0.1/random_to_urandom.diff b/recipes/mozilla/firefox-3.0.1/random_to_urandom.diff deleted file mode 100644 index f969752381..0000000000 --- a/recipes/mozilla/firefox-3.0.1/random_to_urandom.diff +++ /dev/null @@ -1,26 +0,0 @@ -# Component manager should not use /dev/random for generation ranodm numbers -# It cause hangs on embedding platforms,which does not have enough devices for generation required entropy -# Bug somewhere exists but it is very old -Index: nsprpub/pr/src/md/unix/uxrng.c -=================================================================== ---- mozilla/nsprpub/pr/src/md/unix/uxrng.c.orig -+++ mozilla/nsprpub/pr/src/md/unix/uxrng.c -@@ -144,17 +144,17 @@ - #include <sys/stat.h> - #include <fcntl.h> - - static int fdDevRandom; - static PRCallOnceType coOpenDevRandom; - - static PRStatus OpenDevRandom( void ) - { -- fdDevRandom = open( "/dev/random", O_RDONLY ); -+ fdDevRandom = open( "/dev/urandom", O_RDONLY ); - return((-1 == fdDevRandom)? PR_FAILURE : PR_SUCCESS ); - } /* end OpenDevRandom() */ - - static size_t GetDevRandom( void *buf, size_t size ) - { - int bytesIn; - int rc; - diff --git a/recipes/mozilla/firefox-3.0.1/security-cross.patch b/recipes/mozilla/firefox-3.0.1/security-cross.patch deleted file mode 100644 index 56c8d04a9e..0000000000 --- a/recipes/mozilla/firefox-3.0.1/security-cross.patch +++ /dev/null @@ -1,93 +0,0 @@ ---- mozilla/security/coreconf/Linux.mk.orig 2006-12-12 10:53:12.000000000 +0000 -+++ mozilla/security/coreconf/Linux.mk 2006-12-12 10:54:13.000000000 +0000 -@@ -52,88 +52,8 @@ - - DEFAULT_COMPILER = gcc - --ifeq ($(OS_TEST),m68k) -- OS_REL_CFLAGS = -DLINUX1_2 -D_XOPEN_SOURCE -- CPU_ARCH = m68k --else --ifeq ($(OS_TEST),ppc64) -- OS_REL_CFLAGS = -DLINUX1_2 -D_XOPEN_SOURCE -- CPU_ARCH = ppc --ifeq ($(USE_64),1) -- ARCHFLAG = -m64 --endif --else --ifeq ($(OS_TEST),ppc) -- OS_REL_CFLAGS = -DLINUX1_2 -D_XOPEN_SOURCE -- CPU_ARCH = ppc --else --ifeq ($(OS_TEST),alpha) -- OS_REL_CFLAGS = -D_ALPHA_ -DLINUX1_2 -D_XOPEN_SOURCE -- CPU_ARCH = alpha --else --ifeq ($(OS_TEST),ia64) -- OS_REL_CFLAGS = -DLINUX1_2 -D_XOPEN_SOURCE -- CPU_ARCH = ia64 --else --ifeq ($(OS_TEST),x86_64) --ifeq ($(USE_64),1) -- OS_REL_CFLAGS = -DLINUX1_2 -D_XOPEN_SOURCE -- CPU_ARCH = x86_64 --else -- OS_REL_CFLAGS = -DLINUX1_2 -Di386 -D_XOPEN_SOURCE -- CPU_ARCH = x86 -- ARCHFLAG = -m32 --endif --else --ifeq ($(OS_TEST),sparc) -- OS_REL_CFLAGS = -DLINUX1_2 -D_XOPEN_SOURCE -- CPU_ARCH = sparc --else --ifeq ($(OS_TEST),sparc64) -- OS_REL_CFLAGS = -DLINUX1_2 -D_XOPEN_SOURCE -- CPU_ARCH = sparc --else --ifeq (,$(filter-out arm% sa110,$(OS_TEST))) -- OS_REL_CFLAGS = -DLINUX1_2 -D_XOPEN_SOURCE -- CPU_ARCH = arm --else --ifeq ($(OS_TEST),parisc) -- OS_REL_CFLAGS = -DLINUX1_2 -D_XOPEN_SOURCE -- CPU_ARCH = hppa --else --ifeq ($(OS_TEST),parisc64) -- OS_REL_CFLAGS = -DLINUX1_2 -D_XOPEN_SOURCE -- CPU_ARCH = hppa --else --ifeq ($(OS_TEST),s390) -- OS_REL_CFLAGS = -DLINUX1_2 -D_XOPEN_SOURCE -- CPU_ARCH = s390 --else --ifeq ($(OS_TEST),s390x) -- OS_REL_CFLAGS = -DLINUX1_2 -D_XOPEN_SOURCE -- CPU_ARCH = s390x --else --ifeq ($(OS_TEST),mips) -- OS_REL_CFLAGS = -DLINUX1_2 -D_XOPEN_SOURCE -- CPU_ARCH = mips --else -- OS_REL_CFLAGS = -DLINUX1_2 -Di386 -D_XOPEN_SOURCE -- CPU_ARCH = x86 --endif --endif --endif --endif --endif --endif --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-3.0.1/wchart.diff b/recipes/mozilla/firefox-3.0.1/wchart.diff deleted file mode 100644 index 61ef5928d2..0000000000 --- a/recipes/mozilla/firefox-3.0.1/wchart.diff +++ /dev/null @@ -1,5850 +0,0 @@ ---- iceweasel-3.0.1.orig/configure -+++ iceweasel-3.0.1/configure -@@ -1110,7 +1110,7 @@ - MSMANIFEST_TOOL= - - MISSING_X= --for ac_prog in gawk mawk nawk awk -+for ac_prog in mawk gawk nawk awk - do - # Extract the first word of "$ac_prog", so it can be a program name with args. - set dummy $ac_prog; ac_word=$2 -@@ -1897,57 +1897,6 @@ - fi - fi - --for ac_declaration in \ -- ''\ -- '#include <stdlib.h>' \ -- 'extern "C" void std::exit (int) throw (); using std::exit;' \ -- 'extern "C" void std::exit (int); using std::exit;' \ -- 'extern "C" void exit (int) throw ();' \ -- 'extern "C" void exit (int);' \ -- 'void exit (int);' --do -- cat > conftest.$ac_ext <<EOF --#line 1911 "configure" --#include "confdefs.h" --#include <stdlib.h> --$ac_declaration --int main() { --exit (42); --; return 0; } --EOF --if { (eval echo configure:1919: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then -- : --else -- echo "configure: failed program was:" >&5 -- cat conftest.$ac_ext >&5 -- rm -rf conftest* -- continue --fi --rm -f conftest* -- cat > conftest.$ac_ext <<EOF --#line 1929 "configure" --#include "confdefs.h" --$ac_declaration --int main() { --exit (42); --; return 0; } --EOF --if { (eval echo configure:1936: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then -- rm -rf conftest* -- break --else -- echo "configure: failed program was:" >&5 -- cat conftest.$ac_ext >&5 --fi --rm -f conftest* --done --if test -n "$ac_declaration"; then -- echo '#ifdef __cplusplus' >>confdefs.h -- echo $ac_declaration >>confdefs.h -- echo '#endif' >>confdefs.h --fi -- -- - - case "$build:$target" in - powerpc-apple-darwin8*:i?86-apple-darwin*) -@@ -1961,7 +1910,7 @@ - # Extract the first word of "$ac_prog", so it can be a program name with args. - set dummy $ac_prog; ac_word=$2 - echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 --echo "configure:1965: checking for $ac_word" >&5 -+echo "configure:1914: checking for $ac_word" >&5 - if eval "test \"`echo '$''{'ac_cv_prog_RANLIB'+set}'`\" = set"; then - echo $ac_n "(cached) $ac_c" 1>&6 - else -@@ -1996,7 +1945,7 @@ - # Extract the first word of "$ac_prog", so it can be a program name with args. - set dummy $ac_prog; ac_word=$2 - echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 --echo "configure:2000: checking for $ac_word" >&5 -+echo "configure:1949: checking for $ac_word" >&5 - if eval "test \"`echo '$''{'ac_cv_prog_AR'+set}'`\" = set"; then - echo $ac_n "(cached) $ac_c" 1>&6 - else -@@ -2031,7 +1980,7 @@ - # Extract the first word of "$ac_prog", so it can be a program name with args. - set dummy $ac_prog; ac_word=$2 - echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 --echo "configure:2035: checking for $ac_word" >&5 -+echo "configure:1984: checking for $ac_word" >&5 - if eval "test \"`echo '$''{'ac_cv_path_AS'+set}'`\" = set"; then - echo $ac_n "(cached) $ac_c" 1>&6 - else -@@ -2072,7 +2021,7 @@ - # Extract the first word of "$ac_prog", so it can be a program name with args. - set dummy $ac_prog; ac_word=$2 - echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 --echo "configure:2076: checking for $ac_word" >&5 -+echo "configure:2025: checking for $ac_word" >&5 - if eval "test \"`echo '$''{'ac_cv_prog_LD'+set}'`\" = set"; then - echo $ac_n "(cached) $ac_c" 1>&6 - else -@@ -2107,7 +2056,7 @@ - # Extract the first word of "$ac_prog", so it can be a program name with args. - set dummy $ac_prog; ac_word=$2 - echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 --echo "configure:2111: checking for $ac_word" >&5 -+echo "configure:2060: checking for $ac_word" >&5 - if eval "test \"`echo '$''{'ac_cv_prog_STRIP'+set}'`\" = set"; then - echo $ac_n "(cached) $ac_c" 1>&6 - else -@@ -2142,7 +2091,7 @@ - # Extract the first word of "$ac_prog", so it can be a program name with args. - set dummy $ac_prog; ac_word=$2 - echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 --echo "configure:2146: checking for $ac_word" >&5 -+echo "configure:2095: checking for $ac_word" >&5 - if eval "test \"`echo '$''{'ac_cv_prog_WINDRES'+set}'`\" = set"; then - echo $ac_n "(cached) $ac_c" 1>&6 - else -@@ -2180,7 +2129,7 @@ - # Extract the first word of "gcc", so it can be a program name with args. - set dummy gcc; ac_word=$2 - echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 --echo "configure:2184: checking for $ac_word" >&5 -+echo "configure:2133: checking for $ac_word" >&5 - if eval "test \"`echo '$''{'ac_cv_prog_CC'+set}'`\" = set"; then - echo $ac_n "(cached) $ac_c" 1>&6 - else -@@ -2210,7 +2159,7 @@ - # Extract the first word of "cc", so it can be a program name with args. - set dummy cc; ac_word=$2 - echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 --echo "configure:2214: checking for $ac_word" >&5 -+echo "configure:2163: checking for $ac_word" >&5 - if eval "test \"`echo '$''{'ac_cv_prog_CC'+set}'`\" = set"; then - echo $ac_n "(cached) $ac_c" 1>&6 - else -@@ -2261,7 +2210,7 @@ - # Extract the first word of "cl", so it can be a program name with args. - set dummy cl; ac_word=$2 - echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 --echo "configure:2265: checking for $ac_word" >&5 -+echo "configure:2214: checking for $ac_word" >&5 - if eval "test \"`echo '$''{'ac_cv_prog_CC'+set}'`\" = set"; then - echo $ac_n "(cached) $ac_c" 1>&6 - else -@@ -2293,7 +2242,7 @@ - fi - - echo $ac_n "checking whether the C compiler ($CC $CFLAGS $LDFLAGS) works""... $ac_c" 1>&6 --echo "configure:2297: checking whether the C compiler ($CC $CFLAGS $LDFLAGS) works" >&5 -+echo "configure:2246: checking whether the C compiler ($CC $CFLAGS $LDFLAGS) works" >&5 - - ac_ext=c - # CFLAGS is not in ac_cpp because -g, -O, etc. are not valid cpp options. -@@ -2304,12 +2253,12 @@ - - cat > conftest.$ac_ext << EOF - --#line 2308 "configure" -+#line 2257 "configure" - #include "confdefs.h" - - main(){return(0);} - EOF --if { (eval echo configure:2313: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then -+if { (eval echo configure:2262: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then - ac_cv_prog_cc_works=yes - # If we can't run a trivial program, we are probably using a cross compiler. - if (./conftest; exit) 2>/dev/null; then -@@ -2335,12 +2284,12 @@ - { echo "configure: error: installation or configuration problem: C compiler cannot create executables." 1>&2; exit 1; } - fi - echo $ac_n "checking whether the C compiler ($CC $CFLAGS $LDFLAGS) is a cross-compiler""... $ac_c" 1>&6 --echo "configure:2339: checking whether the C compiler ($CC $CFLAGS $LDFLAGS) is a cross-compiler" >&5 -+echo "configure:2288: checking whether the C compiler ($CC $CFLAGS $LDFLAGS) is a cross-compiler" >&5 - echo "$ac_t""$ac_cv_prog_cc_cross" 1>&6 - cross_compiling=$ac_cv_prog_cc_cross - - echo $ac_n "checking whether we are using GNU C""... $ac_c" 1>&6 --echo "configure:2344: checking whether we are using GNU C" >&5 -+echo "configure:2293: checking whether we are using GNU C" >&5 - if eval "test \"`echo '$''{'ac_cv_prog_gcc'+set}'`\" = set"; then - echo $ac_n "(cached) $ac_c" 1>&6 - else -@@ -2349,7 +2298,7 @@ - yes; - #endif - EOF --if { ac_try='${CC-cc} -E conftest.c'; { (eval echo configure:2353: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }; } | egrep yes >/dev/null 2>&1; then -+if { ac_try='${CC-cc} -E conftest.c'; { (eval echo configure:2302: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }; } | egrep yes >/dev/null 2>&1; then - ac_cv_prog_gcc=yes - else - ac_cv_prog_gcc=no -@@ -2368,7 +2317,7 @@ - ac_save_CFLAGS="$CFLAGS" - CFLAGS= - echo $ac_n "checking whether ${CC-cc} accepts -g""... $ac_c" 1>&6 --echo "configure:2372: checking whether ${CC-cc} accepts -g" >&5 -+echo "configure:2321: checking whether ${CC-cc} accepts -g" >&5 - if eval "test \"`echo '$''{'ac_cv_prog_cc_g'+set}'`\" = set"; then - echo $ac_n "(cached) $ac_c" 1>&6 - else -@@ -2404,7 +2353,7 @@ - # Extract the first word of "$ac_prog", so it can be a program name with args. - set dummy $ac_prog; ac_word=$2 - echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 --echo "configure:2408: checking for $ac_word" >&5 -+echo "configure:2357: checking for $ac_word" >&5 - if eval "test \"`echo '$''{'ac_cv_prog_CXX'+set}'`\" = set"; then - echo $ac_n "(cached) $ac_c" 1>&6 - else -@@ -2436,7 +2385,7 @@ - - - echo $ac_n "checking whether the C++ compiler ($CXX $CXXFLAGS $LDFLAGS) works""... $ac_c" 1>&6 --echo "configure:2440: checking whether the C++ compiler ($CXX $CXXFLAGS $LDFLAGS) works" >&5 -+echo "configure:2389: checking whether the C++ compiler ($CXX $CXXFLAGS $LDFLAGS) works" >&5 - - ac_ext=C - # CXXFLAGS is not in ac_cpp because -g, -O, etc. are not valid cpp options. -@@ -2447,12 +2396,12 @@ - - cat > conftest.$ac_ext << EOF - --#line 2451 "configure" -+#line 2400 "configure" - #include "confdefs.h" - - int main(){return(0);} - EOF --if { (eval echo configure:2456: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then -+if { (eval echo configure:2405: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then - ac_cv_prog_cxx_works=yes - # If we can't run a trivial program, we are probably using a cross compiler. - if (./conftest; exit) 2>/dev/null; then -@@ -2478,12 +2427,12 @@ - { echo "configure: error: installation or configuration problem: C++ compiler cannot create executables." 1>&2; exit 1; } - fi - echo $ac_n "checking whether the C++ compiler ($CXX $CXXFLAGS $LDFLAGS) is a cross-compiler""... $ac_c" 1>&6 --echo "configure:2482: checking whether the C++ compiler ($CXX $CXXFLAGS $LDFLAGS) is a cross-compiler" >&5 -+echo "configure:2431: checking whether the C++ compiler ($CXX $CXXFLAGS $LDFLAGS) is a cross-compiler" >&5 - echo "$ac_t""$ac_cv_prog_cxx_cross" 1>&6 - cross_compiling=$ac_cv_prog_cxx_cross - - echo $ac_n "checking whether we are using GNU C++""... $ac_c" 1>&6 --echo "configure:2487: checking whether we are using GNU C++" >&5 -+echo "configure:2436: checking whether we are using GNU C++" >&5 - if eval "test \"`echo '$''{'ac_cv_prog_gxx'+set}'`\" = set"; then - echo $ac_n "(cached) $ac_c" 1>&6 - else -@@ -2492,7 +2441,7 @@ - yes; - #endif - EOF --if { ac_try='${CXX-g++} -E conftest.C'; { (eval echo configure:2496: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }; } | egrep yes >/dev/null 2>&1; then -+if { ac_try='${CXX-g++} -E conftest.C'; { (eval echo configure:2445: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }; } | egrep yes >/dev/null 2>&1; then - ac_cv_prog_gxx=yes - else - ac_cv_prog_gxx=no -@@ -2511,7 +2460,7 @@ - ac_save_CXXFLAGS="$CXXFLAGS" - CXXFLAGS= - echo $ac_n "checking whether ${CXX-g++} accepts -g""... $ac_c" 1>&6 --echo "configure:2515: checking whether ${CXX-g++} accepts -g" >&5 -+echo "configure:2464: checking whether ${CXX-g++} accepts -g" >&5 - if eval "test \"`echo '$''{'ac_cv_prog_cxx_g'+set}'`\" = set"; then - echo $ac_n "(cached) $ac_c" 1>&6 - else -@@ -2542,61 +2491,10 @@ - fi - fi - --for ac_declaration in \ -- ''\ -- '#include <stdlib.h>' \ -- 'extern "C" void std::exit (int) throw (); using std::exit;' \ -- 'extern "C" void std::exit (int); using std::exit;' \ -- 'extern "C" void exit (int) throw ();' \ -- 'extern "C" void exit (int);' \ -- 'void exit (int);' --do -- cat > conftest.$ac_ext <<EOF --#line 2556 "configure" --#include "confdefs.h" --#include <stdlib.h> --$ac_declaration --int main() { --exit (42); --; return 0; } --EOF --if { (eval echo configure:2564: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then -- : --else -- echo "configure: failed program was:" >&5 -- cat conftest.$ac_ext >&5 -- rm -rf conftest* -- continue --fi --rm -f conftest* -- cat > conftest.$ac_ext <<EOF --#line 2574 "configure" --#include "confdefs.h" --$ac_declaration --int main() { --exit (42); --; return 0; } --EOF --if { (eval echo configure:2581: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then -- rm -rf conftest* -- break --else -- echo "configure: failed program was:" >&5 -- cat conftest.$ac_ext >&5 --fi --rm -f conftest* --done --if test -n "$ac_declaration"; then -- echo '#ifdef __cplusplus' >>confdefs.h -- echo $ac_declaration >>confdefs.h -- echo '#endif' >>confdefs.h --fi -- -- - # Extract the first word of "ranlib", so it can be a program name with args. - set dummy ranlib; ac_word=$2 - echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 --echo "configure:2600: checking for $ac_word" >&5 -+echo "configure:2498: checking for $ac_word" >&5 - if eval "test \"`echo '$''{'ac_cv_prog_RANLIB'+set}'`\" = set"; then - echo $ac_n "(cached) $ac_c" 1>&6 - else -@@ -2628,7 +2526,7 @@ - # Extract the first word of "$ac_prog", so it can be a program name with args. - set dummy $ac_prog; ac_word=$2 - echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 --echo "configure:2632: checking for $ac_word" >&5 -+echo "configure:2530: checking for $ac_word" >&5 - if eval "test \"`echo '$''{'ac_cv_path_AS'+set}'`\" = set"; then - echo $ac_n "(cached) $ac_c" 1>&6 - else -@@ -2669,7 +2567,7 @@ - # Extract the first word of "$ac_prog", so it can be a program name with args. - set dummy $ac_prog; ac_word=$2 - echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 --echo "configure:2673: checking for $ac_word" >&5 -+echo "configure:2571: checking for $ac_word" >&5 - if eval "test \"`echo '$''{'ac_cv_prog_AR'+set}'`\" = set"; then - echo $ac_n "(cached) $ac_c" 1>&6 - else -@@ -2704,7 +2602,7 @@ - # Extract the first word of "$ac_prog", so it can be a program name with args. - set dummy $ac_prog; ac_word=$2 - echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 --echo "configure:2708: checking for $ac_word" >&5 -+echo "configure:2606: checking for $ac_word" >&5 - if eval "test \"`echo '$''{'ac_cv_prog_LD'+set}'`\" = set"; then - echo $ac_n "(cached) $ac_c" 1>&6 - else -@@ -2739,7 +2637,7 @@ - # Extract the first word of "$ac_prog", so it can be a program name with args. - set dummy $ac_prog; ac_word=$2 - echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 --echo "configure:2743: checking for $ac_word" >&5 -+echo "configure:2641: checking for $ac_word" >&5 - if eval "test \"`echo '$''{'ac_cv_prog_STRIP'+set}'`\" = set"; then - echo $ac_n "(cached) $ac_c" 1>&6 - else -@@ -2774,7 +2672,7 @@ - # Extract the first word of "$ac_prog", so it can be a program name with args. - set dummy $ac_prog; ac_word=$2 - echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 --echo "configure:2778: checking for $ac_word" >&5 -+echo "configure:2676: checking for $ac_word" >&5 - if eval "test \"`echo '$''{'ac_cv_prog_WINDRES'+set}'`\" = set"; then - echo $ac_n "(cached) $ac_c" 1>&6 - else -@@ -2907,7 +2805,7 @@ - # Extract the first word of "$ac_prog", so it can be a program name with args. - set dummy $ac_prog; ac_word=$2 - echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 --echo "configure:2911: checking for $ac_word" >&5 -+echo "configure:2809: checking for $ac_word" >&5 - if eval "test \"`echo '$''{'ac_cv_prog_MIDL'+set}'`\" = set"; then - echo $ac_n "(cached) $ac_c" 1>&6 - else -@@ -2949,14 +2847,14 @@ - cross_compiling=$ac_cv_prog_cc_cross - - cat > conftest.$ac_ext <<EOF --#line 2953 "configure" -+#line 2851 "configure" - #include "confdefs.h" - #include <stdio.h> - int main() { - printf("Hello World\n"); - ; return 0; } - EOF --if { (eval echo configure:2960: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then -+if { (eval echo configure:2858: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then - : - else - echo "configure: failed program was:" >&5 -@@ -2974,14 +2872,14 @@ - cross_compiling=$ac_cv_prog_cxx_cross - - cat > conftest.$ac_ext <<EOF --#line 2978 "configure" -+#line 2876 "configure" - #include "confdefs.h" - #include <new.h> - int main() { - unsigned *test = new unsigned(42); - ; return 0; } - EOF --if { (eval echo configure:2985: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then -+if { (eval echo configure:2883: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then - : - else - echo "configure: failed program was:" >&5 -@@ -3096,7 +2994,7 @@ - _MIDL_REV_VERSION=`echo ${_MIDL_FULL_VERSION} | $AWK -F\. '{ print $3 }'` - # Add flags if necessary - echo $ac_n "checking for midl flags""... $ac_c" 1>&6 --echo "configure:3100: checking for midl flags" >&5 -+echo "configure:2998: checking for midl flags" >&5 - if test \( "$_MIDL_MAJOR_VERSION" -gt "6" \) -o \( "$_MIDL_MAJOR_VERSION" = "6" -a "$_MIDL_MINOR_VERSION" -gt "0" \) -o \( "$_MIDL_MAJOR_VERSION" = "6" -a "$_MIDL_MINOR_VERSION" = "00" -a "$_MIDL_REV_VERSION" -gt "359" \); then - # Starting with MIDL version 6.0.359, the MIDL compiler - # generates /Oicf /robust stubs by default, which is not -@@ -3118,9 +3016,9 @@ - _W32API_MAJOR_VERSION=`echo $W32API_VERSION | $AWK -F\. '{ print $1 }'` - _W32API_MINOR_VERSION=`echo $W32API_VERSION | $AWK -F\. '{ print $2 }'` - echo $ac_n "checking for w32api version >= $W32API_VERSION""... $ac_c" 1>&6 --echo "configure:3122: checking for w32api version >= $W32API_VERSION" >&5 -+echo "configure:3020: checking for w32api version >= $W32API_VERSION" >&5 - cat > conftest.$ac_ext <<EOF --#line 3124 "configure" -+#line 3022 "configure" - #include "confdefs.h" - #include <w32api.h> - int main() { -@@ -3132,7 +3030,7 @@ - - ; return 0; } - EOF --if { (eval echo configure:3136: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then -+if { (eval echo configure:3034: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then - rm -rf conftest* - res=yes - else -@@ -3148,7 +3046,7 @@ - fi - # Check windres version - echo $ac_n "checking for windres version >= $WINDRES_VERSION""... $ac_c" 1>&6 --echo "configure:3152: checking for windres version >= $WINDRES_VERSION" >&5 -+echo "configure:3050: checking for windres version >= $WINDRES_VERSION" >&5 - _WINDRES_VERSION=`${WINDRES} --version 2>&1 | grep -i windres 2>/dev/null | $AWK '{ print $3 }'` - echo "$ac_t""$_WINDRES_VERSION" 1>&6 - _WINDRES_MAJOR_VERSION=`echo $_WINDRES_VERSION | $AWK -F\. '{ print $1 }'` -@@ -3187,10 +3085,10 @@ - if test "$CC" != "icc" -a -z "$_WIN32_MSVC"; then - if test "x$CC" != xcc; then - echo $ac_n "checking whether $CC and cc understand -c and -o together""... $ac_c" 1>&6 --echo "configure:3191: checking whether $CC and cc understand -c and -o together" >&5 -+echo "configure:3089: checking whether $CC and cc understand -c and -o together" >&5 - else - echo $ac_n "checking whether cc understands -c and -o together""... $ac_c" 1>&6 --echo "configure:3194: checking whether cc understands -c and -o together" >&5 -+echo "configure:3092: checking whether cc understands -c and -o together" >&5 - fi - set dummy $CC; ac_cc="`echo $2 | - sed -e 's/[^a-zA-Z0-9_]/_/g' -e 's/^[0-9]/_/'`" -@@ -3202,16 +3100,16 @@ - # We do the test twice because some compilers refuse to overwrite an - # existing .o file with -o, though they will create one. - ac_try='${CC-cc} -c conftest.c -o conftest.o 1>&5' --if { (eval echo configure:3206: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } && -- test -f conftest.o && { (eval echo configure:3207: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }; -+if { (eval echo configure:3104: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } && -+ test -f conftest.o && { (eval echo configure:3105: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }; - then - eval ac_cv_prog_cc_${ac_cc}_c_o=yes - if test "x$CC" != xcc; then - # Test first that cc exists at all. -- if { ac_try='cc -c conftest.c 1>&5'; { (eval echo configure:3212: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }; }; then -+ if { ac_try='cc -c conftest.c 1>&5'; { (eval echo configure:3110: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }; }; then - ac_try='cc -c conftest.c -o conftest.o 1>&5' -- if { (eval echo configure:3214: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } && -- test -f conftest.o && { (eval echo configure:3215: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }; -+ if { (eval echo configure:3112: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } && -+ test -f conftest.o && { (eval echo configure:3113: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }; - then - # cc works too. - : -@@ -3247,7 +3145,7 @@ - fi - - echo $ac_n "checking how to run the C preprocessor""... $ac_c" 1>&6 --echo "configure:3251: checking how to run the C preprocessor" >&5 -+echo "configure:3149: checking how to run the C preprocessor" >&5 - # On Suns, sometimes $CPP names a directory. - if test -n "$CPP" && test -d "$CPP"; then - CPP= -@@ -3262,13 +3160,13 @@ - # On the NeXT, cc -E runs the code through the compiler's parser, - # not just through cpp. - cat > conftest.$ac_ext <<EOF --#line 3266 "configure" -+#line 3164 "configure" - #include "confdefs.h" - #include <assert.h> - Syntax Error - EOF - ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" --{ (eval echo configure:3272: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } -+{ (eval echo configure:3170: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } - ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"` - if test -z "$ac_err"; then - : -@@ -3279,13 +3177,13 @@ - rm -rf conftest* - CPP="${CC-cc} -E -traditional-cpp" - cat > conftest.$ac_ext <<EOF --#line 3283 "configure" -+#line 3181 "configure" - #include "confdefs.h" - #include <assert.h> - Syntax Error - EOF - ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" --{ (eval echo configure:3289: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } -+{ (eval echo configure:3187: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } - ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"` - if test -z "$ac_err"; then - : -@@ -3296,13 +3194,13 @@ - rm -rf conftest* - CPP="${CC-cc} -nologo -E" - cat > conftest.$ac_ext <<EOF --#line 3300 "configure" -+#line 3198 "configure" - #include "confdefs.h" - #include <assert.h> - Syntax Error - EOF - ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" --{ (eval echo configure:3306: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } -+{ (eval echo configure:3204: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } - ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"` - if test -z "$ac_err"; then - : -@@ -3327,7 +3225,7 @@ - echo "$ac_t""$CPP" 1>&6 - - echo $ac_n "checking how to run the C++ preprocessor""... $ac_c" 1>&6 --echo "configure:3331: checking how to run the C++ preprocessor" >&5 -+echo "configure:3229: checking how to run the C++ preprocessor" >&5 - if test -z "$CXXCPP"; then - if eval "test \"`echo '$''{'ac_cv_prog_CXXCPP'+set}'`\" = set"; then - echo $ac_n "(cached) $ac_c" 1>&6 -@@ -3340,12 +3238,12 @@ - cross_compiling=$ac_cv_prog_cxx_cross - CXXCPP="${CXX-g++} -E" - cat > conftest.$ac_ext <<EOF --#line 3344 "configure" -+#line 3242 "configure" - #include "confdefs.h" - #include <stdlib.h> - EOF - ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" --{ (eval echo configure:3349: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } -+{ (eval echo configure:3247: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } - ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"` - if test -z "$ac_err"; then - : -@@ -3400,7 +3298,7 @@ - # SVR4 /usr/ucb/install, which tries to use the nonexistent group "staff" - # ./install, which can be erroneously created by make from ./install.sh. - echo $ac_n "checking for a BSD compatible install""... $ac_c" 1>&6 --echo "configure:3404: checking for a BSD compatible install" >&5 -+echo "configure:3302: checking for a BSD compatible install" >&5 - if test -z "$INSTALL"; then - if eval "test \"`echo '$''{'ac_cv_path_install'+set}'`\" = set"; then - echo $ac_n "(cached) $ac_c" 1>&6 -@@ -3453,7 +3351,7 @@ - test -z "$INSTALL_DATA" && INSTALL_DATA='${INSTALL} -m 644' - - echo $ac_n "checking whether ln -s works""... $ac_c" 1>&6 --echo "configure:3457: checking whether ln -s works" >&5 -+echo "configure:3355: checking whether ln -s works" >&5 - if eval "test \"`echo '$''{'ac_cv_prog_LN_S'+set}'`\" = set"; then - echo $ac_n "(cached) $ac_c" 1>&6 - else -@@ -3478,7 +3376,7 @@ - # Extract the first word of "$ac_prog", so it can be a program name with args. - set dummy $ac_prog; ac_word=$2 - echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 --echo "configure:3482: checking for $ac_word" >&5 -+echo "configure:3380: checking for $ac_word" >&5 - if eval "test \"`echo '$''{'ac_cv_path_PERL'+set}'`\" = set"; then - echo $ac_n "(cached) $ac_c" 1>&6 - else -@@ -3519,7 +3417,7 @@ - - if test -z "$TINDERBOX_SKIP_PERL_VERSION_CHECK"; then - echo $ac_n "checking for minimum required perl version >= $PERL_VERSION""... $ac_c" 1>&6 --echo "configure:3523: checking for minimum required perl version >= $PERL_VERSION" >&5 -+echo "configure:3421: checking for minimum required perl version >= $PERL_VERSION" >&5 - _perl_version=`PERL_VERSION=$PERL_VERSION $PERL -e 'print "$]"; if ($] >= $ENV{PERL_VERSION}) { exit(0); } else { exit(1); }' 2>&5` - _perl_res=$? - echo "$ac_t""$_perl_version" 1>&6 -@@ -3530,7 +3428,7 @@ - fi - - echo $ac_n "checking for full perl installation""... $ac_c" 1>&6 --echo "configure:3534: checking for full perl installation" >&5 -+echo "configure:3432: checking for full perl installation" >&5 - _perl_archlib=`$PERL -e 'use Config; if ( -d $Config{archlib} ) { exit(0); } else { exit(1); }' 2>&5` - _perl_res=$? - if test "$_perl_res" != 0; then -@@ -3545,7 +3443,7 @@ - # Extract the first word of "$ac_prog", so it can be a program name with args. - set dummy $ac_prog; ac_word=$2 - echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 --echo "configure:3549: checking for $ac_word" >&5 -+echo "configure:3447: checking for $ac_word" >&5 - if eval "test \"`echo '$''{'ac_cv_path_PYTHON'+set}'`\" = set"; then - echo $ac_n "(cached) $ac_c" 1>&6 - else -@@ -3590,7 +3488,7 @@ - # Extract the first word of "$ac_prog", so it can be a program name with args. - set dummy $ac_prog; ac_word=$2 - echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 --echo "configure:3594: checking for $ac_word" >&5 -+echo "configure:3492: checking for $ac_word" >&5 - if eval "test \"`echo '$''{'ac_cv_path_NSINSTALL_BIN'+set}'`\" = set"; then - echo $ac_n "(cached) $ac_c" 1>&6 - else -@@ -3635,7 +3533,7 @@ - # Extract the first word of "doxygen", so it can be a program name with args. - set dummy doxygen; ac_word=$2 - echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 --echo "configure:3639: checking for $ac_word" >&5 -+echo "configure:3537: checking for $ac_word" >&5 - if eval "test \"`echo '$''{'ac_cv_path_DOXYGEN'+set}'`\" = set"; then - echo $ac_n "(cached) $ac_c" 1>&6 - else -@@ -3671,7 +3569,7 @@ - # Extract the first word of "whoami", so it can be a program name with args. - set dummy whoami; ac_word=$2 - echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 --echo "configure:3675: checking for $ac_word" >&5 -+echo "configure:3573: checking for $ac_word" >&5 - if eval "test \"`echo '$''{'ac_cv_path_WHOAMI'+set}'`\" = set"; then - echo $ac_n "(cached) $ac_c" 1>&6 - else -@@ -3707,7 +3605,7 @@ - # Extract the first word of "autoconf", so it can be a program name with args. - set dummy autoconf; ac_word=$2 - echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 --echo "configure:3711: checking for $ac_word" >&5 -+echo "configure:3609: checking for $ac_word" >&5 - if eval "test \"`echo '$''{'ac_cv_path_AUTOCONF'+set}'`\" = set"; then - echo $ac_n "(cached) $ac_c" 1>&6 - else -@@ -3743,7 +3641,7 @@ - # Extract the first word of "unzip", so it can be a program name with args. - set dummy unzip; ac_word=$2 - echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 --echo "configure:3747: checking for $ac_word" >&5 -+echo "configure:3645: checking for $ac_word" >&5 - if eval "test \"`echo '$''{'ac_cv_path_UNZIP'+set}'`\" = set"; then - echo $ac_n "(cached) $ac_c" 1>&6 - else -@@ -3781,7 +3679,7 @@ - # Extract the first word of "$ac_prog", so it can be a program name with args. - set dummy $ac_prog; ac_word=$2 - echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 --echo "configure:3785: checking for $ac_word" >&5 -+echo "configure:3683: checking for $ac_word" >&5 - if eval "test \"`echo '$''{'ac_cv_path_ZIP'+set}'`\" = set"; then - echo $ac_n "(cached) $ac_c" 1>&6 - else -@@ -3822,7 +3720,7 @@ - # Extract the first word of "makedepend", so it can be a program name with args. - set dummy makedepend; ac_word=$2 - echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 --echo "configure:3826: checking for $ac_word" >&5 -+echo "configure:3724: checking for $ac_word" >&5 - if eval "test \"`echo '$''{'ac_cv_path_SYSTEM_MAKEDEPEND'+set}'`\" = set"; then - echo $ac_n "(cached) $ac_c" 1>&6 - else -@@ -3857,7 +3755,7 @@ - # Extract the first word of "xargs", so it can be a program name with args. - set dummy xargs; ac_word=$2 - echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 --echo "configure:3861: checking for $ac_word" >&5 -+echo "configure:3759: checking for $ac_word" >&5 - if eval "test \"`echo '$''{'ac_cv_path_XARGS'+set}'`\" = set"; then - echo $ac_n "(cached) $ac_c" 1>&6 - else -@@ -3918,7 +3816,7 @@ - # Extract the first word of "$ac_prog", so it can be a program name with args. - set dummy $ac_prog; ac_word=$2 - echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 --echo "configure:3922: checking for $ac_word" >&5 -+echo "configure:3820: checking for $ac_word" >&5 - if eval "test \"`echo '$''{'ac_cv_path_PBBUILD'+set}'`\" = set"; then - echo $ac_n "(cached) $ac_c" 1>&6 - else -@@ -3968,7 +3866,7 @@ - # Extract the first word of "sdp", so it can be a program name with args. - set dummy sdp; ac_word=$2 - echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 --echo "configure:3972: checking for $ac_word" >&5 -+echo "configure:3870: checking for $ac_word" >&5 - if eval "test \"`echo '$''{'ac_cv_path_SDP'+set}'`\" = set"; then - echo $ac_n "(cached) $ac_c" 1>&6 - else -@@ -4089,7 +3987,7 @@ - - - echo $ac_n "checking for valid compiler/Mac OS X SDK combination""... $ac_c" 1>&6 --echo "configure:4093: checking for valid compiler/Mac OS X SDK combination" >&5 -+echo "configure:3991: checking for valid compiler/Mac OS X SDK combination" >&5 - ac_ext=C - # CXXFLAGS is not in ac_cpp because -g, -O, etc. are not valid cpp options. - ac_cpp='$CXXCPP $CPPFLAGS' -@@ -4098,7 +3996,7 @@ - cross_compiling=$ac_cv_prog_cxx_cross - - cat > conftest.$ac_ext <<EOF --#line 4102 "configure" -+#line 4000 "configure" - #include "confdefs.h" - #include <new> - int main() { return 0; } -@@ -4106,7 +4004,7 @@ - result=yes - ; return 0; } - EOF --if { (eval echo configure:4110: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then -+if { (eval echo configure:4008: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then - rm -rf conftest* - result=no - else -@@ -4137,7 +4035,7 @@ - # Extract the first word of "$ac_prog", so it can be a program name with args. - set dummy $ac_prog; ac_word=$2 - echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 --echo "configure:4141: checking for $ac_word" >&5 -+echo "configure:4039: checking for $ac_word" >&5 - if eval "test \"`echo '$''{'ac_cv_path_MAKE'+set}'`\" = set"; then - echo $ac_n "(cached) $ac_c" 1>&6 - else -@@ -4180,7 +4078,7 @@ - # Extract the first word of "$ac_prog", so it can be a program name with args. - set dummy $ac_prog; ac_word=$2 - echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 --echo "configure:4184: checking for $ac_word" >&5 -+echo "configure:4082: checking for $ac_word" >&5 - if eval "test \"`echo '$''{'ac_cv_path_MAKE'+set}'`\" = set"; then - echo $ac_n "(cached) $ac_c" 1>&6 - else -@@ -4248,7 +4146,7 @@ - # Uses ac_ vars as temps to allow command line to override cache and checks. - # --without-x overrides everything else, but does not touch the cache. - echo $ac_n "checking for X""... $ac_c" 1>&6 --echo "configure:4252: checking for X" >&5 -+echo "configure:4150: checking for X" >&5 - - # Check whether --with-x or --without-x was given. - if test "${with_x+set}" = set; then -@@ -4310,12 +4208,12 @@ - - # First, try using that file with no special directory specified. - cat > conftest.$ac_ext <<EOF --#line 4314 "configure" -+#line 4212 "configure" - #include "confdefs.h" - #include <$x_direct_test_include> - EOF - ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" --{ (eval echo configure:4319: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } -+{ (eval echo configure:4217: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } - ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"` - if test -z "$ac_err"; then - rm -rf conftest* -@@ -4384,14 +4282,14 @@ - ac_save_LIBS="$LIBS" - LIBS="-l$x_direct_test_library $LIBS" - cat > conftest.$ac_ext <<EOF --#line 4388 "configure" -+#line 4286 "configure" - #include "confdefs.h" - - int main() { - ${x_direct_test_function}() - ; return 0; } - EOF --if { (eval echo configure:4395: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then -+if { (eval echo configure:4293: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then - rm -rf conftest* - LIBS="$ac_save_LIBS" - # We can link X programs with no special library path. -@@ -4497,17 +4395,17 @@ - case "`(uname -sr) 2>/dev/null`" in - "SunOS 5"*) - echo $ac_n "checking whether -R must be followed by a space""... $ac_c" 1>&6 --echo "configure:4501: checking whether -R must be followed by a space" >&5 -+echo "configure:4399: checking whether -R must be followed by a space" >&5 - ac_xsave_LIBS="$LIBS"; LIBS="$LIBS -R$x_libraries" - cat > conftest.$ac_ext <<EOF --#line 4504 "configure" -+#line 4402 "configure" - #include "confdefs.h" - - int main() { - - ; return 0; } - EOF --if { (eval echo configure:4511: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then -+if { (eval echo configure:4409: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then - rm -rf conftest* - ac_R_nospace=yes - else -@@ -4523,14 +4421,14 @@ - else - LIBS="$ac_xsave_LIBS -R $x_libraries" - cat > conftest.$ac_ext <<EOF --#line 4527 "configure" -+#line 4425 "configure" - #include "confdefs.h" - - int main() { - - ; return 0; } - EOF --if { (eval echo configure:4534: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then -+if { (eval echo configure:4432: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then - rm -rf conftest* - ac_R_space=yes - else -@@ -4562,7 +4460,7 @@ - # libraries were built with DECnet support. And karl@cs.umb.edu says - # the Alpha needs dnet_stub (dnet does not exist). - echo $ac_n "checking for dnet_ntoa in -ldnet""... $ac_c" 1>&6 --echo "configure:4566: checking for dnet_ntoa in -ldnet" >&5 -+echo "configure:4464: checking for dnet_ntoa in -ldnet" >&5 - ac_lib_var=`echo dnet'_'dnet_ntoa | sed 'y%./+-%__p_%'` - if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then - echo $ac_n "(cached) $ac_c" 1>&6 -@@ -4570,7 +4468,7 @@ - ac_save_LIBS="$LIBS" - LIBS="-ldnet $LIBS" - cat > conftest.$ac_ext <<EOF --#line 4574 "configure" -+#line 4472 "configure" - #include "confdefs.h" - /* Override any gcc2 internal prototype to avoid an error. */ - /* We use char because int might match the return type of a gcc2 -@@ -4581,7 +4479,7 @@ - dnet_ntoa() - ; return 0; } - EOF --if { (eval echo configure:4585: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then -+if { (eval echo configure:4483: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then - rm -rf conftest* - eval "ac_cv_lib_$ac_lib_var=yes" - else -@@ -4603,7 +4501,7 @@ - - if test $ac_cv_lib_dnet_dnet_ntoa = no; then - echo $ac_n "checking for dnet_ntoa in -ldnet_stub""... $ac_c" 1>&6 --echo "configure:4607: checking for dnet_ntoa in -ldnet_stub" >&5 -+echo "configure:4505: checking for dnet_ntoa in -ldnet_stub" >&5 - ac_lib_var=`echo dnet_stub'_'dnet_ntoa | sed 'y%./+-%__p_%'` - if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then - echo $ac_n "(cached) $ac_c" 1>&6 -@@ -4611,7 +4509,7 @@ - ac_save_LIBS="$LIBS" - LIBS="-ldnet_stub $LIBS" - cat > conftest.$ac_ext <<EOF --#line 4615 "configure" -+#line 4513 "configure" - #include "confdefs.h" - /* Override any gcc2 internal prototype to avoid an error. */ - /* We use char because int might match the return type of a gcc2 -@@ -4622,7 +4520,7 @@ - dnet_ntoa() - ; return 0; } - EOF --if { (eval echo configure:4626: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then -+if { (eval echo configure:4524: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then - rm -rf conftest* - eval "ac_cv_lib_$ac_lib_var=yes" - else -@@ -4651,12 +4549,12 @@ - # The nsl library prevents programs from opening the X display - # on Irix 5.2, according to dickey@clark.net. - echo $ac_n "checking for gethostbyname""... $ac_c" 1>&6 --echo "configure:4655: checking for gethostbyname" >&5 -+echo "configure:4553: checking for gethostbyname" >&5 - if eval "test \"`echo '$''{'ac_cv_func_gethostbyname'+set}'`\" = set"; then - echo $ac_n "(cached) $ac_c" 1>&6 - else - cat > conftest.$ac_ext <<EOF --#line 4660 "configure" -+#line 4558 "configure" - #include "confdefs.h" - /* System header to define __stub macros and hopefully few prototypes, - which can conflict with char gethostbyname(); below. */ -@@ -4679,7 +4577,7 @@ - - ; return 0; } - EOF --if { (eval echo configure:4683: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then -+if { (eval echo configure:4581: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then - rm -rf conftest* - eval "ac_cv_func_gethostbyname=yes" - else -@@ -4700,7 +4598,7 @@ - - if test $ac_cv_func_gethostbyname = no; then - echo $ac_n "checking for gethostbyname in -lnsl""... $ac_c" 1>&6 --echo "configure:4704: checking for gethostbyname in -lnsl" >&5 -+echo "configure:4602: checking for gethostbyname in -lnsl" >&5 - ac_lib_var=`echo nsl'_'gethostbyname | sed 'y%./+-%__p_%'` - if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then - echo $ac_n "(cached) $ac_c" 1>&6 -@@ -4708,7 +4606,7 @@ - ac_save_LIBS="$LIBS" - LIBS="-lnsl $LIBS" - cat > conftest.$ac_ext <<EOF --#line 4712 "configure" -+#line 4610 "configure" - #include "confdefs.h" - /* Override any gcc2 internal prototype to avoid an error. */ - /* We use char because int might match the return type of a gcc2 -@@ -4719,7 +4617,7 @@ - gethostbyname() - ; return 0; } - EOF --if { (eval echo configure:4723: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then -+if { (eval echo configure:4621: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then - rm -rf conftest* - eval "ac_cv_lib_$ac_lib_var=yes" - else -@@ -4749,12 +4647,12 @@ - # -lsocket must be given before -lnsl if both are needed. - # We assume that if connect needs -lnsl, so does gethostbyname. - echo $ac_n "checking for connect""... $ac_c" 1>&6 --echo "configure:4753: checking for connect" >&5 -+echo "configure:4651: checking for connect" >&5 - if eval "test \"`echo '$''{'ac_cv_func_connect'+set}'`\" = set"; then - echo $ac_n "(cached) $ac_c" 1>&6 - else - cat > conftest.$ac_ext <<EOF --#line 4758 "configure" -+#line 4656 "configure" - #include "confdefs.h" - /* System header to define __stub macros and hopefully few prototypes, - which can conflict with char connect(); below. */ -@@ -4777,7 +4675,7 @@ - - ; return 0; } - EOF --if { (eval echo configure:4781: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then -+if { (eval echo configure:4679: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then - rm -rf conftest* - eval "ac_cv_func_connect=yes" - else -@@ -4798,7 +4696,7 @@ - - if test $ac_cv_func_connect = no; then - echo $ac_n "checking for connect in -lsocket""... $ac_c" 1>&6 --echo "configure:4802: checking for connect in -lsocket" >&5 -+echo "configure:4700: checking for connect in -lsocket" >&5 - ac_lib_var=`echo socket'_'connect | sed 'y%./+-%__p_%'` - if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then - echo $ac_n "(cached) $ac_c" 1>&6 -@@ -4806,7 +4704,7 @@ - ac_save_LIBS="$LIBS" - LIBS="-lsocket $X_EXTRA_LIBS $LIBS" - cat > conftest.$ac_ext <<EOF --#line 4810 "configure" -+#line 4708 "configure" - #include "confdefs.h" - /* Override any gcc2 internal prototype to avoid an error. */ - /* We use char because int might match the return type of a gcc2 -@@ -4817,7 +4715,7 @@ - connect() - ; return 0; } - EOF --if { (eval echo configure:4821: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then -+if { (eval echo configure:4719: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then - rm -rf conftest* - eval "ac_cv_lib_$ac_lib_var=yes" - else -@@ -4841,12 +4739,12 @@ - - # gomez@mi.uni-erlangen.de says -lposix is necessary on A/UX. - echo $ac_n "checking for remove""... $ac_c" 1>&6 --echo "configure:4845: checking for remove" >&5 -+echo "configure:4743: checking for remove" >&5 - if eval "test \"`echo '$''{'ac_cv_func_remove'+set}'`\" = set"; then - echo $ac_n "(cached) $ac_c" 1>&6 - else - cat > conftest.$ac_ext <<EOF --#line 4850 "configure" -+#line 4748 "configure" - #include "confdefs.h" - /* System header to define __stub macros and hopefully few prototypes, - which can conflict with char remove(); below. */ -@@ -4869,7 +4767,7 @@ - - ; return 0; } - EOF --if { (eval echo configure:4873: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then -+if { (eval echo configure:4771: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then - rm -rf conftest* - eval "ac_cv_func_remove=yes" - else -@@ -4890,7 +4788,7 @@ - - if test $ac_cv_func_remove = no; then - echo $ac_n "checking for remove in -lposix""... $ac_c" 1>&6 --echo "configure:4894: checking for remove in -lposix" >&5 -+echo "configure:4792: checking for remove in -lposix" >&5 - ac_lib_var=`echo posix'_'remove | sed 'y%./+-%__p_%'` - if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then - echo $ac_n "(cached) $ac_c" 1>&6 -@@ -4898,7 +4796,7 @@ - ac_save_LIBS="$LIBS" - LIBS="-lposix $LIBS" - cat > conftest.$ac_ext <<EOF --#line 4902 "configure" -+#line 4800 "configure" - #include "confdefs.h" - /* Override any gcc2 internal prototype to avoid an error. */ - /* We use char because int might match the return type of a gcc2 -@@ -4909,7 +4807,7 @@ - remove() - ; return 0; } - EOF --if { (eval echo configure:4913: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then -+if { (eval echo configure:4811: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then - rm -rf conftest* - eval "ac_cv_lib_$ac_lib_var=yes" - else -@@ -4933,12 +4831,12 @@ - - # BSDI BSD/OS 2.1 needs -lipc for XOpenDisplay. - echo $ac_n "checking for shmat""... $ac_c" 1>&6 --echo "configure:4937: checking for shmat" >&5 -+echo "configure:4835: checking for shmat" >&5 - if eval "test \"`echo '$''{'ac_cv_func_shmat'+set}'`\" = set"; then - echo $ac_n "(cached) $ac_c" 1>&6 - else - cat > conftest.$ac_ext <<EOF --#line 4942 "configure" -+#line 4840 "configure" - #include "confdefs.h" - /* System header to define __stub macros and hopefully few prototypes, - which can conflict with char shmat(); below. */ -@@ -4961,7 +4859,7 @@ - - ; return 0; } - EOF --if { (eval echo configure:4965: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then -+if { (eval echo configure:4863: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then - rm -rf conftest* - eval "ac_cv_func_shmat=yes" - else -@@ -4982,7 +4880,7 @@ - - if test $ac_cv_func_shmat = no; then - echo $ac_n "checking for shmat in -lipc""... $ac_c" 1>&6 --echo "configure:4986: checking for shmat in -lipc" >&5 -+echo "configure:4884: checking for shmat in -lipc" >&5 - ac_lib_var=`echo ipc'_'shmat | sed 'y%./+-%__p_%'` - if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then - echo $ac_n "(cached) $ac_c" 1>&6 -@@ -4990,7 +4888,7 @@ - ac_save_LIBS="$LIBS" - LIBS="-lipc $LIBS" - cat > conftest.$ac_ext <<EOF --#line 4994 "configure" -+#line 4892 "configure" - #include "confdefs.h" - /* Override any gcc2 internal prototype to avoid an error. */ - /* We use char because int might match the return type of a gcc2 -@@ -5001,7 +4899,7 @@ - shmat() - ; return 0; } - EOF --if { (eval echo configure:5005: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then -+if { (eval echo configure:4903: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then - rm -rf conftest* - eval "ac_cv_lib_$ac_lib_var=yes" - else -@@ -5034,7 +4932,7 @@ - # libraries we check for below, so use a different variable. - # --interran@uluru.Stanford.EDU, kb@cs.umb.edu. - echo $ac_n "checking for IceConnectionNumber in -lICE""... $ac_c" 1>&6 --echo "configure:5038: checking for IceConnectionNumber in -lICE" >&5 -+echo "configure:4936: checking for IceConnectionNumber in -lICE" >&5 - ac_lib_var=`echo ICE'_'IceConnectionNumber | sed 'y%./+-%__p_%'` - if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then - echo $ac_n "(cached) $ac_c" 1>&6 -@@ -5042,7 +4940,7 @@ - ac_save_LIBS="$LIBS" - LIBS="-lICE $X_EXTRA_LIBS $LIBS" - cat > conftest.$ac_ext <<EOF --#line 5046 "configure" -+#line 4944 "configure" - #include "confdefs.h" - /* Override any gcc2 internal prototype to avoid an error. */ - /* We use char because int might match the return type of a gcc2 -@@ -5053,7 +4951,7 @@ - IceConnectionNumber() - ; return 0; } - EOF --if { (eval echo configure:5057: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then -+if { (eval echo configure:4955: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then - rm -rf conftest* - eval "ac_cv_lib_$ac_lib_var=yes" - else -@@ -5521,7 +5419,7 @@ - if test "$COMPILE_ENVIRONMENT"; then - if test "$GNU_CC"; then - echo $ac_n "checking whether ld has archive extraction flags""... $ac_c" 1>&6 --echo "configure:5525: checking whether ld has archive extraction flags" >&5 -+echo "configure:5423: checking whether ld has archive extraction flags" >&5 - if eval "test \"`echo '$''{'ac_cv_mkshlib_force_and_unforce'+set}'`\" = set"; then - echo $ac_n "(cached) $ac_c" 1>&6 - else -@@ -5538,14 +5436,14 @@ - LDFLAGS=$force - LIBS=$unforce - cat > conftest.$ac_ext <<EOF --#line 5542 "configure" -+#line 5440 "configure" - #include "confdefs.h" - - int main() { - - ; return 0; } - EOF --if { (eval echo configure:5549: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then -+if { (eval echo configure:5447: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then - rm -rf conftest* - ac_cv_mkshlib_force_and_unforce=$line; break - else -@@ -5578,7 +5476,7 @@ - ' - - echo $ac_n "checking that static assertion macros used in autoconf tests work""... $ac_c" 1>&6 --echo "configure:5582: checking that static assertion macros used in autoconf tests work" >&5 -+echo "configure:5480: checking that static assertion macros used in autoconf tests work" >&5 - if eval "test \"`echo '$''{'ac_cv_static_assertion_macros_work'+set}'`\" = set"; then - echo $ac_n "(cached) $ac_c" 1>&6 - else -@@ -5592,14 +5490,14 @@ - - ac_cv_static_assertion_macros_work="yes" - cat > conftest.$ac_ext <<EOF --#line 5596 "configure" -+#line 5494 "configure" - #include "confdefs.h" - $configure_static_assert_macros - int main() { - CONFIGURE_STATIC_ASSERT(1) - ; return 0; } - EOF --if { (eval echo configure:5603: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then -+if { (eval echo configure:5501: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then - : - else - echo "configure: failed program was:" >&5 -@@ -5609,14 +5507,14 @@ - fi - rm -f conftest* - cat > conftest.$ac_ext <<EOF --#line 5613 "configure" -+#line 5511 "configure" - #include "confdefs.h" - $configure_static_assert_macros - int main() { - CONFIGURE_STATIC_ASSERT(0) - ; return 0; } - EOF --if { (eval echo configure:5620: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then -+if { (eval echo configure:5518: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then - rm -rf conftest* - ac_cv_static_assertion_macros_work="no" - else -@@ -5632,14 +5530,14 @@ - cross_compiling=$ac_cv_prog_cxx_cross - - cat > conftest.$ac_ext <<EOF --#line 5636 "configure" -+#line 5534 "configure" - #include "confdefs.h" - $configure_static_assert_macros - int main() { - CONFIGURE_STATIC_ASSERT(1) - ; return 0; } - EOF --if { (eval echo configure:5643: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then -+if { (eval echo configure:5541: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then - : - else - echo "configure: failed program was:" >&5 -@@ -5649,14 +5547,14 @@ - fi - rm -f conftest* - cat > conftest.$ac_ext <<EOF --#line 5653 "configure" -+#line 5551 "configure" - #include "confdefs.h" - $configure_static_assert_macros - int main() { - CONFIGURE_STATIC_ASSERT(0) - ; return 0; } - EOF --if { (eval echo configure:5660: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then -+if { (eval echo configure:5558: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then - rm -rf conftest* - ac_cv_static_assertion_macros_work="no" - else -@@ -5691,16 +5589,16 @@ - cross_compiling=$ac_cv_prog_cc_cross - - echo $ac_n "checking for 64-bit OS""... $ac_c" 1>&6 --echo "configure:5695: checking for 64-bit OS" >&5 -+echo "configure:5593: checking for 64-bit OS" >&5 - cat > conftest.$ac_ext <<EOF --#line 5697 "configure" -+#line 5595 "configure" - #include "confdefs.h" - $configure_static_assert_macros - int main() { - CONFIGURE_STATIC_ASSERT(sizeof(long) == 8) - ; return 0; } - EOF --if { (eval echo configure:5704: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then -+if { (eval echo configure:5602: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then - rm -rf conftest* - result="yes" - else -@@ -5873,9 +5771,9 @@ - cross_compiling=$ac_cv_prog_cxx_cross - - echo $ac_n "checking for VisualAge C++ compiler version >= 5.0.2.0""... $ac_c" 1>&6 --echo "configure:5877: checking for VisualAge C++ compiler version >= 5.0.2.0" >&5 -+echo "configure:5775: checking for VisualAge C++ compiler version >= 5.0.2.0" >&5 - cat > conftest.$ac_ext <<EOF --#line 5879 "configure" -+#line 5777 "configure" - #include "confdefs.h" - - int main() { -@@ -5884,7 +5782,7 @@ - #endif - ; return 0; } - EOF --if { (eval echo configure:5888: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then -+if { (eval echo configure:5786: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then - rm -rf conftest* - _BAD_COMPILER= - else -@@ -5922,17 +5820,17 @@ - do - ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'` - echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6 --echo "configure:5926: checking for $ac_hdr" >&5 -+echo "configure:5824: checking for $ac_hdr" >&5 - if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then - echo $ac_n "(cached) $ac_c" 1>&6 - else - cat > conftest.$ac_ext <<EOF --#line 5931 "configure" -+#line 5829 "configure" - #include "confdefs.h" - #include <$ac_hdr> - EOF - ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" --{ (eval echo configure:5936: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } -+{ (eval echo configure:5834: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } - ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"` - if test -z "$ac_err"; then - rm -rf conftest* -@@ -5974,7 +5872,7 @@ - LIBS="$LIBS -lbe" - if test "$COMPILE_ENVIRONMENT"; then - echo $ac_n "checking for main in -lbind""... $ac_c" 1>&6 --echo "configure:5978: checking for main in -lbind" >&5 -+echo "configure:5876: checking for main in -lbind" >&5 - ac_lib_var=`echo bind'_'main | sed 'y%./+-%__p_%'` - if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then - echo $ac_n "(cached) $ac_c" 1>&6 -@@ -5982,14 +5880,14 @@ - ac_save_LIBS="$LIBS" - LIBS="-lbind $LIBS" - cat > conftest.$ac_ext <<EOF --#line 5986 "configure" -+#line 5884 "configure" - #include "confdefs.h" - - int main() { - main() - ; return 0; } - EOF --if { (eval echo configure:5993: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then -+if { (eval echo configure:5891: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then - rm -rf conftest* - eval "ac_cv_lib_$ac_lib_var=yes" - else -@@ -6010,7 +5908,7 @@ - fi - - echo $ac_n "checking for main in -lzeta""... $ac_c" 1>&6 --echo "configure:6014: checking for main in -lzeta" >&5 -+echo "configure:5912: checking for main in -lzeta" >&5 - ac_lib_var=`echo zeta'_'main | sed 'y%./+-%__p_%'` - if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then - echo $ac_n "(cached) $ac_c" 1>&6 -@@ -6018,14 +5916,14 @@ - ac_save_LIBS="$LIBS" - LIBS="-lzeta $LIBS" - cat > conftest.$ac_ext <<EOF --#line 6022 "configure" -+#line 5920 "configure" - #include "confdefs.h" - - int main() { - main() - ; return 0; } - EOF --if { (eval echo configure:6029: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then -+if { (eval echo configure:5927: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then - rm -rf conftest* - eval "ac_cv_lib_$ac_lib_var=yes" - else -@@ -6094,18 +5992,18 @@ - MACOSX=1 - - echo $ac_n "checking for -dead_strip option to ld""... $ac_c" 1>&6 --echo "configure:6098: checking for -dead_strip option to ld" >&5 -+echo "configure:5996: checking for -dead_strip option to ld" >&5 - _SAVE_LDFLAGS=$LDFLAGS - LDFLAGS="$LDFLAGS -Wl,-dead_strip" - cat > conftest.$ac_ext <<EOF --#line 6102 "configure" -+#line 6000 "configure" - #include "confdefs.h" - - int main() { - return 0; - ; return 0; } - EOF --if { (eval echo configure:6109: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then -+if { (eval echo configure:6007: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then - rm -rf conftest* - _HAVE_DEAD_STRIP=1 - else -@@ -6630,17 +6528,17 @@ - do - ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'` - echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6 --echo "configure:6634: checking for $ac_hdr" >&5 -+echo "configure:6532: checking for $ac_hdr" >&5 - if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then - echo $ac_n "(cached) $ac_c" 1>&6 - else - cat > conftest.$ac_ext <<EOF --#line 6639 "configure" -+#line 6537 "configure" - #include "confdefs.h" - #include <$ac_hdr> - EOF - ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" --{ (eval echo configure:6644: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } -+{ (eval echo configure:6542: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } - ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"` - if test -z "$ac_err"; then - rm -rf conftest* -@@ -6679,17 +6577,17 @@ - do - ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'` - echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6 --echo "configure:6683: checking for $ac_hdr" >&5 -+echo "configure:6581: checking for $ac_hdr" >&5 - if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then - echo $ac_n "(cached) $ac_c" 1>&6 - else - cat > conftest.$ac_ext <<EOF --#line 6688 "configure" -+#line 6586 "configure" - #include "confdefs.h" - #include <$ac_hdr> - EOF - ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" --{ (eval echo configure:6693: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } -+{ (eval echo configure:6591: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } - ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"` - if test -z "$ac_err"; then - rm -rf conftest* -@@ -6935,19 +6833,19 @@ - _DEFINES_CXXFLAGS="$_DEFINES_CXXFLAGS -Uunix -U__unix -U__unix__" - - echo $ac_n "checking for __declspec(dllexport)""... $ac_c" 1>&6 --echo "configure:6939: checking for __declspec(dllexport)" >&5 -+echo "configure:6837: checking for __declspec(dllexport)" >&5 - if eval "test \"`echo '$''{'ac_os2_declspec'+set}'`\" = set"; then - echo $ac_n "(cached) $ac_c" 1>&6 - else - cat > conftest.$ac_ext <<EOF --#line 6944 "configure" -+#line 6842 "configure" - #include "confdefs.h" - __declspec(dllexport) void ac_os2_declspec(void) {} - int main() { - return 0; - ; return 0; } - EOF --if { (eval echo configure:6951: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then -+if { (eval echo configure:6849: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then - rm -rf conftest* - ac_os2_declspec="yes" - else -@@ -7133,14 +7031,14 @@ - _SAVE_LDFLAGS=$LDFLAGS - LDFLAGS="-M /usr/lib/ld/map.noexstk $LDFLAGS" - cat > conftest.$ac_ext <<EOF --#line 7137 "configure" -+#line 7035 "configure" - #include "confdefs.h" - #include <stdio.h> - int main() { - printf("Hello World\n"); - ; return 0; } - EOF --if { (eval echo configure:7144: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then -+if { (eval echo configure:7042: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then - : - else - echo "configure: failed program was:" >&5 -@@ -7169,7 +7067,7 @@ - CC_VERSION=`$CC -V 2>&1 | grep '^cc:' 2>/dev/null | $AWK -F\: '{ print $2 }'` - CXX_VERSION=`$CXX -V 2>&1 | grep '^CC:' 2>/dev/null | $AWK -F\: '{ print $2 }'` - echo $ac_n "checking for Forte compiler version >= WS6U2""... $ac_c" 1>&6 --echo "configure:7173: checking for Forte compiler version >= WS6U2" >&5 -+echo "configure:7071: checking for Forte compiler version >= WS6U2" >&5 - - ac_ext=C - # CXXFLAGS is not in ac_cpp because -g, -O, etc. are not valid cpp options. -@@ -7179,7 +7077,7 @@ - cross_compiling=$ac_cv_prog_cxx_cross - - cat > conftest.$ac_ext <<EOF --#line 7183 "configure" -+#line 7081 "configure" - #include "confdefs.h" - - int main() { -@@ -7188,7 +7086,7 @@ - #endif - ; return 0; } - EOF --if { (eval echo configure:7192: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then -+if { (eval echo configure:7090: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then - rm -rf conftest* - _BAD_COMPILER= - else -@@ -7339,12 +7237,12 @@ - cross_compiling=$ac_cv_prog_cc_cross - - echo $ac_n "checking for ANSI C header files""... $ac_c" 1>&6 --echo "configure:7343: checking for ANSI C header files" >&5 -+echo "configure:7241: checking for ANSI C header files" >&5 - if eval "test \"`echo '$''{'ac_cv_header_stdc'+set}'`\" = set"; then - echo $ac_n "(cached) $ac_c" 1>&6 - else - cat > conftest.$ac_ext <<EOF --#line 7348 "configure" -+#line 7246 "configure" - #include "confdefs.h" - #include <stdlib.h> - #include <stdarg.h> -@@ -7352,7 +7250,7 @@ - #include <float.h> - EOF - ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" --{ (eval echo configure:7356: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } -+{ (eval echo configure:7254: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } - ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"` - if test -z "$ac_err"; then - rm -rf conftest* -@@ -7369,7 +7267,7 @@ - if test $ac_cv_header_stdc = yes; then - # SunOS 4.x string.h does not declare mem*, contrary to ANSI. - cat > conftest.$ac_ext <<EOF --#line 7373 "configure" -+#line 7271 "configure" - #include "confdefs.h" - #include <string.h> - EOF -@@ -7387,7 +7285,7 @@ - if test $ac_cv_header_stdc = yes; then - # ISC 2.0.2 stdlib.h does not declare free, contrary to ANSI. - cat > conftest.$ac_ext <<EOF --#line 7391 "configure" -+#line 7289 "configure" - #include "confdefs.h" - #include <stdlib.h> - EOF -@@ -7408,7 +7306,7 @@ - : - else - cat > conftest.$ac_ext <<EOF --#line 7412 "configure" -+#line 7310 "configure" - #include "confdefs.h" - #include <ctype.h> - #define ISLOWER(c) ('a' <= (c) && (c) <= 'z') -@@ -7419,7 +7317,7 @@ - exit (0); } - - EOF --if { (eval echo configure:7423: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null -+if { (eval echo configure:7321: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null - then - : - else -@@ -7443,12 +7341,12 @@ - fi - - echo $ac_n "checking for working const""... $ac_c" 1>&6 --echo "configure:7447: checking for working const" >&5 -+echo "configure:7345: checking for working const" >&5 - if eval "test \"`echo '$''{'ac_cv_c_const'+set}'`\" = set"; then - echo $ac_n "(cached) $ac_c" 1>&6 - else - cat > conftest.$ac_ext <<EOF --#line 7452 "configure" -+#line 7350 "configure" - #include "confdefs.h" - - int main() { -@@ -7497,7 +7395,7 @@ - - ; return 0; } - EOF --if { (eval echo configure:7501: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then -+if { (eval echo configure:7399: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then - rm -rf conftest* - ac_cv_c_const=yes - else -@@ -7518,12 +7416,12 @@ - fi - - echo $ac_n "checking for mode_t""... $ac_c" 1>&6 --echo "configure:7522: checking for mode_t" >&5 -+echo "configure:7420: checking for mode_t" >&5 - if eval "test \"`echo '$''{'ac_cv_type_mode_t'+set}'`\" = set"; then - echo $ac_n "(cached) $ac_c" 1>&6 - else - cat > conftest.$ac_ext <<EOF --#line 7527 "configure" -+#line 7425 "configure" - #include "confdefs.h" - #include <sys/types.h> - #if STDC_HEADERS -@@ -7551,12 +7449,12 @@ - fi - - echo $ac_n "checking for off_t""... $ac_c" 1>&6 --echo "configure:7555: checking for off_t" >&5 -+echo "configure:7453: checking for off_t" >&5 - if eval "test \"`echo '$''{'ac_cv_type_off_t'+set}'`\" = set"; then - echo $ac_n "(cached) $ac_c" 1>&6 - else - cat > conftest.$ac_ext <<EOF --#line 7560 "configure" -+#line 7458 "configure" - #include "confdefs.h" - #include <sys/types.h> - #if STDC_HEADERS -@@ -7584,12 +7482,12 @@ - fi - - echo $ac_n "checking for pid_t""... $ac_c" 1>&6 --echo "configure:7588: checking for pid_t" >&5 -+echo "configure:7486: checking for pid_t" >&5 - if eval "test \"`echo '$''{'ac_cv_type_pid_t'+set}'`\" = set"; then - echo $ac_n "(cached) $ac_c" 1>&6 - else - cat > conftest.$ac_ext <<EOF --#line 7593 "configure" -+#line 7491 "configure" - #include "confdefs.h" - #include <sys/types.h> - #if STDC_HEADERS -@@ -7617,12 +7515,12 @@ - fi - - echo $ac_n "checking for size_t""... $ac_c" 1>&6 --echo "configure:7621: checking for size_t" >&5 -+echo "configure:7519: checking for size_t" >&5 - if eval "test \"`echo '$''{'ac_cv_type_size_t'+set}'`\" = set"; then - echo $ac_n "(cached) $ac_c" 1>&6 - else - cat > conftest.$ac_ext <<EOF --#line 7626 "configure" -+#line 7524 "configure" - #include "confdefs.h" - #include <sys/types.h> - #if STDC_HEADERS -@@ -7650,12 +7548,12 @@ - fi - - echo $ac_n "checking for st_blksize in struct stat""... $ac_c" 1>&6 --echo "configure:7654: checking for st_blksize in struct stat" >&5 -+echo "configure:7552: checking for st_blksize in struct stat" >&5 - if eval "test \"`echo '$''{'ac_cv_struct_st_blksize'+set}'`\" = set"; then - echo $ac_n "(cached) $ac_c" 1>&6 - else - cat > conftest.$ac_ext <<EOF --#line 7659 "configure" -+#line 7557 "configure" - #include "confdefs.h" - #include <sys/types.h> - #include <sys/stat.h> -@@ -7663,7 +7561,7 @@ - struct stat s; s.st_blksize; - ; return 0; } - EOF --if { (eval echo configure:7667: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then -+if { (eval echo configure:7565: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then - rm -rf conftest* - ac_cv_struct_st_blksize=yes - else -@@ -7684,12 +7582,12 @@ - fi - - echo $ac_n "checking for siginfo_t""... $ac_c" 1>&6 --echo "configure:7688: checking for siginfo_t" >&5 -+echo "configure:7586: checking for siginfo_t" >&5 - if eval "test \"`echo '$''{'ac_cv_siginfo_t'+set}'`\" = set"; then - echo $ac_n "(cached) $ac_c" 1>&6 - else - cat > conftest.$ac_ext <<EOF --#line 7693 "configure" -+#line 7591 "configure" - #include "confdefs.h" - #define _POSIX_C_SOURCE 199506L - #include <signal.h> -@@ -7697,7 +7595,7 @@ - siginfo_t* info; - ; return 0; } - EOF --if { (eval echo configure:7701: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then -+if { (eval echo configure:7599: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then - rm -rf conftest* - ac_cv_siginfo_t=true - else -@@ -7731,12 +7629,12 @@ - fi - - echo $ac_n "checking for int16_t""... $ac_c" 1>&6 --echo "configure:7735: checking for int16_t" >&5 -+echo "configure:7633: checking for int16_t" >&5 - if eval "test \"`echo '$''{'ac_cv_int16_t'+set}'`\" = set"; then - echo $ac_n "(cached) $ac_c" 1>&6 - else - cat > conftest.$ac_ext <<EOF --#line 7740 "configure" -+#line 7638 "configure" - #include "confdefs.h" - #include <stdio.h> - #include <sys/types.h> -@@ -7744,7 +7642,7 @@ - int16_t foo = 0; - ; return 0; } - EOF --if { (eval echo configure:7748: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then -+if { (eval echo configure:7646: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then - rm -rf conftest* - ac_cv_int16_t=true - else -@@ -7766,12 +7664,12 @@ - echo "$ac_t""no" 1>&6 - fi - echo $ac_n "checking for int32_t""... $ac_c" 1>&6 --echo "configure:7770: checking for int32_t" >&5 -+echo "configure:7668: checking for int32_t" >&5 - if eval "test \"`echo '$''{'ac_cv_int32_t'+set}'`\" = set"; then - echo $ac_n "(cached) $ac_c" 1>&6 - else - cat > conftest.$ac_ext <<EOF --#line 7775 "configure" -+#line 7673 "configure" - #include "confdefs.h" - #include <stdio.h> - #include <sys/types.h> -@@ -7779,7 +7677,7 @@ - int32_t foo = 0; - ; return 0; } - EOF --if { (eval echo configure:7783: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then -+if { (eval echo configure:7681: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then - rm -rf conftest* - ac_cv_int32_t=true - else -@@ -7801,12 +7699,12 @@ - echo "$ac_t""no" 1>&6 - fi - echo $ac_n "checking for int64_t""... $ac_c" 1>&6 --echo "configure:7805: checking for int64_t" >&5 -+echo "configure:7703: checking for int64_t" >&5 - if eval "test \"`echo '$''{'ac_cv_int64_t'+set}'`\" = set"; then - echo $ac_n "(cached) $ac_c" 1>&6 - else - cat > conftest.$ac_ext <<EOF --#line 7810 "configure" -+#line 7708 "configure" - #include "confdefs.h" - #include <stdio.h> - #include <sys/types.h> -@@ -7814,7 +7712,7 @@ - int64_t foo = 0; - ; return 0; } - EOF --if { (eval echo configure:7818: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then -+if { (eval echo configure:7716: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then - rm -rf conftest* - ac_cv_int64_t=true - else -@@ -7836,12 +7734,12 @@ - echo "$ac_t""no" 1>&6 - fi - echo $ac_n "checking for int64""... $ac_c" 1>&6 --echo "configure:7840: checking for int64" >&5 -+echo "configure:7738: checking for int64" >&5 - if eval "test \"`echo '$''{'ac_cv_int64'+set}'`\" = set"; then - echo $ac_n "(cached) $ac_c" 1>&6 - else - cat > conftest.$ac_ext <<EOF --#line 7845 "configure" -+#line 7743 "configure" - #include "confdefs.h" - #include <stdio.h> - #include <sys/types.h> -@@ -7849,7 +7747,7 @@ - int64 foo = 0; - ; return 0; } - EOF --if { (eval echo configure:7853: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then -+if { (eval echo configure:7751: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then - rm -rf conftest* - ac_cv_int64=true - else -@@ -7871,12 +7769,12 @@ - echo "$ac_t""no" 1>&6 - fi - echo $ac_n "checking for uint""... $ac_c" 1>&6 --echo "configure:7875: checking for uint" >&5 -+echo "configure:7773: checking for uint" >&5 - if eval "test \"`echo '$''{'ac_cv_uint'+set}'`\" = set"; then - echo $ac_n "(cached) $ac_c" 1>&6 - else - cat > conftest.$ac_ext <<EOF --#line 7880 "configure" -+#line 7778 "configure" - #include "confdefs.h" - #include <stdio.h> - #include <sys/types.h> -@@ -7884,7 +7782,7 @@ - uint foo = 0; - ; return 0; } - EOF --if { (eval echo configure:7888: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then -+if { (eval echo configure:7786: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then - rm -rf conftest* - ac_cv_uint=true - else -@@ -7906,12 +7804,12 @@ - echo "$ac_t""no" 1>&6 - fi - echo $ac_n "checking for uint_t""... $ac_c" 1>&6 --echo "configure:7910: checking for uint_t" >&5 -+echo "configure:7808: checking for uint_t" >&5 - if eval "test \"`echo '$''{'ac_cv_uint_t'+set}'`\" = set"; then - echo $ac_n "(cached) $ac_c" 1>&6 - else - cat > conftest.$ac_ext <<EOF --#line 7915 "configure" -+#line 7813 "configure" - #include "confdefs.h" - #include <stdio.h> - #include <sys/types.h> -@@ -7919,7 +7817,7 @@ - uint_t foo = 0; - ; return 0; } - EOF --if { (eval echo configure:7923: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then -+if { (eval echo configure:7821: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then - rm -rf conftest* - ac_cv_uint_t=true - else -@@ -7941,12 +7839,12 @@ - echo "$ac_t""no" 1>&6 - fi - echo $ac_n "checking for uint16_t""... $ac_c" 1>&6 --echo "configure:7945: checking for uint16_t" >&5 -+echo "configure:7843: checking for uint16_t" >&5 - if eval "test \"`echo '$''{'ac_cv_uint16_t'+set}'`\" = set"; then - echo $ac_n "(cached) $ac_c" 1>&6 - else - cat > conftest.$ac_ext <<EOF --#line 7950 "configure" -+#line 7848 "configure" - #include "confdefs.h" - #include <stdio.h> - #include <sys/types.h> -@@ -7954,7 +7852,7 @@ - uint16_t foo = 0; - ; return 0; } - EOF --if { (eval echo configure:7958: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then -+if { (eval echo configure:7856: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then - rm -rf conftest* - ac_cv_uint16_t=true - else -@@ -7985,12 +7883,12 @@ - - - echo $ac_n "checking for uname.domainname""... $ac_c" 1>&6 --echo "configure:7989: checking for uname.domainname" >&5 -+echo "configure:7887: checking for uname.domainname" >&5 - if eval "test \"`echo '$''{'ac_cv_have_uname_domainname_field'+set}'`\" = set"; then - echo $ac_n "(cached) $ac_c" 1>&6 - else - cat > conftest.$ac_ext <<EOF --#line 7994 "configure" -+#line 7892 "configure" - #include "confdefs.h" - #include <sys/utsname.h> - int main() { -@@ -7998,7 +7896,7 @@ - (void)uname(res); if (res != 0) { domain = res->domainname; } - ; return 0; } - EOF --if { (eval echo configure:8002: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then -+if { (eval echo configure:7900: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then - rm -rf conftest* - ac_cv_have_uname_domainname_field=true - else -@@ -8022,12 +7920,12 @@ - fi - - echo $ac_n "checking for uname.__domainname""... $ac_c" 1>&6 --echo "configure:8026: checking for uname.__domainname" >&5 -+echo "configure:7924: checking for uname.__domainname" >&5 - if eval "test \"`echo '$''{'ac_cv_have_uname_us_domainname_field'+set}'`\" = set"; then - echo $ac_n "(cached) $ac_c" 1>&6 - else - cat > conftest.$ac_ext <<EOF --#line 8031 "configure" -+#line 7929 "configure" - #include "confdefs.h" - #include <sys/utsname.h> - int main() { -@@ -8035,7 +7933,7 @@ - (void)uname(res); if (res != 0) { domain = res->__domainname; } - ; return 0; } - EOF --if { (eval echo configure:8039: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then -+if { (eval echo configure:7937: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then - rm -rf conftest* - ac_cv_have_uname_us_domainname_field=true - else -@@ -8068,12 +7966,12 @@ - - - echo $ac_n "checking for usable wchar_t (2 bytes, unsigned)""... $ac_c" 1>&6 --echo "configure:8072: checking for usable wchar_t (2 bytes, unsigned)" >&5 -+echo "configure:7970: checking for usable wchar_t (2 bytes, unsigned)" >&5 - if eval "test \"`echo '$''{'ac_cv_have_usable_wchar_v2'+set}'`\" = set"; then - echo $ac_n "(cached) $ac_c" 1>&6 - else - cat > conftest.$ac_ext <<EOF --#line 8077 "configure" -+#line 7975 "configure" - #include "confdefs.h" - #include <stddef.h> - $configure_static_assert_macros -@@ -8082,7 +7980,7 @@ - CONFIGURE_STATIC_ASSERT((wchar_t)-1 > (wchar_t) 0) - ; return 0; } - EOF --if { (eval echo configure:8086: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then -+if { (eval echo configure:7984: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then - rm -rf conftest* - ac_cv_have_usable_wchar_v2="yes" - else -@@ -8101,7 +7999,7 @@ - EOF - - HAVE_CPP_2BYTE_WCHAR_T=1 --else -+elif false; then - - - ac_ext=C -@@ -8115,12 +8013,12 @@ - CXXFLAGS="$CXXFLAGS -fshort-wchar" - - echo $ac_n "checking for compiler -fshort-wchar option""... $ac_c" 1>&6 --echo "configure:8119: checking for compiler -fshort-wchar option" >&5 -+echo "configure:8017: checking for compiler -fshort-wchar option" >&5 - if eval "test \"`echo '$''{'ac_cv_have_usable_wchar_option_v2'+set}'`\" = set"; then - echo $ac_n "(cached) $ac_c" 1>&6 - else - cat > conftest.$ac_ext <<EOF --#line 8124 "configure" -+#line 8022 "configure" - #include "confdefs.h" - #include <stddef.h> - $configure_static_assert_macros -@@ -8129,7 +8027,7 @@ - CONFIGURE_STATIC_ASSERT((wchar_t)-1 > (wchar_t) 0) - ; return 0; } - EOF --if { (eval echo configure:8133: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then -+if { (eval echo configure:8031: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then - rm -rf conftest* - ac_cv_have_usable_wchar_option_v2="yes" - else -@@ -8163,7 +8061,7 @@ - - if test "$GNU_CC"; then - echo $ac_n "checking for visibility(hidden) attribute""... $ac_c" 1>&6 --echo "configure:8167: checking for visibility(hidden) attribute" >&5 -+echo "configure:8065: checking for visibility(hidden) attribute" >&5 - if eval "test \"`echo '$''{'ac_cv_visibility_hidden'+set}'`\" = set"; then - echo $ac_n "(cached) $ac_c" 1>&6 - else -@@ -8188,7 +8086,7 @@ - - - echo $ac_n "checking for visibility(default) attribute""... $ac_c" 1>&6 --echo "configure:8192: checking for visibility(default) attribute" >&5 -+echo "configure:8090: checking for visibility(default) attribute" >&5 - if eval "test \"`echo '$''{'ac_cv_visibility_default'+set}'`\" = set"; then - echo $ac_n "(cached) $ac_c" 1>&6 - else -@@ -8213,7 +8111,7 @@ - - - echo $ac_n "checking for visibility pragma support""... $ac_c" 1>&6 --echo "configure:8217: checking for visibility pragma support" >&5 -+echo "configure:8115: checking for visibility pragma support" >&5 - if eval "test \"`echo '$''{'ac_cv_visibility_pragma'+set}'`\" = set"; then - echo $ac_n "(cached) $ac_c" 1>&6 - else -@@ -8238,7 +8136,7 @@ - echo "$ac_t""$ac_cv_visibility_pragma" 1>&6 - if test "$ac_cv_visibility_pragma" = "yes"; then - echo $ac_n "checking For gcc visibility bug with class-level attributes (GCC bug 26905)""... $ac_c" 1>&6 --echo "configure:8242: checking For gcc visibility bug with class-level attributes (GCC bug 26905)" >&5 -+echo "configure:8140: checking For gcc visibility bug with class-level attributes (GCC bug 26905)" >&5 - if eval "test \"`echo '$''{'ac_cv_have_visibility_class_bug'+set}'`\" = set"; then - echo $ac_n "(cached) $ac_c" 1>&6 - else -@@ -8266,7 +8164,7 @@ - echo "$ac_t""$ac_cv_have_visibility_class_bug" 1>&6 - - echo $ac_n "checking For x86_64 gcc visibility bug with builtins (GCC bug 20297)""... $ac_c" 1>&6 --echo "configure:8270: checking For x86_64 gcc visibility bug with builtins (GCC bug 20297)" >&5 -+echo "configure:8168: checking For x86_64 gcc visibility bug with builtins (GCC bug 20297)" >&5 - if eval "test \"`echo '$''{'ac_cv_have_visibility_builtin_bug'+set}'`\" = set"; then - echo $ac_n "(cached) $ac_c" 1>&6 - else -@@ -8314,12 +8212,12 @@ - do - ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'` - echo $ac_n "checking for $ac_hdr that defines DIR""... $ac_c" 1>&6 --echo "configure:8318: checking for $ac_hdr that defines DIR" >&5 -+echo "configure:8216: checking for $ac_hdr that defines DIR" >&5 - if eval "test \"`echo '$''{'ac_cv_header_dirent_$ac_safe'+set}'`\" = set"; then - echo $ac_n "(cached) $ac_c" 1>&6 - else - cat > conftest.$ac_ext <<EOF --#line 8323 "configure" -+#line 8221 "configure" - #include "confdefs.h" - #include <sys/types.h> - #include <$ac_hdr> -@@ -8327,7 +8225,7 @@ - DIR *dirp = 0; - ; return 0; } - EOF --if { (eval echo configure:8331: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then -+if { (eval echo configure:8229: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then - rm -rf conftest* - eval "ac_cv_header_dirent_$ac_safe=yes" - else -@@ -8352,7 +8250,7 @@ - # Two versions of opendir et al. are in -ldir and -lx on SCO Xenix. - if test $ac_header_dirent = dirent.h; then - echo $ac_n "checking for opendir in -ldir""... $ac_c" 1>&6 --echo "configure:8356: checking for opendir in -ldir" >&5 -+echo "configure:8254: checking for opendir in -ldir" >&5 - ac_lib_var=`echo dir'_'opendir | sed 'y%./+-%__p_%'` - if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then - echo $ac_n "(cached) $ac_c" 1>&6 -@@ -8360,7 +8258,7 @@ - ac_save_LIBS="$LIBS" - LIBS="-ldir $LIBS" - cat > conftest.$ac_ext <<EOF --#line 8364 "configure" -+#line 8262 "configure" - #include "confdefs.h" - /* Override any gcc2 internal prototype to avoid an error. */ - /* We use char because int might match the return type of a gcc2 -@@ -8371,7 +8269,7 @@ - opendir() - ; return 0; } - EOF --if { (eval echo configure:8375: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then -+if { (eval echo configure:8273: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then - rm -rf conftest* - eval "ac_cv_lib_$ac_lib_var=yes" - else -@@ -8393,7 +8291,7 @@ - - else - echo $ac_n "checking for opendir in -lx""... $ac_c" 1>&6 --echo "configure:8397: checking for opendir in -lx" >&5 -+echo "configure:8295: checking for opendir in -lx" >&5 - ac_lib_var=`echo x'_'opendir | sed 'y%./+-%__p_%'` - if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then - echo $ac_n "(cached) $ac_c" 1>&6 -@@ -8401,7 +8299,7 @@ - ac_save_LIBS="$LIBS" - LIBS="-lx $LIBS" - cat > conftest.$ac_ext <<EOF --#line 8405 "configure" -+#line 8303 "configure" - #include "confdefs.h" - /* Override any gcc2 internal prototype to avoid an error. */ - /* We use char because int might match the return type of a gcc2 -@@ -8412,7 +8310,7 @@ - opendir() - ; return 0; } - EOF --if { (eval echo configure:8416: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then -+if { (eval echo configure:8314: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then - rm -rf conftest* - eval "ac_cv_lib_$ac_lib_var=yes" - else -@@ -8444,17 +8342,17 @@ - do - ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'` - echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6 --echo "configure:8448: checking for $ac_hdr" >&5 -+echo "configure:8346: checking for $ac_hdr" >&5 - if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then - echo $ac_n "(cached) $ac_c" 1>&6 - else - cat > conftest.$ac_ext <<EOF --#line 8453 "configure" -+#line 8351 "configure" - #include "confdefs.h" - #include <$ac_hdr> - EOF - ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" --{ (eval echo configure:8458: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } -+{ (eval echo configure:8356: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } - ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"` - if test -z "$ac_err"; then - rm -rf conftest* -@@ -8484,17 +8382,17 @@ - do - ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'` - echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6 --echo "configure:8488: checking for $ac_hdr" >&5 -+echo "configure:8386: checking for $ac_hdr" >&5 - if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then - echo $ac_n "(cached) $ac_c" 1>&6 - else - cat > conftest.$ac_ext <<EOF --#line 8493 "configure" -+#line 8391 "configure" - #include "confdefs.h" - #include <$ac_hdr> - EOF - ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" --{ (eval echo configure:8498: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } -+{ (eval echo configure:8396: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } - ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"` - if test -z "$ac_err"; then - rm -rf conftest* -@@ -8524,17 +8422,17 @@ - do - ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'` - echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6 --echo "configure:8528: checking for $ac_hdr" >&5 -+echo "configure:8426: checking for $ac_hdr" >&5 - if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then - echo $ac_n "(cached) $ac_c" 1>&6 - else - cat > conftest.$ac_ext <<EOF --#line 8533 "configure" -+#line 8431 "configure" - #include "confdefs.h" - #include <$ac_hdr> - EOF - ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" --{ (eval echo configure:8538: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } -+{ (eval echo configure:8436: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } - ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"` - if test -z "$ac_err"; then - rm -rf conftest* -@@ -8564,17 +8462,17 @@ - do - ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'` - echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6 --echo "configure:8568: checking for $ac_hdr" >&5 -+echo "configure:8466: checking for $ac_hdr" >&5 - if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then - echo $ac_n "(cached) $ac_c" 1>&6 - else - cat > conftest.$ac_ext <<EOF --#line 8573 "configure" -+#line 8471 "configure" - #include "confdefs.h" - #include <$ac_hdr> - EOF - ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" --{ (eval echo configure:8578: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } -+{ (eval echo configure:8476: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } - ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"` - if test -z "$ac_err"; then - rm -rf conftest* -@@ -8604,17 +8502,17 @@ - do - ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'` - echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6 --echo "configure:8608: checking for $ac_hdr" >&5 -+echo "configure:8506: checking for $ac_hdr" >&5 - if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then - echo $ac_n "(cached) $ac_c" 1>&6 - else - cat > conftest.$ac_ext <<EOF --#line 8613 "configure" -+#line 8511 "configure" - #include "confdefs.h" - #include <$ac_hdr> - EOF - ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" --{ (eval echo configure:8618: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } -+{ (eval echo configure:8516: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } - ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"` - if test -z "$ac_err"; then - rm -rf conftest* -@@ -8645,17 +8543,17 @@ - do - ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'` - echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6 --echo "configure:8649: checking for $ac_hdr" >&5 -+echo "configure:8547: checking for $ac_hdr" >&5 - if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then - echo $ac_n "(cached) $ac_c" 1>&6 - else - cat > conftest.$ac_ext <<EOF --#line 8654 "configure" -+#line 8552 "configure" - #include "confdefs.h" - #include <$ac_hdr> - EOF - ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" --{ (eval echo configure:8659: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } -+{ (eval echo configure:8557: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } - ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"` - if test -z "$ac_err"; then - rm -rf conftest* -@@ -8686,17 +8584,17 @@ - do - ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'` - echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6 --echo "configure:8690: checking for $ac_hdr" >&5 -+echo "configure:8588: checking for $ac_hdr" >&5 - if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then - echo $ac_n "(cached) $ac_c" 1>&6 - else - cat > conftest.$ac_ext <<EOF --#line 8695 "configure" -+#line 8593 "configure" - #include "confdefs.h" - #include <$ac_hdr> - EOF - ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" --{ (eval echo configure:8700: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } -+{ (eval echo configure:8598: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } - ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"` - if test -z "$ac_err"; then - rm -rf conftest* -@@ -8733,17 +8631,17 @@ - NEW_H=new.h - ac_safe=`echo "new" | sed 'y%./+-%__p_%'` - echo $ac_n "checking for new""... $ac_c" 1>&6 --echo "configure:8737: checking for new" >&5 -+echo "configure:8635: checking for new" >&5 - if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then - echo $ac_n "(cached) $ac_c" 1>&6 - else - cat > conftest.$ac_ext <<EOF --#line 8742 "configure" -+#line 8640 "configure" - #include "confdefs.h" - #include <new> - EOF - ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" --{ (eval echo configure:8747: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } -+{ (eval echo configure:8645: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } - ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"` - if test -z "$ac_err"; then - rm -rf conftest* -@@ -8785,17 +8683,17 @@ - if test "x$enable_dtrace" = "xyes"; then - ac_safe=`echo "sys/sdt.h" | sed 'y%./+-%__p_%'` - echo $ac_n "checking for sys/sdt.h""... $ac_c" 1>&6 --echo "configure:8789: checking for sys/sdt.h" >&5 -+echo "configure:8687: checking for sys/sdt.h" >&5 - if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then - echo $ac_n "(cached) $ac_c" 1>&6 - else - cat > conftest.$ac_ext <<EOF --#line 8794 "configure" -+#line 8692 "configure" - #include "confdefs.h" - #include <sys/sdt.h> - EOF - ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" --{ (eval echo configure:8799: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } -+{ (eval echo configure:8697: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } - ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"` - if test -z "$ac_err"; then - rm -rf conftest* -@@ -8835,17 +8733,17 @@ - do - ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'` - echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6 --echo "configure:8839: checking for $ac_hdr" >&5 -+echo "configure:8737: checking for $ac_hdr" >&5 - if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then - echo $ac_n "(cached) $ac_c" 1>&6 - else - cat > conftest.$ac_ext <<EOF --#line 8844 "configure" -+#line 8742 "configure" - #include "confdefs.h" - #include <$ac_hdr> - EOF - ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" --{ (eval echo configure:8849: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } -+{ (eval echo configure:8747: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } - ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"` - if test -z "$ac_err"; then - rm -rf conftest* -@@ -8879,7 +8777,7 @@ - ;; - *) - echo $ac_n "checking for gethostbyname_r in -lc_r""... $ac_c" 1>&6 --echo "configure:8883: checking for gethostbyname_r in -lc_r" >&5 -+echo "configure:8781: checking for gethostbyname_r in -lc_r" >&5 - ac_lib_var=`echo c_r'_'gethostbyname_r | sed 'y%./+-%__p_%'` - if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then - echo $ac_n "(cached) $ac_c" 1>&6 -@@ -8887,7 +8785,7 @@ - ac_save_LIBS="$LIBS" - LIBS="-lc_r $LIBS" - cat > conftest.$ac_ext <<EOF --#line 8891 "configure" -+#line 8789 "configure" - #include "confdefs.h" - /* Override any gcc2 internal prototype to avoid an error. */ - /* We use char because int might match the return type of a gcc2 -@@ -8898,7 +8796,7 @@ - gethostbyname_r() - ; return 0; } - EOF --if { (eval echo configure:8902: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then -+if { (eval echo configure:8800: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then - rm -rf conftest* - eval "ac_cv_lib_$ac_lib_var=yes" - else -@@ -8935,7 +8833,7 @@ - ;; - *) - echo $ac_n "checking for atan in -lm""... $ac_c" 1>&6 --echo "configure:8939: checking for atan in -lm" >&5 -+echo "configure:8837: checking for atan in -lm" >&5 - ac_lib_var=`echo m'_'atan | sed 'y%./+-%__p_%'` - if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then - echo $ac_n "(cached) $ac_c" 1>&6 -@@ -8943,7 +8841,7 @@ - ac_save_LIBS="$LIBS" - LIBS="-lm $LIBS" - cat > conftest.$ac_ext <<EOF --#line 8947 "configure" -+#line 8845 "configure" - #include "confdefs.h" - /* Override any gcc2 internal prototype to avoid an error. */ - /* We use char because int might match the return type of a gcc2 -@@ -8954,7 +8852,7 @@ - atan() - ; return 0; } - EOF --if { (eval echo configure:8958: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then -+if { (eval echo configure:8856: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then - rm -rf conftest* - eval "ac_cv_lib_$ac_lib_var=yes" - else -@@ -8982,7 +8880,7 @@ - fi - - echo $ac_n "checking for dlopen in -ldl""... $ac_c" 1>&6 --echo "configure:8986: checking for dlopen in -ldl" >&5 -+echo "configure:8884: checking for dlopen in -ldl" >&5 - ac_lib_var=`echo dl'_'dlopen | sed 'y%./+-%__p_%'` - if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then - echo $ac_n "(cached) $ac_c" 1>&6 -@@ -8990,7 +8888,7 @@ - ac_save_LIBS="$LIBS" - LIBS="-ldl $LIBS" - cat > conftest.$ac_ext <<EOF --#line 8994 "configure" -+#line 8892 "configure" - #include "confdefs.h" - /* Override any gcc2 internal prototype to avoid an error. */ - /* We use char because int might match the return type of a gcc2 -@@ -9001,7 +8899,7 @@ - dlopen() - ; return 0; } - EOF --if { (eval echo configure:9005: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then -+if { (eval echo configure:8903: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then - rm -rf conftest* - eval "ac_cv_lib_$ac_lib_var=yes" - else -@@ -9018,17 +8916,17 @@ - echo "$ac_t""yes" 1>&6 - ac_safe=`echo "dlfcn.h" | sed 'y%./+-%__p_%'` - echo $ac_n "checking for dlfcn.h""... $ac_c" 1>&6 --echo "configure:9022: checking for dlfcn.h" >&5 -+echo "configure:8920: checking for dlfcn.h" >&5 - if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then - echo $ac_n "(cached) $ac_c" 1>&6 - else - cat > conftest.$ac_ext <<EOF --#line 9027 "configure" -+#line 8925 "configure" - #include "confdefs.h" - #include <dlfcn.h> - EOF - ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" --{ (eval echo configure:9032: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } -+{ (eval echo configure:8930: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } - ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"` - if test -z "$ac_err"; then - rm -rf conftest* -@@ -9065,12 +8963,12 @@ - for ac_func in dladdr - do - echo $ac_n "checking for $ac_func""... $ac_c" 1>&6 --echo "configure:9069: checking for $ac_func" >&5 -+echo "configure:8967: checking for $ac_func" >&5 - if eval "test \"`echo '$''{'ac_cv_func_$ac_func'+set}'`\" = set"; then - echo $ac_n "(cached) $ac_c" 1>&6 - else - cat > conftest.$ac_ext <<EOF --#line 9074 "configure" -+#line 8972 "configure" - #include "confdefs.h" - /* System header to define __stub macros and hopefully few prototypes, - which can conflict with char $ac_func(); below. */ -@@ -9093,7 +8991,7 @@ - - ; return 0; } - EOF --if { (eval echo configure:9097: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then -+if { (eval echo configure:8995: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then - rm -rf conftest* - eval "ac_cv_func_$ac_func=yes" - else -@@ -9124,7 +9022,7 @@ - case $target in - *-aix*) - echo $ac_n "checking for demangle in -lC_r""... $ac_c" 1>&6 --echo "configure:9128: checking for demangle in -lC_r" >&5 -+echo "configure:9026: checking for demangle in -lC_r" >&5 - ac_lib_var=`echo C_r'_'demangle | sed 'y%./+-%__p_%'` - if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then - echo $ac_n "(cached) $ac_c" 1>&6 -@@ -9132,7 +9030,7 @@ - ac_save_LIBS="$LIBS" - LIBS="-lC_r $LIBS" - cat > conftest.$ac_ext <<EOF --#line 9136 "configure" -+#line 9034 "configure" - #include "confdefs.h" - /* Override any gcc2 internal prototype to avoid an error. */ - /* We use char because int might match the return type of a gcc2 -@@ -9143,7 +9041,7 @@ - demangle() - ; return 0; } - EOF --if { (eval echo configure:9147: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then -+if { (eval echo configure:9045: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then - rm -rf conftest* - eval "ac_cv_lib_$ac_lib_var=yes" - else -@@ -9173,7 +9071,7 @@ - ;; - *) - echo $ac_n "checking for demangle in -lC""... $ac_c" 1>&6 --echo "configure:9177: checking for demangle in -lC" >&5 -+echo "configure:9075: checking for demangle in -lC" >&5 - ac_lib_var=`echo C'_'demangle | sed 'y%./+-%__p_%'` - if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then - echo $ac_n "(cached) $ac_c" 1>&6 -@@ -9181,7 +9079,7 @@ - ac_save_LIBS="$LIBS" - LIBS="-lC $LIBS" - cat > conftest.$ac_ext <<EOF --#line 9185 "configure" -+#line 9083 "configure" - #include "confdefs.h" - /* Override any gcc2 internal prototype to avoid an error. */ - /* We use char because int might match the return type of a gcc2 -@@ -9192,7 +9090,7 @@ - demangle() - ; return 0; } - EOF --if { (eval echo configure:9196: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then -+if { (eval echo configure:9094: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then - rm -rf conftest* - eval "ac_cv_lib_$ac_lib_var=yes" - else -@@ -9223,7 +9121,7 @@ - esac - fi - echo $ac_n "checking for socket in -lsocket""... $ac_c" 1>&6 --echo "configure:9227: checking for socket in -lsocket" >&5 -+echo "configure:9125: checking for socket in -lsocket" >&5 - ac_lib_var=`echo socket'_'socket | sed 'y%./+-%__p_%'` - if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then - echo $ac_n "(cached) $ac_c" 1>&6 -@@ -9231,7 +9129,7 @@ - ac_save_LIBS="$LIBS" - LIBS="-lsocket $LIBS" - cat > conftest.$ac_ext <<EOF --#line 9235 "configure" -+#line 9133 "configure" - #include "confdefs.h" - /* Override any gcc2 internal prototype to avoid an error. */ - /* We use char because int might match the return type of a gcc2 -@@ -9242,7 +9140,7 @@ - socket() - ; return 0; } - EOF --if { (eval echo configure:9246: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then -+if { (eval echo configure:9144: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then - rm -rf conftest* - eval "ac_cv_lib_$ac_lib_var=yes" - else -@@ -9287,7 +9185,7 @@ - _SAVE_LDFLAGS="$LDFLAGS" - LDFLAGS="$XLDFLAGS $LDFLAGS" - echo $ac_n "checking for XDrawLines in -lX11""... $ac_c" 1>&6 --echo "configure:9291: checking for XDrawLines in -lX11" >&5 -+echo "configure:9189: checking for XDrawLines in -lX11" >&5 - ac_lib_var=`echo X11'_'XDrawLines | sed 'y%./+-%__p_%'` - if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then - echo $ac_n "(cached) $ac_c" 1>&6 -@@ -9295,7 +9193,7 @@ - ac_save_LIBS="$LIBS" - LIBS="-lX11 $XLIBS $LIBS" - cat > conftest.$ac_ext <<EOF --#line 9299 "configure" -+#line 9197 "configure" - #include "confdefs.h" - /* Override any gcc2 internal prototype to avoid an error. */ - /* We use char because int might match the return type of a gcc2 -@@ -9306,7 +9204,7 @@ - XDrawLines() - ; return 0; } - EOF --if { (eval echo configure:9310: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then -+if { (eval echo configure:9208: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then - rm -rf conftest* - eval "ac_cv_lib_$ac_lib_var=yes" - else -@@ -9328,7 +9226,7 @@ - fi - - echo $ac_n "checking for XextAddDisplay in -lXext""... $ac_c" 1>&6 --echo "configure:9332: checking for XextAddDisplay in -lXext" >&5 -+echo "configure:9230: checking for XextAddDisplay in -lXext" >&5 - ac_lib_var=`echo Xext'_'XextAddDisplay | sed 'y%./+-%__p_%'` - if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then - echo $ac_n "(cached) $ac_c" 1>&6 -@@ -9336,7 +9234,7 @@ - ac_save_LIBS="$LIBS" - LIBS="-lXext $XLIBS $LIBS" - cat > conftest.$ac_ext <<EOF --#line 9340 "configure" -+#line 9238 "configure" - #include "confdefs.h" - /* Override any gcc2 internal prototype to avoid an error. */ - /* We use char because int might match the return type of a gcc2 -@@ -9347,7 +9245,7 @@ - XextAddDisplay() - ; return 0; } - EOF --if { (eval echo configure:9351: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then -+if { (eval echo configure:9249: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then - rm -rf conftest* - eval "ac_cv_lib_$ac_lib_var=yes" - else -@@ -9371,7 +9269,7 @@ - - - echo $ac_n "checking for XtFree in -lXt""... $ac_c" 1>&6 --echo "configure:9375: checking for XtFree in -lXt" >&5 -+echo "configure:9273: checking for XtFree in -lXt" >&5 - ac_lib_var=`echo Xt'_'XtFree | sed 'y%./+-%__p_%'` - if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then - echo $ac_n "(cached) $ac_c" 1>&6 -@@ -9379,7 +9277,7 @@ - ac_save_LIBS="$LIBS" - LIBS="-lXt $LIBS" - cat > conftest.$ac_ext <<EOF --#line 9383 "configure" -+#line 9281 "configure" - #include "confdefs.h" - /* Override any gcc2 internal prototype to avoid an error. */ - /* We use char because int might match the return type of a gcc2 -@@ -9390,7 +9288,7 @@ - XtFree() - ; return 0; } - EOF --if { (eval echo configure:9394: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then -+if { (eval echo configure:9292: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then - rm -rf conftest* - eval "ac_cv_lib_$ac_lib_var=yes" - else -@@ -9411,7 +9309,7 @@ - - unset ac_cv_lib_Xt_XtFree - echo $ac_n "checking for IceFlush in -lICE""... $ac_c" 1>&6 --echo "configure:9415: checking for IceFlush in -lICE" >&5 -+echo "configure:9313: checking for IceFlush in -lICE" >&5 - ac_lib_var=`echo ICE'_'IceFlush | sed 'y%./+-%__p_%'` - if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then - echo $ac_n "(cached) $ac_c" 1>&6 -@@ -9419,7 +9317,7 @@ - ac_save_LIBS="$LIBS" - LIBS="-lICE $XT_LIBS $XLIBS $LIBS" - cat > conftest.$ac_ext <<EOF --#line 9423 "configure" -+#line 9321 "configure" - #include "confdefs.h" - /* Override any gcc2 internal prototype to avoid an error. */ - /* We use char because int might match the return type of a gcc2 -@@ -9430,7 +9328,7 @@ - IceFlush() - ; return 0; } - EOF --if { (eval echo configure:9434: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then -+if { (eval echo configure:9332: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then - rm -rf conftest* - eval "ac_cv_lib_$ac_lib_var=yes" - else -@@ -9451,7 +9349,7 @@ - fi - - echo $ac_n "checking for SmcCloseConnection in -lSM""... $ac_c" 1>&6 --echo "configure:9455: checking for SmcCloseConnection in -lSM" >&5 -+echo "configure:9353: checking for SmcCloseConnection in -lSM" >&5 - ac_lib_var=`echo SM'_'SmcCloseConnection | sed 'y%./+-%__p_%'` - if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then - echo $ac_n "(cached) $ac_c" 1>&6 -@@ -9459,7 +9357,7 @@ - ac_save_LIBS="$LIBS" - LIBS="-lSM $XT_LIBS $XLIBS $LIBS" - cat > conftest.$ac_ext <<EOF --#line 9463 "configure" -+#line 9361 "configure" - #include "confdefs.h" - /* Override any gcc2 internal prototype to avoid an error. */ - /* We use char because int might match the return type of a gcc2 -@@ -9470,7 +9368,7 @@ - SmcCloseConnection() - ; return 0; } - EOF --if { (eval echo configure:9474: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then -+if { (eval echo configure:9372: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then - rm -rf conftest* - eval "ac_cv_lib_$ac_lib_var=yes" - else -@@ -9491,7 +9389,7 @@ - fi - - echo $ac_n "checking for XtFree in -lXt""... $ac_c" 1>&6 --echo "configure:9495: checking for XtFree in -lXt" >&5 -+echo "configure:9393: checking for XtFree in -lXt" >&5 - ac_lib_var=`echo Xt'_'XtFree | sed 'y%./+-%__p_%'` - if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then - echo $ac_n "(cached) $ac_c" 1>&6 -@@ -9499,7 +9397,7 @@ - ac_save_LIBS="$LIBS" - LIBS="-lXt $X_PRE_LIBS $XT_LIBS $XLIBS $LIBS" - cat > conftest.$ac_ext <<EOF --#line 9503 "configure" -+#line 9401 "configure" - #include "confdefs.h" - /* Override any gcc2 internal prototype to avoid an error. */ - /* We use char because int might match the return type of a gcc2 -@@ -9510,7 +9408,7 @@ - XtFree() - ; return 0; } - EOF --if { (eval echo configure:9514: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then -+if { (eval echo configure:9412: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then - rm -rf conftest* - eval "ac_cv_lib_$ac_lib_var=yes" - else -@@ -9544,7 +9442,7 @@ - esac - - echo $ac_n "checking for XShmCreateImage in -lXext""... $ac_c" 1>&6 --echo "configure:9548: checking for XShmCreateImage in -lXext" >&5 -+echo "configure:9446: checking for XShmCreateImage in -lXext" >&5 - ac_lib_var=`echo Xext'_'XShmCreateImage | sed 'y%./+-%__p_%'` - if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then - echo $ac_n "(cached) $ac_c" 1>&6 -@@ -9552,7 +9450,7 @@ - ac_save_LIBS="$LIBS" - LIBS="-lXext $XLIBS $XEXT_LIBS $LIBS" - cat > conftest.$ac_ext <<EOF --#line 9556 "configure" -+#line 9454 "configure" - #include "confdefs.h" - /* Override any gcc2 internal prototype to avoid an error. */ - /* We use char because int might match the return type of a gcc2 -@@ -9563,7 +9461,7 @@ - XShmCreateImage() - ; return 0; } - EOF --if { (eval echo configure:9567: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then -+if { (eval echo configure:9465: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then - rm -rf conftest* - eval "ac_cv_lib_$ac_lib_var=yes" - else -@@ -9585,17 +9483,17 @@ - - ac_safe=`echo "X11/extensions/XShm.h" | sed 'y%./+-%__p_%'` - echo $ac_n "checking for X11/extensions/XShm.h""... $ac_c" 1>&6 --echo "configure:9589: checking for X11/extensions/XShm.h" >&5 -+echo "configure:9487: checking for X11/extensions/XShm.h" >&5 - if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then - echo $ac_n "(cached) $ac_c" 1>&6 - else - cat > conftest.$ac_ext <<EOF --#line 9594 "configure" -+#line 9492 "configure" - #include "confdefs.h" - #include <X11/extensions/XShm.h> - EOF - ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" --{ (eval echo configure:9599: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } -+{ (eval echo configure:9497: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } - ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"` - if test -z "$ac_err"; then - rm -rf conftest* -@@ -9625,7 +9523,7 @@ - fi - - echo $ac_n "checking for XieFloGeometry in -lXIE""... $ac_c" 1>&6 --echo "configure:9629: checking for XieFloGeometry in -lXIE" >&5 -+echo "configure:9527: checking for XieFloGeometry in -lXIE" >&5 - ac_lib_var=`echo XIE'_'XieFloGeometry | sed 'y%./+-%__p_%'` - if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then - echo $ac_n "(cached) $ac_c" 1>&6 -@@ -9633,7 +9531,7 @@ - ac_save_LIBS="$LIBS" - LIBS="-lXIE $XLIBS $XEXT_LIBS $LIBS" - cat > conftest.$ac_ext <<EOF --#line 9637 "configure" -+#line 9535 "configure" - #include "confdefs.h" - /* Override any gcc2 internal prototype to avoid an error. */ - /* We use char because int might match the return type of a gcc2 -@@ -9644,7 +9542,7 @@ - XieFloGeometry() - ; return 0; } - EOF --if { (eval echo configure:9648: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then -+if { (eval echo configure:9546: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then - rm -rf conftest* - eval "ac_cv_lib_$ac_lib_var=yes" - else -@@ -9666,17 +9564,17 @@ - - ac_safe=`echo "X11/extensions/XIElib.h" | sed 'y%./+-%__p_%'` - echo $ac_n "checking for X11/extensions/XIElib.h""... $ac_c" 1>&6 --echo "configure:9670: checking for X11/extensions/XIElib.h" >&5 -+echo "configure:9568: checking for X11/extensions/XIElib.h" >&5 - if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then - echo $ac_n "(cached) $ac_c" 1>&6 - else - cat > conftest.$ac_ext <<EOF --#line 9675 "configure" -+#line 9573 "configure" - #include "confdefs.h" - #include <X11/extensions/XIElib.h> - EOF - ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" --{ (eval echo configure:9680: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } -+{ (eval echo configure:9578: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } - ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"` - if test -z "$ac_err"; then - rm -rf conftest* -@@ -9750,7 +9648,7 @@ - # Extract the first word of "freetype-config", so it can be a program name with args. - set dummy freetype-config; ac_word=$2 - echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 --echo "configure:9754: checking for $ac_word" >&5 -+echo "configure:9652: checking for $ac_word" >&5 - if eval "test \"`echo '$''{'ac_cv_path_FT2_CONFIG'+set}'`\" = set"; then - echo $ac_n "(cached) $ac_c" 1>&6 - else -@@ -9786,7 +9684,7 @@ - - min_ft_version=6.1.0 - echo $ac_n "checking for FreeType - version >= $min_ft_version""... $ac_c" 1>&6 --echo "configure:9790: checking for FreeType - version >= $min_ft_version" >&5 -+echo "configure:9688: checking for FreeType - version >= $min_ft_version" >&5 - no_ft="" - if test "$FT2_CONFIG" = "no" ; then - no_ft=yes -@@ -9834,7 +9732,7 @@ - echo $ac_n "cross compiling; assumed OK... $ac_c" - else - cat > conftest.$ac_ext <<EOF --#line 9838 "configure" -+#line 9736 "configure" - #include "confdefs.h" - - #include <ft2build.h> -@@ -9860,7 +9758,7 @@ - } - - EOF --if { (eval echo configure:9864: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null -+if { (eval echo configure:9762: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null - then - : - else -@@ -9910,12 +9808,12 @@ - CFLAGS="$CFLAGS $FT2_CFLAGS" - - echo $ac_n "checking for FT_Bitmap_Size.y_ppem""... $ac_c" 1>&6 --echo "configure:9914: checking for FT_Bitmap_Size.y_ppem" >&5 -+echo "configure:9812: checking for FT_Bitmap_Size.y_ppem" >&5 - if eval "test \"`echo '$''{'ac_cv_member_FT_Bitmap_Size_y_ppem'+set}'`\" = set"; then - echo $ac_n "(cached) $ac_c" 1>&6 - else - cat > conftest.$ac_ext <<EOF --#line 9919 "configure" -+#line 9817 "configure" - #include "confdefs.h" - #include <ft2build.h> - #include FT_FREETYPE_H -@@ -9925,7 +9823,7 @@ - return 1 - ; return 0; } - EOF --if { (eval echo configure:9929: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then -+if { (eval echo configure:9827: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then - rm -rf conftest* - ac_cv_member_FT_Bitmap_Size_y_ppem=yes - else -@@ -9951,12 +9849,12 @@ - for ac_func in FT_GlyphSlot_Embolden FT_Load_Sfnt_Table FT_Select_Size - do - echo $ac_n "checking for $ac_func""... $ac_c" 1>&6 --echo "configure:9955: checking for $ac_func" >&5 -+echo "configure:9853: checking for $ac_func" >&5 - if eval "test \"`echo '$''{'ac_cv_func_$ac_func'+set}'`\" = set"; then - echo $ac_n "(cached) $ac_c" 1>&6 - else - cat > conftest.$ac_ext <<EOF --#line 9960 "configure" -+#line 9858 "configure" - #include "confdefs.h" - /* System header to define __stub macros and hopefully few prototypes, - which can conflict with char $ac_func(); below. */ -@@ -9979,7 +9877,7 @@ - - ; return 0; } - EOF --if { (eval echo configure:9983: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then -+if { (eval echo configure:9881: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then - rm -rf conftest* - eval "ac_cv_func_$ac_func=yes" - else -@@ -10022,7 +9920,7 @@ - *) - - echo $ac_n "checking for pthread_create in -lpthreads""... $ac_c" 1>&6 --echo "configure:10026: checking for pthread_create in -lpthreads" >&5 -+echo "configure:9924: checking for pthread_create in -lpthreads" >&5 - echo " - #include <pthread.h> - #include <stdlib.h> -@@ -10045,7 +9943,7 @@ - echo "$ac_t""no" 1>&6 - - echo $ac_n "checking for pthread_create in -lpthread""... $ac_c" 1>&6 --echo "configure:10049: checking for pthread_create in -lpthread" >&5 -+echo "configure:9947: checking for pthread_create in -lpthread" >&5 - echo " - #include <pthread.h> - #include <stdlib.h> -@@ -10068,7 +9966,7 @@ - echo "$ac_t""no" 1>&6 - - echo $ac_n "checking for pthread_create in -lc_r""... $ac_c" 1>&6 --echo "configure:10072: checking for pthread_create in -lc_r" >&5 -+echo "configure:9970: checking for pthread_create in -lc_r" >&5 - echo " - #include <pthread.h> - #include <stdlib.h> -@@ -10091,7 +9989,7 @@ - echo "$ac_t""no" 1>&6 - - echo $ac_n "checking for pthread_create in -lc""... $ac_c" 1>&6 --echo "configure:10095: checking for pthread_create in -lc" >&5 -+echo "configure:9993: checking for pthread_create in -lc" >&5 - echo " - #include <pthread.h> - #include <stdlib.h> -@@ -10150,7 +10048,7 @@ - rm -f conftest* - ac_cv_have_dash_pthread=no - echo $ac_n "checking whether ${CC-cc} accepts -pthread""... $ac_c" 1>&6 --echo "configure:10154: checking whether ${CC-cc} accepts -pthread" >&5 -+echo "configure:10052: checking whether ${CC-cc} accepts -pthread" >&5 - echo 'int main() { return 0; }' | cat > conftest.c - ${CC-cc} -pthread -o conftest conftest.c > conftest.out 2>&1 - if test $? -eq 0; then -@@ -10173,7 +10071,7 @@ - ac_cv_have_dash_pthreads=no - if test "$ac_cv_have_dash_pthread" = "no"; then - echo $ac_n "checking whether ${CC-cc} accepts -pthreads""... $ac_c" 1>&6 --echo "configure:10177: checking whether ${CC-cc} accepts -pthreads" >&5 -+echo "configure:10075: checking whether ${CC-cc} accepts -pthreads" >&5 - echo 'int main() { return 0; }' | cat > conftest.c - ${CC-cc} -pthreads -o conftest conftest.c > conftest.out 2>&1 - if test $? -eq 0; then -@@ -10268,7 +10166,7 @@ - fi - - echo $ac_n "checking whether mmap() sees write()s""... $ac_c" 1>&6 --echo "configure:10272: checking whether mmap() sees write()s" >&5 -+echo "configure:10170: checking whether mmap() sees write()s" >&5 - - - mmap_test_prog=' -@@ -10307,11 +10205,11 @@ - result="yes" - else - cat > conftest.$ac_ext <<EOF --#line 10311 "configure" -+#line 10209 "configure" - #include "confdefs.h" - $mmap_test_prog - EOF --if { (eval echo configure:10315: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null -+if { (eval echo configure:10213: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null - then - result="yes" - else -@@ -10336,13 +10234,13 @@ - - if test $ac_cv_prog_gcc = yes; then - echo $ac_n "checking whether ${CC-cc} needs -traditional""... $ac_c" 1>&6 --echo "configure:10340: checking whether ${CC-cc} needs -traditional" >&5 -+echo "configure:10238: checking whether ${CC-cc} needs -traditional" >&5 - if eval "test \"`echo '$''{'ac_cv_prog_gcc_traditional'+set}'`\" = set"; then - echo $ac_n "(cached) $ac_c" 1>&6 - else - ac_pattern="Autoconf.*'x'" - cat > conftest.$ac_ext <<EOF --#line 10346 "configure" -+#line 10244 "configure" - #include "confdefs.h" - #include <sgtty.h> - Autoconf TIOCGETP -@@ -10360,7 +10258,7 @@ - - if test $ac_cv_prog_gcc_traditional = no; then - cat > conftest.$ac_ext <<EOF --#line 10364 "configure" -+#line 10262 "configure" - #include "confdefs.h" - #include <termio.h> - Autoconf TCGETA -@@ -10382,7 +10280,7 @@ - fi - - echo $ac_n "checking for 8-bit clean memcmp""... $ac_c" 1>&6 --echo "configure:10386: checking for 8-bit clean memcmp" >&5 -+echo "configure:10284: checking for 8-bit clean memcmp" >&5 - if eval "test \"`echo '$''{'ac_cv_func_memcmp_clean'+set}'`\" = set"; then - echo $ac_n "(cached) $ac_c" 1>&6 - else -@@ -10390,7 +10288,7 @@ - ac_cv_func_memcmp_clean=no - else - cat > conftest.$ac_ext <<EOF --#line 10394 "configure" -+#line 10292 "configure" - #include "confdefs.h" - - main() -@@ -10400,7 +10298,7 @@ - } - - EOF --if { (eval echo configure:10404: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null -+if { (eval echo configure:10302: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null - then - ac_cv_func_memcmp_clean=yes - else -@@ -10420,12 +10318,12 @@ - for ac_func in random strerror lchown fchmod snprintf statvfs memmove rint stat64 lstat64 truncate64 statvfs64 - do - echo $ac_n "checking for $ac_func""... $ac_c" 1>&6 --echo "configure:10424: checking for $ac_func" >&5 -+echo "configure:10322: checking for $ac_func" >&5 - if eval "test \"`echo '$''{'ac_cv_func_$ac_func'+set}'`\" = set"; then - echo $ac_n "(cached) $ac_c" 1>&6 - else - cat > conftest.$ac_ext <<EOF --#line 10429 "configure" -+#line 10327 "configure" - #include "confdefs.h" - /* System header to define __stub macros and hopefully few prototypes, - which can conflict with char $ac_func(); below. */ -@@ -10448,7 +10346,7 @@ - - ; return 0; } - EOF --if { (eval echo configure:10452: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then -+if { (eval echo configure:10350: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then - rm -rf conftest* - eval "ac_cv_func_$ac_func=yes" - else -@@ -10475,12 +10373,12 @@ - for ac_func in flockfile getpagesize - do - echo $ac_n "checking for $ac_func""... $ac_c" 1>&6 --echo "configure:10479: checking for $ac_func" >&5 -+echo "configure:10377: checking for $ac_func" >&5 - if eval "test \"`echo '$''{'ac_cv_func_$ac_func'+set}'`\" = set"; then - echo $ac_n "(cached) $ac_c" 1>&6 - else - cat > conftest.$ac_ext <<EOF --#line 10484 "configure" -+#line 10382 "configure" - #include "confdefs.h" - /* System header to define __stub macros and hopefully few prototypes, - which can conflict with char $ac_func(); below. */ -@@ -10503,7 +10401,7 @@ - - ; return 0; } - EOF --if { (eval echo configure:10507: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then -+if { (eval echo configure:10405: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then - rm -rf conftest* - eval "ac_cv_func_$ac_func=yes" - else -@@ -10532,12 +10430,12 @@ - for ac_func in localtime_r strtok_r - do - echo $ac_n "checking for $ac_func""... $ac_c" 1>&6 --echo "configure:10536: checking for $ac_func" >&5 -+echo "configure:10434: checking for $ac_func" >&5 - if eval "test \"`echo '$''{'ac_cv_func_$ac_func'+set}'`\" = set"; then - echo $ac_n "(cached) $ac_c" 1>&6 - else - cat > conftest.$ac_ext <<EOF --#line 10541 "configure" -+#line 10439 "configure" - #include "confdefs.h" - /* System header to define __stub macros and hopefully few prototypes, - which can conflict with char $ac_func(); below. */ -@@ -10560,7 +10458,7 @@ - - ; return 0; } - EOF --if { (eval echo configure:10564: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then -+if { (eval echo configure:10462: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then - rm -rf conftest* - eval "ac_cv_func_$ac_func=yes" - else -@@ -10596,19 +10494,19 @@ - cross_compiling=$ac_cv_prog_cxx_cross - - echo $ac_n "checking for wcrtomb""... $ac_c" 1>&6 --echo "configure:10600: checking for wcrtomb" >&5 -+echo "configure:10498: checking for wcrtomb" >&5 - if eval "test \"`echo '$''{'ac_cv_have_wcrtomb'+set}'`\" = set"; then - echo $ac_n "(cached) $ac_c" 1>&6 - else - cat > conftest.$ac_ext <<EOF --#line 10605 "configure" -+#line 10503 "configure" - #include "confdefs.h" - #include <wchar.h> - int main() { - mbstate_t ps={0};wcrtomb(0,'f',&ps); - ; return 0; } - EOF --if { (eval echo configure:10612: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then -+if { (eval echo configure:10510: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then - rm -rf conftest* - ac_cv_have_wcrtomb="yes" - else -@@ -10628,19 +10526,19 @@ - - fi - echo $ac_n "checking for mbrtowc""... $ac_c" 1>&6 --echo "configure:10632: checking for mbrtowc" >&5 -+echo "configure:10530: checking for mbrtowc" >&5 - if eval "test \"`echo '$''{'ac_cv_have_mbrtowc'+set}'`\" = set"; then - echo $ac_n "(cached) $ac_c" 1>&6 - else - cat > conftest.$ac_ext <<EOF --#line 10637 "configure" -+#line 10535 "configure" - #include "confdefs.h" - #include <wchar.h> - int main() { - mbstate_t ps={0};mbrtowc(0,0,0,&ps); - ; return 0; } - EOF --if { (eval echo configure:10644: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then -+if { (eval echo configure:10542: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then - rm -rf conftest* - ac_cv_have_mbrtowc="yes" - else -@@ -10669,12 +10567,12 @@ - fi - - echo $ac_n "checking for res_ninit()""... $ac_c" 1>&6 --echo "configure:10673: checking for res_ninit()" >&5 -+echo "configure:10571: checking for res_ninit()" >&5 - if eval "test \"`echo '$''{'ac_cv_func_res_ninit'+set}'`\" = set"; then - echo $ac_n "(cached) $ac_c" 1>&6 - else - cat > conftest.$ac_ext <<EOF --#line 10678 "configure" -+#line 10576 "configure" - #include "confdefs.h" - - #ifdef linux -@@ -10686,7 +10584,7 @@ - int foo = res_ninit(&_res); - ; return 0; } - EOF --if { (eval echo configure:10690: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then -+if { (eval echo configure:10588: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then - rm -rf conftest* - ac_cv_func_res_ninit=yes - else -@@ -10716,12 +10614,12 @@ - cross_compiling=$ac_cv_prog_cxx_cross - - echo $ac_n "checking for gnu_get_libc_version()""... $ac_c" 1>&6 --echo "configure:10720: checking for gnu_get_libc_version()" >&5 -+echo "configure:10618: checking for gnu_get_libc_version()" >&5 - if eval "test \"`echo '$''{'ac_cv_func_gnu_get_libc_version'+set}'`\" = set"; then - echo $ac_n "(cached) $ac_c" 1>&6 - else - cat > conftest.$ac_ext <<EOF --#line 10725 "configure" -+#line 10623 "configure" - #include "confdefs.h" - - #ifdef HAVE_GNU_LIBC_VERSION_H -@@ -10732,7 +10630,7 @@ - const char *glibc_version = gnu_get_libc_version(); - ; return 0; } - EOF --if { (eval echo configure:10736: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then -+if { (eval echo configure:10634: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then - rm -rf conftest* - ac_cv_func_gnu_get_libc_version=yes - else -@@ -10761,7 +10659,7 @@ - *) - - echo $ac_n "checking for iconv in -lc""... $ac_c" 1>&6 --echo "configure:10765: checking for iconv in -lc" >&5 -+echo "configure:10663: checking for iconv in -lc" >&5 - ac_lib_var=`echo c'_'iconv | sed 'y%./+-%__p_%'` - if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then - echo $ac_n "(cached) $ac_c" 1>&6 -@@ -10769,7 +10667,7 @@ - ac_save_LIBS="$LIBS" - LIBS="-lc $LIBS" - cat > conftest.$ac_ext <<EOF --#line 10773 "configure" -+#line 10671 "configure" - #include "confdefs.h" - /* Override any gcc2 internal prototype to avoid an error. */ - #ifdef __cplusplus -@@ -10783,7 +10681,7 @@ - iconv() - ; return 0; } - EOF --if { (eval echo configure:10787: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then -+if { (eval echo configure:10685: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then - rm -rf conftest* - eval "ac_cv_lib_$ac_lib_var=yes" - else -@@ -10802,7 +10700,7 @@ - else - echo "$ac_t""no" 1>&6 - echo $ac_n "checking for iconv in -liconv""... $ac_c" 1>&6 --echo "configure:10806: checking for iconv in -liconv" >&5 -+echo "configure:10704: checking for iconv in -liconv" >&5 - ac_lib_var=`echo iconv'_'iconv | sed 'y%./+-%__p_%'` - if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then - echo $ac_n "(cached) $ac_c" 1>&6 -@@ -10810,7 +10708,7 @@ - ac_save_LIBS="$LIBS" - LIBS="-liconv $LIBS" - cat > conftest.$ac_ext <<EOF --#line 10814 "configure" -+#line 10712 "configure" - #include "confdefs.h" - /* Override any gcc2 internal prototype to avoid an error. */ - #ifdef __cplusplus -@@ -10824,7 +10722,7 @@ - iconv() - ; return 0; } - EOF --if { (eval echo configure:10828: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then -+if { (eval echo configure:10726: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then - rm -rf conftest* - eval "ac_cv_lib_$ac_lib_var=yes" - else -@@ -10843,7 +10741,7 @@ - else - echo "$ac_t""no" 1>&6 - echo $ac_n "checking for libiconv in -liconv""... $ac_c" 1>&6 --echo "configure:10847: checking for libiconv in -liconv" >&5 -+echo "configure:10745: checking for libiconv in -liconv" >&5 - ac_lib_var=`echo iconv'_'libiconv | sed 'y%./+-%__p_%'` - if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then - echo $ac_n "(cached) $ac_c" 1>&6 -@@ -10851,7 +10749,7 @@ - ac_save_LIBS="$LIBS" - LIBS="-liconv $LIBS" - cat > conftest.$ac_ext <<EOF --#line 10855 "configure" -+#line 10753 "configure" - #include "confdefs.h" - /* Override any gcc2 internal prototype to avoid an error. */ - #ifdef __cplusplus -@@ -10865,7 +10763,7 @@ - libiconv() - ; return 0; } - EOF --if { (eval echo configure:10869: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then -+if { (eval echo configure:10767: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then - rm -rf conftest* - eval "ac_cv_lib_$ac_lib_var=yes" - else -@@ -10892,12 +10790,12 @@ - _SAVE_LIBS=$LIBS - LIBS="$LIBS $_ICONV_LIBS" - echo $ac_n "checking for iconv()""... $ac_c" 1>&6 --echo "configure:10896: checking for iconv()" >&5 -+echo "configure:10794: checking for iconv()" >&5 - if eval "test \"`echo '$''{'ac_cv_func_iconv'+set}'`\" = set"; then - echo $ac_n "(cached) $ac_c" 1>&6 - else - cat > conftest.$ac_ext <<EOF --#line 10901 "configure" -+#line 10799 "configure" - #include "confdefs.h" - - #include <stdlib.h> -@@ -10911,7 +10809,7 @@ - - ; return 0; } - EOF --if { (eval echo configure:10915: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then -+if { (eval echo configure:10813: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then - rm -rf conftest* - ac_cv_func_iconv=yes - else -@@ -10935,12 +10833,12 @@ - LIBXUL_LIBS="$LIBXUL_LIBS $_ICONV_LIBS" - LIBICONV="$_ICONV_LIBS" - echo $ac_n "checking for iconv() with const input""... $ac_c" 1>&6 --echo "configure:10939: checking for iconv() with const input" >&5 -+echo "configure:10837: checking for iconv() with const input" >&5 - if eval "test \"`echo '$''{'ac_cv_func_const_iconv'+set}'`\" = set"; then - echo $ac_n "(cached) $ac_c" 1>&6 - else - cat > conftest.$ac_ext <<EOF --#line 10944 "configure" -+#line 10842 "configure" - #include "confdefs.h" - - #include <stdlib.h> -@@ -10955,7 +10853,7 @@ - - ; return 0; } - EOF --if { (eval echo configure:10959: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then -+if { (eval echo configure:10857: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then - rm -rf conftest* - ac_cv_func_const_iconv=yes - else -@@ -10984,19 +10882,19 @@ - - - echo $ac_n "checking for nl_langinfo and CODESET""... $ac_c" 1>&6 --echo "configure:10988: checking for nl_langinfo and CODESET" >&5 -+echo "configure:10886: checking for nl_langinfo and CODESET" >&5 - if eval "test \"`echo '$''{'am_cv_langinfo_codeset'+set}'`\" = set"; then - echo $ac_n "(cached) $ac_c" 1>&6 - else - cat > conftest.$ac_ext <<EOF --#line 10993 "configure" -+#line 10891 "configure" - #include "confdefs.h" - #include <langinfo.h> - int main() { - char* cs = nl_langinfo(CODESET); - ; return 0; } - EOF --if { (eval echo configure:11000: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then -+if { (eval echo configure:10898: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then - rm -rf conftest* - am_cv_langinfo_codeset=yes - else -@@ -11028,7 +10926,7 @@ - - - echo $ac_n "checking for an implementation of va_copy()""... $ac_c" 1>&6 --echo "configure:11032: checking for an implementation of va_copy()" >&5 -+echo "configure:10930: checking for an implementation of va_copy()" >&5 - if eval "test \"`echo '$''{'ac_cv_va_copy'+set}'`\" = set"; then - echo $ac_n "(cached) $ac_c" 1>&6 - else -@@ -11038,7 +10936,7 @@ - - else - cat > conftest.$ac_ext <<EOF --#line 11042 "configure" -+#line 10940 "configure" - #include "confdefs.h" - - #include <stdarg.h> -@@ -11052,7 +10950,7 @@ - } - int main() { f (0, 42); return 0; } - EOF --if { (eval echo configure:11056: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null -+if { (eval echo configure:10954: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null - then - ac_cv_va_copy=yes - else -@@ -11069,7 +10967,7 @@ - - echo "$ac_t""$ac_cv_va_copy" 1>&6 - echo $ac_n "checking for an implementation of __va_copy()""... $ac_c" 1>&6 --echo "configure:11073: checking for an implementation of __va_copy()" >&5 -+echo "configure:10971: checking for an implementation of __va_copy()" >&5 - if eval "test \"`echo '$''{'ac_cv___va_copy'+set}'`\" = set"; then - echo $ac_n "(cached) $ac_c" 1>&6 - else -@@ -11079,7 +10977,7 @@ - - else - cat > conftest.$ac_ext <<EOF --#line 11083 "configure" -+#line 10981 "configure" - #include "confdefs.h" - - #include <stdarg.h> -@@ -11093,7 +10991,7 @@ - } - int main() { f (0, 42); return 0; } - EOF --if { (eval echo configure:11097: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null -+if { (eval echo configure:10995: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null - then - ac_cv___va_copy=yes - else -@@ -11110,7 +11008,7 @@ - - echo "$ac_t""$ac_cv___va_copy" 1>&6 - echo $ac_n "checking whether va_lists can be copied by value""... $ac_c" 1>&6 --echo "configure:11114: checking whether va_lists can be copied by value" >&5 -+echo "configure:11012: checking whether va_lists can be copied by value" >&5 - if eval "test \"`echo '$''{'ac_cv_va_val_copy'+set}'`\" = set"; then - echo $ac_n "(cached) $ac_c" 1>&6 - else -@@ -11120,7 +11018,7 @@ - - else - cat > conftest.$ac_ext <<EOF --#line 11124 "configure" -+#line 11022 "configure" - #include "confdefs.h" - - #include <stdarg.h> -@@ -11134,7 +11032,7 @@ - } - int main() { f (0, 42); return 0; } - EOF --if { (eval echo configure:11138: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null -+if { (eval echo configure:11036: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null - then - ac_cv_va_val_copy=yes - else -@@ -11233,7 +11131,7 @@ - if test "$GNU_CXX"; then - - echo $ac_n "checking for C++ exceptions flag""... $ac_c" 1>&6 --echo "configure:11237: checking for C++ exceptions flag" >&5 -+echo "configure:11135: checking for C++ exceptions flag" >&5 - - if eval "test \"`echo '$''{'ac_cv_cxx_exceptions_flags'+set}'`\" = set"; then - echo $ac_n "(cached) $ac_c" 1>&6 -@@ -11268,12 +11166,12 @@ - HAVE_GCC3_ABI= - if test "$GNU_CC"; then - echo $ac_n "checking for gcc 3.0 ABI""... $ac_c" 1>&6 --echo "configure:11272: checking for gcc 3.0 ABI" >&5 -+echo "configure:11170: checking for gcc 3.0 ABI" >&5 - if eval "test \"`echo '$''{'ac_cv_gcc_three_abi'+set}'`\" = set"; then - echo $ac_n "(cached) $ac_c" 1>&6 - else - cat > conftest.$ac_ext <<EOF --#line 11277 "configure" -+#line 11175 "configure" - #include "confdefs.h" - - int main() { -@@ -11286,7 +11184,7 @@ - - ; return 0; } - EOF --if { (eval echo configure:11290: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then -+if { (eval echo configure:11188: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then - rm -rf conftest* - ac_cv_gcc_three_abi="yes" - else -@@ -11310,12 +11208,12 @@ - - - echo $ac_n "checking for C++ \"explicit\" keyword""... $ac_c" 1>&6 --echo "configure:11314: checking for C++ \"explicit\" keyword" >&5 -+echo "configure:11212: checking for C++ \"explicit\" keyword" >&5 - if eval "test \"`echo '$''{'ac_cv_cpp_explicit'+set}'`\" = set"; then - echo $ac_n "(cached) $ac_c" 1>&6 - else - cat > conftest.$ac_ext <<EOF --#line 11319 "configure" -+#line 11217 "configure" - #include "confdefs.h" - class X { - public: explicit X(int i) : i_(i) {} -@@ -11325,7 +11223,7 @@ - X x(3); - ; return 0; } - EOF --if { (eval echo configure:11329: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then -+if { (eval echo configure:11227: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then - rm -rf conftest* - ac_cv_cpp_explicit=yes - else -@@ -11346,12 +11244,12 @@ - fi - - echo $ac_n "checking for C++ \"typename\" keyword""... $ac_c" 1>&6 --echo "configure:11350: checking for C++ \"typename\" keyword" >&5 -+echo "configure:11248: checking for C++ \"typename\" keyword" >&5 - if eval "test \"`echo '$''{'ac_cv_cpp_typename'+set}'`\" = set"; then - echo $ac_n "(cached) $ac_c" 1>&6 - else - cat > conftest.$ac_ext <<EOF --#line 11355 "configure" -+#line 11253 "configure" - #include "confdefs.h" - class param { - public: -@@ -11370,7 +11268,7 @@ - A.foo(0); - ; return 0; } - EOF --if { (eval echo configure:11374: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then -+if { (eval echo configure:11272: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then - rm -rf conftest* - ac_cv_cpp_typename=yes - else -@@ -11391,12 +11289,12 @@ - fi - - echo $ac_n "checking for modern C++ template specialization syntax support""... $ac_c" 1>&6 --echo "configure:11395: checking for modern C++ template specialization syntax support" >&5 -+echo "configure:11293: checking for modern C++ template specialization syntax support" >&5 - if eval "test \"`echo '$''{'ac_cv_cpp_modern_specialize_template_syntax'+set}'`\" = set"; then - echo $ac_n "(cached) $ac_c" 1>&6 - else - cat > conftest.$ac_ext <<EOF --#line 11400 "configure" -+#line 11298 "configure" - #include "confdefs.h" - template <class T> struct X { int a; }; - class Y {}; -@@ -11406,7 +11304,7 @@ - X<Y> y_x; - ; return 0; } - EOF --if { (eval echo configure:11410: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then -+if { (eval echo configure:11308: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then - rm -rf conftest* - ac_cv_cpp_modern_specialize_template_syntax=yes - else -@@ -11428,12 +11326,12 @@ - - - echo $ac_n "checking whether partial template specialization works""... $ac_c" 1>&6 --echo "configure:11432: checking whether partial template specialization works" >&5 -+echo "configure:11330: checking whether partial template specialization works" >&5 - if eval "test \"`echo '$''{'ac_cv_cpp_partial_specialization'+set}'`\" = set"; then - echo $ac_n "(cached) $ac_c" 1>&6 - else - cat > conftest.$ac_ext <<EOF --#line 11437 "configure" -+#line 11335 "configure" - #include "confdefs.h" - template <class T> class Foo {}; - template <class T> class Foo<T*> {}; -@@ -11441,7 +11339,7 @@ - return 0; - ; return 0; } - EOF --if { (eval echo configure:11445: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then -+if { (eval echo configure:11343: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then - rm -rf conftest* - ac_cv_cpp_partial_specialization=yes - else -@@ -11462,12 +11360,12 @@ - fi - - echo $ac_n "checking whether operators must be re-defined for templates derived from templates""... $ac_c" 1>&6 --echo "configure:11466: checking whether operators must be re-defined for templates derived from templates" >&5 -+echo "configure:11364: checking whether operators must be re-defined for templates derived from templates" >&5 - if eval "test \"`echo '$''{'ac_cv_need_derived_template_operators'+set}'`\" = set"; then - echo $ac_n "(cached) $ac_c" 1>&6 - else - cat > conftest.$ac_ext <<EOF --#line 11471 "configure" -+#line 11369 "configure" - #include "confdefs.h" - template <class T> class Base { }; - template <class T> -@@ -11479,7 +11377,7 @@ - return 0; - ; return 0; } - EOF --if { (eval echo configure:11483: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then -+if { (eval echo configure:11381: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then - rm -rf conftest* - ac_cv_need_derived_template_operators=no - else -@@ -11501,12 +11399,12 @@ - - - echo $ac_n "checking whether we need to cast a derived template to pass as its base class""... $ac_c" 1>&6 --echo "configure:11505: checking whether we need to cast a derived template to pass as its base class" >&5 -+echo "configure:11403: checking whether we need to cast a derived template to pass as its base class" >&5 - if eval "test \"`echo '$''{'ac_cv_need_cpp_template_cast_to_base'+set}'`\" = set"; then - echo $ac_n "(cached) $ac_c" 1>&6 - else - cat > conftest.$ac_ext <<EOF --#line 11510 "configure" -+#line 11408 "configure" - #include "confdefs.h" - template <class T> class Base { }; - template <class T> class Derived : public Base<T> { }; -@@ -11515,7 +11413,7 @@ - Derived<char> bar; return foo(bar); - ; return 0; } - EOF --if { (eval echo configure:11519: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then -+if { (eval echo configure:11417: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then - rm -rf conftest* - ac_cv_need_cpp_template_cast_to_base=no - else -@@ -11536,12 +11434,12 @@ - fi - - echo $ac_n "checking whether the compiler can resolve const ambiguities for templates""... $ac_c" 1>&6 --echo "configure:11540: checking whether the compiler can resolve const ambiguities for templates" >&5 -+echo "configure:11438: checking whether the compiler can resolve const ambiguities for templates" >&5 - if eval "test \"`echo '$''{'ac_cv_can_resolve_const_ambiguity'+set}'`\" = set"; then - echo $ac_n "(cached) $ac_c" 1>&6 - else - cat > conftest.$ac_ext <<EOF --#line 11545 "configure" -+#line 11443 "configure" - #include "confdefs.h" - - template <class T> class ptrClass { -@@ -11562,7 +11460,7 @@ - a(&i); - ; return 0; } - EOF --if { (eval echo configure:11566: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then -+if { (eval echo configure:11464: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then - rm -rf conftest* - ac_cv_can_resolve_const_ambiguity=yes - else -@@ -11584,12 +11482,12 @@ - - - echo $ac_n "checking whether the C++ \"using\" keyword can change access""... $ac_c" 1>&6 --echo "configure:11588: checking whether the C++ \"using\" keyword can change access" >&5 -+echo "configure:11486: checking whether the C++ \"using\" keyword can change access" >&5 - if eval "test \"`echo '$''{'ac_cv_cpp_access_changing_using2'+set}'`\" = set"; then - echo $ac_n "(cached) $ac_c" 1>&6 - else - cat > conftest.$ac_ext <<EOF --#line 11593 "configure" -+#line 11491 "configure" - #include "confdefs.h" - class A { protected: int foo() { return 0; } }; - class B : public A { public: using A::foo; }; -@@ -11597,10 +11495,10 @@ - B b; return b.foo(); - ; return 0; } - EOF --if { (eval echo configure:11601: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then -+if { (eval echo configure:11499: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then - rm -rf conftest* - cat > conftest.$ac_ext <<EOF --#line 11604 "configure" -+#line 11502 "configure" - #include "confdefs.h" - class A { public: int foo() { return 1; } }; - class B : public A { private: using A::foo; }; -@@ -11608,7 +11506,7 @@ - B b; return b.foo(); - ; return 0; } - EOF --if { (eval echo configure:11612: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then -+if { (eval echo configure:11510: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then - rm -rf conftest* - ac_cv_cpp_access_changing_using2=no - else -@@ -11636,12 +11534,12 @@ - fi - - echo $ac_n "checking whether the C++ \"using\" keyword resolves ambiguity""... $ac_c" 1>&6 --echo "configure:11640: checking whether the C++ \"using\" keyword resolves ambiguity" >&5 -+echo "configure:11538: checking whether the C++ \"using\" keyword resolves ambiguity" >&5 - if eval "test \"`echo '$''{'ac_cv_cpp_ambiguity_resolving_using'+set}'`\" = set"; then - echo $ac_n "(cached) $ac_c" 1>&6 - else - cat > conftest.$ac_ext <<EOF --#line 11645 "configure" -+#line 11543 "configure" - #include "confdefs.h" - class X { - public: int go(const X&) {return 3;} -@@ -11657,7 +11555,7 @@ - X x; Y y; y.jo(x); - ; return 0; } - EOF --if { (eval echo configure:11661: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then -+if { (eval echo configure:11559: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then - rm -rf conftest* - ac_cv_cpp_ambiguity_resolving_using=yes - else -@@ -11678,19 +11576,19 @@ - fi - - echo $ac_n "checking for \"std::\" namespace""... $ac_c" 1>&6 --echo "configure:11682: checking for \"std::\" namespace" >&5 -+echo "configure:11580: checking for \"std::\" namespace" >&5 - if eval "test \"`echo '$''{'ac_cv_cpp_namespace_std'+set}'`\" = set"; then - echo $ac_n "(cached) $ac_c" 1>&6 - else - cat > conftest.$ac_ext <<EOF --#line 11687 "configure" -+#line 11585 "configure" - #include "confdefs.h" - #include <algorithm> - int main() { - return std::min(0, 1); - ; return 0; } - EOF --if { (eval echo configure:11694: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then -+if { (eval echo configure:11592: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then - rm -rf conftest* - ac_cv_cpp_namespace_std=yes - else -@@ -11711,12 +11609,12 @@ - fi - - echo $ac_n "checking whether standard template operator!=() is ambiguous""... $ac_c" 1>&6 --echo "configure:11715: checking whether standard template operator!=() is ambiguous" >&5 -+echo "configure:11613: checking whether standard template operator!=() is ambiguous" >&5 - if eval "test \"`echo '$''{'ac_cv_cpp_unambiguous_std_notequal'+set}'`\" = set"; then - echo $ac_n "(cached) $ac_c" 1>&6 - else - cat > conftest.$ac_ext <<EOF --#line 11720 "configure" -+#line 11618 "configure" - #include "confdefs.h" - #include <algorithm> - struct T1 {}; -@@ -11726,7 +11624,7 @@ - T1 a,b; return a != b; - ; return 0; } - EOF --if { (eval echo configure:11730: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then -+if { (eval echo configure:11628: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then - rm -rf conftest* - ac_cv_cpp_unambiguous_std_notequal=unambiguous - else -@@ -11748,12 +11646,12 @@ - - - echo $ac_n "checking for C++ reinterpret_cast""... $ac_c" 1>&6 --echo "configure:11752: checking for C++ reinterpret_cast" >&5 -+echo "configure:11650: checking for C++ reinterpret_cast" >&5 - if eval "test \"`echo '$''{'ac_cv_cpp_reinterpret_cast'+set}'`\" = set"; then - echo $ac_n "(cached) $ac_c" 1>&6 - else - cat > conftest.$ac_ext <<EOF --#line 11757 "configure" -+#line 11655 "configure" - #include "confdefs.h" - struct X { int i; }; - struct Y { int i; }; -@@ -11761,7 +11659,7 @@ - X x; X*const z = &x;Y*y = reinterpret_cast<Y*>(z); - ; return 0; } - EOF --if { (eval echo configure:11765: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then -+if { (eval echo configure:11663: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then - rm -rf conftest* - ac_cv_cpp_reinterpret_cast=yes - else -@@ -11782,7 +11680,7 @@ - fi - - echo $ac_n "checking for C++ dynamic_cast to void*""... $ac_c" 1>&6 --echo "configure:11786: checking for C++ dynamic_cast to void*" >&5 -+echo "configure:11684: checking for C++ dynamic_cast to void*" >&5 - if eval "test \"`echo '$''{'ac_cv_cpp_dynamic_cast_void_ptr'+set}'`\" = set"; then - echo $ac_n "(cached) $ac_c" 1>&6 - else -@@ -11790,8 +11688,11 @@ - ac_cv_cpp_dynamic_cast_void_ptr=no - else - cat > conftest.$ac_ext <<EOF --#line 11794 "configure" -+#line 11692 "configure" - #include "confdefs.h" -+#ifdef __cplusplus -+extern "C" void exit(int); -+#endif - class X { int i; public: virtual ~X() { } }; - class Y { int j; public: virtual ~Y() { } }; - class Z : public X, public Y { int k; }; -@@ -11806,7 +11707,7 @@ - ((void*)&mdo == dynamic_cast<void*>(suby)))); - } - EOF --if { (eval echo configure:11810: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null -+if { (eval echo configure:11711: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null - then - ac_cv_cpp_dynamic_cast_void_ptr=yes - else -@@ -11830,19 +11731,19 @@ - - - echo $ac_n "checking whether C++ requires implementation of unused virtual methods""... $ac_c" 1>&6 --echo "configure:11834: checking whether C++ requires implementation of unused virtual methods" >&5 -+echo "configure:11735: checking whether C++ requires implementation of unused virtual methods" >&5 - if eval "test \"`echo '$''{'ac_cv_cpp_unused_required'+set}'`\" = set"; then - echo $ac_n "(cached) $ac_c" 1>&6 - else - cat > conftest.$ac_ext <<EOF --#line 11839 "configure" -+#line 11740 "configure" - #include "confdefs.h" - class X {private: virtual void never_called();}; - int main() { - X x; - ; return 0; } - EOF --if { (eval echo configure:11846: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then -+if { (eval echo configure:11747: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then - rm -rf conftest* - ac_cv_cpp_unused_required=no - else -@@ -11865,12 +11766,12 @@ - - - echo $ac_n "checking for trouble comparing to zero near std::operator!=()""... $ac_c" 1>&6 --echo "configure:11869: checking for trouble comparing to zero near std::operator!=()" >&5 -+echo "configure:11770: checking for trouble comparing to zero near std::operator!=()" >&5 - if eval "test \"`echo '$''{'ac_cv_trouble_comparing_to_zero'+set}'`\" = set"; then - echo $ac_n "(cached) $ac_c" 1>&6 - else - cat > conftest.$ac_ext <<EOF --#line 11874 "configure" -+#line 11775 "configure" - #include "confdefs.h" - #include <algorithm> - template <class T> class Foo {}; -@@ -11881,7 +11782,7 @@ - Foo<int> f; return (0 != f); - ; return 0; } - EOF --if { (eval echo configure:11885: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then -+if { (eval echo configure:11786: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then - rm -rf conftest* - ac_cv_trouble_comparing_to_zero=no - else -@@ -11913,19 +11814,19 @@ - - - echo $ac_n "checking for LC_MESSAGES""... $ac_c" 1>&6 --echo "configure:11917: checking for LC_MESSAGES" >&5 -+echo "configure:11818: checking for LC_MESSAGES" >&5 - if eval "test \"`echo '$''{'ac_cv_i18n_lc_messages'+set}'`\" = set"; then - echo $ac_n "(cached) $ac_c" 1>&6 - else - cat > conftest.$ac_ext <<EOF --#line 11922 "configure" -+#line 11823 "configure" - #include "confdefs.h" - #include <locale.h> - int main() { - int category = LC_MESSAGES; - ; return 0; } - EOF --if { (eval echo configure:11929: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then -+if { (eval echo configure:11830: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then - rm -rf conftest* - ac_cv_i18n_lc_messages=yes - else -@@ -12028,7 +11929,7 @@ - # Extract the first word of "nspr-config", so it can be a program name with args. - set dummy nspr-config; ac_word=$2 - echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 --echo "configure:12032: checking for $ac_word" >&5 -+echo "configure:11933: checking for $ac_word" >&5 - if eval "test \"`echo '$''{'ac_cv_path_NSPR_CONFIG'+set}'`\" = set"; then - echo $ac_n "(cached) $ac_c" 1>&6 - else -@@ -12063,7 +11964,7 @@ - - min_nspr_version=4.7.0 - echo $ac_n "checking for NSPR - version >= $min_nspr_version""... $ac_c" 1>&6 --echo "configure:12067: checking for NSPR - version >= $min_nspr_version" >&5 -+echo "configure:11968: checking for NSPR - version >= $min_nspr_version" >&5 - - no_nspr="" - if test "$NSPR_CONFIG" = "no"; then -@@ -12114,7 +12015,7 @@ - _SAVE_CFLAGS=$CFLAGS - CFLAGS="$CFLAGS $NSPR_CFLAGS" - cat > conftest.$ac_ext <<EOF --#line 12118 "configure" -+#line 12019 "configure" - #include "confdefs.h" - #include "prlog.h" - int main() { -@@ -12123,7 +12024,7 @@ - #endif - ; return 0; } - EOF --if { (eval echo configure:12127: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then -+if { (eval echo configure:12028: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then - rm -rf conftest* - MOZ_NATIVE_NSPR=1 - else -@@ -12135,6 +12036,10 @@ - rm -f conftest* - CFLAGS=$_SAVE_CFLAGS - else -+ if test -n "$LIBXUL_SDK"; then -+ NSPR_CFLAGS="-I$LIBXUL_SDK_DIR/sdk/include" -+ NSPR_LIBS="-L$LIBXUL_SDK_DIR/sdk/lib -lnspr$NSPR_VERSION -lplc$NSPR_VERSION -lplds$NSPR_VERSION" -+ else - NSPR_CFLAGS='`$(DEPTH)/nsprpub/config/nspr-config --prefix=$(LIBXUL_DIST) --includedir=$(LIBXUL_DIST)/include/nspr --cflags`' - # explicitly set libs for Visual Age C++ for OS/2 - if test "$OS_ARCH" = "OS2" -a "$VACPP" = "yes"; then -@@ -12152,6 +12057,7 @@ - else - NSPR_LIBS='`$(DEPTH)/nsprpub/config/nspr-config --prefix=$(LIBXUL_DIST) --libdir=$(LIBXUL_DIST)/lib --libs`' - fi -+ fi - fi - - -@@ -12205,7 +12111,7 @@ - # Extract the first word of "nss-config", so it can be a program name with args. - set dummy nss-config; ac_word=$2 - echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 --echo "configure:12209: checking for $ac_word" >&5 -+echo "configure:12115: checking for $ac_word" >&5 - if eval "test \"`echo '$''{'ac_cv_path_NSS_CONFIG'+set}'`\" = set"; then - echo $ac_n "(cached) $ac_c" 1>&6 - else -@@ -12240,7 +12146,7 @@ - - min_nss_version=3.12.0 - echo $ac_n "checking for NSS - version >= $min_nss_version""... $ac_c" 1>&6 --echo "configure:12244: checking for NSS - version >= $min_nss_version" >&5 -+echo "configure:12150: checking for NSS - version >= $min_nss_version" >&5 - - no_nss="" - if test "$NSS_CONFIG" = "no"; then -@@ -12331,7 +12237,7 @@ - SYSTEM_JPEG= - else - echo $ac_n "checking for jpeg_destroy_compress in -ljpeg""... $ac_c" 1>&6 --echo "configure:12335: checking for jpeg_destroy_compress in -ljpeg" >&5 -+echo "configure:12241: checking for jpeg_destroy_compress in -ljpeg" >&5 - ac_lib_var=`echo jpeg'_'jpeg_destroy_compress | sed 'y%./+-%__p_%'` - if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then - echo $ac_n "(cached) $ac_c" 1>&6 -@@ -12339,7 +12245,7 @@ - ac_save_LIBS="$LIBS" - LIBS="-ljpeg $JPEG_LIBS $LIBS" - cat > conftest.$ac_ext <<EOF --#line 12343 "configure" -+#line 12249 "configure" - #include "confdefs.h" - /* Override any gcc2 internal prototype to avoid an error. */ - /* We use char because int might match the return type of a gcc2 -@@ -12350,7 +12256,7 @@ - jpeg_destroy_compress() - ; return 0; } - EOF --if { (eval echo configure:12354: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then -+if { (eval echo configure:12260: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then - rm -rf conftest* - eval "ac_cv_lib_$ac_lib_var=yes" - else -@@ -12376,7 +12282,7 @@ - if test "$SYSTEM_JPEG" = 1; then - LIBS="$JPEG_LIBS $LIBS" - cat > conftest.$ac_ext <<EOF --#line 12380 "configure" -+#line 12286 "configure" - #include "confdefs.h" - #include <stdio.h> - #include <sys/types.h> -@@ -12387,7 +12293,7 @@ - #endif - ; return 0; } - EOF --if { (eval echo configure:12391: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then -+if { (eval echo configure:12297: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then - rm -rf conftest* - SYSTEM_JPEG=1 - else -@@ -12425,7 +12331,7 @@ - SYSTEM_ZLIB= - else - echo $ac_n "checking for gzread in -lz""... $ac_c" 1>&6 --echo "configure:12429: checking for gzread in -lz" >&5 -+echo "configure:12335: checking for gzread in -lz" >&5 - ac_lib_var=`echo z'_'gzread | sed 'y%./+-%__p_%'` - if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then - echo $ac_n "(cached) $ac_c" 1>&6 -@@ -12433,7 +12339,7 @@ - ac_save_LIBS="$LIBS" - LIBS="-lz $ZLIB_LIBS $LIBS" - cat > conftest.$ac_ext <<EOF --#line 12437 "configure" -+#line 12343 "configure" - #include "confdefs.h" - /* Override any gcc2 internal prototype to avoid an error. */ - /* We use char because int might match the return type of a gcc2 -@@ -12444,7 +12350,7 @@ - gzread() - ; return 0; } - EOF --if { (eval echo configure:12448: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then -+if { (eval echo configure:12354: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then - rm -rf conftest* - eval "ac_cv_lib_$ac_lib_var=yes" - else -@@ -12469,7 +12375,7 @@ - if test "$SYSTEM_ZLIB" = 1; then - LIBS="$ZLIB_LIBS $LIBS" - cat > conftest.$ac_ext <<EOF --#line 12473 "configure" -+#line 12379 "configure" - #include "confdefs.h" - #include <stdio.h> - #include <string.h> -@@ -12480,7 +12386,7 @@ - #endif - ; return 0; } - EOF --if { (eval echo configure:12484: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then -+if { (eval echo configure:12390: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then - rm -rf conftest* - SYSTEM_ZLIB=1 - else -@@ -12518,7 +12424,7 @@ - SYSTEM_BZ2= - else - echo $ac_n "checking for BZ2_bzread in -lbz2""... $ac_c" 1>&6 --echo "configure:12522: checking for BZ2_bzread in -lbz2" >&5 -+echo "configure:12428: checking for BZ2_bzread in -lbz2" >&5 - ac_lib_var=`echo bz2'_'BZ2_bzread | sed 'y%./+-%__p_%'` - if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then - echo $ac_n "(cached) $ac_c" 1>&6 -@@ -12526,7 +12432,7 @@ - ac_save_LIBS="$LIBS" - LIBS="-lbz2 $BZ2_LIBS $LIBS" - cat > conftest.$ac_ext <<EOF --#line 12530 "configure" -+#line 12436 "configure" - #include "confdefs.h" - /* Override any gcc2 internal prototype to avoid an error. */ - /* We use char because int might match the return type of a gcc2 -@@ -12537,7 +12443,7 @@ - BZ2_bzread() - ; return 0; } - EOF --if { (eval echo configure:12541: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then -+if { (eval echo configure:12447: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then - rm -rf conftest* - eval "ac_cv_lib_$ac_lib_var=yes" - else -@@ -12589,7 +12495,7 @@ - else - _SAVE_PNG_LIBS=$PNG_LIBS - echo $ac_n "checking for png_get_valid in -lpng""... $ac_c" 1>&6 --echo "configure:12593: checking for png_get_valid in -lpng" >&5 -+echo "configure:12499: checking for png_get_valid in -lpng" >&5 - ac_lib_var=`echo png'_'png_get_valid | sed 'y%./+-%__p_%'` - if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then - echo $ac_n "(cached) $ac_c" 1>&6 -@@ -12597,7 +12503,7 @@ - ac_save_LIBS="$LIBS" - LIBS="-lpng $PNG_LIBS $LIBS" - cat > conftest.$ac_ext <<EOF --#line 12601 "configure" -+#line 12507 "configure" - #include "confdefs.h" - /* Override any gcc2 internal prototype to avoid an error. */ - /* We use char because int might match the return type of a gcc2 -@@ -12608,7 +12514,7 @@ - png_get_valid() - ; return 0; } - EOF --if { (eval echo configure:12612: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then -+if { (eval echo configure:12518: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then - rm -rf conftest* - eval "ac_cv_lib_$ac_lib_var=yes" - else -@@ -12630,7 +12536,7 @@ - fi - - echo $ac_n "checking for png_get_acTL in -lpng""... $ac_c" 1>&6 --echo "configure:12634: checking for png_get_acTL in -lpng" >&5 -+echo "configure:12540: checking for png_get_acTL in -lpng" >&5 - ac_lib_var=`echo png'_'png_get_acTL | sed 'y%./+-%__p_%'` - if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then - echo $ac_n "(cached) $ac_c" 1>&6 -@@ -12638,7 +12544,7 @@ - ac_save_LIBS="$LIBS" - LIBS="-lpng $_SAVE_PNG_LIBS $LIBS" - cat > conftest.$ac_ext <<EOF --#line 12642 "configure" -+#line 12548 "configure" - #include "confdefs.h" - /* Override any gcc2 internal prototype to avoid an error. */ - /* We use char because int might match the return type of a gcc2 -@@ -12649,7 +12555,7 @@ - png_get_acTL() - ; return 0; } - EOF --if { (eval echo configure:12653: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then -+if { (eval echo configure:12559: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then - rm -rf conftest* - eval "ac_cv_lib_$ac_lib_var=yes" - else -@@ -12681,7 +12587,7 @@ - if test "$SYSTEM_PNG" = 1; then - LIBS="$PNG_LIBS $LIBS" - cat > conftest.$ac_ext <<EOF --#line 12685 "configure" -+#line 12591 "configure" - #include "confdefs.h" - #include <stdio.h> - #include <sys/types.h> -@@ -12695,7 +12601,7 @@ - #endif - ; return 0; } - EOF --if { (eval echo configure:12699: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then -+if { (eval echo configure:12605: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then - rm -rf conftest* - SYSTEM_PNG=1 - else -@@ -12737,7 +12643,7 @@ - # Extract the first word of "pkg-config", so it can be a program name with args. - set dummy pkg-config; ac_word=$2 - echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 --echo "configure:12741: checking for $ac_word" >&5 -+echo "configure:12647: checking for $ac_word" >&5 - if eval "test \"`echo '$''{'ac_cv_path_PKG_CONFIG'+set}'`\" = set"; then - echo $ac_n "(cached) $ac_c" 1>&6 - else -@@ -12781,19 +12687,19 @@ - PKG_CONFIG_MIN_VERSION=0.9.0 - if $PKG_CONFIG --atleast-pkgconfig-version $PKG_CONFIG_MIN_VERSION; then - echo $ac_n "checking for hunspell""... $ac_c" 1>&6 --echo "configure:12785: checking for hunspell" >&5 -+echo "configure:12691: checking for hunspell" >&5 - - if $PKG_CONFIG --exists "hunspell" ; then - echo "$ac_t""yes" 1>&6 - succeeded=yes - - echo $ac_n "checking MOZ_HUNSPELL_CFLAGS""... $ac_c" 1>&6 --echo "configure:12792: checking MOZ_HUNSPELL_CFLAGS" >&5 -+echo "configure:12698: checking MOZ_HUNSPELL_CFLAGS" >&5 - MOZ_HUNSPELL_CFLAGS=`$PKG_CONFIG --cflags "hunspell"` - echo "$ac_t""$MOZ_HUNSPELL_CFLAGS" 1>&6 - - echo $ac_n "checking MOZ_HUNSPELL_LIBS""... $ac_c" 1>&6 --echo "configure:12797: checking MOZ_HUNSPELL_LIBS" >&5 -+echo "configure:12703: checking MOZ_HUNSPELL_LIBS" >&5 - ## Remove evil flags like -Wl,--export-dynamic - MOZ_HUNSPELL_LIBS="`$PKG_CONFIG --libs \"hunspell\" |sed s/-Wl,--export-dynamic//g`" - echo "$ac_t""$MOZ_HUNSPELL_LIBS" 1>&6 -@@ -13161,7 +13067,7 @@ - # Allow the application to influence configure with a confvars.sh script. - - echo $ac_n "checking if app-specific confvars.sh exists""... $ac_c" 1>&6 --echo "configure:13165: checking if app-specific confvars.sh exists" >&5 -+echo "configure:13071: checking if app-specific confvars.sh exists" >&5 - if test -f "${srcdir}/${MOZ_BUILD_APP}/confvars.sh" ; then - echo "$ac_t""${srcdir}/${MOZ_BUILD_APP}/confvars.sh" 1>&6 - . "${srcdir}/${MOZ_BUILD_APP}/confvars.sh" -@@ -13284,6 +13190,10 @@ - - # Toolkit Options - -+if test -n "$LIBXUL_SDK"; then -+ MOZ_WIDGET_TOOLKIT=`perl -e 'while (<>) { /MOZ_DEFAULT_TOOLKIT *\"(.*)\"/ && print $1; }' $LIBXUL_SDK_DIR/include/mozilla-config.h` -+else -+ - # Check whether --enable-default-toolkit or --disable-default-toolkit was given. - if test "${enable_default_toolkit+set}" = set; then - enableval="$enable_default_toolkit" -@@ -13309,6 +13219,7 @@ - { echo "configure: error: Toolkit must be $_PLATFORM_DEFAULT_TOOLKIT (if supported)." 1>&2; exit 1; } - fi - fi -+fi # LIBXUL_SDK - - cat >> confdefs.h <<EOF - #define MOZ_DEFAULT_TOOLKIT "$MOZ_WIDGET_TOOLKIT" -@@ -13404,7 +13315,7 @@ - # Extract the first word of "pkg-config", so it can be a program name with args. - set dummy pkg-config; ac_word=$2 - echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 --echo "configure:13408: checking for $ac_word" >&5 -+echo "configure:13319: checking for $ac_word" >&5 - if eval "test \"`echo '$''{'ac_cv_path_PKG_CONFIG'+set}'`\" = set"; then - echo $ac_n "(cached) $ac_c" 1>&6 - else -@@ -13448,19 +13359,19 @@ - PKG_CONFIG_MIN_VERSION=0.9.0 - if $PKG_CONFIG --atleast-pkgconfig-version $PKG_CONFIG_MIN_VERSION; then - echo $ac_n "checking for gtk+-2.0 >= $GTK2_VERSION gtk+-unix-print-2.0 gdk-x11-2.0 glib-2.0 gobject-2.0""... $ac_c" 1>&6 --echo "configure:13452: checking for gtk+-2.0 >= $GTK2_VERSION gtk+-unix-print-2.0 gdk-x11-2.0 glib-2.0 gobject-2.0" >&5 -+echo "configure:13363: checking for gtk+-2.0 >= $GTK2_VERSION gtk+-unix-print-2.0 gdk-x11-2.0 glib-2.0 gobject-2.0" >&5 - - if $PKG_CONFIG --exists "gtk+-2.0 >= $GTK2_VERSION gtk+-unix-print-2.0 gdk-x11-2.0 glib-2.0 gobject-2.0" ; then - echo "$ac_t""yes" 1>&6 - succeeded=yes - - echo $ac_n "checking MOZ_GTK2_CFLAGS""... $ac_c" 1>&6 --echo "configure:13459: checking MOZ_GTK2_CFLAGS" >&5 -+echo "configure:13370: checking MOZ_GTK2_CFLAGS" >&5 - MOZ_GTK2_CFLAGS=`$PKG_CONFIG --cflags "gtk+-2.0 >= $GTK2_VERSION gtk+-unix-print-2.0 gdk-x11-2.0 glib-2.0 gobject-2.0"` - echo "$ac_t""$MOZ_GTK2_CFLAGS" 1>&6 - - echo $ac_n "checking MOZ_GTK2_LIBS""... $ac_c" 1>&6 --echo "configure:13464: checking MOZ_GTK2_LIBS" >&5 -+echo "configure:13375: checking MOZ_GTK2_LIBS" >&5 - ## Remove evil flags like -Wl,--export-dynamic - MOZ_GTK2_LIBS="`$PKG_CONFIG --libs \"gtk+-2.0 >= $GTK2_VERSION gtk+-unix-print-2.0 gdk-x11-2.0 glib-2.0 gobject-2.0\" |sed s/-Wl,--export-dynamic//g`" - echo "$ac_t""$MOZ_GTK2_LIBS" 1>&6 -@@ -13495,6 +13406,7 @@ - - - -+if test -z "$LIBXUL_SDK"; then - if test "$MOZ_ENABLE_GTK2" - then - MOZ_ENABLE_STARTUP_NOTIFICATION= -@@ -13519,7 +13431,7 @@ - # Extract the first word of "pkg-config", so it can be a program name with args. - set dummy pkg-config; ac_word=$2 - echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 --echo "configure:13523: checking for $ac_word" >&5 -+echo "configure:13435: checking for $ac_word" >&5 - if eval "test \"`echo '$''{'ac_cv_path_PKG_CONFIG'+set}'`\" = set"; then - echo $ac_n "(cached) $ac_c" 1>&6 - else -@@ -13563,19 +13475,19 @@ - PKG_CONFIG_MIN_VERSION=0.9.0 - if $PKG_CONFIG --atleast-pkgconfig-version $PKG_CONFIG_MIN_VERSION; then - echo $ac_n "checking for libstartup-notification-1.0 >= $STARTUP_NOTIFICATION_VERSION""... $ac_c" 1>&6 --echo "configure:13567: checking for libstartup-notification-1.0 >= $STARTUP_NOTIFICATION_VERSION" >&5 -+echo "configure:13479: checking for libstartup-notification-1.0 >= $STARTUP_NOTIFICATION_VERSION" >&5 - - if $PKG_CONFIG --exists "libstartup-notification-1.0 >= $STARTUP_NOTIFICATION_VERSION" ; then - echo "$ac_t""yes" 1>&6 - succeeded=yes - - echo $ac_n "checking MOZ_STARTUP_NOTIFICATION_CFLAGS""... $ac_c" 1>&6 --echo "configure:13574: checking MOZ_STARTUP_NOTIFICATION_CFLAGS" >&5 -+echo "configure:13486: checking MOZ_STARTUP_NOTIFICATION_CFLAGS" >&5 - MOZ_STARTUP_NOTIFICATION_CFLAGS=`$PKG_CONFIG --cflags "libstartup-notification-1.0 >= $STARTUP_NOTIFICATION_VERSION"` - echo "$ac_t""$MOZ_STARTUP_NOTIFICATION_CFLAGS" 1>&6 - - echo $ac_n "checking MOZ_STARTUP_NOTIFICATION_LIBS""... $ac_c" 1>&6 --echo "configure:13579: checking MOZ_STARTUP_NOTIFICATION_LIBS" >&5 -+echo "configure:13491: checking MOZ_STARTUP_NOTIFICATION_LIBS" >&5 - ## Remove evil flags like -Wl,--export-dynamic - MOZ_STARTUP_NOTIFICATION_LIBS="`$PKG_CONFIG --libs \"libstartup-notification-1.0 >= $STARTUP_NOTIFICATION_VERSION\" |sed s/-Wl,--export-dynamic//g`" - echo "$ac_t""$MOZ_STARTUP_NOTIFICATION_LIBS" 1>&6 -@@ -13621,6 +13533,7 @@ - - TK_LIBS="$TK_LIBS $MOZ_STARTUP_NOTIFICATION_LIBS" - fi -+fi - - - -@@ -13639,7 +13552,7 @@ - - - --if test "$MOZ_ENABLE_GTK2" -+if test "$MOZ_ENABLE_GTK2" && test -z "$LIBXUL_SDK" - then - cat >> confdefs.h <<\EOF - #define MOZ_X11 1 -@@ -13779,7 +13692,7 @@ - - - --if test "$MOZ_ENABLE_GTK2" -+if test "$MOZ_ENABLE_GTK2" && test -z "$LIBXUL_SDK" - then - succeeded=no - -@@ -13787,7 +13700,7 @@ - # Extract the first word of "pkg-config", so it can be a program name with args. - set dummy pkg-config; ac_word=$2 - echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 --echo "configure:13791: checking for $ac_word" >&5 -+echo "configure:13704: checking for $ac_word" >&5 - if eval "test \"`echo '$''{'ac_cv_path_PKG_CONFIG'+set}'`\" = set"; then - echo $ac_n "(cached) $ac_c" 1>&6 - else -@@ -13831,19 +13744,19 @@ - PKG_CONFIG_MIN_VERSION=0.9.0 - if $PKG_CONFIG --atleast-pkgconfig-version $PKG_CONFIG_MIN_VERSION; then - echo $ac_n "checking for xft""... $ac_c" 1>&6 --echo "configure:13835: checking for xft" >&5 -+echo "configure:13748: checking for xft" >&5 - - if $PKG_CONFIG --exists "xft" ; then - echo "$ac_t""yes" 1>&6 - succeeded=yes - - echo $ac_n "checking MOZ_XFT_CFLAGS""... $ac_c" 1>&6 --echo "configure:13842: checking MOZ_XFT_CFLAGS" >&5 -+echo "configure:13755: checking MOZ_XFT_CFLAGS" >&5 - MOZ_XFT_CFLAGS=`$PKG_CONFIG --cflags "xft"` - echo "$ac_t""$MOZ_XFT_CFLAGS" 1>&6 - - echo $ac_n "checking MOZ_XFT_LIBS""... $ac_c" 1>&6 --echo "configure:13847: checking MOZ_XFT_LIBS" >&5 -+echo "configure:13760: checking MOZ_XFT_LIBS" >&5 - ## Remove evil flags like -Wl,--export-dynamic - MOZ_XFT_LIBS="`$PKG_CONFIG --libs \"xft\" |sed s/-Wl,--export-dynamic//g`" - echo "$ac_t""$MOZ_XFT_LIBS" 1>&6 -@@ -13881,7 +13794,7 @@ - # Extract the first word of "pkg-config", so it can be a program name with args. - set dummy pkg-config; ac_word=$2 - echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 --echo "configure:13885: checking for $ac_word" >&5 -+echo "configure:13798: checking for $ac_word" >&5 - if eval "test \"`echo '$''{'ac_cv_path_PKG_CONFIG'+set}'`\" = set"; then - echo $ac_n "(cached) $ac_c" 1>&6 - else -@@ -13925,19 +13838,19 @@ - PKG_CONFIG_MIN_VERSION=0.9.0 - if $PKG_CONFIG --atleast-pkgconfig-version $PKG_CONFIG_MIN_VERSION; then - echo $ac_n "checking for pango >= $PANGO_VERSION""... $ac_c" 1>&6 --echo "configure:13929: checking for pango >= $PANGO_VERSION" >&5 -+echo "configure:13842: checking for pango >= $PANGO_VERSION" >&5 - - if $PKG_CONFIG --exists "pango >= $PANGO_VERSION" ; then - echo "$ac_t""yes" 1>&6 - succeeded=yes - - echo $ac_n "checking _PANGOCHK_CFLAGS""... $ac_c" 1>&6 --echo "configure:13936: checking _PANGOCHK_CFLAGS" >&5 -+echo "configure:13849: checking _PANGOCHK_CFLAGS" >&5 - _PANGOCHK_CFLAGS=`$PKG_CONFIG --cflags "pango >= $PANGO_VERSION"` - echo "$ac_t""$_PANGOCHK_CFLAGS" 1>&6 - - echo $ac_n "checking _PANGOCHK_LIBS""... $ac_c" 1>&6 --echo "configure:13941: checking _PANGOCHK_LIBS" >&5 -+echo "configure:13854: checking _PANGOCHK_LIBS" >&5 - ## Remove evil flags like -Wl,--export-dynamic - _PANGOCHK_LIBS="`$PKG_CONFIG --libs \"pango >= $PANGO_VERSION\" |sed s/-Wl,--export-dynamic//g`" - echo "$ac_t""$_PANGOCHK_LIBS" 1>&6 -@@ -13972,7 +13885,7 @@ - # Extract the first word of "pkg-config", so it can be a program name with args. - set dummy pkg-config; ac_word=$2 - echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 --echo "configure:13976: checking for $ac_word" >&5 -+echo "configure:13889: checking for $ac_word" >&5 - if eval "test \"`echo '$''{'ac_cv_path_PKG_CONFIG'+set}'`\" = set"; then - echo $ac_n "(cached) $ac_c" 1>&6 - else -@@ -14016,19 +13929,19 @@ - PKG_CONFIG_MIN_VERSION=0.9.0 - if $PKG_CONFIG --atleast-pkgconfig-version $PKG_CONFIG_MIN_VERSION; then - echo $ac_n "checking for pango >= $PANGO_VERSION pangocairo >= $PANGO_VERSION pangoft2 >= $PANGO_VERSION""... $ac_c" 1>&6 --echo "configure:14020: checking for pango >= $PANGO_VERSION pangocairo >= $PANGO_VERSION pangoft2 >= $PANGO_VERSION" >&5 -+echo "configure:13933: checking for pango >= $PANGO_VERSION pangocairo >= $PANGO_VERSION pangoft2 >= $PANGO_VERSION" >&5 - - if $PKG_CONFIG --exists "pango >= $PANGO_VERSION pangocairo >= $PANGO_VERSION pangoft2 >= $PANGO_VERSION" ; then - echo "$ac_t""yes" 1>&6 - succeeded=yes - - echo $ac_n "checking MOZ_PANGO_CFLAGS""... $ac_c" 1>&6 --echo "configure:14027: checking MOZ_PANGO_CFLAGS" >&5 -+echo "configure:13940: checking MOZ_PANGO_CFLAGS" >&5 - MOZ_PANGO_CFLAGS=`$PKG_CONFIG --cflags "pango >= $PANGO_VERSION pangocairo >= $PANGO_VERSION pangoft2 >= $PANGO_VERSION"` - echo "$ac_t""$MOZ_PANGO_CFLAGS" 1>&6 - - echo $ac_n "checking MOZ_PANGO_LIBS""... $ac_c" 1>&6 --echo "configure:14032: checking MOZ_PANGO_LIBS" >&5 -+echo "configure:13945: checking MOZ_PANGO_LIBS" >&5 - ## Remove evil flags like -Wl,--export-dynamic - MOZ_PANGO_LIBS="`$PKG_CONFIG --libs \"pango >= $PANGO_VERSION pangocairo >= $PANGO_VERSION pangoft2 >= $PANGO_VERSION\" |sed s/-Wl,--export-dynamic//g`" - echo "$ac_t""$MOZ_PANGO_LIBS" 1>&6 -@@ -14075,6 +13988,7 @@ - - - -+if test -z "$LIBXUL_SDK"; then - if test "$MOZ_X11" - then - if test "$MOZ_ENABLE_GTK2" -@@ -14105,7 +14019,7 @@ - # Extract the first word of "pkg-config", so it can be a program name with args. - set dummy pkg-config; ac_word=$2 - echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 --echo "configure:14109: checking for $ac_word" >&5 -+echo "configure:14023: checking for $ac_word" >&5 - if eval "test \"`echo '$''{'ac_cv_path_PKG_CONFIG'+set}'`\" = set"; then - echo $ac_n "(cached) $ac_c" 1>&6 - else -@@ -14149,19 +14063,19 @@ - PKG_CONFIG_MIN_VERSION=0.9.0 - if $PKG_CONFIG --atleast-pkgconfig-version $PKG_CONFIG_MIN_VERSION; then - echo $ac_n "checking for gnome-vfs-2.0 >= $GNOMEVFS_VERSION gnome-vfs-module-2.0 >= $GNOMEVFS_VERSION""... $ac_c" 1>&6 --echo "configure:14153: checking for gnome-vfs-2.0 >= $GNOMEVFS_VERSION gnome-vfs-module-2.0 >= $GNOMEVFS_VERSION" >&5 -+echo "configure:14067: checking for gnome-vfs-2.0 >= $GNOMEVFS_VERSION gnome-vfs-module-2.0 >= $GNOMEVFS_VERSION" >&5 - - if $PKG_CONFIG --exists "gnome-vfs-2.0 >= $GNOMEVFS_VERSION gnome-vfs-module-2.0 >= $GNOMEVFS_VERSION" ; then - echo "$ac_t""yes" 1>&6 - succeeded=yes - - echo $ac_n "checking MOZ_GNOMEVFS_CFLAGS""... $ac_c" 1>&6 --echo "configure:14160: checking MOZ_GNOMEVFS_CFLAGS" >&5 -+echo "configure:14074: checking MOZ_GNOMEVFS_CFLAGS" >&5 - MOZ_GNOMEVFS_CFLAGS=`$PKG_CONFIG --cflags "gnome-vfs-2.0 >= $GNOMEVFS_VERSION gnome-vfs-module-2.0 >= $GNOMEVFS_VERSION"` - echo "$ac_t""$MOZ_GNOMEVFS_CFLAGS" 1>&6 - - echo $ac_n "checking MOZ_GNOMEVFS_LIBS""... $ac_c" 1>&6 --echo "configure:14165: checking MOZ_GNOMEVFS_LIBS" >&5 -+echo "configure:14079: checking MOZ_GNOMEVFS_LIBS" >&5 - ## Remove evil flags like -Wl,--export-dynamic - MOZ_GNOMEVFS_LIBS="`$PKG_CONFIG --libs \"gnome-vfs-2.0 >= $GNOMEVFS_VERSION gnome-vfs-module-2.0 >= $GNOMEVFS_VERSION\" |sed s/-Wl,--export-dynamic//g`" - echo "$ac_t""$MOZ_GNOMEVFS_LIBS" 1>&6 -@@ -14212,7 +14126,7 @@ - # Extract the first word of "pkg-config", so it can be a program name with args. - set dummy pkg-config; ac_word=$2 - echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 --echo "configure:14216: checking for $ac_word" >&5 -+echo "configure:14130: checking for $ac_word" >&5 - if eval "test \"`echo '$''{'ac_cv_path_PKG_CONFIG'+set}'`\" = set"; then - echo $ac_n "(cached) $ac_c" 1>&6 - else -@@ -14256,19 +14170,19 @@ - PKG_CONFIG_MIN_VERSION=0.9.0 - if $PKG_CONFIG --atleast-pkgconfig-version $PKG_CONFIG_MIN_VERSION; then - echo $ac_n "checking for gconf-2.0 >= $GCONF_VERSION""... $ac_c" 1>&6 --echo "configure:14260: checking for gconf-2.0 >= $GCONF_VERSION" >&5 -+echo "configure:14174: checking for gconf-2.0 >= $GCONF_VERSION" >&5 - - if $PKG_CONFIG --exists "gconf-2.0 >= $GCONF_VERSION" ; then - echo "$ac_t""yes" 1>&6 - succeeded=yes - - echo $ac_n "checking MOZ_GCONF_CFLAGS""... $ac_c" 1>&6 --echo "configure:14267: checking MOZ_GCONF_CFLAGS" >&5 -+echo "configure:14181: checking MOZ_GCONF_CFLAGS" >&5 - MOZ_GCONF_CFLAGS=`$PKG_CONFIG --cflags "gconf-2.0 >= $GCONF_VERSION"` - echo "$ac_t""$MOZ_GCONF_CFLAGS" 1>&6 - - echo $ac_n "checking MOZ_GCONF_LIBS""... $ac_c" 1>&6 --echo "configure:14272: checking MOZ_GCONF_LIBS" >&5 -+echo "configure:14186: checking MOZ_GCONF_LIBS" >&5 - ## Remove evil flags like -Wl,--export-dynamic - MOZ_GCONF_LIBS="`$PKG_CONFIG --libs \"gconf-2.0 >= $GCONF_VERSION\" |sed s/-Wl,--export-dynamic//g`" - echo "$ac_t""$MOZ_GCONF_LIBS" 1>&6 -@@ -14323,7 +14237,7 @@ - # Extract the first word of "pkg-config", so it can be a program name with args. - set dummy pkg-config; ac_word=$2 - echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 --echo "configure:14327: checking for $ac_word" >&5 -+echo "configure:14241: checking for $ac_word" >&5 - if eval "test \"`echo '$''{'ac_cv_path_PKG_CONFIG'+set}'`\" = set"; then - echo $ac_n "(cached) $ac_c" 1>&6 - else -@@ -14367,19 +14281,19 @@ - PKG_CONFIG_MIN_VERSION=0.9.0 - if $PKG_CONFIG --atleast-pkgconfig-version $PKG_CONFIG_MIN_VERSION; then - echo $ac_n "checking for libgnome-2.0 >= $LIBGNOME_VERSION""... $ac_c" 1>&6 --echo "configure:14371: checking for libgnome-2.0 >= $LIBGNOME_VERSION" >&5 -+echo "configure:14285: checking for libgnome-2.0 >= $LIBGNOME_VERSION" >&5 - - if $PKG_CONFIG --exists "libgnome-2.0 >= $LIBGNOME_VERSION" ; then - echo "$ac_t""yes" 1>&6 - succeeded=yes - - echo $ac_n "checking MOZ_LIBGNOME_CFLAGS""... $ac_c" 1>&6 --echo "configure:14378: checking MOZ_LIBGNOME_CFLAGS" >&5 -+echo "configure:14292: checking MOZ_LIBGNOME_CFLAGS" >&5 - MOZ_LIBGNOME_CFLAGS=`$PKG_CONFIG --cflags "libgnome-2.0 >= $LIBGNOME_VERSION"` - echo "$ac_t""$MOZ_LIBGNOME_CFLAGS" 1>&6 - - echo $ac_n "checking MOZ_LIBGNOME_LIBS""... $ac_c" 1>&6 --echo "configure:14383: checking MOZ_LIBGNOME_LIBS" >&5 -+echo "configure:14297: checking MOZ_LIBGNOME_LIBS" >&5 - ## Remove evil flags like -Wl,--export-dynamic - MOZ_LIBGNOME_LIBS="`$PKG_CONFIG --libs \"libgnome-2.0 >= $LIBGNOME_VERSION\" |sed s/-Wl,--export-dynamic//g`" - echo "$ac_t""$MOZ_LIBGNOME_LIBS" 1>&6 -@@ -14457,7 +14371,7 @@ - # Extract the first word of "pkg-config", so it can be a program name with args. - set dummy pkg-config; ac_word=$2 - echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 --echo "configure:14461: checking for $ac_word" >&5 -+echo "configure:14375: checking for $ac_word" >&5 - if eval "test \"`echo '$''{'ac_cv_path_PKG_CONFIG'+set}'`\" = set"; then - echo $ac_n "(cached) $ac_c" 1>&6 - else -@@ -14501,19 +14415,19 @@ - PKG_CONFIG_MIN_VERSION=0.9.0 - if $PKG_CONFIG --atleast-pkgconfig-version $PKG_CONFIG_MIN_VERSION; then - echo $ac_n "checking for libgnomeui-2.0 >= $GNOMEUI_VERSION""... $ac_c" 1>&6 --echo "configure:14505: checking for libgnomeui-2.0 >= $GNOMEUI_VERSION" >&5 -+echo "configure:14419: checking for libgnomeui-2.0 >= $GNOMEUI_VERSION" >&5 - - if $PKG_CONFIG --exists "libgnomeui-2.0 >= $GNOMEUI_VERSION" ; then - echo "$ac_t""yes" 1>&6 - succeeded=yes - - echo $ac_n "checking MOZ_GNOMEUI_CFLAGS""... $ac_c" 1>&6 --echo "configure:14512: checking MOZ_GNOMEUI_CFLAGS" >&5 -+echo "configure:14426: checking MOZ_GNOMEUI_CFLAGS" >&5 - MOZ_GNOMEUI_CFLAGS=`$PKG_CONFIG --cflags "libgnomeui-2.0 >= $GNOMEUI_VERSION"` - echo "$ac_t""$MOZ_GNOMEUI_CFLAGS" 1>&6 - - echo $ac_n "checking MOZ_GNOMEUI_LIBS""... $ac_c" 1>&6 --echo "configure:14517: checking MOZ_GNOMEUI_LIBS" >&5 -+echo "configure:14431: checking MOZ_GNOMEUI_LIBS" >&5 - ## Remove evil flags like -Wl,--export-dynamic - MOZ_GNOMEUI_LIBS="`$PKG_CONFIG --libs \"libgnomeui-2.0 >= $GNOMEUI_VERSION\" |sed s/-Wl,--export-dynamic//g`" - echo "$ac_t""$MOZ_GNOMEUI_LIBS" 1>&6 -@@ -14590,7 +14504,7 @@ - # Extract the first word of "pkg-config", so it can be a program name with args. - set dummy pkg-config; ac_word=$2 - echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 --echo "configure:14594: checking for $ac_word" >&5 -+echo "configure:14508: checking for $ac_word" >&5 - if eval "test \"`echo '$''{'ac_cv_path_PKG_CONFIG'+set}'`\" = set"; then - echo $ac_n "(cached) $ac_c" 1>&6 - else -@@ -14634,19 +14548,19 @@ - PKG_CONFIG_MIN_VERSION=0.9.0 - if $PKG_CONFIG --atleast-pkgconfig-version $PKG_CONFIG_MIN_VERSION; then - echo $ac_n "checking for dbus-glib-1 >= $DBUS_VERSION""... $ac_c" 1>&6 --echo "configure:14638: checking for dbus-glib-1 >= $DBUS_VERSION" >&5 -+echo "configure:14552: checking for dbus-glib-1 >= $DBUS_VERSION" >&5 - - if $PKG_CONFIG --exists "dbus-glib-1 >= $DBUS_VERSION" ; then - echo "$ac_t""yes" 1>&6 - succeeded=yes - - echo $ac_n "checking MOZ_DBUS_GLIB_CFLAGS""... $ac_c" 1>&6 --echo "configure:14645: checking MOZ_DBUS_GLIB_CFLAGS" >&5 -+echo "configure:14559: checking MOZ_DBUS_GLIB_CFLAGS" >&5 - MOZ_DBUS_GLIB_CFLAGS=`$PKG_CONFIG --cflags "dbus-glib-1 >= $DBUS_VERSION"` - echo "$ac_t""$MOZ_DBUS_GLIB_CFLAGS" 1>&6 - - echo $ac_n "checking MOZ_DBUS_GLIB_LIBS""... $ac_c" 1>&6 --echo "configure:14650: checking MOZ_DBUS_GLIB_LIBS" >&5 -+echo "configure:14564: checking MOZ_DBUS_GLIB_LIBS" >&5 - ## Remove evil flags like -Wl,--export-dynamic - MOZ_DBUS_GLIB_LIBS="`$PKG_CONFIG --libs \"dbus-glib-1 >= $DBUS_VERSION\" |sed s/-Wl,--export-dynamic//g`" - echo "$ac_t""$MOZ_DBUS_GLIB_LIBS" 1>&6 -@@ -14685,6 +14599,9 @@ - - - -+fi # LIBXUL_SDK -+ -+ - # Check whether --enable-crypto or --disable-crypto was given. - if test "${enable_crypto+set}" = set; then - enableval="$enable_crypto" -@@ -15149,7 +15066,7 @@ - # Extract the first word of "java", so it can be a program name with args. - set dummy java; ac_word=$2 - echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 --echo "configure:15153: checking for $ac_word" >&5 -+echo "configure:15070: checking for $ac_word" >&5 - if eval "test \"`echo '$''{'ac_cv_path_JAVA'+set}'`\" = set"; then - echo $ac_n "(cached) $ac_c" 1>&6 - else -@@ -15185,7 +15102,7 @@ - # Extract the first word of "javac", so it can be a program name with args. - set dummy javac; ac_word=$2 - echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 --echo "configure:15189: checking for $ac_word" >&5 -+echo "configure:15106: checking for $ac_word" >&5 - if eval "test \"`echo '$''{'ac_cv_path_JAVAC'+set}'`\" = set"; then - echo $ac_n "(cached) $ac_c" 1>&6 - else -@@ -15221,7 +15138,7 @@ - # Extract the first word of "jar", so it can be a program name with args. - set dummy jar; ac_word=$2 - echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 --echo "configure:15225: checking for $ac_word" >&5 -+echo "configure:15142: checking for $ac_word" >&5 - if eval "test \"`echo '$''{'ac_cv_path_JAR'+set}'`\" = set"; then - echo $ac_n "(cached) $ac_c" 1>&6 - else -@@ -15295,7 +15212,7 @@ - # Extract the first word of "pkg-config", so it can be a program name with args. - set dummy pkg-config; ac_word=$2 - echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 --echo "configure:15299: checking for $ac_word" >&5 -+echo "configure:15216: checking for $ac_word" >&5 - if eval "test \"`echo '$''{'ac_cv_path_PKG_CONFIG'+set}'`\" = set"; then - echo $ac_n "(cached) $ac_c" 1>&6 - else -@@ -15339,19 +15256,19 @@ - PKG_CONFIG_MIN_VERSION=0.9.0 - if $PKG_CONFIG --atleast-pkgconfig-version $PKG_CONFIG_MIN_VERSION; then - echo $ac_n "checking for gthread-2.0""... $ac_c" 1>&6 --echo "configure:15343: checking for gthread-2.0" >&5 -+echo "configure:15260: checking for gthread-2.0" >&5 - - if $PKG_CONFIG --exists "gthread-2.0" ; then - echo "$ac_t""yes" 1>&6 - succeeded=yes - - echo $ac_n "checking MOZ_GTHREAD_CFLAGS""... $ac_c" 1>&6 --echo "configure:15350: checking MOZ_GTHREAD_CFLAGS" >&5 -+echo "configure:15267: checking MOZ_GTHREAD_CFLAGS" >&5 - MOZ_GTHREAD_CFLAGS=`$PKG_CONFIG --cflags "gthread-2.0"` - echo "$ac_t""$MOZ_GTHREAD_CFLAGS" 1>&6 - - echo $ac_n "checking MOZ_GTHREAD_LIBS""... $ac_c" 1>&6 --echo "configure:15355: checking MOZ_GTHREAD_LIBS" >&5 -+echo "configure:15272: checking MOZ_GTHREAD_LIBS" >&5 - ## Remove evil flags like -Wl,--export-dynamic - MOZ_GTHREAD_LIBS="`$PKG_CONFIG --libs \"gthread-2.0\" |sed s/-Wl,--export-dynamic//g`" - echo "$ac_t""$MOZ_GTHREAD_LIBS" 1>&6 -@@ -15387,17 +15304,17 @@ - do - ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'` - echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6 --echo "configure:15391: checking for $ac_hdr" >&5 -+echo "configure:15308: checking for $ac_hdr" >&5 - if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then - echo $ac_n "(cached) $ac_c" 1>&6 - else - cat > conftest.$ac_ext <<EOF --#line 15396 "configure" -+#line 15313 "configure" - #include "confdefs.h" - #include <$ac_hdr> - EOF - ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" --{ (eval echo configure:15401: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } -+{ (eval echo configure:15318: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } - ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"` - if test -z "$ac_err"; then - rm -rf conftest* -@@ -15747,7 +15664,7 @@ - # Extract the first word of "$ac_prog", so it can be a program name with args. - set dummy $ac_prog; ac_word=$2 - echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 --echo "configure:15751: checking for $ac_word" >&5 -+echo "configure:15668: checking for $ac_word" >&5 - if eval "test \"`echo '$''{'ac_cv_path_MAKENSIS'+set}'`\" = set"; then - echo $ac_n "(cached) $ac_c" 1>&6 - else -@@ -15792,7 +15709,7 @@ - # Extract the first word of "$ac_prog", so it can be a program name with args. - set dummy $ac_prog; ac_word=$2 - echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 --echo "configure:15796: checking for $ac_word" >&5 -+echo "configure:15713: checking for $ac_word" >&5 - if eval "test \"`echo '$''{'ac_cv_path_HOST_ICONV'+set}'`\" = set"; then - echo $ac_n "(cached) $ac_c" 1>&6 - else -@@ -15840,13 +15757,13 @@ - - - echo $ac_n "checking for tar archiver""... $ac_c" 1>&6 --echo "configure:15844: checking for tar archiver" >&5 -+echo "configure:15761: checking for tar archiver" >&5 - for ac_prog in gnutar gtar tar - do - # Extract the first word of "$ac_prog", so it can be a program name with args. - set dummy $ac_prog; ac_word=$2 - echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 --echo "configure:15850: checking for $ac_word" >&5 -+echo "configure:15767: checking for $ac_word" >&5 - if eval "test \"`echo '$''{'ac_cv_prog_TAR'+set}'`\" = set"; then - echo $ac_n "(cached) $ac_c" 1>&6 - else -@@ -15901,13 +15818,13 @@ - msvc*|mks*|cygwin*|mingw*|wince*) - if test -n "$MOZ_UPDATER"; then - echo $ac_n "checking for iconv""... $ac_c" 1>&6 --echo "configure:15905: checking for iconv" >&5 -+echo "configure:15822: checking for iconv" >&5 - for ac_prog in $HOST_ICONV "iconv" - do - # Extract the first word of "$ac_prog", so it can be a program name with args. - set dummy $ac_prog; ac_word=$2 - echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 --echo "configure:15911: checking for $ac_word" >&5 -+echo "configure:15828: checking for $ac_word" >&5 - if eval "test \"`echo '$''{'ac_cv_prog_HOST_ICONV'+set}'`\" = set"; then - echo $ac_n "(cached) $ac_c" 1>&6 - else -@@ -16247,7 +16164,7 @@ - # Extract the first word of "pkg-config", so it can be a program name with args. - set dummy pkg-config; ac_word=$2 - echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 --echo "configure:16251: checking for $ac_word" >&5 -+echo "configure:16168: checking for $ac_word" >&5 - if eval "test \"`echo '$''{'ac_cv_path_PKG_CONFIG'+set}'`\" = set"; then - echo $ac_n "(cached) $ac_c" 1>&6 - else -@@ -16291,19 +16208,19 @@ - PKG_CONFIG_MIN_VERSION=0.9.0 - if $PKG_CONFIG --atleast-pkgconfig-version $PKG_CONFIG_MIN_VERSION; then - echo $ac_n "checking for sqlite3 >= $SQLITE_VERSION""... $ac_c" 1>&6 --echo "configure:16295: checking for sqlite3 >= $SQLITE_VERSION" >&5 -+echo "configure:16212: checking for sqlite3 >= $SQLITE_VERSION" >&5 - - if $PKG_CONFIG --exists "sqlite3 >= $SQLITE_VERSION" ; then - echo "$ac_t""yes" 1>&6 - succeeded=yes - - echo $ac_n "checking SQLITE_CFLAGS""... $ac_c" 1>&6 --echo "configure:16302: checking SQLITE_CFLAGS" >&5 -+echo "configure:16219: checking SQLITE_CFLAGS" >&5 - SQLITE_CFLAGS=`$PKG_CONFIG --cflags "sqlite3 >= $SQLITE_VERSION"` - echo "$ac_t""$SQLITE_CFLAGS" 1>&6 - - echo $ac_n "checking SQLITE_LIBS""... $ac_c" 1>&6 --echo "configure:16307: checking SQLITE_LIBS" >&5 -+echo "configure:16224: checking SQLITE_LIBS" >&5 - ## Remove evil flags like -Wl,--export-dynamic - SQLITE_LIBS="`$PKG_CONFIG --libs \"sqlite3 >= $SQLITE_VERSION\" |sed s/-Wl,--export-dynamic//g`" - echo "$ac_t""$SQLITE_LIBS" 1>&6 -@@ -16493,18 +16410,18 @@ - - if test -n "$MOZ_DEBUG"; then - echo $ac_n "checking for valid debug flags""... $ac_c" 1>&6 --echo "configure:16497: checking for valid debug flags" >&5 -+echo "configure:16414: checking for valid debug flags" >&5 - _SAVE_CFLAGS=$CFLAGS - CFLAGS="$CFLAGS $MOZ_DEBUG_FLAGS" - cat > conftest.$ac_ext <<EOF --#line 16501 "configure" -+#line 16418 "configure" - #include "confdefs.h" - #include <stdio.h> - int main() { - printf("Hello World\n"); - ; return 0; } - EOF --if { (eval echo configure:16508: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then -+if { (eval echo configure:16425: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then - rm -rf conftest* - _results=yes - else -@@ -16545,18 +16462,18 @@ - if test "$COMPILE_ENVIRONMENT"; then - if test -n "$MOZ_OPTIMIZE"; then - echo $ac_n "checking for valid optimization flags""... $ac_c" 1>&6 --echo "configure:16549: checking for valid optimization flags" >&5 -+echo "configure:16466: checking for valid optimization flags" >&5 - _SAVE_CFLAGS=$CFLAGS - CFLAGS="$CFLAGS $MOZ_OPTIMIZE_FLAGS" - cat > conftest.$ac_ext <<EOF --#line 16553 "configure" -+#line 16470 "configure" - #include "confdefs.h" - #include <stdio.h> - int main() { - printf("Hello World\n"); - ; return 0; } - EOF --if { (eval echo configure:16560: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then -+if { (eval echo configure:16477: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then - rm -rf conftest* - _results=yes - else -@@ -16706,7 +16623,7 @@ - fi - - --if test "$NS_TRACE_MALLOC"; then -+if test "$NS_TRACE_MALLOC" || test "$LIBXUL_SDK"; then - MOZ_MEMORY= - fi - -@@ -16726,7 +16643,7 @@ - fi - else - echo $ac_n "checking size of int *""... $ac_c" 1>&6 --echo "configure:16730: checking size of int *" >&5 -+echo "configure:16647: checking size of int *" >&5 - if eval "test \"`echo '$''{'ac_cv_sizeof_int_p'+set}'`\" = set"; then - echo $ac_n "(cached) $ac_c" 1>&6 - else -@@ -16734,18 +16651,19 @@ - ac_cv_sizeof_int_p=4 - else - cat > conftest.$ac_ext <<EOF --#line 16738 "configure" -+#line 16655 "configure" - #include "confdefs.h" - #include <stdio.h> --int main() -+#include <sys/types.h> -+main() - { - FILE *f=fopen("conftestval", "w"); -- if (!f) return(1); -+ if (!f) exit(1); - fprintf(f, "%d\n", sizeof(int *)); -- return(0); -+ exit(0); - } - EOF --if { (eval echo configure:16749: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null -+if { (eval echo configure:16667: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null - then - ac_cv_sizeof_int_p=`cat conftestval` - else -@@ -16875,17 +16793,17 @@ - - ac_safe=`echo "valgrind/valgrind.h" | sed 'y%./+-%__p_%'` - echo $ac_n "checking for valgrind/valgrind.h""... $ac_c" 1>&6 --echo "configure:16879: checking for valgrind/valgrind.h" >&5 -+echo "configure:16797: checking for valgrind/valgrind.h" >&5 - if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then - echo $ac_n "(cached) $ac_c" 1>&6 - else - cat > conftest.$ac_ext <<EOF --#line 16884 "configure" -+#line 16802 "configure" - #include "confdefs.h" - #include <valgrind/valgrind.h> - EOF - ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" --{ (eval echo configure:16889: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } -+{ (eval echo configure:16807: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } - ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"` - if test -z "$ac_err"; then - rm -rf conftest* -@@ -16962,7 +16880,7 @@ - - if test -n "$_ENABLE_EFENCE"; then - echo $ac_n "checking for malloc in -lefence""... $ac_c" 1>&6 --echo "configure:16966: checking for malloc in -lefence" >&5 -+echo "configure:16884: checking for malloc in -lefence" >&5 - ac_lib_var=`echo efence'_'malloc | sed 'y%./+-%__p_%'` - if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then - echo $ac_n "(cached) $ac_c" 1>&6 -@@ -16970,7 +16888,7 @@ - ac_save_LIBS="$LIBS" - LIBS="-lefence $LIBS" - cat > conftest.$ac_ext <<EOF --#line 16974 "configure" -+#line 16892 "configure" - #include "confdefs.h" - /* Override any gcc2 internal prototype to avoid an error. */ - /* We use char because int might match the return type of a gcc2 -@@ -16981,7 +16899,7 @@ - malloc() - ; return 0; } - EOF --if { (eval echo configure:16985: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then -+if { (eval echo configure:16903: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then - rm -rf conftest* - eval "ac_cv_lib_$ac_lib_var=yes" - else -@@ -17113,12 +17031,12 @@ - for ac_func in __builtin_vec_new __builtin_vec_delete __builtin_new __builtin_delete __pure_virtual - do - echo $ac_n "checking for $ac_func""... $ac_c" 1>&6 --echo "configure:17117: checking for $ac_func" >&5 -+echo "configure:17035: checking for $ac_func" >&5 - if eval "test \"`echo '$''{'ac_cv_func_$ac_func'+set}'`\" = set"; then - echo $ac_n "(cached) $ac_c" 1>&6 - else - cat > conftest.$ac_ext <<EOF --#line 17122 "configure" -+#line 17040 "configure" - #include "confdefs.h" - /* System header to define __stub macros and hopefully few prototypes, - which can conflict with char $ac_func(); below. */ -@@ -17144,7 +17062,7 @@ - - ; return 0; } - EOF --if { (eval echo configure:17148: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then -+if { (eval echo configure:17066: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then - rm -rf conftest* - eval "ac_cv_func_$ac_func=yes" - else -@@ -17363,12 +17281,12 @@ - for ac_func in __cxa_demangle - do - echo $ac_n "checking for $ac_func""... $ac_c" 1>&6 --echo "configure:17367: checking for $ac_func" >&5 -+echo "configure:17285: checking for $ac_func" >&5 - if eval "test \"`echo '$''{'ac_cv_func_$ac_func'+set}'`\" = set"; then - echo $ac_n "(cached) $ac_c" 1>&6 - else - cat > conftest.$ac_ext <<EOF --#line 17372 "configure" -+#line 17290 "configure" - #include "confdefs.h" - /* System header to define __stub macros and hopefully few prototypes, - which can conflict with char $ac_func(); below. */ -@@ -17394,7 +17312,7 @@ - - ; return 0; } - EOF --if { (eval echo configure:17398: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then -+if { (eval echo configure:17316: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then - rm -rf conftest* - eval "ac_cv_func_$ac_func=yes" - else -@@ -17442,17 +17360,17 @@ - if test "$HAVE_GCC3_ABI" && test -z "$SKIP_LIBRARY_CHECKS"; then - ac_safe=`echo "unwind.h" | sed 'y%./+-%__p_%'` - echo $ac_n "checking for unwind.h""... $ac_c" 1>&6 --echo "configure:17446: checking for unwind.h" >&5 -+echo "configure:17364: checking for unwind.h" >&5 - if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then - echo $ac_n "(cached) $ac_c" 1>&6 - else - cat > conftest.$ac_ext <<EOF --#line 17451 "configure" -+#line 17369 "configure" - #include "confdefs.h" - #include <unwind.h> - EOF - ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" --{ (eval echo configure:17456: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } -+{ (eval echo configure:17374: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } - ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"` - if test -z "$ac_err"; then - rm -rf conftest* -@@ -17471,12 +17389,12 @@ - for ac_func in _Unwind_Backtrace - do - echo $ac_n "checking for $ac_func""... $ac_c" 1>&6 --echo "configure:17475: checking for $ac_func" >&5 -+echo "configure:17393: checking for $ac_func" >&5 - if eval "test \"`echo '$''{'ac_cv_func_$ac_func'+set}'`\" = set"; then - echo $ac_n "(cached) $ac_c" 1>&6 - else - cat > conftest.$ac_ext <<EOF --#line 17480 "configure" -+#line 17398 "configure" - #include "confdefs.h" - /* System header to define __stub macros and hopefully few prototypes, - which can conflict with char $ac_func(); below. */ -@@ -17499,7 +17417,7 @@ - - ; return 0; } - EOF --if { (eval echo configure:17503: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then -+if { (eval echo configure:17421: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then - rm -rf conftest* - eval "ac_cv_func_$ac_func=yes" - else -@@ -17621,7 +17539,7 @@ - # Compiler Options - - echo $ac_n "checking for gcc -pipe support""... $ac_c" 1>&6 --echo "configure:17625: checking for gcc -pipe support" >&5 -+echo "configure:17543: checking for gcc -pipe support" >&5 - if test -n "$GNU_CC" && test -n "$GNU_CXX" && test -n "$GNU_AS"; then - echo '#include <stdio.h>' > dummy-hello.c - echo 'int main() { printf("Hello World\n"); exit(0); }' >> dummy-hello.c -@@ -17636,14 +17554,14 @@ - _SAVE_CFLAGS=$CFLAGS - CFLAGS="$CFLAGS -pipe" - cat > conftest.$ac_ext <<EOF --#line 17640 "configure" -+#line 17558 "configure" - #include "confdefs.h" - #include <stdio.h> - int main() { - printf("Hello World\n"); - ; return 0; } - EOF --if { (eval echo configure:17647: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then -+if { (eval echo configure:17565: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then - rm -rf conftest* - _res_gcc_pipe="yes" - else -@@ -17685,16 +17603,16 @@ - _SAVE_CFLAGS="$CFLAGS" - CFLAGS="$CFLAGS ${_COMPILER_PREFIX}-Wno-long-long" - echo $ac_n "checking whether compiler supports -Wno-long-long""... $ac_c" 1>&6 --echo "configure:17689: checking whether compiler supports -Wno-long-long" >&5 -+echo "configure:17607: checking whether compiler supports -Wno-long-long" >&5 - cat > conftest.$ac_ext <<EOF --#line 17691 "configure" -+#line 17609 "configure" - #include "confdefs.h" - - int main() { - return(0); - ; return 0; } - EOF --if { (eval echo configure:17698: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then -+if { (eval echo configure:17616: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then - rm -rf conftest* - _WARNINGS_CFLAGS="${_WARNINGS_CFLAGS} ${_COMPILER_PREFIX}-Wno-long-long" - _WARNINGS_CXXFLAGS="${_WARNINGS_CXXFLAGS} ${_COMPILER_PREFIX}-Wno-long-long" -@@ -17730,16 +17648,16 @@ - CFLAGS="$CFLAGS -fprofile-generate" - - echo $ac_n "checking whether C compiler supports -fprofile-generate""... $ac_c" 1>&6 --echo "configure:17734: checking whether C compiler supports -fprofile-generate" >&5 -+echo "configure:17652: checking whether C compiler supports -fprofile-generate" >&5 - cat > conftest.$ac_ext <<EOF --#line 17736 "configure" -+#line 17654 "configure" - #include "confdefs.h" - - int main() { - return 0; - ; return 0; } - EOF --if { (eval echo configure:17743: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then -+if { (eval echo configure:17661: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then - rm -rf conftest* - PROFILE_GEN_CFLAGS="-fprofile-generate" - result="yes" -@@ -17759,16 +17677,16 @@ - else - CFLAGS="$_SAVE_CFLAGS -fprofile-arcs" - echo $ac_n "checking whether C compiler supports -fprofile-arcs""... $ac_c" 1>&6 --echo "configure:17763: checking whether C compiler supports -fprofile-arcs" >&5 -+echo "configure:17681: checking whether C compiler supports -fprofile-arcs" >&5 - cat > conftest.$ac_ext <<EOF --#line 17765 "configure" -+#line 17683 "configure" - #include "confdefs.h" - - int main() { - return 0; - ; return 0; } - EOF --if { (eval echo configure:17772: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then -+if { (eval echo configure:17690: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then - rm -rf conftest* - PROFILE_GEN_CFLAGS="-fprofile-arcs" - result="yes" -@@ -17838,16 +17756,16 @@ - _SAVE_CXXFLAGS=$CXXFLAGS - CXXFLAGS="$CXXFLAGS ${_WARNINGS_CXXFLAGS} ${_COMPILER_PREFIX}-pedantic" - echo $ac_n "checking whether C++ compiler has -pedantic long long bug""... $ac_c" 1>&6 --echo "configure:17842: checking whether C++ compiler has -pedantic long long bug" >&5 -+echo "configure:17760: checking whether C++ compiler has -pedantic long long bug" >&5 - cat > conftest.$ac_ext <<EOF --#line 17844 "configure" -+#line 17762 "configure" - #include "confdefs.h" - $configure_static_assert_macros - int main() { - CONFIGURE_STATIC_ASSERT(sizeof(long long) == 8) - ; return 0; } - EOF --if { (eval echo configure:17851: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then -+if { (eval echo configure:17769: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then - rm -rf conftest* - result="no" - else -@@ -17872,13 +17790,16 @@ - fi - - echo $ac_n "checking for correct temporary object destruction order""... $ac_c" 1>&6 --echo "configure:17876: checking for correct temporary object destruction order" >&5 -+echo "configure:17794: checking for correct temporary object destruction order" >&5 - if test "$cross_compiling" = yes; then - result="maybe" - else - cat > conftest.$ac_ext <<EOF --#line 17881 "configure" -+#line 17799 "configure" - #include "confdefs.h" -+#ifdef __cplusplus -+extern "C" void exit(int); -+#endif - class A { - public: A(int& x) : mValue(x) {} - ~A() { mValue--; } -@@ -17897,7 +17818,7 @@ - } - - EOF --if { (eval echo configure:17901: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null -+if { (eval echo configure:17822: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null - then - result="yes" - else -@@ -17918,12 +17839,12 @@ - _SAVE_CXXFLAGS=$CXXFLAGS - CXXFLAGS="$CXXFLAGS ${_WARNINGS_CXXFLAGS}" - echo $ac_n "checking for correct overload resolution with const and templates""... $ac_c" 1>&6 --echo "configure:17922: checking for correct overload resolution with const and templates" >&5 -+echo "configure:17843: checking for correct overload resolution with const and templates" >&5 - if eval "test \"`echo '$''{'ac_nscap_nonconst_opeq_bug'+set}'`\" = set"; then - echo $ac_n "(cached) $ac_c" 1>&6 - else - cat > conftest.$ac_ext <<EOF --#line 17927 "configure" -+#line 17848 "configure" - #include "confdefs.h" - - template <class T> -@@ -17953,7 +17874,7 @@ - - ; return 0; } - EOF --if { (eval echo configure:17957: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then -+if { (eval echo configure:17878: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then - rm -rf conftest* - ac_nscap_nonconst_opeq_bug="no" - else -@@ -18216,7 +18137,7 @@ - ;; - esac - --if test -z "$COMPILE_ENVIRONMENT"; then -+if test -z "$COMPILE_ENVIRONMENT" || test "$LIBXUL_SDK"; then - SKIP_IDL_CHECK="yes" - fi - -@@ -18256,7 +18177,7 @@ - # Extract the first word of "pkg-config", so it can be a program name with args. - set dummy pkg-config; ac_word=$2 - echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 --echo "configure:18260: checking for $ac_word" >&5 -+echo "configure:18181: checking for $ac_word" >&5 - if eval "test \"`echo '$''{'ac_cv_path_PKG_CONFIG'+set}'`\" = set"; then - echo $ac_n "(cached) $ac_c" 1>&6 - else -@@ -18300,19 +18221,19 @@ - PKG_CONFIG_MIN_VERSION=0.9.0 - if $PKG_CONFIG --atleast-pkgconfig-version $PKG_CONFIG_MIN_VERSION; then - echo $ac_n "checking for libIDL-2.0 >= 0.8.0 glib-2.0 gobject-2.0""... $ac_c" 1>&6 --echo "configure:18304: checking for libIDL-2.0 >= 0.8.0 glib-2.0 gobject-2.0" >&5 -+echo "configure:18225: checking for libIDL-2.0 >= 0.8.0 glib-2.0 gobject-2.0" >&5 - - if $PKG_CONFIG --exists "libIDL-2.0 >= 0.8.0 glib-2.0 gobject-2.0" ; then - echo "$ac_t""yes" 1>&6 - succeeded=yes - - echo $ac_n "checking LIBIDL_CFLAGS""... $ac_c" 1>&6 --echo "configure:18311: checking LIBIDL_CFLAGS" >&5 -+echo "configure:18232: checking LIBIDL_CFLAGS" >&5 - LIBIDL_CFLAGS=`$PKG_CONFIG --cflags "libIDL-2.0 >= 0.8.0 glib-2.0 gobject-2.0"` - echo "$ac_t""$LIBIDL_CFLAGS" 1>&6 - - echo $ac_n "checking LIBIDL_LIBS""... $ac_c" 1>&6 --echo "configure:18316: checking LIBIDL_LIBS" >&5 -+echo "configure:18237: checking LIBIDL_LIBS" >&5 - ## Remove evil flags like -Wl,--export-dynamic - LIBIDL_LIBS="`$PKG_CONFIG --libs \"libIDL-2.0 >= 0.8.0 glib-2.0 gobject-2.0\" |sed s/-Wl,--export-dynamic//g`" - echo "$ac_t""$LIBIDL_LIBS" 1>&6 -@@ -18436,7 +18357,7 @@ - # Extract the first word of "glib-config", so it can be a program name with args. - set dummy glib-config; ac_word=$2 - echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 --echo "configure:18440: checking for $ac_word" >&5 -+echo "configure:18361: checking for $ac_word" >&5 - if eval "test \"`echo '$''{'ac_cv_path_GLIB_CONFIG'+set}'`\" = set"; then - echo $ac_n "(cached) $ac_c" 1>&6 - else -@@ -18471,7 +18392,7 @@ - - min_glib_version=1.2.0 - echo $ac_n "checking for GLIB - version >= $min_glib_version""... $ac_c" 1>&6 --echo "configure:18475: checking for GLIB - version >= $min_glib_version" >&5 -+echo "configure:18396: checking for GLIB - version >= $min_glib_version" >&5 - no_glib="" - if test "$GLIB_CONFIG" = "no" ; then - no_glib=yes -@@ -18494,7 +18415,7 @@ - echo $ac_n "cross compiling; assumed OK... $ac_c" - else - cat > conftest.$ac_ext <<EOF --#line 18498 "configure" -+#line 18419 "configure" - #include "confdefs.h" - - #include <glib.h> -@@ -18570,7 +18491,7 @@ - } - - EOF --if { (eval echo configure:18574: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null -+if { (eval echo configure:18495: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null - then - : - else -@@ -18604,7 +18525,7 @@ - CFLAGS="$CFLAGS $GLIB_CFLAGS" - LIBS="$LIBS $GLIB_LIBS" - cat > conftest.$ac_ext <<EOF --#line 18608 "configure" -+#line 18529 "configure" - #include "confdefs.h" - - #include <glib.h> -@@ -18614,7 +18535,7 @@ - return ((glib_major_version) || (glib_minor_version) || (glib_micro_version)); - ; return 0; } - EOF --if { (eval echo configure:18618: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then -+if { (eval echo configure:18539: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then - rm -rf conftest* - echo "*** The test program compiled, but did not run. This usually means" - echo "*** that the run-time linker is not finding GLIB or finding the wrong" -@@ -18658,7 +18579,7 @@ - # Extract the first word of "libIDL-config", so it can be a program name with args. - set dummy libIDL-config; ac_word=$2 - echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 --echo "configure:18662: checking for $ac_word" >&5 -+echo "configure:18583: checking for $ac_word" >&5 - if eval "test \"`echo '$''{'ac_cv_path_LIBIDL_CONFIG'+set}'`\" = set"; then - echo $ac_n "(cached) $ac_c" 1>&6 - else -@@ -18693,7 +18614,7 @@ - - min_libIDL_version=$LIBIDL_VERSION - echo $ac_n "checking for libIDL - version >= $min_libIDL_version""... $ac_c" 1>&6 --echo "configure:18697: checking for libIDL - version >= $min_libIDL_version" >&5 -+echo "configure:18618: checking for libIDL - version >= $min_libIDL_version" >&5 - no_libIDL="" - if test "$LIBIDL_CONFIG" = "no" ; then - no_libIDL=yes -@@ -18720,7 +18641,7 @@ - echo $ac_n "cross compiling; assumed OK... $ac_c" - else - cat > conftest.$ac_ext <<EOF --#line 18724 "configure" -+#line 18645 "configure" - #include "confdefs.h" - - #include <stdio.h> -@@ -18806,7 +18727,7 @@ - } - - EOF --if { (eval echo configure:18810: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null -+if { (eval echo configure:18731: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null - then - : - else -@@ -18840,7 +18761,7 @@ - CFLAGS="$CFLAGS $LIBIDL_CFLAGS" - LIBS="$LIBS $LIBIDL_LIBS" - cat > conftest.$ac_ext <<EOF --#line 18844 "configure" -+#line 18765 "configure" - #include "confdefs.h" - - #include <stdio.h> -@@ -18851,7 +18772,7 @@ - return IDL_get_libver_string ? 1 : 0; - ; return 0; } - EOF --if { (eval echo configure:18855: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then -+if { (eval echo configure:18776: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then - rm -rf conftest* - echo "*** The test program compiled, but did not run. This usually means" - echo "*** that the run-time linker is not finding libIDL or finding the wrong" -@@ -18891,7 +18812,7 @@ - # Extract the first word of "pkg-config", so it can be a program name with args. - set dummy pkg-config; ac_word=$2 - echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 --echo "configure:18895: checking for $ac_word" >&5 -+echo "configure:18816: checking for $ac_word" >&5 - if eval "test \"`echo '$''{'ac_cv_path_PKG_CONFIG'+set}'`\" = set"; then - echo $ac_n "(cached) $ac_c" 1>&6 - else -@@ -18935,19 +18856,19 @@ - PKG_CONFIG_MIN_VERSION=0.9.0 - if $PKG_CONFIG --atleast-pkgconfig-version $PKG_CONFIG_MIN_VERSION; then - echo $ac_n "checking for libIDL-2.0 >= 0.8.0""... $ac_c" 1>&6 --echo "configure:18939: checking for libIDL-2.0 >= 0.8.0" >&5 -+echo "configure:18860: checking for libIDL-2.0 >= 0.8.0" >&5 - - if $PKG_CONFIG --exists "libIDL-2.0 >= 0.8.0" ; then - echo "$ac_t""yes" 1>&6 - succeeded=yes - - echo $ac_n "checking LIBIDL_CFLAGS""... $ac_c" 1>&6 --echo "configure:18946: checking LIBIDL_CFLAGS" >&5 -+echo "configure:18867: checking LIBIDL_CFLAGS" >&5 - LIBIDL_CFLAGS=`$PKG_CONFIG --cflags "libIDL-2.0 >= 0.8.0"` - echo "$ac_t""$LIBIDL_CFLAGS" 1>&6 - - echo $ac_n "checking LIBIDL_LIBS""... $ac_c" 1>&6 --echo "configure:18951: checking LIBIDL_LIBS" >&5 -+echo "configure:18872: checking LIBIDL_LIBS" >&5 - ## Remove evil flags like -Wl,--export-dynamic - LIBIDL_LIBS="`$PKG_CONFIG --libs \"libIDL-2.0 >= 0.8.0\" |sed s/-Wl,--export-dynamic//g`" - echo "$ac_t""$LIBIDL_LIBS" 1>&6 -@@ -18984,7 +18905,7 @@ - # Extract the first word of "$ac_prog", so it can be a program name with args. - set dummy $ac_prog; ac_word=$2 - echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 --echo "configure:18988: checking for $ac_word" >&5 -+echo "configure:18909: checking for $ac_word" >&5 - if eval "test \"`echo '$''{'ac_cv_path_ORBIT_CONFIG'+set}'`\" = set"; then - echo $ac_n "(cached) $ac_c" 1>&6 - else -@@ -19021,7 +18942,7 @@ - - if test -n "$ORBIT_CONFIG"; then - echo $ac_n "checking for ORBit libIDL usability""... $ac_c" 1>&6 --echo "configure:19025: checking for ORBit libIDL usability" >&5 -+echo "configure:18946: checking for ORBit libIDL usability" >&5 - _ORBIT_CFLAGS=`${ORBIT_CONFIG} client --cflags` - _ORBIT_LIBS=`${ORBIT_CONFIG} client --libs` - _ORBIT_INC_PATH=`${PERL} -e '{ for $f (@ARGV) { print "$f " if ($f =~ m/^-I/); } }' -- ${_ORBIT_CFLAGS}` -@@ -19038,7 +18959,7 @@ - result="maybe" - else - cat > conftest.$ac_ext <<EOF --#line 19042 "configure" -+#line 18963 "configure" - #include "confdefs.h" - - #include <stdlib.h> -@@ -19053,7 +18974,7 @@ - } - - EOF --if { (eval echo configure:19057: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null -+if { (eval echo configure:18978: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null - then - _LIBIDL_FOUND=1 - result="yes" -@@ -19100,7 +19021,7 @@ - fi - fi - --if test -z "$SKIP_PATH_CHECKS"; then -+if test -z "$SKIP_PATH_CHECKS" && test -z "$LIBXUL_SDK"; then - if test -z "${GLIB_CFLAGS}" || test -z "${GLIB_LIBS}" ; then - if test "$MOZ_ENABLE_GTK2"; then - succeeded=no -@@ -19109,7 +19030,7 @@ - # Extract the first word of "pkg-config", so it can be a program name with args. - set dummy pkg-config; ac_word=$2 - echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 --echo "configure:19113: checking for $ac_word" >&5 -+echo "configure:19034: checking for $ac_word" >&5 - if eval "test \"`echo '$''{'ac_cv_path_PKG_CONFIG'+set}'`\" = set"; then - echo $ac_n "(cached) $ac_c" 1>&6 - else -@@ -19153,19 +19074,19 @@ - PKG_CONFIG_MIN_VERSION=0.9.0 - if $PKG_CONFIG --atleast-pkgconfig-version $PKG_CONFIG_MIN_VERSION; then - echo $ac_n "checking for glib-2.0 >= 1.3.7 gobject-2.0""... $ac_c" 1>&6 --echo "configure:19157: checking for glib-2.0 >= 1.3.7 gobject-2.0" >&5 -+echo "configure:19078: checking for glib-2.0 >= 1.3.7 gobject-2.0" >&5 - - if $PKG_CONFIG --exists "glib-2.0 >= 1.3.7 gobject-2.0" ; then - echo "$ac_t""yes" 1>&6 - succeeded=yes - - echo $ac_n "checking GLIB_CFLAGS""... $ac_c" 1>&6 --echo "configure:19164: checking GLIB_CFLAGS" >&5 -+echo "configure:19085: checking GLIB_CFLAGS" >&5 - GLIB_CFLAGS=`$PKG_CONFIG --cflags "glib-2.0 >= 1.3.7 gobject-2.0"` - echo "$ac_t""$GLIB_CFLAGS" 1>&6 - - echo $ac_n "checking GLIB_LIBS""... $ac_c" 1>&6 --echo "configure:19169: checking GLIB_LIBS" >&5 -+echo "configure:19090: checking GLIB_LIBS" >&5 - ## Remove evil flags like -Wl,--export-dynamic - GLIB_LIBS="`$PKG_CONFIG --libs \"glib-2.0 >= 1.3.7 gobject-2.0\" |sed s/-Wl,--export-dynamic//g`" - echo "$ac_t""$GLIB_LIBS" 1>&6 -@@ -19250,7 +19171,7 @@ - # Extract the first word of "glib-config", so it can be a program name with args. - set dummy glib-config; ac_word=$2 - echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 --echo "configure:19254: checking for $ac_word" >&5 -+echo "configure:19175: checking for $ac_word" >&5 - if eval "test \"`echo '$''{'ac_cv_path_GLIB_CONFIG'+set}'`\" = set"; then - echo $ac_n "(cached) $ac_c" 1>&6 - else -@@ -19285,7 +19206,7 @@ - - min_glib_version=${GLIB_VERSION} - echo $ac_n "checking for GLIB - version >= $min_glib_version""... $ac_c" 1>&6 --echo "configure:19289: checking for GLIB - version >= $min_glib_version" >&5 -+echo "configure:19210: checking for GLIB - version >= $min_glib_version" >&5 - no_glib="" - if test "$GLIB_CONFIG" = "no" ; then - no_glib=yes -@@ -19308,7 +19229,7 @@ - echo $ac_n "cross compiling; assumed OK... $ac_c" - else - cat > conftest.$ac_ext <<EOF --#line 19312 "configure" -+#line 19233 "configure" - #include "confdefs.h" - - #include <glib.h> -@@ -19384,7 +19305,7 @@ - } - - EOF --if { (eval echo configure:19388: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null -+if { (eval echo configure:19309: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null - then - : - else -@@ -19418,7 +19339,7 @@ - CFLAGS="$CFLAGS $GLIB_CFLAGS" - LIBS="$LIBS $GLIB_LIBS" - cat > conftest.$ac_ext <<EOF --#line 19422 "configure" -+#line 19343 "configure" - #include "confdefs.h" - - #include <glib.h> -@@ -19428,7 +19349,7 @@ - return ((glib_major_version) || (glib_minor_version) || (glib_micro_version)); - ; return 0; } - EOF --if { (eval echo configure:19432: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then -+if { (eval echo configure:19353: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then - rm -rf conftest* - echo "*** The test program compiled, but did not run. This usually means" - echo "*** that the run-time linker is not finding GLIB or finding the wrong" -@@ -19508,19 +19429,19 @@ - # The Ultrix 4.2 mips builtin alloca declared by alloca.h only works - # for constant arguments. Useless! - echo $ac_n "checking for working alloca.h""... $ac_c" 1>&6 --echo "configure:19512: checking for working alloca.h" >&5 -+echo "configure:19433: checking for working alloca.h" >&5 - if eval "test \"`echo '$''{'ac_cv_header_alloca_h'+set}'`\" = set"; then - echo $ac_n "(cached) $ac_c" 1>&6 - else - cat > conftest.$ac_ext <<EOF --#line 19517 "configure" -+#line 19438 "configure" - #include "confdefs.h" - #include <alloca.h> - int main() { - char *p = alloca(2 * sizeof(int)); - ; return 0; } - EOF --if { (eval echo configure:19524: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then -+if { (eval echo configure:19445: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then - rm -rf conftest* - ac_cv_header_alloca_h=yes - else -@@ -19541,12 +19462,12 @@ - fi - - echo $ac_n "checking for alloca""... $ac_c" 1>&6 --echo "configure:19545: checking for alloca" >&5 -+echo "configure:19466: checking for alloca" >&5 - if eval "test \"`echo '$''{'ac_cv_func_alloca_works'+set}'`\" = set"; then - echo $ac_n "(cached) $ac_c" 1>&6 - else - cat > conftest.$ac_ext <<EOF --#line 19550 "configure" -+#line 19471 "configure" - #include "confdefs.h" - - #ifdef __GNUC__ -@@ -19574,7 +19495,7 @@ - char *p = (char *) alloca(1); - ; return 0; } - EOF --if { (eval echo configure:19578: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then -+if { (eval echo configure:19499: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then - rm -rf conftest* - ac_cv_func_alloca_works=yes - else -@@ -19606,12 +19527,12 @@ - - - echo $ac_n "checking whether alloca needs Cray hooks""... $ac_c" 1>&6 --echo "configure:19610: checking whether alloca needs Cray hooks" >&5 -+echo "configure:19531: checking whether alloca needs Cray hooks" >&5 - if eval "test \"`echo '$''{'ac_cv_os_cray'+set}'`\" = set"; then - echo $ac_n "(cached) $ac_c" 1>&6 - else - cat > conftest.$ac_ext <<EOF --#line 19615 "configure" -+#line 19536 "configure" - #include "confdefs.h" - #if defined(CRAY) && ! defined(CRAY2) - webecray -@@ -19636,12 +19557,12 @@ - if test $ac_cv_os_cray = yes; then - for ac_func in _getb67 GETB67 getb67; do - echo $ac_n "checking for $ac_func""... $ac_c" 1>&6 --echo "configure:19640: checking for $ac_func" >&5 -+echo "configure:19561: checking for $ac_func" >&5 - if eval "test \"`echo '$''{'ac_cv_func_$ac_func'+set}'`\" = set"; then - echo $ac_n "(cached) $ac_c" 1>&6 - else - cat > conftest.$ac_ext <<EOF --#line 19645 "configure" -+#line 19566 "configure" - #include "confdefs.h" - /* System header to define __stub macros and hopefully few prototypes, - which can conflict with char $ac_func(); below. */ -@@ -19664,7 +19585,7 @@ - - ; return 0; } - EOF --if { (eval echo configure:19668: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then -+if { (eval echo configure:19589: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then - rm -rf conftest* - eval "ac_cv_func_$ac_func=yes" - else -@@ -19691,7 +19612,7 @@ - fi - - echo $ac_n "checking stack direction for C alloca""... $ac_c" 1>&6 --echo "configure:19695: checking stack direction for C alloca" >&5 -+echo "configure:19616: checking stack direction for C alloca" >&5 - if eval "test \"`echo '$''{'ac_cv_c_stack_direction'+set}'`\" = set"; then - echo $ac_n "(cached) $ac_c" 1>&6 - else -@@ -19699,7 +19620,7 @@ - ac_cv_c_stack_direction=0 - else - cat > conftest.$ac_ext <<EOF --#line 19703 "configure" -+#line 19624 "configure" - #include "confdefs.h" - find_stack_direction () - { -@@ -19718,7 +19639,7 @@ - exit (find_stack_direction() < 0); - } - EOF --if { (eval echo configure:19722: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null -+if { (eval echo configure:19643: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null - then - ac_cv_c_stack_direction=1 - else -@@ -19765,17 +19686,17 @@ - do - ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'` - echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6 --echo "configure:19769: checking for $ac_hdr" >&5 -+echo "configure:19690: checking for $ac_hdr" >&5 - if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then - echo $ac_n "(cached) $ac_c" 1>&6 - else - cat > conftest.$ac_ext <<EOF --#line 19774 "configure" -+#line 19695 "configure" - #include "confdefs.h" - #include <$ac_hdr> - EOF - ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" --{ (eval echo configure:19779: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } -+{ (eval echo configure:19700: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } - ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"` - if test -z "$ac_err"; then - rm -rf conftest* -@@ -19853,7 +19774,7 @@ - # Extract the first word of "pkg-config", so it can be a program name with args. - set dummy pkg-config; ac_word=$2 - echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 --echo "configure:19857: checking for $ac_word" >&5 -+echo "configure:19778: checking for $ac_word" >&5 - if eval "test \"`echo '$''{'ac_cv_path_PKG_CONFIG'+set}'`\" = set"; then - echo $ac_n "(cached) $ac_c" 1>&6 - else -@@ -19897,19 +19818,19 @@ - PKG_CONFIG_MIN_VERSION=0.9.0 - if $PKG_CONFIG --atleast-pkgconfig-version $PKG_CONFIG_MIN_VERSION; then - echo $ac_n "checking for fontconfig freetype2""... $ac_c" 1>&6 --echo "configure:19901: checking for fontconfig freetype2" >&5 -+echo "configure:19822: checking for fontconfig freetype2" >&5 - - if $PKG_CONFIG --exists "fontconfig freetype2" ; then - echo "$ac_t""yes" 1>&6 - succeeded=yes - - echo $ac_n "checking CAIRO_FT_CFLAGS""... $ac_c" 1>&6 --echo "configure:19908: checking CAIRO_FT_CFLAGS" >&5 -+echo "configure:19829: checking CAIRO_FT_CFLAGS" >&5 - CAIRO_FT_CFLAGS=`$PKG_CONFIG --cflags "fontconfig freetype2"` - echo "$ac_t""$CAIRO_FT_CFLAGS" 1>&6 - - echo $ac_n "checking CAIRO_FT_LIBS""... $ac_c" 1>&6 --echo "configure:19913: checking CAIRO_FT_LIBS" >&5 -+echo "configure:19834: checking CAIRO_FT_LIBS" >&5 - ## Remove evil flags like -Wl,--export-dynamic - CAIRO_FT_LIBS="`$PKG_CONFIG --libs \"fontconfig freetype2\" |sed s/-Wl,--export-dynamic//g`" - echo "$ac_t""$CAIRO_FT_LIBS" 1>&6 -@@ -20000,7 +19921,7 @@ - # Extract the first word of "pkg-config", so it can be a program name with args. - set dummy pkg-config; ac_word=$2 - echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 --echo "configure:20004: checking for $ac_word" >&5 -+echo "configure:19925: checking for $ac_word" >&5 - if eval "test \"`echo '$''{'ac_cv_path_PKG_CONFIG'+set}'`\" = set"; then - echo $ac_n "(cached) $ac_c" 1>&6 - else -@@ -20044,19 +19965,19 @@ - PKG_CONFIG_MIN_VERSION=0.9.0 - if $PKG_CONFIG --atleast-pkgconfig-version $PKG_CONFIG_MIN_VERSION; then - echo $ac_n "checking for cairo >= $CAIRO_VERSION freetype2 fontconfig""... $ac_c" 1>&6 --echo "configure:20048: checking for cairo >= $CAIRO_VERSION freetype2 fontconfig" >&5 -+echo "configure:19969: checking for cairo >= $CAIRO_VERSION freetype2 fontconfig" >&5 - - if $PKG_CONFIG --exists "cairo >= $CAIRO_VERSION freetype2 fontconfig" ; then - echo "$ac_t""yes" 1>&6 - succeeded=yes - - echo $ac_n "checking CAIRO_CFLAGS""... $ac_c" 1>&6 --echo "configure:20055: checking CAIRO_CFLAGS" >&5 -+echo "configure:19976: checking CAIRO_CFLAGS" >&5 - CAIRO_CFLAGS=`$PKG_CONFIG --cflags "cairo >= $CAIRO_VERSION freetype2 fontconfig"` - echo "$ac_t""$CAIRO_CFLAGS" 1>&6 - - echo $ac_n "checking CAIRO_LIBS""... $ac_c" 1>&6 --echo "configure:20060: checking CAIRO_LIBS" >&5 -+echo "configure:19981: checking CAIRO_LIBS" >&5 - ## Remove evil flags like -Wl,--export-dynamic - CAIRO_LIBS="`$PKG_CONFIG --libs \"cairo >= $CAIRO_VERSION freetype2 fontconfig\" |sed s/-Wl,--export-dynamic//g`" - echo "$ac_t""$CAIRO_LIBS" 1>&6 -@@ -20094,7 +20015,7 @@ - # Extract the first word of "pkg-config", so it can be a program name with args. - set dummy pkg-config; ac_word=$2 - echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 --echo "configure:20098: checking for $ac_word" >&5 -+echo "configure:20019: checking for $ac_word" >&5 - if eval "test \"`echo '$''{'ac_cv_path_PKG_CONFIG'+set}'`\" = set"; then - echo $ac_n "(cached) $ac_c" 1>&6 - else -@@ -20138,19 +20059,19 @@ - PKG_CONFIG_MIN_VERSION=0.9.0 - if $PKG_CONFIG --atleast-pkgconfig-version $PKG_CONFIG_MIN_VERSION; then - echo $ac_n "checking for cairo-xlib-xrender >= $CAIRO_VERSION""... $ac_c" 1>&6 --echo "configure:20142: checking for cairo-xlib-xrender >= $CAIRO_VERSION" >&5 -+echo "configure:20063: checking for cairo-xlib-xrender >= $CAIRO_VERSION" >&5 - - if $PKG_CONFIG --exists "cairo-xlib-xrender >= $CAIRO_VERSION" ; then - echo "$ac_t""yes" 1>&6 - succeeded=yes - - echo $ac_n "checking CAIRO_XRENDER_CFLAGS""... $ac_c" 1>&6 --echo "configure:20149: checking CAIRO_XRENDER_CFLAGS" >&5 -+echo "configure:20070: checking CAIRO_XRENDER_CFLAGS" >&5 - CAIRO_XRENDER_CFLAGS=`$PKG_CONFIG --cflags "cairo-xlib-xrender >= $CAIRO_VERSION"` - echo "$ac_t""$CAIRO_XRENDER_CFLAGS" 1>&6 - - echo $ac_n "checking CAIRO_XRENDER_LIBS""... $ac_c" 1>&6 --echo "configure:20154: checking CAIRO_XRENDER_LIBS" >&5 -+echo "configure:20075: checking CAIRO_XRENDER_LIBS" >&5 - ## Remove evil flags like -Wl,--export-dynamic - CAIRO_XRENDER_LIBS="`$PKG_CONFIG --libs \"cairo-xlib-xrender >= $CAIRO_VERSION\" |sed s/-Wl,--export-dynamic//g`" - echo "$ac_t""$CAIRO_XRENDER_LIBS" 1>&6 -@@ -20221,7 +20142,7 @@ - # Extract the first word of "pkg-config", so it can be a program name with args. - set dummy pkg-config; ac_word=$2 - echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 --echo "configure:20225: checking for $ac_word" >&5 -+echo "configure:20146: checking for $ac_word" >&5 - if eval "test \"`echo '$''{'ac_cv_path_PKG_CONFIG'+set}'`\" = set"; then - echo $ac_n "(cached) $ac_c" 1>&6 - else -@@ -20265,19 +20186,19 @@ - PKG_CONFIG_MIN_VERSION=0.9.0 - if $PKG_CONFIG --atleast-pkgconfig-version $PKG_CONFIG_MIN_VERSION; then - echo $ac_n "checking for lcms >= $LCMS_VERSION""... $ac_c" 1>&6 --echo "configure:20269: checking for lcms >= $LCMS_VERSION" >&5 -+echo "configure:20190: checking for lcms >= $LCMS_VERSION" >&5 - - if $PKG_CONFIG --exists "lcms >= $LCMS_VERSION" ; then - echo "$ac_t""yes" 1>&6 - succeeded=yes - - echo $ac_n "checking LCMS_CFLAGS""... $ac_c" 1>&6 --echo "configure:20276: checking LCMS_CFLAGS" >&5 -+echo "configure:20197: checking LCMS_CFLAGS" >&5 - LCMS_CFLAGS=`$PKG_CONFIG --cflags "lcms >= $LCMS_VERSION"` - echo "$ac_t""$LCMS_CFLAGS" 1>&6 - - echo $ac_n "checking LCMS_LIBS""... $ac_c" 1>&6 --echo "configure:20281: checking LCMS_LIBS" >&5 -+echo "configure:20202: checking LCMS_LIBS" >&5 - ## Remove evil flags like -Wl,--export-dynamic - LCMS_LIBS="`$PKG_CONFIG --libs \"lcms >= $LCMS_VERSION\" |sed s/-Wl,--export-dynamic//g`" - echo "$ac_t""$LCMS_LIBS" 1>&6 -@@ -20625,14 +20546,14 @@ - cross_compiling=$ac_cv_prog_cc_cross - - cat > conftest.$ac_ext <<EOF --#line 20629 "configure" -+#line 20550 "configure" - #include "confdefs.h" - #include <gmodule.h> - int main() { - int x = 1; x++; - ; return 0; } - EOF --if { (eval echo configure:20636: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then -+if { (eval echo configure:20557: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then - : - else - echo "configure: failed program was:" >&5 -@@ -20946,7 +20867,7 @@ - _SAVE_CFLAGS=$CFLAGS - CFLAGS="$CFLAGS $XCFLAGS" - cat > conftest.$ac_ext <<EOF --#line 20950 "configure" -+#line 20871 "configure" - #include "confdefs.h" - - #include <stdio.h> -@@ -20964,7 +20885,7 @@ - - ; return 0; } - EOF --if { (eval echo configure:20968: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then -+if { (eval echo configure:20889: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then - : - else - echo "configure: failed program was:" >&5 -@@ -21187,34 +21108,15 @@ - # Transform confdefs.h into DEFS. - # Protect against shell expansion while executing Makefile rules. - # Protect against Makefile macro expansion. --# --# If the first sed substitution is executed (which looks for macros that --# take arguments), then we branch to the quote section. Otherwise, --# look for a macro that doesn't take arguments. --cat >confdef2opt.sed <<\_ACEOF --t clear --: clear --s,^[ ]*#[ ]*define[ ][ ]*\([^ (][^ (]*([^)]*)\)[ ]*\(.*\),-D\1=\2,g --t quote --s,^[ ]*#[ ]*define[ ][ ]*\([^ ][^ ]*\)[ ]*\(.*\),-D\1=\2,g --t quote --d --: quote --s,[ `~#$^&*(){}\\|;'"<>?],\\&,g --s,\[,\\&,g --s,\],\\&,g --s,\$,$$,g --p --_ACEOF --# We use echo to avoid assuming a particular line-breaking character. --# The extra dot is to prevent the shell from consuming trailing --# line-breaks from the sub-command output. A line-break within --# single-quotes doesn't work because, if this script is created in a --# platform that uses two characters for line-breaks (e.g., DOS), tr --# would break. --ac_LF_and_DOT=`echo; echo .` --DEFS=`sed -n -f confdef2opt.sed confdefs.h | tr "$ac_LF_and_DOT" ' .'` --rm -f confdef2opt.sed -+cat > conftest.defs <<\EOF -+s%#define \([A-Za-z_][A-Za-z0-9_]*\) *\(.*\)%-D\1=\2%g -+s%[ `~#$^&*(){}\\|;'"<>?]%\\&%g -+s%\[%\\&%g -+s%\]%\\&%g -+s%\$%$$%g -+EOF -+DEFS=`sed -f conftest.defs confdefs.h | tr '\012' ' '` -+rm -f conftest.defs - - MOZ_DEFINES=$DEFS - -@@ -22081,7 +21983,7 @@ - unset MAKEFILES - unset CONFIG_FILES - --if test "$COMPILE_ENVIRONMENT"; then -+if test "$COMPILE_ENVIRONMENT" && test -z "$LIBXUL_SDK"; then - if test -z "$MOZ_NATIVE_NSPR" || test "$MOZ_LDAP_XPCOM"; then - ac_configure_args="$_SUBDIR_CONFIG_ARGS --with-dist-prefix=$MOZ_BUILD_ROOT/dist --with-mozilla" - if test -z "$MOZ_DEBUG"; then -@@ -22190,7 +22092,7 @@ - fi - fi - -- cd $ac_popdir -+ cd "$ac_popdir" - done - fi - -@@ -22333,7 +22235,7 @@ - fi - fi - -- cd $ac_popdir -+ cd "$ac_popdir" - done - fi - ---- iceweasel-3.0.1.orig/configure.in -+++ iceweasel-3.0.1/configure.in -@@ -2759,7 +2759,7 @@ - if test "$ac_cv_have_usable_wchar_v2" = "yes"; then - AC_DEFINE(HAVE_CPP_2BYTE_WCHAR_T) - HAVE_CPP_2BYTE_WCHAR_T=1 --else -+elif false; then - dnl This is really gcc-only - dnl Do this test using CXX only since some versions of gcc - dnl 2.95-2.97 have a signed wchar_t in c++ only and some versions -@@ -4000,6 +4000,10 @@ - AC_MSG_ERROR([system NSPR does not support PR_STATIC_ASSERT])) - CFLAGS=$_SAVE_CFLAGS - else -+ if test -n "$LIBXUL_SDK"; then -+ NSPR_CFLAGS="-I$LIBXUL_SDK_DIR/sdk/include" -+ NSPR_LIBS="-L$LIBXUL_SDK_DIR/sdk/lib -lnspr$NSPR_VERSION -lplc$NSPR_VERSION -lplds$NSPR_VERSION" -+ else - NSPR_CFLAGS='`$(DEPTH)/nsprpub/config/nspr-config --prefix=$(LIBXUL_DIST) --includedir=$(LIBXUL_DIST)/include/nspr --cflags`' - # explicitly set libs for Visual Age C++ for OS/2 - if test "$OS_ARCH" = "OS2" -a "$VACPP" = "yes"; then -@@ -4017,6 +4021,7 @@ - else - NSPR_LIBS='`$(DEPTH)/nsprpub/config/nspr-config --prefix=$(LIBXUL_DIST) --libdir=$(LIBXUL_DIST)/lib --libs`' - fi -+ fi - fi - - dnl ======================================================== -@@ -4641,6 +4646,10 @@ - dnl ======================================================== - MOZ_ARG_HEADER(Toolkit Options) - -+if test -n "$LIBXUL_SDK"; then -+ MOZ_WIDGET_TOOLKIT=`perl -e 'while (<>) { /MOZ_DEFAULT_TOOLKIT *\"(.*)\"/ && print $1; }' $LIBXUL_SDK_DIR/include/mozilla-config.h` -+else -+ - dnl ======================================================== - dnl = Select the default toolkit - dnl ======================================================== -@@ -4676,6 +4685,7 @@ - AC_MSG_ERROR([Toolkit must be $_PLATFORM_DEFAULT_TOOLKIT (if supported).]) - fi - fi -+fi # LIBXUL_SDK - - AC_DEFINE_UNQUOTED(MOZ_DEFAULT_TOOLKIT,"$MOZ_WIDGET_TOOLKIT") - -@@ -4754,6 +4764,7 @@ - dnl = startup-notification support module - dnl ======================================================== - -+if test -z "$LIBXUL_SDK"; then - if test "$MOZ_ENABLE_GTK2" - then - MOZ_ENABLE_STARTUP_NOTIFICATION= -@@ -4781,6 +4792,7 @@ - - TK_LIBS="$TK_LIBS $MOZ_STARTUP_NOTIFICATION_LIBS" - fi -+fi - AC_SUBST(MOZ_ENABLE_STARTUP_NOTIFICATION) - AC_SUBST(MOZ_STARTUP_NOTIFICATION_CFLAGS) - AC_SUBST(MOZ_STARTUP_NOTIFICATION_LIBS) -@@ -4799,7 +4811,7 @@ - - AC_SUBST(MOC) - --if test "$MOZ_ENABLE_GTK2" -+if test "$MOZ_ENABLE_GTK2" && test -z "$LIBXUL_SDK" - then - AC_DEFINE(MOZ_X11) - MOZ_X11=1 -@@ -4921,7 +4933,7 @@ - dnl ======================================================== - dnl = Xft and Pango - dnl ======================================================== --if test "$MOZ_ENABLE_GTK2" -+if test "$MOZ_ENABLE_GTK2" && test -z "$LIBXUL_SDK" - then - PKG_CHECK_MODULES(MOZ_XFT, xft) - AC_SUBST(MOZ_XFT_CFLAGS) -@@ -4945,6 +4957,7 @@ - dnl = GnomeVFS support module - dnl ======================================================== - -+if test -z "$LIBXUL_SDK"; then - if test "$MOZ_X11" - then - dnl build the gnomevfs extension by default only when the -@@ -5081,6 +5094,9 @@ - AC_SUBST(MOZ_DBUS_GLIB_CFLAGS) - AC_SUBST(MOZ_DBUS_GLIB_LIBS) - -+fi # LIBXUL_SDK -+ -+ - dnl ======================================================== - dnl = Build Personal Security Manager - dnl ======================================================== -@@ -6245,7 +6261,7 @@ - MOZ_MEMORY=1, - MOZ_MEMORY=) - --if test "$NS_TRACE_MALLOC"; then -+if test "$NS_TRACE_MALLOC" || test "$LIBXUL_SDK"; then - MOZ_MEMORY= - fi - -@@ -7113,7 +7129,7 @@ - ;; - esac - --if test -z "$COMPILE_ENVIRONMENT"; then -+if test -z "$COMPILE_ENVIRONMENT" || test "$LIBXUL_SDK"; then - SKIP_IDL_CHECK="yes" - fi - -@@ -7220,7 +7236,7 @@ - fi - fi - --if test -z "$SKIP_PATH_CHECKS"; then -+if test -z "$SKIP_PATH_CHECKS" && test -z "$LIBXUL_SDK"; then - if test -z "${GLIB_CFLAGS}" || test -z "${GLIB_LIBS}" ; then - if test "$MOZ_ENABLE_GTK2"; then - PKG_CHECK_MODULES(GLIB, glib-2.0 >= 1.3.7 gobject-2.0) -@@ -8260,7 +8276,7 @@ - unset MAKEFILES - unset CONFIG_FILES - --if test "$COMPILE_ENVIRONMENT"; then -+if test "$COMPILE_ENVIRONMENT" && test -z "$LIBXUL_SDK"; then - if test -z "$MOZ_NATIVE_NSPR" || test "$MOZ_LDAP_XPCOM"; then - ac_configure_args="$_SUBDIR_CONFIG_ARGS --with-dist-prefix=$MOZ_BUILD_ROOT/dist --with-mozilla" - if test -z "$MOZ_DEBUG"; then - - diff --git a/recipes/mozilla/firefox-3.0.4/0001-Remove-Werror-from-build.patch b/recipes/mozilla/firefox-3.0.4/0001-Remove-Werror-from-build.patch deleted file mode 100644 index 8fe1087b4d..0000000000 --- a/recipes/mozilla/firefox-3.0.4/0001-Remove-Werror-from-build.patch +++ /dev/null @@ -1,45 +0,0 @@ -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(-) - -diff --git a/configure b/configure -index a2d84ab..402e70a 100755 ---- a/configure -+++ b/configure -@@ -5344,7 +5344,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' - _MOZ_RTTI_FLAGS_ON=${_COMPILER_PREFIX}-frtti -@@ -6811,7 +6811,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" -@@ -7048,7 +7048,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 $@' --- -1.5.4.3 diff --git a/recipes/mozilla/firefox-3.0.4/0002-Fix-security-cross-compile-cpu-detection-error.patch b/recipes/mozilla/firefox-3.0.4/0002-Fix-security-cross-compile-cpu-detection-error.patch deleted file mode 100644 index ce8d4d9948..0000000000 --- a/recipes/mozilla/firefox-3.0.4/0002-Fix-security-cross-compile-cpu-detection-error.patch +++ /dev/null @@ -1,42 +0,0 @@ -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.0.4/010_FPU_IS_ARM_FPA_xslt.diff b/recipes/mozilla/firefox-3.0.4/010_FPU_IS_ARM_FPA_xslt.diff deleted file mode 100644 index 854100c4c3..0000000000 --- a/recipes/mozilla/firefox-3.0.4/010_FPU_IS_ARM_FPA_xslt.diff +++ /dev/null @@ -1,56 +0,0 @@ -# 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.0.4/Bug339782.additional.fix.diff b/recipes/mozilla/firefox-3.0.4/Bug339782.additional.fix.diff deleted file mode 100644 index 0848e730d3..0000000000 --- a/recipes/mozilla/firefox-3.0.4/Bug339782.additional.fix.diff +++ /dev/null @@ -1,39 +0,0 @@ -# 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.0.4/Bug385583.nspr.jmp_buf.eabi.diff b/recipes/mozilla/firefox-3.0.4/Bug385583.nspr.jmp_buf.eabi.diff deleted file mode 100644 index 486440c30e..0000000000 --- a/recipes/mozilla/firefox-3.0.4/Bug385583.nspr.jmp_buf.eabi.diff +++ /dev/null @@ -1,33 +0,0 @@ -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.0.4/Bug405992.atomic.nspr.diff b/recipes/mozilla/firefox-3.0.4/Bug405992.atomic.nspr.diff deleted file mode 100644 index f54f916a6a..0000000000 --- a/recipes/mozilla/firefox-3.0.4/Bug405992.atomic.nspr.diff +++ /dev/null @@ -1,48 +0,0 @@ -# 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.0.4/configure-wchart.patch b/recipes/mozilla/firefox-3.0.4/configure-wchart.patch deleted file mode 100644 index 36ee2a0ba4..0000000000 --- a/recipes/mozilla/firefox-3.0.4/configure-wchart.patch +++ /dev/null @@ -1,11 +0,0 @@ ---- 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.0.4/jemalloc-tls.patch b/recipes/mozilla/firefox-3.0.4/jemalloc-tls.patch deleted file mode 100644 index d1d740989e..0000000000 --- a/recipes/mozilla/firefox-3.0.4/jemalloc-tls.patch +++ /dev/null @@ -1,28 +0,0 @@ ---- /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.0.4/jsautocfg-dontoverwrite.patch b/recipes/mozilla/firefox-3.0.4/jsautocfg-dontoverwrite.patch deleted file mode 100644 index 39978cfd11..0000000000 --- a/recipes/mozilla/firefox-3.0.4/jsautocfg-dontoverwrite.patch +++ /dev/null @@ -1,23 +0,0 @@ ---- mozilla/js/src/Makefile.in.orig 2006-12-12 11:46:02.000000000 +0000 -+++ mozilla/js/src/Makefile.in 2006-12-12 11:46:27.000000000 +0000 -@@ -319,20 +319,8 @@ - - jsopcode.h jsopcode.c: jsopcode.tbl - --ifeq (,$(CROSS_COMPILE)$(filter-out WINNT,$(OS_ARCH))) - jsautocfg.h: - touch $@ --else --ifeq ($(OS_ARCH),WINCE) --jsautocfg.h: -- touch $@ --else --jsautocfg.h: jscpucfg$(HOST_BIN_SUFFIX) -- @rm -f $@ jsautocfg.tmp -- ./jscpucfg > jsautocfg.tmp -- mv jsautocfg.tmp $@ --endif --endif - - # jscpucfg is a strange target - # Needs to be built with the host compiler but needs to include diff --git a/recipes/mozilla/firefox-3.0.4/linkage-problem.patch b/recipes/mozilla/firefox-3.0.4/linkage-problem.patch deleted file mode 100644 index 28bffd1e22..0000000000 --- a/recipes/mozilla/firefox-3.0.4/linkage-problem.patch +++ /dev/null @@ -1,14 +0,0 @@ ---- 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.0.4/mozconfig b/recipes/mozilla/firefox-3.0.4/mozconfig deleted file mode 100644 index d8d3f3923d..0000000000 --- a/recipes/mozilla/firefox-3.0.4/mozconfig +++ /dev/null @@ -1,72 +0,0 @@ -. $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 --disable-necko-disk-cache -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.0.4/random_to_urandom.diff b/recipes/mozilla/firefox-3.0.4/random_to_urandom.diff deleted file mode 100644 index f969752381..0000000000 --- a/recipes/mozilla/firefox-3.0.4/random_to_urandom.diff +++ /dev/null @@ -1,26 +0,0 @@ -# Component manager should not use /dev/random for generation ranodm numbers -# It cause hangs on embedding platforms,which does not have enough devices for generation required entropy -# Bug somewhere exists but it is very old -Index: nsprpub/pr/src/md/unix/uxrng.c -=================================================================== ---- mozilla/nsprpub/pr/src/md/unix/uxrng.c.orig -+++ mozilla/nsprpub/pr/src/md/unix/uxrng.c -@@ -144,17 +144,17 @@ - #include <sys/stat.h> - #include <fcntl.h> - - static int fdDevRandom; - static PRCallOnceType coOpenDevRandom; - - static PRStatus OpenDevRandom( void ) - { -- fdDevRandom = open( "/dev/random", O_RDONLY ); -+ fdDevRandom = open( "/dev/urandom", O_RDONLY ); - return((-1 == fdDevRandom)? PR_FAILURE : PR_SUCCESS ); - } /* end OpenDevRandom() */ - - static size_t GetDevRandom( void *buf, size_t size ) - { - int bytesIn; - int rc; - diff --git a/recipes/mozilla/firefox-3.0.4/security-cross.patch b/recipes/mozilla/firefox-3.0.4/security-cross.patch deleted file mode 100644 index e1c988d7e6..0000000000 --- a/recipes/mozilla/firefox-3.0.4/security-cross.patch +++ /dev/null @@ -1,98 +0,0 @@ ---- mozilla/security/coreconf/Linux.mk.orig 2006-12-12 10:53:12.000000000 +0000 -+++ mozilla/security/coreconf/Linux.mk 2006-12-12 10:54:13.000000000 +0000 -@@ -52,93 +52,8 @@ - - DEFAULT_COMPILER = gcc - --ifeq ($(OS_TEST),m68k) -- OS_REL_CFLAGS = -DLINUX1_2 -D_XOPEN_SOURCE -- CPU_ARCH = m68k --else --ifeq ($(OS_TEST),ppc64) -- OS_REL_CFLAGS = -DLINUX1_2 -D_XOPEN_SOURCE -- CPU_ARCH = ppc --ifeq ($(USE_64),1) -- ARCHFLAG = -m64 --endif --else --ifeq ($(OS_TEST),ppc) -- OS_REL_CFLAGS = -DLINUX1_2 -D_XOPEN_SOURCE -- CPU_ARCH = ppc --else --ifeq ($(OS_TEST),alpha) -- OS_REL_CFLAGS = -D_ALPHA_ -DLINUX1_2 -D_XOPEN_SOURCE -- CPU_ARCH = alpha --else --ifeq ($(OS_TEST),ia64) -- OS_REL_CFLAGS = -DLINUX1_2 -D_XOPEN_SOURCE -- CPU_ARCH = ia64 --else --ifeq ($(OS_TEST),x86_64) --ifeq ($(USE_64),1) -- OS_REL_CFLAGS = -DLINUX1_2 -D_XOPEN_SOURCE -- CPU_ARCH = x86_64 --else -- OS_REL_CFLAGS = -DLINUX1_2 -Di386 -D_XOPEN_SOURCE -- CPU_ARCH = x86 -- ARCHFLAG = -m32 --endif --else --ifeq ($(OS_TEST),sparc) -- OS_REL_CFLAGS = -DLINUX1_2 -D_XOPEN_SOURCE -- CPU_ARCH = sparc --else --ifeq ($(OS_TEST),sparc64) -- OS_REL_CFLAGS = -DLINUX1_2 -D_XOPEN_SOURCE -- CPU_ARCH = sparc --else --ifeq (,$(filter-out arm% sa110,$(OS_TEST))) -- OS_REL_CFLAGS = -DLINUX1_2 -D_XOPEN_SOURCE -- CPU_ARCH = arm --else --ifeq ($(OS_TEST),parisc) -- OS_REL_CFLAGS = -DLINUX1_2 -D_XOPEN_SOURCE -- CPU_ARCH = hppa --else --ifeq ($(OS_TEST),parisc64) -- OS_REL_CFLAGS = -DLINUX1_2 -D_XOPEN_SOURCE -- CPU_ARCH = hppa --else --ifeq ($(OS_TEST),s390) -- OS_REL_CFLAGS = -DLINUX1_2 -D_XOPEN_SOURCE -- CPU_ARCH = s390 --else --ifeq ($(OS_TEST),s390x) -- OS_REL_CFLAGS = -DLINUX1_2 -D_XOPEN_SOURCE -- CPU_ARCH = s390x --else --ifeq ($(OS_TEST),mips) -- OS_REL_CFLAGS = -DLINUX1_2 -D_XOPEN_SOURCE -- CPU_ARCH = mips --else --ifeq (,$(filter-out i%86,$(OS_TEST))) -- OS_REL_CFLAGS = -DLINUX1_2 -Di386 -D_XOPEN_SOURCE -- CPU_ARCH = x86 --else -- OS_REL_CFLAGS = -DLINUX1_2 -D_XOPEN_SOURCE -- CPU_ARCH = $(OS_TEST) --endif --endif --endif --endif --endif --endif --endif --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-3.0.8/0001-Remove-Werror-from-build.patch b/recipes/mozilla/firefox-3.0.8/0001-Remove-Werror-from-build.patch deleted file mode 100644 index 8fe1087b4d..0000000000 --- a/recipes/mozilla/firefox-3.0.8/0001-Remove-Werror-from-build.patch +++ /dev/null @@ -1,45 +0,0 @@ -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(-) - -diff --git a/configure b/configure -index a2d84ab..402e70a 100755 ---- a/configure -+++ b/configure -@@ -5344,7 +5344,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' - _MOZ_RTTI_FLAGS_ON=${_COMPILER_PREFIX}-frtti -@@ -6811,7 +6811,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" -@@ -7048,7 +7048,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 $@' --- -1.5.4.3 diff --git a/recipes/mozilla/firefox-3.0.8/0002-Fix-security-cross-compile-cpu-detection-error.patch b/recipes/mozilla/firefox-3.0.8/0002-Fix-security-cross-compile-cpu-detection-error.patch deleted file mode 100644 index ce8d4d9948..0000000000 --- a/recipes/mozilla/firefox-3.0.8/0002-Fix-security-cross-compile-cpu-detection-error.patch +++ /dev/null @@ -1,42 +0,0 @@ -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.0.8/010_FPU_IS_ARM_FPA_xslt.diff b/recipes/mozilla/firefox-3.0.8/010_FPU_IS_ARM_FPA_xslt.diff deleted file mode 100644 index 854100c4c3..0000000000 --- a/recipes/mozilla/firefox-3.0.8/010_FPU_IS_ARM_FPA_xslt.diff +++ /dev/null @@ -1,56 +0,0 @@ -# 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.0.8/Bug339782.additional.fix.diff b/recipes/mozilla/firefox-3.0.8/Bug339782.additional.fix.diff deleted file mode 100644 index 0848e730d3..0000000000 --- a/recipes/mozilla/firefox-3.0.8/Bug339782.additional.fix.diff +++ /dev/null @@ -1,39 +0,0 @@ -# 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.0.8/Bug385583.nspr.jmp_buf.eabi.diff b/recipes/mozilla/firefox-3.0.8/Bug385583.nspr.jmp_buf.eabi.diff deleted file mode 100644 index 486440c30e..0000000000 --- a/recipes/mozilla/firefox-3.0.8/Bug385583.nspr.jmp_buf.eabi.diff +++ /dev/null @@ -1,33 +0,0 @@ -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.0.8/Bug405992.atomic.nspr.diff b/recipes/mozilla/firefox-3.0.8/Bug405992.atomic.nspr.diff deleted file mode 100644 index f54f916a6a..0000000000 --- a/recipes/mozilla/firefox-3.0.8/Bug405992.atomic.nspr.diff +++ /dev/null @@ -1,48 +0,0 @@ -# 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.0.8/configure-wchart.patch b/recipes/mozilla/firefox-3.0.8/configure-wchart.patch deleted file mode 100644 index 36ee2a0ba4..0000000000 --- a/recipes/mozilla/firefox-3.0.8/configure-wchart.patch +++ /dev/null @@ -1,11 +0,0 @@ ---- 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.0.8/jemalloc-tls.patch b/recipes/mozilla/firefox-3.0.8/jemalloc-tls.patch deleted file mode 100644 index d1d740989e..0000000000 --- a/recipes/mozilla/firefox-3.0.8/jemalloc-tls.patch +++ /dev/null @@ -1,28 +0,0 @@ ---- /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.0.8/jsautocfg-dontoverwrite.patch b/recipes/mozilla/firefox-3.0.8/jsautocfg-dontoverwrite.patch deleted file mode 100644 index 39978cfd11..0000000000 --- a/recipes/mozilla/firefox-3.0.8/jsautocfg-dontoverwrite.patch +++ /dev/null @@ -1,23 +0,0 @@ ---- mozilla/js/src/Makefile.in.orig 2006-12-12 11:46:02.000000000 +0000 -+++ mozilla/js/src/Makefile.in 2006-12-12 11:46:27.000000000 +0000 -@@ -319,20 +319,8 @@ - - jsopcode.h jsopcode.c: jsopcode.tbl - --ifeq (,$(CROSS_COMPILE)$(filter-out WINNT,$(OS_ARCH))) - jsautocfg.h: - touch $@ --else --ifeq ($(OS_ARCH),WINCE) --jsautocfg.h: -- touch $@ --else --jsautocfg.h: jscpucfg$(HOST_BIN_SUFFIX) -- @rm -f $@ jsautocfg.tmp -- ./jscpucfg > jsautocfg.tmp -- mv jsautocfg.tmp $@ --endif --endif - - # jscpucfg is a strange target - # Needs to be built with the host compiler but needs to include diff --git a/recipes/mozilla/firefox-3.0.8/linkage-problem.patch b/recipes/mozilla/firefox-3.0.8/linkage-problem.patch deleted file mode 100644 index 28bffd1e22..0000000000 --- a/recipes/mozilla/firefox-3.0.8/linkage-problem.patch +++ /dev/null @@ -1,14 +0,0 @@ ---- 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.0.8/mozconfig b/recipes/mozilla/firefox-3.0.8/mozconfig deleted file mode 100644 index d8d3f3923d..0000000000 --- a/recipes/mozilla/firefox-3.0.8/mozconfig +++ /dev/null @@ -1,72 +0,0 @@ -. $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 --disable-necko-disk-cache -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.0.8/security-cross.patch b/recipes/mozilla/firefox-3.0.8/security-cross.patch deleted file mode 100644 index e1c988d7e6..0000000000 --- a/recipes/mozilla/firefox-3.0.8/security-cross.patch +++ /dev/null @@ -1,98 +0,0 @@ ---- mozilla/security/coreconf/Linux.mk.orig 2006-12-12 10:53:12.000000000 +0000 -+++ mozilla/security/coreconf/Linux.mk 2006-12-12 10:54:13.000000000 +0000 -@@ -52,93 +52,8 @@ - - DEFAULT_COMPILER = gcc - --ifeq ($(OS_TEST),m68k) -- OS_REL_CFLAGS = -DLINUX1_2 -D_XOPEN_SOURCE -- CPU_ARCH = m68k --else --ifeq ($(OS_TEST),ppc64) -- OS_REL_CFLAGS = -DLINUX1_2 -D_XOPEN_SOURCE -- CPU_ARCH = ppc --ifeq ($(USE_64),1) -- ARCHFLAG = -m64 --endif --else --ifeq ($(OS_TEST),ppc) -- OS_REL_CFLAGS = -DLINUX1_2 -D_XOPEN_SOURCE -- CPU_ARCH = ppc --else --ifeq ($(OS_TEST),alpha) -- OS_REL_CFLAGS = -D_ALPHA_ -DLINUX1_2 -D_XOPEN_SOURCE -- CPU_ARCH = alpha --else --ifeq ($(OS_TEST),ia64) -- OS_REL_CFLAGS = -DLINUX1_2 -D_XOPEN_SOURCE -- CPU_ARCH = ia64 --else --ifeq ($(OS_TEST),x86_64) --ifeq ($(USE_64),1) -- OS_REL_CFLAGS = -DLINUX1_2 -D_XOPEN_SOURCE -- CPU_ARCH = x86_64 --else -- OS_REL_CFLAGS = -DLINUX1_2 -Di386 -D_XOPEN_SOURCE -- CPU_ARCH = x86 -- ARCHFLAG = -m32 --endif --else --ifeq ($(OS_TEST),sparc) -- OS_REL_CFLAGS = -DLINUX1_2 -D_XOPEN_SOURCE -- CPU_ARCH = sparc --else --ifeq ($(OS_TEST),sparc64) -- OS_REL_CFLAGS = -DLINUX1_2 -D_XOPEN_SOURCE -- CPU_ARCH = sparc --else --ifeq (,$(filter-out arm% sa110,$(OS_TEST))) -- OS_REL_CFLAGS = -DLINUX1_2 -D_XOPEN_SOURCE -- CPU_ARCH = arm --else --ifeq ($(OS_TEST),parisc) -- OS_REL_CFLAGS = -DLINUX1_2 -D_XOPEN_SOURCE -- CPU_ARCH = hppa --else --ifeq ($(OS_TEST),parisc64) -- OS_REL_CFLAGS = -DLINUX1_2 -D_XOPEN_SOURCE -- CPU_ARCH = hppa --else --ifeq ($(OS_TEST),s390) -- OS_REL_CFLAGS = -DLINUX1_2 -D_XOPEN_SOURCE -- CPU_ARCH = s390 --else --ifeq ($(OS_TEST),s390x) -- OS_REL_CFLAGS = -DLINUX1_2 -D_XOPEN_SOURCE -- CPU_ARCH = s390x --else --ifeq ($(OS_TEST),mips) -- OS_REL_CFLAGS = -DLINUX1_2 -D_XOPEN_SOURCE -- CPU_ARCH = mips --else --ifeq (,$(filter-out i%86,$(OS_TEST))) -- OS_REL_CFLAGS = -DLINUX1_2 -Di386 -D_XOPEN_SOURCE -- CPU_ARCH = x86 --else -- OS_REL_CFLAGS = -DLINUX1_2 -D_XOPEN_SOURCE -- CPU_ARCH = $(OS_TEST) --endif --endif --endif --endif --endif --endif --endif --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-3.5.2/0002-Fix-security-cross-compile-cpu-detection-error.patch b/recipes/mozilla/firefox-3.5.2/0002-Fix-security-cross-compile-cpu-detection-error.patch deleted file mode 100644 index ce8d4d9948..0000000000 --- a/recipes/mozilla/firefox-3.5.2/0002-Fix-security-cross-compile-cpu-detection-error.patch +++ /dev/null @@ -1,42 +0,0 @@ -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.5.2/010_FPU_IS_ARM_FPA_xslt.diff b/recipes/mozilla/firefox-3.5.2/010_FPU_IS_ARM_FPA_xslt.diff deleted file mode 100644 index 854100c4c3..0000000000 --- a/recipes/mozilla/firefox-3.5.2/010_FPU_IS_ARM_FPA_xslt.diff +++ /dev/null @@ -1,56 +0,0 @@ -# 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.5.2/Bug339782.additional.fix.diff b/recipes/mozilla/firefox-3.5.2/Bug339782.additional.fix.diff deleted file mode 100644 index 0848e730d3..0000000000 --- a/recipes/mozilla/firefox-3.5.2/Bug339782.additional.fix.diff +++ /dev/null @@ -1,39 +0,0 @@ -# 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.5.2/Bug385583.nspr.jmp_buf.eabi.diff b/recipes/mozilla/firefox-3.5.2/Bug385583.nspr.jmp_buf.eabi.diff deleted file mode 100644 index 486440c30e..0000000000 --- a/recipes/mozilla/firefox-3.5.2/Bug385583.nspr.jmp_buf.eabi.diff +++ /dev/null @@ -1,33 +0,0 @@ -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.5.2/Bug405992.atomic.nspr.diff b/recipes/mozilla/firefox-3.5.2/Bug405992.atomic.nspr.diff deleted file mode 100644 index f54f916a6a..0000000000 --- a/recipes/mozilla/firefox-3.5.2/Bug405992.atomic.nspr.diff +++ /dev/null @@ -1,48 +0,0 @@ -# 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.5.2/configure-wchart.patch b/recipes/mozilla/firefox-3.5.2/configure-wchart.patch deleted file mode 100644 index 36ee2a0ba4..0000000000 --- a/recipes/mozilla/firefox-3.5.2/configure-wchart.patch +++ /dev/null @@ -1,11 +0,0 @@ ---- 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.5.2/firefox-plugin.pc b/recipes/mozilla/firefox-3.5.2/firefox-plugin.pc deleted file mode 100644 index 611acd5944..0000000000 --- a/recipes/mozilla/firefox-3.5.2/firefox-plugin.pc +++ /dev/null @@ -1,10 +0,0 @@ -prefix=/usr -exec_prefix=/usr -libdir=/usr/lib -includedir=/usr/include/firefox-3.5.2 - -Name: Mozilla Plug-In API -Description: Mozilla Plug-In API -Version: 3.5 -Requires: firefox-xpcom = 3.5 -Cflags: -I${includedir}/java -I${includedir}/plugin diff --git a/recipes/mozilla/firefox-3.5.2/firefox-xpcom.pc b/recipes/mozilla/firefox-3.5.2/firefox-xpcom.pc deleted file mode 100644 index 935d357d84..0000000000 --- a/recipes/mozilla/firefox-3.5.2/firefox-xpcom.pc +++ /dev/null @@ -1,13 +0,0 @@ -prefix=/usr -exec_prefix=/usr -libdir=/usr/lib -includedir=/usr/include -mozdir=${includedir}/firefox-3.5.2 -idldir=${includedir}/firefox-3.5.2 - -Name: XPCOM -Description: The Mozilla Cross Platform Component Library -Version: 3.5 -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.5.2/jemalloc-tls.patch b/recipes/mozilla/firefox-3.5.2/jemalloc-tls.patch deleted file mode 100644 index d1d740989e..0000000000 --- a/recipes/mozilla/firefox-3.5.2/jemalloc-tls.patch +++ /dev/null @@ -1,28 +0,0 @@ ---- /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.5.2/jsautocfg-dontoverwrite.patch b/recipes/mozilla/firefox-3.5.2/jsautocfg-dontoverwrite.patch deleted file mode 100644 index 39978cfd11..0000000000 --- a/recipes/mozilla/firefox-3.5.2/jsautocfg-dontoverwrite.patch +++ /dev/null @@ -1,23 +0,0 @@ ---- mozilla/js/src/Makefile.in.orig 2006-12-12 11:46:02.000000000 +0000 -+++ mozilla/js/src/Makefile.in 2006-12-12 11:46:27.000000000 +0000 -@@ -319,20 +319,8 @@ - - jsopcode.h jsopcode.c: jsopcode.tbl - --ifeq (,$(CROSS_COMPILE)$(filter-out WINNT,$(OS_ARCH))) - jsautocfg.h: - touch $@ --else --ifeq ($(OS_ARCH),WINCE) --jsautocfg.h: -- touch $@ --else --jsautocfg.h: jscpucfg$(HOST_BIN_SUFFIX) -- @rm -f $@ jsautocfg.tmp -- ./jscpucfg > jsautocfg.tmp -- mv jsautocfg.tmp $@ --endif --endif - - # jscpucfg is a strange target - # Needs to be built with the host compiler but needs to include diff --git a/recipes/mozilla/firefox-3.5.2/linkage-problem.patch b/recipes/mozilla/firefox-3.5.2/linkage-problem.patch deleted file mode 100644 index 28bffd1e22..0000000000 --- a/recipes/mozilla/firefox-3.5.2/linkage-problem.patch +++ /dev/null @@ -1,14 +0,0 @@ ---- 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.5.2/mozconfig b/recipes/mozilla/firefox-3.5.2/mozconfig deleted file mode 100644 index 7e2ade0b71..0000000000 --- a/recipes/mozilla/firefox-3.5.2/mozconfig +++ /dev/null @@ -1,73 +0,0 @@ -. $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 --disable-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.5.2/nspr.pc b/recipes/mozilla/firefox-3.5.2/nspr.pc deleted file mode 100644 index ba3d131978..0000000000 --- a/recipes/mozilla/firefox-3.5.2/nspr.pc +++ /dev/null @@ -1,10 +0,0 @@ -prefix=/usr -exec_prefix=/usr -libdir=/usr/lib -includedir=/usr/include/firefox-3.5.2 - -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.5.2/security-cross.patch b/recipes/mozilla/firefox-3.5.2/security-cross.patch deleted file mode 100644 index e1c988d7e6..0000000000 --- a/recipes/mozilla/firefox-3.5.2/security-cross.patch +++ /dev/null @@ -1,98 +0,0 @@ ---- mozilla/security/coreconf/Linux.mk.orig 2006-12-12 10:53:12.000000000 +0000 -+++ mozilla/security/coreconf/Linux.mk 2006-12-12 10:54:13.000000000 +0000 -@@ -52,93 +52,8 @@ - - DEFAULT_COMPILER = gcc - --ifeq ($(OS_TEST),m68k) -- OS_REL_CFLAGS = -DLINUX1_2 -D_XOPEN_SOURCE -- CPU_ARCH = m68k --else --ifeq ($(OS_TEST),ppc64) -- OS_REL_CFLAGS = -DLINUX1_2 -D_XOPEN_SOURCE -- CPU_ARCH = ppc --ifeq ($(USE_64),1) -- ARCHFLAG = -m64 --endif --else --ifeq ($(OS_TEST),ppc) -- OS_REL_CFLAGS = -DLINUX1_2 -D_XOPEN_SOURCE -- CPU_ARCH = ppc --else --ifeq ($(OS_TEST),alpha) -- OS_REL_CFLAGS = -D_ALPHA_ -DLINUX1_2 -D_XOPEN_SOURCE -- CPU_ARCH = alpha --else --ifeq ($(OS_TEST),ia64) -- OS_REL_CFLAGS = -DLINUX1_2 -D_XOPEN_SOURCE -- CPU_ARCH = ia64 --else --ifeq ($(OS_TEST),x86_64) --ifeq ($(USE_64),1) -- OS_REL_CFLAGS = -DLINUX1_2 -D_XOPEN_SOURCE -- CPU_ARCH = x86_64 --else -- OS_REL_CFLAGS = -DLINUX1_2 -Di386 -D_XOPEN_SOURCE -- CPU_ARCH = x86 -- ARCHFLAG = -m32 --endif --else --ifeq ($(OS_TEST),sparc) -- OS_REL_CFLAGS = -DLINUX1_2 -D_XOPEN_SOURCE -- CPU_ARCH = sparc --else --ifeq ($(OS_TEST),sparc64) -- OS_REL_CFLAGS = -DLINUX1_2 -D_XOPEN_SOURCE -- CPU_ARCH = sparc --else --ifeq (,$(filter-out arm% sa110,$(OS_TEST))) -- OS_REL_CFLAGS = -DLINUX1_2 -D_XOPEN_SOURCE -- CPU_ARCH = arm --else --ifeq ($(OS_TEST),parisc) -- OS_REL_CFLAGS = -DLINUX1_2 -D_XOPEN_SOURCE -- CPU_ARCH = hppa --else --ifeq ($(OS_TEST),parisc64) -- OS_REL_CFLAGS = -DLINUX1_2 -D_XOPEN_SOURCE -- CPU_ARCH = hppa --else --ifeq ($(OS_TEST),s390) -- OS_REL_CFLAGS = -DLINUX1_2 -D_XOPEN_SOURCE -- CPU_ARCH = s390 --else --ifeq ($(OS_TEST),s390x) -- OS_REL_CFLAGS = -DLINUX1_2 -D_XOPEN_SOURCE -- CPU_ARCH = s390x --else --ifeq ($(OS_TEST),mips) -- OS_REL_CFLAGS = -DLINUX1_2 -D_XOPEN_SOURCE -- CPU_ARCH = mips --else --ifeq (,$(filter-out i%86,$(OS_TEST))) -- OS_REL_CFLAGS = -DLINUX1_2 -Di386 -D_XOPEN_SOURCE -- CPU_ARCH = x86 --else -- OS_REL_CFLAGS = -DLINUX1_2 -D_XOPEN_SOURCE -- CPU_ARCH = $(OS_TEST) --endif --endif --endif --endif --endif --endif --endif --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-3.5.4/0001-Remove-Werror-from-build.patch b/recipes/mozilla/firefox-3.5.4/0001-Remove-Werror-from-build.patch deleted file mode 100644 index 008dabbe8d..0000000000 --- a/recipes/mozilla/firefox-3.5.4/0001-Remove-Werror-from-build.patch +++ /dev/null @@ -1,43 +0,0 @@ -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.5.4/0002-Fix-security-cross-compile-cpu-detection-error.patch b/recipes/mozilla/firefox-3.5.4/0002-Fix-security-cross-compile-cpu-detection-error.patch deleted file mode 100644 index ce8d4d9948..0000000000 --- a/recipes/mozilla/firefox-3.5.4/0002-Fix-security-cross-compile-cpu-detection-error.patch +++ /dev/null @@ -1,42 +0,0 @@ -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.5.4/010_FPU_IS_ARM_FPA_xslt.diff b/recipes/mozilla/firefox-3.5.4/010_FPU_IS_ARM_FPA_xslt.diff deleted file mode 100644 index 854100c4c3..0000000000 --- a/recipes/mozilla/firefox-3.5.4/010_FPU_IS_ARM_FPA_xslt.diff +++ /dev/null @@ -1,56 +0,0 @@ -# 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.5.4/Bug339782.additional.fix.diff b/recipes/mozilla/firefox-3.5.4/Bug339782.additional.fix.diff deleted file mode 100644 index 0848e730d3..0000000000 --- a/recipes/mozilla/firefox-3.5.4/Bug339782.additional.fix.diff +++ /dev/null @@ -1,39 +0,0 @@ -# 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.5.4/Bug385583.nspr.jmp_buf.eabi.diff b/recipes/mozilla/firefox-3.5.4/Bug385583.nspr.jmp_buf.eabi.diff deleted file mode 100644 index 486440c30e..0000000000 --- a/recipes/mozilla/firefox-3.5.4/Bug385583.nspr.jmp_buf.eabi.diff +++ /dev/null @@ -1,33 +0,0 @@ -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.5.4/Bug405992.atomic.nspr.diff b/recipes/mozilla/firefox-3.5.4/Bug405992.atomic.nspr.diff deleted file mode 100644 index f54f916a6a..0000000000 --- a/recipes/mozilla/firefox-3.5.4/Bug405992.atomic.nspr.diff +++ /dev/null @@ -1,48 +0,0 @@ -# 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.5.4/configure-wchart.patch b/recipes/mozilla/firefox-3.5.4/configure-wchart.patch deleted file mode 100644 index 36ee2a0ba4..0000000000 --- a/recipes/mozilla/firefox-3.5.4/configure-wchart.patch +++ /dev/null @@ -1,11 +0,0 @@ ---- 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.5.4/jemalloc-tls.patch b/recipes/mozilla/firefox-3.5.4/jemalloc-tls.patch deleted file mode 100644 index d1d740989e..0000000000 --- a/recipes/mozilla/firefox-3.5.4/jemalloc-tls.patch +++ /dev/null @@ -1,28 +0,0 @@ ---- /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.5.4/jsautocfg-dontoverwrite.patch b/recipes/mozilla/firefox-3.5.4/jsautocfg-dontoverwrite.patch deleted file mode 100644 index 39978cfd11..0000000000 --- a/recipes/mozilla/firefox-3.5.4/jsautocfg-dontoverwrite.patch +++ /dev/null @@ -1,23 +0,0 @@ ---- mozilla/js/src/Makefile.in.orig 2006-12-12 11:46:02.000000000 +0000 -+++ mozilla/js/src/Makefile.in 2006-12-12 11:46:27.000000000 +0000 -@@ -319,20 +319,8 @@ - - jsopcode.h jsopcode.c: jsopcode.tbl - --ifeq (,$(CROSS_COMPILE)$(filter-out WINNT,$(OS_ARCH))) - jsautocfg.h: - touch $@ --else --ifeq ($(OS_ARCH),WINCE) --jsautocfg.h: -- touch $@ --else --jsautocfg.h: jscpucfg$(HOST_BIN_SUFFIX) -- @rm -f $@ jsautocfg.tmp -- ./jscpucfg > jsautocfg.tmp -- mv jsautocfg.tmp $@ --endif --endif - - # jscpucfg is a strange target - # Needs to be built with the host compiler but needs to include diff --git a/recipes/mozilla/firefox-3.5.4/linkage-problem.patch b/recipes/mozilla/firefox-3.5.4/linkage-problem.patch deleted file mode 100644 index 28bffd1e22..0000000000 --- a/recipes/mozilla/firefox-3.5.4/linkage-problem.patch +++ /dev/null @@ -1,14 +0,0 @@ ---- 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.5.4/mozconfig b/recipes/mozilla/firefox-3.5.4/mozconfig deleted file mode 100644 index 7e2ade0b71..0000000000 --- a/recipes/mozilla/firefox-3.5.4/mozconfig +++ /dev/null @@ -1,73 +0,0 @@ -. $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 --disable-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.5.4/plugins-dir.patch b/recipes/mozilla/firefox-3.5.4/plugins-dir.patch deleted file mode 100644 index 2c8b8e9bd1..0000000000 --- a/recipes/mozilla/firefox-3.5.4/plugins-dir.patch +++ /dev/null @@ -1,16 +0,0 @@ -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.5.4/security-cross.patch b/recipes/mozilla/firefox-3.5.4/security-cross.patch deleted file mode 100644 index b6c32fe52f..0000000000 --- a/recipes/mozilla/firefox-3.5.4/security-cross.patch +++ /dev/null @@ -1,64 +0,0 @@ ---- /tmp/Linux.mk 2009-11-02 10:26:16.000000000 +0100 -+++ mozilla-1.9.1/security/coreconf/Linux.mk 2009-11-02 10:27:04.000000000 +0100 -@@ -52,59 +52,8 @@ - - DEFAULT_COMPILER = gcc - --ifeq ($(OS_TEST),ppc64) -- OS_REL_CFLAGS = -DLINUX1_2 -D_XOPEN_SOURCE -- CPU_ARCH = ppc --ifeq ($(USE_64),1) -- ARCHFLAG = -m64 --endif --else --ifeq ($(OS_TEST),alpha) -- OS_REL_CFLAGS = -D_ALPHA_ -DLINUX1_2 -D_XOPEN_SOURCE -- CPU_ARCH = alpha --else --ifeq ($(OS_TEST),x86_64) --ifeq ($(USE_64),1) -- OS_REL_CFLAGS = -DLINUX1_2 -D_XOPEN_SOURCE -- CPU_ARCH = x86_64 --else -- OS_REL_CFLAGS = -DLINUX1_2 -Di386 -D_XOPEN_SOURCE -- CPU_ARCH = x86 -- ARCHFLAG = -m32 --endif --else --ifeq ($(OS_TEST),sparc64) -- OS_REL_CFLAGS = -DLINUX1_2 -D_XOPEN_SOURCE -- CPU_ARCH = sparc --else --ifeq (,$(filter-out arm% sa110,$(OS_TEST))) -- OS_REL_CFLAGS = -DLINUX1_2 -D_XOPEN_SOURCE -- CPU_ARCH = arm --else --ifeq (,$(filter-out parisc%,$(OS_TEST))) -- OS_REL_CFLAGS = -DLINUX1_2 -D_XOPEN_SOURCE -- CPU_ARCH = hppa --else --ifeq (,$(filter-out i%86,$(OS_TEST))) -- OS_REL_CFLAGS = -DLINUX1_2 -Di386 -D_XOPEN_SOURCE -- CPU_ARCH = x86 --else --ifeq ($(OS_TEST),sh4a) -- OS_REL_CFLAGS = -DLINUX1_2 -D_XOPEN_SOURCE -- CPU_ARCH = sh4 --else --# $(OS_TEST) == m68k, ppc, ia64, sparc, s390, s390x, mips, sh3, sh4 -- OS_REL_CFLAGS = -DLINUX1_2 -D_XOPEN_SOURCE -- 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-3.5.5/0001-Remove-Werror-from-build.patch b/recipes/mozilla/firefox-3.5.5/0001-Remove-Werror-from-build.patch deleted file mode 100644 index 008dabbe8d..0000000000 --- a/recipes/mozilla/firefox-3.5.5/0001-Remove-Werror-from-build.patch +++ /dev/null @@ -1,43 +0,0 @@ -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.5.5/0002-Fix-security-cross-compile-cpu-detection-error.patch b/recipes/mozilla/firefox-3.5.5/0002-Fix-security-cross-compile-cpu-detection-error.patch deleted file mode 100644 index ce8d4d9948..0000000000 --- a/recipes/mozilla/firefox-3.5.5/0002-Fix-security-cross-compile-cpu-detection-error.patch +++ /dev/null @@ -1,42 +0,0 @@ -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.5.5/010_FPU_IS_ARM_FPA_xslt.diff b/recipes/mozilla/firefox-3.5.5/010_FPU_IS_ARM_FPA_xslt.diff deleted file mode 100644 index 854100c4c3..0000000000 --- a/recipes/mozilla/firefox-3.5.5/010_FPU_IS_ARM_FPA_xslt.diff +++ /dev/null @@ -1,56 +0,0 @@ -# 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.5.5/Bug339782.additional.fix.diff b/recipes/mozilla/firefox-3.5.5/Bug339782.additional.fix.diff deleted file mode 100644 index 0848e730d3..0000000000 --- a/recipes/mozilla/firefox-3.5.5/Bug339782.additional.fix.diff +++ /dev/null @@ -1,39 +0,0 @@ -# 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.5.5/Bug385583.nspr.jmp_buf.eabi.diff b/recipes/mozilla/firefox-3.5.5/Bug385583.nspr.jmp_buf.eabi.diff deleted file mode 100644 index 486440c30e..0000000000 --- a/recipes/mozilla/firefox-3.5.5/Bug385583.nspr.jmp_buf.eabi.diff +++ /dev/null @@ -1,33 +0,0 @@ -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.5.5/Bug405992.atomic.nspr.diff b/recipes/mozilla/firefox-3.5.5/Bug405992.atomic.nspr.diff deleted file mode 100644 index f54f916a6a..0000000000 --- a/recipes/mozilla/firefox-3.5.5/Bug405992.atomic.nspr.diff +++ /dev/null @@ -1,48 +0,0 @@ -# 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.5.5/configure-wchart.patch b/recipes/mozilla/firefox-3.5.5/configure-wchart.patch deleted file mode 100644 index 36ee2a0ba4..0000000000 --- a/recipes/mozilla/firefox-3.5.5/configure-wchart.patch +++ /dev/null @@ -1,11 +0,0 @@ ---- 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.5.5/jemalloc-tls.patch b/recipes/mozilla/firefox-3.5.5/jemalloc-tls.patch deleted file mode 100644 index d1d740989e..0000000000 --- a/recipes/mozilla/firefox-3.5.5/jemalloc-tls.patch +++ /dev/null @@ -1,28 +0,0 @@ ---- /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.5.5/jsautocfg-dontoverwrite.patch b/recipes/mozilla/firefox-3.5.5/jsautocfg-dontoverwrite.patch deleted file mode 100644 index 39978cfd11..0000000000 --- a/recipes/mozilla/firefox-3.5.5/jsautocfg-dontoverwrite.patch +++ /dev/null @@ -1,23 +0,0 @@ ---- mozilla/js/src/Makefile.in.orig 2006-12-12 11:46:02.000000000 +0000 -+++ mozilla/js/src/Makefile.in 2006-12-12 11:46:27.000000000 +0000 -@@ -319,20 +319,8 @@ - - jsopcode.h jsopcode.c: jsopcode.tbl - --ifeq (,$(CROSS_COMPILE)$(filter-out WINNT,$(OS_ARCH))) - jsautocfg.h: - touch $@ --else --ifeq ($(OS_ARCH),WINCE) --jsautocfg.h: -- touch $@ --else --jsautocfg.h: jscpucfg$(HOST_BIN_SUFFIX) -- @rm -f $@ jsautocfg.tmp -- ./jscpucfg > jsautocfg.tmp -- mv jsautocfg.tmp $@ --endif --endif - - # jscpucfg is a strange target - # Needs to be built with the host compiler but needs to include diff --git a/recipes/mozilla/firefox-3.5.5/linkage-problem.patch b/recipes/mozilla/firefox-3.5.5/linkage-problem.patch deleted file mode 100644 index 28bffd1e22..0000000000 --- a/recipes/mozilla/firefox-3.5.5/linkage-problem.patch +++ /dev/null @@ -1,14 +0,0 @@ ---- 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.5.5/mozconfig b/recipes/mozilla/firefox-3.5.5/mozconfig deleted file mode 100644 index 7e2ade0b71..0000000000 --- a/recipes/mozilla/firefox-3.5.5/mozconfig +++ /dev/null @@ -1,73 +0,0 @@ -. $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 --disable-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.5.5/plugins-dir.patch b/recipes/mozilla/firefox-3.5.5/plugins-dir.patch deleted file mode 100644 index 2c8b8e9bd1..0000000000 --- a/recipes/mozilla/firefox-3.5.5/plugins-dir.patch +++ /dev/null @@ -1,16 +0,0 @@ -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.5.5/security-cross.patch b/recipes/mozilla/firefox-3.5.5/security-cross.patch deleted file mode 100644 index b6c32fe52f..0000000000 --- a/recipes/mozilla/firefox-3.5.5/security-cross.patch +++ /dev/null @@ -1,64 +0,0 @@ ---- /tmp/Linux.mk 2009-11-02 10:26:16.000000000 +0100 -+++ mozilla-1.9.1/security/coreconf/Linux.mk 2009-11-02 10:27:04.000000000 +0100 -@@ -52,59 +52,8 @@ - - DEFAULT_COMPILER = gcc - --ifeq ($(OS_TEST),ppc64) -- OS_REL_CFLAGS = -DLINUX1_2 -D_XOPEN_SOURCE -- CPU_ARCH = ppc --ifeq ($(USE_64),1) -- ARCHFLAG = -m64 --endif --else --ifeq ($(OS_TEST),alpha) -- OS_REL_CFLAGS = -D_ALPHA_ -DLINUX1_2 -D_XOPEN_SOURCE -- CPU_ARCH = alpha --else --ifeq ($(OS_TEST),x86_64) --ifeq ($(USE_64),1) -- OS_REL_CFLAGS = -DLINUX1_2 -D_XOPEN_SOURCE -- CPU_ARCH = x86_64 --else -- OS_REL_CFLAGS = -DLINUX1_2 -Di386 -D_XOPEN_SOURCE -- CPU_ARCH = x86 -- ARCHFLAG = -m32 --endif --else --ifeq ($(OS_TEST),sparc64) -- OS_REL_CFLAGS = -DLINUX1_2 -D_XOPEN_SOURCE -- CPU_ARCH = sparc --else --ifeq (,$(filter-out arm% sa110,$(OS_TEST))) -- OS_REL_CFLAGS = -DLINUX1_2 -D_XOPEN_SOURCE -- CPU_ARCH = arm --else --ifeq (,$(filter-out parisc%,$(OS_TEST))) -- OS_REL_CFLAGS = -DLINUX1_2 -D_XOPEN_SOURCE -- CPU_ARCH = hppa --else --ifeq (,$(filter-out i%86,$(OS_TEST))) -- OS_REL_CFLAGS = -DLINUX1_2 -Di386 -D_XOPEN_SOURCE -- CPU_ARCH = x86 --else --ifeq ($(OS_TEST),sh4a) -- OS_REL_CFLAGS = -DLINUX1_2 -D_XOPEN_SOURCE -- CPU_ARCH = sh4 --else --# $(OS_TEST) == m68k, ppc, ia64, sparc, s390, s390x, mips, sh3, sh4 -- OS_REL_CFLAGS = -DLINUX1_2 -D_XOPEN_SOURCE -- 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-3.6.2/0001-Remove-Werror-from-build.patch b/recipes/mozilla/firefox-3.6.2/0001-Remove-Werror-from-build.patch deleted file mode 100644 index 008dabbe8d..0000000000 --- a/recipes/mozilla/firefox-3.6.2/0001-Remove-Werror-from-build.patch +++ /dev/null @@ -1,43 +0,0 @@ -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.2/0002-Fix-security-cross-compile-cpu-detection-error.patch b/recipes/mozilla/firefox-3.6.2/0002-Fix-security-cross-compile-cpu-detection-error.patch deleted file mode 100644 index ce8d4d9948..0000000000 --- a/recipes/mozilla/firefox-3.6.2/0002-Fix-security-cross-compile-cpu-detection-error.patch +++ /dev/null @@ -1,42 +0,0 @@ -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.2/010_FPU_IS_ARM_FPA_xslt.diff b/recipes/mozilla/firefox-3.6.2/010_FPU_IS_ARM_FPA_xslt.diff deleted file mode 100644 index 854100c4c3..0000000000 --- a/recipes/mozilla/firefox-3.6.2/010_FPU_IS_ARM_FPA_xslt.diff +++ /dev/null @@ -1,56 +0,0 @@ -# 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.2/Bug339782.additional.fix.diff b/recipes/mozilla/firefox-3.6.2/Bug339782.additional.fix.diff deleted file mode 100644 index 0848e730d3..0000000000 --- a/recipes/mozilla/firefox-3.6.2/Bug339782.additional.fix.diff +++ /dev/null @@ -1,39 +0,0 @@ -# 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.2/Bug385583.nspr.jmp_buf.eabi.diff b/recipes/mozilla/firefox-3.6.2/Bug385583.nspr.jmp_buf.eabi.diff deleted file mode 100644 index 486440c30e..0000000000 --- a/recipes/mozilla/firefox-3.6.2/Bug385583.nspr.jmp_buf.eabi.diff +++ /dev/null @@ -1,33 +0,0 @@ -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.2/Bug405992.atomic.nspr.diff b/recipes/mozilla/firefox-3.6.2/Bug405992.atomic.nspr.diff deleted file mode 100644 index f54f916a6a..0000000000 --- a/recipes/mozilla/firefox-3.6.2/Bug405992.atomic.nspr.diff +++ /dev/null @@ -1,48 +0,0 @@ -# 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.2/configure-wchart.patch b/recipes/mozilla/firefox-3.6.2/configure-wchart.patch deleted file mode 100644 index 36ee2a0ba4..0000000000 --- a/recipes/mozilla/firefox-3.6.2/configure-wchart.patch +++ /dev/null @@ -1,11 +0,0 @@ ---- 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.2/jemalloc-tls.patch b/recipes/mozilla/firefox-3.6.2/jemalloc-tls.patch deleted file mode 100644 index d1d740989e..0000000000 --- a/recipes/mozilla/firefox-3.6.2/jemalloc-tls.patch +++ /dev/null @@ -1,28 +0,0 @@ ---- /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.2/linkage-problem.patch b/recipes/mozilla/firefox-3.6.2/linkage-problem.patch deleted file mode 100644 index 28bffd1e22..0000000000 --- a/recipes/mozilla/firefox-3.6.2/linkage-problem.patch +++ /dev/null @@ -1,14 +0,0 @@ ---- 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.2/nspr.pc b/recipes/mozilla/firefox-3.6.2/nspr.pc deleted file mode 100644 index c97c842025..0000000000 --- a/recipes/mozilla/firefox-3.6.2/nspr.pc +++ /dev/null @@ -1,10 +0,0 @@ -prefix=/usr -exec_prefix=/usr -libdir=/usr/lib -includedir=/usr/include/firefox-3.6.2 - -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.2/plugins-dir.patch b/recipes/mozilla/firefox-3.6.2/plugins-dir.patch deleted file mode 100644 index 2c8b8e9bd1..0000000000 --- a/recipes/mozilla/firefox-3.6.2/plugins-dir.patch +++ /dev/null @@ -1,16 +0,0 @@ -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/0001-Remove-Werror-from-build.patch b/recipes/mozilla/firefox-3.6.3/0001-Remove-Werror-from-build.patch deleted file mode 100644 index 008dabbe8d..0000000000 --- a/recipes/mozilla/firefox-3.6.3/0001-Remove-Werror-from-build.patch +++ /dev/null @@ -1,43 +0,0 @@ -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 deleted file mode 100644 index ce8d4d9948..0000000000 --- a/recipes/mozilla/firefox-3.6.3/0002-Fix-security-cross-compile-cpu-detection-error.patch +++ /dev/null @@ -1,42 +0,0 @@ -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 deleted file mode 100644 index 854100c4c3..0000000000 --- a/recipes/mozilla/firefox-3.6.3/010_FPU_IS_ARM_FPA_xslt.diff +++ /dev/null @@ -1,56 +0,0 @@ -# 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 deleted file mode 100644 index 0848e730d3..0000000000 --- a/recipes/mozilla/firefox-3.6.3/Bug339782.additional.fix.diff +++ /dev/null @@ -1,39 +0,0 @@ -# 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 deleted file mode 100644 index 486440c30e..0000000000 --- a/recipes/mozilla/firefox-3.6.3/Bug385583.nspr.jmp_buf.eabi.diff +++ /dev/null @@ -1,33 +0,0 @@ -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 deleted file mode 100644 index f54f916a6a..0000000000 --- a/recipes/mozilla/firefox-3.6.3/Bug405992.atomic.nspr.diff +++ /dev/null @@ -1,48 +0,0 @@ -# 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 deleted file mode 100644 index 36ee2a0ba4..0000000000 --- a/recipes/mozilla/firefox-3.6.3/configure-wchart.patch +++ /dev/null @@ -1,11 +0,0 @@ ---- 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 deleted file mode 100644 index c9c1ce8d9c..0000000000 --- a/recipes/mozilla/firefox-3.6.3/firefox-plugin.pc +++ /dev/null @@ -1,10 +0,0 @@ -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 deleted file mode 100644 index a0edec60de..0000000000 --- a/recipes/mozilla/firefox-3.6.3/firefox-xpcom.pc +++ /dev/null @@ -1,13 +0,0 @@ -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 deleted file mode 100644 index d1d740989e..0000000000 --- a/recipes/mozilla/firefox-3.6.3/jemalloc-tls.patch +++ /dev/null @@ -1,28 +0,0 @@ ---- /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 deleted file mode 100644 index 28bffd1e22..0000000000 --- a/recipes/mozilla/firefox-3.6.3/linkage-problem.patch +++ /dev/null @@ -1,14 +0,0 @@ ---- 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 deleted file mode 100644 index 883a396e53..0000000000 --- a/recipes/mozilla/firefox-3.6.3/mozconfig +++ /dev/null @@ -1,73 +0,0 @@ -. $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/plugins-dir.patch b/recipes/mozilla/firefox-3.6.3/plugins-dir.patch deleted file mode 100644 index 2c8b8e9bd1..0000000000 --- a/recipes/mozilla/firefox-3.6.3/plugins-dir.patch +++ /dev/null @@ -1,16 +0,0 @@ -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 deleted file mode 100644 index cfe57b28f0..0000000000 --- a/recipes/mozilla/firefox-3.6.3/security-cross.patch +++ /dev/null @@ -1,57 +0,0 @@ ---- /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-3.5.2/0001-Remove-Werror-from-build.patch b/recipes/mozilla/firefox-3.6.6/0001-Remove-Werror-from-build.patch index 008dabbe8d..008dabbe8d 100644 --- a/recipes/mozilla/firefox-3.5.2/0001-Remove-Werror-from-build.patch +++ b/recipes/mozilla/firefox-3.6.6/0001-Remove-Werror-from-build.patch diff --git a/recipes/mozilla/firefox-3.0.1/0002-Fix-security-cross-compile-cpu-detection-error.patch b/recipes/mozilla/firefox-3.6.6/0002-Fix-security-cross-compile-cpu-detection-error.patch index ce8d4d9948..ce8d4d9948 100644 --- a/recipes/mozilla/firefox-3.0.1/0002-Fix-security-cross-compile-cpu-detection-error.patch +++ b/recipes/mozilla/firefox-3.6.6/0002-Fix-security-cross-compile-cpu-detection-error.patch diff --git a/recipes/mozilla/firefox-3.0.1/010_FPU_IS_ARM_FPA_xslt.diff b/recipes/mozilla/firefox-3.6.6/010_FPU_IS_ARM_FPA_xslt.diff index 854100c4c3..854100c4c3 100644 --- a/recipes/mozilla/firefox-3.0.1/010_FPU_IS_ARM_FPA_xslt.diff +++ b/recipes/mozilla/firefox-3.6.6/010_FPU_IS_ARM_FPA_xslt.diff diff --git a/recipes/mozilla/firefox-3.0.1/Bug339782.additional.fix.diff b/recipes/mozilla/firefox-3.6.6/Bug339782.additional.fix.diff index 0848e730d3..0848e730d3 100644 --- a/recipes/mozilla/firefox-3.0.1/Bug339782.additional.fix.diff +++ b/recipes/mozilla/firefox-3.6.6/Bug339782.additional.fix.diff diff --git a/recipes/mozilla/firefox-3.0.1/Bug385583.nspr.jmp_buf.eabi.diff b/recipes/mozilla/firefox-3.6.6/Bug385583.nspr.jmp_buf.eabi.diff index 486440c30e..486440c30e 100644 --- a/recipes/mozilla/firefox-3.0.1/Bug385583.nspr.jmp_buf.eabi.diff +++ b/recipes/mozilla/firefox-3.6.6/Bug385583.nspr.jmp_buf.eabi.diff diff --git a/recipes/mozilla/firefox-3.0.1/Bug405992.atomic.nspr.diff b/recipes/mozilla/firefox-3.6.6/Bug405992.atomic.nspr.diff index f54f916a6a..f54f916a6a 100644 --- a/recipes/mozilla/firefox-3.0.1/Bug405992.atomic.nspr.diff +++ b/recipes/mozilla/firefox-3.6.6/Bug405992.atomic.nspr.diff diff --git a/recipes/mozilla/firefox-3.0.1/configure-wchart.patch b/recipes/mozilla/firefox-3.6.6/configure-wchart.patch index 36ee2a0ba4..36ee2a0ba4 100644 --- a/recipes/mozilla/firefox-3.0.1/configure-wchart.patch +++ b/recipes/mozilla/firefox-3.6.6/configure-wchart.patch diff --git a/recipes/mozilla/firefox-3.6.2/firefox-plugin.pc b/recipes/mozilla/firefox-3.6.6/firefox-plugin.pc index ecc8262d7e..b51dd2c74b 100644 --- a/recipes/mozilla/firefox-3.6.2/firefox-plugin.pc +++ b/recipes/mozilla/firefox-3.6.6/firefox-plugin.pc @@ -1,10 +1,10 @@ prefix=/usr exec_prefix=/usr libdir=/usr/lib -includedir=/usr/include/firefox-3.6.2 +includedir=/usr/include/firefox-3.6.6 Name: Mozilla Plug-In API Description: Mozilla Plug-In API Version: 3.6 -Requires: firefox-xpcom = 3.6.2 +Requires: firefox-xpcom = 3.6.6 Cflags: -I${includedir}/java -I${includedir}/plugin diff --git a/recipes/mozilla/firefox-3.6.2/firefox-xpcom.pc b/recipes/mozilla/firefox-3.6.6/firefox-xpcom.pc index 1c2de33620..3e622dc3fb 100644 --- a/recipes/mozilla/firefox-3.6.2/firefox-xpcom.pc +++ b/recipes/mozilla/firefox-3.6.6/firefox-xpcom.pc @@ -2,12 +2,12 @@ prefix=/usr exec_prefix=/usr libdir=/usr/lib includedir=/usr/include -mozdir=${includedir}/firefox-3.6.2 -idldir=${includedir}/firefox-3.6.2 +mozdir=${includedir}/firefox-3.6.6 +idldir=${includedir}/firefox-3.6.6 Name: XPCOM Description: The Mozilla Cross Platform Component Library -Version: 3.6.2 +Version: 3.6.6 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.0.1/jemalloc-tls.patch b/recipes/mozilla/firefox-3.6.6/jemalloc-tls.patch index d1d740989e..d1d740989e 100644 --- a/recipes/mozilla/firefox-3.0.1/jemalloc-tls.patch +++ b/recipes/mozilla/firefox-3.6.6/jemalloc-tls.patch diff --git a/recipes/mozilla/firefox-2.0.0.3/linkage-problem.patch b/recipes/mozilla/firefox-3.6.6/linkage-problem.patch index 28bffd1e22..28bffd1e22 100644 --- a/recipes/mozilla/firefox-2.0.0.3/linkage-problem.patch +++ b/recipes/mozilla/firefox-3.6.6/linkage-problem.patch diff --git a/recipes/mozilla/firefox-3.6.2/mozconfig b/recipes/mozilla/firefox-3.6.6/mozconfig index 883a396e53..883a396e53 100644 --- a/recipes/mozilla/firefox-3.6.2/mozconfig +++ b/recipes/mozilla/firefox-3.6.6/mozconfig diff --git a/recipes/mozilla/firefox-3.6.3/nspr.pc b/recipes/mozilla/firefox-3.6.6/nspr.pc index 6e4499235f..d058a1c33a 100644 --- a/recipes/mozilla/firefox-3.6.3/nspr.pc +++ b/recipes/mozilla/firefox-3.6.6/nspr.pc @@ -1,7 +1,7 @@ prefix=/usr exec_prefix=/usr libdir=/usr/lib -includedir=/usr/include/firefox-3.6.3 +includedir=/usr/include/firefox-3.6.6 Name: NSPR Description: The Netscape Portable Runtime diff --git a/recipes/mozilla/firefox-3.5.2/plugins-dir.patch b/recipes/mozilla/firefox-3.6.6/plugins-dir.patch index 2c8b8e9bd1..2c8b8e9bd1 100644 --- a/recipes/mozilla/firefox-3.5.2/plugins-dir.patch +++ b/recipes/mozilla/firefox-3.6.6/plugins-dir.patch diff --git a/recipes/mozilla/firefox-3.6.2/security-cross.patch b/recipes/mozilla/firefox-3.6.6/security-cross.patch index cfe57b28f0..cfe57b28f0 100644 --- a/recipes/mozilla/firefox-3.6.2/security-cross.patch +++ b/recipes/mozilla/firefox-3.6.6/security-cross.patch diff --git a/recipes/mozilla/firefox-3.6/0001-Remove-Werror-from-build.patch b/recipes/mozilla/firefox-3.6/0001-Remove-Werror-from-build.patch deleted file mode 100644 index 008dabbe8d..0000000000 --- a/recipes/mozilla/firefox-3.6/0001-Remove-Werror-from-build.patch +++ /dev/null @@ -1,43 +0,0 @@ -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/0002-Fix-security-cross-compile-cpu-detection-error.patch b/recipes/mozilla/firefox-3.6/0002-Fix-security-cross-compile-cpu-detection-error.patch deleted file mode 100644 index ce8d4d9948..0000000000 --- a/recipes/mozilla/firefox-3.6/0002-Fix-security-cross-compile-cpu-detection-error.patch +++ /dev/null @@ -1,42 +0,0 @@ -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/010_FPU_IS_ARM_FPA_xslt.diff b/recipes/mozilla/firefox-3.6/010_FPU_IS_ARM_FPA_xslt.diff deleted file mode 100644 index 854100c4c3..0000000000 --- a/recipes/mozilla/firefox-3.6/010_FPU_IS_ARM_FPA_xslt.diff +++ /dev/null @@ -1,56 +0,0 @@ -# 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/Bug339782.additional.fix.diff b/recipes/mozilla/firefox-3.6/Bug339782.additional.fix.diff deleted file mode 100644 index 0848e730d3..0000000000 --- a/recipes/mozilla/firefox-3.6/Bug339782.additional.fix.diff +++ /dev/null @@ -1,39 +0,0 @@ -# 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/Bug385583.nspr.jmp_buf.eabi.diff b/recipes/mozilla/firefox-3.6/Bug385583.nspr.jmp_buf.eabi.diff deleted file mode 100644 index 486440c30e..0000000000 --- a/recipes/mozilla/firefox-3.6/Bug385583.nspr.jmp_buf.eabi.diff +++ /dev/null @@ -1,33 +0,0 @@ -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/Bug405992.atomic.nspr.diff b/recipes/mozilla/firefox-3.6/Bug405992.atomic.nspr.diff deleted file mode 100644 index f54f916a6a..0000000000 --- a/recipes/mozilla/firefox-3.6/Bug405992.atomic.nspr.diff +++ /dev/null @@ -1,48 +0,0 @@ -# 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/configure-wchart.patch b/recipes/mozilla/firefox-3.6/configure-wchart.patch deleted file mode 100644 index 36ee2a0ba4..0000000000 --- a/recipes/mozilla/firefox-3.6/configure-wchart.patch +++ /dev/null @@ -1,11 +0,0 @@ ---- 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/firefox-plugin.pc b/recipes/mozilla/firefox-3.6/firefox-plugin.pc deleted file mode 100644 index f6ad141f9f..0000000000 --- a/recipes/mozilla/firefox-3.6/firefox-plugin.pc +++ /dev/null @@ -1,10 +0,0 @@ -prefix=/usr -exec_prefix=/usr -libdir=/usr/lib -includedir=/usr/include/firefox-3.6 - -Name: Mozilla Plug-In API -Description: Mozilla Plug-In API -Version: 3.5 -Requires: firefox-xpcom = 3.6 -Cflags: -I${includedir}/java -I${includedir}/plugin diff --git a/recipes/mozilla/firefox-3.6/firefox-xpcom.pc b/recipes/mozilla/firefox-3.6/firefox-xpcom.pc deleted file mode 100644 index 6eb1289cda..0000000000 --- a/recipes/mozilla/firefox-3.6/firefox-xpcom.pc +++ /dev/null @@ -1,13 +0,0 @@ -prefix=/usr -exec_prefix=/usr -libdir=/usr/lib -includedir=/usr/include -mozdir=${includedir}/firefox-3.6 -idldir=${includedir}/firefox-3.6 - -Name: XPCOM -Description: The Mozilla Cross Platform Component Library -Version: 3.6 -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/jemalloc-tls.patch b/recipes/mozilla/firefox-3.6/jemalloc-tls.patch deleted file mode 100644 index d1d740989e..0000000000 --- a/recipes/mozilla/firefox-3.6/jemalloc-tls.patch +++ /dev/null @@ -1,28 +0,0 @@ ---- /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/linkage-problem.patch b/recipes/mozilla/firefox-3.6/linkage-problem.patch deleted file mode 100644 index 28bffd1e22..0000000000 --- a/recipes/mozilla/firefox-3.6/linkage-problem.patch +++ /dev/null @@ -1,14 +0,0 @@ ---- 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/mozconfig b/recipes/mozilla/firefox-3.6/mozconfig deleted file mode 100644 index 883a396e53..0000000000 --- a/recipes/mozilla/firefox-3.6/mozconfig +++ /dev/null @@ -1,73 +0,0 @@ -. $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/nspr.pc b/recipes/mozilla/firefox-3.6/nspr.pc deleted file mode 100644 index b73ffc04f7..0000000000 --- a/recipes/mozilla/firefox-3.6/nspr.pc +++ /dev/null @@ -1,10 +0,0 @@ -prefix=/usr -exec_prefix=/usr -libdir=/usr/lib -includedir=/usr/include/firefox-3.6 - -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/plugins-dir.patch b/recipes/mozilla/firefox-3.6/plugins-dir.patch deleted file mode 100644 index 2c8b8e9bd1..0000000000 --- a/recipes/mozilla/firefox-3.6/plugins-dir.patch +++ /dev/null @@ -1,16 +0,0 @@ -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/security-cross.patch b/recipes/mozilla/firefox-3.6/security-cross.patch deleted file mode 100644 index b6c32fe52f..0000000000 --- a/recipes/mozilla/firefox-3.6/security-cross.patch +++ /dev/null @@ -1,64 +0,0 @@ ---- /tmp/Linux.mk 2009-11-02 10:26:16.000000000 +0100 -+++ mozilla-1.9.1/security/coreconf/Linux.mk 2009-11-02 10:27:04.000000000 +0100 -@@ -52,59 +52,8 @@ - - DEFAULT_COMPILER = gcc - --ifeq ($(OS_TEST),ppc64) -- OS_REL_CFLAGS = -DLINUX1_2 -D_XOPEN_SOURCE -- CPU_ARCH = ppc --ifeq ($(USE_64),1) -- ARCHFLAG = -m64 --endif --else --ifeq ($(OS_TEST),alpha) -- OS_REL_CFLAGS = -D_ALPHA_ -DLINUX1_2 -D_XOPEN_SOURCE -- CPU_ARCH = alpha --else --ifeq ($(OS_TEST),x86_64) --ifeq ($(USE_64),1) -- OS_REL_CFLAGS = -DLINUX1_2 -D_XOPEN_SOURCE -- CPU_ARCH = x86_64 --else -- OS_REL_CFLAGS = -DLINUX1_2 -Di386 -D_XOPEN_SOURCE -- CPU_ARCH = x86 -- ARCHFLAG = -m32 --endif --else --ifeq ($(OS_TEST),sparc64) -- OS_REL_CFLAGS = -DLINUX1_2 -D_XOPEN_SOURCE -- CPU_ARCH = sparc --else --ifeq (,$(filter-out arm% sa110,$(OS_TEST))) -- OS_REL_CFLAGS = -DLINUX1_2 -D_XOPEN_SOURCE -- CPU_ARCH = arm --else --ifeq (,$(filter-out parisc%,$(OS_TEST))) -- OS_REL_CFLAGS = -DLINUX1_2 -D_XOPEN_SOURCE -- CPU_ARCH = hppa --else --ifeq (,$(filter-out i%86,$(OS_TEST))) -- OS_REL_CFLAGS = -DLINUX1_2 -Di386 -D_XOPEN_SOURCE -- CPU_ARCH = x86 --else --ifeq ($(OS_TEST),sh4a) -- OS_REL_CFLAGS = -DLINUX1_2 -D_XOPEN_SOURCE -- CPU_ARCH = sh4 --else --# $(OS_TEST) == m68k, ppc, ia64, sparc, s390, s390x, mips, sh3, sh4 -- OS_REL_CFLAGS = -DLINUX1_2 -D_XOPEN_SOURCE -- 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-addon.inc b/recipes/mozilla/firefox-addon.inc index fa0eca6d48..a11001856c 100644 --- a/recipes/mozilla/firefox-addon.inc +++ b/recipes/mozilla/firefox-addon.inc @@ -2,7 +2,7 @@ # Released under the MIT license (see packages/COPYING) DEPENDS = "unzip-native" -RDEPENDS = "firefox" +RDEPENDS_${PN} = "firefox" S = "${WORKDIR}" FIREFOX_VERSION = "3.0.4" @@ -11,7 +11,7 @@ do_configure() { unzip -o -q -d xpi *.xpi } -INC_PR = "r1" +INC_PR = "r2" do_install() { cd ${S}/xpi diff --git a/recipes/mozilla/firefox-l10n.inc b/recipes/mozilla/firefox-l10n.inc index 31555e3d0d..4ab8873488 100644 --- a/recipes/mozilla/firefox-l10n.inc +++ b/recipes/mozilla/firefox-l10n.inc @@ -12,7 +12,7 @@ def get_language_name(package): return lang DEPENDS = "unzip-native" -RDEPENDS = "firefox" +RDEPENDS_${PN} = "firefox" LANGUAGE = "${@get_language_name('${PN}')}" SRC_URI = "http://releases.mozilla.org/pub/mozilla.org/firefox/releases/${PV}/linux-i686/xpi/${LANGUAGE}.xpi" @@ -22,7 +22,7 @@ do_configure() { unzip -o -q -d ${LANGUAGE} ${LANGUAGE}.xpi } -INC_PR = "r1" +INC_PR = "r2" do_install() { cd ${S}/${LANGUAGE} 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 deleted file mode 100644 index be33d679af..0000000000 --- a/recipes/mozilla/firefox_2.0.0.3.bb +++ /dev/null @@ -1,44 +0,0 @@ -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://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 \ -" - -S = "${WORKDIR}/mozilla" - -DEFAULT_PREFERENCE = "-1" - -inherit mozilla -require firefox.inc - -do_compile_prepend() { - cp ${WORKDIR}/jsautocfg.h ${S}/js/src/ - sed -i "s|CPU_ARCH =|CPU_ARCH = ${TARGET_ARCH}|" security/coreconf/Linux.mk -} - -do_stage() { - install -d ${STAGING_INCDIR}/firefox-${PV} - cd dist/sdk/include - rm -rf obsolete - headers=`find . -name "*.h"` - for f in $headers - do - install -D -m 0644 $f ${STAGING_INCDIR}/firefox-${PV}/ - done - # removes 2 lines that call absent headers - sed -e '178,179d' ${STAGING_INCDIR}/firefox-${PV}/nsIServiceManager.h -} - -SRC_URI[md5sum] = "24398e3d98673a2a92a01a8f771ca12a" -SRC_URI[sha256sum] = "02169e4e7a095c426fd5caf56c6cfc2415f4fe54cef7f4e78556f350e2c94007" diff --git a/recipes/mozilla/firefox_3.0.1.bb b/recipes/mozilla/firefox_3.0.1.bb deleted file mode 100644 index 48013e6249..0000000000 --- a/recipes/mozilla/firefox_3.0.1.bb +++ /dev/null @@ -1,48 +0,0 @@ -DEPENDS += "cairo" -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 \ -" - -S = "${WORKDIR}/mozilla" - -#DEFAULT_PREFERENCE = "-1" - -inherit mozilla -require firefox.inc - -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 -} - -do_stage() { - install -d ${STAGING_INCDIR}/firefox-${PV} - cd dist/sdk/include - rm -rf obsolete - headers=`find . -name "*.h"` - for f in $headers - do - install -D -m 0644 $f ${STAGING_INCDIR}/firefox-${PV}/ - done - # removes 2 lines that call absent headers - sed -e '178,179d' ${STAGING_INCDIR}/firefox-${PV}/nsIServiceManager.h -} - - -SRC_URI[md5sum] = "406d67174f8f74ab154a1b17d0881b27" -SRC_URI[sha256sum] = "e16c9794b624188a85af52a2f61131189f422cb99c7fb9777686741cb330dc33" diff --git a/recipes/mozilla/firefox_3.0.4.bb b/recipes/mozilla/firefox_3.0.4.bb deleted file mode 100644 index 6f1e226088..0000000000 --- a/recipes/mozilla/firefox_3.0.4.bb +++ /dev/null @@ -1,47 +0,0 @@ -DEPENDS += "cairo" -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 \ -" - -S = "${WORKDIR}/mozilla" - -# This is missing the wchart.diff patch and can't be compiled with a recent gcc -DEFAULT_PREFERENCE = "-1" - -inherit mozilla -require firefox.inc - -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 -} - -do_stage() { - install -d ${STAGING_INCDIR}/firefox-${PV} - cd dist/sdk/include - rm -rf obsolete - headers=`find . -name "*.h"` - for f in $headers - do - install -D -m 0644 $f ${STAGING_INCDIR}/firefox-${PV}/ - done - # removes 2 lines that call absent headers - sed -e '178,179d' ${STAGING_INCDIR}/firefox-${PV}/nsIServiceManager.h -} - -SRC_URI[md5sum] = "8a1ac4a5940108a96458c5307a74c98d" -SRC_URI[sha256sum] = "685df7c7f33fc71a8c2d0fb71e190d59e2dd92007c2ace1ad176e655fb3012d7" diff --git a/recipes/mozilla/firefox_3.0.8.bb b/recipes/mozilla/firefox_3.0.8.bb deleted file mode 100644 index 12635287e8..0000000000 --- a/recipes/mozilla/firefox_3.0.8.bb +++ /dev/null @@ -1,47 +0,0 @@ -DEPENDS += "cairo" -PR = "r1" - -# Fails to build with gcc 4.3.x due to wchar problems: -# /OE/angstrom-dev/cross/armv7a/lib/gcc/arm-angstrom-linux-gnueabi/4.3.1/../../../../arm-angstrom-linux-gnueabi/bin/ld: ERROR: mozilla-xremote-client.o: Conflicting definitions of wchar_t -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 \ -" - -S = "${WORKDIR}/mozilla" - -inherit mozilla -require firefox.inc - -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 -} - -do_stage() { - install -d ${STAGING_INCDIR}/firefox-${PV} - cd dist/sdk/include - rm -rf obsolete - headers=`find . -name "*.h"` - for f in $headers - do - install -D -m 0644 $f ${STAGING_INCDIR}/firefox-${PV}/ - done - # removes 2 lines that call absent headers - sed -e '178,179d' ${STAGING_INCDIR}/firefox-${PV}/nsIServiceManager.h -} - -SRC_URI[md5sum] = "5fb6c6f3e973516df83a573348377a2f" -SRC_URI[sha256sum] = "e0c279546d99d3d21c30cdae6649e0d3710a5db44edd1347b4f31e04cb729040" diff --git a/recipes/mozilla/firefox_3.1b1.bb b/recipes/mozilla/firefox_3.1b1.bb deleted file mode 100644 index 113f44e24d..0000000000 --- a/recipes/mozilla/firefox_3.1b1.bb +++ /dev/null @@ -1,49 +0,0 @@ -DEPENDS += "cairo" - -PV = "3.0.1+3.1b1" -MOZPV = "3.1b1" -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 \ -" - -S = "${WORKDIR}/mozilla-central" - -DEFAULT_PREFERENCE = "-1" - -inherit mozilla -require firefox.inc - -FULL_OPTIMIZATION = "-fexpensive-optimizations -fomit-frame-pointer -frename-registers -O2" - -do_configure_prepend() { - sed -i -e s:'head -1':'head -n1':g client.mk - oe_runmake -f client.mk CONFIGURE_ARGS="${EXTRA_OECONF}" configure -} - -do_compile_prepend() { - cp ${WORKDIR}/jsautocfg.h ${S}/js/src/ - sed -i -e "s|CPU_ARCH =|CPU_ARCH = ${TARGET_ARCH}|" \ - -e s:'$(OS_TEST)':${TARGET_ARCH}:g \ - ${S}/security/coreconf/Linux.mk -} - -do_stage() { - install -d ${STAGING_INCDIR}/firefox-${MOZPV} - cd dist/sdk/include - rm -rf obsolete - headers=`find . -name "*.h"` - for f in $headers - do - install -D -m 0644 $f ${STAGING_INCDIR}/firefox-${MOZPV}/ - done - # removes 2 lines that call absent headers - sed -e '178,179d' ${STAGING_INCDIR}/firefox-${MOZPV}/nsIServiceManager.h -} - - -SRC_URI[md5sum] = "d101c02c8ad670eeb2095e449c79c085" -SRC_URI[sha256sum] = "5382518ad10313c4c22fbfd2bf5cbf1a6e88160e7e29ab5dcd07362147d04c8d" diff --git a/recipes/mozilla/firefox_3.1b2.bb b/recipes/mozilla/firefox_3.1b2.bb deleted file mode 100644 index a74e8d2954..0000000000 --- a/recipes/mozilla/firefox_3.1b2.bb +++ /dev/null @@ -1,48 +0,0 @@ -DEPENDS += "cairo" - -PV = "3.0.1+3.1b2" -MOZPV = "3.1b2" -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 \ -" - -S = "${WORKDIR}/mozilla-central" - -DEFAULT_PREFERENCE = "-1" - -inherit mozilla -require firefox.inc - -FULL_OPTIMIZATION = "-fexpensive-optimizations -fomit-frame-pointer -frename-registers -O2" - -do_configure_prepend() { - sed -i -e s:'head -1':'head -n1':g client.mk - oe_runmake -f client.mk CONFIGURE_ARGS="${EXTRA_OECONF}" configure -} - -do_compile_prepend() { - cp ${WORKDIR}/jsautocfg.h ${S}/js/src/ - sed -i -e "s|CPU_ARCH =|CPU_ARCH = ${TARGET_ARCH}|" \ - -e s:'$(OS_TEST)':${TARGET_ARCH}:g \ - ${S}/security/coreconf/Linux.mk -} - -do_stage() { - install -d ${STAGING_INCDIR}/firefox-${MOZPV} - cd dist/sdk/include - rm -rf obsolete - headers=`find . -name "*.h"` - for f in $headers - do - install -D -m 0644 $f ${STAGING_INCDIR}/firefox-${MOZPV}/ - done - # removes 2 lines that call absent headers - sed -e '178,179d' ${STAGING_INCDIR}/firefox-${MOZPV}/nsIServiceManager.h -} - - -SRC_URI[md5sum] = "c315e06cdfe9ee76aa4831ece1ed5df3" -SRC_URI[sha256sum] = "402ca3641f1724f5a4ec1ac3e283cd1334bd85c4b5de7744bd267454ef31259e" diff --git a/recipes/mozilla/firefox_3.5.2.bb b/recipes/mozilla/firefox_3.5.2.bb deleted file mode 100644 index 282148c492..0000000000 --- a/recipes/mozilla/firefox_3.5.2.bb +++ /dev/null @@ -1,76 +0,0 @@ -DEPENDS += "cairo sqlite3 libnotify" - -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://firefox-plugin.pc \ - file://firefox-xpcom.pc \ - file://nspr.pc \ -" - -S = "${WORKDIR}/mozilla-1.9.1" - -inherit mozilla -require firefox.inc - -EXTRA_OECONF += " --enable-official-branding " - - -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 -} - -do_stage() { - install -d ${STAGING_INCDIR}/firefox-${PV} - cd ${S}/dist/sdk/include - cp -a obsolete ${STAGING_INCDIR}/firefox-${PV}/ - rm -rf obsolete - headers=`find . -name "*.h"` - for f in $headers - do - install -D -m 0644 $f ${STAGING_INCDIR}/firefox-${PV}/ - done - cd ${S}/dist/include/plugin - headers=`find . -name "*.h"` - for f in $headers - do - install -D -m 0644 $f ${STAGING_INCDIR}/firefox-${PV}/ - done - cd ${S}/nsprpub/pr/include - headers=`find . -name "*.h"` - for f in $headers - do - install -D -m 0644 $f ${STAGING_INCDIR}/firefox-${PV}/ - done - cd ${S}/xpcom/base - headers=`find . -name "*.idl"` - for f in $headers - do - install -D -m 0644 $f ${STAGING_INCDIR}/firefox-${PV}/ - done - - install -d ${PKG_CONFIG_DIR} - install -m 0644 ${WORKDIR}/firefox-plugin.pc ${PKG_CONFIG_DIR} - install -m 0644 ${WORKDIR}/firefox-xpcom.pc ${PKG_CONFIG_DIR} - install -m 0644 ${WORKDIR}/nspr.pc ${PKG_CONFIG_DIR} - install -m 0755 ${S}/xpcom/typelib/xpidl/host_xpidl ${STAGING_BINDIR_NATIVE}/xpidl - - # removes 2 lines that call absent headers - sed -e '178,179d' ${STAGING_INCDIR}/firefox-${PV}/nsIServiceManager.h -} - -SRC_URI[md5sum] = "136867f95c86f3988b7f825e874b85de" -SRC_URI[sha256sum] = "d68b5988907e06cc37793489589f5545487a9b1bbe6444b7e2e16450bd1cb9ae" diff --git a/recipes/mozilla/firefox_3.5.4.bb b/recipes/mozilla/firefox_3.5.4.bb deleted file mode 100644 index 18e864d984..0000000000 --- a/recipes/mozilla/firefox_3.5.4.bb +++ /dev/null @@ -1,80 +0,0 @@ -DEPENDS += "cairo sqlite3 libnotify" - -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://firefox-plugin.pc \ - file://firefox-xpcom.pc \ - file://nspr.pc \ -" - -S = "${WORKDIR}/mozilla-1.9.1" - -inherit mozilla -require firefox.inc - -EXTRA_OECONF += " --enable-official-branding " - - -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 -} - -do_stage() { - install -d ${STAGING_INCDIR}/firefox-${PV} - cd ${S}/dist/sdk/include - cp -a obsolete ${STAGING_INCDIR}/firefox-${PV}/ - rm -rf obsolete - headers=`find . -name "*.h"` - for f in $headers - do - install -D -m 0644 $f ${STAGING_INCDIR}/firefox-${PV}/ - done - cd ${S}/dist/include/plugin - headers=`find . -name "*.h"` - for f in $headers - do - install -D -m 0644 $f ${STAGING_INCDIR}/firefox-${PV}/ - done - cd ${S}/nsprpub/pr/include - headers=`find . -name "*.h"` - for f in $headers - do - install -D -m 0644 $f ${STAGING_INCDIR}/firefox-${PV}/ - done - cd ${S}/xpcom/base - headers=`find . -name "*.idl"` - for f in $headers - do - install -D -m 0644 $f ${STAGING_INCDIR}/firefox-${PV}/ - done - - for pc in ${WORKDIR}/*.pc ; do - sed -i s:3.5.2:${PV}:g $pc - done - - install -d ${PKG_CONFIG_DIR} - install -m 0644 ${WORKDIR}/firefox-plugin.pc ${PKG_CONFIG_DIR} - install -m 0644 ${WORKDIR}/firefox-xpcom.pc ${PKG_CONFIG_DIR} - install -m 0644 ${WORKDIR}/nspr.pc ${PKG_CONFIG_DIR} - install -m 0755 ${S}/xpcom/typelib/xpidl/host_xpidl ${STAGING_BINDIR_NATIVE}/xpidl - - # removes 2 lines that call absent headers - sed -e '178,179d' ${STAGING_INCDIR}/firefox-${PV}/nsIServiceManager.h -} - -SRC_URI[md5sum] = "0b6ccb1e50d96b7127a18a69399fcf05" -SRC_URI[sha256sum] = "b2b0a231aae105090948521a469c5019eb886f0562fa3315a49cebaf74f61be4" diff --git a/recipes/mozilla/firefox_3.5.5.bb b/recipes/mozilla/firefox_3.5.5.bb deleted file mode 100644 index 5de60b9777..0000000000 --- a/recipes/mozilla/firefox_3.5.5.bb +++ /dev/null @@ -1,80 +0,0 @@ -DEPENDS += "cairo sqlite3 libnotify" - -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://firefox-plugin.pc \ - file://firefox-xpcom.pc \ - file://nspr.pc \ -" - -S = "${WORKDIR}/mozilla-1.9.1" - -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 -} - -do_stage() { - install -d ${STAGING_INCDIR}/firefox-${PV} - cd ${S}/dist/sdk/include - cp -a obsolete ${STAGING_INCDIR}/firefox-${PV}/ - rm -rf obsolete - headers=`find . -name "*.h"` - for f in $headers - do - install -D -m 0644 $f ${STAGING_INCDIR}/firefox-${PV}/ - done - cd ${S}/dist/include/plugin - headers=`find . -name "*.h"` - for f in $headers - do - install -D -m 0644 $f ${STAGING_INCDIR}/firefox-${PV}/ - done - cd ${S}/nsprpub/pr/include - headers=`find . -name "*.h"` - for f in $headers - do - install -D -m 0644 $f ${STAGING_INCDIR}/firefox-${PV}/ - done - cd ${S}/xpcom/base - headers=`find . -name "*.idl"` - for f in $headers - do - install -D -m 0644 $f ${STAGING_INCDIR}/firefox-${PV}/ - done - - for pc in ${WORKDIR}/*.pc ; do - sed -i s:3.5.2:${PV}:g $pc - done - - install -d ${PKG_CONFIG_DIR} - install -m 0644 ${WORKDIR}/firefox-plugin.pc ${PKG_CONFIG_DIR} - install -m 0644 ${WORKDIR}/firefox-xpcom.pc ${PKG_CONFIG_DIR} - install -m 0644 ${WORKDIR}/nspr.pc ${PKG_CONFIG_DIR} - install -m 0755 ${S}/xpcom/typelib/xpidl/host_xpidl ${STAGING_BINDIR_NATIVE}/xpidl - - # removes 2 lines that call absent headers - sed -e '178,179d' ${STAGING_INCDIR}/firefox-${PV}/nsIServiceManager.h -} - -SRC_URI[md5sum] = "b3d92dfb40584141dc1068efc9bdfccc" -SRC_URI[sha256sum] = "2abe7b5561267c230df27951d1d8c6c5853d06ca2426997fdf0a63c5db689feb" diff --git a/recipes/mozilla/firefox_3.5b4.bb b/recipes/mozilla/firefox_3.5b4.bb deleted file mode 100644 index e8571cef37..0000000000 --- a/recipes/mozilla/firefox_3.5b4.bb +++ /dev/null @@ -1,48 +0,0 @@ -DEPENDS += "cairo sqlite libnotify" - -PV = "3.0.1+3.5b4" -MOZPV = "3.5b4" -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 \ -" - -S = "${WORKDIR}/mozilla-1.9.1" - -DEFAULT_PREFERENCE = "-10" - -inherit mozilla -require firefox.inc - -FULL_OPTIMIZATION = "-fexpensive-optimizations -fomit-frame-pointer -frename-registers -O2" - -do_configure_prepend() { - sed -i -e s:'head -1':'head -n1':g client.mk - oe_runmake -f client.mk CONFIGURE_ARGS="${EXTRA_OECONF}" configure -} - -do_compile_prepend() { - cp ${WORKDIR}/jsautocfg.h ${S}/js/src/ - sed -i -e "s|CPU_ARCH =|CPU_ARCH = ${TARGET_ARCH}|" \ - -e s:'$(OS_TEST)':${TARGET_ARCH}:g \ - ${S}/security/coreconf/Linux.mk -} - -do_stage() { - install -d ${STAGING_INCDIR}/firefox-${MOZPV} - cd dist/sdk/include - rm -rf obsolete - headers=`find . -name "*.h"` - for f in $headers - do - install -D -m 0644 $f ${STAGING_INCDIR}/firefox-${MOZPV}/ - done - # removes 2 lines that call absent headers - sed -e '178,179d' ${STAGING_INCDIR}/firefox-${MOZPV}/nsIServiceManager.h -} - - -SRC_URI[md5sum] = "ff6bf463300cb56bcf750973b2af3d80" -SRC_URI[sha256sum] = "b653f2fa8dfdd0a54a6b8c576769719cf9014ca6b09f8e9d351721a51766d95d" diff --git a/recipes/mozilla/firefox_3.6.2.bb b/recipes/mozilla/firefox_3.6.2.bb deleted file mode 100644 index 1c975e0baf..0000000000 --- a/recipes/mozilla/firefox_3.6.2.bb +++ /dev/null @@ -1,36 +0,0 @@ -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://firefox-plugin.pc \ - file://firefox-xpcom.pc \ - file://nspr.pc \ -" - -SRC_URI[archive.md5sum] = "a1972a2216ac7139b92b7378a328ec93" -SRC_URI[archive.sha256sum] = "0f8398efabb14da83e14c7fbabdff99a619752cadb43348b27adf302382046f0" - -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.3.bb b/recipes/mozilla/firefox_3.6.6.bb index 49b38ad813..8d01591061 100644 --- a/recipes/mozilla/firefox_3.6.3.bb +++ b/recipes/mozilla/firefox_3.6.6.bb @@ -3,21 +3,21 @@ 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 \ " -SRC_URI[archive.md5sum] = "5e4541ab23084b7b14ba228291ce2688" -SRC_URI[archive.sha256sum] = "35a0b35d79baa502b6c5781ed3e9c4b5eb623bdaf1940460dcf465192848a2d0" +SRC_URI[archive.md5sum] = "c9a071b31bb90d05edfb93117d0a7537" +SRC_URI[archive.sha256sum] = "59b87271f940684f51cdd6becbcfdaf99a5a5880948ba07cefd07474c9ab06b3" S = "${WORKDIR}/mozilla-1.9.2" diff --git a/recipes/mozilla/firefox_3.6.bb b/recipes/mozilla/firefox_3.6.bb deleted file mode 100644 index 573154f3aa..0000000000 --- a/recipes/mozilla/firefox_3.6.bb +++ /dev/null @@ -1,38 +0,0 @@ -DEPENDS += "cairo sqlite3 libnotify" - -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://firefox-plugin.pc \ - file://firefox-xpcom.pc \ - file://nspr.pc \ -" - -SRC_URI[archive.md5sum] = "458051557ff49e6a352c1d56eee5782a" -SRC_URI[archive.sha256sum] = "8d4f12fff7bc361d83e6b486f9ec4264c60114ed86c805e1221b3d30efec0a4b" - -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_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..708acbf91e 100644 --- a/recipes/mozilla/minimo_cvs.bb +++ b/recipes/mozilla/minimo_cvs.bb @@ -4,7 +4,7 @@ LICENSE = "MPL GPL LGPL" HOMEPAGE = "http://www.mozilla.org/projects/minimo/" PRIORITY = "optional" -DEPENDS = "libxrender xt xft fontconfig freetype libidl dbus-glib pango atk gtk+ libidl-native zip-native" +DEPENDS = "libxrender libxt libxft fontconfig freetype libidl dbus-glib pango atk gtk+ libidl-native zip-native" CVSSVR="cvs-mirror.mozilla.org" BRTAG = "MOZILLA_1_8_BRANCH" @@ -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/25_entropy.dpatch b/recipes/mozilla/nss-3.12/25_entropy.dpatch deleted file mode 100644 index 7453929eb0..0000000000 --- a/recipes/mozilla/nss-3.12/25_entropy.dpatch +++ /dev/null @@ -1,16 +0,0 @@ -Index: mozilla/security/nss/lib/freebl/unix_rand.c -=================================================================== ---- mozilla.orig/security/nss/lib/freebl/unix_rand.c 2008-07-23 20:20:15.000000000 +0200 -+++ mozilla/security/nss/lib/freebl/unix_rand.c 2008-07-23 20:20:18.000000000 +0200 -@@ -888,7 +888,11 @@ - /* Fork netstat to collect its output by default. Do not unset this unless - * another source of entropy is available - */ -+#ifndef LINUX - #define DO_NETSTAT 1 -+#else -+#undef DO_NETSTAT -+#endif - - void RNG_SystemInfoForRNG(void) - { diff --git a/recipes/mozilla/nss-3.12/38_mips64_build.dpatch b/recipes/mozilla/nss-3.12/38_mips64_build.dpatch deleted file mode 100644 index 66c0c9576f..0000000000 --- a/recipes/mozilla/nss-3.12/38_mips64_build.dpatch +++ /dev/null @@ -1,22 +0,0 @@ -Index: mozilla/security/coreconf/Linux.mk -=================================================================== ---- mozilla.orig/security/coreconf/Linux.mk 2008-07-23 20:20:14.000000000 +0200 -+++ mozilla/security/coreconf/Linux.mk 2008-07-23 20:20:28.000000000 +0200 -@@ -105,6 +105,9 @@ - OS_REL_CFLAGS = -DLINUX1_2 -D_XOPEN_SOURCE - CPU_ARCH = hppa - else -+ ifeq ($(OS_TEST),mips64) -+ CPU_ARCH = mips -+else - ifeq ($(OS_TEST),s390) - OS_REL_CFLAGS = -DLINUX1_2 -D_XOPEN_SOURCE - CPU_ARCH = s390 -@@ -133,6 +136,7 @@ - endif - endif - endif -+endif - - - LIBC_TAG = _glibc diff --git a/recipes/mozilla/nss-3.12/80_security_build.dpatch b/recipes/mozilla/nss-3.12/80_security_build.dpatch deleted file mode 100644 index 473c2729a8..0000000000 --- a/recipes/mozilla/nss-3.12/80_security_build.dpatch +++ /dev/null @@ -1,11 +0,0 @@ -Index: mozilla/security/nss/cmd/shlibsign/Makefile -=================================================================== ---- mozilla.orig/security/nss/cmd/shlibsign/Makefile 2008-07-23 20:20:14.000000000 +0200 -+++ mozilla/security/nss/cmd/shlibsign/Makefile 2008-07-23 20:20:30.000000000 +0200 -@@ -99,5 +99,5 @@ - $(call core_abspath,$(NSPR_LIB_DIR)) $(call core_abspath,$<) - endif - --libs install :: $(CHECKLOC) -+libs install :: - diff --git a/recipes/mozilla/nss-3.12/80_security_tools.dpatch b/recipes/mozilla/nss-3.12/80_security_tools.dpatch deleted file mode 100644 index f7df38c973..0000000000 --- a/recipes/mozilla/nss-3.12/80_security_tools.dpatch +++ /dev/null @@ -1,31 +0,0 @@ -Index: mozilla/security/coreconf/Linux.mk -=================================================================== ---- mozilla.orig/security/coreconf/Linux.mk 2008-07-23 20:20:28.000000000 +0200 -+++ mozilla/security/coreconf/Linux.mk 2008-07-23 20:20:33.000000000 +0200 -@@ -184,3 +184,6 @@ - # Always set CPU_TAG on Linux, OpenVMS, WINCE. - # - CPU_TAG = _$(CPU_ARCH) -+ -+USE_SYSTEM_ZLIB = 1 -+ZLIB_LIBS = -lz -Index: mozilla/security/nss/cmd/platlibs.mk -=================================================================== ---- mozilla.orig/security/nss/cmd/platlibs.mk 2008-07-23 20:20:13.000000000 +0200 -+++ mozilla/security/nss/cmd/platlibs.mk 2008-07-23 20:20:33.000000000 +0200 -@@ -38,6 +38,7 @@ - # set RPATH-type linker instructions here so they can be used in the shared - # version and in the mixed (static nss libs/shared NSPR libs) version. - -+ifdef ENABLE_RPATH - ifeq ($(OS_ARCH), SunOS) - ifeq ($(BUILD_SUN_PKG), 1) - ifeq ($(USE_64), 1) -@@ -71,6 +72,7 @@ - endif - endif - endif -+endif - - SQLITE=-lsqlite3 - diff --git a/recipes/mozilla/nss-3.12/81_sonames.dpatch b/recipes/mozilla/nss-3.12/81_sonames.dpatch deleted file mode 100644 index 77a72abdb1..0000000000 --- a/recipes/mozilla/nss-3.12/81_sonames.dpatch +++ /dev/null @@ -1,333 +0,0 @@ -Index: mozilla/security/coreconf/BSD_OS.mk -=================================================================== ---- mozilla.orig/security/coreconf/BSD_OS.mk 2008-07-23 20:27:10.000000000 +0200 -+++ mozilla/security/coreconf/BSD_OS.mk 2008-07-23 20:28:04.000000000 +0200 -@@ -73,7 +73,7 @@ - DSO_CFLAGS = -fPIC -DPIC - DSO_LDOPTS = -shared - DSO_LDFLAGS = --DSO_LDOPTS += -Wl,-soname,lib$(LIBRARY_NAME)$(LIBRARY_VERSION).$(DLL_SUFFIX) -+DSO_LDOPTS += -Wl,-soname,$(SONAME) - - ifdef LIBRUNPATH - DSO_LDOPTS += -Wl,-R$(LIBRUNPATH) -Index: mozilla/security/coreconf/BeOS.mk -=================================================================== ---- mozilla.orig/security/coreconf/BeOS.mk 2008-07-23 20:27:10.000000000 +0200 -+++ mozilla/security/coreconf/BeOS.mk 2008-07-23 20:28:04.000000000 +0200 -@@ -59,7 +59,7 @@ - CPU_ARCH = x86 - endif - --MKSHLIB = $(CC) -nostart -Wl,-soname -Wl,$(@:$(OBJDIR)/%.so=%.so) -+MKSHLIB = $(CC) -nostart -Wl,-soname -Wl,$(SONAME) - ifdef BUILD_OPT - OPTIMIZER = -O2 - endif -Index: mozilla/security/coreconf/FreeBSD.mk -=================================================================== ---- mozilla.orig/security/coreconf/FreeBSD.mk 2008-07-23 20:27:10.000000000 +0200 -+++ mozilla/security/coreconf/FreeBSD.mk 2008-07-23 20:28:04.000000000 +0200 -@@ -51,7 +51,7 @@ - OS_CFLAGS = $(DSO_CFLAGS) -ansi -Wall -Wno-switch -DFREEBSD -DHAVE_STRERROR -DHAVE_BSD_FLOCK - - DSO_CFLAGS = -fPIC --DSO_LDOPTS = -shared -Wl,-soname -Wl,$(notdir $@) -+DSO_LDOPTS = -shared -Wl,-soname -Wl,$(SONAME) - - # - # The default implementation strategy for FreeBSD is pthreads. -Index: mozilla/security/coreconf/HP-UX.mk -=================================================================== ---- mozilla.orig/security/coreconf/HP-UX.mk 2008-07-23 20:27:10.000000000 +0200 -+++ mozilla/security/coreconf/HP-UX.mk 2008-07-23 20:28:04.000000000 +0200 -@@ -83,7 +83,7 @@ - PROCESS_MAP_FILE = grep -v ';+' $< | grep -v ';-' | \ - sed -e 's; DATA ;;' -e 's,;;,,' -e 's,;.*,,' -e 's,^,+e ,' > $@ - --DSO_LDOPTS = -b +h $(notdir $@) -+DSO_LDOPTS = -b +h $(SONAME) - ifeq ($(OS_TEST),ia64) - DSO_LDOPTS += +b '$$ORIGIN' - endif -Index: mozilla/security/coreconf/IRIX.mk -=================================================================== ---- mozilla.orig/security/coreconf/IRIX.mk 2008-07-23 20:27:10.000000000 +0200 -+++ mozilla/security/coreconf/IRIX.mk 2008-07-23 20:28:04.000000000 +0200 -@@ -102,7 +102,7 @@ - SHLIB_LD_OPTS += -n32 -mips3 - endif - --MKSHLIB += $(LD) $(SHLIB_LD_OPTS) -shared -soname $(@:$(OBJDIR)/%.so=%.so) -+MKSHLIB += $(LD) $(SHLIB_LD_OPTS) -shared -soname $(SONAME) - ifdef MAPFILE - # Add LD options to restrict exported symbols to those in the map file - endif -Index: mozilla/security/coreconf/Linux.mk -=================================================================== ---- mozilla.orig/security/coreconf/Linux.mk 2008-07-23 20:27:31.000000000 +0200 -+++ mozilla/security/coreconf/Linux.mk 2008-07-23 20:28:04.000000000 +0200 -@@ -143,7 +143,7 @@ - - ifeq ($(OS_RELEASE),2.0) - OS_REL_CFLAGS += -DLINUX2_0 -- MKSHLIB = $(CC) -shared -Wl,-soname -Wl,$(@:$(OBJDIR)/%.so=%.so) -+ MKSHLIB = $(CC) -shared -Wl,-soname -Wl,$(SONAME) - ifdef MAPFILE - MKSHLIB += -Wl,--version-script,$(MAPFILE) - endif -Index: mozilla/security/coreconf/Linux2.1.mk -=================================================================== ---- mozilla.orig/security/coreconf/Linux2.1.mk 2008-07-23 20:27:10.000000000 +0200 -+++ mozilla/security/coreconf/Linux2.1.mk 2008-07-23 20:28:04.000000000 +0200 -@@ -38,7 +38,7 @@ - include $(CORE_DEPTH)/coreconf/Linux.mk - ifeq ($(OS_RELEASE),2.1) - OS_REL_CFLAGS += -DLINUX2_1 -- MKSHLIB = $(CC) $(DSO_LDOPTS) -Wl,-soname -Wl,$(@:$(OBJDIR)/%.so=%.so) -+ MKSHLIB = $(CC) $(DSO_LDOPTS) -Wl,-soname -Wl,$(SONAME) - ifdef MAPFILE - MKSHLIB += -Wl,--version-script,$(MAPFILE) - endif -Index: mozilla/security/coreconf/Linux2.2.mk -=================================================================== ---- mozilla.orig/security/coreconf/Linux2.2.mk 2008-07-23 20:27:10.000000000 +0200 -+++ mozilla/security/coreconf/Linux2.2.mk 2008-07-23 20:28:04.000000000 +0200 -@@ -38,7 +38,7 @@ - include $(CORE_DEPTH)/coreconf/Linux.mk - - OS_REL_CFLAGS += -DLINUX2_1 --MKSHLIB = $(CC) $(DSO_LDOPTS) -Wl,-soname -Wl,$(@:$(OBJDIR)/%.so=%.so) -+MKSHLIB = $(CC) $(DSO_LDOPTS) -Wl,-soname -Wl,$(SONAME) - - ifdef MAPFILE - MKSHLIB += -Wl,--version-script,$(MAPFILE) -Index: mozilla/security/coreconf/Linux2.4.mk -=================================================================== ---- mozilla.orig/security/coreconf/Linux2.4.mk 2008-07-23 20:27:10.000000000 +0200 -+++ mozilla/security/coreconf/Linux2.4.mk 2008-07-23 20:28:04.000000000 +0200 -@@ -38,7 +38,7 @@ - include $(CORE_DEPTH)/coreconf/Linux.mk - - OS_REL_CFLAGS += -DLINUX2_1 --MKSHLIB = $(CC) $(DSO_LDOPTS) -Wl,-soname -Wl,$(@:$(OBJDIR)/%.so=%.so) -+MKSHLIB = $(CC) $(DSO_LDOPTS) -Wl,-soname -Wl,$(SONAME) - - ifdef MAPFILE - MKSHLIB += -Wl,--version-script,$(MAPFILE) -Index: mozilla/security/coreconf/Linux2.5.mk -=================================================================== ---- mozilla.orig/security/coreconf/Linux2.5.mk 2008-07-23 20:27:10.000000000 +0200 -+++ mozilla/security/coreconf/Linux2.5.mk 2008-07-23 20:28:04.000000000 +0200 -@@ -38,7 +38,7 @@ - include $(CORE_DEPTH)/coreconf/Linux.mk - - OS_REL_CFLAGS += -DLINUX2_1 --MKSHLIB = $(CC) $(DSO_LDOPTS) -Wl,-soname -Wl,$(@:$(OBJDIR)/%.so=%.so) -+MKSHLIB = $(CC) $(DSO_LDOPTS) -Wl,-soname -Wl,$(SONAME) - - ifdef MAPFILE - MKSHLIB += -Wl,--version-script,$(MAPFILE) -Index: mozilla/security/coreconf/NetBSD.mk -=================================================================== ---- mozilla.orig/security/coreconf/NetBSD.mk 2008-07-23 20:27:10.000000000 +0200 -+++ mozilla/security/coreconf/NetBSD.mk 2008-07-23 20:28:04.000000000 +0200 -@@ -68,7 +68,7 @@ - DSO_LDOPTS = -shared - DSO_LDFLAGS = - ifeq ($(OBJECT_FMT),ELF) --DSO_LDOPTS += -Wl,-soname,lib$(LIBRARY_NAME)$(LIBRARY_VERSION).$(DLL_SUFFIX) -+DSO_LDOPTS += -Wl,-soname,$(SONAME) - endif - - ifdef LIBRUNPATH -Index: mozilla/security/coreconf/OSF1.mk -=================================================================== ---- mozilla.orig/security/coreconf/OSF1.mk 2008-07-23 20:27:10.000000000 +0200 -+++ mozilla/security/coreconf/OSF1.mk 2008-07-23 20:28:04.000000000 +0200 -@@ -64,7 +64,7 @@ - endif - - # The command to build a shared library on OSF1. --MKSHLIB += ld -shared -expect_unresolved "*" -soname $(notdir $@) -+MKSHLIB += ld -shared -expect_unresolved "*" -soname $(SONAME) - ifdef MAPFILE - MKSHLIB += -hidden -input $(MAPFILE) - endif -Index: mozilla/security/coreconf/OpenBSD.mk -=================================================================== ---- mozilla.orig/security/coreconf/OpenBSD.mk 2008-07-23 20:27:10.000000000 +0200 -+++ mozilla/security/coreconf/OpenBSD.mk 2008-07-23 20:28:04.000000000 +0200 -@@ -65,7 +65,7 @@ - ARCH = openbsd - - DSO_CFLAGS = -fPIC -DPIC --DSO_LDOPTS = -shared -fPIC -Wl,-soname,lib$(LIBRARY_NAME)$(LIBRARY_VERSION).$(DLL_SUFFIX) -+DSO_LDOPTS = -shared -fPIC -Wl,-soname,$(SONAME) - DSO_LDFLAGS = - - MKSHLIB = $(CC) $(DSO_LDOPTS) -Index: mozilla/security/coreconf/QNX.mk -=================================================================== ---- mozilla.orig/security/coreconf/QNX.mk 2008-07-23 20:27:10.000000000 +0200 -+++ mozilla/security/coreconf/QNX.mk 2008-07-23 20:28:04.000000000 +0200 -@@ -54,7 +54,7 @@ - CPU_ARCH = x86 - endif - --MKSHLIB = $(CC) -shared -Wl,-soname -Wl,$(@:$(OBJDIR)/%.so=%.so) -+MKSHLIB = $(CC) -shared -Wl,-soname -Wl,$(SONAME) - ifdef BUILD_OPT - OPTIMIZER = -O2 - endif -Index: mozilla/security/coreconf/ReliantUNIX.mk -=================================================================== ---- mozilla.orig/security/coreconf/ReliantUNIX.mk 2008-07-23 20:27:10.000000000 +0200 -+++ mozilla/security/coreconf/ReliantUNIX.mk 2008-07-23 20:28:04.000000000 +0200 -@@ -51,7 +51,7 @@ - OPTIMIZER += -O6 - endif - MKSHLIB = $(LD) -- MKSHLIB += -G -h $(@:$(OBJDIR)/%.so=%.so) -+ MKSHLIB += -G -h $(SONAME) - DSO_LDOPTS += -G -Xlinker -Blargedynsym - else - ## native compiler (CDS++ 1.0) -Index: mozilla/security/coreconf/SunOS5.mk -=================================================================== ---- mozilla.orig/security/coreconf/SunOS5.mk 2008-07-23 20:27:10.000000000 +0200 -+++ mozilla/security/coreconf/SunOS5.mk 2008-07-23 20:28:04.000000000 +0200 -@@ -143,7 +143,7 @@ - ifeq ($(USE_64), 1) - DSO_LDOPTS += -m64 - endif -- DSO_LDOPTS += -shared -h $(notdir $@) -+ DSO_LDOPTS += -shared -h $(SONAME) - else - ifeq ($(USE_64), 1) - ifeq ($(OS_TEST),i86pc) -@@ -152,7 +152,7 @@ - DSO_LDOPTS +=-xarch=v9 - endif - endif -- DSO_LDOPTS += -G -h $(notdir $@) -+ DSO_LDOPTS += -G -h $(SONAME) - endif - DSO_LDOPTS += -z combreloc -z defs -z ignore - -Index: mozilla/security/coreconf/rules.mk -=================================================================== ---- mozilla.orig/security/coreconf/rules.mk 2008-07-23 20:27:10.000000000 +0200 -+++ mozilla/security/coreconf/rules.mk 2008-07-23 20:28:04.000000000 +0200 -@@ -115,6 +115,7 @@ - $(INSTALL) -m 644 $(SHARED_LIBRARY:$(DLL_SUFFIX)=pdb) $(SOURCE_LIB_DIR) - endif - endif -+ $(call MKSHLINKS,$(SOURCE_LIB_DIR)) - endif - ifdef IMPORT_LIBRARY - $(INSTALL) -m 775 $(IMPORT_LIBRARY) $(SOURCE_LIB_DIR) -@@ -258,6 +259,7 @@ - release_md:: - ifneq ($(MD_LIB_RELEASE_FILES),) - $(INSTALL) -m 444 $(MD_LIB_RELEASE_FILES) $(SOURCE_RELEASE_PREFIX)/$(SOURCE_RELEASE_LIB_DIR) -+ $(call MKSHLINKS,$(SOURCE_RELEASE_PREFIX)/$(SOURCE_RELEASE_LIB_DIR)) - endif - ifneq ($(MD_BIN_RELEASE_FILES),) - $(INSTALL) -m 555 $(MD_BIN_RELEASE_FILES) $(SOURCE_RELEASE_PREFIX)/$(SOURCE_RELEASE_BIN_DIR) -@@ -313,6 +315,8 @@ - endif - endif - -+$(SHARED_LIBRARY_LINKS): %: $(SHARED_LIBRARY) -+ - $(SHARED_LIBRARY): $(OBJS) $(RES) $(MAPFILE) $(SUB_SHLOBJS) - @$(MAKE_OBJDIR) - rm -f $@ -Index: mozilla/security/coreconf/ruleset.mk -=================================================================== ---- mozilla.orig/security/coreconf/ruleset.mk 2008-07-23 20:27:10.000000000 +0200 -+++ mozilla/security/coreconf/ruleset.mk 2008-07-23 20:28:04.000000000 +0200 -@@ -123,6 +123,25 @@ - ifndef SHARED_LIBRARY - SHARED_LIBRARY = $(OBJDIR)/$(DLL_PREFIX)$(LIBRARY_NAME)$(LIBRARY_VERSION)$(JDK_DEBUG_SUFFIX).$(DLL_SUFFIX) - endif -+ SONAME = $(notdir $(SHARED_LIBRARY)) -+ ifdef SO_VERSION -+ ifneq (,$(findstring $(SONAME),$(MKSHLIB))) -+ SO_VERSION_MAJOR := $(shell echo $(SO_VERSION) | sed 's/^\([^.]*\)\(\.[^.]*\)\?\(\.[^.]*\)\?/\1/') -+ SO_VERSION_MINOR := $(shell echo $(SO_VERSION) | sed 's/^\([^.]*\)\(\.[^.]*\)\?\(\.[^.]*\)\?/\2/') -+ SO_VERSION_MICRO := $(shell echo $(SO_VERSION) | sed 's/^\([^.]*\)\(\.[^.]*\)\?\(\.[^.]*\)\?/\3/') -+ -+ SHARED_LIBRARY_LINKS := $(SONAME) -+ ifdef SO_VERSION_MINOR -+ SHARED_LIBRARY_LINKS += $(SONAME).$(SO_VERSION_MAJOR) -+ endif -+ -+ SONAME := $(SONAME).$(SO_VERSION_MAJOR) -+ SHARED_LIBRARY := $(SHARED_LIBRARY).$(SO_VERSION) -+ -+ MKSHLINKS = (cd $(1) && for link in $(SHARED_LIBRARY_LINKS); do rm -f $$link; ln -s $(notdir $(SHARED_LIBRARY)) $$link; done) -+ endif -+ endif -+ - ifndef MAPFILE_SOURCE - MAPFILE_SOURCE = $(LIBRARY_NAME).def - endif -@@ -189,7 +208,7 @@ - endif - - ALL_TRASH = $(TARGETS) $(OBJS) $(OBJDIR) LOGS TAGS $(GARBAGE) \ -- so_locations $(BUILT_SRCS) $(NOSUCHFILE) -+ so_locations $(BUILT_SRCS) $(NOSUCHFILE) $(SHARED_LIBRARY_LINKS) - - ifdef NS_USE_JDK - ALL_TRASH += $(JDK_HEADER_CFILES) $(JDK_STUB_CFILES) \ -Index: mozilla/security/nss/lib/nss/manifest.mn -=================================================================== ---- mozilla.orig/security/nss/lib/nss/manifest.mn 2008-07-23 20:27:09.000000000 +0200 -+++ mozilla/security/nss/lib/nss/manifest.mn 2008-07-23 20:28:04.000000000 +0200 -@@ -58,6 +58,7 @@ - - LIBRARY_NAME = nss - LIBRARY_VERSION = 3 -+SO_VERSION = 1d - - # This part of the code, including all sub-dirs, can be optimized for size - export ALLOW_OPT_CODE_SIZE = 1 -Index: mozilla/security/nss/lib/smime/manifest.mn -=================================================================== ---- mozilla.orig/security/nss/lib/smime/manifest.mn 2008-07-23 20:27:10.000000000 +0200 -+++ mozilla/security/nss/lib/smime/manifest.mn 2008-07-23 20:28:04.000000000 +0200 -@@ -79,6 +79,7 @@ - - LIBRARY_NAME = smime - LIBRARY_VERSION = 3 -+SO_VERSION = 1d - - # This part of the code, including all sub-dirs, can be optimized for size - export ALLOW_OPT_CODE_SIZE = 1 -Index: mozilla/security/nss/lib/ssl/manifest.mn -=================================================================== ---- mozilla.orig/security/nss/lib/ssl/manifest.mn 2008-07-23 20:27:09.000000000 +0200 -+++ mozilla/security/nss/lib/ssl/manifest.mn 2008-07-23 20:28:04.000000000 +0200 -@@ -83,6 +83,7 @@ - - LIBRARY_NAME = ssl - LIBRARY_VERSION = 3 -+SO_VERSION = 1d - - # This part of the code, including all sub-dirs, can be optimized for size - export ALLOW_OPT_CODE_SIZE = 1 -Index: mozilla/security/nss/lib/util/manifest.mn -=================================================================== ---- mozilla.orig/security/nss/lib/util/manifest.mn 2008-07-23 20:27:09.000000000 +0200 -+++ mozilla/security/nss/lib/util/manifest.mn 2008-07-23 20:28:04.000000000 +0200 -@@ -100,6 +100,7 @@ - - LIBRARY_NAME = nssutil - LIBRARY_VERSION = 3 -+SO_VERSION = 1d - - # This part of the code, including all sub-dirs, can be optimized for size - export ALLOW_OPT_CODE_SIZE = 1 diff --git a/recipes/mozilla/nss-3.12/85_security_load.dpatch b/recipes/mozilla/nss-3.12/85_security_load.dpatch deleted file mode 100644 index 8581f9b28f..0000000000 --- a/recipes/mozilla/nss-3.12/85_security_load.dpatch +++ /dev/null @@ -1,57 +0,0 @@ -Index: mozilla/security/nss/lib/freebl/genload.c -=================================================================== ---- mozilla.orig/security/nss/lib/freebl/genload.c 2008-07-23 20:27:21.000000000 +0200 -+++ mozilla/security/nss/lib/freebl/genload.c 2008-07-23 20:28:57.000000000 +0200 -@@ -113,9 +113,14 @@ - - /* Remove the trailing filename from referencePath and add the new one */ - c = strrchr(referencePath, PR_GetDirectorySeparator()); -+ if (!c) { /* referencePath doesn't contain a / means that dladdr gave us argv[0] -+ * and program was called from $PATH. Hack to get libs from /usr/lib */ -+ referencePath = "/usr/lib/"; -+ c = &referencePath[8]; /* last / */ -+ } - if (c) { - size_t referencePathSize = 1 + c - referencePath; -- fullName = (char*) PORT_Alloc(strlen(name) + referencePathSize + 1); -+ fullName = (char*) PORT_Alloc(strlen(name) + referencePathSize + 5); - if (fullName) { - memcpy(fullName, referencePath, referencePathSize); - strcpy(fullName + referencePathSize, name); -@@ -125,7 +130,17 @@ - #endif - libSpec.type = PR_LibSpec_Pathname; - libSpec.value.pathname = fullName; -+ if ((referencePathSize >= 4) && -+ (strncmp(fullName + referencePathSize - 4, "bin", 3) == 0)) { -+ memcpy(fullName + referencePathSize -4, "lib", 3); -+ } -+ strcpy(fullName + referencePathSize, "nss/"); -+ strcpy(fullName + referencePathSize + 4, name); - dlh = PR_LoadLibraryWithFlags(libSpec, PR_LD_NOW | PR_LD_LOCAL); -+ if (! dlh) { -+ strcpy(fullName + referencePathSize, name); -+ dlh = PR_LoadLibraryWithFlags(libSpec, PR_LD_NOW | PR_LD_LOCAL); -+ } - PORT_Free(fullName); - } - } -Index: mozilla/security/nss/lib/pk11wrap/pk11load.c -=================================================================== ---- mozilla.orig/security/nss/lib/pk11wrap/pk11load.c 2008-07-23 20:27:22.000000000 +0200 -+++ mozilla/security/nss/lib/pk11wrap/pk11load.c 2008-07-23 20:28:57.000000000 +0200 -@@ -331,6 +331,14 @@ - #endif - - if (library == NULL) { -+ full_name = rindex(mod->dllName, PR_GetDirectorySeparator()); -+ if (full_name) -+ full_name++; -+ else -+ full_name = mod->dllName; -+ library = loader_LoadLibrary(full_name); -+ } -+ if (library == NULL) { - return SECFailure; - } - diff --git a/recipes/mozilla/nss-3.12/90_realpath.dpatch b/recipes/mozilla/nss-3.12/90_realpath.dpatch deleted file mode 100644 index 46e12d05b0..0000000000 --- a/recipes/mozilla/nss-3.12/90_realpath.dpatch +++ /dev/null @@ -1,29 +0,0 @@ -Index: mozilla/security/nss/lib/freebl/genload.c -=================================================================== ---- mozilla.orig/security/nss/lib/freebl/genload.c 2008-07-23 20:20:36.000000000 +0200 -+++ mozilla/security/nss/lib/freebl/genload.c 2008-07-23 20:20:39.000000000 +0200 -@@ -62,6 +62,16 @@ - */ - static char* loader_GetOriginalPathname(const char* link) - { -+#ifdef __GLIBC__ -+ char* tmp = realpath(link, NULL); -+ char* resolved; -+ if (! tmp) -+ return NULL; -+ resolved = PR_Malloc(strlen(tmp) + 1); -+ strcpy(resolved, tmp); /* This is necessary because PR_Free might not be using free() */ -+ free(tmp); -+ return resolved; -+#else - char* resolved = NULL; - char* input = NULL; - PRUint32 iterations = 0; -@@ -96,6 +106,7 @@ - input = NULL; - } - return input; -+#endif - } - #endif /* XP_UNIX */ - diff --git a/recipes/mozilla/nss-3.12/91_build_pwdecrypt.dpatch b/recipes/mozilla/nss-3.12/91_build_pwdecrypt.dpatch deleted file mode 100644 index db77140f47..0000000000 --- a/recipes/mozilla/nss-3.12/91_build_pwdecrypt.dpatch +++ /dev/null @@ -1,12 +0,0 @@ -Index: mozilla/security/nss/cmd/manifest.mn -=================================================================== ---- mozilla.orig/security/nss/cmd/manifest.mn 2008-07-23 20:20:10.000000000 +0200 -+++ mozilla/security/nss/cmd/manifest.mn 2008-07-23 20:20:42.000000000 +0200 -@@ -65,6 +65,7 @@ - pk12util \ - pk11mode \ - pp \ -+ pwdecrypt \ - rsaperf \ - sdrtest \ - selfserv \ diff --git a/recipes/mozilla/nss-3.12/95_add_spi+cacert_ca_certs.dpatch b/recipes/mozilla/nss-3.12/95_add_spi+cacert_ca_certs.dpatch deleted file mode 100644 index d299f69ae5..0000000000 --- a/recipes/mozilla/nss-3.12/95_add_spi+cacert_ca_certs.dpatch +++ /dev/null @@ -1,1145 +0,0 @@ -Index: mozilla/security/nss/lib/ckfw/builtins/certdata.c -=================================================================== ---- mozilla.orig/security/nss/lib/ckfw/builtins/certdata.c 2008-07-23 20:20:09.000000000 +0200 -+++ mozilla/security/nss/lib/ckfw/builtins/certdata.c 2008-07-23 20:20:45.000000000 +0200 -@@ -797,6 +797,24 @@ - static const CK_ATTRIBUTE_TYPE nss_builtins_types_247 [] = { - CKA_CLASS, CKA_TOKEN, CKA_PRIVATE, CKA_MODIFIABLE, CKA_LABEL, CKA_CERT_SHA1_HASH, CKA_CERT_MD5_HASH, CKA_ISSUER, CKA_SERIAL_NUMBER, CKA_TRUST_SERVER_AUTH, CKA_TRUST_EMAIL_PROTECTION, CKA_TRUST_CODE_SIGNING, CKA_TRUST_STEP_UP_APPROVED - }; -+static const CK_ATTRIBUTE_TYPE nss_builtins_types_248 [] = { -+ CKA_CLASS, CKA_TOKEN, CKA_PRIVATE, CKA_MODIFIABLE, CKA_LABEL, CKA_CERTIFICATE_TYPE, CKA_SUBJECT, CKA_ID, CKA_ISSUER, CKA_SERIAL_NUMBER, CKA_VALUE -+}; -+static const CK_ATTRIBUTE_TYPE nss_builtins_types_249 [] = { -+ CKA_CLASS, CKA_TOKEN, CKA_PRIVATE, CKA_MODIFIABLE, CKA_LABEL, CKA_CERT_SHA1_HASH, CKA_CERT_MD5_HASH, CKA_ISSUER, CKA_SERIAL_NUMBER, CKA_TRUST_SERVER_AUTH, CKA_TRUST_EMAIL_PROTECTION, CKA_TRUST_CODE_SIGNING, CKA_TRUST_STEP_UP_APPROVED -+}; -+static const CK_ATTRIBUTE_TYPE nss_builtins_types_250 [] = { -+ CKA_CLASS, CKA_TOKEN, CKA_PRIVATE, CKA_MODIFIABLE, CKA_LABEL, CKA_CERTIFICATE_TYPE, CKA_SUBJECT, CKA_ID, CKA_ISSUER, CKA_SERIAL_NUMBER, CKA_VALUE -+}; -+static const CK_ATTRIBUTE_TYPE nss_builtins_types_251 [] = { -+ CKA_CLASS, CKA_TOKEN, CKA_PRIVATE, CKA_MODIFIABLE, CKA_LABEL, CKA_CERT_SHA1_HASH, CKA_CERT_MD5_HASH, CKA_ISSUER, CKA_SERIAL_NUMBER, CKA_TRUST_SERVER_AUTH, CKA_TRUST_EMAIL_PROTECTION, CKA_TRUST_CODE_SIGNING, CKA_TRUST_STEP_UP_APPROVED -+}; -+static const CK_ATTRIBUTE_TYPE nss_builtins_types_252 [] = { -+ CKA_CLASS, CKA_TOKEN, CKA_PRIVATE, CKA_MODIFIABLE, CKA_LABEL, CKA_CERTIFICATE_TYPE, CKA_SUBJECT, CKA_ID, CKA_ISSUER, CKA_SERIAL_NUMBER, CKA_VALUE -+}; -+static const CK_ATTRIBUTE_TYPE nss_builtins_types_253 [] = { -+ CKA_CLASS, CKA_TOKEN, CKA_PRIVATE, CKA_MODIFIABLE, CKA_LABEL, CKA_CERT_SHA1_HASH, CKA_CERT_MD5_HASH, CKA_ISSUER, CKA_SERIAL_NUMBER, CKA_TRUST_SERVER_AUTH, CKA_TRUST_EMAIL_PROTECTION, CKA_TRUST_CODE_SIGNING, CKA_TRUST_STEP_UP_APPROVED -+}; - #ifdef DEBUG - static const NSSItem nss_builtins_items_0 [] = { - { (void *)&cko_data, (PRUint32)sizeof(CK_OBJECT_CLASS) }, -@@ -16725,6 +16743,531 @@ - { (void *)&ckt_netscape_trust_unknown, (PRUint32)sizeof(CK_TRUST) }, - { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) } - }; -+static const NSSItem nss_builtins_items_248 [] = { -+ { (void *)&cko_certificate, (PRUint32)sizeof(CK_OBJECT_CLASS) }, -+ { (void *)&ck_true, (PRUint32)sizeof(CK_BBOOL) }, -+ { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) }, -+ { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) }, -+ { (void *)"CAcert.org Class 1 Root CA", (PRUint32)27 }, -+ { (void *)&ckc_x_509, (PRUint32)sizeof(CK_CERTIFICATE_TYPE) }, -+ { (void *)"\060\171\061\020\060\016\006\003\125\004\012\023\007\122\157\157" -+"\164\040\103\101\061\036\060\034\006\003\125\004\013\023\025\150" -+"\164\164\160\072\057\057\167\167\167\056\143\141\143\145\162\164" -+"\056\157\162\147\061\042\060\040\006\003\125\004\003\023\031\103" -+"\101\040\103\145\162\164\040\123\151\147\156\151\156\147\040\101" -+"\165\164\150\157\162\151\164\171\061\041\060\037\006\011\052\206" -+"\110\206\367\015\001\011\001\026\022\163\165\160\160\157\162\164" -+"\100\143\141\143\145\162\164\056\157\162\147" -+, (PRUint32)123 }, -+ { (void *)"0", (PRUint32)2 }, -+ { (void *)"\060\171\061\020\060\016\006\003\125\004\012\023\007\122\157\157" -+"\164\040\103\101\061\036\060\034\006\003\125\004\013\023\025\150" -+"\164\164\160\072\057\057\167\167\167\056\143\141\143\145\162\164" -+"\056\157\162\147\061\042\060\040\006\003\125\004\003\023\031\103" -+"\101\040\103\145\162\164\040\123\151\147\156\151\156\147\040\101" -+"\165\164\150\157\162\151\164\171\061\041\060\037\006\011\052\206" -+"\110\206\367\015\001\011\001\026\022\163\165\160\160\157\162\164" -+"\100\143\141\143\145\162\164\056\157\162\147" -+, (PRUint32)123 }, -+ { (void *)"\002\001\000" -+, (PRUint32)3 }, -+ { (void *)"\060\202\007\075\060\202\005\045\240\003\002\001\002\002\001\000" -+"\060\015\006\011\052\206\110\206\367\015\001\001\004\005\000\060" -+"\171\061\020\060\016\006\003\125\004\012\023\007\122\157\157\164" -+"\040\103\101\061\036\060\034\006\003\125\004\013\023\025\150\164" -+"\164\160\072\057\057\167\167\167\056\143\141\143\145\162\164\056" -+"\157\162\147\061\042\060\040\006\003\125\004\003\023\031\103\101" -+"\040\103\145\162\164\040\123\151\147\156\151\156\147\040\101\165" -+"\164\150\157\162\151\164\171\061\041\060\037\006\011\052\206\110" -+"\206\367\015\001\011\001\026\022\163\165\160\160\157\162\164\100" -+"\143\141\143\145\162\164\056\157\162\147\060\036\027\015\060\063" -+"\060\063\063\060\061\062\062\071\064\071\132\027\015\063\063\060" -+"\063\062\071\061\062\062\071\064\071\132\060\171\061\020\060\016" -+"\006\003\125\004\012\023\007\122\157\157\164\040\103\101\061\036" -+"\060\034\006\003\125\004\013\023\025\150\164\164\160\072\057\057" -+"\167\167\167\056\143\141\143\145\162\164\056\157\162\147\061\042" -+"\060\040\006\003\125\004\003\023\031\103\101\040\103\145\162\164" -+"\040\123\151\147\156\151\156\147\040\101\165\164\150\157\162\151" -+"\164\171\061\041\060\037\006\011\052\206\110\206\367\015\001\011" -+"\001\026\022\163\165\160\160\157\162\164\100\143\141\143\145\162" -+"\164\056\157\162\147\060\202\002\042\060\015\006\011\052\206\110" -+"\206\367\015\001\001\001\005\000\003\202\002\017\000\060\202\002" -+"\012\002\202\002\001\000\316\042\300\342\106\175\354\066\050\007" -+"\120\226\362\240\063\100\214\113\361\073\146\077\061\345\153\002" -+"\066\333\326\174\366\361\210\217\116\167\066\005\101\225\371\011" -+"\360\022\317\106\206\163\140\267\156\176\350\300\130\144\256\315" -+"\260\255\105\027\014\143\372\147\012\350\326\322\277\076\347\230" -+"\304\360\114\372\340\003\273\065\135\154\041\336\236\040\331\272" -+"\315\146\062\067\162\372\367\010\365\307\315\130\311\216\347\016" -+"\136\352\076\376\034\241\024\012\025\154\206\204\133\144\146\052" -+"\172\251\113\123\171\365\210\242\173\356\057\012\141\053\215\262" -+"\176\115\126\245\023\354\352\332\222\236\254\104\101\036\130\140" -+"\145\005\146\370\300\104\275\313\224\367\102\176\013\367\145\150" -+"\230\121\005\360\363\005\221\004\035\033\027\202\354\310\127\273" -+"\303\153\172\210\361\260\162\314\045\133\040\221\354\026\002\022" -+"\217\062\351\027\030\110\320\307\005\056\002\060\102\270\045\234" -+"\005\153\077\252\072\247\353\123\110\367\350\322\266\007\230\334" -+"\033\306\064\177\177\311\034\202\172\005\130\053\010\133\363\070" -+"\242\253\027\135\146\311\230\327\236\020\213\242\322\335\164\232" -+"\367\161\014\162\140\337\315\157\230\063\235\226\064\166\076\044" -+"\172\222\260\016\225\036\157\346\240\105\070\107\252\327\101\355" -+"\112\267\022\366\327\033\203\212\017\056\330\011\266\131\327\252" -+"\004\377\322\223\175\150\056\335\213\113\253\130\272\057\215\352" -+"\225\247\240\303\124\211\245\373\333\213\121\042\235\262\303\276" -+"\021\276\054\221\206\213\226\170\255\040\323\212\057\032\077\306" -+"\320\121\145\207\041\261\031\001\145\177\105\034\207\365\174\320" -+"\101\114\117\051\230\041\375\063\037\165\014\004\121\372\031\167" -+"\333\324\024\034\356\201\303\035\365\230\267\151\006\221\042\335" -+"\000\120\314\201\061\254\022\007\173\070\332\150\133\346\053\324" -+"\176\311\137\255\350\353\162\114\363\001\345\113\040\277\232\246" -+"\127\312\221\000\001\213\241\165\041\067\265\143\015\147\076\106" -+"\117\160\040\147\316\305\326\131\333\002\340\360\322\313\315\272" -+"\142\267\220\101\350\335\040\344\051\274\144\051\102\310\042\334" -+"\170\232\377\103\354\230\033\011\121\113\132\132\302\161\361\304" -+"\313\163\251\345\241\013\002\003\001\000\001\243\202\001\316\060" -+"\202\001\312\060\035\006\003\125\035\016\004\026\004\024\026\265" -+"\062\033\324\307\363\340\346\216\363\275\322\260\072\356\262\071" -+"\030\321\060\201\243\006\003\125\035\043\004\201\233\060\201\230" -+"\200\024\026\265\062\033\324\307\363\340\346\216\363\275\322\260" -+"\072\356\262\071\030\321\241\175\244\173\060\171\061\020\060\016" -+"\006\003\125\004\012\023\007\122\157\157\164\040\103\101\061\036" -+"\060\034\006\003\125\004\013\023\025\150\164\164\160\072\057\057" -+"\167\167\167\056\143\141\143\145\162\164\056\157\162\147\061\042" -+"\060\040\006\003\125\004\003\023\031\103\101\040\103\145\162\164" -+"\040\123\151\147\156\151\156\147\040\101\165\164\150\157\162\151" -+"\164\171\061\041\060\037\006\011\052\206\110\206\367\015\001\011" -+"\001\026\022\163\165\160\160\157\162\164\100\143\141\143\145\162" -+"\164\056\157\162\147\202\001\000\060\017\006\003\125\035\023\001" -+"\001\377\004\005\060\003\001\001\377\060\062\006\003\125\035\037" -+"\004\053\060\051\060\047\240\045\240\043\206\041\150\164\164\160" -+"\163\072\057\057\167\167\167\056\143\141\143\145\162\164\056\157" -+"\162\147\057\162\145\166\157\153\145\056\143\162\154\060\060\006" -+"\011\140\206\110\001\206\370\102\001\004\004\043\026\041\150\164" -+"\164\160\163\072\057\057\167\167\167\056\143\141\143\145\162\164" -+"\056\157\162\147\057\162\145\166\157\153\145\056\143\162\154\060" -+"\064\006\011\140\206\110\001\206\370\102\001\010\004\047\026\045" -+"\150\164\164\160\072\057\057\167\167\167\056\143\141\143\145\162" -+"\164\056\157\162\147\057\151\156\144\145\170\056\160\150\160\077" -+"\151\144\075\061\060\060\126\006\011\140\206\110\001\206\370\102" -+"\001\015\004\111\026\107\124\157\040\147\145\164\040\171\157\165" -+"\162\040\157\167\156\040\143\145\162\164\151\146\151\143\141\164" -+"\145\040\146\157\162\040\106\122\105\105\040\150\145\141\144\040" -+"\157\166\145\162\040\164\157\040\150\164\164\160\072\057\057\167" -+"\167\167\056\143\141\143\145\162\164\056\157\162\147\060\015\006" -+"\011\052\206\110\206\367\015\001\001\004\005\000\003\202\002\001" -+"\000\050\307\356\234\202\002\272\134\200\022\312\065\012\035\201" -+"\157\211\152\231\314\362\150\017\177\247\341\215\130\225\076\275" -+"\362\006\303\220\132\254\265\140\366\231\103\001\243\210\160\234" -+"\235\142\235\244\207\257\147\130\015\060\066\073\346\255\110\323" -+"\313\164\002\206\161\076\342\053\003\150\361\064\142\100\106\073" -+"\123\352\050\364\254\373\146\225\123\212\115\135\375\073\331\140" -+"\327\312\171\151\073\261\145\222\246\306\201\202\134\234\315\353" -+"\115\001\212\245\337\021\125\252\025\312\037\067\300\202\230\160" -+"\141\333\152\174\226\243\216\056\124\076\117\041\251\220\357\334" -+"\202\277\334\350\105\255\115\220\163\010\074\224\145\260\004\231" -+"\166\177\342\274\302\152\025\252\227\004\067\044\330\036\224\116" -+"\155\016\121\276\326\304\217\312\226\155\367\103\337\350\060\145" -+"\047\073\173\273\103\103\143\304\103\367\262\354\150\314\341\031" -+"\216\042\373\230\341\173\132\076\001\067\073\213\010\260\242\363" -+"\225\116\032\313\233\315\232\261\333\262\160\360\055\112\333\330" -+"\260\343\157\105\110\063\022\377\376\074\062\052\124\367\304\367" -+"\212\360\210\043\302\107\376\144\172\161\300\321\036\246\143\260" -+"\007\176\244\057\323\001\217\334\237\053\266\306\010\251\017\223" -+"\110\045\374\022\375\237\102\334\363\304\076\366\127\260\327\335" -+"\151\321\006\167\064\012\113\322\312\240\377\034\306\214\311\026" -+"\276\304\314\062\067\150\163\137\010\373\121\367\111\123\066\005" -+"\012\225\002\114\362\171\032\020\366\330\072\165\234\363\035\361" -+"\242\015\160\147\206\033\263\026\365\057\345\244\353\171\206\371" -+"\075\013\302\163\013\245\231\254\157\374\147\270\345\057\013\246" -+"\030\044\215\173\321\110\065\051\030\100\254\223\140\341\226\206" -+"\120\264\172\131\330\217\041\013\237\317\202\221\306\073\277\153" -+"\334\007\221\271\227\126\043\252\266\154\224\306\110\006\074\344" -+"\316\116\252\344\366\057\011\334\123\157\056\374\164\353\072\143" -+"\231\302\246\254\211\274\247\262\104\240\015\212\020\343\154\362" -+"\044\313\372\233\237\160\107\056\336\024\213\324\262\040\011\226" -+"\242\144\361\044\034\334\241\065\234\025\262\324\274\125\056\175" -+"\006\365\234\016\125\364\132\326\223\332\166\255\045\163\114\305" -+"\103" -+, (PRUint32)1857 } -+}; -+static const NSSItem nss_builtins_items_249 [] = { -+ { (void *)&cko_netscape_trust, (PRUint32)sizeof(CK_OBJECT_CLASS) }, -+ { (void *)&ck_true, (PRUint32)sizeof(CK_BBOOL) }, -+ { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) }, -+ { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) }, -+ { (void *)"CAcert.org Class 1 Root CA", (PRUint32)27 }, -+ { (void *)"\023\134\354\066\364\234\270\351\073\032\262\160\315\200\210\106" -+"\166\316\217\063" -+, (PRUint32)20 }, -+ { (void *)"\246\033\067\136\071\015\234\066\124\356\275\040\061\106\037\153" -+, (PRUint32)16 }, -+ { (void *)"\060\171\061\020\060\016\006\003\125\004\012\023\007\122\157\157" -+"\164\040\103\101\061\036\060\034\006\003\125\004\013\023\025\150" -+"\164\164\160\072\057\057\167\167\167\056\143\141\143\145\162\164" -+"\056\157\162\147\061\042\060\040\006\003\125\004\003\023\031\103" -+"\101\040\103\145\162\164\040\123\151\147\156\151\156\147\040\101" -+"\165\164\150\157\162\151\164\171\061\041\060\037\006\011\052\206" -+"\110\206\367\015\001\011\001\026\022\163\165\160\160\157\162\164" -+"\100\143\141\143\145\162\164\056\157\162\147" -+, (PRUint32)123 }, -+ { (void *)"\002\001\000" -+, (PRUint32)3 }, -+ { (void *)&ckt_netscape_trusted_delegator, (PRUint32)sizeof(CK_TRUST) }, -+ { (void *)&ckt_netscape_trusted_delegator, (PRUint32)sizeof(CK_TRUST) }, -+ { (void *)&ckt_netscape_trusted_delegator, (PRUint32)sizeof(CK_TRUST) }, -+ { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) } -+}; -+static const NSSItem nss_builtins_items_250 [] = { -+ { (void *)&cko_certificate, (PRUint32)sizeof(CK_OBJECT_CLASS) }, -+ { (void *)&ck_true, (PRUint32)sizeof(CK_BBOOL) }, -+ { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) }, -+ { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) }, -+ { (void *)"CAcert.org Class 3 Root CA", (PRUint32)27 }, -+ { (void *)&ckc_x_509, (PRUint32)sizeof(CK_CERTIFICATE_TYPE) }, -+ { (void *)"\060\124\061\024\060\022\006\003\125\004\012\023\013\103\101\143" -+"\145\162\164\040\111\156\143\056\061\036\060\034\006\003\125\004" -+"\013\023\025\150\164\164\160\072\057\057\167\167\167\056\103\101" -+"\143\145\162\164\056\157\162\147\061\034\060\032\006\003\125\004" -+"\003\023\023\103\101\143\145\162\164\040\103\154\141\163\163\040" -+"\063\040\122\157\157\164" -+, (PRUint32)86 }, -+ { (void *)"0", (PRUint32)2 }, -+ { (void *)"\060\171\061\020\060\016\006\003\125\004\012\023\007\122\157\157" -+"\164\040\103\101\061\036\060\034\006\003\125\004\013\023\025\150" -+"\164\164\160\072\057\057\167\167\167\056\143\141\143\145\162\164" -+"\056\157\162\147\061\042\060\040\006\003\125\004\003\023\031\103" -+"\101\040\103\145\162\164\040\123\151\147\156\151\156\147\040\101" -+"\165\164\150\157\162\151\164\171\061\041\060\037\006\011\052\206" -+"\110\206\367\015\001\011\001\026\022\163\165\160\160\157\162\164" -+"\100\143\141\143\145\162\164\056\157\162\147" -+, (PRUint32)123 }, -+ { (void *)"\002\001\001" -+, (PRUint32)3 }, -+ { (void *)"\060\202\006\010\060\202\003\360\240\003\002\001\002\002\001\001" -+"\060\015\006\011\052\206\110\206\367\015\001\001\004\005\000\060" -+"\171\061\020\060\016\006\003\125\004\012\023\007\122\157\157\164" -+"\040\103\101\061\036\060\034\006\003\125\004\013\023\025\150\164" -+"\164\160\072\057\057\167\167\167\056\143\141\143\145\162\164\056" -+"\157\162\147\061\042\060\040\006\003\125\004\003\023\031\103\101" -+"\040\103\145\162\164\040\123\151\147\156\151\156\147\040\101\165" -+"\164\150\157\162\151\164\171\061\041\060\037\006\011\052\206\110" -+"\206\367\015\001\011\001\026\022\163\165\160\160\157\162\164\100" -+"\143\141\143\145\162\164\056\157\162\147\060\036\027\015\060\065" -+"\061\060\061\064\060\067\063\066\065\065\132\027\015\063\063\060" -+"\063\062\070\060\067\063\066\065\065\132\060\124\061\024\060\022" -+"\006\003\125\004\012\023\013\103\101\143\145\162\164\040\111\156" -+"\143\056\061\036\060\034\006\003\125\004\013\023\025\150\164\164" -+"\160\072\057\057\167\167\167\056\103\101\143\145\162\164\056\157" -+"\162\147\061\034\060\032\006\003\125\004\003\023\023\103\101\143" -+"\145\162\164\040\103\154\141\163\163\040\063\040\122\157\157\164" -+"\060\202\002\042\060\015\006\011\052\206\110\206\367\015\001\001" -+"\001\005\000\003\202\002\017\000\060\202\002\012\002\202\002\001" -+"\000\253\111\065\021\110\174\322\046\176\123\224\317\103\251\335" -+"\050\327\102\052\213\363\207\170\031\130\174\017\236\332\211\175" -+"\341\373\353\162\220\015\164\241\226\144\253\237\240\044\231\163" -+"\332\342\125\166\307\027\173\365\004\254\106\270\303\276\177\144" -+"\215\020\154\044\363\141\234\300\362\220\372\121\346\365\151\001" -+"\143\303\017\126\342\112\102\317\342\104\214\045\050\250\305\171" -+"\011\175\106\271\212\363\351\363\064\051\010\105\344\034\237\313" -+"\224\004\034\201\250\024\263\230\145\304\103\354\116\202\215\011" -+"\321\275\252\133\215\222\320\354\336\220\305\177\012\302\343\353" -+"\346\061\132\136\164\076\227\063\131\350\303\003\075\140\063\277" -+"\367\321\157\107\304\315\356\142\203\122\156\056\010\232\244\331" -+"\025\030\221\246\205\222\107\260\256\110\353\155\267\041\354\205" -+"\032\150\162\065\253\377\360\020\135\300\364\224\247\152\325\073" -+"\222\176\114\220\005\176\223\301\054\213\244\216\142\164\025\161" -+"\156\013\161\003\352\257\025\070\232\324\322\005\162\157\214\371" -+"\053\353\132\162\045\371\071\106\343\162\033\076\004\303\144\047" -+"\042\020\052\212\117\130\247\003\255\276\264\056\023\355\135\252" -+"\110\327\325\175\324\052\173\134\372\106\004\120\344\314\016\102" -+"\133\214\355\333\362\317\374\226\223\340\333\021\066\124\142\064" -+"\070\217\014\140\233\073\227\126\070\255\363\322\133\213\240\133" -+"\352\116\226\270\174\327\325\240\206\160\100\323\221\051\267\242" -+"\074\255\365\214\273\317\032\222\212\344\064\173\300\330\154\137" -+"\351\012\302\303\247\040\232\132\337\054\135\122\134\272\107\325" -+"\233\357\044\050\160\070\040\057\325\177\051\300\262\101\003\150" -+"\222\314\340\234\314\227\113\105\357\072\020\012\253\160\072\230" -+"\225\160\255\065\261\352\205\053\244\034\200\041\061\251\256\140" -+"\172\200\046\110\000\270\001\300\223\143\125\042\221\074\126\347" -+"\257\333\072\045\363\217\061\124\352\046\213\201\131\371\241\321" -+"\123\021\305\173\235\003\366\164\021\340\155\261\054\077\054\206" -+"\221\231\161\232\246\167\213\064\140\321\024\264\054\254\235\257" -+"\214\020\323\237\304\152\370\157\023\374\163\131\367\146\102\164" -+"\036\212\343\370\334\322\157\230\234\313\107\230\225\100\005\373" -+"\351\002\003\001\000\001\243\201\277\060\201\274\060\017\006\003" -+"\125\035\023\001\001\377\004\005\060\003\001\001\377\060\135\006" -+"\010\053\006\001\005\005\007\001\001\004\121\060\117\060\043\006" -+"\010\053\006\001\005\005\007\060\001\206\027\150\164\164\160\072" -+"\057\057\157\143\163\160\056\103\101\143\145\162\164\056\157\162" -+"\147\057\060\050\006\010\053\006\001\005\005\007\060\002\206\034" -+"\150\164\164\160\072\057\057\167\167\167\056\103\101\143\145\162" -+"\164\056\157\162\147\057\143\141\056\143\162\164\060\112\006\003" -+"\125\035\040\004\103\060\101\060\077\006\010\053\006\001\004\001" -+"\201\220\112\060\063\060\061\006\010\053\006\001\005\005\007\002" -+"\001\026\045\150\164\164\160\072\057\057\167\167\167\056\103\101" -+"\143\145\162\164\056\157\162\147\057\151\156\144\145\170\056\160" -+"\150\160\077\151\144\075\061\060\060\015\006\011\052\206\110\206" -+"\367\015\001\001\004\005\000\003\202\002\001\000\177\010\210\241" -+"\332\032\120\111\332\211\373\241\010\162\363\212\367\036\304\072" -+"\264\171\133\040\060\261\105\336\302\135\323\145\151\361\302\135" -+"\124\124\074\205\137\271\173\102\221\302\231\375\033\121\233\253" -+"\106\245\241\020\123\236\155\210\254\163\156\054\063\246\360\364" -+"\236\340\165\301\076\210\105\251\341\146\103\376\126\132\321\172" -+"\101\170\367\100\332\112\072\361\013\133\245\273\026\006\346\302" -+"\347\223\271\205\115\227\117\261\036\070\103\200\357\233\015\214" -+"\357\270\247\140\000\207\127\175\036\104\034\313\043\357\233\074" -+"\231\235\257\265\051\034\105\171\026\226\115\047\155\361\034\154" -+"\303\302\125\144\263\274\024\342\363\244\037\036\062\374\047\025" -+"\005\317\335\056\256\076\202\141\173\360\041\020\030\366\104\352" -+"\123\071\371\334\320\232\040\340\306\273\340\273\132\117\304\231" -+"\310\007\275\265\275\242\333\056\142\015\102\064\101\274\377\213" -+"\212\365\121\042\252\210\060\000\342\260\324\274\276\145\272\325" -+"\003\127\171\233\350\334\310\115\370\120\355\221\245\122\050\242" -+"\254\373\066\130\076\351\224\053\221\120\207\033\326\136\326\214" -+"\314\367\017\020\014\122\116\320\026\141\345\345\012\154\277\027" -+"\307\162\106\127\234\230\365\154\140\143\172\157\136\271\116\057" -+"\310\271\271\273\152\205\274\230\015\355\371\076\227\204\064\224" -+"\256\000\257\241\345\347\222\156\116\275\363\342\331\024\213\134" -+"\322\353\001\154\240\027\245\055\020\353\234\172\112\275\275\356" -+"\316\375\355\042\100\253\160\070\210\365\012\207\152\302\253\005" -+"\140\311\110\005\332\123\301\336\104\167\152\263\363\074\074\355" -+"\200\274\246\070\112\051\044\137\376\131\073\233\045\172\126\143" -+"\000\144\271\135\244\142\175\127\066\117\255\203\357\037\222\123" -+"\240\216\167\127\335\345\141\021\075\043\000\220\114\074\372\243" -+"\140\223\004\243\257\065\366\016\152\217\117\112\140\247\205\005" -+"\154\106\241\217\364\307\166\343\241\131\127\367\161\262\304\156" -+"\024\134\155\155\101\146\337\033\223\261\324\000\303\356\313\317" -+"\074\075\041\200\251\137\143\145\374\335\340\137\244\364\053\360" -+"\205\161\101\324\147\045\373\032\261\227\256\326\231\202\023\101" -+"\322\156\245\033\231\047\200\347\013\251\250\000" -+, (PRUint32)1548 } -+}; -+static const NSSItem nss_builtins_items_251 [] = { -+ { (void *)&cko_netscape_trust, (PRUint32)sizeof(CK_OBJECT_CLASS) }, -+ { (void *)&ck_true, (PRUint32)sizeof(CK_BBOOL) }, -+ { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) }, -+ { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) }, -+ { (void *)"CAcert.org Class 3 Root CA", (PRUint32)27 }, -+ { (void *)"\333\114\102\151\007\077\351\302\243\175\211\012\134\033\030\304" -+"\030\116\052\055" -+, (PRUint32)20 }, -+ { (void *)"\163\077\065\124\035\104\311\351\132\112\357\121\255\003\006\266" -+, (PRUint32)16 }, -+ { (void *)"\060\171\061\020\060\016\006\003\125\004\012\023\007\122\157\157" -+"\164\040\103\101\061\036\060\034\006\003\125\004\013\023\025\150" -+"\164\164\160\072\057\057\167\167\167\056\143\141\143\145\162\164" -+"\056\157\162\147\061\042\060\040\006\003\125\004\003\023\031\103" -+"\101\040\103\145\162\164\040\123\151\147\156\151\156\147\040\101" -+"\165\164\150\157\162\151\164\171\061\041\060\037\006\011\052\206" -+"\110\206\367\015\001\011\001\026\022\163\165\160\160\157\162\164" -+"\100\143\141\143\145\162\164\056\157\162\147" -+, (PRUint32)123 }, -+ { (void *)"\002\001\001" -+, (PRUint32)3 }, -+ { (void *)&ckt_netscape_trusted_delegator, (PRUint32)sizeof(CK_TRUST) }, -+ { (void *)&ckt_netscape_trusted_delegator, (PRUint32)sizeof(CK_TRUST) }, -+ { (void *)&ckt_netscape_trusted_delegator, (PRUint32)sizeof(CK_TRUST) }, -+ { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) } -+}; -+static const NSSItem nss_builtins_items_252 [] = { -+ { (void *)&cko_certificate, (PRUint32)sizeof(CK_OBJECT_CLASS) }, -+ { (void *)&ck_true, (PRUint32)sizeof(CK_BBOOL) }, -+ { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) }, -+ { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) }, -+ { (void *)"Software in the Public Interest, Inc. Root CA (2008)", (PRUint32)53 }, -+ { (void *)&ckc_x_509, (PRUint32)sizeof(CK_CERTIFICATE_TYPE) }, -+ { (void *)"\060\201\274\061\013\060\011\006\003\125\004\006\023\002\125\123" -+"\061\020\060\016\006\003\125\004\010\023\007\111\156\144\151\141" -+"\156\141\061\025\060\023\006\003\125\004\007\023\014\111\156\144" -+"\151\141\156\141\160\157\154\151\163\061\050\060\046\006\003\125" -+"\004\012\023\037\123\157\146\164\167\141\162\145\040\151\156\040" -+"\164\150\145\040\120\165\142\154\151\143\040\111\156\164\145\162" -+"\145\163\164\061\023\060\021\006\003\125\004\013\023\012\150\157" -+"\163\164\155\141\163\164\145\162\061\036\060\034\006\003\125\004" -+"\003\023\025\103\145\162\164\151\146\151\143\141\164\145\040\101" -+"\165\164\150\157\162\151\164\171\061\045\060\043\006\011\052\206" -+"\110\206\367\015\001\011\001\026\026\150\157\163\164\155\141\163" -+"\164\145\162\100\163\160\151\055\151\156\143\056\157\162\147" -+, (PRUint32)191 }, -+ { (void *)"0", (PRUint32)2 }, -+ { (void *)"\060\201\274\061\013\060\011\006\003\125\004\006\023\002\125\123" -+"\061\020\060\016\006\003\125\004\010\023\007\111\156\144\151\141" -+"\156\141\061\025\060\023\006\003\125\004\007\023\014\111\156\144" -+"\151\141\156\141\160\157\154\151\163\061\050\060\046\006\003\125" -+"\004\012\023\037\123\157\146\164\167\141\162\145\040\151\156\040" -+"\164\150\145\040\120\165\142\154\151\143\040\111\156\164\145\162" -+"\145\163\164\061\023\060\021\006\003\125\004\013\023\012\150\157" -+"\163\164\155\141\163\164\145\162\061\036\060\034\006\003\125\004" -+"\003\023\025\103\145\162\164\151\146\151\143\141\164\145\040\101" -+"\165\164\150\157\162\151\164\171\061\045\060\043\006\011\052\206" -+"\110\206\367\015\001\011\001\026\026\150\157\163\164\155\141\163" -+"\164\145\162\100\163\160\151\055\151\156\143\056\157\162\147" -+, (PRUint32)191 }, -+ { (void *)"\002\011\000\350\216\266\311\370\052\024\050" -+, (PRUint32)11 }, -+ { (void *)"\060\202\010\016\060\202\005\366\240\003\002\001\002\002\011\000" -+"\350\216\266\311\370\052\024\050\060\015\006\011\052\206\110\206" -+"\367\015\001\001\005\005\000\060\201\274\061\013\060\011\006\003" -+"\125\004\006\023\002\125\123\061\020\060\016\006\003\125\004\010" -+"\023\007\111\156\144\151\141\156\141\061\025\060\023\006\003\125" -+"\004\007\023\014\111\156\144\151\141\156\141\160\157\154\151\163" -+"\061\050\060\046\006\003\125\004\012\023\037\123\157\146\164\167" -+"\141\162\145\040\151\156\040\164\150\145\040\120\165\142\154\151" -+"\143\040\111\156\164\145\162\145\163\164\061\023\060\021\006\003" -+"\125\004\013\023\012\150\157\163\164\155\141\163\164\145\162\061" -+"\036\060\034\006\003\125\004\003\023\025\103\145\162\164\151\146" -+"\151\143\141\164\145\040\101\165\164\150\157\162\151\164\171\061" -+"\045\060\043\006\011\052\206\110\206\367\015\001\011\001\026\026" -+"\150\157\163\164\155\141\163\164\145\162\100\163\160\151\055\151" -+"\156\143\056\157\162\147\060\036\027\015\060\070\060\065\061\063" -+"\060\070\060\067\065\066\132\027\015\061\070\060\065\061\061\060" -+"\070\060\067\065\066\132\060\201\274\061\013\060\011\006\003\125" -+"\004\006\023\002\125\123\061\020\060\016\006\003\125\004\010\023" -+"\007\111\156\144\151\141\156\141\061\025\060\023\006\003\125\004" -+"\007\023\014\111\156\144\151\141\156\141\160\157\154\151\163\061" -+"\050\060\046\006\003\125\004\012\023\037\123\157\146\164\167\141" -+"\162\145\040\151\156\040\164\150\145\040\120\165\142\154\151\143" -+"\040\111\156\164\145\162\145\163\164\061\023\060\021\006\003\125" -+"\004\013\023\012\150\157\163\164\155\141\163\164\145\162\061\036" -+"\060\034\006\003\125\004\003\023\025\103\145\162\164\151\146\151" -+"\143\141\164\145\040\101\165\164\150\157\162\151\164\171\061\045" -+"\060\043\006\011\052\206\110\206\367\015\001\011\001\026\026\150" -+"\157\163\164\155\141\163\164\145\162\100\163\160\151\055\151\156" -+"\143\056\157\162\147\060\202\002\042\060\015\006\011\052\206\110" -+"\206\367\015\001\001\001\005\000\003\202\002\017\000\060\202\002" -+"\012\002\202\002\001\000\334\066\346\107\102\302\304\121\165\051" -+"\207\100\303\330\216\041\006\322\030\116\353\357\040\275\220\074" -+"\205\020\023\214\051\133\224\143\366\364\055\361\006\102\221\271" -+"\031\304\102\151\010\277\213\066\105\352\050\005\063\111\110\240" -+"\047\103\223\065\212\101\330\170\263\360\357\263\156\055\335\321" -+"\313\175\352\364\165\046\323\076\220\072\356\327\347\054\004\265" -+"\174\341\365\174\305\116\357\167\275\134\242\223\063\222\316\175" -+"\201\110\317\153\265\042\054\010\203\375\323\325\317\073\055\375" -+"\265\111\220\133\366\255\115\023\312\336\323\246\235\123\121\161" -+"\143\106\370\112\026\134\230\356\055\155\232\026\241\166\220\342" -+"\140\103\231\326\211\326\154\056\172\230\262\013\003\054\343\172" -+"\117\307\335\343\314\343\112\152\215\171\122\372\364\301\257\056" -+"\217\052\010\313\033\051\202\222\162\103\274\316\210\251\252\247" -+"\212\121\103\125\205\232\067\003\170\223\310\360\275\264\101\310" -+"\007\102\232\313\065\227\172\212\201\145\336\035\124\010\001\361" -+"\144\134\267\027\032\121\274\036\303\131\207\166\030\026\230\356" -+"\277\366\147\201\213\006\065\305\113\155\131\031\307\322\306\110" -+"\276\156\024\050\203\112\020\234\033\365\157\274\251\216\365\151" -+"\376\262\301\125\314\347\024\311\371\133\024\123\121\007\352\316" -+"\075\344\117\050\037\074\141\011\327\063\322\156\247\156\324\307" -+"\023\011\157\153\135\024\356\235\211\033\245\152\362\366\370\320" -+"\162\216\352\162\037\057\064\152\051\012\305\012\354\034\100\205" -+"\022\367\246\245\323\117\255\300\205\214\114\174\163\040\314\123" -+"\030\361\262\130\114\001\365\277\352\144\325\134\071\305\316\154" -+"\314\123\132\126\272\101\017\045\337\153\120\266\307\212\240\275" -+"\002\302\305\073\125\245\262\144\042\204\121\050\126\256\061\356" -+"\136\373\013\026\115\106\005\221\200\104\355\254\155\360\127\250" -+"\372\353\141\110\240\313\033\263\037\216\315\305\041\167\003\204" -+"\036\374\254\243\103\010\143\214\355\371\047\357\264\260\135\147" -+"\326\117\355\320\213\076\135\133\311\221\275\226\002\204\075\305" -+"\115\274\102\077\164\375\074\135\254\134\110\066\136\207\061\057" -+"\030\154\304\150\356\241\213\311\131\320\030\343\000\200\263\124" -+"\047\056\231\360\025\123\002\003\001\000\001\243\202\002\017\060" -+"\202\002\013\060\035\006\003\125\035\016\004\026\004\024\064\161" -+"\321\070\327\025\066\203\107\153\327\067\144\102\073\216\215\122" -+"\235\253\060\201\361\006\003\125\035\043\004\201\351\060\201\346" -+"\200\024\064\161\321\070\327\025\066\203\107\153\327\067\144\102" -+"\073\216\215\122\235\253\241\201\302\244\201\277\060\201\274\061" -+"\013\060\011\006\003\125\004\006\023\002\125\123\061\020\060\016" -+"\006\003\125\004\010\023\007\111\156\144\151\141\156\141\061\025" -+"\060\023\006\003\125\004\007\023\014\111\156\144\151\141\156\141" -+"\160\157\154\151\163\061\050\060\046\006\003\125\004\012\023\037" -+"\123\157\146\164\167\141\162\145\040\151\156\040\164\150\145\040" -+"\120\165\142\154\151\143\040\111\156\164\145\162\145\163\164\061" -+"\023\060\021\006\003\125\004\013\023\012\150\157\163\164\155\141" -+"\163\164\145\162\061\036\060\034\006\003\125\004\003\023\025\103" -+"\145\162\164\151\146\151\143\141\164\145\040\101\165\164\150\157" -+"\162\151\164\171\061\045\060\043\006\011\052\206\110\206\367\015" -+"\001\011\001\026\026\150\157\163\164\155\141\163\164\145\162\100" -+"\163\160\151\055\151\156\143\056\157\162\147\202\011\000\350\216" -+"\266\311\370\052\024\050\060\017\006\003\125\035\023\001\001\377" -+"\004\005\060\003\001\001\377\060\021\006\011\140\206\110\001\206" -+"\370\102\001\001\004\004\003\002\000\007\060\011\006\003\125\035" -+"\022\004\002\060\000\060\056\006\011\140\206\110\001\206\370\102" -+"\001\015\004\041\026\037\123\157\146\164\167\141\162\145\040\151" -+"\156\040\164\150\145\040\120\165\142\154\151\143\040\111\156\164" -+"\145\162\145\163\164\060\060\006\011\140\206\110\001\206\370\102" -+"\001\004\004\043\026\041\150\164\164\160\163\072\057\057\143\141" -+"\056\163\160\151\055\151\156\143\056\157\162\147\057\143\141\055" -+"\143\162\154\056\160\145\155\060\062\006\011\140\206\110\001\206" -+"\370\102\001\003\004\045\026\043\150\164\164\160\163\072\057\057" -+"\143\141\056\163\160\151\055\151\156\143\056\157\162\147\057\143" -+"\145\162\164\055\143\162\154\056\160\145\155\060\041\006\003\125" -+"\035\021\004\032\060\030\201\026\150\157\163\164\155\141\163\164" -+"\145\162\100\163\160\151\055\151\156\143\056\157\162\147\060\016" -+"\006\003\125\035\017\001\001\377\004\004\003\002\001\006\060\015" -+"\006\011\052\206\110\206\367\015\001\001\005\005\000\003\202\002" -+"\001\000\264\315\275\340\271\352\262\003\053\176\062\351\336\162" -+"\077\311\113\202\136\235\342\257\125\011\242\014\124\350\317\030" -+"\074\050\040\035\251\273\003\002\057\122\071\042\371\027\317\255" -+"\147\220\263\003\177\330\025\343\153\176\273\233\126\001\257\065" -+"\324\332\271\307\147\027\233\324\325\016\067\263\040\101\056\014" -+"\001\304\133\371\145\076\302\141\350\322\360\152\225\160\303\306" -+"\157\325\065\244\254\131\162\341\211\337\241\240\235\044\275\051" -+"\171\351\141\052\331\323\036\311\106\244\010\170\101\222\162\017" -+"\253\024\165\355\011\360\242\360\134\357\303\012\142\040\267\302" -+"\050\146\256\114\057\056\217\105\143\046\226\360\356\061\346\213" -+"\125\233\252\072\371\202\071\035\210\074\342\007\165\032\341\017" -+"\261\060\274\161\062\322\072\376\372\241\211\363\103\054\326\162" -+"\304\171\247\025\110\005\300\330\055\162\002\343\313\075\026\152" -+"\272\311\270\021\020\342\111\205\314\226\107\140\005\045\056\357" -+"\165\131\063\365\107\031\026\357\332\154\137\007\310\246\120\266" -+"\035\313\146\064\045\374\146\203\353\305\266\060\101\370\106\104" -+"\142\250\301\014\124\346\352\114\132\050\346\256\306\267\376\177" -+"\073\226\250\056\356\307\150\076\335\000\075\051\257\052\143\253" -+"\137\356\111\052\055\305\334\373\321\306\323\321\227\126\122\206" -+"\266\224\353\324\140\121\267\374\036\233\314\002\233\324\037\217" -+"\371\112\217\266\056\050\073\027\314\305\246\005\343\322\323\265" -+"\306\003\311\341\110\102\233\313\077\344\027\340\376\015\001\225" -+"\011\272\270\015\161\344\011\160\167\102\330\115\341\102\251\140" -+"\203\327\027\211\103\322\324\335\247\030\266\253\324\044\045\207" -+"\265\324\342\374\056\042\151\275\255\150\054\377\162\265\230\252" -+"\006\234\347\052\152\270\241\223\166\316\260\363\177\234\341\340" -+"\117\270\330\206\106\245\063\002\054\045\141\067\052\222\310\254" -+"\201\164\150\143\207\063\166\275\005\177\136\325\325\002\155\275" -+"\257\377\052\132\252\111\354\230\171\107\123\221\366\016\064\132" -+"\311\245\306\353\262\343\305\254\266\240\160\065\273\310\121\151" -+"\320\362\265\242\062\156\274\077\240\067\071\174\161\066\246\005" -+"\337\014\022\344\026\247\305\326\313\143\243\225\160\077\346\004" -+"\243\140" -+, (PRUint32)2066 } -+}; -+static const NSSItem nss_builtins_items_253 [] = { -+ { (void *)&cko_netscape_trust, (PRUint32)sizeof(CK_OBJECT_CLASS) }, -+ { (void *)&ck_true, (PRUint32)sizeof(CK_BBOOL) }, -+ { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) }, -+ { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) }, -+ { (void *)"Software in the Public Interest, Inc. Root CA (2008)", (PRUint32)53 }, -+ { (void *)"\257\160\210\103\203\202\002\025\315\141\306\274\354\375\067\044" -+"\251\220\103\034" -+, (PRUint32)20 }, -+ { (void *)"\052\107\237\140\273\203\164\157\001\003\327\013\015\366\015\170" -+, (PRUint32)16 }, -+ { (void *)"\060\201\274\061\013\060\011\006\003\125\004\006\023\002\125\123" -+"\061\020\060\016\006\003\125\004\010\023\007\111\156\144\151\141" -+"\156\141\061\025\060\023\006\003\125\004\007\023\014\111\156\144" -+"\151\141\156\141\160\157\154\151\163\061\050\060\046\006\003\125" -+"\004\012\023\037\123\157\146\164\167\141\162\145\040\151\156\040" -+"\164\150\145\040\120\165\142\154\151\143\040\111\156\164\145\162" -+"\145\163\164\061\023\060\021\006\003\125\004\013\023\012\150\157" -+"\163\164\155\141\163\164\145\162\061\036\060\034\006\003\125\004" -+"\003\023\025\103\145\162\164\151\146\151\143\141\164\145\040\101" -+"\165\164\150\157\162\151\164\171\061\045\060\043\006\011\052\206" -+"\110\206\367\015\001\011\001\026\026\150\157\163\164\155\141\163" -+"\164\145\162\100\163\160\151\055\151\156\143\056\157\162\147" -+, (PRUint32)191 }, -+ { (void *)"\002\011\000\350\216\266\311\370\052\024\050" -+, (PRUint32)11 }, -+ { (void *)&ckt_netscape_trusted_delegator, (PRUint32)sizeof(CK_TRUST) }, -+ { (void *)&ckt_netscape_trusted_delegator, (PRUint32)sizeof(CK_TRUST) }, -+ { (void *)&ckt_netscape_trusted_delegator, (PRUint32)sizeof(CK_TRUST) }, -+ { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) } -+}; - - builtinsInternalObject - nss_builtins_data[] = { -@@ -16977,11 +17520,17 @@ - { 11, nss_builtins_types_244, nss_builtins_items_244, {NULL} }, - { 13, nss_builtins_types_245, nss_builtins_items_245, {NULL} }, - { 11, nss_builtins_types_246, nss_builtins_items_246, {NULL} }, -- { 13, nss_builtins_types_247, nss_builtins_items_247, {NULL} } -+ { 13, nss_builtins_types_247, nss_builtins_items_247, {NULL} }, -+ { 11, nss_builtins_types_248, nss_builtins_items_248, {NULL} }, -+ { 13, nss_builtins_types_249, nss_builtins_items_249, {NULL} }, -+ { 11, nss_builtins_types_250, nss_builtins_items_250, {NULL} }, -+ { 13, nss_builtins_types_251, nss_builtins_items_251, {NULL} }, -+ { 11, nss_builtins_types_252, nss_builtins_items_252, {NULL} }, -+ { 13, nss_builtins_types_253, nss_builtins_items_253, {NULL} } - }; - const PRUint32 - #ifdef DEBUG -- nss_builtins_nObjects = 247+1; -+ nss_builtins_nObjects = 253+1; - #else -- nss_builtins_nObjects = 247; -+ nss_builtins_nObjects = 253; - #endif /* DEBUG */ -Index: mozilla/security/nss/lib/ckfw/builtins/certdata.txt -=================================================================== ---- mozilla.orig/security/nss/lib/ckfw/builtins/certdata.txt 2008-07-23 20:20:08.000000000 +0200 -+++ mozilla/security/nss/lib/ckfw/builtins/certdata.txt 2008-07-23 20:20:45.000000000 +0200 -@@ -17241,3 +17241,558 @@ - CKA_TRUST_EMAIL_PROTECTION CK_TRUST CKT_NETSCAPE_TRUST_UNKNOWN - CKA_TRUST_CODE_SIGNING CK_TRUST CKT_NETSCAPE_TRUST_UNKNOWN - CKA_TRUST_STEP_UP_APPROVED CK_BBOOL CK_FALSE -+ -+# -+# Certificate "CAcert.org Class 1 Root CA" -+# -+CKA_CLASS CK_OBJECT_CLASS CKO_CERTIFICATE -+CKA_TOKEN CK_BBOOL CK_TRUE -+CKA_PRIVATE CK_BBOOL CK_FALSE -+CKA_MODIFIABLE CK_BBOOL CK_FALSE -+CKA_LABEL UTF8 "CAcert.org Class 1 Root CA" -+CKA_CERTIFICATE_TYPE CK_CERTIFICATE_TYPE CKC_X_509 -+CKA_SUBJECT MULTILINE_OCTAL -+\060\171\061\020\060\016\006\003\125\004\012\023\007\122\157\157 -+\164\040\103\101\061\036\060\034\006\003\125\004\013\023\025\150 -+\164\164\160\072\057\057\167\167\167\056\143\141\143\145\162\164 -+\056\157\162\147\061\042\060\040\006\003\125\004\003\023\031\103 -+\101\040\103\145\162\164\040\123\151\147\156\151\156\147\040\101 -+\165\164\150\157\162\151\164\171\061\041\060\037\006\011\052\206 -+\110\206\367\015\001\011\001\026\022\163\165\160\160\157\162\164 -+\100\143\141\143\145\162\164\056\157\162\147 -+END -+CKA_ID UTF8 "0" -+CKA_ISSUER MULTILINE_OCTAL -+\060\171\061\020\060\016\006\003\125\004\012\023\007\122\157\157 -+\164\040\103\101\061\036\060\034\006\003\125\004\013\023\025\150 -+\164\164\160\072\057\057\167\167\167\056\143\141\143\145\162\164 -+\056\157\162\147\061\042\060\040\006\003\125\004\003\023\031\103 -+\101\040\103\145\162\164\040\123\151\147\156\151\156\147\040\101 -+\165\164\150\157\162\151\164\171\061\041\060\037\006\011\052\206 -+\110\206\367\015\001\011\001\026\022\163\165\160\160\157\162\164 -+\100\143\141\143\145\162\164\056\157\162\147 -+END -+CKA_SERIAL_NUMBER MULTILINE_OCTAL -+\002\001\000 -+END -+CKA_VALUE MULTILINE_OCTAL -+\060\202\007\075\060\202\005\045\240\003\002\001\002\002\001\000 -+\060\015\006\011\052\206\110\206\367\015\001\001\004\005\000\060 -+\171\061\020\060\016\006\003\125\004\012\023\007\122\157\157\164 -+\040\103\101\061\036\060\034\006\003\125\004\013\023\025\150\164 -+\164\160\072\057\057\167\167\167\056\143\141\143\145\162\164\056 -+\157\162\147\061\042\060\040\006\003\125\004\003\023\031\103\101 -+\040\103\145\162\164\040\123\151\147\156\151\156\147\040\101\165 -+\164\150\157\162\151\164\171\061\041\060\037\006\011\052\206\110 -+\206\367\015\001\011\001\026\022\163\165\160\160\157\162\164\100 -+\143\141\143\145\162\164\056\157\162\147\060\036\027\015\060\063 -+\060\063\063\060\061\062\062\071\064\071\132\027\015\063\063\060 -+\063\062\071\061\062\062\071\064\071\132\060\171\061\020\060\016 -+\006\003\125\004\012\023\007\122\157\157\164\040\103\101\061\036 -+\060\034\006\003\125\004\013\023\025\150\164\164\160\072\057\057 -+\167\167\167\056\143\141\143\145\162\164\056\157\162\147\061\042 -+\060\040\006\003\125\004\003\023\031\103\101\040\103\145\162\164 -+\040\123\151\147\156\151\156\147\040\101\165\164\150\157\162\151 -+\164\171\061\041\060\037\006\011\052\206\110\206\367\015\001\011 -+\001\026\022\163\165\160\160\157\162\164\100\143\141\143\145\162 -+\164\056\157\162\147\060\202\002\042\060\015\006\011\052\206\110 -+\206\367\015\001\001\001\005\000\003\202\002\017\000\060\202\002 -+\012\002\202\002\001\000\316\042\300\342\106\175\354\066\050\007 -+\120\226\362\240\063\100\214\113\361\073\146\077\061\345\153\002 -+\066\333\326\174\366\361\210\217\116\167\066\005\101\225\371\011 -+\360\022\317\106\206\163\140\267\156\176\350\300\130\144\256\315 -+\260\255\105\027\014\143\372\147\012\350\326\322\277\076\347\230 -+\304\360\114\372\340\003\273\065\135\154\041\336\236\040\331\272 -+\315\146\062\067\162\372\367\010\365\307\315\130\311\216\347\016 -+\136\352\076\376\034\241\024\012\025\154\206\204\133\144\146\052 -+\172\251\113\123\171\365\210\242\173\356\057\012\141\053\215\262 -+\176\115\126\245\023\354\352\332\222\236\254\104\101\036\130\140 -+\145\005\146\370\300\104\275\313\224\367\102\176\013\367\145\150 -+\230\121\005\360\363\005\221\004\035\033\027\202\354\310\127\273 -+\303\153\172\210\361\260\162\314\045\133\040\221\354\026\002\022 -+\217\062\351\027\030\110\320\307\005\056\002\060\102\270\045\234 -+\005\153\077\252\072\247\353\123\110\367\350\322\266\007\230\334 -+\033\306\064\177\177\311\034\202\172\005\130\053\010\133\363\070 -+\242\253\027\135\146\311\230\327\236\020\213\242\322\335\164\232 -+\367\161\014\162\140\337\315\157\230\063\235\226\064\166\076\044 -+\172\222\260\016\225\036\157\346\240\105\070\107\252\327\101\355 -+\112\267\022\366\327\033\203\212\017\056\330\011\266\131\327\252 -+\004\377\322\223\175\150\056\335\213\113\253\130\272\057\215\352 -+\225\247\240\303\124\211\245\373\333\213\121\042\235\262\303\276 -+\021\276\054\221\206\213\226\170\255\040\323\212\057\032\077\306 -+\320\121\145\207\041\261\031\001\145\177\105\034\207\365\174\320 -+\101\114\117\051\230\041\375\063\037\165\014\004\121\372\031\167 -+\333\324\024\034\356\201\303\035\365\230\267\151\006\221\042\335 -+\000\120\314\201\061\254\022\007\173\070\332\150\133\346\053\324 -+\176\311\137\255\350\353\162\114\363\001\345\113\040\277\232\246 -+\127\312\221\000\001\213\241\165\041\067\265\143\015\147\076\106 -+\117\160\040\147\316\305\326\131\333\002\340\360\322\313\315\272 -+\142\267\220\101\350\335\040\344\051\274\144\051\102\310\042\334 -+\170\232\377\103\354\230\033\011\121\113\132\132\302\161\361\304 -+\313\163\251\345\241\013\002\003\001\000\001\243\202\001\316\060 -+\202\001\312\060\035\006\003\125\035\016\004\026\004\024\026\265 -+\062\033\324\307\363\340\346\216\363\275\322\260\072\356\262\071 -+\030\321\060\201\243\006\003\125\035\043\004\201\233\060\201\230 -+\200\024\026\265\062\033\324\307\363\340\346\216\363\275\322\260 -+\072\356\262\071\030\321\241\175\244\173\060\171\061\020\060\016 -+\006\003\125\004\012\023\007\122\157\157\164\040\103\101\061\036 -+\060\034\006\003\125\004\013\023\025\150\164\164\160\072\057\057 -+\167\167\167\056\143\141\143\145\162\164\056\157\162\147\061\042 -+\060\040\006\003\125\004\003\023\031\103\101\040\103\145\162\164 -+\040\123\151\147\156\151\156\147\040\101\165\164\150\157\162\151 -+\164\171\061\041\060\037\006\011\052\206\110\206\367\015\001\011 -+\001\026\022\163\165\160\160\157\162\164\100\143\141\143\145\162 -+\164\056\157\162\147\202\001\000\060\017\006\003\125\035\023\001 -+\001\377\004\005\060\003\001\001\377\060\062\006\003\125\035\037 -+\004\053\060\051\060\047\240\045\240\043\206\041\150\164\164\160 -+\163\072\057\057\167\167\167\056\143\141\143\145\162\164\056\157 -+\162\147\057\162\145\166\157\153\145\056\143\162\154\060\060\006 -+\011\140\206\110\001\206\370\102\001\004\004\043\026\041\150\164 -+\164\160\163\072\057\057\167\167\167\056\143\141\143\145\162\164 -+\056\157\162\147\057\162\145\166\157\153\145\056\143\162\154\060 -+\064\006\011\140\206\110\001\206\370\102\001\010\004\047\026\045 -+\150\164\164\160\072\057\057\167\167\167\056\143\141\143\145\162 -+\164\056\157\162\147\057\151\156\144\145\170\056\160\150\160\077 -+\151\144\075\061\060\060\126\006\011\140\206\110\001\206\370\102 -+\001\015\004\111\026\107\124\157\040\147\145\164\040\171\157\165 -+\162\040\157\167\156\040\143\145\162\164\151\146\151\143\141\164 -+\145\040\146\157\162\040\106\122\105\105\040\150\145\141\144\040 -+\157\166\145\162\040\164\157\040\150\164\164\160\072\057\057\167 -+\167\167\056\143\141\143\145\162\164\056\157\162\147\060\015\006 -+\011\052\206\110\206\367\015\001\001\004\005\000\003\202\002\001 -+\000\050\307\356\234\202\002\272\134\200\022\312\065\012\035\201 -+\157\211\152\231\314\362\150\017\177\247\341\215\130\225\076\275 -+\362\006\303\220\132\254\265\140\366\231\103\001\243\210\160\234 -+\235\142\235\244\207\257\147\130\015\060\066\073\346\255\110\323 -+\313\164\002\206\161\076\342\053\003\150\361\064\142\100\106\073 -+\123\352\050\364\254\373\146\225\123\212\115\135\375\073\331\140 -+\327\312\171\151\073\261\145\222\246\306\201\202\134\234\315\353 -+\115\001\212\245\337\021\125\252\025\312\037\067\300\202\230\160 -+\141\333\152\174\226\243\216\056\124\076\117\041\251\220\357\334 -+\202\277\334\350\105\255\115\220\163\010\074\224\145\260\004\231 -+\166\177\342\274\302\152\025\252\227\004\067\044\330\036\224\116 -+\155\016\121\276\326\304\217\312\226\155\367\103\337\350\060\145 -+\047\073\173\273\103\103\143\304\103\367\262\354\150\314\341\031 -+\216\042\373\230\341\173\132\076\001\067\073\213\010\260\242\363 -+\225\116\032\313\233\315\232\261\333\262\160\360\055\112\333\330 -+\260\343\157\105\110\063\022\377\376\074\062\052\124\367\304\367 -+\212\360\210\043\302\107\376\144\172\161\300\321\036\246\143\260 -+\007\176\244\057\323\001\217\334\237\053\266\306\010\251\017\223 -+\110\045\374\022\375\237\102\334\363\304\076\366\127\260\327\335 -+\151\321\006\167\064\012\113\322\312\240\377\034\306\214\311\026 -+\276\304\314\062\067\150\163\137\010\373\121\367\111\123\066\005 -+\012\225\002\114\362\171\032\020\366\330\072\165\234\363\035\361 -+\242\015\160\147\206\033\263\026\365\057\345\244\353\171\206\371 -+\075\013\302\163\013\245\231\254\157\374\147\270\345\057\013\246 -+\030\044\215\173\321\110\065\051\030\100\254\223\140\341\226\206 -+\120\264\172\131\330\217\041\013\237\317\202\221\306\073\277\153 -+\334\007\221\271\227\126\043\252\266\154\224\306\110\006\074\344 -+\316\116\252\344\366\057\011\334\123\157\056\374\164\353\072\143 -+\231\302\246\254\211\274\247\262\104\240\015\212\020\343\154\362 -+\044\313\372\233\237\160\107\056\336\024\213\324\262\040\011\226 -+\242\144\361\044\034\334\241\065\234\025\262\324\274\125\056\175 -+\006\365\234\016\125\364\132\326\223\332\166\255\045\163\114\305 -+\103 -+END -+ -+# Trust for Certificate "CAcert.org Class 1 Root CA" -+CKA_CLASS CK_OBJECT_CLASS CKO_NETSCAPE_TRUST -+CKA_TOKEN CK_BBOOL CK_TRUE -+CKA_PRIVATE CK_BBOOL CK_FALSE -+CKA_MODIFIABLE CK_BBOOL CK_FALSE -+CKA_LABEL UTF8 "CAcert.org Class 1 Root CA" -+CKA_CERT_SHA1_HASH MULTILINE_OCTAL -+\023\134\354\066\364\234\270\351\073\032\262\160\315\200\210\106 -+\166\316\217\063 -+END -+CKA_CERT_MD5_HASH MULTILINE_OCTAL -+\246\033\067\136\071\015\234\066\124\356\275\040\061\106\037\153 -+END -+CKA_ISSUER MULTILINE_OCTAL -+\060\171\061\020\060\016\006\003\125\004\012\023\007\122\157\157 -+\164\040\103\101\061\036\060\034\006\003\125\004\013\023\025\150 -+\164\164\160\072\057\057\167\167\167\056\143\141\143\145\162\164 -+\056\157\162\147\061\042\060\040\006\003\125\004\003\023\031\103 -+\101\040\103\145\162\164\040\123\151\147\156\151\156\147\040\101 -+\165\164\150\157\162\151\164\171\061\041\060\037\006\011\052\206 -+\110\206\367\015\001\011\001\026\022\163\165\160\160\157\162\164 -+\100\143\141\143\145\162\164\056\157\162\147 -+END -+CKA_SERIAL_NUMBER MULTILINE_OCTAL -+\002\001\000 -+END -+CKA_TRUST_SERVER_AUTH CK_TRUST CKT_NETSCAPE_TRUSTED_DELEGATOR -+CKA_TRUST_EMAIL_PROTECTION CK_TRUST CKT_NETSCAPE_TRUSTED_DELEGATOR -+CKA_TRUST_CODE_SIGNING CK_TRUST CKT_NETSCAPE_TRUSTED_DELEGATOR -+CKA_TRUST_STEP_UP_APPROVED CK_BBOOL CK_FALSE -+ -+# -+# Certificate "CAcert.org Class 3 Root CA" -+# -+CKA_CLASS CK_OBJECT_CLASS CKO_CERTIFICATE -+CKA_TOKEN CK_BBOOL CK_TRUE -+CKA_PRIVATE CK_BBOOL CK_FALSE -+CKA_MODIFIABLE CK_BBOOL CK_FALSE -+CKA_LABEL UTF8 "CAcert.org Class 3 Root CA" -+CKA_CERTIFICATE_TYPE CK_CERTIFICATE_TYPE CKC_X_509 -+CKA_SUBJECT MULTILINE_OCTAL -+\060\124\061\024\060\022\006\003\125\004\012\023\013\103\101\143 -+\145\162\164\040\111\156\143\056\061\036\060\034\006\003\125\004 -+\013\023\025\150\164\164\160\072\057\057\167\167\167\056\103\101 -+\143\145\162\164\056\157\162\147\061\034\060\032\006\003\125\004 -+\003\023\023\103\101\143\145\162\164\040\103\154\141\163\163\040 -+\063\040\122\157\157\164 -+END -+CKA_ID UTF8 "0" -+CKA_ISSUER MULTILINE_OCTAL -+\060\171\061\020\060\016\006\003\125\004\012\023\007\122\157\157 -+\164\040\103\101\061\036\060\034\006\003\125\004\013\023\025\150 -+\164\164\160\072\057\057\167\167\167\056\143\141\143\145\162\164 -+\056\157\162\147\061\042\060\040\006\003\125\004\003\023\031\103 -+\101\040\103\145\162\164\040\123\151\147\156\151\156\147\040\101 -+\165\164\150\157\162\151\164\171\061\041\060\037\006\011\052\206 -+\110\206\367\015\001\011\001\026\022\163\165\160\160\157\162\164 -+\100\143\141\143\145\162\164\056\157\162\147 -+END -+CKA_SERIAL_NUMBER MULTILINE_OCTAL -+\002\001\001 -+END -+CKA_VALUE MULTILINE_OCTAL -+\060\202\006\010\060\202\003\360\240\003\002\001\002\002\001\001 -+\060\015\006\011\052\206\110\206\367\015\001\001\004\005\000\060 -+\171\061\020\060\016\006\003\125\004\012\023\007\122\157\157\164 -+\040\103\101\061\036\060\034\006\003\125\004\013\023\025\150\164 -+\164\160\072\057\057\167\167\167\056\143\141\143\145\162\164\056 -+\157\162\147\061\042\060\040\006\003\125\004\003\023\031\103\101 -+\040\103\145\162\164\040\123\151\147\156\151\156\147\040\101\165 -+\164\150\157\162\151\164\171\061\041\060\037\006\011\052\206\110 -+\206\367\015\001\011\001\026\022\163\165\160\160\157\162\164\100 -+\143\141\143\145\162\164\056\157\162\147\060\036\027\015\060\065 -+\061\060\061\064\060\067\063\066\065\065\132\027\015\063\063\060 -+\063\062\070\060\067\063\066\065\065\132\060\124\061\024\060\022 -+\006\003\125\004\012\023\013\103\101\143\145\162\164\040\111\156 -+\143\056\061\036\060\034\006\003\125\004\013\023\025\150\164\164 -+\160\072\057\057\167\167\167\056\103\101\143\145\162\164\056\157 -+\162\147\061\034\060\032\006\003\125\004\003\023\023\103\101\143 -+\145\162\164\040\103\154\141\163\163\040\063\040\122\157\157\164 -+\060\202\002\042\060\015\006\011\052\206\110\206\367\015\001\001 -+\001\005\000\003\202\002\017\000\060\202\002\012\002\202\002\001 -+\000\253\111\065\021\110\174\322\046\176\123\224\317\103\251\335 -+\050\327\102\052\213\363\207\170\031\130\174\017\236\332\211\175 -+\341\373\353\162\220\015\164\241\226\144\253\237\240\044\231\163 -+\332\342\125\166\307\027\173\365\004\254\106\270\303\276\177\144 -+\215\020\154\044\363\141\234\300\362\220\372\121\346\365\151\001 -+\143\303\017\126\342\112\102\317\342\104\214\045\050\250\305\171 -+\011\175\106\271\212\363\351\363\064\051\010\105\344\034\237\313 -+\224\004\034\201\250\024\263\230\145\304\103\354\116\202\215\011 -+\321\275\252\133\215\222\320\354\336\220\305\177\012\302\343\353 -+\346\061\132\136\164\076\227\063\131\350\303\003\075\140\063\277 -+\367\321\157\107\304\315\356\142\203\122\156\056\010\232\244\331 -+\025\030\221\246\205\222\107\260\256\110\353\155\267\041\354\205 -+\032\150\162\065\253\377\360\020\135\300\364\224\247\152\325\073 -+\222\176\114\220\005\176\223\301\054\213\244\216\142\164\025\161 -+\156\013\161\003\352\257\025\070\232\324\322\005\162\157\214\371 -+\053\353\132\162\045\371\071\106\343\162\033\076\004\303\144\047 -+\042\020\052\212\117\130\247\003\255\276\264\056\023\355\135\252 -+\110\327\325\175\324\052\173\134\372\106\004\120\344\314\016\102 -+\133\214\355\333\362\317\374\226\223\340\333\021\066\124\142\064 -+\070\217\014\140\233\073\227\126\070\255\363\322\133\213\240\133 -+\352\116\226\270\174\327\325\240\206\160\100\323\221\051\267\242 -+\074\255\365\214\273\317\032\222\212\344\064\173\300\330\154\137 -+\351\012\302\303\247\040\232\132\337\054\135\122\134\272\107\325 -+\233\357\044\050\160\070\040\057\325\177\051\300\262\101\003\150 -+\222\314\340\234\314\227\113\105\357\072\020\012\253\160\072\230 -+\225\160\255\065\261\352\205\053\244\034\200\041\061\251\256\140 -+\172\200\046\110\000\270\001\300\223\143\125\042\221\074\126\347 -+\257\333\072\045\363\217\061\124\352\046\213\201\131\371\241\321 -+\123\021\305\173\235\003\366\164\021\340\155\261\054\077\054\206 -+\221\231\161\232\246\167\213\064\140\321\024\264\054\254\235\257 -+\214\020\323\237\304\152\370\157\023\374\163\131\367\146\102\164 -+\036\212\343\370\334\322\157\230\234\313\107\230\225\100\005\373 -+\351\002\003\001\000\001\243\201\277\060\201\274\060\017\006\003 -+\125\035\023\001\001\377\004\005\060\003\001\001\377\060\135\006 -+\010\053\006\001\005\005\007\001\001\004\121\060\117\060\043\006 -+\010\053\006\001\005\005\007\060\001\206\027\150\164\164\160\072 -+\057\057\157\143\163\160\056\103\101\143\145\162\164\056\157\162 -+\147\057\060\050\006\010\053\006\001\005\005\007\060\002\206\034 -+\150\164\164\160\072\057\057\167\167\167\056\103\101\143\145\162 -+\164\056\157\162\147\057\143\141\056\143\162\164\060\112\006\003 -+\125\035\040\004\103\060\101\060\077\006\010\053\006\001\004\001 -+\201\220\112\060\063\060\061\006\010\053\006\001\005\005\007\002 -+\001\026\045\150\164\164\160\072\057\057\167\167\167\056\103\101 -+\143\145\162\164\056\157\162\147\057\151\156\144\145\170\056\160 -+\150\160\077\151\144\075\061\060\060\015\006\011\052\206\110\206 -+\367\015\001\001\004\005\000\003\202\002\001\000\177\010\210\241 -+\332\032\120\111\332\211\373\241\010\162\363\212\367\036\304\072 -+\264\171\133\040\060\261\105\336\302\135\323\145\151\361\302\135 -+\124\124\074\205\137\271\173\102\221\302\231\375\033\121\233\253 -+\106\245\241\020\123\236\155\210\254\163\156\054\063\246\360\364 -+\236\340\165\301\076\210\105\251\341\146\103\376\126\132\321\172 -+\101\170\367\100\332\112\072\361\013\133\245\273\026\006\346\302 -+\347\223\271\205\115\227\117\261\036\070\103\200\357\233\015\214 -+\357\270\247\140\000\207\127\175\036\104\034\313\043\357\233\074 -+\231\235\257\265\051\034\105\171\026\226\115\047\155\361\034\154 -+\303\302\125\144\263\274\024\342\363\244\037\036\062\374\047\025 -+\005\317\335\056\256\076\202\141\173\360\041\020\030\366\104\352 -+\123\071\371\334\320\232\040\340\306\273\340\273\132\117\304\231 -+\310\007\275\265\275\242\333\056\142\015\102\064\101\274\377\213 -+\212\365\121\042\252\210\060\000\342\260\324\274\276\145\272\325 -+\003\127\171\233\350\334\310\115\370\120\355\221\245\122\050\242 -+\254\373\066\130\076\351\224\053\221\120\207\033\326\136\326\214 -+\314\367\017\020\014\122\116\320\026\141\345\345\012\154\277\027 -+\307\162\106\127\234\230\365\154\140\143\172\157\136\271\116\057 -+\310\271\271\273\152\205\274\230\015\355\371\076\227\204\064\224 -+\256\000\257\241\345\347\222\156\116\275\363\342\331\024\213\134 -+\322\353\001\154\240\027\245\055\020\353\234\172\112\275\275\356 -+\316\375\355\042\100\253\160\070\210\365\012\207\152\302\253\005 -+\140\311\110\005\332\123\301\336\104\167\152\263\363\074\074\355 -+\200\274\246\070\112\051\044\137\376\131\073\233\045\172\126\143 -+\000\144\271\135\244\142\175\127\066\117\255\203\357\037\222\123 -+\240\216\167\127\335\345\141\021\075\043\000\220\114\074\372\243 -+\140\223\004\243\257\065\366\016\152\217\117\112\140\247\205\005 -+\154\106\241\217\364\307\166\343\241\131\127\367\161\262\304\156 -+\024\134\155\155\101\146\337\033\223\261\324\000\303\356\313\317 -+\074\075\041\200\251\137\143\145\374\335\340\137\244\364\053\360 -+\205\161\101\324\147\045\373\032\261\227\256\326\231\202\023\101 -+\322\156\245\033\231\047\200\347\013\251\250\000 -+END -+ -+# Trust for Certificate "CAcert.org Class 3 Root CA" -+CKA_CLASS CK_OBJECT_CLASS CKO_NETSCAPE_TRUST -+CKA_TOKEN CK_BBOOL CK_TRUE -+CKA_PRIVATE CK_BBOOL CK_FALSE -+CKA_MODIFIABLE CK_BBOOL CK_FALSE -+CKA_LABEL UTF8 "CAcert.org Class 3 Root CA" -+CKA_CERT_SHA1_HASH MULTILINE_OCTAL -+\333\114\102\151\007\077\351\302\243\175\211\012\134\033\030\304 -+\030\116\052\055 -+END -+CKA_CERT_MD5_HASH MULTILINE_OCTAL -+\163\077\065\124\035\104\311\351\132\112\357\121\255\003\006\266 -+END -+CKA_ISSUER MULTILINE_OCTAL -+\060\171\061\020\060\016\006\003\125\004\012\023\007\122\157\157 -+\164\040\103\101\061\036\060\034\006\003\125\004\013\023\025\150 -+\164\164\160\072\057\057\167\167\167\056\143\141\143\145\162\164 -+\056\157\162\147\061\042\060\040\006\003\125\004\003\023\031\103 -+\101\040\103\145\162\164\040\123\151\147\156\151\156\147\040\101 -+\165\164\150\157\162\151\164\171\061\041\060\037\006\011\052\206 -+\110\206\367\015\001\011\001\026\022\163\165\160\160\157\162\164 -+\100\143\141\143\145\162\164\056\157\162\147 -+END -+CKA_SERIAL_NUMBER MULTILINE_OCTAL -+\002\001\001 -+END -+CKA_TRUST_SERVER_AUTH CK_TRUST CKT_NETSCAPE_TRUSTED_DELEGATOR -+CKA_TRUST_EMAIL_PROTECTION CK_TRUST CKT_NETSCAPE_TRUSTED_DELEGATOR -+CKA_TRUST_CODE_SIGNING CK_TRUST CKT_NETSCAPE_TRUSTED_DELEGATOR -+CKA_TRUST_STEP_UP_APPROVED CK_BBOOL CK_FALSE -+ -+# -+# Certificate "Software in the Public Interest, Inc. Root CA (2008)" -+# -+CKA_CLASS CK_OBJECT_CLASS CKO_CERTIFICATE -+CKA_TOKEN CK_BBOOL CK_TRUE -+CKA_PRIVATE CK_BBOOL CK_FALSE -+CKA_MODIFIABLE CK_BBOOL CK_FALSE -+CKA_LABEL UTF8 "Software in the Public Interest, Inc. Root CA (2008)" -+CKA_CERTIFICATE_TYPE CK_CERTIFICATE_TYPE CKC_X_509 -+CKA_SUBJECT MULTILINE_OCTAL -+\060\201\274\061\013\060\011\006\003\125\004\006\023\002\125\123 -+\061\020\060\016\006\003\125\004\010\023\007\111\156\144\151\141 -+\156\141\061\025\060\023\006\003\125\004\007\023\014\111\156\144 -+\151\141\156\141\160\157\154\151\163\061\050\060\046\006\003\125 -+\004\012\023\037\123\157\146\164\167\141\162\145\040\151\156\040 -+\164\150\145\040\120\165\142\154\151\143\040\111\156\164\145\162 -+\145\163\164\061\023\060\021\006\003\125\004\013\023\012\150\157 -+\163\164\155\141\163\164\145\162\061\036\060\034\006\003\125\004 -+\003\023\025\103\145\162\164\151\146\151\143\141\164\145\040\101 -+\165\164\150\157\162\151\164\171\061\045\060\043\006\011\052\206 -+\110\206\367\015\001\011\001\026\026\150\157\163\164\155\141\163 -+\164\145\162\100\163\160\151\055\151\156\143\056\157\162\147 -+END -+CKA_ID UTF8 "0" -+CKA_ISSUER MULTILINE_OCTAL -+\060\201\274\061\013\060\011\006\003\125\004\006\023\002\125\123 -+\061\020\060\016\006\003\125\004\010\023\007\111\156\144\151\141 -+\156\141\061\025\060\023\006\003\125\004\007\023\014\111\156\144 -+\151\141\156\141\160\157\154\151\163\061\050\060\046\006\003\125 -+\004\012\023\037\123\157\146\164\167\141\162\145\040\151\156\040 -+\164\150\145\040\120\165\142\154\151\143\040\111\156\164\145\162 -+\145\163\164\061\023\060\021\006\003\125\004\013\023\012\150\157 -+\163\164\155\141\163\164\145\162\061\036\060\034\006\003\125\004 -+\003\023\025\103\145\162\164\151\146\151\143\141\164\145\040\101 -+\165\164\150\157\162\151\164\171\061\045\060\043\006\011\052\206 -+\110\206\367\015\001\011\001\026\026\150\157\163\164\155\141\163 -+\164\145\162\100\163\160\151\055\151\156\143\056\157\162\147 -+END -+CKA_SERIAL_NUMBER MULTILINE_OCTAL -+\002\011\000\350\216\266\311\370\052\024\050 -+END -+CKA_VALUE MULTILINE_OCTAL -+\060\202\010\016\060\202\005\366\240\003\002\001\002\002\011\000 -+\350\216\266\311\370\052\024\050\060\015\006\011\052\206\110\206 -+\367\015\001\001\005\005\000\060\201\274\061\013\060\011\006\003 -+\125\004\006\023\002\125\123\061\020\060\016\006\003\125\004\010 -+\023\007\111\156\144\151\141\156\141\061\025\060\023\006\003\125 -+\004\007\023\014\111\156\144\151\141\156\141\160\157\154\151\163 -+\061\050\060\046\006\003\125\004\012\023\037\123\157\146\164\167 -+\141\162\145\040\151\156\040\164\150\145\040\120\165\142\154\151 -+\143\040\111\156\164\145\162\145\163\164\061\023\060\021\006\003 -+\125\004\013\023\012\150\157\163\164\155\141\163\164\145\162\061 -+\036\060\034\006\003\125\004\003\023\025\103\145\162\164\151\146 -+\151\143\141\164\145\040\101\165\164\150\157\162\151\164\171\061 -+\045\060\043\006\011\052\206\110\206\367\015\001\011\001\026\026 -+\150\157\163\164\155\141\163\164\145\162\100\163\160\151\055\151 -+\156\143\056\157\162\147\060\036\027\015\060\070\060\065\061\063 -+\060\070\060\067\065\066\132\027\015\061\070\060\065\061\061\060 -+\070\060\067\065\066\132\060\201\274\061\013\060\011\006\003\125 -+\004\006\023\002\125\123\061\020\060\016\006\003\125\004\010\023 -+\007\111\156\144\151\141\156\141\061\025\060\023\006\003\125\004 -+\007\023\014\111\156\144\151\141\156\141\160\157\154\151\163\061 -+\050\060\046\006\003\125\004\012\023\037\123\157\146\164\167\141 -+\162\145\040\151\156\040\164\150\145\040\120\165\142\154\151\143 -+\040\111\156\164\145\162\145\163\164\061\023\060\021\006\003\125 -+\004\013\023\012\150\157\163\164\155\141\163\164\145\162\061\036 -+\060\034\006\003\125\004\003\023\025\103\145\162\164\151\146\151 -+\143\141\164\145\040\101\165\164\150\157\162\151\164\171\061\045 -+\060\043\006\011\052\206\110\206\367\015\001\011\001\026\026\150 -+\157\163\164\155\141\163\164\145\162\100\163\160\151\055\151\156 -+\143\056\157\162\147\060\202\002\042\060\015\006\011\052\206\110 -+\206\367\015\001\001\001\005\000\003\202\002\017\000\060\202\002 -+\012\002\202\002\001\000\334\066\346\107\102\302\304\121\165\051 -+\207\100\303\330\216\041\006\322\030\116\353\357\040\275\220\074 -+\205\020\023\214\051\133\224\143\366\364\055\361\006\102\221\271 -+\031\304\102\151\010\277\213\066\105\352\050\005\063\111\110\240 -+\047\103\223\065\212\101\330\170\263\360\357\263\156\055\335\321 -+\313\175\352\364\165\046\323\076\220\072\356\327\347\054\004\265 -+\174\341\365\174\305\116\357\167\275\134\242\223\063\222\316\175 -+\201\110\317\153\265\042\054\010\203\375\323\325\317\073\055\375 -+\265\111\220\133\366\255\115\023\312\336\323\246\235\123\121\161 -+\143\106\370\112\026\134\230\356\055\155\232\026\241\166\220\342 -+\140\103\231\326\211\326\154\056\172\230\262\013\003\054\343\172 -+\117\307\335\343\314\343\112\152\215\171\122\372\364\301\257\056 -+\217\052\010\313\033\051\202\222\162\103\274\316\210\251\252\247 -+\212\121\103\125\205\232\067\003\170\223\310\360\275\264\101\310 -+\007\102\232\313\065\227\172\212\201\145\336\035\124\010\001\361 -+\144\134\267\027\032\121\274\036\303\131\207\166\030\026\230\356 -+\277\366\147\201\213\006\065\305\113\155\131\031\307\322\306\110 -+\276\156\024\050\203\112\020\234\033\365\157\274\251\216\365\151 -+\376\262\301\125\314\347\024\311\371\133\024\123\121\007\352\316 -+\075\344\117\050\037\074\141\011\327\063\322\156\247\156\324\307 -+\023\011\157\153\135\024\356\235\211\033\245\152\362\366\370\320 -+\162\216\352\162\037\057\064\152\051\012\305\012\354\034\100\205 -+\022\367\246\245\323\117\255\300\205\214\114\174\163\040\314\123 -+\030\361\262\130\114\001\365\277\352\144\325\134\071\305\316\154 -+\314\123\132\126\272\101\017\045\337\153\120\266\307\212\240\275 -+\002\302\305\073\125\245\262\144\042\204\121\050\126\256\061\356 -+\136\373\013\026\115\106\005\221\200\104\355\254\155\360\127\250 -+\372\353\141\110\240\313\033\263\037\216\315\305\041\167\003\204 -+\036\374\254\243\103\010\143\214\355\371\047\357\264\260\135\147 -+\326\117\355\320\213\076\135\133\311\221\275\226\002\204\075\305 -+\115\274\102\077\164\375\074\135\254\134\110\066\136\207\061\057 -+\030\154\304\150\356\241\213\311\131\320\030\343\000\200\263\124 -+\047\056\231\360\025\123\002\003\001\000\001\243\202\002\017\060 -+\202\002\013\060\035\006\003\125\035\016\004\026\004\024\064\161 -+\321\070\327\025\066\203\107\153\327\067\144\102\073\216\215\122 -+\235\253\060\201\361\006\003\125\035\043\004\201\351\060\201\346 -+\200\024\064\161\321\070\327\025\066\203\107\153\327\067\144\102 -+\073\216\215\122\235\253\241\201\302\244\201\277\060\201\274\061 -+\013\060\011\006\003\125\004\006\023\002\125\123\061\020\060\016 -+\006\003\125\004\010\023\007\111\156\144\151\141\156\141\061\025 -+\060\023\006\003\125\004\007\023\014\111\156\144\151\141\156\141 -+\160\157\154\151\163\061\050\060\046\006\003\125\004\012\023\037 -+\123\157\146\164\167\141\162\145\040\151\156\040\164\150\145\040 -+\120\165\142\154\151\143\040\111\156\164\145\162\145\163\164\061 -+\023\060\021\006\003\125\004\013\023\012\150\157\163\164\155\141 -+\163\164\145\162\061\036\060\034\006\003\125\004\003\023\025\103 -+\145\162\164\151\146\151\143\141\164\145\040\101\165\164\150\157 -+\162\151\164\171\061\045\060\043\006\011\052\206\110\206\367\015 -+\001\011\001\026\026\150\157\163\164\155\141\163\164\145\162\100 -+\163\160\151\055\151\156\143\056\157\162\147\202\011\000\350\216 -+\266\311\370\052\024\050\060\017\006\003\125\035\023\001\001\377 -+\004\005\060\003\001\001\377\060\021\006\011\140\206\110\001\206 -+\370\102\001\001\004\004\003\002\000\007\060\011\006\003\125\035 -+\022\004\002\060\000\060\056\006\011\140\206\110\001\206\370\102 -+\001\015\004\041\026\037\123\157\146\164\167\141\162\145\040\151 -+\156\040\164\150\145\040\120\165\142\154\151\143\040\111\156\164 -+\145\162\145\163\164\060\060\006\011\140\206\110\001\206\370\102 -+\001\004\004\043\026\041\150\164\164\160\163\072\057\057\143\141 -+\056\163\160\151\055\151\156\143\056\157\162\147\057\143\141\055 -+\143\162\154\056\160\145\155\060\062\006\011\140\206\110\001\206 -+\370\102\001\003\004\045\026\043\150\164\164\160\163\072\057\057 -+\143\141\056\163\160\151\055\151\156\143\056\157\162\147\057\143 -+\145\162\164\055\143\162\154\056\160\145\155\060\041\006\003\125 -+\035\021\004\032\060\030\201\026\150\157\163\164\155\141\163\164 -+\145\162\100\163\160\151\055\151\156\143\056\157\162\147\060\016 -+\006\003\125\035\017\001\001\377\004\004\003\002\001\006\060\015 -+\006\011\052\206\110\206\367\015\001\001\005\005\000\003\202\002 -+\001\000\264\315\275\340\271\352\262\003\053\176\062\351\336\162 -+\077\311\113\202\136\235\342\257\125\011\242\014\124\350\317\030 -+\074\050\040\035\251\273\003\002\057\122\071\042\371\027\317\255 -+\147\220\263\003\177\330\025\343\153\176\273\233\126\001\257\065 -+\324\332\271\307\147\027\233\324\325\016\067\263\040\101\056\014 -+\001\304\133\371\145\076\302\141\350\322\360\152\225\160\303\306 -+\157\325\065\244\254\131\162\341\211\337\241\240\235\044\275\051 -+\171\351\141\052\331\323\036\311\106\244\010\170\101\222\162\017 -+\253\024\165\355\011\360\242\360\134\357\303\012\142\040\267\302 -+\050\146\256\114\057\056\217\105\143\046\226\360\356\061\346\213 -+\125\233\252\072\371\202\071\035\210\074\342\007\165\032\341\017 -+\261\060\274\161\062\322\072\376\372\241\211\363\103\054\326\162 -+\304\171\247\025\110\005\300\330\055\162\002\343\313\075\026\152 -+\272\311\270\021\020\342\111\205\314\226\107\140\005\045\056\357 -+\165\131\063\365\107\031\026\357\332\154\137\007\310\246\120\266 -+\035\313\146\064\045\374\146\203\353\305\266\060\101\370\106\104 -+\142\250\301\014\124\346\352\114\132\050\346\256\306\267\376\177 -+\073\226\250\056\356\307\150\076\335\000\075\051\257\052\143\253 -+\137\356\111\052\055\305\334\373\321\306\323\321\227\126\122\206 -+\266\224\353\324\140\121\267\374\036\233\314\002\233\324\037\217 -+\371\112\217\266\056\050\073\027\314\305\246\005\343\322\323\265 -+\306\003\311\341\110\102\233\313\077\344\027\340\376\015\001\225 -+\011\272\270\015\161\344\011\160\167\102\330\115\341\102\251\140 -+\203\327\027\211\103\322\324\335\247\030\266\253\324\044\045\207 -+\265\324\342\374\056\042\151\275\255\150\054\377\162\265\230\252 -+\006\234\347\052\152\270\241\223\166\316\260\363\177\234\341\340 -+\117\270\330\206\106\245\063\002\054\045\141\067\052\222\310\254 -+\201\164\150\143\207\063\166\275\005\177\136\325\325\002\155\275 -+\257\377\052\132\252\111\354\230\171\107\123\221\366\016\064\132 -+\311\245\306\353\262\343\305\254\266\240\160\065\273\310\121\151 -+\320\362\265\242\062\156\274\077\240\067\071\174\161\066\246\005 -+\337\014\022\344\026\247\305\326\313\143\243\225\160\077\346\004 -+\243\140 -+END -+ -+# Trust for Certificate "Software in the Public Interest, Inc. Root CA (2008)" -+CKA_CLASS CK_OBJECT_CLASS CKO_NETSCAPE_TRUST -+CKA_TOKEN CK_BBOOL CK_TRUE -+CKA_PRIVATE CK_BBOOL CK_FALSE -+CKA_MODIFIABLE CK_BBOOL CK_FALSE -+CKA_LABEL UTF8 "Software in the Public Interest, Inc. Root CA (2008)" -+CKA_CERT_SHA1_HASH MULTILINE_OCTAL -+\257\160\210\103\203\202\002\025\315\141\306\274\354\375\067\044 -+\251\220\103\034 -+END -+CKA_CERT_MD5_HASH MULTILINE_OCTAL -+\052\107\237\140\273\203\164\157\001\003\327\013\015\366\015\170 -+END -+CKA_ISSUER MULTILINE_OCTAL -+\060\201\274\061\013\060\011\006\003\125\004\006\023\002\125\123 -+\061\020\060\016\006\003\125\004\010\023\007\111\156\144\151\141 -+\156\141\061\025\060\023\006\003\125\004\007\023\014\111\156\144 -+\151\141\156\141\160\157\154\151\163\061\050\060\046\006\003\125 -+\004\012\023\037\123\157\146\164\167\141\162\145\040\151\156\040 -+\164\150\145\040\120\165\142\154\151\143\040\111\156\164\145\162 -+\145\163\164\061\023\060\021\006\003\125\004\013\023\012\150\157 -+\163\164\155\141\163\164\145\162\061\036\060\034\006\003\125\004 -+\003\023\025\103\145\162\164\151\146\151\143\141\164\145\040\101 -+\165\164\150\157\162\151\164\171\061\045\060\043\006\011\052\206 -+\110\206\367\015\001\011\001\026\026\150\157\163\164\155\141\163 -+\164\145\162\100\163\160\151\055\151\156\143\056\157\162\147 -+END -+CKA_SERIAL_NUMBER MULTILINE_OCTAL -+\002\011\000\350\216\266\311\370\052\024\050 -+END -+CKA_TRUST_SERVER_AUTH CK_TRUST CKT_NETSCAPE_TRUSTED_DELEGATOR -+CKA_TRUST_EMAIL_PROTECTION CK_TRUST CKT_NETSCAPE_TRUSTED_DELEGATOR -+CKA_TRUST_CODE_SIGNING CK_TRUST CKT_NETSCAPE_TRUSTED_DELEGATOR -+CKA_TRUST_STEP_UP_APPROVED CK_BBOOL CK_FALSE diff --git a/recipes/mozilla/nss-3.12/build-fix.patch b/recipes/mozilla/nss-3.12/build-fix.patch deleted file mode 100644 index 971e40df44..0000000000 --- a/recipes/mozilla/nss-3.12/build-fix.patch +++ /dev/null @@ -1,63 +0,0 @@ -Index: mozilla/security/coreconf/Linux.mk -=================================================================== ---- mozilla.orig/security/coreconf/Linux.mk 2008-07-25 13:48:56.000000000 +0200 -+++ mozilla/security/coreconf/Linux.mk 2008-07-25 13:49:07.000000000 +0200 -@@ -46,11 +46,11 @@ - IMPL_STRATEGY = _PTH - endif - --CC = gcc --CCC = g++ --RANLIB = ranlib -+CC ?= gcc -+CCC ?= g++ -+RANLIB ?= ranlib - --DEFAULT_COMPILER = gcc -+DEFAULT_COMPILER ?= gcc - - ifeq ($(OS_TEST),m68k) - OS_REL_CFLAGS = -DLINUX1_2 -D_XOPEN_SOURCE -Index: mozilla/security/coreconf/arch.mk -=================================================================== ---- mozilla.orig/security/coreconf/arch.mk 2008-07-25 13:47:34.000000000 +0200 -+++ mozilla/security/coreconf/arch.mk 2008-07-25 13:48:51.000000000 +0200 -@@ -66,7 +66,7 @@ - # Attempt to differentiate between sparc and x86 Solaris - # - --OS_TEST := $(shell uname -m) -+OS_TEST ?= $(shell uname -m) - ifeq ($(OS_TEST),i86pc) - OS_RELEASE := $(shell uname -r)_$(OS_TEST) - else -Index: mozilla/security/nss/lib/softoken/legacydb/manifest.mn -=================================================================== ---- mozilla.orig/security/nss/lib/softoken/legacydb/manifest.mn 2008-07-24 21:21:37.000000000 +0200 -+++ mozilla/security/nss/lib/softoken/legacydb/manifest.mn 2008-07-25 14:01:28.000000000 +0200 -@@ -48,6 +48,10 @@ - - ifdef MOZILLA_CLIENT - INCLUDES += -I$(DIST)/include/sqlite3 -+ -+ifdef SQLITE3_INCLUDE_DIR -+INCLUDES += -I$(SQLITE3_INCLUDE_DIR) -+endif - endif - - CSRCS = \ -Index: mozilla/security/nss/lib/softoken/manifest.mn -=================================================================== ---- mozilla.orig/security/nss/lib/softoken/manifest.mn 2008-07-24 21:20:03.000000000 +0200 -+++ mozilla/security/nss/lib/softoken/manifest.mn 2008-07-25 14:00:43.000000000 +0200 -@@ -49,6 +49,10 @@ - - ifdef MOZILLA_CLIENT - INCLUDES += -I$(DIST)/include/sqlite3 -+ -+ifdef SQLITE3_INCLUDE_DIR -+INCLUDES += -I$(SQLITE3_INCLUDE_DIR) -+endif - endif - - EXPORTS = \ diff --git a/recipes/mozilla/nss-3.12/nss.pc.in b/recipes/mozilla/nss-3.12/nss.pc.in deleted file mode 100644 index 55497e365d..0000000000 --- a/recipes/mozilla/nss-3.12/nss.pc.in +++ /dev/null @@ -1,11 +0,0 @@ -prefix=/usr -exec_prefix=${prefix} -libdir=${exec_prefix}/lib -includedir=${prefix}/include/mozilla/nss - -Name: NSS -Description: Mozilla Network Security Services -Version: @VERSION@ -Requires: nspr -Libs: -L${libdir}/nss -lnss3 -lnssutil3 -lsmime3 -lssl3 -Cflags: -I${includedir} 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 deleted file mode 100644 index a6408954cb..0000000000 --- a/recipes/mozilla/nss_3.12.bb +++ /dev/null @@ -1,105 +0,0 @@ -DESCRIPTION = "Mozilla's SSL and TLS implementation" -HOMEPAGE = "http://www.mozilla.org/projects/security/pki/nss/" - -LICENSE = "MPL1.1 GPL LGPL" - -PR = "r3" - -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://nss.pc.in \ -" - -SRC_URI[archive.md5sum] = "917f4e05f3982bd7fceaede197f0e1d4" -SRC_URI[archive.sha256sum] = "d30a7470b82a73ed442525b365afaf00427204e3771edfeab05743acca97122b" - -S = "${WORKDIR}/nss-${PV}/mozilla" - -TD = "${S}/tentative-dist" -TDS = "${S}/tentative-dist-staging" - -PARALLEL_MAKE = "" - -TARGET_CC_ARCH += "${LDFLAGS}" - -do_compile() { - oe_runmake -C security/nss \ - build_coreconf \ - build_dbm \ - export libs program \ - MOZILLA_CLIENT=1 \ - BUILD_OPT=1 \ - OS_TARGET=Linux \ - OS_TEST="${TARGET_ARCH}" \ - NSPR_INCLUDE_DIR="${STAGING_INCDIR}/mozilla/nspr" \ - NSPR_LIB_DIR="${STAGING_LIBDIR}" \ - SQLITE3_INCLUDE_DIR="${STAGING_INCDIR}" \ - OPTIMIZER="${CFLAGS}" \ - NS_USE_GCC=1 \ - NSS_USE_SYSTEM_SQLITE=1 \ - NSS_ENABLE_ECC=1 \ - DEFAULT_COMPILER="${CC}" \ - CC="${CC}" \ - CCC="${CXX}" \ - CXX="${CXX}" \ - RANLIB="${RANLIB}" \ - NATIVE_CC="${BUILD_CC}" \ - NATIVE_FLAGS="${BUILD_CFLAGS}" - -} - -do_install() { - oe_runmake -C security/nss \ - install \ - MOZILLA_CLIENT=1 \ - BUILD_OPT=1 \ - OS_TARGET=Linux \ - OS_TEST="${TARGET_ARCH}" \ - NSPR_INCLUDE_DIR="${STAGING_INCDIR}/mozilla/nspr" \ - NSPR_LIB_DIR="${STAGING_LIBDIR}" \ - NS_USE_GCC=1 \ - NSS_USE_SYSTEM_SQLITE=1 \ - NSS_ENABLE_ECC=1 \ - SOURCE_LIB_DIR="${TD}/${libdir}" \ - SOURCE_BIN_DIR="${TD}/${bindir}" - - install -d ${D}/${libdir}/nss - - for shared_lib in ${TD}/${libdir}/*.so - do - cp $shared_lib ${D}/${libdir}/nss - done - - install -d ${D}/${includedir}/mozilla/nss - install -m 644 -t ${D}/${includedir}/mozilla/nss dist/public/nss/* - - for static_lib in ${TD}/${libdir}/*.a - do - oe_libinstall -C ${TD}/${libdir} `basename $static_lib .a` ${D}/${libdir}/nss - done - - install -d ${D}/${bindir} - for binary in ${TD}/${bindir}/* - do - install -m 755 -t ${D}/${bindir} $binary - done - - install -d ${D}${libdir}/pkgconfig/ - sed 's/@VERSION@/${PV}/' ${WORKDIR}/nss.pc.in > ${D}${libdir}/pkgconfig/nss.pc - -} - -FILES_${PN} = "${bindir} ${libdir}/nss/*.so" -FILES_${PN}-static += "${libdir}/nss/*.a" diff --git a/recipes/mozilla/rhino-native_1.7r1.bb b/recipes/mozilla/rhino-native_1.7r1.bb deleted file mode 100644 index 1b563603f8..0000000000 --- a/recipes/mozilla/rhino-native_1.7r1.bb +++ /dev/null @@ -1,5 +0,0 @@ -require rhino_${PV}.bb - -inherit java-native - -RDEPENDS_${PN} = "" diff --git a/recipes/mozilla/rhino_1.7r1.bb b/recipes/mozilla/rhino_1.7r1.bb index b7b5d9e7d2..49addfda29 100644 --- a/recipes/mozilla/rhino_1.7r1.bb +++ b/recipes/mozilla/rhino_1.7r1.bb @@ -4,6 +4,8 @@ LICENSE = "GPL MPL" DEPENDS = "fastjar-native" +PR = "r1" + inherit java-library SRC_URI = "\ @@ -17,7 +19,9 @@ S = "${WORKDIR}/rhino1_7R1" PACKAGES = "${JPN} rhino" FILES_${PN} = "${bindir}/rhino ${bindir}/rhino-jsc" + RDEPENDS_${PN} = "java2-runtime ${JPN}" +RDEPENDS_${PN}_virtclass-native = "" do_compile() { mkdir -p build @@ -43,3 +47,6 @@ do_install_append() { SRC_URI[md5sum] = "613eed8201d37be201805e5048ebb0c3" SRC_URI[sha256sum] = "084e250d2392369b2548b663e61bcf128baecb2f527e381e9ba89f0148db2c0d" + +NATIVE_INSTALL_WORKS = "1" +BBCLASSEXTEND = "native" diff --git a/recipes/mozilla/thunderbird_1.0.7.bb b/recipes/mozilla/thunderbird_1.0.7.bb index cc4e6744c0..8bf438d960 100644 --- a/recipes/mozilla/thunderbird_1.0.7.bb +++ b/recipes/mozilla/thunderbird_1.0.7.bb @@ -1,17 +1,17 @@ SECTION = "x11/utils" DEPENDS += "gnupg" -RRECOMMENDS += "gnupg" -PR = "r1" +RRECOMMENDS_${PN} += "gnupg" +PR = "r2" EMVER="0.92.0" 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" |