commit 08c55daf87bd65ae51f67c6f1edf2bc4ce07e5a8 Author: Sérgio M. Basto <sergio(a)serjux.com&gt; Date: Fri Feb 21 02:36:21 2020 +0000 Add a hack to fix builds on Rawhide/F32 Makefile.kmk_hack.patch | 18 ------------------ VirtualBox-6.1.4-hacks.patch | 40 ++++++++++++++++++++++++++++++++++++++++ VirtualBox.spec | 9 ++++++--- 3 files changed, 46 insertions(+), 21 deletions(-) --- diff --git a/VirtualBox-6.1.4-hacks.patch b/VirtualBox-6.1.4-hacks.patch new file mode 100644 index 0000000..22cee1d --- /dev/null +++ b/VirtualBox-6.1.4-hacks.patch @@ -0,0 +1,40 @@ +Patch 1: Fix Detection of GCC10 (is >= 4.4 ) +Patch 2: Fix + +/builddir/build/BUILD/VirtualBox-6.1.4/src/VBox/Debugger/DBGCDumpImage.cpp: In function 'const char* dbgcMachoCpuType(uint32_t, uint32_t)': +/builddir/build/BUILD/VirtualBox-6.1.4/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) + | ^ +/builddir/build/BUILD/VirtualBox-6.1.4/src/VBox/Debugger/DBGCDumpImage.cpp:471:14: note: in expansion of macro 'CPU_TYPE_ANY' + 471 | case CPU_TYPE_ANY: return "CPU_TYPE_ANY"; + | ^~~~~~~~~~~~ + +--- ./Makefile.kmk.orig 2020-02-20 03:40:14.049126175 +0000 ++++ ./Makefile.kmk 2020-02-20 03:40:41.843981024 +0000 +@@ -188,15 +188,6 @@ ifeq ($(KBUILD_TARGET),darwin) + "$(if $(VBOX_WITH_HARDENING),/Applications/VirtualBox.app/Contents/Frameworks,(a)rpath)/$(qtmod).framework/Versions/5/$(qtmod)&quot; ) ) \ + "$(2)",) # HACK ALERT! Using $(source_type_prefix) to detect EXEC_SOURCES. + else # win x11 +- if1of ($(KBUILD_TARGET), linux solaris) +- ifndef VBOX_ONLY_BUILD +- ifneq ($(VBOX_GCC_VERSION_CXX),) +- ifeq ($(int-ge $(VBOX_GCC_VERSION_CXX),40400),) +- $(error gcc >= 4.4 required when compiling against Qt5!) +- endif +- endif +- endif +- endif + if defined(VBOX_WITH_ORACLE_QT) || defined(VBOX_WITH_QT_PAYLOAD) + include $(KBUILD_PATH)/units/qt5.kmk + ifeq ($(KBUILD_TARGET),win) +--- ./include/iprt/formats/mach-o.h.orig 2020-02-21 00:48:43.337510836 +0000 ++++ ./include/iprt/formats/mach-o.h 2020-02-21 00:54:56.263466584 +0000 +@@ -38,7 +38,7 @@ + /* cputype */ + #define CPU_ARCH_MASK INT32_C(0xff000000) + #define CPU_ARCH_ABI64 INT32_C(0x01000000) +-#define CPU_TYPE_ANY INT32_C(-1) ++#define CPU_TYPE_ANY INT32_C(0xffffffff) + #define CPU_TYPE_VAX INT32_C(1) + #define CPU_TYPE_MC680x0 INT32_C(6) + #define CPU_TYPE_X86 INT32_C(7) diff --git a/VirtualBox.spec b/VirtualBox.spec index 0108f7a..0f21cdf 100644 --- a/VirtualBox.spec +++ b/VirtualBox.spec @@ -46,7 +46,7 @@ Name: VirtualBox Version: 6.1.4 -Release: 1%{?dist} +Release: 2%{?dist} Summary: A general-purpose full virtualizer for PC hardware License: GPLv2 or (GPLv2 and CDDL) @@ -90,7 +90,7 @@ Patch61: 0001-VBoxServiceAutoMount-Change-Linux-mount-code-to-use-.patch # from OpenSuse Patch70: vbox-python-detection.diff -Patch80: Makefile.kmk_hack.patch +Patch80: VirtualBox-6.1.4-hacks.patch BuildRequires: kBuild >= 0.1.9998.r3093 BuildRequires: SDL-devel @@ -332,7 +332,7 @@ rm -r src/libs/zlib-1.2.*/ %patch60 -p1 -b .xclient %patch61 -p1 -b .automount %patch70 -p1 -b .python-detection -%patch80 -p1 -b .Makefile.kmk_hack.patch +%patch80 -p1 -b .hack %build ./configure --disable-kmods \ @@ -873,6 +873,9 @@ getent passwd vboxadd >/dev/null || \ %{_datadir}/%{name}-kmod-%{version} %changelog +* Fri Feb 21 2020 Sérgio Basto <sergio(a)serjux.com&gt; - 6.1.4-2 +- Add a hack to fix builds on Rawhide/F32 + * Thu Feb 20 2020 Sérgio Basto <sergio(a)serjux.com&gt; - 6.1.4-1 - Update VBox to 6.1.4