6.2.0 - beta3

.gitignore

@@ -4,3 +4,4 @@
 /qtdeclarative-everywhere-src-6.1.0.tar.xz
 /qtdeclarative-everywhere-src-6.1.1.tar.xz
 /qtdeclarative-everywhere-src-6.1.2.tar.xz
+/qtdeclarative-everywhere-src-6.2.0-beta3.tar.xz

qt6-qtdeclarative.spec

@@ -3,16 +3,27 @@
 # definition borrowed from qtbase
 %global multilib_archs x86_64 %{ix86} %{?mips} ppc64 ppc s390x s390 sparc64 sparcv9
 
+%global unstable 1
+%if 0%{unstable}
+%global prerelease beta3
+%endif
+
 Summary: Qt6 - QtDeclarative component
 Name:    qt6-%{qt_module}
-Version: 6.1.2
+Version: 6.2.0%{?unstable:~%{prerelease}}
 Release: 1%{?dist}
 
 # See LICENSE.GPL LICENSE.LGPL LGPL_EXCEPTION.txt, for details
 License: LGPLv2 with exceptions or GPLv3 with exceptions
 Url:     http://www.qt.io
 %global  majmin %(echo %{version} | cut -d. -f1-2)
+%global  qt_version %(echo %{version} | cut -d~ -f1)
+
+%if 0%{unstable}
+Source0: https://download.qt.io/development_releases/qt/%{majmin}/%{qt_version}/submodules/%{qt_module}-everywhere-src-%{qt_version}-%{prerelease}.tar.xz
+%else
 Source0: https://download.qt.io/official_releases/qt/%{majmin}/%{version}/submodules/%{qt_module}-everywhere-src-%{version}.tar.xz
+%endif
 
 # header file to workaround multilib issue
 # https://bugzilla.redhat.com/show_bug.cgi?id=1441343
@@ -31,6 +42,7 @@ BuildRequires: ninja-build
 BuildRequires: qt6-rpm-macros
 BuildRequires: qt6-qtbase-devel >= %{version}
 BuildRequires: qt6-qtbase-private-devel
+BuildRequires: qt6-qtshadertools-devel >= %{version}
 %{?_qt6:Requires: %{_qt6}%{?_isa} = %{_qt6_version}}
 BuildRequires: python%{python3_pkgversion}
 BuildRequires: pkgconfig(xkbcommon) >= 0.4.1
@@ -67,7 +79,7 @@ Requires: %{name}%{?_isa} = %{version}-%{release}
 
 
 %prep
-%autosetup -n %{qt_module}-everywhere-src-%{version} -p1
+%autosetup -n %{qt_module}-everywhere-src-%{qt_version}%{?unstable:-%{prerelease}} -p1
 
 
 %build
@@ -86,9 +98,9 @@ export PATH=`pwd`:$PATH
 
 %ifarch %{multilib_archs}
 # multilib: qv4global_p.h
-  mv %{buildroot}%{_qt6_headerdir}/QtQml/%{version}/QtQml/private/qv4global_p.h \
-     %{buildroot}%{_qt6_headerdir}/QtQml/%{version}/QtQml/private/qv4global_p-%{__isa_bits}.h
-  install -p -m644 -D %{SOURCE5} %{buildroot}%{_qt6_headerdir}/QtQml/%{version}/QtQml/private/qv4global_p.h
+  mv %{buildroot}%{_qt6_headerdir}/QtQml/%{qt_version}/QtQml/private/qv4global_p.h \
+     %{buildroot}%{_qt6_headerdir}/QtQml/%{qt_version}/QtQml/private/qv4global_p-%{__isa_bits}.h
+  install -p -m644 -D %{SOURCE5} %{buildroot}%{_qt6_headerdir}/QtQml/%{qt_version}/QtQml/private/qv4global_p.h
 %endif
 
 # hardlink files to %{_bindir}, add -qt6 postfix to not conflict
