commit 9b23ebed61fbf83a575a044b4b8d0c948c5e1507
Author: Jan Rękorajski <bagg...@pld-linux.org>
Date: Fri May 24 22:30:41 2024 +0200
- up to 7.0.18
VirtualBox.spec | 10 ++++------
libxml2.12.patch | 43 -------------------------------------------
2 files changed, 4 insertions(+), 49 deletions(-)
---
diff --git a/VirtualBox.spec b/VirtualBox.spec
index 71fbbaf..3164020 100644
--- a/VirtualBox.spec
+++ b/VirtualBox.spec
@@ -47,19 +47,19 @@ exit 1
%define qtver 5.6.0
-%define rel 2
+%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.12
+Version: 7.0.18
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: b89fb26c765764ee0e2d14305c0411d5
+# Source0-md5: b1259b71044ab24671d6f5757855548d
Source1:
https://download.virtualbox.org/virtualbox/%{version}/VBoxGuestAdditions_%{version}.iso
-# Source1-md5: beedd5530d469b38079e4fe066d1ef32
+# Source1-md5: c31a1845868d0913012f1dc481461e8f
Source2: vboxservice.init
Source3: vboxservice.service
Source4: vboxservice.sysconfig
@@ -90,7 +90,6 @@ 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}
@@ -565,7 +564,6 @@ echo override vboxsf %{_kernel_ver} misc >>
kernel/installed/etc/depmod.d/%{_ker
%patch20 -p1
%patch21 -p1
%patch22 -p1
-%patch23 -p1
%{__sed} -i -e 's,@VBOX_DOC_PATH@,%{_docdir}/%{name}-%{version},' \
-e 's/Categories=.*/Categories=Utility;Emulator;/'
src/VBox/Installer/common/virtualbox.desktop.in
diff --git a/libxml2.12.patch b/libxml2.12.patch
deleted file mode 100644
index 60df8c8..0000000
--- a/libxml2.12.patch
+++ /dev/null
@@ -1,43 +0,0 @@
---- 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/9b23ebed61fbf83a575a044b4b8d0c948c5e1507
_______________________________________________
pld-cvs-commit mailing list
pld-cvs-commit@lists.pld-linux.org
http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
