diff options
| author | Remi Collet <fedora@famillecollet.com> | 2011-12-22 16:49:48 +0100 |
|---|---|---|
| committer | Remi Collet <fedora@famillecollet.com> | 2011-12-22 16:49:48 +0100 |
| commit | 2e5013b06612bcfdf8050c569cd9f12a758e8fa4 (patch) | |
| tree | 4b825dc642cb6eb9a060e54bf8d69288fbee4904 | |
| parent | 5f139fd8d735a957395c0d01bcc835271d80999f (diff) | |
clean
51 files changed, 0 insertions, 5769 deletions
diff --git a/Makefile b/Makefile deleted file mode 100644 index 0e9fe75..0000000 --- a/Makefile +++ /dev/null @@ -1,18 +0,0 @@ -SRCDIR := $(shell pwd) -NAME := $(shell basename $(SRCDIR)) -include ../common/Makefile - - -checkcvs: - for file in fire* moz* fin*; \ - do \ - if [ -f /home/extras/CVS/firefox/devel/$$file ]; then \ - echo "--------- $$file (firefox)"; \ - diff -u /home/extras/CVS/firefox/devel/$$file $$file; \ - elif [ -f /home/extras/CVS/xulrunner/devel/$$file ]; then \ - echo "--------- $$file (xulrunner)"; \ - diff -u /home/extras/CVS/xulrunner/devel/$$file $$file; \ - else \ - echo "--------- $$file NOTFOUND"; \ - fi; \ - done @@ -1,12 +0,0 @@ -firefox -------- - -Backport of latest Firefox for older Fedora Release - -FF 3.6.x only in Fedora >= 13 -Backport to Fedora 8-12 - -Diff : - use bundled xulrunner to avoid breaking other deps. - - diff --git a/bench/f14-kraken.txt b/bench/f14-kraken.txt deleted file mode 100644 index 81c1b22..0000000 --- a/bench/f14-kraken.txt +++ /dev/null @@ -1,498 +0,0 @@ -========================================================================== -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/f14-sunspider.txt b/bench/f14-sunspider.txt deleted file mode 100644 index d41cce4..0000000 --- a/bench/f14-sunspider.txt +++ /dev/null @@ -1,797 +0,0 @@ -========================================== 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/f14-v8.txt b/bench/f14-v8.txt deleted file mode 100644 index a0dc4a1..0000000 --- a/bench/f14-v8.txt +++ /dev/null @@ -1,87 +0,0 @@ -============================================================================== -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 -============================================================================== - diff --git a/bench/kraken.txt b/bench/kraken.txt deleted file mode 100644 index 4e571ee..0000000 --- a/bench/kraken.txt +++ /dev/null @@ -1,174 +0,0 @@ - Intel(R) Core(TM)2 Quad CPU Q6600 @ 2.40GHz - -===================================== V8 ===================================== -Kraken JavaScript Benchmark Results - http://krakenbenchmark.mozilla.com/kraken-1.0/driver.html -============================================================================== - -Mozilla/5.0 (X11; U; Linux x86_64; fr; rv:1.9.2.9) Gecko/20100910 Remi/fc13 Firefox/3.6.9 94221.2ms +/- 3.8% - -Mozilla/5.0 (X11; Linux x86_64; rv:2.0b4) Gecko/20100825 Remi/fc13 Firefox/4.0b4 10602.2ms +/- 5.2% -Mozilla/5.0 (X11; Linux x86_64; rv:2.0b5) Gecko/20100101 Firefox/4.0b5 Remi/fc13 10186.6ms +/- 6.4% -Mozilla/5.0 (X11; Linux x86_64; rv:2.0b6) Gecko/20100101 Firefox/4.0b6 Remi/fc13 (build2) 10062.7ms +/- 4.2% -Mozilla/5.0 (X11; Linux x86_64; rv:2.0b6) Gecko/20100101 Firefox/4.0b6 Remi/fc13 10180.0ms +/- 4.9% - -============================================================================== - -Mozilla/5.0 (X11; Linux x86_64; rv:2.0b6) Gecko/20100101 Firefox/4.0b6 Remi/fc13 -=============================================== -RESULTS (means and 95% confidence intervals) ------------------------------------------------ -Total: 10180.0ms +/- 4.9% ------------------------------------------------ - - ai: 1254.2ms +/- 14.9% - astar: 1254.2ms +/- 14.9% - - audio: 4102.2ms +/- 7.0% - beat-detection: 1113.0ms +/- 10.2% - dft: 979.0ms +/- 7.7% - fft: 1008.5ms +/- 12.6% - oscillator: 1001.7ms +/- 14.7% - - imaging: 2788.3ms +/- 6.9% - gaussian-blur: 1146.4ms +/- 9.4% - darkroom: 472.8ms +/- 9.8% - desaturate: 1169.1ms +/- 8.2% - - json: 330.2ms +/- 5.5% - parse-financial: 205.6ms +/- 0.4% - stringify-tinderbox: 124.6ms +/- 14.3% - - stanford: 1705.1ms +/- 3.7% - crypto-aes: 382.4ms +/- 12.0% - crypto-ccm: 487.5ms +/- 14.3% - crypto-pbkdf2: 641.9ms +/- 9.4% - crypto-sha256-iterative: 193.3ms +/- 12.2% - -Mozilla/5.0 (X11; Linux x86_64; rv:2.0b6) Gecko/20100101 Firefox/4.0b6 Remi/fc13 (build2) -=============================================== -RESULTS (means and 95% confidence intervals) ------------------------------------------------ -Total: 10062.7ms +/- 4.2% ------------------------------------------------ - - ai: 1141.9ms +/- 14.5% - astar: 1141.9ms +/- 14.5% - - audio: 4209.5ms +/- 7.7% - beat-detection: 1091.5ms +/- 11.7% - dft: 935.6ms +/- 8.5% - fft: 1132.1ms +/- 11.7% - oscillator: 1050.3ms +/- 13.5% - - imaging: 2674.0ms +/- 0.7% - gaussian-blur: 1099.8ms +/- 2.0% - darkroom: 460.2ms +/- 2.4% - desaturate: 1114.0ms +/- 0.5% - - json: 322.1ms +/- 3.7% - parse-financial: 209.5ms +/- 2.7% - stringify-tinderbox: 112.6ms +/- 9.9% - - stanford: 1715.2ms +/- 6.7% - crypto-aes: 366.0ms +/- 14.7% - crypto-ccm: 527.5ms +/- 14.8% - crypto-pbkdf2: 634.3ms +/- 7.4% - crypto-sha256-iterative: 187.4ms +/- 10.7% - - -Mozilla/5.0 (X11; Linux x86_64; rv:2.0b5) Gecko/20100101 Firefox/4.0b5 Remi/fc13 -=============================================== -RESULTS (means and 95% confidence intervals) ------------------------------------------------ -Total: 10186.6ms +/- 6.4% ------------------------------------------------ - - ai: 1185.2ms +/- 12.6% - astar: 1185.2ms +/- 12.6% - - audio: 4207.2ms +/- 8.6% - beat-detection: 1188.9ms +/- 11.0% - dft: 863.8ms +/- 9.3% - fft: 1095.0ms +/- 12.3% - oscillator: 1059.5ms +/- 13.8% - - imaging: 2783.0ms +/- 6.8% - gaussian-blur: 1147.5ms +/- 8.6% - darkroom: 478.9ms +/- 7.2% - desaturate: 1156.6ms +/- 5.5% - - json: 323.2ms +/- 3.5% - parse-financial: 211.0ms +/- 0.9% - stringify-tinderbox: 112.2ms +/- 10.0% - - stanford: 1688.0ms +/- 5.6% - crypto-aes: 333.8ms +/- 11.5% - crypto-ccm: 492.6ms +/- 13.9% - crypto-pbkdf2: 650.6ms +/- 11.8% - crypto-sha256-iterative: 211.0ms +/- 15.0% - - -Mozilla/5.0 (X11; Linux x86_64; rv:2.0b4) Gecko/20100825 Remi/fc13 Firefox/4.0b4 -=============================================== -RESULTS (means and 95% confidence intervals) ------------------------------------------------ -Total: 10602.2ms +/- 5.2% ------------------------------------------------ - - ai: 1211.1ms +/- 12.8% - astar: 1211.1ms +/- 12.8% - - audio: 4331.5ms +/- 9.0% - beat-detection: 1181.4ms +/- 10.9% - dft: 1085.2ms +/- 9.8% - fft: 1016.3ms +/- 12.8% - oscillator: 1048.6ms +/- 13.6% - - imaging: 2930.3ms +/- 4.6% - gaussian-blur: 1279.7ms +/- 10.4% - darkroom: 532.3ms +/- 12.1% - desaturate: 1118.3ms +/- 2.0% - - json: 322.6ms +/- 7.4% - parse-financial: 201.0ms +/- 9.9% - stringify-tinderbox: 121.6ms +/- 13.3% - - stanford: 1806.7ms +/- 9.8% - crypto-aes: 391.9ms +/- 12.1% - crypto-ccm: 586.2ms +/- 17.3% - crypto-pbkdf2: 625.1ms +/- 13.0% - crypto-sha256-iterative: 203.5ms +/- 14.3% - - -Mozilla/5.0 (X11; U; Linux x86_64; fr; rv:1.9.2.9) Gecko/20100910 Remi/fc13 Firefox/3.6.9 -=============================================== -RESULTS (means and 95% confidence intervals) ------------------------------------------------ -Total: 94221.2ms +/- 3.8% ------------------------------------------------ - - ai: 6824.2ms +/- 14.9% - astar: 6824.2ms +/- 14.9% - - audio: 22299.0ms +/- 4.7% - beat-detection: 6370.9ms +/- 4.8% - dft: 6128.5ms +/- 6.7% - fft: 5364.6ms +/- 7.7% - oscillator: 4435.0ms +/- 11.4% - - imaging: 53564.2ms +/- 5.0% - gaussian-blur: 36217.1ms +/- 8.5% - darkroom: 7870.9ms +/- 9.5% - desaturate: 9476.2ms +/- 11.6% - - json: 386.1ms +/- 0.3% - parse-financial: 259.0ms +/- 0.4% - stringify-tinderbox: 127.1ms +/- 0.5% - - stanford: 11147.7ms +/- 5.0% - crypto-aes: 2164.0ms +/- 11.3% - crypto-ccm: 1554.3ms +/- 9.7% - crypto-pbkdf2: 5572.5ms +/- 7.6% - crypto-sha256-iterative: 1856.9ms +/- 13.7% - diff --git a/bench/sunspider.txt b/bench/sunspider.txt deleted file mode 100644 index e8255bd..0000000 --- a/bench/sunspider.txt +++ /dev/null @@ -1,431 +0,0 @@ - Intel(R) Core(TM)2 Quad CPU Q6600 @ 2.40GHz - -========================================== SunSpider ==================================== -http://www2.webkit.org/perf/sunspider-0.9/sunspider.html -========================================================================================= -Mozilla/5.0 (X11; U; Linux x86_64; fr; rv:1.9.2.8) Gecko/20100724 Remi/fc13 Firefox/3.6.8 2029.0ms +/- 2.3% -Mozilla/5.0 (X11; U; Linux x86_64; fr; rv:1.9.2.9) Gecko/20100910 Remi/fc13 Firefox/3.6.9 2105.2ms +/- 3.4% - -Mozilla/5.0 (X11; Linux x86_64; rv:2.0b2) Gecko/20100728 Remi/fc13 Firefox/4.0b2 757.4ms +/- 6.8% -Mozilla/5.0 (X11; Linux x86_64; rv:2.0b3) Gecko/20100815 Remi/fc13 Firefox/4.0b3 748.4ms +/- 4.4% -Mozilla/5.0 (X11; Linux x86_64; rv:2.0b4) Gecko/20100825 Remi/fc13 Firefox/4.0b4 537.4ms +/- 4.0% -Mozilla/5.0 (X11; Linux x86_64; rv:2.0b5) Gecko/20100101 Firefox/4.0b5 Remi/fc13 523.2ms +/- 3.4% -Mozilla/5.0 (X11; Linux x86_64; rv:2.0b6) Gecko/20100101 Firefox/4.0b6 Remi/fc13 (build2) 512.8ms +/- 1.6% -Mozilla/5.0 (X11; Linux x86_64; rv:2.0b6) Gecko/20100101 Firefox/4.0b6 Remi/fc13 531.0ms +/- 7.3% -========================================================================================= - -Mozilla/5.0 (X11; Linux x86_64; rv:2.0b6) Gecko/20100101 Firefox/4.0b6 Remi/fc13 -============================================ -RESULTS (means and 95% confidence intervals) --------------------------------------------- -Total: 531.0ms +/- 7.3% --------------------------------------------- - - 3d: 110.8ms +/- 0.9% - cube: 31.8ms +/- 3.3% - morph: 27.0ms +/- 0.0% - raytrace: 52.0ms +/- 0.0% - - access: 79.8ms +/- 14.2% - binary-trees: 25.0ms +/- 36.4% - fannkuch: 34.2ms +/- 8.3% - nbody: 10.0ms +/- 0.0% - nsieve: 10.6ms +/- 6.4% - - bitops: 22.2ms +/- 4.7% - 3bit-bits-in-byte: 0.8ms +/- 69.5% - bits-in-byte: 9.0ms +/- 0.0% - bitwise-and: 2.0ms +/- 0.0% - nsieve-bits: 10.4ms +/- 6.5% - - controlflow: 8.0ms +/- 0.0% - recursive: 8.0ms +/- 0.0% - - crypto: 37.0ms +/- 0.0% - aes: 20.0ms +/- 0.0% - md5: 12.0ms +/- 0.0% - sha1: 5.0ms +/- 0.0% - - date: 77.2ms +/- 22.4% - format-tofte: 52.4ms +/- 32.6% - format-xparb: 24.8ms +/- 4.2% - - math: 32.8ms +/- 3.2% - cordic: 13.0ms +/- 6.8% - partial-sums: 13.8ms +/- 4.0% - spectral-norm: 6.0ms +/- 0.0% - - regexp: 37.0ms +/- 6.7% - dna: 37.0ms +/- 6.7% - - string: 126.2ms +/- 9.4% - base64: 6.4ms +/- 10.6% - fasta: 25.2ms +/- 2.2% - tagcloud: 42.2ms +/- 24.4% - unpack-code: 42.0ms +/- 5.9% - validate-input: 10.4ms +/- 6.5% - - -Mozilla/5.0 (X11; U; Linux x86_64; fr; rv:1.9.2.8) Gecko/20100724 Remi/fc13 Firefox/3.6.8 -============================================ -RESULTS (means and 95% confidence intervals) --------------------------------------------- -Total: 2029.0ms +/- 2.3% --------------------------------------------- - - 3d: 251.0ms +/- 1.2% - cube: 85.0ms +/- 1.8% - morph: 80.2ms +/- 0.7% - raytrace: 85.8ms +/- 3.8% - - access: 314.2ms +/- 7.0% - binary-trees: 37.4ms +/- 1.8% - fannkuch: 137.4ms +/- 1.0% - nbody: 101.4ms +/- 22.2% - nsieve: 38.0ms +/- 0.0% - - bitops: 225.8ms +/- 6.3% - 3bit-bits-in-byte: 42.8ms +/- 2.4% - bits-in-byte: 57.2ms +/- 4.7% - bitwise-and: 57.8ms +/- 24.4% - nsieve-bits: 68.0ms +/- 2.2% - - controlflow: 34.0ms +/- 3.7% - recursive: 34.0ms +/- 3.7% - - crypto: 136.4ms +/- 1.7% - aes: 54.8ms +/- 1.9% - md5: 39.6ms +/- 4.8% - sha1: 42.0ms +/- 0.0% - - date: 158.4ms +/- 1.7% - format-tofte: 77.8ms +/- 2.1% - format-xparb: 80.6ms +/- 1.4% - - math: 223.4ms +/- 5.7% - cordic: 88.0ms +/- 1.0% - partial-sums: 86.8ms +/- 5.2% - spectral-norm: 48.6ms +/- 24.9% - - regexp: 178.8ms +/- 4.2% - dna: 178.8ms +/- 4.2% - - string: 507.0ms +/- 11.2% - base64: 39.4ms +/- 8.2% - fasta: 107.0ms +/- 2.3% - tagcloud: 122.8ms +/- 20.8% - unpack-code: 169.8ms +/- 13.2% - validate-input: 68.0ms +/- 35.1% - - -Mozilla/5.0 (X11; U; Linux x86_64; fr; rv:1.9.2.9) Gecko/20100910 Remi/fc13 Firefox/3.6.9 -============================================ -RESULTS (means and 95% confidence intervals) --------------------------------------------- -Total: 2105.2ms +/- 3.4% --------------------------------------------- - - 3d: 261.2ms +/- 8.8% - cube: 86.2ms +/- 1.9% - morph: 93.2ms +/- 25.2% - raytrace: 81.8ms +/- 1.3% - - access: 307.8ms +/- 2.6% - binary-trees: 39.4ms +/- 1.7% - fannkuch: 131.6ms +/- 1.4% - nbody: 98.6ms +/- 7.1% - nsieve: 38.2ms +/- 1.5% - - bitops: 223.8ms +/- 4.2% - 3bit-bits-in-byte: 36.2ms +/- 3.8% - bits-in-byte: 61.2ms +/- 15.0% - bitwise-and: 52.4ms +/- 1.3% - nsieve-bits: 74.0ms +/- 2.9% - - controlflow: 34.2ms +/- 6.5% - recursive: 34.2ms +/- 6.5% - - crypto: 131.2ms +/- 2.1% - aes: 53.0ms +/- 2.3% - md5: 37.8ms +/- 5.4% - sha1: 40.4ms +/- 1.7% - - date: 171.2ms +/- 4.0% - format-tofte: 85.2ms +/- 3.2% - format-xparb: 86.0ms +/- 4.9% - - math: 240.2ms +/- 12.8% - cordic: 94.4ms +/- 2.9% - partial-sums: 100.4ms +/- 31.1% - spectral-norm: 45.4ms +/- 1.5% - - regexp: 185.8ms +/- 3.6% - dna: 185.8ms +/- 3.6% - - string: 549.8ms +/- 8.7% - base64: 38.2ms +/- 3.6% - fasta: 124.8ms +/- 24.9% - tagcloud: 129.2ms +/- 16.9% - unpack-code: 188.0ms +/- 16.5% - validate-input: 69.6ms +/- 12.5% - - -Mozilla/5.0 (X11; Linux x86_64; rv:2.0b2) Gecko/20100728 Remi/fc13 Firefox/4.0b2 -============================================ -RESULTS (means and 95% confidence intervals) --------------------------------------------- -Total: 757.4ms +/- 6.8% --------------------------------------------- - - 3d: 124.6ms +/- 40.9% - cube: 34.6ms +/- 4.8% - morph: 30.0ms +/- 9.3% - raytrace: 60.0ms +/- 77.6% - - access: 79.8ms +/- 4.3% - binary-trees: 18.8ms +/- 8.6% - fannkuch: 35.4ms +/- 9.2% - nbody: 15.2ms +/- 3.7% - nsieve: 10.4ms +/- 6.5% - - bitops: 25.4ms +/- 8.2% - 3bit-bits-in-byte: 0.4ms +/- 170.2% - bits-in-byte: 9.2ms +/- 6.0% - bitwise-and: 1.4ms +/- 48.6% - nsieve-bits: 14.4ms +/- 4.7% - - controlflow: 8.4ms +/- 8.1% - recursive: 8.4ms +/- 8.1% - - crypto: 41.8ms +/- 4.4% - aes: 25.2ms +/- 7.3% - md5: 11.2ms +/- 5.0% - sha1: 5.4ms +/- 12.6% - - date: 91.6ms +/- 1.2% - format-tofte: 59.6ms +/- 1.1% - format-xparb: 32.0ms +/- 2.7% - - math: 36.8ms +/- 5.6% - cordic: 13.4ms +/- 8.3% - partial-sums: 17.6ms +/- 6.3% - spectral-norm: 5.8ms +/- 9.6% - - regexp: 74.0ms +/- 5.2% - dna: 74.0ms +/- 5.2% - - string: 275.0ms +/- 6.3% - base64: 7.0ms +/- 0.0% - fasta: 26.4ms +/- 2.6% - tagcloud: 87.8ms +/- 1.8% - unpack-code: 126.0ms +/- 13.7% - validate-input: 27.8ms +/- 5.8% - - -Mozilla/5.0 (X11; Linux x86_64; rv:2.0b3) Gecko/20100815 Remi/fc13 Firefox/4.0b3 -============================================ -RESULTS (means and 95% confidence intervals) --------------------------------------------- -Total: 748.4ms +/- 4.4% --------------------------------------------- - - 3d: 123.4ms +/- 14.0% - cube: 41.4ms +/- 37.2% - morph: 28.4ms +/- 3.9% - raytrace: 53.6ms +/- 6.3% - - access: 72.6ms +/- 3.6% - binary-trees: 21.0ms +/- 4.2% - fannkuch: 31.6ms +/- 3.5% - nbody: 9.2ms +/- 6.0% - nsieve: 10.8ms +/- 9.6% - - bitops: 21.8ms +/- 4.8% - 3bit-bits-in-byte: 1.0ms +/- 0.0% - bits-in-byte: 9.2ms +/- 6.0% - bitwise-and: 2.0ms +/- 0.0% - nsieve-bits: 9.6ms +/- 7.1% - - controlflow: 8.8ms +/- 11.8% - recursive: 8.8ms +/- 11.8% - - crypto: 42.6ms +/- 8.4% - aes: 26.0ms +/- 13.1% - md5: 11.6ms +/- 5.9% - sha1: 5.0ms +/- 0.0% - - date: 90.8ms +/- 3.7% - format-tofte: 56.2ms +/- 1.9% - format-xparb: 34.6ms +/- 7.5% - - math: 36.4ms +/- 11.0% - cordic: 12.8ms +/- 12.7% - partial-sums: 17.6ms +/- 13.8% - spectral-norm: 6.0ms +/- 0.0% - - regexp: 83.6ms +/- 1.3% - dna: 83.6ms +/- 1.3% - - string: 268.4ms +/- 3.8% - base64: 6.2ms +/- 9.0% - fasta: 25.4ms +/- 7.4% - tagcloud: 85.4ms +/- 2.8% - unpack-code: 133.2ms +/- 9.1% - validate-input: 18.2ms +/- 7.5% - - -Mozilla/5.0 (X11; Linux x86_64; rv:2.0b4) Gecko/20100825 Remi/fc13 Firefox/4.0b4 -============================================ -RESULTS (means and 95% confidence intervals) --------------------------------------------- -Total: 537.4ms +/- 4.0% --------------------------------------------- - - 3d: 106.0ms +/- 1.9% - cube: 29.8ms +/- 3.5% - morph: 27.8ms +/- 4.9% - raytrace: 48.4ms +/- 1.4% - - access: 70.4ms +/- 1.6% - binary-trees: 18.8ms +/- 5.5% - fannkuch: 31.8ms +/- 4.3% - nbody: 9.2ms +/- 14.8% - nsieve: 10.6ms +/- 10.5% - - bitops: 22.4ms +/- 5.0% - 3bit-bits-in-byte: 0.8ms +/- 69.5% - bits-in-byte: 9.6ms +/- 11.6% - bitwise-and: 2.2ms +/- 25.3% - nsieve-bits: 9.8ms +/- 5.7% - - controlflow: 7.8ms +/- 7.1% - recursive: 7.8ms +/- 7.1% - - crypto: 36.6ms +/- 5.2% - aes: 21.0ms +/- 11.1% - md5: 11.0ms +/- 8.0% - sha1: 4.6ms +/- 14.8% - - date: 87.6ms +/- 7.6% - format-tofte: 54.2ms +/- 12.6% - format-xparb: 33.4ms +/- 2.0% - - math: 40.0ms +/- 31.3% - cordic: 12.8ms +/- 8.1% - partial-sums: 21.8ms +/- 55.1% - spectral-norm: 5.4ms +/- 12.6% - - regexp: 37.2ms +/- 3.7% - dna: 37.2ms +/- 3.7% - - string: 129.4ms +/- 3.8% - base64: 6.2ms +/- 22.0% - fasta: 25.2ms +/- 2.2% - tagcloud: 46.0ms +/- 0.0% - unpack-code: 41.2ms +/- 5.4% - validate-input: 10.8ms +/- 20.6% - - -Mozilla/5.0 (X11; Linux x86_64; rv:2.0b5) Gecko/20100101 Firefox/4.0b5 Remi/fc13 -============================================ -RESULTS (means and 95% confidence intervals) --------------------------------------------- -Total: 523.2ms +/- 3.4% --------------------------------------------- - - 3d: 110.0ms +/- 1.6% - cube: 31.8ms +/- 1.7% - morph: 27.2ms +/- 2.0% - raytrace: 51.0ms +/- 1.7% - - access: 76.2ms +/- 2.9% - binary-trees: 21.6ms +/- 3.2% - fannkuch: 33.2ms +/- 3.1% - nbody: 9.4ms +/- 11.8% - nsieve: 12.0ms +/- 7.3% - - bitops: 22.0ms +/- 4.0% - 3bit-bits-in-byte: 0.8ms +/- 69.5% - bits-in-byte: 9.2ms +/- 6.0% - bitwise-and: 2.0ms +/- 0.0% - nsieve-bits: 10.0ms +/- 0.0% - - controlflow: 8.0ms +/- 0.0% - recursive: 8.0ms +/- 0.0% - - crypto: 38.0ms +/- 4.0% - aes: 21.6ms +/- 5.1% - md5: 11.4ms +/- 6.0% - sha1: 5.0ms +/- 0.0% - - date: 71.0ms +/- 1.8% - format-tofte: 46.6ms +/- 1.5% - format-xparb: 24.4ms +/- 2.8% - - math: 33.0ms +/- 2.7% - cordic: 13.0ms +/- 6.8% - partial-sums: 14.0ms +/- 0.0% - spectral-norm: 6.0ms +/- 0.0% - - regexp: 36.0ms +/- 0.0% - dna: 36.0ms +/- 0.0% - - string: 129.0ms +/- 10.5% - base64: 6.0ms +/- 0.0% - fasta: 26.8ms +/- 3.9% - tagcloud: 40.6ms +/- 17.9% - unpack-code: 45.0ms +/- 12.8% - validate-input: 10.6ms +/- 10.5% - -Mozilla/5.0 (X11; Linux x86_64; rv:2.0b6) Gecko/20100101 Firefox/4.0b6 Remi/fc13 (build2) -============================================ -RESULTS (means and 95% confidence intervals) --------------------------------------------- -Total: 512.8ms +/- 1.6% --------------------------------------------- - - 3d: 110.0ms +/- 1.6% - cube: 31.8ms +/- 3.3% - morph: 27.2ms +/- 2.0% - raytrace: 51.0ms +/- 1.7% - - access: 70.8ms +/- 0.8% - binary-trees: 18.8ms +/- 3.0% - fannkuch: 32.4ms +/- 2.1% - nbody: 9.2ms +/- 6.0% - nsieve: 10.4ms +/- 10.7% - - bitops: 23.6ms +/- 7.1% - 3bit-bits-in-byte: 0.6ms +/- 113.5% - bits-in-byte: 9.0ms +/- 0.0% - bitwise-and: 4.2ms +/- 32.4% - nsieve-bits: 9.8ms +/- 5.7% - - controlflow: 8.0ms +/- 0.0% - recursive: 8.0ms +/- 0.0% - - crypto: 37.2ms +/- 5.5% - aes: 20.4ms +/- 6.9% - md5: 11.8ms +/- 8.8% - sha1: 5.0ms +/- 0.0% - - date: 70.2ms +/- 1.9% - format-tofte: 46.0ms +/- 3.3% - format-xparb: 24.2ms +/- 2.3% - - math: 31.8ms +/- 1.7% - cordic: 12.2ms +/- 4.6% - partial-sums: 13.6ms +/- 5.0% - spectral-norm: 6.0ms +/- 0.0% - - regexp: 37.8ms +/- 5.9% - dna: 37.8ms +/- 5.9% - - string: 123.4ms +/- 3.5% - base64: 6.0ms +/- 0.0% - fasta: 25.2ms +/- 2.2% - tagcloud: 37.6ms +/- 3.0% - unpack-code: 43.8ms +/- 12.3% - validate-input: 10.8ms +/- 15.0% - - diff --git a/bench/v8.txt b/bench/v8.txt deleted file mode 100644 index 6c61f66..0000000 --- a/bench/v8.txt +++ /dev/null @@ -1,14 +0,0 @@ - Intel(R) Core(TM)2 Quad CPU Q6600 @ 2.40GHz - -===================================== V8 ===================================== -http://v8.googlecode.com/svn/data/benchmarks/v5/run.html -============================================================================== - -Mozilla/5.0 (X11; U; Linux x86_64; fr; rv:1.9.2.8) Gecko/20100724 Remi/fc13 Firefox/3.6.8 : 225 -Mozilla/5.0 (X11; U; Linux x86_64; fr; rv:1.9.2.9) Gecko/20100910 Remi/fc13 Firefox/3.6.9 : 242 -Mozilla/5.0 (X11; Linux x86_64; rv:2.0b3) Gecko/20100815 Remi/fc13 Firefox/4.0b3 : 812 -Mozilla/5.0 (X11; Linux x86_64; rv:2.0b4) Gecko/20100825 Remi/fc13 Firefox/4.0b4 : 902 -Mozilla/5.0 (X11; Linux x86_64; rv:2.0b5) Gecko/20100101 Firefox/4.0b5 Remi/fc13 : 909 -Mozilla/5.0 (X11; Linux x86_64; rv:2.0b6) Gecko/20100101 Firefox/4.0b6 Remi/fc13 (build2) : 1029 -Mozilla/5.0 (X11; Linux x86_64; rv:2.0b6) Gecko/20100101 Firefox/4.0b6 Remi/fc13 : 1066 - @@ -1,109 +0,0 @@ -#!/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/find-external-requires b/find-external-requires deleted file mode 100755 index d79db1d..0000000 --- a/find-external-requires +++ /dev/null @@ -1,23 +0,0 @@ -#!/bin/sh - -# Finds requirements provided outside of the current file set - -filelist=`sed "s/[]['\"*?{}]/\\\\\&/g"` - -provides=`echo $filelist | /usr/lib/rpm/find-provides` - -{ -for f in $filelist ; do - echo $f | /usr/lib/rpm/find-requires | while read req ; do - found=0 - for p in $provides ; do - if [ "$req" = "$p" ]; then - found=1 - fi - done - if [ "$found" = "0" ]; then - echo $req - fi - done -done -} | sort -u
\ No newline at end of file diff --git a/firefox-bookmarks.html b/firefox-bookmarks.html deleted file mode 100644 index 905991c..0000000 --- a/firefox-bookmarks.html +++ /dev/null @@ -1,45 +0,0 @@ -<!DOCTYPE NETSCAPE-Bookmark-file-1> -<!-- This is an automatically generated file. - It will be read and overwritten. - DO NOT EDIT! --> -<META HTTP-EQUIV="Content-Type" CONTENT="text/html; charset=UTF-8"> -<TITLE>Bookmarks</TITLE> -<H1 LAST_MODIFIED="1130967916">Bookmarks</H1> - -<DL><p> - <DT><H3 ADD_DATE="961112773" LAST_MODIFIED="1176675480" PERSONAL_TOOLBAR_FOLDER="true" ID="NC:PersonalToolbarFolder">Personal Toolbar Folder</H3> - <DL><p> - <DT><A HREF="http://docs.fedoraproject.org/release-notes/" ADD_DATE="1158286602" LAST_VISIT="1158286627" LAST_MODIFIED="1176675660" LAST_CHARSET="UTF-8" ID="rdf:#$b7+Ar2">Release Notes</A> -<DD>Fedora Release Notes - <DT><H3 ADD_DATE="1130967903" LAST_MODIFIED="1176675263" ID="rdf:#$A80oc3">Fedora Project</H3> - <DL><p> - <DT><A HREF="http://fedoraproject.org/" ADD_DATE="1158286779" LAST_VISIT="1176675005" LAST_MODIFIED="1176675285" LAST_CHARSET="UTF-8" ID="rdf:#$c7+Ar2">Fedora Project</A> -<DD>Starting point for the Fedora Project - <DT><A HREF="http://forums.fedoraforum.org/" ADD_DATE="1130967896" LAST_VISIT="1158286671" LAST_MODIFIED="1176675301" LAST_CHARSET="ISO-8859-1" ID="rdf:#$z80oc3">Fedora Forum</A> -<DD>Fedora Community Forums - <DT><A HREF="http://fedoraproject.org/wiki/FWN" ADD_DATE="1176675071" LAST_VISIT="1176675075" LAST_MODIFIED="1176675310" LAST_CHARSET="ISO-8859-1" ID="rdf:#$NKnQZ2">Fedora Weekly News</A> -<DD>Fedora Weekly News - <DT><A HREF="http://www.fedoraunity.org/" ADD_DATE="1176675136" LAST_VISIT="1176675760" LAST_MODIFIED="1176675183" LAST_CHARSET="UTF-8" ID="rdf:#$OKnQZ2">Fedora Unity Project</A> - <DT><A HREF="http://planet.fedoraproject.org/" ADD_DATE="1176675201" LAST_VISIT="1176675207" LAST_MODIFIED="1176675329" LAST_CHARSET="UTF-8" ID="rdf:#$PKnQZ2">Fedora People</A> -<DD>Blogs by Fedora Contributors - <DT><A HREF="http://fedoraproject.org/wiki/Communicate" ADD_DATE="1141318585" LAST_VISIT="1176674053" LAST_MODIFIED="1141318713" LAST_CHARSET="UTF-8" ID="rdf:#$ojXGd3">More Support & Discussion</A> - </DL><p> - <DT><H3 ADD_DATE="1176674113" LAST_MODIFIED="1176678438" ID="rdf:#$jKnQZ2">Red Hat</H3> - <DL><p> - <DT><A HREF="http://www.redhatmagazine.com/" ADD_DATE="1176678438" LAST_VISIT="1176678446" LAST_MODIFIED="1176678459" LAST_CHARSET="UTF-8" ID="rdf:#$+T+iZ2">Red Hat Magazine</A> - <DT><A HREF="http://mugshot.org/main" ADD_DATE="1176674240" LAST_VISIT="1176674248" LAST_CHARSET="UTF-8" ID="rdf:#$sKnQZ2">Mugshot</A> - <DT><A HREF="http://www.redhat.com/" ADD_DATE="1176674148" LAST_VISIT="1176674165" LAST_MODIFIED="1176674158" LAST_CHARSET="ISO-8859-1" ID="rdf:#$qKnQZ2">Red Hat</A> - <DT><A HREF="http://www.jboss.com/" ADD_DATE="1176674189" LAST_VISIT="1176674209" LAST_MODIFIED="1176674200" LAST_CHARSET="UTF-8" ID="rdf:#$rKnQZ2">JBoss</A> - </DL><p> - <DT><H3 ADD_DATE="1176674388" LAST_MODIFIED="1176674871" ID="rdf:#$tKnQZ2">Free Content</H3> - <DL><p> - <DT><A HREF="http://www.wikipedia.org/" ADD_DATE="1176674401" LAST_VISIT="1176674649" LAST_MODIFIED="1176675382" LAST_CHARSET="UTF-8" ID="rdf:#$uKnQZ2">Wikipedia</A> -<DD>Online Encyclopedia - <DT><A HREF="http://www.jamendo.com/" ADD_DATE="1176674604" LAST_VISIT="1176674681" LAST_MODIFIED="1176675644" LAST_CHARSET="UTF-8" ID="rdf:#$JKnQZ2">Jamendo</A> - <DT><A HREF="http://magnatune.com/" ADD_DATE="1176674748" LAST_VISIT="1176675508" LAST_MODIFIED="1176675639" LAST_CHARSET="ISO-8859-1" ID="rdf:#$KKnQZ2">Magnatune</A> - <DT><A HREF="http://freesound.iua.upf.edu/" ADD_DATE="1176674764" LAST_VISIT="1176674804" LAST_MODIFIED="1176674833" LAST_CHARSET="UTF-8" ID="rdf:#$LKnQZ2">The Freesound Project</A> - <DT><A HREF="http://creativecommons.org/" ADD_DATE="1176674776" LAST_VISIT="1176675582" LAST_MODIFIED="1176675626" LAST_CHARSET="UTF-8" ID="rdf:#$MKnQZ2">Creative Commons</A> -<DD>Free Content Licenses - </DL><p> - </DL><p> -</DL><p> diff --git a/firefox-default.patch b/firefox-default.patch deleted file mode 100644 index 7619fce..0000000 --- a/firefox-default.patch +++ /dev/null @@ -1,91 +0,0 @@ -diff -up firefox-3.6.4/mozilla-1.9.2/browser/components/preferences/advanced.xul.default firefox-3.6.4/mozilla-1.9.2/browser/components/preferences/advanced.xul ---- firefox-3.6.4/mozilla-1.9.2/browser/components/preferences/advanced.xul.default 2010-06-11 22:40:51.000000000 +0200 -+++ firefox-3.6.4/mozilla-1.9.2/browser/components/preferences/advanced.xul 2010-06-24 11:42:36.000000000 +0200 -@@ -185,10 +185,11 @@ - </groupbox> - - #ifdef HAVE_SHELL_SERVICE -+#ifdef MOZ_CRASHREPORTER - <!-- System Defaults --> - <groupbox id="systemDefaultsGroup" orient="vertical"> - <caption label="&systemDefaults.label;"/> -- -+#ifdef 0 - <hbox id="checkDefaultBox" align="center" flex="1"> - <checkbox id="alwaysCheckDefault" preference="browser.shell.checkDefaultBrowser" - label="&alwaysCheckDefault.label;" accesskey="&alwaysCheckDefault.accesskey;" -@@ -198,6 +199,7 @@ - oncommand="gAdvancedPane.checkNow()" - preference="pref.general.disable_button.default_browser"/> - </hbox> -+#endif - #ifdef MOZ_CRASHREPORTER - <checkbox id="submitCrashesBox" flex="1" - oncommand="gAdvancedPane.updateSubmitCrashes();" -@@ -205,6 +207,7 @@ - #endif - </groupbox> - #endif -+#endif - </tabpanel> - - <!-- Network --> -diff -up firefox-3.6.4/mozilla-1.9.2/browser/components/shell/src/nsGNOMEShellService.cpp.default firefox-3.6.4/mozilla-1.9.2/browser/components/shell/src/nsGNOMEShellService.cpp ---- firefox-3.6.4/mozilla-1.9.2/browser/components/shell/src/nsGNOMEShellService.cpp.default 2010-06-11 22:40:51.000000000 +0200 -+++ firefox-3.6.4/mozilla-1.9.2/browser/components/shell/src/nsGNOMEShellService.cpp 2010-06-24 11:42:36.000000000 +0200 -@@ -140,27 +140,21 @@ NS_IMPL_ISUPPORTS1(nsGNOMEShellService, - PRBool - nsGNOMEShellService::KeyMatchesAppName(const char *aKeyValue) const - { -+ nsCAutoString appName; - -- gchar *commandPath; - if (mUseLocaleFilenames) { - gchar *nativePath = g_filename_from_utf8(aKeyValue, -1, NULL, NULL, NULL); - if (!nativePath) { - NS_ERROR("Error converting path to filesystem encoding"); - return PR_FALSE; - } -- -- commandPath = g_find_program_in_path(nativePath); -+ appName.Assign(nativePath); - g_free(nativePath); - } else { -- commandPath = g_find_program_in_path(aKeyValue); -+ appName.Assign(aKeyValue); - } -- -- if (!commandPath) -- return PR_FALSE; -- -- PRBool matches = mAppPath.Equals(commandPath); -- g_free(commandPath); -- return matches; -+ // Compare default browser command retrieved from gconf with MOZ_APP_NAME -+ return appName.EqualsLiteral(MOZ_APP_NAME); - } - - NS_IMETHODIMP -@@ -216,8 +210,8 @@ nsGNOMEShellService::SetDefaultBrowser(P - nsCOMPtr<nsIGConfService> gconf = do_GetService(NS_GCONFSERVICE_CONTRACTID); - - nsCAutoString schemeList; -- nsCAutoString appKeyValue(mAppPath); -- appKeyValue.Append(" \"%s\""); -+ nsCAutoString appKeyValue(MOZ_APP_NAME); -+ appKeyValue.Append(" %s"); - unsigned int i; - - for (i = 0; i < NS_ARRAY_LENGTH(appProtocols); ++i) { -diff -up firefox-3.6.4/mozilla-1.9.2/browser/components/shell/src/nsGNOMEShellService.h.default firefox-3.6.4/mozilla-1.9.2/browser/components/shell/src/nsGNOMEShellService.h ---- firefox-3.6.4/mozilla-1.9.2/browser/components/shell/src/nsGNOMEShellService.h.default 2010-06-11 22:40:51.000000000 +0200 -+++ firefox-3.6.4/mozilla-1.9.2/browser/components/shell/src/nsGNOMEShellService.h 2010-06-24 11:42:36.000000000 +0200 -@@ -43,7 +43,7 @@ - class nsGNOMEShellService : public nsIShellService - { - public: -- nsGNOMEShellService() : mCheckedThisSession(PR_FALSE) { } -+ nsGNOMEShellService() : mCheckedThisSession(PR_TRUE) { } - - NS_DECL_ISUPPORTS - NS_DECL_NSISHELLSERVICE diff --git a/firefox-dev.spec b/firefox-dev.spec deleted file mode 100644 index 1040648..0000000 --- a/firefox-dev.spec +++ /dev/null @@ -1,803 +0,0 @@ -%define nspr_version 4.8.7 -%define nss_version 3.12.9 -%define cairo_version 1.10 -%define freetype_version 2.1.9 -%define lcms_version 1.18 -%define sqlite_version 3.7.1 - -%define homepage http://start.fedoraproject.org/ -%define default_bookmarks_file %{_datadir}/bookmarks/default-bookmarks.html -%define firefox_app_id \{ec8030f7-c20a-464f-9b0e-13a3a9e97384\} - -%define internal_version 4.0 - -%define mozappdir %{_libdir}/firefox-%{internal_version} - -%define tarballdir mozilla-central - -%define official_branding 1 -%define build_langpacks 1 - -%if ! %{official_branding} -%define cvsdate 20080327 -%define nightly .cvs%{cvsdate} -%endif - -%global relcan b10 -%global firefox firefox -%global mycomment Beta 10 -%global datelang 20110126 - -Summary: Mozilla Firefox Web browser -Name: firefox -Version: 4.0 -Release: 0.20.beta10%{?dist} -URL: http://www.mozilla.org/projects/firefox/ -License: MPLv1.1 or GPLv2+ or LGPLv2+ -Group: Applications/Internet -%if %{official_branding} -## hg clone -u FIREFOX_3_6_3_RELEASE http://hg.mozilla.org/releases/mozilla-1.9.2 -## tar cjf firefox-3.6.3.source.tar.bz2 --exclude .hg mozilla-1.9.2 -%define tarball firefox-%{version}%{?relcan}.source.tar.bz2 -%else -%define tarball firefox-3.1b3-source.tar.bz2 -%endif -Source0: %{tarball} -%if %{build_langpacks} -Source1: firefox-langpacks-%{version}%{?relcan}-%{datelang}.tar.bz2 -%endif -Source12: firefox-redhat-default-prefs.js -# firefox3.destop without translation to allow change name -Source20: firefox3.desktop -Source21: firefox4.sh.in -Source23: firefox.1 -Source100: find-external-requires - -# build patches from xulrunner -#Patch0: xulrunner-version.patch => firefox / firefox4-version.patch -#Patch1: mozilla-build.patch -Patch1: firefox4-build.patch -#Patch3: firefox4-jemalloc.patch -#Patch9: mozilla-build-sbrk.patch -Patch9: firefox4-build-sbrk.patch -Patch11: mozilla-malloc.patch -Patch12: xulrunner-2.0-64bit-big-endian.patch -Patch13: xulrunner-2.0-secondary-jit.patch -Patch14: xulrunner-2.0-chromium-types.patch -Patch15: xulrunner-2.0-system-cairo.patch -Patch16: xulrunner-2.0-system-cairo-tee.patch -Patch17: xulrunner-2.0-os2cc.patch - -# Fedora specific patches -Patch20: mozilla-193-pkgconfig.patch -#Patch21: mozilla-libjpeg-turbo.patch -Patch21: firefox4-libjpeg-turbo.patch -Patch22: mozilla-notify.patch -Patch23: wmclass.patch - -# build patches from firefox -Patch0: firefox4-version.patch -#Patch1: firefox4-jemalloc.patch = xulrunner / firefox4-jemalloc.patch -#Patch2: firefox4-build-throw.patch = xulrunner / mozilla-malloc.patch - -Patch30: revert-562138.patch -Patch31: firefox4-default.patch - - -# Fedora specific patches - -# Upstream patches - -# Remi specific patches - - -%if %{official_branding} -# Required by Mozilla Corporation - - -%else -# Not yet approved by Mozillla Corporation - - -%endif - -# --------------------------------------------------- - -BuildRoot: %(mktemp -ud %{_tmppath}/%{name}-%{version}-%{release}-XXXXXX) -# BR from Firefox -BuildRequires: zip -BuildRequires: libIDL-devel -BuildRequires: desktop-file-utils -BuildRequires: gtk2-devel -BuildRequires: gnome-vfs2-devel -BuildRequires: libgnomeui-devel -BuildRequires: krb5-devel -BuildRequires: pango-devel -BuildRequires: freetype-devel >= 2.1.9 -BuildRequires: libXt-devel -BuildRequires: libXrender-devel -BuildRequires: startup-notification-devel -%ifarch %{ix86} x86_64 -BuildRequires: wireless-tools-devel -%endif - -# BR from Xulrunner -%if %{fedora} >= 15 -BuildRequires: sqlite-devel >= %{sqlite_version} -%endif -%if %{fedora} >= 14 -BuildRequires: nspr-devel >= %{nspr_version} -BuildRequires: nss-devel >= %{nss_version} -%endif -%if %{fedora} >= 11 -BuildRequires: hunspell-devel -%endif -%if %{fedora} >= 15 -BuildRequires: cairo-devel >= %{cairo_version} -%endif -%if %{fedora} >= 10 -BuildRequires: libnotify-devel -%endif -%if %{fedora} >= 9 -BuildRequires: lcms-devel >= %{lcms_version} -%endif -BuildRequires: system-bookmarks -BuildRequires: libpng-devel -BuildRequires: libjpeg-devel -BuildRequires: zip -BuildRequires: bzip2-devel -BuildRequires: zlib-devel -BuildRequires: libIDL-devel -BuildRequires: gtk2-devel -BuildRequires: gnome-vfs2-devel -BuildRequires: libgnome-devel -BuildRequires: libgnomeui-devel -BuildRequires: krb5-devel -BuildRequires: pango-devel -BuildRequires: freetype-devel >= %{freetype_version} -BuildRequires: libXt-devel -BuildRequires: libXrender-devel -BuildRequires: startup-notification-devel -BuildRequires: alsa-lib-devel -BuildRequires: autoconf213 -BuildRequires: mesa-libGL-devel -BuildRequires: yasm - -Requires: system-bookmarks -%if 0%{?fedora} >= 14 -Requires: nss >= %{nss_version} -Requires: nspr >= %{nspr_version} -%endif -%if %{fedora} >= 9 -BuildRequires: lcms-devel >= %{lcms_version} -%endif -Obsoletes: mozilla <= 37:1.7.13 -%if %{name} == firefox -Obsoletes: firefox4 -Provides: firefox4 = %{version}-%{release} -%endif -Provides: webclient - -%define _use_internal_dependency_generator 0 -%define __find_requires %{SOURCE100} - -# 10k of 11k files are in langpacks -%{?filter_setup: -%filter_provides_in %{mozappdir}/langpacks -%filter_requires_in %{mozappdir}/langpacks -%filter_setup -} - -%description -Mozilla Firefox is an open-source web browser, designed for standards -compliance, performance and portability. - -#--------------------------------------------------------------------- - -%prep -%if %{build_langpacks} -[ -f %{SOURCE1} ] || exit 1 -%endif -%setup -q -c -cd %{tarballdir} - -sed -e 's/__RPM_VERSION_INTERNAL__/%{internal_version}/' %{P:%%PATCH0} \ - > version.patch -%{__patch} -p1 -b --suffix .version --fuzz=0 < version.patch - -# Build Patches -%patch1 -p2 -b .build -#patch3 -p1 -b .jemalloc -%patch9 -p2 -b .sbrk -%patch11 -p2 -b .malloc -#patch12 -p1 -b .macos -%patch12 -p2 -b .64bit-big-endian -%patch13 -p2 -b .secondary-jit -%patch14 -p2 -b .chromium-types -%if 0%{?fedora} >= 15 -%patch15 -p1 -b .system-cairo -%patch16 -p1 -b .system-cairo-tee -%endif -%patch17 -p1 -b .os2cc - -%patch20 -p2 -b .pk -%if %{fedora} >= 14 -%patch21 -p2 -b .jpeg-turbo -%endif -%if %{fedora} >= 15 -# when libnotify >= 0.7.0 -%patch22 -p1 -b .notify -%endif -%patch23 -p1 -b .wmclass - -%patch30 -p1 -b .revert-562138 -%patch31 -p1 -b .default - -%if 0%{?fedora} >= 15 -# For xulrunner-2.0-system-cairo-tee.patch -autoconf-2.13 -%endif - -%{__rm} -f .mozconfig - -cat <<EOF_MOZCONFIG | tee .mozconfig -. \$topsrcdir/browser/config/mozconfig -mk_add_options MOZ_OBJDIR=@TOPSRCDIR@ - -# --with-system-png is disabled because Mozilla requires APNG support in libpng -#ac_add_options --with-system-png -ac_add_options --prefix="\$PREFIX" -ac_add_options --libdir="\$LIBDIR" -%if %{fedora} >= 15 -ac_add_options --enable-system-sqlite -%endif -%if %{fedora} >= 14 -ac_add_options --with-system-nspr -ac_add_options --with-system-nss -%endif -%if %{fedora} >= 11 -ac_add_options --enable-system-hunspell -%endif -%if %{fedora} >= 15 -ac_add_options --enable-system-cairo -%endif -%if %{fedora} >= 10 -ac_add_options --enable-libnotify -%else -ac_add_options --disable-libnotify -%endif -%if %{fedora} >= 9 -ac_add_options --enable-system-lcms -%endif -%ifarch ppc ppc64 -ac_add_options --disable-necko-wifi -ac_add_options --disable-ipc -%endif -ac_add_options --with-system-jpeg -ac_add_options --with-system-zlib -ac_add_options --with-system-bz2 -ac_add_options --with-pthreads -ac_add_options --disable-strip -ac_add_options --disable-tests -ac_add_options --disable-mochitest -ac_add_options --disable-installer -ac_add_options --disable-debug -ac_add_options --enable-optimize="\$MOZ_OPT_FLAGS" -ac_add_options --enable-xinerama -ac_add_options --enable-default-toolkit=cairo-gtk2 -ac_add_options --disable-xprint -ac_add_options --enable-pango -ac_add_options --enable-svg -ac_add_options --enable-canvas -ac_add_options --enable-startup-notification -ac_add_options --disable-cpp-exceptions -ac_add_options --disable-javaxpcom -ac_add_options --disable-crashreporter -ac_add_options --enable-safe-browsing -ac_add_options --disable-updater -ac_add_options --enable-shared-js -#ac_add_options --enable-chrome-format=jar -ac_add_options --enable-url-classifier -#ac_add_options --enable-extensions=default,python/xpcom -%if %{official_branding} -ac_add_options --enable-official-branding -%endif - -export BUILD_OFFICIAL=1 -export MOZILLA_OFFICIAL=1 -mk_add_options BUILD_OFFICIAL=1 -mk_add_options MOZILLA_OFFICIAL=1 -EOF_MOZCONFIG - -#--------------------------------------------------------------------- - -%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 -# -export MOZ_OPT_FLAGS=$(echo "$RPM_OPT_FLAGS -fpermissive" | \ - %{__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 -%ifnarch ppc ppc64 s390 s390x -[ -z "$RPM_BUILD_NCPUS" ] && \ - RPM_BUILD_NCPUS="`/usr/bin/getconf _NPROCESSORS_ONLN`" -[ "$RPM_BUILD_NCPUS" -gt 1 ] && MOZ_SMP_FLAGS=-j$RPM_BUILD_NCPUS -%endif - -INTERNAL_GECKO=%{internal_version} -MOZ_APP_DIR=%{_libdir}/%{name}-${INTERNAL_GECKO} - -export LDFLAGS="-Wl,-rpath,${MOZ_APP_DIR}" -make -f client.mk build STRIP="/bin/true" MOZ_MAKE_FLAGS="$MOZ_SMP_FLAGS" MOZ_SERVICES_SYNC="1" - -#--------------------------------------------------------------------- - -%install -%{__rm} -rf $RPM_BUILD_ROOT -cd %{tarballdir} - -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 --vendor mozilla \ - --dir $RPM_BUILD_ROOT%{_datadir}/applications \ - --add-category WebBrowser \ - --add-category Network \ - --delete-original %{name}.desktop - -# set up the firefox start script -%{__rm} -rf $RPM_BUILD_ROOT%{_bindir}/firefox -%{__cat} %{SOURCE21} | %{__sed} -e 's,FIREFOX_VERSION,%{internal_version},g' > \ - $RPM_BUILD_ROOT%{_bindir}/%{name} -%{__chmod} 755 $RPM_BUILD_ROOT%{_bindir}/%{name} - -# set up our default preferences -%{__cat} %{SOURCE12} | %{__sed} \ - -e 's,FIREFOX_RPM_VR,fc%{fedora},g' \ - -e 's/Fedora/Remi/' > rh-default-prefs - -######## Strange ######## -if [ -f $RPM_BUILD_ROOT/%{mozappdir}/omni.jar ]; then - unzip -o dist/firefox/omni.jar -d $RPM_BUILD_ROOT/%{mozappdir} - rm -f $RPM_BUILD_ROOT/%{mozappdir}/omni.jar -fi -######################### - -# Startup page for default language -sed -i -e 's@^\(browser\.startup\.homepage\(\|_reset\)\)=.*$@\1=%{homepage}@g;' \ - $RPM_BUILD_ROOT/%{mozappdir}/chrome/en-US/locale/branding/browserconfig.properties - -# Export correct locale -%{__cat} > $RPM_BUILD_ROOT/%{mozappdir}/defaults/pref/firefox-l10n.js << EOF -pref("general.useragent.locale", "chrome://global/locale/intl.properties"); -EOF -%{__chmod} 644 $RPM_BUILD_ROOT/%{mozappdir}/defaults/pref/firefox-l10n.js - -# place the preferences -%{__cp} rh-default-prefs $RPM_BUILD_ROOT/%{mozappdir}/defaults/pref/all-redhat.js -%{__rm} rh-default-prefs - -# set up our default bookmarks -%{__rm} -f $RPM_BUILD_ROOT/%{mozappdir}/defaults/profile/bookmarks.html -ln -s %{default_bookmarks_file} $RPM_BUILD_ROOT/%{mozappdir}/defaults/profile/bookmarks.html - -%{__install} -p -D -m 644 %{SOURCE23} $RPM_BUILD_ROOT%{_mandir}/man1/%{name}.1 - -%{__rm} -f $RPM_BUILD_ROOT/%{mozappdir}/firefox-config - -#cd $RPM_BUILD_ROOT/%{mozappdir}/chrome -#find . -name "*" -type d -maxdepth 1 -exec %{__rm} -rf {} \; -#cd - - -#%{__cat} > $RPM_BUILD_ROOT/%{mozappdir}/defaults/pref/firefox-l10n.js << EOF -#pref("general.useragent.locale", "chrome://global/locale/intl.properties"); -#EOF -#%{__chmod} 644 $RPM_BUILD_ROOT/%{mozappdir}/defaults/pref/firefox-l10n.js - -%{__cp} other-licenses/branding/%{firefox}/default16.png \ - $RPM_BUILD_ROOT/%{mozappdir}/icons/ -%{__mkdir_p} $RPM_BUILD_ROOT%{_datadir}/icons/hicolor/16x16/apps -%{__cp} other-licenses/branding/%{firefox}/default16.png \ - $RPM_BUILD_ROOT%{_datadir}/icons/hicolor/16x16/apps/%{name}.png -%{__mkdir_p} $RPM_BUILD_ROOT%{_datadir}/icons/hicolor/22x22/apps -%{__cp} other-licenses/branding/%{firefox}/default22.png \ - $RPM_BUILD_ROOT%{_datadir}/icons/hicolor/22x22/apps/%{name}.png -%{__mkdir_p} $RPM_BUILD_ROOT%{_datadir}/icons/hicolor/24x24/apps -%{__cp} other-licenses/branding/%{firefox}/default24.png \ - $RPM_BUILD_ROOT%{_datadir}/icons/hicolor/24x24/apps/%{name}.png -%{__mkdir_p} $RPM_BUILD_ROOT%{_datadir}/icons/hicolor/32x32/apps -%{__cp} other-licenses/branding/%{firefox}/default32.png \ - $RPM_BUILD_ROOT%{_datadir}/icons/hicolor/32x32/apps/%{name}.png -%{__mkdir_p} $RPM_BUILD_ROOT%{_datadir}/icons/hicolor/48x48/apps -%{__cp} other-licenses/branding/%{firefox}/default48.png \ - $RPM_BUILD_ROOT%{_datadir}/icons/hicolor/48x48/apps/%{name}.png -%{__mkdir_p} $RPM_BUILD_ROOT%{_datadir}/icons/hicolor/256x256/apps -%{__cp} other-licenses/branding/%{firefox}/default256.png \ - $RPM_BUILD_ROOT%{_datadir}/icons/hicolor/256x256/apps/%{name}.png - -echo > ../%{name}.lang -%if %{build_langpacks} -# Install langpacks -%{__mkdir_p} $RPM_BUILD_ROOT/%{mozappdir}/langpacks -%{__tar} xjf %{SOURCE1} -for langpack in `ls firefox-langpacks/*.xpi`; do - language=`basename $langpack .xpi` - extensiondir=$RPM_BUILD_ROOT/%{mozappdir}/langpacks/langpack-$language@firefox.mozilla.org - %{__mkdir_p} $extensiondir - unzip -q $langpack -d $extensiondir - find $extensiondir -type f | xargs chmod 644 - - sed -i -e 's@^\(browser\.startup\.homepage\(\|_reset\)\)=.*$@\1=%{homepage}@g;' \ - $extensiondir/chrome/$language/locale/branding/browserconfig.properties - cat $extensiondir/chrome/$language/locale/branding/browserconfig.properties - - language=`echo $language | sed -e 's/-/_/g'` - extensiondir=`echo $extensiondir | sed -e "s,^$RPM_BUILD_ROOT,,"` - echo "%%lang($language) $extensiondir" >> ../%{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} - -# Use the system hunspell dictionaries -%{__rm} -rf $RPM_BUILD_ROOT/%{mozappdir}/dictionaries -ln -s %{_datadir}/myspell $RPM_BUILD_ROOT%{mozappdir}/dictionaries - -# ghost files -touch $RPM_BUILD_ROOT/%{mozappdir}/components/compreg.dat -touch $RPM_BUILD_ROOT/%{mozappdir}/components/xpti.dat - -# jemalloc shows up sometimes, but it's not needed here, it's in XR -#%{__rm} -f $RPM_BUILD_ROOT/%{mozappdir}/libjemalloc.so - -# Remi : this appears on Fedora <= 10 -%{__rm} -f $RPM_BUILD_ROOT/%{mozappdir}/*.chk -%{__rm} -f $RPM_BUILD_ROOT/%{mozappdir}/dependentlibs.list - -# Don't need this -%{__rm} -f $RPM_BUILD_ROOT/%{mozappdir}/removed-files -%{__rm} -rf $RPM_BUILD_ROOT/%{_includedir}/firefox-sdk-%{internal_version} -%{__rm} -rf $RPM_BUILD_ROOT/%{_libdir}/firefox-sdk-%{internal_version} -%{__rm} -rf $RPM_BUILD_ROOT/%{_datadir}/idl/firefox-sdk-%{internal_version} - - -#--------------------------------------------------------------------- - -%clean -%{__rm} -rf $RPM_BUILD_ROOT - -#--------------------------------------------------------------------- - -%pre -echo -e "\nWARNING : This %{name} %{version} %{mycomment} RPM is not an official" -echo -e "Fedora build and it overrides the official one. Don't file bugs on Fedora Project.\n" -echo -e "Use dedicated forums http://forums.famillecollet.com/\n" - -%if %{?fedora}%{!?fedora:99} <= 12 -echo -e "WARNING : Fedora %{fedora} is now EOL :" -echo -e "You should consider upgrading to a supported release.\n" -%endif - -%post -chcon -t textrel_shlib_t %{mozappdir}/libxul.so &>/dev/null || : -update-desktop-database &> /dev/null || : -touch --no-create %{_datadir}/icons/hicolor &>/dev/null || : -if [ -x %{_bindir}/gtk-update-icon-cache ]; then - %{_bindir}/gtk-update-icon-cache --quiet %{_datadir}/icons/hicolor || : -fi - -%postun -if [ $1 -eq 0 ] ; then - touch --no-create %{_datadir}/icons/hicolor &>/dev/null - gtk-update-icon-cache %{_datadir}/icons/hicolor &>/dev/null || : -fi -update-desktop-database &> /dev/null || : - -%preun -# Only for firefox (not for firefox4, tu manage update from firefox4 to firefox) -%if %{name} == firefox -# is it a final removal? -if [ $1 -eq 0 ]; then - %{__rm} -rf %{mozappdir}/components - %{__rm} -rf %{mozappdir}/extensions - %{__rm} -rf %{mozappdir}/langpacks - %{__rm} -rf %{mozappdir}/plugins -fi -%endif - -%posttrans -gtk-update-icon-cache %{_datadir}/icons/hicolor &>/dev/null || : - -%files -f %{name}.lang -%defattr(-,root,root,-) -%{_bindir}/%{name} -%{_mandir}/man1/* -%dir %{_datadir}/mozilla/extensions/%{firefox_app_id} -%dir %{_libdir}/mozilla/extensions/%{firefox_app_id} -%{_datadir}/applications/mozilla-%{name}.desktop -%dir %{mozappdir} -%doc %{mozappdir}/LICENSE -%doc %{mozappdir}/README.txt -#%{mozappdir}/*.properties -%{mozappdir}/chrome -%dir %{mozappdir}/components -%ghost %{mozappdir}/components/compreg.dat -%ghost %{mozappdir}/components/xpti.dat -%{mozappdir}/components/*.so -%{mozappdir}/components/*.xpt -%attr(644, root, root) %{mozappdir}/blocklist.xml -%attr(644, root, root) %{mozappdir}/components/*.js -#%attr(644, root, root) %{mozappdir}/components/components.list -%attr(644, root, root) %{mozappdir}/components/*.manifest -%attr(644, root, root) %{mozappdir}/*.manifest -%{mozappdir}/defaults -#%{mozappdir}/greprefs -%{mozappdir}/greprefs.js -%{mozappdir}/dictionaries -%dir %{mozappdir}/extensions -%{mozappdir}/extensions/{972ce4c6-7e08-4474-a285-3208198ce6fd} -%dir %{mozappdir}/langpacks -%{mozappdir}/icons -%{mozappdir}/searchplugins -%{mozappdir}/firefox -%{mozappdir}/firefox-bin -%{mozappdir}/modules -#%{mozappdir}/plugins -%{mozappdir}/res -%{mozappdir}/*.so -%if %{fedora} > 8 -%ifarch %{ix86} x86_64 -%{mozappdir}/plugin-container -%endif -%endif -%{mozappdir}/mozilla-xremote-client -%{mozappdir}/platform.ini -%{mozappdir}/run-mozilla.sh -%{mozappdir}/application.ini -#%{mozappdir}/.autoreg -%{_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 - -#--------------------------------------------------------------------- - -%changelog -* Thu Jan 27 2011 Remi Collet <rpms@famillecollet.com> - 4.0-0.20.beta10 -- latest patch from rawhide - -* Wed Jan 26 2011 Christopher Aillon <caillon@redhat.com> - 2.0-0.18 -- Fix issue with popup windows showing in the wrong place - -* Wed Jan 26 2011 Remi Collet <rpms@famillecollet.com> - 4.0-0.19.beta10 -- update to 4.0b10 -- switch to system cairo on fedora >= 15 only (patches from rawhide) - -* Tue Jan 25 2011 Christopher Aillon <caillon@redhat.com> - 4.0-0.13b10 -- Firefox 4.0 Beta 10 - -* Sat Jan 22 2011 Remi Collet <rpms@famillecollet.com> - 4.0-0.18.beta10.build1 -- update to 4.0b10 build1 candidate -- BR nss >= 3.12.9, nspr >= 4.8.7 - -* Fri Jan 14 2011 Remi Collet <rpms@famillecollet.com> - 4.0-0.17.beta9 -- update to 4.0b9 - -* Wed Jan 12 2011 Remi Collet <rpms@famillecollet.com> - 4.0-0.16.beta9.build1 -- update to 4.0b9 build1 candidate -- use bundled cairo - -* Fri Dec 31 2010 Remi Collet <rpms@famillecollet.com> - 4.0-0.15.beta8 -- rename to firefox (and obsolete firefox4) - -* Tue Dec 21 2010 Remi Collet <rpms@famillecollet.com> - 4.0-0.14.beta8 -- update to 4.0b8 - -* Fri Dec 17 2010 Remi Collet <rpms@famillecollet.com> - 4.0-0.13.beta8.build1 -- update to 4.0b8 build1 candidate - -* Thu Nov 11 2010 Remi Collet <rpms@famillecollet.com> - 4.0-0.12.beta7 -- update to 4.0b7 -- raise cairo BR to 1.10 (fedora >= 14) - -* Sat Nov 06 2010 Remi Collet <rpms@famillecollet.com> - 4.0-0.11.beta7.build1 -- update to 4.0b7 build1 candidate - -* Thu Sep 16 2010 Remi Collet <rpms@famillecollet.com> - 4.0-0.10.beta6 -- update to 4.0b6 - -* Tue Sep 14 2010 Remi Collet <rpms@famillecollet.com> - 4.0-0.9.beta6.build2 -- update to 4.0b6 build2 -- add patch for https://bugzilla.mozilla.org/591152 - -* Wed Sep 08 2010 Remi Collet <rpms@famillecollet.com> - 4.0-0.8.beta5 -- update to 4.0b5 -- sync patches with rawhide -- set MOZ_OBJDIR - -* Thu Sep 02 2010 Remi Collet <rpms@famillecollet.com> - 4.0-0.7.beta5.build1 -- update to 4.0b5 build1 - -* Wed Aug 25 2010 Remi Collet <rpms@famillecollet.com> - 4.0-0.6.beta4 -- update to 4.0 beta 4 - -* Wed Aug 18 2010 Remi Collet <rpms@famillecollet.com> - 4.0-0.5.beta4.build2 -- update to 4.0b4 build2 -- add BR yasm - -* Sun Aug 15 2010 Remi Collet <rpms@famillecollet.com> - 4.0-0.4.beta3 -- update to 4.0b3 - -* Sat Aug 07 2010 Remi Collet <rpms@famillecollet.com> - 4.0-0.3.beta3.build3 -- update to 4.0b3 build3 - -* Wed Jul 28 2010 Remi Collet <rpms@famillecollet.com> - 4.0-0.2.beta2 -- update to 4.0b2 - -* Wed Jul 28 2010 Remi Collet <rpms@famillecollet.com> - 4.0-0.1.beta2.build1 -- update to 4.0b2 build1 - -* Sat Jul 24 2010 Remi Collet <rpms@famillecollet.com> - 3.6.8-1 -- update to Firefox 3.6.8 - -* Tue Jul 20 2010 Remi Collet <rpms@famillecollet.com> - 3.6.7-1 -- update to Firefox 3.6.7 - -* Tue Jun 29 2010 Remi Collet <rpms@famillecollet.com> - 3.6.6-1.1 -- build with --disable-ipc option for F-8 and ppc - -* Sun Jun 27 2010 Remi Collet <rpms@famillecollet.com> - 3.6.6-1 -- update to Firefox 3.6.6 - -* Wed Jun 23 2010 Remi Collet <rpms@famillecollet.com> - 3.6.4-1 -- update to Firefox 3.6.4 finale -- sync with patches from rawhide / F-13 - -* Thu Jun 10 2010 Remi Collet <rpms@famillecollet.com> - 3.6.4-0.4.build6 -- F12 build -- fix sqlite dependency (3.6.22) -- fix path for mozilla-xremote-client in launcher - -* Sat May 29 2010 Remi Collet <rpms@famillecollet.com> - 3.6.4-0.3.build6 -- update to Firefox 3.6.4 Beta (build6) - -* Fri May 14 2010 Remi Collet <rpms@famillecollet.com> - 3.6.4-0.2.build4 -- update to Firefox 3.6.4 Beta (build4) - -* Thu May 13 2010 Remi Collet <rpms@famillecollet.com> - 3.6.4-0.1.build3 -- update to Firefox 3.6.4 Beta (build3) - -* Sat Apr 10 2010 Remi Collet <rpms@famillecollet.com> - 3.6.3-2.plugin1 -- update to Firefox "lorentz" 3.6.3plugin1 - -* Fri Apr 02 2010 Remi Collet <rpms@famillecollet.com> - 3.6.3-1 -- Update to Firefox 3.6.3 (sources from mercurial) - -* Tue Mar 23 2010 Remi Collet <rpms@famillecollet.com> - 3.6.2-1 -- Update to Firefox 3.6.2 - -* Thu Mar 18 2010 Remi Collet <rpms@famillecollet.com> - 3.6.2-0.3.build3 -- Update to Firefox 3.6.2 Candidate Build 3 - -* Mon Mar 15 2010 Remi Collet <rpms@famillecollet.com> - 3.6.2-0.1.build1 -- Update to Firefox 3.6.2 Candidate Build 1 - -* Thu Jan 21 2010 Remi Collet <rpms@famillecollet.com> - 3.6-1 -- Update to Firefox 3.6 Finale - -* Sat Jan 09 2010 Remi Collet <rpms@famillecollet.com> - 3.6-0.5.rc1 -- Update to Firefox 3.6 Release Candidate 1 - -* Thu Dec 17 2009 Remi Collet <rpms@famillecollet.com> - 3.6-0.4.beta5 -- Update to Firefox 3.6 Beta 5 - -* Thu Nov 26 2009 Remi Collet <rpms@famillecollet.com> - 3.6-0.4.beta4 -- Update to Firefox 3.6 Beta 4 - -* Wed Nov 18 2009 Remi Collet <rpms@famillecollet.com> - 3.6-0.3.beta3 -- Update to Firefox 3.6 Beta 3 -- switch from firefox36 to firefox - -* Tue Nov 10 2009 Remi Collet <rpms@famillecollet.com> - 3.6-0.2.beta2 -- Update to Firefox 3.6 Beta 2 - -* Fri Nov 6 2009 Remi Collet <rpms@famillecollet.com> - 3.6-0.1.beta1 -- Update to Firefox 3.6 Beta 1 - -* Thu Nov 5 2009 Remi Collet <rpms@famillecollet.com> - 3.5.5-1 -- Update to Firefox 3.5.5 Final Release - -* Thu Nov 5 2009 Jan Horak <jhorak@redhat.com> - 3.5.5-1 -- Update to 3.5.5 - -* Wed Oct 28 2009 Remi Collet <rpms@famillecollet.com> - 3.5.4-1 -- Update to Firefox 3.5.4 Final Release - -* Mon Oct 26 2009 Jan Horak <jhorak@redhat.com> - 3.5.4-1 -- Update to 3.5.4 - -* Wed Sep 9 2009 Remi Collet <rpms@famillecollet.com> - 3.5.3-1 -- Update to Firefox 3.5.3 Final Release - -* Mon Sep 7 2009 Jan Horak <jhorak@redhat.com> - 3.5.3-1 -- Updated to 3.5.3. - -* Thu Aug 6 2009 Martin Stransky <stransky@redhat.com> - 3.5.2-3 -- Fix for #437596 - Firefox needs to register proper name - for session restore. - -* Tue Aug 4 2009 Remi Collet <rpms@famillecollet.com> - 3.5.2-1 -- Update to Firefox 3.5.2 Final Release - -* Mon Aug 3 2009 Martin Stransky <stransky@redhat.com> - 3.5.2-2 -- Updated to 3.5.2. - -* Fri Jul 24 2009 Jan Horak <jhorak@redhat.com> - 3.5.1-3 -- Adjust icons cache update according to template - -* Fri Jul 17 2009 Remi Collet <rpms@famillecollet.com> - 3.5.1-1 -- Update to Firefox 3.5.1 Final Release - -* Fri Jul 17 2009 Remi Collet <rpms@famillecollet.com> - 3.5.1-0.1.build1 -- Update to Firefox 3.5.1 build1 - -* Wed Jun 30 2009 Remi Collet <rpms@famillecollet.com> - 3.5-1 -- Update to Firefox 3.5 Final Release - -* Wed Jun 27 2009 Remi Collet <rpms@famillecollet.com> - 3.5-0.27.rc3 -- Update to Firefox 3.5 RC3 - -* Wed Jun 24 2009 Remi Collet <rpms@famillecollet.com> - 3.5-0.26.rc3.build2 -- Update to Firefox 3.5 RC3 build2 - -* Fri Jun 19 2009 Remi Collet <rpms@famillecollet.com> - 3.5-0.26.rc2 -- Update to Firefox 3.5 RC2 - -* Thu Jun 18 2009 Remi Collet <rpms@famillecollet.com> - 3.5-0.25.rc2.build2 -- Update to Firefox 3.5 RC2 build2 - -* Wed Jun 17 2009 Remi Collet <rpms@famillecollet.com> - 3.5-0.24.rc1 -- Update to Firefox 3.5 RC1 - -* Tue Jun 16 2009 Remi Collet <rpms@famillecollet.com> - 3.5-0.23.rc1.build2 -- Update to Firefox 3.5 RC1 build2 - -* Sun Jun 14 2009 Remi Collet <rpms@famillecollet.com> - 3.5-0.22.rc1.build1 -- Update to Firefox 3.5 RC1 build1 - -* Thu Jun 11 2009 Remi Collet <rpms@famillecollet.com> - 3.5-0.21.beta99 -- Update to Firefox 3.5 Beta 99 (Preview) - -* Tue Apr 28 2009 Remi Collet <rpms@famillecollet.com> - 3.5-0.2.beta4 -- Update to Firefox 3.5 Beta 4 - -* Fri Apr 24 2009 Remi Collet <rpms@famillecollet.com> - 3.5-0.1.beta4 -- Update to 3.5b4 build1 -- use system-nss only if Fedora >= 11 (3.12.3) - -* Thu Apr 23 2009 Remi Collet <rpms@famillecollet.com> - 3.1-0.1.beta3 -- First Firefox 3.1 build from rawhide xulrunner + firefox spec - diff --git a/firefox-disable-checkupdates.patch b/firefox-disable-checkupdates.patch deleted file mode 100644 index e3b8c97..0000000 --- a/firefox-disable-checkupdates.patch +++ /dev/null @@ -1,12 +0,0 @@ -diff -up mozilla-1.9.2/browser/base/content/utilityOverlay.js.checkForUpdates mozilla-1.9.2/browser/base/content/utilityOverlay.js ---- mozilla-1.9.2/browser/base/content/utilityOverlay.js.checkForUpdates 2010-06-13 15:36:16.617677299 -0700 -+++ mozilla-1.9.2/browser/base/content/utilityOverlay.js 2010-06-13 15:39:54.485387418 -0700 -@@ -510,7 +510,7 @@ function buildHelpMenu() - // Disable the UI if the update enabled pref has been locked by the - // administrator or if we cannot update for some other reason - var checkForUpdates = document.getElementById("checkForUpdates"); -- var canCheckForUpdates = updates.canCheckForUpdates; -+ var canCheckForUpdates = updates.canCheckForUpdates && updates.canApplyUpdates; - checkForUpdates.setAttribute("disabled", !canCheckForUpdates); - if (!canCheckForUpdates) - return; diff --git a/firefox-redhat-default-prefs.js b/firefox-redhat-default-prefs.js deleted file mode 100644 index 4aab739..0000000 --- a/firefox-redhat-default-prefs.js +++ /dev/null @@ -1,12 +0,0 @@ -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("general.smoothScroll", true); -pref("general.useragent.vendor", "Fedora"); -pref("general.useragent.vendorSub", "FIREFOX_RPM_VR"); -pref("intl.locale.matchOS", true); diff --git a/firefox-version.patch b/firefox-version.patch deleted file mode 100644 index 892f40c..0000000 --- a/firefox-version.patch +++ /dev/null @@ -1,12 +0,0 @@ -diff -up mozilla-1.9.2/browser/installer/Makefile.in.version mozilla-1.9.2/browser/installer/Makefile.in ---- mozilla-1.9.2/browser/installer/Makefile.in.version 2009-11-09 01:33:57.000000000 +0100 -+++ mozilla-1.9.2/browser/installer/Makefile.in 2009-11-13 13:48:15.000000000 +0100 -@@ -43,6 +43,8 @@ VPATH = @srcdir@ - - include $(DEPTH)/config/autoconf.mk - -+MOZ_APP_VERSION="__RPM_VERSION_INTERNAL__" -+ - NO_PKG_FILES = \ - $(MOZ_APP_NAME)-config \ - $(MOZ_APP_NAME)-bin.elf \ diff --git a/firefox.1 b/firefox.1 deleted file mode 100644 index 2086325..0000000 --- a/firefox.1 +++ /dev/null @@ -1,125 +0,0 @@ -.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.spec b/firefox.spec deleted file mode 100644 index 9efab42..0000000 --- a/firefox.spec +++ /dev/null @@ -1,725 +0,0 @@ -%define nspr_version 4.8.6 -%define nss_version 3.12.8 -%define cairo_version 1.8.8 -%define freetype_version 2.1.9 -%define lcms_version 1.18 -%define sqlite_version 3.6.22 - -%define homepage http://start.fedoraproject.org/ -%define default_bookmarks_file %{_datadir}/bookmarks/default-bookmarks.html -%define firefox_app_id \{ec8030f7-c20a-464f-9b0e-13a3a9e97384\} - -%define internal_version 3.6 - -%define mozappdir %{_libdir}/firefox-%{internal_version} - -%define tarballdir mozilla-1.9.2 - -%define official_branding 1 -%define build_langpacks 1 - -%if ! %{official_branding} -%define cvsdate 20080327 -%define nightly .cvs%{cvsdate} -%endif - -#define relcan plugin1 -%define firefox firefox -#define mycomment Beta (build6) - -Summary: Mozilla Firefox Web browser -Name: firefox -Version: 3.6.13 -Release: 1%{?dist} -URL: http://www.mozilla.org/projects/firefox/ -License: MPLv1.1 or GPLv2+ or LGPLv2+ -Group: Applications/Internet -%if %{official_branding} -## hg clone -u FIREFOX_3_6_3_RELEASE http://hg.mozilla.org/releases/mozilla-1.9.2 -## tar cjf firefox-3.6.3.source.tar.bz2 --exclude .hg mozilla-1.9.2 -%define tarball firefox-%{version}%{?relcan}.source.tar.bz2 -%else -%define tarball firefox-3.1b3-source.tar.bz2 -%endif -Source0: %{tarball} -%if %{build_langpacks} -Source2: firefox-langpacks-%{version}%{?relcan}-20101212.tar.bz2 -%endif -Source12: firefox-redhat-default-prefs.js -# firefox3.destop without translation to allow change name -Source20: firefox3.desktop -Source21: firefox36.sh.in -Source23: firefox.1 -Source100: find-external-requires - -Source200: firefox-bookmarks.html - -# build patches from xulrunner -Patch0: firefox-version.patch -Patch1: mozilla-build.patch -Patch3: mozilla-jemalloc.patch -Patch4: mozilla-about-firefox-version.patch -Patch7: xulrunner-1.9.2.1-build.patch -Patch9: mozilla-build-sbrk.patch -Patch10: mozilla-build-s390.patch -Patch11: mozilla-gdk-pixbuf.patch - -# build patches from firefox -Patch30: firefox-disable-checkupdates.patch -Patch31: firefox-default.patch - - -# Fedora specific patches -Patch20: mozilla-192-pkgconfig.patch -Patch21: mozilla-libjpeg-turbo.patch -Patch22: mozilla-crashreporter-static.patch - - -# Remi specific patches - - -%if %{official_branding} -# Required by Mozilla Corporation - - -%else -# Not yet approved by Mozillla Corporation - - -%endif - -# --------------------------------------------------- - -BuildRoot: %(mktemp -ud %{_tmppath}/%{name}-%{version}-%{release}-XXXXXX) -# BR from Firefox -BuildRequires: zip -BuildRequires: libIDL-devel -BuildRequires: desktop-file-utils -BuildRequires: gtk2-devel -BuildRequires: gnome-vfs2-devel -BuildRequires: libgnomeui-devel -BuildRequires: krb5-devel -BuildRequires: pango-devel -BuildRequires: freetype-devel >= 2.1.9 -BuildRequires: libXt-devel -BuildRequires: libXrender-devel -BuildRequires: startup-notification-devel -%ifarch %{ix86} x86_64 -BuildRequires: wireless-tools-devel -%endif - -# BR from Xulrunner -%if %{fedora} >= 15 -# Requires SQLITE_SECURE_DELETE only in F-15 -BuildRequires: sqlite-devel >= %{sqlite_version} -%endif -%if %{fedora} >= 13 -BuildRequires: nss-devel >= %{nss_version} -%endif -%if %{fedora} >= 12 -BuildRequires: nspr-devel >= %{nspr_version} -%endif -%if %{fedora} >= 11 -BuildRequires: hunspell-devel -BuildRequires: cairo-devel >= %{cairo_version} -%endif -%if %{fedora} >= 10 -BuildRequires: libnotify-devel -%endif -%if %{fedora} >= 9 -BuildRequires: lcms-devel >= %{lcms_version} -%endif -%if %{fedora} >= 7 -BuildRequires: system-bookmarks -%endif -BuildRequires: libpng-devel -BuildRequires: libjpeg-devel -BuildRequires: zip -BuildRequires: bzip2-devel -BuildRequires: zlib-devel -BuildRequires: libIDL-devel -BuildRequires: gtk2-devel -BuildRequires: gnome-vfs2-devel -BuildRequires: libgnome-devel -BuildRequires: libgnomeui-devel -BuildRequires: krb5-devel -BuildRequires: pango-devel -BuildRequires: freetype-devel >= %{freetype_version} -BuildRequires: libXt-devel -BuildRequires: libXrender-devel -BuildRequires: startup-notification-devel -BuildRequires: alsa-lib-devel -BuildRequires: autoconf213 -BuildRequires: libcurl-devel - -%if %{fedora} >= 7 -Requires: system-bookmarks -%endif -%if 0%{?fedora} >= 13 -Requires: nss >= %{nss_version} -%endif -%if 0%{?fedora} >= 12 -Requires: nspr >= %{nspr_version} -%endif -%if %{fedora} >= 9 -BuildRequires: lcms-devel >= %{lcms_version} -%endif -Obsoletes: mozilla <= 37:1.7.13 -Obsoletes: firefox36 -Provides: webclient - -%define _use_internal_dependency_generator 0 -%define __find_requires %{SOURCE100} - -%description -Mozilla Firefox is an open-source web browser, designed for standards -compliance, performance and portability. - -#--------------------------------------------------------------------- - -%prep -%if %{build_langpacks} -[ -f %{SOURCE2} ] || exit 1 -%endif -%setup -q -c -cd %{tarballdir} - -sed -e 's/__RPM_VERSION_INTERNAL__/%{internal_version}/' %{P:%%PATCH0} \ - > version.patch -%{__patch} -p1 -b --suffix .version --fuzz=0 < version.patch - -%patch1 -p1 -b .build -%patch3 -p1 -b .jemalloc -%patch4 -p1 -b .about-firefox-version -%patch7 -p2 -b .del -%patch9 -p2 -b .sbrk -%ifarch s390 -%patch10 -p1 -b .s390 -%endif -%if %{fedora} >= 14 -%patch11 -p1 -b .gdk-pixbuf -%endif - -%patch20 -p1 -b .pk -%if %{fedora} >= 14 -%patch21 -p2 -b .jpeg-turbo -%endif -%patch22 -p1 -b .static - -%patch30 -p1 -b .checkupdates -%patch31 -p2 -b .default - -%{__rm} -f .mozconfig - -cat <<EOF_MOZCONFIG | tee .mozconfig -. \$topsrcdir/browser/config/mozconfig - -# --with-system-png is disabled because Mozilla requires APNG support in libpng -#ac_add_options --with-system-png -ac_add_options --prefix="\$PREFIX" -ac_add_options --libdir="\$LIBDIR" -%if %{fedora} >= 15 -ac_add_options --enable-system-sqlite -%endif -%if %{fedora} >= 13 -ac_add_options --with-system-nss -%endif -%if %{fedora} >= 12 -ac_add_options --with-system-nspr -%endif -%if %{fedora} >= 11 -ac_add_options --enable-system-hunspell -ac_add_options --enable-system-cairo -%endif -%if %{fedora} >= 10 -ac_add_options --enable-libnotify -%else -ac_add_options --disable-libnotify -%endif -%if %{fedora} >= 9 -ac_add_options --enable-system-lcms -%endif -%ifarch ppc ppc64 -ac_add_options --disable-necko-wifi -ac_add_options --disable-ipc -%endif -%if %{fedora} <= 8 -ac_add_options --disable-ipc -%endif -ac_add_options --with-system-jpeg -ac_add_options --with-system-zlib -ac_add_options --with-system-bz2 -ac_add_options --with-pthreads -ac_add_options --disable-strip -ac_add_options --disable-tests -ac_add_options --disable-mochitest -ac_add_options --disable-installer -ac_add_options --disable-debug -ac_add_options --enable-optimize -ac_add_options --enable-xinerama -ac_add_options --enable-default-toolkit=cairo-gtk2 -ac_add_options --disable-xprint -ac_add_options --enable-pango -ac_add_options --enable-svg -ac_add_options --enable-canvas -ac_add_options --enable-startup-notification -ac_add_options --disable-javaxpcom -ac_add_options --disable-crashreporter -ac_add_options --enable-safe-browsing -#ac_add_options --enable-extensions=default,python/xpcom -%if %{official_branding} -ac_add_options --enable-official-branding -%endif - -export BUILD_OFFICIAL=1 -export MOZILLA_OFFICIAL=1 -mk_add_options BUILD_OFFICIAL=1 -mk_add_options MOZILLA_OFFICIAL=1 -EOF_MOZCONFIG - -#--------------------------------------------------------------------- - -%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. -MOZ_OPT_FLAGS=$(echo $RPM_OPT_FLAGS | %{__sed} -e 's/-Wall//') -export CFLAGS=$MOZ_OPT_FLAGS -export CXXFLAGS=$MOZ_OPT_FLAGS - -export PREFIX='%{_prefix}' -export LIBDIR='%{_libdir}' - -MOZ_SMP_FLAGS=-j1 -%ifnarch ppc ppc64 s390 s390x -[ -z "$RPM_BUILD_NCPUS" ] && \ - RPM_BUILD_NCPUS="`/usr/bin/getconf _NPROCESSORS_ONLN`" -[ "$RPM_BUILD_NCPUS" -gt 1 ] && MOZ_SMP_FLAGS=-j2 -%endif - -INTERNAL_GECKO=%{internal_version} -MOZ_APP_DIR=%{_libdir}/%{name}-${INTERNAL_GECKO} - -export LDFLAGS="-Wl,-rpath,${MOZ_APP_DIR}" -make -f client.mk build STRIP="/bin/true" MOZ_MAKE_FLAGS="$MOZ_SMP_FLAGS" - -#--------------------------------------------------------------------- - -%install -%{__rm} -rf $RPM_BUILD_ROOT -cd %{tarballdir} - -DESTDIR=$RPM_BUILD_ROOT make install - -%{__mkdir_p} $RPM_BUILD_ROOT{%{_libdir},%{_bindir},%{_datadir}/applications} - -sed -e 's/^Name=.*/Name=Firefox %{version}%{?relcan} %{?mycomment}/' \ - -e "s/firefox/%{name}/" \ - %{SOURCE20} | tee %{name}.desktop - -desktop-file-install --vendor mozilla \ - --dir $RPM_BUILD_ROOT%{_datadir}/applications \ - --add-category WebBrowser \ - --add-category Network \ - --delete-original %{name}.desktop - -# set up the firefox start script -%{__rm} -rf $RPM_BUILD_ROOT%{_bindir}/firefox -%{__cat} %{SOURCE21} | %{__sed} -e 's,FIREFOX_VERSION,%{internal_version},g' > \ - $RPM_BUILD_ROOT%{_bindir}/%{name} -%{__chmod} 755 $RPM_BUILD_ROOT%{_bindir}/%{name} - -# set up our default preferences -%{__cat} %{SOURCE12} | %{__sed} \ - -e 's,FIREFOX_RPM_VR,fc%{fedora},g' \ - -e 's/Fedora/Remi/' > rh-default-prefs - -# resolves bug #461880 -%{__cat} > $RPM_BUILD_ROOT/%{mozappdir}/browserconfig.properties << EOF -browser.startup.homepage=%{homepage} -EOF - -# Export correct locale -%{__cat} > $RPM_BUILD_ROOT/%{mozappdir}/defaults/pref/firefox-l10n.js << EOF -pref("general.useragent.locale", "chrome://global/locale/intl.properties"); -EOF -%{__chmod} 644 $RPM_BUILD_ROOT/%{mozappdir}/defaults/pref/firefox-l10n.js - -# place the preferences -%{__cp} rh-default-prefs $RPM_BUILD_ROOT/%{mozappdir}/defaults/pref/all-redhat.js -%{__rm} rh-default-prefs - -# set up our default bookmarks -%{__rm} -f $RPM_BUILD_ROOT/%{mozappdir}/defaults/profile/bookmarks.html -%if %{fedora} >= 7 -ln -s %{default_bookmarks_file} $RPM_BUILD_ROOT/%{mozappdir}/defaults/profile/bookmarks.html -%else -%{__cp} %{SOURCE200} $RPM_BUILD_ROOT/%{mozappdir}/defaults/profile/bookmarks.html -%endif - -%{__install} -p -D -m 644 %{SOURCE23} $RPM_BUILD_ROOT%{_mandir}/man1/firefox.1 - -%{__rm} -f $RPM_BUILD_ROOT/%{mozappdir}/firefox-config - -#cd $RPM_BUILD_ROOT/%{mozappdir}/chrome -#find . -name "*" -type d -maxdepth 1 -exec %{__rm} -rf {} \; -#cd - - -#%{__cat} > $RPM_BUILD_ROOT/%{mozappdir}/defaults/pref/firefox-l10n.js << EOF -#pref("general.useragent.locale", "chrome://global/locale/intl.properties"); -#EOF -#%{__chmod} 644 $RPM_BUILD_ROOT/%{mozappdir}/defaults/pref/firefox-l10n.js - -%{__cp} other-licenses/branding/%{firefox}/default16.png \ - $RPM_BUILD_ROOT/%{mozappdir}/icons/ -%{__mkdir_p} $RPM_BUILD_ROOT%{_datadir}/icons/hicolor/16x16/apps -%{__cp} other-licenses/branding/%{firefox}/default16.png \ - $RPM_BUILD_ROOT%{_datadir}/icons/hicolor/16x16/apps/%{name}.png -%{__mkdir_p} $RPM_BUILD_ROOT%{_datadir}/icons/hicolor/22x22/apps -%{__cp} other-licenses/branding/%{firefox}/default22.png \ - $RPM_BUILD_ROOT%{_datadir}/icons/hicolor/22x22/apps/%{name}.png -%{__mkdir_p} $RPM_BUILD_ROOT%{_datadir}/icons/hicolor/24x24/apps -%{__cp} other-licenses/branding/%{firefox}/default24.png \ - $RPM_BUILD_ROOT%{_datadir}/icons/hicolor/24x24/apps/%{name}.png -%{__mkdir_p} $RPM_BUILD_ROOT%{_datadir}/icons/hicolor/32x32/apps -%{__cp} other-licenses/branding/%{firefox}/default32.png \ - $RPM_BUILD_ROOT%{_datadir}/icons/hicolor/32x32/apps/%{name}.png -%{__mkdir_p} $RPM_BUILD_ROOT%{_datadir}/icons/hicolor/48x48/apps -%{__cp} other-licenses/branding/%{firefox}/default48.png \ - $RPM_BUILD_ROOT%{_datadir}/icons/hicolor/48x48/apps/%{name}.png -%{__mkdir_p} $RPM_BUILD_ROOT%{_datadir}/icons/hicolor/256x256/apps -%{__cp} other-licenses/branding/%{firefox}/default256.png \ - $RPM_BUILD_ROOT%{_datadir}/icons/hicolor/256x256/apps/%{name}.png - -echo > ../%{name}.lang -%if %{build_langpacks} -# Install langpacks -%{__mkdir_p} $RPM_BUILD_ROOT/%{mozappdir}/langpacks -%{__tar} xjf %{SOURCE2} -for langpack in `ls firefox-langpacks/*.xpi`; do - language=`basename $langpack .xpi` - extensiondir=$RPM_BUILD_ROOT/%{mozappdir}/langpacks/langpack-$language@firefox.mozilla.org - %{__mkdir_p} $extensiondir - unzip $langpack -d $extensiondir - find $extensiondir -type f | xargs chmod 644 - - tmpdir=`mktemp -d %{name}.XXXXXXXX` - langtmp=$tmpdir/%{name}/langpack-$language - %{__mkdir_p} $langtmp - jarfile=$extensiondir/chrome/$language.jar - unzip $jarfile -d $langtmp - - sed -i -e "s|browser.startup.homepage.*$|browser.startup.homepage=%{homepage}|g;" \ - $langtmp/locale/browser-region/region.properties - - find $langtmp -type f | xargs chmod 644 - %{__rm} -rf $jarfile - cd $langtmp - zip -r -D $jarfile locale - cd - - %{__rm} -rf $tmpdir - - language=`echo $language | sed -e 's/-/_/g'` - extensiondir=`echo $extensiondir | sed -e "s,^$RPM_BUILD_ROOT,,"` - echo "%%lang($language) $extensiondir" >> ../%{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} - -%if %{fedora} >= 7 -# Use the system hunspell dictionaries -%{__rm} -rf $RPM_BUILD_ROOT/%{mozappdir}/dictionaries -ln -s %{_datadir}/myspell $RPM_BUILD_ROOT%{mozappdir}/dictionaries -%endif - -# ghost files -touch $RPM_BUILD_ROOT/%{mozappdir}/components/compreg.dat -touch $RPM_BUILD_ROOT/%{mozappdir}/components/xpti.dat - -# jemalloc shows up sometimes, but it's not needed here, it's in XR -#%{__rm} -f $RPM_BUILD_ROOT/%{mozappdir}/libjemalloc.so - -# Remi : this appears on Fedora <= 10 -%{__rm} -f $RPM_BUILD_ROOT/%{mozappdir}/*.chk -%{__rm} -f $RPM_BUILD_ROOT/%{mozappdir}/dependentlibs.list - - -#--------------------------------------------------------------------- - -%clean -%{__rm} -rf $RPM_BUILD_ROOT - -#--------------------------------------------------------------------- - -%pre -echo -e "\nWARNING : This %{name} RPM is not an official Fedora build and it" -echo -e "overrides the official one. Don't file bugs on Fedora Project.\n" -echo -e "Use dedicated forums http://forums.famillecollet.com/\n" - -%if %{?fedora}%{!?fedora:99} <= 12 -echo -e "WARNING : Fedora %{fedora} is now EOL :" -echo -e "You should consider upgrading to a supported release.\n" -%endif - -%post -update-desktop-database &> /dev/null || : -touch --no-create %{_datadir}/icons/hicolor &>/dev/null || : -if [ -x %{_bindir}/gtk-update-icon-cache ]; then - %{_bindir}/gtk-update-icon-cache --quiet %{_datadir}/icons/hicolor || : -fi - -%postun -if [ $1 -eq 0 ] ; then - touch --no-create %{_datadir}/icons/hicolor &>/dev/null - gtk-update-icon-cache %{_datadir}/icons/hicolor &>/dev/null || : -fi -update-desktop-database &> /dev/null || : - -%preun -# is it a final removal? -if [ $1 -eq 0 ]; then - %{__rm} -rf %{mozappdir}/components - %{__rm} -rf %{mozappdir}/extensions - %{__rm} -rf %{mozappdir}/langpacks - %{__rm} -rf %{mozappdir}/plugins -fi - -%posttrans -gtk-update-icon-cache %{_datadir}/icons/hicolor &>/dev/null || : - -%files -f %{name}.lang -%defattr(-,root,root,-) -%{_bindir}/%{name} -%{_mandir}/man1/* -%dir %{_datadir}/mozilla/extensions/%{firefox_app_id} -%dir %{_libdir}/mozilla/extensions/%{firefox_app_id} -%{_datadir}/applications/mozilla-%{name}.desktop -%dir %{mozappdir} -%doc %{mozappdir}/LICENSE -%doc %{mozappdir}/README.txt -%{mozappdir}/*.properties -%{mozappdir}/chrome -%dir %{mozappdir}/components -%ghost %{mozappdir}/components/compreg.dat -%ghost %{mozappdir}/components/xpti.dat -%{mozappdir}/components/*.so -%{mozappdir}/components/*.xpt -%attr(644, root, root) %{mozappdir}/blocklist.xml -%attr(644, root, root) %{mozappdir}/components/*.js -%attr(644, root, root) %{mozappdir}/components/components.list -%{mozappdir}/defaults -%{mozappdir}/greprefs -%{mozappdir}/dictionaries -%dir %{mozappdir}/extensions -%{mozappdir}/extensions/{972ce4c6-7e08-4474-a285-3208198ce6fd} -%dir %{mozappdir}/langpacks -%{mozappdir}/icons -%{mozappdir}/searchplugins -%{mozappdir}/firefox -%{mozappdir}/firefox-bin -%{mozappdir}/modules -%{mozappdir}/plugins -%{mozappdir}/res -%{mozappdir}/*.so -%if %{fedora} > 8 -%ifarch %{ix86} x86_64 -%{mozappdir}/plugin-container -%endif -%endif -%{mozappdir}/mozilla-xremote-client -%{mozappdir}/platform.ini -%{mozappdir}/run-mozilla.sh -%{mozappdir}/application.ini -%{mozappdir}/.autoreg -# XXX See if these are needed still -%{mozappdir}/update* -%exclude %{mozappdir}/removed-files -%exclude %{_includedir}/firefox-sdk-%{internal_version} -%exclude %{_libdir}/firefox-sdk-%{internal_version} -%exclude %{_datadir}/idl/firefox-sdk-%{internal_version} -%{_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 - -#--------------------------------------------------------------------- - -%changelog -* Sun Dec 12 2010 Remi Collet <rpms@famillecollet.com> - 3.6.13-1 -- update to Firefox 3.6.13 - -* Thu Dec 9 2010 Jan Horak <jhorak@redhat.com> - 3.6.13-1 -- Update to 3.6.13 - -* Thu Oct 28 2010 Remi Collet <rpms@famillecollet.com> - 3.6.12-1 -- update to Firefox 3.6.12 - -* Wed Oct 27 2010 Jan Horak <jhorak@redhat.com> - 3.6.12-1 -- Update to 3.6.12 - -* Wed Oct 20 2010 Remi Collet <rpms@famillecollet.com> - 3.6.11-1 -- update to Firefox 3.6.11 - -* Tue Oct 19 2010 Jan Horak <jhorak@redhat.com> - 3.6.11-1 -- Update to 3.6.11 - -* Thu Sep 16 2010 Remi Collet <rpms@famillecollet.com> - 3.6.10-1 -- update to Firefox 3.6.10 - -* Fri Sep 10 2010 Remi Collet <rpms@famillecollet.com> - 3.6.9-1 -- update to Firefox 3.6.9 - -* Mon Aug 02 2010 Remi Collet <rpms@famillecollet.com> - 3.6.8-1.1 -- rebuild - -* Sat Jul 24 2010 Remi Collet <rpms@famillecollet.com> - 3.6.8-1 -- update to Firefox 3.6.8 - -* Tue Jul 20 2010 Remi Collet <rpms@famillecollet.com> - 3.6.7-1 -- update to Firefox 3.6.7 - -* Tue Jun 29 2010 Remi Collet <rpms@famillecollet.com> - 3.6.6-1.1 -- build with --disable-ipc option for F-8 and ppc - -* Sun Jun 27 2010 Remi Collet <rpms@famillecollet.com> - 3.6.6-1 -- update to Firefox 3.6.6 - -* Wed Jun 23 2010 Remi Collet <rpms@famillecollet.com> - 3.6.4-1 -- update to Firefox 3.6.4 finale -- sync with patches from rawhide / F-13 - -* Thu Jun 10 2010 Remi Collet <rpms@famillecollet.com> - 3.6.4-0.4.build6 -- F12 build -- fix sqlite dependency (3.6.22) -- fix path for mozilla-xremote-client in launcher - -* Sat May 29 2010 Remi Collet <rpms@famillecollet.com> - 3.6.4-0.3.build6 -- update to Firefox 3.6.4 Beta (build6) - -* Fri May 14 2010 Remi Collet <rpms@famillecollet.com> - 3.6.4-0.2.build4 -- update to Firefox 3.6.4 Beta (build4) - -* Thu May 13 2010 Remi Collet <rpms@famillecollet.com> - 3.6.4-0.1.build3 -- update to Firefox 3.6.4 Beta (build3) - -* Sat Apr 10 2010 Remi Collet <rpms@famillecollet.com> - 3.6.3-2.plugin1 -- update to Firefox "lorentz" 3.6.3plugin1 - -* Fri Apr 02 2010 Remi Collet <rpms@famillecollet.com> - 3.6.3-1 -- Update to Firefox 3.6.3 (sources from mercurial) - -* Tue Mar 23 2010 Remi Collet <rpms@famillecollet.com> - 3.6.2-1 -- Update to Firefox 3.6.2 - -* Thu Mar 18 2010 Remi Collet <rpms@famillecollet.com> - 3.6.2-0.3.build3 -- Update to Firefox 3.6.2 Candidate Build 3 - -* Mon Mar 15 2010 Remi Collet <rpms@famillecollet.com> - 3.6.2-0.1.build1 -- Update to Firefox 3.6.2 Candidate Build 1 - -* Thu Jan 21 2010 Remi Collet <rpms@famillecollet.com> - 3.6-1 -- Update to Firefox 3.6 Finale - -* Sat Jan 09 2010 Remi Collet <rpms@famillecollet.com> - 3.6-0.5.rc1 -- Update to Firefox 3.6 Release Candidate 1 - -* Thu Dec 17 2009 Remi Collet <rpms@famillecollet.com> - 3.6-0.4.beta5 -- Update to Firefox 3.6 Beta 5 - -* Thu Nov 26 2009 Remi Collet <rpms@famillecollet.com> - 3.6-0.4.beta4 -- Update to Firefox 3.6 Beta 4 - -* Wed Nov 18 2009 Remi Collet <rpms@famillecollet.com> - 3.6-0.3.beta3 -- Update to Firefox 3.6 Beta 3 -- switch from firefox36 to firefox - -* Tue Nov 10 2009 Remi Collet <rpms@famillecollet.com> - 3.6-0.2.beta2 -- Update to Firefox 3.6 Beta 2 - -* Fri Nov 6 2009 Remi Collet <rpms@famillecollet.com> - 3.6-0.1.beta1 -- Update to Firefox 3.6 Beta 1 - -* Thu Nov 5 2009 Remi Collet <rpms@famillecollet.com> - 3.5.5-1 -- Update to Firefox 3.5.5 Final Release - -* Thu Nov 5 2009 Jan Horak <jhorak@redhat.com> - 3.5.5-1 -- Update to 3.5.5 - -* Wed Oct 28 2009 Remi Collet <rpms@famillecollet.com> - 3.5.4-1 -- Update to Firefox 3.5.4 Final Release - -* Mon Oct 26 2009 Jan Horak <jhorak@redhat.com> - 3.5.4-1 -- Update to 3.5.4 - -* Wed Sep 9 2009 Remi Collet <rpms@famillecollet.com> - 3.5.3-1 -- Update to Firefox 3.5.3 Final Release - -* Mon Sep 7 2009 Jan Horak <jhorak@redhat.com> - 3.5.3-1 -- Updated to 3.5.3. - -* Thu Aug 6 2009 Martin Stransky <stransky@redhat.com> - 3.5.2-3 -- Fix for #437596 - Firefox needs to register proper name - for session restore. - -* Tue Aug 4 2009 Remi Collet <rpms@famillecollet.com> - 3.5.2-1 -- Update to Firefox 3.5.2 Final Release - -* Mon Aug 3 2009 Martin Stransky <stransky@redhat.com> - 3.5.2-2 -- Updated to 3.5.2. - -* Fri Jul 24 2009 Jan Horak <jhorak@redhat.com> - 3.5.1-3 -- Adjust icons cache update according to template - -* Fri Jul 17 2009 Remi Collet <rpms@famillecollet.com> - 3.5.1-1 -- Update to Firefox 3.5.1 Final Release - -* Fri Jul 17 2009 Remi Collet <rpms@famillecollet.com> - 3.5.1-0.1.build1 -- Update to Firefox 3.5.1 build1 - -* Wed Jun 30 2009 Remi Collet <rpms@famillecollet.com> - 3.5-1 -- Update to Firefox 3.5 Final Release - -* Wed Jun 27 2009 Remi Collet <rpms@famillecollet.com> - 3.5-0.27.rc3 -- Update to Firefox 3.5 RC3 - -* Wed Jun 24 2009 Remi Collet <rpms@famillecollet.com> - 3.5-0.26.rc3.build2 -- Update to Firefox 3.5 RC3 build2 - -* Fri Jun 19 2009 Remi Collet <rpms@famillecollet.com> - 3.5-0.26.rc2 -- Update to Firefox 3.5 RC2 - -* Thu Jun 18 2009 Remi Collet <rpms@famillecollet.com> - 3.5-0.25.rc2.build2 -- Update to Firefox 3.5 RC2 build2 - -* Wed Jun 17 2009 Remi Collet <rpms@famillecollet.com> - 3.5-0.24.rc1 -- Update to Firefox 3.5 RC1 - -* Tue Jun 16 2009 Remi Collet <rpms@famillecollet.com> - 3.5-0.23.rc1.build2 -- Update to Firefox 3.5 RC1 build2 - -* Sun Jun 14 2009 Remi Collet <rpms@famillecollet.com> - 3.5-0.22.rc1.build1 -- Update to Firefox 3.5 RC1 build1 - -* Thu Jun 11 2009 Remi Collet <rpms@famillecollet.com> - 3.5-0.21.beta99 -- Update to Firefox 3.5 Beta 99 (Preview) - -* Tue Apr 28 2009 Remi Collet <rpms@famillecollet.com> - 3.5-0.2.beta4 -- Update to Firefox 3.5 Beta 4 - -* Fri Apr 24 2009 Remi Collet <rpms@famillecollet.com> - 3.5-0.1.beta4 -- Update to 3.5b4 build1 -- use system-nss only if Fedora >= 11 (3.12.3) - -* Thu Apr 23 2009 Remi Collet <rpms@famillecollet.com> - 3.1-0.1.beta3 -- First Firefox 3.1 build from rawhide xulrunner + firefox spec - diff --git a/firefox3.desktop b/firefox3.desktop deleted file mode 100644 index 13b142a..0000000 --- a/firefox3.desktop +++ /dev/null @@ -1,14 +0,0 @@ -[Desktop Entry] -Version=1.0 -Encoding=UTF-8 -Name=Firefox Web Browser -GenericName=Web Browser -Comment=Browse the Web -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 - diff --git a/firefox36.sh.in b/firefox36.sh.in deleted file mode 100644 index b1190e0..0000000 --- a/firefox36.sh.in +++ /dev/null @@ -1,260 +0,0 @@ -#!/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 - -if [ ! -x $MOZ_LIB_DIR/firefox-FIREFOX_VERSION/firefox ]; then - if [ ! -x $SECONDARY_LIB_DIR/firefox-FIREFOX_VERSION/firefox ]; then - echo "Error: $MOZ_LIB_DIR/firefox-FIREFOX_VERSION/firefox not found" - if [ -d $SECONDARY_LIB_DIR ]; then - echo " $SECONDARY_LIB_DIR/firefox-FIREFOX_VERSION/firefox not found" - fi - exit 1 - fi - MOZ_LIB_DIR="$SECONDARY_LIB_DIR" -fi -MOZ_DIST_BIN="$MOZ_LIB_DIR/firefox-FIREFOX_VERSION" -## firefox DIR for remi -MOZ_XUL_DIR="$MOZ_DIST_BIN" -MOZ_LANGPACKS_DIR="$MOZ_DIST_BIN/langpacks" -MOZ_EXTENSIONS_PROFILE_DIR="$HOME/.mozilla/extensions/{ec8030f7-c20a-464f-9b0e-13a3a9e97384}" -MOZ_PROGRAM="$MOZ_DIST_BIN/firefox" -MOZ_LAUCHER="$MOZ_DIST_BIN/run-mozilla.sh" - -## -## Set MOZ_GRE_CONF -## -## Not used for remi ## This build use bundled Xulrunner - -## -## 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" - -# check system locale -MOZARGS= - -# MOZ_DISABLE_LANGPACKS disables language packs completelly -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"` - - # Try to link global langpacks to an extension directory - if [ -f $MOZ_LANGPACKS_DIR/langpack-${SHORTMOZLOCALE}@firefox.mozilla.org/chrome/$SHORTMOZLOCALE.jar ]; then - if [ -d $MOZ_EXTENSIONS_PROFILE_DIR/langpack-${SHORTMOZLOCALE}@firefox.mozilla.org ]; then - rmdir "$MOZ_EXTENSIONS_PROFILE_DIR/langpack-${SHORTMOZLOCALE}@firefox.mozilla.org" > /dev/null 2>&1 - fi - if ! [ -e $MOZ_EXTENSIONS_PROFILE_DIR/langpack-${SHORTMOZLOCALE}@firefox.mozilla.org ]; then - ln -s $MOZ_LANGPACKS_DIR/langpack-${SHORTMOZLOCALE}@firefox.mozilla.org \ - $MOZ_EXTENSIONS_PROFILE_DIR/langpack-${SHORTMOZLOCALE}@firefox.mozilla.org - echo "$MOZ_EXTENSIONS_PROFILE_DIR/langpack-${SHORTMOZLOCALE}@firefox.mozilla.org" > $FEDORA_LANGPACK_CONFIG - fi - elif [ -f $MOZ_LANGPACKS_DIR/langpack-${MOZLOCALE}@firefox.mozilla.org/chrome/$MOZLOCALE.jar ]; then - if [ -d $MOZ_EXTENSIONS_PROFILE_DIR/langpack-${MOZLOCALE}@firefox.mozilla.org ]; then - rmdir "$MOZ_EXTENSIONS_PROFILE_DIR/langpack-${MOZLOCALE}@firefox.mozilla.org" > /dev/null 2>&1 - fi - if ! [ -e $MOZ_EXTENSIONS_PROFILE_DIR/langpack-${MOZLOCALE}@firefox.mozilla.org ]; then - ln -s $MOZ_LANGPACKS_DIR/langpack-${MOZLOCALE}@firefox.mozilla.org \ - $MOZ_EXTENSIONS_PROFILE_DIR/langpack-${MOZLOCALE}@firefox.mozilla.org - echo "$MOZ_EXTENSIONS_PROFILE_DIR/langpack-${MOZLOCALE}@firefox.mozilla.org" > $FEDORA_LANGPACK_CONFIG - fi - fi - - # And set it up for mozilla - if [ -f $MOZ_EXTENSIONS_PROFILE_DIR/langpack-${SHORTMOZLOCALE}@firefox.mozilla.org/chrome/$SHORTMOZLOCALE.jar ]; then - MOZARGS="-UILocale $SHORTMOZLOCALE" - else - if [ -f $MOZ_EXTENSIONS_PROFILE_DIR/langpack-${MOZLOCALE}@firefox.mozilla.org/chrome/$MOZLOCALE.jar ]; then - MOZARGS="-UILocale $MOZLOCALE" - fi - fi -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_LAUCHER $script_args $MOZ_PROGRAM $MOZARGS "$@" -fi - -exec $MOZ_LAUCHER $script_args $MOZ_PROGRAM $MOZARGS "$@" diff --git a/firefox4-build-macos.patch b/firefox4-build-macos.patch deleted file mode 100644 index 14c9903..0000000 --- a/firefox4-build-macos.patch +++ /dev/null @@ -1,50 +0,0 @@ -See https://bugzilla.mozilla.org/591152 - -diff -up mozilla-central/configure.in.orig mozilla-central/configure.in ---- mozilla-central/configure.in.orig 2010-09-14 21:41:14.883579761 +0200 -+++ mozilla-central/configure.in 2010-09-14 21:42:23.976579149 +0200 -@@ -3787,7 +3787,7 @@ fi - - dnl check for wcrtomb/mbrtowc - dnl ======================================================================= --if test -z "$MACOS_DEPLOYMENT_TARGET" -o "$MACOS_DEPLOYMENT_TARGET" -ge "100300"; then -+if test "${MACOS_DEPLOYMENT_TARGET:-999999}" -ge "100300"; then - AC_LANG_SAVE - AC_LANG_CPLUSPLUS - AC_CACHE_CHECK(for wcrtomb, -diff -up mozilla-central/configure.orig mozilla-central/configure ---- mozilla-central/configure.orig 2010-09-14 21:41:09.557839675 +0200 -+++ mozilla-central/configure 2010-09-14 21:42:10.369954678 +0200 -@@ -11978,7 +11978,7 @@ EOF - - fi - --if test -z "$MACOS_DEPLOYMENT_TARGET" -o "$MACOS_DEPLOYMENT_TARGET" -ge "100300"; then -+if test "${MACOS_DEPLOYMENT_TARGET:-999999}" -ge "100300"; then - - ac_ext=C - # CXXFLAGS is not in ac_cpp because -g, -O, etc. are not valid cpp options. -diff -up mozilla-central/js/src/configure.in.orig mozilla-central/js/src/configure.in ---- mozilla-central/js/src/configure.in.orig 2010-09-14 21:41:24.605579748 +0200 -+++ mozilla-central/js/src/configure.in 2010-09-14 21:42:49.229954365 +0200 -@@ -3309,7 +3309,7 @@ fi - - dnl check for wcrtomb/mbrtowc - dnl ======================================================================= --if test -z "$MACOS_DEPLOYMENT_TARGET" -o "$MACOS_DEPLOYMENT_TARGET" -ge "100300"; then -+if test "${MACOS_DEPLOYMENT_TARGET:-999999}" -ge "100300"; then - AC_LANG_SAVE - AC_LANG_CPLUSPLUS - AC_CACHE_CHECK(for wcrtomb, -diff -up mozilla-central/js/src/configure.orig mozilla-central/js/src/configure ---- mozilla-central/js/src/configure.orig 2010-09-14 21:41:20.036829607 +0200 -+++ mozilla-central/js/src/configure 2010-09-14 21:42:42.767876525 +0200 -@@ -10234,7 +10234,7 @@ EOF - - fi - --if test -z "$MACOS_DEPLOYMENT_TARGET" -o "$MACOS_DEPLOYMENT_TARGET" -ge "100300"; then -+if test "${MACOS_DEPLOYMENT_TARGET:-999999}" -ge "100300"; then - - ac_ext=C - # CXXFLAGS is not in ac_cpp because -g, -O, etc. are not valid cpp options. diff --git a/firefox4-build-sbrk.patch b/firefox4-build-sbrk.patch deleted file mode 100644 index 7e8f8c9..0000000 --- a/firefox4-build-sbrk.patch +++ /dev/null @@ -1,24 +0,0 @@ -diff -up xulrunner2-2.0/mozilla-central/js/src/shell/js.cpp.sbrk xulrunner2-2.0/mozilla-central/js/src/shell/js.cpp ---- xulrunner2-2.0/mozilla-central/js/src/shell/js.cpp.sbrk 2010-07-20 20:52:15.000000000 -0400 -+++ xulrunner2-2.0/mozilla-central/js/src/shell/js.cpp 2010-07-28 10:21:51.905606001 -0400 -@@ -1118,7 +1118,7 @@ GC(JSContext *cx, uintN argc, jsval *vp) - char buf[256]; - JS_snprintf(buf, sizeof(buf), "before %lu, after %lu, break %08lx\n", - (unsigned long)preBytes, (unsigned long)cx->runtime->gcBytes, --#ifdef HAVE_SBRK -+#if 0 - (unsigned long)sbrk(0) - #else - 0 -diff -up xulrunner2-2.0/mozilla-central/js/src/xpconnect/shell/xpcshell.cpp.sbrk xulrunner2-2.0/mozilla-central/js/src/xpconnect/shell/xpcshell.cpp ---- xulrunner2-2.0/mozilla-central/js/src/xpconnect/shell/xpcshell.cpp.sbrk 2010-07-20 20:52:20.000000000 -0400 -+++ xulrunner2-2.0/mozilla-central/js/src/xpconnect/shell/xpcshell.cpp 2010-07-28 10:20:36.878606001 -0400 -@@ -540,7 +540,7 @@ GC(JSContext *cx, JSObject *obj, uintN a - JS_GC(cx); - fprintf(gOutFile, "before %lu, after %lu, break %08lx\n", - (unsigned long)preBytes, (unsigned long)rt->gcBytes, --#if defined(XP_UNIX) && !defined(__SYMBIAN32__) -+#if 0 //defined(XP_UNIX) && !defined(__SYMBIAN32__) - (unsigned long)sbrk(0) - #else - 0 diff --git a/firefox4-build.patch b/firefox4-build.patch deleted file mode 100644 index 065ca9f..0000000 --- a/firefox4-build.patch +++ /dev/null @@ -1,23 +0,0 @@ -diff -up xulrunner-1.9.3.0/mozilla-central/security/manager/Makefile.in.build xulrunner-1.9.3.0/mozilla-central/security/manager/Makefile.in ---- xulrunner-1.9.3.0/mozilla-central/security/manager/Makefile.in.build 2010-08-06 03:09:27.000000000 +0200 -+++ xulrunner-1.9.3.0/mozilla-central/security/manager/Makefile.in 2010-08-16 10:49:10.000000000 +0200 -@@ -181,7 +181,6 @@ DEFAULT_GMAKE_FLAGS += NSPR_INCLUDE_DIR= - DEFAULT_GMAKE_FLAGS += NSPR_LIB_DIR=$(NSPR_LIB_DIR) - DEFAULT_GMAKE_FLAGS += MOZILLA_CLIENT=1 - DEFAULT_GMAKE_FLAGS += NO_MDUPDATE=1 --DEFAULT_GMAKE_FLAGS += NSS_ENABLE_ECC=1 - DEFAULT_GMAKE_FLAGS += NSINSTALL="$(NSINSTALL)" - ifndef MOZ_NATIVE_SQLITE - DEFAULT_GMAKE_FLAGS += SQLITE_LIB_NAME=mozsqlite3 -diff -up xulrunner-1.9.3.0/mozilla-central/security/manager/ssl/src/Makefile.in.build xulrunner-1.9.3.0/mozilla-central/security/manager/ssl/src/Makefile.in ---- xulrunner-1.9.3.0/mozilla-central/security/manager/ssl/src/Makefile.in.build 2010-08-06 03:09:17.000000000 +0200 -+++ xulrunner-1.9.3.0/mozilla-central/security/manager/ssl/src/Makefile.in 2010-08-16 10:46:22.000000000 +0200 -@@ -113,8 +113,6 @@ CSRCS += md4.c - - EXTRA_DEPS = $(NSS_DEP_LIBS) - --DEFINES += -DNSS_ENABLE_ECC -- - # Use local includes because they are inserted before INCLUDES - # so that Mozilla's nss.h is used, not glibc's - LOCAL_INCLUDES += $(NSS_CFLAGS) diff --git a/firefox4-default.patch b/firefox4-default.patch deleted file mode 100644 index d1e027f..0000000 --- a/firefox4-default.patch +++ /dev/null @@ -1,91 +0,0 @@ -diff -up mozilla-central/browser/components/preferences/advanced.xul.default mozilla-central/browser/components/preferences/advanced.xul ---- mozilla-central/browser/components/preferences/advanced.xul.default 2011-01-22 01:24:21.000000000 +0100 -+++ mozilla-central/browser/components/preferences/advanced.xul 2011-01-22 16:48:18.522166468 +0100 -@@ -194,10 +194,11 @@ - </groupbox> - - #ifdef HAVE_SHELL_SERVICE -+#ifdef MOZ_CRASHREPORTER - <!-- System Defaults --> - <groupbox id="systemDefaultsGroup" orient="vertical"> - <caption label="&systemDefaults.label;"/> -- -+#ifdef 0 - <hbox id="checkDefaultBox" align="center" flex="1"> - <checkbox id="alwaysCheckDefault" preference="browser.shell.checkDefaultBrowser" - label="&alwaysCheckDefault.label;" accesskey="&alwaysCheckDefault.accesskey;" -@@ -207,6 +208,7 @@ - oncommand="gAdvancedPane.checkNow()" - preference="pref.general.disable_button.default_browser"/> - </hbox> -+#endif - #ifdef MOZ_CRASHREPORTER - <checkbox id="submitCrashesBox" flex="1" - oncommand="gAdvancedPane.updateSubmitCrashes();" -@@ -214,6 +216,7 @@ - #endif - </groupbox> - #endif -+#endif - </tabpanel> - - <!-- Network --> -diff -up mozilla-central/browser/components/shell/src/nsGNOMEShellService.cpp.default mozilla-central/browser/components/shell/src/nsGNOMEShellService.cpp ---- mozilla-central/browser/components/shell/src/nsGNOMEShellService.cpp.default 2011-01-22 01:24:22.000000000 +0100 -+++ mozilla-central/browser/components/shell/src/nsGNOMEShellService.cpp 2011-01-22 16:51:39.616884957 +0100 -@@ -140,27 +140,21 @@ NS_IMPL_ISUPPORTS1(nsGNOMEShellService, - PRBool - nsGNOMEShellService::KeyMatchesAppName(const char *aKeyValue) const - { -+ nsCAutoString appName; - -- gchar *commandPath; - if (mUseLocaleFilenames) { - gchar *nativePath = g_filename_from_utf8(aKeyValue, -1, NULL, NULL, NULL); - if (!nativePath) { - NS_ERROR("Error converting path to filesystem encoding"); - return PR_FALSE; - } -- -- commandPath = g_find_program_in_path(nativePath); -+ appName.Assign(nativePath); - g_free(nativePath); - } else { -- commandPath = g_find_program_in_path(aKeyValue); -+ appName.Assign(aKeyValue); - } -- -- if (!commandPath) -- return PR_FALSE; -- -- PRBool matches = mAppPath.Equals(commandPath); -- g_free(commandPath); -- return matches; -+ // Compare default browser command retrieved from gconf with MOZ_APP_NAME -+ return appName.EqualsLiteral(MOZ_APP_NAME); - } - - NS_IMETHODIMP -@@ -215,8 +209,8 @@ nsGNOMEShellService::SetDefaultBrowser(P - - nsCOMPtr<nsIGConfService> gconf = do_GetService(NS_GCONFSERVICE_CONTRACTID); - if (gconf) { -- nsCAutoString appKeyValue(mAppPath); -- appKeyValue.Append(" \"%s\""); -+ nsCAutoString appKeyValue(MOZ_APP_NAME); -+ appKeyValue.Append(" %s"); - for (unsigned int i = 0; i < NS_ARRAY_LENGTH(appProtocols); ++i) { - if (appProtocols[i].essential || aClaimAllTypes) { - gconf->SetAppForProtocol(nsDependentCString(appProtocols[i].name), -diff -up mozilla-central/browser/components/shell/src/nsGNOMEShellService.h.default mozilla-central/browser/components/shell/src/nsGNOMEShellService.h ---- mozilla-central/browser/components/shell/src/nsGNOMEShellService.h.default 2011-01-22 01:24:22.000000000 +0100 -+++ mozilla-central/browser/components/shell/src/nsGNOMEShellService.h 2011-01-22 16:48:18.523166485 +0100 -@@ -43,7 +43,7 @@ - class nsGNOMEShellService : public nsIShellService - { - public: -- nsGNOMEShellService() : mCheckedThisSession(PR_FALSE) { } -+ nsGNOMEShellService() : mCheckedThisSession(PR_TRUE) { } - - NS_DECL_ISUPPORTS - NS_DECL_NSISHELLSERVICE diff --git a/firefox4-disable-checkupdates.patch b/firefox4-disable-checkupdates.patch deleted file mode 100644 index e3b8c97..0000000 --- a/firefox4-disable-checkupdates.patch +++ /dev/null @@ -1,12 +0,0 @@ -diff -up mozilla-1.9.2/browser/base/content/utilityOverlay.js.checkForUpdates mozilla-1.9.2/browser/base/content/utilityOverlay.js ---- mozilla-1.9.2/browser/base/content/utilityOverlay.js.checkForUpdates 2010-06-13 15:36:16.617677299 -0700 -+++ mozilla-1.9.2/browser/base/content/utilityOverlay.js 2010-06-13 15:39:54.485387418 -0700 -@@ -510,7 +510,7 @@ function buildHelpMenu() - // Disable the UI if the update enabled pref has been locked by the - // administrator or if we cannot update for some other reason - var checkForUpdates = document.getElementById("checkForUpdates"); -- var canCheckForUpdates = updates.canCheckForUpdates; -+ var canCheckForUpdates = updates.canCheckForUpdates && updates.canApplyUpdates; - checkForUpdates.setAttribute("disabled", !canCheckForUpdates); - if (!canCheckForUpdates) - return; diff --git a/firefox4-jemalloc.patch b/firefox4-jemalloc.patch deleted file mode 100644 index 982483f..0000000 --- a/firefox4-jemalloc.patch +++ /dev/null @@ -1,22 +0,0 @@ -diff -up mozilla-central/memory/jemalloc/jemalloc.h.jemalloc mozilla-central/memory/jemalloc/jemalloc.h ---- mozilla-central/memory/jemalloc/jemalloc.h.jemalloc 2010-08-18 15:21:10.000000000 -0400 -+++ mozilla-central/memory/jemalloc/jemalloc.h 2010-09-01 16:50:38.615946834 -0400 -@@ -42,12 +42,12 @@ extern const char *_malloc_options; - - /* Darwin and Linux already have memory allocation functions */ - #if (!defined(MOZ_MEMORY_DARWIN) && !defined(MOZ_MEMORY_LINUX)) --void *malloc(size_t size); --void *valloc(size_t size); --void *calloc(size_t num, size_t size); --void *realloc(void *ptr, size_t size); --void free(void *ptr); --int posix_memalign(void **memptr, size_t alignment, size_t size); -+void *malloc(size_t size) __THROW __attribute_malloc__ __wur; -+void *valloc(size_t size) __THROW __attribute_malloc__ __wur; -+void *calloc(size_t num, size_t size) __THROW __attribute_malloc__ __wur; -+void *realloc(void *ptr, size_t size) __THROW __attribute_malloc__ __wur; -+void free(void *ptr) __THROW __attribute_malloc__ __wur; -+int posix_memalign(void **memptr, size_t alignment, size_t size) __THROW __attribute_malloc__ __wur; - #endif /* MOZ_MEMORY_DARWIN, MOZ_MEMORY_LINUX */ - - #if defined(MOZ_MEMORY_ANDROID) || defined(WRAP_MALLOC) diff --git a/firefox4-libjpeg-turbo.patch b/firefox4-libjpeg-turbo.patch deleted file mode 100644 index 54be1a1..0000000 --- a/firefox4-libjpeg-turbo.patch +++ /dev/null @@ -1,34 +0,0 @@ -diff -up xulrunner-2.0/mozilla-central/modules/libpr0n/decoders/nsJPEGDecoder.cpp.jpeg-turbo xulrunner-2.0/mozilla-central/modules/libpr0n/decoders/nsJPEGDecoder.cpp ---- xulrunner-2.0/mozilla-central/modules/libpr0n/decoders/nsJPEGDecoder.cpp.jpeg-turbo 2010-11-04 21:06:43.000000000 +0100 -+++ xulrunner-2.0/mozilla-central/modules/libpr0n/decoders/nsJPEGDecoder.cpp 2010-11-12 12:39:08.047171412 +0100 -@@ -411,14 +411,6 @@ nsJPEGDecoder::WriteInternal(const char - return; /* I/O suspension */ - } - -- /* Force to use our YCbCr to Packed RGB converter when possible */ -- if (!mTransform && (mCMSMode != eCMSMode_All) && -- mInfo.jpeg_color_space == JCS_YCbCr && mInfo.out_color_space == JCS_RGB) { -- /* Special case for the most common case: transform from YCbCr direct into packed ARGB */ -- mInfo.out_color_components = 4; /* Packed ARGB pixels are always 4 bytes...*/ -- mInfo.cconvert->color_convert = ycc_rgb_convert_argb; -- } -- - /* If this is a progressive JPEG ... */ - mState = mInfo.buffered_image ? JPEG_DECOMPRESS_PROGRESSIVE : JPEG_DECOMPRESS_SEQUENTIAL; - } -@@ -563,15 +555,6 @@ nsJPEGDecoder::OutputScanlines(PRBool* s - PRUint32 *imageRow = ((PRUint32*)mImageData) + - (mInfo.output_scanline * mInfo.output_width); - -- if (mInfo.cconvert->color_convert == ycc_rgb_convert_argb) { -- /* Special case: scanline will be directly converted into packed ARGB */ -- if (jpeg_read_scanlines(&mInfo, (JSAMPARRAY)&imageRow, 1) != 1) { -- *suspend = PR_TRUE; /* suspend */ -- break; -- } -- continue; /* all done for this row! */ -- } -- - JSAMPROW sampleRow = (JSAMPROW)imageRow; - if (mInfo.output_components == 3) { - /* Put the pixels at end of row to enable in-place expansion */ diff --git a/firefox4-version.patch b/firefox4-version.patch deleted file mode 100644 index 491c3b1..0000000 --- a/firefox4-version.patch +++ /dev/null @@ -1,11 +0,0 @@ ---- mozilla-central/browser/installer/Makefile.in.version 2010-07-21 02:52:02.000000000 +0200 -+++ mozilla-central/browser/installer/Makefile.in 2010-07-28 08:35:07.420151040 +0200 -@@ -45,6 +45,8 @@ - - include $(topsrcdir)/config/rules.mk - -+MOZ_APP_VERSION="__RPM_VERSION_INTERNAL__" -+ - MOZ_PKG_REMOVALS = $(srcdir)/removed-files.in - - ifdef MOZ_ENABLE_LIBXUL diff --git a/firefox4.sh.in b/firefox4.sh.in deleted file mode 100644 index d7f38cb..0000000 --- a/firefox4.sh.in +++ /dev/null @@ -1,267 +0,0 @@ -#!/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 - -if [ ! -x $MOZ_LIB_DIR/firefox-FIREFOX_VERSION/firefox ]; then - if [ ! -x $SECONDARY_LIB_DIR/firefox-FIREFOX_VERSION/firefox ]; then - echo "Error: $MOZ_LIB_DIR/firefox-FIREFOX_VERSION/firefox not found" - if [ -d $SECONDARY_LIB_DIR ]; then - echo " $SECONDARY_LIB_DIR/firefox-FIREFOX_VERSION/firefox not found" - fi - exit 1 - fi - MOZ_LIB_DIR="$SECONDARY_LIB_DIR" -fi -MOZ_DIST_BIN="$MOZ_LIB_DIR/firefox-FIREFOX_VERSION" -## firefox DIR for remi -MOZ_XUL_DIR="$MOZ_DIST_BIN" -MOZ_LANGPACKS_DIR="$MOZ_DIST_BIN/langpacks" -MOZ_EXTENSIONS_PROFILE_DIR="$HOME/.mozilla/extensions/{ec8030f7-c20a-464f-9b0e-13a3a9e97384}" -MOZ_PROGRAM="$MOZ_DIST_BIN/firefox" -MOZ_LAUCHER="$MOZ_DIST_BIN/run-mozilla.sh" - -## -## Set MOZ_GRE_CONF -## -## Not used for remi ## This build use bundled Xulrunner - -## -## 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" - -# check system locale -MOZARGS= - -# MOZ_DISABLE_LANGPACKS disables language packs completelly -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"` - MANIFEST="chrome.manifest" - - # Try to link global langpacks to an extension directory - if [ -f $MOZ_LANGPACKS_DIR/langpack-${SHORTMOZLOCALE}@firefox.mozilla.org/$MANIFEST ]; then - if [ -d $MOZ_EXTENSIONS_PROFILE_DIR/langpack-${SHORTMOZLOCALE}@firefox.mozilla.org ]; then - rmdir "$MOZ_EXTENSIONS_PROFILE_DIR/langpack-${SHORTMOZLOCALE}@firefox.mozilla.org" > /dev/null 2>&1 - fi - if ! [ -e $MOZ_EXTENSIONS_PROFILE_DIR/langpack-${SHORTMOZLOCALE}@firefox.mozilla.org ]; then - ln -s $MOZ_LANGPACKS_DIR/langpack-${SHORTMOZLOCALE}@firefox.mozilla.org \ - $MOZ_EXTENSIONS_PROFILE_DIR/langpack-${SHORTMOZLOCALE}@firefox.mozilla.org - echo "$MOZ_EXTENSIONS_PROFILE_DIR/langpack-${SHORTMOZLOCALE}@firefox.mozilla.org" > $FEDORA_LANGPACK_CONFIG - fi - elif [ -f $MOZ_LANGPACKS_DIR/langpack-${MOZLOCALE}@firefox.mozilla.org/$MANIFEST ]; then - if [ -d $MOZ_EXTENSIONS_PROFILE_DIR/langpack-${MOZLOCALE}@firefox.mozilla.org ]; then - rmdir "$MOZ_EXTENSIONS_PROFILE_DIR/langpack-${MOZLOCALE}@firefox.mozilla.org" > /dev/null 2>&1 - fi - if ! [ -e $MOZ_EXTENSIONS_PROFILE_DIR/langpack-${MOZLOCALE}@firefox.mozilla.org ]; then - ln -s $MOZ_LANGPACKS_DIR/langpack-${MOZLOCALE}@firefox.mozilla.org \ - $MOZ_EXTENSIONS_PROFILE_DIR/langpack-${MOZLOCALE}@firefox.mozilla.org - echo "$MOZ_EXTENSIONS_PROFILE_DIR/langpack-${MOZLOCALE}@firefox.mozilla.org" > $FEDORA_LANGPACK_CONFIG - fi - fi - - # And set it up for mozilla - if [ -f $MOZ_EXTENSIONS_PROFILE_DIR/langpack-${SHORTMOZLOCALE}@firefox.mozilla.org/$MANIFEST ]; then - MOZARGS="-UILocale $SHORTMOZLOCALE" - else - if [ -f $MOZ_EXTENSIONS_PROFILE_DIR/langpack-${MOZLOCALE}@firefox.mozilla.org/$MANIFEST ]; then - MOZARGS="-UILocale $MOZLOCALE" - fi - fi -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 - -## -## Enable WebGL -## -MOZ_GLX_IGNORE_BLACKLIST=1 -export MOZ_GLX_IGNORE_BLACKLIST - -# Run the browser -debugging=0 -if [ $debugging = 1 ] -then - echo $MOZ_LAUCHER $script_args $MOZ_PROGRAM $MOZARGS "$@" -fi - -exec $MOZ_LAUCHER $script_args $MOZ_PROGRAM $MOZARGS "$@" diff --git a/mozilla-192-pkgconfig.patch b/mozilla-192-pkgconfig.patch deleted file mode 100644 index 1f234a7..0000000 --- a/mozilla-192-pkgconfig.patch +++ /dev/null @@ -1,73 +0,0 @@ -diff -up mozilla-1.9.2/config/autoconf.mk.in.pk mozilla-1.9.2/config/autoconf.mk.in ---- mozilla-1.9.2/config/autoconf.mk.in.pk 2009-11-09 01:33:58.000000000 +0100 -+++ mozilla-1.9.2/config/autoconf.mk.in 2009-11-12 12:49:28.000000000 +0100 -@@ -58,14 +58,14 @@ MOZ_PKG_SPECIAL = @MOZ_PKG_SPECIAL@ - prefix = @prefix@ - exec_prefix = @exec_prefix@ - bindir = @bindir@ --includedir = @includedir@/$(MOZ_APP_NAME)-$(MOZ_APP_VERSION) -+includedir = @includedir@/$(MOZ_APP_NAME)-sdk-$(MOZ_APP_VERSION) - libdir = @libdir@ - datadir = @datadir@ - mandir = @mandir@ --idldir = $(datadir)/idl/$(MOZ_APP_NAME)-$(MOZ_APP_VERSION) -+idldir = $(datadir)/idl/$(MOZ_APP_NAME)-sdk-$(MOZ_APP_VERSION) - - installdir = $(libdir)/$(MOZ_APP_NAME)-$(MOZ_APP_VERSION) --sdkdir = $(libdir)/$(MOZ_APP_NAME)-devel-$(MOZ_APP_VERSION) -+sdkdir = $(libdir)/$(MOZ_APP_NAME)-sdk-$(MOZ_APP_VERSION) - - DIST = $(DEPTH)/dist - LIBXUL_SDK = @LIBXUL_SDK@ -diff -up mozilla-1.9.2/xulrunner/installer/libxul-embedding.pc.in.pk mozilla-1.9.2/xulrunner/installer/libxul-embedding.pc.in ---- mozilla-1.9.2/xulrunner/installer/libxul-embedding.pc.in.pk 2009-11-09 01:34:25.000000000 +0100 -+++ mozilla-1.9.2/xulrunner/installer/libxul-embedding.pc.in 2009-11-12 13:09:18.000000000 +0100 -@@ -6,5 +6,6 @@ idldir=%idldir% - Name: libxul-embedding - Description: Static library for version-independent embedding of the Mozilla runtime - Version: %MOZILLA_VERSION% -+Requires: %NSPR_NAME% >= %NSPR_VERSION% - Libs: -L${sdkdir}/lib -lxpcomglue - Cflags: -DXPCOM_GLUE -I${includedir} %WCHAR_CFLAGS% -diff -up mozilla-1.9.2/xulrunner/installer/libxul.pc.in.pk mozilla-1.9.2/xulrunner/installer/libxul.pc.in ---- mozilla-1.9.2/xulrunner/installer/libxul.pc.in.pk 2009-11-09 01:34:25.000000000 +0100 -+++ mozilla-1.9.2/xulrunner/installer/libxul.pc.in 2009-11-12 13:10:03.000000000 +0100 -@@ -2,6 +2,7 @@ prefix=%prefix% - sdkdir=%sdkdir% - includedir=%includedir% - idldir=%idldir% -+libdir=%libdir% - - Name: libxul - Description: The Mozilla Runtime and Embedding Engine -diff -up mozilla-1.9.2/xulrunner/installer/Makefile.in.pk mozilla-1.9.2/xulrunner/installer/Makefile.in ---- mozilla-1.9.2/xulrunner/installer/Makefile.in.pk 2009-11-12 12:49:28.000000000 +0100 -+++ mozilla-1.9.2/xulrunner/installer/Makefile.in 2009-11-12 12:49:28.000000000 +0100 -@@ -123,6 +123,7 @@ endif - -e "s|%includedir%|$(includedir)|" \ - -e "s|%idldir%|$(idldir)|" \ - -e "s|%sdkdir%|$(sdkdir)|" \ -+ -e "s|%libdir%|$(installdir)|" \ - -e "s|%MOZ_APP_NAME%|$(MOZ_APP_NAME)|" \ - -e "s|%MOZILLA_VERSION%|$(MOZ_APP_VERSION)|" \ - -e "s|%WCHAR_CFLAGS%|$(WCHAR_CFLAGS)|" \ -diff -up mozilla-1.9.2/xulrunner/installer/mozilla-gtkmozembed-embedding.pc.in.pk mozilla-1.9.2/xulrunner/installer/mozilla-gtkmozembed-embedding.pc.in ---- mozilla-1.9.2/xulrunner/installer/mozilla-gtkmozembed-embedding.pc.in.pk 2009-11-09 01:34:25.000000000 +0100 -+++ mozilla-1.9.2/xulrunner/installer/mozilla-gtkmozembed-embedding.pc.in 2009-11-12 12:49:28.000000000 +0100 -@@ -1,5 +1,6 @@ - prefix=%prefix% - sdkdir=%sdkdir% -+libdir=%libdir% - includedir=%includedir% - - Name: mozilla-gtkembedmoz -diff -up mozilla-1.9.2/xulrunner/installer/mozilla-gtkmozembed.pc.in.pk mozilla-1.9.2/xulrunner/installer/mozilla-gtkmozembed.pc.in ---- mozilla-1.9.2/xulrunner/installer/mozilla-gtkmozembed.pc.in.pk 2009-11-09 01:34:25.000000000 +0100 -+++ mozilla-1.9.2/xulrunner/installer/mozilla-gtkmozembed.pc.in 2009-11-12 12:49:28.000000000 +0100 -@@ -1,5 +1,6 @@ - prefix=%prefix% - sdkdir=%sdkdir% -+libdir=%libdir% - includedir=%includedir% - - Name: mozilla-gtkembedmoz diff --git a/mozilla-193-pkgconfig.patch b/mozilla-193-pkgconfig.patch deleted file mode 100644 index c17c89b..0000000 --- a/mozilla-193-pkgconfig.patch +++ /dev/null @@ -1,73 +0,0 @@ -diff -up xulrunner-1.9.3.0/mozilla-central/config/autoconf.mk.in.pk xulrunner-1.9.3.0/mozilla-central/config/autoconf.mk.in ---- xulrunner-1.9.3.0/mozilla-central/config/autoconf.mk.in.pk 2010-08-06 03:09:27.000000000 +0200 -+++ xulrunner-1.9.3.0/mozilla-central/config/autoconf.mk.in 2010-08-16 11:07:52.000000000 +0200 -@@ -58,14 +58,14 @@ MOZ_PKG_SPECIAL = @MOZ_PKG_SPECIAL@ - prefix = @prefix@ - exec_prefix = @exec_prefix@ - bindir = @bindir@ --includedir = @includedir@/$(MOZ_APP_NAME)-$(MOZ_APP_VERSION) -+includedir = @includedir@/$(MOZ_APP_NAME)-sdk-$(MOZ_APP_VERSION) - libdir = @libdir@ - datadir = @datadir@ - mandir = @mandir@ --idldir = $(datadir)/idl/$(MOZ_APP_NAME)-$(MOZ_APP_VERSION) -+idldir = $(datadir)/idl/$(MOZ_APP_NAME)-sdk-$(MOZ_APP_VERSION) - - installdir = $(libdir)/$(MOZ_APP_NAME)-$(MOZ_APP_VERSION) --sdkdir = $(libdir)/$(MOZ_APP_NAME)-devel-$(MOZ_APP_VERSION) -+sdkdir = $(libdir)/$(MOZ_APP_NAME)-sdk-$(MOZ_APP_VERSION) - - DIST = $(DEPTH)/dist - LIBXUL_SDK = @LIBXUL_SDK@ -diff -up xulrunner-1.9.3.0/mozilla-central/xulrunner/installer/libxul-embedding.pc.in.pk xulrunner-1.9.3.0/mozilla-central/xulrunner/installer/libxul-embedding.pc.in ---- xulrunner-1.9.3.0/mozilla-central/xulrunner/installer/libxul-embedding.pc.in.pk 2010-08-06 03:09:24.000000000 +0200 -+++ xulrunner-1.9.3.0/mozilla-central/xulrunner/installer/libxul-embedding.pc.in 2010-08-16 11:12:32.000000000 +0200 -@@ -6,5 +6,6 @@ idldir=%idldir% - Name: libxul-embedding - Description: Static library for version-independent embedding of the Mozilla runtime - Version: %MOZILLA_VERSION% -+Requires: %NSPR_NAME% >= %NSPR_VERSION% - Libs: -L${sdkdir}/lib -lxpcomglue -ldl - Cflags: -DXPCOM_GLUE -I${includedir} %WCHAR_CFLAGS% -diff -up xulrunner-1.9.3.0/mozilla-central/xulrunner/installer/libxul.pc.in.pk xulrunner-1.9.3.0/mozilla-central/xulrunner/installer/libxul.pc.in ---- xulrunner-1.9.3.0/mozilla-central/xulrunner/installer/libxul.pc.in.pk 2010-08-06 03:09:24.000000000 +0200 -+++ xulrunner-1.9.3.0/mozilla-central/xulrunner/installer/libxul.pc.in 2010-08-16 11:07:52.000000000 +0200 -@@ -2,6 +2,7 @@ prefix=%prefix% - sdkdir=%sdkdir% - includedir=%includedir% - idldir=%idldir% -+libdir=%libdir% - - Name: libxul - Description: The Mozilla Runtime and Embedding Engine -diff -up xulrunner-1.9.3.0/mozilla-central/xulrunner/installer/Makefile.in.pk xulrunner-1.9.3.0/mozilla-central/xulrunner/installer/Makefile.in ---- xulrunner-1.9.3.0/mozilla-central/xulrunner/installer/Makefile.in.pk 2010-08-16 11:07:52.000000000 +0200 -+++ xulrunner-1.9.3.0/mozilla-central/xulrunner/installer/Makefile.in 2010-08-16 11:07:52.000000000 +0200 -@@ -116,6 +116,7 @@ endif - -e "s|%includedir%|$(includedir)|" \ - -e "s|%idldir%|$(idldir)|" \ - -e "s|%sdkdir%|$(sdkdir)|" \ -+ -e "s|%libdir%|$(installdir)|" \ - -e "s|%MOZ_APP_NAME%|$(MOZ_APP_NAME)|" \ - -e "s|%MOZILLA_VERSION%|$(MOZ_APP_VERSION)|" \ - -e "s|%WCHAR_CFLAGS%|$(WCHAR_CFLAGS)|" \ -diff -up xulrunner-1.9.3.0/mozilla-central/xulrunner/installer/mozilla-gtkmozembed-embedding.pc.in.pk xulrunner-1.9.3.0/mozilla-central/xulrunner/installer/mozilla-gtkmozembed-embedding.pc.in ---- xulrunner-1.9.3.0/mozilla-central/xulrunner/installer/mozilla-gtkmozembed-embedding.pc.in.pk 2010-08-06 03:09:24.000000000 +0200 -+++ xulrunner-1.9.3.0/mozilla-central/xulrunner/installer/mozilla-gtkmozembed-embedding.pc.in 2010-08-16 11:07:52.000000000 +0200 -@@ -1,5 +1,6 @@ - prefix=%prefix% - sdkdir=%sdkdir% -+libdir=%libdir% - includedir=%includedir% - - Name: mozilla-gtkembedmoz -diff -up xulrunner-1.9.3.0/mozilla-central/xulrunner/installer/mozilla-gtkmozembed.pc.in.pk xulrunner-1.9.3.0/mozilla-central/xulrunner/installer/mozilla-gtkmozembed.pc.in ---- xulrunner-1.9.3.0/mozilla-central/xulrunner/installer/mozilla-gtkmozembed.pc.in.pk 2010-08-06 03:09:24.000000000 +0200 -+++ xulrunner-1.9.3.0/mozilla-central/xulrunner/installer/mozilla-gtkmozembed.pc.in 2010-08-16 11:07:52.000000000 +0200 -@@ -1,5 +1,6 @@ - prefix=%prefix% - sdkdir=%sdkdir% -+libdir=%libdir% - includedir=%includedir% - - Name: mozilla-gtkembedmoz diff --git a/mozilla-about-firefox-version.patch b/mozilla-about-firefox-version.patch deleted file mode 100644 index 115664c..0000000 --- a/mozilla-about-firefox-version.patch +++ /dev/null @@ -1,12 +0,0 @@ -diff -up mozilla-1.9.1/toolkit/content/Makefile.in.about-firefox-version mozilla-1.9.1/toolkit/content/Makefile.in ---- mozilla-1.9.1/toolkit/content/Makefile.in.about-firefox-version 2009-06-29 18:15:23.000000000 +0200 -+++ mozilla-1.9.1/toolkit/content/Makefile.in 2009-07-07 13:43:54.000000000 +0200 -@@ -46,7 +46,7 @@ CHROME_DEPS = buildconfig.html - include $(DEPTH)/config/autoconf.mk - - DEFINES += \ -- -DMOZ_APP_VERSION=$(MOZ_APP_VERSION) \ -+ -DMOZ_APP_VERSION=$(FIREFOX_VERSION) \ - -Dtarget="$(target)" \ - -Dac_configure_args="$(ac_configure_args)" \ - -DCC="$(CC)" \ diff --git a/mozilla-build-s390.patch b/mozilla-build-s390.patch deleted file mode 100644 index 92f5cbb..0000000 --- a/mozilla-build-s390.patch +++ /dev/null @@ -1,11 +0,0 @@ -diff -up mozilla-1.9.2/js/src/jstl.h.old mozilla-1.9.2/js/src/jstl.h ---- mozilla-1.9.2/js/src/jstl.h.old 2010-03-10 10:01:51.000000000 +0100 -+++ mozilla-1.9.2/js/src/jstl.h 2010-03-10 12:24:55.000000000 +0100 -@@ -195,7 +195,6 @@ class ReentrancyGuard - static JS_ALWAYS_INLINE size_t - RoundUpPow2(size_t x) - { -- typedef tl::StaticAssert<tl::IsSameType<size_t,JSUword>::result>::result _; - size_t log2 = JS_CEILING_LOG2W(x); - JS_ASSERT(log2 < tl::BitSize<size_t>::result); - size_t result = size_t(1) << log2; diff --git a/mozilla-build-sbrk.patch b/mozilla-build-sbrk.patch deleted file mode 100644 index e7e8773..0000000 --- a/mozilla-build-sbrk.patch +++ /dev/null @@ -1,24 +0,0 @@ -diff -up xulrunner-1.9.2.1/mozilla-1.9.2/js/src/shell/js.cpp.sbrk xulrunner-1.9.2.1/mozilla-1.9.2/js/src/shell/js.cpp ---- xulrunner-1.9.2.1/mozilla-1.9.2/js/src/shell/js.cpp.sbrk 2010-01-06 04:35:17.000000000 +0100 -+++ xulrunner-1.9.2.1/mozilla-1.9.2/js/src/shell/js.cpp 2010-01-13 21:49:33.000000000 +0100 -@@ -1119,7 +1119,7 @@ GC(JSContext *cx, uintN argc, jsval *vp) - char buf[256]; - JS_snprintf(buf, sizeof(buf), "before %lu, after %lu, break %08lx\n", - (unsigned long)preBytes, (unsigned long)rt->gcBytes, --#ifdef HAVE_SBRK -+#if 0 - (unsigned long)sbrk(0) - #else - 0 -diff -up xulrunner-1.9.2.1/mozilla-1.9.2/js/src/xpconnect/shell/xpcshell.cpp.sbrk xulrunner-1.9.2.1/mozilla-1.9.2/js/src/xpconnect/shell/xpcshell.cpp ---- xulrunner-1.9.2.1/mozilla-1.9.2/js/src/xpconnect/shell/xpcshell.cpp.sbrk 2010-01-06 04:35:19.000000000 +0100 -+++ xulrunner-1.9.2.1/mozilla-1.9.2/js/src/xpconnect/shell/xpcshell.cpp 2010-01-13 22:32:46.000000000 +0100 -@@ -543,7 +543,7 @@ GC(JSContext *cx, JSObject *obj, uintN a - JS_GC(cx); - fprintf(gOutFile, "before %lu, after %lu, break %08lx\n", - (unsigned long)preBytes, (unsigned long)rt->gcBytes, --#if defined(XP_UNIX) && !defined(__SYMBIAN32__) -+#if 0 //defined(XP_UNIX) && !defined(__SYMBIAN32__) - (unsigned long)sbrk(0) - #else - 0 diff --git a/mozilla-build.patch b/mozilla-build.patch deleted file mode 100644 index a956e5f..0000000 --- a/mozilla-build.patch +++ /dev/null @@ -1,23 +0,0 @@ -diff -up mozilla/security/manager/Makefile.in.old mozilla/security/manager/Makefile.in ---- mozilla/security/manager/Makefile.in.old 2007-10-25 00:25:30.000000000 +0200 -+++ mozilla/security/manager/Makefile.in 2007-11-06 10:57:39.000000000 +0100 -@@ -153,7 +153,6 @@ DEFAULT_GMAKE_FLAGS += NSPR_INCLUDE_DIR= - DEFAULT_GMAKE_FLAGS += NSPR_LIB_DIR=$(NSPR_LIB_DIR) - DEFAULT_GMAKE_FLAGS += MOZILLA_CLIENT=1 - DEFAULT_GMAKE_FLAGS += NO_MDUPDATE=1 --DEFAULT_GMAKE_FLAGS += NSS_ENABLE_ECC=1 - ifdef NSS_DISABLE_DBM - DEFAULT_GMAKE_FLAGS += NSS_DISABLE_DBM=1 - endif -diff -up mozilla/security/manager/ssl/src/Makefile.in.old mozilla/security/manager/ssl/src/Makefile.in ---- mozilla/security/manager/ssl/src/Makefile.in.old 2007-10-19 21:16:36.000000000 +0200 -+++ mozilla/security/manager/ssl/src/Makefile.in 2007-11-06 10:57:52.000000000 +0100 -@@ -134,8 +134,6 @@ REQUIRES = nspr \ - - EXTRA_DEPS = $(NSS_DEP_LIBS) - --DEFINES += -DNSS_ENABLE_ECC -- - # Use local includes because they are inserted before INCLUDES - # so that Mozilla's nss.h is used, not glibc's - LOCAL_INCLUDES += $(NSS_CFLAGS) diff --git a/mozilla-crashreporter-static.patch b/mozilla-crashreporter-static.patch deleted file mode 100644 index 610b66e..0000000 --- a/mozilla-crashreporter-static.patch +++ /dev/null @@ -1,11 +0,0 @@ -diff -up mozilla-1.9.2/toolkit/crashreporter/google-breakpad/src/tools/linux/dump_syms/Makefile.in.static mozilla-1.9.2/toolkit/crashreporter/google-breakpad/src/tools/linux/dump_syms/Makefile.in ---- mozilla-1.9.2/toolkit/crashreporter/google-breakpad/src/tools/linux/dump_syms/Makefile.in.static 2010-09-14 20:53:09.000000000 +0200 -+++ mozilla-1.9.2/toolkit/crashreporter/google-breakpad/src/tools/linux/dump_syms/Makefile.in 2010-10-13 14:21:14.000000000 +0200 -@@ -64,6 +64,6 @@ FORCE_USE_PIC = 1 - - #XXX: bug 554854 causes us to be unable to run binaries on the build slaves - # due to them having an older libstdc++ --HOST_LDFLAGS += -static -+#HOST_LDFLAGS += -static - - include $(topsrcdir)/config/rules.mk diff --git a/mozilla-gdk-pixbuf.patch b/mozilla-gdk-pixbuf.patch deleted file mode 100644 index 0596b1b..0000000 --- a/mozilla-gdk-pixbuf.patch +++ /dev/null @@ -1,15 +0,0 @@ -diff -up mozilla-1.9.2/configure.in.gdk-pixbuf mozilla-1.9.2/configure.in ---- mozilla-1.9.2/configure.in.gdk-pixbuf 2010-07-13 21:10:45.000000000 +0200 -+++ mozilla-1.9.2/configure.in 2010-08-03 15:38:43.113733420 +0200 -@@ -5354,7 +5354,10 @@ then - then - if test "$MOZ_ENABLE_LIBNOTIFY" - then -- PKG_CHECK_MODULES(MOZ_LIBNOTIFY, libnotify >= $LIBNOTIFY_VERSION) -+ dnl Code which requires gdk-pixbuf is only in -+ dnl toolkit/system/gnome/nsAlertsIconListener.cpp and is compiled -+ dnl only when libnotify is enabled -+ PKG_CHECK_MODULES(MOZ_LIBNOTIFY, libnotify >= $LIBNOTIFY_VERSION gdk-pixbuf-2.0 gtk+-2.0) - fi - fi - fi diff --git a/mozilla-jemalloc-526152.patch b/mozilla-jemalloc-526152.patch deleted file mode 100644 index 5f60485..0000000 --- a/mozilla-jemalloc-526152.patch +++ /dev/null @@ -1,32 +0,0 @@ -From: David Mandelin <dmandelin@mozilla.com> - -diff --git a/memory/jemalloc/jemalloc.c b/memory/jemalloc/jemalloc.c ---- a/memory/jemalloc/jemalloc.c -+++ b/memory/jemalloc/jemalloc.c -@@ -5792,24 +5792,24 @@ __attribute__((noinline)) - #else - inline - #endif - void * - memalign(size_t alignment, size_t size) - { - void *ret; - -- assert(((alignment - 1) & alignment) == 0 && alignment >= -- sizeof(void *)); -+ assert(((alignment - 1) & alignment) == 0); - - if (malloc_init()) { - ret = NULL; - goto RETURN; - } - -+ alignment = alignment < sizeof(void*) ? sizeof(void*) : alignment; - ret = ipalloc(alignment, size); - - RETURN: - #ifdef MALLOC_XMALLOC - if (opt_xmalloc && ret == NULL) { - _malloc_message(_getprogname(), - ": (malloc) Error in memalign(): out of memory\n", "", ""); - abort(); diff --git a/mozilla-jemalloc.patch b/mozilla-jemalloc.patch deleted file mode 100644 index aabd690..0000000 --- a/mozilla-jemalloc.patch +++ /dev/null @@ -1,24 +0,0 @@ -diff -r f1af606531f5 memory/jemalloc/jemalloc.h ---- a/memory/jemalloc/jemalloc.h Sat Nov 22 20:22:22 2008 +0100 -+++ b/memory/jemalloc/jemalloc.h Mon Dec 01 16:53:06 2008 -0500 -@@ -45,14 +45,14 @@ - } jemalloc_stats_t; - - #ifndef MOZ_MEMORY_DARWIN --void *malloc(size_t size); --void *valloc(size_t size); --void *calloc(size_t num, size_t size); --void *realloc(void *ptr, size_t size); --void free(void *ptr); -+void *malloc(size_t size) __THROW __attribute_malloc__ __wur; -+void *valloc(size_t size) __THROW __attribute_malloc__ __wur; -+void *calloc(size_t num, size_t size) __THROW __attribute_malloc__ __wur; -+void *realloc(void *ptr, size_t size) __THROW __attribute_malloc__ __wur; -+void free(void *ptr) __THROW __attribute_malloc__ __wur; - #endif - --int posix_memalign(void **memptr, size_t alignment, size_t size); -+int posix_memalign(void **memptr, size_t alignment, size_t size) __THROW __attribute_malloc__ __wur; - void *memalign(size_t alignment, size_t size); - size_t malloc_usable_size(const void *ptr); - void jemalloc_stats(jemalloc_stats_t *stats); diff --git a/mozilla-libjpeg-turbo.patch b/mozilla-libjpeg-turbo.patch deleted file mode 100644 index 0016a51..0000000 --- a/mozilla-libjpeg-turbo.patch +++ /dev/null @@ -1,54 +0,0 @@ -diff -up xulrunner-1.9.2.7/mozilla-1.9.2/modules/libpr0n/decoders/jpeg/nsJPEGDecoder.cpp.old xulrunner-1.9.2.7/mozilla-1.9.2/modules/libpr0n/decoders/jpeg/nsJPEGDecoder.cpp ---- xulrunner-1.9.2.7/mozilla-1.9.2/modules/libpr0n/decoders/jpeg/nsJPEGDecoder.cpp.old 2010-07-13 21:10:28.000000000 +0200 -+++ xulrunner-1.9.2.7/mozilla-1.9.2/modules/libpr0n/decoders/jpeg/nsJPEGDecoder.cpp 2010-07-22 12:33:21.000000000 +0200 -@@ -57,19 +57,6 @@ - - extern "C" { - #include "iccjpeg.h" -- --/* Colorspace conversion (copied from jpegint.h) */ --struct jpeg_color_deconverter { -- JMETHOD(void, start_pass, (j_decompress_ptr cinfo)); -- JMETHOD(void, color_convert, (j_decompress_ptr cinfo, -- JSAMPIMAGE input_buf, JDIMENSION input_row, -- JSAMPARRAY output_buf, int num_rows)); --}; -- --METHODDEF(void) --ycc_rgb_convert_argb (j_decompress_ptr cinfo, -- JSAMPIMAGE input_buf, JDIMENSION input_row, -- JSAMPARRAY output_buf, int num_rows); - } - - NS_IMPL_ISUPPORTS1(nsJPEGDecoder, imgIDecoder) -@@ -514,14 +501,6 @@ nsresult nsJPEGDecoder::ProcessData(cons - return NS_OK; /* I/O suspension */ - } - -- /* Force to use our YCbCr to Packed RGB converter when possible */ -- if (!mTransform && (gfxPlatform::GetCMSMode() == eCMSMode_Off) && -- mInfo.jpeg_color_space == JCS_YCbCr && mInfo.out_color_space == JCS_RGB) { -- /* Special case for the most common case: transform from YCbCr direct into packed ARGB */ -- mInfo.out_color_components = 4; /* Packed ARGB pixels are always 4 bytes...*/ -- mInfo.cconvert->color_convert = ycc_rgb_convert_argb; -- } -- - /* If this is a progressive JPEG ... */ - mState = mInfo.buffered_image ? JPEG_DECOMPRESS_PROGRESSIVE : JPEG_DECOMPRESS_SEQUENTIAL; - } -@@ -678,15 +657,6 @@ nsJPEGDecoder::OutputScanlines(PRBool* s - PRUint32 *imageRow = ((PRUint32*)mImageData) + - (mInfo.output_scanline * mInfo.output_width); - -- if (mInfo.cconvert->color_convert == ycc_rgb_convert_argb) { -- /* Special case: scanline will be directly converted into packed ARGB */ -- if (jpeg_read_scanlines(&mInfo, (JSAMPARRAY)&imageRow, 1) != 1) { -- *suspend = PR_TRUE; /* suspend */ -- break; -- } -- continue; /* all done for this row! */ -- } -- - JSAMPROW sampleRow = (JSAMPROW)imageRow; - if (mInfo.output_components == 3) { - /* Put the pixels at end of row to enable in-place expansion */ diff --git a/mozilla-malloc.patch b/mozilla-malloc.patch deleted file mode 100644 index ffb4e53..0000000 --- a/mozilla-malloc.patch +++ /dev/null @@ -1,12 +0,0 @@ -diff -up xulrunner-1.9.3.0/mozilla-central/memory/mozalloc/mozalloc.h.old xulrunner-1.9.3.0/mozilla-central/memory/mozalloc/mozalloc.h ---- xulrunner-1.9.3.0/mozilla-central/memory/mozalloc/mozalloc.h.old 2010-08-06 03:09:14.000000000 +0200 -+++ xulrunner-1.9.3.0/mozilla-central/memory/mozalloc/mozalloc.h 2010-08-17 11:15:40.000000000 +0200 -@@ -214,7 +214,7 @@ MOZALLOC_EXPORT void* moz_valloc(size_t - #define MOZALLOC_THROW_IF_HAS_EXCEPTIONS throw() - #endif - --#ifdef MOZ_CPP_EXCEPTIONS -+#if 1 - #define MOZALLOC_THROW_BAD_ALLOC throw(std::bad_alloc) - #else - #define MOZALLOC_THROW_BAD_ALLOC MOZALLOC_THROW_IF_HAS_EXCEPTIONS diff --git a/mozilla-notify.patch b/mozilla-notify.patch deleted file mode 100644 index 7c865de..0000000 --- a/mozilla-notify.patch +++ /dev/null @@ -1,40 +0,0 @@ -https://bugzilla.mozilla.org/show_bug.cgi?id=628222 - -# HG changeset patch -# User Priit Laes <plaes@plaes.org> -# Date 1295907218 -7200 -# Node ID ebfe5822e8916cce3d1811e67f6cb95ba3caeb24 -# Parent e874889e43d1b40f16c8234d53f39126a04e6621 -Add support for libnotify-0.7+ - -diff -r e874889e43d1 -r ebfe5822e891 toolkit/system/gnome/nsAlertsIconListener.cpp ---- a/toolkit/system/gnome/nsAlertsIconListener.cpp Fri Jan 21 16:45:23 2011 -0500 -+++ b/toolkit/system/gnome/nsAlertsIconListener.cpp Tue Jan 25 00:13:38 2011 +0200 -@@ -46,6 +46,11 @@ - - #include <gdk/gdk.h> - -+// Compatibility macro for <libnotify-0.7 -+#ifndef NOTIFY_CHECK_VERSION -+#define NOTIFY_CHECK_VERSION(x,y,z) 0 -+#endif -+ - static PRBool gHasActions = PR_FALSE; - - static void notify_action_cb(NotifyNotification *notification, -@@ -218,7 +223,13 @@ - { - mNotification = notify_notification_new(mAlertTitle.get(), - mAlertText.get(), -- NULL, NULL); -+ NULL -+// >=libnotify-0.7.0 has no support for attaching to widgets -+#if !NOTIFY_CHECK_VERSION(0,7,0) -+ , NULL -+#endif -+ ); -+ - if (!mNotification) - return NS_ERROR_OUT_OF_MEMORY; - - diff --git a/revert-562138.patch b/revert-562138.patch deleted file mode 100644 index cc97d00..0000000 --- a/revert-562138.patch +++ /dev/null @@ -1,290 +0,0 @@ -See https://bugzilla.mozilla.org/show_bug.cgi?id=562138#c8 - -# HG changeset patch -# User Markus Stange <mstange@themasta.com> -# Date 1296111298 -3600 -# Node ID 433f39574cd72d30e47e6500fad52a0398753367 -# Parent f948c56cb86f83354f0bd9d579cd51167464b4f2 -Backed out changeset f948c56cb86f (bug 562138 part 2) because it depends on changeset 44c42d8b8d08 which is going to be backed out. - -diff --git a/widget/src/cocoa/nsCocoaWindow.h b/widget/src/cocoa/nsCocoaWindow.h ---- a/widget/src/cocoa/nsCocoaWindow.h -+++ b/widget/src/cocoa/nsCocoaWindow.h -@@ -291,17 +291,16 @@ public: - NS_IMETHOD ResetInputState(); - - NS_IMETHOD BeginSecureKeyboardInput(); - NS_IMETHOD EndSecureKeyboardInput(); - - static void UnifiedShading(void* aInfo, const CGFloat* aIn, CGFloat* aOut); - - void SetPopupWindowLevel(); -- PRBool IsVisible(); - - PRBool IsChildInFailingLeftClickThrough(NSView *aChild); - PRBool ShouldFocusPlugin(); - - NS_IMETHOD ReparentNativeWidget(nsIWidget* aNewParent); - protected: - - nsresult CreateNativeWindow(const NSRect &aRect, -@@ -335,14 +334,13 @@ protected: - PRInt32 mShadowStyle; - NSUInteger mWindowFilter; - - PRPackedBool mWindowMadeHere; // true if we created the window, false for embedding - PRPackedBool mSheetNeedsShow; // if this is a sheet, are we waiting to be shown? - // this is used for sibling sheet contention only - PRPackedBool mFullScreen; - PRPackedBool mModal; -- PRPackedBool mIsShowing; // PR_TRUE during a Show(PR_TRUE) call. - - PRInt32 mNumModalDescendents; - }; - - #endif // nsCocoaWindow_h_ -diff --git a/widget/src/cocoa/nsCocoaWindow.mm b/widget/src/cocoa/nsCocoaWindow.mm ---- a/widget/src/cocoa/nsCocoaWindow.mm -+++ b/widget/src/cocoa/nsCocoaWindow.mm -@@ -143,17 +143,16 @@ nsCocoaWindow::nsCocoaWindow() - , mSheetWindowParent(nil) - , mPopupContentView(nil) - , mShadowStyle(NS_STYLE_WINDOW_SHADOW_DEFAULT) - , mWindowFilter(0) - , mWindowMadeHere(PR_FALSE) - , mSheetNeedsShow(PR_FALSE) - , mFullScreen(PR_FALSE) - , mModal(PR_FALSE) --, mIsShowing(PR_FALSE) - , mNumModalDescendents(0) - { - - } - - void nsCocoaWindow::DestroyNativeWindow() - { - NS_OBJC_BEGIN_TRY_ABORT_BLOCK; -@@ -528,30 +527,24 @@ void* nsCocoaWindow::GetNativeData(PRUin - break; - } - - return retVal; - - NS_OBJC_END_TRY_ABORT_BLOCK_NSNULL; - } - --PRBool --nsCocoaWindow::IsVisible() --{ -- NS_OBJC_BEGIN_TRY_ABORT_BLOCK_RETURN; -- -- return [mWindow isVisible] || mSheetNeedsShow || mIsShowing; -- -- NS_OBJC_END_TRY_ABORT_BLOCK_RETURN(PR_FALSE); --} -- - NS_IMETHODIMP nsCocoaWindow::IsVisible(PRBool & aState) - { -- aState = IsVisible(); -+ NS_OBJC_BEGIN_TRY_ABORT_BLOCK_NSRESULT; -+ -+ aState = ([mWindow isVisible] || mSheetNeedsShow); - return NS_OK; -+ -+ NS_OBJC_END_TRY_ABORT_BLOCK_NSRESULT; - } - - NS_IMETHODIMP nsCocoaWindow::SetModal(PRBool aState) - { - // This is used during startup (outside the event loop) when creating - // the add-ons compatibility checking dialog and the profile manager UI; - // therefore, it needs to provide an autorelease pool to avoid cocoa - // objects leaking. -@@ -626,42 +619,29 @@ NS_IMETHODIMP nsCocoaWindow::SetModal(PR - - // Hide or show this window - NS_IMETHODIMP nsCocoaWindow::Show(PRBool bState) - { - NS_OBJC_BEGIN_TRY_ABORT_BLOCK_NSRESULT; - - // We need to re-execute sometimes in order to bring already-visible - // windows forward. -- if (!bState && !IsVisible()) -+ if (!mSheetNeedsShow && !bState && ![mWindow isVisible]) - return NS_OK; - - nsIWidget* parentWidget = mParent; - nsCOMPtr<nsPIWidgetCocoa> piParentWidget(do_QueryInterface(parentWidget)); - NSWindow* nativeParentWindow = (parentWidget) ? - (NSWindow*)parentWidget->GetNativeData(NS_NATIVE_WINDOW) : nil; - - if (bState && !mBounds.IsEmpty()) { -- // IsVisible can be entered from inside this method, for example through -- // synchronous painting. Unfortunately, at that point [mWindow isVisible] -- // still returns NO, so we use mIsShowing to tell us that we should return -- // true from IsVisible anyway. -- mIsShowing = PR_TRUE; -- -- if (mPopupContentView) { -- // Ensure our content view is visible. We never need to hide it. -- mPopupContentView->Show(PR_TRUE); -- } -- - if (mWindowType == eWindowType_sheet) { - // bail if no parent window (its basically what we do in Carbon) -- if (!nativeParentWindow || !piParentWidget) { -- mIsShowing = PR_FALSE; -+ if (!nativeParentWindow || !piParentWidget) - return NS_ERROR_FAILURE; -- } - - NSWindow* topNonSheetWindow = nativeParentWindow; - - // If this sheet is the child of another sheet, hide the parent so that - // this sheet can be displayed. Leave the parent mSheetNeedsShow alone, - // that is only used to handle sibling sheet contention. The parent will - // return once there are no more child sheets. - PRBool parentIsSheet = PR_FALSE; -@@ -744,17 +724,16 @@ NS_IMETHODIMP nsCocoaWindow::Show(PRBool - } - else { - [mWindow setAcceptsMouseMovedEvents:YES]; - NS_OBJC_BEGIN_TRY_LOGONLY_BLOCK; - [mWindow makeKeyAndOrderFront:nil]; - NS_OBJC_END_TRY_LOGONLY_BLOCK; - SendSetZLevelEvent(); - } -- mIsShowing = PR_FALSE; - } - else { - // roll up any popups if a top-level window is going away - if (mWindowType == eWindowType_toplevel || mWindowType == eWindowType_dialog) - RollUpPopups(); - - // now get rid of the window/sheet - if (mWindowType == eWindowType_sheet) { -@@ -850,16 +829,19 @@ NS_IMETHODIMP nsCocoaWindow::Show(PRBool - if ([mWindow isKindOfClass:[PopupWindow class]] && - [(PopupWindow*) mWindow isContextMenu]) { - [[NSDistributedNotificationCenter defaultCenter] - postNotificationName:@"com.apple.HIToolbox.endMenuTrackingNotification" - object:@"org.mozilla.gecko.PopupWindow"]; - } - } - } -+ -+ if (mPopupContentView) -+ mPopupContentView->Show(bState); - - return NS_OK; - - NS_OBJC_END_TRY_ABORT_BLOCK_NSRESULT; - } - - struct ShadowParams { - float standardDeviation; - - -# HG changeset patch -# User Markus Stange <mstange@themasta.com> -# Date 1296111382 -3600 -# Node ID 2cfc443d28ee87835e17b665d41be3a6fb0dca23 -# Parent 44c42d8b8d087ed22c02ffe90f7d23f84ee8abbb -Backed out changeset 44c42d8b8d08 (bug 562138 part 1) because it caused bug 627824 and bug 628861. - -diff --git a/view/src/nsView.cpp b/view/src/nsView.cpp ---- a/view/src/nsView.cpp -+++ b/view/src/nsView.cpp -@@ -433,63 +433,51 @@ nsIntRect nsIView::CalcWidgetBounds(nsWi - void nsView::DoResetWidgetBounds(PRBool aMoveOnly, - PRBool aInvalidateChangedSize) { - // The geometry of a root view's widget is controlled externally, - // NOT by sizing or positioning the view - if (mViewManager->GetRootView() == this) { - return; - } - -- NS_PRECONDITION(mWindow, "Why was this called??"); -- - nsIntRect curBounds; - mWindow->GetBounds(curBounds); - - nsWindowType type; - mWindow->GetWindowType(type); - - if (curBounds.IsEmpty() && mDimBounds.IsEmpty() && type == eWindowType_popup) { - // Don't manipulate empty popup widgets. For example there's no point - // moving hidden comboboxes around, or doing X server roundtrips - // to compute their true screen position. This could mean that WidgetToScreen - // operations on these widgets don't return up-to-date values, but popup - // positions aren't reliable anyway because of correction to be on or off-screen. - return; - } - -+ NS_PRECONDITION(mWindow, "Why was this called??"); -+ - nsIntRect newBounds = CalcWidgetBounds(type); - - PRBool changedPos = curBounds.TopLeft() != newBounds.TopLeft(); - PRBool changedSize = curBounds.Size() != newBounds.Size(); - -- PRBool curVisibility; -- mWindow->IsVisible(curVisibility); -- PRBool newVisibility = IsEffectivelyVisible(); -- -- if (curVisibility && !newVisibility) { -- mWindow->Show(PR_FALSE); -- } -- - // Child views are never attached to top level widgets, this is safe. - if (changedPos) { - if (changedSize && !aMoveOnly) { - mWindow->Resize(newBounds.x, newBounds.y, newBounds.width, newBounds.height, - aInvalidateChangedSize); - } else { - mWindow->Move(newBounds.x, newBounds.y); - } - } else { - if (changedSize && !aMoveOnly) { - mWindow->Resize(newBounds.width, newBounds.height, aInvalidateChangedSize); - } // else do nothing! - } -- -- if (!curVisibility && newVisibility) { -- mWindow->Show(PR_TRUE); -- } - } - - void nsView::SetDimensions(const nsRect& aRect, PRBool aPaint, PRBool aResizeWidget) - { - nsRect dims = aRect; - dims.MoveBy(mPosX, mPosY); - - // Don't use nsRect's operator== here, since it returns true when -@@ -511,17 +499,23 @@ void nsView::NotifyEffectiveVisibilityCh - { - if (!aEffectivelyVisible) - { - DropMouseGrabbing(); - } - - if (nsnull != mWindow) - { -- ResetWidgetBounds(PR_FALSE, PR_TRUE, PR_FALSE); -+ if (aEffectivelyVisible) -+ { -+ DoResetWidgetBounds(PR_FALSE, PR_TRUE); -+ mWindow->Show(PR_TRUE); -+ } -+ else -+ mWindow->Show(PR_FALSE); - } - - for (nsView* child = mFirstChild; child; child = child->mNextSibling) { - if (child->mVis == nsViewVisibility_kHide) { - // It was effectively hidden and still is - continue; - } - // Our child is visible if we are - - diff --git a/wmclass.patch b/wmclass.patch deleted file mode 100644 index 5fe76ac..0000000 --- a/wmclass.patch +++ /dev/null @@ -1,29 +0,0 @@ -# -# Online Desktop expects WMCLASS to match the .desktop file -# Since renaming the .desktop file is bad, work around this here -# - -diff -up ./widget/src/gtk2/nsWindow.cpp.wmclass ./widget/src/gtk2/nsWindow.cpp ---- ./widget/src/gtk2/nsWindow.cpp.wmclass 2010-10-25 11:33:21.649433261 -0700 -+++ ./widget/src/gtk2/nsWindow.cpp 2010-10-25 11:36:19.864431870 -0700 -@@ -3738,6 +3738,10 @@ nsWindow::Create(nsIWidget *aPare - GetBrandName(brandName); - NS_ConvertUTF16toUTF8 cBrand(brandName); - -+ if (brandName.EqualsLiteral("Minefield")) { -+ cBrand.Assign("Firefox"); -+ } -+ - if (mWindowType == eWindowType_dialog) { - mShell = gtk_window_new(GTK_WINDOW_TOPLEVEL); - SetDefaultIcon(); -@@ -4109,6 +4113,9 @@ nsWindow::SetWindowClass(const nsAString - #ifdef MOZ_X11 - nsXPIDLString brandName; - GetBrandName(brandName); -+ if (brandName.EqualsLiteral("Minefield")) { -+ brandName.AssignLiteral("Firefox"); -+ } - - XClassHint *class_hint = XAllocClassHint(); - if (!class_hint) diff --git a/xulrunner-1.9.2.1-build.patch b/xulrunner-1.9.2.1-build.patch deleted file mode 100644 index 12f966b..0000000 --- a/xulrunner-1.9.2.1-build.patch +++ /dev/null @@ -1,12 +0,0 @@ -diff -up xulrunner-1.9.2.1/mozilla-1.9.2/layout/generic/nsFrame.h.old xulrunner-1.9.2.1/mozilla-1.9.2/layout/generic/nsFrame.h ---- xulrunner-1.9.2.1/mozilla-1.9.2/layout/generic/nsFrame.h.old 2009-11-11 15:34:51.000000000 +0100 -+++ xulrunner-1.9.2.1/mozilla-1.9.2/layout/generic/nsFrame.h 2009-11-11 15:33:09.000000000 +0100 -@@ -157,7 +157,7 @@ private: - // Left undefined; nsFrame objects are never allocated from the heap. - void* operator new(size_t sz) CPP_THROW_NEW; - --protected: -+public: - // Overridden to prevent the global delete from being called, since - // the memory came out of an arena instead of the heap. - // diff --git a/xulrunner-2.0-64bit-big-endian.patch b/xulrunner-2.0-64bit-big-endian.patch deleted file mode 100644 index 8cf3fc9..0000000 --- a/xulrunner-2.0-64bit-big-endian.patch +++ /dev/null @@ -1,13 +0,0 @@ -https://bugzilla.mozilla.org/show_bug.cgi?id=627664 - -diff -up xulrunner-2.0/mozilla-central/js/src/jsval.h.64bit-big-endian xulrunner-2.0/mozilla-central/js/src/jsval.h ---- xulrunner-2.0/mozilla-central/js/src/jsval.h.64bit-big-endian 2011-01-20 15:59:49.000000000 +0100 -+++ xulrunner-2.0/mozilla-central/js/src/jsval.h 2011-01-20 16:00:21.000000000 +0100 -@@ -347,6 +347,7 @@ typedef union jsval_layout - int32 i32; - uint32 u32; - JSWhyMagic why; -+ jsuword word; - } payload; - } s; - double asDouble; diff --git a/xulrunner-2.0-chromium-types.patch b/xulrunner-2.0-chromium-types.patch deleted file mode 100644 index 65dbc59..0000000 --- a/xulrunner-2.0-chromium-types.patch +++ /dev/null @@ -1,31 +0,0 @@ -https://bugzilla.mozilla.org/show_bug.cgi?id=627669 - -diff -up xulrunner-2.0/mozilla-central/gfx/ycbcr/chromium_types.h.chromium-types xulrunner-2.0/mozilla-central/gfx/ycbcr/chromium_types.h ---- xulrunner-2.0/mozilla-central/gfx/ycbcr/chromium_types.h.chromium-types 2010-11-04 21:05:47.000000000 +0100 -+++ xulrunner-2.0/mozilla-central/gfx/ycbcr/chromium_types.h 2010-11-15 14:20:12.000000000 +0100 -@@ -64,6 +64,10 @@ typedef PRInt16 int16; - #define ARCH_CPU_PPC_FAMILY 1 - #define ARCH_CPU_PPC 1 - #define ARCH_CPU_32_BITS 1 -+#elif defined(__ppc64__) -+#define ARCH_CPU_PPC_FAMILY 1 -+#define ARCH_CPU_PPC 1 -+#define ARCH_CPU_64_BITS 1 - #elif defined(__sparc) - #define ARCH_CPU_SPARC_FAMILY 1 - #define ARCH_CPU_SPARC 1 -@@ -72,6 +76,14 @@ typedef PRInt16 int16; - #define ARCH_CPU_SPARC_FAMILY 1 - #define ARCH_CPU_SPARC 1 - #define ARCH_CPU_64_BITS 1 -+#elif defined(__s390__) -+#define ARCH_CPU_S390_FAMILY 1 -+#define ARCH_CPU_S390 1 -+#define ARCH_CPU_32_BITS 1 -+#elif defined(__s390x__) -+#define ARCH_CPU_S390_FAMILY 1 -+#define ARCH_CPU_S390 1 -+#define ARCH_CPU_64_BITS 1 - #else - #warning Please add support for your architecture in chromium_types.h - #endif diff --git a/xulrunner-2.0-os2cc.patch b/xulrunner-2.0-os2cc.patch deleted file mode 100644 index c6c32a7..0000000 --- a/xulrunner-2.0-os2cc.patch +++ /dev/null @@ -1,14 +0,0 @@ -https://bugzilla.mozilla.org/show_bug.cgi?id=628252 - -diff --git a/gfx/ots/src/os2.cc b/gfx/ots/src/os2.cc ---- a/gfx/ots/src/os2.cc -+++ b/gfx/ots/src/os2.cc -@@ -3,4 +3,6 @@ - // found in the LICENSE file. - -+#include <stddef.h> -+ - #include "os2.h" - - - diff --git a/xulrunner-2.0-secondary-jit.patch b/xulrunner-2.0-secondary-jit.patch deleted file mode 100644 index 4656129..0000000 --- a/xulrunner-2.0-secondary-jit.patch +++ /dev/null @@ -1,14 +0,0 @@ -https://bugzilla.mozilla.org/show_bug.cgi?id=627668 - -diff -up xulrunner-2.0/mozilla-central/js/src/Makefile.in.big-endian-jit xulrunner-2.0/mozilla-central/js/src/Makefile.in ---- xulrunner-2.0/mozilla-central/js/src/Makefile.in.big-endian-jit 2010-11-04 21:05:48.000000000 +0100 -+++ xulrunner-2.0/mozilla-central/js/src/Makefile.in 2010-11-15 14:17:39.000000000 +0100 -@@ -371,7 +371,7 @@ CPPSRCS += checks.cc \ - # END enclude sources for V8 dtoa - ############################################# - --ifeq (,$(filter-out powerpc sparc,$(TARGET_CPU))) -+ifeq (,$(filter-out powerpc powerpc64 sparc sparc64 s390 s390x,$(TARGET_CPU))) - - VPATH += $(srcdir)/assembler \ - $(srcdir)/assembler/wtf \ diff --git a/xulrunner-2.0-system-cairo-tee.patch b/xulrunner-2.0-system-cairo-tee.patch deleted file mode 100644 index 85c8447..0000000 --- a/xulrunner-2.0-system-cairo-tee.patch +++ /dev/null @@ -1,29 +0,0 @@ -https://bugzilla.mozilla.org/show_bug.cgi?id=623797 - -# HG changeset patch -# User Jory A. Pratt (anarchy@gentoo.org) -# Parent b27366868c807e07a11741a7a2eb404ebc08e5e7 -Check to ensure system cairo has tee backend support, part 2 bug #623797 - -diff --git a/configure.in b/configure.in ---- a/configure.in -+++ b/configure.in -@@ -8714,16 +8714,17 @@ if test "$MOZ_TREE_CAIRO"; then - - CAIRO_FEATURES_H=gfx/cairo/cairo/src/cairo-features.h - mv -f $CAIRO_FEATURES_H "$CAIRO_FEATURES_H".orig 2> /dev/null - - else - PKG_CHECK_MODULES(CAIRO, cairo >= $CAIRO_VERSION pixman-1 freetype2 fontconfig) - MOZ_CAIRO_CFLAGS=$CAIRO_CFLAGS - MOZ_CAIRO_LIBS=$CAIRO_LIBS -+ PKG_CHECK_MODULES(CAIRO_TEE, cairo-tee >= $CAIRO_VERSION) - if test "$MOZ_X11"; then - PKG_CHECK_MODULES(CAIRO_XRENDER, cairo-xlib-xrender >= $CAIRO_VERSION) - MOZ_CAIRO_LIBS="$MOZ_CAIRO_LIBS $XLDFLAGS $CAIRO_XRENDER_LIBS" - MOZ_CAIRO_CFLAGS="$MOZ_CAIRO_CFLAGS $CAIRO_XRENDER_CFLAGS" - fi - fi - - AC_SUBST(MOZ_TREE_CAIRO) - diff --git a/xulrunner-2.0-system-cairo.patch b/xulrunner-2.0-system-cairo.patch deleted file mode 100644 index 5300f38..0000000 --- a/xulrunner-2.0-system-cairo.patch +++ /dev/null @@ -1,137 +0,0 @@ -https://bugzilla.mozilla.org/show_bug.cgi?id=623797 - -work around new features that are not avaliable in system-cairo on linux -(romaxa's original patch with modifications to use cairo-tee) - -diff --git a/config/system-headers b/config/system-headers ---- a/config/system-headers -+++ b/config/system-headers -@@ -81,16 +81,17 @@ pixman.h - cairo.h - cairo-atsui.h - cairo-beos.h - cairo-ft.h - cairo-glitz.h - cairo-os2.h - cairo-pdf.h - cairo-ps.h -+cairo-tee.h - cairo-quartz.h - cairo-win32.h - cairo-xlib.h - cairo-xlib-xrender.h - cairo-directfb.h - cairo-qpainter.h - #endif - dfiff.h -diff --git a/gfx/thebes/gfxASurface.cpp b/gfx/thebes/gfxASurface.cpp ---- a/gfx/thebes/gfxASurface.cpp -+++ b/gfx/thebes/gfxASurface.cpp -@@ -216,19 +216,21 @@ gfxASurface::Init(cairo_surface_t* surfa - - mSurface = surface; - mSurfaceValid = PR_TRUE; - - if (existingSurface) { - mFloatingRefs = 0; - } else { - mFloatingRefs = 1; -+#ifdef MOZ_TREE_CAIRO - if (cairo_surface_get_content(surface) != CAIRO_CONTENT_COLOR) { - cairo_surface_set_subpixel_antialiasing(surface, CAIRO_SUBPIXEL_ANTIALIASING_DISABLED); - } -+#endif - } - } - - gfxASurface::gfxSurfaceType - gfxASurface::GetType() const - { - if (!mSurfaceValid) - return (gfxSurfaceType)-1; -@@ -430,28 +432,34 @@ gfxASurface::FormatFromContent(gfxASurfa - default: - return ImageFormatRGB24; - } - } - - void - gfxASurface::SetSubpixelAntialiasingEnabled(PRBool aEnabled) - { -+#ifdef MOZ_TREE_CAIRO - if (!mSurfaceValid) - return; - cairo_surface_set_subpixel_antialiasing(mSurface, - aEnabled ? CAIRO_SUBPIXEL_ANTIALIASING_ENABLED : CAIRO_SUBPIXEL_ANTIALIASING_DISABLED); -+#endif - } - - PRBool - gfxASurface::GetSubpixelAntialiasingEnabled() - { - if (!mSurfaceValid) - return PR_FALSE; -+#ifdef MOZ_TREE_CAIRO - return cairo_surface_get_subpixel_antialiasing(mSurface) == CAIRO_SUBPIXEL_ANTIALIASING_ENABLED; -+#else -+ return PR_TRUE; -+#endif - } - - PRInt32 - gfxASurface::BytePerPixelFromFormat(gfxImageFormat format) - { - switch (format) { - case ImageFormatARGB32: - case ImageFormatRGB24: -diff --git a/gfx/thebes/gfxTeeSurface.cpp b/gfx/thebes/gfxTeeSurface.cpp ---- a/gfx/thebes/gfxTeeSurface.cpp -+++ b/gfx/thebes/gfxTeeSurface.cpp -@@ -32,17 +32,24 @@ - * and other provisions required by the GPL or the LGPL. If you do not delete - * the provisions above, a recipient may use your version of this file under - * the terms of any one of the MPL, the GPL or the LGPL. - * - * ***** END LICENSE BLOCK ***** */ - - #include "gfxTeeSurface.h" - -+/* Once cairo in tree is update ensure we remove the ifdef -+ and just include cairo-tee.h -+*/ -+#ifdef MOZ_TREE_CAIRO - #include "cairo.h" -+#else -+#include "cairo-tee.h" -+#endif - - gfxTeeSurface::gfxTeeSurface(cairo_surface_t *csurf) - { - Init(csurf, PR_TRUE); - } - - gfxTeeSurface::gfxTeeSurface(gfxASurface **aSurfaces, PRInt32 aSurfaceCount) - { -diff --git a/js/src/config/system-headers b/js/src/config/system-headers ---- a/js/src/config/system-headers -+++ b/js/src/config/system-headers -@@ -82,16 +82,17 @@ cairo.h - cairo-atsui.h - cairo-beos.h - cairo-ft.h - cairo-glitz.h - cairo-os2.h - cairo-pdf.h - cairo-ps.h - cairo-quartz.h -+cairo-tee.h - cairo-win32.h - cairo-xlib.h - cairo-xlib-xrender.h - cairo-directfb.h - cairo-qpainter.h - #endif - dfiff.h - exception - - |