summarylogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--.SRCINFO6
-rw-r--r--018-xclient.patch24
-rw-r--r--PKGBUILD10
3 files changed, 6 insertions, 34 deletions
diff --git a/.SRCINFO b/.SRCINFO
index 44c43fc4e0ca..b721f6a08c05 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,6 +1,6 @@
pkgbase = virtualbox-svn
- pkgver = 92314
- pkgrel = 1
+ pkgver = 93465
+ pkgrel = 2
url = http://virtualbox.org
arch = x86_64
license = GPL
@@ -65,7 +65,6 @@ pkgbase = virtualbox-svn
source = 012-vbglR3GuestCtrlDetectPeekGetCancelSupport.patch
source = 013-Makefile.patch
source = 017-fix-narrowing-conversion.patch
- source = 018-xclient.patch
sha256sums = SKIP
sha256sums = 76d98ea062fcad9e5e3fa981d046a6eb12a3e718a296544a68b66f4b65cb56db
sha256sums = 2101ebb58233bbfadf3aa74381f22f7e7e508559d2b46387114bc2d8e308554c
@@ -87,7 +86,6 @@ pkgbase = virtualbox-svn
sha256sums = 81900e13d36630488accd8c0bfd2ceb69563fb2c4f0f171caba1cca59d438024
sha256sums = fb21aafdc0bc14312b9618ebd7550cb7ecf2228486a121c75a0d94bf90ba54fb
sha256sums = 5aac692909a0a0ec56b08bdece9e42cf7463abdca9da2f990d441ff463be6a99
- sha256sums = cac5a573e9ed5aafb2f469c2e6fffb8cd4f389bbadba5a968c9f65be7a72fee3
pkgname = virtualbox-svn
pkgdesc = Powerful x86 virtualization for enterprise as well as home use
diff --git a/018-xclient.patch b/018-xclient.patch
deleted file mode 100644
index 411c85d1b9ef..000000000000
--- a/018-xclient.patch
+++ /dev/null
@@ -1,24 +0,0 @@
---- 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
diff --git a/PKGBUILD b/PKGBUILD
index 5a8c2d904b40..d7c03cf7201b 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -9,8 +9,8 @@ pkgname=('virtualbox-svn'
'virtualbox-guest-utils-svn'
'virtualbox-guest-utils-nox-svn'
'virtualbox-ext-vnc-svn')
-pkgver=92314
-pkgrel=1
+pkgver=93465
+pkgrel=2
arch=('x86_64')
url='http://virtualbox.org'
license=('GPL' 'custom')
@@ -73,8 +73,7 @@ source=("VirtualBox::svn+http://www.virtualbox.org/svn/vbox/trunk"
'009-i3wm.patch'
'012-vbglR3GuestCtrlDetectPeekGetCancelSupport.patch'
'013-Makefile.patch'
- '017-fix-narrowing-conversion.patch'
- '018-xclient.patch')
+ '017-fix-narrowing-conversion.patch')
pkgver() {
cd "VirtualBox"
@@ -361,5 +360,4 @@ sha256sums=('SKIP'
'cd83f4c9f3befb344c7e143aec65550444647890b676d6ea8502d67c7c1b3d93'
'81900e13d36630488accd8c0bfd2ceb69563fb2c4f0f171caba1cca59d438024'
'fb21aafdc0bc14312b9618ebd7550cb7ecf2228486a121c75a0d94bf90ba54fb'
- '5aac692909a0a0ec56b08bdece9e42cf7463abdca9da2f990d441ff463be6a99'
- 'cac5a573e9ed5aafb2f469c2e6fffb8cd4f389bbadba5a968c9f65be7a72fee3')
+ '5aac692909a0a0ec56b08bdece9e42cf7463abdca9da2f990d441ff463be6a99')