+
Description: Disable "Check for Updates" action.
Bug-Ubuntu: https://bugs.launchpad.net/bugs/272212
-Author: Daniel Hahler <ubuntu@thequod.de>, Felix Geyer <fgeyer@debian.org>
+Author: Daniel Hahler <ubuntu@thequod.de>, Felix Geyer <fgeyer@debian.org>, Gianfranco Costamagna <locutusofborg@debian.org>
-diff a/src/VBox/Frontends/VirtualBox/src/net/UIUpdateManager.cpp b/src/VBox/Frontends/VirtualBox/src/net/UIUpdateManager.cpp
---- a/src/VBox/Frontends/VirtualBox/src/net/UIUpdateManager.cpp
-+++ b/src/VBox/Frontends/VirtualBox/src/net/UIUpdateManager.cpp
-@@ -474,6 +474,8 @@ void UIUpdateManager::shutdown()
-
- void UIUpdateManager::sltForceCheck()
+Index: virtualbox/doc/manual/en_US/user_Introduction.xml
+===================================================================
+--- virtualbox.orig/doc/manual/en_US/user_Introduction.xml
++++ virtualbox/doc/manual/en_US/user_Introduction.xml
+@@ -6090,14 +6090,14 @@
+ <xref linkend="specialcharacters"/>.
+ </para>
+ </listitem>
+-
++ <!--
+ <listitem>
+ <para>
+ <emphasis role="bold">Update.</emphasis> Enables you to
+ specify various settings for Automatic Updates.
+ </para>
+ </listitem>
+-
++ -->
+ <listitem>
+ <para>
+ <emphasis role="bold">Language.</emphasis> Enables you to
+Index: virtualbox/src/VBox/Frontends/VirtualBox/src/extradata/UIExtraDataManager.cpp
+===================================================================
+--- virtualbox.orig/src/VBox/Frontends/VirtualBox/src/extradata/UIExtraDataManager.cpp
++++ virtualbox/src/VBox/Frontends/VirtualBox/src/extradata/UIExtraDataManager.cpp
+@@ -2421,7 +2421,7 @@
+ bool UIExtraDataManager::applicationUpdateEnabled()
{
-+ return;
-+
- /* Force call for new version check: */
- sltCheckIfUpdateIsNecessary(true /* force call */);
+ /* 'True' unless 'restriction' feature allowed: */
+- return !isFeatureAllowed(GUI_PreventApplicationUpdate);
++ return false;
}
---- VirtualBox-5.0.0/src/VBox/./Frontends/VirtualBox/src/globals/UIActionPool.cpp.orig 2015-07-09 20:11:53.129742315 +0200
-+++ VirtualBox-5.0.0/src/VBox/./Frontends/VirtualBox/src/globals/UIActionPool.cpp 2015-07-09 20:12:02.136424394 +0200
-@@ -991,7 +991,6 @@
- m_pool[UIActionIndex_M_Application_S_Preferences] = new UIActionSimplePreferences(this);
+
+ QString UIExtraDataManager::applicationUpdateData()
+Index: virtualbox/src/VBox/Frontends/VirtualBox/src/settings/UISettingsDialogSpecific.cpp
+===================================================================
+--- virtualbox.orig/src/VBox/Frontends/VirtualBox/src/settings/UISettingsDialogSpecific.cpp
++++ virtualbox/src/VBox/Frontends/VirtualBox/src/settings/UISettingsDialogSpecific.cpp
+@@ -47,10 +47,10 @@
+ #ifdef VBOX_WS_WIN
+ # include "UIGlobalSettingsInterface.h"
+ #endif
+-#ifdef VBOX_GUI_WITH_NETWORK_MANAGER
+-# include "UIGlobalSettingsProxy.h"
+-# include "UIGlobalSettingsUpdate.h"
+-#endif
++//#ifdef VBOX_GUI_WITH_NETWORK_MANAGER
++//# include "UIGlobalSettingsProxy.h"
++//# include "UIGlobalSettingsUpdate.h"
++//#endif
+
+ /* GUI includes: Machine Settings: */
+ #include "UIMachineSettingsAudio.h"
+@@ -99,7 +99,7 @@
+
#ifdef VBOX_GUI_WITH_NETWORK_MANAGER
- m_pool[UIActionIndex_M_Application_S_NetworkAccessManager] = new UIActionSimpleNetworkAccessManager(this);
-- m_pool[UIActionIndex_M_Application_S_CheckForUpdates] = new UIActionSimpleCheckForUpdates(this);
- #endif /* VBOX_GUI_WITH_NETWORK_MANAGER */
- m_pool[UIActionIndex_M_Application_S_ResetWarnings] = new UIActionSimpleResetWarnings(this);
- m_pool[UIActionIndex_M_Application_S_Close] = new UIActionSimplePerformClose(this);
-@@ -1033,8 +1033,6 @@
+ /* Update page: */
+- m_pSelector->setItemText(GlobalSettingsPageType_Update, tr("Update"));
++ //m_pSelector->setItemText(GlobalSettingsPageType_Update, tr("Update"));
+ #endif
+
+ /* Language page: */
+@@ -110,7 +110,7 @@
+
+ #ifdef VBOX_GUI_WITH_NETWORK_MANAGER
+ /* Proxy page: */
+- m_pSelector->setItemText(GlobalSettingsPageType_Proxy, tr("Proxy"));
++ //m_pSelector->setItemText(GlobalSettingsPageType_Proxy, tr("Proxy"));
+ #endif
+
+ #ifdef VBOX_WS_WIN
+@@ -226,14 +226,14 @@
+ }
#ifdef VBOX_GUI_WITH_NETWORK_MANAGER
- connect(action(UIActionIndex_M_Application_S_NetworkAccessManager), &UIAction::triggered,
- gNetworkManager, &UINetworkManager::show, Qt::UniqueConnection);
-- connect(action(UIActionIndex_M_Application_S_CheckForUpdates), &UIAction::triggered,
-- gUpdateManager, &UIUpdateManager::sltForceCheck, Qt::UniqueConnection);
+ /* Update page: */
+- case GlobalSettingsPageType_Update:
++ /*case GlobalSettingsPageType_Update:
+ {
+ pSettingsPage = new UIGlobalSettingsUpdate;
+ addItem(":/refresh_32px.png", ":/refresh_24px.png", ":/refresh_16px.png",
+ iPageIndex, "#update", pSettingsPage);
+ addPageHelpKeyword(iPageIndex, "preferences");
+ break;
+- }
++ }*/
#endif /* VBOX_GUI_WITH_NETWORK_MANAGER */
- connect(action(UIActionIndex_M_Application_S_ResetWarnings), &UIAction::triggered,
- &msgCenter(), &UIMessageCenter::sltResetSuppressedMessages, Qt::UniqueConnection);
---- VirtualBox-5.0.0/src/VBox/./Frontends/VirtualBox/src/globals/UIActionPool.h.orig 2015-07-09 20:13:36.439757556 +0200
-+++ VirtualBox-5.0.0/src/VBox/./Frontends/VirtualBox/src/globals/UIActionPool.h 2015-07-09 20:13:40.446396985 +0200
-@@ -62,7 +62,6 @@
- UIActionIndex_M_Application_S_Preferences,
+ /* Language page: */
+ case GlobalSettingsPageType_Language:
+@@ -255,14 +255,14 @@
+ }
#ifdef VBOX_GUI_WITH_NETWORK_MANAGER
- UIActionIndex_M_Application_S_NetworkAccessManager,
-- UIActionIndex_M_Application_S_CheckForUpdates,
+ /* Proxy page: */
+- case GlobalSettingsPageType_Proxy:
++ /*case GlobalSettingsPageType_Proxy:
+ {
+ pSettingsPage = new UIGlobalSettingsProxy;
+ addItem(":/proxy_32px.png", ":/proxy_24px.png", ":/proxy_16px.png",
+ iPageIndex, "#proxy", pSettingsPage);
+ addPageHelpKeyword(iPageIndex, "preferences");
+ break;
+- }
++ }*/
#endif /* VBOX_GUI_WITH_NETWORK_MANAGER */
- UIActionIndex_M_Application_S_ResetWarnings,
- UIActionIndex_M_Application_S_Close,
---- VirtualBox-5.0.0/src/VBox/./Frontends/VirtualBox/src/selector/UISelectorWindow.cpp.orig 2015-07-09 20:09:22.239478146 +0200
-+++ VirtualBox-5.0.0/src/VBox/./Frontends/VirtualBox/src/selector/UISelectorWindow.cpp 2015-07-09 20:17:20.635207663 +0200
-@@ -1211,8 +1211,6 @@
- /* 'About' action goes to Application menu: */
- pMenu->addAction(actionPool()->action(UIActionIndex_M_Application_S_About));
- # ifdef VBOX_GUI_WITH_NETWORK_MANAGER
-- /* 'Check for Updates' action goes to Application menu: */
-- pMenu->addAction(actionPool()->action(UIActionIndex_M_Application_S_CheckForUpdates));
- /* 'Network Access Manager' action goes to Application menu: */
- pMenu->addAction(actionPool()->action(UIActionIndex_M_Application_S_NetworkAccessManager));
- # endif /* VBOX_GUI_WITH_NETWORK_MANAGER */
-@@ -1303,7 +1301,6 @@
- addAction(actionPool()->action(UIActionIndexST_M_File_S_ShowMediumManager));
- # ifdef VBOX_GUI_WITH_NETWORK_MANAGER
- addAction(actionPool()->action(UIActionIndex_M_Application_S_NetworkAccessManager));
-- addAction(actionPool()->action(UIActionIndex_M_Application_S_CheckForUpdates));
- # endif /* VBOX_GUI_WITH_NETWORK_MANAGER */
- addAction(actionPool()->action(UIActionIndex_M_Application_S_ResetWarnings));
- addAction(actionPool()->action(UIActionIndexST_M_File_S_Close));
-@@ -1368,9 +1365,6 @@
- # ifdef VBOX_GUI_WITH_NETWORK_MANAGER
- /* 'Network Access Manager' action goes to 'File' menu: */
- pMenu->addAction(actionPool()->action(UIActionIndex_M_Application_S_NetworkAccessManager));
-- /* 'Check for Updates' action goes to 'File' menu: */
-- if (gEDataManager->applicationUpdateEnabled())
-- pMenu->addAction(actionPool()->action(UIActionIndex_M_Application_S_CheckForUpdates));
- # endif /* VBOX_GUI_WITH_NETWORK_MANAGER */
- /* 'Reset Warnings' action goes 'File' menu: */
- pMenu->addAction(actionPool()->action(UIActionIndex_M_Application_S_ResetWarnings));
-diff a/src/VBox/Frontends/VirtualBox/src/settings/UISettingsDialogSpecific.cpp b/src/VBox/Frontends/VirtualBox/src/settings/UISettingsDialogSpecific.cpp
---- a/src/VBox/Frontends/VirtualBox/src/settings/UISettingsDialogSpecific.cpp
-+++ b/src/VBox/Frontends/VirtualBox/src/settings/UISettingsDialogSpecific.cpp
-@@ -557,6 +557,10 @@ bool UISettingsDialogGlobal::isPageAvailable(int iPageId)
- #endif /* !VBOX_WITH_NETFLT */
- break;
- }
-+ case GlobalSettingsPageType_Update:
-+ {
-+ return false;
-+ }
- default:
- break;
- }
+ #ifdef VBOX_WS_WIN
+ /* Interface page: */
+++ /dev/null
---- VirtualBox-4.3.0/src/VBox/Additions/common/crOpenGL/fakedri_drv.c~ 2011-06-30 18:33:33.000000000 +0200
-+++ VirtualBox-4.3.0/src/VBox/Additions/common/crOpenGL/fakedri_drv.c 2011-07-19 21:58:45.900949411 +0200
-@@ -37,15 +37,15 @@
- # define DRI_DEFAULT_DRIVER_DIR "/usr/local/lib/dri"
- # define DRI_XORG_DRV_DIR "/usr/local/lib/xorg/modules/drivers/"
- # else
--# define DRI_DEFAULT_DRIVER_DIR "/usr/lib64/dri:/usr/lib/dri:/usr/lib/x86_64-linux-gnu/dri:/usr/lib/xorg/modules/dri"
--# define DRI_XORG_DRV_DIR "/usr/lib/xorg/modules/drivers/"
-+# define DRI_DEFAULT_DRIVER_DIR "/usr/lib64/xorg/modules/dri:/usr/lib/xorg/modules/dri:/usr/lib/xorg/modules/x86_64-linux-gnu/dri"
-+# define DRI_XORG_DRV_DIR "/usr/lib64/xorg/modules/drivers/"
- # endif
- #else
- # ifdef RT_OS_FREEBSD
- # define DRI_DEFAULT_DRIVER_DIR "/usr/local/lib/dri"
- # define DRI_XORG_DRV_DIR "/usr/local/lib/xorg/modules/drivers/"
- # else
--# define DRI_DEFAULT_DRIVER_DIR "/usr/lib/dri:/usr/lib/i386-linux-gnu/dri:/usr/lib/xorg/modules/dri"
-+# define DRI_DEFAULT_DRIVER_DIR "/usr/lib/xorg/modules/dri:/usr/lib/xorg/modules/i386-linux-gnu/dri"
- # define DRI_XORG_DRV_DIR "/usr/lib/xorg/modules/drivers/"
- # endif
- #endif
+++ /dev/null
---- VirtualBox-5.2.2/src/VBox/Installer/linux/Makefile.include.header.orig 2017-11-25 14:42:43.336204931 +0100
-+++ VirtualBox-5.2.2/src/VBox/Installer/linux/Makefile.include.header 2017-11-25 14:43:00.666146939 +0100
-@@ -136,7 +136,7 @@
- endif # neq($(KERNELRELEASE),)
-
- # Kernel build folder
--KERN_DIR := /lib/modules/$(KERN_VER)/build
-+KERN_DIR ?= /lib/modules/$(KERN_VER)/build
- ifneq ($(shell if test -d $(KERN_DIR); then echo yes; fi),yes)
- $(error Error: unable to find the headers of the Linux kernel to build against. \
- Specify KERN_VER=<version> (currently $(KERN_VER)) and run Make again)
+++ /dev/null
---- ./src/libs/xpcom18a4/python/Makefile.kmk.orig 2016-09-13 20:04:08.869585445 +0200
-+++ ./src/libs/xpcom18a4/python/Makefile.kmk 2016-09-13 20:04:29.852832898 +0200
-@@ -19,7 +19,7 @@
- include $(KBUILD_PATH)/subheader.kmk
-
- ifdef VBOX_WITH_MULTIVERSION_PYTHON
-- VBOX_MULTIPYTHON = 1
-+ VBOX_MULTIPYTHON = $(VBOX_WITH_MULTIVERSION_PYTHON)
- else
- VBOX_MULTIPYTHON = 0
- endif
--- VirtualBox-5.0.0/doc/manual/docbook2latex.xsl.orig 2015-07-09 22:40:10.126159489 +0200
+++ VirtualBox-5.0.0/doc/manual/docbook2latex.xsl 2015-07-09 22:40:24.342836635 +0200
@@ -117,7 +117,6 @@
- \usepackage{fancyvrb}
+ \usepackage{fancybox}
\usepackage{alltt}
\usepackage{color}
-\usepackage{scrextend}
\definecolor{darkgreen}{rgb}{0,0.6,0}
+ \tymin=21pt
- </xsl:text>
- DLLS := $(filter-out vboxvideo_drv_%,$(DLLS)) vboxvideo_drv_system
+ DLLS := $(filter-out vboxvideo_drv_%,$(DLLS))
SYSMODS := $(filter-out vboxvideo_drv%,$(SYSMODS))
- vboxvideo_drv_system_TEMPLATE = VBOXGUESTR3XORGMOD
+ vboxvideo_drv_system_TEMPLATE = VBoxGuestR3XOrgMod
vboxvideo_drv_system_CFLAGS := \
vboxdrv
vboxnetadp
vboxnetflt
-vboxpci
+++ VirtualBox-3.2.0_OSE/src/VBox/VMM/VMMAll/PGMAllGst.h 2010-05-19 14:07:31.690925013 +0200
@@ -28,6 +28,11 @@ RT_C_DECLS_END
-
+ #endif /* 32BIT, PAE, AMD64 */
+#if defined(__GNUC__) && __GNUC__ == 4 && __GNUC_MINOR__ == 5
+ // Work around gcc 4.5 producing warnings when a X86PDPE is constructed
%bcond_without dkms # build dkms package
%bcond_without verbose
%bcond_without gui # disable Qt4 GUI frontend build
+%bcond_without host # build guest packages only
%if 0%{?_pld_builder:1} && %{with kernel} && %{with userspace}
%{error:kernel and userspace cannot be built at the same time on PLD builders}
%define _enable_debug_packages 0
%endif
+%ifnarch %{x8664} %{?with_kernel:x32}
+%undefine with_host
+%endif
+
%define qtver 5.6.0
-%define rel 3
+%define rel 2
%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: 5.2.18
+Version: 7.0.12
Release: %{rel}%{?_pld_builder:%{?with_kernel:@%{_kernel_ver_str}}}
License: GPL v2
Group: Applications/Emulators
-Source0: http://download.virtualbox.org/virtualbox/%{version}/%{pname}-%{version}.tar.bz2
-# Source0-md5: d8e291525b84569356773eef507c49ce
-Source1: http://download.virtualbox.org/virtualbox/%{version}/VBoxGuestAdditions_%{version}.iso
-# Source1-md5: a263141eabce4bd1e537665104f7c1e4
+Source0: https://download.virtualbox.org/virtualbox/%{version}/%{pname}-%{version}.tar.bz2
+# Source0-md5: b89fb26c765764ee0e2d14305c0411d5
+Source1: https://download.virtualbox.org/virtualbox/%{version}/VBoxGuestAdditions_%{version}.iso
+# Source1-md5: beedd5530d469b38079e4fe066d1ef32
Source2: vboxservice.init
Source3: vboxservice.service
Source4: vboxservice.sysconfig
Source8: %{pname}-virtualbox-guest-modules-load.conf
Source9: vboxautostart.init
Source10: autostart.cfg
+Source11: vboxclient-vmsvga.service
+Source12: udev-guest.rules
Patch0: %{pname}-version-error.patch
Patch1: %{pname}-VBoxSysInfo.patch
Patch2: %{pname}-warning_workaround.patch
-Patch3: %{pname}-dri.patch
Patch4: wrapper.patch
-Patch5: xserver-1.12.patch
Patch6: hardening-shared.patch
Patch7: lightdm-greeter-makefile.patch
Patch8: lightdm-greeter-g++-link.patch
Patch9: pld-guest.patch
Patch10: 16-no-update.patch
Patch11: %{pname}-all-translations.patch
-Patch12: x32.patch
Patch13: %{pname}-no-scrextend.patch
-Patch14: %{pname}-multipython.patch
Patch15: %{pname}-lightdm-1.19.2.patch
Patch16: %{pname}-no-vboxvideo.patch
-Patch17: %{pname}-kerndir.patch
-Patch18: kernel-4.18.patch
-Patch19: gcc8.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
+Patch23: libxml2.12.patch
URL: http://www.virtualbox.org/
%if %{with userspace}
%ifarch %{x8664}
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: bin86
BuildRequires: curl-devel >= 7.19.1
BuildRequires: device-mapper-devel >= 1.02
-%{?with_doc:BuildRequires: docbook-dtd44-xml}
+%if %{with doc}
+BuildRequires: docbook-dtd45-xml
+BuildRequires: docbook-style-xsl
+%endif
BuildRequires: fakeroot
%{?with_lightdm:BuildRequires: fltk-devel}
BuildRequires: gcc >= 5:3.2.3
%{?with_webservice:BuildRequires: gsoap-devel}
BuildRequires: issue
-BuildRequires: kBuild >= 0.1.9998.3093
+BuildRequires: kBuild >= 0.1.9998.3598
BuildRequires: libIDL-devel
BuildRequires: libcap-static
BuildRequires: libdrm-devel
-BuildRequires: libpng-devel >= 1.2.5
+BuildRequires: liblzf-devel
+BuildRequires: libpng-devel >= 2:1.2.5
BuildRequires: libstdc++-devel >= 5:3.2.3
BuildRequires: libstdc++-static >= 5:3.2.3
+BuildRequires: libtpms-devel
BuildRequires: libuuid-devel
BuildRequires: libvncserver-devel >= 0.9.9
BuildRequires: libvpx-devel >= 0.9.5
%{?with_lightdm:BuildRequires: lightdm-libs-qt5-devel}
BuildRequires: makeself
BuildRequires: mkisofs
-BuildRequires: openssl-devel >= 0.9.8
+BuildRequires: openssl-devel >= 1.0.1
BuildRequires: pam-devel
BuildRequires: pixman-devel
BuildRequires: pkgconfig
BuildRequires: pulseaudio-devel >= 0.9.0
-BuildRequires: python-devel >= 2.3
-BuildRequires: python-modules
+BuildRequires: python3-devel >= 1:3.6
+BuildRequires: python3-modules
+BuildRequires: qt5-assistant
BuildRequires: qt5-build
BuildRequires: qt5-linguist
-BuildRequires: rpmbuild(macros) >= 1.715
+BuildRequires: rpmbuild(macros) >= 1.752
BuildRequires: sed >= 4.0
%if %{with doc}
BuildRequires: texlive-fonts-bitstream
%define filterout -Werror=format-security
+%define _noautochrpath .*\\.debug$
+
%description
Oracle VirtualBox is a general-purpose full virtualizer for x86
hardware. Targeted at server, desktop and embedded use, it is now the
Summary: VirtualBox Guest Additions
Group: Base
Requires: %{name} = %{version}
-%if "%{_rpmversion}" >= "5"
BuildArch: noarch
-%endif
%description additions
VirtualBox Guest Additions.
Group: X11/Applications
Requires: %{name}-guest = %{version}-%{release}
Requires: xorg-app-xrandr
-Requires: xorg-driver-video-vboxvideo = %{version}-%{release}
Requires: kernel(vboxvideo)
Obsoletes: xorg-driver-input-vboxmouse < %{version}-%{release}
+Obsoletes: xorg-driver-video-vboxvideo < %{version}-%{release}
%description guest-x11
Tools for X11 session that utilize kernel modules for supporting
PAM module (Pluggable Authentication Module) which can be used to
perform automated guest logons.
-%package -n xorg-driver-video-vboxvideo
-Summary: X.org video driver for VirtualBox guest OS
-Summary(pl.UTF-8): Sterownik grafiki dla systemu gościa w VirtualBoksie
-Group: X11/Applications
-Requires: Mesa-dri-driver-swrast
-Requires: xorg-driver-video-modesetting
-Requires: xorg-xserver-libdri >= 1.7.4
-Requires: xorg-xserver-server >= 1.0.99.901
-%{?requires_xorg_xserver_videodrv}
-Provides: OpenGL = 2.1
-Provides: OpenGL-GLX = 1.3
-Provides: xorg-xserver-module(glx)
-
-%description -n xorg-driver-video-vboxvideo
-X.org video driver for VirtualBox guest OS.
-
-%description -n xorg-driver-video-vboxvideo -l pl.UTF-8
-Sterownik grafiki dla systemu gościa w VirtualBoksie.
-
%package -n dkms-vboxguest
Summary: VirtualBox kernel modules source for Linux Guest
Summary(pl.UTF-8): Moduły VirtualBoksa do jądra Linuksa dla systemu gościa
License: GPL v2+
Group: Base/Kernel
Requires: dkms
-%if "%{_rpmversion}" >= "5"
BuildArch: noarch
-%endif
%description -n dkms-vboxguest
This package contains DKMS-ready VirtualBox Guest Additions for Linux
License: GPL v2+
Group: Base/Kernel
Requires: dkms
-%if "%{_rpmversion}" >= "5"
BuildArch: noarch
-%endif
%description -n dkms-vboxhost
This package contains DKMS enabled sourcecode of VirtualBox Support
Requires(postun): %releq_kernel\
Provides: kernel(vboxguest) = %{version}-%{rel}\
Provides: kernel(vboxsf) = %{version}-%{rel}\
+%if %{_kernel_version_code} < %{_kernel_version_magic 4 13 0}\
Provides: kernel(vboxvideo) = %{version}-%{rel}\
+%endif\
Obsoletes: kernel-init-guest\
Conflicts: kernel%{_alt_kernel}-virtualbox-host\
\
Provides: kernel(vboxdrv) = %{version}-%{rel}\
Provides: kernel(vboxnetadp) = %{version}-%{rel}\
Provides: kernel(vboxnetflt) = %{version}-%{rel}\
-Provides: kernel(vboxpci) = %{version}-%{rel}\
Obsoletes: kernel-init-host\
\
%description -n kernel%{_alt_kernel}-virtualbox-host\
%if %{with kernel}\
%files -n kernel%{_alt_kernel}-virtualbox-guest\
%defattr(644,root,root,755)\
+%if %{_kernel_version_code} >= %{_kernel_version_magic 4 16 0}\
+%config(noreplace) %verify(not md5 mtime size) /etc/depmod.d/%{_kernel_ver}/vboxguest.conf\
+%endif\
%config(noreplace) %verify(not md5 mtime size) /etc/modules-load.d/virtualbox-guest.conf\
+%if %{_kernel_version_code} < %{_kernel_version_magic 5 14 0}\
/lib/modules/%{_kernel_ver}/misc/vboxguest.ko*\
/lib/modules/%{_kernel_ver}/misc/vboxsf.ko*\
%if %{_kernel_version_code} < %{_kernel_version_magic 4 13 0}\
/lib/modules/%{_kernel_ver}/misc/vboxvideo.ko*\
%endif\
+%endif\
\
+%if %{with host}\
%files -n kernel%{_alt_kernel}-virtualbox-host\
%config(noreplace) %verify(not md5 mtime size) /etc/modules-load.d/virtualbox-host.conf\
/lib/modules/%{_kernel_ver}/misc/vboxdrv.ko*\
/lib/modules/%{_kernel_ver}/misc/vboxnetadp.ko*\
/lib/modules/%{_kernel_ver}/misc/vboxnetflt.ko*\
-/lib/modules/%{_kernel_ver}/misc/vboxpci.ko*\
+%endif\
%endif\
\
%post -n kernel%{_alt_kernel}-virtualbox-guest\
%postun -n kernel%{_alt_kernel}-virtualbox-guest\
%depmod %{_kernel_ver}\
\
+%if %{with host}\
%post -n kernel%{_alt_kernel}-virtualbox-host\
%depmod %{_kernel_ver}\
\
%postun -n kernel%{_alt_kernel}-virtualbox-host\
%depmod %{_kernel_ver}\
+%endif\
%{nil}
%define build_kernel_pkg()\
export KERN_DIR=%{_kernelsrcdir}\
-cd PLD-MODULE-BUILD/HostDrivers\
+%if %{with host}\
+cd kernel/HostDrivers\
%build_kernel_modules -m vboxdrv -C vboxdrv\
-%build_kernel_modules -m vboxnetadp -C vboxnetadp\
-%build_kernel_modules -m vboxnetflt -C vboxnetflt\
-%build_kernel_modules -m vboxpci -C vboxpci\
-cd ../GuestDrivers\
+%build_kernel_modules -m vboxnetadp -C vboxnetadp KBUILD_EXTRA_SYMBOLS=$PWD/../vboxdrv/Module.symvers\
+%build_kernel_modules -m vboxnetflt -C vboxnetflt KBUILD_EXTRA_SYMBOLS=$PWD/../vboxdrv/Module.symvers\
+%install_kernel_modules -D ../../kernel/installed -m vboxdrv/vboxdrv,vboxnetadp/vboxnetadp,vboxnetflt/vboxnetflt -d misc\
+cd ../..\
+%endif\
+%if %{_kernel_version_code} < %{_kernel_version_magic 5 14 0}\
+cd kernel/GuestDrivers\
%build_kernel_modules -m vboxguest -C vboxguest\
-cp -a vboxguest/Module.symvers vboxsf\
-%build_kernel_modules -m vboxsf -C vboxsf -c\
+%build_kernel_modules -m vboxsf -C vboxsf KBUILD_EXTRA_SYMBOLS=$PWD/../vboxguest/Module.symvers\
+%install_kernel_modules -D ../../kernel/installed -m vboxsf/vboxsf,vboxguest/vboxguest -d misc\
%if %{_kernel_version_code} < %{_kernel_version_magic 4 13 0}\
-%build_kernel_modules -m vboxvideo -C vboxvideo\
+%build_kernel_modules -m vboxvideo -C vboxvideo KBUILD_EXTRA_SYMBOLS=$PWD/../vboxguest/Module.symvers\
+%install_kernel_modules -D ../../kernel/installed -m vboxvideo/vboxvideo -d misc\
%endif\
cd ../..\
-%install_kernel_modules -D PLD-MODULE-BUILD/installed -m PLD-MODULE-BUILD/HostDrivers/vboxdrv/vboxdrv,PLD-MODULE-BUILD/HostDrivers/vboxnetadp/vboxnetadp,PLD-MODULE-BUILD/HostDrivers/vboxnetflt/vboxnetflt,PLD-MODULE-BUILD/HostDrivers/vboxpci/vboxpci,PLD-MODULE-BUILD/GuestDrivers/vboxsf/vboxsf -d misc\
-%install_kernel_modules -D PLD-MODULE-BUILD/installed -m PLD-MODULE-BUILD/GuestDrivers/vboxguest/vboxguest -d misc\
-%if %{_kernel_version_code} < %{_kernel_version_magic 4 13 0}\
-%install_kernel_modules -D PLD-MODULE-BUILD/installed -m PLD-MODULE-BUILD/GuestDrivers/vboxvideo/vboxvideo -d misc\
+%endif\
+%{nil}
+
+%define install_kernel_pkg()\
+%if %{_kernel_version_code} >= %{_kernel_version_magic 4 16 0}\
+install -d kernel/installed/etc/depmod.d/%{_kernel_ver}\
+echo override vboxguest %{_kernel_ver} misc > kernel/installed/etc/depmod.d/%{_kernel_ver}/vboxguest.conf\
+%if %{_kernel_version_code} >= %{_kernel_version_magic 5 6 0}\
+echo override vboxsf %{_kernel_ver} misc >> kernel/installed/etc/depmod.d/%{_kernel_ver}/vboxguest.conf\
+%endif\
%endif\
%{nil}
%patch0 -p1
%patch1 -p1
%patch2 -p1
-%patch3 -p1
%patch4 -p1
-%patch5 -p1
%patch6 -p1
%patch7 -p1
%patch8 -p1
%if %{with all_langs}
%patch11 -p0
%endif
-%patch12 -p1
%patch13 -p1
-%patch14 -p0
%patch15 -p0
%patch16 -p0
%patch17 -p1
%patch18 -p1
-%patch19 -p0
+%patch19 -p1
+%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
%{__sed} -i -e 's#@INSTALL_DIR@#%{_libdir}/%{pname}#' src/VBox/Installer/linux/VBox.sh
%if %{with kernel}
-install -d PLD-MODULE-BUILD/{GuestDrivers,HostDrivers}
-cd PLD-MODULE-BUILD
+install -d kernel/{GuestDrivers,HostDrivers}
+cd kernel
../src/VBox/Additions/linux/export_modules.sh guest-modules.tar.gz
tar -zxf guest-modules.tar.gz -C GuestDrivers
-../src/VBox/HostDrivers/linux/export_modules.sh host-modules.tar.gz --without-hardening
+../src/VBox/HostDrivers/linux/export_modules.sh --file host-modules.tar.gz --without-hardening
tar -zxf host-modules.tar.gz -C HostDrivers
cd -
%endif
TOOL_GCC3_CXXFLAGS=%{rpmcxxflags}
VBOX_GCC_OPT=%{rpmcxxflags}
+TOOL_YASM_AS := /usr/bin/yasm
+
+VBOX_BLD_PYTHON := %{__python3}
+VBOX_WITHOUT_PYTHON_LIMITED_API=1
+
VBOX_PATH_APP_PRIVATE_ARCH := %{_libdir}/%{pname}
VBOX_PATH_APP_PRIVATE := %{_datadir}/%{pname}
VBOX_PATH_SHARED_LIBS := $(VBOX_PATH_APP_PRIVATE_ARCH)
VBOX_WITH_VRDP_RDESKTOP=
VBOX_WITH_MULTIVERSION_PYTHON=0
+%if %{without host}
+VBOX_ONLY_ADDITIONS_WITHOUT_RTISOMAKER=1
+VBOX_ONLY_ADDITIONS=1
+%endif
EOF
%undefine filterout_c
--enable-vnc \
%{!?with_gui:--disable-qt} \
%{__enable webservice} \
+ %{!?with_host:--only-additions} \
%{nil}
. "$PWD/env.sh"
-kmk %{?_smp_mflags}
+kmk %{?_smp_mflags} %{!?with_host:VBOX_ONLY_ADDITIONS_WITHOUT_RTISOMAKER=1 VBOX_ONLY_ADDITIONS=1}
%endif
%{?with_kernel:%{expand:%build_kernel_packages}}
+%{?with_kernel:%{expand:%install_kernel_packages}}
%install
rm -rf $RPM_BUILD_ROOT
install -d $RPM_BUILD_ROOT%{_datadir}/%{pname}
cp -a$l %{outdir}/* $RPM_BUILD_ROOT%{_libdir}/%{pname}
-cp -p$l %{SOURCE1} $RPM_BUILD_ROOT%{_datadir}/%{pname}/VBoxGuestAdditions.iso ||
-cp -p %{SOURCE1} $RPM_BUILD_ROOT%{_datadir}/%{pname}/VBoxGuestAdditions.iso
%if %{without gui}
%{__rm} -r $RPM_BUILD_ROOT%{_libdir}/%{pname}/icons
%{__rm} $RPM_BUILD_ROOT%{_libdir}/%{pname}/virtualbox.xml
%endif
-# vboxvideo
-%{__mv} $RPM_BUILD_ROOT{%{_libdir}/%{pname}/additions/VBoxOGL.so,%{_libdir}/xorg/modules/dri/vboxvideo_dri.so}
-# XXX: where else to install them that vboxvideo_dri.so finds them? patch with rpath?
-%{__mv} $RPM_BUILD_ROOT{%{_libdir}/%{pname}/additions,%{_libdir}}/VBoxEGL.so
-%{__mv} $RPM_BUILD_ROOT{%{_libdir}/%{pname}/additions,%{_libdir}}/VBoxOGLarrayspu.so
-%{__mv} $RPM_BUILD_ROOT{%{_libdir}/%{pname}/additions,%{_libdir}}/VBoxOGLcrutil.so
-%{__mv} $RPM_BUILD_ROOT{%{_libdir}/%{pname}/additions,%{_libdir}}/VBoxOGLerrorspu.so
-%{__mv} $RPM_BUILD_ROOT{%{_libdir}/%{pname}/additions,%{_libdir}}/VBoxOGLfeedbackspu.so
-%{__mv} $RPM_BUILD_ROOT{%{_libdir}/%{pname}/additions,%{_libdir}}/VBoxOGLpackspu.so
-%{__mv} $RPM_BUILD_ROOT{%{_libdir}/%{pname}/additions,%{_libdir}}/VBoxOGLpassthroughspu.so
-
# Guest Only Tools
+%{__mv} $RPM_BUILD_ROOT{%{_libdir}/%{pname}/additions,%{_bindir}}/VBoxAudioTest
%{__mv} $RPM_BUILD_ROOT{%{_libdir}/%{pname}/additions,%{_bindir}}/VBoxClient
%{__mv} $RPM_BUILD_ROOT{%{_libdir}/%{pname}/additions,%{_bindir}}/VBoxControl
+%{__mv} $RPM_BUILD_ROOT{%{_libdir}/%{pname}/additions,%{_bindir}}/VBoxDRMClient
%{__mv} $RPM_BUILD_ROOT{%{_libdir}/%{pname}/additions,%{_bindir}}/VBoxService
install -d $RPM_BUILD_ROOT/etc/xdg/autostart
cp -p src/VBox/Additions/x11/Installer/vboxclient.desktop \
cp -p %{SOURCE3} $RPM_BUILD_ROOT%{systemdunitdir}/vboxservice.service
cp -p %{SOURCE4} $RPM_BUILD_ROOT/etc/sysconfig/vboxservice
+cp -p %{SOURCE11} $RPM_BUILD_ROOT%{systemdunitdir}/vboxclient-vmsvga.service
+
install -p %{SOURCE9} $RPM_BUILD_ROOT/etc/rc.d/init.d/vboxautostart
%{__sed} -i -e 's#@INSTALL_DIR@#%{_libdir}/%{pname}#' $RPM_BUILD_ROOT/etc/rc.d/init.d/vboxautostart
cp -p %{SOURCE10} $RPM_BUILD_ROOT%{_sysconfdir}/vbox
%{__rm} $RPM_BUILD_ROOT%{_libdir}/%{pname}/additions/autorun.sh
%{__rm} $RPM_BUILD_ROOT%{_libdir}/%{pname}/additions/runasroot.sh
+cp -p %{SOURCE12} $RPM_BUILD_ROOT/etc/udev/rules.d/60-vboxguest.rules
+
+%if %{with host}
# unknown - checkme
%if 1
%{__rm} $RPM_BUILD_ROOT%{_libdir}/%{pname}/SUPInstall
%{__rm} $RPM_BUILD_ROOT%{_libdir}/%{pname}/xpidl
%endif
+cp -p$l %{SOURCE1} $RPM_BUILD_ROOT%{_datadir}/%{pname}/VBoxGuestAdditions.iso ||
+cp -p %{SOURCE1} $RPM_BUILD_ROOT%{_datadir}/%{pname}/VBoxGuestAdditions.iso
+
# manual installation steps based on src/VBox/Installer/linux/install.sh
ln -sf %{_libdir}/%{pname}/VBox.sh $RPM_BUILD_ROOT%{_bindir}/VirtualBox
ln -sf %{_libdir}/%{pname}/VBox.sh $RPM_BUILD_ROOT%{_bindir}/VBoxManage
-ln -sf %{_libdir}/%{pname}/VBox.sh $RPM_BUILD_ROOT%{_bindir}/VBoxSDL
ln -sf %{_libdir}/%{pname}/VBox.sh $RPM_BUILD_ROOT%{_bindir}/VBoxVRDP
ln -sf %{_libdir}/%{pname}/VBox.sh $RPM_BUILD_ROOT%{_bindir}/VBoxHeadless
ln -sf %{_libdir}/%{pname}/VBox.sh $RPM_BUILD_ROOT%{_bindir}/VBoxBalloonCtrl
%{__rm} -r $RPM_BUILD_ROOT%{_libdir}/%{pname}/{sdk,testcase}
%{__rm} -r $RPM_BUILD_ROOT%{_libdir}/%{pname}/dtrace
%{__rm} $RPM_BUILD_ROOT%{_libdir}/%{pname}/vboxkeyboard.tar.bz2
-%{__rm} $RPM_BUILD_ROOT%{_libdir}/%{pname}/tst*
%{__rm} $RPM_BUILD_ROOT%{_libdir}/%{pname}/scripts/generated.sh
%{__rm} $RPM_BUILD_ROOT%{_libdir}/%{pname}/ExtensionPacks/VNC/ExtPack-license.*
%endif
%endif
%endif
+%endif
%if %{with kernel}
install -d $RPM_BUILD_ROOT{/etc/modules-load.d,/sbin}
-cp -a PLD-MODULE-BUILD/installed/* $RPM_BUILD_ROOT
+cp -a kernel/installed/* $RPM_BUILD_ROOT
# Tell systemd to load modules
cp -p %{SOURCE7} $RPM_BUILD_ROOT/etc/modules-load.d/virtualbox-host.conf
%update_mime_database
%pre guest
+%useradd -u 336 -d /usr/share/empty -s /bin/false -c "VirtualBox guest additions" -g nobody vboxadd
# Add a group "vboxsf" for Shared Folders access
# All users which want to access the auto-mounted Shared Folders have to be added to this group.
%groupadd -g 266 -r -f vboxsf
%post guest
/sbin/chkconfig --add vboxservice
%service vboxservice restart
-%systemd_post vboxservice.service
+%systemd_post vboxservice.service vboxclient-vmsvga.service
%preun guest
if [ "$1" = "0" ]; then
/sbin/chkconfig --del vboxservice
%service vboxservice -q stop
fi
-%systemd_preun vboxservice.service
+%systemd_preun vboxservice.service vboxclient-vmsvga.service
%postun guest
if [ "$1" = "0" ]; then
+ %userremove vboxadd
%groupremove vboxsf
fi
%systemd_reload
dkms remove -m vboxhost -v %{version}-%{rel} --rpm_safe_upgrade --all || :
%if %{with userspace}
+%if %{with host}
%files
%defattr(644,root,root,755)
%dir %attr(751,root,root) %{_sysconfdir}/vbox
%attr(755,root,root) %{_bindir}/VBoxDTrace
%attr(755,root,root) %{_bindir}/VBoxHeadless
%attr(755,root,root) %{_bindir}/VBoxManage
-%attr(755,root,root) %{_bindir}/VBoxSDL
%attr(755,root,root) %{_bindir}/VBoxVRDP
%attr(755,root,root) %{_bindir}/vbox-img
%dir %{_libdir}/%{pname}
%attr(755,root,root) %{_libdir}/%{pname}/VBoxDD.so
%attr(755,root,root) %{_libdir}/%{pname}/VBoxDD2.so
%attr(755,root,root) %{_libdir}/%{pname}/VBoxDDU.so
+%attr(755,root,root) %{_libdir}/%{pname}/VBoxDxVk.so
%attr(755,root,root) %{_libdir}/%{pname}/VBoxDragAndDropSvc.so
%attr(755,root,root) %{_libdir}/%{pname}/VBoxGuestControlSvc.so
%attr(755,root,root) %{_libdir}/%{pname}/VBoxGuestPropSvc.so
%attr(755,root,root) %{_libdir}/%{pname}/VBoxHostChannel.so
%attr(755,root,root) %{_libdir}/%{pname}/VBoxKeyboard.so
-%attr(755,root,root) %{_libdir}/%{pname}/VBoxOGLhostcrutil.so
-%attr(755,root,root) %{_libdir}/%{pname}/VBoxOGLhosterrorspu.so
-%attr(755,root,root) %{_libdir}/%{pname}/VBoxOGLrenderspu.so
%attr(755,root,root) %{_libdir}/%{pname}/VBoxPython*.so
-%attr(755,root,root) %{_libdir}/%{pname}/VBoxREM.so
%attr(755,root,root) %{_libdir}/%{pname}/VBoxRT.so
+%attr(755,root,root) %{_libdir}/%{pname}/VBoxSVGA3D.so
%attr(755,root,root) %{_libdir}/%{pname}/VBoxSharedClipboard.so
-%attr(755,root,root) %{_libdir}/%{pname}/VBoxSharedCrOpenGL.so
%attr(755,root,root) %{_libdir}/%{pname}/VBoxSharedFolders.so
%attr(755,root,root) %{_libdir}/%{pname}/VBoxVMM.so
%attr(755,root,root) %{_libdir}/%{pname}/VBoxXPCOM.so
# binaries
%attr(755,root,root) %{_libdir}/%{pname}/VBox.sh
+%attr(755,root,root) %{_libdir}/%{pname}/VBoxAudioTest
%attr(755,root,root) %{_libdir}/%{pname}/VBoxAutostart
%attr(755,root,root) %{_libdir}/%{pname}/VBoxBalloonCtrl
%attr(755,root,root) %{_libdir}/%{pname}/VBoxDTrace
%attr(755,root,root) %{_libdir}/%{pname}/VBoxNetAdpCtl
%attr(755,root,root) %{_libdir}/%{pname}/VBoxNetDHCP
%attr(755,root,root) %{_libdir}/%{pname}/VBoxNetNAT
-%attr(755,root,root) %{_libdir}/%{pname}/VBoxSDL
%attr(755,root,root) %{_libdir}/%{pname}/VBoxSVC
-%attr(755,root,root) %{_libdir}/%{pname}/VBoxTunctl
%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
-%if %{with doc}
-%attr(755,root,root) %{_libdir}/%{pname}/VBoxManageHelp
-%endif
+%attr(755,root,root) %{_libdir}/%{pname}/vboximg-mount
%dir %{_libdir}/%{pname}/tools
+%attr(755,root,root) %{_libdir}/%{pname}/tools/LnxPerfHack
%attr(755,root,root) %{_libdir}/%{pname}/tools/RTCat
%attr(755,root,root) %{_libdir}/%{pname}/tools/RTChMod
+%attr(755,root,root) %{_libdir}/%{pname}/tools/RTCp
%attr(755,root,root) %{_libdir}/%{pname}/tools/RTDbgSymCache
+%attr(755,root,root) %{_libdir}/%{pname}/tools/RTEfiFatExtract
+%attr(755,root,root) %{_libdir}/%{pname}/tools/RTEfiSigDb
+%attr(755,root,root) %{_libdir}/%{pname}/tools/RTFuzzClient
+%attr(755,root,root) %{_libdir}/%{pname}/tools/RTFuzzMaster
+%attr(755,root,root) %{_libdir}/%{pname}/tools/RTFtpServer
%attr(755,root,root) %{_libdir}/%{pname}/tools/RTGzip
%attr(755,root,root) %{_libdir}/%{pname}/tools/RTHttp
+%attr(755,root,root) %{_libdir}/%{pname}/tools/RTHttpServer
%attr(755,root,root) %{_libdir}/%{pname}/tools/RTIsoMaker
%attr(755,root,root) %{_libdir}/%{pname}/tools/RTKrnlModInfo
+%attr(755,root,root) %{_libdir}/%{pname}/tools/RTLdrCheckImports
%attr(755,root,root) %{_libdir}/%{pname}/tools/RTLdrFlt
%attr(755,root,root) %{_libdir}/%{pname}/tools/RTLs
%attr(755,root,root) %{_libdir}/%{pname}/tools/RTManifest
%{_libdir}/%{pname}/VBoxBugReport
%{_libdir}/%{pname}/VBoxCpuReport
-%{_libdir}/%{pname}/VBoxDD2R0.debug
-%{_libdir}/%{pname}/VBoxDD2R0.r0
-%{_libdir}/%{pname}/VBoxDD2RC.debug
-%{_libdir}/%{pname}/VBoxDD2RC.rc
-%{_libdir}/%{pname}/VBoxDDRC.debug
-%{_libdir}/%{pname}/VBoxDDRC.rc
%{_libdir}/%{pname}/VBoxDDR0.debug
%{_libdir}/%{pname}/VBoxDDR0.r0
%{_libdir}/%{pname}/VBoxEFI32.fd
%{_libdir}/%{pname}/VBoxEFI64.fd
-%{_libdir}/%{pname}/VMMRC.debug
-%{_libdir}/%{pname}/VMMRC.rc
%{_libdir}/%{pname}/VMMR0.debug
%{_libdir}/%{pname}/VMMR0.r0
%dir %{_datadir}/%{pname}
-%config(noreplace) %verify(not md5 mtime size) /etc/udev/rules.d/*.rules
+%config(noreplace) %verify(not md5 mtime size) /etc/udev/rules.d/60-vboxdrv.rules
%attr(755,root,root) /lib/udev/VBoxCreateUSBNode.sh
%if %{with gui}
%files gui
%defattr(644,root,root,755)
%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
%lang(fr) %{_datadir}/%{pname}/nls/*_fr.qm
%lang(gl) %{_datadir}/%{pname}/nls/*_gl.qm
%lang(he) %{_datadir}/%{pname}/nls/*_he.qm
+%lang(hr) %{_datadir}/%{pname}/nls/*_hr_HR.qm
%lang(hu) %{_datadir}/%{pname}/nls/*_hu.qm
%lang(id) %{_datadir}/%{pname}/nls/*_id.qm
%lang(it) %{_datadir}/%{pname}/nls/*_it.qm
%lang(ja) %{_datadir}/%{pname}/nls/*_ja.qm
+%lang(ka) %{_datadir}/%{pname}/nls/*_ka.qm
%lang(km_KH) %{_datadir}/%{pname}/nls/*_km_KH.qm
%lang(ko) %{_datadir}/%{pname}/nls/*_ko.qm
%lang(lt) %{_datadir}/%{pname}/nls/*_lt.qm
%defattr(644,root,root,755)
%{_datadir}/%{pname}/VBoxGuestAdditions.iso
+%if %{with webservice}
+%files webservice
+%defattr(644,root,root,755)
+%attr(755,root,root) %{_bindir}/vboxwebsrv
+%attr(755,root,root) %{_libdir}/%{pname}/vboxwebsrv
+%attr(755,root,root) %{_libdir}/%{pname}/webtest
+%endif
+
+%if %{with doc}
+%files doc
+%defattr(644,root,root,755)
+%doc %{_libdir}/%{pname}/UserManual.qch
+%doc %{_libdir}/%{pname}/UserManual.qhc
+# this is a symlink...
+%doc %{_libdir}/%{pname}/UserManual.pdf
+%if %{with all_langs}
+%lang(fr) %doc %{_libdir}/%{pname}/UserManual_fr_FR.pdf
+%endif
+# ..to this file
+%doc %{outdir}/UserManual.pdf
+%if %{with all_langs}
+%lang(fr) %doc %{outdir}/UserManual_fr_FR.pdf
+%endif
+%endif
+%endif
+
%files guest
%defattr(644,root,root,755)
%attr(755,root,root) /sbin/mount.vboxsf
%attr(754,root,root) /etc/rc.d/init.d/vboxservice
%config(noreplace) %verify(not md5 mtime size) /etc/sysconfig/vboxservice
%{systemdunitdir}/vboxservice.service
+%{systemdunitdir}/vboxclient-vmsvga.service
+%attr(755,root,root) %{_bindir}/VBoxAudioTest
%attr(755,root,root) %{_bindir}/VBoxControl
%attr(755,root,root) %{_bindir}/VBoxService
+%config(noreplace) %verify(not md5 mtime size) /etc/udev/rules.d/60-vboxguest.rules
%files guest-x11
%defattr(644,root,root,755)
/etc/xdg/autostart/vboxclient.desktop
%attr(755,root,root) %{_bindir}/VBoxClient
%attr(755,root,root) %{_bindir}/VBoxClient-all
-
-%if %{with webservice}
-%files webservice
-%defattr(644,root,root,755)
-%attr(755,root,root) %{_bindir}/vboxwebsrv
-%attr(755,root,root) %{_libdir}/%{pname}/vboxwebsrv
-%attr(755,root,root) %{_libdir}/%{pname}/webtest
-%endif
+%attr(755,root,root) %{_bindir}/VBoxDRMClient
%if %{with lightdm}
%files -n lightdm-greeter-vbox
%defattr(644,root,root,755)
%attr(755,root,root) /%{_lib}/security/pam_vbox.so
-%if %{with doc}
-%files doc
-%defattr(644,root,root,755)
-# this is a symlink...
-%doc %{_libdir}/%{pname}/UserManual.pdf
-%if %{with all_langs}
-%lang(fr) %doc %{_libdir}/%{pname}/UserManual_fr_FR.pdf
-%endif
-# ..to this file
-%doc %{outdir}/UserManual.pdf
-%if %{with all_langs}
-%lang(fr) %doc %{outdir}/UserManual_fr_FR.pdf
-%endif
-%endif
-
-%files -n xorg-driver-video-vboxvideo
-%defattr(644,root,root,755)
-%attr(755,root,root) %{_libdir}/xorg/modules/dri/vboxvideo_dri.so
-# vboxvideo_dri.so deps
-%attr(755,root,root) %{_libdir}/VBoxEGL.so
-%attr(755,root,root) %{_libdir}/VBoxOGLarrayspu.so
-%attr(755,root,root) %{_libdir}/VBoxOGLcrutil.so
-%attr(755,root,root) %{_libdir}/VBoxOGLerrorspu.so
-%attr(755,root,root) %{_libdir}/VBoxOGLfeedbackspu.so
-%attr(755,root,root) %{_libdir}/VBoxOGLpackspu.so
-%attr(755,root,root) %{_libdir}/VBoxOGLpassthroughspu.so
-
%if %{with dkms}
%files -n dkms-vboxguest
%defattr(644,root,root,755)
%{_usrsrc}/vboxguest-%{version}-%{rel}
+%if %{with host}
%files -n dkms-vboxhost
%defattr(644,root,root,755)
%{_usrsrc}/vboxhost-%{version}-%{rel}
%endif
%endif
+%endif
--- /dev/null
+--- VirtualBox-7.0.10/configure.orig 2023-09-07 02:11:31.000000000 +0200
++++ VirtualBox-7.0.10/configure 2023-09-07 02:20:09.875202421 +0200
+@@ -381,7 +381,7 @@
+ check_environment()
+ {
+ test_header environment
+- BUILD_CPU=`uname -m`
++ BUILD_CPU=`rpm -E '%{_host_cpu}'`
+ [ "$OS" = "solaris" ] && BUILD_CPU=`isainfo | cut -f 1 -d ' '`
+ case "$BUILD_CPU" in
+ i[3456789]86|x86|i86pc|BePC)
--- /dev/null
+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>
+++ /dev/null
-------------------------------------------------------------------------
-r73343 | vboxsync | 2018-07-25 08:39:58 +0200 (śro, 25 lip 2018) | 3 lines
-Changed paths:
- M /trunk/configure
-
-configure: remove the upper version limit in the gcc test and plan to
-blacklist if necessary in future.
-Thank you Gianfranco Costamagna.
-
-Index: configure
-===================================================================
---- configure (revision 73342)
-+++ configure (revision 73343)
-@@ -446,9 +446,8 @@
- # gcc-4.0 is allowed for Darwin only
- elif [ $cc_maj -lt 4 \
- -o \( $cc_maj -eq 4 -a $cc_min -lt 4 -a "$OS" != "darwin" \) \
-- -o \( $cc_maj -eq 4 -a $cc_min -lt 2 -a "$OS" = "darwin" \) \
-- -o $cc_maj -gt 7 ]; then
-- log_failure "gcc version $cc_maj.$cc_min found, expected gcc 4.x...7.x"
-+ -o \( $cc_maj -eq 4 -a $cc_min -lt 2 -a "$OS" = "darwin" \) ]; then
-+ log_failure "gcc version $cc_maj.$cc_min found, expected gcc 4.x or later"
- fail really
- else
- log_success "found version $cc_ver"
-
-------------------------------------------------------------------------
@@ -1079,7 +1079,7 @@
#
ifdef VBOX_WITHOUT_HARDENING
- VBOX_WITH_HARDENING=
+ VBOX_WITH_HARDENING =
- ifeq ($(VBOX_WITH_HARDENING),)
+ ifeq ($(VBOX_WITH_HARDENING),0)
- VBOX_PATH_APP_PRIVATE=
- VBOX_PATH_APP_PRIVATE_ARCH=
- VBOX_PATH_APP_PRIVATE_ARCH_TOP=
+ VBOX_PATH_APP_PRIVATE =
+ VBOX_PATH_APP_PRIVATE_ARCH =
+ VBOX_PATH_APP_PRIVATE_ARCH_TOP =
+++ /dev/null
-Index: VirtualBox-5.2.12/src/VBox/Additions/linux/sharedfolders/utils.c
-===================================================================
---- VirtualBox-5.2.12.orig/src/VBox/Additions/linux/sharedfolders/utils.c
-+++ VirtualBox-5.2.12/src/VBox/Additions/linux/sharedfolders/utils.c
-@@ -50,7 +50,11 @@ static void sf_timespec_from_ftime(RTTIM
- RTTimeSpecSetNano(ts, t);
- }
- #else /* >= 2.6.0 */
-+#if LINUX_VERSION_CODE >= KERNEL_VERSION(4, 18, 0)
-+static void sf_ftime_from_timespec(struct timespec64 *tv, RTTIMESPEC *ts)
-+#else
- static void sf_ftime_from_timespec(struct timespec *tv, RTTIMESPEC *ts)
-+#endif
- {
- int64_t t = RTTimeSpecGetNano(ts);
- int64_t nsec;
-@@ -60,7 +64,11 @@ static void sf_ftime_from_timespec(struc
- tv->tv_nsec = nsec;
- }
-
-+#if LINUX_VERSION_CODE >= KERNEL_VERSION(4, 18, 0)
-+static void sf_timespec_from_ftime(RTTIMESPEC *ts, struct timespec64 *tv)
-+#else
- static void sf_timespec_from_ftime(RTTIMESPEC *ts, struct timespec *tv)
-+#endif
- {
- int64_t t = (int64_t)tv->tv_nsec + (int64_t)tv->tv_sec * 1000000000;
- RTTimeSpecSetNano(ts, t);
-
--- /dev/null
+--- 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 */
--- VirtualBox-4.2.12/src/VBox/Additions/linux/lightdm-greeter/Makefile.kmk~ 2013-06-01 11:13:40.000000000 +0300
+++ VirtualBox-4.2.12/src/VBox/Additions/linux/lightdm-greeter/Makefile.kmk 2013-06-02 11:08:48.853803103 +0300
@@ -82,4 +82,7 @@
- endif
+ vbox-greeter_LDFLAGS += -s
endif
+# as vbox build links this with gcc not g++, add -lsupc++
+++ /dev/null
-hardcoded paths instead of pkg-config. oh well
-
---- VirtualBox-4.2.12/src/VBox/Additions/linux/lightdm-greeter/Makefile.kmk~ 2013-04-12 13:35:14.000000000 +0300
-+++ VirtualBox-4.2.12/src/VBox/Additions/linux/lightdm-greeter/Makefile.kmk 2013-06-01 11:13:40.977671744 +0300
-@@ -46,6 +46,8 @@
- vbox-greeter_SOURCES = vbox-greeter.cpp
- ### todo: define some _INCS in Config.kmk and use 'pkg-config glib-2.0 --cflags' in configure to override
- vbox-greeter_INCS = \
-+ /usr/lib64/glib-2.0/include \
-+ /usr/lib/glib-2.0/include \
- /usr/lib/i386-linux-gnu/glib-2.0/include \
- /usr/lib/x86_64-linux-gnu/glib-2.0/include \
- /usr/include/glib-2.0 \
## to the INCS, however lightdm.h is missing and will be taken from the system.
@@ -59,7 +59,7 @@
/usr/include/glib-2.0 \
- $(if $(VBOX_OSE),,liblightdm-gobject-1.5.0) \
+ $(if $(VBOX_OSE),,liblightdm-gobject-1.5.0) \
/usr/include/lightdm-gobject-1 \
- $(if $(VBOX_OSE),$(patsubst -I%,%,%(filter -I%,$(shell pkg-config --cflags liblightdm-gobject-1))),)
+ $(if $(VBOX_OSE),$(patsubst -I%,%,$(filter -I%,$(shell pkg-config --cflags liblightdm-gobject-1))),)
ifndef VBOX_WITH_FLTK
vbox-greeter_INCS += \
- /usr/include/glib-2.0 \
+ /usr/include/glib-2.0 \
{ "netbsd", "NetBSD" },
{ "netware", "Netware" },
{ "solaris", "Solaris" },
---- VirtualBox-4.2.12/./src/VBox/Frontends/VirtualBox/VirtualBox1.qrc~ 2013-04-12 13:37:50.000000000 +0300
-+++ VirtualBox-4.2.12/./src/VBox/Frontends/VirtualBox/VirtualBox1.qrc 2013-05-13 15:51:14.323890458 +0300
+--- 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.png">images/os_openbsd.png</file>
<file alias="os_openbsd_64.png">images/os_openbsd_64.png</file>
-+ <file alias="os_pld.png">images/os_pld.png</file>
+ <file alias="os_openbsd.png">images/os_openbsd.png</file>
+ <file alias="os_pld_64.png">images/os_pld_64.png</file>
- <file alias="os_opensuse.png">images/os_opensuse.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_oracle.png">images/os_oracle.png</file>
+ <file alias="os_opensuse.png">images/os_opensuse.png</file>
+ <file alias="os_oracle_64.png">images/os_oracle_64.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>
++ <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>
+--- 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>
++ <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>
+--- 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>
++ <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>
--- 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,17 @@
- 512, 16, 8 * _1G64, NetworkAdapterType_I82540EM, 0, StorageControllerType_PIIX4, StorageBus_IDE,
- StorageControllerType_PIIX4, StorageBus_IDE, ChipsetType_PIIX3, AudioControllerType_AC97, AudioCodecType_STAC9700 },
+@@ -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),
-+ { "Linux", "Linux", "PLD", "PLD Linux (32-bit)",
-+ VBOXOSTYPE_Linux26, VBOXOSHINT_RTCUTC | VBOXOSHINT_USBTABLET | VBOXOSHINT_X2APIC,
-+ 512, 16, 8 * _1G64, NetworkAdapterType_I82540EM, 0, StorageControllerType_PIIX4, StorageBus_IDE,
-+ StorageControllerType_IntelAhci, StorageBus_SATA, ChipsetType_PIIX3, AudioControllerType_AC97, AudioCodecType_AD1980 },
++ 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),
+
-+ { "Linux", "Linux", "PLD_64", "PLD Linux (64-bit)",
-+ VBOXOSTYPE_Linux26_x64, VBOXOSHINT_64BIT | VBOXOSHINT_HWVIRTEX | VBOXOSHINT_IOAPIC | VBOXOSHINT_RTCUTC
-+ | VBOXOSHINT_USBTABLET | VBOXOSHINT_X2APIC,
-+ 1024, 16, 8 * _1G64, NetworkAdapterType_I82540EM, 0, StorageControllerType_PIIX4, StorageBus_IDE,
-+ StorageControllerType_IntelAhci, StorageBus_SATA, ChipsetType_PIIX3, AudioControllerType_AC97, AudioCodecType_AD1980 },
-+
- { "Solaris", "Solaris", "Solaris", "Oracle Solaris 10 5/09 and earlier (32-bit)",
- VBOXOSTYPE_Solaris, VBOXOSHINT_NONE,
- 768, 16, 16 * _1G64, NetworkAdapterType_I82540EM, 0, StorageControllerType_PIIX4, StorageBus_IDE,
+ VBOX_LINUX_SUBTYPE_A_32(Turbolinux, "Turbolinux (32-bit)", 384, 16, 8),
+ VBOX_LINUX_SUBTYPE_A_64(Turbolinux, "Turbolinux (64-bit)", 384, 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 @@
--- 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_Xandros_x64 = 0x5D100,
- VBOXOSTYPE_Oracle = 0x5E000,
- VBOXOSTYPE_Oracle_x64 = 0x5E100,
+ VBOXOSTYPE_Oracle8_x64 = 0x5E105, // 64-bit only
+ VBOXOSTYPE_Oracle9_x64 = 0x5E106, // 64-bit only
+ VBOXOSTYPE_Oracle_latest_x64 = VBOXOSTYPE_Oracle9_x64,
+ VBOXOSTYPE_PLD = 0x5F000,
+ VBOXOSTYPE_PLD_x64 = 0x5F100,
VBOXOSTYPE_FreeBSD = 0x60000,
VBOXOSTYPE_FreeBSD_x64 = 0x60100,
VBOXOSTYPE_OpenBSD = 0x61000,
---- VirtualBox-4.3.8/src/VBox/Frontends/VirtualBox/src/wizards/newvm/UIWizardNewVMPageBasic1.cpp~ 2014-02-25 19:09:00.000000000 +0200
-+++ VirtualBox-4.3.8/src/VBox/Frontends/VirtualBox/src/wizards/newvm/UIWizardNewVMPageBasic1.cpp 2014-02-28 09:58:59.493698505 +0200
+--- 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 @@
- { QRegExp("Xa.*32", Qt::CaseInsensitive), "Xandros" },
- { QRegExp("((Or)|(oel)|(ol)).*64", Qt::CaseInsensitive), "Oracle_64" },
- { QRegExp("((Or)|(oel)|(ol)).*32", Qt::CaseInsensitive), "Oracle" },
-+ { QRegExp("PLD.*64", Qt::CaseInsensitive), "PLD_64" },
-+ { QRegExp("PLD.*32", Qt::CaseInsensitive), "PLD" },
- { QRegExp("Knoppix", Qt::CaseInsensitive), "Linux26" },
- { QRegExp("Dsl", Qt::CaseInsensitive), "Linux24" },
- { QRegExp("((Lin)|(lnx)).*2.?2", Qt::CaseInsensitive), "Linux22" },
+ { 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
@@ -332,6 +332,8 @@
--- /dev/null
+--- VirtualBox-7.0.10/configure~ 2023-09-06 15:45:03.000000000 +0200
++++ VirtualBox-7.0.10/configure 2023-09-06 15:48:44.766964239 +0200
+@@ -2173,7 +2173,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"
+ 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
+--- VirtualBox-7.0.10/src/libs/xpcom18a4/python/gen_python_deps.py~ 2023-07-12 18:42:54.000000000 +0200
++++ VirtualBox-7.0.10/src/libs/xpcom18a4/python/gen_python_deps.py 2023-09-07 16:25:51.601179500 +0200
+@@ -1,4 +1,4 @@
+-#!/usr/bin/python
++#!/usr/bin/python3
+
+ """
+ Copyright (C) 2009-2023 Oracle and/or its affiliates.
+@@ -26,7 +26,7 @@
+ import os,sys
+ from distutils.version import StrictVersion
+
+-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" ]
+ prefixes = ["/usr", "/usr/local", "/opt", "/opt/local"]
+ known = {}
+
+--- VirtualBox-7.0.10/Config.kmk~ 2023-09-08 01:41:50.000000000 +0200
++++ VirtualBox-7.0.10/Config.kmk 2023-09-08 01:51:41.947941370 +0200
+@@ -853,7 +853,7 @@
+ # unless VBOX_WITH_ONLY_PYTHON_LIMITED_API is overridden).
+ VBOX_WITH_MULTIVERSION_PYTHON ?= 1
+ # Only build the limited Python extension API version for 3.3 and later.
+-VBOX_WITH_ONLY_PYTHON_LIMITED_API = 1
++# VBOX_WITH_ONLY_PYTHON_LIMITED_API = 1
+ # Build the Validation Kit.
+ VBOX_WITH_VALIDATIONKIT = 1
+ # Include unit tests (testcases) on the Validation Kit .ISO
--- /dev/null
+--- 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"
--- /dev/null
+--- 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
--- /dev/null
+# Devices in Guest, should use acl really
+KERNEL=="vboxguest", OWNER="vboxadd", MODE="0660"
+KERNEL=="vboxuser", OWNER="vboxadd", MODE="0666"
SUBSYSTEM=="usb_device", ACTION=="remove", RUN+="VBoxCreateUSBNode.sh --remove $major $minor"
SUBSYSTEM=="usb", ACTION=="remove", ENV{DEVTYPE}=="usb_device", RUN+="VBoxCreateUSBNode.sh --remove $major $minor"
-
-# Devices in Guest, should use acl really
-KERNEL=="vboxguest", GROUP="vbox", MODE="0600"
-KERNEL=="vboxuser", GROUP="vbox", MODE="0666"
--- /dev/null
+[Unit]
+Description=Start VMSVGA dynamic resizing for DRM
+
+[Service]
+Type=oneshot
+ExecStart=VBoxClient --vmsvga
+RemainAfterExit=yes
+
+[Install]
+WantedBy=graphical.target
--- VirtualBox-4.3.26/configure~ 2015-03-28 22:23:14.000000000 +0200
+++ VirtualBox-4.3.26/configure 2015-03-28 22:26:31.627419402 +0200
@@ -1943,7 +1943,7 @@
- fi
+ 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.8m python3.9 python3.9m python3.10 python3.10m"
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
+++ /dev/null
---- VirtualBox-4.1.8_OSE/src/VBox/Additions/common/crOpenGL/glx_c_exports.c~ 2011-12-19 13:58:54.000000000 +0100
-+++ VirtualBox-4.1.8_OSE/src/VBox/Additions/common/crOpenGL/glx_c_exports.c 2012-03-20 19:23:14.921396646 +0100
-@@ -16,6 +16,7 @@
- * hope that it will be useful, but WITHOUT ANY WARRANTY of any kind.
- */
-
-+#include "xorg/xorg-server.h"
- #include "stub.h"
- #include "dri_glx.h"
- #include "fakedri_drv.h"
---- VirtualBox-4.1.8_OSE/src/VBox/Additions/common/crOpenGL/fakedri_drv.c~ 2012-03-20 18:05:06.047425764 +0100
-+++ VirtualBox-4.1.8_OSE/src/VBox/Additions/common/crOpenGL/fakedri_drv.c 2012-03-20 19:26:39.608072546 +0100
-@@ -18,6 +18,7 @@
-
- #define _GNU_SOURCE 1
-
-+#include "xorg/xorg-server.h"
- #include "cr_error.h"
- #include "cr_gl.h"
- #include "cr_mem.h"
--- /dev/null
+--- 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
+ 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
+ endif
+ VBOX_XML_CATALOG ?= $(VBOX_PATH_MANUAL_OUTBASE)/vbox-doc.cat