VBoxClient no longer needs root it seems

5 files changed, 25 insertions, 47 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 6952c1dbf260..15810ca8db18 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,35 +1,29 @@
 pkgbase = virtualbox-guest-dkms-vmsvga
 	pkgdesc = VirtualBox Guest kernel modules sources (VMSVGA resize and multi-head fix)
 	pkgver = 6.1.10
-	pkgrel = 1
+	pkgrel = 2
 	url = https://virtualbox.org/
-	install = virtualbox-guest-dkms-vmsvga.install
 	arch = x86_64
 	license = GPL
 	license = custom
 	depends = dkms
 	depends = gcc
 	depends = make
-	depends = virtualbox-guest-utils
 	optdepends = linux-headers: build modules against Arch kernel
 	optdepends = linux-lts-headers: build modules against LTS kernel
 	optdepends = linux-zen-headers: build modules against ZEN kernel
 	provides = VIRTUALBOX-GUEST-MODULES
 	conflicts = virtualbox-archlinux-source
-	conflicts = virtualbox-guest-source
 	conflicts = virtualbox-guest-dkms
-	replaces = virtualbox-archlinux-source
-	replaces = virtualbox-guest-source
-	replaces = virtualbox-guest-modules-lts
-	replaces = virtualbox-guest-dkms
+	conflicts = virtualbox-guest-source
 	source = https://download.virtualbox.org/virtualbox/6.1.10/VirtualBox-6.1.10.tar.bz2
 	source = LocalConfig.kmk
+	source = vboxvmsvga.desktop
 	source = virtualbox-guest-dkms-vmsvga.conf
-	source = vboxvmsvga.service
 	sha256sums = 37d8b30c0be82a50c858f3fc70cde967882239b6212bb32e138d3615b423c477
 	sha256sums = 2be313b98bffde482aad93b00c419f1d5f7645fd9e6053175ffb0d925067f96a
+	sha256sums = 4404a95eb6f5c30683625e870fe7a26e562200c2220728d0c14151dbf9667e36
 	sha256sums = edd0492f0706e03169cdf3654658ea650687c30967ca5e32fde19d43e3dd4e5e
-	sha256sums = b6da21bfbc2d452aa8e2ae5c118ec8ed8b87ad6d86000e6b27f28c098b9871ca
 
 pkgname = virtualbox-guest-dkms-vmsvga
 
diff --git a/PKGBUILD b/PKGBUILD
index a5a5d64dfbfc..94464dfafe64 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -2,35 +2,27 @@
 
 pkgname=virtualbox-guest-dkms-vmsvga
 pkgver=6.1.10
-pkgrel=1
+pkgrel=2
 pkgdesc='VirtualBox Guest kernel modules sources (VMSVGA resize and multi-head fix)'
 arch=('x86_64')
 url='https://virtualbox.org/'
 license=('GPL' 'custom')
-depends=('dkms' 'gcc' 'make' 'virtualbox-guest-utils')
+depends=('dkms' 'gcc' 'make')
 optdepends=('linux-headers: build modules against Arch kernel'
             'linux-lts-headers: build modules against LTS kernel'
             'linux-zen-headers: build modules against ZEN kernel')
 provides=('VIRTUALBOX-GUEST-MODULES')
 conflicts=('virtualbox-archlinux-source'
-           'virtualbox-guest-source'
-           'virtualbox-guest-dkms')
-replaces=('virtualbox-archlinux-source'
-          'virtualbox-guest-source'
-          'virtualbox-guest-modules-lts'
-          'virtualbox-guest-dkms')
-optdepends=('linux-headers: build modules against Arch kernel'
-            'linux-lts-headers: build modules against LTS kernel'
-            'linux-zen-headers: build modules against ZEN kernel')
-install=virtualbox-guest-dkms-vmsvga.install
+           'virtualbox-guest-dkms'
+           'virtualbox-guest-source')
 source=("https://download.virtualbox.org/virtualbox/${pkgver}/VirtualBox-${pkgver}.tar.bz2"
         'LocalConfig.kmk'
-        'virtualbox-guest-dkms-vmsvga.conf'
-        'vboxvmsvga.service')
+        'vboxvmsvga.desktop'
+        'virtualbox-guest-dkms-vmsvga.conf')
 sha256sums=('37d8b30c0be82a50c858f3fc70cde967882239b6212bb32e138d3615b423c477'
             '2be313b98bffde482aad93b00c419f1d5f7645fd9e6053175ffb0d925067f96a'
-            'edd0492f0706e03169cdf3654658ea650687c30967ca5e32fde19d43e3dd4e5e'
-            'b6da21bfbc2d452aa8e2ae5c118ec8ed8b87ad6d86000e6b27f28c098b9871ca')
+            '4404a95eb6f5c30683625e870fe7a26e562200c2220728d0c14151dbf9667e36'
+            'edd0492f0706e03169cdf3654658ea650687c30967ca5e32fde19d43e3dd4e5e')
 
 prepare() {
   cd "VirtualBox-$pkgver"
@@ -67,8 +59,8 @@ package() {
   install -d -m0755 "$pkgdir/usr/lib/modules-load.d"
   printf 'vboxguest\nvboxsf\nvboxvideo\n' > "$pkgdir/usr/lib/modules-load.d/$pkgname.conf"
 
-  # systemd unit
-  install -D -m0644 "$srcdir/vboxvmsvga.service" "$pkgdir/usr/lib/systemd/system/vboxvmsvga.service"
+  # autostart
+  install -D -m0644 "$srcdir/vboxvmsvga.desktop" "$pkgdir/etc/xdg/autostart/vboxvmsvga.desktop"
 
   # license
   install -D -m0644 "$srcdir/VirtualBox-$pkgver/COPYING" "$pkgdir/usr/share/licenses/$pkgname/LICENSE"
diff --git a/vboxvmsvga.desktop b/vboxvmsvga.desktop
new file mode 100644
index 000000000000..076241faa1e7
--- /dev/null
+++ b/vboxvmsvga.desktop
@@ -0,0 +1,11 @@
+[Desktop Entry]
+Type=Application
+Encoding=UTF-8
+Version=1.0
+Name=vboxvmsvga
+Name[C]=vboxvmsvga
+Comment[C]=VirtualBox VMSVGA Services
+Comment=VirtualBox VMSVGA Services
+Exec=/usr/bin/VBoxClient --vmsvga
+X-GNOME-Autostart-enabled=true
+X-KDE-autostart-after=panel
diff --git a/vboxvmsvga.service b/vboxvmsvga.service
deleted file mode 100644
index 8a48a4043cad..000000000000
--- a/vboxvmsvga.service
+++ /dev/null
@@ -1,10 +0,0 @@
-[Unit]
-Description=VirtualBox VMSVGA Service
-ConditionVirtualization=oracle
-After=vboxservice.service
-
-[Service]
-ExecStart=/usr/bin/VBoxClient -f --vmsvga
-
-[Install]
-WantedBy=graphical.target
diff --git a/virtualbox-guest-dkms-vmsvga.install b/virtualbox-guest-dkms-vmsvga.install
deleted file mode 100644
index 8bbc2d1edda3..000000000000
--- a/virtualbox-guest-dkms-vmsvga.install
+++ /dev/null
@@ -1,9 +0,0 @@
-#! /bin/bash
-
-post_install() {
-  echo '==> The vboxvmsvga service must be started for auto-resize to work with the VMSVGA adapter.'
-}
-
-post_upgrade() {
-  post_install $1
-}