From 65e272e056fb25f8b9e90757c60b46aef9896838 Mon Sep 17 00:00:00 2001 From: V3n3RiX Date: Sun, 31 May 2015 13:29:24 +0100 Subject: do not rely on qtchooser, and make sure calamares builds against qt5, fix from vlc ebuild --- app-admin/calamares/calamares-999.ebuild | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/app-admin/calamares/calamares-999.ebuild b/app-admin/calamares/calamares-999.ebuild index 31bc3140..a4ac0eef 100644 --- a/app-admin/calamares/calamares-999.ebuild +++ b/app-admin/calamares/calamares-999.ebuild @@ -52,6 +52,10 @@ RDEPEND=">=dev-qt/qtcore-5.4.0:5 virtual/udev[systemd]" src_prepare() { + # If qtchooser is installed, it may break the build, because moc,rcc and uic binaries for wrong qt version may be used. + # Setting QT_SELECT environment variable will enforce correct binaries (fix taken from vlc ebuild) + export QT_SELECT=qt5 + git submodule init git submodule update } -- cgit v1.2.3