diff options
author | Jan Palus | 2020-06-06 12:08:16 (GMT) |
---|---|---|
committer | Jan Palus | 2020-06-06 12:08:16 (GMT) |
commit | c8978e987eb5f3fbf5a33789b168b42ff78f84e6 (patch) | |
tree | 574299f90838e396e6c233e7d891ad8f986f88e3 | |
parent | bb47c3ae4e2b8121dc565357eb20c49d9881d574 (diff) | |
download | VirtualBox-c8978e987eb5f3fbf5a33789b168b42ff78f84e6.zip VirtualBox-c8978e987eb5f3fbf5a33789b168b42ff78f84e6.tar.gz |
fix build with qt 5.15
from https://www.virtualbox.org/ticket/19637
-rw-r--r-- | VirtualBox.spec | 2 | ||||
-rw-r--r-- | qt5.15.patch | 55 |
2 files changed, 57 insertions, 0 deletions
diff --git a/VirtualBox.spec b/VirtualBox.spec index e3c44d8..3283e96 100644 --- a/VirtualBox.spec +++ b/VirtualBox.spec @@ -87,6 +87,7 @@ Patch14: %{pname}-multipython.patch Patch15: %{pname}-lightdm-1.19.2.patch Patch16: %{pname}-no-vboxvideo.patch Patch17: qt5-gl.patch +Patch18: qt5.15.patch URL: http://www.virtualbox.org/ %if %{with userspace} %ifarch %{x8664} @@ -551,6 +552,7 @@ echo override vboxsf %{_kernel_ver} misc >> kernel/installed/etc/depmod.d/%{_ker %patch15 -p0 %patch16 -p0 %patch17 -p1 +%patch18 -p1 %{__sed} -i -e 's,@VBOX_DOC_PATH@,%{_docdir}/%{name}-%{version},' \ -e 's/Categories=.*/Categories=Utility;Emulator;/' src/VBox/Installer/common/virtualbox.desktop.in diff --git a/qt5.15.patch b/qt5.15.patch new file mode 100644 index 0000000..a0eba5d --- /dev/null +++ b/qt5.15.patch @@ -0,0 +1,55 @@ +diff -ur VirtualBox-6.1.8/src/VBox/Frontends/VirtualBox/src/globals/UIImageTools.cpp VirtualBox-6.1.8.patched/src/VBox/Frontends/VirtualBox/src/globals/UIImageTools.cpp +--- VirtualBox-6.1.8/src/VBox/Frontends/VirtualBox/src/globals/UIImageTools.cpp 2020-05-14 14:40:35.000000000 -0400 ++++ VirtualBox-6.1.8.patched/src/VBox/Frontends/VirtualBox/src/globals/UIImageTools.cpp 2020-06-03 10:46:06.750776100 -0400 +@@ -17,6 +17,7 @@ + + /* Qt includes: */ + #include <QPainter> ++#include <QPainterPath> + + /* GUI include */ + #include "UIImageTools.h" +diff -ur VirtualBox-6.1.8/src/VBox/Frontends/VirtualBox/src/widgets/UIMenuToolBar.cpp VirtualBox-6.1.8.patched/src/VBox/Frontends/VirtualBox/src/widgets/UIMenuToolBar.cpp +--- VirtualBox-6.1.8/src/VBox/Frontends/VirtualBox/src/widgets/UIMenuToolBar.cpp 2020-05-14 14:40:44.000000000 -0400 ++++ VirtualBox-6.1.8.patched/src/VBox/Frontends/VirtualBox/src/widgets/UIMenuToolBar.cpp 2020-06-03 10:52:50.125585673 -0400 +@@ -19,6 +19,7 @@ + #include <QApplication> + #include <QHBoxLayout> + #include <QPainter> ++#include <QPainterPath> + #include <QStyle> + #include <QToolButton> + +diff -ur VirtualBox-6.1.8/src/VBox/Frontends/VirtualBox/src/widgets/UIMiniToolBar.cpp VirtualBox-6.1.8.patched/src/VBox/Frontends/VirtualBox/src/widgets/UIMiniToolBar.cpp +--- VirtualBox-6.1.8/src/VBox/Frontends/VirtualBox/src/widgets/UIMiniToolBar.cpp 2020-05-14 14:40:44.000000000 -0400 ++++ VirtualBox-6.1.8.patched/src/VBox/Frontends/VirtualBox/src/widgets/UIMiniToolBar.cpp 2020-06-03 10:51:38.560369848 -0400 +@@ -21,6 +21,7 @@ + #include <QMenu> + #include <QMoveEvent> + #include <QPainter> ++#include <QPainterPath> + #include <QStateMachine> + #include <QStyle> + #include <QTimer> +diff -ur VirtualBox-6.1.8/src/VBox/Frontends/VirtualBox/src/widgets/UIPopupBox.cpp VirtualBox-6.1.8.patched/src/VBox/Frontends/VirtualBox/src/widgets/UIPopupBox.cpp +--- VirtualBox-6.1.8/src/VBox/Frontends/VirtualBox/src/widgets/UIPopupBox.cpp 2020-05-14 14:40:44.000000000 -0400 ++++ VirtualBox-6.1.8.patched/src/VBox/Frontends/VirtualBox/src/widgets/UIPopupBox.cpp 2020-06-03 10:47:51.348523624 -0400 +@@ -19,6 +19,7 @@ + #include <QApplication> + #include <QLabel> + #include <QPainter> ++#include <QPainterPath> + #include <QPaintEvent> + #include <QStyle> + #include <QVBoxLayout> +diff -ur VirtualBox-6.1.8/src/VBox/Frontends/VirtualBox/src/widgets/UIPopupBox.h VirtualBox-6.1.8.patched/src/VBox/Frontends/VirtualBox/src/widgets/UIPopupBox.h +--- VirtualBox-6.1.8/src/VBox/Frontends/VirtualBox/src/widgets/UIPopupBox.h 2020-05-14 14:40:44.000000000 -0400 ++++ VirtualBox-6.1.8.patched/src/VBox/Frontends/VirtualBox/src/widgets/UIPopupBox.h 2020-06-03 10:49:01.201695063 -0400 +@@ -24,6 +24,7 @@ + /* Qt includes: */ + #include <QIcon> + #include <QWidget> ++#include <QPainterPath> + + /* GUI includes: */ + #include "UILibraryDefs.h" |