Date: Saturday, May 16, 2020 @ 22:53:53 Author: eworm Revision: 628211
upgpkg: virtualbox 6.1.8-1 new upstream release Added: virtualbox/trunk/017-fix-narrowing-conversion.patch Modified: virtualbox/trunk/PKGBUILD ------------------------------------+ 017-fix-narrowing-conversion.patch | 37 +++++++++++++++++++++++++++++++++++ PKGBUILD | 12 ++++++----- 2 files changed, 44 insertions(+), 5 deletions(-) Added: 017-fix-narrowing-conversion.patch =================================================================== --- 017-fix-narrowing-conversion.patch (rev 0) +++ 017-fix-narrowing-conversion.patch 2020-05-16 22:53:53 UTC (rev 628211) @@ -0,0 +1,37 @@ +From ee6ae088673d14c407d4773855dbda821024653c Mon Sep 17 00:00:00 2001 +From: Christian Hesse <[email protected]> +Date: Sun, 17 May 2020 00:40:18 +0200 +Subject: [PATCH 1/1] fix narrowing conversion +MIME-Version: 1.0 +Content-Type: text/plain; charset=UTF-8 +Content-Transfer-Encoding: 8bit + +Building fails with: + +/build/virtualbox/src/VirtualBox-6.1.8/src/VBox/Debugger/DBGCDumpImage.cpp: In function ‘const char* dbgcMachoCpuType(uint32_t, uint32_t)’: +/build/virtualbox/src/VirtualBox-6.1.8/include/iprt/formats/mach-o.h:41:46: error: narrowing conversion of ‘-1’ from ‘int’ to ‘unsigned int’ [-Wnarrowing] + 41 | #define CPU_TYPE_ANY INT32_C(-1) + | ^ +/build/virtualbox/src/VirtualBox-6.1.8/src/VBox/Debugger/DBGCDumpImage.cpp:471:14: note: in expansion of macro ‘CPU_TYPE_ANY’ + 471 | case CPU_TYPE_ANY: return "CPU_TYPE_ANY"; + | ^~~~~~~~~~~~ + +As uType is unsigned it can never match CPU_TYPE_ANY, which is -1. + +Signed-off-by: Christian Hesse <[email protected]> +--- + src/VBox/Debugger/DBGCDumpImage.cpp | 1 - + 1 file changed, 1 deletion(-) + +diff --git a/src/VBox/Debugger/DBGCDumpImage.cpp b/src/VBox/Debugger/DBGCDumpImage.cpp +index 02ba3158..d906c37c 100644 +--- a/src/VBox/Debugger/DBGCDumpImage.cpp ++++ b/src/VBox/Debugger/DBGCDumpImage.cpp +@@ -468,7 +468,6 @@ static const char *dbgcMachoCpuType(uint32_t uType, uint32_t uSubType) + { + switch (uType) + { +- case CPU_TYPE_ANY: return "CPU_TYPE_ANY"; + case CPU_TYPE_VAX: return "VAX"; + case CPU_TYPE_MC680x0: return "MC680x0"; + case CPU_TYPE_X86: return "X86"; Modified: PKGBUILD =================================================================== --- PKGBUILD 2020-05-16 22:53:18 UTC (rev 628210) +++ PKGBUILD 2020-05-16 22:53:53 UTC (rev 628211) @@ -9,8 +9,8 @@ 'virtualbox-guest-utils' 'virtualbox-guest-utils-nox' 'virtualbox-ext-vnc') -pkgver=6.1.6 -pkgrel=2 +pkgver=6.1.8 +pkgrel=1 _vboxsf_commit='5aba938bcabd978e4615186ad7d8617d633e6f30' arch=('x86_64') url='https://virtualbox.org/' @@ -73,8 +73,9 @@ '008-no-vboxvideo.patch' '012-vbglR3GuestCtrlDetectPeekGetCancelSupport.patch' '013-Makefile.patch' - '016-VBoxServiceAutoMount-Change-Linux-mount-code-to-use-.patch') -sha256sums=('b031c30d770f28c5f884071ad933e8c1f83e65b93aaba03a4012077c1d90a54f' + '016-VBoxServiceAutoMount-Change-Linux-mount-code-to-use-.patch' + '017-fix-narrowing-conversion.patch') +sha256sums=('426888f83036b6b1f79c272d317a4e8ecf43781f6a266fd7209c03dca504eefc' 'SKIP' '76d98ea062fcad9e5e3fa981d046a6eb12a3e718a296544a68b66f4b65cb56db' 'c1ccfaa3a37d6b227cd65de944df2d68cbf178a857b6ab15c04b8fa05693f252' @@ -93,7 +94,8 @@ '053bfeee8863f3ffdf2f0e3f9f0d77dc61dd32764700a97a7635fd8611e20491' '81900e13d36630488accd8c0bfd2ceb69563fb2c4f0f171caba1cca59d438024' 'da7e58ed37dc23c6202aab3017864579a99e78417f3421ddcc98a198198fe2c9' - '100c9e14e9cfb12ae65364e830153d2481cf272ceeb39d11c6b203bc6e35bf0c') + '100c9e14e9cfb12ae65364e830153d2481cf272ceeb39d11c6b203bc6e35bf0c' + '5aac692909a0a0ec56b08bdece9e42cf7463abdca9da2f990d441ff463be6a99') prepare() { cd "VirtualBox-$pkgver"
