diff options
| author |   Thomas Deutschmann <whissi@gentoo.org> | 2020-04-02 23:11:46 +0200 |
|---|---|---|
| committer | Thomas Deutschmann <whissi@gentoo.org> | 2020-04-02 23:18:49 +0200 |
| commit | aab03537c23183b3cfd04c5d5524d89fb7ecc004 (patch) | |
| tree | 214a0a7b265446d16cd70bececcdc9e21cbd5d54 | |
| parent | dev-python/sqlalchemy: arm64 stable (bug #714522) (diff) | |
| download | gentoo-aab03537c23183b3cfd04c5d5524d89fb7ecc004.tar.gz gentoo-aab03537c23183b3cfd04c5d5524d89fb7ecc004.tar.bz2 gentoo-aab03537c23183b3cfd04c5d5524d89fb7ecc004.zip | |
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@gentoo.org>
| -rw-r--r-- | www-client/firefox-bin/files/firefox-bin.sh | 20 | ||||
| -rw-r--r-- | www-client/firefox-bin/firefox-bin-68.6.0-r2.ebuild (renamed from www-client/firefox-bin/firefox-bin-68.6.0-r1.ebuild) | 0 | ||||
| -rw-r--r-- | www-client/firefox-bin/firefox-bin-74.0-r2.ebuild (renamed from www-client/firefox-bin/firefox-bin-74.0-r1.ebuild) | 0 |
3 files changed, 19 insertions, 1 deletions
diff --git a/www-client/firefox-bin/files/firefox-bin.sh b/www-client/firefox-bin/files/firefox-bin.sh index 15f95487feb4..baa6487a1666 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 index 77ed113988e8..77ed113988e8 100644 --- a/www-client/firefox-bin/firefox-bin-68.6.0-r1.ebuild +++ b/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 index 85a96b9928c8..85a96b9928c8 100644 --- a/www-client/firefox-bin/firefox-bin-74.0-r1.ebuild +++ b/www-client/firefox-bin/firefox-bin-74.0-r2.ebuild |