commit: aab03537c23183b3cfd04c5d5524d89fb7ecc004 Author: Thomas Deutschmann <whissi <AT> gentoo <DOT> org> AuthorDate: Thu Apr 2 21:11:46 2020 +0000 Commit: Thomas Deutschmann <whissi <AT> gentoo <DOT> org> CommitDate: Thu Apr 2 21:18:49 2020 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=aab03537
www-client/firefox-bin: don't enable XINPUT2 for KWin users Bug: https://bugs.gentoo.org/715604 Package-Manager: Portage-2.3.96, Repoman-2.3.22 Signed-off-by: Thomas Deutschmann <whissi <AT> gentoo.org> www-client/firefox-bin/files/firefox-bin.sh | 20 +++++++++++++++++++- ...68.6.0-r1.ebuild => firefox-bin-68.6.0-r2.ebuild} | 0 ...bin-74.0-r1.ebuild => firefox-bin-74.0-r2.ebuild} | 0 3 files changed, 19 insertions(+), 1 deletion(-) diff --git a/www-client/firefox-bin/files/firefox-bin.sh b/www-client/firefox-bin/files/firefox-bin.sh index 15f95487feb..baa6487a166 100644 --- a/www-client/firefox-bin/files/firefox-bin.sh +++ b/www-client/firefox-bin/files/firefox-bin.sh @@ -83,7 +83,25 @@ fi ## ## Enable Xinput2 (#617344) ## -export MOZ_USE_XINPUT2=1 + +# 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 diff --git a/www-client/firefox-bin/firefox-bin-68.6.0-r1.ebuild b/www-client/firefox-bin/firefox-bin-68.6.0-r2.ebuild similarity index 100% rename from www-client/firefox-bin/firefox-bin-68.6.0-r1.ebuild rename to www-client/firefox-bin/firefox-bin-68.6.0-r2.ebuild diff --git a/www-client/firefox-bin/firefox-bin-74.0-r1.ebuild b/www-client/firefox-bin/firefox-bin-74.0-r2.ebuild similarity index 100% rename from www-client/firefox-bin/firefox-bin-74.0-r1.ebuild rename to www-client/firefox-bin/firefox-bin-74.0-r2.ebuild
