9:17 p.m.
commit e9162c45628dc54880a55e34635444cbff4755b5
Author: Sérgio M. Basto <sergio(a)serjux.com>
Date: Tue Apr 18 22:13:01 2023 +0100
Update VirtualBox to 7.0.8
VirtualBox-6.1.34-build-xpcom18a4-with-c++17.patch | 11 --
VirtualBox-lzf.patch | 12 ---
VirtualBox-python3.11.patch | 117 ++++++++++-----------
VirtualBox.spec | 16 ++-
sources | 4 +-
update_vbox.sh | 2 +-
6 files changed, 67 insertions(+), 95 deletions(-)
---
diff --git a/VirtualBox-python3.11.patch b/VirtualBox-python3.11.patch
index ac0077f..5a75f5a 100644
--- a/VirtualBox-python3.11.patch
+++ b/VirtualBox-python3.11.patch
@@ -9,10 +9,9 @@
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
-diff -rup VirtualBox-6.1.36/src/libs/xpcom18a4/python/Makefile.kmk
VirtualBox-6.1.34.orig/src/libs/xpcom18a4/python/Makefile.kmk
---- VirtualBox-6.1.36/src/libs/xpcom18a4/python/Makefile.kmk 2022-07-19
22:01:39.000000000 +0100
-+++ VirtualBox-6.1.34.orig/src/libs/xpcom18a4/python/Makefile.kmk 2022-07-25
14:00:03.971778289 +0100
-@@ -26,7 +26,7 @@ endif
+--- ./src/libs/xpcom18a4/python/Makefile.kmk.python3.11 2023-04-17 16:58:21.000000000
+0100
++++ ./src/libs/xpcom18a4/python/Makefile.kmk 2023-04-18 20:34:47.463630061 +0100
+@@ -30,7 +30,7 @@ include $(KBUILD_PATH)/subheader.kmk
#
# List of supported Python versions, defining a number of
@@ -21,68 +20,68 @@ diff -rup VirtualBox-6.1.36/src/libs/xpcom18a4/python/Makefile.kmk
VirtualBox-6.
# which get picked up below.
#
ifeq ($(KBUILD_TARGET),darwin) # Relatively predictable, don't script.
-@@ -624,6 +624,52 @@ VBoxPython3_10m_x86_LIBS = $(VBOX_
+@@ -665,6 +665,52 @@ ifndef VBOX_ONLY_SDK
+ endif
endif
- endif
- endif
-+
-+ifdef VBOX_PYTHON311_INC
-+#
-+# Python 3.11 version
-+#
-+DLLS += VBoxPython3_11
-+VBoxPython3_11_EXTENDS = VBoxPythonBase
-+VBoxPython3_11_EXTENDS_BY = appending
-+VBoxPython3_11_TEMPLATE = XPCOM
-+VBoxPython3_11_INCS = $(VBOX_PYTHON311_INC)
-+VBoxPython3_11_LIBS = $(VBOX_PYTHON311_LIB)
+
++ ifdef VBOX_PYTHON311_INC
++ #
++ # Python 3.11 version
++ #
++ DLLS += VBoxPython3_11
++ VBoxPython3_11_EXTENDS = VBoxPythonBase
++ VBoxPython3_11_EXTENDS_BY = appending
++ VBoxPython3_11_TEMPLATE = XPCOM
++ VBoxPython3_11_INCS = $(VBOX_PYTHON311_INC)
++ VBoxPython3_11_LIBS = $(VBOX_PYTHON311_LIB)
+
-+ ifdef VBOX_WITH_32_ON_64_MAIN_API
-+ ifdef VBOX_PYTHON311_LIB_X86
-+DLLS += VBoxPython3_11_x86
-+VBoxPython3_11_x86_EXTENDS = VBoxPythonBase_x86
-+VBoxPython3_11_x86_EXTENDS_BY = appending
-+VBoxPython3_11_x86_TEMPLATE = XPCOM
-+VBoxPython3_11_x86_INCS = $(VBOX_PYTHON311_INC)
-+VBoxPython3_11_x86_LIBS = $(VBOX_PYTHON311_LIB_X86)
++ ifdef VBOX_WITH_32_ON_64_MAIN_API
++ ifdef VBOX_PYTHON311_LIB_X86
++ DLLS += VBoxPython3_11_x86
++ VBoxPython3_11_x86_EXTENDS = VBoxPythonBase_x86
++ VBoxPython3_11_x86_EXTENDS_BY = appending
++ VBoxPython3_11_x86_TEMPLATE = XPCOM
++ VBoxPython3_11_x86_INCS = $(VBOX_PYTHON311_INC)
++ VBoxPython3_11_x86_LIBS = $(VBOX_PYTHON311_LIB_X86)
++ endif
++ endif
+ endif
-+ endif
-+endif
+
-+ifdef VBOX_PYTHON311M_INC
-+#
-+# Python 3.11 version with pymalloc
-+#
-+DLLS += VBoxPython3_11m
-+VBoxPython3_11m_EXTENDS = VBoxPythonBase_m
-+VBoxPython3_11m_EXTENDS_BY = appending
-+VBoxPython3_11m_TEMPLATE = XPCOM
-+VBoxPython3_11m_INCS = $(VBOX_PYTHON311M_INC)
-+VBoxPython3_11m_LIBS = $(VBOX_PYTHON311M_LIB)
++ ifdef VBOX_PYTHON311M_INC
++ #
++ # Python 3.11 version with pymalloc
++ #
++ DLLS += VBoxPython3_11m
++ VBoxPython3_11m_EXTENDS = VBoxPythonBase_m
++ VBoxPython3_11m_EXTENDS_BY = appending
++ VBoxPython3_11m_TEMPLATE = XPCOM
++ VBoxPython3_11m_INCS = $(VBOX_PYTHON311M_INC)
++ VBoxPython3_11m_LIBS = $(VBOX_PYTHON311M_LIB)
+
-+ ifdef VBOX_WITH_32_ON_64_MAIN_API
-+ ifdef VBOX_PYTHON311M_LIB_X86
-+DLLS += VBoxPython3_11m_x86
-+VBoxPython3_11m_x86_EXTENDS = VBoxPythonBase_x86_m
-+VBoxPython3_11m_x86_EXTENDS_BY = appending
-+VBoxPython3_11m_x86_TEMPLATE_ = XPCOM
-+VBoxPython3_11m_x86_INCS = $(VBOX_PYTHON311M_INC)
-+VBoxPython3_11m_x86_LIBS = $(VBOX_PYTHON311M_LIB_X86)
++ ifdef VBOX_WITH_32_ON_64_MAIN_API
++ ifdef VBOX_PYTHON311M_LIB_X86
++ DLLS += VBoxPython3_11m_x86
++ VBoxPython3_11m_x86_EXTENDS = VBoxPythonBase_x86_m
++ VBoxPython3_11m_x86_EXTENDS_BY = appending
++ VBoxPython3_11m_x86_TEMPLATE_ = XPCOM
++ VBoxPython3_11m_x86_INCS = $(VBOX_PYTHON311M_INC)
++ VBoxPython3_11m_x86_LIBS = $(VBOX_PYTHON311M_LIB_X86)
++ endif
++ endif
+ endif
-+ endif
-+endif
-
- ifdef VBOX_PYTHONDEF_INC
- #
-@@ -744,7 +790,7 @@ endif
- # 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,)))
++
+ ifdef VBOX_PYTHONDEF_INC
+ #
+ # Python without versioning
+@@ -707,7 +753,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 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
+ DLLS += VBoxPython3
--- ./src/libs/xpcom18a4/python/src/module/_xpcom.cpp.orig 2022-10-30 04:19:33.834495672
+0000
+++ ./src/libs/xpcom18a4/python/src/module/_xpcom.cpp 2022-10-30 04:24:11.895463023
+0000
@@ -84,7 +84,11 @@ extern PYXPCOM_EXPORT void PyXPCOM_Inter
diff --git a/VirtualBox.spec b/VirtualBox.spec
index c1a0c6d..6e083c9 100644
--- a/VirtualBox.spec
+++ b/VirtualBox.spec
@@ -45,7 +45,7 @@
%bcond_without python3
Name: VirtualBox
-Version: 7.0.6
+Version: 7.0.8
Release: 1%{?dist}
Summary: A general-purpose full virtualizer for PC hardware
@@ -99,10 +99,7 @@ Patch60: VirtualBox-7.0.2-xclient-cleanups.patch
#Patch70: vbox-python-selection.patch
Patch80: VirtualBox-6.1.4-gcc10.patch
-Patch88: VirtualBox-lzf.patch
Patch90: VirtualBox-python3.11.patch
-# Force the build of xpcom with -std=gnu++17, mandated by Python 3.11
-Patch92: VirtualBox-6.1.34-build-xpcom18a4-with-c++17.patch
BuildRequires: gcc-c++
BuildRequires: kBuild >= 0.1.9998.r3093
@@ -326,11 +323,11 @@ rm -r src/libs/libpng-1.6.*/
rm -r src/libs/libxml2-2.9.*/
rm -r src/libs/openssl-3.*/
rm -r src/libs/zlib-1.2.*/
-rm -r src/libs/curl-7.*/
+rm -r src/libs/curl-8.*/
rm -r src/libs/libvorbis-1.3.*/
rm -r src/libs/libogg-1.3.*/
%if %{with system_libtpms}
-rm -r src/libs/libtpms-0.9.0/
+rm -r src/libs/libtpms-0.9.*/
%endif
%if %{with dxvk_native}
#rm -r src/libs/dxvk-native-1.9.*/
@@ -356,11 +353,7 @@ rm -r src/libs/libtpms-0.9.0/
%patch60 -p1 -b .xclient
#patch70 -p1 -b .python-detection
%patch80 -p1 -b .gcc10
-%patch88 -p1 -b .lzf
%patch90 -p1 -b .python3.11
-%if 0%{?fedora} >= 36 || 0%{?rhel} >= 9
-%patch92 -p1 -b .c++17
-%endif
%build
@@ -906,6 +899,9 @@ getent passwd vboxadd >/dev/null || \
%{_datadir}/%{name}-kmod-%{version}
%changelog
+* Tue Apr 18 2023 Sérgio Basto <sergio(a)serjux.com> - 7.0.8-1
+- Update VirtualBox to 7.0.8
+
* Wed Jan 18 2023 Sérgio Basto <sergio(a)serjux.com> - 7.0.6-1
- Update VirtualBox to 7.0.6
- Add fix to gcc13
diff --git a/sources b/sources
index bc23083..41255b5 100644
--- a/sources
+++ b/sources
@@ -1,2 +1,2 @@
-SHA512 (VirtualBox-7.0.6.tar.bz2) =
f9db7a154e392f550f50abe774fc6263eb0b6f86dccc069f2c5012fedbe2debbf5b8ba62cca44ea0d5d5475652188176bfb888266f69197677b22854f02b64a0
-SHA512 (UserManual.pdf) =
dddaa004188ed950684c919f30f874afac70a05aa6884073899a4a67a1c79f4f298ee79c441a7448422453d89f9114f39d16cb040c5bffc7b34d00a713003e29
+SHA512 (VirtualBox-7.0.8.tar.bz2) =
4c25f8275269d085cf347596a242b8921f140e0e40d8c44fd6b171742b8cbd0c9a45f4702dbc0c1272e10091be68c3668711c9e4d1a8b3ce57d25f871e0eb9fe
+SHA512 (UserManual.pdf) =
310f83fe2b832b496b8419bfee85e30ff1a1b668d68bb32b3c34ba2be25cbfc89d199f3ef09e4d1b787bc691e2173bb03997b25ce5cfd6525920363d19a7c44c
diff --git a/update_vbox.sh b/update_vbox.sh
index 2e7cd2b..c9c5df6 100755
--- a/update_vbox.sh
+++ b/update_vbox.sh
@@ -1,4 +1,4 @@
-VERSION=7.0.6
+VERSION=7.0.8
REL=1
RAWHIDE=39
REPOS="f38 f37 f36 el9 el8"
587
days inactive
587
days old
rpmfusion-commits@lists.rpmfusion.org
0 comments
1 participants
participants (1)
-
Sérgio M. Basto