| 1 |
commit: be4b63a80148cc9f6c1d4f305ef3a1a28f52d676 |
| 2 |
Author: Lars Wendler <polynomial-c <AT> gentoo <DOT> org> |
| 3 |
AuthorDate: Fri Dec 7 20:29:55 2018 +0000 |
| 4 |
Commit: Lars Wendler <polynomial-c <AT> gentoo <DOT> org> |
| 5 |
CommitDate: Fri Dec 7 21:42:15 2018 +0000 |
| 6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=be4b63a8 |
| 7 |
|
| 8 |
app-emulation/virtualbox: fixed qt5 gui session startup |
| 9 |
|
| 10 |
added some missing symlinks, and enhanced the wrapper script a bit more. |
| 11 |
|
| 12 |
Closes: https://bugs.gentoo.org/671354 |
| 13 |
Package-Manager: Portage-2.3.52, Repoman-2.3.12 |
| 14 |
Signed-off-by: Lars Wendler <polynomial-c <AT> gentoo.org> |
| 15 |
|
| 16 |
app-emulation/virtualbox/files/virtualbox-ose-6-wrapper | 3 +++ |
| 17 |
app-emulation/virtualbox/virtualbox-6.0.0_beta3.ebuild | 15 +++++++-------- |
| 18 |
2 files changed, 10 insertions(+), 8 deletions(-) |
| 19 |
|
| 20 |
diff --git a/app-emulation/virtualbox/files/virtualbox-ose-6-wrapper b/app-emulation/virtualbox/files/virtualbox-ose-6-wrapper |
| 21 |
index 43e9c9ed448..af8090dd09a 100644 |
| 22 |
--- a/app-emulation/virtualbox/files/virtualbox-ose-6-wrapper |
| 23 |
+++ b/app-emulation/virtualbox/files/virtualbox-ose-6-wrapper |
| 24 |
@@ -84,6 +84,9 @@ case "$APP" in |
| 25 |
VirtualBox|virtualbox) |
| 26 |
exec "$INSTALL_DIR/VirtualBox" "$@" |
| 27 |
;; |
| 28 |
+ VirtualBoxVM|virtualboxvm) |
| 29 |
+ exec "$INSTALL_DIR/VirtualBoxVM" "$@" |
| 30 |
+ ;; |
| 31 |
VBoxManage|vboxmanage) |
| 32 |
exec "$INSTALL_DIR/VBoxManage" "$@" |
| 33 |
;; |
| 34 |
|
| 35 |
diff --git a/app-emulation/virtualbox/virtualbox-6.0.0_beta3.ebuild b/app-emulation/virtualbox/virtualbox-6.0.0_beta3.ebuild |
| 36 |
index edda2a369a4..cd98a4875fd 100644 |
| 37 |
--- a/app-emulation/virtualbox/virtualbox-6.0.0_beta3.ebuild |
| 38 |
+++ b/app-emulation/virtualbox/virtualbox-6.0.0_beta3.ebuild |
| 39 |
@@ -262,7 +262,7 @@ src_install() { |
| 40 |
use debug && binpath="debug" |
| 41 |
cd "${S}"/out/linux.${ARCH}/${binpath}/bin || die |
| 42 |
|
| 43 |
- local vbox_inst_path="/usr/$(get_libdir)/${PN}" each fwfile size ico icofile |
| 44 |
+ local vbox_inst_path="/usr/$(get_libdir)/${PN}" each size ico icofile |
| 45 |
|
| 46 |
vbox_inst() { |
| 47 |
local binary="${1}" |
| 48 |
@@ -312,11 +312,9 @@ src_install() { |
| 49 |
done |
| 50 |
|
| 51 |
# Install EFI Firmware files (bug #320757) |
| 52 |
- pushd "${S}"/src/VBox/Devices/EFI/FirmwareBin &>/dev/null || die |
| 53 |
- for fwfile in VBoxEFI{32,64}.fd ; do |
| 54 |
- vbox_inst ${fwfile} 0644 |
| 55 |
+ for each in VBoxEFI{32,64}.fd ; do |
| 56 |
+ vbox_inst ${each} 0644 |
| 57 |
done |
| 58 |
- popd &>/dev/null || die |
| 59 |
|
| 60 |
# VBoxSVC and VBoxManage need to be pax-marked (bug #403453) |
| 61 |
# VBoxXPCOMIPCD (bug #524202) |
| 62 |
@@ -325,7 +323,7 @@ src_install() { |
| 63 |
done |
| 64 |
|
| 65 |
# Symlink binaries to the shipped wrapper |
| 66 |
- for each in vbox{headless,manage} VBox{BugReport,Headless,Manage,VRDP} ; do |
| 67 |
+ for each in vbox{autostart,balloonctrl,bugreport,headless,manage} VBox{Autostart,BalloonCtrl,BugReport,Headless,Manage,VRDP} ; do |
| 68 |
dosym ${vbox_inst_path}/VBox /usr/bin/${each} |
| 69 |
done |
| 70 |
dosym ${vbox_inst_path}/VBoxTunctl /usr/bin/VBoxTunctl |
| 71 |
@@ -348,8 +346,9 @@ src_install() { |
| 72 |
done |
| 73 |
|
| 74 |
if use qt5 ; then |
| 75 |
+ vbox_inst Virtualbox |
| 76 |
+ vbox_inst VirtualboxVM 4750 |
| 77 |
for each in VirtualBox{,VM} ; do |
| 78 |
- vbox_inst ${each} |
| 79 |
pax-mark -m "${ED%/}"${vbox_inst_path}/${each} |
| 80 |
done |
| 81 |
|
| 82 |
@@ -358,7 +357,7 @@ src_install() { |
| 83 |
pax-mark -m "${ED%/}"${vbox_inst_path}/VBoxTestOGL |
| 84 |
fi |
| 85 |
|
| 86 |
- for each in virtualbox VirtualBox ; do |
| 87 |
+ for each in virtualbox{,vm} VirtualBox{,VM} ; do |
| 88 |
dosym ${vbox_inst_path}/VBox /usr/bin/${each} |
| 89 |
done |
Archives