public inbox for gentoo-commits@lists.gentoo.org
 help / color / mirror / Atom feed
From: "Andreas Sturmlechner" <asturm@gentoo.org>
To: gentoo-commits@lists.gentoo.org
Subject: [gentoo-commits] repo/gentoo:master commit in: app-emulation/virtualbox/, app-emulation/virtualbox/files/
Date: Tue,  2 Jun 2020 21:52:03 +0000 (UTC)	[thread overview]
Message-ID: <1591134710.8507cc179dc91f1aa8803ee67e48018c7c6733b1.asturm@gentoo> (raw)

commit:     8507cc179dc91f1aa8803ee67e48018c7c6733b1
Author:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
AuthorDate: Tue Jun  2 21:26:38 2020 +0000
Commit:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Tue Jun  2 21:51:50 2020 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=8507cc17

app-emulation/virtualbox: Fix build with Qt 5.15

Thanks-to: cmvu <cmvu <AT> protonmail.com>
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>

 .../files/virtualbox-6.1.6-qt-5.15.patch           | 92 ++++++++++++++++++++++
 app-emulation/virtualbox/virtualbox-6.1.6.ebuild   |  2 +
 2 files changed, 94 insertions(+)

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
new file mode 100644
index 00000000000..36f525593e0
--- /dev/null
+++ b/app-emulation/virtualbox/files/virtualbox-6.1.6-qt-5.15.patch
@@ -0,0 +1,92 @@
+--- 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 @@
+ #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 @@
+ /* Qt includes: */
+ #include <QPainter>
+ #include <QTextEdit>
++#include <QPainterPath>
+ 
+ /* GUI includes: */
+ #include "UIPopupPane.h"

diff --git a/app-emulation/virtualbox/virtualbox-6.1.6.ebuild b/app-emulation/virtualbox/virtualbox-6.1.6.ebuild
index 7ddbfdc4204..a359a7ca30f 100644
--- a/app-emulation/virtualbox/virtualbox-6.1.6.ebuild
+++ b/app-emulation/virtualbox/virtualbox-6.1.6.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
+
 	eapply "${WORKDIR}/patches"
 
 	eapply_user


             reply	other threads:[~2020-06-02 21:52 UTC|newest]

Thread overview: 38+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2020-06-02 21:52 Andreas Sturmlechner [this message]
  -- strict thread matches above, loose matches on Subject: below --
2025-09-12 15:54 [gentoo-commits] repo/gentoo:master commit in: app-emulation/virtualbox/, app-emulation/virtualbox/files/ Viorel Munteanu
2025-09-12 15:54 Viorel Munteanu
2025-08-28 17:53 Viorel Munteanu
2025-07-24  7:30 Viorel Munteanu
2025-07-24  6:43 Viorel Munteanu
2025-06-06  7:49 Viorel Munteanu
2024-10-18 17:16 Viorel Munteanu
2024-09-15 13:02 Viorel Munteanu
2024-09-15 13:02 Viorel Munteanu
2024-02-10 16:31 Viorel Munteanu
2024-02-10 16:31 Viorel Munteanu
2024-01-28 10:44 Viorel Munteanu
2023-08-28 10:08 Viorel Munteanu
2023-08-15 12:50 Viorel Munteanu
2023-08-15 12:50 Viorel Munteanu
2023-07-20  9:40 Viorel Munteanu
2023-06-02 18:27 Viorel Munteanu
2023-05-15 14:35 Viorel Munteanu
2023-04-21 16:38 Viorel Munteanu
2023-02-21 15:06 Viorel Munteanu
2023-02-03 14:35 Viorel Munteanu
2022-11-20  8:20 Viorel Munteanu
2022-11-02  6:41 Viorel Munteanu
2022-09-05 12:39 Joonas Niilola
2022-08-18 18:43 Sam James
2022-07-06  6:05 Sam James
2021-04-22 16:55 Lars Wendler
2020-06-03  0:10 Andreas Sturmlechner
2019-01-16 12:02 Lars Wendler
2018-12-07 21:42 Lars Wendler
2018-11-17 11:55 Lars Wendler
2018-02-19 14:16 Lars Wendler
2018-02-16 14:56 Lars Wendler
2017-07-26 19:21 Richard Farina
2017-05-11 12:07 Lars Wendler
2017-02-21 22:05 Magnus Granberg
2016-03-11 17:31 Lars Wendler

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=1591134710.8507cc179dc91f1aa8803ee67e48018c7c6733b1.asturm@gentoo \
    --to=asturm@gentoo.org \
    --cc=gentoo-commits@lists.gentoo.org \
    --cc=gentoo-dev@lists.gentoo.org \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body. 
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox