rpms
/
firefox
7
0
Fork 0
Code Issues Pull Requests Releases Activity

Added firefox-x11 launch script, make wayland default

This commit is contained in:
Martin Stransky 2018-01-31 10:08:11 +01:00
parent a0558c67a0
commit 4e625cc771
4 changed files with 10 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
firefox-x11.desktop
View File

@ -42,7 +42,7 @@ Comment[pt]=Navegue na Internet
Comment[pt_BR]=Navegue na Internet Comment[pt_BR]=Navegue na Internet
Comment[sk]=Prehliadanie internetu Comment[sk]=Prehliadanie internetu
Comment[sv]=Surfa på webben Comment[sv]=Surfa på webben
Exec=firefox %u Exec=firefox-x11 %u
Icon=firefox Icon=firefox
Terminal=false Terminal=false
Type=Application Type=Application
@ -160,7 +160,7 @@ Name[zh-CN]=新建窗口
Name[zh-TW]=開新視窗 Name[zh-TW]=開新視窗
Exec=firefox %u Exec=firefox-x11 %u
[Desktop Action new-private-window] [Desktop Action new-private-window]
Name=Open a 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[xh]=Ifestile yangasese entsha
Name[zh-CN]=新建隐私浏览窗口 Name[zh-CN]=新建隐私浏览窗口
Name[zh-TW]=新增隱私視窗 Name[zh-TW]=新增隱私視窗
Exec=firefox --private-window %u Exec=firefox-x11 --private-window %u

6
firefox.desktop
View File

@ -42,7 +42,7 @@ Comment[pt]=Navegue na Internet
Comment[pt_BR]=Navegue na Internet Comment[pt_BR]=Navegue na Internet
Comment[sk]=Prehliadanie internetu Comment[sk]=Prehliadanie internetu
Comment[sv]=Surfa på webben Comment[sv]=Surfa på webben
Exec=firefox-wayland %u Exec=firefox %u
Icon=firefox Icon=firefox
Terminal=false Terminal=false
Type=Application Type=Application
@ -160,7 +160,7 @@ Name[zh-CN]=新建窗口
Name[zh-TW]=開新視窗 Name[zh-TW]=開新視窗
Exec=firefox-wayland %u Exec=firefox %u
[Desktop Action new-private-window] [Desktop Action new-private-window]
Name=Open a 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[xh]=Ifestile yangasese entsha
Name[zh-CN]=新建隐私浏览窗口 Name[zh-CN]=新建隐私浏览窗口
Name[zh-TW]=新增隱私視窗 Name[zh-TW]=新增隱私視窗
Exec=firefox-wayland --private-window %u Exec=firefox --private-window %u

8
firefox.sh.in
View File

@ -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_PROGRAM="$MOZ_DIST_BIN/$MOZ_FIREFOX_FILE"
MOZ_LAUNCHER="$MOZ_DIST_BIN/run-mozilla.sh" 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 ## Set MOZ_GRE_CONF
## ##

4
firefox.spec
View File

@ -117,6 +117,7 @@ Source26: distribution.ini
Source27: google-api-key Source27: google-api-key
Source28: firefox-wayland.sh.in Source28: firefox-wayland.sh.in
Source29: firefox-x11.desktop Source29: firefox-x11.desktop
Source30: firefox-x11.sh.in
# Build patches # Build patches
Patch3: mozilla-build-arm.patch Patch3: mozilla-build-arm.patch
@ -592,6 +593,8 @@ desktop-file-install --dir %{buildroot}%{_datadir}/applications %{SOURCE29}
%{__chmod} 755 %{buildroot}%{_bindir}/firefox %{__chmod} 755 %{buildroot}%{_bindir}/firefox
%{__cat} %{SOURCE28} > %{buildroot}%{_bindir}/firefox-wayland %{__cat} %{SOURCE28} > %{buildroot}%{_bindir}/firefox-wayland
%{__chmod} 755 %{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 %{__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 %files -f %{name}.lang
%{_bindir}/firefox %{_bindir}/firefox
%{_bindir}/firefox-wayland %{_bindir}/firefox-wayland
%{_bindir}/firefox-x11
%{mozappdir}/firefox %{mozappdir}/firefox
%{mozappdir}/firefox-bin %{mozappdir}/firefox-bin
%doc %{_mandir}/man1/* %doc %{_mandir}/man1/*