summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJan Horak <jhorak@redhat.com>2019-05-31 16:13:47 +0200
committerJan Horak <jhorak@redhat.com>2019-05-31 16:13:47 +0200
commit7edd26f80ca86d98c67c9c1a77ebaf242fab2441 (patch)
tree75b4c490f014af2ab458d67b5b140e16f0a48663
parentremoved mozbz#1552590 fix (diff)
downloadlibrewolf-fedora-ff-7edd26f80ca86d98c67c9c1a77ebaf242fab2441.tar.gz
librewolf-fedora-ff-7edd26f80ca86d98c67c9c1a77ebaf242fab2441.tar.bz2
librewolf-fedora-ff-7edd26f80ca86d98c67c9c1a77ebaf242fab2441.zip
Fix external app handling in flatpak
-rw-r--r--firefox.sh.in3
-rw-r--r--firefox.spec7
2 files changed, 10 insertions, 0 deletions
diff --git a/firefox.sh.in b/firefox.sh.in
index 5cd169d..29bd738 100644
--- a/firefox.sh.in
+++ b/firefox.sh.in
@@ -248,6 +248,9 @@ do
esac
done
+# Flatpak specific environment variables
+%FLATPAK_ENV_VARS%
+
# Run the browser
debugging=0
if [ $debugging = 1 ]
diff --git a/firefox.spec b/firefox.spec
index c4c847c..4051cdf 100644
--- a/firefox.spec
+++ b/firefox.spec
@@ -667,6 +667,13 @@ desktop-file-install --dir %{buildroot}%{_datadir}/applications %{SOURCE29}
-e 's,/__PREFIX__,%{_prefix},g' %{SOURCE21} > %{buildroot}%{_bindir}/firefox
%{__chmod} 755 %{buildroot}%{_bindir}/firefox
+
+%if 0%{?flatpak}
+sed -i -e 's|%FLATPAK_ENV_VARS%|export TMPDIR=$XDG_CACHE_HOME/tmp"|' %{buildroot}%{_bindir}/firefox
+%else
+sed -i -e 's|%FLATPAK_ENV_VARS%||' %{buildroot}%{_bindir}/firefox
+%endif
+
%if 0%{?wayland_backend_default}
%{__sed} -e 's,/__PREFIX__,%{_prefix},g' %{SOURCE30} > %{buildroot}%{_bindir}/firefox-x11
%{__chmod} 755 %{buildroot}%{_bindir}/firefox-x11
bgstack15