diff options
| -rw-r--r-- | .SRCINFO | 6 | ||||
| -rw-r--r-- | 018-upate-xclient-script.patch | 18 | ||||
| -rw-r--r-- | PKGBUILD | 12 |
3 files changed, 20 insertions, 16 deletions
@@ -1,5 +1,5 @@ pkgbase = virtualbox-svn - pkgver = 101318 + pkgver = 102693 pkgrel = 2 url = http://virtualbox.org arch = x86_64 @@ -67,7 +67,6 @@ pkgbase = virtualbox-svn source = 012-vbglR3GuestCtrlDetectPeekGetCancelSupport.patch source = 013-support-building-from-dkms.patch source = 018-upate-xclient-script.patch - source = 020-python-3-11.patch sha256sums = SKIP sha256sums = 76d98ea062fcad9e5e3fa981d046a6eb12a3e718a296544a68b66f4b65cb56db sha256sums = 2101ebb58233bbfadf3aa74381f22f7e7e508559d2b46387114bc2d8e308554c @@ -87,8 +86,7 @@ pkgbase = virtualbox-svn sha256sums = 5c4b237839a52a18b39d996b37de9d2f9d0ee621c162956cf4424122429094d3 sha256sums = 81900e13d36630488accd8c0bfd2ceb69563fb2c4f0f171caba1cca59d438024 sha256sums = 00f68b86d32a1fada900c2da8dad2ab4215106cd58004f049bded99727cda2ff - sha256sums = 87dddfd9047480e4c2b73367facf5dd3702148418c2efcd606af17c07da90fe0 - sha256sums = aede7737a19dcff6908d216a4490f7b6a5640fb3a2d3e9200d4875133e8f1e4b + sha256sums = b6193d22ee7c1726ea4d468b18640454b8e4f2784479073a0044e45dca4e516d pkgname = virtualbox-svn pkgdesc = Powerful x86 virtualization for enterprise as well as home use diff --git a/018-upate-xclient-script.patch b/018-upate-xclient-script.patch index eeb5e0e878a7..a3bc39ddd91f 100644 --- a/018-upate-xclient-script.patch +++ b/018-upate-xclient-script.patch @@ -11,10 +11,10 @@ diff --git a/src/VBox/Additions/x11/Installer/98vboxadd-xclient b/src/VBox/Addit index 7c9b5989..271261a4 100755 --- a/src/VBox/Additions/x11/Installer/98vboxadd-xclient +++ b/src/VBox/Additions/x11/Installer/98vboxadd-xclient -@@ -31,18 +31,11 @@ for i in $HOME/.vboxclient-*.pid; do +@@ -31,16 +31,9 @@ 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, @@ -24,12 +24,16 @@ index 7c9b5989..271261a4 100755 - # 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-session # In case VMSVGA emulation is enabled + # Check wheather X11 or Wayland version of VBoxClient should be started. + vbox_wl_check=$(/usr/bin/vboxwl --check 2> /dev/null) + if test "$vbox_wl_check" = "WL"; then +@@ -52,5 +45,4 @@ elif test -z "${SSH_CONNECTION}"; then + fi + + /usr/bin/VBoxClient --checkhostversion +- /usr/bin/VBoxClient --vmsvga-session # In case VMSVGA emulation is enabled fi @@ -9,7 +9,7 @@ pkgname=('virtualbox-svn' 'virtualbox-guest-utils-svn' 'virtualbox-guest-utils-nox-svn' 'virtualbox-ext-vnc-svn') -pkgver=101318 +pkgver=102693 _tarver=${pkgver} pkgrel=2 arch=('x86_64') @@ -76,8 +76,8 @@ source=("VirtualBox::svn+http://www.virtualbox.org/svn/vbox/trunk" '009-properly-handle-i3wm.patch' '012-vbglR3GuestCtrlDetectPeekGetCancelSupport.patch' '013-support-building-from-dkms.patch' - '018-upate-xclient-script.patch' - '020-python-3-11.patch') + '018-upate-xclient-script.patch') + #'020-python-3-11.patch') pkgver() { cd "VirtualBox" @@ -98,6 +98,9 @@ prepare() { done sed -i '1 a #include<cstdint>' src/libs/dxvk-native-1.9.2a/src/util/util_bit.h + sed -i 's/xmlErrorPtr aErr/const xmlError* aErr/g' src/VBox/Runtime/r3/xml.cpp + sed -i 's/xmlErrorPtr error/const _xmlError* error/g' src/VBox/Runtime/r3/xml.cpp + sed -i 's/xmlErrorPtr aErr/const xmlError* aErr/g' include/iprt/cpp/xml.h echo 'Applying local config' cp "$srcdir/LocalConfig.kmk" . @@ -363,5 +366,4 @@ sha256sums=('SKIP' '5c4b237839a52a18b39d996b37de9d2f9d0ee621c162956cf4424122429094d3' '81900e13d36630488accd8c0bfd2ceb69563fb2c4f0f171caba1cca59d438024' '00f68b86d32a1fada900c2da8dad2ab4215106cd58004f049bded99727cda2ff' - '87dddfd9047480e4c2b73367facf5dd3702148418c2efcd606af17c07da90fe0' - 'aede7737a19dcff6908d216a4490f7b6a5640fb3a2d3e9200d4875133e8f1e4b') + 'b6193d22ee7c1726ea4d468b18640454b8e4f2784479073a0044e45dca4e516d') |