From 6059084bee8eb7b4fbeefc2e3f653697375118b6 Mon Sep 17 00:00:00 2001
From: Jeff Cook <jeff@jeffcook.io>
Date: Sat, 28 Dec 2019 21:13:50 -0700
Subject: [PATCH 1/3] Update PKGBUILD for new xorgproto dep tree

---
 trunk/PKGBUILD | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/trunk/PKGBUILD b/trunk/PKGBUILD
index 6552607..c2e45a1 100644
--- a/trunk/PKGBUILD
+++ b/trunk/PKGBUILD
@@ -50,7 +50,7 @@ makedepends=('alsa-lib'
              'sdl_ttf'
              'vde2'
              'xalan-c'
-             'xf86driproto'
+             'xorgproto'
              'xorg-server-devel')
 source=("https://download.virtualbox.org/virtualbox/${pkgver}/VirtualBox-${pkgver}.tar.bz2"
         # We need to build a modified version of vboxsf for Linux 4.16
-- 
2.24.1


From 7c4d7d3290f2ec28983a2e201859d5313f526963 Mon Sep 17 00:00:00 2001
From: Jeff Cook <jeff@jeffcook.io>
Date: Sat, 28 Dec 2019 21:14:37 -0700
Subject: [PATCH 2/3] Build failed without -trigraphs CXXFLAG

---
 trunk/PKGBUILD | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/trunk/PKGBUILD b/trunk/PKGBUILD
index c2e45a1..58ba482 100644
--- a/trunk/PKGBUILD
+++ b/trunk/PKGBUILD
@@ -115,7 +115,7 @@ prepare() {
     cp "$srcdir/LocalConfig.kmk" .
 
     msg2 'Use our CFLAGS'
-    echo "VBOX_GCC_OPT=$CXXFLAGS" >> LocalConfig.kmk
+    echo "VBOX_GCC_OPT=$CXXFLAGS -trigraphs" >> LocalConfig.kmk
 }
 
 build() {
-- 
2.24.1


From 2a23e631668d7abb06a5ef5fd0262d259acb0580 Mon Sep 17 00:00:00 2001
From: Jeff Cook <jeff@jeffcook.io>
Date: Sat, 28 Dec 2019 21:16:03 -0700
Subject: [PATCH 3/3] Add vboximg-mount binary to package.

---
 trunk/PKGBUILD | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/trunk/PKGBUILD b/trunk/PKGBUILD
index 58ba482..3deb500 100644
--- a/trunk/PKGBUILD
+++ b/trunk/PKGBUILD
@@ -168,6 +168,7 @@ package_virtualbox() {
     done
     install -m0755 VBoxTunctl "$pkgdir/usr/bin"
     install -m0755 rdesktop-vrdp "$pkgdir/usr/bin"
+    install -m0755 vboximg-mount "$pkgdir/usr/bin"
 
     # libraries
     install -dm0755 "$pkgdir/usr/lib/virtualbox"
@@ -176,7 +177,7 @@ package_virtualbox() {
     ## setuid root binaries
     install -m4755 VBoxSDL VirtualBoxVM VBoxHeadless VBoxNetDHCP VBoxNetAdpCtl VBoxNetNAT -t "$pkgdir/usr/lib/virtualbox"
     ## other binaries
-    install -m0755 VirtualBox VBoxManage VBoxSVC VBoxExtPackHelperApp VBoxXPCOMIPCD VBoxTestOGL VBoxBalloonCtrl vboxwebsrv webtest -t "$pkgdir/usr/lib/virtualbox"
+    install -m0755 VirtualBox VBoxManage VBoxSVC VBoxExtPackHelperApp VBoxXPCOMIPCD VBoxTestOGL VBoxBalloonCtrl vboxwebsrv webtest vboximg-mount -t "$pkgdir/usr/lib/virtualbox"
 
     # components
     install -dm0755 "$pkgdir/usr/lib/virtualbox/components"
-- 
2.24.1