- updated patches

- updated files
- BR latest and greatest kBuild

diff --git a/16-no-update.patch b/16-no-update.patch
index 77738d987940255e455d984b0ead8644605c17f3..e8487fba50c669f88af301a856ab4417d2fa6bcd 100644 (file)
--- a/16-no-update.patch
+++ b/16-no-update.patch
@@ -24,16 +24,6 @@ diff a/src/VBox/Frontends/VirtualBox/src/net/UIUpdateManager.cpp b/src/VBox/Fron
      m_pool[UIActionIndex_Simple_About] = new UIActionSimpleAbout(this);
  }
  
-@@ -570,9 +569,6 @@ void UIActionPool::createMenus()
-     m_pool[UIActionIndex_Simple_CheckForUpdates]->setVisible(false);
- #endif
- #if !(defined(Q_WS_MAC) && (QT_VERSION < 0x040700))
--    if (m_pool[UIActionIndex_Simple_CheckForUpdates])
--        delete m_pool[UIActionIndex_Simple_CheckForUpdates];
--    m_pool[UIActionIndex_Simple_CheckForUpdates] = new UIActionSimpleCheckForUpdates(this);
-     if (m_pool[UIActionIndex_Simple_About])
-         delete m_pool[UIActionIndex_Simple_About];
-     m_pool[UIActionIndex_Simple_About] = new UIActionSimpleAbout(this);
 --- a/src/VBox/Frontends/VirtualBox/src/globals/UIActionPool.h
 +++ b/src/VBox/Frontends/VirtualBox/src/globals/UIActionPool.h
 @@ -47,7 +47,6 @@ enum UIActionIndex
