summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
Diffstat
-rw-r--r--bench/f14-kraken.txt31
-rw-r--r--bench/f14-sunspider.txt53
-rw-r--r--bench/f14-v8.txt2
-rwxr-xr-xffxpi2
-rw-r--r--firefox-dev.spec43
-rw-r--r--firefox4-disable-checkupdates.patch9
-rw-r--r--xulrunner-2.0-64bit-big-endian.patch31
-rw-r--r--xulrunner-2.0-chromium-types.patch29
-rw-r--r--xulrunner-2.0-secondary-jit.patch12
9 files changed, 190 insertions, 22 deletions
diff --git a/bench/f14-kraken.txt b/bench/f14-kraken.txt
index a2cc6b1..d4ea8f5 100644
--- a/bench/f14-kraken.txt
+++ b/bench/f14-kraken.txt
@@ -7,8 +7,39 @@ Kraken JavaScript Benchmark Results
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
+=========================================================================================
+Mozilla/5.0 (X11; Linux x86_64; rv:2.0b8) Gecko/20100101 Firefox/4.0b8
+===============================================
+RESULTS (means and 95% confidence intervals)
+-----------------------------------------------
+Total: 9350.0ms +/- 3.4%
+-----------------------------------------------
+ ai: 1743.7ms +/- 8.5%
+ astar: 1743.7ms +/- 8.5%
+
+ audio: 3230.8ms +/- 5.3%
+ beat-detection: 980.4ms +/- 9.0%
+ dft: 824.4ms +/- 1.9%
+ fft: 681.7ms +/- 13.2%
+ oscillator: 744.3ms +/- 15.3%
+
+ imaging: 2550.8ms +/- 9.3%
+ gaussian-blur: 977.6ms +/- 14.6%
+ darkroom: 456.6ms +/- 9.3%
+ desaturate: 1116.6ms +/- 11.5%
+
+ json: 347.0ms +/- 11.5%
+ parse-financial: 203.3ms +/- 18.3%
+ stringify-tinderbox: 143.7ms +/- 14.4%
+
+ stanford: 1477.7ms +/- 5.4%
+ crypto-aes: 449.9ms +/- 7.7%
+ crypto-ccm: 247.9ms +/- 13.2%
+ crypto-pbkdf2: 527.4ms +/- 6.1%
+ crypto-sha256-iterative: 252.5ms +/- 8.6%
=========================================================================================
Mozilla/5.0 (X11; Linux x86_64; rv:2.0b7) Gecko/20100101 Firefox/4.0b7
===============================================
diff --git a/bench/f14-sunspider.txt b/bench/f14-sunspider.txt
index c3134e6..c3ab611 100644
--- a/bench/f14-sunspider.txt
+++ b/bench/f14-sunspider.txt
@@ -7,6 +7,59 @@ http://www2.webkit.org/perf/sunspider-0.9.1/sunspider-0.9.1/driver.html
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
+
+=========================================================================================
+Mozilla/5.0 (X11; Linux x86_64; rv:2.0b8) Gecko/20100101 Firefox/4.0b8
+============================================
+RESULTS (means and 95% confidence intervals)
+--------------------------------------------
+Total: 396.8ms +/- 6.7%
+--------------------------------------------
+
+ 3d: 64.5ms +/- 7.8%
+ cube: 26.7ms +/- 10.3%
+ morph: 10.1ms +/- 13.1%
+ raytrace: 27.7ms +/- 12.0%
+
+ access: 60.8ms +/- 10.7%
+ binary-trees: 7.7ms +/- 9.8%
+ fannkuch: 30.3ms +/- 12.5%
+ nbody: 9.0ms +/- 13.0%
+ nsieve: 13.8ms +/- 10.6%
+
+ bitops: 25.5ms +/- 9.1%
+ 3bit-bits-in-byte: 1.3ms +/- 26.6%
+ bits-in-byte: 14.6ms +/- 11.4%
+ bitwise-and: 2.9ms +/- 21.6%
+ nsieve-bits: 6.7ms +/- 13.4%
+
+ controlflow: 4.2ms +/- 15.6%
+ recursive: 4.2ms +/- 15.6%
+
+ crypto: 25.7ms +/- 8.6%
+ aes: 14.2ms +/- 11.3%
+ md5: 6.6ms +/- 12.7%
+ sha1: 4.9ms +/- 16.1%
+
+ date: 59.7ms +/- 27.9%
+ format-tofte: 30.2ms +/- 12.0%
+ format-xparb: 29.5ms +/- 58.6%
+
+ math: 38.2ms +/- 7.0%
+ cordic: 8.4ms +/- 14.6%
+ partial-sums: 19.4ms +/- 11.3%
+ spectral-norm: 10.4ms +/- 12.2%
+
+ regexp: 22.5ms +/- 10.4%
+ dna: 22.5ms +/- 10.4%
+
+ string: 95.7ms +/- 7.8%
+ base64: 6.3ms +/- 12.0%
+ fasta: 23.3ms +/- 10.1%
+ tagcloud: 26.2ms +/- 11.8%
+ unpack-code: 29.9ms +/- 11.6%
+ validate-input: 10.0ms +/- 4.8%
=========================================================================================
Mozilla/5.0 (X11; Linux x86_64; rv:2.0b7) Gecko/20100101 Firefox/4.0b7
diff --git a/bench/f14-v8.txt b/bench/f14-v8.txt
index 89807b9..7d5b4f8 100644
--- a/bench/f14-v8.txt
+++ b/bench/f14-v8.txt
@@ -7,4 +7,6 @@ http://v8.googlecode.com/svn/data/benchmarks/v6/run.html
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
+
diff --git a/ffxpi b/ffxpi
index 8fea6e0..f85151e 100755
--- a/ffxpi
+++ b/ffxpi
@@ -45,7 +45,7 @@ packxpi() {
echo Création de $1.xpi
mv $1.xpi /tmp
cd tmp/$1
- zip ../../$1.xpi install.rdf chrome/* chrome.manifest
+ zip ../../$1.xpi -r install.rdf chrome/* chrome.manifest
fi
}
donexpi() {
diff --git a/firefox-dev.spec b/firefox-dev.spec
index 304c958..4a8c3d9 100644
--- a/firefox-dev.spec
+++ b/firefox-dev.spec
@@ -23,14 +23,14 @@
%define nightly .cvs%{cvsdate}
%endif
-%global relcan b7
+%global relcan b8
%global firefox firefox
-%global mycomment Beta 7
+%global mycomment Beta 8 (Build1 candidate)
Summary: Mozilla Firefox Web browser
Name: firefox4
Version: 4.0
-Release: 0.12.beta7%{?dist}
+Release: 0.13.beta8.build1%{?dist}
URL: http://www.mozilla.org/projects/firefox/
License: MPLv1.1 or GPLv2+ or LGPLv2+
Group: Applications/Internet
@@ -43,7 +43,7 @@ Group: Applications/Internet
%endif
Source0: %{tarball}
%if %{build_langpacks}
-Source2: firefox-langpacks-%{version}%{?relcan}-20101111.tar.bz2
+Source2: firefox-langpacks-%{version}%{?relcan}-20101217.tar.bz2
%endif
Source12: firefox-redhat-default-prefs.js
# firefox3.destop without translation to allow change name
@@ -59,14 +59,15 @@ Source200: firefox-bookmarks.html
#Patch1: mozilla-build.patch
Patch1: firefox4-build.patch
Patch3: firefox4-jemalloc.patch
-# Patch4: mozilla-about-firefox-version.patch
Patch7: xulrunner-1.9.2.1-build.patch
Patch8: mozilla-plugin.patch
#Patch9: mozilla-build-sbrk.patch
Patch9: firefox4-build-sbrk.patch
-Patch10: mozilla-build-s390.patch
Patch11: mozilla-malloc.patch
-Patch12: firefox4-build-macos.patch
+#Patch12: firefox4-build-macos.patch
+Patch12: xulrunner-2.0-64bit-big-endian.patch
+Patch13: xulrunner-2.0-secondary-jit.patch
+Patch14: xulrunner-2.0-chromium-types.patch
# Fedora specific patches
Patch20: mozilla-193-pkgconfig.patch
@@ -80,7 +81,7 @@ Patch0: firefox4-version.patch
#Patch1: firefox4-jemalloc.patch = xulrunner / firefox4-jemalloc.patch
#Patch2: firefox4-build-throw.patch = xulrunner / mozilla-malloc.patch
-Patch30: firefox4-disable-checkupdates.patch
+#Patch30: firefox4-disable-checkupdates.patch
Patch31: firefox4-default.patch
@@ -209,15 +210,14 @@ sed -e 's/__RPM_VERSION_INTERNAL__/%{internal_version}/' %{P:%%PATCH0} \
# Build Patches
%patch1 -p2 -b .build
%patch3 -p1 -b .jemalloc
-#patch4 -p1 -b .about-firefox-version
%patch7 -p2 -b .del
#patch8 -p1 -b .plugin
%patch9 -p2 -b .sbrk
-%ifarch s390
-%patch10 -p1 -b .s390
-%endif
%patch11 -p2 -b .malloc
-%patch12 -p1 -b .macos
+#patch12 -p1 -b .macos
+%patch12 -p2 -b .64bit-big-endian
+%patch13 -p2 -b .secondary-jit
+%patch14 -p2 -b .chromium-types
%patch20 -p2 -b .pk
%if %{fedora} >= 14
@@ -229,7 +229,7 @@ sed -e 's/__RPM_VERSION_INTERNAL__/%{internal_version}/' %{P:%%PATCH0} \
%endif
%patch23 -p1 -b .wmclass
-%patch30 -p1 -b .checkupdates
+#%patch30 -p1 -b .checkupdates
%patch31 -p2 -b .default
%{__rm} -f .mozconfig
@@ -246,7 +246,7 @@ ac_add_options --libdir="\$LIBDIR"
ac_add_options --enable-system-sqlite
%endif
%if %{fedora} >= 12
-ac_add_options --with-system-nspr
+#ac_add_options --with-system-nspr
ac_add_options --with-system-nss
%endif
%if %{fedora} >= 11
@@ -292,6 +292,7 @@ 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-extensions=default,python/xpcom
%if %{official_branding}
ac_add_options --enable-official-branding
@@ -321,14 +322,14 @@ 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
+[ "$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"
+make -f client.mk build STRIP="/bin/true" MOZ_MAKE_FLAGS="$MOZ_SMP_FLAGS" MOZ_SERVICES_SYNC="1"
#---------------------------------------------------------------------
@@ -361,6 +362,11 @@ desktop-file-install --vendor mozilla \
-e 's,FIREFOX_RPM_VR,fc%{fedora},g' \
-e 's/Fedora/Remi/' > rh-default-prefs
+######## Strange ########
+unzip -o dist/firefox/omni.jar -d $RPM_BUILD_ROOT/%{mozappdir}
+rm -f $RPM_BUILD_ROOT/%{mozappdir}/omni.jar
+#########################
+
# 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
@@ -572,6 +578,9 @@ gtk-update-icon-cache %{_datadir}/icons/hicolor &>/dev/null || :
#---------------------------------------------------------------------
%changelog
+* 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)
diff --git a/firefox4-disable-checkupdates.patch b/firefox4-disable-checkupdates.patch
index 72b3200..e3b8c97 100644
--- a/firefox4-disable-checkupdates.patch
+++ b/firefox4-disable-checkupdates.patch
@@ -1,9 +1,10 @@
---- mozilla-central/browser/base/content/utilityOverlay.js.checkupdates 2010-11-04 21:05:17.000000000 +0100
-+++ mozilla-central/browser/base/content/utilityOverlay.js 2010-11-06 10:49:40.172670752 +0100
-@@ -525,7 +525,7 @@
-
+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);
diff --git a/xulrunner-2.0-64bit-big-endian.patch b/xulrunner-2.0-64bit-big-endian.patch
new file mode 100644
index 0000000..d1d63e8
--- /dev/null
+++ b/xulrunner-2.0-64bit-big-endian.patch
@@ -0,0 +1,31 @@
+diff -up xulrunner-2.0/mozilla-central/js/src/jsval.h.s390 xulrunner-2.0/mozilla-central/js/src/jsval.h
+--- xulrunner-2.0/mozilla-central/js/src/jsval.h.s390 2010-11-15 10:43:49.000000000 +0100
++++ xulrunner-2.0/mozilla-central/js/src/jsval.h 2010-11-15 10:45:41.000000000 +0100
+@@ -331,6 +331,27 @@ typedef union jsval_layout
+ double asDouble;
+ void *asPtr;
+ } jsval_layout;
++# elif JS_BITS_PER_WORD == 64
++typedef union jsval_layout
++{
++ uint64 asBits;
++#ifndef _WIN64
++ /* MSVC does not pack these correctly :-( */
++ struct {
++ uint64 payload47 : 47;
++ JSValueTag tag : 17;
++ } debugView;
++#endif
++ struct {
++ union {
++ int32 i32;
++ uint32 u32;
++ JSWhyMagic why;
++ } payload;
++ } s;
++ double asDouble;
++ void *asPtr;
++} jsval_layout;
+ # endif /* JS_BITS_PER_WORD */
+ #endif /* defined(IS_LITTLE_ENDIAN) */
+
diff --git a/xulrunner-2.0-chromium-types.patch b/xulrunner-2.0-chromium-types.patch
new file mode 100644
index 0000000..0ac65d6
--- /dev/null
+++ b/xulrunner-2.0-chromium-types.patch
@@ -0,0 +1,29 @@
+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-secondary-jit.patch b/xulrunner-2.0-secondary-jit.patch
new file mode 100644
index 0000000..54ab913
--- /dev/null
+++ b/xulrunner-2.0-secondary-jit.patch
@@ -0,0 +1,12 @@
+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 \
generated by cgit (git 2.34.1) at 2025-11-04 10:57:04 +0000