diff --git a/MozillaFirefox.changes b/MozillaFirefox.changes index 3997ed4..758772a 100644 --- a/MozillaFirefox.changes +++ b/MozillaFirefox.changes @@ -1,3 +1,30 @@ +------------------------------------------------------------------- +Wed May 23 08:49:09 UTC 2018 - guillaume.gardet@opensuse.org + +- Disable webrtc for aarch64 due to bmo#1434589 +- Add patch to fix skia build on AArch64: + * mozilla-fix-skia-aarch64.patch + +------------------------------------------------------------------- +Thu May 17 14:01:18 UTC 2018 - wr@rosenauer.org + +- update to Firefox 60.0.1 + * Avoid overly long cycle collector pauses with some add-ons installed + (bmo#1449033) + * After unckecking the "Sponsored Stories" option, the New Tab page + now immediately stops displaying "Sponsored content" cards (bmo#1458906) + * On touchscreen devices, fixed momentum scrolling on non-zoomable pages + (bmo#1457743) + * Use the right default background when opening tabs or windows in + high contrast mode (bmo#1458956) + * Restored translations of the Preferences panels when using a + language pack (bmo#1461590) + +------------------------------------------------------------------- +Mon May 14 13:37:38 UTC 2018 - pcerny@suse.com + +- parellelise locales building + ------------------------------------------------------------------- Mon May 7 08:32:28 UTC 2018 - wr@rosenauer.org diff --git a/MozillaFirefox.spec b/MozillaFirefox.spec index afd2af1..e972237 100644 --- a/MozillaFirefox.spec +++ b/MozillaFirefox.spec @@ -19,10 +19,10 @@ # changed with every update %define major 60 -%define mainver %major.0 +%define mainver %major.0.1 %define update_channel release %define branding 1 -%define releasedate 20180503143129 +%define releasedate 20180516032328 %define source_prefix firefox-%{mainver} # PIE, full relro (x86_64 for now) @@ -156,10 +156,10 @@ Patch8: mozilla-bmo256180.patch Patch9: mozilla-i586-DecoderDoctorLogger.patch Patch10: mozilla-i586-domPrefs.patch Patch11: mozilla-enable-csd.patch +Patch12: mozilla-fix-skia-aarch64.patch # Firefox/browser Patch101: firefox-kde.patch Patch102: firefox-branded-icons.patch - BuildRoot: %{_tmppath}/%{name}-%{version}-build Requires(post): coreutils shared-mime-info desktop-file-utils Requires(postun): shared-mime-info desktop-file-utils @@ -271,6 +271,7 @@ cd $RPM_BUILD_DIR/%{source_prefix} %patch10 -p1 %endif %patch11 -p1 +%patch12 -p1 # Firefox %patch101 -p1 %patch102 -p1 @@ -383,7 +384,7 @@ ac_add_options --with-arch=armv6 ac_add_options --with-arch=armv7-a %endif %endif -%ifarch %arm s390x +%ifarch aarch64 %arm s390x ac_add_options --disable-webrtc %endif EOF @@ -413,35 +414,31 @@ install -m 644 %{SOURCE6} %{buildroot}%{progdir}/browser/defaults/preferences/kd install -m 644 %{SOURCE9} %{buildroot}%{progdir}/browser/defaults/preferences/firefox.js # install additional locales %if %localize -rm -f %{_tmppath}/translations.* -touch %{_tmppath}/translations.{common,other} -for locale in $(cat $RPM_BUILD_DIR/%{source_prefix}/browser/locales/shipped-locales) ; do - case $locale in - ja-JP-mac|en-US|'') - ;; - *) - pushd $RPM_BUILD_DIR/compare-locales - PYTHONPATH=lib \ - scripts/compare-locales -m ../l10n-merged/$locale \ - ../%{source_prefix}/browser/locales/l10n.ini ../l10n $locale - popd - LOCALE_MERGEDIR=$RPM_BUILD_DIR/l10n-merged/$locale \ - make -C browser/locales langpack-$locale - cp -rL dist/xpi-stage/locale-$locale \ - %{buildroot}%{progdir}/browser/extensions/langpack-$locale@firefox.mozilla.org - # remove prefs, profile defaults, and hyphenation from langpack - rm -rf %{buildroot}%{progdir}/browser/extensions/langpack-$locale@firefox.mozilla.org/defaults - rm -rf %{buildroot}%{progdir}/browser/extensions/langpack-$locale@firefox.mozilla.org/hyphenation - # check against the fixed common list and sort into the right filelist - _matched=0 - for _match in ar ca cs da de en-GB el es-AR es-CL es-ES fi fr hu it ja ko nb-NO nl pl pt-BR pt-PT ru sv-SE zh-CN zh-TW; do - [ "$_match" = "$locale" ] && _matched=1 - done - [ $_matched -eq 1 ] && _l10ntarget=common || _l10ntarget=other - echo %{progdir}/browser/extensions/langpack-$locale@firefox.mozilla.org \ - >> %{_tmppath}/translations.$_l10ntarget - esac -done +truncate -s 0 %{_tmppath}/translations.{common,other} +sed -r '/^(ja-JP-mac|en-US|)$/d;s/ .*$//' $RPM_BUILD_DIR/%{source_prefix}/browser/locales/shipped-locales \ + | xargs -P 8 -n 1 -I {} /bin/sh -c ' + locale=$1 + pushd $RPM_BUILD_DIR/compare-locales + PYTHONPATH=lib \ + scripts/compare-locales -m ../l10n-merged/$locale \ + ../%{source_prefix}/browser/locales/l10n.ini ../l10n $locale + popd + LOCALE_MERGEDIR=$RPM_BUILD_DIR/l10n-merged/$locale \ + make -C browser/locales langpack-$locale + cp -rL dist/xpi-stage/locale-$locale \ + %{buildroot}%{progdir}/browser/extensions/langpack-$locale@firefox.mozilla.org + # remove prefs, profile defaults, and hyphenation from langpack + rm -rf %{buildroot}%{progdir}/browser/extensions/langpack-$locale@firefox.mozilla.org/defaults + rm -rf %{buildroot}%{progdir}/browser/extensions/langpack-$locale@firefox.mozilla.org/hyphenation + # check against the fixed common list and sort into the right filelist + _matched=0 + for _match in ar ca cs da de en-GB el es-AR es-CL es-ES fi fr hu it ja ko nb-NO nl pl pt-BR pt-PT ru sv-SE zh-CN zh-TW; do + [ "$_match" = "$locale" ] && _matched=1 + done + [ $_matched -eq 1 ] && _l10ntarget=common || _l10ntarget=other + echo %{progdir}/browser/extensions/langpack-$locale@firefox.mozilla.org \ + >> %{_tmppath}/translations.$_l10ntarget +' -- {} %endif # remove some executable permissions find %{buildroot}%{progdir} \ @@ -452,9 +449,10 @@ find %{buildroot}%{progdir} \ -name "*.dtd" -o \ -name "*.txt" -o \ -name "*.xml" -o \ - -name "*.css" | xargs chmod a-x + -name "*.css" \ + -exec chmod a-x {} + # remove mkdir.done files from installed base -find %{buildroot}%{progdir} -name ".mkdir.done" | xargs rm || : +find %{buildroot}%{progdir} -type f -name ".mkdir.done" -delete # overwrite the mozilla start-script and link it to /usr/bin mkdir --parents %{buildroot}/usr/bin sed "s:%%PREFIX:%{_prefix}:g diff --git a/create-tar.sh b/create-tar.sh index 0ac7713..e6c4481 100644 --- a/create-tar.sh +++ b/create-tar.sh @@ -7,8 +7,8 @@ CHANNEL="release" BRANCH="releases/mozilla-$CHANNEL" -RELEASE_TAG="ea4f3168c604994f051644b467aad92723448d12" -VERSION="60.0" +RELEASE_TAG="FIREFOX_60_0_1_RELEASE" +VERSION="60.0.1" # check required tools test -x /usr/bin/hg || ( echo "hg missing: execute zypper in mercurial"; exit 5 ) diff --git a/firefox-60.0.1.source.tar.xz b/firefox-60.0.1.source.tar.xz new file mode 100644 index 0000000..da42adf --- /dev/null +++ b/firefox-60.0.1.source.tar.xz @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:c8e621c7dfccbef14cce41a6847b83bee15b5276cd0c35771c3874e464e6a662 +size 267804748 diff --git a/firefox-60.0.1.source.tar.xz.asc b/firefox-60.0.1.source.tar.xz.asc new file mode 100644 index 0000000..7f096f6 --- /dev/null +++ b/firefox-60.0.1.source.tar.xz.asc @@ -0,0 +1,17 @@ +-----BEGIN PGP SIGNATURE----- +Version: GnuPG v2.0.14 (GNU/Linux) + +iQIcBAABCAAGBQJa+8WlAAoJELu+vbskxvNV+JAP/Awb2XYbSOgKOZapZ6+wa7W5 +RnnGiVL2OtaMm+2XJDcKrYYolw57OKb1vnpHrpgUkq1NQ3W8yknLnFMue0chY0Lk +gfOeyUGKK/mDPxvq1+qbuwkYnVvkRQNvvy7J33jqWLWc0sai1zI5djjounqsHstD +KL/alWqoBRux627m0QSGZ4+a5ex87aOKfYlMgCX0qI0j+h1Grx2P3BpN414At1jf +N4kI5vjAQSvPu8Xw7bwtbBrpctf2Ufwv8B9kcnM7018KxV3j8LukpceHYjApMY5D +ROCD09lYqnmhbv7hJN9wSYIG5EG0bCQ+bsw9TJdiCPwBSw0i0tAL6SkMUhLiuB8d +gau9Ed9QkSFBsu+a0M5Y61cwFWSm/HI9Ya2wvc3rYGn2njtrOhUFBWm7PAsiKM8P +bwZkB8+KTAu31dgeIC/uXRjOGuHkdK7+WU1HjbZhbGZIIn2zawJfdT3IJKk6hHIk +gDkcYKL0amnSFaoUXcvlLZfnEWcv+uEhGbGztE7ztA9Vo1IfLzXQtduGdn0F1fp/ +sZ/Q1N1liZkVwK0GtV4+GUxIs5d0XCTZ4tNPeQ82+ePbQjo7HavJBE8gTrbj06Ui +Q4gdxdhsyuKkF8iaDx0Ft92KhZKiLyGgP3vcb025wj8l58nBCNnn2j9UDyholuDL +Xs2b4IADNmSPjxHqRgNh +=m07A +-----END PGP SIGNATURE----- diff --git a/firefox-60.0.source.tar.xz b/firefox-60.0.source.tar.xz deleted file mode 100644 index fdeb131..0000000 --- a/firefox-60.0.source.tar.xz +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:4bc4fd997e6239f53e16a70b04f197791e5c5d09367e2916bcfe4a427999f842 -size 266717500 diff --git a/firefox-60.0.source.tar.xz.asc b/firefox-60.0.source.tar.xz.asc deleted file mode 100644 index ec8c83a..0000000 --- a/firefox-60.0.source.tar.xz.asc +++ /dev/null @@ -1,17 +0,0 @@ ------BEGIN PGP SIGNATURE----- -Version: GnuPG v2.0.14 (GNU/Linux) - -iQIcBAABCAAGBQJa60C4AAoJELu+vbskxvNVUDcQAJ1hl00Be6Gfm+Vmt/mD0RI/ -1iRV+2tESmzdeI4QPvzHw1H5lLbxkXi/LsOgT33jxtGVVWyS2XKhh598bQKF0AV9 -D1yVChoLjt5xIvb7Fo9qH3HdPPtJfff6t88Nj/Or+TbCjmUQQIzOPeUPwHG7YFoM -xYjdHIVTw5IYMJoAD7cbWTknQZcwNlhPG0MeT/M5nEfi311i5oR1ExSyk/W1EOCJ -C337uFt6DqrLm75eeYNYsKE9+PA2DMRrS5FUVVtTeAtGZelyiUjSzmKnbJShl5tt -kUnfz1xExdEAh837EtWJ2evX9f+xAqu1r2jZ3g/NO71LdFTbPJNcqlPqYhza5kw5 -s6IDWnB70pMviVVBXYWFwECZ9Jiz0+CQ9+qj2E4qNlUuq8AyJ7leW5K1dIsAcGQH -bAy57CT4Q/Q+3n1hOCBInWkQqhO9BxZ1JSk30obYDlmfE6QYoPYyvojyO3Z2aZ3G -K6CUOYs5kmBWNdD0HNhO2WUrffrXaMyNsvlicZQKpNR1GPZ3r8aznWgG1x1X7mIF -2IK4jcFvJlsi/sTqEZDyADHrTnruerWq330LXLXOLzmZC+/pkTmzMFaVqC3BOE4I -KbC2QsePQRge0nGpz7U099SW6wNy5zEcHKTfTGMqwQH3FkB0Ep9BVgoE+mUuWsIv -aZZGvCTjbDaGBHlHxkaA -=/KN9 ------END PGP SIGNATURE----- diff --git a/l10n-60.0.tar.xz b/l10n-60.0.1.tar.xz similarity index 100% rename from l10n-60.0.tar.xz rename to l10n-60.0.1.tar.xz diff --git a/mozilla-fix-skia-aarch64.patch b/mozilla-fix-skia-aarch64.patch new file mode 100644 index 0000000..cf649eb --- /dev/null +++ b/mozilla-fix-skia-aarch64.patch @@ -0,0 +1,20 @@ +--- firefox-60.0/gfx/skia/skia/src/jumper/SkJumper_stages.cpp.orig 2018-05-14 13:23:26.001095058 +0200 ++++ firefox-60.0/gfx/skia/skia/src/jumper/SkJumper_stages.cpp 2018-05-14 13:24:46.851416500 +0200 +@@ -666,7 +666,7 @@ SI F approx_powf(F x, F y) { + } + + SI F from_half(U16 h) { +-#if defined(__aarch64__) && !defined(SK_BUILD_FOR_GOOGLE3) // Temporary workaround for some Google3 builds. ++#if defined(JUMPER_IS_NEON) && defined(__aarch64__) && !defined(SK_BUILD_FOR_GOOGLE3) // Temporary workaround for some Google3 builds. + return vcvt_f32_f16(h); + + #elif defined(JUMPER_IS_HSW) || defined(JUMPER_IS_AVX512) +@@ -686,7 +686,7 @@ SI F from_half(U16 h) { + } + + SI U16 to_half(F f) { +-#if defined(__aarch64__) && !defined(SK_BUILD_FOR_GOOGLE3) // Temporary workaround for some Google3 builds. ++#if defined(JUMPER_IS_NEON) && defined(__aarch64__) && !defined(SK_BUILD_FOR_GOOGLE3) // Temporary workaround for some Google3 builds. + return vcvt_f16_f32(f); + + #elif defined(JUMPER_IS_HSW) || defined(JUMPER_IS_AVX512) diff --git a/source-stamp.txt b/source-stamp.txt index 85e8de0..350db75 100644 --- a/source-stamp.txt +++ b/source-stamp.txt @@ -1,2 +1,2 @@ -REV=ea4f3168c604 +REV=03d4f76300be REPO=http://hg.mozilla.org/releases/mozilla-release