@@ -47,9 +37,9 @@ diff a/src/VBox/Frontends/VirtualBox/src/net/UIUpdateManager.cpp b/src/VBox/Fron
 --- a/src/VBox/Frontends/VirtualBox/src/selector/UISelectorWindow.cpp
 +++ b/src/VBox/Frontends/VirtualBox/src/selector/UISelectorWindow.cpp
 @@ -1301,12 +1301,6 @@ void UISelectorWindow::prepareMenuHelp(Q
-     m_pRegisterAction = gActionPool->action(UIActionIndex_Simple_Register);
-     pMenu->addAction(m_pRegisterAction);
- #endif /* VBOX_WITH_REGISTRATION */
+     pMenu->addSeparator();
+     m_pNetworkAccessManager = gActionPool->action(UIActionIndex_Simple_NetworkAccessManager);
+     pMenu->addAction(m_pNetworkAccessManager);
 -    m_pUpdateAction = gActionPool->action(UIActionIndex_Simple_CheckForUpdates);
 -    CVirtualBox vbox = vboxGlobal().virtualBox();
 -    if (VBoxGlobal::shouldWeAllowApplicationUpdate(vbox))
@@ -60,9 +50,9 @@ diff a/src/VBox/Frontends/VirtualBox/src/net/UIUpdateManager.cpp b/src/VBox/Fron
      pMenu->addSeparator();
  #endif /* !Q_WS_MAC */
 @@ -1443,7 +1437,6 @@ void UISelectorWindow::prepareConnection
-     connect(m_pRegisterAction, SIGNAL(triggered()), &vboxGlobal(), SLOT(showRegistrationDialog()));
-     connect(gEDataEvents, SIGNAL(sigCanShowRegistrationDlg(bool)), m_pRegisterAction, SLOT(setEnabled(bool)));
- #endif /* VBOX_WITH_REGISTRATION */
+     connect(m_pWebAction, SIGNAL(triggered()), &msgCenter(), SLOT(sltShowHelpWebDialog()));
+     connect(m_pResetWarningsAction, SIGNAL(triggered()), &msgCenter(), SLOT(sltResetSuppressedMessages()));
+     connect(m_pNetworkAccessManager, SIGNAL(triggered()), gNetworkManager, SLOT(show()));
 -    connect(m_pUpdateAction, SIGNAL(triggered()), gUpdateManager, SLOT(sltForceCheck()));
      connect(m_pAboutAction, SIGNAL(triggered()), &msgCenter(), SLOT(sltShowHelpAboutDialog()));
  

diff --git a/18-system-xorg.patch b/18-system-xorg.patch
index a5279a65e19ad15bbb03a96d68df00ea97c010e9..96248aedd5b8f14b7f597f55adeb979786688f73 100644 (file)
--- a/18-system-xorg.patch
+++ b/18-system-xorg.patch
@@ -8,9 +8,9 @@ Author: Michael Meskes <meskes@debian.org>, Felix Geyer <fgeyer@debian.org>
  ifndef VBOX_ONLY_TESTSUITE
   if1of ($(KBUILD_TARGET), freebsd linux netbsd openbsd)
 -  LIBRARIES += \
--      VBoxGuestR3LibXFree86
+-        VBoxGuestR3LibXFree86
 +#  LIBRARIES += \
-+#     VBoxGuestR3LibXFree86
++#       VBoxGuestR3LibXFree86
   endif
  endif
  LIBRARIES.win.amd64 += VBoxGuestR3Lib-x86 VBoxGuestR3LibShared-x86

diff --git a/VirtualBox.spec b/VirtualBox.spec
index 2ab6df42d86f2c5868e8a31a23ce1900cf21e6ed..0e15e6adc3ff4076e9cd7cdbc64d1f2367f04d1a 100644 (file)
--- a/VirtualBox.spec
+++ b/VirtualBox.spec
@@ -107,7 +107,7 @@ BuildRequires:      device-mapper-devel
 BuildRequires: gcc >= 5:3.2.3
 %{?with_webservice:BuildRequires:      gsoap-devel}
 BuildRequires: issue
-BuildRequires: kBuild >= 0.1.9998-2
+BuildRequires: kBuild >= 0.1.9998.2700
 BuildRequires: libIDL-devel
 BuildRequires: libcap-static
 BuildRequires: libdrm-devel
@@ -940,7 +940,6 @@ fi
 %attr(755,root,root) %{_libdir}/%{pname}/VBoxAuth.so
 %attr(755,root,root) %{_libdir}/%{pname}/VBoxAuthSimple.so
 %attr(755,root,root) %{_libdir}/%{pname}/VBoxAutostart
-%attr(755,root,root) %{_libdir}/%{pname}/VBoxBFE
 %attr(755,root,root) %{_libdir}/%{pname}/VBoxBalloonCtrl
 %attr(755,root,root) %{_libdir}/%{pname}/VBoxDbg.so
 %attr(755,root,root) %{_libdir}/%{pname}/VBoxDD2.so
@@ -954,6 +953,9 @@ fi
 %attr(755,root,root) %{_libdir}/%{pname}/VBoxHostChannel.so
 %attr(755,root,root) %{_libdir}/%{pname}/VBoxKeyboard.so
 %attr(755,root,root) %{_libdir}/%{pname}/VBoxManage
+%attr(755,root,root) %{_libdir}/%{pname}/VBoxNetNAT
+%attr(755,root,root) %{_libdir}/%{pname}/VBoxVolInfo
+%attr(755,root,root) %{_libdir}/%{pname}/iPxeBaseBin
 %if %{with doc}
 %attr(755,root,root) %{_libdir}/%{pname}/VBoxManageHelp
 %endif
@@ -985,15 +987,20 @@ fi
 %attr(755,root,root) %{_libdir}/%{pname}/VirtualBox
 %attr(755,root,root) %{_libdir}/%{pname}/VirtualBox-wrapper.sh
 %attr(755,root,root) %{_libdir}/%{pname}/ExtensionPacks/VNC/linux*/VBoxVNC*.so
+%{_libdir}/%{pname}/VBoxDD2GC.debug
 %{_libdir}/%{pname}/VBoxDD2GC.gc
-%{_libdir}/%{pname}/VBoxDDGC.gc
-%{_libdir}/%{pname}/VMMGC.gc
+%{_libdir}/%{pname}/VBoxDD2R0.debug
 %{_libdir}/%{pname}/VBoxDD2R0.r0
+%{_libdir}/%{pname}/VBoxDDGC.debug
+%{_libdir}/%{pname}/VBoxDDGC.gc
+%{_libdir}/%{pname}/VBoxDDR0.debug
 %{_libdir}/%{pname}/VBoxDDR0.r0
-%{_libdir}/%{pname}/VMMR0.r0
-#%{_libdir}/%{pname}/EfiThunk
 %{_libdir}/%{pname}/VBoxEFI32.fd
 %{_libdir}/%{pname}/VBoxEFI64.fd
+%{_libdir}/%{pname}/VMMGC.debug
+%{_libdir}/%{pname}/VMMGC.gc
+%{_libdir}/%{pname}/VMMR0.debug
+%{_libdir}/%{pname}/VMMR0.r0
 %{_libdir}/%{pname}/components/VBoxXPCOMBase.xpt
 %{_libdir}/%{pname}/ExtensionPacks/VNC/ExtPack.xml
 %{_libdir}/%{pname}/components/VirtualBox_XPCOM.xpt