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

Accepting request 1088140 from Virtualization

Browse Source 
Automatic submission by obs-autosubmit

OBS-URL: https://build.opensuse.org/request/show/1088140
OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/virtualbox?expand=0&rev=258
This commit is contained in:
Dominique Leuenberger 2023-05-22 11:14:09 +00:00 committed by Git OBS Bridge
commit 1f4f17a323
2 changed files with 38 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

31
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,14 @@ 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
--- 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

17
virtualbox.changes
View File

@ -1,3 +1,20 @@
-------------------------------------------------------------------
Sun May 14 16:51:46 UTC 2023 - Dirk Müller <dmueller@suse.com>
- update python311.patch: remove changes that only work on
Tumbleweed
-------------------------------------------------------------------
Sat May 13 20:07:37 UTC 2023 - Larry Finger <Larry.Finger@gmail.com>
- Patch python311.patch fails on Leap 15.4 and Leap 15.5. Change spec file so thqt it is only
applied for Tumbleweed.
-------------------------------------------------------------------
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>