From bb90ee6504453f2015643549bb01cfdb1420e28e969b958c6a400a4c7f134ce3 Mon Sep 17 00:00:00 2001 From: Larry Finger Date: Wed, 1 Mar 2023 20:26:20 +0000 Subject: [PATCH] Accepting request 1068549 from home:lwfinger:branches:Virtualization - Add file "fixes_for_gcc13.patch" to fix builds with GCC13. boo#1207468 OBS-URL: https://build.opensuse.org/request/show/1068549 OBS-URL: https://build.opensuse.org/package/show/Virtualization/virtualbox?expand=0&rev=679 --- fixes_for_gcc13.patch | 47 +++++++++++++++++++++++++++++++++ virtualbox.changes | 5 ++++ virtualbox.spec | 61 +++++++++++++++++++++++++++++++++++++------ 3 files changed, 105 insertions(+), 8 deletions(-) create mode 100644 fixes_for_gcc13.patch diff --git a/fixes_for_gcc13.patch b/fixes_for_gcc13.patch new file mode 100644 index 0000000..722f56f --- /dev/null +++ b/fixes_for_gcc13.patch @@ -0,0 +1,47 @@ +Index: VirtualBox-7.0.6/include/iprt/types.h +=================================================================== +--- VirtualBox-7.0.6.orig/include/iprt/types.h ++++ VirtualBox-7.0.6/include/iprt/types.h +@@ -170,6 +170,7 @@ RT_C_DECLS_END + # undef __inline + # define __inline __inline + # endif ++# include + # include + # include + /* +Index: VirtualBox-7.0.6/src/libs/dxvk-native-1.9.2a/src/util/util_matrix.cpp +=================================================================== +--- VirtualBox-7.0.6.orig/src/libs/dxvk-native-1.9.2a/src/util/util_matrix.cpp ++++ VirtualBox-7.0.6/src/libs/dxvk-native-1.9.2a/src/util/util_matrix.cpp +@@ -229,4 +229,4 @@ namespace dxvk { + return os; + } + +-} +\ No newline at end of file ++} +Index: VirtualBox-7.0.6/src/libs/dxvk-native-1.9.2a/src/util/util_bit.h +=================================================================== +--- VirtualBox-7.0.6.orig/src/libs/dxvk-native-1.9.2a/src/util/util_bit.h ++++ VirtualBox-7.0.6/src/libs/dxvk-native-1.9.2a/src/util/util_bit.h +@@ -13,6 +13,7 @@ + #include + #endif + ++#include + #include "util_likely.h" + #include "util_math.h" + +Index: VirtualBox-7.0.6/src/VBox/Additions/3D/mesa/mesa-21.3.8/include/c99_math.h +=================================================================== +--- VirtualBox-7.0.6.orig/src/VBox/Additions/3D/mesa/mesa-21.3.8/include/c99_math.h ++++ VirtualBox-7.0.6/src/VBox/Additions/3D/mesa/mesa-21.3.8/include/c99_math.h +@@ -34,6 +34,7 @@ + #ifndef _C99_MATH_H_ + #define _C99_MATH_H_ + ++#define _GLIBCXX_HOSTED 1 + #include + #include "c99_compat.h" + diff --git a/virtualbox.changes b/virtualbox.changes index 80d67ca..c0a376e 100644 --- a/virtualbox.changes +++ b/virtualbox.changes @@ -1,3 +1,8 @@ +------------------------------------------------------------------- +Wed Mar 1 16:13:24 UTC 2023 - Larry Finger + +- Add file "fixes_for_gcc13.patch" to fix builds with GCC13. + ------------------------------------------------------------------- Mon Feb 13 12:03:41 UTC 2023 - Thorsten Kukuk diff --git a/virtualbox.spec b/virtualbox.spec index 2b064e3..02cf864 100644 --- a/virtualbox.spec +++ b/virtualbox.spec @@ -158,6 +158,8 @@ Patch33: fixes_for_leap15.3.patch Patch34: fix_kmp_build.patch # Fix for backports to 15.5 Patch35: fixes_for_leap15.5.patch +# Fix for GCC13 +Patch36: fixes_for_gcc13.patch # # Common BuildRequires for both virtualbox and virtualbox-kmp BuildRequires: %{kernel_module_package_buildreqs} @@ -299,7 +301,12 @@ the terms of the GNU Public License (GPL). -########################################## + + + + +#-######################################### + %package qt Summary: Qt GUI part for %{name} Group: System/Emulators/PC @@ -319,7 +326,12 @@ This package contains the code for the GUI used to control VMs. -######################################### + + + + +#-######################################## + %package websrv Summary: WebService GUI part for %{name} Group: System/Emulators/PC @@ -332,8 +344,13 @@ The VirtualBox web server is used to control headless VMs using a browser. -########################################### + + + + + +#-########################################## %package guest-tools Summary: VirtualBox guest tools Group: System/Emulators/PC @@ -357,7 +374,12 @@ VirtualBox guest addition tools. -########################################### + + + + +#-########################################## + %package -n python3-%{name} Summary: Python bindings for %{name} Group: Development/Libraries/Python @@ -378,7 +400,12 @@ Python XPCOM bindings to %{name}. Used e.g. by vboxgtk package. -########################################### + + + + +#-########################################## + %package devel Summary: Devel files for %{name} Group: Development/Libraries/Other @@ -394,7 +421,12 @@ Development file for %{name} -########################################### + + + + +#-########################################## + %package host-source Summary: Source files for %{name} host kernel modules Group: Development/Sources @@ -427,7 +459,12 @@ sudo %{_sbindir}/vboxguestconfig -########################################### + + + + +#-########################################## + %package guest-desktop-icons Summary: Icons for guest desktop files Group: System/Emulators/PC @@ -441,7 +478,12 @@ This package contains icons for guest desktop files that were created on the des -########################################### + + + + +#-########################################## + %package vnc Summary: VNC desktop sharing Group: System/Emulators/PC @@ -506,6 +548,9 @@ This package contains the kernel-modules that VirtualBox uses to create or run v %if 0%{?sle_version} == 150500 && 0%{?is_opensuse} %patch35 -p1 %endif +%if 0%{gcc_version} >= 13 +%patch36 -p1 +%endif ### Documents for virtualbox main package ### %if %{main_package}