diff options
| author |   Lars Wendler <polynomial-c@gentoo.org> | 2021-08-03 13:12:48 +0200 |
|---|---|---|
| committer | Lars Wendler <polynomial-c@gentoo.org> | 2021-08-03 13:17:51 +0200 |
| commit | 23627cbbe20fc546b9f9971b955071a9db13c236 (patch) | |
| tree | 057f3e2621aebf6f6c24333ebf9664a7ceb18b1b | |
| parent | check-reqs.eclass: Introduce CHECKREQS_DONOTHING (diff) | |
| download | gentoo-23627cbbe20fc546b9f9971b955071a9db13c236.tar.gz gentoo-23627cbbe20fc546b9f9971b955071a9db13c236.tar.bz2 gentoo-23627cbbe20fc546b9f9971b955071a9db13c236.zip | |
app-emulation/virtualbox: Fixed qt5 include path
Closes: https://bugs.gentoo.org/805350
Closes: https://bugs.gentoo.org/805365
Thanks-to: Jiří Moravec <qjim@volny.cz>
Signed-off-by: Lars Wendler <polynomial-c@gentoo.org>
| -rw-r--r-- | app-emulation/virtualbox/files/virtualbox-6.1.26-configure-include-qt5-path.patch | 15 | ||||
| -rw-r--r-- | app-emulation/virtualbox/virtualbox-6.1.26.ebuild | 2 |
2 files changed, 17 insertions, 0 deletions
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 000000000000..57752c4bbd85 --- /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 d7cbd13be91a..ee270bbcc26f 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 |