@@ -144,23 +156,32 @@ make check -k -C tests ||:
 %{_qt6_libdir}/libQt6LabsWavefrontMesh.so.6*
 %{_qt6_libdir}/libQt6QmlLocalStorage.so.6*
 %{_qt6_libdir}/libQt6Qml.so.6*
+%{_qt6_libdir}/libQt6QmlCore.so.6*
 %{_qt6_libdir}/libQt6QmlModels.so.6*
 %{_qt6_libdir}/libQt6QmlWorkerScript.so.6*
 %{_qt6_libdir}/libQt6Quick.so.6*
+%{_qt6_libdir}/libQt6QuickControls2.so.6*
+%{_qt6_libdir}/libQt6QuickControls2Impl.so.6*
+%{_qt6_libdir}/libQt6QuickDialogs2.so.6*
+%{_qt6_libdir}/libQt6QuickDialogs2QuickImpl.so.6*
+%{_qt6_libdir}/libQt6QuickDialogs2Utils.so.6*
 %{_qt6_libdir}/libQt6QuickLayouts.so.6*
 %{_qt6_libdir}/libQt6QuickWidgets.so.6*
 %{_qt6_libdir}/libQt6QuickParticles.so.6*
 %{_qt6_libdir}/libQt6QuickShapes.so.6*
 %{_qt6_libdir}/libQt6QuickTest.so.6*
+%{_qt6_libdir}/libQt6QuickTemplates2.so.6*
+%{_qt6_libdir}/libQt6QmlXmlListModel.so.6*
 %{_qt6_plugindir}/qmltooling/
 %{_qt6_archdatadir}/qml/
 
 %files devel
-%dir %{_qt6_libdir}/cmake/Qt6PacketProtocol/
+%dir %{_qt6_libdir}/cmake/Qt6PacketProtocolPrivate/
 %dir %{_qt6_libdir}/cmake/Qt6Qml/
-%dir %{_qt6_libdir}/cmake/Qt6QmlCompiler/
-%dir %{_qt6_libdir}/cmake/Qt6QmlDebug/
-%dir %{_qt6_libdir}/cmake/Qt6QmlDevTools/
+%dir %{_qt6_libdir}/cmake/Qt6QmlCompilerPrivate/
+%dir %{_qt6_libdir}/cmake/Qt6QmlCore
+%dir %{_qt6_libdir}/cmake/Qt6QmlDebugPrivate/
+%dir %{_qt6_libdir}/cmake/Qt6QmlDevToolsPrivate/
 %dir %{_qt6_libdir}/cmake/Qt6QmlImportScanner/
 %dir %{_qt6_libdir}/cmake/Qt6LabsAnimation
 %dir %{_qt6_libdir}/cmake/Qt6LabsFolderListModel
@@ -168,18 +189,28 @@ make check -k -C tests ||:
 %dir %{_qt6_libdir}/cmake/Qt6LabsSettings
 %dir %{_qt6_libdir}/cmake/Qt6LabsSharedImage
 %dir %{_qt6_libdir}/cmake/Qt6LabsWavefrontMesh
-%dir %{_qt6_libdir}/cmake/Qt6QmlDom
+%dir %{_qt6_libdir}/cmake/Qt6QmlDomPrivate
 %dir %{_qt6_libdir}/cmake/Qt6QmlLocalStorage
 %dir %{_qt6_libdir}/cmake/Qt6QmlModels/
 %dir %{_qt6_libdir}/cmake/Qt6QmlTools/
 %dir %{_qt6_libdir}/cmake/Qt6QmlWorkerScript/
 %dir %{_qt6_libdir}/cmake/Qt6Quick/
+%dir %{_qt6_libdir}/cmake/Qt6QuickControls2
+%dir %{_qt6_libdir}/cmake/Qt6QuickControls2Impl
+%dir %{_qt6_libdir}/cmake/Qt6QuickDialogs2
+%dir %{_qt6_libdir}/cmake/Qt6QuickDialogs2QuickImpl
+%dir %{_qt6_libdir}/cmake/Qt6QuickDialogs2Utils
 %dir %{_qt6_libdir}/cmake/Qt6QuickLayouts
