Date: Wednesday, June 13, 2018 @ 20:16:38
Author: eworm
Revision: 342939
switch to python 3.x (FS#58986)
Modified:
virtualbox/trunk/LocalConfig.kmk
virtualbox/trunk/PKGBUILD
-----------------+
LocalConfig.kmk | 2 +-
PKGBUILD | 14 +++++++-------
2 files changed, 8 insertions(+), 8 deletions(-)
Modified: LocalConfig.kmk
===================================================================
--- LocalConfig.kmk 2018-06-13 19:27:54 UTC (rev 342938)
+++ LocalConfig.kmk 2018-06-13 20:16:38 UTC (rev 342939)
@@ -15,7 +15,7 @@
VBOX_PATH_APP_PRIVATE := /usr/share/virtualbox
VBOX_PATH_APP_DOCS := /usr/share/doc/virtualbox
VBOX_PATH_PACKAGE_DOCS := $(VBOX_PATH_APP_DOCS)
-VBOX_BLD_PYTHON = python2
+VBOX_BLD_PYTHON = python
VBOX_JAVA_HOME = /usr/lib/jvm/java-7-openjdk
# do not fail on warning
Modified: PKGBUILD
===================================================================
--- PKGBUILD 2018-06-13 19:27:54 UTC (rev 342938)
+++ PKGBUILD 2018-06-13 20:16:38 UTC (rev 342939)
@@ -42,7 +42,7 @@
'libxtst'
'linux-headers'
'mesa'
- 'python2'
+ 'python'
'qt5-base'
'qt5-x11extras'
'qt5-tools'
@@ -72,7 +72,7 @@
'002-dri-driver-path.patch'
'005-gsoap-build.patch'
'006-rdesktop-vrdp-keymap-path.patch'
- '007-python2-path.patch'
+ '007-python3.6-support.patch'
'008-no-vboxvideo.patch'
'009-include-path.patch'
'010-qt-5.11.patch'
@@ -89,7 +89,7 @@
'da4c49f6ca94e047e196cdbcba2c321199f4760056ea66e0fbc659353e128c9e'
'9c5238183019f9ebc7d92a8582cad232f471eab9d3278786225abc1a1c7bf66e'
'033c597e0f5285d2ddb0490868e5b6f945f45c7b1b1152a02a9e6fea438b2c95'
- '0105ce26b79dbe533085423decf042ac0f5e6aa28edb5e6a9bc713cca2ab04c5'
+ '918fe3ae7d60550181bcefedb55621f2c824087062c0df6ad03d148ed3f2ba01'
'94a808f46909a51b2d0cf2c6e0a6c9dea792034943e6413bf9649a036c921b21'
'01dbb921bd57a852919cc78be5b73580a564f28ebab2fe8d6c9b8301265cbfce'
'e6e875ef186578b53106d7f6af48e426cdaf1b4e86834f01696b8ef1c685787f'
@@ -97,7 +97,7 @@
'f67674931c30187f867233e3a4ae662f93c9110fbd0bfce50dd9f391f4533bc0'
'7d2da8fe10a90f76bbfc80ad1f55df4414f118cd10e10abfb76070326abebd46'
'5d5af2de5b1f1c61ec793503350f2440661cf8fd640f11b8a86f10bce499c0dc'
- '6bdb017459532537199c399eefd3d84d8dc7f1786e79997caebd3b6eb5c75d9f'
+ '802c3f9bf0a19b10056c375c5c7c5eb4aba14300446acefab3dbd5de366ada2b'
'8b7f241107863f82a5b0ae336aead0b3366a40103ff72dbebf33f54b512a0cbc'
'1acc7014bcb3d9ca6da29eed813c3d6e91a688c43f9d93802fd4e3814f67ace4'
'c6ef35e6893d557c7c2269ff79bc299fe9058cfb2c933a7efdc7a8a7b6d9c5da'
@@ -155,7 +155,7 @@
package_virtualbox() {
pkgdesc='Powerful x86 virtualization for enterprise as well as home use'
- depends=('glibc' 'openssl' 'curl' 'gcc-libs' 'libpng' 'python2' 'sdl'
+ depends=('glibc' 'openssl' 'curl' 'gcc-libs' 'libpng' 'python' 'sdl'
'libvpx' 'libxml2' 'procps-ng' 'shared-mime-info' 'zlib'
'libxcursor' 'libxinerama' 'libx11' 'libxext' 'libxmu' 'libxt'
'qt5-base' 'qt5-x11extras' 'VIRTUALBOX-HOST-MODULES')
@@ -250,7 +250,7 @@
package_virtualbox-sdk() {
pkgdesc='VirtualBox Software Developer Kit (SDK)'
- depends=('python2')
+ depends=('python')
install -dm755 "$pkgdir/usr/lib/virtualbox"
@@ -260,7 +260,7 @@
install -Dm755 vboxshell.py "$pkgdir/usr/lib/virtualbox/vboxshell.py"
# python sdk
pushd sdk/installer
- VBOX_INSTALL_PATH="/usr/lib/virtualbox" python2 vboxapisetup.py install
--root "$pkgdir"
+ VBOX_INSTALL_PATH="/usr/lib/virtualbox" python vboxapisetup.py install
--root "$pkgdir"
popd
cp -r sdk "$pkgdir/usr/lib/virtualbox"
rm -r "$pkgdir/usr/lib/virtualbox/sdk/installer"
