|
|
|
@@ -1,8 +1,8 @@
|
|
|
|
|
Index: VirtualBox-5.2.12/configure
|
|
|
|
|
Index: VirtualBox-5.2.16/configure
|
|
|
|
|
===================================================================
|
|
|
|
|
--- VirtualBox-5.2.12.orig/configure
|
|
|
|
|
+++ VirtualBox-5.2.12/configure
|
|
|
|
|
@@ -1953,17 +1953,17 @@ extern "C" int main(void)
|
|
|
|
|
--- VirtualBox-5.2.16.orig/configure
|
|
|
|
|
+++ VirtualBox-5.2.16/configure
|
|
|
|
|
@@ -1959,17 +1959,17 @@ extern "C" int main(void)
|
|
|
|
|
{
|
|
|
|
|
Py_Initialize();
|
|
|
|
|
printf("found version %s", PY_VERSION);
|
|
|
|
@@ -18,16 +18,16 @@ Index: VirtualBox-5.2.12/configure
|
|
|
|
|
}
|
|
|
|
|
EOF
|
|
|
|
|
found=
|
|
|
|
|
- SUPPYTHONLIBS="python2.7 python2.6 python3.1 python3.2 python3.3 python3.4 python3.4m python3.5 python3.5m"
|
|
|
|
|
+ SUPPYTHONLIBS="python3.6m"
|
|
|
|
|
- SUPPYTHONLIBS="python2.7 python2.6 python3.1 python3.2 python3.3 python3.4 python3.4m python3.5 python3.5m python3.6 python3.6m"
|
|
|
|
|
+ SUPPYTHONLIBS="python3.6m python3.6 python3.6m"
|
|
|
|
|
for p in $PYTHONDIR; do
|
|
|
|
|
for d in $SUPPYTHONLIBS; do
|
|
|
|
|
for b in lib/x86_64-linux-gnu lib/i386-linux-gnu lib64 lib/64 lib; do
|
|
|
|
|
Index: VirtualBox-5.2.12/src/VBox/Installer/linux/routines.sh
|
|
|
|
|
Index: VirtualBox-5.2.16/src/VBox/Installer/linux/routines.sh
|
|
|
|
|
===================================================================
|
|
|
|
|
--- VirtualBox-5.2.12.orig/src/VBox/Installer/linux/routines.sh
|
|
|
|
|
+++ VirtualBox-5.2.12/src/VBox/Installer/linux/routines.sh
|
|
|
|
|
@@ -367,8 +367,8 @@ terminate_proc() {
|
|
|
|
|
--- VirtualBox-5.2.16.orig/src/VBox/Installer/linux/routines.sh
|
|
|
|
|
+++ VirtualBox-5.2.16/src/VBox/Installer/linux/routines.sh
|
|
|
|
|
@@ -375,8 +375,8 @@ terminate_proc() {
|
|
|
|
|
maybe_run_python_bindings_installer() {
|
|
|
|
|
VBOX_INSTALL_PATH="${1}"
|
|
|
|
|
|
|
|
|
@@ -38,10 +38,10 @@ Index: VirtualBox-5.2.12/src/VBox/Installer/linux/routines.sh
|
|
|
|
|
if sys.version_info >= (2, 6):
|
|
|
|
|
print \"test\"' 2> /dev/null`" != "test" ]; then
|
|
|
|
|
echo 1>&2 "Python 2.6 or later not available, skipping bindings installation."
|
|
|
|
|
Index: VirtualBox-5.2.12/src/bldprogs/scm.cpp
|
|
|
|
|
Index: VirtualBox-5.2.16/src/bldprogs/scm.cpp
|
|
|
|
|
===================================================================
|
|
|
|
|
--- VirtualBox-5.2.12.orig/src/bldprogs/scm.cpp
|
|
|
|
|
+++ VirtualBox-5.2.12/src/bldprogs/scm.cpp
|
|
|
|
|
--- VirtualBox-5.2.16.orig/src/bldprogs/scm.cpp
|
|
|
|
|
+++ VirtualBox-5.2.16/src/bldprogs/scm.cpp
|
|
|
|
|
@@ -2031,7 +2031,7 @@ static int scmProcessFileInner(PSCMRWSTA
|
|
|
|
|
pszTreatAs = "shell";
|
|
|
|
|
else if ( (cchFirst >= 15 && strncmp(pchFirst, "/usr/bin/python", 15) == 0)
|
|
|
|
@@ -51,10 +51,10 @@ Index: VirtualBox-5.2.12/src/bldprogs/scm.cpp
|
|
|
|
|
else if ( (cchFirst >= 13 && strncmp(pchFirst, "/usr/bin/perl", 13) == 0)
|
|
|
|
|
|| (cchFirst >= 17 && strncmp(pchFirst, "/usr/bin/env perl", 17) == 0) )
|
|
|
|
|
pszTreatAs = "perl";
|
|
|
|
|
Index: VirtualBox-5.2.12/src/libs/libxml2-2.9.4/configure
|
|
|
|
|
Index: VirtualBox-5.2.16/src/libs/libxml2-2.9.4/configure
|
|
|
|
|
===================================================================
|
|
|
|
|
--- VirtualBox-5.2.12.orig/src/libs/libxml2-2.9.4/configure
|
|
|
|
|
+++ VirtualBox-5.2.12/src/libs/libxml2-2.9.4/configure
|
|
|
|
|
--- VirtualBox-5.2.16.orig/src/libs/libxml2-2.9.4/configure
|
|
|
|
|
+++ VirtualBox-5.2.16/src/libs/libxml2-2.9.4/configure
|
|
|
|
|
@@ -15153,10 +15153,10 @@ PYTHON_SITE_PACKAGES=
|
|
|
|
|
PYTHON_TESTS=
|
|
|
|
|
pythondir=
|
|
|
|
@@ -79,10 +79,10 @@ Index: VirtualBox-5.2.12/src/libs/libxml2-2.9.4/configure
|
|
|
|
|
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
|
|
|
|
|
$as_echo_n "checking for $ac_word... " >&6; }
|
|
|
|
|
if ${ac_cv_path_PYTHON+:} false; then :
|
|
|
|
|
Index: VirtualBox-5.2.12/src/VBox/ValidationKit/testboxscript/setup.sh
|
|
|
|
|
Index: VirtualBox-5.2.16/src/VBox/ValidationKit/testboxscript/setup.sh
|
|
|
|
|
===================================================================
|
|
|
|
|
--- VirtualBox-5.2.12.orig/src/VBox/ValidationKit/testboxscript/setup.sh
|
|
|
|
|
+++ VirtualBox-5.2.12/src/VBox/ValidationKit/testboxscript/setup.sh
|
|
|
|
|
--- VirtualBox-5.2.16.orig/src/VBox/ValidationKit/testboxscript/setup.sh
|
|
|
|
|
+++ VirtualBox-5.2.16/src/VBox/ValidationKit/testboxscript/setup.sh
|
|
|
|
|
@@ -644,7 +644,7 @@ import sys;\
|
|
|
|
|
x = sys.version_info[0] == 2 and (sys.version_info[1] >= 6 or (sys.version_info[1] == 5 and sys.version_info[2] >= 1));\
|
|
|
|
|
sys.exit(not x);\
|
|
|
|
@@ -92,10 +92,10 @@ Index: VirtualBox-5.2.12/src/VBox/ValidationKit/testboxscript/setup.sh
|
|
|
|
|
do
|
|
|
|
|
python=`which ${python} 2> /dev/null`
|
|
|
|
|
if [ -n "${python}" -a -x "${python}" ]; then
|
|
|
|
|
Index: VirtualBox-5.2.12/src/VBox/Installer/linux/rpm/VirtualBox.tmpl.spec
|
|
|
|
|
Index: VirtualBox-5.2.16/src/VBox/Installer/linux/rpm/VirtualBox.tmpl.spec
|
|
|
|
|
===================================================================
|
|
|
|
|
--- VirtualBox-5.2.12.orig/src/VBox/Installer/linux/rpm/VirtualBox.tmpl.spec
|
|
|
|
|
+++ VirtualBox-5.2.12/src/VBox/Installer/linux/rpm/VirtualBox.tmpl.spec
|
|
|
|
|
--- VirtualBox-5.2.16.orig/src/VBox/Installer/linux/rpm/VirtualBox.tmpl.spec
|
|
|
|
|
+++ VirtualBox-5.2.16/src/VBox/Installer/linux/rpm/VirtualBox.tmpl.spec
|
|
|
|
|
@@ -20,7 +20,7 @@
|
|
|
|
|
%define %PYTHON% 1
|
|
|
|
|
%define VBOXDOCDIR %{_defaultdocdir}/%NAME%
|
|
|
|
@@ -114,10 +114,10 @@ Index: VirtualBox-5.2.12/src/VBox/Installer/linux/rpm/VirtualBox.tmpl.spec
|
|
|
|
|
%endif
|
|
|
|
|
rm -rf sdk/installer
|
|
|
|
|
mv nls $RPM_BUILD_ROOT/usr/share/virtualbox
|
|
|
|
|
Index: VirtualBox-5.2.12/src/libs/libxml2-2.9.4/libxml.spec.in
|
|
|
|
|
Index: VirtualBox-5.2.16/src/libs/libxml2-2.9.4/libxml.spec.in
|
|
|
|
|
===================================================================
|
|
|
|
|
--- VirtualBox-5.2.12.orig/src/libs/libxml2-2.9.4/libxml.spec.in
|
|
|
|
|
+++ VirtualBox-5.2.12/src/libs/libxml2-2.9.4/libxml.spec.in
|
|
|
|
|
--- VirtualBox-5.2.16.orig/src/libs/libxml2-2.9.4/libxml.spec.in
|
|
|
|
|
+++ VirtualBox-5.2.16/src/libs/libxml2-2.9.4/libxml.spec.in
|
|
|
|
|
@@ -101,11 +101,11 @@ rm -fr %{buildroot}
|
|
|
|
|
|
|
|
|
|
make install DESTDIR=%{buildroot}
|
|
|
|
@@ -133,10 +133,10 @@ Index: VirtualBox-5.2.12/src/libs/libxml2-2.9.4/libxml.spec.in
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
rm -f $RPM_BUILD_ROOT%{_libdir}/*.la
|
|
|
|
|
Index: VirtualBox-5.2.12/src/libs/libxml2-2.9.4/libxml2.spec
|
|
|
|
|
Index: VirtualBox-5.2.16/src/libs/libxml2-2.9.4/libxml2.spec
|
|
|
|
|
===================================================================
|
|
|
|
|
--- VirtualBox-5.2.12.orig/src/libs/libxml2-2.9.4/libxml2.spec
|
|
|
|
|
+++ VirtualBox-5.2.12/src/libs/libxml2-2.9.4/libxml2.spec
|
|
|
|
|
--- VirtualBox-5.2.16.orig/src/libs/libxml2-2.9.4/libxml2.spec
|
|
|
|
|
+++ VirtualBox-5.2.16/src/libs/libxml2-2.9.4/libxml2.spec
|
|
|
|
|
@@ -103,7 +103,7 @@ make install DESTDIR=%{buildroot}
|
|
|
|
|
|
|
|
|
|
%if 0%{?with_python3}
|
|
|
|
|