From 7ebcafdc8c1e73a3a16d368abd623072d0197149192019512d2e4c6df8916a51 Mon Sep 17 00:00:00 2001 From: Larry Finger Date: Sun, 5 Mar 2023 22:53:33 +0000 Subject: [PATCH] Accepting request 1069494 from home:lwfinger:branches:Virtualization - GCC 13 changed and the fixes patch needed revising. boo#1207468 OBS-URL: https://build.opensuse.org/request/show/1069494 OBS-URL: https://build.opensuse.org/package/show/Virtualization/virtualbox?expand=0&rev=681 --- fixes_for_gcc13.patch | 45 +++++----------- virtualbox.changes | 5 ++ virtualbox.spec | 119 +++++++++++++++++++++++++++++++++++++++--- 3 files changed, 129 insertions(+), 40 deletions(-) diff --git a/fixes_for_gcc13.patch b/fixes_for_gcc13.patch index 722f56f..dcf483e 100644 --- a/fixes_for_gcc13.patch +++ b/fixes_for_gcc13.patch @@ -1,26 +1,3 @@ -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 @@ -33,15 +10,17 @@ Index: VirtualBox-7.0.6/src/libs/dxvk-native-1.9.2a/src/util/util_bit.h #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 +Index: VirtualBox-7.0.6/src/VBox/Additions/x11/x11include/XFree86-4.3/Xserver/misc.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" +--- VirtualBox-7.0.6.orig/src/VBox/Additions/x11/x11include/XFree86-4.3/Xserver/misc.h ++++ VirtualBox-7.0.6/src/VBox/Additions/x11/x11include/XFree86-4.3/Xserver/misc.h +@@ -66,6 +66,9 @@ TORTIOUS ACTION, ARISING OUT OF OR IN CO + OF THIS SOFTWARE. + ******************************************************************/ ++ ++#define __STDC_HOSTED__ 1 ++ + /* $Xorg: misc.h,v 1.5 2001/02/09 02:05:15 xorgcvs Exp $ */ + #ifndef MISC_H + #define MISC_H 1 diff --git a/virtualbox.changes b/virtualbox.changes index c0a376e..2c8108f 100644 --- a/virtualbox.changes +++ b/virtualbox.changes @@ -1,3 +1,8 @@ +------------------------------------------------------------------- +Sun Mar 5 20:24:32 UTC 2023 - Larry Finger + +- GCC 13 changed and the fixes patch needed revising. boo#1207468 + ------------------------------------------------------------------- Wed Mar 1 16:13:24 UTC 2023 - Larry Finger diff --git a/virtualbox.spec b/virtualbox.spec index 02cf864..e36390a 100644 --- a/virtualbox.spec +++ b/virtualbox.spec @@ -305,8 +305,21 @@ the terms of the GNU Public License (GPL). -#-######################################### + + + + + + + + + + + + + +#-######################################### %package qt Summary: Qt GUI part for %{name} Group: System/Emulators/PC @@ -330,8 +343,21 @@ This package contains the code for the GUI used to control VMs. -#-######################################## + + + + + + + + + + + + + +#-######################################## %package websrv Summary: WebService GUI part for %{name} Group: System/Emulators/PC @@ -348,9 +374,23 @@ The VirtualBox web server is used to control headless VMs using a browser. + + + + + + + + + + + + + #-########################################## + %package guest-tools Summary: VirtualBox guest tools Group: System/Emulators/PC @@ -378,8 +418,21 @@ VirtualBox guest addition tools. -#-########################################## + + + + + + + + + + + + + +#-########################################## %package -n python3-%{name} Summary: Python bindings for %{name} Group: Development/Libraries/Python @@ -404,8 +457,21 @@ Python XPCOM bindings to %{name}. Used e.g. by vboxgtk package. -#-########################################## + + + + + + + + + + + + + +#-########################################## %package devel Summary: Devel files for %{name} Group: Development/Libraries/Other @@ -425,8 +491,21 @@ Development file for %{name} -#-########################################## + + + + + + + + + + + + + +#-########################################## %package host-source Summary: Source files for %{name} host kernel modules Group: Development/Sources @@ -463,8 +542,21 @@ sudo %{_sbindir}/vboxguestconfig -#-########################################## + + + + + + + + + + + + + +#-########################################## %package guest-desktop-icons Summary: Icons for guest desktop files Group: System/Emulators/PC @@ -482,8 +574,21 @@ This package contains icons for guest desktop files that were created on the des -#-########################################## + + + + + + + + + + + + + +#-########################################## %package vnc Summary: VNC desktop sharing Group: System/Emulators/PC