[packages/VirtualBox] - updated to 7.1.10
baggins
baggins at pld-linux.org
Mon Jun 9 15:01:31 CEST 2025
commit bf508f5c9d8c8beab05957e1722b6710a56436af
Author: Jan Rękorajski <baggins at pld-linux.org>
Date: Mon Jun 9 16:17:16 2025 +0200
- updated to 7.1.10
kernel modules don't build
there is something wrong with debuginfo, stripped binaries?
VirtualBox.spec | 59 +++++++++-----------
gcc-13.patch | 12 -----
pld-guest.patch | 152 +++++++++++++++++++++++++---------------------------
python3.patch | 10 ++--
qt-detect.patch | 11 ----
qt5-gl.patch | 11 ----
xsl-style-dir.patch | 4 +-
7 files changed, 106 insertions(+), 153 deletions(-)
---
diff --git a/VirtualBox.spec b/VirtualBox.spec
index a29931d..7263178 100644
--- a/VirtualBox.spec
+++ b/VirtualBox.spec
@@ -21,7 +21,7 @@
%bcond_without lightdm # lightdm greeter
%bcond_without dkms # build dkms package
%bcond_without verbose
-%bcond_without gui # disable Qt4 GUI frontend build
+%bcond_without gui # disable Qt6 GUI frontend build
%bcond_without host # build guest packages only
%bcond_with python # Python3 support
@@ -47,21 +47,21 @@ exit 1
%undefine with_host
%endif
-%define qtver 5.6.0
+%define qtver 6.3.0
-%define rel 1
+%define rel 0.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.26
+Version: 7.1.10
Release: %{rel}%{?_pld_builder:%{?with_kernel:@%{_kernel_ver_str}}}
License: GPL v3
Group: Applications/Emulators
Source0: https://download.virtualbox.org/virtualbox/%{version}/%{pname}-%{version}.tar.bz2
-# Source0-md5: f7cd263b31deb675b1e62e56141b775c
+# Source0-md5: 74f699410356334618ab6c00e329d810
Source1: https://download.virtualbox.org/virtualbox/%{version}/VBoxGuestAdditions_%{version}.iso
-# Source1-md5: cd8cba640cff687188392fc8771ccf5c
+# Source1-md5: 95cc508dcb2e5b1cd0bca47f31b17dfe
Source2: vboxservice.init
Source3: vboxservice.service
Source4: vboxservice.sysconfig
@@ -86,10 +86,7 @@ Patch11: %{pname}-all-translations.patch
Patch13: %{pname}-no-scrextend.patch
Patch15: %{pname}-lightdm-1.19.2.patch
Patch16: %{pname}-no-vboxvideo.patch
-Patch17: qt5-gl.patch
-Patch18: qt-detect.patch
Patch19: python3.patch
-Patch20: gcc-13.patch
Patch21: xsl-style-dir.patch
Patch22: build-arch.patch
URL: http://www.virtualbox.org/
@@ -117,16 +114,15 @@ BuildRequires: xorg-xserver-server-devel
BuildRequires: EGL-devel
BuildRequires: OpenGL-GLU-devel
BuildRequires: OpenGL-devel
-BuildRequires: Qt5Core-devel >= %{qtver}
-BuildRequires: Qt5DBus-devel >= %{qtver}
-BuildRequires: Qt5Gui-devel >= %{qtver}
-BuildRequires: Qt5Help-devel >= %{qtver}
-BuildRequires: Qt5Network-devel >= %{qtver}
-BuildRequires: Qt5OpenGL-devel >= %{qtver}
-BuildRequires: Qt5PrintSupport-devel >= %{qtver}
-BuildRequires: Qt5Widgets-devel >= %{qtver}
-BuildRequires: Qt5X11Extras-devel >= %{qtver}
-BuildRequires: Qt5Xml-devel >= %{qtver}
+BuildRequires: Qt6Core-devel >= %{qtver}
+BuildRequires: Qt6DBus-devel >= %{qtver}
+BuildRequires: Qt6Gui-devel >= %{qtver}
+BuildRequires: Qt6Help-devel >= %{qtver}
+BuildRequires: Qt6Network-devel >= %{qtver}
+BuildRequires: Qt6OpenGL-devel >= %{qtver}
+BuildRequires: Qt6PrintSupport-devel >= %{qtver}
+BuildRequires: Qt6Widgets-devel >= %{qtver}
+BuildRequires: Qt6Xml-devel >= %{qtver}
BuildRequires: SDL-devel >= 1.2.7
BuildRequires: acpica
BuildRequires: alsa-lib-devel >= 1.0.6
@@ -159,7 +155,7 @@ BuildRequires: libvpx-devel >= 0.9.5
BuildRequires: libxml2-devel >= 2.6.26
BuildRequires: libxslt-devel >= 1.1.17
BuildRequires: libxslt-progs >= 1.1.17
-%{?with_lightdm:BuildRequires: lightdm-libs-qt5-devel}
+%{?with_lightdm:BuildRequires: lightdm-libs-gobject-devel}
BuildRequires: makeself
BuildRequires: mkisofs
BuildRequires: openssl-devel >= 1.0.1
@@ -171,9 +167,9 @@ BuildRequires: pulseaudio-devel >= 0.9.0
BuildRequires: python3-devel >= 1:3.6
BuildRequires: python3-modules
%endif
-BuildRequires: qt5-assistant
-BuildRequires: qt5-build
-BuildRequires: qt5-linguist
+BuildRequires: qt6-assistant
+BuildRequires: qt6-build
+BuildRequires: qt6-linguist
BuildRequires: rpmbuild(macros) >= 1.752
BuildRequires: sed >= 4.0
%if %{with doc}
@@ -264,8 +260,8 @@ konfigurację maszyny wirtualnej na inny komputer.
Summary: Qt GUI part for VirtualBox
Group: X11/Applications
Requires: %{name} = %{version}-%{release}
-Requires: Qt5Core >= %{qtver}
-Requires: Qt5Gui-platform-xcb >= %{qtver}
+Requires: Qt6Core >= %{qtver}
+Requires: Qt6Gui-platform-xcb >= %{qtver}
Requires: desktop-file-utils
Requires: desktop-file-utils
Requires: fontconfig
@@ -273,8 +269,8 @@ Requires: fonts-Type1-urw
Requires: gtk-update-icon-cache
Requires: hicolor-icon-theme
Requires: shared-mime-info
-Suggests: Qt5Gui-platform-xcb-glx >= %{qtver}
-Suggests: Qt5Gui-platform-xcb-egl >= %{qtver}
+Suggests: Qt6Gui-platform-xcb-glx >= %{qtver}
+Suggests: Qt6Gui-platform-xcb-egl >= %{qtver}
Suggests: gxmessage
Conflicts: %{name} < 4.3.8-3
@@ -555,17 +551,14 @@ echo override vboxsf %{_kernel_ver} misc >> kernel/installed/etc/depmod.d/%{_ker
%patch -P 7 -p1
%patch -P 8 -p1
%patch -P 9 -p1
-%patch -P 10 -p1
+#patch -P 10 -p1
%if %{with all_langs}
%patch -P 11 -p0
%endif
%patch -P 13 -p1
%patch -P 15 -p0
%patch -P 16 -p0
-%patch -P 17 -p1
-%patch -P 18 -p1
%patch -P 19 -p1
-%patch -P 20 -p1
%patch -P 21 -p1
%patch -P 22 -p1
@@ -594,7 +587,6 @@ cd -
# use linux icon for now
cp -p src/VBox/Frontends/VirtualBox/images/os_{linux26,pld}.png
-cp -p src/VBox/Frontends/VirtualBox/images/os_{linux26,pld}_64.png
# don't force whole userspace to be built with -fPIC
# see https://www.virtualbox.org/pipermail/vbox-dev/2015-February/012863.html
@@ -616,6 +608,7 @@ VBOX_WITH_LIGHTDM_GREETER_PACKING=1
TOOL_GCC3_CFLAGS=%{rpmcflags}
TOOL_GCC3_CXXFLAGS=%{rpmcxxflags}
VBOX_GCC_OPT=%{rpmcxxflags}
+VBOX_DO_STRIP :=
TOOL_YASM_AS := /usr/bin/yasm
@@ -992,7 +985,6 @@ dkms remove -m vboxhost -v %{version}-%{rel} --rpm_safe_upgrade --all || :
%attr(755,root,root) %{_libdir}/%{pname}/VBoxSVC
%attr(755,root,root) %{_libdir}/%{pname}/VBoxVMMPreload
%attr(755,root,root) %{_libdir}/%{pname}/VBoxVolInfo
-%attr(755,root,root) %{_libdir}/%{pname}/VBoxXPCOMIPCD
%attr(755,root,root) %{_libdir}/%{pname}/VirtualBoxVM
%attr(755,root,root) %{_libdir}/%{pname}/bldRTLdrCheckImports
%attr(755,root,root) %{_libdir}/%{pname}/iPxeBaseBin
@@ -1069,7 +1061,6 @@ dkms remove -m vboxhost -v %{version}-%{rel} --rpm_safe_upgrade --all || :
%attr(755,root,root) %{_bindir}/VirtualBox
%attr(755,root,root) %{_libdir}/%{pname}/UICommon.so
%attr(755,root,root) %{_libdir}/%{pname}/VBoxDbg.so
-%attr(755,root,root) %{_libdir}/%{pname}/VBoxTestOGL
%attr(755,root,root) %{_libdir}/%{pname}/VirtualBox
%dir %{_datadir}/%{pname}/nls
%lang(bg) %{_datadir}/%{pname}/nls/*_bg.qm
diff --git a/gcc-13.patch b/gcc-13.patch
deleted file mode 100644
index e1234cc..0000000
--- a/gcc-13.patch
+++ /dev/null
@@ -1,12 +0,0 @@
-diff --git a/src/libs/dxvk-native-1.9.2a/src/util/util_bit.h b/src/libs/dxvk-native-1.9.2a/src/util/util_bit.h
-index 3c65c70df..d283792f2 100644
---- a/src/libs/dxvk-native-1.9.2a/src/util/util_bit.h
-+++ b/src/libs/dxvk-native-1.9.2a/src/util/util_bit.h
-@@ -16,6 +16,7 @@
- #include "util_likely.h"
- #include "util_math.h"
-
-+#include <cstdint>
- #include <cstring>
- #include <iterator>
- #include <type_traits>
diff --git a/pld-guest.patch b/pld-guest.patch
index 70fd40e..e1e43d8 100644
--- a/pld-guest.patch
+++ b/pld-guest.patch
@@ -1,110 +1,106 @@
--- VirtualBox-4.2.12/./src/VBox/Main/xml/Settings.cpp~ 2013-04-12 13:38:26.000000000 +0300
+++ VirtualBox-4.2.12/./src/VBox/Main/xml/Settings.cpp 2013-05-13 15:49:30.035999373 +0300
-@@ -3408,6 +3408,7 @@
- { "xandros", "Xandros" },
- { "freebsd", "FreeBSD" },
- { "openbsd", "OpenBSD" },
-+ { "pld", "PLD" },
- { "netbsd", "NetBSD" },
- { "netware", "Netware" },
- { "solaris", "Solaris" },
+@@ -6885,6 +6885,7 @@
+ { "fedoracore", GUEST_OS_ID_STR_X86("Fedora") },
+ { "gentoo", GUEST_OS_ID_STR_X86("Gentoo") },
+ { "mandriva", GUEST_OS_ID_STR_X86("Mandriva") },
++ { "pld", GUEST_OS_ID_STR_X86("PLD") },
+ { "redhat", GUEST_OS_ID_STR_X86("RedHat") },
+ { "ubuntu", GUEST_OS_ID_STR_X86("Ubuntu") },
+ { "xandros", GUEST_OS_ID_STR_X86("Xandros") },
--- VirtualBox-4.2.12/./src/VBox/Frontends/VirtualBox/VirtualBox2.qrc~ 2013-04-12 13:37:50.000000000 +0300
+++ VirtualBox-4.2.12/./src/VBox/Frontends/VirtualBox/VirtualBox2.qrc 2013-05-13 15:51:14.323890458 +0300
-@@ -26,6 +26,8 @@
- <file alias="os_netware.png">images/os_netware.png</file>
- <file alias="os_openbsd_64.png">images/os_openbsd_64.png</file>
- <file alias="os_openbsd.png">images/os_openbsd.png</file>
-+ <file alias="os_pld_64.png">images/os_pld_64.png</file>
+@@ -118,6 +118,7 @@
+ <file alias="os_os2warp45.png">images/os_os2warp45.png</file>
+ <file alias="os_os2warp4.png">images/os_os2warp4.png</file>
+ <file alias="os_other.png">images/os_other.png</file>
+ <file alias="os_pld.png">images/os_pld.png</file>
- <file alias="os_opensuse_64.png">images/os_opensuse_64.png</file>
- <file alias="os_opensuse.png">images/os_opensuse.png</file>
- <file alias="os_oracle_64.png">images/os_oracle_64.png</file>
+ <file alias="os_qnx.png">images/os_qnx.png</file>
+ <file alias="os_redhat.png">images/os_redhat.png</file>
+ <file alias="os_solaris.png">images/os_solaris.png</file>
--- VirtualBox-4.2.12/./src/VBox/Frontends/VirtualBox/VirtualBox2_x2.qrc~ 2013-04-12 13:37:50.000000000 +0300
+++ VirtualBox-4.2.12/./src/VBox/Frontends/VirtualBox/VirtualBox2_x2.qrc 2013-05-13 15:51:14.323890458 +0300
-@@ -26,6 +26,8 @@
- <file alias="os_netware_x2.png">images/x2/os_netware_x2.png</file>
- <file alias="os_openbsd_64_x2.png">images/x2/os_openbsd_64_x2.png</file>
- <file alias="os_openbsd_x2.png">images/x2/os_openbsd_x2.png</file>
+@@ -129,6 +129,7 @@
+ <file alias="os_os2warp45_x2.png">images/x2/os_os2warp45_x2.png</file>
+ <file alias="os_os2warp4_x2.png">images/x2/os_os2warp4_x2.png</file>
+ <file alias="os_other_x2.png">images/x2/os_other_x2.png</file>
+ <file alias="os_pld.png">images/os_pld.png</file>
-+ <file alias="os_pld_64.png">images/os_pld_64.png</file>
- <file alias="os_opensuse_64_x2.png">images/x2/os_opensuse_64_x2.png</file>
- <file alias="os_opensuse_x2.png">images/x2/os_opensuse_x2.png</file>
- <file alias="os_oracle_64_x2.png">images/x2/os_oracle_64_x2.png</file>
+ <file alias="os_qnx_x2.png">images/x2/os_qnx_x2.png</file>
+ <file alias="os_redhat_x2.png">images/x2/os_redhat_x2.png</file>
+ <file alias="os_solaris_x2.png">images/x2/os_solaris_x2.png</file>
--- VirtualBox-4.2.12/./src/VBox/Frontends/VirtualBox/VirtualBox2_x3.qrc~ 2013-04-12 13:37:50.000000000 +0300
+++ VirtualBox-4.2.12/./src/VBox/Frontends/VirtualBox/VirtualBox2_x3.qrc 2013-05-13 15:51:14.323890458 +0300
-@@ -26,6 +26,8 @@
- <file alias="os_netware_x3.png">images/x3/os_netware_x3.png</file>
- <file alias="os_openbsd_64_x3.png">images/x3/os_openbsd_64_x3.png</file>
- <file alias="os_openbsd_x3.png">images/x3/os_openbsd_x3.png</file>
+@@ -129,6 +129,7 @@
+ <file alias="os_os2warp45_x3.png">images/x3/os_os2warp45_x3.png</file>
+ <file alias="os_os2warp4_x3.png">images/x3/os_os2warp4_x3.png</file>
+ <file alias="os_other_x3.png">images/x3/os_other_x3.png</file>
+ <file alias="os_pld.png">images/os_pld.png</file>
-+ <file alias="os_pld_64.png">images/os_pld_64.png</file>
- <file alias="os_opensuse_64_x3.png">images/x3/os_opensuse_64_x3.png</file>
- <file alias="os_opensuse_x3.png">images/x3/os_opensuse_x3.png</file>
- <file alias="os_oracle_64_x3.png">images/x3/os_oracle_64_x3.png</file>
+ <file alias="os_qnx_x3.png">images/x3/os_qnx_x3.png</file>
+ <file alias="os_redhat_x3.png">images/x3/os_redhat_x3.png</file>
+ <file alias="os_solaris_x3.png">images/x3/os_solaris_x3.png</file>
--- VirtualBox-4.2.12/./src/VBox/Frontends/VirtualBox/VirtualBox2_x4.qrc~ 2013-04-12 13:37:50.000000000 +0300
+++ VirtualBox-4.2.12/./src/VBox/Frontends/VirtualBox/VirtualBox2_x4.qrc 2013-05-13 15:51:14.323890458 +0300
-@@ -26,6 +26,8 @@
- <file alias="os_netware_x4.png">images/x4/os_netware_x4.png</file>
- <file alias="os_openbsd_64_x4.png">images/x4/os_openbsd_64_x4.png</file>
- <file alias="os_openbsd_x4.png">images/x4/os_openbsd_x4.png</file>
+@@ -129,6 +129,7 @@
+ <file alias="os_os2warp45_x4.png">images/x4/os_os2warp45_x4.png</file>
+ <file alias="os_os2warp4_x4.png">images/x4/os_os2warp4_x4.png</file>
+ <file alias="os_other_x4.png">images/x4/os_other_x4.png</file>
+ <file alias="os_pld.png">images/os_pld.png</file>
-+ <file alias="os_pld_64.png">images/os_pld_64.png</file>
- <file alias="os_opensuse_64_x4.png">images/x4/os_opensuse_64_x4.png</file>
- <file alias="os_opensuse_x4.png">images/x4/os_opensuse_x4.png</file>
- <file alias="os_oracle_64_x4.png">images/x4/os_oracle_64_x4.png</file>
+ <file alias="os_qnx_x4.png">images/x4/os_qnx_x4.png</file>
+ <file alias="os_redhat_x4.png">images/x4/os_redhat_x4.png</file>
+ <file alias="os_solaris_x4.png">images/x4/os_solaris_x4.png</file>
--- VirtualBox-5.1.2/src/VBox/Main/src-all/Global.cpp.orig 2016-07-29 19:25:16.731328887 +0200
+++ VirtualBox-5.1.2/src/VBox/Main/src-all/Global.cpp 2016-07-29 19:31:59.252427682 +0200
-@@ -321,6 +321,9 @@
- VBOX_LINUX_SUBTYPE_A_32(SUSE_LE, "SUSE Linux Enterprise (32-bit)", 2048, 16, 8),
- VBOX_LINUX_SUBTYPE_A_64(SUSE_LE, "SUSE Linux Enterprise (64-bit)", 2048, 16, 8),
+@@ -400,6 +400,9 @@
+ VBOX_LINUX_SUBTYPE_B_X64("Oracle Linux", Oracle9, "Oracle Linux 9.x (64-bit)", 2048, 16, 20), // 64-bit only
+ VBOX_LINUX_SUBTYPE_B_A64("Oracle Linux", Oracle9, "Oracle Linux 9.x (ARM 64-bit)", 2048, 16, 20), // 64-bit only
-+ VBOX_LINUX_SUBTYPE_A_32(PLD, "PLD Linux (32-bit)", 1024, 16, 8),
-+ VBOX_LINUX_SUBTYPE_A_64(PLD, "PLD Linux (64-bit)", 1024, 16, 8),
++ VBOX_LINUX_SUBTYPE_A_X86("PLD Linux", PLD, "PLD Linux (32-bit)", 1024, 16, 8),
++ VBOX_LINUX_SUBTYPE_A_X64("PLD Linux", PLD, "PLD Linux (64-bit)", 2048, 16, 16),
+
- VBOX_LINUX_SUBTYPE_A_32(Turbolinux, "Turbolinux (32-bit)", 384, 16, 8),
- VBOX_LINUX_SUBTYPE_A_64(Turbolinux, "Turbolinux (64-bit)", 384, 16, 8),
-
+ VBOX_LINUX_SUBTYPE_B_X86("Red Hat", RedHat, "Red Hat (32-bit)", 2048, 16, 20),
+ VBOX_LINUX_SUBTYPE_B_X64("Red Hat", RedHat, "Red Hat (64-bit)", 2048, 16, 20),
+ VBOX_LINUX_SUBTYPE_B_X86("Red Hat", RedHat3, "Red Hat 3.x (32-bit)", 1024, 16, 8),
--- VirtualBox-4.3.8/src/VBox/Main/src-server/ApplianceImpl.cpp~ 2014-02-25 19:09:15.000000000 +0200
+++ VirtualBox-4.3.8/src/VBox/Main/src-server/ApplianceImpl.cpp 2014-02-28 09:52:48.663191185 +0200
-@@ -141,6 +141,8 @@
- { ovf::CIMOSType_CIMOS_Linux_2_6_x_64, VBOXOSTYPE_Xandros_x64 },
- { ovf::CIMOSType_CIMOS_Solaris, VBOXOSTYPE_OpenSolaris },
- { ovf::CIMOSType_CIMOS_Solaris_64, VBOXOSTYPE_OpenSolaris_x64 },
+@@ -238,6 +238,8 @@
+ { ovf::CIMOSType_CIMOS_Debian_64, VBOXOSTYPE_Debian11_x64 },
+ { ovf::CIMOSType_CIMOS_Debian, VBOXOSTYPE_Debian12 },
+ { ovf::CIMOSType_CIMOS_Debian_64, VBOXOSTYPE_Debian12_x64 },
+ { ovf::CIMOSType_CIMOS_Linux_2_6_x, VBOXOSTYPE_PLD },
+ { ovf::CIMOSType_CIMOS_Linux_2_6_x_64, VBOXOSTYPE_PLD_x64 },
-
- // types added with CIM 2.25.0 follow:
- { ovf::CIMOSType_CIMOS_WindowsServer2008R2, VBOXOSTYPE_Win2k8 }, // duplicate, see above
+ { ovf::CIMOSType_CIMOS_Linux_2_4_x, VBOXOSTYPE_Linux24 },
+ { ovf::CIMOSType_CIMOS_Linux_2_4_x_64, VBOXOSTYPE_Linux24_x64 },
+ { ovf::CIMOSType_CIMOS_Linux_2_6_x, VBOXOSTYPE_Linux26 },
--- VirtualBox-4.3.8/include/VBox/ostypes.h~ 2014-02-25 18:59:48.000000000 +0200
+++ VirtualBox-4.3.8/include/VBox/ostypes.h 2014-02-28 09:56:34.440314457 +0200
@@ -103,6 +103,8 @@
- VBOXOSTYPE_Oracle8_x64 = 0x5E105, // 64-bit only
- VBOXOSTYPE_Oracle9_x64 = 0x5E106, // 64-bit only
+ VBOXOSTYPE_Oracle9_arm64 = 0x5E306,
VBOXOSTYPE_Oracle_latest_x64 = VBOXOSTYPE_Oracle9_x64,
+ VBOXOSTYPE_Oracle_latest_arm64 = VBOXOSTYPE_Oracle9_arm64,
+ VBOXOSTYPE_PLD = 0x5F000,
+ VBOXOSTYPE_PLD_x64 = 0x5F100,
- VBOXOSTYPE_FreeBSD = 0x60000,
- VBOXOSTYPE_FreeBSD_x64 = 0x60100,
- VBOXOSTYPE_OpenBSD = 0x61000,
+ /** @} */
+ /** @name BSD and it's descendants
+ * @{ */
--- VirtualBox-4.3.8/src/VBox/Frontends/VirtualBox/src/wizards/newvm/UIWizardNewVMNameOSTypePage.cpp~ 2014-02-25 19:09:00.000000000 +0200
+++ VirtualBox-4.3.8/src/VBox/Frontends/VirtualBox/src/wizards/newvm/UIWizardNewVMNameOSTypePage.cpp 2014-02-28 09:58:59.493698505 +0200
@@ -133,6 +133,8 @@
- { QRegularExpression("Xa.*32", QRegularExpression::CaseInsensitiveOption), "Xandros" },
- { QRegularExpression("((Or)|(oel)|(^ol)).*64", QRegularExpression::CaseInsensitiveOption), "Oracle_64" },
- { QRegularExpression("((Or)|(oel)|(^ol)).*32", QRegularExpression::CaseInsensitiveOption), "Oracle" },
-+ { QRegularExpression("PLD.*64", QRegularExpression::CaseInsensitiveOption), "PLD_64" },
-+ { QRegularExpression("PLD.*32", QRegularExpression::CaseInsensitiveOption), "PLD" },
- { QRegularExpression("Knoppix", QRegularExpression::CaseInsensitiveOption), "Linux26" },
- { QRegularExpression("Dsl", QRegularExpression::CaseInsensitiveOption), "Linux24" },
- { QRegularExpression("((Lin)|(lnx)).*2.?2", QRegularExpression::CaseInsensitiveOption), "Linux22" },
---- VirtualBox-5.0.0/src/VBox/./Frontends/VirtualBox/src/globals/UIIconPool.cpp.orig 2015-07-09 20:00:01.339965485 +0200
-+++ VirtualBox-5.0.0/src/VBox/./Frontends/VirtualBox/src/globals/UIIconPool.cpp 2015-07-09 20:00:40.670058835 +0200
+ { QRegularExpression("((Or)|(oel)|(^ol)).*32", QRegularExpression::CaseInsensitiveOption), GUEST_OS_ID_STR_X86("Oracle") },
+ { QRegularExpression("((Or)|(oel)|(^ol)).*64", QRegularExpression::CaseInsensitiveOption), GUEST_OS_ID_STR_ARM64("Oracle") },
+ { QRegularExpression("((Or)|(oel)|(^ol)).*32", QRegularExpression::CaseInsensitiveOption), GUEST_OS_ID_STR_ARM32("Oracle") },
++ { QRegularExpression("PLD.*64", QRegularExpression::CaseInsensitiveOption), GUEST_OS_ID_STR_X64("PLD") },
++ { QRegularExpression("PLD.*32", QRegularExpression::CaseInsensitiveOption), GUEST_OS_ID_STR_X86("PLD") },
+ { QRegularExpression("Knoppix", QRegularExpression::CaseInsensitiveOption), GUEST_OS_ID_STR_X86("Linux26") },
+ { QRegularExpression("Dsl", QRegularExpression::CaseInsensitiveOption), GUEST_OS_ID_STR_X86("Linux24") },
+ { QRegularExpression("((Lin)|(lnx)).*2.?2", QRegularExpression::CaseInsensitiveOption), GUEST_OS_ID_STR_X86("Linux22") },
+--- VirtualBox-5.0.0/src/VBox/Frontends/VirtualBox/src/globals/UIIconPool.cpp.orig 2015-07-09 20:00:01.339965485 +0200
++++ VirtualBox-5.0.0/src/VBox/Frontends/VirtualBox/src/globals/UIIconPool.cpp 2015-07-09 20:00:40.670058835 +0200
@@ -332,6 +332,8 @@
- m_guestOSTypeIconNames.insert("FreeBSD_64", ":/os_freebsd_64.png");
- m_guestOSTypeIconNames.insert("OpenBSD", ":/os_openbsd.png");
- m_guestOSTypeIconNames.insert("OpenBSD_64", ":/os_openbsd_64.png");
-+ m_guestOSTypeIconNames.insert("PLD", ":/os_pld.png");
-+ m_guestOSTypeIconNames.insert("PLD_64", ":/os_pld_64.png");
- m_guestOSTypeIconNames.insert("NetBSD", ":/os_netbsd.png");
- m_guestOSTypeIconNames.insert("NetBSD_64", ":/os_netbsd_64.png");
- m_guestOSTypeIconNames.insert("Solaris", ":/os_solaris.png");
+ m_guestOSTypeIconNames.insert(GUEST_OS_ID_STR_X86("Oracle"), ":/os_oracle.png");
+ m_guestOSTypeIconNames.insert(GUEST_OS_ID_STR_X64("Oracle"), ":/os_oracle.png");
+ m_guestOSTypeIconNames.insert(GUEST_OS_ID_STR_A64("Oracle"), ":/os_oracle.png");
++ m_guestOSTypeIconNames.insert(GUEST_OS_ID_STR_X86("PLD"), ":/os_pld.png");
++ m_guestOSTypeIconNames.insert(GUEST_OS_ID_STR_X64("PLD"), ":/os_pld.png");
+ m_guestOSTypeIconNames.insert(GUEST_OS_ID_STR_X86("Linux"), ":/os_linux.png");
+ m_guestOSTypeIconNames.insert(GUEST_OS_ID_STR_X64("Linux"), ":/os_linux.png");
+ m_guestOSTypeIconNames.insert(GUEST_OS_ID_STR_X86("FreeBSD"), ":/os_freebsd.png");
diff --git a/python3.patch b/python3.patch
index 32b967f..fc37672 100644
--- a/python3.patch
+++ b/python3.patch
@@ -5,7 +5,7 @@
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="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"
++ 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 python3.14"
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
@@ -16,13 +16,13 @@
+#!/usr/bin/python3
"""
- Copyright (C) 2009-2023 Oracle and/or its affiliates.
+ Copyright (C) 2009-2024 Oracle and/or its affiliates.
@@ -26,7 +26,7 @@
- import os,sys
- from distutils.version import StrictVersion
+ 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 = ["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" ]
++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", "3.14" ]
prefixes = ["/usr", "/usr/local", "/opt", "/opt/local"]
known = {}
diff --git a/qt-detect.patch b/qt-detect.patch
deleted file mode 100644
index f13a1ce..0000000
--- a/qt-detect.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- VirtualBox-6.1.26/configure~ 2021-09-10 08:38:49.000000000 +0200
-+++ VirtualBox-6.1.26/configure 2021-09-10 09:01:11.297646984 +0200
-@@ -1564,7 +1564,7 @@
- FLGQT5=`pkg-config Qt5Core --cflags`
- # gcc 4.8 is able to compile with C++11 (see also VBOX_GCC_std in Config.kmk)
- [ $(($cc_maj * 100 + $cc_min)) -ge 408 ] && FLGQT5="$FLGQT5 -std=c++11"
-- INCQT5=`strip_I "$FLGQT5"`
-+ INCQT5=`pkg-config Qt5Core --variable=includedir`
- LIBDIR5=`pkg-config Qt5Core --variable=libdir`
- LIBQT5=`pkg-config Qt5Core Qt5Gui --libs`
- LIBQT5="-L$LIBDIR5 $LIBQT5"
diff --git a/qt5-gl.patch b/qt5-gl.patch
deleted file mode 100644
index d548008..0000000
--- a/qt5-gl.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- VirtualBox-6.0.8/include/VBox/VBoxGL2D.h~ 2019-05-13 15:23:12.000000000 +0200
-+++ VirtualBox-6.0.8/include/VBox/VBoxGL2D.h 2019-07-13 17:31:31.183251092 +0200
-@@ -111,7 +111,7 @@
- typedef GLvoid (APIENTRY *PFNVBOXVHWA_UNIFORM4I)(GLint location, GLint v0, GLint v1, GLint v2, GLint v3);
-
- /* GL_ARB_pixel_buffer_object*/
--#ifndef Q_WS_MAC
-+#if 0
- /* apears to be defined on mac */
- typedef ptrdiff_t GLsizeiptr;
- #endif
diff --git a/xsl-style-dir.patch b/xsl-style-dir.patch
index b561f0b..1be4467 100644
--- a/xsl-style-dir.patch
+++ b/xsl-style-dir.patch
@@ -1,11 +1,11 @@
--- VirtualBox-7.0.10/doc/manual/Config.kmk.orig 2023-07-12 18:25:05.000000000 +0200
+++ VirtualBox-7.0.10/doc/manual/Config.kmk 2023-09-06 16:49:17.062393789 +0200
@@ -135,7 +135,7 @@
- VBOX_PATH_DOCBOOK_DTD ?= $(KBUILD_DEVTOOLS)/common/docbook-xml/v4.5
+ VBOX_PATH_DITA_DTD ?= $(VBOX_DITA_OT_PATH)/plugins/org.dita.specialization.dita11/dtd/
else
# use docbook of the build host
- VBOX_PATH_DOCBOOK ?= /usr/share/xml/docbook/stylesheet/docbook-xsl
+ VBOX_PATH_DOCBOOK ?= /usr/share/sgml/docbook/xsl-stylesheets
VBOX_PATH_DOCBOOK_DTD ?= /usr/share/xml/docbook/schema/dtd/4.5
+ VBOX_PATH_DITA_DTD ?= $(VBOX_DITA_OT_PATH)/plugins/org.dita.specialization.dita11/dtd/
endif
- VBOX_XML_CATALOG ?= $(VBOX_PATH_MANUAL_OUTBASE)/vbox-doc.cat
================================================================
---- gitweb:
http://git.pld-linux.org/gitweb.cgi/packages/VirtualBox.git/commitdiff/bf508f5c9d8c8beab05957e1722b6710a56436af
More information about the pld-cvs-commit
mailing list