aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--system/virtualbox-addons/doinst.sh7
-rw-r--r--system/virtualbox-addons/virtualbox-addons.SlackBuild10
-rw-r--r--system/virtualbox-addons/virtualbox-addons.info6
3 files changed, 10 insertions, 13 deletions
diff --git a/system/virtualbox-addons/doinst.sh b/system/virtualbox-addons/doinst.sh
index e4d34e9ebd8d6..9af312d442182 100644
--- a/system/virtualbox-addons/doinst.sh
+++ b/system/virtualbox-addons/doinst.sh
@@ -23,12 +23,17 @@ preserve_perms() {
}
# Fix starting of kde within virtualbox
-cat << EOF >> usr/share/apps/kconf_update/kwin_blacklist.upd
+BLACKLIST="usr/share/apps/kconf_update/kwin_blacklist.upd"
+VBOX_TEST=$(grep -c "Blacklist-virtualbox" $BLACKLIST)
+
+if [ "$VBOX_TEST" = "0" ]; then
+cat << EOF >> $BLACKLIST
Id=Blacklist-virtualbox
Options=overwrite
File=kwinrc
Script=kwin_blacklist_vbox.sh,sh
EOF
+fi
preserve_perms etc/rc.d/rc.vboxadd.new
preserve_perms etc/rc.d/rc.vboxadd-service.new
diff --git a/system/virtualbox-addons/virtualbox-addons.SlackBuild b/system/virtualbox-addons/virtualbox-addons.SlackBuild
index 6d1aadccfe415..ac3899527733b 100644
--- a/system/virtualbox-addons/virtualbox-addons.SlackBuild
+++ b/system/virtualbox-addons/virtualbox-addons.SlackBuild
@@ -24,7 +24,7 @@
PRGNAM=virtualbox-addons
SRCNAM=VirtualBox
-VERSION=4.0.8
+VERSION=4.1.4
BUILD=${BUILD:-1}
TAG=${TAG:-_SBo}
@@ -120,12 +120,6 @@ echo "KERNEL==\"vboxguest\", NAME=\"vboxguest\", OWNER=\"vboxadd\", MODE=\"0660\
echo "KERNEL==\"vboxuser\", NAME=\"vboxuser\", OWNER=\"vboxadd\", MODE=\"0666\"" \
>> $PKG/lib/udev/rules.d/60-vboxadd.rules
-install -m 644 src/VBox/Additions/linux/installer/70-xorg-vboxmouse.rules \
- $PKG/lib/udev/rules.d/
-
-install -m 644 src/VBox/Additions/x11/Installer/50-vboxmouse.conf \
- $PKG/etc/X11/xorg.conf.d/
-
cd out/linux.$TARGET/release/bin/additions
cp -rf src/vboxguest $PKG/usr/src/vboxguest-$VERSION
cp -rf src/vboxsf $PKG/usr/src/vboxsf-$VERSION
@@ -136,8 +130,6 @@ cd out/linux.$TARGET/release/bin/additions
install -m 4755 mount.vboxsf $PKG/sbin/mount.vboxsf
install -m 644 vboxvideo_drv_$XSERVER.so \
$PKG/usr/lib$LIBDIRSUFFIX/xorg/modules/drivers/vboxvideo_drv.so
- install -m 644 vboxmouse_drv_$XSERVER.so \
- $PKG/usr/lib$LIBDIRSUFFIX/xorg/modules/input/vboxmouse_drv.so
install -m 644 VBoxOGLcrutil.so $PKG/usr/lib$LIBDIRSUFFIX
install -m 644 VBoxOGLerrorspu.so $PKG/usr/lib$LIBDIRSUFFIX
diff --git a/system/virtualbox-addons/virtualbox-addons.info b/system/virtualbox-addons/virtualbox-addons.info
index 0eb0971d805fd..5926a60200fe8 100644
--- a/system/virtualbox-addons/virtualbox-addons.info
+++ b/system/virtualbox-addons/virtualbox-addons.info
@@ -1,8 +1,8 @@
PRGNAM="virtualbox-addons"
-VERSION="4.0.8"
+VERSION="4.1.4"
HOMEPAGE="http://www.virtualbox.org"
-DOWNLOAD="http://download.virtualbox.org/virtualbox/4.0.8/VirtualBox-4.0.8.tar.bz2"
-MD5SUM="a3e81289f2357fcf4bbe3e77805f38b6"
+DOWNLOAD="http://download.virtualbox.org/virtualbox/4.1.4/VirtualBox-4.1.4.tar.bz2"
+MD5SUM="dc6e6801b3823332b6ca2e9915221aae"
DOWNLOAD_x86_64="UNTESTED"
MD5SUM_x86_64=""
MAINTAINER="Heinz Wiesinger"