diff options
| -rw-r--r-- | Makefile | 4 | ||||
| -rw-r--r-- | bench/kraken.txt | 498 | ||||
| -rw-r--r-- | bench/sunspider.txt | 797 | ||||
| -rw-r--r-- | bench/v8.txt | 87 | ||||
| -rwxr-xr-x | ffxpi | 109 | ||||
| -rw-r--r-- | firefox-5.0-asciidel.patch | 15 | ||||
| -rw-r--r-- | firefox-8.0-enable-addons.patch | 26 | ||||
| -rw-r--r-- | firefox-install-dir.patch | 25 | ||||
| -rw-r--r-- | firefox-mozconfig | 40 | ||||
| -rw-r--r-- | firefox-mozconfig-branded | 1 | ||||
| -rw-r--r-- | firefox-mozconfig-debuginfo | 5 | ||||
| -rw-r--r-- | firefox-redhat-default-prefs.js | 12 | ||||
| -rw-r--r-- | firefox.1 | 125 | ||||
| -rw-r--r-- | firefox.desktop | 52 | ||||
| -rw-r--r-- | firefox.sh.in | 238 | ||||
| -rw-r--r-- | firefox.spec | 619 | 
16 files changed, 2653 insertions, 0 deletions
| diff --git a/Makefile b/Makefile new file mode 100644 index 0000000..1e65467 --- /dev/null +++ b/Makefile @@ -0,0 +1,4 @@ +SRCDIR := $(shell pwd) +NAME := $(shell basename $(SRCDIR)) +include ../common/Makefile + diff --git a/bench/kraken.txt b/bench/kraken.txt new file mode 100644 index 0000000..81c1b22 --- /dev/null +++ b/bench/kraken.txt @@ -0,0 +1,498 @@ +========================================================================== +Kraken JavaScript Benchmark Results +	http://krakenbenchmark.mozilla.com/kraken-1.0/driver.html +========================================================================== + +Intel(R) Core(TM)2 Quad CPU    Q6600  @ 2.40GHz + +	Mozilla/5.0 (X11; U; Linux x86_64; fr; rv:1.9.2.12) Gecko/20101028 Remi/fc14 Firefox/3.6.12	105225.0 +	Mozilla/5.0 (X11; Linux x86_64; rv:2.0b6) Gecko/20100101 Firefox/4.0b6 Remi/fc14		 12185.7 +	Mozilla/5.0 (X11; Linux x86_64; rv:2.0b7) Gecko/20100101 Firefox/4.0b7				  9427.9 +	Mozilla/5.0 (X11; Linux x86_64; rv:2.0b8) Gecko/20100101 Firefox/4.0b8				  9350.0	 + +Intel(R) Core(TM) i5 CPU         760  @ 2.80GHz + +	Mozilla/5.0 (X11; U; Linux x86_64; fr; rv:1.9.2.10) Gecko/20101005 Fedora/3.6.10-1.fc14 Firefox/3.6.10	61796.7 +	Mozilla/5.0 (X11; U; Linux x86_64; fr; rv:1.9.2.13) Gecko/20110103 Fedora/3.6.13-1.fc14 Firefox/3.6.13	60490.3 +	Mozilla/5.0 (X11; Linux x86_64; rv:2.0b7) Gecko/20100101 Firefox/4.0b7					 5278.1 +	Mozilla/5.0 (X11; Linux x86_64; rv:2.0b8) Gecko/20100101 Firefox/4.0b8					 5221.3 +	Mozilla/5.0 (X11; Linux x86_64; rv:2.0b9) Gecko/20100101 Firefox/4.0b9					 5143.7 +	Mozilla/5.0 (X11; Linux x86_64; rv:2.0b10) Gecko/20100101 Firefox/4.0b10				 4712.3 +	Mozilla/5.0 (X11; Linux x86_64; rv:2.0b11) Gecko/20110203 Firefox/4.0b11				 4734.2 +	Mozilla/5.0 (X11; Linux x86_64; rv:2.0b12) Gecko/20100101 Firefox/4.0b12				 4548.8 +	Mozilla/5.0 (X11; Linux x86_64; rv:2.0) Gecko/20100101 Firefox/4.0 (rc1)				 4589.7 +	Mozilla/5.0 (X11; Linux x86_64; rv:2.0) Gecko/20100101 Firefox/4.0 (rc2)				 4585.6 +        Mozilla/5.0 (X11; Linux x86_64; rv:2.0.1) Gecko/20100101 Firefox/4.0.1                                   4292.4 +        Mozilla/5.0 (X11; Linux x86_64; rv:5.0) Gecko/20100101 Firefox/5.0b5                                     4338.0 +        Mozilla/5.0 (X11; Linux x86_64; rv:5.0) Gecko/20100101 Firefox/5.0b7                                     4296.6 +        Mozilla/5.0 (X11; Linux x86_64; rv:6.0) Gecko/20100101 Firefox/6.0                                       4251.9 +        Mozilla/5.0 (X11; Linux x86_64; rv:7.0) Gecko/20100101 Firefox/7.0                                       4319.8 +         +============================================================================== +Mozilla/5.0 (X11; Linux x86_64; rv:7.0) Gecko/20100101 Firefox/7.0 +=============================================== +RESULTS (means and 95% confidence intervals) +----------------------------------------------- +Total:                        4319.8ms +/- 1.2% +----------------------------------------------- + +  ai:                         1048.0ms +/- 5.7% +    astar:                    1048.0ms +/- 5.7% + +  audio:                      1096.8ms +/- 1.2% +    beat-detection:            325.3ms +/- 4.5% +    dft:                       234.1ms +/- 0.9% +    fft:                       211.6ms +/- 1.0% +    oscillator:                325.8ms +/- 1.2% + +  imaging:                    1398.1ms +/- 0.4% +    gaussian-blur:             529.6ms +/- 0.4% +    darkroom:                  204.0ms +/- 2.7% +    desaturate:                664.5ms +/- 0.5% + +  json:                        122.1ms +/- 0.9% +    parse-financial:            69.2ms +/- 0.9% +    stringify-tinderbox:        52.9ms +/- 2.1% + +  stanford:                    654.8ms +/- 0.6% +    crypto-aes:                198.2ms +/- 1.4% +    crypto-ccm:                134.8ms +/- 1.3% +    crypto-pbkdf2:             220.1ms +/- 1.0% +    crypto-sha256-iterative:   101.7ms +/- 2.9% +============================================================================== +Mozilla/5.0 (X11; Linux x86_64; rv:6.0) Gecko/20100101 Firefox/6.0 +=============================================== +RESULTS (means and 95% confidence intervals) +----------------------------------------------- +Total:                        4251.9ms +/- 0.8% +----------------------------------------------- + +  ai:                         1005.2ms +/- 1.7% +    astar:                    1005.2ms +/- 1.7% + +  audio:                      1092.7ms +/- 1.5% +    beat-detection:            312.3ms +/- 4.4% +    dft:                       246.9ms +/- 2.1% +    fft:                       211.3ms +/- 0.7% +    oscillator:                322.2ms +/- 0.7% + +  imaging:                    1388.0ms +/- 0.4% +    gaussian-blur:             520.6ms +/- 0.5% +    darkroom:                  202.7ms +/- 1.0% +    desaturate:                664.7ms +/- 0.4% + +  json:                        126.1ms +/- 1.8% +    parse-financial:            71.0ms +/- 3.5% +    stringify-tinderbox:        55.1ms +/- 0.7% + +  stanford:                    639.9ms +/- 0.8% +    crypto-aes:                197.3ms +/- 0.7% +    crypto-ccm:                131.6ms +/- 1.4% +    crypto-pbkdf2:             210.0ms +/- 1.7% +    crypto-sha256-iterative:   101.0ms +/- 1.5% +============================================================================== +Mozilla/5.0 (X11; Linux x86_64; rv:5.0) Gecko/20100101 Firefox/5.0b7 +=============================================== +RESULTS (means and 95% confidence intervals) +----------------------------------------------- +Total:                        4296.6ms +/- 0.6% +----------------------------------------------- + +  ai:                         1008.0ms +/- 2.2% +    astar:                    1008.0ms +/- 2.2% + +  audio:                      1111.8ms +/- 1.5% +    beat-detection:            329.8ms +/- 4.7% +    dft:                       254.1ms +/- 3.7% +    fft:                       208.4ms +/- 0.5% +    oscillator:                319.5ms +/- 0.6% + +  imaging:                    1383.3ms +/- 0.6% +    gaussian-blur:             518.0ms +/- 0.8% +    darkroom:                  209.1ms +/- 4.5% +    desaturate:                656.2ms +/- 0.0% + +  json:                        122.7ms +/- 0.4% +    parse-financial:            67.0ms +/- 0.0% +    stringify-tinderbox:        55.7ms +/- 0.9% + +  stanford:                    670.8ms +/- 0.6% +    crypto-aes:                203.1ms +/- 1.3% +    crypto-ccm:                132.5ms +/- 0.8% +    crypto-pbkdf2:             235.2ms +/- 0.6% +    crypto-sha256-iterative:   100.0ms +/- 1.1% +         +========================================================================================= +Mozilla/5.0 (X11; Linux x86_64; rv:5.0) Gecko/20100101 Firefox/5.0b5  +=============================================== +RESULTS (means and 95% confidence intervals) +----------------------------------------------- +Total:                        4338.0ms +/- 0.5% +----------------------------------------------- + +  ai:                         1011.8ms +/- 1.9% +    astar:                    1011.8ms +/- 1.9% + +  audio:                      1117.8ms +/- 1.7% +    beat-detection:            333.5ms +/- 4.9% +    dft:                       251.4ms +/- 1.5% +    fft:                       211.9ms +/- 0.8% +    oscillator:                321.0ms +/- 0.6% + +  imaging:                    1411.5ms +/- 1.4% +    gaussian-blur:             529.4ms +/- 3.5% +    darkroom:                  200.4ms +/- 0.4% +    desaturate:                681.7ms +/- 0.3% + +  json:                        124.8ms +/- 1.3% +    parse-financial:            68.8ms +/- 2.3% +    stringify-tinderbox:        56.0ms +/- 1.5% + +  stanford:                    672.1ms +/- 0.7% +    crypto-aes:                199.6ms +/- 1.1% +    crypto-ccm:                135.2ms +/- 1.6% +    crypto-pbkdf2:             236.1ms +/- 1.2% +    crypto-sha256-iterative:   101.2ms +/- 1.3% +========================================================================================= +Mozilla/5.0 (X11; Linux x86_64; rv:2.0.1) Gecko/20100101 Firefox/4.0.1 +=============================================== +RESULTS (means and 95% confidence intervals) +----------------------------------------------- +Total:                        4292.4ms +/- 0.4% +----------------------------------------------- + +  ai:                         1054.6ms +/- 0.3% +    astar:                    1054.6ms +/- 0.3% + +  audio:                      1082.3ms +/- 1.7% +    beat-detection:            298.9ms +/- 4.5% +    dft:                       267.3ms +/- 1.6% +    fft:                       205.1ms +/- 6.9% +    oscillator:                311.0ms +/- 0.7% + +  imaging:                    1375.2ms +/- 0.1% +    gaussian-blur:             515.4ms +/- 0.4% +    darkroom:                  199.5ms +/- 0.6% +    desaturate:                660.3ms +/- 0.2% + +  json:                        144.2ms +/- 1.1% +    parse-financial:            94.3ms +/- 1.4% +    stringify-tinderbox:        49.9ms +/- 0.8% + +  stanford:                    636.1ms +/- 0.5% +    crypto-aes:                187.5ms +/- 1.1% +    crypto-ccm:                126.9ms +/- 1.0% +    crypto-pbkdf2:             225.4ms +/- 0.7% +    crypto-sha256-iterative:    96.3ms +/- 0.4% +========================================================================================= +Mozilla/5.0 (X11; Linux x86_64; rv:2.0) Gecko/20100101 Firefox/4.0 (rc2) +=============================================== +RESULTS (means and 95% confidence intervals) +----------------------------------------------- +Total:                        4585.6ms +/- 0.2% +----------------------------------------------- + +  ai:                         1040.1ms +/- 0.7% +    astar:                    1040.1ms +/- 0.7% + +  audio:                      1347.0ms +/- 0.2% +    beat-detection:            432.1ms +/- 0.7% +    dft:                       274.7ms +/- 0.8% +    fft:                       322.1ms +/- 0.4% +    oscillator:                318.1ms +/- 0.3% + +  imaging:                    1378.2ms +/- 0.3% +    gaussian-blur:             521.9ms +/- 0.5% +    darkroom:                  198.0ms +/- 0.0% +    desaturate:                658.3ms +/- 0.4% + +  json:                        156.4ms +/- 1.2% +    parse-financial:            98.1ms +/- 1.8% +    stringify-tinderbox:        58.3ms +/- 0.6% + +  stanford:                    663.9ms +/- 0.7% +    crypto-aes:                202.7ms +/- 1.1% +    crypto-ccm:                144.5ms +/- 2.3% +    crypto-pbkdf2:             210.5ms +/- 0.5% +    crypto-sha256-iterative:   106.2ms +/- 1.0% +========================================================================================= +Mozilla/5.0 (X11; Linux x86_64; rv:2.0) Gecko/20100101 Firefox/4.0 (rc1) +=============================================== +RESULTS (means and 95% confidence intervals) +----------------------------------------------- +Total:                        4589.7ms +/- 0.4% +----------------------------------------------- + +  ai:                         1039.4ms +/- 0.6% +    astar:                    1039.4ms +/- 0.6% + +  audio:                      1336.8ms +/- 0.3% +    beat-detection:            427.4ms +/- 0.6% +    dft:                       274.2ms +/- 0.4% +    fft:                       318.2ms +/- 0.6% +    oscillator:                317.0ms +/- 0.2% + +  imaging:                    1389.0ms +/- 0.5% +    gaussian-blur:             522.8ms +/- 0.5% +    darkroom:                  199.5ms +/- 0.4% +    desaturate:                666.7ms +/- 0.9% + +  json:                        154.9ms +/- 1.7% +    parse-financial:            98.1ms +/- 2.7% +    stringify-tinderbox:        56.8ms +/- 0.5% + +  stanford:                    669.6ms +/- 0.8% +    crypto-aes:                204.7ms +/- 0.7% +    crypto-ccm:                145.6ms +/- 3.1% +    crypto-pbkdf2:             210.0ms +/- 0.5% +    crypto-sha256-iterative:   109.3ms +/- 1.7% +========================================================================================= +Mozilla/5.0 (X11; Linux x86_64; rv:2.0b12) Gecko/20100101 Firefox/4.0b12				 +=============================================== +RESULTS (means and 95% confidence intervals) +----------------------------------------------- +Total:                        4548.8ms +/- 0.5% +----------------------------------------------- + +  ai:                         1011.0ms +/- 1.7% +    astar:                    1011.0ms +/- 1.7% + +  audio:                      1348.9ms +/- 0.3% +    beat-detection:            428.4ms +/- 0.4% +    dft:                       278.0ms +/- 1.4% +    fft:                       320.1ms +/- 0.5% +    oscillator:                322.4ms +/- 0.3% + +  imaging:                    1375.1ms +/- 0.4% +    gaussian-blur:             516.7ms +/- 0.2% +    darkroom:                  198.7ms +/- 0.3% +    desaturate:                659.7ms +/- 0.7% + +  json:                        155.8ms +/- 0.5% +    parse-financial:            97.2ms +/- 1.0% +    stringify-tinderbox:        58.6ms +/- 1.5% + +  stanford:                    658.0ms +/- 0.7% +    crypto-aes:                200.3ms +/- 1.2% +    crypto-ccm:                144.1ms +/- 2.1% +    crypto-pbkdf2:             210.7ms +/- 0.6% +    crypto-sha256-iterative:   102.9ms +/- 0.8% +========================================================================================= +Mozilla/5.0 (X11; Linux x86_64; rv:2.0b11) Gecko/20110203 Firefox/4.0b11 +=============================================== +RESULTS (means and 95% confidence intervals) +----------------------------------------------- +Total:                        4734.2ms +/- 1.6% +----------------------------------------------- + +  ai:                         1111.4ms +/- 6.6% +    astar:                    1111.4ms +/- 6.6% + +  audio:                      1397.6ms +/- 1.2% +    beat-detection:            441.7ms +/- 3.2% +    dft:                       275.8ms +/- 1.7% +    fft:                       356.6ms +/- 2.5% +    oscillator:                323.5ms +/- 2.0% + +  imaging:                    1373.7ms +/- 0.2% +    gaussian-blur:             518.3ms +/- 0.4% +    darkroom:                  197.6ms +/- 0.2% +    desaturate:                657.8ms +/- 0.1% + +  json:                        153.8ms +/- 1.7% +    parse-financial:           100.1ms +/- 2.3% +    stringify-tinderbox:        53.7ms +/- 1.1% + +  stanford:                    697.7ms +/- 2.0% +    crypto-aes:                215.2ms +/- 6.4% +    crypto-ccm:                157.6ms +/- 5.6% +    crypto-pbkdf2:             225.8ms +/- 5.2% +    crypto-sha256-iterative:    99.1ms +/- 6.0% +========================================================================================= +Mozilla/5.0 (X11; Linux x86_64; rv:2.0b10) Gecko/20100101 Firefox/4.0b10 +=============================================== +RESULTS (means and 95% confidence intervals) +----------------------------------------------- +Total:                        4712.3ms +/- 0.7% +----------------------------------------------- + +  ai:                         1058.1ms +/- 0.6% +    astar:                    1058.1ms +/- 0.6% + +  audio:                      1413.1ms +/- 1.8% +    beat-detection:            437.5ms +/- 4.3% +    dft:                       276.3ms +/- 3.1% +    fft:                       345.9ms +/- 2.9% +    oscillator:                353.4ms +/- 2.7% + +  imaging:                    1377.9ms +/- 0.5% +    gaussian-blur:             518.9ms +/- 0.7% +    darkroom:                  198.9ms +/- 0.5% +    desaturate:                660.1ms +/- 0.5% + +  json:                        170.8ms +/- 1.8% +    parse-financial:           112.0ms +/- 2.6% +    stringify-tinderbox:        58.8ms +/- 1.7% + +  stanford:                    692.4ms +/- 0.7% +    crypto-aes:                207.2ms +/- 5.1% +    crypto-ccm:                152.2ms +/- 0.4% +    crypto-pbkdf2:             237.8ms +/- 3.6% +    crypto-sha256-iterative:    95.2ms +/- 1.9% +========================================================================================= +Mozilla/5.0 (X11; Linux x86_64; rv:2.0b9) Gecko/20100101 Firefox/4.0b9 +=============================================== +RESULTS (means and 95% confidence intervals) +----------------------------------------------- +Total:                        5143.7ms +/- 0.3% +----------------------------------------------- + +  ai:                         1438.2ms +/- 0.4% +    astar:                    1438.2ms +/- 0.4% + +  audio:                      1493.7ms +/- 1.1% +    beat-detection:            466.2ms +/- 1.2% +    dft:                       289.8ms +/- 5.2% +    fft:                       357.4ms +/- 2.7% +    oscillator:                380.3ms +/- 0.3% + +  imaging:                    1354.5ms +/- 0.0% +    gaussian-blur:             515.3ms +/- 0.1% +    darkroom:                  198.6ms +/- 0.2% +    desaturate:                640.6ms +/- 0.1% + +  json:                        168.7ms +/- 0.5% +    parse-financial:           107.0ms +/- 0.4% +    stringify-tinderbox:        61.7ms +/- 1.1% + +  stanford:                    688.6ms +/- 1.3% +    crypto-aes:                205.3ms +/- 0.8% +    crypto-ccm:                128.6ms +/- 6.3% +    crypto-pbkdf2:             233.4ms +/- 0.3% +    crypto-sha256-iterative:   121.3ms +/- 8.5% +========================================================================================= +Mozilla/5.0 (X11; Linux x86_64; rv:2.0b8) Gecko/20100101 Firefox/4.0b8 +=============================================== +RESULTS (means and 95% confidence intervals) +----------------------------------------------- +Total:                        5221.3ms +/- 0.2% +----------------------------------------------- + +  ai:                         1434.5ms +/- 0.9% +    astar:                    1434.5ms +/- 0.9% + +  audio:                      1504.6ms +/- 0.9% +    beat-detection:            477.3ms +/- 2.2% +    dft:                       289.9ms +/- 2.9% +    fft:                       355.8ms +/- 3.4% +    oscillator:                381.6ms +/- 0.4% + +  imaging:                    1377.5ms +/- 0.2% +    gaussian-blur:             516.6ms +/- 0.2% +    darkroom:                  200.3ms +/- 0.2% +    desaturate:                660.6ms +/- 0.5% + +  json:                        185.9ms +/- 6.6% +    parse-financial:           118.6ms +/- 8.8% +    stringify-tinderbox:        67.3ms +/- 15.6% + +  stanford:                    718.8ms +/- 2.3% +    crypto-aes:                211.2ms +/- 5.6% +    crypto-ccm:                138.3ms +/- 1.0% +    crypto-pbkdf2:             230.1ms +/- 5.4% +    crypto-sha256-iterative:   139.2ms +/- 6.8% +========================================================================================= +Mozilla/5.0 (X11; Linux x86_64; rv:2.0b7) Gecko/20100101 Firefox/4.0b7 +=============================================== +RESULTS (means and 95% confidence intervals) +----------------------------------------------- +Total:                        5278.1ms +/- 0.4% +----------------------------------------------- + +  ai:                         1426.9ms +/- 0.8% +    astar:                    1426.9ms +/- 0.8% + +  audio:                      1592.7ms +/- 0.5% +    beat-detection:            515.2ms +/- 2.3% +    dft:                       276.7ms +/- 1.4% +    fft:                       401.7ms +/- 2.7% +    oscillator:                399.1ms +/- 1.1% + +  imaging:                    1395.0ms +/- 0.2% +    gaussian-blur:             528.5ms +/- 0.3% +    darkroom:                  203.0ms +/- 0.3% +    desaturate:                663.5ms +/- 0.2% + +  json:                        175.7ms +/- 0.3% +    parse-financial:           114.2ms +/- 0.4% +    stringify-tinderbox:        61.5ms +/- 0.6% + +  stanford:                    687.8ms +/- 1.6% +    crypto-aes:                209.9ms +/- 0.9% +    crypto-ccm:                145.3ms +/- 2.1% +    crypto-pbkdf2:             224.9ms +/- 5.2% +    crypto-sha256-iterative:   107.7ms +/- 2.5%	 +========================================================================================= +Mozilla/5.0 (X11; U; Linux x86_64; fr; rv:1.9.2.13) Gecko/20110103 Fedora/3.6.13-1.fc14 Firefox/3.6.13 +=============================================== +RESULTS (means and 95% confidence intervals) +----------------------------------------------- +Total:                        60490.3ms +/- 0.2% +----------------------------------------------- + +  ai:                          5117.8ms +/- 0.2% +    astar:                     5117.8ms +/- 0.2% + +  audio:                      13393.7ms +/- 0.2% +    beat-detection:            3684.3ms +/- 0.2% +    dft:                       3403.5ms +/- 0.6% +    fft:                       3622.4ms +/- 0.2% +    oscillator:                2683.5ms +/- 0.4% + +  imaging:                    34541.7ms +/- 0.4% +    gaussian-blur:            24071.5ms +/- 0.6% +    darkroom:                  4717.7ms +/- 0.2% +    desaturate:                5752.5ms +/- 0.4% + +  json:                         259.9ms +/- 1.0% +    parse-financial:            178.9ms +/- 1.4% +    stringify-tinderbox:         81.0ms +/- 0.6% + +  stanford:                    7177.2ms +/- 0.4% +    crypto-aes:                1281.3ms +/- 0.8% +    crypto-ccm:                 972.8ms +/- 0.5% +    crypto-pbkdf2:             3756.9ms +/- 0.3% +    crypto-sha256-iterative:   1166.2ms +/- 1.4% +========================================================================================= +Mozilla/5.0 (X11; U; Linux x86_64; fr; rv:1.9.2.10) Gecko/20101005 Fedora/3.6.10-1.fc14 Firefox/3.6.10 +=============================================== +RESULTS (means and 95% confidence intervals) +----------------------------------------------- +Total:                        61796.7ms +/- 0.9% +----------------------------------------------- + +  ai:                          5142.7ms +/- 0.2% +    astar:                     5142.7ms +/- 0.2% + +  audio:                      13645.3ms +/- 0.6% +    beat-detection:            3828.1ms +/- 0.4% +    dft:                       3417.6ms +/- 1.3% +    fft:                       3789.8ms +/- 1.0% +    oscillator:                2609.8ms +/- 0.8% + +  imaging:                    35628.7ms +/- 1.5% +    gaussian-blur:            25253.2ms +/- 2.2% +    darkroom:                  4959.2ms +/- 1.6% +    desaturate:                5416.3ms +/- 1.3% + +  json:                         263.3ms +/- 2.4% +    parse-financial:            183.1ms +/- 3.0% +    stringify-tinderbox:         80.2ms +/- 1.7% + +  stanford:                    7116.7ms +/- 0.6% +    crypto-aes:                1263.5ms +/- 0.7% +    crypto-ccm:                 985.1ms +/- 1.2% +    crypto-pbkdf2:             3711.2ms +/- 0.9% +    crypto-sha256-iterative:   1156.9ms +/- 1.1% +============================================== + diff --git a/bench/sunspider.txt b/bench/sunspider.txt new file mode 100644 index 0000000..d41cce4 --- /dev/null +++ b/bench/sunspider.txt @@ -0,0 +1,797 @@ +========================================== SunSpider ==================================== +http://www2.webkit.org/perf/sunspider/sunspider.html +http://www2.webkit.org/perf/sunspider-0.9.1/sunspider-0.9.1/driver.html +========================================================================================= + +Intel(R) Core(TM)2 Quad CPU    Q6600  @ 2.40GHz + +	Mozilla/5.0 (X11; U; Linux x86_64; fr; rv:1.9.2.12) Gecko/20101028 Remi/fc14 Firefox/3.6.12	2336.1 +	Mozilla/5.0 (X11; Linux x86_64; rv:2.0b6) Gecko/20100101 Firefox/4.0b6 Remi/fc14		 603.8 +	Mozilla/5.0 (X11; Linux x86_64; rv:2.0b7) Gecko/20100101 Firefox/4.0b7				 391.8 +	Mozilla/5.0 (X11; Linux x86_64; rv:2.0b8) Gecko/20100101 Firefox/4.0b8				 396.8 + +Intel(R) Core(TM) i5 CPU         760  @ 2.80GHz + +	Mozilla/5.0 (X11; U; Linux x86_64; fr; rv:1.9.2.10) Gecko/20101005 Fedora/3.6.10-1.fc14 Firefox/3.6.10	1469.4 +	Mozilla/5.0 (X11; U; Linux x86_64; fr; rv:1.9.2.13) Gecko/20110103 Fedora/3.6.13-1.fc14 Firefox/3.6.13	1435.3 +	Mozilla/5.0 (X11; Linux x86_64; rv:2.0b7) Gecko/20100101 Firefox/4.0b7					 241.7	 +	Mozilla/5.0 (X11; Linux x86_64; rv:2.0b8) Gecko/20100101 Firefox/4.0b8					 236.8 +	Mozilla/5.0 (X11; Linux x86_64; rv:2.0b9) Gecko/20100101 Firefox/4.0b9					 218.5 +	Mozilla/5.0 (X11; Linux x86_64; rv:2.0b10) Gecko/20100101 Firefox/4.0b10				 225.8 +	Mozilla/5.0 (X11; Linux x86_64; rv:2.0b11) Gecko/20110203 Firefox/4.0b11				 231.9 +	Mozilla/5.0 (X11; Linux x86_64; rv:2.0b12) Gecko/20100101 Firefox/4.0b12				 237.4 +	Mozilla/5.0 (X11; Linux x86_64; rv:2.0) Gecko/20100101 Firefox/4.0 (rc1)				 235.1 +	Mozilla/5.0 (X11; Linux x86_64; rv:2.0) Gecko/20100101 Firefox/4.0 (rc2)				 225.1 +        Mozilla/5.0 (X11; Linux x86_64; rv:2.0.1) Gecko/20100101 Firefox/4.0.1                                   211.3 +        Mozilla/5.0 (X11; Linux x86_64; rv:5.0) Gecko/20100101 Firefox/5.0b5                                     219.4 +        Mozilla/5.0 (X11; Linux x86_64; rv:5.0) Gecko/20100101 Firefox/5.0b5                                     228.4 +        Mozilla/5.0 (X11; Linux x86_64; rv:6.0) Gecko/20100101 Firefox/6.0                                       224.8 +        Mozilla/5.0 (X11; Linux x86_64; rv:7.0) Gecko/20100101 Firefox/7.0                                       221.7 +         +============================================================================== +Mozilla/5.0 (X11; Linux x86_64; rv:7.0) Gecko/20100101 Firefox/7.0 +============================================ +RESULTS (means and 95% confidence intervals) +-------------------------------------------- +Total:                 221.7ms +/- 3.2% +-------------------------------------------- + +  3d:                   33.5ms +/- 7.5% +    cube:               14.6ms +/- 9.0% +    morph:               5.7ms +/- 32.4% +    raytrace:           13.2ms +/- 2.3% + +  access:               36.6ms +/- 7.3% +    binary-trees:        4.5ms +/- 20.2% +    fannkuch:           17.9ms +/- 7.6% +    nbody:               5.9ms +/- 24.5% +    nsieve:              8.3ms +/- 26.6% + +  bitops:               18.7ms +/- 13.2% +    3bit-bits-in-byte:   1.1ms +/- 36.9% +    bits-in-byte:        9.4ms +/- 22.4% +    bitwise-and:         2.0ms +/- 33.7% +    nsieve-bits:         6.2ms +/- 28.1% + +  controlflow:           5.9ms +/- 25.2% +    recursive:           5.9ms +/- 25.2% + +  crypto:               17.1ms +/- 7.0% +    aes:                 9.1ms +/- 5.8% +    md5:                 5.0ms +/- 27.0% +    sha1:                3.0ms +/- 22.5% + +  date:                 27.2ms +/- 11.1% +    format-tofte:       16.8ms +/- 12.8% +    format-xparb:       10.4ms +/- 21.3% + +  math:                 21.2ms +/- 10.8% +    cordic:              5.3ms +/- 11.1% +    partial-sums:       10.4ms +/- 21.3% +    spectral-norm:       5.5ms +/- 12.6% + +  regexp:               12.4ms +/- 11.3% +    dna:                12.4ms +/- 11.3% + +  string:               49.1ms +/- 4.9% +    base64:              4.0ms +/- 32.6% +    fasta:              10.1ms +/- 20.4% +    tagcloud:           13.8ms +/- 4.8% +    unpack-code:        15.5ms +/- 2.4% +    validate-input:      5.7ms +/- 8.5%    +============================================================================== +Mozilla/5.0 (X11; Linux x86_64; rv:6.0) Gecko/20100101 Firefox/6.0 +============================================ +RESULTS (means and 95% confidence intervals) +-------------------------------------------- +Total:                 224.8ms +/- 2.3% +-------------------------------------------- + +  3d:                   34.7ms +/- 9.3% +    cube:               14.7ms +/- 4.6% +    morph:               5.9ms +/- 34.9% +    raytrace:           14.1ms +/- 13.2% + +  access:               34.8ms +/- 6.3% +    binary-trees:        4.4ms +/- 11.4% +    fannkuch:           18.1ms +/- 11.2% +    nbody:               5.0ms +/- 0.0% +    nsieve:              7.3ms +/- 4.7% + +  bitops:               16.5ms +/- 13.4% +    3bit-bits-in-byte:   1.0ms +/- 58.4% +    bits-in-byte:        8.3ms +/- 15.2% +    bitwise-and:         2.4ms +/- 35.0% +    nsieve-bits:         4.8ms +/- 23.1% + +  controlflow:           3.7ms +/- 24.2% +    recursive:           3.7ms +/- 24.2% + +  crypto:               21.8ms +/- 17.5% +    aes:                12.6ms +/- 23.2% +    md5:                 5.6ms +/- 37.7% +    sha1:                3.6ms +/- 26.8% + +  date:                 28.2ms +/- 8.9% +    format-tofte:       17.1ms +/- 11.7% +    format-xparb:       11.1ms +/- 23.6% + +  math:                 19.8ms +/- 6.3% +    cordic:              5.0ms +/- 6.7% +    partial-sums:        8.8ms +/- 3.4% +    spectral-norm:       6.0ms +/- 16.8% + +  regexp:               12.5ms +/- 9.8% +    dna:                12.5ms +/- 9.8% + +  string:               52.8ms +/- 6.2% +    base64:              3.4ms +/- 10.9% +    fasta:              11.8ms +/- 21.7% +    tagcloud:           15.2ms +/- 14.2% +    unpack-code:        16.3ms +/- 6.6% +    validate-input:      6.1ms +/- 17.0% +========================================================================================= +Mozilla/5.0 (X11; Linux x86_64; rv:5.0) Gecko/20100101 Firefox/5.0b7 +============================================ +RESULTS (means and 95% confidence intervals) +-------------------------------------------- +Total:                 228.4ms +/- 3.1% +-------------------------------------------- + +  3d:                   34.3ms +/- 9.3% +    cube:               14.3ms +/- 4.7% +    morph:               5.8ms +/- 31.7% +    raytrace:           14.2ms +/- 13.0% + +  access:               37.0ms +/- 8.7% +    binary-trees:        5.1ms +/- 26.0% +    fannkuch:           18.0ms +/- 14.4% +    nbody:               5.4ms +/- 17.9% +    nsieve:              8.5ms +/- 21.8% + +  bitops:               18.9ms +/- 17.0% +    3bit-bits-in-byte:   1.4ms +/- 26.4% +    bits-in-byte:        8.6ms +/- 22.2% +    bitwise-and:         2.4ms +/- 32.0% +    nsieve-bits:         6.5ms +/- 32.1% + +  controlflow:           4.6ms +/- 36.0% +    recursive:           4.6ms +/- 36.0% + +  crypto:               18.4ms +/- 13.7% +    aes:                 9.2ms +/- 8.0% +    md5:                 5.2ms +/- 24.9% +    sha1:                4.0ms +/- 36.7% + +  date:                 27.1ms +/- 8.5% +    format-tofte:       18.6ms +/- 10.9% +    format-xparb:        8.5ms +/- 4.4% + +  math:                 23.2ms +/- 13.0% +    cordic:              4.7ms +/- 10.3% +    partial-sums:       10.7ms +/- 24.6% +    spectral-norm:       7.8ms +/- 28.6% + +  regexp:               12.1ms +/- 9.0% +    dna:                12.1ms +/- 9.0% + +  string:               52.8ms +/- 6.0% +    base64:              4.7ms +/- 38.6% +    fasta:              10.4ms +/- 20.8% +    tagcloud:           13.8ms +/- 2.2% +    unpack-code:        17.5ms +/- 11.1% +    validate-input:      6.4ms +/- 13.1% +========================================================================================= +Mozilla/5.0 (X11; Linux x86_64; rv:5.0) Gecko/20100101 Firefox/5.0b5         +============================================ +RESULTS (means and 95% confidence intervals) +-------------------------------------------- +Total:                 219.4ms +/- 2.1% +-------------------------------------------- + +  3d:                   33.6ms +/- 5.5% +    cube:               13.9ms +/- 2.9% +    morph:               5.0ms +/- 0.0% +    raytrace:           14.7ms +/- 12.8% + +  access:               34.4ms +/- 6.1% +    binary-trees:        5.0ms +/- 31.6% +    fannkuch:           16.6ms +/- 4.6% +    nbody:               4.9ms +/- 4.6% +    nsieve:              7.9ms +/- 11.6% + +  bitops:               18.1ms +/- 20.0% +    3bit-bits-in-byte:   1.0ms +/- 47.6% +    bits-in-byte:        9.2ms +/- 21.9% +    bitwise-and:         2.6ms +/- 23.2% +    nsieve-bits:         5.3ms +/- 24.7% + +  controlflow:           3.6ms +/- 42.1% +    recursive:           3.6ms +/- 42.1% + +  crypto:               19.6ms +/- 11.9% +    aes:                10.5ms +/- 11.7% +    md5:                 4.6ms +/- 32.1% +    sha1:                4.5ms +/- 36.1% + +  date:                 26.8ms +/- 10.2% +    format-tofte:       17.8ms +/- 8.2% +    format-xparb:        9.0ms +/- 20.2% + +  math:                 21.0ms +/- 13.5% +    cordic:              5.5ms +/- 30.2% +    partial-sums:        9.8ms +/- 20.3% +    spectral-norm:       5.7ms +/- 8.5% + +  regexp:               11.3ms +/- 8.5% +    dna:                11.3ms +/- 8.5% + +  string:               51.0ms +/- 5.6% +    base64:              3.8ms +/- 17.3% +    fasta:              10.5ms +/- 19.0% +    tagcloud:           14.2ms +/- 7.4% +    unpack-code:        16.0ms +/- 7.3% +    validate-input:      6.5ms +/- 29.4% +========================================================================================= +Mozilla/5.0 (X11; Linux x86_64; rv:2.0.1) Gecko/20100101 Firefox/4.0.1 +============================================ +RESULTS (means and 95% confidence intervals) +-------------------------------------------- +Total:                 211.3ms +/- 3.7% +-------------------------------------------- + +  3d:                   29.6ms +/- 4.1% +    cube:               11.5ms +/- 12.5% +    morph:               4.7ms +/- 7.3% +    raytrace:           13.4ms +/- 2.8% + +  access:               34.2ms +/- 4.8% +    binary-trees:        4.0ms +/- 16.8% +    fannkuch:           16.7ms +/- 5.7% +    nbody:               5.6ms +/- 13.7% +    nsieve:              7.9ms +/- 14.4% + +  bitops:               18.0ms +/- 14.0% +    3bit-bits-in-byte:   0.9ms +/- 45.1% +    bits-in-byte:        8.6ms +/- 15.3% +    bitwise-and:         2.4ms +/- 35.0% +    nsieve-bits:         6.1ms +/- 23.1% + +  controlflow:           3.8ms +/- 24.8% +    recursive:           3.8ms +/- 24.8% + +  crypto:               17.7ms +/- 10.8% +    aes:                 9.9ms +/- 8.6% +    md5:                 4.1ms +/- 22.4% +    sha1:                3.7ms +/- 24.2% + +  date:                 27.0ms +/- 8.5% +    format-tofte:       17.6ms +/- 7.2% +    format-xparb:        9.4ms +/- 12.5% + +  math:                 19.9ms +/- 7.8% +    cordic:              5.0ms +/- 9.5% +    partial-sums:        9.1ms +/- 7.8% +    spectral-norm:       5.8ms +/- 12.7% + +  regexp:               11.4ms +/- 7.9% +    dna:                11.4ms +/- 7.9% + +  string:               49.7ms +/- 4.2% +    base64:              4.2ms +/- 28.7% +    fasta:               9.8ms +/- 6.7% +    tagcloud:           15.3ms +/- 10.6% +    unpack-code:        15.1ms +/- 1.5% +    validate-input:      5.3ms +/- 6.5% +========================================================================================= +Mozilla/5.0 (X11; Linux x86_64; rv:2.0) Gecko/20100101 Firefox/4.0 (rc1) +============================================ +RESULTS (means and 95% confidence intervals) +-------------------------------------------- +Total:                 225.1ms +/- 2.2% +-------------------------------------------- + +  3d:                   32.8ms +/- 6.6% +    cube:               14.5ms +/- 4.8% +    morph:               5.3ms +/- 27.7% +    raytrace:           13.0ms +/- 2.6% + +  access:               34.2ms +/- 7.0% +    binary-trees:        4.0ms +/- 8.4% +    fannkuch:           16.5ms +/- 9.6% +    nbody:               4.9ms +/- 12.8% +    nsieve:              8.8ms +/- 17.0% + +  bitops:               20.4ms +/- 12.4% +    3bit-bits-in-byte:   0.8ms +/- 37.7% +    bits-in-byte:        8.7ms +/- 20.9% +    bitwise-and:         2.9ms +/- 31.7% +    nsieve-bits:         8.0ms +/- 24.6% + +  controlflow:           4.2ms +/- 20.9% +    recursive:           4.2ms +/- 20.9% + +  crypto:               17.8ms +/- 7.3% +    aes:                 9.9ms +/- 7.2% +    md5:                 4.9ms +/- 12.8% +    sha1:                3.0ms +/- 15.9% + +  date:                 28.2ms +/- 4.6% +    format-tofte:       19.2ms +/- 7.6% +    format-xparb:        9.0ms +/- 7.5% + +  math:                 20.8ms +/- 7.2% +    cordic:              5.1ms +/- 4.4% +    partial-sums:        9.3ms +/- 9.6% +    spectral-norm:       6.4ms +/- 16.8% + +  regexp:               13.4ms +/- 14.5% +    dna:                13.4ms +/- 14.5% + +  string:               53.3ms +/- 4.4% +    base64:              4.4ms +/- 13.7% +    fasta:              11.1ms +/- 13.4% +    tagcloud:           14.9ms +/- 4.8% +    unpack-code:        16.9ms +/- 6.7% +    validate-input:      6.0ms +/- 18.6% +========================================================================================= +Mozilla/5.0 (X11; Linux x86_64; rv:2.0) Gecko/20100101 Firefox/4.0 (rc1) +============================================ +RESULTS (means and 95% confidence intervals) +-------------------------------------------- +Total:                 235.1ms +/- 3.0% +-------------------------------------------- + +  3d:                   34.3ms +/- 7.2% +    cube:               15.2ms +/- 13.3% +    morph:               4.9ms +/- 4.6% +    raytrace:           14.2ms +/- 11.6% + +  access:               38.3ms +/- 7.2% +    binary-trees:        4.9ms +/- 27.9% +    fannkuch:           18.1ms +/- 13.0% +    nbody:               5.7ms +/- 21.4% +    nsieve:              9.6ms +/- 20.5% + +  bitops:               18.8ms +/- 23.1% +    3bit-bits-in-byte:   1.0ms +/- 33.7% +    bits-in-byte:        8.7ms +/- 25.7% +    bitwise-and:         3.0ms +/- 27.5% +    nsieve-bits:         6.1ms +/- 31.5% + +  controlflow:           3.9ms +/- 26.6% +    recursive:           3.9ms +/- 26.6% + +  crypto:               19.9ms +/- 10.2% +    aes:                11.1ms +/- 17.3% +    md5:                 5.0ms +/- 20.2% +    sha1:                3.8ms +/- 30.5% + +  date:                 31.2ms +/- 8.7% +    format-tofte:       21.1ms +/- 9.9% +    format-xparb:       10.1ms +/- 23.2% + +  math:                 22.6ms +/- 10.7% +    cordic:              4.8ms +/- 11.7% +    partial-sums:       10.1ms +/- 10.3% +    spectral-norm:       7.7ms +/- 27.0% + +  regexp:               12.3ms +/- 8.7% +    dna:                12.3ms +/- 8.7% + +  string:               53.8ms +/- 6.7% +    base64:              3.6ms +/- 13.9% +    fasta:               9.8ms +/- 4.6% +    tagcloud:           15.5ms +/- 5.9% +    unpack-code:        17.2ms +/- 7.8% +    validate-input:      7.7ms +/- 29.7% +========================================================================================= +Mozilla/5.0 (X11; Linux x86_64; rv:2.0b12) Gecko/20100101 Firefox/4.0b12 +============================================ +RESULTS (means and 95% confidence intervals) +-------------------------------------------- +Total:                 237.4ms +/- 5.4% +-------------------------------------------- + +  3d:                   35.2ms +/- 5.0% +    cube:               15.3ms +/- 12.3% +    morph:               5.0ms +/- 0.0% +    raytrace:           14.9ms +/- 10.7% + +  access:               36.5ms +/- 16.4% +    binary-trees:        4.4ms +/- 32.7% +    fannkuch:           17.9ms +/- 15.0% +    nbody:               6.0ms +/- 29.7% +    nsieve:              8.2ms +/- 18.3% + +  bitops:               20.2ms +/- 18.0% +    3bit-bits-in-byte:   0.6ms +/- 83.3% +    bits-in-byte:        9.6ms +/- 25.8% +    bitwise-and:         2.7ms +/- 33.1% +    nsieve-bits:         7.3ms +/- 26.9% + +  controlflow:           4.5ms +/- 29.2% +    recursive:           4.5ms +/- 29.2% + +  crypto:               19.7ms +/- 11.1% +    aes:                10.2ms +/- 11.8% +    md5:                 5.8ms +/- 28.9% +    sha1:                3.7ms +/- 30.3% + +  date:                 29.2ms +/- 6.8% +    format-tofte:       19.8ms +/- 11.5% +    format-xparb:        9.4ms +/- 14.4% + +  math:                 25.0ms +/- 21.9% +    cordic:              6.1ms +/- 27.3% +    partial-sums:       10.6ms +/- 23.0% +    spectral-norm:       8.3ms +/- 33.7% + +  regexp:               12.4ms +/- 11.9% +    dna:                12.4ms +/- 11.9% + +  string:               54.7ms +/- 5.2% +    base64:              4.6ms +/- 25.6% +    fasta:              11.7ms +/- 18.9% +    tagcloud:           14.8ms +/- 5.0% +    unpack-code:        17.3ms +/- 7.3% +    validate-input:      6.3ms +/- 31.2% +========================================================================================= +Mozilla/5.0 (X11; Linux x86_64; rv:2.0b11) Gecko/20110203 Firefox/4.0b11 +============================================ +RESULTS (means and 95% confidence intervals) +-------------------------------------------- +Total:                 231.9ms +/- 3.9% +-------------------------------------------- + +  3d:                   34.9ms +/- 15.8% +    cube:               16.5ms +/- 32.9% +    morph:               4.7ms +/- 7.3% +    raytrace:           13.7ms +/- 8.2% + +  access:               35.4ms +/- 6.7% +    binary-trees:        4.8ms +/- 27.9% +    fannkuch:           17.1ms +/- 3.7% +    nbody:               5.3ms +/- 14.3% +    nsieve:              8.2ms +/- 15.3% + +  bitops:               20.2ms +/- 18.3% +    3bit-bits-in-byte:   0.8ms +/- 37.7% +    bits-in-byte:       10.2ms +/- 21.6% +    bitwise-and:         2.8ms +/- 29.0% +    nsieve-bits:         6.4ms +/- 30.3% + +  controlflow:           3.7ms +/- 30.3% +    recursive:           3.7ms +/- 30.3% + +  crypto:               17.9ms +/- 8.1% +    aes:                 9.5ms +/- 11.9% +    md5:                 5.2ms +/- 27.3% +    sha1:                3.2ms +/- 27.5% + +  date:                 30.2ms +/- 8.4% +    format-tofte:       19.3ms +/- 9.7% +    format-xparb:       10.9ms +/- 11.7% + +  math:                 21.9ms +/- 9.4% +    cordic:              5.2ms +/- 16.9% +    partial-sums:       10.5ms +/- 12.5% +    spectral-norm:       6.2ms +/- 15.2% + +  regexp:               12.4ms +/- 10.9% +    dna:                12.4ms +/- 10.9% + +  string:               55.3ms +/- 5.2% +    base64:              5.3ms +/- 34.8% +    fasta:              10.8ms +/- 16.7% +    tagcloud:           15.9ms +/- 9.6% +    unpack-code:        16.9ms +/- 5.4% +    validate-input:      6.4ms +/- 21.2% +========================================================================================= +Mozilla/5.0 (X11; Linux x86_64; rv:2.0b10) Gecko/20100101 Firefox/4.0b10 +============================================ +RESULTS (means and 95% confidence intervals) +-------------------------------------------- +Total:                 225.8ms +/- 4.9% +-------------------------------------------- + +  3d:                   36.2ms +/- 7.5% +    cube:               14.9ms +/- 6.2% +    morph:               5.8ms +/- 25.2% +    raytrace:           15.5ms +/- 11.6% + +  access:               33.9ms +/- 2.9% +    binary-trees:        4.3ms +/- 13.7% +    fannkuch:           16.7ms +/- 2.9% +    nbody:               5.1ms +/- 4.4% +    nsieve:              7.8ms +/- 7.2% + +  bitops:               17.2ms +/- 11.0% +    3bit-bits-in-byte:   0.8ms +/- 37.7% +    bits-in-byte:        8.2ms +/- 17.3% +    bitwise-and:         2.7ms +/- 28.0% +    nsieve-bits:         5.5ms +/- 14.0% + +  controlflow:           2.9ms +/- 18.2% +    recursive:           2.9ms +/- 18.2% + +  crypto:               19.5ms +/- 31.2% +    aes:                 8.9ms +/- 8.0% +    md5:                 7.5ms +/- 80.5% +    sha1:                3.1ms +/- 7.3% + +  date:                 28.6ms +/- 8.8% +    format-tofte:       18.7ms +/- 10.0% +    format-xparb:        9.9ms +/- 13.4% + +  math:                 19.3ms +/- 4.6% +    cordic:              4.7ms +/- 7.3% +    partial-sums:        9.1ms +/- 5.8% +    spectral-norm:       5.5ms +/- 6.8% + +  regexp:               12.7ms +/- 7.5% +    dna:                12.7ms +/- 7.5% + +  string:               55.5ms +/- 11.8% +    base64:              3.5ms +/- 10.8% +    fasta:              10.1ms +/- 7.0% +    tagcloud:           15.5ms +/- 6.2% +    unpack-code:        17.7ms +/- 7.4% +    validate-input:      8.7ms +/- 76.3% +========================================================================================= +Mozilla/5.0 (X11; Linux x86_64; rv:2.0b9) Gecko/20100101 Firefox/4.0b9 +============================================ +RESULTS (means and 95% confidence intervals) +-------------------------------------------- +Total:                 218.5ms +/- 1.4% +-------------------------------------------- + +  3d:                   32.0ms +/- 2.4% +    cube:               13.9ms +/- 3.8% +    morph:               4.7ms +/- 7.3% +    raytrace:           13.4ms +/- 3.7% + +  access:               35.9ms +/- 4.5% +    binary-trees:        3.9ms +/- 10.4% +    fannkuch:           17.0ms +/- 4.4% +    nbody:               5.5ms +/- 9.2% +    nsieve:              9.5ms +/- 12.4% + +  bitops:               17.6ms +/- 6.1% +    3bit-bits-in-byte:   1.0ms +/- 0.0% +    bits-in-byte:        8.4ms +/- 12.8% +    bitwise-and:         2.1ms +/- 25.1% +    nsieve-bits:         6.1ms +/- 8.6% + +  controlflow:           3.1ms +/- 17.0% +    recursive:           3.1ms +/- 17.0% + +  crypto:               17.0ms +/- 7.7% +    aes:                 8.9ms +/- 7.0% +    md5:                 4.7ms +/- 22.7% +    sha1:                3.4ms +/- 14.7% + +  date:                 26.9ms +/- 4.8% +    format-tofte:       17.3ms +/- 3.9% +    format-xparb:        9.6ms +/- 11.7% + +  math:                 21.1ms +/- 5.6% +    cordic:              5.8ms +/- 9.7% +    partial-sums:        9.5ms +/- 10.2% +    spectral-norm:       5.8ms +/- 9.7% + +  regexp:               11.7ms +/- 5.8% +    dna:                11.7ms +/- 5.8% + +  string:               53.2ms +/- 2.0% +    base64:              4.1ms +/- 15.3% +    fasta:              11.4ms +/- 7.9% +    tagcloud:           15.4ms +/- 2.4% +    unpack-code:        16.8ms +/- 3.4% +    validate-input:      5.5ms +/- 9.2% +========================================================================================= +Mozilla/5.0 (X11; Linux x86_64; rv:2.0b8) Gecko/20100101 Firefox/4.0b8 +============================================ +RESULTS (means and 95% confidence intervals) +-------------------------------------------- +Total:                 236.8ms +/- 6.0% +-------------------------------------------- + +  3d:                   34.1ms +/- 3.3% +    cube:               14.9ms +/- 4.8% +    morph:               5.5ms +/- 11.0% +    raytrace:           13.7ms +/- 2.5% + +  access:               34.5ms +/- 3.1% +    binary-trees:        4.3ms +/- 8.0% +    fannkuch:           16.1ms +/- 1.4% +    nbody:               5.2ms +/- 10.8% +    nsieve:              8.9ms +/- 12.8% + +  bitops:               18.8ms +/- 9.4% +    3bit-bits-in-byte:   1.0ms +/- 33.7% +    bits-in-byte:        9.2ms +/- 11.5% +    bitwise-and:         2.1ms +/- 33.8% +    nsieve-bits:         6.5ms +/- 22.7% + +  controlflow:           3.2ms +/- 14.1% +    recursive:           3.2ms +/- 14.1% + +  crypto:               16.9ms +/- 10.1% +    aes:                 9.0ms +/- 9.2% +    md5:                 4.4ms +/- 26.7% +    sha1:                3.5ms +/- 10.8% + +  date:                 33.0ms +/- 30.0% +    format-tofte:       16.7ms +/- 4.5% +    format-xparb:       16.3ms +/- 58.4% + +  math:                 22.5ms +/- 7.5% +    cordic:              5.8ms +/- 12.7% +    partial-sums:       10.1ms +/- 6.2% +    spectral-norm:       6.6ms +/- 18.5% + +  regexp:               12.3ms +/- 7.3% +    dna:                12.3ms +/- 7.3% + +  string:               61.5ms +/- 18.3% +    base64:              4.1ms +/- 17.3% +    fasta:              12.3ms +/- 7.3% +    tagcloud:           16.2ms +/- 3.5% +    unpack-code:        17.2ms +/- 2.6% +    validate-input:     11.7ms +/- 93.3% +========================================================================================= +Mozilla/5.0 (X11; Linux x86_64; rv:2.0b7) Gecko/20100101 Firefox/4.0b7 +============================================ +RESULTS (means and 95% confidence intervals) +-------------------------------------------- +Total:                 241.7ms +/- 3.4% +-------------------------------------------- + +  3d:                   30.6ms +/- 6.6% +    cube:               11.4ms +/- 7.9% +    morph:               4.7ms +/- 10.3% +    raytrace:           14.5ms +/- 5.8% + +  access:               36.3ms +/- 9.6% +    binary-trees:        5.4ms +/- 30.7% +    fannkuch:           16.6ms +/- 5.4% +    nbody:               5.9ms +/- 13.3% +    nsieve:              8.4ms +/- 12.2% + +  bitops:               20.6ms +/- 11.1% +    3bit-bits-in-byte:   1.1ms +/- 36.9% +    bits-in-byte:       10.1ms +/- 16.2% +    bitwise-and:         2.7ms +/- 21.8% +    nsieve-bits:         6.7ms +/- 19.5% + +  controlflow:           3.6ms +/- 29.9% +    recursive:           3.6ms +/- 29.9% + +  crypto:               19.7ms +/- 11.5% +    aes:                10.8ms +/- 18.9% +    md5:                 5.2ms +/- 21.3% +    sha1:                3.7ms +/- 24.2% + +  date:                 32.2ms +/- 9.5% +    format-tofte:       18.0ms +/- 10.9% +    format-xparb:       14.2ms +/- 10.8% + +  math:                 20.0ms +/- 5.6% +    cordic:              6.2ms +/- 19.4% +    partial-sums:        9.0ms +/- 7.5% +    spectral-norm:       4.8ms +/- 6.3% + +  regexp:               12.5ms +/- 4.9% +    dna:                12.5ms +/- 4.9% + +  string:               66.2ms +/- 14.1% +    base64:              4.7ms +/- 27.8% +    fasta:              12.3ms +/- 9.1% +    tagcloud:           20.4ms +/- 36.6% +    unpack-code:        18.8ms +/- 5.6% +    validate-input:     10.0ms +/- 70.9% +========================================================================================= +Mozilla/5.0 (X11; U; Linux x86_64; fr; rv:1.9.2.13) Gecko/20110103 Fedora/3.6.13-1.fc14 Firefox/3.6.13 +============================================ +RESULTS (means and 95% confidence intervals) +-------------------------------------------- +Total:                 1435.3ms +/- 1.6% +-------------------------------------------- + +  3d:                   194.5ms +/- 7.3% +    cube:                64.3ms +/- 0.8% +    morph:               73.0ms +/- 19.7% +    raytrace:            57.2ms +/- 0.5% + +  access:               235.0ms +/- 5.6% +    binary-trees:        30.1ms +/- 33.3% +    fannkuch:            94.6ms +/- 0.8% +    nbody:               81.9ms +/- 11.7% +    nsieve:              28.4ms +/- 1.3% + +  bitops:               164.4ms +/- 5.3% +    3bit-bits-in-byte:   28.7ms +/- 1.7% +    bits-in-byte:        42.0ms +/- 1.4% +    bitwise-and:         40.5ms +/- 1.7% +    nsieve-bits:         53.2ms +/- 15.6% + +  controlflow:           24.2ms +/- 4.4% +    recursive:           24.2ms +/- 4.4% + +  crypto:                98.8ms +/- 9.0% +    aes:                 36.5ms +/- 1.9% +    md5:                 28.6ms +/- 2.4% +    sha1:                33.7ms +/- 27.1% + +  date:                 110.7ms +/- 0.9% +    format-tofte:        57.7ms +/- 1.2% +    format-xparb:        53.0ms +/- 1.4% + +  math:                 158.0ms +/- 1.5% +    cordic:              66.5ms +/- 0.8% +    partial-sums:        60.2ms +/- 3.9% +    spectral-norm:       31.3ms +/- 2.4% + +  regexp:               105.2ms +/- 0.6% +    dna:                105.2ms +/- 0.6% + +  string:               344.5ms +/- 8.2% +    base64:              39.4ms +/- 22.4% +    fasta:               74.0ms +/- 3.7% +    tagcloud:            74.3ms +/- 5.8% +    unpack-code:        111.1ms +/- 9.9% +    validate-input:      45.7ms +/- 13.6% +========================================================================================= +Mozilla/5.0 (X11; U; Linux x86_64; fr; rv:1.9.2.10) Gecko/20101005 Fedora/3.6.10-1.fc14 Firefox/3.6.10	1469.4 +============================================ +RESULTS (means and 95% confidence intervals) +-------------------------------------------- +Total:                 1469.4ms +/- 1.7% +-------------------------------------------- + +  3d:                   205.9ms +/- 7.6% +    cube:                76.2ms +/- 19.0% +    morph:               58.4ms +/- 0.9% +    raytrace:            71.3ms +/- 20.5% + +  access:               233.1ms +/- 3.7% +    binary-trees:        25.5ms +/- 2.0% +    fannkuch:            98.8ms +/- 0.3% +    nbody:               80.3ms +/- 11.3% +    nsieve:              28.5ms +/- 1.3% + +  bitops:               158.4ms +/- 1.1% +    3bit-bits-in-byte:   26.6ms +/- 2.9% +    bits-in-byte:        42.6ms +/- 1.8% +    bitwise-and:         41.3ms +/- 2.3% +    nsieve-bits:         47.9ms +/- 1.5% + +  controlflow:           23.7ms +/- 2.5% +    recursive:           23.7ms +/- 2.5% + +  crypto:                96.9ms +/- 0.7% +    aes:                 37.2ms +/- 1.5% +    md5:                 29.3ms +/- 2.8% +    sha1:                30.4ms +/- 2.0% + +  date:                 113.4ms +/- 8.4% +    format-tofte:        62.1ms +/- 15.4% +    format-xparb:        51.3ms +/- 1.1% + +  math:                 171.9ms +/- 7.2% +    cordic:              72.3ms +/- 14.2% +    partial-sums:        66.1ms +/- 12.0% +    spectral-norm:       33.5ms +/- 1.1% + +  regexp:               105.9ms +/- 0.6% +    dna:                105.9ms +/- 0.6% + +  string:               360.2ms +/- 5.5% +    base64:              35.9ms +/- 2.4% +    fasta:               77.6ms +/- 10.2% +    tagcloud:            79.6ms +/- 13.0% +    unpack-code:        120.4ms +/- 7.3% +    validate-input:      46.7ms +/- 6.5% +============================================ + diff --git a/bench/v8.txt b/bench/v8.txt new file mode 100644 index 0000000..a0dc4a1 --- /dev/null +++ b/bench/v8.txt @@ -0,0 +1,87 @@ +============================================================================== +http://v8.googlecode.com/svn/data/benchmarks +http://v8.googlecode.com/svn/data/benchmarks/v6/run.html +============================================================================== + +Intel(R) Core(TM)2 Quad CPU    Q6600  @ 2.40GHz + +	Mozilla/5.0 (X11; U; Linux x86_64; fr; rv:1.9.2.12) Gecko/20101028 Remi/fc14 Firefox/3.6.12	 255 +	Mozilla/5.0 (X11; Linux x86_64; rv:2.0b6) Gecko/20100101 Firefox/4.0b6 Remi/fc14		 874 +	Mozilla/5.0 (X11; Linux x86_64; rv:2.0b7) Gecko/20100101 Firefox/4.0b7				2328 +	Mozilla/5.0 (X11; Linux x86_64; rv:2.0b8) Gecko/20100101 Firefox/4.0b8				2772 + +Intel(R) Core(TM) i5 CPU         760  @ 2.80GHz + +	Mozilla/5.0 (X11; U; Linux x86_64; fr; rv:1.9.2.10) Gecko/20101005 Fedora/3.6.10-1.fc14 Firefox/3.6.10	 382 +	Mozilla/5.0 (X11; U; Linux x86_64; fr; rv:1.9.2.13) Gecko/20110103 Fedora/3.6.13-1.fc14 Firefox/3.6.13	 394 +	Mozilla/5.0 (X11; Linux x86_64; rv:2.0b7) Gecko/20100101 Firefox/4.0b7					4010 +	Mozilla/5.0 (X11; Linux x86_64; rv:2.0b8) Gecko/20100101 Firefox/4.0b8					4634 +	Mozilla/5.0 (X11; Linux x86_64; rv:2.0b9) Gecko/20100101 Firefox/4.0b9					5158 +	Mozilla/5.0 (X11; Linux x86_64; rv:2.0b10) Gecko/20100101 Firefox/4.0b10				5099 +	Mozilla/5.0 (X11; Linux x86_64; rv:2.0b11) Gecko/20110203 Firefox/4.0b11				5050 +	Mozilla/5.0 (X11; Linux x86_64; rv:2.0b12) Gecko/20100101 Firefox/4.0b12				5090 +	Mozilla/5.0 (X11; Linux x86_64; rv:2.0) Gecko/20100101 Firefox/4.0 (rc1)				5132 +	Mozilla/5.0 (X11; Linux x86_64; rv:2.0) Gecko/20100101 Firefox/4.0 (rc1)				5105 +        Mozilla/5.0 (X11; Linux x86_64; rv:2.0.1) Gecko/20100101 Firefox/4.0.1                                  5266 +        Mozilla/5.0 (X11; Linux x86_64; rv:5.0) Gecko/20100101 Firefox/5.0b5                                    4989 +        Mozilla/5.0 (X11; Linux x86_64; rv:5.0) Gecko/20100101 Firefox/5.0b7                                    5050 +        Mozilla/5.0 (X11; Linux x86_64; rv:6.0) Gecko/20100101 Firefox/6.0                                      5236 +        Mozilla/5.0 (X11; Linux x86_64; rv:7.0) Gecko/20100101 Firefox/7.0                                      5345 +         +============================================================================== +Mozilla/5.0 (X11; Linux x86_64; rv:7.0) Gecko/20100101 Firefox/7.0 +============================================================================== +Score: 5345 +Richards: 7812 +DeltaBlue: 4238 +Crypto: 8105 +RayTrace: 4218 +EarleyBoyer: 5775 +RegExp: 2500 +Splay: 7624 +============================================================================== +Mozilla/5.0 (X11; Linux x86_64; rv:6.0) Gecko/20100101 Firefox/6.0 +============================================================================== +Score: 5236 +Richards: 7622 +DeltaBlue: 5237 +Crypto: 8119 +RayTrace: 4374 +EarleyBoyer: 5211 +RegExp: 1971 +Splay: 7408 +============================================================================== +Mozilla/5.0 (X11; Linux x86_64; rv:5.0) Gecko/20100101 Firefox/5.0b7 +============================================================================== +Score: 5050 +Richards: 7774 +DeltaBlue: 5079 +Crypto: 8122 +RayTrace: 4075 +EarleyBoyer: 5003 +RegExp: 1972 +Splay: 6495 +============================================================================== +Mozilla/5.0 (X11; Linux x86_64; rv:5.0) Gecko/20100101 Firefox/5.0b5 +============================================================================== +Score: 4989 +Richards: 7555 +DeltaBlue: 4754 +Crypto: 8143 +RayTrace: 4111 +EarleyBoyer: 5077 +RegExp: 1865 +Splay: 6756 +============================================================================== +Mozilla/5.0 (X11; Linux x86_64; rv:2.0.1) Gecko/20100101 Firefox/4.0.1 +==============================================================================        +Score: 5266 +Richards: 7869 +DeltaBlue: 5977 +Crypto: 8290 +RayTrace: 4103 +EarleyBoyer: 5268 +RegExp: 2118 +Splay: 6291 +============================================================================== + @@ -0,0 +1,109 @@ +#!/bin/sh + +getxpi() { +	if [ x$1 = x ] +	then	 +		echo "ERREUR : Numero de version absent !" +	else 	 +		if [ x$1 = xtrunk ] +		then	URL=http://ftp.mozilla.org/pub/mozilla.org/firefox/nightly/latest-trunk-l10n/linux-xpi/ +		elif [ x$2 = x ] +		then	URL=http://releases.mozilla.org/pub/mozilla.org/firefox/releases/$1/linux-i686/xpi +		else	URL=ftp://ftp.mozilla.org/pub/mozilla.org/firefox/nightly/$1-candidates/$2/linux-i686/xpi/ +		fi +		# 85 max extensions (21+20+20+20+4) +		for i in af ak ar as ast be bg bn-BD bn-IN br bs ca cs cy da de el en-GB en-ZA eo es-AR \ +			es-CL es-ES es-MX et eu	fa fi fr fy-NL ga-IE gd gl gu-IN he hi-IN hr hu hy-AM id is it \ +			ja ka kk kn ko ku lg lt lv mai mk ml mn mr nb-NO nl nn-NO nso oc or \ +                        pa-IN pl pt-BR pt-PT rm ro ru si sk sl son sq sr sv-SE ta ta-LK te th tr uk \ +                        vi zh-CN zh-TW zu +		do 	echo -en "$i\t" +			[ -f $i.xpi ] && echo "already downloaded" +			[ -f $i.xpi ] || wget -nv $URL/$i.xpi +		done +		echo -n "Number of XPI found: " +		ls *.xpi | wc -l +	fi +} + +checkxpi() { +	[ -d tmp ] && rm -rf tmp/* || mkdir tmp + +	for i in *.xpi +	do	j=$(basename $i .xpi) +		unzip -q $i -d tmp/$j +	done + +	xmlwf tmp/*/install.rdf +} +packxpi() { +	if [ x$1 = x ] +	then	 +		echo "ERREUR : langue absente !" +	elif [ ! -d tmp/$1 ] +	then +		echo "ERREUR : langue $1 absente !" +	else 	 +		echo Création de $1.xpi +		mv $1.xpi /tmp +		cd tmp/$1 +		zip ../../$1.xpi -r install.rdf chrome/* chrome.manifest + +		echo -n "Controle... " +		xmlwf install.rdf && echo done +	fi +} +donexpi() { +	cd .. +	if [ x$1 = x ] +	then +		echo "ERREUR : Numero de version absent !" + +	elif [ x$1 = xtrunk ] +	then +		echo "Création de /home/rpmbuild/SOURCES/firefox-langpacks-trunk.tar.bz2" +		tar cvjf /home/rpmbuild/SPECS/remirepo/firefox4/firefox-langpacks-trunk.tar.bz2 \ +			--exclude tmp firefox-langpacks +	else 	 +	        case $1 in +	                8*)     dest=firefox8 +	                        ;; +	                7*)     dest=firefox7 +	                        ;; +	                6*)     dest=firefox6 +	                        ;; +	                5*)     dest=firefox5 +	                        ;; +	                4*)     dest=firefox4 +	                        ;; +	                *)      dest=firefox +	                        ;; +	        esac +		echo "Création de /home/rpmbuild/SPECS/remirepo/$dest/firefox-langpacks-$1-$(date +%Y%m%d).tar.bz2" +		tar cvjf /home/rpmbuild/SPECS/remirepo/$dest/firefox-langpacks-$1-$(date +%Y%m%d).tar.bz2 \ +			--exclude tmp firefox-langpacks +	fi +} + +dir=/dev/shm/firefox-langpacks + +[ -d $dir ] || (mkdir $dir && echo $dir created) +cd $dir + +case "$1" in +get)	getxpi $2 $3 +	;; +check)	checkxpi +	;; +pack)	packxpi $2 +	;; +done)	donexpi $2 +	;; +*)	echo -e "\nusage $0 action\n" +	echo -e "\t get version [ rc# ]" +	echo -e "\t check" +	echo -e "\t pack langue" +	echo -e "\t done version" +	echo "" +	;; +esac diff --git a/firefox-5.0-asciidel.patch b/firefox-5.0-asciidel.patch new file mode 100644 index 0000000..1916cb3 --- /dev/null +++ b/firefox-5.0-asciidel.patch @@ -0,0 +1,15 @@ +Patch from: Bill Nottingham <notting@redhat.com> + +diff -up mozilla-release/browser/base/Makefile.in.fu mozilla-release/browser/base/Makefile.in +--- mozilla-release/browser/base/Makefile.in.fu	2011-06-24 16:50:23.802042086 -0400 ++++ mozilla-release/browser/base/Makefile.in	2011-06-24 16:50:42.324042096 -0400 +@@ -62,7 +62,7 @@ EXTRA_JS_MODULES = \ +  + include $(topsrcdir)/config/rules.mk +  +-PRE_RELEASE_SUFFIX := "" ++PRE_RELEASE_SUFFIX := +  + DEFINES += \ + 	-DMOZ_APP_VERSION=$(MOZ_APP_VERSION) \ + diff --git a/firefox-8.0-enable-addons.patch b/firefox-8.0-enable-addons.patch new file mode 100644 index 0000000..795b082 --- /dev/null +++ b/firefox-8.0-enable-addons.patch @@ -0,0 +1,26 @@ +diff -up firefox-8.0/mozilla-release/browser/app/profile/firefox.js.addons firefox-8.0/mozilla-release/browser/app/profile/firefox.js +--- firefox-8.0/mozilla-release/browser/app/profile/firefox.js.addons	2011-11-04 22:33:52.000000000 +0100 ++++ firefox-8.0/mozilla-release/browser/app/profile/firefox.js	2011-11-15 10:35:31.446869396 +0100 +@@ -77,7 +77,7 @@ pref("extensions.update.autoUpdateDefaul + // Disable add-ons installed into the shared user and shared system areas by + // default. This does not include the application directory. See the SCOPE + // constants in AddonManager.jsm for values to use here +-pref("extensions.autoDisableScopes", 15); ++pref("extensions.autoDisableScopes", 0); +  + // Dictionary download preference + pref("browser.dictionaries.download.url", "https://addons.mozilla.org/%LOCALE%/firefox/dictionaries/"); +diff -up firefox-8.0/mozilla-release/toolkit/mozapps/extensions/XPIProvider.jsm.addons firefox-8.0/mozilla-release/toolkit/mozapps/extensions/XPIProvider.jsm +--- firefox-8.0/mozilla-release/toolkit/mozapps/extensions/XPIProvider.jsm.addons	2011-11-04 22:34:18.000000000 +0100 ++++ firefox-8.0/mozilla-release/toolkit/mozapps/extensions/XPIProvider.jsm	2011-11-15 10:42:17.866426274 +0100 +@@ -1591,8 +1591,8 @@ var XPIProvider = { +       this.showUpgradeUI(); +       flushCaches = true; +     } +-    else if (aAppChanged === undefined) { +-      // For new profiles we will never need to show the add-on selection UI ++    else { ++      // For all profiles we will never need to show the add-on selection UI +       Services.prefs.setBoolPref(PREF_SHOWN_SELECTION_UI, true); +     } +  diff --git a/firefox-install-dir.patch b/firefox-install-dir.patch new file mode 100644 index 0000000..7ba14f4 --- /dev/null +++ b/firefox-install-dir.patch @@ -0,0 +1,25 @@ +diff -up firefox-7.0/mozilla-beta/config/autoconf.mk.in.old firefox-7.0/mozilla-beta/config/autoconf.mk.in +--- firefox-7.0/mozilla-beta/config/autoconf.mk.in.old	2011-08-31 21:16:06.000000000 +0200 ++++ firefox-7.0/mozilla-beta/config/autoconf.mk.in	2011-09-06 12:08:00.859392269 +0200 +@@ -68,7 +68,7 @@ datadir		= @datadir@ + mandir		= @mandir@ + idldir		= $(datadir)/idl/$(MOZ_APP_NAME)-$(MOZ_APP_VERSION) +  +-installdir	= $(libdir)/$(MOZ_APP_NAME)-$(MOZ_APP_VERSION) ++installdir	= $(libdir)/$(MOZ_APP_NAME) + sdkdir		= $(libdir)/$(MOZ_APP_NAME)-devel-$(MOZ_APP_VERSION) +  + DIST		= $(DEPTH)/dist +diff -up firefox-7.0/mozilla-beta/js/src/config/autoconf.mk.in.old firefox-7.0/mozilla-beta/js/src/config/autoconf.mk.in +--- firefox-7.0/mozilla-beta/js/src/config/autoconf.mk.in.old	2011-08-31 21:16:16.000000000 +0200 ++++ firefox-7.0/mozilla-beta/js/src/config/autoconf.mk.in	2011-09-06 12:08:39.463500899 +0200 +@@ -61,7 +61,7 @@ libdir		= @libdir@ + datadir		= @datadir@ + mandir		= @mandir@ +  +-installdir	= $(libdir)/$(MOZ_APP_NAME)-$(MOZ_APP_VERSION) ++installdir	= $(libdir)/$(MOZ_APP_NAME) + sdkdir		= $(libdir)/$(MOZ_APP_NAME)-devel-$(MOZ_APP_VERSION) +  + TOP_DIST	= @TOP_DIST@ +diff -up firefox-7.0/mozilla-beta/Makefile.in.old firefox-7.0/mozilla-beta/Makefile.in diff --git a/firefox-mozconfig b/firefox-mozconfig new file mode 100644 index 0000000..fa293f6 --- /dev/null +++ b/firefox-mozconfig @@ -0,0 +1,40 @@ +. $topsrcdir/browser/config/mozconfig + +ac_add_options --prefix="$PREFIX" +ac_add_options --libdir="$LIBDIR" +ac_add_options --with-system-nspr +ac_add_options --with-system-nss +ac_add_options --with-system-jpeg +ac_add_options --with-system-zlib +#ac_add_options --with-system-png +ac_add_options --with-pthreads +ac_add_options --disable-tests +ac_add_options --disable-debug +ac_add_options --enable-optimize +ac_add_options --disable-installer +ac_add_options --enable-xinerama +ac_add_options --enable-default-toolkit=cairo-gtk2 +ac_add_options --disable-xprint +ac_add_options --disable-strip +ac_add_options --enable-system-cairo +ac_add_options --enable-pango +ac_add_options --enable-svg +ac_add_options --enable-canvas +ac_add_options --enable-startup-notification +ac_add_options --enable-libxul +ac_add_options --disable-crashreporter +ac_add_options --enable-safe-browsing +ac_add_options --enable-libnotify +ac_add_options --disable-necko-wifi +ac_add_options --disable-cpp-exceptions +ac_add_options --disable-updater +ac_add_options --enable-url-classifier +ac_add_options --enable-gio +ac_add_options --disable-gnomevfs +ac_add_options --enable-chrome-format=omni + +export BUILD_OFFICIAL=1 +export MOZILLA_OFFICIAL=1 +mk_add_options BUILD_OFFICIAL=1 +mk_add_options MOZILLA_OFFICIAL=1 +mk_add_options MOZ_OBJDIR=@TOPSRCDIR@ diff --git a/firefox-mozconfig-branded b/firefox-mozconfig-branded new file mode 100644 index 0000000..53b376d --- /dev/null +++ b/firefox-mozconfig-branded @@ -0,0 +1 @@ +ac_add_options --enable-official-branding diff --git a/firefox-mozconfig-debuginfo b/firefox-mozconfig-debuginfo new file mode 100644 index 0000000..4dd2427 --- /dev/null +++ b/firefox-mozconfig-debuginfo @@ -0,0 +1,5 @@ +# For mozilla's debuginfo: +export CFLAGS="$CFLAGS -gdwarf-2" +export CXXFLAGS="$CXXFLAGS -gdwarf-2" +export MOZ_DEBUG_SYMBOLS=1 +ac_add_options --enable-crashreporter diff --git a/firefox-redhat-default-prefs.js b/firefox-redhat-default-prefs.js new file mode 100644 index 0000000..2ffdf5c --- /dev/null +++ b/firefox-redhat-default-prefs.js @@ -0,0 +1,12 @@ +pref("app.update.auto",                     false); +pref("app.update.enabled",                  false); +pref("app.update.autoInstallEnabled",       false); +pref("browser.backspace_action",            2); +pref("browser.display.use_system_colors",   true); +pref("browser.download.folderList",         1); +pref("browser.link.open_external",          3); +pref("browser.shell.checkDefaultBrowser",   false); +pref("network.manage-offline-status",       true); +pref("dom.ipc.plugins.enabled.nswrapper*",  false); +pref("extensions.shownSelectionUI",         true); +pref("extensions.autoDisableScope",         0);
\ No newline at end of file diff --git a/firefox.1 b/firefox.1 new file mode 100644 index 0000000..2086325 --- /dev/null +++ b/firefox.1 @@ -0,0 +1,125 @@ +.TH FIREFOX 1 "August 07, 2001" firefox "Linux User's Manual" +.SH NAME +firefox \- a Web browser for X11 derived from the Mozilla browser + +.SH SYNOPSIS +.B firefox +[\fIOPTIONS\fR] [\fIURL\fR] + +.B firefox-bin +[\fIOPTIONS\fR] [\fIURL\fR] + +.SH DESCRIPTION +\fBMozilla Firefox\fR is an open-source web browser, designed for +standards compliance, performance and portability. + +.SH USAGE +\fBfirefox\fR is a simple shell script that will set up the +environment for the actual executable, \fBfirefox-bin\fR. + +.SH OPTIONS +A summary of the options supported by \fBfirefox\fR is included below. + +.SS "GTK options" +\fB\-\-gdk-debug=\fR\fIFLAGS\fR +Gdk debugging flags to set +.TP +\fB\-\-gdk-no-debug=\fR\fIFLAGS\fR +Gdk debugging flags to unset +.TP +\fB\-\-gtk-debug=\fR\fIFLAGS\fR +Gtk+ debugging flags to set +.TP +\fB\-\-gtk-no-debug=\fR\fIFLAGS\fR +Gtk+ debugging flags to unset +.TP +\fB\-\-gtk-module=\fR\fIMODULE\fR +Load an additional Gtk module + +.SS "X11 options" +.TP +.BI \-\-display= DISPLAY +X display to use +.TP +.B \--sync +Make X calls synchronous +.TP +.B \-\-no-xshm +Don't use X shared memory extension +.TP +.BI \-\-xim-preedit= STYLE +.TP +.BI \-\-xim-status= STYLE +.TP +.B \-\-g-fatal-warnings +Make all warnings fatal + +.SS "Firefox options" +.TP +\fB\-height\fR \fIvalue\fR +Set height of startup window to \fIvalue\fR. +.TP +.B \-h, \-help +Show summary of options. +.TP +.B \-installer +Start with 4.x migration window. +.TP +\fB\-width\fR \fIvalue\fR +Set width of startup window to \fIvalue\fR. +.TP +.B \-v, \-version +Print \fB/usr/bin/firefox-bin\fR version. +.TP +\fB\-CreateProfile\fR \fIprofile\fR +Create \fIprofile\fR. +.TP +\fB\-P\fR \fIprofile\fR +Start with \fIprofile\fR. +.TP +.B \-ProfileWizard +Start with profile wizard. +.TP +.B \-ProfileManager +Start with profile manager. +.TP +.B \-SelectProfile +Start with profile selection dialog. +.TP +\fB\-lang\fR \fIlang-region\fR +Start with \fIlang-region\fR resources. +.TP +\fB\-remote\fR \fIcommand\fR +Execute \fIcommand\fR in an already running Firefox process.  For more info, +see: \fIhttp://www.mozilla.org/unix/remote.html\fR +.TP +.B \-splash +Enable splash screen. +.TP +.B \-jsconsole +Start with Javascript Console +.TP +\fB\-chrome\fR \fIurl\fR +Load the specified chrome. +.TP + +.SH FILES +\fI/usr/bin/firefox\fR - shell script wrapping +\fBfirefox\fR +.br +\fI/usr/lib/mozilla/firefox-bin\fR - \fBfirefox\fR +executable + +.SH VERSION +1.0 + +.SH BUGS +To report a bug, please visit \fIhttp://bugzilla.mozilla.org/\fR + +.SH "SEE ALSO" +.BR mozilla(1) + +.SH AUTHORS +.TP +.B The Mozilla Organization +.I http://www.mozilla.org/about.html diff --git a/firefox.desktop b/firefox.desktop new file mode 100644 index 0000000..e3bee09 --- /dev/null +++ b/firefox.desktop @@ -0,0 +1,52 @@ +[Desktop Entry] +Version=1.0 +Name=Firefox +GenericName=Web Browser +GenericName[ca]=Navegador web +GenericName[cs]=Webový prohlížeč +GenericName[es]=Navegador web +GenericName[fa]=مرورگر اینترنتی +GenericName[fi]=WWW-selain +GenericName[fr]=Navigateur Web +GenericName[hu]=Webböngésző +GenericName[it]=Browser Web +GenericName[ja]=ウェブ・ブラウザ +GenericName[ko]=웹 브라우저 +GenericName[nb]=Nettleser +GenericName[nl]=Webbrowser +GenericName[nn]=Nettlesar +GenericName[no]=Nettleser +GenericName[pl]=Przeglądarka WWW +GenericName[pt]=Navegador Web +GenericName[pt_BR]=Navegador Web +GenericName[sk]=Internetový prehliadač +GenericName[sv]=Webbläsare +Comment=Browse the Web +Comment[ca]=Navegueu per el web +Comment[cs]=Prohlížení stránek World Wide Webu +Comment[de]=Im Internet surfen +Comment[es]=Navegue por la web +Comment[fa]=صفحات شبکه جهانی اینترنت را مرور نمایید +Comment[fi]=Selaa Internetin WWW-sivuja +Comment[fr]=Navigue sur Internet +Comment[hu]=A világháló böngészése +Comment[it]=Esplora il web +Comment[ja]=ウェブを閲覧します +Comment[ko]=웹을 돌아 다닙니다 +Comment[nb]=Surf på nettet +Comment[nl]=Verken het internet +Comment[nn]=Surf på nettet +Comment[no]=Surf på nettet +Comment[pl]=Przeglądanie stron WWW  +Comment[pt]=Navegue na Internet +Comment[pt_BR]=Navegue na Internet +Comment[sk]=Prehliadanie internetu +Comment[sv]=Surfa på webben +Exec=firefox %u +Icon=firefox +Terminal=false +Type=Application +StartupWMClass=Firefox-bin +MimeType=text/html;text/xml;application/xhtml+xml;application/vnd.mozilla.xul+xml;text/mml;x-scheme-handler/http;x-scheme-handler/https; +StartupNotify=true +Categories=Network;WebBrowser; diff --git a/firefox.sh.in b/firefox.sh.in new file mode 100644 index 0000000..7ecc663 --- /dev/null +++ b/firefox.sh.in @@ -0,0 +1,238 @@ +#!/bin/sh +# +# The contents of this file are subject to the Netscape Public +# License Version 1.1 (the "License"); you may not use this file +# except in compliance with the License. You may obtain a copy of +# the License at http://www.mozilla.org/NPL/ +# +# Software distributed under the License is distributed on an "AS +# IS" basis, WITHOUT WARRANTY OF ANY KIND, either express or +# implied. See the License for the specific language governing +# rights and limitations under the License. +# +# The Original Code is mozilla.org code. +# +# The Initial Developer of the Original Code is Netscape +# Communications Corporation.  Portions created by Netscape are +# Copyright (C) 1998 Netscape Communications Corporation. All +# Rights Reserved. +# +# Contributor(s):  +# + +##  +## Usage: +## +## $ firefox +## +## This script is meant to run a mozilla program from the mozilla +## rpm installation. +## +## The script will setup all the environment voodoo needed to make +## mozilla work. + +cmdname=`basename $0` + +## +## Variables +## +MOZ_ARCH=$(uname -m) +case $MOZ_ARCH in +	x86_64 | s390x | sparc64) +		MOZ_LIB_DIR="/usr/lib64" +		SECONDARY_LIB_DIR="/usr/lib" +		;; +	* ) +		MOZ_LIB_DIR="/usr/lib" +		SECONDARY_LIB_DIR="/usr/lib64" +		;; +esac + +MOZ_FIREFOX_FILE="firefox" + +if [ ! -r $MOZ_LIB_DIR/firefox/$MOZ_FIREFOX_FILE ]; then +    if [ ! -r $SECONDARY_LIB_DIR/firefox/$MOZ_FIREFOX_FILE ]; then +	echo "Error: $MOZ_LIB_DIR/firefox/$MOZ_FIREFOX_FILE not found" +	if [ -d $SECONDARY_LIB_DIR ]; then +	    echo "       $SECONDARY_LIB_DIR/firefox/$MOZ_FIREFOX_FILE not found" +	fi +	exit 1 +    fi +    MOZ_LIB_DIR="$SECONDARY_LIB_DIR" +fi +MOZ_DIST_BIN="$MOZ_LIB_DIR/firefox" +MOZ_XUL_DIR="$MOZ_LIB_DIR/XULRUNNER_DIRECTORY" +MOZ_LANGPACKS_DIR="$MOZ_DIST_BIN/langpacks" +MOZ_EXTENSIONS_PROFILE_DIR="$HOME/.mozilla/extensions/{ec8030f7-c20a-464f-9b0e-13a3a9e97384}" +MOZ_PROGRAM="$MOZ_DIST_BIN/$MOZ_FIREFOX_FILE" +MOZ_LAUNCHER="$MOZ_DIST_BIN/run-mozilla.sh" +  +## +## Set MOZILLA_FIVE_HOME +## +MOZILLA_FIVE_HOME="$MOZ_DIST_BIN" + +export MOZILLA_FIVE_HOME + +## +## Select the propper plugin dir +## Wrapped plug-ins are located in /lib/mozilla/plugins-wrapped +## +if [ -x "/usr/bin/mozilla-plugin-config" ] +then +  MOZ_PLUGIN_DIR="plugins-wrapped" +else +  MOZ_PLUGIN_DIR="plugins" +fi + +## +## Make sure that we set the plugin path +## +if [ "$MOZ_PLUGIN_PATH" ] +then +  MOZ_PLUGIN_PATH=$MOZ_PLUGIN_PATH:$MOZ_LIB_DIR/mozilla/$MOZ_PLUGIN_DIR:$MOZ_DIST_BIN/$MOZ_PLUGIN_DIR +else +  MOZ_PLUGIN_PATH=$MOZ_LIB_DIR/mozilla/$MOZ_PLUGIN_DIR:$MOZ_DIST_BIN/$MOZ_PLUGIN_DIR +fi +export MOZ_PLUGIN_PATH + +## +## Set MOZ_APP_LAUNCHER for gnome-session +## +export MOZ_APP_LAUNCHER="/usr/bin/firefox" + +## +## If plugins are wrapped, check them +## +if [ -x "/usr/bin/mozilla-plugin-config" ] +then +  /usr/bin/mozilla-plugin-config +fi + +## +## Set FONTCONFIG_PATH for Xft/fontconfig +## +FONTCONFIG_PATH="/etc/fonts:${MOZILLA_FIVE_HOME}/res/Xft" +export FONTCONFIG_PATH + +## +## In order to better support certain scripts (such as Indic and some CJK  +## scripts), Fedora builds its Firefox, with permission from the Mozilla  +## Corporation, with the Pango system as its text renderer.  This change  +## may negatively impact performance on some pages.  To disable the use of +## Pango, set MOZ_DISABLE_PANGO=1 in your environment before launching +## Firefox. +## +# +# MOZ_DISABLE_PANGO=1 +# export MOZ_DISABLE_PANGO +# + +## +## Disable the GNOME crash dialog, Moz has it's own +## +GNOME_DISABLE_CRASH_DIALOG=1 +export GNOME_DISABLE_CRASH_DIALOG + +# OK, here's where all the real work gets done + + +## +## To disable the use of Firefox localization, set MOZ_DISABLE_LANGPACKS=1 +## in your environment before launching Firefox. +## +# +# MOZ_DISABLE_LANGPACKS=1 +# export MOZ_DISABLE_LANGPACKS +# + +## +## Automatically installed langpacks are tracked by .fedora-langpack-install +## config file. +## +FEDORA_LANGPACK_CONFIG="$MOZ_EXTENSIONS_PROFILE_DIR/.fedora-langpack-install" + +# MOZ_DISABLE_LANGPACKS disables language packs completely +MOZILLA_DOWN=0 +if ! [ $MOZ_DISABLE_LANGPACKS ] || [ $MOZ_DISABLE_LANGPACKS -eq 0 ]; then +    if [ -x $MOZ_XUL_DIR/mozilla-xremote-client ]; then +        # Is firefox running? +        $MOZ_XUL_DIR/mozilla-xremote-client -a firefox 'ping()' > /dev/null 2>&1 +        MOZILLA_DOWN=$? +    fi +fi + +# Modify language pack configuration only when firefox is not running  +# and language packs are not disabled +if [ $MOZILLA_DOWN -ne 0 ]; then + +    # Clear already installed langpacks +    mkdir -p $MOZ_EXTENSIONS_PROFILE_DIR +    if [ -f $FEDORA_LANGPACK_CONFIG ]; then +        rm `cat $FEDORA_LANGPACK_CONFIG` > /dev/null 2>&1 +        rm $FEDORA_LANGPACK_CONFIG > /dev/null 2>&1 +    fi + +    # Get locale from system +    CURRENT_LOCALE=$LC_ALL +    CURRENT_LOCALE=${CURRENT_LOCALE:-$LC_MESSAGES} +    CURRENT_LOCALE=${CURRENT_LOCALE:-$LANG} +     +    # Try without a local variant first, then with a local variant +    # So that pt-BR doesn't try to use pt for example +    SHORTMOZLOCALE=`echo $CURRENT_LOCALE | sed "s|_\([^.]*\).*||g"` +    MOZLOCALE=`echo $CURRENT_LOCALE | sed "s|_\([^.]*\).*|-\1|g"` + +    function create_langpack_link() { +        local language=$* +        local langpack=langpack-${language}@firefox.mozilla.org.xpi +        if [ -f $MOZ_LANGPACKS_DIR/$langpack ]; then +            rm -rf $MOZ_EXTENSIONS_PROFILE_DIR/$langpack +            ln -s $MOZ_LANGPACKS_DIR/$langpack \ +                  $MOZ_EXTENSIONS_PROFILE_DIR/$langpack +            echo $MOZ_EXTENSIONS_PROFILE_DIR/$langpack > $FEDORA_LANGPACK_CONFIG +            return 0 +        fi +        return 1 +    } + +    create_langpack_link $SHORTMOZLOCALE || create_langpack_link $MOZLOCALE || true +fi + +# Prepare command line arguments +script_args="" +pass_arg_count=0 +while [ $# -gt $pass_arg_count ] +do +  case "$1" in +    -g | --debug) +      script_args="$script_args -g" +      debugging=1 +      shift +      ;; +    -d | --debugger) +      if [ $# -gt 1 ]; then +        script_args="$script_args -d $2" +        shift 2 +      else +        shift +      fi +      ;; +    *) +      # Move the unrecognized argument to the end of the list. +      arg="$1" +      shift +      set -- "$@" "$arg" +      pass_arg_count=`expr $pass_arg_count + 1` +      ;; +  esac +done + +# Run the browser +debugging=0 +if [ $debugging = 1 ] +then +  echo $MOZ_LAUNCHER $script_args $MOZ_PROGRAM "$@" +fi + +exec $MOZ_LAUNCHER $script_args $MOZ_PROGRAM "$@" diff --git a/firefox.spec b/firefox.spec new file mode 100644 index 0000000..91214bf --- /dev/null +++ b/firefox.spec @@ -0,0 +1,619 @@ +# Separated plugins are supported on x86(64) only +%ifarch %{ix86} x86_64 +%define separated_plugins 1 +%else +%define separated_plugins 0 +%endif + +%define homepage http://start.fedoraproject.org/ +%define default_bookmarks_file %{_datadir}/bookmarks/default-bookmarks.html +%define firefox_app_id \{ec8030f7-c20a-464f-9b0e-13a3a9e97384\} + +%global shortname       firefox +#global mycomment       Beta 4 +%global firefox_dir_ver 9 +%global gecko_version   9.0 +%global gecko_release   1 +%global alpha_version   0 +%global beta_version    0 +%global rc_version      0 +%global datelang        20111220 + +%global mozappdir     %{_libdir}/%{shortname} +%global langpackdir   %{mozappdir}/langpacks +%global tarballdir    mozilla-release + +%define official_branding       1 +%define build_langpacks         1 +%define include_debuginfo       0 + +%if %{alpha_version} > 0 +%global pre_version a%{alpha_version} +%global pre_name    alpha%{alpha_version} +%endif +%if %{beta_version} > 0 +%global pre_version b%{beta_version} +%global pre_name    beta%{beta_version} +%endif +%if %{rc_version} > 0 +%global pre_version rc%{rc_version} +%global pre_name    rc%{rc_version} +%endif +%if %{defined pre_version} +%global gecko_verrel %{gecko_version}-%{gecko_release}%{pre_name} +%global pre_tag .%{pre_version} +%else +%global gecko_verrel %{gecko_version}-%{gecko_release} +%endif + +Summary:        Mozilla Firefox Web browser +Name:           %{shortname} +Version:        9.0 +Release:        1%{?dist} +URL:            http://www.mozilla.org/projects/firefox/ +License:        MPLv1.1 or GPLv2+ or LGPLv2+ +Group:          Applications/Internet +Source0:        ftp://ftp.mozilla.org/pub/firefox/releases/%{version}%{?pre_version}/source/firefox-%{version}%{?pre_version}.source.tar.bz2 +%if %{build_langpacks} +Source1:        firefox-langpacks-%{version}%{?pre_version}-%{datelang}.tar.bz2 +%endif +Source10:       firefox-mozconfig +Source11:       firefox-mozconfig-branded +Source12:       firefox-redhat-default-prefs.js +Source13:       firefox-mozconfig-debuginfo +Source20:       firefox.desktop +Source21:       firefox.sh.in +Source23:       firefox.1 + +#Build patches +Patch0:         firefox-install-dir.patch + +# Fedora patches +Patch14:        firefox-5.0-asciidel.patch +Patch15:        firefox-8.0-enable-addons.patch + +# Upstream patches + +%if %{official_branding} +# Required by Mozilla Corporation + + +%else +# Not yet approved by Mozillla Corporation + + +%endif + +# --------------------------------------------------- + +BuildRequires:  desktop-file-utils +BuildRequires:  system-bookmarks +BuildRequires:  xulrunner%{firefox_dir_ver}-devel = %{version} +# For WebM support +BuildRequires:	yasm + +Requires:       xulrunner%{firefox_dir_ver}%{?_isa} = %{version} +Requires:       gecko-libs%{?_isa} = %{gecko_verrel} +Requires:       system-bookmarks +Obsoletes:      mozilla <= 37:1.7.13 +Provides:       webclient +%if %{name} == %{shortname} +Obsoletes:      firefox%{firefox_dir_ver} +Provides:       firefox%{firefox_dir_ver} = %{version}-%{release} +%endif + + +%description +Mozilla Firefox is an open-source web browser, designed for standards +compliance, performance and portability. + +#--------------------------------------------------------------------- + +%prep +echo TARGET = %{name}-%{version}-%{release}%{?dist} +%if %{build_langpacks} +[ -f %{SOURCE1} ] || exit 1 +%endif +%setup -q -c +cd %{tarballdir} + +# Build patches, can't change backup suffix from default because during build +# there is a compare of config and js/config directories and .orig suffix is  +# ignored during this compare. +%patch0 -p2 -b .orig + +# For branding specific patches. + +# Fedora patches +%patch14 -p1 -b .asciidel +%patch15 -p2 -b .addons + +# Upstream patches + +%if %{official_branding} +# Required by Mozilla Corporation + +%else +# Not yet approved by Mozilla Corporation +%endif + + +%{__rm} -f .mozconfig +%{__cat} %{SOURCE10} \ +%if 0%{?fedora} < 16 && 0%{?rhel} <= 6 +  | grep -v enable-system-sqlite   \ +%endif +%if 0%{?fedora} < 14 && 0%{?rhel} <= 6 +  | grep -v with-system-nspr       \ +%endif +%if 0%{?fedora} < 17 && 0%{?rhel} <= 6 +  | grep -v with-system-nss        \ +%endif +%if 0%{?fedora} < 15 && 0%{?rhel} <= 6 +  | grep -v enable-system-cairo    \ +%endif +%ifarch %{ix86} x86_64 +  | grep -v disable-necko-wifi     \ +%endif +  | tee .mozconfig + +%if %{official_branding} +%{__cat} %{SOURCE11} >> .mozconfig +%endif +%if %{include_debuginfo} +%{__cat} %{SOURCE13} >> .mozconfig +%endif + +echo "ac_add_options --enable-system-lcms" >> .mozconfig + +# Set up SDK path +echo "ac_add_options --with-libxul-sdk=\ +`pkg-config --variable=sdkdir libxul`" >> .mozconfig + +%if !%{?separated_plugins} +echo "ac_add_options --disable-ipc" >> .mozconfig +%endif + +%if 0%{?fedora} < 14 && 0%{?rhel} <= 6 +echo "ac_add_options --disable-libjpeg-turbo" >> .mozconfig +%endif + +#--------------------------------------------------------------------- + +%build +cd %{tarballdir} + +# Mozilla builds with -Wall with exception of a few warnings which show up +# everywhere in the code; so, don't override that. +# +# Disable C++ exceptions since Mozilla code is not exception-safe +# +MOZ_OPT_FLAGS=$(echo $RPM_OPT_FLAGS | \ +                     %{__sed} -e 's/-Wall//' -e 's/-fexceptions/-fno-exceptions/g') +export CFLAGS=$MOZ_OPT_FLAGS +export CXXFLAGS=$MOZ_OPT_FLAGS + +export PREFIX='%{_prefix}' +export LIBDIR='%{_libdir}' + +MOZ_SMP_FLAGS=-j1 +# On x86 architectures, Mozilla can build up to 4 jobs at once in parallel, +# however builds tend to fail on other arches when building in parallel. +%ifarch %{ix86} x86_64 +[ -z "$RPM_BUILD_NCPUS" ] && \ +     RPM_BUILD_NCPUS="`/usr/bin/getconf _NPROCESSORS_ONLN`" +[ "$RPM_BUILD_NCPUS" -ge 2 ] && MOZ_SMP_FLAGS=-j2 +[ "$RPM_BUILD_NCPUS" -ge 4 ] && MOZ_SMP_FLAGS=-j4 +%endif + +export LDFLAGS="-Wl,-rpath,%{mozappdir}" +make -f client.mk build STRIP="/bin/true" MOZ_MAKE_FLAGS="$MOZ_SMP_FLAGS" + +# create debuginfo for crash-stats.mozilla.com +%if %{include_debuginfo} +#cd %{moz_objdir} +make buildsymbols +%endif + +#--------------------------------------------------------------------- + +%install +cd %{tarballdir} + +# set up our prefs and add it to the package manifest file, so it gets pulled in +# to omni.jar which gets created during make install +%{__cp} %{SOURCE12} dist/bin/defaults/preferences/all-redhat.js +# This sed call "replaces" firefox.js with all-redhat.js, newline, and itself (&) +# having the net effect of prepending all-redhat.js above firefox.js +%{__sed} -i -e\ +    's|@BINPATH@/@PREF_DIR@/firefox.js|@BINPATH@/@PREF_DIR@/all-redhat.js\n&|' \ +    browser/installer/package-manifest.in + +# set up our default bookmarks +%{__cp} -p %{default_bookmarks_file} dist/bin/defaults/profile/bookmarks.html + +# Make sure locale works for langpacks +%{__cat} > dist/bin/defaults/preferences/firefox-l10n.js << EOF +pref("general.useragent.locale", "chrome://global/locale/intl.properties"); +EOF + +# resolves bug #461880 +%{__cat} > dist/bin/chrome/en-US/locale/branding/browserconfig.properties << EOF +browser.startup.homepage=%{homepage} +EOF + +DESTDIR=$RPM_BUILD_ROOT make install + +%{__mkdir_p} $RPM_BUILD_ROOT{%{_libdir},%{_bindir},%{_datadir}/applications} + +sed -e 's/^Name=.*/Name=Firefox %{version} %{?mycomment}/' \ +    -e "s/firefox/%{name}/" \ +    %{SOURCE20} | tee %{name}.desktop + +desktop-file-install \ +%if 0%{?fedora} <= 16 && 0%{?rhel} <= 6 +   --vendor mozilla \ +%endif +  --dir $RPM_BUILD_ROOT%{_datadir}/applications \ +  --delete-original %{name}.desktop  + +# set up the firefox start script +%{__rm} -rf $RPM_BUILD_ROOT%{_bindir}/%{shortname} +XULRUNNER_DIR=`pkg-config --variable=libdir libxul | %{__sed} -e "s,%{_libdir},,g"` +%{__cat} %{SOURCE21} | %{__sed} -e "s,XULRUNNER_DIRECTORY,$XULRUNNER_DIR,g"  \ +  > $RPM_BUILD_ROOT%{_bindir}/%{name} +%{__chmod} 755 $RPM_BUILD_ROOT%{_bindir}/%{name} + +# Link with xulrunner  +ln -s `pkg-config --variable=libdir libxul` $RPM_BUILD_ROOT/%{mozappdir}/xulrunner + +%{__install} -p -D -m 644 %{SOURCE23} $RPM_BUILD_ROOT%{_mandir}/man1/%{name}.1 + +%{__rm} -f $RPM_BUILD_ROOT/%{mozappdir}/firefox-config + +for s in 16 22 24 32 48 256; do +    %{__mkdir_p} $RPM_BUILD_ROOT%{_datadir}/icons/hicolor/${s}x${s}/apps +    %{__cp} -p browser/branding/official/default${s}.png \ +               $RPM_BUILD_ROOT%{_datadir}/icons/hicolor/${s}x${s}/apps/%{name}.png +done + +echo > ../%{name}.lang +%if %{build_langpacks} +# Extract langpacks, make any mods needed, repack the langpack, and install it. +%{__mkdir_p} $RPM_BUILD_ROOT%{langpackdir} +%{__tar} xf %{SOURCE1} +for langpack in `ls firefox-langpacks/*.xpi`; do +  language=`basename $langpack .xpi` +  extensionID=langpack-$language@firefox.mozilla.org +  %{__mkdir_p} $extensionID +  unzip -q $langpack -d $extensionID +  find $extensionID -type f | xargs chmod 644 + +  sed -i -e "s|browser.startup.homepage.*$|browser.startup.homepage=%{homepage}|g;" \ +     $extensionID/chrome/$language/locale/branding/browserconfig.properties + +  cd $extensionID +  zip -qr9mX ../${extensionID}.xpi * +  cd - + +  %{__install} -m 644 ${extensionID}.xpi $RPM_BUILD_ROOT%{langpackdir} +  language=`echo $language | sed -e 's/-/_/g'` +  echo "%%lang($language) %{langpackdir}/${extensionID}.xpi" >> ../%{name}.lang +done +%{__rm} -rf firefox-langpacks +%endif # build_langpacks + +# System extensions +%{__mkdir_p} $RPM_BUILD_ROOT%{_datadir}/mozilla/extensions/%{firefox_app_id} +%{__mkdir_p} $RPM_BUILD_ROOT%{_libdir}/mozilla/extensions/%{firefox_app_id} + +# Copy over the LICENSE +%{__install} -p -c -m 644 LICENSE $RPM_BUILD_ROOT/%{mozappdir} + +# Enable crash reporter for Firefox application +%if %{include_debuginfo} +sed -i -e "s/\[Crash Reporter\]/[Crash Reporter]\nEnabled=1/" $RPM_BUILD_ROOT/%{mozappdir}/application.ini +%endif + +#--------------------------------------------------------------------- + +%pre +echo -e "\nWARNING : This %{name} %{version} %{?mycomment} RPM is not an official" +echo -e "Fedora/Redhat build and it overrides the official one." +echo -e "Don't file bugs on Fedora Project nor Redhat.\n" +echo -e "Use dedicated forums http://forums.famillecollet.com/\n" + +%if %{?fedora}%{!?fedora:99} <= 14 +echo -e "WARNING : Fedora %{fedora} is now EOL :" +echo -e "You should consider upgrading to a supported release.\n" +%endif + +%if %{name} == %{shortname} +%preun +# is it a final removal? +if [ $1 -eq 0 ]; then +  %{__rm} -rf %{mozappdir}/components +  %{__rm} -rf %{mozappdir}/extensions +  %{__rm} -rf %{mozappdir}/plugins +  %{__rm} -rf %{langpackdir} +fi +%endif + +%post +update-desktop-database &> /dev/null || : +touch --no-create %{_datadir}/icons/hicolor &>/dev/null || : +gtk-update-icon-cache %{_datadir}/icons/hicolor &>/dev/null || : + +%postun +update-desktop-database &> /dev/null || : +if [ $1 -eq 0 ] ; then +    touch --no-create %{_datadir}/icons/hicolor &>/dev/null +    gtk-update-icon-cache %{_datadir}/icons/hicolor &>/dev/null || : +fi + + +%files -f %{name}.lang +%defattr(-,root,root,-) +%{_bindir}/%{name} +%{mozappdir}/firefox +%doc %{_mandir}/man1/* +%dir %{_datadir}/mozilla/extensions/%{firefox_app_id} +%dir %{_libdir}/mozilla/extensions/%{firefox_app_id} +%{_datadir}/applications/*.desktop +%dir %{mozappdir} +%doc %{mozappdir}/LICENSE +%{mozappdir}/chrome +%{mozappdir}/chrome.manifest +%dir %{mozappdir}/components +%{mozappdir}/components/*.so +%{mozappdir}/components/binary.manifest +%{mozappdir}/defaults/preferences/channel-prefs.js +%attr(644, root, root) %{mozappdir}/blocklist.xml +%dir %{mozappdir}/extensions +%{mozappdir}/extensions/{972ce4c6-7e08-4474-a285-3208198ce6fd} +%if %{build_langpacks} +%dir %{langpackdir} +%endif +%{mozappdir}/omni.jar +%{mozappdir}/icons +%{mozappdir}/searchplugins +%{mozappdir}/run-mozilla.sh +%{mozappdir}/application.ini +%exclude %{mozappdir}/removed-files +%{_datadir}/icons/hicolor/16x16/apps/%{name}.png +%{_datadir}/icons/hicolor/22x22/apps/%{name}.png +%{_datadir}/icons/hicolor/24x24/apps/%{name}.png +%{_datadir}/icons/hicolor/256x256/apps/%{name}.png +%{_datadir}/icons/hicolor/32x32/apps/%{name}.png +%{_datadir}/icons/hicolor/48x48/apps/%{name}.png +%{mozappdir}/xulrunner + +%if %{include_debuginfo} +#%{mozappdir}/crashreporter +%{mozappdir}/crashreporter-override.ini +#%{mozappdir}/Throbber-small.gif +#%{mozappdir}/plugin-container +%endif + +#--------------------------------------------------------------------- + +%changelog +* Tue Dec 20 2011 Remi Collet <RPMS@FamilleCollet.com> - 9.0-1 +- update to 9.0, sync with rawhide + +* Tue Dec 20 2011 Jan Horak <jhorak@redhat.com> - 9.0-2 +- Update to 9.0 + +* Thu Dec 15 2011 Jan Horak <jhorak@redhat.com> - 9.0-1.beta5 +- Update to 9.0 Beta 5 + +* Tue Nov 15 2011 Martin Stransky <stransky@redhat.com> - 8.0-3 +- Disabled addon check UI (#753551) + +* Tue Nov 15 2011 Martin Stransky <stransky@redhat.com> - 8.0-2 +- Temporary workaround for langpacks (#753551) + +* Sat Nov 12 2011 Remi Collet <RPMS@FamilleCollet.com> - 8.0-1 +- update to 8.0, sync with rawhide + +* Tue Nov  8 2011 Jan Horak <jhorak@redhat.com> - 8.0-1 +- Update to 8.0 + +* Mon Oct 24 2011 Martin Stransky <stransky@redhat.com> - 7.0.1-3 +- reverted the desktop file name for Fedora15 & 16 + +* Mon Oct 24 2011 Martin Stransky <stransky@redhat.com> - 7.0.1-2 +- renamed mozilla-firefox.desktop to firefox.desktop (#736558) +- nspluginwrapper is not run in plugin-container (#747981) + +* Wed Oct 12 2011 Georgi Georgiev <chutzimir@gmail.com> - 7.0.1-1 +- Make it work on RHEL + +* Fri Sep 30 2011 Remi Collet <RPMS@FamilleCollet.com> - 7.0.1-1 +- update to 7.0.1 + +* Tue Sep 27 2011 Remi Collet <RPMS@FamilleCollet.com> - 7.0-1 +- changes from rawhide (install dir) + +* Tue Sep 27 2011 Jan Horak <jhorak@redhat.com> - 7.0 +- Update to 7.0 + +* Tue Sep 27 2011 Remi Collet <RPMS@FamilleCollet.com> - 7.0-1 +- update to 7.0 + +* Tue Sep 06 2011 Remi Collet <RPMS@FamilleCollet.com> - 6.0.2-1 +- update to 6.0.2 + +* Thu Sep 01 2011 Remi Collet <RPMS@FamilleCollet.com> - 6.0.1-1 +- update to 6.0.1 + +* Wed Aug 17 2011 Remi Collet <RPMS@FamilleCollet.com> - 6.0-1 +- sync with rawhide, update to 6.0 + +* Tue Aug 16 2011 Martin Stransky <stransky@redhat.com> - 6.0-1 +- Update to 6.0 + +* Tue Aug 02 2011 Remi Collet <RPMS@FamilleCollet.com> - 6.0-0.1.beta4 +- update to 6.0 beta4 + +* Sun Jul 24 2011 Remi Collet <RPMS@FamilleCollet.com> - 6.0-0.1.beta3.build2 +- update to 6.0 beta3 build2 candidate + +* Sat Jul 16 2011 Remi Collet <RPMS@FamilleCollet.com> - 5.0.1-1 +- Update to 5.0.1 + +* Sat Jun 25 2011 Remi Collet <RPMS@FamilleCollet.com> - 5.0-2 +- sync with f15/rawhide +- requires xulrunner5 (mainly for f15) + +* Fri Jun 24 2011 Bill Nottingham <notting@redhat.com> - 5.0-2 +- Fix an issue with a stray glyph in the window title + +* Fri Jun 24 2011 Remi Collet <RPMS@FamilleCollet.com> - 5.0-1 +- sync with f15/rawhide +- update to 5.0 finale + +* Tue Jun 21 2011 Martin Stransky <stransky@redhat.com> - 5.0-1 +- Update to 5.0 + +* Thu Jun 16 2011 Remi Collet <RPMS@FamilleCollet.com> - 5.0-0.6.build1 +- Update to 5.0 build 1 candidate + +* Wed Jun 15 2011 Remi Collet <RPMS@FamilleCollet.com> - 5.0-0.5.beta7.build1 +- fix windows title + +* Wed Jun 15 2011 Remi Collet <RPMS@FamilleCollet.com> - 5.0-0.4.beta7.build1 +- update to 5.0 Beta 7 Build 1 Candidate + +* Tue Jun 14 2011 Remi Collet <RPMS@FamilleCollet.com> - 5.0-0.3.beta6.build1 +- update to 5.0 Beta 6 Build 1 Candidate + +* Sun Jun 12 2011 Remi Collet <RPMS@FamilleCollet.com> - 5.0-0.2.b5.build1 +- fix desktop file + +* Sun Jun 12 2011 Remi Collet <RPMS@FamilleCollet.com> - 5.0-0.1.b5.build1 +- patch from spot +- Update to 5.0b5 build1 + +* Thu Jun  2 2011 Tom Callaway <spot@fedoraproject.org> - 5.0-0.1.b3 +- firefox5, b3 + +* Tue May 10 2011 Martin Stransky <stransky@redhat.com> - 4.0.1-2 +- Fixed rhbz#676183 - "firefox -g" is broken + +* Thu Apr 28 2011 Remi Collet <RPMS@FamilleCollet.com> - 4.0.1-1 +- Update to 4.0.1 +- pull latest changes from rawhide + +* Thu Apr 21 2011 Christopher Aillon <caillon@redhat.com> - 4.0-4 +- Spec file cleanups + +* Sun Apr 17 2011 Remi Collet <RPMS@FamilleCollet.com> - 4.0.1-0.1.build1 +- Update to 4.0.1 build1 candidate + +* Mon Apr  4 2011 Christopher Aillon <caillon@redhat.com> - 4.0-3 +- Updates for NetworkManager 0.9 +- Updates for GNOME 3 + +* Tue Mar 22 2011 Christopher Aillon <caillon@redhat.com> - 4.0-2 +- Rebuild + +* Tue Mar 22 2011 Christopher Aillon <caillon@redhat.com> - 4.0-1 +- Firefox 4 + +* Tue Mar 22 2011 Remi Collet <RPMS@FamilleCollet.com> - 4.0-1 +- Firefox 4.0 Finale + +* Sat Mar 19 2011 Remi Collet <RPMS@FamilleCollet.com> - 4.0-0.29.rc2 +- Firefox 4.0 Release Candidate 2 + +* Fri Mar 18 2011 Christopher Aillon <caillon@redhat.com> - 4.0-0.21 +- Firefox 4.0 RC 2 + +* Thu Mar 17 2011 Jan Horak <jhorak@redhat.com> - 4.0-0.20 +- Rebuild against xulrunner with disabled gnomevfs and enabled gio + +* Sat Mar 10 2011 Remi Collet <RPMS@FamilleCollet.com> - 4.0-0.28.rc1 +- Firefox 4.0 Release Candidate 1 + +* Wed Mar  9 2011 Christopher Aillon <caillon@redhat.com> - 4.0-0.19 +- Firefox 4.0 RC 1 + +* Sat Mar 05 2011 Remi Collet <RPMS@FamilleCollet.com> - 4.0-0.27.rc1.build1 +- Firefox 4.0 RC1 build1 candidate + +* Mon Feb 28 2011 Remi Collet <RPMS@FamilleCollet.com> - 4.0-0.26.beta12 +- sync with rawhide +- Firefox 4.0 Beta 12 + +* Sat Feb 26 2011 Christopher Aillon <caillon@redhat.com> - 4.0-0.18b12 +- Switch to using the omni chrome file format + +* Fri Feb 25 2011 Christopher Aillon <caillon@redhat.com> - 4.0-0.17b12 +- Firefox 4.0 Beta 12 + +* Wed Feb 23 2011 Remi Collet <RPMS@FamilleCollet.com> - 4.0-0.25.beta12.build1 +- sync with rawhide +- Firefox 4.0 Beta 12 build1 candidate + +* Thu Feb 10 2011 Christopher Aillon <caillon@redhat.com> - 4.0-0.16b11 +- Update gecko-{libs,devel} requires + +* Wed Feb 09 2011 Remi Collet <RPMS@FamilleCollet.com> - 4.0-0.24.beta11 +- Firefox 4.0 Beta 11 + +* Tue Feb 08 2011 Christopher Aillon <caillon@redhat.com> - 4.0-0.15b11 +- Firefox 4.0 Beta 11 + +* Fri Feb 04 2011 Remi Collet <RPMS@FamilleCollet.com> - 4.0-0.23.beta11.build3 +- 4.0b11 build3 candidate + +* Thu Feb 03 2011 Remi Collet <RPMS@FamilleCollet.com> - 4.0-0.22.beta11.build2 +- 4.0b11 build2 candidate + +* Wed Feb 02 2011 Remi Collet <RPMS@FamilleCollet.com> - 4.0-0.21.beta10 +- sync with rawhide, use system xulrunner2 + +* Tue Jan 25 2011 Christopher Aillon <caillon@redhat.com> - 4.0-0.13b10 +- Firefox 4.0 Beta 10 + +* Fri Jan 14 2011 Christopher Aillon <caillon@redhat.com> - 4.0-0.12b9 +- Firefox 4.0 Beta 9 + +* Thu Jan 6 2011 Dan Horák <dan[at]danny.cz> - 4.0-0.11b8 +- disable ipc on non-x86 arches to match xulrunner + +* Thu Jan 6 2011 Martin Stransky <stransky@redhat.com> - 4.0-0.10b8 +- application.ini permission check fix + +* Thu Jan 6 2011 Martin Stransky <stransky@redhat.com> - 4.0-0.9b8 +- Fixed rhbz#667477 - broken launch script + +* Tue Jan 4 2011 Martin Stransky <stransky@redhat.com> - 4.0-0.8b8 +- Fixed rhbz#664877 - Cannot read application.ini + +* Tue Dec 21 2010 Martin Stransky <stransky@redhat.com> - 4.0-0.7b8 +- Update to Beta 8 +- Fixed rhbz#437608 - When prelink is installed,  +  rpm builds are garbage + +* Wed Dec  8 2010 Christopher Aillon <caillon@redhat.com> - 4.0-0.6b7 +- Use official branding since this is an official beta +- Fix Tab Candy/Panorama (#658573) + +* Thu Nov 11 2010 Jan Horak <jhorak@redhat.com> - 4.0b7-1 +- Update to 4.0b7 +- Added x-scheme-handler to firefox.desktop + +* Wed Sep 29 2010 jkeating - 4.0-0.4b6 +- Rebuilt for gcc bug 634757 + +* Tue Sep 21 2010 Martin Stransky <stransky@redhat.com> - 4.0-0.3.b6 +- Update to 4.0 Beta 6 + +* Tue Sep  7 2010 Tom "spot" Callaway <tcallawa@redhat.com> - 4.0-0.2.b4 +- get package building and mostly functional + +* Mon Aug 30 2010 Martin Stransky <stransky@redhat.com> - 4.0-0.1.b4 +- Update to 4.0 Beta 4 + | 
