X-Git-Url: https://git.pld-linux.org/?a=blobdiff_plain;f=16-no-update.patch;h=e914773967f1a8ca658a1a2309d6af899d451589;hb=HEAD;hp=9151a271f9da9dc125d45dc94bc846872f1409d1;hpb=0d80b52e9652377ef541cf0bc01b88971648abe4;p=packages%2FVirtualBox.git

diff --git a/16-no-update.patch b/16-no-update.patch
index 9151a27..9e0f025 100644
--- a/16-no-update.patch
+++ b/16-no-update.patch
@@ -1,62 +1,110 @@
+
 Description: Disable "Check for Updates" action.
 Bug-Ubuntu: https://bugs.launchpad.net/bugs/272212
-Author: Daniel Hahler <ubuntu@thequod.de>, Felix Geyer <debfx-pkg@fobos.de>
+Author: Daniel Hahler <ubuntu@thequod.de>, Felix Geyer <fgeyer@debian.org>, Gianfranco Costamagna <locutusofborg@debian.org>
 
-diff -Nur virtualbox-ose-4.0.0-dfsg.orig/src/VBox/Frontends/VirtualBox/src/globals/VBoxGlobal.cpp virtualbox-ose-4.0.0-dfsg/src/VBox/Frontends/VirtualBox/src/globals/VBoxGlobal.cpp
---- virtualbox-ose-4.0.0-dfsg.orig/src/VBox/Frontends/VirtualBox/src/globals/VBoxGlobal.cpp	2010-12-17 16:14:24.000000000 +0100
-+++ virtualbox-ose-4.0.0-dfsg/src/VBox/Frontends/VirtualBox/src/globals/VBoxGlobal.cpp	2011-01-01 23:55:23.240440031 +0100
-@@ -4565,6 +4565,9 @@
-  */
- void VBoxGlobal::showUpdateDialog (bool aForce)
+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()
  {
-+    // Updates are handled through package managers.
-+    return;
-+
-     /* Silently check in one day after current time-stamp */
-     QTimer::singleShot (24 /* hours */   * 60   /* minutes */ *
-                         60 /* seconds */ * 1000 /* milliseconds */,
---- VirtualBox-4.1.2_OSE/src/VBox/Frontends/VirtualBox/src/runtime/UIMachineMenuBar.cpp.orig	2011-08-15 14:28:35.000000000 +0200
-+++ VirtualBox-4.1.2_OSE/src/VBox/Frontends/VirtualBox/src/runtime/UIMachineMenuBar.cpp	2011-08-16 23:27:21.954256054 +0200
-@@ -275,13 +275,6 @@
- #if defined(Q_WS_MAC) && (QT_VERSION < 0x040700)
-     if (m_fIsFirstTime)
- # endif
--        pMenu->addAction(gActionPool->action(UIActionIndex_Simple_Update));
--#ifndef Q_WS_MAC
--    pMenu->addSeparator();
--#endif /* !Q_WS_MAC */
--#if defined(Q_WS_MAC) && (QT_VERSION < 0x040700)
--    if (m_fIsFirstTime)
--# endif
-         pMenu->addAction(gActionPool->action(UIActionIndex_Simple_About));
+     /* 'True' unless 'restriction' feature allowed: */
+-    return !isFeatureAllowed(GUI_PreventApplicationUpdate);
++    return false;
+ }
  
+ 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
  
-diff -Nur virtualbox-ose-4.0.0-dfsg.orig/src/VBox/Frontends/VirtualBox/src/settings/UISettingsDialogSpecific.cpp virtualbox-ose-4.0.0-dfsg/src/VBox/Frontends/VirtualBox/src/settings/UISettingsDialogSpecific.cpp
---- virtualbox-ose-4.0.0-dfsg.orig/src/VBox/Frontends/VirtualBox/src/settings/UISettingsDialogSpecific.cpp	2010-12-17 16:14:24.000000000 +0100
-+++ virtualbox-ose-4.0.0-dfsg/src/VBox/Frontends/VirtualBox/src/settings/UISettingsDialogSpecific.cpp	2011-01-02 00:03:55.120533579 +0100
-@@ -501,6 +501,10 @@
- #endif /* !VBOX_WITH_NETFLT */
-             break;
-         }
-+        case GLSettingsPage_Update:
-+        {
-+            return false;
-+        }
-         default:
-             break;
-     }
---- VirtualBox-4.1.2_OSE/src/VBox/Frontends/VirtualBox/src/selector/VBoxSelectorWnd.cpp.orig	2011-08-15 14:28:35.000000000 +0200
-+++ VirtualBox-4.1.2_OSE/src/VBox/Frontends/VirtualBox/src/selector/VBoxSelectorWnd.cpp	2011-08-17 22:48:08.700558251 +0200
-@@ -1747,12 +1747,6 @@
-     pMenu->addAction(gActionPool->action(UIActionIndex_Simple_Register));
- #endif /* VBOX_WITH_REGISTRATION */
+ /* GUI includes: Machine Settings: */
+ #include "UIMachineSettingsAudio.h"
+@@ -99,7 +99,7 @@
  
--    pMenu->addAction(gActionPool->action(UIActionIndex_Simple_Update));
--
--#ifndef Q_WS_MAC
--    pMenu->addSeparator();
--#endif /* !Q_WS_MAC */
--
-     pMenu->addAction(gActionPool->action(UIActionIndex_Simple_About));
+ #ifdef VBOX_GUI_WITH_NETWORK_MANAGER
+     /* 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
  
-     /* Configure connections: */
+ #ifdef VBOX_WS_WIN
+@@ -226,14 +226,14 @@
+                 }
+ #ifdef VBOX_GUI_WITH_NETWORK_MANAGER
+                 /* 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 */
+                 /* Language page: */
+                 case GlobalSettingsPageType_Language:
+@@ -255,14 +255,14 @@
+                 }
+ #ifdef VBOX_GUI_WITH_NETWORK_MANAGER
+                 /* 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 */
+ #ifdef VBOX_WS_WIN
+                 /* Interface page: */