[Pkg-virtualbox-commits] [virtualbox] 02/03: Patch refresh Drop 69989.patch: upstream
Gianfranco Costamagna
locutusofborg at moszumanska.debian.org
Tue Dec 19 22:35:18 UTC 2017
This is an automated email from the git hooks/post-receive script.
locutusofborg pushed a commit to branch master
in repository virtualbox.
commit 63e80c5681f55b976694ad53c2168dc5f18a58d8
Author: Gianfranco Costamagna <costamagnagianfranco at yahoo.it>
Date: Tue Dec 19 23:34:26 2017 +0100
Patch refresh
Drop 69989.patch: upstream
---
debian/patches/16-no-update.patch | 8 +--
debian/patches/27-hide-host-cache-warning.patch | 2 +-
debian/patches/29-fix-ftbfs-as-needed.patch | 2 +-
debian/patches/36-fix-vnc-version-string.patch | 2 +-
debian/patches/69989.patch | 77 -------------------------
debian/patches/fix-build.patch | 2 +-
debian/patches/series | 1 -
7 files changed, 8 insertions(+), 86 deletions(-)
diff --git a/debian/patches/16-no-update.patch b/debian/patches/16-no-update.patch
index ef24341..1d0d4d3 100644
--- a/debian/patches/16-no-update.patch
+++ b/debian/patches/16-no-update.patch
@@ -7,7 +7,7 @@ Index: virtualbox/src/VBox/Frontends/VirtualBox/src/net/UIUpdateManager.cpp
===================================================================
--- virtualbox.orig/src/VBox/Frontends/VirtualBox/src/net/UIUpdateManager.cpp
+++ virtualbox/src/VBox/Frontends/VirtualBox/src/net/UIUpdateManager.cpp
-@@ -471,6 +471,8 @@
+@@ -472,6 +472,8 @@
void UIUpdateManager::sltForceCheck()
{
@@ -77,7 +77,7 @@ Index: virtualbox/src/VBox/Frontends/VirtualBox/src/selector/UISelectorWindow.cp
===================================================================
--- virtualbox.orig/src/VBox/Frontends/VirtualBox/src/selector/UISelectorWindow.cpp
+++ virtualbox/src/VBox/Frontends/VirtualBox/src/selector/UISelectorWindow.cpp
-@@ -1441,8 +1441,6 @@
+@@ -1435,8 +1435,6 @@
/* 'About' action goes to Application menu: */
pMenu->addAction(actionPool()->action(UIActionIndex_M_Application_S_About));
# ifdef VBOX_GUI_WITH_NETWORK_MANAGER
@@ -86,7 +86,7 @@ Index: virtualbox/src/VBox/Frontends/VirtualBox/src/selector/UISelectorWindow.cp
/* 'Network Access Manager' action goes to Application menu: */
pMenu->addAction(actionPool()->action(UIActionIndex_M_Application_S_NetworkAccessManager));
# endif /* VBOX_GUI_WITH_NETWORK_MANAGER */
-@@ -1485,7 +1483,7 @@
+@@ -1479,7 +1476,7 @@
addAction(actionPool()->action(UIActionIndexST_M_File_S_ShowHostNetworkManager));
# ifdef VBOX_GUI_WITH_NETWORK_MANAGER
addAction(actionPool()->action(UIActionIndex_M_Application_S_NetworkAccessManager));
@@ -95,7 +95,7 @@ Index: virtualbox/src/VBox/Frontends/VirtualBox/src/selector/UISelectorWindow.cp
# endif /* VBOX_GUI_WITH_NETWORK_MANAGER */
addAction(actionPool()->action(UIActionIndex_M_Application_S_ResetWarnings));
addAction(actionPool()->action(UIActionIndexST_M_File_S_Close));
-@@ -1512,9 +1510,6 @@
+@@ -1506,9 +1504,6 @@
# ifdef VBOX_GUI_WITH_NETWORK_MANAGER
/* 'Network Access Manager' action goes to 'File' menu: */
pMenu->addAction(actionPool()->action(UIActionIndex_M_Application_S_NetworkAccessManager));
diff --git a/debian/patches/27-hide-host-cache-warning.patch b/debian/patches/27-hide-host-cache-warning.patch
index 520bcc3..01358dc 100644
--- a/debian/patches/27-hide-host-cache-warning.patch
+++ b/debian/patches/27-hide-host-cache-warning.patch
@@ -6,7 +6,7 @@ diff --git a/src/VBox/Main/src-client/ConsoleImpl2.cpp b/src/VBox/Main/src-clien
index 61dbf0a59..cfb76fc48 100644
--- a/src/VBox/Main/src-client/ConsoleImpl2.cpp
+++ b/src/VBox/Main/src-client/ConsoleImpl2.cpp
-@@ -4056,34 +4056,12 @@ int Console::i_checkMediumLocation(IMedium *pMedium, bool *pfUseHostIOCache)
+@@ -4072,34 +4072,12 @@ int Console::i_checkMediumLocation(IMedium *pMedium, bool *pfUseHostIOCache)
if ( enmFsTypeFile == RTFSTYPE_EXT4
|| enmFsTypeFile == RTFSTYPE_XFS)
{
diff --git a/debian/patches/29-fix-ftbfs-as-needed.patch b/debian/patches/29-fix-ftbfs-as-needed.patch
index 1b84851..a11918e 100644
--- a/debian/patches/29-fix-ftbfs-as-needed.patch
+++ b/debian/patches/29-fix-ftbfs-as-needed.patch
@@ -5,7 +5,7 @@ Index: virtualbox/Config.kmk
===================================================================
--- virtualbox.orig/Config.kmk 2015-04-02 15:46:59.611743003 +0200
+++ virtualbox/Config.kmk 2015-04-02 15:46:59.611743003 +0200
-@@ -6288,7 +6288,7 @@
+@@ -6283,7 +6283,7 @@
TEMPLATE_VBoxBldProg_LDFLAGS.amd64 = -m64
TEMPLATE_VBoxBldProg_LDFLAGS.sparc64 = -m64
ifeq ($(KBUILD_HOST),linux)
diff --git a/debian/patches/36-fix-vnc-version-string.patch b/debian/patches/36-fix-vnc-version-string.patch
index 1d70b68..5fb993f 100644
--- a/debian/patches/36-fix-vnc-version-string.patch
+++ b/debian/patches/36-fix-vnc-version-string.patch
@@ -3,7 +3,7 @@ Index: virtualbox/Config.kmk
===================================================================
--- virtualbox.orig/Config.kmk 2015-04-02 15:47:04.439745251 +0200
+++ virtualbox/Config.kmk 2015-04-02 15:47:04.435745250 +0200
-@@ -3073,6 +3073,7 @@
+@@ -3068,6 +3068,7 @@
-e 's/@VBOX_VERSION_MINOR@/$(VBOX_VERSION_MINOR)/g' \
-e 's/@VBOX_VERSION_BUILD@/$(VBOX_VERSION_BUILD)/g' \
-e 's/@VBOX_VERSION_STRING@/$(VBOX_VERSION_STRING)/g' \
diff --git a/debian/patches/69989.patch b/debian/patches/69989.patch
deleted file mode 100644
index 1d7aa60..0000000
--- a/debian/patches/69989.patch
+++ /dev/null
@@ -1,77 +0,0 @@
-===================================================================
---- a/src/VBox/GuestHost/OpenGL/util/vboxhgcm.c
-+++ b/src/VBox/GuestHost/OpenGL/util/vboxhgcm.c
-@@ -37,4 +37,5 @@
- #include "cr_process.h"
-
-+#include <iprt/initterm.h>
- #include <iprt/thread.h>
-
-@@ -705,5 +706,5 @@
-
- rc = crVBoxHGCMCall(conn, &parms.hdr, sizeof(parms));
-- callRes = parms.hdr.Hdr.rc;
-+ callRes = parms.hdr.Hdr.rc; /** @todo now rc == parms.hdr.Hdr.rc */
- }
- else
-@@ -719,5 +720,5 @@
-
- rc = crVBoxHGCMCall(conn, &parms.hdr, sizeof(parms));
-- callRes = parms.hdr.Hdr.rc;
-+ callRes = parms.hdr.Hdr.rc; /** @todo now rc == parms.hdr.Hdr.rc */
- }
-
-@@ -759,5 +760,5 @@
- rc = crVBoxHGCMCall(conn, &parms.hdr, sizeof(parms));
-
-- if (RT_FAILURE(rc) || RT_FAILURE(parms.hdr.Hdr.rc))
-+ if (RT_FAILURE(rc) || RT_FAILURE(parms.hdr.Hdr.rc) /** @todo now rc == parms.hdr.Hdr.rc */)
- {
- crWarning("SHCRGL_GUEST_FN_READ failed with %x %x\n", rc, parms.hdr.Hdr.rc);
-@@ -835,5 +836,5 @@
-
- rc = crVBoxHGCMCall(conn, &wbParms.hdr, sizeof(wbParms));
-- if (RT_FAILURE(rc) || RT_FAILURE(wbParms.hdr.Hdr.rc))
-+ if (RT_FAILURE(rc) || RT_FAILURE(wbParms.hdr.Hdr.rc) /** @todo now rc == wbParms.hdr.Hdr.rc */)
- {
- crError("SHCRGL_GUEST_FN_WRITE_BUFFER (%i) failed with %x %x\n", wbParms.pBuffer.u.Pointer.size, rc, wbParms.hdr.Hdr.rc);
-@@ -866,8 +867,8 @@
- #endif
-
-- if (RT_FAILURE(rc) || RT_FAILURE(parms.hdr.Hdr.rc))
-- {
--
-- if ((VERR_BUFFER_OVERFLOW == parms.hdr.Hdr.rc) && RT_SUCCESS(rc))
-+ if (RT_FAILURE(rc) || RT_FAILURE(parms.hdr.Hdr.rc) /** @todo now rc == parms.hdr.Hdr.rc */)
-+ {
-+
-+ if ((VERR_BUFFER_OVERFLOW == parms.hdr.Hdr.rc) /* && RT_SUCCESS(rc) */)
- {
- /* reallocate buffer and retry */
-@@ -991,5 +992,5 @@
- rc = crVBoxHGCMCall(conn, &parms.hdr, sizeof(parms));
-
-- if (RT_FAILURE(rc) || RT_FAILURE(parms.hdr.Hdr.rc))
-+ if (RT_FAILURE(rc) || RT_FAILURE(parms.hdr.Hdr.rc) /** @todo now rc == parms.hdr.Hdr.rc */)
- {
- crDebug("SHCRGL_GUEST_FN_READ failed with %x %x\n", rc, parms.hdr.Hdr.rc);
-@@ -1194,5 +1195,5 @@
- if (RT_SUCCESS(rc))
- {
-- rc = parms.hdr.Hdr.rc;
-+ rc = parms.hdr.Hdr.rc; /** @todo now rc == parms.hdr.Hdr.rc */
- if (RT_SUCCESS(rc))
- {
-@@ -1256,5 +1257,5 @@
- rc = crVBoxHGCMCall(conn, &parms.hdr, sizeof(parms));
-
-- if (RT_FAILURE(rc) || RT_FAILURE(parms.hdr.Hdr.rc))
-+ if (RT_FAILURE(rc) || RT_FAILURE(parms.hdr.Hdr.rc) /** @todo now rc == parms.hdr.Hdr.rc */)
- {
- crWarning("SHCRGL_GUEST_FN_SET_PID failed!");
-@@ -1275,4 +1276,5 @@
- int rc;
- VBOXCRHGSMIPROFILE_FUNC_PROLOGUE();
-+ RTR3InitDll(RTR3INIT_FLAGS_UNOBTRUSIVE);
- rc = VbglR3InitUser();
- if (RT_SUCCESS(rc))
diff --git a/debian/patches/fix-build.patch b/debian/patches/fix-build.patch
index 7aa7122..fb5fc73 100644
--- a/debian/patches/fix-build.patch
+++ b/debian/patches/fix-build.patch
@@ -1,4 +1,4 @@
-Description: * Tentatively fix virtualbox-dkms
+Description: Tentatively fix virtualbox-dkms
Author: Gianfranco Costamagna <locutusofborg at debian.org>
Last-Update: 2017-10-27
diff --git a/debian/patches/series b/debian/patches/series
index 991c285..244fb70 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -16,4 +16,3 @@
36-fix-vnc-version-string.patch
37-python-3.6-support.patch
fix-build.patch
-69989.patch
--
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