qt6-declarative: update to 6.2.0.

This commit is contained in:
John 2021-06-24 20:58:51 +02:00 committed by John Zimmermann
parent a187192c1e
commit 61df6af05f
5 changed files with 22 additions and 41 deletions

View file

@ -2010,7 +2010,7 @@ libQt6LabsSharedImage.so.6 qt6-declarative-6.1.0_1
libQt6LabsWavefrontMesh.so.6 qt6-declarative-6.1.0_1
libQt6QmlLocalStorage.so.6 qt6-declarative-6.1.0_1
libQt6QmlWorkerScript.so.6 qt6-declarative-6.0.0_1
libQt6QuickTest.so.6 qt6-declarative-6.0.0_1
libQt6QuickTest.so.6 qt6-declarative-devel-6.2.0beta4_1
libQt6QuickShapes.so.6 qt6-declarative-6.0.0_1
libQt6QuickWidgets.so.6 qt6-declarative-6.0.0_1
libQt6Quick.so.6 qt6-declarative-6.0.0_1
@ -2024,9 +2024,9 @@ libQt6Quick3DUtils.so.6 qt6-quick3d-6.0.0_1
libQt6Quick3DAssetImport.so.6 qt6-quick3d-6.0.0_1
libQt6Quick3DIblBaker.so.6 qt6-quick3d-6.0.3_1
libQt6Quick3DParticles.so.6 qt6-quick3d-6.1.0_1
libQt6QuickControls2Impl.so.6 qt6-quickcontrols2-6.0.0_1
libQt6QuickControls2.so.6 qt6-quickcontrols2-6.0.0_1
libQt6QuickTemplates2.so.6 qt6-quickcontrols2-6.0.0_1
libQt6QuickControls2Impl.so.6 qt6-declarative-6.0.0_1
libQt6QuickControls2.so.6 qt6-declarative-6.0.0_1
libQt6QuickTemplates2.so.6 qt6-declarative-6.0.0_1
libQt6NetworkAuth.so.6 qt6-networkauth-6.1.0rc2_1
libQt6ScxmlQml.so.6 qt6-scxml-6.1.0rc2_1
libQt6Scxml.so.6 qt6-scxml-6.1.0rc2_1

View file

@ -1,20 +1,25 @@
# Template file for 'qt6-declarative'
pkgname=qt6-declarative
version=6.1.1
version=6.2.0
revision=1
wrksrc="qtdeclarative-everywhere-src-${version}"
build_style=cmake
configure_args=" -DQT_HOST_PATH=/usr
-DQT_BUILD_TOOLS_WHEN_CROSSCOMPILING=true"
configure_args=" -DQT_HOST_PATH=/usr"
hostmakedepends="qt6-base-devel perl pkg-config wayland-devel
qt6-declarative-devel"
qt6-shadertools-devel"
makedepends="qt6-base-devel Vulkan-Headers"
short_desc="Cross-platform application and UI framework - Declarative"
maintainer="John <me@johnnynator.dev>"
license="GPL-3.0-only with Qt-GPL-exception-1.0, LGPL-3.0-only, GPL-2.0-or-later"
homepage="https://www.qt.io"
distfiles="https://download.qt.io/official_releases/qt/${version%.*}/${version}/submodules/qtdeclarative-everywhere-src-${version}.tar.xz"
checksum=805394307479ebca9899996af8357037c4f1ff8b783162ade0c5a05cea7ee2d2
checksum=46737feceb9e54d63ad0c87a08d33f08ca58f4b8920ccefad8f1ebd64f0d1270
replaces="qt6-quickcontrols2>=0"
if [ "$CROSS_BUILD" ]; then
configure_args+=" -DQT_BUILD_TOOLS_WHEN_CROSSCOMPILING=true"
hostmakedepends+=" qt6-declarative-devel"
fi
if [ "$XBPS_CHECK_PKGS" ]; then
configure_args+=" -DQT_BUILD_TESTS=ON"
@ -34,9 +39,10 @@ qt6-declarative-tools_package() {
short_desc+=" - tools"
pkg_install() {
vmove usr/lib/qt6/plugins/qmltooling
for bin in qmlcachegen qmleasing qmlformat qmlimportscanner \
qmllint qmlplugindump qmlpreview qmlprofiler qmlscene \
qmltestrunner qmltime qmltyperegistrar; do
for bin in qmlcachegen qmlimportscanner qmltyperegistrar; do
vmove usr/lib/qt6/libexec/$bin
done
for bin in qmlformat qmllint qmlpreview qmlprofiler; do
vmove usr/lib/qt6/bin/$bin
done
}
@ -46,10 +52,14 @@ qt6-declarative-devel_package() {
depends="${sourcepkg}>=${version}_${revision} qt6-base-devel>=${version}_1
qt6-declarative-tools>=${version}_${revision}"
short_desc+=" - development files"
replaces="qt6-quickcontrols2-devel>=0"
pkg_install() {
vmove usr/include
vmove usr/lib/cmake
vmove usr/lib/qt6/mkspecs
vmove "usr/lib/libQt6QuickTest.so.*"
vmove usr/lib/qt6/qml/QtTest
vmove usr/lib/qt6/bin/qmltestrunner
vmove "usr/lib/*.so"
vmove "usr/lib/*.prl"
}

View file

@ -1 +0,0 @@
qt6-quickcontrols2

View file

@ -1,27 +0,0 @@
# Template file for 'qt6-quickcontrols2'
pkgname=qt6-quickcontrols2
version=6.1.1
revision=1
wrksrc="qtquickcontrols2-everywhere-src-${version}"
build_style=cmake
configure_args="-DQT_HOST_PATH=/usr "
hostmakedepends="perl qt6-base-devel qt6-declarative-devel"
makedepends="qt6-base-devel qt6-declarative-devel"
short_desc="Cross-platform application and UI framework - quickcontrols2"
maintainer="John <me@johnnynator.dev>"
license="GPL-2.0-or-later, LGPL-3.0-or-later"
homepage="https://qt.io/"
distfiles="http://download.qt.io/official_releases/qt/${version%.*}/${version}/submodules/qtquickcontrols2-everywhere-src-${version}.tar.xz"
checksum=7ebc99724bedd97a2c6a606ba2726feb66bb76eb9f30262ae13cd246f5665ea4
qt6-quickcontrols2-devel_package() {
depends="${sourcepkg}>=${version}_${revision} qt6-base-devel"
short_desc+=" - development files"
pkg_install() {
vmove usr/include
vmove usr/lib/cmake
vmove usr/lib/qt6/mkspecs
vmove "usr/lib/*.so"
vmove "usr/lib/*.prl"
}
}

View file

@ -1 +0,0 @@
pkgname="${pkgname/6-/}-everywhere-src"