1 |
commit: 8507cc179dc91f1aa8803ee67e48018c7c6733b1 |
2 |
Author: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org> |
3 |
AuthorDate: Tue Jun 2 21:26:38 2020 +0000 |
4 |
Commit: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org> |
5 |
CommitDate: Tue Jun 2 21:51:50 2020 +0000 |
6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=8507cc17 |
7 |
|
8 |
app-emulation/virtualbox: Fix build with Qt 5.15 |
9 |
|
10 |
Thanks-to: cmvu <cmvu <AT> protonmail.com> |
11 |
Closes: https://bugs.gentoo.org/726154 |
12 |
Package-Manager: Portage-2.3.100, Repoman-2.3.22 |
13 |
Signed-off-by: Andreas Sturmlechner <asturm <AT> gentoo.org> |
14 |
|
15 |
.../files/virtualbox-6.1.6-qt-5.15.patch | 92 ++++++++++++++++++++++ |
16 |
app-emulation/virtualbox/virtualbox-6.1.6.ebuild | 2 + |
17 |
2 files changed, 94 insertions(+) |
18 |
|
19 |
diff --git a/app-emulation/virtualbox/files/virtualbox-6.1.6-qt-5.15.patch b/app-emulation/virtualbox/files/virtualbox-6.1.6-qt-5.15.patch |
20 |
new file mode 100644 |
21 |
index 00000000000..36f525593e0 |
22 |
--- /dev/null |
23 |
+++ b/app-emulation/virtualbox/files/virtualbox-6.1.6-qt-5.15.patch |
24 |
@@ -0,0 +1,92 @@ |
25 |
+--- a/src/VBox/Frontends/VirtualBox/src/globals/UIImageTools.cpp 2020-05-29 23:51:41.504432532 +0300 |
26 |
++++ b/src/VBox/Frontends/VirtualBox/src/globals/UIImageTools.cpp 2020-05-29 23:49:26.943858460 +0300 |
27 |
+@@ -17,6 +17,8 @@ |
28 |
+ |
29 |
+ /* Qt includes: */ |
30 |
+ #include <QPainter> |
31 |
++#include <QPainterPath> |
32 |
++#include <QPainterPathStroker> |
33 |
+ |
34 |
+ /* GUI include */ |
35 |
+ #include "UIImageTools.h" |
36 |
+ |
37 |
+--- a/src/VBox/Frontends/VirtualBox/src/widgets/UIPopupBox.h 2020-05-30 00:09:50.369275092 +0300 |
38 |
++++ b/src/VBox/Frontends/VirtualBox/src/widgets/UIPopupBox.h 2020-05-30 00:01:14.152354690 +0300 |
39 |
+@@ -24,6 +24,7 @@ |
40 |
+ /* Qt includes: */ |
41 |
+ #include <QIcon> |
42 |
+ #include <QWidget> |
43 |
++#include <QPainterPath> |
44 |
+ |
45 |
+ /* GUI includes: */ |
46 |
+ #include "UILibraryDefs.h" |
47 |
+--- a/src/VBox/Frontends/VirtualBox/src/widgets/UIMenuToolBar.cpp 2020-05-30 00:39:54.773447224 +0300 |
48 |
++++ b/src/VBox/Frontends/VirtualBox/src/widgets/UIMenuToolBar.cpp 2020-05-30 00:41:36.274371761 +0300 |
49 |
+@@ -21,6 +21,7 @@ |
50 |
+ #include <QPainter> |
51 |
+ #include <QStyle> |
52 |
+ #include <QToolButton> |
53 |
++#include <QPainterPath> |
54 |
+ |
55 |
+ /* GUI includes: */ |
56 |
+ #include "UIMenuToolBar.h" |
57 |
+--- a/src/VBox/Frontends/VirtualBox/src/widgets/UITabBar.cpp 2020-05-30 00:39:47.613523134 +0300 |
58 |
++++ b/src/VBox/Frontends/VirtualBox/src/widgets/UITabBar.cpp 2020-05-30 00:41:29.655441857 +0300 |
59 |
+@@ -29,6 +29,7 @@ |
60 |
+ #include <QMouseEvent> |
61 |
+ #include <QStyleOption> |
62 |
+ #include <QPainter> |
63 |
++#include <QPainterPath> |
64 |
+ #ifdef VBOX_WS_MAC |
65 |
+ # include <QStackedLayout> |
66 |
+ #endif |
67 |
+--- a/src/VBox/Frontends/VirtualBox/src/widgets/UIFilmContainer.cpp 2020-05-30 00:40:01.624374596 +0300 |
68 |
++++ b/src/VBox/Frontends/VirtualBox/src/widgets/UIFilmContainer.cpp 2020-05-30 00:41:40.654325376 +0300 |
69 |
+@@ -23,6 +23,7 @@ |
70 |
+ #include <QScrollBar> |
71 |
+ #include <QStyle> |
72 |
+ #include <QVBoxLayout> |
73 |
++#include <QPainterPath> |
74 |
+ |
75 |
+ /* GUI includes: */ |
76 |
+ #include "UIFilmContainer.h" |
77 |
+--- a/src/VBox/Frontends/VirtualBox/src/widgets/UIPopupBox.cpp 2020-05-30 00:40:08.844298062 +0300 |
78 |
++++ b/src/VBox/Frontends/VirtualBox/src/widgets/UIPopupBox.cpp 2020-05-30 00:41:44.594283652 +0300 |
79 |
+@@ -22,6 +22,7 @@ |
80 |
+ #include <QPaintEvent> |
81 |
+ #include <QStyle> |
82 |
+ #include <QVBoxLayout> |
83 |
++#include <QPainterPath> |
84 |
+ |
85 |
+ /* GUI includes: */ |
86 |
+ #include "UIPopupBox.h" |
87 |
+--- a/src/VBox/Frontends/VirtualBox/src/widgets/UIMiniToolBar.cpp 2020-05-30 00:40:16.064221530 +0300 |
88 |
++++ b/src/VBox/Frontends/VirtualBox/src/widgets/UIMiniToolBar.cpp 2020-05-30 00:41:52.014205079 +0300 |
89 |
+@@ -27,6 +27,7 @@ |
90 |
+ #include <QToolButton> |
91 |
+ #include <QVBoxLayout> |
92 |
+ #include <QWindow> |
93 |
++#include <QPainterPath> |
94 |
+ #ifdef VBOX_WS_X11 |
95 |
+ # include <QWindowStateChangeEvent> |
96 |
+ #endif |
97 |
+--- a/src/VBox/Frontends/VirtualBox/src/widgets/graphics/UIGraphicsScrollBar.cpp 2020-05-30 00:40:22.314155286 +0300 |
98 |
++++ b/src/VBox/Frontends/VirtualBox/src/widgets/graphics/UIGraphicsScrollBar.cpp 2020-05-30 00:41:56.544157111 +0300 |
99 |
+@@ -28,6 +28,7 @@ |
100 |
+ #include <QStyleOptionGraphicsItem> |
101 |
+ #include <QTimer> |
102 |
+ #include <QTimerEvent> |
103 |
++#include <QPainterPath> |
104 |
+ |
105 |
+ /* GUI includes: */ |
106 |
+ #include "UIGraphicsButton.h" |
107 |
+--- a/src/VBox/Frontends/VirtualBox/src/widgets/UIPopupPane.cpp 2020-05-30 00:40:34.375027462 +0300 |
108 |
++++ b/src/VBox/Frontends/VirtualBox/src/widgets/UIPopupPane.cpp 2020-05-30 00:42:01.244107347 +0300 |
109 |
+@@ -18,6 +18,7 @@ |
110 |
+ /* Qt includes: */ |
111 |
+ #include <QPainter> |
112 |
+ #include <QTextEdit> |
113 |
++#include <QPainterPath> |
114 |
+ |
115 |
+ /* GUI includes: */ |
116 |
+ #include "UIPopupPane.h" |
117 |
|
118 |
diff --git a/app-emulation/virtualbox/virtualbox-6.1.6.ebuild b/app-emulation/virtualbox/virtualbox-6.1.6.ebuild |
119 |
index 7ddbfdc4204..a359a7ca30f 100644 |
120 |
--- a/app-emulation/virtualbox/virtualbox-6.1.6.ebuild |
121 |
+++ b/app-emulation/virtualbox/virtualbox-6.1.6.ebuild |
122 |
@@ -207,6 +207,8 @@ src_prepare() { |
123 |
eapply "${FILESDIR}"/virtualbox-5.2.8-paxmark-bldprogs.patch |
124 |
fi |
125 |
|
126 |
+ eapply "${FILESDIR}"/${P}-qt-5.15.patch # TODO: upstream, bug #726154 |
127 |
+ |
128 |
eapply "${WORKDIR}/patches" |
129 |
|
130 |
eapply_user |