[packages/VirtualBox] - up to 7.0.12
baggins
baggins at pld-linux.org
Sun Dec 24 19:49:16 CET 2023
commit a4c810dd09dc90a6d1bdf0904aa6d2724bb4fd0f
Author: Jan Rękorajski <baggins at pld-linux.org>
Date: Sun Dec 24 19:28:15 2023 +0100
- up to 7.0.12
VirtualBox.spec | 12 +--
kernel-4.9.256.patch | 231 ---------------------------------------------------
kernel-5.18.patch | 16 ----
kernel-6.4.10.patch | 13 ---
libxml2.12.patch | 43 ++++++++++
5 files changed, 49 insertions(+), 266 deletions(-)
---
diff --git a/VirtualBox.spec b/VirtualBox.spec
index 2c653ba..98757ef 100644
--- a/VirtualBox.spec
+++ b/VirtualBox.spec
@@ -47,19 +47,19 @@ exit 1
%define qtver 5.6.0
-%define rel 3
+%define rel 1
%define pname VirtualBox
Summary: VirtualBox - x86 hardware virtualizer
Summary(pl.UTF-8): VirtualBox - wirtualizator sprzętu x86
Name: %{pname}%{?_pld_builder:%{?with_kernel:-kernel}}%{_alt_kernel}
-Version: 7.0.10
+Version: 7.0.12
Release: %{rel}%{?_pld_builder:%{?with_kernel:@%{_kernel_ver_str}}}
License: GPL v2
Group: Applications/Emulators
Source0: https://download.virtualbox.org/virtualbox/%{version}/%{pname}-%{version}.tar.bz2
-# Source0-md5: dea0dbd1aa2012b4a35c0d416f8155c8
+# Source0-md5: b89fb26c765764ee0e2d14305c0411d5
Source1: https://download.virtualbox.org/virtualbox/%{version}/VBoxGuestAdditions_%{version}.iso
-# Source1-md5: 536e5176026317c9e3b364ecb558fd02
+# Source1-md5: beedd5530d469b38079e4fe066d1ef32
Source2: vboxservice.init
Source3: vboxservice.service
Source4: vboxservice.sysconfig
@@ -74,7 +74,6 @@ Source12: udev-guest.rules
Patch0: %{pname}-version-error.patch
Patch1: %{pname}-VBoxSysInfo.patch
Patch2: %{pname}-warning_workaround.patch
-Patch3: kernel-6.4.10.patch
Patch4: wrapper.patch
Patch6: hardening-shared.patch
Patch7: lightdm-greeter-makefile.patch
@@ -91,6 +90,7 @@ Patch19: python3.patch
Patch20: gcc-13.patch
Patch21: xsl-style-dir.patch
Patch22: build-arch.patch
+Patch23: libxml2.12.patch
URL: http://www.virtualbox.org/
%if %{with userspace}
%ifarch %{x8664}
@@ -547,7 +547,6 @@ echo override vboxsf %{_kernel_ver} misc >> kernel/installed/etc/depmod.d/%{_ker
%patch0 -p1
%patch1 -p1
%patch2 -p1
-%patch3 -p1
%patch4 -p1
%patch6 -p1
%patch7 -p1
@@ -566,6 +565,7 @@ echo override vboxsf %{_kernel_ver} misc >> kernel/installed/etc/depmod.d/%{_ker
%patch20 -p1
%patch21 -p1
%patch22 -p1
+%patch23 -p1
%{__sed} -i -e 's, at VBOX_DOC_PATH@,%{_docdir}/%{name}-%{version},' \
-e 's/Categories=.*/Categories=Utility;Emulator;/' src/VBox/Installer/common/virtualbox.desktop.in
diff --git a/kernel-4.9.256.patch b/kernel-4.9.256.patch
deleted file mode 100644
index d9c6606..0000000
--- a/kernel-4.9.256.patch
+++ /dev/null
@@ -1,231 +0,0 @@
-diff -ur VirtualBox-6.1.18/kernel/GuestDrivers/vboxguest/r0drv/linux/memobj-r0drv-linux.c VirtualBox-6.1.18-256/kernel/GuestDrivers/vboxguest/r0drv/linux/memobj-r0drv-linux.c
---- VirtualBox-6.1.18/kernel/GuestDrivers/vboxguest/r0drv/linux/memobj-r0drv-linux.c 2021-02-06 22:09:20.000000000 +0100
-+++ VirtualBox-6.1.18-256/kernel/GuestDrivers/vboxguest/r0drv/linux/memobj-r0drv-linux.c 2021-02-06 22:08:19.038693668 +0100
-@@ -1174,7 +1174,7 @@
-
- /* openSUSE Leap 42.3 detection :-/ */
- #if RTLNX_VER_RANGE(4,4,0, 4,6,0) && defined(FAULT_FLAG_REMOTE)
--# define GET_USER_PAGES_API KERNEL_VERSION(4, 10, 0) /* no typo! */
-+# define GET_USER_PAGES_API KERNEL_VERSION(4, 11, 0) /* no typo! */
- #else
- # define GET_USER_PAGES_API LINUX_VERSION_CODE
- #endif
-@@ -1252,7 +1252,7 @@
- # endif
- &pMemLnx->apPages[0], /* Page array. */
- papVMAs /* vmas */
--# if GET_USER_PAGES_API >= KERNEL_VERSION(4, 10, 0)
-+# if GET_USER_PAGES_API >= KERNEL_VERSION(4, 11, 0)
- , NULL /* locked */
- # endif
- );
-diff -ur VirtualBox-6.1.18/kernel/GuestDrivers/vboxguest/r0drv/linux/mpnotification-r0drv-linux.c VirtualBox-6.1.18-256/kernel/GuestDrivers/vboxguest/r0drv/linux/mpnotification-r0drv-linux.c
---- VirtualBox-6.1.18/kernel/GuestDrivers/vboxguest/r0drv/linux/mpnotification-r0drv-linux.c 2021-02-06 22:09:20.000000000 +0100
-+++ VirtualBox-6.1.18-256/kernel/GuestDrivers/vboxguest/r0drv/linux/mpnotification-r0drv-linux.c 2021-02-06 21:54:24.869047375 +0100
-@@ -37,7 +37,7 @@
- #include <iprt/thread.h>
- #include "r0drv/mp-r0drv.h"
-
--#if RTLNX_VER_MIN(4,10,0)
-+#if RTLNX_VER_MIN(4,11,0)
-
- static enum cpuhp_state g_rtR0MpOnline;
-
-diff -ur VirtualBox-6.1.18/kernel/GuestDrivers/vboxsf/lnkops.c VirtualBox-6.1.18-256/kernel/GuestDrivers/vboxsf/lnkops.c
---- VirtualBox-6.1.18/kernel/GuestDrivers/vboxsf/lnkops.c 2021-02-06 22:09:20.000000000 +0100
-+++ VirtualBox-6.1.18-256/kernel/GuestDrivers/vboxsf/lnkops.c 2021-02-06 21:54:24.869047375 +0100
-@@ -286,7 +286,7 @@
- * Symlink inode operations.
- */
- struct inode_operations vbsf_lnk_iops = {
--#if RTLNX_VER_MAX(4,10,0)
-+#if RTLNX_VER_MAX(4,11,0)
- # if RTLNX_VER_MIN(2,6,8)
- .readlink = generic_readlink,
- # else
-diff -ur VirtualBox-6.1.18/kernel/GuestDrivers/vboxsf/regops.c VirtualBox-6.1.18-256/kernel/GuestDrivers/vboxsf/regops.c
---- VirtualBox-6.1.18/kernel/GuestDrivers/vboxsf/regops.c 2021-02-06 22:09:20.000000000 +0100
-+++ VirtualBox-6.1.18-256/kernel/GuestDrivers/vboxsf/regops.c 2021-02-06 21:54:24.869047375 +0100
-@@ -3335,7 +3335,7 @@
- static int vbsf_vmlog_fault(struct vm_area_struct *vma, struct vm_fault *vmf)
- {
- int rc;
--# if RTLNX_VER_MIN(4,10,0)
-+# if RTLNX_VER_MIN(4,11,0)
- SFLOGFLOW(("vbsf_vmlog_fault: vma=%p vmf=%p flags=%#x addr=%p\n", vma, vmf, vmf->flags, vmf->address));
- # else
- SFLOGFLOW(("vbsf_vmlog_fault: vma=%p vmf=%p flags=%#x addr=%p\n", vma, vmf, vmf->flags, vmf->virtual_address));
-@@ -3384,7 +3384,7 @@
- static int vbsf_vmlog_page_mkwrite(struct vm_area_struct *vma, struct vm_fault *vmf)
- {
- int rc;
--# if RTLNX_VER_MIN(4,10,0)
-+# if RTLNX_VER_MIN(4,11,0)
- SFLOGFLOW(("vbsf_vmlog_page_mkwrite: vma=%p vmf=%p flags=%#x addr=%p\n", vma, vmf, vmf->flags, vmf->address));
- # else
- SFLOGFLOW(("vbsf_vmlog_page_mkwrite: vma=%p vmf=%p flags=%#x addr=%p\n", vma, vmf, vmf->flags, vmf->virtual_address));
-@@ -3406,7 +3406,7 @@
- SFLOGFLOW(("vbsf_vmlog_map_pages: returns\n"));
- return rc;
- }
--# elif RTLNX_VER_MIN(4,10,0)
-+# elif RTLNX_VER_MIN(4,11,0)
- static void vbsf_vmlog_map_pages(struct vm_fault *vmf, pgoff_t start, pgoff_t end)
- {
- SFLOGFLOW(("vbsf_vmlog_map_pages: vmf=%p (flags=%#x addr=%p) start=%p end=%p\n", vmf, vmf->flags, vmf->address, start, end));
-diff -ur VirtualBox-6.1.18/kernel/GuestDrivers/vboxsf/vfsmod.c VirtualBox-6.1.18-256/kernel/GuestDrivers/vboxsf/vfsmod.c
---- VirtualBox-6.1.18/kernel/GuestDrivers/vboxsf/vfsmod.c 2021-02-06 22:09:20.000000000 +0100
-+++ VirtualBox-6.1.18-256/kernel/GuestDrivers/vboxsf/vfsmod.c 2021-02-06 21:54:24.869047375 +0100
-@@ -443,7 +443,7 @@
- trouches it after this point (we may screw up something). */
- # if RTLNX_VER_RANGE(4,0,0, 4,2,0)
- sb->s_bdi = pSuperInfo->bdi_org; /* (noop_backing_dev_info is not exported) */
--# elif RTLNX_VER_RANGE(2,6,34, 4,10,0)
-+# elif RTLNX_VER_RANGE(2,6,34, 4,11,0)
- sb->s_bdi = &noop_backing_dev_info;
- # endif
- #endif
-diff -ur VirtualBox-6.1.18/kernel/GuestDrivers/vboxvideo/vbox_ttm.c VirtualBox-6.1.18-256/kernel/GuestDrivers/vboxvideo/vbox_ttm.c
---- VirtualBox-6.1.18/kernel/GuestDrivers/vboxvideo/vbox_ttm.c 2021-02-06 22:09:21.000000000 +0100
-+++ VirtualBox-6.1.18-256/kernel/GuestDrivers/vboxvideo/vbox_ttm.c 2021-02-06 21:54:24.872380697 +0100
-@@ -314,7 +314,7 @@
- #if RTLNX_VER_MAX(5,10,0) && !RTLNX_RHEL_MAJ_PREREQ(8,5)
- .init_mem_type = vbox_bo_init_mem_type,
- #endif
--#if RTLNX_VER_MIN(4,10,0) || RTLNX_RHEL_MAJ_PREREQ(7,4)
-+#if RTLNX_VER_MIN(4,11,0) || RTLNX_RHEL_MAJ_PREREQ(7,4)
- .eviction_valuable = ttm_bo_eviction_valuable,
- #endif
- .evict_flags = vbox_bo_evict_flags,
-diff -ur VirtualBox-6.1.18/kernel/HostDrivers/vboxdrv/r0drv/linux/memobj-r0drv-linux.c VirtualBox-6.1.18-256/kernel/HostDrivers/vboxdrv/r0drv/linux/memobj-r0drv-linux.c
---- VirtualBox-6.1.18/kernel/HostDrivers/vboxdrv/r0drv/linux/memobj-r0drv-linux.c 2021-02-06 22:09:22.000000000 +0100
-+++ VirtualBox-6.1.18-256/kernel/HostDrivers/vboxdrv/r0drv/linux/memobj-r0drv-linux.c 2021-02-06 22:08:40.515390291 +0100
-@@ -1174,7 +1174,7 @@
-
- /* openSUSE Leap 42.3 detection :-/ */
- #if RTLNX_VER_RANGE(4,4,0, 4,6,0) && defined(FAULT_FLAG_REMOTE)
--# define GET_USER_PAGES_API KERNEL_VERSION(4, 10, 0) /* no typo! */
-+# define GET_USER_PAGES_API KERNEL_VERSION(4, 11, 0) /* no typo! */
- #else
- # define GET_USER_PAGES_API LINUX_VERSION_CODE
- #endif
-@@ -1252,7 +1252,7 @@
- # endif
- &pMemLnx->apPages[0], /* Page array. */
- papVMAs /* vmas */
--# if GET_USER_PAGES_API >= KERNEL_VERSION(4, 10, 0)
-+# if GET_USER_PAGES_API >= KERNEL_VERSION(4, 11, 0)
- , NULL /* locked */
- # endif
- );
-diff -ur VirtualBox-6.1.18/kernel/HostDrivers/vboxdrv/r0drv/linux/mpnotification-r0drv-linux.c VirtualBox-6.1.18-256/kernel/HostDrivers/vboxdrv/r0drv/linux/mpnotification-r0drv-linux.c
---- VirtualBox-6.1.18/kernel/HostDrivers/vboxdrv/r0drv/linux/mpnotification-r0drv-linux.c 2021-02-06 22:09:22.000000000 +0100
-+++ VirtualBox-6.1.18-256/kernel/HostDrivers/vboxdrv/r0drv/linux/mpnotification-r0drv-linux.c 2021-02-06 21:54:24.872380697 +0100
-@@ -37,7 +37,7 @@
- #include <iprt/thread.h>
- #include "r0drv/mp-r0drv.h"
-
--#if RTLNX_VER_MIN(4,10,0)
-+#if RTLNX_VER_MIN(4,11,0)
-
- static enum cpuhp_state g_rtR0MpOnline;
-
-diff -ur VirtualBox-6.1.18/src/VBox/Additions/linux/drm/vbox_ttm.c VirtualBox-6.1.18-256/src/VBox/Additions/linux/drm/vbox_ttm.c
---- VirtualBox-6.1.18/src/VBox/Additions/linux/drm/vbox_ttm.c 2021-01-07 16:34:24.000000000 +0100
-+++ VirtualBox-6.1.18-256/src/VBox/Additions/linux/drm/vbox_ttm.c 2021-02-06 21:54:24.869047375 +0100
-@@ -319,7 +319,7 @@
- #if RTLNX_VER_MAX(5,10,0) && !RTLNX_RHEL_MAJ_PREREQ(8,5)
- .init_mem_type = vbox_bo_init_mem_type,
- #endif
--#if RTLNX_VER_MIN(4,10,0) || RTLNX_RHEL_MAJ_PREREQ(7,4)
-+#if RTLNX_VER_MIN(4,11,0) || RTLNX_RHEL_MAJ_PREREQ(7,4)
- .eviction_valuable = ttm_bo_eviction_valuable,
- #endif
- .evict_flags = vbox_bo_evict_flags,
-diff -ur VirtualBox-6.1.18/src/VBox/Additions/linux/sharedfolders/lnkops.c VirtualBox-6.1.18-256/src/VBox/Additions/linux/sharedfolders/lnkops.c
---- VirtualBox-6.1.18/src/VBox/Additions/linux/sharedfolders/lnkops.c 2021-01-07 16:34:26.000000000 +0100
-+++ VirtualBox-6.1.18-256/src/VBox/Additions/linux/sharedfolders/lnkops.c 2021-02-06 21:54:24.869047375 +0100
-@@ -286,7 +286,7 @@
- * Symlink inode operations.
- */
- struct inode_operations vbsf_lnk_iops = {
--#if RTLNX_VER_MAX(4,10,0)
-+#if RTLNX_VER_MAX(4,11,0)
- # if RTLNX_VER_MIN(2,6,8)
- .readlink = generic_readlink,
- # else
-diff -ur VirtualBox-6.1.18/src/VBox/Additions/linux/sharedfolders/regops.c VirtualBox-6.1.18-256/src/VBox/Additions/linux/sharedfolders/regops.c
---- VirtualBox-6.1.18/src/VBox/Additions/linux/sharedfolders/regops.c 2021-01-07 16:34:26.000000000 +0100
-+++ VirtualBox-6.1.18-256/src/VBox/Additions/linux/sharedfolders/regops.c 2021-02-06 21:54:24.869047375 +0100
-@@ -3335,7 +3335,7 @@
- static int vbsf_vmlog_fault(struct vm_area_struct *vma, struct vm_fault *vmf)
- {
- int rc;
--# if RTLNX_VER_MIN(4,10,0)
-+# if RTLNX_VER_MIN(4,11,0)
- SFLOGFLOW(("vbsf_vmlog_fault: vma=%p vmf=%p flags=%#x addr=%p\n", vma, vmf, vmf->flags, vmf->address));
- # else
- SFLOGFLOW(("vbsf_vmlog_fault: vma=%p vmf=%p flags=%#x addr=%p\n", vma, vmf, vmf->flags, vmf->virtual_address));
-@@ -3384,7 +3384,7 @@
- static int vbsf_vmlog_page_mkwrite(struct vm_area_struct *vma, struct vm_fault *vmf)
- {
- int rc;
--# if RTLNX_VER_MIN(4,10,0)
-+# if RTLNX_VER_MIN(4,11,0)
- SFLOGFLOW(("vbsf_vmlog_page_mkwrite: vma=%p vmf=%p flags=%#x addr=%p\n", vma, vmf, vmf->flags, vmf->address));
- # else
- SFLOGFLOW(("vbsf_vmlog_page_mkwrite: vma=%p vmf=%p flags=%#x addr=%p\n", vma, vmf, vmf->flags, vmf->virtual_address));
-@@ -3406,7 +3406,7 @@
- SFLOGFLOW(("vbsf_vmlog_map_pages: returns\n"));
- return rc;
- }
--# elif RTLNX_VER_MIN(4,10,0)
-+# elif RTLNX_VER_MIN(4,11,0)
- static void vbsf_vmlog_map_pages(struct vm_fault *vmf, pgoff_t start, pgoff_t end)
- {
- SFLOGFLOW(("vbsf_vmlog_map_pages: vmf=%p (flags=%#x addr=%p) start=%p end=%p\n", vmf, vmf->flags, vmf->address, start, end));
-diff -ur VirtualBox-6.1.18/src/VBox/Additions/linux/sharedfolders/vfsmod.c VirtualBox-6.1.18-256/src/VBox/Additions/linux/sharedfolders/vfsmod.c
---- VirtualBox-6.1.18/src/VBox/Additions/linux/sharedfolders/vfsmod.c 2021-01-07 16:34:26.000000000 +0100
-+++ VirtualBox-6.1.18-256/src/VBox/Additions/linux/sharedfolders/vfsmod.c 2021-02-06 21:54:24.869047375 +0100
-@@ -443,7 +443,7 @@
- trouches it after this point (we may screw up something). */
- # if RTLNX_VER_RANGE(4,0,0, 4,2,0)
- sb->s_bdi = pSuperInfo->bdi_org; /* (noop_backing_dev_info is not exported) */
--# elif RTLNX_VER_RANGE(2,6,34, 4,10,0)
-+# elif RTLNX_VER_RANGE(2,6,34, 4,11,0)
- sb->s_bdi = &noop_backing_dev_info;
- # endif
- #endif
-diff -ur VirtualBox-6.1.18/src/VBox/Runtime/r0drv/linux/memobj-r0drv-linux.c VirtualBox-6.1.18-256/src/VBox/Runtime/r0drv/linux/memobj-r0drv-linux.c
---- VirtualBox-6.1.18/src/VBox/Runtime/r0drv/linux/memobj-r0drv-linux.c 2021-02-06 22:09:20.335448500 +0100
-+++ VirtualBox-6.1.18-256/src/VBox/Runtime/r0drv/linux/memobj-r0drv-linux.c 2021-02-06 22:07:34.318634767 +0100
-@@ -1174,7 +1174,7 @@
-
- /* openSUSE Leap 42.3 detection :-/ */
- #if RTLNX_VER_RANGE(4,4,0, 4,6,0) && defined(FAULT_FLAG_REMOTE)
--# define GET_USER_PAGES_API KERNEL_VERSION(4, 10, 0) /* no typo! */
-+# define GET_USER_PAGES_API KERNEL_VERSION(4, 11, 0) /* no typo! */
- #else
- # define GET_USER_PAGES_API LINUX_VERSION_CODE
- #endif
-@@ -1252,7 +1252,7 @@
- # endif
- &pMemLnx->apPages[0], /* Page array. */
- papVMAs /* vmas */
--# if GET_USER_PAGES_API >= KERNEL_VERSION(4, 10, 0)
-+# if GET_USER_PAGES_API >= KERNEL_VERSION(4, 11, 0)
- , NULL /* locked */
- # endif
- );
-diff -ur VirtualBox-6.1.18/src/VBox/Runtime/r0drv/linux/mpnotification-r0drv-linux.c VirtualBox-6.1.18-256/src/VBox/Runtime/r0drv/linux/mpnotification-r0drv-linux.c
---- VirtualBox-6.1.18/src/VBox/Runtime/r0drv/linux/mpnotification-r0drv-linux.c 2021-01-07 16:42:09.000000000 +0100
-+++ VirtualBox-6.1.18-256/src/VBox/Runtime/r0drv/linux/mpnotification-r0drv-linux.c 2021-02-06 21:54:24.869047375 +0100
-@@ -37,7 +37,7 @@
- #include <iprt/thread.h>
- #include "r0drv/mp-r0drv.h"
-
--#if RTLNX_VER_MIN(4,10,0)
-+#if RTLNX_VER_MIN(4,11,0)
-
- static enum cpuhp_state g_rtR0MpOnline;
-
diff --git a/kernel-5.18.patch b/kernel-5.18.patch
deleted file mode 100644
index 1adcf10..0000000
--- a/kernel-5.18.patch
+++ /dev/null
@@ -1,16 +0,0 @@
---- VirtualBox-6.1.34/kernel/HostDrivers/vboxnetflt/linux/VBoxNetFlt-linux.c~ 2022-05-25 17:21:29.000000000 +0200
-+++ VirtualBox-6.1.34/kernel/HostDrivers/vboxnetflt/linux/VBoxNetFlt-linux.c 2022-05-26 06:36:50.085761576 +0200
-@@ -2310,8 +2310,13 @@
- {
- vboxNetFltDumpPacket(pSG, true, "host", (fDst & INTNETTRUNKDIR_WIRE) ? 0 : 1);
- Log6(("vboxNetFltPortOsXmit: pBuf->cb dump:\n%.*Rhxd\n", sizeof(pBuf->cb), pBuf->cb));
-+#if RTLNX_VER_MIN(5,18,0)
-+ Log6(("vboxNetFltPortOsXmit: netif_rx(%p)\n", pBuf));
-+ err = netif_rx(pBuf);
-+#else
- Log6(("vboxNetFltPortOsXmit: netif_rx_ni(%p)\n", pBuf));
- err = netif_rx_ni(pBuf);
-+#endif
- if (err)
- rc = RTErrConvertFromErrno(err);
- }
diff --git a/kernel-6.4.10.patch b/kernel-6.4.10.patch
deleted file mode 100644
index 5ad0b6c..0000000
--- a/kernel-6.4.10.patch
+++ /dev/null
@@ -1,13 +0,0 @@
---- VirtualBox-6.1.46/src/VBox/HostDrivers/VBoxNetFlt/linux/VBoxNetFlt-linux.c~ 2023-08-18 13:23:19.899777134 +0200
-+++ VirtualBox-6.1.46/src/VBox/HostDrivers/VBoxNetFlt/linux/VBoxNetFlt-linux.c 2023-08-18 13:29:51.703087517 +0200
-@@ -37,9 +37,9 @@
- #if RTLNX_VER_MIN(2,6,24)
- # include <linux/nsproxy.h>
- #endif
--#if RTLNX_VER_MIN(6,5,0)
-+#if RTLNX_VER_MIN(6,4,10)
- # include <net/gso.h>
- #endif
- #include <linux/netdevice.h>
- #if RTLNX_VER_MAX(2,6,29) || RTLNX_VER_MIN(5,11,0)
- # include <linux/ethtool.h>
diff --git a/libxml2.12.patch b/libxml2.12.patch
new file mode 100644
index 0000000..60df8c8
--- /dev/null
+++ b/libxml2.12.patch
@@ -0,0 +1,43 @@
+--- VirtualBox-7.0.12/include/iprt/cpp/xml.h.orig 2023-12-24 15:42:18.092685383 +0100
++++ VirtualBox-7.0.12/include/iprt/cpp/xml.h 2023-12-24 15:46:14.872125732 +0100
+@@ -113,9 +113,9 @@
+ 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
+--- VirtualBox-7.0.12/src/VBox/Runtime/r3/xml.cpp.orig 2023-12-24 15:31:18.385556729 +0100
++++ VirtualBox-7.0.12/src/VBox/Runtime/r3/xml.cpp 2023-12-24 15:46:31.679225463 +0100
+@@ -131,7 +131,7 @@
+ RTStrFree(msg);
+ }
+
+-XmlError::XmlError(xmlErrorPtr aErr)
++XmlError::XmlError(const xmlError* aErr)
+ {
+ if (!aErr)
+ throw EInvalidArg(RT_SRC_POS);
+@@ -145,7 +145,7 @@
+ * 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 : "<none>";
+ size_t msgLen = strlen(msg);
+@@ -1856,7 +1856,7 @@
+ 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 */
================================================================
---- gitweb:
http://git.pld-linux.org/gitweb.cgi/packages/VirtualBox.git/commitdiff/a4c810dd09dc90a6d1bdf0904aa6d2724bb4fd0f
More information about the pld-cvs-commit
mailing list