jengelh/virtualbox
SHA256
1
0
Fork 6
forked from pool/virtualbox
Code Issues Pull Requests Activity

Compare commits

merge into: jengelh:leap-15.6
Branches Tags
jengelh:master jengelh:leap-15.6 dgarcia:python313 dgarcia:python313-patch dgarcia:master dgarcia:mypython pool:factory
...
pull from: dgarcia:python313-patch
Branches Tags
dgarcia:python313 dgarcia:python313-patch dgarcia:master dgarcia:mypython jengelh:master jengelh:leap-15.6 pool:factory

3 Commits
leap-15.6 ... python313-

Author SHA256 Message Date
Daniel Garcia Moreno
57db7db36d Patch to build with python3.13 
NOT BUILDING
 2025-08-26 12:15:57 +02:00
Daniel Garcia Moreno
2d6eb3f435 Build python bindings for python313 2025-08-25 14:08:04 +02:00
Jan Engelhardt
abbfbbe45c virtualbox 7.2.0 2025-08-15 16:48:07 +02:00
7 changed files with 141 additions and 30 deletions
Expand all files Collapse all files

BIN
VirtualBox-7.1.12a-patched.tpxz LFS
View File

Binary file not shown.

BIN
VirtualBox-7.2.0-patched.tpxz LFS Normal file
View File

Binary file not shown.

31
fix_sdl_build.patch
View File

