[gentoo-commits] repo/gentoo:master commit in: app-emulation/virtualbox/, app-emulation/virtualbox/files/

[Andreas Sturmlechner]

commit:     c15842f13dc218913f6d95555c65c90f844f5ec2
Author:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
AuthorDate: Wed Jun  3 00:09:26 2020 +0000
Commit:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Wed Jun  3 00:10:33 2020 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=c15842f1

app-emulation/virtualbox: Fix 6.0.20 build with Qt 5.15 too

Closes: https://bugs.gentoo.org/726154
Package-Manager: Portage-2.3.100, Repoman-2.3.22
Signed-off-by: Andreas Sturmlechner <asturm <AT> gentoo.org>

 ...-5.15.patch => virtualbox-6.0.20-qt-5.15.patch} | 10 ---
 .../files/virtualbox-6.1.6-qt-5.15.patch           | 82 ----------------------
 app-emulation/virtualbox/virtualbox-6.0.20.ebuild  |  2 +
 app-emulation/virtualbox/virtualbox-6.1.6.ebuild   |  3 +-
 4 files changed, 4 insertions(+), 93 deletions(-)

diff --git a/app-emulation/virtualbox/files/virtualbox-6.1.6-qt-5.15.patch b/app-emulation/virtualbox/files/virtualbox-6.0.20-qt-5.15.patch
similarity index 87%
copy from app-emulation/virtualbox/files/virtualbox-6.1.6-qt-5.15.patch
copy to app-emulation/virtualbox/files/virtualbox-6.0.20-qt-5.15.patch
index 36f525593e0..7ba03f02259 100644
--- a/app-emulation/virtualbox/files/virtualbox-6.1.6-qt-5.15.patch
+++ b/app-emulation/virtualbox/files/virtualbox-6.0.20-qt-5.15.patch
@@ -70,16 +70,6 @@
  #ifdef VBOX_WS_X11
  # include <QWindowStateChangeEvent>
  #endif
---- a/src/VBox/Frontends/VirtualBox/src/widgets/graphics/UIGraphicsScrollBar.cpp 2020-05-30 00:40:22.314155286 +0300
-+++ b/src/VBox/Frontends/VirtualBox/src/widgets/graphics/UIGraphicsScrollBar.cpp 2020-05-30 00:41:56.544157111 +0300
-@@ -28,6 +28,7 @@
- #include <QStyleOptionGraphicsItem>
- #include <QTimer>
- #include <QTimerEvent>
-+#include <QPainterPath>
- 
- /* GUI includes: */
- #include "UIGraphicsButton.h"
 --- a/src/VBox/Frontends/VirtualBox/src/widgets/UIPopupPane.cpp 2020-05-30 00:40:34.375027462 +0300
 +++ b/src/VBox/Frontends/VirtualBox/src/widgets/UIPopupPane.cpp 2020-05-30 00:42:01.244107347 +0300
 @@ -18,6 +18,7 @@

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
index 36f525593e0..6518f60d080 100644
--- 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
@@ -1,75 +1,3 @@
---- a/src/VBox/Frontends/VirtualBox/src/globals/UIImageTools.cpp 2020-05-29 23:51:41.504432532 +0300
-+++ b/src/VBox/Frontends/VirtualBox/src/globals/UIImageTools.cpp 2020-05-29 23:49:26.943858460 +0300
-@@ -17,6 +17,8 @@
- 
- /* Qt includes: */
- #include <QPainter>
-+#include <QPainterPath>
-+#include <QPainterPathStroker>
- 
- /* GUI include */
- #include "UIImageTools.h"
-
---- a/src/VBox/Frontends/VirtualBox/src/widgets/UIPopupBox.h 2020-05-30 00:09:50.369275092 +0300
-+++ b/src/VBox/Frontends/VirtualBox/src/widgets/UIPopupBox.h 2020-05-30 00:01:14.152354690 +0300
-@@ -24,6 +24,7 @@
- /* Qt includes: */
- #include <QIcon>
- #include <QWidget>
-+#include <QPainterPath>
- 
- /* GUI includes: */
- #include "UILibraryDefs.h"
---- a/src/VBox/Frontends/VirtualBox/src/widgets/UIMenuToolBar.cpp 2020-05-30 00:39:54.773447224 +0300
-+++ b/src/VBox/Frontends/VirtualBox/src/widgets/UIMenuToolBar.cpp 2020-05-30 00:41:36.274371761 +0300
-@@ -21,6 +21,7 @@
- #include <QPainter>
- #include <QStyle>
- #include <QToolButton>
-+#include <QPainterPath>
- 
- /* GUI includes: */
- #include "UIMenuToolBar.h"
---- a/src/VBox/Frontends/VirtualBox/src/widgets/UITabBar.cpp 2020-05-30 00:39:47.613523134 +0300
-+++ b/src/VBox/Frontends/VirtualBox/src/widgets/UITabBar.cpp 2020-05-30 00:41:29.655441857 +0300
-@@ -29,6 +29,7 @@
- #include <QMouseEvent>
- #include <QStyleOption>
- #include <QPainter>
-+#include <QPainterPath>
- #ifdef VBOX_WS_MAC
- # include <QStackedLayout>
- #endif
---- a/src/VBox/Frontends/VirtualBox/src/widgets/UIFilmContainer.cpp 2020-05-30 00:40:01.624374596 +0300
-+++ b/src/VBox/Frontends/VirtualBox/src/widgets/UIFilmContainer.cpp 2020-05-30 00:41:40.654325376 +0300
-@@ -23,6 +23,7 @@
- #include <QScrollBar>
- #include <QStyle>
- #include <QVBoxLayout>
-+#include <QPainterPath>
- 
- /* GUI includes: */
- #include "UIFilmContainer.h"
---- a/src/VBox/Frontends/VirtualBox/src/widgets/UIPopupBox.cpp 2020-05-30 00:40:08.844298062 +0300
-+++ b/src/VBox/Frontends/VirtualBox/src/widgets/UIPopupBox.cpp 2020-05-30 00:41:44.594283652 +0300
-@@ -22,6 +22,7 @@
- #include <QPaintEvent>
- #include <QStyle>
- #include <QVBoxLayout>
-+#include <QPainterPath>
- 
- /* GUI includes: */
- #include "UIPopupBox.h"
---- a/src/VBox/Frontends/VirtualBox/src/widgets/UIMiniToolBar.cpp 2020-05-30 00:40:16.064221530 +0300
-+++ b/src/VBox/Frontends/VirtualBox/src/widgets/UIMiniToolBar.cpp 2020-05-30 00:41:52.014205079 +0300
-@@ -27,6 +27,7 @@
- #include <QToolButton>
- #include <QVBoxLayout>
- #include <QWindow>
-+#include <QPainterPath>
- #ifdef VBOX_WS_X11
- # include <QWindowStateChangeEvent>
- #endif
 --- a/src/VBox/Frontends/VirtualBox/src/widgets/graphics/UIGraphicsScrollBar.cpp 2020-05-30 00:40:22.314155286 +0300
 +++ b/src/VBox/Frontends/VirtualBox/src/widgets/graphics/UIGraphicsScrollBar.cpp 2020-05-30 00:41:56.544157111 +0300
 @@ -28,6 +28,7 @@
