diff --git a/dev-qt/qt6/patches/qt6-6.0.0~rc2.patchset b/dev-qt/qt6/patches/qt6-6.0.0.patchset similarity index 100% rename from dev-qt/qt6/patches/qt6-6.0.0~rc2.patchset rename to dev-qt/qt6/patches/qt6-6.0.0.patchset diff --git a/dev-qt/qt6/qt6-6.0.0~rc2.recipe b/dev-qt/qt6/qt6-6.0.0.recipe similarity index 96% rename from dev-qt/qt6/qt6-6.0.0~rc2.recipe rename to dev-qt/qt6/qt6-6.0.0.recipe index 03ab0ac9f..faee30836 100644 --- a/dev-qt/qt6/qt6-6.0.0~rc2.recipe +++ b/dev-qt/qt6/qt6-6.0.0.recipe @@ -9,8 +9,8 @@ LICENSE="GNU LGPL v2.1 GNU LGPL v3 FDL" REVISION="1" -SOURCE_URI="https://download.qt.io/development_releases/qt/${portVersion%.*}/${portVersion/\~/-}/single/qt-everywhere-src-${portVersion/\~/-}.tar.xz" -CHECKSUM_SHA256="a5a8e0eee717fa3b8e802644b1d401dff8f1d219f6fd801e484c3cbba8467f72" +SOURCE_URI="https://download.qt.io/official_releases/qt/${portVersion%.*}/${portVersion/\~/-}/single/qt-everywhere-src-${portVersion/\~/-}.tar.xz" +CHECKSUM_SHA256="d39a1a557a0dc8dc5ea2eaaee0fa015c71dcbb79c25a6aea421c594227565296" SOURCE_DIR="qt-everywhere-src-${portVersion/\~/-}" PATCHES="qt6-$portVersion.patchset" ADDITIONAL_FILES=" @@ -344,6 +344,14 @@ REQUIRES_devel=" devel:libgl$secondaryArchSuffix " +PROVIDES_examples=" + qt6${secondaryArchSuffix}_examples = $portVersion + " + +REQUIRES_examples=" + qt6${secondaryArchSuffix}_devel == $portVersion base + " + PROVIDES_tools=" qt6${secondaryArchSuffix}_tools = $portVersion compat >= 6 app:Assistant$secondaryArchSuffix = $portVersion compat >= 6 @@ -454,6 +462,7 @@ BUILD() -docdir $docDir/Qt6 \ -datadir $dataDir/Qt6 \ -archdatadir $dataDir/Qt6 \ + -hostdatadir $dataDir/Qt6 \ -translationdir $dataDir/Qt6/translations \ -sysconfdir $settingsDir \ -testsdir $dataDir/Qt6/tests \ @@ -477,6 +486,20 @@ INSTALL() ninja install + # copy all examples + _base=$dataDir/Qt6/examples + mkdir -p $_base + cp ${sourceDir}/qtbase/examples/examples.pro $_base + + _fdirs=$(find "${sourceDir}" -maxdepth 2 -type d -name examples) + for _dir in $_fdirs; do + _mod=$(basename ${_dir%/examples}) + if [ -e "$_dir/README" ]; then + cp $_dir/README $_dir/README.$_mod + fi + cp -rn $_dir/* $_base + done + fixPkgconfig prepareInstalledDevelLibs \ @@ -499,8 +522,6 @@ INSTALL() mv -f $libDir/*.a $developLibDir/ mv -f $libDir/*.prl $developLibDir/ - mkdir -p $dataDir/Qt6 - mv $prefix/mkspecs $dataDir/Qt6/ devCommands="balsam meshdebug moc qlalr qmake qml qmlcachegen qmleasing qmlformat qmlimportscanner qmllint qmlplugindump qmlpreview qmlprofiler qmlscene qmltestrunner qmltyperegistrar @@ -553,6 +574,9 @@ INSTALL() mimeset -f "$appsDir/Qt6/$j" done + packageEntries examples \ + $dataDir/Qt6/examples + packageEntries devel \ $developDir \ $devPackageCommands \