rpms/firefox
3
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Updated launcher scripts

Browse Source
This commit is contained in:
Martin Stransky 2019-02-04 14:56:47 +01:00
parent 5c3efe8a80
commit a1d5dfd448
3 changed files with 14 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
firefox-x11.sh.in
View File

@ -3,4 +3,5 @@
# Run Firefox on X11 backend # Run Firefox on X11 backend
# #
export MOZ_DISABLE_WAYLAND=1
exec /usr/bin/firefox "$@" exec /usr/bin/firefox "$@"

9
firefox.sh.in
View File

@ -66,6 +66,15 @@ MOZ_EXTENSIONS_PROFILE_DIR="$HOME/.mozilla/extensions/{ec8030f7-c20a-464f-9b0e-1
MOZ_PROGRAM="$MOZ_DIST_BIN/$MOZ_FIREFOX_FILE" MOZ_PROGRAM="$MOZ_DIST_BIN/$MOZ_FIREFOX_FILE"
MOZ_LAUNCHER="$MOZ_DIST_BIN/run-mozilla.sh" MOZ_LAUNCHER="$MOZ_DIST_BIN/run-mozilla.sh"
##
## Enable Wayland backend?
##
if __DEFAULT_WAYLAND__ && ! [ $MOZ_DISABLE_WAYLAND ]; then
if [ "$XDG_CURRENT_DESKTOP" == "GNOME" ]; then
export MOZ_ENABLE_WAYLAND=1
fi
fi
## ##
## Set MOZ_GRE_CONF ## Set MOZ_GRE_CONF
## ##

8
firefox.spec
View File

@ -602,14 +602,14 @@ desktop-file-install --dir %{buildroot}%{_datadir}/applications %{SOURCE29}
# set up the firefox start script # set up the firefox start script
%if 0%{?wayland_backend_default} %if 0%{?wayland_backend_default}
%global x11_state false %global wayland_default true
%else %else
%global x11_state true %global wayland_default false
%endif %endif
%{__rm} -rf %{buildroot}%{_bindir}/firefox %{__rm} -rf %{buildroot}%{_bindir}/firefox
%{__sed} -e 's/__DEFAULT_X11__/%{x11_state}/' %{SOURCE21} > %{buildroot}%{_bindir}/firefox %{__sed} -e 's/__DEFAULT_WAYLAND__/%{wayland_default}/' %{SOURCE21} > %{buildroot}%{_bindir}/firefox
%{__chmod} 755 %{buildroot}%{_bindir}/firefox %{__chmod} 755 %{buildroot}%{_bindir}/firefox
%if 0%{?wayland_backend_default} %if 0%{?wayland_backend_default}
%{__cat} %{SOURCE30} > %{buildroot}%{_bindir}/firefox-x11 %{__cat} %{SOURCE30} > %{buildroot}%{_bindir}/firefox-x11
%{__chmod} 755 %{buildroot}%{_bindir}/firefox-x11 %{__chmod} 755 %{buildroot}%{_bindir}/firefox-x11