- gcc48 patch no longer needed

- updated no-update patch

diff --git a/16-no-update.patch b/16-no-update.patch
index a09cfa3a3bf5050bc85f940bd77f6091d7ebb316..77738d987940255e455d984b0ead8644605c17f3 100644 (file)
--- a/16-no-update.patch
+++ b/16-no-update.patch
@@ -5,7 +5,7 @@ Author: Daniel Hahler <ubuntu@thequod.de>, Felix Geyer <fgeyer@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
-@@ -465,6 +465,8 @@ void UIUpdateManager::shutdown()
+@@ -474,6 +474,8 @@ void UIUpdateManager::shutdown()
  
  void UIUpdateManager::sltForceCheck()
  {
@@ -14,19 +14,6 @@ diff a/src/VBox/Frontends/VirtualBox/src/net/UIUpdateManager.cpp b/src/VBox/Fron
      /* Force call for new version check: */
      sltCheckIfUpdateIsNecessary(true /* force call */);
  }
---- a/src/VBox/Frontends/VirtualBox/src/settings/UISettingsDialogSpecific.cpp
-+++ b/src/VBox/Frontends/VirtualBox/src/settings/UISettingsDialogSpecific.cpp
-@@ -550,6 +550,10 @@ bool UISettingsDialogGlobal::isPageAvail
- #endif /* !VBOX_WITH_NETFLT */
-             break;
-         }
-+        case GLSettingsPage_Update:
-+        {
-+            return false;
-+        }
-         default:
-             break;
-     }
 --- a/src/VBox/Frontends/VirtualBox/src/globals/UIActionPool.cpp
 +++ b/src/VBox/Frontends/VirtualBox/src/globals/UIActionPool.cpp
 @@ -538,7 +538,6 @@ void UIActionPool::createActions()
@@ -59,16 +46,20 @@ diff a/src/VBox/Frontends/VirtualBox/src/net/UIUpdateManager.cpp b/src/VBox/Fron
      /* Maximum index: */
 --- a/src/VBox/Frontends/VirtualBox/src/selector/UISelectorWindow.cpp
 +++ b/src/VBox/Frontends/VirtualBox/src/selector/UISelectorWindow.cpp
-@@ -1300,8 +1300,6 @@ void UISelectorWindow::prepareMenuHelp(Q
+@@ -1301,12 +1301,6 @@ void UISelectorWindow::prepareMenuHelp(Q
      m_pRegisterAction = gActionPool->action(UIActionIndex_Simple_Register);
      pMenu->addAction(m_pRegisterAction);
  #endif /* VBOX_WITH_REGISTRATION */
 -    m_pUpdateAction = gActionPool->action(UIActionIndex_Simple_CheckForUpdates);
--    pMenu->addAction(m_pUpdateAction);
+-    CVirtualBox vbox = vboxGlobal().virtualBox();
+-    if (VBoxGlobal::shouldWeAllowApplicationUpdate(vbox))
+-        pMenu->addAction(m_pUpdateAction);
+-    else
+-        m_pUpdateAction->setEnabled(false);
  #ifndef Q_WS_MAC
      pMenu->addSeparator();
  #endif /* !Q_WS_MAC */
-@@ -1438,7 +1436,6 @@ void UISelectorWindow::prepareConnection
+@@ -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 */
@@ -76,3 +67,17 @@ diff a/src/VBox/Frontends/VirtualBox/src/net/UIUpdateManager.cpp b/src/VBox/Fron
      connect(m_pAboutAction, SIGNAL(triggered()), &msgCenter(), SLOT(sltShowHelpAboutDialog()));
  
      /* Status-bar connections: */
+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;
+     }

diff --git a/VirtualBox.spec b/VirtualBox.spec
index 692a8c18de431709e4dcb9a90ba353189948184f..854a9f875b92fe59cc4294d9d6051b09498d126c 100644 (file)
--- a/VirtualBox.spec
+++ b/VirtualBox.spec
@@ -67,7 +67,6 @@ Patch2:               %{pname}-warning_workaround.patch
 Patch3:                %{pname}-dri.patch
 Patch4:                %{pname}-disable_build_NetBiosBin.patch
 Patch5:                xserver-1.12.patch
-Patch6:                gcc48.patch
 Patch7:                lightdm-greeter-glib-includes.patch
 Patch8:                lightdm-greeter-g++-link.patch
 # ubuntu patches
@@ -541,7 +540,6 @@ Moduł jądra Linuksa dla VirtualBoksa - sterownik obsługi DRM.
 %patch3 -p1
 %patch4 -p1
 %patch5 -p1
-%patch6 -p1
 %patch7 -p1
 %patch8 -p1
 

diff --git a/gcc48.patch b/gcc48.patch
deleted file mode 100644 (file)
index a251392..0000000
--- a/gcc48.patch
+++ /dev/null
@@ -1,22 +0,0 @@
---- VirtualBox-4.2.12/configure~       2013-05-25 10:37:20.966442108 +0200
-+++ VirtualBox-4.2.12/configure        2013-05-25 10:47:20.825486915 +0200
-@@ -414,7 +414,7 @@
-       elif [ $cc_maj -lt 3 \
-              -o \( $cc_maj -eq 3 -a $cc_min -lt 2 \) \
-              -o \( $cc_maj -eq 4 -a $cc_min -lt 1 -a "$OS" != "darwin" \) \
--             -o \( $cc_maj -eq 4 -a $cc_min -gt 7 \) \
-+             -o \( $cc_maj -eq 4 -a $cc_min -gt 8 \) \
-              -o $cc_maj -gt 4 ]; then
-         log_failure "gcc version $cc_ver found, expected gcc 3.x with x>1 or gcc 4.x with 0<x<8"
-         fail really
---- VirtualBox-4.2.12/Config.kmk~      2013-05-25 11:56:55.629895894 +0200
-+++ VirtualBox-4.2.12/Config.kmk       2013-05-25 14:50:59.850448713 +0200
-@@ -2304,7 +2304,7 @@
- #
- ifdef VBOX_WITH_WARNINGS_AS_ERRORS
-  if $(VBOX_GCC_VERSION_CXX) >= 40000
--  VBOX_GCC_WERR ?= -Werror
-+  VBOX_GCC_WERR ?= -Werror -Wno-error=unused-parameter
-  endif
-  VBOX_VCC_WERR ?= -WX
-  VBOX_VCC_LD_WERR ?= ## @todo later also: -WX