#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 */
+ #endif
m_pool[UIActionIndex_M_Application_S_ResetWarnings] = new UIActionSimpleResetWarnings(this);
m_pool[UIActionIndex_M_Application_S_Close] = new UIActionSimplePerformClose(this);
@@ -1033,8 +1033,6 @@
gNetworkManager, &UINetworkManager::show, Qt::UniqueConnection);
- connect(action(UIActionIndex_M_Application_S_CheckForUpdates), &UIAction::triggered,
- gUpdateManager, &UIUpdateManager::sltForceCheck, Qt::UniqueConnection);
- #endif /* VBOX_GUI_WITH_NETWORK_MANAGER */
+ #endif
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
#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 @@
+--- VirtualBox-5.0.0/src/VBox/./Frontends/VirtualBox/src/globals/UIActionPoolManager.cpp.orig 2015-07-09 20:09:22.239478146 +0200
++++ VirtualBox-5.0.0/src/VBox/./Frontends/VirtualBox/src/globals/UIActionPoolManager.cpp 2015-07-09 20:17:20.635207663 +0200
+@@ -1211,9 +1211,6 @@
/* 'About' action goes to Application menu: */
- pMenu->addAction(actionPool()->action(UIActionIndex_M_Application_S_About));
+ pMenu->addAction(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));
+- if (gEDataManager->applicationUpdateEnabled())
+- pMenu->addAction(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));
+ pMenu->addAction(action(UIActionIndex_M_Application_S_NetworkAccessManager));
+ # endif
@@ -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));
+ pMenu->addAction(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));
+- pMenu->addAction(action(UIActionIndex_M_Application_S_CheckForUpdates));
+ # endif
+ /* Separator after tool actions of the 'File' menu: */
+ pMenu->addSeparator();
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 */
+ #endif
break;
}
+ case GlobalSettingsPageType_Update:
default:
break;
}
+--- VirtualBox-6.0.0/src/VBox/Frontends/VirtualBox/src/manager/chooser/UIChooserModel.cpp.orig 2018-12-19 19:53:33.019049148 +0100
++++ VirtualBox-6.0.0/src/VBox/Frontends/VirtualBox/src/manager/chooser/UIChooserModel.cpp 2018-12-19 19:53:56.902224273 +0100
+@@ -1366,8 +1366,6 @@
+ m_pContextMenuGlobal->addAction(actionPool()->action(UIActionIndexST_M_File_S_ShowCloudProfileManager));
+ # ifdef VBOX_GUI_WITH_NETWORK_MANAGER
+ m_pContextMenuGlobal->addAction(actionPool()->action(UIActionIndex_M_Application_S_NetworkAccessManager));
+- if (gEDataManager->applicationUpdateEnabled())
+- m_pContextMenuGlobal->addAction(actionPool()->action(UIActionIndex_M_Application_S_CheckForUpdates));
+ # endif
+ #endif /* !VBOX_WS_MAC */
+ }
+++ /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)
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.22
+Version: 6.0.0
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: c9c2f162ac5f99d28d8c0ca43b19ed01
+# Source0-md5: 7008d8ea52e62f50cd9990152326d8d7
Source1: http://download.virtualbox.org/virtualbox/%{version}/VBoxGuestAdditions_%{version}.iso
-# Source1-md5: 86499eebfff3513e8919d2df32806ec9
+# Source1-md5: 5f1ec97d69c2ecd1c55895e3bca574ae
Source2: vboxservice.init
Source3: vboxservice.service
Source4: vboxservice.sysconfig
Patch14: %{pname}-multipython.patch
Patch15: %{pname}-lightdm-1.19.2.patch
Patch16: %{pname}-no-vboxvideo.patch
-Patch17: %{pname}-kerndir.patch
URL: http://www.virtualbox.org/
%if %{with userspace}
%ifarch %{x8664}
%{?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
%patch14 -p0
%patch15 -p0
%patch16 -p0
-%patch17 -p1
%{__sed} -i -e 's,@VBOX_DOC_PATH@,%{_docdir}/%{name}-%{version},' \
-e 's/Categories=.*/Categories=Utility;Emulator;/' src/VBox/Installer/common/virtualbox.desktop.in
../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
%attr(755,root,root) %{_libdir}/%{pname}/VBoxDD2.so
%attr(755,root,root) %{_libdir}/%{pname}/VBoxDDU.so
%attr(755,root,root) %{_libdir}/%{pname}/VBoxDragAndDropSvc.so
+%attr(755,root,root) %{_libdir}/%{pname}/VBoxGlobal.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}/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}/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
%dir %{_libdir}/%{pname}/tools
%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/RTFuzzMaster
%attr(755,root,root) %{_libdir}/%{pname}/tools/RTGzip
%attr(755,root,root) %{_libdir}/%{pname}/tools/RTHttp
%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
{ "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_openbsd.png">images/os_openbsd.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.png">images/os_opensuse.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 @@
+ { "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,
++ 512, 16, 8 * _1G64, GraphicsControllerType_VMSVGA, NetworkAdapterType_I82540EM, 0, StorageControllerType_PIIX4, StorageBus_IDE,
+ StorageControllerType_IntelAhci, StorageBus_SATA, ChipsetType_PIIX3, AudioControllerType_AC97, AudioCodecType_AD1980 },
+
+ { "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,
++ 1024, 16, 8 * _1G64, GraphicsControllerType_VMSVGA, 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)",