From fb9d0c3f73daf4b23a2fdf7ad36bd7e27c23b9fe Mon Sep 17 00:00:00 2001 From: Adrien Destugues Date: Sat, 14 Jan 2017 15:33:52 +0100 Subject: [PATCH] qt5.6: fix all policy errors - Missing and mistyped provides - Wrong install directories for some things - Tested running ok (qbittorrent_qt5 compiles and runs) --- dev-qt/qt5/qt5-5.6.1.recipe | 31 ++++++++++++++++++++++++++++--- 1 file changed, 28 insertions(+), 3 deletions(-) diff --git a/dev-qt/qt5/qt5-5.6.1.recipe b/dev-qt/qt5/qt5-5.6.1.recipe index 7e101ec02..fc4f0dc97 100644 --- a/dev-qt/qt5/qt5-5.6.1.recipe +++ b/dev-qt/qt5/qt5-5.6.1.recipe @@ -119,12 +119,16 @@ PROVIDES_devel=" qt5${secondaryArchSuffix}_devel = $portVersion compat >= 5 devel:libqt5$secondaryArchSuffix = $portVersion compat >= 5 # qtbase + devel:libQt5Bootstrap$secondaryArchSuffix = $portVersion compat >= 5 devel:libQt5Concurrent$secondaryArchSuffix = $portVersion compat >= 5 devel:libQt5Core$secondaryArchSuffix = $portVersion compat >= 5 devel:libQt5DBus$secondaryArchSuffix = $portVersion compat >= 5 devel:libQt5Gui$secondaryArchSuffix = $portVersion compat >= 5 + devel:libQt5LabsControls$secondaryArchSuffix = $portVersion compat >= 5 devel:libQt5Network$secondaryArchSuffix = $portVersion compat >= 5 devel:libQt5OpenGL$secondaryArchSuffix = $portVersion compat >= 5 + devel:libQt5OpenGLExtensions$secondaryArchSuffix = $portVersion compat >= 5 + devel:libQt5PlatformSupport$secondaryArchSuffix = $portVersion compat >= 5 devel:libQt5PrintSupport$secondaryArchSuffix = $portVersion compat >= 5 devel:libQt5Sql$secondaryArchSuffix = $portVersion compat >= 5 devel:libQt5Test$secondaryArchSuffix = $portVersion compat >= 5 @@ -143,8 +147,8 @@ PROVIDES_devel=" devel:libQt53DInput$secondaryArchSuffix = $portVersion compat >= 5 devel:libQt53DLogic$secondaryArchSuffix = $portVersion compat >= 5 devel:libQt53DQuick$secondaryArchSuffix = $portVersion compat >= 5 - #devel:libQt53DQuickRenderer$secondaryArchSuffix = $portVersion compat >= 5 - #devel:libQt53DRenderer$secondaryArchSuffix = $portVersion compat >= 5 + devel:libQt53DQuickRender$secondaryArchSuffix = $portVersion compat >= 5 + devel:libQt53DRender$secondaryArchSuffix = $portVersion compat >= 5 # qtconnectivity devel:libQt5Bluetooth$secondaryArchSuffix = $portVersion compat >= 5 devel:libQt5Nfc$secondaryArchSuffix = $portVersion compat >= 5 @@ -165,6 +169,8 @@ PROVIDES_devel=" devel:libQt5MultimediaWidgets$secondaryArchSuffix = $portVersion compat >= 5 # qtquick1 #devel:libQt5Declarative$secondaryArchSuffix = $portVersion compat >= 5 + devel:libQt5QmlDevTools$secondaryArchSuffix = $portVersion compat >= 5 + devel:libQt5UiTools$secondaryArchSuffix = $portVersion compat >= 5 # qtscript devel:libQt5Script$secondaryArchSuffix = $portVersion compat >= 5 devel:libQt5ScriptTools$secondaryArchSuffix = $portVersion compat >= 5 @@ -183,7 +189,9 @@ PROVIDES_devel=" devel:libQt5WebChannel$secondaryArchSuffix = $portVersion compat >= 5 cmd:assistant$secondaryArchSuffix = $portVersion compat >= 5 + cmd:canbusutil$secondaryArchSuffix = $portVersion compat >= 5 cmd:designer$secondaryArchSuffix = $portVersion compat >= 5 + cmd:fixqt4headers.pl$secondaryArchSuffix = $portVersion compat >= 5 cmd:lconvert$secondaryArchSuffix = $portVersion compat >= 5 cmd:linguist$secondaryArchSuffix = $portVersion compat >= 5 cmd:lrelease$secondaryArchSuffix = $portVersion compat >= 5 @@ -197,9 +205,23 @@ PROVIDES_devel=" cmd:qdbusxml2cpp$secondaryArchSuffix = $portVersion compat >= 5 cmd:qdoc$secondaryArchSuffix = $portVersion compat >= 5 cmd:qhelpgenerator$secondaryArchSuffix = $portVersion compat >= 5 + cmd:qgltf$secondaryArchSuffix = $portVersion compat >= 5 cmd:qlalr$secondaryArchSuffix = $portVersion compat >= 5 cmd:qhelpconverter$secondaryArchSuffix = $portVersion compat >= 5 cmd:qmake$secondaryArchSuffix = $portVersion compat >= 5 + cmd:qml$secondaryArchSuffix = $portVersion compat >= 5 + cmd:qmleasing$secondaryArchSuffix = $portVersion compat >= 5 + cmd:qmlimportscanner$secondaryArchSuffix = $portVersion compat >= 5 + cmd:qmllint$secondaryArchSuffix = $portVersion compat >= 5 + cmd:qmlmin$secondaryArchSuffix = $portVersion compat >= 5 + cmd:qmlplugindump$secondaryArchSuffix = $portVersion compat >= 5 + cmd:qmlprofiler$secondaryArchSuffix = $portVersion compat >= 5 + cmd:qmlscene$secondaryArchSuffix = $portVersion compat >= 5 + cmd:qmltestrunner$secondaryArchSuffix = $portVersion compat >= 5 + cmd:qmlviewer$secondaryArchSuffix = $portVersion compat >= 5 + cmd:qtdiag$secondaryArchSuffix = $portVersion compat >= 5 + cmd:qtpaths$secondaryArchSuffix = $portVersion compat >= 5 + cmd:qtplugininfo$secondaryArchSuffix = $portVersion compat >= 5 cmd:rcc$secondaryArchSuffix = $portVersion compat >= 5 cmd:syncqt.pl$secondaryArchSuffix = $portVersion compat >= 5 cmd:uic$secondaryArchSuffix = $portVersion compat >= 5 @@ -269,11 +291,14 @@ BUILD() -headerdir $includeDir \ -docdir $docDir/Qt5 \ -datadir $dataDir/Qt5 \ + -archdatadir $dataDir/Qt5 \ + -hostdatadir $dataDir/Qt5 \ -translationdir $dataDir/Qt5/translations \ -sysconfdir $settingsDir \ -testsdir $dataDir/Qt5/tests \ -examplesdir $dataDir/Qt5/examples \ -importdir $dataDir/Qt5/imports \ + -qmldir $dataDir/Qt5/qml \ -plugindir $addOnsDir/Qt5 \ -platform haiku-g++ -no-pch \ -nomake examples -release -opensource \ @@ -380,5 +405,5 @@ INSTALL() $devPackageCommands \ ${DIR_QT_DEVELOP_DESKBAR} \ $libDir/cmake \ - $prefix/mkspecs + $dataDir/Qt5/mkspecs }