summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMartin Stransky <stransky@redhat.com>2018-01-31 10:17:22 +0100
committerMartin Stransky <stransky@redhat.com>2018-01-31 10:17:22 +0100
commite113d3e05d1724ec5f7bbe98a5d0b0982b771981 (patch)
tree388028ab7761de17d27c957f079ff6aab8a12cec
parentAdded firefox-x11 launch script, make wayland default (diff)
downloadlibrewolf-fedora-ff-e113d3e05d1724ec5f7bbe98a5d0b0982b771981.tar.gz
librewolf-fedora-ff-e113d3e05d1724ec5f7bbe98a5d0b0982b771981.tar.bz2
librewolf-fedora-ff-e113d3e05d1724ec5f7bbe98a5d0b0982b771981.zip
Fix dbus remote when profile is not given
-rw-r--r--firefox-x11.sh.in7
-rw-r--r--firefox.spec2
-rw-r--r--remote-profile.patch19
3 files changed, 28 insertions, 0 deletions
diff --git a/firefox-x11.sh.in b/firefox-x11.sh.in
new file mode 100644
index 0000000..d1b48c7
--- /dev/null
+++ b/firefox-x11.sh.in
@@ -0,0 +1,7 @@
+#!/bin/bash
+#
+# Run Firefox under X11
+#
+
+export GDK_BACKEND=x11
+/usr/bin/firefox "$@"
diff --git a/firefox.spec b/firefox.spec
index 853456b..1d14db6 100644
--- a/firefox.spec
+++ b/firefox.spec
@@ -161,6 +161,7 @@ Patch450: mozilla-1431052.patch
Patch451: mozilla-1432414.patch
Patch452: mozilla-1434202.patch
Patch453: mozilla-1433081.patch
+Patch454: remote-profile.patch
# Debian patches
Patch500: mozilla-440908.patch
@@ -329,6 +330,7 @@ This package contains results of tests executed during build.
%patch451 -p1 -b .1432414
%patch452 -p1 -b .1434202
%patch453 -p1 -b .1433081
+%patch454 -p1 -b .remote-profile
# Patch for big endian platforms only
%if 0%{?big_endian}
diff --git a/remote-profile.patch b/remote-profile.patch
new file mode 100644
index 0000000..919f735
--- /dev/null
+++ b/remote-profile.patch
@@ -0,0 +1,19 @@
+diff --git a/toolkit/xre/nsAppRunner.cpp b/toolkit/xre/nsAppRunner.cpp
+index 386213efebb4..990ba32acbd4 100644
+--- a/toolkit/xre/nsAppRunner.cpp
++++ b/toolkit/xre/nsAppRunner.cpp
+@@ -3995,6 +3995,14 @@ XREMain::XRE_mainStartup(bool* aExitFlag)
+ }
+ }
+
++ if (!profile) {
++#ifdef MOZ_DEV_EDITION
++ profile = "dev-edition-default";
++#else
++ profile = "default";
++#endif
++ }
++
+ nsCOMPtr<nsIFile> mutexDir;
+ rv = GetSpecialSystemDirectory(OS_TemporaryDirectory, getter_AddRefs(mutexDir));
+ if (NS_SUCCEEDED(rv)) {
bgstack15