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 100701382C5 for ; Wed, 3 Jun 2020 00:10:58 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id D095BE083E; Wed, 3 Jun 2020 00:10:55 +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 16D32E083E for ; Wed, 3 Jun 2020 00:10:55 +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 5FC9434EEAB for ; Wed, 3 Jun 2020 00:10:53 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 52AFB268 for ; Wed, 3 Jun 2020 00:10:51 +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: <1591143033.c15842f13dc218913f6d95555c65c90f844f5ec2.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.0.20-qt-5.15.patch app-emulation/virtualbox/files/virtualbox-6.1.6-qt-5.15.patch app-emulation/virtualbox/virtualbox-6.0.20.ebuild 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: c15842f13dc218913f6d95555c65c90f844f5ec2 X-VCS-Branch: master Date: Wed, 3 Jun 2020 00:10:51 +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: 1a65aacd-116e-4152-86cc-350a2706df18 X-Archives-Hash: 6e285fc816bfc0d715878f506fbd259f commit: c15842f13dc218913f6d95555c65c90f844f5ec2 Author: Andreas Sturmlechner gentoo org> AuthorDate: Wed Jun 3 00:09:26 2020 +0000 Commit: Andreas Sturmlechner gentoo 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 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 #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 @@ 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 -+#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 @@ @@ -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 - #include -+#include - - /* 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"