diff --git a/.abf.yml b/.abf.yml index 3e73ff2..2788639 100644 --- a/.abf.yml +++ b/.abf.yml @@ -1,3 +1,3 @@ --- sources: - firefox-10.0.source.tar.bz2: cbf1fb0efe0a3a2b2dafaa324b136736e93de70c + firefox-10.0.2.source.tar.bz2: d9b459d915d4638a48b3e249fcbaf7cafc27e834 diff --git a/firefox-10.0-no_optimizarion_override.diff b/firefox-10.0-no_optimizarion_override.diff new file mode 100644 index 0000000..430f97f --- /dev/null +++ b/firefox-10.0-no_optimizarion_override.diff @@ -0,0 +1,22 @@ +--- configure.in 2012-01-29 10:24:22.000000000 +0000 ++++ configure.in.oden 2012-02-08 13:00:34.000000000 +0000 +@@ -2402,7 +2402,7 @@ + MOZ_OPTIMIZE_SIZE_TWEAK="-finline-limit=50" + esac + MOZ_PGO_OPTIMIZE_FLAGS="-O3" +- MOZ_OPTIMIZE_FLAGS="-Os -freorder-blocks $MOZ_OPTIMIZE_SIZE_TWEAK" ++ MOZ_OPTIMIZE_FLAGS="-O2 -freorder-blocks $MOZ_OPTIMIZE_SIZE_TWEAK" + MOZ_DEBUG_FLAGS="-g" + fi + +--- configure 2012-01-29 10:43:10.000000000 +0000 ++++ configure.oden 2012-02-08 13:10:01.000000000 +0000 +@@ -7516,7 +7516,7 @@ + MOZ_OPTIMIZE_SIZE_TWEAK="-finline-limit=50" + esac + MOZ_PGO_OPTIMIZE_FLAGS="-O3" +- MOZ_OPTIMIZE_FLAGS="-Os -freorder-blocks $MOZ_OPTIMIZE_SIZE_TWEAK" ++ MOZ_OPTIMIZE_FLAGS="-O2 -freorder-blocks $MOZ_OPTIMIZE_SIZE_TWEAK" + MOZ_DEBUG_FLAGS="-g" + fi + diff --git a/firefox.spec b/firefox.spec index 30a14a5..220b47a 100644 --- a/firefox.spec +++ b/firefox.spec @@ -1,5 +1,5 @@ %define major 10 -%define realver %{major}.0 +%define realver %{major}.0.2 # (tpg) MOZILLA_FIVE_HOME %define mozillalibdir %{_libdir}/%{name}-%{realver} @@ -8,11 +8,11 @@ %if %mandriva_branch == Cooker # Cooker -%define release 2 +%define release 1 %else # Old distros %define subrel 1 -%define release %mkrel 1 +%define release %mkrel 0 %endif # this seems fragile, so require the exact version or later (#58754) @@ -45,15 +45,15 @@ Patch41: mozilla-kde.patch # the default web browser" is used fix mdv bug#58784 Patch5: firefox-3.6.3-appname.patch Patch6: firefox-5.0-asciidel.patch +Patch7: firefox-10.0-no_optimizarion_override.diff BuildRequires: gtk+2-devel Requires: %{mklibname sqlite3_ 0} >= %{sqlite3_version} -BuildRequires: sqlite3-devel >= 3.7.1 Requires: %{nss_libname} >= 2:%{nss_version} BuildRequires: nspr-devel >= 2:4.8.8 BuildRequires: nss-devel >= 2:3.13.1 BuildRequires: nss-static-devel >= 2:3.13.1 BuildRequires: sqlite3-devel >= 3.7.7.1 -BuildRequires: libproxy-devel +BuildRequires: libproxy-devel >= 0.4.4 BuildRequires: libalsa-devel BuildRequires: libiw-devel BuildRequires: unzip @@ -67,7 +67,11 @@ BuildRequires: python BuildRequires: valgrind BuildRequires: rootcerts BuildRequires: doxygen +%if %mdkversion >= 201200 +BuildRequires: gnome-vfs2-devel +%else BuildRequires: libgnome-vfs2-devel +%endif BuildRequires: libgnome2-devel BuildRequires: libgnomeui2-devel BuildRequires: java-rpmbuild @@ -80,11 +84,15 @@ BuildRequires: cairo-devel >= 1.10 %endif BuildRequires: yasm >= 1.0.1 BuildRequires: mesagl-devel +BuildRequires: startup-notification-devel >= 0.8 Provides: webclient #Requires: indexhtml Requires: xdg-utils -%define ff_deps myspell-en_US nspluginwrapper -Suggests: %{ff_deps} +%if %mdkversion >= 201200 +# https://qa.mandriva.com/show_bug.cgi?id=65237 +Requires: gtk2-modules +%endif +Suggests: ff_deps myspell-en_US nspluginwrapper BuildRoot: %{_tmppath}/%{name}-%{version}-buildroot %description @@ -105,6 +113,8 @@ Files and macros mainly for building Firefox extensions. %patch2 -p1 -b .vendor %patch3 -p1 -b .defaultbrowser %patch6 -p1 -b .wintitle +%patch7 -p0 -b .no_optimizarion_override + ## KDE INTEGRATION # copy current files and patch them later to keep them in sync # %%patch4 -p1 -b .kde @@ -126,8 +136,8 @@ export MOZCONFIG=`pwd`/mozconfig cat << EOF > $MOZCONFIG mk_add_options MOZILLA_OFFICIAL=1 mk_add_options BUILD_OFFICIAL=1 -mk_add_options MOZ_MAKE_FLAGS="%{_smp_mflags}" -mk_add_options MOZ_OBJDIR=@TOPSRCDIR@/../obj +#mk_add_options MOZ_MAKE_FLAGS="%{_smp_mflags}" +mk_add_options MOZ_OBJDIR=@TOPSRCDIR@ ac_add_options --prefix="%{_prefix}" ac_add_options --libdir="%{_libdir}" ac_add_options --sysconfdir="%{_sysconfdir}" @@ -149,11 +159,10 @@ ac_add_options --with-system-bz2 ac_add_options --enable-system-sqlite ac_add_options --disable-installer ac_add_options --disable-updater +ac_add_options --with-pthreads ac_add_options --disable-tests ac_add_options --disable-debug -ac_add_options --disable-strip -#ac_add_options --enable-chrome-format=jar -#ac_add_options --enable-update-channel=beta +ac_add_options --enable-strip ac_add_options --enable-official-branding ac_add_options --enable-libproxy %if %mdkversion >= 201100 @@ -163,20 +172,46 @@ ac_add_options --disable-system-cairo %endif ac_add_options --with-distribution-id=com.mandriva ac_add_options --disable-crashreporter +ac_add_options --enable-optimize +ac_add_options --enable-startup-notification +ac_add_options --disable-cpp-exceptions EOF -make -f client.mk build +# Mozilla builds with -Wall with exception of a few warnings which show up +# everywhere in the code; so, don't override that. +# +# Disable C++ exceptions since Mozilla code is not exception-safe +# +MOZ_OPT_FLAGS=$(echo "$RPM_OPT_FLAGS" | sed -e 's/-Wall//' -e 's/-fexceptions/-fno-exceptions/g') +export CFLAGS="$MOZ_OPT_FLAGS" +export CXXFLAGS="$MOZ_OPT_FLAGS" +export PREFIX="%{_prefix}" +export LIBDIR="%{_libdir}" + +MOZ_SMP_FLAGS=-j1 +# On x86 architectures, Mozilla can build up to 4 jobs at once in parallel, +# however builds tend to fail on other arches when building in parallel. +%ifarch %{ix86} x86_64 +[ -z "$RPM_BUILD_NCPUS" ] && \ + RPM_BUILD_NCPUS="`/usr/bin/getconf _NPROCESSORS_ONLN`" +[ "$RPM_BUILD_NCPUS" -ge 2 ] && MOZ_SMP_FLAGS=-j2 +[ "$RPM_BUILD_NCPUS" -ge 4 ] && MOZ_SMP_FLAGS=-j4 +%endif + +export LDFLAGS="%{ldflags}" +make -f client.mk build STRIP="/bin/true" MOZ_MAKE_FLAGS="$MOZ_SMP_FLAGS" %install -make -C %{_builddir}/obj/browser/installer STRIP=/bin/true +%makeinstall_std STRIP=/bin/true -# Copy files to buildroot -%{__mkdir_p} %{buildroot}%{mozillalibdir} -cp -rf %{_builddir}/obj/dist/firefox/* %{buildroot}%{mozillalibdir} +%{__mkdir_p} %{buildroot}%{_bindir} +ln -snf %{mozillalibdir}/firefox %{buildroot}%{_bindir}/firefox -%{__mkdir_p} %{buildroot}%{_bindir} -ln -sf %{mozillalibdir}/firefox %{buildroot}%{_bindir}/firefox +# don't package two identical binaries +pushd %{buildroot}%{mozillalibdir} + ln -snf firefox-bin firefox +popd # Create an own %_libdir/mozilla/plugins %{__mkdir_p} %{buildroot}%{_libdir}/mozilla/plugins @@ -206,14 +241,13 @@ user_pref("browser.search.order.3","Google"); user_pref("browser.search.order.4","Yahoo"); user_pref("browser.EULA.override", true); user_pref("browser.shell.checkDefaultBrowser", false); -user_pref("browser.startup.homepage", "file:///usr/share/doc/HTML/index.html"); user_pref("browser.ctrlTab.previews", true); user_pref("browser.tabs.insertRelatedAfterCurrent", false); user_pref("app.update.auto", false); user_pref("app.update.enabled", false); user_pref("app.update.autoInstallEnabled", false); user_pref("security.ssl.require_safe_negotiation", false); -user_pref("browser.startup.homepage","file:///usr/share/doc/HTML/index.html"); +user_pref("browser.startup.homepage", "file:///usr/share/doc/HTML/index.html"); EOF # files in this directory are read on every startup, and can change/add @@ -227,8 +261,25 @@ EOF # or in toolkit/mozapps/extensions/AddonManager.jsm # we also need to disable the "disable addon selection dialog" cat << EOF > %{buildroot}%{mozillalibdir}/defaults/pref/mandriva.js -pref("extensions.autoDisableScopes", 0); +pref("app.update.auto", false); +pref("app.update.autoInstallEnabled", false); +pref("app.update.enabled", false); +pref("browser.backspace_action", 2); +pref("browser.ctrlTab.previews", true); +pref("browser.display.use_system_colors", true); +pref("browser.download.folderList", 1); +pref("browser.link.open_external", 3); +pref("browser.search.order.1","Ask.com"); +pref("browser.search.order.2","Exalead"); +pref("browser.search.order.3","Google"); +pref("browser.search.order.4","Yahoo"); +pref("browser.search.selectedEngine","Ask.com"); +pref("browser.shell.checkDefaultBrowser", false); +pref("browser.tabs.insertRelatedAfterCurrent", false); +pref("dom.ipc.plugins.enabled.nswrapper*", false); +pref("extensions.autoDisableScope", 0); pref("extensions.shownSelectionUI", true); +pref("network.manage-offline-status", true); EOF # search engines @@ -240,8 +291,6 @@ cp -f %{SOURCE8} %{buildroot}%{mozillalibdir}/searchplugins/askcom.xml sed -i 's/@DISTRO_VALUE@/ffx/' %{buildroot}%{mozillalibdir}/searchplugins/askcom.xml sed -i 's/@DISTRO_VALUE@//' %{buildroot}%{mozillalibdir}/searchplugins/exalead.xml -%find_lang %{name} - mkdir -p %{buildroot}%{_sys_macros_dir} cat <%{buildroot}%{_sys_macros_dir}/%{name}.macros # Macros from %{name} package @@ -253,6 +302,11 @@ cat <%{buildroot}%{_sys_macros_dir}/%{name}.macros %%firefox_extdir %%(if [ "%%_target_cpu" = "noarch" ]; then echo %%{_datadir}/mozilla/extensions/%%{firefox_appid}; else echo %%{_libdir}/mozilla/extensions/%%{firefox_appid}; fi) FIN +# the %%makeinstall_std macro also installs devel files that we don't need (yet?) +rm -rf %{buildroot}%{_includedir} +rm -rf %{buildroot}%{_libdir}/firefox-devel* +rm -rf %{buildroot}%{_datadir}/idl + %post unset DISPLAY if [ ! -r /etc/sysconfig/oem ]; then @@ -264,7 +318,7 @@ if [ ! -r /etc/sysconfig/oem ]; then ln -s -f ../../../../share/mdk/bookmarks/mozilla/$bookmark %{mozillalibdir}/defaults/profile/bookmarks.html fi -%files -f %{name}.lang +%files %{_bindir}/firefox %{_iconsdir}/hicolor/*/apps/*.png %{_datadir}/applications/*.desktop @@ -275,31 +329,88 @@ fi %files devel %{_sys_macros_dir}/%{name}.macros + %changelog +* Thu Feb 23 2012 Oden Eriksson 10.0.2-0.1mdv2010.2 +- 10.0.2 + +* Sun Feb 12 2012 Oden Eriksson 10.0.1-0.1 +- 10.0.1 + +* Fri Feb 10 2012 Oden Eriksson 10.0-0.5 +- built for updates + +* Fri Feb 10 2012 Oden Eriksson 10.0-3 ++ Revision: 772482 +- argh! the added gtk2-modules dependency was only for cooker + +* Wed Feb 08 2012 Oden Eriksson 10.0-2 ++ Revision: 771872 +- reverted the ghibo change, it has to be done with a patch otherwise it segfaults at build time +- we have to use STRIP="/bin/true" otherwise the debug package is empty +- fix deps +- fix #65237 (firefox and thunderbird show an empty printers list) + + + Giuseppe Ghibò + - Make gtk2-modules conditional (as package doesn't exists yet in 2010.2). + - remove STRIP=/bin/true from building command line (otherwise resulting RPM binaries are huge) + - adjust MOZ_OPTIMIZE_FLAGS, to use -O2 instead of mixing with internal -Os. + - enable startup-notification explicitely. + +* Sun Feb 05 2012 Oden Eriksson 10.0-1 ++ Revision: 771258 +- sync with MDVA-2012:007 + + + Giuseppe Ghibò + - enable strip (because of optimization) + - enable disable-cpp-exceptions. + - Added min version for libproxy-devel BuildRequires. + - Add full optimization (works also for firefox10 in 2010.2). + * Thu Feb 02 2012 Oden Eriksson 10.0-0.1 -- 10.0 ++ Revision: 770749 - disable the kde patches for now +- fix deps +- 10.0 +- rediffed P4 (kde patch) +- dropped P7 (fixed upstream) -* Tue Dec 27 2011 Oden Eriksson 9.0.1-0.1 -- 9.0.1 -- fix #64991 (Firefox and Thunderbird consider l10n plugins as third party) +* Fri Jan 13 2012 Oden Eriksson 9.0.1-1 ++ Revision: 760609 +- sync with MDVA-2011:096 -* Wed Dec 21 2011 Oden Eriksson 9.0-0.1 +* Wed Dec 21 2011 Oden Eriksson 9.0-1 ++ Revision: 744085 +- fix build - 9.0 - rediffed the kde patches (P4,P41) - use --with-system-libevent - use --with-system-libvpx -* Wed Nov 09 2011 Oden Eriksson 8.0-0.1 -- 8.0 -- use the patches from firefox-beta, cooker (gmoro) +* Tue Dec 20 2011 Per Øyvind Karlsen 8.0.1-2 ++ Revision: 744016 +- rebuild to get proper %%_sys_macros_dir -* Sat Oct 01 2011 Oden Eriksson 7.0.1-0.1 + + Zé + - clean BR + - firefox install dir needs to be owned to be uninstalled + +* Mon Nov 28 2011 Oden Eriksson 8.0.1-1 ++ Revision: 734973 +- stupid rpm5 +- duh! +- 8.0.1 + +* Wed Nov 09 2011 Oden Eriksson 8.0-1 ++ Revision: 729370 +- sync with what's soon shows up with MDVSA-2011:169 + +* Sat Oct 01 2011 Oden Eriksson 7.0.1-1 ++ Revision: 702204 +- stole the kde patches from mageia, which in turn stems from suse (thanks neoclust) - 7.0.1 -- use patches from mageia - -* Fri Sep 09 2011 Oden Eriksson 6.0.2-0.1 -- built for updates +- fix build +- rediff some patches * Wed Sep 07 2011 Oden Eriksson 6.0.2-1 + Revision: 698626