@@ -1,8 +1,13 @@
Index: VirtualBox-7.0.20/configure
---
configure | 17 ++++++-----------
src/VBox/Frontends/VBoxSDL/Makefile.kmk | 8 ++++----
2 files changed, 10 insertions(+), 15 deletions(-)
Index: VirtualBox-7.2.0/configure
===================================================================
--- VirtualBox-7.0.20.orig/configure
+++ VirtualBox-7.0.20/configure
@@ -1186,21 +1186,19 @@ check_sdl()
--- VirtualBox-7.2.0.orig/configure
+++ VirtualBox-7.2.0/configure
@@ -1150,21 +1150,19 @@ check_sdl()
fail
fi
else
@@ -27,7 +32,7 @@ Index: VirtualBox-7.0.20/configure
#undef main
extern "C" int main(int argc, char** argv)
{
@@ -1216,7 +1214,7 @@ extern "C" int main(int argc, char** arg
@@ -1180,7 +1178,7 @@ extern "C" int main(int argc, char** arg
}
EOF
[ -n "$INCSDL" ] && I_INCSDL=`prefix_I "$INCSDL"`
@@ -36,7 +41,7 @@ Index: VirtualBox-7.0.20/configure
if test_execute; then
cnf_append "LIB_SDK_LIBSDL_SDL" "`strip_l "$LIBSDL"`"
cnf_append "SDK_LIBSDL_LIBPATH" "`strip_L "$LIBSDL"`"
@@ -3010,11 +3008,8 @@ if [ $ONLY_ADDITIONS -eq 0 ]; then
@@ -2960,11 +2958,8 @@ if [ $ONLY_ADDITIONS -eq 0 ]; then
[ $WITH_LIBLZMA -eq 1 ] && check_liblzma
[ "$OS" != "darwin" ] && check_png
[ $OSE -eq 0 -a "$OS" = "linux" ] && check_pam
@@ -50,20 +55,20 @@ Index: VirtualBox-7.0.20/configure
[ $WITH_SDL_TTF -eq 1 -a $OSE -eq 0 ] && check_sdl_ttf
[ $WITH_X11 -eq 1 ] && check_x
# TODO check for xcomposite-dev (X11/extensions/Xcomposite.h, additions only)
Index: VirtualBox-7.0.20/src/VBox/Frontends/VBoxSDL/Makefile.kmk
Index: VirtualBox-7.2.0/src/VBox/Frontends/VBoxSDL/Makefile.kmk
===================================================================
--- VirtualBox-7.0.20.orig/src/VBox/Frontends/VBoxSDL/Makefile.kmk
+++ VirtualBox-7.0.20/src/VBox/Frontends/VBoxSDL/Makefile.kmk
--- VirtualBox-7.2.0.orig/src/VBox/Frontends/VBoxSDL/Makefile.kmk
+++ VirtualBox-7.2.0/src/VBox/Frontends/VBoxSDL/Makefile.kmk
@@ -51,7 +51,7 @@ if !defined(VBOX_WITH_HARDENING) || "$(K
PROGRAMS += VBoxSDL
endif
VBoxSDL_TEMPLATE := $(if $(VBOX_WITH_HARDENING),VBoxMainClientDll,VBoxMainClientExe)
VBoxSDL_TEMPLATE := $(if $(VBOX_WITH_HARDENING),VBoxMainClientDll,VBoxMainClientSignedExe)
- VBoxSDL_SDKS = LIBSDL2
+ VBoxSDL_SDKS = LIBSDL
VBoxSDL_SOURCES = \
VBoxSDL.cpp \
Framebuffer.cpp \
@@ -81,7 +81,7 @@ if !defined(VBOX_WITH_HARDENING) || "$(K
@@ -78,7 +78,7 @@ if !defined(VBOX_WITH_HARDENING) || "$(K
endif
ifn1of ($(KBUILD_TARGET), solaris) # Probably wrong with SDL2
VBoxSDL_LIBS = \
@@ -72,7 +77,7 @@ Index: VirtualBox-7.0.20/src/VBox/Frontends/VBoxSDL/Makefile.kmk
endif
if1of ($(KBUILD_TARGET), freebsd linux netbsd openbsd solaris) # X11
VBoxSDL_LIBS += \
@@ -121,7 +121,7 @@ if !defined(VBOX_WITH_HARDENING) || "$(K
@@ -116,7 +116,7 @@ if !defined(VBOX_WITH_HARDENING) || "$(K
if 0
PROGRAMS += tstSDL
tstSDL_TEMPLATE = VBoxR3TstExe
@@ -81,7 +86,7 @@ Index: VirtualBox-7.0.20/src/VBox/Frontends/VBoxSDL/Makefile.kmk
tstSDL_INST = $(INST_TESTCASE)
tstSDL_SOURCES = \
VBoxSDLTest.cpp
@@ -138,7 +138,7 @@ if !defined(VBOX_WITH_HARDENING) || "$(K
@@ -131,7 +131,7 @@ if !defined(VBOX_WITH_HARDENING) || "$(K
$(LIB_RUNTIME)
ifn1of ($(KBUILD_TARGET), solaris)
tstSDL_LIBS += \

79
python313.patch Normal file
View File

@@ -0,0 +1,79 @@
Index: VirtualBox-7.2.0/configure
===================================================================
--- VirtualBox-7.2.0.orig/configure
+++ VirtualBox-7.2.0/configure
@@ -2116,7 +2116,7 @@ extern "C" int main(void)
}
EOF
found=
- SUPPYTHONLIBS="python2.7 python2.6 python3.1 python3.2 python3.3 python3.4 python3.4m python3.5 python3.5m python3.6 python3.6m python3.7 python3.7m python3.8 python3.9 python3.10 python3.11 python3.12"
+ SUPPYTHONLIBS="python2.7 python2.6 python3.1 python3.2 python3.3 python3.4 python3.4m python3.5 python3.5m python3.6 python3.6m python3.7 python3.7m python3.8 python3.9 python3.10 python3.11 python3.12 python3.13"
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-7.2.0/src/VBox/Installer/linux/routines.sh
===================================================================
--- VirtualBox-7.2.0.orig/src/VBox/Installer/linux/routines.sh
+++ VirtualBox-7.2.0/src/VBox/Installer/linux/routines.sh
@@ -483,6 +483,7 @@ maybe_run_python_bindings_installer() {
python3.10 \
python3.11 \
python3.12 \
+ python3.13 \
python3 \
python"
Index: VirtualBox-7.2.0/src/libs/xpcom18a4/python/Makefile.kmk
===================================================================
--- VirtualBox-7.2.0.orig/src/libs/xpcom18a4/python/Makefile.kmk
+++ VirtualBox-7.2.0/src/libs/xpcom18a4/python/Makefile.kmk
@@ -658,6 +658,27 @@ ifndef VBOX_ONLY_SDK
endif
endif
+ ifdef VBOX_PYTHON313_INC
+ #
+ # Python 3.13 version (implicitly with pymalloc)
+ #
+ DLLS += VBoxPython3_13
+ VBoxPython3_13_EXTENDS = VBoxPythonBase
+ VBoxPython3_13_EXTENDS_BY = appending
+ VBoxPython3_13_INCS = $(VBOX_PYTHON313_INC)
+ VBoxPython3_13_LIBS = $(VBOX_PYTHON313_LIB)
+
+ ifdef VBOX_WITH_32_ON_64_MAIN_API
+ ifdef VBOX_PYTHON313_LIB_X86
+ DLLS += VBoxPython3_13_x86
+ VBoxPython3_13_x86_EXTENDS = VBoxPythonBase_x86
+ VBoxPython3_13_x86_EXTENDS_BY = appending
+ VBoxPython3_13_x86_INCS = $(VBOX_PYTHON313_INC)
+ VBoxPython3_13_x86_LIBS = $(VBOX_PYTHON313_LIB_X86)
+ endif
+ endif
+ endif
+
ifdef VBOX_PYTHONDEF_INC
#
# Python without versioning
@@ -700,7 +721,7 @@ ifndef VBOX_ONLY_SDK
# 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 37 38 39 310 311 312 34 33 \
+ VBOX_PYTHON_LIMITED_API_VER := $(firstword $(foreach ver, 35 36 37 38 39 310 311 312 313 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
Index: VirtualBox-7.2.0/src/libs/xpcom18a4/python/gen_python_deps.py
===================================================================
--- VirtualBox-7.2.0.orig/src/libs/xpcom18a4/python/gen_python_deps.py
+++ VirtualBox-7.2.0/src/libs/xpcom18a4/python/gen_python_deps.py
@@ -29,7 +29,7 @@ if sys.version_info >= (3, 10):
else:
from distutils.version import StrictVersion as 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.9", "3.10", "3.11", "3.12" ]
+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.9", "3.10", "3.11", "3.12", "3.13" ]
prefixes = ["/usr", "/usr/local", "/opt", "/opt/local"]
known = {}

26
vbox-permissions_warning.diff
View File

@@ -1,19 +1,25 @@
Index: VirtualBox-7.0.20/src/apps/Makefile.kmk
---
src/apps/Makefile.kmk | 2
src/apps/VBoxPermissionMessage/Makefile.kmk | 32 +++++++++++++++
src/apps/VBoxPermissionMessage/VBoxPermissionMessage.cpp | 12 +++++
3 files changed, 46 insertions(+)
Index: VirtualBox-7.2.0/src/apps/Makefile.kmk
===================================================================
--- VirtualBox-7.0.20.orig/src/apps/Makefile.kmk
+++ VirtualBox-7.0.20/src/apps/Makefile.kmk
@@ -28,5 +28,7 @@
SUB_DEPTH = ../..
include $(KBUILD_PATH)/subheader.kmk
--- VirtualBox-7.2.0.orig/src/apps/Makefile.kmk
+++ VirtualBox-7.2.0/src/apps/Makefile.kmk
@@ -33,5 +33,7 @@ ifneq ($(KBUILD_TARGET),win)
include $(PATH_SUB_CURRENT)/svn2git-vbox/Makefile.kmk
endif
+include $(PATH_SUB_CURRENT)/VBoxPermissionMessage/Makefile.kmk
+
include $(FILE_KBUILD_SUB_FOOTER)
Index: VirtualBox-7.0.20/src/apps/VBoxPermissionMessage/Makefile.kmk
Index: VirtualBox-7.2.0/src/apps/VBoxPermissionMessage/Makefile.kmk
===================================================================
--- /dev/null
+++ VirtualBox-7.0.20/src/apps/VBoxPermissionMessage/Makefile.kmk
+++ VirtualBox-7.2.0/src/apps/VBoxPermissionMessage/Makefile.kmk
@@ -0,0 +1,32 @@
+# $Id: Makefile.kmk 28800 2010-04-27 08:22:32Z vboxsync $
+## @file
@@ -47,10 +53,10 @@ Index: VirtualBox-7.0.20/src/apps/VBoxPermissionMessage/Makefile.kmk
+
+include $(KBUILD_PATH)/subfooter.kmk
+
Index: VirtualBox-7.0.20/src/apps/VBoxPermissionMessage/VBoxPermissionMessage.cpp
Index: VirtualBox-7.2.0/src/apps/VBoxPermissionMessage/VBoxPermissionMessage.cpp
===================================================================
--- /dev/null
+++ VirtualBox-7.0.20/src/apps/VBoxPermissionMessage/VBoxPermissionMessage.cpp
+++ VirtualBox-7.2.0/src/apps/VBoxPermissionMessage/VBoxPermissionMessage.cpp
@@ -0,0 +1,12 @@
+#include <QtWidgets/QApplication>
+#include <QtWidgets/QMessageBox>

18
virtualbox.changes
View File

@@ -1,3 +1,21 @@
-------------------------------------------------------------------
Mon Aug 25 11:50:21 UTC 2025 - Daniel Garcia <daniel.garcia@suse.com>
- Build python bindings for python313
-------------------------------------------------------------------
Fri Aug 15 14:46:51 UTC 2025 - Jan Engelhardt <jengelh@inai.de>
- Update to release 7.2.0
* GUI: Moved global and VM tools from hamburger menus to global
tools taskbar (vertically on the left) and the VM tools tabs
(horizontally above the right hand panel) to make them easier
to reach.
* ARM host: Virtualization of Windows 11/ARM VMs.
* Linux host: Video decoding acceleration when 3D is enabled.
* Storage: The NVMe storage controller emulation is now part of
the open source base package.
-------------------------------------------------------------------
Thu Jul 24 13:07:21 UTC 2025 - Jan Engelhardt <jengelh@inai.de>

11
virtualbox.spec
View File

@@ -55,15 +55,15 @@
%endif
# If you want to disable building Python parts, just set this to %%nil
%global mypython python311
%global mypython python313
%if "%mypython" != ""
%global __mypython %{expand:%%__%{mypython}}
%global mypython_sitelib %{expand:%%%{mypython}_sitelib}
%endif
Name: virtualbox%{?dash}%{?name_suffix}
Version: 7.1.12a
%define rversion 7.1.12
Version: 7.2.0
%define rversion 7.2.0
Release: 0
Summary: %{package_summary}
License: GPL-3.0-or-later
@@ -127,6 +127,8 @@ Patch10: fix_for_leap15.5.patch
Patch11: cxx17.patch
Patch12: host-source.patch
Patch20: gentoo-C23.patch
# Build python bindings for python 3.13
Patch21: python313.patch
#
# Common BuildRequires for both virtualbox and virtualbox-kmp
BuildRequires: %{kernel_module_package_buildreqs}
@@ -143,7 +145,7 @@ BuildRequires: gcc-c++
BuildRequires: gcc12
BuildRequires: gcc12-c++
%endif
BuildRequires: kbuild >= 0.1.9998+svn3613
BuildRequires: kbuild >= 0.1.9998+svn3686
BuildRequires: libcap-devel
BuildRequires: libcurl-devel
BuildRequires: libopenssl-devel
@@ -823,6 +825,7 @@ export DISABLE_RESTART_ON_UPDATE=yes
%{_vbox_instdir}/VBoxRT.so
%{_vbox_instdir}/VBoxSharedFolders.so
%{_vbox_instdir}/VBoxVMM.so
%{_vbox_instdir}/VBoxVMMArm.so
%{_vbox_instdir}/VBoxXPCOMC.so
%{_vbox_instdir}/VBoxXPCOM.so
%{_vbox_instdir}/VBox*.r0