-%dir %{_qt6_libdir}/cmake/Qt6QuickParticles/
-%dir %{_qt6_libdir}/cmake/Qt6QuickShapes/
+%dir %{_qt6_libdir}/cmake/Qt6QuickParticlesPrivate/
+%dir %{_qt6_libdir}/cmake/Qt6QuickShapesPrivate/
 %dir %{_qt6_libdir}/cmake/Qt6QuickTest/
+%dir %{_qt6_libdir}/cmake/Qt6QuickTemplates2
+%dir %{_qt6_libdir}/cmake/Qt6QmlXmlListModel
 %{_bindir}/qml*
 %{_qt6_bindir}/qml*
+%{_qt6_libexecdir}/qmlcachegen
+%{_qt6_libexecdir}/qmlimportscanner
+%{_qt6_libexecdir}/qmltyperegistrar
 %{_qt6_headerdir}/Qt*/
 %{_qt6_libdir}/libQt6LabsAnimation.so
 %{_qt6_libdir}/libQt6LabsFolderListModel.so
@@ -189,20 +220,23 @@ make check -k -C tests ||:
 %{_qt6_libdir}/libQt6LabsWavefrontMesh.so
 %{_qt6_libdir}/libQt6QmlLocalStorage.so
 %{_qt6_libdir}/libQt6Qml.so
+%{_qt6_libdir}/libQt6QmlCore.so
 %{_qt6_libdir}/libQt6QmlModels.so
 %{_qt6_libdir}/libQt6QmlWorkerScript.so
 %{_qt6_libdir}/libQt6Quick*.so
