qt5: move tools pkgconfig and cmake files to the tools subpkg

note: 'cp -n' behavior changed with coreutils 9.3, now exiting with non-zero when skipping files
This commit is contained in:
Jerome Duval
2023-05-12 16:16:48 +02:00
parent ef32a00d5a
commit 973246ab42

View File

@@ -8,7 +8,7 @@ COPYRIGHT="2015-2020 The Qt Company Ltd."
LICENSE="GNU LGPL v2.1
GNU LGPL v3
FDL"
REVISION="9"
REVISION="10"
#baseURL="https://download.qt.io/official_releases/qt/${portVersion%.*}/$portVersion/submodules"
baseURL="http://qt-mirror.dannhauer.de/official_releases/qt/${portVersion%.*}/$portVersion/submodules/"
SOURCE_URI="https://github.com/qt/qt5/archive/$portVersion.tar.gz"
@@ -379,7 +379,6 @@ PROVIDES_devel="
devel:libQt5Purchasing$secondaryArchSuffix = $portVersion compat >= 5
# qtquick1
devel:libQt5QmlDevTools$secondaryArchSuffix = $portVersion compat >= 5
devel:libQt5UiTools$secondaryArchSuffix = $portVersion compat >= 5
# qtremoteobjects
devel:libQt5RemoteObjects$secondaryArchSuffix = $portVersion compat >= 5
# qtscript
@@ -397,10 +396,6 @@ PROVIDES_devel="
devel:libQt5TextToSpeech$secondaryArchSuffix = $portVersion compat >= 5
# qtsvg
devel:libQt5Svg$secondaryArchSuffix = $portVersion compat >= 5
# qttools
devel:libQt5Designer$secondaryArchSuffix = $portVersion compat >= 5
devel:libQt5DesignerComponents$secondaryArchSuffix = $portVersion compat >= 5
devel:libQt5Help$secondaryArchSuffix = $portVersion compat >= 5
# qtvirtualkeyboard
devel:libQt5VirtualKeyboard$secondaryArchSuffix = $portVersion compat >= 5
# qtwebchannel
@@ -427,7 +422,6 @@ PROVIDES_devel="
devel:libQt5QmlDevTools$secondaryArchSuffix = $portVersion compat >= 5
devel:libQt5ServiceSupport$secondaryArchSuffix = $portVersion compat >= 5
devel:libQt5ThemeSupport$secondaryArchSuffix = $portVersion compat >= 5
devel:libQt5UiTools$secondaryArchSuffix = $portVersion compat >= 5
cmd:balsam$secondaryArchSuffix = $portVersion compat >= 5
cmd:canbusutil$secondaryArchSuffix = $portVersion compat >= 5
@@ -520,6 +514,11 @@ PROVIDES_tools="
cmd:qtdiag$secondaryArchSuffix = $portVersion compat >= 5
cmd:qtpaths$secondaryArchSuffix = $portVersion compat >= 5
cmd:qtplugininfo$secondaryArchSuffix = $portVersion compat >= 5
# qttools
devel:libQt5Designer$secondaryArchSuffix = $portVersion compat >= 5
devel:libQt5DesignerComponents$secondaryArchSuffix = $portVersion compat >= 5
devel:libQt5Help$secondaryArchSuffix = $portVersion compat >= 5
devel:libQt5UiTools$secondaryArchSuffix = $portVersion compat >= 5
"
REQUIRES_tools="
qt5$secondaryArchSuffix == $portVersion base
@@ -777,7 +776,7 @@ INSTALL()
if [ -e "$_dir/README" ]; then
cp $_dir/README $_dir/README.$_mod
fi
cp -rn $_dir/* $_base
cp -rn $_dir/* $_base || true
done
rm $libDir/*.la
@@ -884,14 +883,33 @@ INSTALL()
packageEntries examples \
$dataDir/Qt5/examples
packageEntries tools \
$appsDir \
$developLibDir/pkgconfig/Qt5Designer.pc \
$developLibDir/pkgconfig/Qt5Help.pc \
$developLibDir/pkgconfig/Qt5UiPlugin.pc \
$developLibDir/pkgconfig/Qt5UiTools.pc \
$includeDir/QtDesigner \
$includeDir/QtHelp \
$includeDir/QtUiPlugin \
$includeDir/QtUiTools \
$libDir/cmake/Qt5AttributionsScannerTools \
$libDir/cmake/Qt5Designer \
$libDir/cmake/Qt5DocTools \
$libDir/cmake/Qt5Help \
$libDir/cmake/Qt5LinguistTools \
$libDir/cmake/Qt5UiPlugin \
$libDir/cmake/Qt5UiTools \
$developLibDir/libQt5Designer* \
$developLibDir/libQt5Help* \
$developLibDir/libQt5UiPlugin* \
$developLibDir/libQt5UiTools* \
$toolsPackageCommands \
${DIR_QT_DEVELOP_DESKBAR}
packageEntries devel \
$developDir \
$devPackageCommands \
$libDir/cmake \
$dataDir/Qt5/mkspecs
packageEntries tools \
$appsDir \
$toolsPackageCommands \
${DIR_QT_DEVELOP_DESKBAR}
}