diff --git a/.abf.yml b/.abf.yml index 7a01b38..5b3aabd 100644 --- a/.abf.yml +++ b/.abf.yml @@ -1,3 +1,3 @@ --- sources: - firefox-13.0.1.source.tar.bz2: 3752f13f26a51dd2e42d2805a707a842e6f8d1b1 + firefox-14.0.1.source.tar.bz2: 8c835836f3c415964b07653364c0c26284ba280b diff --git a/firefox-13.0-nspr_header_fix.diff b/firefox-13.0-nspr_header_fix.diff deleted file mode 100644 index 04a5a9e..0000000 --- a/firefox-13.0-nspr_header_fix.diff +++ /dev/null @@ -1,11 +0,0 @@ ---- hal/sandbox/PHal.ipdl 2012-06-01 12:04:00.000000000 +0000 -+++ hal/sandbox/PHal.ipdl.oden 2012-06-08 09:42:57.000000000 +0000 -@@ -39,7 +39,7 @@ - - include protocol PContent; - include protocol PBrowser; --include "nspr/prtime.h"; -+include "prtime.h"; - include "mozilla/HalSensor.h"; - include "mozilla/HalTypes.h"; - diff --git a/firefox.desktop b/firefox.desktop index b7fc67b..deebc82 100644 --- a/firefox.desktop +++ b/firefox.desktop @@ -149,5 +149,5 @@ Icon=firefox Terminal=false Type=Application StartupWMClass=Firefox -MimeType=text/html;text/xml;application/xhtml+xml;application/xml;application/rss+xml;application/rdf+xml; +MimeType=text/html;text/xml;application/xhtml+xml;application/vnd.mozilla.xul+xml;text/mml;x-scheme-handler/http;x-scheme-handler/https; Categories=GTK;Network;WebBrowser;X-MandrivaLinux-Internet-WebBrowsers;X-MandrivaLinux-CrossDesktop; diff --git a/firefox.spec b/firefox.spec index b7d711e..3e3119d 100644 --- a/firefox.spec +++ b/firefox.spec @@ -1,4 +1,4 @@ -%define major 13 +%define major 14 %define realver %{major}.0.1 # (tpg) MOZILLA_FIVE_HOME @@ -46,7 +46,6 @@ Patch41: mozilla-kde.patch Patch5: firefox-3.6.3-appname.patch Patch6: firefox-5.0-asciidel.patch Patch7: firefox-10.0-no_optimizarion_override.diff -Patch9: firefox-13.0-nspr_header_fix.diff Patch10: firefox-13-fix-cairo-build.patch BuildRequires: gtk+2-devel Requires: %{mklibname sqlite3_ 0} >= %{sqlite3_version} @@ -121,9 +120,9 @@ Files and macros mainly for building Firefox extensions. %if %mdkversion < 201200 # the bundled libvpx is 0.9.2 + mozilla patches. this is fixed in 0.9.7 perl -pi -e "s|VPX_CODEC_USE_INPUT_FRAGMENTS|VPX_CODEC_USE_INPUT_PARTITION|g" configure* +perl -pi -e "s|vpx >= 1.0.0|vpx >= 0.9.7|g" configure* %endif -%patch9 -p0 %patch10 -p1 ## KDE INTEGRATION @@ -218,16 +217,16 @@ export LDFLAGS="%{ldflags}" make -f client.mk clean %ifarch i686 -make -f client.mk build STRIP="/bin/true" MOZ_MAKE_FLAGS="$MOZ_SMP_FLAGS" MOZ_OPTIMIZE_FLAGS="-O3" +make -f client.mk build STRIP="/bin/true" MOZ_MAKE_FLAGS="$MOZ_SMP_FLAGS" MOZ_OPTIMIZE_FLAGS="-O3" MOZ_PKG_FATAL_WARNINGS=0 %else -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_PKG_FATAL_WARNINGS=0 %endif %install %if %mdkversion <= 201020 -%makeinstall_std -C objdir STRIP=/bin/strip +%makeinstall_std -C objdir STRIP=/bin/strip MOZ_PKG_FATAL_WARNINGS=0 %else -%makeinstall_std -C objdir STRIP=/bin/true +%makeinstall_std -C objdir STRIP=/bin/true MOZ_PKG_FATAL_WARNINGS=0 %endif %{__mkdir_p} %{buildroot}%{_bindir} @@ -356,6 +355,16 @@ fi %changelog +* Tue Jul 24 2012 Oden Eriksson 14.0.1-1 ++ Revision: 810865 +- re-add the cairo patch +- drop 2 patches +- 14.0.1 + +* Thu Jul 12 2012 Guilherme Moro 13.0.1-2 ++ Revision: 809075 ++ rebuild (emptylog) + * Tue Jun 19 2012 Oden Eriksson 13.0.1-1 + Revision: 806173 - 13.0.1