diff --git a/MozillaFirefox.changes b/MozillaFirefox.changes index 87c23a78..3794178d 100644 --- a/MozillaFirefox.changes +++ b/MozillaFirefox.changes @@ -1,12 +1,10 @@ ------------------------------------------------------------------- -Wed Sep 25 07:03:29 UTC 2019 - Bernhard Wiedemann +Wed Sep 25 11:25:17 UTC 2019 - Wolfgang Rosenauer - Allow to build without profile guided optimizations (boo#1040589) - -------------------------------------------------------------------- -Fri Sep 20 09:21:05 UTC 2019 - Martin Liška - -- Make build verbose. + (contributed by Bernhard Wiedemann) +- Make build verbose (contributed by Martin Liška) +- remove obsolete kde.js setting (boo#1151186) ------------------------------------------------------------------- Thu Sep 19 13:31:16 UTC 2019 - Wolfgang Rosenauer diff --git a/MozillaFirefox.spec b/MozillaFirefox.spec index 1b2efcbf..fc948ef4 100644 --- a/MozillaFirefox.spec +++ b/MozillaFirefox.spec @@ -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 @@ -188,7 +189,6 @@ Patch23: mozilla-bmo1512162.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 @@ -324,7 +324,6 @@ cd $RPM_BUILD_DIR/%{source_prefix} # Firefox %patch101 -p1 %patch102 -p1 -%patch103 -p1 %endif # only_print_mozconfig %build @@ -473,7 +472,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 -v +%if 0%{?do_profiling} +xvfb-run --server-args="-screen 0 1920x1080x24" \ +%endif +./mach build -v %endif # only_print_mozconfig %install @@ -496,7 +498,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 b933b77d..bdf10b5b 100644 --- a/_constraints +++ b/_constraints @@ -2,7 +2,7 @@ - 24 + 25 8 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 7e66b01b..00000000 --- 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/kde.js b/kde.js deleted file mode 100644 index f06d73ae..00000000 --- a/kde.js +++ /dev/null @@ -1 +0,0 @@ -pref("browser.preferences.instantApply", false);