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 541AC139368 for ; Tue, 3 Aug 2021 11:18:05 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id A786DE0964; Tue, 3 Aug 2021 11:18:04 +0000 (UTC) Received: from smtp.gentoo.org (dev.gentoo.org [IPv6:2001:470:ea4a:1:5054:ff:fec7:86e4]) (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 3E8C7E0B48 for ; Tue, 3 Aug 2021 11:18:04 +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 456FD343BF0 for ; Tue, 3 Aug 2021 11:18:03 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id D98B17A7 for ; Tue, 3 Aug 2021 11:18:01 +0000 (UTC) From: "Lars Wendler" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Lars Wendler" Message-ID: <1627989471.23627cbbe20fc546b9f9971b955071a9db13c236.polynomial-c@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: app-emulation/virtualbox/files/, app-emulation/virtualbox/ X-VCS-Repository: repo/gentoo X-VCS-Files: app-emulation/virtualbox/files/virtualbox-6.1.26-configure-include-qt5-path.patch app-emulation/virtualbox/virtualbox-6.1.26.ebuild X-VCS-Directories: app-emulation/virtualbox/ app-emulation/virtualbox/files/ X-VCS-Committer: polynomial-c X-VCS-Committer-Name: Lars Wendler X-VCS-Revision: 23627cbbe20fc546b9f9971b955071a9db13c236 X-VCS-Branch: master Date: Tue, 3 Aug 2021 11:18:01 +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: f86e0b4b-bf56-4fd2-b50a-e4cb86a9c0b5 X-Archives-Hash: 7f95ded2cb1eb4d6cce9f4797272adc6 commit: 23627cbbe20fc546b9f9971b955071a9db13c236 Author: Lars Wendler gentoo org> AuthorDate: Tue Aug 3 11:12:48 2021 +0000 Commit: Lars Wendler gentoo org> CommitDate: Tue Aug 3 11:17:51 2021 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=23627cbb app-emulation/virtualbox: Fixed qt5 include path Closes: https://bugs.gentoo.org/805350 Closes: https://bugs.gentoo.org/805365 Thanks-to: Jiří Moravec volny.cz> Signed-off-by: Lars Wendler gentoo.org> .../virtualbox-6.1.26-configure-include-qt5-path.patch | 15 +++++++++++++++ app-emulation/virtualbox/virtualbox-6.1.26.ebuild | 2 ++ 2 files changed, 17 insertions(+) diff --git a/app-emulation/virtualbox/files/virtualbox-6.1.26-configure-include-qt5-path.patch b/app-emulation/virtualbox/files/virtualbox-6.1.26-configure-include-qt5-path.patch new file mode 100644 index 00000000000..57752c4bbd8 --- /dev/null +++ b/app-emulation/virtualbox/files/virtualbox-6.1.26-configure-include-qt5-path.patch @@ -0,0 +1,15 @@ +https://www.virtualbox.org/changeset/90377/vbox +https://bugs.gentoo.org/805350 +https://bugs.gentoo.org/805365 + +--- VirtualBox-6.1.26/configure ++++ VirtualBox-6.1.26/configure +@@ -1624,6 +1624,8 @@ EOF + else + # Strip .../QtCore as we add components ourself: + INCQT5=`echo "$INCQT5"|$KBUILD_SED 's|\([^ ]*\)/QtCore|\1|g; s| $||g'` ++ # Strip .../QtGui as we add components ourself: ++ INCQT5=`echo "$INCQT5"|$KBUILD_SED 's|\([^ ]*\)/QtGui|\1|g; s| $||g'` + # store only the first path, remove all other paths + # most likely pkg-config gave us -I/usr/include/qt5 -I/usr/include/qt5/QtCore + INCQT5=`echo "$INCQT5"|$KBUILD_SED 's|\([^ ]*\) .*|\1|'` diff --git a/app-emulation/virtualbox/virtualbox-6.1.26.ebuild b/app-emulation/virtualbox/virtualbox-6.1.26.ebuild index d7cbd13be91..ee270bbcc26 100644 --- a/app-emulation/virtualbox/virtualbox-6.1.26.ebuild +++ b/app-emulation/virtualbox/virtualbox-6.1.26.ebuild @@ -211,6 +211,8 @@ src_prepare() { eapply "${FILESDIR}"/virtualbox-5.2.8-paxmark-bldprogs.patch fi + eapply "${FILESDIR}/${P}-configure-include-qt5-path.patch" #805365 + eapply "${WORKDIR}/patches" default