| 1 |
commit: ad207c941c2cebd1b5051ac7ad00e511ecdd7ef0 |
| 2 |
Author: Thomas Deutschmann <whissi <AT> gentoo <DOT> org> |
| 3 |
AuthorDate: Mon Mar 30 15:42:31 2020 +0000 |
| 4 |
Commit: Thomas Deutschmann <whissi <AT> gentoo <DOT> org> |
| 5 |
CommitDate: Mon Mar 30 15:43:01 2020 +0000 |
| 6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=ad207c94 |
| 7 |
|
| 8 |
www-client/firefox-bin: 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-bin/firefox-bin-68.6.0-r1.ebuild | 11 +++++++---- |
| 14 |
www-client/firefox-bin/firefox-bin-74.0-r1.ebuild | 11 +++++++---- |
| 15 |
2 files changed, 14 insertions(+), 8 deletions(-) |
| 16 |
|
| 17 |
diff --git a/www-client/firefox-bin/firefox-bin-68.6.0-r1.ebuild b/www-client/firefox-bin/firefox-bin-68.6.0-r1.ebuild |
| 18 |
index eb30ac30836..77ed113988e 100644 |
| 19 |
--- a/www-client/firefox-bin/firefox-bin-68.6.0-r1.ebuild |
| 20 |
+++ b/www-client/firefox-bin/firefox-bin-68.6.0-r1.ebuild |
| 21 |
@@ -161,11 +161,14 @@ src_install() { |
| 22 |
newbin "${FILESDIR}"/firefox-bin-wayland.sh ${PN}-wayland |
| 23 |
;; |
| 24 |
X11) |
| 25 |
- exec_command="${PN}-x11 --name ${PN}-x11" |
| 26 |
- if use wayland ; then |
| 27 |
- # Only needed when there's actually a choice |
| 28 |
- newbin "${FILESDIR}"/firefox-bin-x11.sh ${PN}-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="${PN}-x11 --name ${PN}-x11" |
| 36 |
+ newbin "${FILESDIR}"/firefox-bin-x11.sh ${PN}-x11 |
| 37 |
;; |
| 38 |
*) |
| 39 |
app_name="${name}" |
| 40 |
|
| 41 |
diff --git a/www-client/firefox-bin/firefox-bin-74.0-r1.ebuild b/www-client/firefox-bin/firefox-bin-74.0-r1.ebuild |
| 42 |
index f8f296dafd1..85a96b9928c 100644 |
| 43 |
--- a/www-client/firefox-bin/firefox-bin-74.0-r1.ebuild |
| 44 |
+++ b/www-client/firefox-bin/firefox-bin-74.0-r1.ebuild |
| 45 |
@@ -161,11 +161,14 @@ src_install() { |
| 46 |
newbin "${FILESDIR}"/firefox-bin-wayland.sh ${PN}-wayland |
| 47 |
;; |
| 48 |
X11) |
| 49 |
- exec_command="${PN}-x11 --name ${PN}-x11" |
| 50 |
- if use wayland ; then |
| 51 |
- # Only needed when there's actually a choice |
| 52 |
- newbin "${FILESDIR}"/firefox-bin-x11.sh ${PN}-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="${PN}-x11 --name ${PN}-x11" |
| 60 |
+ newbin "${FILESDIR}"/firefox-bin-x11.sh ${PN}-x11 |
| 61 |
;; |
| 62 |
*) |
| 63 |
app_name="${name}" |
Archives