summaryrefslogtreecommitdiffstats
path: root/system
diff options
context:
space:
mode:
author Matteo Bernardini2021-10-21 17:57:45 +0200
committer Willy Sudiarto Raharjo2021-10-22 08:03:40 +0200
commitaf916950852b8c1220adfe00d136cbb561f1ea17 (patch)
tree6430a79b15b3ce77ee8393c15db3b342d2df9ee2 /system
parenta8b18fc081588e0495f704e6eea6c56c77609fc6 (diff)
downloadslackbuilds-af916950852b8c1220adfe00d136cbb561f1ea17.tar.gz
system/virtualbox: Updated for version 6.1.28, detect python 3.10.
Signed-off-by: Matteo Bernardini <ponce@slackbuilds.org> Signed-off-by: Willy Sudiarto Raharjo <willysr@slackbuilds.org>
Diffstat (limited to 'system')
-rw-r--r--system/virtualbox/configure.patch15
-rw-r--r--system/virtualbox/virtualbox.SlackBuild12
-rw-r--r--system/virtualbox/virtualbox.info18
3 files changed, 13 insertions, 32 deletions
diff --git a/system/virtualbox/configure.patch b/system/virtualbox/configure.patch
deleted file mode 100644
index b9cc5c96d6..0000000000
--- a/system/virtualbox/configure.patch
+++ /dev/null
@@ -1,15 +0,0 @@
-diff -Naur VirtualBox-6.1.26.orig/configure VirtualBox-6.1.26/configure
---- VirtualBox-6.1.26.orig/configure 2021-07-28 18:13:45.000000000 +0200
-+++ VirtualBox-6.1.26/configure 2021-08-20 18:43:20.615000000 +0200
-@@ -1561,9 +1561,9 @@
- qt5_ver=`pkg-config Qt5Core --modversion 2>> $LOG`
- if [ $? -eq 0 ]; then
- echo "(Qt5 from pkg-config)" >> $LOG
-- FLGQT5=`pkg-config Qt5Core Qt5Gui --cflags`
-+ FLGQT5=`pkg-config Qt5Core --cflags`
- # gcc 4.8 is able to compile with C++11 (see also VBOX_GCC_std in Config.kmk)
-- [ $(($cc_maj * 100 + $cc_min)) -ge 408 ] && FLGQT5="$FLGQT5 -std=c++11"
-+ FLGQT5="$FLGQT5 -std=c++11"
- INCQT5=`strip_I "$FLGQT5"`
- LIBDIR5=`pkg-config Qt5Core --variable=libdir`
- LIBQT5=`pkg-config Qt5Core Qt5Gui --libs`
diff --git a/system/virtualbox/virtualbox.SlackBuild b/system/virtualbox/virtualbox.SlackBuild
index ddedab4817..bc9c56e385 100644
--- a/system/virtualbox/virtualbox.SlackBuild
+++ b/system/virtualbox/virtualbox.SlackBuild
@@ -27,8 +27,8 @@ cd $(dirname $0) ; CWD=$(pwd)
PRGNAM=virtualbox
SRCNAM=VirtualBox
-VERSION=${VERSION:-6.1.26}
-BUILD=${BUILD:-2}
+VERSION=${VERSION:-6.1.28}
+BUILD=${BUILD:-1}
TAG=${TAG:-_SBo}
PKGTYPE=${PKGTYPE:-tgz}
@@ -127,12 +127,8 @@ patch -d src/VBox/Installer/linux -i $CWD/vboxdrv.sh-setup.diff
# Fix wrong path to rdesktop-vrdp-keymaps
patch -p1 -i $CWD/006-rdesktop-vrdp-keymap-path.patch
-# Skip python2 detection
-sed -i 's|python2.7 python2.6 ||' ./configure
-
-# Remove gcc version check and fix the qt5 flags
-sed -i 's/^check_gcc$/#check_gcc/' ./configure
-patch -p1 < $CWD/configure.patch
+# Skip python2 detection and cheat about python-3.10 support
+sed -i 's|python2.7 python2.6 |python3.10 |' ./configure
# Use our CFLAGS
sed -i "s|CXX_FLAGS=\"\"|CXX_FLAGS=\"$SLKCFLAGS -std=c++11\"|" ./configure
diff --git a/system/virtualbox/virtualbox.info b/system/virtualbox/virtualbox.info
index 605b09076e..c13034bef2 100644
--- a/system/virtualbox/virtualbox.info
+++ b/system/virtualbox/virtualbox.info
@@ -1,14 +1,14 @@
PRGNAM="virtualbox"
-VERSION="6.1.26"
+VERSION="6.1.28"
HOMEPAGE="https://www.virtualbox.org"
-DOWNLOAD="http://download.virtualbox.org/virtualbox/6.1.26/VirtualBox-6.1.26.tar.bz2 \
- http://download.virtualbox.org/virtualbox/6.1.26/VBoxGuestAdditions_6.1.26.iso \
- http://download.virtualbox.org/virtualbox/6.1.26/UserManual.pdf \
- http://download.virtualbox.org/virtualbox/6.1.26/SDKRef.pdf"
-MD5SUM="fce04bbef244b4df1a50e53d132d3e6f \
- cab53b0d504e08d155a8f95878b2afc1 \
- b84b95683c73e84c1c59d252106b4706 \
- b4f1f29b1b97d358df416ec9a008f671"
+DOWNLOAD="http://download.virtualbox.org/virtualbox/6.1.28/VirtualBox-6.1.28.tar.bz2 \
+ http://download.virtualbox.org/virtualbox/6.1.28/VBoxGuestAdditions_6.1.28.iso \
+ http://download.virtualbox.org/virtualbox/6.1.28/UserManual.pdf \
+ http://download.virtualbox.org/virtualbox/6.1.28/SDKRef.pdf"
+MD5SUM="c6efae8dc115b90c6124e13126794c4f \
+ 44872fc7ad7eff85c07cf243a26eaf34 \
+ 3e570d88c82c81c9ba8123aa08fdfb54 \
+ a5b78b44ae49578d32e00e75b3db5fd9"
DOWNLOAD_x86_64=""
MD5SUM_x86_64=""
REQUIRES="acpica virtualbox-kernel"