diff options
Diffstat (limited to 'system/virtualbox-addons')
-rw-r--r-- | system/virtualbox-addons/doinst.sh | 17 | ||||
-rw-r--r-- | system/virtualbox-addons/kded5rc | 2 | ||||
-rw-r--r-- | system/virtualbox-addons/plasma_enable_kscreen.sh (renamed from system/virtualbox-addons/plasma_disable_kscreen.sh) | 2 | ||||
-rw-r--r-- | system/virtualbox-addons/virtualbox-addons.SlackBuild | 16 | ||||
-rw-r--r-- | system/virtualbox-addons/virtualbox-addons.info | 6 | ||||
-rw-r--r-- | system/virtualbox-addons/virtualbox_plasma_disable_kscreen.upd | 6 | ||||
-rw-r--r-- | system/virtualbox-addons/virtualbox_plasma_enable_kscreen.upd | 6 |
7 files changed, 21 insertions, 34 deletions
diff --git a/system/virtualbox-addons/doinst.sh b/system/virtualbox-addons/doinst.sh index 97afad9c3e..57d62138c3 100644 --- a/system/virtualbox-addons/doinst.sh +++ b/system/virtualbox-addons/doinst.sh @@ -22,24 +22,13 @@ preserve_perms() { config $NEW } -# Fix starting of kde within virtualbox +# Old kwin update to fix starting kde in virtualbox. +# No longer necessary BLACKLIST="usr/share/apps/kconf_update/kwin_blacklist.upd" if [ -f "$BLACKLIST" ]; then - VBOX_TEST=$(grep -c "Blacklist-virtualbox" $BLACKLIST) -else - VBOX_TEST="0" + rm -f "$BLACKLIST" fi -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/kded5rc b/system/virtualbox-addons/kded5rc deleted file mode 100644 index f86038454f..0000000000 --- a/system/virtualbox-addons/kded5rc +++ /dev/null @@ -1,2 +0,0 @@ -[Module-kscreen] -autoload=false diff --git a/system/virtualbox-addons/plasma_disable_kscreen.sh b/system/virtualbox-addons/plasma_enable_kscreen.sh index 9971e631e1..1feca38b8a 100644 --- a/system/virtualbox-addons/plasma_disable_kscreen.sh +++ b/system/virtualbox-addons/plasma_enable_kscreen.sh @@ -1,3 +1,3 @@ #!/bin/sh -kwriteconfig5 --file kded5rc --group "Module-kscreen" --key autoload --type bool false +kwriteconfig5 --file kded5rc --group "Module-kscreen" --key autoload --type bool true diff --git a/system/virtualbox-addons/virtualbox-addons.SlackBuild b/system/virtualbox-addons/virtualbox-addons.SlackBuild index 4d5f5b002c..298cb1ef80 100644 --- a/system/virtualbox-addons/virtualbox-addons.SlackBuild +++ b/system/virtualbox-addons/virtualbox-addons.SlackBuild @@ -2,7 +2,7 @@ # Slackware build script for virtualbox-addons -# Copyright 2008-2021 Heinz Wiesinger, Amsterdam, The Netherlands +# Copyright 2008-2024 Heinz Wiesinger, Amsterdam, The Netherlands # All rights reserved. # # Redistribution and use of this script, with or without modification, is @@ -26,14 +26,14 @@ cd $(dirname $0) ; CWD=$(pwd) PRGNAM=virtualbox-addons SRCNAM=VirtualBox -VERSION=${VERSION:-6.1.26} +VERSION=${VERSION:-6.1.50} BUILD=${BUILD:-1} TAG=${TAG:-_SBo} PKGTYPE=${PKGTYPE:-tgz} if [ -z "$ARCH" ]; then case "$( uname -m )" in - i?86) ARCH=i486 ;; + i?86) ARCH=i586 ;; arm*) ARCH=arm ;; *) ARCH=$( uname -m ) ;; esac @@ -132,12 +132,12 @@ cd out/linux.$TARGET/release/bin/additions install -m 755 $CWD/vbox-uninstall-guest-additions $PKG/usr/sbin/ cd - -# kconf_update script to disable kscreen within KDE +# We disabled kscreen in earlier versions of the package +# This kconf_update script re-enabled it # See bug at https://bugs.kde.org/show_bug.cgi?id=407058 -mkdir -p $PKG/usr/share/kconf_update $PKG/etc/kde/xdg -install -m 755 $CWD/plasma_disable_kscreen.sh $PKG/usr/share/kconf_update/ -install -m 644 $CWD/virtualbox_plasma_disable_kscreen.upd $PKG/usr/share/kconf_update/ -install -m 644 $CWD/kded5rc $PKG/etc/kde/xdg/ +mkdir -p $PKG/usr/share/kconf_update +install -m 755 $CWD/plasma_enable_kscreen.sh $PKG/usr/share/kconf_update/ +install -m 644 $CWD/virtualbox_plasma_enable_kscreen.upd $PKG/usr/share/kconf_update/ find $PKG -print0 | xargs -0 file | grep -e "executable" -e "shared object" | grep ELF \ | cut -f 1 -d : | xargs strip --strip-unneeded 2> /dev/null || true diff --git a/system/virtualbox-addons/virtualbox-addons.info b/system/virtualbox-addons/virtualbox-addons.info index 4e8e1aefde..fd54bba65c 100644 --- a/system/virtualbox-addons/virtualbox-addons.info +++ b/system/virtualbox-addons/virtualbox-addons.info @@ -1,8 +1,8 @@ PRGNAM="virtualbox-addons" -VERSION="6.1.26" +VERSION="6.1.50" HOMEPAGE="https://www.virtualbox.org" -DOWNLOAD="http://download.virtualbox.org/virtualbox/6.1.26/VirtualBox-6.1.26.tar.bz2" -MD5SUM="fce04bbef244b4df1a50e53d132d3e6f" +DOWNLOAD="http://download.virtualbox.org/virtualbox/6.1.50/VirtualBox-6.1.50.tar.bz2" +MD5SUM="57073540cb522ded3ad142c7f1fb01ac" DOWNLOAD_x86_64="" MD5SUM_x86_64="" REQUIRES="" diff --git a/system/virtualbox-addons/virtualbox_plasma_disable_kscreen.upd b/system/virtualbox-addons/virtualbox_plasma_disable_kscreen.upd deleted file mode 100644 index d1706fdbf3..0000000000 --- a/system/virtualbox-addons/virtualbox_plasma_disable_kscreen.upd +++ /dev/null @@ -1,6 +0,0 @@ -Version=5 - -# Disable kscreen inside virtualbox -Id=virtualbox-plasma-disable-kscreen -File=kded5rc -Script=plasma_disable_kscreen.sh,sh diff --git a/system/virtualbox-addons/virtualbox_plasma_enable_kscreen.upd b/system/virtualbox-addons/virtualbox_plasma_enable_kscreen.upd new file mode 100644 index 0000000000..804ad42f74 --- /dev/null +++ b/system/virtualbox-addons/virtualbox_plasma_enable_kscreen.upd @@ -0,0 +1,6 @@ +Version=5 + +# Enable kscreen inside virtualbox +Id=virtualbox-plasma-enable-kscreen +File=kded5rc +Script=plasma_enable_kscreen.sh,sh |