From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by finch.gentoo.org (Postfix) with ESMTPS id 918AF138350 for ; Thu, 2 Apr 2020 21:19:03 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id DFA0CE0A8A; Thu, 2 Apr 2020 21:19:02 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [IPv6:2001:470:ea4a:1:5054:ff:fec7:86e4]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id C4B80E0A8A for ; Thu, 2 Apr 2020 21:19:02 +0000 (UTC) Received: from oystercatcher.gentoo.org (oystercatcher.gentoo.org [148.251.78.52]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id CDCFD34EF76 for ; Thu, 2 Apr 2020 21:19:01 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 7F9491AC for ; Thu, 2 Apr 2020 21:19:00 +0000 (UTC) From: "Thomas Deutschmann" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Thomas Deutschmann" Message-ID: <1585862330.4dd43c0f1c0520ad93b3b836aab06baedf8eb919.whissi@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: www-client/firefox/, www-client/firefox/files/ X-VCS-Repository: repo/gentoo X-VCS-Files: www-client/firefox/files/firefox.sh www-client/firefox/firefox-68.6.0-r3.ebuild www-client/firefox/firefox-68.6.0-r4.ebuild www-client/firefox/firefox-74.0-r2.ebuild www-client/firefox/firefox-74.0-r3.ebuild X-VCS-Directories: www-client/firefox/ www-client/firefox/files/ X-VCS-Committer: whissi X-VCS-Committer-Name: Thomas Deutschmann X-VCS-Revision: 4dd43c0f1c0520ad93b3b836aab06baedf8eb919 X-VCS-Branch: master Date: Thu, 2 Apr 2020 21:19:00 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org X-Auto-Response-Suppress: DR, RN, NRN, OOF, AutoReply X-Archives-Salt: a62c30c1-94e2-46a9-9935-7d74e745ecd4 X-Archives-Hash: 712e994524d090489a43a61003d52cfb commit: 4dd43c0f1c0520ad93b3b836aab06baedf8eb919 Author: Thomas Deutschmann gentoo org> AuthorDate: Thu Apr 2 21:16:14 2020 +0000 Commit: Thomas Deutschmann gentoo org> CommitDate: Thu Apr 2 21:18:50 2020 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=4dd43c0f www-client/firefox: don't enable XINPUT2 for KWin users Closes: https://bugs.gentoo.org/715604 Package-Manager: Portage-2.3.96, Repoman-2.3.22 Signed-off-by: Thomas Deutschmann gentoo.org> www-client/firefox/files/firefox.sh | 20 +++++++++++++++++++- ...fox-68.6.0-r3.ebuild => firefox-68.6.0-r4.ebuild} | 0 ...firefox-74.0-r2.ebuild => firefox-74.0-r3.ebuild} | 0 3 files changed, 19 insertions(+), 1 deletion(-) diff --git a/www-client/firefox/files/firefox.sh b/www-client/firefox/files/firefox.sh index f1fde8fdfce..c08d555196d 100644 --- a/www-client/firefox/files/firefox.sh +++ b/www-client/firefox/files/firefox.sh @@ -93,7 +93,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/firefox-68.6.0-r3.ebuild b/www-client/firefox/firefox-68.6.0-r4.ebuild similarity index 100% rename from www-client/firefox/firefox-68.6.0-r3.ebuild rename to www-client/firefox/firefox-68.6.0-r4.ebuild diff --git a/www-client/firefox/firefox-74.0-r2.ebuild b/www-client/firefox/firefox-74.0-r3.ebuild similarity index 100% rename from www-client/firefox/firefox-74.0-r2.ebuild rename to www-client/firefox/firefox-74.0-r3.ebuild