diff --git a/MozillaFirefox.changes b/MozillaFirefox.changes index 7fdf47b..51d93ff 100644 --- a/MozillaFirefox.changes +++ b/MozillaFirefox.changes @@ -1,3 +1,21 @@ +------------------------------------------------------------------- +Thu Oct 3 08:40:05 UTC 2019 - Wolfgang Rosenauer + +- Mozilla Firefox 69.0.2 + * Fixed a crash when editing files on Office 365 websites (bmo#1579858) + * Fixed a Linux-only crash when changing the playback speed while + watching YouTube videos (bmo#1582222) +- updated supported locale list +- Allow to build without profile guided optimizations (boo#1040589) + (contributed by Bernhard Wiedemann) +- Make build verbose (contributed by Martin Liška) +- remove obsolete kde.js setting (boo#1151186) and related patch + firefox-add-kde.js-in-order-to-survive-PGO-build.patch +- update create-tar.sh to latest revision and adjusted tar_stamps +- add mozilla-fix-top-level-asm.patch to fix LTO build (w/o PGO) +- extension preferences moved from branding package to core package + (packaging but not branding specific) + ------------------------------------------------------------------- Thu Sep 19 13:31:16 UTC 2019 - Wolfgang Rosenauer diff --git a/MozillaFirefox.spec b/MozillaFirefox.spec index bd41d96..8ea8ec7 100644 --- a/MozillaFirefox.spec +++ b/MozillaFirefox.spec @@ -19,12 +19,12 @@ # changed with every update %define major 69 -%define mainver %major.0.1 -%define orig_version 69.0.1 +%define mainver %major.0.2 +%define orig_version 69.0.2 %define orig_suffix %{nil} %define update_channel release %define branding 1 -%define releasedate 20190917135527 +%define releasedate 20191001234643 %define source_prefix firefox-%{orig_version} # always build with GCC as SUSE Security Team requires that @@ -93,7 +93,9 @@ BuildRequires: startup-notification-devel BuildRequires: unzip BuildRequires: update-desktop-files BuildRequires: xorg-x11-libXt-devel +%if 0%{?do_profiling} BuildRequires: xvfb-run +%endif BuildRequires: yasm BuildRequires: zip %if 0%{?suse_version} < 1550 @@ -143,7 +145,6 @@ Source2: MozillaFirefox-rpmlintrc Source3: mozilla.sh.in Source4: tar_stamps Source5: source-stamp.txt -Source6: kde.js Source7: l10n-%{orig_version}%{orig_suffix}.tar.xz Source8: firefox-mimeinfo.xml Source9: firefox.js @@ -185,10 +186,10 @@ Patch20: mozilla-bmo1511604.patch Patch21: mozilla-bmo1554971.patch Patch22: mozilla-nestegg-big-endian.patch Patch23: mozilla-bmo1512162.patch +Patch24: mozilla-fix-top-level-asm.patch # Firefox/browser Patch101: firefox-kde.patch Patch102: firefox-branded-icons.patch -Patch103: firefox-add-kde.js-in-order-to-survive-PGO-build.patch %endif # only_print_mozconfig BuildRoot: %{_tmppath}/%{name}-%{version}-build Requires(post): coreutils shared-mime-info desktop-file-utils @@ -239,7 +240,7 @@ of %{appname}. %package translations-other Summary: Extra translations for %{appname} Group: System/Localization -Provides: locale(%{name}:ach;af;an;as;ast;az;bg;bn_BD;bn_IN;br;bs;cak;cy;dsb;en_ZA;eo;es_MX;et;eu;fa;ff;fy_NL;ga_IE;gd;gl;gn;gu_IN;he;hi_IN;hr;hsb;hy_AM;id;is;ka;kab;kk;km;kn;lij;lt;lv;mai;mk;ml;mr;ms;ne-NP;nn_NO;oc;or;pa_IN;rm;ro;si;sk;sl;son;sq;sr;ta;te;th;tr;uk;uz;vi;xh) +Provides: locale(%{name}:ach;af;an;ast;az;be;bg;bn;br;bs;cak;cy;dsb;en_CA;eo;es_MX;et;eu;fa;ff;fy_NL;ga_IE;gd;gl;gn;gu_IN;he;hi_IN;hr;hsb;hy_AM;ia;id;is;ka;kab;kk;km;kn;lij;lt;lv;mk;mr;ms;my;ne_NP;nn_NO;oc;pa_IN;rm;ro;si;sk;sl;son;sq;sr;ta;te;th;tr;uk;ur;uz;vi;xh) Requires: %{name} = %{version} Obsoletes: %{name}-translations < %{version}-%{release} @@ -321,10 +322,10 @@ cd $RPM_BUILD_DIR/%{source_prefix} %patch21 -p1 %patch22 -p1 %patch23 -p1 +%patch24 -p1 # Firefox %patch101 -p1 %patch102 -p1 -%patch103 -p1 %endif # only_print_mozconfig %build @@ -448,16 +449,18 @@ ac_add_options --with-arch=armv7-a ac_add_options --disable-webrtc %endif # mitigation/workaround for bmo#1512162 -%ifarch ppc64le s390x +%ifarch s390x ac_add_options --enable-optimize="-O1" %endif %ifarch x86_64 # LTO needs newer toolchain stack only (at least GCC 8.2.1 (r268506) %if 0%{?suse_version} > 1500 ac_add_options --enable-lto +%if 0%{?do_profiling} ac_add_options MOZ_PGO=1 %endif %endif +%endif EOF %if !%{with only_print_mozconfig} %ifarch ppc64 s390x s390 @@ -470,7 +473,10 @@ echo "Generate big endian version of config/external/icu/data/icud58l.dat" ls -l config/external/icu/data rm -f config/external/icu/data/icudt*l.dat %endif -xvfb-run --server-args="-screen 0 1920x1080x24" ./mach build +%if 0%{?do_profiling} +xvfb-run --server-args="-screen 0 1920x1080x24" \ +%endif +./mach build -v %endif # only_print_mozconfig %install @@ -493,7 +499,6 @@ mkdir -p %{buildroot}%{progdir}/browser/defaults/preferences/ # install gre prefs install -m 644 %{SOURCE13} %{buildroot}%{progdir}/defaults/pref/ # install browser prefs -install -m 644 %{SOURCE6} %{buildroot}%{progdir}/browser/defaults/preferences/kde.js install -m 644 %{SOURCE9} %{buildroot}%{progdir}/browser/defaults/preferences/firefox.js # build additional locales %if %localize diff --git a/_constraints b/_constraints index b933b77..bdf10b5 100644 --- a/_constraints +++ b/_constraints @@ -2,7 +2,7 @@ - 24 + 25 8 diff --git a/compare-locales.tar.xz b/compare-locales.tar.xz index 8e56815..d635f8c 100644 --- a/compare-locales.tar.xz +++ b/compare-locales.tar.xz @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:1148fcde00433ec348821c92abfac8b09228c6a803572871d27298ad792ae6dd +oid sha256:2f42de85651016a67446293fe1e4087f220581446d79202070a45756a710bcad size 28484 diff --git a/create-tar.sh b/create-tar.sh index 5a3cf37..59e28e7 100644 --- a/create-tar.sh +++ b/create-tar.sh @@ -1,9 +1,9 @@ #!/bin/bash function print_usage_and_exit() { - echo "Usage: create-tar.sh tar_stamp" + echo "Usage: create-tar.sh tar_stamps" echo "" - echo "Where tar_stamp should look like this:" + echo "Where tar_stamps should look like this:" echo "" cat << EOF # Node ID: 64ee63facd4ff96b3e8590cff559d7e97ac6b061 @@ -11,8 +11,7 @@ PRODUCT="firefox" # "firefox" or "thunderbird" CHANNEL="esr60" VERSION="60.7.0" VERSION_SUFFIX="esr" -FF_RELEASE_TAG="" # Needs only to be set if no tar-ball can be downloaded -TB_RELEASE_TAG="" # Only relevant for Thunderbird +RELEASE_TAG="" # Needs only to be set if no tar-ball can be downloaded PREV_VERSION="60.6.3" # Prev. version only needed for locales (leave empty to force l10n-generation) PREV_VERSION_SUFFIX="esr" #SKIP_LOCALES="" # Uncomment to skip l10n and compare-locales-generation @@ -25,7 +24,7 @@ if [ $# -ne 1 ]; then print_usage_and_exit fi -# Sourcing the given tar_stamp-file to have the variables available +# Sourcing the given tar_stamps-file to have the variables available source "$1" || print_usage_and_exit # Internal variables @@ -193,10 +192,19 @@ else echo "cloning new $BRANCH..." hg clone http://hg.mozilla.org/$BRANCH $PRODUCT-$VERSION if [ "$PRODUCT" = "thunderbird" ]; then - hg clone http://hg.mozilla.org/releases/comm-$CHANNEL thunderbird-$VERSION/comm + hg clone http://hg.mozilla.org/releases/comm-$CHANNEL $PRODUCT-$VERSION/comm fi fi pushd $PRODUCT-$VERSION || exit 1 + + # parse out the Firefox-release tag for this Thunderbird-checkout + if [ "$PRODUCT" = "thunderbird" ]; then + FF_RELEASE_TAG=$(grep ^GECKO_HEAD_REV ./comm/.gecko_rev.yml | awk -F ' ' '{print $2}') || exit 1 + echo "Parsed Firefox base ID from .gecko_rev.yml: $FF_RELEASE_TAG" + else + FF_RELEASE_TAG="$RELEASE_TAG" + fi + hg update --check $FF_RELEASE_TAG [ "$FF_RELEASE_TAG" == "default" ] || hg update -r $FF_RELEASE_TAG # get repo and source stamp @@ -207,7 +215,7 @@ else if [ "$PRODUCT" = "thunderbird" ]; then pushd comm || exit 1 - hg update --check $TB_RELEASE_TAG + hg update --check $RELEASE_TAG popd || exit 1 rm -rf thunderbird-${VERSION}/{,comm/}other-licenses/7zstub fi @@ -241,7 +249,7 @@ if [ $LOCALES_CHANGED -ne 0 ]; then else hg clone "http://hg.mozilla.org/l10n-central/$locale" "l10n/$locale" fi - [ "$FF_RELEASE_TAG" == "default" ] || hg -R "l10n/$locale" up -C -r "$changeset" + [ "$RELEASE_TAG" == "default" ] || hg -R "l10n/$locale" up -C -r "$changeset" ;; esac done diff --git a/firefox-69.0.1.source.tar.xz b/firefox-69.0.1.source.tar.xz deleted file mode 100644 index 643abad..0000000 --- a/firefox-69.0.1.source.tar.xz +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:f5f2f592b8296812d43244d6a50c0c57ad11a5324db8e4e79749545482b79033 -size 315516072 diff --git a/firefox-69.0.1.source.tar.xz.asc b/firefox-69.0.1.source.tar.xz.asc deleted file mode 100644 index 40de7a0..0000000 --- a/firefox-69.0.1.source.tar.xz.asc +++ /dev/null @@ -1,16 +0,0 @@ ------BEGIN PGP SIGNATURE----- - -iQIzBAABCgAdFiEECXsxMHeuYqAvhNpN8aZmj7t9Vy4FAl2BE0cACgkQ8aZmj7t9 -Vy5H9g//RRmnyOfuIid0bbFxqY3vOiPF4lxSXNzMSVAgGHk57dfopRwkVokHSfCz -JQTTnZbuSo7BbD55fSsdibWPX7KZ7bDtCT6WFpDUM0BxkWDsCCAKE2oG/NccsbKb -S45GZPGUIqBydB5mQ4hKqUKjUfy0Jjmn0O9hpHkbOyNYU347szGQK7BHoAcs+Edr -WrsIjmONDrzkMCGA+M37VfbIL92Kt/3glroxqVwMiByyfDPex6fmeydh6TyNdnUH -f6JyikL+1f7PwWIHfkvjPzJHy59jTPjqZF0M6JIXB4ZewGhg2OgANcVqbMMfPd14 -i+Ft6nc2Wy/iUANO220fbK8DOq5zj7GN/DnbYgq/xaPh4PxzQUEbjFAG/oNlfpOy -oJ0XesI+xxfy7J8pxSxfz2YHYHaCQU3tM66LcIghZOivPu9lzW1BtogYMCwCHfJk -0ferHxwdJH2957esHmLFlgmQ1fmRGi8yw9418vi32Ja9h52WY5QYCuqestkbZsbJ -CnORGVPZ7OUxfSir7+sFHdRq1mfyKaAGlKjXhCDdcdUhskPnmQ5LQOxFbzxOeRqu -ZK51Djpwz2j5u9PJwOfKD+AKMa+KO3I4H3W63yda3O63nbOX7wwClyjADOR9Nq5G -WoCN8NPkiFiq0QvNeqxsVQ3xVXVcwNAqTnfq+CL7uIFsxskVhdQ= -=B9XT ------END PGP SIGNATURE----- diff --git a/firefox-69.0.2.source.tar.xz b/firefox-69.0.2.source.tar.xz new file mode 100644 index 0000000..5f16622 --- /dev/null +++ b/firefox-69.0.2.source.tar.xz @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:2904ef954626d2a7f320670ccb7cb5d9060610f091c94190a6cbee14aa2cd82e +size 315308244 diff --git a/firefox-69.0.2.source.tar.xz.asc b/firefox-69.0.2.source.tar.xz.asc new file mode 100644 index 0000000..c95789a --- /dev/null +++ b/firefox-69.0.2.source.tar.xz.asc @@ -0,0 +1,16 @@ +-----BEGIN PGP SIGNATURE----- + +iQIzBAABCgAdFiEECXsxMHeuYqAvhNpN8aZmj7t9Vy4FAl2UzKEACgkQ8aZmj7t9 +Vy7uBQ//UYL6F2q8A3/R2xGPE0xwrCAUu56RkLtF/thDS7pxqUt9G9PAJyg+IDq1 +nsL1uD/pRngznQMUXVKJ+BKsmFUpiBrGv0aN440S07kiw3uXF52RiVNGAgz786kN +eECa3wHB/AmfeN8J3Xz5P9aI1L39mSKhxGqABbKOWFMnvjMoJdEMgrbY/4+jzBS2 +Hp68NSS+o2+iJ4JcGFgidHuBomqHQ2JEesn2pHzPriPxSKNrEkAw7w5K4UZezFd2 +Ereh3znfMNPapIFOy/95IdWyGn1POVPdtpyXOWiz3W8CGUlwMtRfqO2ki++XJJN8 +073wQHZRq1pcohZ+7CNRNGpuic5Hsid/d0O7B5Iu5TBGMQoCSA6LfZ18+x8GGaOV +2BbJxb6kmEFZ696YQa50elNx5QYJsEk6TVxQnbpmpTkxk6S2zguzvUkKbbKVoHnd +IZjgIQA9g8R47HwL/WsXJgosbyMERBDLLaNXpsuquCHsUYeH0wnfWcmpkm/o4Djy +DSx9Ag25C4y5Yg57E8+ggaz0cKzFpMYAcVX+2O9TU5JtfaWLklMf4u3oQVLtLiyC +s/S2ot9nrCo4F6QNCbbDaCFoeFKoZ7JdqVV0i32mER9+KEo14G1SOz9j1l7C4T4W +U3jsLeUAm47vt9hB7hiOsdma42b0Bijbni7D68SF+MKYnb1NCVo= +=FgGs +-----END PGP SIGNATURE----- diff --git a/firefox-add-kde.js-in-order-to-survive-PGO-build.patch b/firefox-add-kde.js-in-order-to-survive-PGO-build.patch deleted file mode 100644 index 7e66b01..0000000 --- a/firefox-add-kde.js-in-order-to-survive-PGO-build.patch +++ /dev/null @@ -1,34 +0,0 @@ -From 89767f5dd97e69d7e9189e5603647645818d27d6 Mon Sep 17 00:00:00 2001 -From: marxin -Date: Thu, 29 Nov 2018 10:07:29 +0100 -Subject: [PATCH 2/3] Add kde.js in order to survive PGO build. - ---- - browser/app/Makefile.in | 1 + - kde.js | 2 ++ - 2 files changed, 3 insertions(+) - create mode 100644 kde.js - -diff --git a/browser/app/Makefile.in b/browser/app/Makefile.in -index 4129aa43fb91..c9950895d520 100644 ---- a/browser/app/Makefile.in -+++ b/browser/app/Makefile.in -@@ -57,6 +57,7 @@ endif - libs:: $(srcdir)/profile/channel-prefs.js - $(NSINSTALL) -D $(DIST)/bin/defaults/pref - $(call py_action,preprocessor,-Fsubstitution $(PREF_PPFLAGS) $(ACDEFINES) $^ -o $(DIST)/bin/defaults/pref/channel-prefs.js) -+ cp $(topsrcdir)/kde.js $(DIST)/bin/defaults/pref/kde.js - - ifeq (cocoa,$(MOZ_WIDGET_TOOLKIT)) - -diff --git a/kde.js b/kde.js -new file mode 100644 -index 000000000000..b0d3e5d20437 ---- /dev/null -+++ b/kde.js -@@ -0,0 +1,2 @@ -+pref("browser.preferences.instantApply", false); -+pref("browser.backspace_action", 0); --- -2.19.1 - diff --git a/firefox-kde.patch b/firefox-kde.patch index 89a70ff..84627b6 100644 --- a/firefox-kde.patch +++ b/firefox-kde.patch @@ -327,25 +327,3 @@ new file mode 100644 +nsUnixShellServiceConstructor(nsISupports *aOuter, REFNSIID aIID, void **aResult); + +#endif // nsunixshellservice_h____ -diff --git a/browser/installer/package-manifest.in b/browser/installer/package-manifest.in ---- a/browser/installer/package-manifest.in -+++ b/browser/installer/package-manifest.in -@@ -295,16 +295,18 @@ - @RESPATH@/browser/defaults/settings/main - @RESPATH@/browser/defaults/settings/security-state - - ; Warning: changing the path to channel-prefs.js can cause bugs (Bug 756325) - ; Technically this is an app pref file, but we are keeping it in the original - ; gre location for now. - @RESPATH@/defaults/pref/channel-prefs.js - -+@RESPATH@/defaults/pref/kde.js -+ - ; Services (gre) prefs - @RESPATH@/defaults/pref/services-sync.js - - ; [Layout Engine Resources] - ; Style Sheets, Graphics and other Resources used by the layout engine. - @RESPATH@/res/EditorOverride.css - @RESPATH@/res/contenteditable.css - @RESPATH@/res/designmode.css diff --git a/firefox.js b/firefox.js index 64e74c6..3a71033 100644 --- a/firefox.js +++ b/firefox.js @@ -1,5 +1,7 @@ pref("intl.locale.requested", ""); -pref("browser.preferences.instantApply", true); pref("geo.wifi.uri", "https://location.services.mozilla.com/v1/geolocate?key=%MOZILLA_API_KEY%"); /* Disable DoH by default */ pref("network.trr.mode", 5); +// do not disable system-global or app-global extensions +pref("extensions.autoDisableScopes", 3); +pref("extensions.shownSelectionUI", true); diff --git a/kde.js b/kde.js deleted file mode 100644 index f06d73a..0000000 --- a/kde.js +++ /dev/null @@ -1 +0,0 @@ -pref("browser.preferences.instantApply", false); diff --git a/l10n-69.0.1.tar.xz b/l10n-69.0.1.tar.xz deleted file mode 100644 index 4af159e..0000000 --- a/l10n-69.0.1.tar.xz +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:bf33d3db5a8a06d6e9939bab27a767b14648bd866dae6b66569b7ea7e6257727 -size 49126104 diff --git a/l10n-69.0.2.tar.xz b/l10n-69.0.2.tar.xz new file mode 100644 index 0000000..1d3ad63 --- /dev/null +++ b/l10n-69.0.2.tar.xz @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:a65e010582c54eaf927343237dc42a156cf1f0f9e79509df246b3461b9eb3413 +size 49093672 diff --git a/mozilla-fix-top-level-asm.patch b/mozilla-fix-top-level-asm.patch new file mode 100644 index 0000000..37aad5f --- /dev/null +++ b/mozilla-fix-top-level-asm.patch @@ -0,0 +1,42 @@ +From 91bb79836ee274855393bdf6ab10e24899b1b349 Mon Sep 17 00:00:00 2001 +From: Martin Liska +Date: Fri, 17 May 2019 14:41:35 +0200 +Subject: [PATCH] Fix top-level asm issue. + +--- + security/sandbox/linux/moz.build | 5 ++++- + 1 file changed, 4 insertions(+), 1 deletion(-) + +diff --git a/security/sandbox/linux/moz.build b/security/sandbox/linux/moz.build +index aae85843e9f6..208368dfd189 100644 +--- a/security/sandbox/linux/moz.build ++++ b/security/sandbox/linux/moz.build +@@ -61,7 +61,6 @@ UNIFIED_SOURCES += [ + '../chromium/sandbox/linux/bpf_dsl/policy_compiler.cc', + '../chromium/sandbox/linux/bpf_dsl/syscall_set.cc', + '../chromium/sandbox/linux/seccomp-bpf/die.cc', +- '../chromium/sandbox/linux/seccomp-bpf/syscall.cc', + 'broker/SandboxBrokerCommon.cpp', + 'Sandbox.cpp', + 'SandboxBrokerClient.cpp', +@@ -77,6 +76,7 @@ UNIFIED_SOURCES += [ + SOURCES += [ + '../chromium/base/strings/safe_sprintf.cc', + '../chromium/base/third_party/icu/icu_utf.cc', ++ '../chromium/sandbox/linux/seccomp-bpf/syscall.cc', + '../chromium/sandbox/linux/seccomp-bpf/trap.cc', + '../chromium/sandbox/linux/services/syscall_wrappers.cc', + ] +@@ -96,6 +96,9 @@ if CONFIG['CC_TYPE'] in ('clang', 'gcc'): + SOURCES['../chromium/sandbox/linux/services/syscall_wrappers.cc'].flags += [ + '-Wno-empty-body', + ] ++ SOURCES['../chromium/sandbox/linux/seccomp-bpf/syscall.cc'].flags += [ ++ '-fno-lto' ++ ] + + # gcc lto likes to put the top level asm in syscall.cc in a different partition + # from the function using it which breaks the build. Work around that by +-- +2.23.0 + diff --git a/source-stamp.txt b/source-stamp.txt index 6eeed66..11968fa 100644 --- a/source-stamp.txt +++ b/source-stamp.txt @@ -1,2 +1,2 @@ -REV=bf6ea738ba073f1a70554799a749235136afc93a +REV=e40b66e55c283267a74ea411b9dfeeb7ddbb879c REPO=http://hg.mozilla.org/releases/mozilla-release diff --git a/tar_stamps b/tar_stamps index 0faff57..0c24d88 100644 --- a/tar_stamps +++ b/tar_stamps @@ -1,9 +1,8 @@ PRODUCT="firefox" CHANNEL="release" -VERSION="69.0.1" +VERSION="69.0.2" VERSION_SUFFIX="" -FF_RELEASE_TAG="bf6ea738ba073f1a70554799a749235136afc93a" -TB_RELEASE_TAG="" +RELEASE_TAG="e40b66e55c283267a74ea411b9dfeeb7ddbb879c" PREV_VERSION="" PREV_VERSION_SUFFIX="" #SKIP_LOCALES="" # Uncomment to skip l10n and compare-locales-generation