pool/virtualbox
SHA256
2
0
Fork 2
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Accepting request 1086821 from home:dirkmueller:Factory

Browse Source 
- update python311.patch to also detect vboxpython module with python 3.11

OBS-URL: https://build.opensuse.org/request/show/1086821
OBS-URL: https://build.opensuse.org/package/show/Virtualization/virtualbox?expand=0&rev=694
This commit is contained in:
Larry Finger 2023-05-12 22:20:52 +00:00 committed by Git OBS Bridge
parent 85b3b3cfae
commit 14aca129c7
2 changed files with 50 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

55
python311.patch
View File

@ -1,8 +1,8 @@
diff --git a/configure b/configure Index: VirtualBox-7.0.8/configure
index 0872ec4c..037680e0 100755 ===================================================================
--- a/configure --- VirtualBox-7.0.8.orig/configure
+++ b/configure +++ VirtualBox-7.0.8/configure
@@ -2132,7 +2132,7 @@ extern "C" int main(void) @@ -2137,7 +2137,7 @@ extern "C" int main(void)
} }
EOF EOF
found= found=
@ -11,11 +11,11 @@ index 0872ec4c..037680e0 100755
for p in $PYTHONDIR; do for p in $PYTHONDIR; do
for d in $SUPPYTHONLIBS; do for d in $SUPPYTHONLIBS; do
for b in lib/x86_64-linux-gnu lib/i386-linux-gnu lib64 lib/64 lib; do for b in lib/x86_64-linux-gnu lib/i386-linux-gnu lib64 lib/64 lib; do
diff --git a/src/VBox/Installer/linux/routines.sh b/src/VBox/Installer/linux/routines.sh Index: VirtualBox-7.0.8/src/VBox/Installer/linux/routines.sh
index 08e06358..44eba726 100644 ===================================================================
--- a/src/VBox/Installer/linux/routines.sh --- VirtualBox-7.0.8.orig/src/VBox/Installer/linux/routines.sh
+++ b/src/VBox/Installer/linux/routines.sh +++ VirtualBox-7.0.8/src/VBox/Installer/linux/routines.sh
@@ -446,7 +446,7 @@ maybe_run_python_bindings_installer() { @@ -444,7 +444,7 @@ maybe_run_python_bindings_installer() {
# the VirtualBox API bindings. Needs to prevent double installs which waste # the VirtualBox API bindings. Needs to prevent double installs which waste
# quite a bit of time. # quite a bit of time.
PYTHONS="" PYTHONS=""
@ -24,3 +24,38 @@ index 08e06358..44eba726 100644
if [ "`$p -c 'import sys if [ "`$p -c 'import sys
if sys.version_info >= (2, 6) and (sys.version_info < (3, 0) or sys.version_info >= (3, 3)): if sys.version_info >= (2, 6) and (sys.version_info < (3, 0) or sys.version_info >= (3, 3)):
print(\"test\")' 2> /dev/null`" != "test" ]; then print(\"test\")' 2> /dev/null`" != "test" ]; then
Index: VirtualBox-7.0.8/src/libs/xpcom18a4/python/gen_python_deps.py
===================================================================
--- VirtualBox-7.0.8.orig/src/libs/xpcom18a4/python/gen_python_deps.py
+++ VirtualBox-7.0.8/src/libs/xpcom18a4/python/gen_python_deps.py
@@ -24,7 +24,7 @@ SPDX-License-Identifier: GPL-3.0-only
from __future__ import print_function
import os,sys
-from distutils.version import StrictVersion
+from packaging import version
versions = ["2.6", "2.7", "3.1", "3.2", "3.2m", "3.3", "3.3m", "3.4", "3.4m", "3.5", "3.5m", "3.6", "3.6m", "3.7", "3.7m", "3.8", "3.8m", "3.9", "3.9m", "3.10", "3.10m", "3.11", "3.11m" ]
prefixes = ["/usr", "/usr/local", "/opt", "/opt/local"]
@@ -120,7 +120,7 @@ def main(argv):
realversion = v[:-1]
else:
realversion = v
- if StrictVersion(realversion) < StrictVersion('2.6'):
+ if version.parse(realversion) < version.parse('2.6'):
continue
for p in prefixes:
c = checkPair(p, v, dllpre, dllsuff, bitness_magic)
Index: VirtualBox-7.0.8/src/libs/xpcom18a4/python/Makefile.kmk
===================================================================
--- VirtualBox-7.0.8.orig/src/libs/xpcom18a4/python/Makefile.kmk
+++ VirtualBox-7.0.8/src/libs/xpcom18a4/python/Makefile.kmk
@@ -753,7 +753,7 @@ ifdef VBOX_PYTHONDEF_INC
# TODO: ASSUMING that we don't need a different headers for pymalloc
# ('m' builds < 3.8) and CRT malloc.
#
- VBOX_PYTHON_LIMITED_API_VER := $(firstword $(foreach ver, 35 36 38 39 310 34 33 \
+ VBOX_PYTHON_LIMITED_API_VER := $(firstword $(foreach ver, 35 36 38 39 310 311 34 33 \
,$(if-expr defined(VBOX_PYTHON$(ver)_INC),$(ver),)$(if-expr defined(VBOX_PYTHON$(ver)M_INC),$(ver)M,)))
ifneq ($(VBOX_PYTHON_LIMITED_API_VER),)
DLLS += VBoxPython3

5
virtualbox.changes
View File

@ -1,3 +1,8 @@
-------------------------------------------------------------------
Fri May 12 20:35:44 UTC 2023 - Dirk Müller <dmueller@suse.com>
- update python311.patch to also detect vboxpython module with python 3.11
------------------------------------------------------------------- -------------------------------------------------------------------
Mon May 8 18:26:38 UTC 2023 - Larry Finger <Larry.Finger@gmail.com> Mon May 8 18:26:38 UTC 2023 - Larry Finger <Larry.Finger@gmail.com>