summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJory Pratt <anarchy@gentoo.org>2020-04-07 21:00:54 -0500
committerJory Pratt <anarchy@gentoo.org>2020-04-07 21:00:54 -0500
commit5ebd386a94bb8a99f5999dccd80dec422eaba17a (patch)
tree871fb5e1951ac0c0f5d813615c5aea40d55a6014
parentwww-client/firefox: Unbreak patchset, readd missing lto/llvm9 patches (diff)
downloadmozilla-5ebd386a94bb8a99f5999dccd80dec422eaba17a.tar.gz
mozilla-5ebd386a94bb8a99f5999dccd80dec422eaba17a.tar.bz2
mozilla-5ebd386a94bb8a99f5999dccd80dec422eaba17a.zip
www-client/firefox: Drop xinput2, do not allow profile downgrades
Package-Manager: Portage-2.3.96, Repoman-2.3.22 Signed-off-by: Jory Pratt <anarchy@gentoo.org>
-rw-r--r--www-client/firefox/files/firefox.sh24
-rw-r--r--www-client/firefox/firefox-75.0-r1.ebuild (renamed from www-client/firefox/firefox-75.0.ebuild)0
2 files changed, 1 insertions, 23 deletions
diff --git a/www-client/firefox/files/firefox.sh b/www-client/firefox/files/firefox.sh
index c08d555..eb66a42 100644
--- a/www-client/firefox/files/firefox.sh
+++ b/www-client/firefox/files/firefox.sh
@@ -90,31 +90,9 @@ if [[ "$XDG_CURRENT_DESKTOP" == "GNOME" ]]; then
export GNOME_DISABLE_CRASH_DIALOG
fi
-##
-## Enable Xinput2 (#617344)
-##
-
-# respect user settings
-MOZ_USE_XINPUT2=${MOZ_USE_XINPUT2:-auto}
-
-if [[ ${MOZ_USE_XINPUT2} == auto && -n ${WAYLAND_DISPLAY} ]]; then
- # enabling XINPUT2 should be safe for all wayland users
- MOZ_USE_XINPUT2=1
-elif [[ ${MOZ_USE_XINPUT2} == auto && ${XDG_CURRENT_DESKTOP^^} == KDE ]]; then
- # XINPUT2 is known to cause problems for KWin users
- MOZ_USE_XINPUT2=0
-elif [[ ${MOZ_USE_XINPUT2} == auto && ${XDG_CURRENT_DESKTOP^^} == LXQT ]]; then
- # LXQt uses KWin
- MOZ_USE_XINPUT2=0
-elif [[ ${MOZ_USE_XINPUT2} == auto ]]; then
- # should work on Mate, Xfce, FluxBox, OpenBox and all the others ...
- MOZ_USE_XINPUT2=1
-fi
-
-[[ ${MOZ_USE_XINPUT2} != 0 ]] && export MOZ_USE_XINPUT2=${MOZ_USE_XINPUT2}
# Don't throw "old profile" dialog box.
-export MOZ_ALLOW_DOWNGRADE=1
+export MOZ_ALLOW_DOWNGRADE=0
##
## Route to the correct .desktop file to get proper
diff --git a/www-client/firefox/firefox-75.0.ebuild b/www-client/firefox/firefox-75.0-r1.ebuild
index f4deaed..f4deaed 100644
--- a/www-client/firefox/firefox-75.0.ebuild
+++ b/www-client/firefox/firefox-75.0-r1.ebuild