From 4e625cc771099ce469b4c1590a8299fcf8c05d2e Mon Sep 17 00:00:00 2001
From: Martin Stransky <stransky@redhat.com>
Date: Wed, 31 Jan 2018 10:08:11 +0100
Subject: Added firefox-x11 launch script, make wayland default

---
 firefox-x11.desktop | 6 +++---
 firefox.desktop     | 6 +++---
 firefox.sh.in       | 8 --------
 firefox.spec        | 4 ++++
 4 files changed, 10 insertions(+), 14 deletions(-)

diff --git a/firefox-x11.desktop b/firefox-x11.desktop
index f13e600..af103a5 100644
--- a/firefox-x11.desktop
+++ b/firefox-x11.desktop
@@ -42,7 +42,7 @@ Comment[pt]=Navegue na Internet
 Comment[pt_BR]=Navegue na Internet
 Comment[sk]=Prehliadanie internetu
 Comment[sv]=Surfa på webben
-Exec=firefox %u
+Exec=firefox-x11 %u
 Icon=firefox
 Terminal=false
 Type=Application
@@ -160,7 +160,7 @@ Name[zh-CN]=新建窗口
 Name[zh-TW]=開新視窗
 
 
-Exec=firefox %u
+Exec=firefox-x11 %u
 
 [Desktop Action new-private-window]
 Name=Open a New Private Window
@@ -268,5 +268,5 @@ Name[wo]=Panlanteeru biir bu bees
 Name[xh]=Ifestile yangasese entsha
 Name[zh-CN]=新建隐私浏览窗口
 Name[zh-TW]=新增隱私視窗
-Exec=firefox --private-window %u
+Exec=firefox-x11 --private-window %u
 
diff --git a/firefox.desktop b/firefox.desktop
index 63097cc..f13e600 100644
--- a/firefox.desktop
+++ b/firefox.desktop
@@ -42,7 +42,7 @@ Comment[pt]=Navegue na Internet
 Comment[pt_BR]=Navegue na Internet
 Comment[sk]=Prehliadanie internetu
 Comment[sv]=Surfa på webben
-Exec=firefox-wayland %u
+Exec=firefox %u
 Icon=firefox
 Terminal=false
 Type=Application
@@ -160,7 +160,7 @@ Name[zh-CN]=新建窗口
 Name[zh-TW]=開新視窗
 
 
-Exec=firefox-wayland %u
+Exec=firefox %u
 
 [Desktop Action new-private-window]
 Name=Open a New Private Window
@@ -268,5 +268,5 @@ Name[wo]=Panlanteeru biir bu bees
 Name[xh]=Ifestile yangasese entsha
 Name[zh-CN]=新建隐私浏览窗口
 Name[zh-TW]=新增隱私視窗
-Exec=firefox-wayland --private-window %u
+Exec=firefox --private-window %u
 
diff --git a/firefox.sh.in b/firefox.sh.in
index fec7bec..c546795 100644
--- a/firefox.sh.in
+++ b/firefox.sh.in
@@ -66,14 +66,6 @@ MOZ_EXTENSIONS_PROFILE_DIR="$HOME/.mozilla/extensions/{ec8030f7-c20a-464f-9b0e-1
 MOZ_PROGRAM="$MOZ_DIST_BIN/$MOZ_FIREFOX_FILE"
 MOZ_LAUNCHER="$MOZ_DIST_BIN/run-mozilla.sh"
 
-
-##
-## Set X11 backed as a default one
-##
-if ! [ "$GDK_BACKEND" ]; then
-  export GDK_BACKEND=x11
-fi
-
 ##
 ## Set MOZ_GRE_CONF
 ##
diff --git a/firefox.spec b/firefox.spec
index 181a470..853456b 100644
--- a/firefox.spec
+++ b/firefox.spec
@@ -117,6 +117,7 @@ Source26:       distribution.ini
 Source27:       google-api-key
 Source28:       firefox-wayland.sh.in
 Source29:       firefox-x11.desktop
+Source30:       firefox-x11.sh.in
 
 # Build patches
 Patch3:         mozilla-build-arm.patch
@@ -592,6 +593,8 @@ desktop-file-install --dir %{buildroot}%{_datadir}/applications %{SOURCE29}
 %{__chmod} 755 %{buildroot}%{_bindir}/firefox
 %{__cat} %{SOURCE28} > %{buildroot}%{_bindir}/firefox-wayland
 %{__chmod} 755 %{buildroot}%{_bindir}/firefox-wayland
+%{__cat} %{SOURCE30} > %{buildroot}%{_bindir}/firefox-x11
+%{__chmod} 755 %{buildroot}%{_bindir}/firefox-x11
 
 %{__install} -p -D -m 644 %{SOURCE23} %{buildroot}%{_mandir}/man1/firefox.1
 
@@ -791,6 +794,7 @@ gtk-update-icon-cache %{_datadir}/icons/hicolor &>/dev/null || :
 %files -f %{name}.lang
 %{_bindir}/firefox
 %{_bindir}/firefox-wayland
+%{_bindir}/firefox-x11
 %{mozappdir}/firefox
 %{mozappdir}/firefox-bin
 %doc %{_mandir}/man1/*
-- 
cgit