[arch-commits] Commit in virtualbox/trunk (7 files)
Christian Hesse
eworm at archlinux.org
Wed Jul 15 21:00:50 UTC 2020
Date: Wednesday, July 15, 2020 @ 21:00:49
Author: eworm
Revision: 664001
upgpkg: virtualbox 6.1.12-1: new upstream release, install VBoxDRMClient
Added:
virtualbox/trunk/018-xclient.patch
virtualbox/trunk/vboxdrmclient.service
Modified:
virtualbox/trunk/LocalConfig.kmk
virtualbox/trunk/PKGBUILD
virtualbox/trunk/vboxservice.service
Deleted:
virtualbox/trunk/018-work-around-black-screen.patch
virtualbox/trunk/019-qt-5-15.patch
------------------------------------+
018-work-around-black-screen.patch | 18 -------------
018-xclient.patch | 24 +++++++++++++++++
019-qt-5-15.patch | 48 -----------------------------------
LocalConfig.kmk | 3 ++
PKGBUILD | 19 +++++++------
vboxdrmclient.service | 7 +++++
vboxservice.service | 1
7 files changed, 45 insertions(+), 75 deletions(-)
Deleted: 018-work-around-black-screen.patch
===================================================================
--- 018-work-around-black-screen.patch 2020-07-15 20:30:55 UTC (rev 664000)
+++ 018-work-around-black-screen.patch 2020-07-15 21:00:49 UTC (rev 664001)
@@ -1,18 +0,0 @@
-From bbd990f83a23c22da787d10c62bd7ff114d32703 Mon Sep 17 00:00:00 2001
-From: Christian Hesse <mail at eworm.de>
-Date: Mon, 18 May 2020 08:21:06 +0200
-Subject: [PATCH 1/1] work around black screen
----
- src/VBox/Additions/x11/Installer/98vboxadd-xclient | 1 -
- 1 file changed, 1 deletion(-)
-
-diff --git a/src/VBox/Additions/x11/Installer/98vboxadd-xclient b/src/VBox/Additions/x11/Installer/98vboxadd-xclient
-index e7d4e292..7a17a692 100755
---- a/src/VBox/Additions/x11/Installer/98vboxadd-xclient
-+++ b/src/VBox/Additions/x11/Installer/98vboxadd-xclient
-@@ -34,5 +34,4 @@ elif test -z "${SSH_CONNECTION}"; then
- /usr/bin/VBoxClient --checkhostversion
- /usr/bin/VBoxClient --seamless
- /usr/bin/VBoxClient --draganddrop
-- /usr/bin/VBoxClient --vmsvga # In case VMSVGA emulation is enabled
- fi
Added: 018-xclient.patch
===================================================================
--- 018-xclient.patch (rev 0)
+++ 018-xclient.patch 2020-07-15 21:00:49 UTC (rev 664001)
@@ -0,0 +1,24 @@
+--- a/src/VBox/Additions/x11/Installer/98vboxadd-xclient
++++ b/src/VBox/Additions/x11/Installer/98vboxadd-xclient
+@@ -21,18 +21,11 @@ for i in $HOME/.vboxclient-*.pid; do
+ test -w $i || rm -f $i
+ done
+
+-if ! test -c /dev/vboxguest 2>/dev/null; then
+- # Do not start if the kernel module is not present.
+- # Execute notify-send in the back-ground to avoid racing with sddm,
+- # as notify-send may wait for sddm to start while it waits for us to exit.
+- notify-send "VBoxClient: the VirtualBox kernel service is not running. Exiting." &
+-elif test -z "${SSH_CONNECTION}"; then
+- # This script can also be triggered by a connection over SSH, which is not
+- # what we had in mind, so we do not start VBoxClient in that case. We do
+- # not use "exit" here as this script is "source"d, not executed.
++# Do not start if the kernel module is not present; or if this script is
++# triggered by a connection over SSH.
++if [ -c /dev/vboxguest -a -z "${SSH_CONNECTION}" ]; then
+ /usr/bin/VBoxClient --clipboard
+ /usr/bin/VBoxClient --checkhostversion
+ /usr/bin/VBoxClient --seamless
+ /usr/bin/VBoxClient --draganddrop
+- /usr/bin/VBoxClient --vmsvga # In case VMSVGA emulation is enabled
+ fi
Deleted: 019-qt-5-15.patch
===================================================================
--- 019-qt-5-15.patch 2020-07-15 20:30:55 UTC (rev 664000)
+++ 019-qt-5-15.patch 2020-07-15 21:00:49 UTC (rev 664001)
@@ -1,48 +0,0 @@
-diff --git a/src/VBox/Frontends/VirtualBox/src/globals/UIImageTools.cpp b/src/VBox/Frontends/VirtualBox/src/globals/UIImageTools.cpp
-index b70d289d..9716781e 100644
---- a/src/VBox/Frontends/VirtualBox/src/globals/UIImageTools.cpp
-+++ b/src/VBox/Frontends/VirtualBox/src/globals/UIImageTools.cpp
-@@ -17,6 +17,7 @@
-
- /* Qt includes: */
- #include <QPainter>
-+#include <QPainterPath>
-
- /* GUI include */
- #include "UIImageTools.h"
-diff --git a/src/VBox/Frontends/VirtualBox/src/widgets/UIMenuToolBar.cpp b/src/VBox/Frontends/VirtualBox/src/widgets/UIMenuToolBar.cpp
-index 4d695f19..406c2dbd 100644
---- a/src/VBox/Frontends/VirtualBox/src/widgets/UIMenuToolBar.cpp
-+++ b/src/VBox/Frontends/VirtualBox/src/widgets/UIMenuToolBar.cpp
-@@ -19,6 +19,7 @@
- #include <QApplication>
- #include <QHBoxLayout>
- #include <QPainter>
-+#include <QPainterPath>
- #include <QStyle>
- #include <QToolButton>
-
-diff --git a/src/VBox/Frontends/VirtualBox/src/widgets/UIMiniToolBar.cpp b/src/VBox/Frontends/VirtualBox/src/widgets/UIMiniToolBar.cpp
-index 53b545a4..6e38448c 100644
---- a/src/VBox/Frontends/VirtualBox/src/widgets/UIMiniToolBar.cpp
-+++ b/src/VBox/Frontends/VirtualBox/src/widgets/UIMiniToolBar.cpp
-@@ -21,6 +21,7 @@
- #include <QMenu>
- #include <QMoveEvent>
- #include <QPainter>
-+#include <QPainterPath>
- #include <QStateMachine>
- #include <QStyle>
- #include <QTimer>
-diff --git a/src/VBox/Frontends/VirtualBox/src/widgets/UIPopupBox.h b/src/VBox/Frontends/VirtualBox/src/widgets/UIPopupBox.h
-index 2f153d80..7b18a66b 100644
---- a/src/VBox/Frontends/VirtualBox/src/widgets/UIPopupBox.h
-+++ b/src/VBox/Frontends/VirtualBox/src/widgets/UIPopupBox.h
-@@ -24,6 +24,7 @@
- /* Qt includes: */
- #include <QIcon>
- #include <QWidget>
-+#include <QPainterPath>
-
- /* GUI includes: */
- #include "UILibraryDefs.h"
Modified: LocalConfig.kmk
===================================================================
--- LocalConfig.kmk 2020-07-15 20:30:55 UTC (rev 664000)
+++ LocalConfig.kmk 2020-07-15 21:00:49 UTC (rev 664001)
@@ -34,3 +34,6 @@
# build shared library
VBOX_GUI_WITH_SHARED_LIBRARY = 1
+
+# disable experimental cloud infrastructure integration
+VBOX_WITH_CLOUD_NET :=
Modified: PKGBUILD
===================================================================
--- PKGBUILD 2020-07-15 20:30:55 UTC (rev 664000)
+++ PKGBUILD 2020-07-15 21:00:49 UTC (rev 664001)
@@ -9,7 +9,7 @@
'virtualbox-guest-utils'
'virtualbox-guest-utils-nox'
'virtualbox-ext-vnc')
-pkgver=6.1.10
+pkgver=6.1.12
pkgrel=1
_vboxsf_commit='5aba938bcabd978e4615186ad7d8617d633e6f30'
arch=('x86_64')
@@ -65,6 +65,7 @@
'LocalConfig.kmk'
'vboxservice.service'
'vboxservice-nox.service'
+ 'vboxdrmclient.service'
'vboxweb.service'
'vboxreload'
'001-disable-update.patch'
@@ -75,10 +76,9 @@
'013-Makefile.patch'
'016-VBoxServiceAutoMount-Change-Linux-mount-code-to-use-.patch'
'017-fix-narrowing-conversion.patch'
- '018-work-around-black-screen.patch'
- '019-qt-5-15.patch'
+ '018-xclient.patch'
'020-gsoap.patch')
-sha256sums=('37d8b30c0be82a50c858f3fc70cde967882239b6212bb32e138d3615b423c477'
+sha256sums=('05eff0321daa72f6d00fb121a6b4211f39964778823806fa0b7b751667dec362'
'SKIP'
'76d98ea062fcad9e5e3fa981d046a6eb12a3e718a296544a68b66f4b65cb56db'
'c1ccfaa3a37d6b227cd65de944df2d68cbf178a857b6ab15c04b8fa05693f252'
@@ -86,9 +86,10 @@
'da4c49f6ca94e047e196cdbcba2c321199f4760056ea66e0fbc659353e128c9e'
'9c5238183019f9ebc7d92a8582cad232f471eab9d3278786225abc1a1c7bf66e'
'033c597e0f5285d2ddb0490868e5b6f945f45c7b1b1152a02a9e6fea438b2c95'
- '2be313b98bffde482aad93b00c419f1d5f7645fd9e6053175ffb0d925067f96a'
- '94a808f46909a51b2d0cf2c6e0a6c9dea792034943e6413bf9649a036c921b21'
+ '240ddf9c532b34380dd9bdd56c6302f323ded9ca95ccf5c50b6e44a5cb533cc9'
+ '4ffd5b84449b07acf280126cf7e56737c6430ebb3a98d203957bcf37ecde5450'
'01dbb921bd57a852919cc78be5b73580a564f28ebab2fe8d6c9b8301265cbfce'
+ '2beab8de525220fa418c9873f9e0d657ddbad4ff9e4a46d7053e6cd9bc4ce95e'
'e6e875ef186578b53106d7f6af48e426cdaf1b4e86834f01696b8ef1c685787f'
'4001b5927348fe669a541e80526d4f9ea91b883805f102f7d571edbb482a9b9d'
'9ee947c9b5ec5b25f52d3e72340fc3a57ca6e65a604e15b669ac582a3fb0dc1b'
@@ -99,8 +100,7 @@
'da7e58ed37dc23c6202aab3017864579a99e78417f3421ddcc98a198198fe2c9'
'100c9e14e9cfb12ae65364e830153d2481cf272ceeb39d11c6b203bc6e35bf0c'
'5aac692909a0a0ec56b08bdece9e42cf7463abdca9da2f990d441ff463be6a99'
- 'c64a4f284a4e91a42df5b30939d9190127ea5aa25470b5d31507a8309c20e1fc'
- '7a6b21f33952d46c5253acb6ada5c76fc579c50df2602dadcd9bd0d381cd9335'
+ 'cac5a573e9ed5aafb2f469c2e6fffb8cd4f389bbadba5a968c9f65be7a72fee3'
'c6892a3561a72a9b308cb33fa6647cc53e54a3bd40cb41780cad7f8e9d7df9f6')
prepare() {
@@ -343,7 +343,7 @@
source "VirtualBox-$pkgver/env.sh"
pushd "VirtualBox-$pkgver/out/linux.$BUILD_PLATFORM_ARCH/release/bin/additions"
install -d "$pkgdir/usr/bin"
- install -m0755 VBoxClient VBoxControl VBoxService "$pkgdir/usr/bin"
+ install -m0755 VBoxClient VBoxControl VBoxDRMClient VBoxService "$pkgdir/usr/bin"
install -m0755 -D "$srcdir"/VirtualBox-$pkgver/src/VBox/Additions/x11/Installer/98vboxadd-xclient \
"$pkgdir"/usr/bin/VBoxClient-all
install -m0644 -D "$srcdir"/VirtualBox-$pkgver/src/VBox/Additions/x11/Installer/vboxclient.desktop \
@@ -353,6 +353,7 @@
popd
# systemd stuff
install -Dm0644 60-vboxguest.rules "$pkgdir/usr/lib/udev/rules.d/60-vboxguest.rules"
+ install -Dm0644 vboxdrmclient.service "$pkgdir/usr/lib/systemd/system/vboxdrmclient.service"
install -Dm0644 vboxservice.service "$pkgdir/usr/lib/systemd/system/vboxservice.service"
install -Dm0644 virtualbox-guest-utils.sysusers "$pkgdir/usr/lib/sysusers.d/virtualbox-guest-utils.conf"
# licence
Added: vboxdrmclient.service
===================================================================
--- vboxdrmclient.service (rev 0)
+++ vboxdrmclient.service 2020-07-15 21:00:49 UTC (rev 664001)
@@ -0,0 +1,7 @@
+[Unit]
+Description=VirtualBox Guest VMSVGA resize client
+ConditionVirtualization=oracle
+ConditionPathExistsGlob=/dev/dri/renderD*
+
+[Service]
+ExecStart=/usr/bin/VBoxDRMClient
Modified: vboxservice.service
===================================================================
--- vboxservice.service 2020-07-15 20:30:55 UTC (rev 664000)
+++ vboxservice.service 2020-07-15 21:00:49 UTC (rev 664001)
@@ -1,6 +1,7 @@
[Unit]
Description=VirtualBox Guest Service
ConditionVirtualization=oracle
+Wants=vboxdrmclient.service
[Service]
ExecStartPre=-/usr/bin/modprobe vboxguest
More information about the arch-commits
mailing list