haikuprojects/haikuports
1
0
Fork 0
mirror of https://github.com/yann64/haikuports.git synced 2026-04-22 19:50:05 +02:00
Code Issues Packages Projects Releases Wiki Activity

qt5: leave cmake files in $libDir

Browse Source 
* this is where cmake will search for them.
* fix and sort provides for devel package.
This commit is contained in:
Jerome Duval
2016-03-23 21:30:38 +00:00
parent 22aaae287d
commit 42efb02a2c
1 changed files with 19 additions and 19 deletions
Download Patch File Download Diff File Expand all files Collapse all files

38
dev-qt/qt5/qt5-5.5.1.recipe
View File

@@ -12,7 +12,7 @@ CHECKSUM_SHA256="c7fad41a009af1996b62ec494e438aedcb072b3234b2ad3eeea6e6b1f64be3b
SOURCE_DIR="qt-everywhere-opensource-src-$portVersion"
PATCHES="qt5-5.5.1.patchset"
REVISION="2"
REVISION="3"
ARCHITECTURES="!x86_gcc2 ?x86 ?x86_64"
SECONDARY_ARCHITECTURES="x86"
@@ -140,10 +140,10 @@ PROVIDES_devel="
devel:libQt5QuickTest$secondaryArchSuffix = $portVersion compat >= 5.5
devel:libQt5QuickWidgets$secondaryArchSuffix = $portVersion compat >= 5.5
# qtenginio
lib:libEnginio$secondaryArchSuffix = $portVersion compat >= 5.5
devel:libEnginio$secondaryArchSuffix = $portVersion compat >= 5.5
# qtlocation
lib:libQt5Location$secondaryArchSuffix = $portVersion compat >= 5.5
lib:libQt5Positioning$secondaryArchSuffix = $portVersion compat >= 5.5
devel:libQt5Location$secondaryArchSuffix = $portVersion compat >= 5.5
devel:libQt5Positioning$secondaryArchSuffix = $portVersion compat >= 5.5
# qtmultimedia
devel:libQt5Multimedia$secondaryArchSuffix = $portVersion compat >= 5.5
devel:libQt5MultimediaQuick_p$secondaryArchSuffix = $portVersion compat >= 5.5
@@ -151,8 +151,8 @@ PROVIDES_devel="
# qtquick1
devel:libQt5Declarative$secondaryArchSuffix = $portVersion compat >= 5.5
# qtscript
lib:libQt5Script$secondaryArchSuffix = $portVersion compat >= 5.5
lib:libQt5ScriptTools$secondaryArchSuffix = $portVersion compat >= 5.5
devel:libQt5Script$secondaryArchSuffix = $portVersion compat >= 5.5
devel:libQt5ScriptTools$secondaryArchSuffix = $portVersion compat >= 5.5
# qtsensors
devel:libQt5Sensors$secondaryArchSuffix = $portVersion compat >= 5.5
# qtserialport
@@ -167,23 +167,27 @@ PROVIDES_devel="
# qtwebchannel
devel:libQt5WebChannel$secondaryArchSuffix = $portVersion compat >= 5.5
cmd:assistant$secondaryArchSuffix = $portVersion compat >= 5.5
cmd:designer$secondaryArchSuffix = $portVersion compat >= 5.5
cmd:lconvert$secondaryArchSuffix = $portVersion compat >= 5.5
cmd:linguist$secondaryArchSuffix = $portVersion compat >= 5.5
cmd:lrelease$secondaryArchSuffix = $portVersion compat >= 5.5
cmd:lupdate$secondaryArchSuffix = $portVersion compat >= 5.5
cmd:moc$secondaryArchSuffix = $portVersion compat >= 5.5
cmd:pixeltool$secondaryArchSuffix = $portVersion compat >= 5.5
cmd:qcollectiongenerator$secondaryArchSuffix = $portVersion compat >= 5.5
cmd:qdbus$secondaryArchSuffix = $portVersion compat >= 5.5
cmd:qdbuscpp2xml$secondaryArchSuffix = $portVersion compat >= 5.5
cmd:qdbusviewer$secondaryArchSuffix = $portVersion compat >= 5.5
cmd:qdbusxml2cpp$secondaryArchSuffix = $portVersion compat >= 5.5
cmd:qdoc$secondaryArchSuffix = $portVersion compat >= 5.5
cmd:qhelpgenerator$secondaryArchSuffix = $portVersion compat >= 5.5
cmd:qlalr$secondaryArchSuffix = $portVersion compat >= 5.5
cmd:qhelpconverter$secondaryArchSuffix = $portVersion compat >= 5.5
cmd:qmake$secondaryArchSuffix = $portVersion compat >= 5.5
cmd:rcc$secondaryArchSuffix = $portVersion compat >= 5.5
cmd:syncqt.pl$secondaryArchSuffix = $portVersion compat >= 5.5
cmd:uic$secondaryArchSuffix = $portVersion compat >= 5.5
cmd:lconvert$secondaryArchSuffix = $portVersion compat >= 5.5
cmd:lrelease$secondaryArchSuffix = $portVersion compat >= 5.5
cmd:lupdate$secondaryArchSuffix = $portVersion compat >= 5.5
cmd:pixeltool$secondaryArchSuffix = $portVersion compat >= 5.5
cmd:qcollectiongenerator$secondaryArchSuffix = $portVersion compat >= 5.5
cmd:qdbusviewer$secondaryArchSuffix = $portVersion compat >= 5.5
cmd:qdbus$secondaryArchSuffix = $portVersion compat >= 5.5
cmd:qhelpconverter$secondaryArchSuffix = $portVersion compat >= 5.5
cmd:xmlpatterns$secondaryArchSuffix = $portVersion compat >= 5.5
cmd:xmlpatternsvalidator$secondaryArchSuffix = $portVersion compat >= 5.5
"
@@ -297,10 +301,6 @@ INSTALL()
rm -rf $libDir/fonts/ $prefix/tests
rm -rf $dataDir/Qt5/demos $dataDir/Qt5/examples
mkdir -p $dataDir/cmake/Modules/
cp -r $libDir/cmake/. $dataDir/cmake/Modules/.
rm -rf $libDir/cmake/
mv -f $libDir/libQt5UiTools* $developLibDir/
mv -f $libDir/libQt5QmlDevTools* $developLibDir/
mv -f $libDir/libQt5Bootstrap* $developLibDir/
@@ -339,6 +339,6 @@ INSTALL()
$developDir \
$devPackageCommands \
${DIR_QT_DEVELOP_DESKBAR} \
$dataDir/cmake/Modules \
$libDir/cmake \
$prefix/mkspecs
}