[Pkg-virtualbox-commits] [virtualbox] 02/02: Patch refresh
Gianfranco Costamagna
locutusofborg-guest at moszumanska.debian.org
Wed Apr 15 09:05:11 UTC 2015
This is an automated email from the git hooks/post-receive script.
locutusofborg-guest pushed a commit to branch experimental
in repository virtualbox.
commit 16a9157ef2f949d3379f4f3f11fd1c1a55f9472b
Author: Gianfranco Costamagna <costamagnagianfranco at yahoo.it>
Date: Wed Apr 15 10:07:27 2015 +0200
Patch refresh
---
debian/changelog | 2 +-
debian/patches/16-no-update.patch | 74 +++++++++++++++----------
debian/patches/27-hide-host-cache-warning.patch | 2 +-
3 files changed, 46 insertions(+), 32 deletions(-)
diff --git a/debian/changelog b/debian/changelog
index e5da59f..d95dcdf 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,4 +1,4 @@
-virtualbox (5.0.0~beta1-dfsg-1) UNRELEASED; urgency=medium
+virtualbox (5.0.0~beta2-dfsg-1) UNRELEASED; urgency=medium
[ Gianfranco Costamagna ]
* Imported upstream snapshot release.
diff --git a/debian/patches/16-no-update.patch b/debian/patches/16-no-update.patch
index e27d9b8..5948ca0 100644
--- a/debian/patches/16-no-update.patch
+++ b/debian/patches/16-no-update.patch
@@ -16,49 +16,50 @@ Index: virtualbox/src/VBox/Frontends/VirtualBox/src/net/UIUpdateManager.cpp
/* Force call for new version check: */
sltCheckIfUpdateIsNecessary(true /* force call */);
}
+diff a/src/VBox/Frontends/VirtualBox/src/globals/UIActionPool.cpp b/src/VBox/Frontends/VirtualBox/src/globals/UIActionPool.cpp
Index: virtualbox/src/VBox/Frontends/VirtualBox/src/globals/UIActionPool.cpp
===================================================================
---- virtualbox.orig/src/VBox/Frontends/VirtualBox/src/globals/UIActionPool.cpp 2015-04-02 15:44:20.879669066 +0200
-+++ virtualbox/src/VBox/Frontends/VirtualBox/src/globals/UIActionPool.cpp 2015-04-02 15:44:20.879669066 +0200
-@@ -928,7 +928,6 @@
- m_pool[UIActionIndex_Simple_ResetWarnings] = new UIActionSimpleResetWarnings(this);
+--- virtualbox.orig/src/VBox/Frontends/VirtualBox/src/globals/UIActionPool.cpp
++++ virtualbox/src/VBox/Frontends/VirtualBox/src/globals/UIActionPool.cpp
+@@ -904,7 +904,6 @@ void UIActionPool::preparePool()
+ m_pool[UIActionIndex_M_Application_S_Preferences] = new UIActionSimplePreferences(this);
#ifdef VBOX_GUI_WITH_NETWORK_MANAGER
- m_pool[UIActionIndex_Simple_NetworkAccessManager] = new UIActionSimpleNetworkAccessManager(this);
-- m_pool[UIActionIndex_Simple_CheckForUpdates] = new UIActionSimpleCheckForUpdates(this);
+ 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 */
- #ifndef RT_OS_DARWIN
- m_pool[UIActionIndex_Simple_About] = new UIActionSimpleAbout(this);
-@@ -961,8 +960,6 @@
+ m_pool[UIActionIndex_M_Application_S_ResetWarnings] = new UIActionSimpleResetWarnings(this);
+ m_pool[UIActionIndex_M_Application_S_Close] = new UIActionSimplePerformClose(this);
+@@ -947,8 +946,6 @@ void UIActionPool::prepareConnections()
#ifdef VBOX_GUI_WITH_NETWORK_MANAGER
- connect(action(UIActionIndex_Simple_NetworkAccessManager), SIGNAL(triggered()),
+ connect(action(UIActionIndex_M_Application_S_NetworkAccessManager), SIGNAL(triggered()),
gNetworkManager, SLOT(show()), Qt::UniqueConnection);
-- connect(action(UIActionIndex_Simple_CheckForUpdates), SIGNAL(triggered()),
+- connect(action(UIActionIndex_M_Application_S_CheckForUpdates), SIGNAL(triggered()),
- gUpdateManager, SLOT(sltForceCheck()), Qt::UniqueConnection);
#endif /* VBOX_GUI_WITH_NETWORK_MANAGER */
- #ifdef RT_OS_DARWIN
- connect(action(UIActionIndex_M_Application_S_About), SIGNAL(triggered()),
-@@ -1129,9 +1126,6 @@
- #ifdef VBOX_GUI_WITH_NETWORK_MANAGER
- /* 'Network Manager' action: */
- fSeparator = addAction(pMenu, action(UIActionIndex_Simple_NetworkAccessManager));
-- /* 'Check for Updates' action (only for Selector pool): */
-- if (type() == UIActionPoolType_Selector)
-- fSeparator = addAction(pMenu, action(UIActionIndex_Simple_CheckForUpdates));
+ connect(action(UIActionIndex_M_Application_S_ResetWarnings), SIGNAL(triggered()),
+ &msgCenter(), SLOT(sltResetSuppressedMessages()), Qt::UniqueConnection);
+@@ -1023,7 +1020,7 @@ void UIActionPool::updateConfiguration()
+ if (!fUpdateAllowed)
+ {
+ m_restrictedActionsMenuApplication[UIActionRestrictionLevel_Base] = (UIExtraDataMetaDefs::MenuApplicationActionType)
+- (m_restrictedActionsMenuApplication[UIActionRestrictionLevel_Base] | UIExtraDataMetaDefs::MenuApplicationActionType_CheckForUpdates);
++ (m_restrictedActionsMenuApplication[UIActionRestrictionLevel_Base]);
+ }
+ #endif /* VBOX_GUI_WITH_NETWORK_MANAGER */
- /* Separator? */
- if (fSeparator)
+diff a/src/VBox/Frontends/VirtualBox/src/globals/UIActionPool.h b/src/VBox/Frontends/VirtualBox/src/globals/UIActionPool.h
Index: virtualbox/src/VBox/Frontends/VirtualBox/src/globals/UIActionPool.h
===================================================================
---- virtualbox.orig/src/VBox/Frontends/VirtualBox/src/globals/UIActionPool.h 2015-04-02 15:44:20.879669066 +0200
-+++ virtualbox/src/VBox/Frontends/VirtualBox/src/globals/UIActionPool.h 2015-04-02 15:44:20.879669066 +0200
-@@ -70,7 +70,6 @@
- UIActionIndex_Simple_ResetWarnings,
+--- virtualbox.orig/src/VBox/Frontends/VirtualBox/src/globals/UIActionPool.h
++++ virtualbox/src/VBox/Frontends/VirtualBox/src/globals/UIActionPool.h
+@@ -59,7 +59,6 @@ enum UIActionIndex
+ UIActionIndex_M_Application_S_Preferences,
#ifdef VBOX_GUI_WITH_NETWORK_MANAGER
- UIActionIndex_Simple_NetworkAccessManager,
-- UIActionIndex_Simple_CheckForUpdates,
+ UIActionIndex_M_Application_S_NetworkAccessManager,
+- UIActionIndex_M_Application_S_CheckForUpdates,
#endif /* VBOX_GUI_WITH_NETWORK_MANAGER */
- #ifndef RT_OS_DARWIN
- UIActionIndex_Simple_About,
+ UIActionIndex_M_Application_S_ResetWarnings,
+ UIActionIndex_M_Application_S_Close,
Index: virtualbox/src/VBox/Frontends/VirtualBox/src/settings/UISettingsDialogSpecific.cpp
===================================================================
--- virtualbox.orig/src/VBox/Frontends/VirtualBox/src/settings/UISettingsDialogSpecific.cpp 2015-04-02 15:44:20.879669066 +0200
@@ -74,3 +75,16 @@ Index: virtualbox/src/VBox/Frontends/VirtualBox/src/settings/UISettingsDialogSpe
default:
break;
}
+ &msgCenter(), SLOT(sltResetSuppressedMessages()), Qt::UniqueConnection);
+diff --git a/src/VBox/Frontends/VirtualBox/src/selector/UISelectorWindow.cpp b/src/VBox/Frontends/VirtualBox/src/selector/UISelectorWindow.cpp
+index 8bf5722..5748717 100644
+--- a/src/VBox/Frontends/VirtualBox/src/selector/UISelectorWindow.cpp
++++ b/src/VBox/Frontends/VirtualBox/src/selector/UISelectorWindow.cpp
+@@ -1155,7 +1155,6 @@ void UISelectorWindow::prepareMenuFile(QMenu *pMenu)
+ pMenu->addSeparator();
+ #ifdef VBOX_GUI_WITH_NETWORK_MANAGER
+ pMenu->addAction(actionPool()->action(UIActionIndex_M_Application_S_NetworkAccessManager));
+- pMenu->addAction(actionPool()->action(UIActionIndex_M_Application_S_CheckForUpdates));
+ # ifndef Q_WS_MAC
+ pMenu->addSeparator();
+ # endif /* Q_WS_MAC */
diff --git a/debian/patches/27-hide-host-cache-warning.patch b/debian/patches/27-hide-host-cache-warning.patch
index bcbeec6..829c632 100644
--- a/debian/patches/27-hide-host-cache-warning.patch
+++ b/debian/patches/27-hide-host-cache-warning.patch
@@ -6,7 +6,7 @@ Index: virtualbox/src/VBox/Main/src-client/ConsoleImpl2.cpp
===================================================================
--- virtualbox.orig/src/VBox/Main/src-client/ConsoleImpl2.cpp 2015-04-02 15:46:54.415740583 +0200
+++ virtualbox/src/VBox/Main/src-client/ConsoleImpl2.cpp 2015-04-02 15:46:54.411740580 +0200
-@@ -3893,34 +3893,12 @@
+@@ -3899,34 +3899,12 @@
if ( enmFsTypeFile == RTFSTYPE_EXT4
|| enmFsTypeFile == RTFSTYPE_XFS)
{
--
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-virtualbox/virtualbox.git
More information about the Pkg-virtualbox-commits
mailing list