# HG changeset patch # User Wolfgang Rosenauer # Date 1571574355 -7200 # Node ID 97a6da6d7e29e98b25eec2e82f29274b2bbb8185 # Parent 9e4b30f05706305f579da25f8bc54b0715305dd4 Firefox 69.0.3 diff -r 9e4b30f05706 -r 97a6da6d7e29 MozillaFirefox/MozillaFirefox.changes --- a/MozillaFirefox/MozillaFirefox.changes Fri Sep 20 14:10:22 2019 +0200 +++ b/MozillaFirefox/MozillaFirefox.changes Sun Oct 20 14:25:55 2019 +0200 @@ -1,4 +1,30 @@ ------------------------------------------------------------------- +Sun Oct 13 08:58:12 UTC 2019 - Wolfgang Rosenauer + +- Mozilla Firefox 69.0.3 + * Fixed Yahoo mail users being prompted to download files when + clicking on emails (bmo#1582848) +- devel package build can easily be disabled now + +------------------------------------------------------------------- +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 - Mozilla Firefox 69.0.1 diff -r 9e4b30f05706 -r 97a6da6d7e29 MozillaFirefox/MozillaFirefox.spec --- a/MozillaFirefox/MozillaFirefox.spec Fri Sep 20 14:10:22 2019 +0200 +++ b/MozillaFirefox/MozillaFirefox.spec Sun Oct 20 14:25:55 2019 +0200 @@ -19,13 +19,13 @@ # changed with every update %define major 69 -%define mainver %major.0.1 -%define orig_version 69.0.1 +%define mainver %major.0.3 +%define orig_version 69.0.3 %define orig_suffix %{nil} %define update_channel release %define branding 1 -%define releasedate 20190917135527 -%define source_prefix firefox-%{orig_version} +%define devpkg 1 +%define releasedate 20191009172106 # always build with GCC as SUSE Security Team requires that %define clang_build 0 @@ -45,6 +45,7 @@ # general build definitions %define progname firefox %define pkgname MozillaFirefox +%define srcname firefox %define appname Firefox %define progdir %{_prefix}/%_lib/%{progname} %define gnome_dir %{_prefix} @@ -93,7 +94,9 @@ 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 @@ -137,13 +140,12 @@ Group: Productivity/Networking/Web/Browsers Url: http://www.mozilla.org/ %if !%{with only_print_mozconfig} -Source: http://ftp.mozilla.org/pub/%{progname}/releases/%{version}%{orig_suffix}/source/firefox-%{orig_version}%{orig_suffix}.source.tar.xz +Source: http://ftp.mozilla.org/pub/%{srcname}/releases/%{version}%{orig_suffix}/source/%{srcname}-%{orig_version}%{orig_suffix}.source.tar.xz Source1: MozillaFirefox.desktop 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 @@ -153,14 +155,14 @@ Source13: spellcheck.js Source14: https://github.com/openSUSE/firefox-scripts/raw/master/create-tar.sh Source15: firefox-appdata.xml -Source16: MozillaFirefox.changes +Source16: %{name}.changes # Set up API keys, see http://www.chromium.org/developers/how-tos/api-keys # Note: these are for the openSUSE Firefox builds ONLY. For your own distribution, # please get your own set of keys. Source18: mozilla-api-key Source19: google-api-key -Source20: https://ftp.mozilla.org/pub/%{progname}/releases/%{version}%{orig_suffix}/source/%{progname}-%{orig_version}%{orig_suffix}.source.tar.xz.asc -Source21: https://ftp.mozilla.org/pub/%{progname}/releases/%{version}%{orig_suffix}/KEY#/mozilla.keyring +Source20: https://ftp.mozilla.org/pub/%{srcname}/releases/%{version}%{orig_suffix}/source/%{srcname}-%{orig_version}%{orig_suffix}.source.tar.xz.asc +Source21: https://ftp.mozilla.org/pub/%{srcname}/releases/%{version}%{orig_suffix}/KEY#/mozilla.keyring # Gecko/Toolkit Patch1: mozilla-nongnome-proxies.patch Patch2: mozilla-kde.patch @@ -185,23 +187,24 @@ 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 Requires(postun): shared-mime-info desktop-file-utils -%if %branding -Requires: %{name}-branding > 44.0 -%endif +Requires: %{name}-branding >= 68 Requires: mozilla-nspr >= %(rpm -q --queryformat '%%{VERSION}' mozilla-nspr) Requires: mozilla-nss >= %(rpm -q --queryformat '%%{VERSION}' mozilla-nss) Recommends: libcanberra0 Recommends: libpulse0 # addon leads to startup crash (bnc#908892) Obsoletes: tracker-miner-firefox < 0.15 +%if 0%{?devpkg} == 0 +Obsoletes: %{name}-devel < %{version} +%endif # libproxy's mozjs pacrunner crashes FF (bnc#759123) %if 0%{?suse_version} < 1220 Obsoletes: libproxy1-pacrunner-mozjs <= 0.4.7 @@ -213,6 +216,7 @@ compliance and performance. Its functionality can be enhanced via a plethora of extensions. +%if 0%{?devpkg} %package devel Summary: Devel package for %{appname} Group: Development/Tools/Other @@ -223,6 +227,7 @@ %description devel Development files for %{appname} to make packaging of addons easier. +%endif %if %localize %package translations-common @@ -239,7 +244,7 @@ %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} @@ -248,7 +253,6 @@ of %{appname}. %endif -%if %branding %package branding-upstream Summary: Upstream branding for %{appname} Group: Productivity/Networking/Web/Browsers @@ -267,7 +271,6 @@ %description branding-upstream This package provides upstream look and feel for %{appname}. -%endif %if %crashreporter %package buildsymbols @@ -291,11 +294,11 @@ exit 1 fi -%setup -q -n %{source_prefix} -b 7 -b 10 +%setup -q -n %{srcname}-%{orig_version} -b 7 -b 10 %else -%setup -q -n %{source_prefix} +%setup -q -n %{srcname}-%{orig_version} %endif -cd $RPM_BUILD_DIR/%{source_prefix} +cd $RPM_BUILD_DIR/%{srcname}-%{orig_version} %patch1 -p1 %patch2 -p1 %patch3 -p1 @@ -321,10 +324,10 @@ %patch21 -p1 %patch22 -p1 %patch23 -p1 +%patch24 -p1 # Firefox %patch101 -p1 %patch102 -p1 -%patch103 -p1 %endif # only_print_mozconfig %build @@ -448,16 +451,18 @@ 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 +475,10 @@ 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 @@ -487,25 +495,29 @@ grep amazondotcom dist/firefox/browser/omni.ja # copy tree into RPM_BUILD_ROOT mkdir -p %{buildroot}%{progdir} -cp -rf $RPM_BUILD_DIR/obj/dist/%{progname}/* %{buildroot}%{progdir} +cp -rf $RPM_BUILD_DIR/obj/dist/%{srcname}/* %{buildroot}%{progdir} mkdir -p %{buildroot}%{progdir}/distribution/extensions mkdir -p %{buildroot}%{progdir}/browser/defaults/preferences/ +# renaming executables (for regular vs. ESR) +%if "%{srcname}" != "%{progname}" +mv %{buildroot}%{progdir}/%{srcname} %{buildroot}%{progdir}/%{progname} +mv %{buildroot}%{progdir}/%{srcname}-bin %{buildroot}%{progdir}/%{progname} +%endif # 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 mkdir -p %{buildroot}%{progdir}/browser/extensions 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 \ +sed -r '/^(ja-JP-mac|en-US|)$/d;s/ .*$//' $RPM_BUILD_DIR/%{srcname}-%{orig_version}/browser/locales/shipped-locales \ | xargs -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 + ../%{srcname}-%{orig_version}/browser/locales/l10n.ini ../l10n $locale popd LOCALE_MERGEDIR=$RPM_BUILD_DIR/l10n-merged/$locale \ make -C browser/locales langpack-$locale @@ -541,7 +553,7 @@ mkdir --parents %{buildroot}/usr/bin sed "s:%%PREFIX:%{_prefix}:g s:%%PROGDIR:%{progdir}:g -s:%%APPNAME:firefox:g +s:%%APPNAME:%{progname}:g s:%%PROFILE:.mozilla/firefox:g" \ %{SOURCE3} > %{buildroot}%{progdir}/%{progname}.sh chmod 755 %{buildroot}%{progdir}/%{progname}.sh @@ -558,7 +570,8 @@ cp %{SOURCE8} %{buildroot}%{_datadir}/mime/packages/%{progname}.xml # appdata mkdir -p %{buildroot}%{_datadir}/appdata -cp %{SOURCE15} %{buildroot}%{_datadir}/appdata/%{desktop_file_name}.appdata.xml +sed "s:firefox.desktop:%{desktop_file_name}:g" \ + %{SOURCE15} > %{buildroot}%{_datadir}/appdata/%{desktop_file_name}.appdata.xml # install man-page mkdir -p %{buildroot}%{_mandir}/man1/ cp %{SOURCE11} %{buildroot}%{_mandir}/man1/%{progname}.1 @@ -588,6 +601,7 @@ rm -f %{buildroot}%{progdir}/LICENSE rm -f %{buildroot}%{progdir}/precomplete rm -f %{buildroot}%{progdir}/update-settings.ini +%if 0%{?devpkg} # devel mkdir -p %{buildroot}%{_bindir} install -m 755 %SOURCE12 %{buildroot}%{_bindir} @@ -609,12 +623,7 @@ %%{__unzip} -q -d "$extdir" "%%1" \ %%{nil} FIN -# just dumping an xpi file there doesn't work... -#%%firefox_ext_install() \ -# extdir="%%{buildroot}%%{firefox_extdir}" \ -# mkdir -p "$extdir" \ -# cp "%%1" "$extdir" \ -# %%{nil} +%endif # fdupes %fdupes %{buildroot}%{progdir} %fdupes %{buildroot}%{_datadir} @@ -668,8 +677,8 @@ %{progdir}/gtk2/libmozgtk.so %{progdir}/gmp-clearkey/ %attr(755,root,root) %{progdir}/%{progname}.sh -%{progdir}/firefox -%{progdir}/firefox-bin +%{progdir}/%{progname} +%{progdir}/%{progname}-bin %{progdir}/application.ini %{progdir}/chrome.manifest %{progdir}/dependentlibs.list @@ -700,13 +709,14 @@ %doc %{_mandir}/man1/%{progname}.1.gz %{_datadir}/appdata/ +%if 0%{?devpkg} %files devel %defattr(-,root,root) %{_bindir}/mozilla-get-app-id %config %{_sysconfdir}/rpm/macros.%{progname} +%endif %if %localize - %files translations-common -f %{_tmppath}/translations.common %defattr(-,root,root) %dir %{progdir} @@ -720,11 +730,9 @@ # this package does not need to provide files but is needed to fulfill # requirements if no other branding package is to be installed -%if %branding %files branding-upstream %defattr(-,root,root) %dir %{progdir} -%endif %if %crashreporter %files buildsymbols diff -r 9e4b30f05706 -r 97a6da6d7e29 MozillaFirefox/_constraints --- a/MozillaFirefox/_constraints Fri Sep 20 14:10:22 2019 +0200 +++ b/MozillaFirefox/_constraints Sun Oct 20 14:25:55 2019 +0200 @@ -2,7 +2,7 @@ - 24 + 25 8 diff -r 9e4b30f05706 -r 97a6da6d7e29 MozillaFirefox/create-tar.sh --- a/MozillaFirefox/create-tar.sh Fri Sep 20 14:10:22 2019 +0200 +++ b/MozillaFirefox/create-tar.sh Sun Oct 20 14:25:55 2019 +0200 @@ -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 @@ 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 @@ 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 @@ 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 @@ 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 @@ 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 -r 9e4b30f05706 -r 97a6da6d7e29 MozillaFirefox/firefox-add-kde.js-in-order-to-survive-PGO-build.patch --- a/MozillaFirefox/firefox-add-kde.js-in-order-to-survive-PGO-build.patch Fri Sep 20 14:10:22 2019 +0200 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,1 +0,0 @@ -../firefox-add-kde.js-in-order-to-survive-PGO-build.patch \ No newline at end of file diff -r 9e4b30f05706 -r 97a6da6d7e29 MozillaFirefox/firefox.js --- a/MozillaFirefox/firefox.js Fri Sep 20 14:10:22 2019 +0200 +++ b/MozillaFirefox/firefox.js Sun Oct 20 14:25:55 2019 +0200 @@ -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 -r 9e4b30f05706 -r 97a6da6d7e29 MozillaFirefox/kde.js --- a/MozillaFirefox/kde.js Fri Sep 20 14:10:22 2019 +0200 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,1 +0,0 @@ -pref("browser.preferences.instantApply", false); diff -r 9e4b30f05706 -r 97a6da6d7e29 MozillaFirefox/mozilla-fix-top-level-asm.patch --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/MozillaFirefox/mozilla-fix-top-level-asm.patch Sun Oct 20 14:25:55 2019 +0200 @@ -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 -r 9e4b30f05706 -r 97a6da6d7e29 MozillaFirefox/source-stamp.txt --- a/MozillaFirefox/source-stamp.txt Fri Sep 20 14:10:22 2019 +0200 +++ b/MozillaFirefox/source-stamp.txt Sun Oct 20 14:25:55 2019 +0200 @@ -1,2 +1,2 @@ -REV=bf6ea738ba073f1a70554799a749235136afc93a +REV=e40b66e55c283267a74ea411b9dfeeb7ddbb879c REPO=http://hg.mozilla.org/releases/mozilla-release diff -r 9e4b30f05706 -r 97a6da6d7e29 MozillaFirefox/tar_stamps --- a/MozillaFirefox/tar_stamps Fri Sep 20 14:10:22 2019 +0200 +++ b/MozillaFirefox/tar_stamps Sun Oct 20 14:25:55 2019 +0200 @@ -1,9 +1,8 @@ PRODUCT="firefox" CHANNEL="release" -VERSION="69.0.1" +VERSION="69.0.3" VERSION_SUFFIX="" -FF_RELEASE_TAG="bf6ea738ba073f1a70554799a749235136afc93a" -TB_RELEASE_TAG="" +RELEASE_TAG="c4227f95dae9e613acd966b9999fda0565eafb9d" PREV_VERSION="" PREV_VERSION_SUFFIX="" #SKIP_LOCALES="" # Uncomment to skip l10n and compare-locales-generation diff -r 9e4b30f05706 -r 97a6da6d7e29 firefox-add-kde.js-in-order-to-survive-PGO-build.patch --- a/firefox-add-kde.js-in-order-to-survive-PGO-build.patch Fri Sep 20 14:10:22 2019 +0200 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -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 -r 9e4b30f05706 -r 97a6da6d7e29 firefox-kde.patch --- a/firefox-kde.patch Fri Sep 20 14:10:22 2019 +0200 +++ b/firefox-kde.patch Sun Oct 20 14:25:55 2019 +0200 @@ -327,25 +327,3 @@ +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 -r 9e4b30f05706 -r 97a6da6d7e29 mozilla-fix-top-level-asm.patch --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/mozilla-fix-top-level-asm.patch Sun Oct 20 14:25:55 2019 +0200 @@ -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 -r 9e4b30f05706 -r 97a6da6d7e29 series --- a/series Fri Sep 20 14:10:22 2019 +0200 +++ b/series Sun Oct 20 14:25:55 2019 +0200 @@ -22,8 +22,8 @@ mozilla-bmo1554971.patch mozilla-nestegg-big-endian.patch mozilla-bmo1512162.patch +mozilla-fix-top-level-asm.patch # Firefox patches firefox-kde.patch firefox-branded-icons.patch -firefox-add-kde.js-in-order-to-survive-PGO-build.patch