Merge branch 'master' into f31

This commit is contained in:
Martin Stransky 2019-12-04 18:20:04 +01:00
commit 1bd379f61f
2 changed files with 18 additions and 1 deletions

View File

@ -94,7 +94,7 @@ ExcludeArch: ppc64le
Summary: Mozilla Firefox Web browser Summary: Mozilla Firefox Web browser
Name: firefox Name: firefox
Version: 71.0 Version: 71.0
Release: 8%{?pre_tag}%{?dist} Release: 9.kiosk%{?pre_tag}%{?dist}
URL: https://www.mozilla.org/firefox/ URL: https://www.mozilla.org/firefox/
License: MPLv1.1 or GPLv2+ or LGPLv2+ License: MPLv1.1 or GPLv2+ or LGPLv2+
Source0: https://archive.mozilla.org/pub/firefox/releases/%{version}%{?pre_version}/source/firefox-%{version}%{?pre_version}.source.tar.xz Source0: https://archive.mozilla.org/pub/firefox/releases/%{version}%{?pre_version}/source/firefox-%{version}%{?pre_version}.source.tar.xz
@ -147,6 +147,7 @@ Patch227: firefox-locale-debug.patch
Patch228: mozilla-1583466.patch Patch228: mozilla-1583466.patch
Patch239: mozilla-gnome-shell-search-provider.patch Patch239: mozilla-gnome-shell-search-provider.patch
Patch240: mozilla-gnome-shell-search-provider-icons.patch Patch240: mozilla-gnome-shell-search-provider-icons.patch
Patch241: kiosk-workaround.patch
# Upstream patches # Upstream patches
Patch402: mozilla-1196777.patch Patch402: mozilla-1196777.patch
@ -360,6 +361,7 @@ This package contains results of tests executed during build.
%patch228 -p1 -b .mozilla-1583466 %patch228 -p1 -b .mozilla-1583466
%patch239 -p1 -b .gnome-shell-search-provider %patch239 -p1 -b .gnome-shell-search-provider
%patch240 -p1 -b .gnome-shell-search-provider-icons %patch240 -p1 -b .gnome-shell-search-provider-icons
%patch241 -p1 -b .kiosk-workaround
%patch402 -p1 -b .1196777 %patch402 -p1 -b .1196777
%ifarch %{arm} %ifarch %{arm}
@ -965,6 +967,9 @@ gtk-update-icon-cache %{_datadir}/icons/hicolor &>/dev/null || :
#--------------------------------------------------------------------- #---------------------------------------------------------------------
%changelog %changelog
* Wed Dec 4 2019 Martin Stransky <stransky@redhat.com> - 71.0-9
- Included kiosk mode workaround (mozbz#1594738)
* Tue Dec 3 2019 Martin Stransky <stransky@redhat.com> - 71.0-8 * Tue Dec 3 2019 Martin Stransky <stransky@redhat.com> - 71.0-8
- Disabled PGO due to startup crash - Disabled PGO due to startup crash

12
kiosk-workaround.patch Normal file
View File

@ -0,0 +1,12 @@
diff -up firefox-71.0/browser/base/content/browser.css.old firefox-71.0/browser/base/content/browser.css
--- firefox-71.0/browser/base/content/browser.css.old 2019-12-04 18:15:20.059908708 +0100
+++ firefox-71.0/browser/base/content/browser.css 2019-12-04 18:15:23.181905115 +0100
@@ -841,7 +841,7 @@ window[chromehidden~="toolbar"] toolbar:
/* Full Screen UI */
#fullscr-toggler {
- height: 1px;
+ height: 0px;
background: black;
}