From c4945dd7fe2a8c9c24a97308a68dae515c50dfe8 Mon Sep 17 00:00:00 2001
From: Martin Stransky <stransky@redhat.com>
Date: Mon, 16 Mar 2020 14:01:31 +0100
Subject: Use D-Bus remote exclusively for both X11 and Wayland backends when
 WAYLAND_DISPLAY is present.

---
 firefox.sh.in | 7 +++++++
 firefox.spec  | 6 +++++-
 2 files changed, 12 insertions(+), 1 deletion(-)

diff --git a/firefox.sh.in b/firefox.sh.in
index f111801..75148e5 100644
--- a/firefox.sh.in
+++ b/firefox.sh.in
@@ -75,6 +75,13 @@ if __DEFAULT_WAYLAND__ && ! [ $MOZ_DISABLE_WAYLAND ]; then
   fi
 fi
 
+##
+## Use D-Bus remote exclusively when there's Wayland display.
+##
+if [ "$WAYLAND_DISPLAY" ]; then
+  export MOZ_DBUS_REMOTE=1
+fi
+
 ##
 ## Set MOZ_GRE_CONF
 ##
diff --git a/firefox.spec b/firefox.spec
index d50034b..1f7a95e 100644
--- a/firefox.spec
+++ b/firefox.spec
@@ -118,7 +118,7 @@ ExcludeArch: s390x
 Summary:        Mozilla Firefox Web browser
 Name:           firefox
 Version:        74.0
-Release:        6%{?nss_tag}%{?dist}
+Release:        7%{?nss_tag}%{?dist}
 URL:            https://www.mozilla.org/firefox/
 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
@@ -960,6 +960,10 @@ gtk-update-icon-cache %{_datadir}/icons/hicolor &>/dev/null || :
 #---------------------------------------------------------------------
 
 %changelog
+* Mon Mar 16 2020 Martin Stransky <stransky@redhat.com> - 74.0-7
+- Use D-Bus remote exclusively for both X11 and Wayland backends
+  when WAYLAND_DISPLAY is present.
+
 * Fri Mar 13 2020 Martin Stransky <stransky@redhat.com> - 74.0-6
 - Added fix for mozbz#1615098
 
-- 
cgit