From d5e7870532ccb157da8c5ac3cdf8674bf92083d0 Mon Sep 17 00:00:00 2001
From: Christian Prochaska <christian.prochaska@genode-labs.com>
Date: Thu, 29 Apr 2021 10:25:07 +0200
Subject: [PATCH] virtualbox5: fix build errors with gcc 10

Fixes #4106
---
 repos/ports/ports/virtualbox5.hash                |  2 +-
 repos/ports/src/virtualbox5/frontend/console.cc   |  2 ++
 .../ports/src/virtualbox5/patches/narrowing.patch | 15 +++++++++++++++
 repos/ports/src/virtualbox5/patches/series        |  1 +
 repos/ports/src/virtualbox5/spec/nova/sup_old.cc  |  4 ++++
 5 files changed, 23 insertions(+), 1 deletion(-)
 create mode 100644 repos/ports/src/virtualbox5/patches/narrowing.patch

diff --git a/repos/ports/ports/virtualbox5.hash b/repos/ports/ports/virtualbox5.hash
index 2fa842865c..fbfd40a4b7 100644
--- a/repos/ports/ports/virtualbox5.hash
+++ b/repos/ports/ports/virtualbox5.hash
@@ -1 +1 @@
-e60d9717f4833b0cba86ddb3b461925d974c5fa1
+a4d2f03ac0c0d8f7d7c3a4c3b284a68fb259cbc8
diff --git a/repos/ports/src/virtualbox5/frontend/console.cc b/repos/ports/src/virtualbox5/frontend/console.cc
index 5154a16953..e67f4e6d2f 100644
--- a/repos/ports/src/virtualbox5/frontend/console.cc
+++ b/repos/ports/src/virtualbox5/frontend/console.cc
@@ -15,6 +15,8 @@
 #include <libc/component.h>
 #include <util/xml_node.h>
 
+#include <cstdlib>
+
 #include <VBox/settings.h>
 #include <SharedClipboard/VBoxClipboard.h>
 #include <VBox/HostServices/VBoxClipboardSvc.h>
diff --git a/repos/ports/src/virtualbox5/patches/narrowing.patch b/repos/ports/src/virtualbox5/patches/narrowing.patch
new file mode 100644
index 0000000000..67fc8223d7
--- /dev/null
+++ b/repos/ports/src/virtualbox5/patches/narrowing.patch
@@ -0,0 +1,15 @@
+Fix 'narrowing conversion' error
+
+diff --git a/src/app/virtualbox/src/VBox/Main/src-client/ConsoleImpl2.cpp b/src/app/virtualbox/src/VBox/Main/src-client/ConsoleImpl2.cpp
+index 3693927..6975ed2 100644
+--- a/src/app/virtualbox/src/VBox/Main/src-client/ConsoleImpl2.cpp
++++ b/src/app/virtualbox/src/VBox/Main/src-client/ConsoleImpl2.cpp
+@@ -5262,7 +5262,7 @@ int Console::i_configNetwork(const char *pszDevice,
+                 {
+                     switch (hrc)
+                     {
+-                        case VERR_ACCESS_DENIED:
++                        case E_ACCESSDENIED:
+                             return VMSetError(VMR3GetVM(mpUVM), VERR_HOSTIF_INIT_FAILED, RT_SRC_POS,  N_(
+                                             "Failed to open '/dev/net/tun' for read/write access. Please check the "
+                                             "permissions of that node. Either run 'chmod 0666 /dev/net/tun' or "
diff --git a/repos/ports/src/virtualbox5/patches/series b/repos/ports/src/virtualbox5/patches/series
index 4a4ce9702d..ce5b70cd3b 100644
--- a/repos/ports/src/virtualbox5/patches/series
+++ b/repos/ports/src/virtualbox5/patches/series
@@ -37,3 +37,4 @@ vga.patch
 register.patch
 changeset82265.patch
 drvvd.patch
+narrowing.patch
diff --git a/repos/ports/src/virtualbox5/spec/nova/sup_old.cc b/repos/ports/src/virtualbox5/spec/nova/sup_old.cc
index 831a123949..794aed471e 100644
--- a/repos/ports/src/virtualbox5/spec/nova/sup_old.cc
+++ b/repos/ports/src/virtualbox5/spec/nova/sup_old.cc
@@ -19,6 +19,10 @@
 #include "sup.h"
 #include "vmm.h"
 
+/* stdcxx includes */
+#include <cstdio>
+#include <cstdlib>
+
 /* VirtualBox includes */
 #include <iprt/ldr.h>
 #include <iprt/thread.h>