diff --git a/VirtualBox-4.0.8-enable_ffmpeg_capture.patch b/VirtualBox-4.0.8-enable_ffmpeg_capture.patch deleted file mode 100644 index c71d8e0..0000000 --- a/VirtualBox-4.0.8-enable_ffmpeg_capture.patch +++ /dev/null @@ -1,30 +0,0 @@ ---- VirtualBox-4.0.8_OSE.orig/Config.kmk 2011-05-16 18:32:40.000000000 +0200 -+++ VirtualBox-4.0.8_OSE/Config.kmk 2011-05-28 17:34:35.884436301 +0200 -@@ -486,7 +486,7 @@ - # Enables the ffmpeg module for recording test runs. - # TODO: Enable this for normal build server builds? - #if1of ($(KBUILD_TARGET), linux) --# VBOX_WITH_FFMPEG = 1 -+VBOX_WITH_FFMPEG = 1 - #endif - # Enable shared folders - VBOX_WITH_SHARED_FOLDERS = 1 -@@ -892,7 +892,6 @@ - endif - VBOX_WITH_TESTSUITE= - VBOX_WITH_INTEL_PXE= -- VBOX_WITH_FFMPEG= - ifn1of ($(KBUILD_TARGET), darwin linux solaris win) - VBOX_WITH_INSTALLER= - endif ---- VirtualBox-4.0.8_OSE.orig/src/libs/Makefile.kmk 2011-05-16 18:34:01.000000000 +0200 -+++ VirtualBox-4.0.8_OSE/src/libs/Makefile.kmk 2011-05-28 17:47:24.224649687 +0200 -@@ -72,7 +72,7 @@ - endif - - # FFmpeg for test videos. -- if defined(VBOX_WITH_FFMPEG) && !defined(VBOX_OSE) && !defined(VBOX_ONLY_DOCS) && !defined(VBOX_WITH_SDK) -+ if defined(VBOX_WITH_FFMPEG) && !defined(VBOX_ONLY_DOCS) && !defined(VBOX_WITH_SDK) - if1of ($(KBUILD_TARGET), darwin linux solaris) - include $(PATH_SUB_CURRENT)/ffmpeg-20060710/Makefile.kmk - endif diff --git a/VirtualBox-4.1.8-x86_64-disable_check_32bit.patch b/VirtualBox-4.1.8-x86_64-disable_check_32bit.patch deleted file mode 100644 index ca6d6d0..0000000 --- a/VirtualBox-4.1.8-x86_64-disable_check_32bit.patch +++ /dev/null @@ -1,11 +0,0 @@ -diff -Nru VirtualBox-4.1.8_OSE.orig/configure VirtualBox-4.1.8_OSE/configure ---- VirtualBox-4.1.8_OSE.orig/configure 2012-05-24 10:45:09.102915885 +0000 -+++ VirtualBox-4.1.8_OSE/configure 2012-05-24 10:44:58.926034932 +0000 -@@ -2600,7 +2600,6 @@ - fi - check_libcap - check_compiler_h -- [ "$BUILD_MACHINE" = "amd64" -a $WITH_VMMRAW -eq 1 ] && check_32bit - # tools/common/makeself* - [ $OSE -ge 1 ] && check_makeself - fi diff --git a/VirtualBox-4.2.16-vboxusb-permissions.patch b/VirtualBox-4.2.16-vboxusb-permissions.patch deleted file mode 100644 index 25f4948..0000000 --- a/VirtualBox-4.2.16-vboxusb-permissions.patch +++ /dev/null @@ -1,17 +0,0 @@ ---- VirtualBox-4.2.16/src/VBox/Installer/linux/VBoxCreateUSBNode.sh.orig 2013-08-11 16:18:03.024582594 +0200 -+++ VirtualBox-4.2.16/src/VBox/Installer/linux/VBoxCreateUSBNode.sh 2013-08-11 16:18:26.475361230 +0200 -@@ -37,11 +37,11 @@ - exit 0 - fi - case "$group" in "") group="vboxusers";; esac -- mkdir /dev/vboxusb -m 0750 2>/dev/null -+ mkdir /dev/vboxusb -m 0755 2>/dev/null - chown root:$group /dev/vboxusb 2>/dev/null -- mkdir "$devdir" -m 0750 2>/dev/null -+ mkdir "$devdir" -m 0755 2>/dev/null - chown root:$group "$devdir" 2>/dev/null -- mknod "$devpath" c $1 $2 -m 0660 2>/dev/null -+ mknod "$devpath" c $1 $2 -m 0666 2>/dev/null - chown root:$group "$devpath" 2>/dev/null - ;; - 1) diff --git a/VirtualBox-4.3.12-gcc-4.9.0.patch b/VirtualBox-4.3.12-gcc-4.9.0.patch deleted file mode 100644 index 14be03f..0000000 --- a/VirtualBox-4.3.12-gcc-4.9.0.patch +++ /dev/null @@ -1,14 +0,0 @@ ---- VirtualBox-4.3.12/configure.orig 2014-05-16 14:18:25.000000000 +0200 -+++ VirtualBox-4.3.12/configure 2014-05-18 16:29:23.400318654 +0200 -@@ -420,9 +420,9 @@ - elif [ $cc_maj -lt 3 \ - -o \( $cc_maj -eq 3 -a $cc_min -lt 2 \) \ - -o \( $cc_maj -eq 4 -a $cc_min -lt 1 -a "$OS" != "darwin" \) \ -- -o \( $cc_maj -eq 4 -a $cc_min -gt 8 \) \ -+ -o \( $cc_maj -eq 4 -a $cc_min -gt 9 \) \ - -o $cc_maj -gt 4 ]; then -- log_failure "gcc version $cc_ver found, expected gcc 3.x with x>1 or gcc 4.x with 01 or gcc 4.x with 01 or gcc 4.x with 01 or gcc 4.x with 0= 40500 # 4.1.2 complains, 4.5.2 is okay, didn't check which version inbetween made it okay with g++. -+TEMPLATE_VBoxR0_CXXFLAGS += -ffreestanding -+ endif - TEMPLATE_VBoxR0_CFLAGS.amd64 = -m64 -mno-red-zone -mno-sse -mno-mmx -mno-sse2 -mno-3dnow -fasynchronous-unwind-tables -ffreestanding - TEMPLATE_VBoxR0_CXXFLAGS.amd64 = -m64 -mno-red-zone -mno-sse -mno-mmx -mno-sse2 -mno-3dnow -fasynchronous-unwind-tables - TEMPLATE_VBoxR0_CXXFLAGS.freebsd = -ffreestanding diff --git a/VirtualBox-7.0.14-libxml2-2.12.5.patch b/VirtualBox-7.0.14-libxml2-2.12.5.patch new file mode 100644 index 0000000..4631f30 --- /dev/null +++ b/VirtualBox-7.0.14-libxml2-2.12.5.patch @@ -0,0 +1,47 @@ +diff --git a/include/iprt/cpp/xml.h b/include/iprt/cpp/xml.h +index 40975e86..7639c281 100644 +--- a/include/iprt/cpp/xml.h ++++ b/include/iprt/cpp/xml.h +@@ -113,9 +113,9 @@ public: + class RT_DECL_CLASS XmlError : public RuntimeError + { + public: +- XmlError(xmlErrorPtr aErr); ++ XmlError(const xmlError *aErr); + +- static char* Format(xmlErrorPtr aErr); ++ static char* Format(const xmlError *aErr); + }; + + // Logical errors +diff --git a/src/VBox/Runtime/r3/xml.cpp b/src/VBox/Runtime/r3/xml.cpp +index a6661760..b301a6c6 100644 +--- a/src/VBox/Runtime/r3/xml.cpp ++++ b/src/VBox/Runtime/r3/xml.cpp +@@ -131,7 +131,7 @@ LogicError::LogicError(RT_SRC_POS_DECL) + RTStrFree(msg); + } + +-XmlError::XmlError(xmlErrorPtr aErr) ++XmlError::XmlError(const xmlError *aErr) + { + if (!aErr) + throw EInvalidArg(RT_SRC_POS); +@@ -145,7 +145,7 @@ XmlError::XmlError(xmlErrorPtr aErr) + * Composes a single message for the given error. The caller must free the + * returned string using RTStrFree() when no more necessary. + */ +-/* static */ char *XmlError::Format(xmlErrorPtr aErr) ++/* static */ char *XmlError::Format(const xmlError *aErr) + { + const char *msg = aErr->message ? aErr->message : ""; + size_t msgLen = strlen(msg); +@@ -1856,7 +1856,7 @@ static void xmlParserBaseGenericError(void *pCtx, const char *pszMsg, ...) RT_NO + va_end(args); + } + +-static void xmlParserBaseStructuredError(void *pCtx, xmlErrorPtr error) RT_NOTHROW_DEF ++static void xmlParserBaseStructuredError(void *pCtx, const xmlError *error) RT_NOTHROW_DEF + { + NOREF(pCtx); + /* we expect that there is always a trailing NL */ diff --git a/VirtualBox.spec b/VirtualBox.spec index 845adaf..995d770 100644 --- a/VirtualBox.spec +++ b/VirtualBox.spec @@ -17,7 +17,7 @@ %endif Name: VirtualBox -Version: 7.0.12 +Version: 7.0.14 Release: 1mamba Summary: A general-purpose full virtualizer for x86 hardware Group: Graphical Desktop/Applications/Utilities @@ -39,23 +39,12 @@ Source12: vboxdrmclient.service Source13: vboxdrmclient.path Source14: vboxguest.rules Source15: virtualbox-guest.sysusers -Patch0: %{name}-4.0.8-enable_ffmpeg_capture.patch -Patch1: %{name}-4.1.8-x86_64-disable_check_32bit.patch -Patch2: VirtualBox-4.3.12-gcc-4.9.patch -Patch3: VirtualBox-4.2.16-vboxusb-permissions.patch -Patch4: VirtualBox-4.3.12-gcc-4.9.0.patch Patch5: VirtualBox-4.3.26-vdfuse.patch -Patch6: VirtualBox-5.0.4-x86-upstream-buildfixes.patch -Patch7: VirtualBox-5.1.22-build-gsoap.patch -Patch8: VirtualBox-5.0.24-ogl-include-path.patch Patch9: VirtualBox-7.0.10-no-vboxvideo.patch Patch10: VirtualBox-5.2.30-x86-conflicting_type_ptrdiff_t.patch -Patch11: VirtualBox-6.0.14-vbox-cpuhotplug-build.patch -Patch12: VirtualBox-6.1.10-vboxweb-gsoap.patch -Patch13: VirtualBox-6.1.18-kernel-5.10.patch -Patch14: VirtualBox-6.1.34-ffreestanding.patch Patch15: VirtualBox-7.0.10-dxvk-native-gcc-13.2.patch Patch16: VirtualBox-7.0.10-VBoxClient-all-disable-notification.patch +Patch17: VirtualBox-7.0.14-libxml2-2.12.5.patch License: GPL ## AUTOBUILDREQ-BEGIN BuildRequires: glibc-devel @@ -183,16 +172,13 @@ X.org mouse driver for VirtualBox guest machine. #% setup -q -D -T #:<< _EOF %patch 5 -p1 -#%patch 7 -p1 %patch 9 -p1 %ifarch %{ix86} %patch 10 -p1 %endif -#%patch12 -p1 -#%patch13 -p1 -#%patch14 -p1 -b .ffreestanding %patch 15 -p1 %patch 16 -p1 +%patch 17 -p1 -b .libxml2-2.12.5 %ifarch %{ix86} sed -i "s|VBOX_SUPPORTED_HOST_ARCHS := amd64|VBOX_SUPPORTED_HOST_ARCHS := x86|" Config.kmk @@ -671,6 +657,9 @@ KERNEL=/boot/vmlinuz-$KVER %{_libdir}/%{name}/additions/VBoxGuestAdditions.iso %changelog +* Tue Feb 06 2024 Automatic Build System 7.0.14-1mamba +- automatic version update by autodist + * Wed Oct 18 2023 Automatic Build System 7.0.12-1mamba - automatic version update by autodist