+%{_qt6_libdir}/libQt6QmlXmlListModel.so
 %{_qt6_libdir}/metatypes/qt6*_metatypes.json
 %{_qt6_archdatadir}/mkspecs/modules/*.pri
 %{_qt6_archdatadir}/mkspecs/features/*.prf
 %{_qt6_libdir}/cmake/Qt6BuildInternals/StandaloneTests/QtDeclarativeTestsConfig.cmake
-%{_qt6_libdir}/cmake/Qt6PacketProtocol/*.cmake
+%{_qt6_libdir}/cmake/Qt6PacketProtocolPrivate/*.cmake
 %{_qt6_libdir}/cmake/Qt6Qml/*.cmake*
 %{_qt6_libdir}/cmake/Qt6Qml/*.cpp.in
 %{_qt6_libdir}/cmake/Qt6Qml/QmlPlugins/*.cmake
-%{_qt6_libdir}/cmake/Qt6QmlCompiler/*.cmake
-%{_qt6_libdir}/cmake/Qt6QmlDebug/*.cmake
-%{_qt6_libdir}/cmake/Qt6QmlDevTools/*.cmake
+%{_qt6_libdir}/cmake/Qt6QmlCompilerPrivate/*.cmake
+%{_qt6_libdir}/cmake/Qt6QmlCore/*.cmake
+%{_qt6_libdir}/cmake/Qt6QmlDebugPrivate/*.cmake
+%{_qt6_libdir}/cmake/Qt6QmlDevToolsPrivate/*.cmake
 %{_qt6_libdir}/cmake/Qt6QmlImportScanner/*.cmake
 %{_qt6_libdir}/cmake/Qt6LabsAnimation/*.cmake
 %{_qt6_libdir}/cmake/Qt6LabsFolderListModel/*.cmake
@@ -210,16 +244,23 @@ make check -k -C tests ||:
 %{_qt6_libdir}/cmake/Qt6LabsSettings/*.cmake
 %{_qt6_libdir}/cmake/Qt6LabsSharedImage/*.cmake
 %{_qt6_libdir}/cmake/Qt6LabsWavefrontMesh/*.cmake
-%{_qt6_libdir}/cmake/Qt6QmlDom/*.cmake
+%{_qt6_libdir}/cmake/Qt6QmlDomPrivate/*.cmake
 %{_qt6_libdir}/cmake/Qt6QmlLocalStorage/*.cmake
 %{_qt6_libdir}/cmake/Qt6QmlModels/*.cmake
 %{_qt6_libdir}/cmake/Qt6QmlTools/*.cmake
 %{_qt6_libdir}/cmake/Qt6QmlWorkerScript/*.cmake
 %{_qt6_libdir}/cmake/Qt6Quick/*.cmake
+%{_qt6_libdir}/cmake/Qt6QuickControls2/*.cmake
+%{_qt6_libdir}/cmake/Qt6QuickControls2Impl/*.cmake
+%{_qt6_libdir}/cmake/Qt6QuickDialogs2/*.cmake
+%{_qt6_libdir}/cmake/Qt6QuickDialogs2QuickImpl/*.cmake
+%{_qt6_libdir}/cmake/Qt6QuickDialogs2Utils/*.cmake
 %{_qt6_libdir}/cmake/Qt6QuickLayouts/*.cmake
-%{_qt6_libdir}/cmake/Qt6QuickParticles/*.cmake
-%{_qt6_libdir}/cmake/Qt6QuickShapes/*.cmake
+%{_qt6_libdir}/cmake/Qt6QuickParticlesPrivate/*.cmake
+%{_qt6_libdir}/cmake/Qt6QuickShapesPrivate/*.cmake
 %{_qt6_libdir}/cmake/Qt6QuickTest/*.cmake
+%{_qt6_libdir}/cmake/Qt6QuickTemplates2/*.cmake
+%{_qt6_libdir}/cmake/Qt6QmlXmlListModel/*.cmake
 %{_qt6_libdir}/cmake/Qt6QuickWidgets/*.cmake
 %{_qt6_datadir}/modules/*.json
 
@@ -230,6 +271,7 @@ make check -k -C tests ||:
 %{_qt6_libdir}/libQt6LabsSettings.prl
 %{_qt6_libdir}/libQt6LabsSharedImage.prl
 %{_qt6_libdir}/libQt6LabsWavefrontMesh.prl
+%{_qt6_libdir}/libQt6QmlCore.prl
 %{_qt6_libdir}/libQt6QmlDom.a
 %{_qt6_libdir}/libQt6QmlDom.prl
 %{_qt6_libdir}/libQt6QmlLocalStorage.prl
@@ -245,12 +287,16 @@ make check -k -C tests ||:
 %{_qt6_libdir}/libQt6PacketProtocol.prl
 %{_qt6_libdir}/libQt6QmlDebug.a
 %{_qt6_libdir}/libQt6QmlDebug.prl
+%{_qt6_libdir}/libQt6QmlXmlListModel.prl
 
 %files examples
 %{_qt6_examplesdir}/
 
 
 %changelog
+* Mon Aug 30 2021 Jan Grulich <jgrulich@redhat.com> - 6.2.0~beta3-1
+- 6.2.0 - beta3
+
 * Thu Aug 12 2021 Jan Grulich <jgrulich@redhat.com> - 6.1.2-1
 - 6.1.2
 

sources

@@ -1 +1 @@
-SHA512 (qtdeclarative-everywhere-src-6.1.2.tar.xz) = 653f902762943643262d3575bb918bf04b4cab156b17f5e6d5fd0132fed059d578cbf60a0b7cc25051aad73c2cbbf17d33f709377d076fd402792b3e213f66e7
+SHA512 (qtdeclarative-everywhere-src-6.2.0-beta3.tar.xz) = e3afacac9d12441345265f6db5153fb812ec4590f659c8d96ca04a49f9744f8b7cdfe5fce44c48ecca39f3baf4fed27a016927947fc009192361f12af9079c5b