From e9289cb88946a8b278e0b8df176fa8983745d46f Mon Sep 17 00:00:00 2001 From: Remi Collet Date: Fri, 10 Sep 2010 18:32:25 +0200 Subject: firefox-3.6.9-1 --- benchmark.txt | 53 +++++++++++++++++++++++++++++++++++++++++++ firefox-dev.spec | 10 ++++---- firefox.spec | 38 ++++++++++++++++++++++--------- firefox4-build-sbrk.patch | 24 ++++++++++++++++++++ firefox4-libjpeg-turbo.patch | 54 ++++++++++++++++++++++++++++++++++++++++++++ mozilla-build-sbrk.patch | 18 +++++++-------- mozilla-gdk-pixbuf.patch | 15 ++++++++++++ mozilla-libjpeg-turbo.patch | 14 ++++++------ 8 files changed, 195 insertions(+), 31 deletions(-) create mode 100644 firefox4-build-sbrk.patch create mode 100644 firefox4-libjpeg-turbo.patch create mode 100644 mozilla-gdk-pixbuf.patch diff --git a/benchmark.txt b/benchmark.txt index eb6eaa0..9755de2 100644 --- a/benchmark.txt +++ b/benchmark.txt @@ -56,6 +56,58 @@ Total: 2029.0ms +/- 2.3% validate-input: 68.0ms +/- 35.1% +Mozilla/5.0 (X11; U; Linux x86_64; fr; rv:1.9.2.9) Gecko/20100910 Remi/fc13 Firefox/3.6.9 +============================================ +RESULTS (means and 95% confidence intervals) +-------------------------------------------- +Total: 2105.2ms +/- 3.4% +-------------------------------------------- + + 3d: 261.2ms +/- 8.8% + cube: 86.2ms +/- 1.9% + morph: 93.2ms +/- 25.2% + raytrace: 81.8ms +/- 1.3% + + access: 307.8ms +/- 2.6% + binary-trees: 39.4ms +/- 1.7% + fannkuch: 131.6ms +/- 1.4% + nbody: 98.6ms +/- 7.1% + nsieve: 38.2ms +/- 1.5% + + bitops: 223.8ms +/- 4.2% + 3bit-bits-in-byte: 36.2ms +/- 3.8% + bits-in-byte: 61.2ms +/- 15.0% + bitwise-and: 52.4ms +/- 1.3% + nsieve-bits: 74.0ms +/- 2.9% + + controlflow: 34.2ms +/- 6.5% + recursive: 34.2ms +/- 6.5% + + crypto: 131.2ms +/- 2.1% + aes: 53.0ms +/- 2.3% + md5: 37.8ms +/- 5.4% + sha1: 40.4ms +/- 1.7% + + date: 171.2ms +/- 4.0% + format-tofte: 85.2ms +/- 3.2% + format-xparb: 86.0ms +/- 4.9% + + math: 240.2ms +/- 12.8% + cordic: 94.4ms +/- 2.9% + partial-sums: 100.4ms +/- 31.1% + spectral-norm: 45.4ms +/- 1.5% + + regexp: 185.8ms +/- 3.6% + dna: 185.8ms +/- 3.6% + + string: 549.8ms +/- 8.7% + base64: 38.2ms +/- 3.6% + fasta: 124.8ms +/- 24.9% + tagcloud: 129.2ms +/- 16.9% + unpack-code: 188.0ms +/- 16.5% + validate-input: 69.6ms +/- 12.5% + + Mozilla/5.0 (X11; Linux x86_64; rv:2.0b2) Gecko/20100728 Remi/fc13 Firefox/4.0b2 ============================================ RESULTS (means and 95% confidence intervals) @@ -267,6 +319,7 @@ Total: 523.2ms +/- 3.4% http://v8.googlecode.com/svn/data/benchmarks/v5/run.html ============================================================================== Mozilla/5.0 (X11; U; Linux x86_64; fr; rv:1.9.2.8) Gecko/20100724 Remi/fc13 Firefox/3.6.8 : 225 +Mozilla/5.0 (X11; U; Linux x86_64; fr; rv:1.9.2.9) Gecko/20100910 Remi/fc13 Firefox/3.6.9 : 242 Mozilla/5.0 (X11; Linux x86_64; rv:2.0b3) Gecko/20100815 Remi/fc13 Firefox/4.0b3 : 812 Mozilla/5.0 (X11; Linux x86_64; rv:2.0b4) Gecko/20100825 Remi/fc13 Firefox/4.0b4 : 902 Mozilla/5.0 (X11; Linux x86_64; rv:2.0b5) Gecko/20100101 Firefox/4.0b5 Remi/fc13 : 909 diff --git a/firefox-dev.spec b/firefox-dev.spec index c7130a4..e0a04ac 100644 --- a/firefox-dev.spec +++ b/firefox-dev.spec @@ -55,20 +55,22 @@ Source100: find-external-requires Source200: firefox-bookmarks.html # build patches from xulrunner -#Patch0: xulrunner-version.patch => firefox / firefox4-version.patch -#Patch1: mozilla-build.patch +#Patch0: xulrunner-version.patch => firefox / firefox4-version.patch +#Patch1: mozilla-build.patch Patch1: firefox4-build.patch Patch3: firefox4-jemalloc.patch Patch4: mozilla-about-firefox-version.patch Patch7: xulrunner-1.9.2.1-build.patch Patch8: mozilla-plugin.patch -Patch9: mozilla-build-sbrk.patch +#Patch9: mozilla-build-sbrk.patch +Patch9: firefox4-build-sbrk.patch Patch10: mozilla-build-s390.patch Patch11: mozilla-malloc.patch # Fedora specific patches Patch20: mozilla-193-pkgconfig.patch -Patch21: mozilla-libjpeg-turbo.patch +#Patch21: mozilla-libjpeg-turbo.patch +Patch21: firefox4-libjpeg-turbo.patch # build patches from firefox Patch0: firefox4-version.patch diff --git a/firefox.spec b/firefox.spec index a617abc..033469b 100644 --- a/firefox.spec +++ b/firefox.spec @@ -1,5 +1,5 @@ -%define nspr_version 4.8 -%define nss_version 3.12.6 +%define nspr_version 4.8.6 +%define nss_version 3.12.7 %define cairo_version 1.8.8 %define freetype_version 2.1.9 %define lcms_version 1.18 @@ -29,8 +29,8 @@ Summary: Mozilla Firefox Web browser Name: firefox -Version: 3.6.8 -Release: 1%{?dist}.1 +Version: 3.6.9 +Release: 1%{?dist} URL: http://www.mozilla.org/projects/firefox/ License: MPLv1.1 or GPLv2+ or LGPLv2+ Group: Applications/Internet @@ -43,7 +43,7 @@ Group: Applications/Internet %endif Source0: %{tarball} %if %{build_langpacks} -Source2: firefox-langpacks-%{version}%{?relcan}-20100724.tar.bz2 +Source2: firefox-langpacks-%{version}%{?relcan}-20100910.tar.bz2 %endif Source12: firefox-redhat-default-prefs.js # firefox3.destop without translation to allow change name @@ -62,6 +62,8 @@ Patch4: mozilla-about-firefox-version.patch Patch7: xulrunner-1.9.2.1-build.patch Patch8: mozilla-plugin.patch Patch9: mozilla-build-sbrk.patch +Patch10: mozilla-build-s390.patch +Patch11: mozilla-gdk-pixbuf.patch # build patches from firefox Patch30: firefox-disable-checkupdates.patch @@ -70,6 +72,7 @@ Patch31: firefox-default.patch # Fedora specific patches Patch20: mozilla-192-pkgconfig.patch +Patch21: mozilla-libjpeg-turbo.patch # Upstream patches Patch100: mozilla-ps-pdf-simplify-operators.patch @@ -108,12 +111,13 @@ BuildRequires: wireless-tools-devel %endif # BR from Xulrunner -%if %{fedora} >= 13 +%if %{fedora} >= 15 +# Requires SQLITE_SECURE_DELETE only in F-15 BuildRequires: sqlite-devel >= %{sqlite_version} +BuildRequires: nss-devel >= %{nss_version} +BuildRequires: nspr-devel >= %{nspr_version} %endif %if %{fedora} >= 11 -BuildRequires: nspr-devel >= %{nspr_version} -BuildRequires: nss-devel >= %{nss_version} BuildRequires: hunspell-devel BuildRequires: cairo-devel >= %{cairo_version} %endif @@ -178,8 +182,17 @@ sed -e 's/__RPM_VERSION_INTERNAL__/%{internal_version}/' %{P:%%PATCH0} \ %patch7 -p2 -b .del %patch8 -p1 -b .plugin %patch9 -p2 -b .sbrk +%ifarch s390 +%patch10 -p1 -b .s390 +%endif +%if %{fedora} >= 14 +%patch11 -p1 -b .gdk-pixbuf +%endif %patch20 -p1 -b .pk +%if %{fedora} >= 14 +%patch21 -p2 -b .jpeg-turbo +%endif %patch30 -p1 -b .checkupdates %patch31 -p2 -b .default @@ -195,12 +208,12 @@ cat <= 13 +%if %{fedora} >= 15 ac_add_options --enable-system-sqlite +ac_add_options --with-system-nss +ac_add_options --with-system-nspr %endif %if %{fedora} >= 11 -ac_add_options --with-system-nspr -ac_add_options --with-system-nss ac_add_options --enable-system-hunspell ac_add_options --enable-system-cairo %endif @@ -528,6 +541,9 @@ gtk-update-icon-cache %{_datadir}/icons/hicolor &>/dev/null || : #--------------------------------------------------------------------- %changelog +* Fri Sep 10 2010 Remi Collet - 3.6.9-1 +- update to Firefox 3.6.9 + * Mon Aug 02 2010 Remi Collet - 3.6.8-1.1 - rebuild diff --git a/firefox4-build-sbrk.patch b/firefox4-build-sbrk.patch new file mode 100644 index 0000000..7e8f8c9 --- /dev/null +++ b/firefox4-build-sbrk.patch @@ -0,0 +1,24 @@ +diff -up xulrunner2-2.0/mozilla-central/js/src/shell/js.cpp.sbrk xulrunner2-2.0/mozilla-central/js/src/shell/js.cpp +--- xulrunner2-2.0/mozilla-central/js/src/shell/js.cpp.sbrk 2010-07-20 20:52:15.000000000 -0400 ++++ xulrunner2-2.0/mozilla-central/js/src/shell/js.cpp 2010-07-28 10:21:51.905606001 -0400 +@@ -1118,7 +1118,7 @@ GC(JSContext *cx, uintN argc, jsval *vp) + char buf[256]; + JS_snprintf(buf, sizeof(buf), "before %lu, after %lu, break %08lx\n", + (unsigned long)preBytes, (unsigned long)cx->runtime->gcBytes, +-#ifdef HAVE_SBRK ++#if 0 + (unsigned long)sbrk(0) + #else + 0 +diff -up xulrunner2-2.0/mozilla-central/js/src/xpconnect/shell/xpcshell.cpp.sbrk xulrunner2-2.0/mozilla-central/js/src/xpconnect/shell/xpcshell.cpp +--- xulrunner2-2.0/mozilla-central/js/src/xpconnect/shell/xpcshell.cpp.sbrk 2010-07-20 20:52:20.000000000 -0400 ++++ xulrunner2-2.0/mozilla-central/js/src/xpconnect/shell/xpcshell.cpp 2010-07-28 10:20:36.878606001 -0400 +@@ -540,7 +540,7 @@ GC(JSContext *cx, JSObject *obj, uintN a + JS_GC(cx); + fprintf(gOutFile, "before %lu, after %lu, break %08lx\n", + (unsigned long)preBytes, (unsigned long)rt->gcBytes, +-#if defined(XP_UNIX) && !defined(__SYMBIAN32__) ++#if 0 //defined(XP_UNIX) && !defined(__SYMBIAN32__) + (unsigned long)sbrk(0) + #else + 0 diff --git a/firefox4-libjpeg-turbo.patch b/firefox4-libjpeg-turbo.patch new file mode 100644 index 0000000..9abd0e9 --- /dev/null +++ b/firefox4-libjpeg-turbo.patch @@ -0,0 +1,54 @@ +diff -up xulrunner-1.9.3.0/mozilla-central/modules/libpr0n/decoders/jpeg/nsJPEGDecoder.cpp.jpeg-turbo xulrunner-1.9.3.0/mozilla-central/modules/libpr0n/decoders/jpeg/nsJPEGDecoder.cpp +--- xulrunner-1.9.3.0/mozilla-central/modules/libpr0n/decoders/jpeg/nsJPEGDecoder.cpp.jpeg-turbo 2010-08-06 03:09:15.000000000 +0200 ++++ xulrunner-1.9.3.0/mozilla-central/modules/libpr0n/decoders/jpeg/nsJPEGDecoder.cpp 2010-08-16 11:19:17.000000000 +0200 +@@ -58,19 +58,6 @@ + + extern "C" { + #include "iccjpeg.h" +- +-/* Colorspace conversion (copied from jpegint.h) */ +-struct jpeg_color_deconverter { +- JMETHOD(void, start_pass, (j_decompress_ptr cinfo)); +- JMETHOD(void, color_convert, (j_decompress_ptr cinfo, +- JSAMPIMAGE input_buf, JDIMENSION input_row, +- JSAMPARRAY output_buf, int num_rows)); +-}; +- +-METHODDEF(void) +-ycc_rgb_convert_argb (j_decompress_ptr cinfo, +- JSAMPIMAGE input_buf, JDIMENSION input_row, +- JSAMPARRAY output_buf, int num_rows); + } + + NS_IMPL_ISUPPORTS1(nsJPEGDecoder, imgIDecoder) +@@ -443,14 +430,6 @@ nsresult nsJPEGDecoder::Write(const char + return NS_OK; /* I/O suspension */ + } + +- /* Force to use our YCbCr to Packed RGB converter when possible */ +- if (!mTransform && (gfxPlatform::GetCMSMode() != eCMSMode_All) && +- mInfo.jpeg_color_space == JCS_YCbCr && mInfo.out_color_space == JCS_RGB) { +- /* Special case for the most common case: transform from YCbCr direct into packed ARGB */ +- mInfo.out_color_components = 4; /* Packed ARGB pixels are always 4 bytes...*/ +- mInfo.cconvert->color_convert = ycc_rgb_convert_argb; +- } +- + /* If this is a progressive JPEG ... */ + mState = mInfo.buffered_image ? JPEG_DECOMPRESS_PROGRESSIVE : JPEG_DECOMPRESS_SEQUENTIAL; + } +@@ -616,15 +595,6 @@ nsJPEGDecoder::OutputScanlines(PRBool* s + PRUint32 *imageRow = ((PRUint32*)mImageData) + + (mInfo.output_scanline * mInfo.output_width); + +- if (mInfo.cconvert->color_convert == ycc_rgb_convert_argb) { +- /* Special case: scanline will be directly converted into packed ARGB */ +- if (jpeg_read_scanlines(&mInfo, (JSAMPARRAY)&imageRow, 1) != 1) { +- *suspend = PR_TRUE; /* suspend */ +- break; +- } +- continue; /* all done for this row! */ +- } +- + JSAMPROW sampleRow = (JSAMPROW)imageRow; + if (mInfo.output_components == 3) { + /* Put the pixels at end of row to enable in-place expansion */ diff --git a/mozilla-build-sbrk.patch b/mozilla-build-sbrk.patch index 7e8f8c9..e7e8773 100644 --- a/mozilla-build-sbrk.patch +++ b/mozilla-build-sbrk.patch @@ -1,19 +1,19 @@ -diff -up xulrunner2-2.0/mozilla-central/js/src/shell/js.cpp.sbrk xulrunner2-2.0/mozilla-central/js/src/shell/js.cpp ---- xulrunner2-2.0/mozilla-central/js/src/shell/js.cpp.sbrk 2010-07-20 20:52:15.000000000 -0400 -+++ xulrunner2-2.0/mozilla-central/js/src/shell/js.cpp 2010-07-28 10:21:51.905606001 -0400 -@@ -1118,7 +1118,7 @@ GC(JSContext *cx, uintN argc, jsval *vp) +diff -up xulrunner-1.9.2.1/mozilla-1.9.2/js/src/shell/js.cpp.sbrk xulrunner-1.9.2.1/mozilla-1.9.2/js/src/shell/js.cpp +--- xulrunner-1.9.2.1/mozilla-1.9.2/js/src/shell/js.cpp.sbrk 2010-01-06 04:35:17.000000000 +0100 ++++ xulrunner-1.9.2.1/mozilla-1.9.2/js/src/shell/js.cpp 2010-01-13 21:49:33.000000000 +0100 +@@ -1119,7 +1119,7 @@ GC(JSContext *cx, uintN argc, jsval *vp) char buf[256]; JS_snprintf(buf, sizeof(buf), "before %lu, after %lu, break %08lx\n", - (unsigned long)preBytes, (unsigned long)cx->runtime->gcBytes, + (unsigned long)preBytes, (unsigned long)rt->gcBytes, -#ifdef HAVE_SBRK +#if 0 (unsigned long)sbrk(0) #else 0 -diff -up xulrunner2-2.0/mozilla-central/js/src/xpconnect/shell/xpcshell.cpp.sbrk xulrunner2-2.0/mozilla-central/js/src/xpconnect/shell/xpcshell.cpp ---- xulrunner2-2.0/mozilla-central/js/src/xpconnect/shell/xpcshell.cpp.sbrk 2010-07-20 20:52:20.000000000 -0400 -+++ xulrunner2-2.0/mozilla-central/js/src/xpconnect/shell/xpcshell.cpp 2010-07-28 10:20:36.878606001 -0400 -@@ -540,7 +540,7 @@ GC(JSContext *cx, JSObject *obj, uintN a +diff -up xulrunner-1.9.2.1/mozilla-1.9.2/js/src/xpconnect/shell/xpcshell.cpp.sbrk xulrunner-1.9.2.1/mozilla-1.9.2/js/src/xpconnect/shell/xpcshell.cpp +--- xulrunner-1.9.2.1/mozilla-1.9.2/js/src/xpconnect/shell/xpcshell.cpp.sbrk 2010-01-06 04:35:19.000000000 +0100 ++++ xulrunner-1.9.2.1/mozilla-1.9.2/js/src/xpconnect/shell/xpcshell.cpp 2010-01-13 22:32:46.000000000 +0100 +@@ -543,7 +543,7 @@ GC(JSContext *cx, JSObject *obj, uintN a JS_GC(cx); fprintf(gOutFile, "before %lu, after %lu, break %08lx\n", (unsigned long)preBytes, (unsigned long)rt->gcBytes, diff --git a/mozilla-gdk-pixbuf.patch b/mozilla-gdk-pixbuf.patch new file mode 100644 index 0000000..0596b1b --- /dev/null +++ b/mozilla-gdk-pixbuf.patch @@ -0,0 +1,15 @@ +diff -up mozilla-1.9.2/configure.in.gdk-pixbuf mozilla-1.9.2/configure.in +--- mozilla-1.9.2/configure.in.gdk-pixbuf 2010-07-13 21:10:45.000000000 +0200 ++++ mozilla-1.9.2/configure.in 2010-08-03 15:38:43.113733420 +0200 +@@ -5354,7 +5354,10 @@ then + then + if test "$MOZ_ENABLE_LIBNOTIFY" + then +- PKG_CHECK_MODULES(MOZ_LIBNOTIFY, libnotify >= $LIBNOTIFY_VERSION) ++ dnl Code which requires gdk-pixbuf is only in ++ dnl toolkit/system/gnome/nsAlertsIconListener.cpp and is compiled ++ dnl only when libnotify is enabled ++ PKG_CHECK_MODULES(MOZ_LIBNOTIFY, libnotify >= $LIBNOTIFY_VERSION gdk-pixbuf-2.0 gtk+-2.0) + fi + fi + fi diff --git a/mozilla-libjpeg-turbo.patch b/mozilla-libjpeg-turbo.patch index 9abd0e9..0016a51 100644 --- a/mozilla-libjpeg-turbo.patch +++ b/mozilla-libjpeg-turbo.patch @@ -1,7 +1,7 @@ -diff -up xulrunner-1.9.3.0/mozilla-central/modules/libpr0n/decoders/jpeg/nsJPEGDecoder.cpp.jpeg-turbo xulrunner-1.9.3.0/mozilla-central/modules/libpr0n/decoders/jpeg/nsJPEGDecoder.cpp ---- xulrunner-1.9.3.0/mozilla-central/modules/libpr0n/decoders/jpeg/nsJPEGDecoder.cpp.jpeg-turbo 2010-08-06 03:09:15.000000000 +0200 -+++ xulrunner-1.9.3.0/mozilla-central/modules/libpr0n/decoders/jpeg/nsJPEGDecoder.cpp 2010-08-16 11:19:17.000000000 +0200 -@@ -58,19 +58,6 @@ +diff -up xulrunner-1.9.2.7/mozilla-1.9.2/modules/libpr0n/decoders/jpeg/nsJPEGDecoder.cpp.old xulrunner-1.9.2.7/mozilla-1.9.2/modules/libpr0n/decoders/jpeg/nsJPEGDecoder.cpp +--- xulrunner-1.9.2.7/mozilla-1.9.2/modules/libpr0n/decoders/jpeg/nsJPEGDecoder.cpp.old 2010-07-13 21:10:28.000000000 +0200 ++++ xulrunner-1.9.2.7/mozilla-1.9.2/modules/libpr0n/decoders/jpeg/nsJPEGDecoder.cpp 2010-07-22 12:33:21.000000000 +0200 +@@ -57,19 +57,6 @@ extern "C" { #include "iccjpeg.h" @@ -21,12 +21,12 @@ diff -up xulrunner-1.9.3.0/mozilla-central/modules/libpr0n/decoders/jpeg/nsJPEGD } NS_IMPL_ISUPPORTS1(nsJPEGDecoder, imgIDecoder) -@@ -443,14 +430,6 @@ nsresult nsJPEGDecoder::Write(const char +@@ -514,14 +501,6 @@ nsresult nsJPEGDecoder::ProcessData(cons return NS_OK; /* I/O suspension */ } - /* Force to use our YCbCr to Packed RGB converter when possible */ -- if (!mTransform && (gfxPlatform::GetCMSMode() != eCMSMode_All) && +- if (!mTransform && (gfxPlatform::GetCMSMode() == eCMSMode_Off) && - mInfo.jpeg_color_space == JCS_YCbCr && mInfo.out_color_space == JCS_RGB) { - /* Special case for the most common case: transform from YCbCr direct into packed ARGB */ - mInfo.out_color_components = 4; /* Packed ARGB pixels are always 4 bytes...*/ @@ -36,7 +36,7 @@ diff -up xulrunner-1.9.3.0/mozilla-central/modules/libpr0n/decoders/jpeg/nsJPEGD /* If this is a progressive JPEG ... */ mState = mInfo.buffered_image ? JPEG_DECOMPRESS_PROGRESSIVE : JPEG_DECOMPRESS_SEQUENTIAL; } -@@ -616,15 +595,6 @@ nsJPEGDecoder::OutputScanlines(PRBool* s +@@ -678,15 +657,6 @@ nsJPEGDecoder::OutputScanlines(PRBool* s PRUint32 *imageRow = ((PRUint32*)mImageData) + (mInfo.output_scanline * mInfo.output_width); -- cgit