@@ -80,13 +8,3 @@
  
  /* GUI includes: */
  #include "UIGraphicsButton.h"
---- a/src/VBox/Frontends/VirtualBox/src/widgets/UIPopupPane.cpp 2020-05-30 00:40:34.375027462 +0300
-+++ b/src/VBox/Frontends/VirtualBox/src/widgets/UIPopupPane.cpp 2020-05-30 00:42:01.244107347 +0300
-@@ -18,6 +18,7 @@
- /* Qt includes: */
- #include <QPainter>
- #include <QTextEdit>
-+#include <QPainterPath>
- 
- /* GUI includes: */
- #include "UIPopupPane.h"

diff --git a/app-emulation/virtualbox/virtualbox-6.0.20.ebuild b/app-emulation/virtualbox/virtualbox-6.0.20.ebuild
index f16c7450b10..7e8e5d10fb3 100644
--- a/app-emulation/virtualbox/virtualbox-6.0.20.ebuild
+++ b/app-emulation/virtualbox/virtualbox-6.0.20.ebuild
@@ -207,6 +207,8 @@ src_prepare() {
 		eapply "${FILESDIR}"/virtualbox-5.2.8-paxmark-bldprogs.patch
 	fi
 
+	eapply "${FILESDIR}"/${P}-qt-5.15.patch # TODO: upstream, bug #726154
+
 	rm "${WORKDIR}/patches/010_virtualbox-5.2.12-qt511.patch" || die
 	eapply "${WORKDIR}/patches"
 

diff --git a/app-emulation/virtualbox/virtualbox-6.1.6.ebuild b/app-emulation/virtualbox/virtualbox-6.1.6.ebuild
index a359a7ca30f..df439dfa0f3 100644
--- a/app-emulation/virtualbox/virtualbox-6.1.6.ebuild
+++ b/app-emulation/virtualbox/virtualbox-6.1.6.ebuild
@@ -207,7 +207,8 @@ src_prepare() {
 		eapply "${FILESDIR}"/virtualbox-5.2.8-paxmark-bldprogs.patch
 	fi
 
-	eapply "${FILESDIR}"/${P}-qt-5.15.patch # TODO: upstream, bug #726154
+	eapply "${FILESDIR}"/${PN}-6.0.20-qt-5.15.patch # TODO: upstream,
+	eapply "${FILESDIR}"/${P}-qt-5.15.patch # ... bug #726154
 
 	eapply "${WORKDIR}/patches"