diff options
| -rw-r--r-- | firefox-dev.spec | 677 | ||||
| -rw-r--r-- | firefox4-build-del.patch | 11 | ||||
| -rw-r--r-- | firefox4-build-sbrk.patch | 24 | ||||
| -rw-r--r-- | firefox4-build-throw.patch | 12 | ||||
| -rw-r--r-- | firefox4-build.patch | 23 | ||||
| -rw-r--r-- | firefox4-jemalloc.patch | 22 | ||||
| -rw-r--r-- | firefox4-version.patch | 11 |
7 files changed, 780 insertions, 0 deletions
diff --git a/firefox-dev.spec b/firefox-dev.spec new file mode 100644 index 0000000..20d665e --- /dev/null +++ b/firefox-dev.spec @@ -0,0 +1,677 @@ +%define nspr_version 4.8 +%define nss_version 3.12.6 +%define cairo_version 1.8.8 +%define freetype_version 2.1.9 +%define lcms_version 1.18 +%define sqlite_version 3.6.23.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 b2 +%global firefox firefox +%global mycomment Beta 2 (build1) + +Summary: Mozilla Firefox Web browser +Name: firefox4 +Version: 4.0 +Release: 0.1.beta2.build1%{?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}-20100728.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: firefox4-version.patch +Patch1: firefox4-build.patch +Patch3: firefox4-jemalloc.patch +Patch4: mozilla-about-firefox-version.patch +Patch7: firefox4-build-del.patch +Patch8: mozilla-plugin.patch +Patch9: firefox4-build-sbrk.patch +Patch10: firefox4-build-throw.patch + +# build patches from firefox +Patch30: firefox-disable-checkupdates.patch +Patch31: firefox-default.patch + + +# Fedora specific patches +Patch20: mozilla-192-pkgconfig.patch + +# Upstream patches +Patch100: mozilla-ps-pdf-simplify-operators.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} >= 99 +BuildRequires: sqlite-devel >= %{sqlite_version} +%endif +%if %{fedora} >= 11 +BuildRequires: nspr-devel >= %{nspr_version} +BuildRequires: nss-devel >= %{nss_version} +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 + +%if %{fedora} >= 7 +Requires: system-bookmarks +%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 -p1 -b .del +#patch8 -p1 -b .plugin +%patch9 -p1 -b .sbrk +%patch10 -p1 -b .throw + +#patch20 -p1 -b .pk + +%patch30 -p1 -b .checkupdates +#patch31 -p2 -b .default + +#patch100 -p1 -b .ps-pdf-simplify-operators + +%{__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} >= 99 +ac_add_options --with-system-nspr +ac_add_options --enable-system-sqlite +%endif +%if %{fedora} >= 13 +%endif +%if %{fedora} >= 11 +ac_add_options --with-system-nss +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//' -e 's/-fexceptions/-fno-exceptions/') +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/%{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 %{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} <= 11 +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 +%attr(644, root, root) %{mozappdir}/components/browser.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 +# XXX See if these are needed still +%{mozappdir}/update* +%exclude %{mozappdir}/removed-files +%exclude %{_includedir}/firefox-%{internal_version} +%exclude %{_libdir}/firefox-devel-%{internal_version} +%exclude %{_datadir}/idl/firefox-%{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 +* 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/firefox4-build-del.patch b/firefox4-build-del.patch new file mode 100644 index 0000000..4659d48 --- /dev/null +++ b/firefox4-build-del.patch @@ -0,0 +1,11 @@ +--- mozilla-central/layout/generic/nsFrame.h.del 2010-07-28 08:52:27.638525808 +0200 ++++ mozilla-central/layout/generic/nsFrame.h 2010-07-28 08:52:33.404150969 +0200 +@@ -151,7 +151,7 @@ + // 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/firefox4-build-sbrk.patch b/firefox4-build-sbrk.patch new file mode 100644 index 0000000..7f7698e --- /dev/null +++ b/firefox4-build-sbrk.patch @@ -0,0 +1,24 @@ +diff -up mozilla-central/js/src/shell/js.cpp.sbrk mozilla-central/js/src/shell/js.cpp +--- mozilla-central/js/src/shell/js.cpp.sbrk 2010-07-21 02:52:15.000000000 +0200 ++++ mozilla-central/js/src/shell/js.cpp 2010-07-28 08:57:39.423150378 +0200 +@@ -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 mozilla-central/js/src/xpconnect/shell/xpcshell.cpp.sbrk mozilla-central/js/src/xpconnect/shell/xpcshell.cpp +--- mozilla-central/js/src/xpconnect/shell/xpcshell.cpp.sbrk 2010-07-21 02:52:20.000000000 +0200 ++++ mozilla-central/js/src/xpconnect/shell/xpcshell.cpp 2010-07-28 08:55:56.761535989 +0200 +@@ -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-throw.patch b/firefox4-build-throw.patch new file mode 100644 index 0000000..a25f7ef --- /dev/null +++ b/firefox4-build-throw.patch @@ -0,0 +1,12 @@ +diff -up mozilla-central/memory/mozalloc/mozalloc.h.throw mozilla-central/memory/mozalloc/mozalloc.h +--- mozilla-central/memory/mozalloc/mozalloc.h.throw 2010-07-28 09:25:12.596150733 +0200 ++++ mozilla-central/memory/mozalloc/mozalloc.h 2010-07-28 09:25:28.325150319 +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/firefox4-build.patch b/firefox4-build.patch new file mode 100644 index 0000000..92d28a4 --- /dev/null +++ b/firefox4-build.patch @@ -0,0 +1,23 @@ +diff -up mozilla-central/security/manager/Makefile.in.build mozilla-central/security/manager/Makefile.in +--- mozilla-central/security/manager/Makefile.in.build 2010-07-21 02:52:39.000000000 +0200 ++++ mozilla-central/security/manager/Makefile.in 2010-07-28 08:43:37.494150702 +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 mozilla-central/security/manager/ssl/src/Makefile.in.build mozilla-central/security/manager/ssl/src/Makefile.in +--- mozilla-central/security/manager/ssl/src/Makefile.in.build 2010-07-21 02:52:39.000000000 +0200 ++++ mozilla-central/security/manager/ssl/src/Makefile.in 2010-07-28 08:36:19.128540997 +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-jemalloc.patch b/firefox4-jemalloc.patch new file mode 100644 index 0000000..f11da2b --- /dev/null +++ b/firefox4-jemalloc.patch @@ -0,0 +1,22 @@ +diff -up mozilla-central/memory/jemalloc/jemalloc.h.jemalloc mozilla-central/memory/jemalloc/jemalloc.h +--- mozilla-central/memory/jemalloc/jemalloc.h.jemalloc 2010-07-21 02:52:33.000000000 +0200 ++++ mozilla-central/memory/jemalloc/jemalloc.h 2010-07-28 09:10:06.569525680 +0200 +@@ -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-version.patch b/firefox4-version.patch new file mode 100644 index 0000000..491c3b1 --- /dev/null +++ b/firefox4-version.patch @@ -0,0 +1,11 @@ +--- 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 |