From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by finch.gentoo.org (Postfix) with ESMTPS id D08651382C5 for ; Tue, 2 Jun 2020 21:52:07 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 28DADE0839; Tue, 2 Jun 2020 21:52:07 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id E89BCE0839 for ; Tue, 2 Jun 2020 21:52:06 +0000 (UTC) Received: from oystercatcher.gentoo.org (oystercatcher.gentoo.org [148.251.78.52]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id 0180A34EF81 for ; Tue, 2 Jun 2020 21:52:05 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 98DDE259 for ; Tue, 2 Jun 2020 21:52:03 +0000 (UTC) From: "Andreas Sturmlechner" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Andreas Sturmlechner" Message-ID: <1591134710.8507cc179dc91f1aa8803ee67e48018c7c6733b1.asturm@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: app-emulation/virtualbox/, app-emulation/virtualbox/files/ X-VCS-Repository: repo/gentoo X-VCS-Files: app-emulation/virtualbox/files/virtualbox-6.1.6-qt-5.15.patch app-emulation/virtualbox/virtualbox-6.1.6.ebuild X-VCS-Directories: app-emulation/virtualbox/ app-emulation/virtualbox/files/ X-VCS-Committer: asturm X-VCS-Committer-Name: Andreas Sturmlechner X-VCS-Revision: 8507cc179dc91f1aa8803ee67e48018c7c6733b1 X-VCS-Branch: master Date: Tue, 2 Jun 2020 21:52:03 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org X-Auto-Response-Suppress: DR, RN, NRN, OOF, AutoReply X-Archives-Salt: f6b7ec0f-c314-48fa-a9c2-3618959fb981 X-Archives-Hash: a78ddc6787f7c49ec9587ed2b82f1baa commit: 8507cc179dc91f1aa8803ee67e48018c7c6733b1 Author: Andreas Sturmlechner gentoo org> AuthorDate: Tue Jun 2 21:26:38 2020 +0000 Commit: Andreas Sturmlechner gentoo 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 protonmail.com> Closes: https://bugs.gentoo.org/726154 Package-Manager: Portage-2.3.100, Repoman-2.3.22 Signed-off-by: Andreas Sturmlechner 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 ++#include ++#include + + /* 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 + #include ++#include + + /* 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 + #include + #include ++#include + + /* 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 + #include + #include ++#include + #ifdef VBOX_WS_MAC + # include + #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 + #include + #include ++#include + + /* 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 + #include + #include ++#include + + /* 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 + #include + #include ++#include + #ifdef VBOX_WS_X11 + # include + #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 + #include + #include ++#include + + /* 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 + #include ++#include + + /* 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