From bd558780fab1e8e00d715e4bac3ee2fa86ac179c Mon Sep 17 00:00:00 2001 From: Koen Kooi Date: Wed, 15 Oct 2008 10:08:06 +0200 Subject: firefox 3.1: move from alpha2 to beta1 --- .../mozilla/firefox-3.0.1+3.1a2/.mtn2git_empty | 0 .../mozilla/firefox-3.0.1+3.1a2/arm/.mtn2git_empty | 0 packages/mozilla/firefox-3.0.1+3.1a2/arm/mozconfig | 67 ---------------------- .../jsautocfg-dontoverwrite.patch | 23 -------- packages/mozilla/firefox-3.0.1+3.1a2/mozconfig | 66 --------------------- .../firefox-3.0.1+3.1a2/random_to_urandom.diff | 26 --------- packages/mozilla/firefox-3.0.1+3.1b1/arm/mozconfig | 67 ++++++++++++++++++++++ .../jsautocfg-dontoverwrite.patch | 23 ++++++++ packages/mozilla/firefox-3.0.1+3.1b1/mozconfig | 66 +++++++++++++++++++++ .../firefox-3.0.1+3.1b1/random_to_urandom.diff | 26 +++++++++ packages/mozilla/firefox_3.1a2.bb | 47 --------------- packages/mozilla/firefox_3.1b1.bb | 47 +++++++++++++++ 12 files changed, 229 insertions(+), 229 deletions(-) delete mode 100644 packages/mozilla/firefox-3.0.1+3.1a2/.mtn2git_empty delete mode 100644 packages/mozilla/firefox-3.0.1+3.1a2/arm/.mtn2git_empty delete mode 100644 packages/mozilla/firefox-3.0.1+3.1a2/arm/mozconfig delete mode 100644 packages/mozilla/firefox-3.0.1+3.1a2/jsautocfg-dontoverwrite.patch delete mode 100644 packages/mozilla/firefox-3.0.1+3.1a2/mozconfig delete mode 100644 packages/mozilla/firefox-3.0.1+3.1a2/random_to_urandom.diff create mode 100644 packages/mozilla/firefox-3.0.1+3.1b1/arm/mozconfig create mode 100644 packages/mozilla/firefox-3.0.1+3.1b1/jsautocfg-dontoverwrite.patch create mode 100644 packages/mozilla/firefox-3.0.1+3.1b1/mozconfig create mode 100644 packages/mozilla/firefox-3.0.1+3.1b1/random_to_urandom.diff delete mode 100644 packages/mozilla/firefox_3.1a2.bb create mode 100644 packages/mozilla/firefox_3.1b1.bb diff --git a/packages/mozilla/firefox-3.0.1+3.1a2/.mtn2git_empty b/packages/mozilla/firefox-3.0.1+3.1a2/.mtn2git_empty deleted file mode 100644 index e69de29bb2..0000000000 diff --git a/packages/mozilla/firefox-3.0.1+3.1a2/arm/.mtn2git_empty b/packages/mozilla/firefox-3.0.1+3.1a2/arm/.mtn2git_empty deleted file mode 100644 index e69de29bb2..0000000000 diff --git a/packages/mozilla/firefox-3.0.1+3.1a2/arm/mozconfig b/packages/mozilla/firefox-3.0.1+3.1a2/arm/mozconfig deleted file mode 100644 index 094a0ff642..0000000000 --- a/packages/mozilla/firefox-3.0.1+3.1a2/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/packages/mozilla/firefox-3.0.1+3.1a2/jsautocfg-dontoverwrite.patch b/packages/mozilla/firefox-3.0.1+3.1a2/jsautocfg-dontoverwrite.patch deleted file mode 100644 index 39978cfd11..0000000000 --- a/packages/mozilla/firefox-3.0.1+3.1a2/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/packages/mozilla/firefox-3.0.1+3.1a2/mozconfig b/packages/mozilla/firefox-3.0.1+3.1a2/mozconfig deleted file mode 100644 index f7ab5dd3a3..0000000000 --- a/packages/mozilla/firefox-3.0.1+3.1a2/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/packages/mozilla/firefox-3.0.1+3.1a2/random_to_urandom.diff b/packages/mozilla/firefox-3.0.1+3.1a2/random_to_urandom.diff deleted file mode 100644 index f969752381..0000000000 --- a/packages/mozilla/firefox-3.0.1+3.1a2/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 - #include - - 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/packages/mozilla/firefox-3.0.1+3.1b1/arm/mozconfig b/packages/mozilla/firefox-3.0.1+3.1b1/arm/mozconfig new file mode 100644 index 0000000000..094a0ff642 --- /dev/null +++ b/packages/mozilla/firefox-3.0.1+3.1b1/arm/mozconfig @@ -0,0 +1,67 @@ +. $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/packages/mozilla/firefox-3.0.1+3.1b1/jsautocfg-dontoverwrite.patch b/packages/mozilla/firefox-3.0.1+3.1b1/jsautocfg-dontoverwrite.patch new file mode 100644 index 0000000000..39978cfd11 --- /dev/null +++ b/packages/mozilla/firefox-3.0.1+3.1b1/jsautocfg-dontoverwrite.patch @@ -0,0 +1,23 @@ +--- 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/packages/mozilla/firefox-3.0.1+3.1b1/mozconfig b/packages/mozilla/firefox-3.0.1+3.1b1/mozconfig new file mode 100644 index 0000000000..f7ab5dd3a3 --- /dev/null +++ b/packages/mozilla/firefox-3.0.1+3.1b1/mozconfig @@ -0,0 +1,66 @@ +. $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/packages/mozilla/firefox-3.0.1+3.1b1/random_to_urandom.diff b/packages/mozilla/firefox-3.0.1+3.1b1/random_to_urandom.diff new file mode 100644 index 0000000000..f969752381 --- /dev/null +++ b/packages/mozilla/firefox-3.0.1+3.1b1/random_to_urandom.diff @@ -0,0 +1,26 @@ +# 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 + #include + + 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/packages/mozilla/firefox_3.1a2.bb b/packages/mozilla/firefox_3.1a2.bb deleted file mode 100644 index 4d5c3cbf3b..0000000000 --- a/packages/mozilla/firefox_3.1a2.bb +++ /dev/null @@ -1,47 +0,0 @@ -DEPENDS += "cairo" - -PV = "3.0.1+3.1a2" -MOZPV = "3.1a2" -PR = "r1" - -SRC_URI = "http://ftp.mozilla.org/pub/mozilla.org/firefox/nightly/${MOZPV}-candidates/build1/firefox-${MOZPV}-source.tar.bz2 \ - file://jsautocfg.h \ - file://jsautocfg-dontoverwrite.patch;patch=1 \ - file://random_to_urandom.diff;patch=1 \ -" - -S = "${WORKDIR}/" - -DEFAULT_PREFERENCE = "-1" - -inherit mozilla -require firefox.inc - -export HOST_LIBIDL_CONFIG = "${STAGING_BINDIR_NATIVE}/libIDL-config-2" -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 -} - diff --git a/packages/mozilla/firefox_3.1b1.bb b/packages/mozilla/firefox_3.1b1.bb new file mode 100644 index 0000000000..eac4adcb75 --- /dev/null +++ b/packages/mozilla/firefox_3.1b1.bb @@ -0,0 +1,47 @@ +DEPENDS += "cairo" + +PV = "3.0.1+3.1b1" +MOZPV = "3.1b1" +PR = "r0" + +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 + +export HOST_LIBIDL_CONFIG = "${STAGING_BINDIR_NATIVE}/libIDL-config-2" +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 +} + -- cgit v1.2.3