1 |
commit: f17173196454c9e684737e3896fc4dad87fe7031 |
2 |
Author: Thomas Deutschmann <whissi <AT> gentoo <DOT> org> |
3 |
AuthorDate: Mon Mar 30 15:34:36 2020 +0000 |
4 |
Commit: Thomas Deutschmann <whissi <AT> gentoo <DOT> org> |
5 |
CommitDate: Mon Mar 30 15:43:00 2020 +0000 |
6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=f1717319 |
7 |
|
8 |
www-client/firefox: don't install -x11 shortcut/.desktop file when not needed |
9 |
|
10 |
Package-Manager: Portage-2.3.96, Repoman-2.3.22 |
11 |
Signed-off-by: Thomas Deutschmann <whissi <AT> gentoo.org> |
12 |
|
13 |
www-client/firefox/firefox-68.6.0-r3.ebuild | 11 +++++++---- |
14 |
www-client/firefox/firefox-74.0-r2.ebuild | 11 +++++++---- |
15 |
2 files changed, 14 insertions(+), 8 deletions(-) |
16 |
|
17 |
diff --git a/www-client/firefox/firefox-68.6.0-r3.ebuild b/www-client/firefox/firefox-68.6.0-r3.ebuild |
18 |
index 24ceeba5ece..035e41b50ae 100644 |
19 |
--- a/www-client/firefox/firefox-68.6.0-r3.ebuild |
20 |
+++ b/www-client/firefox/firefox-68.6.0-r3.ebuild |
21 |
@@ -762,11 +762,14 @@ PROFILE_EOF |
22 |
newbin "${FILESDIR}"/firefox-wayland.sh firefox-wayland |
23 |
;; |
24 |
X11) |
25 |
- exec_command='firefox-x11 --name firefox-x11' |
26 |
- if use wayland ; then |
27 |
- # Only needed when there's actually a choice |
28 |
- newbin "${FILESDIR}"/firefox-x11.sh firefox-x11 |
29 |
+ if ! use wayland ; then |
30 |
+ # Exit loop here because there's no choice so |
31 |
+ # we don't need wrapper/.desktop file for X11. |
32 |
+ continue |
33 |
fi |
34 |
+ |
35 |
+ exec_command='firefox-x11 --name firefox-x11' |
36 |
+ newbin "${FILESDIR}"/firefox-x11.sh firefox-x11 |
37 |
;; |
38 |
*) |
39 |
app_name="${name}" |
40 |
|
41 |
diff --git a/www-client/firefox/firefox-74.0-r2.ebuild b/www-client/firefox/firefox-74.0-r2.ebuild |
42 |
index f6e5a2262fa..2698ac6f81f 100644 |
43 |
--- a/www-client/firefox/firefox-74.0-r2.ebuild |
44 |
+++ b/www-client/firefox/firefox-74.0-r2.ebuild |
45 |
@@ -781,11 +781,14 @@ PROFILE_EOF |
46 |
newbin "${FILESDIR}"/firefox-wayland.sh firefox-wayland |
47 |
;; |
48 |
X11) |
49 |
- exec_command='firefox-x11 --name firefox-x11' |
50 |
- if use wayland ; then |
51 |
- # Only needed when there's actually a choice |
52 |
- newbin "${FILESDIR}"/firefox-x11.sh firefox-x11 |
53 |
+ if ! use wayland ; then |
54 |
+ # Exit loop here because there's no choice so |
55 |
+ # we don't need wrapper/.desktop file for X11. |
56 |
+ continue |
57 |
fi |
58 |
+ |
59 |
+ exec_command='firefox-x11 --name firefox-x11' |
60 |
+ newbin "${FILESDIR}"/firefox-x11.sh firefox-x11 |
61 |
;; |
62 |
*) |
63 |
app_name="${name}" |