Notification time stamped 2022-04-29 07:46:34 UTC
From 5158f772a7b03aaaed566b2c5ba9d1a2c7268847 Mon Sep 17 00:00:00 2001 From: Sandro Mani manisandro@gmail.com Date: Apr 29 2022 07:46:24 +0000 Subject: Fix build
---
diff --git a/mingw-qt6-qtdeclarative.spec b/mingw-qt6-qtdeclarative.spec index bff983e..9ed1601 100644 --- a/mingw-qt6-qtdeclarative.spec +++ b/mingw-qt6-qtdeclarative.spec @@ -155,6 +155,8 @@ rm -rf %{buildroot}%{mingw64_libdir}/objects-RelWithDebInfo/ %{mingw32_includedir}/qt6/QtQmlCore/ %{mingw32_includedir}/qt6/QtQmlDebug/ %{mingw32_includedir}/qt6/QtQmlDom/ +%{mingw32_includedir}/qt6/QtQmlIntegration/ +%{mingw32_includedir}/qt6/QtQmlLint/ %{mingw32_includedir}/qt6/QtQmlLocalStorage/ %{mingw32_includedir}/qt6/QtQmlModels/ %{mingw32_includedir}/qt6/QtQmlWorkerScript/ @@ -189,7 +191,6 @@ rm -rf %{buildroot}%{mingw64_libdir}/objects-RelWithDebInfo/ %{mingw32_libdir}/cmake/Qt6QmlDebugPrivate/ %{mingw32_libdir}/cmake/Qt6QmlIntegration/ %{mingw32_libdir}/cmake/Qt6QmlDomPrivate/ -%{mingw32_libdir}/cmake/Qt6QmlImportScanner/ %{mingw32_libdir}/cmake/Qt6QmlLocalStorage/ %{mingw32_libdir}/cmake/Qt6QmlModels/ %{mingw32_libdir}/cmake/Qt6QmlWorkerScript/ @@ -251,8 +252,8 @@ rm -rf %{buildroot}%{mingw64_libdir}/objects-RelWithDebInfo/ %{mingw32_libdir}/metatypes/qt6qmlcompilerprivate_relwithdebinfo_metatypes.json %{mingw32_libdir}/metatypes/qt6qmlcore_relwithdebinfo_metatypes.json %{mingw32_libdir}/metatypes/qt6qmldebugprivate_relwithdebinfo_metatypes.json -%{mingw32_libdir}/metatypes/qt6qmldevtoolsprivate_relwithdebinfo_metatypes.json %{mingw32_libdir}/metatypes/qt6qmldomprivate_relwithdebinfo_metatypes.json +%{mingw32_libdir}/metatypes/qt6qmllintprivate_relwithdebinfo_metatypes.json %{mingw32_libdir}/metatypes/qt6qmllocalstorage_relwithdebinfo_metatypes.json %{mingw32_libdir}/metatypes/qt6qmlmodels_relwithdebinfo_metatypes.json %{mingw32_libdir}/metatypes/qt6qml_relwithdebinfo_metatypes.json @@ -282,8 +283,8 @@ rm -rf %{buildroot}%{mingw64_libdir}/objects-RelWithDebInfo/ %{mingw32_libdir}/Qt6QmlCompiler.prl %{mingw32_libdir}/Qt6QmlCore.prl %{mingw32_libdir}/Qt6QmlDebug.prl -%{mingw32_libdir}/Qt6QmlDevTools.prl %{mingw32_libdir}/Qt6QmlDom.prl +%{mingw32_libdir}/Qt6QmlLint.prl %{mingw32_libdir}/Qt6QmlLocalStorage.prl %{mingw32_libdir}/Qt6QmlModels.prl %{mingw32_libdir}/Qt6Qml.prl @@ -305,9 +306,6 @@ rm -rf %{buildroot}%{mingw64_libdir}/objects-RelWithDebInfo/ %{mingw32_libdir}/Qt6QuickWidgets.prl
%{mingw32_libdir}/Qt6PacketProtocol.prl -%{mingw32_libdir}/qt6/mkspecs/features/qmlcache.prf -%{mingw32_libdir}/qt6/mkspecs/features/qmltypes.prf -%{mingw32_libdir}/qt6/mkspecs/features/qtquickcompiler.prf %{mingw32_libdir}/qt6/mkspecs/modules/qt_lib_labsanimation.pri %{mingw32_libdir}/qt6/mkspecs/modules/qt_lib_labsanimation_private.pri %{mingw32_libdir}/qt6/mkspecs/modules/qt_lib_labsfolderlistmodel.pri @@ -325,8 +323,10 @@ rm -rf %{buildroot}%{mingw64_libdir}/objects-RelWithDebInfo/ %{mingw32_libdir}/qt6/mkspecs/modules/qt_lib_qmlcore.pri %{mingw32_libdir}/qt6/mkspecs/modules/qt_lib_qmlcore_private.pri %{mingw32_libdir}/qt6/mkspecs/modules/qt_lib_qmldebug_private.pri -%{mingw32_libdir}/qt6/mkspecs/modules/qt_lib_qmldevtools_private.pri %{mingw32_libdir}/qt6/mkspecs/modules/qt_lib_qmldom_private.pri +%{mingw32_libdir}/qt6/mkspecs/modules/qt_lib_qmlintegration.pri +%{mingw32_libdir}/qt6/mkspecs/modules/qt_lib_qmlintegration_private.pri +%{mingw32_libdir}/qt6/mkspecs/modules/qt_lib_qmllint_private.pri %{mingw32_libdir}/qt6/mkspecs/modules/qt_lib_qmllocalstorage.pri %{mingw32_libdir}/qt6/mkspecs/modules/qt_lib_qmllocalstorage_private.pri %{mingw32_libdir}/qt6/mkspecs/modules/qt_lib_qmlmodels.pri @@ -402,8 +402,9 @@ rm -rf %{buildroot}%{mingw64_libdir}/objects-RelWithDebInfo/ %{mingw32_datadir}/qt6/modules/QmlCompilerPrivate.json %{mingw32_datadir}/qt6/modules/QmlCore.json %{mingw32_datadir}/qt6/modules/QmlDebugPrivate.json -%{mingw32_datadir}/qt6/modules/QmlDevToolsPrivate.json %{mingw32_datadir}/qt6/modules/QmlDomPrivate.json +%{mingw32_datadir}/qt6/modules/QmlIntegration.json +%{mingw32_datadir}/qt6/modules/QmlLintPrivate.json %{mingw32_datadir}/qt6/modules/QmlLocalStorage.json %{mingw32_datadir}/qt6/modules/QmlModels.json %{mingw32_datadir}/qt6/modules/QmlWorkerScript.json @@ -467,6 +468,8 @@ rm -rf %{buildroot}%{mingw64_libdir}/objects-RelWithDebInfo/ %{mingw64_includedir}/qt6/QtQmlCore/ %{mingw64_includedir}/qt6/QtQmlDebug/ %{mingw64_includedir}/qt6/QtQmlDom/ +%{mingw64_includedir}/qt6/QtQmlIntegration/ +%{mingw64_includedir}/qt6/QtQmlLint/ %{mingw64_includedir}/qt6/QtQmlLocalStorage/ %{mingw64_includedir}/qt6/QtQmlModels/ %{mingw64_includedir}/qt6/QtQmlWorkerScript/ @@ -501,7 +504,6 @@ rm -rf %{buildroot}%{mingw64_libdir}/objects-RelWithDebInfo/ %{mingw64_libdir}/cmake/Qt6QmlDebugPrivate/ %{mingw64_libdir}/cmake/Qt6QmlIntegration/ %{mingw64_libdir}/cmake/Qt6QmlDomPrivate/ -%{mingw64_libdir}/cmake/Qt6QmlImportScanner/ %{mingw64_libdir}/cmake/Qt6QmlLocalStorage/ %{mingw64_libdir}/cmake/Qt6QmlModels/ %{mingw64_libdir}/cmake/Qt6QmlWorkerScript/ @@ -563,8 +565,8 @@ rm -rf %{buildroot}%{mingw64_libdir}/objects-RelWithDebInfo/ %{mingw64_libdir}/metatypes/qt6qmlcompilerprivate_relwithdebinfo_metatypes.json %{mingw64_libdir}/metatypes/qt6qmlcore_relwithdebinfo_metatypes.json %{mingw64_libdir}/metatypes/qt6qmldebugprivate_relwithdebinfo_metatypes.json -%{mingw64_libdir}/metatypes/qt6qmldevtoolsprivate_relwithdebinfo_metatypes.json %{mingw64_libdir}/metatypes/qt6qmldomprivate_relwithdebinfo_metatypes.json +%{mingw64_libdir}/metatypes/qt6qmllintprivate_relwithdebinfo_metatypes.json %{mingw64_libdir}/metatypes/qt6qmllocalstorage_relwithdebinfo_metatypes.json %{mingw64_libdir}/metatypes/qt6qmlmodels_relwithdebinfo_metatypes.json %{mingw64_libdir}/metatypes/qt6qml_relwithdebinfo_metatypes.json @@ -594,8 +596,8 @@ rm -rf %{buildroot}%{mingw64_libdir}/objects-RelWithDebInfo/ %{mingw64_libdir}/Qt6QmlCompiler.prl %{mingw64_libdir}/Qt6QmlCore.prl %{mingw64_libdir}/Qt6QmlDebug.prl -%{mingw64_libdir}/Qt6QmlDevTools.prl %{mingw64_libdir}/Qt6QmlDom.prl +%{mingw64_libdir}/Qt6QmlLint.prl %{mingw64_libdir}/Qt6QmlLocalStorage.prl %{mingw64_libdir}/Qt6QmlModels.prl %{mingw64_libdir}/Qt6Qml.prl @@ -617,9 +619,6 @@ rm -rf %{buildroot}%{mingw64_libdir}/objects-RelWithDebInfo/ %{mingw64_libdir}/Qt6QuickWidgets.prl
%{mingw64_libdir}/Qt6PacketProtocol.prl -%{mingw64_libdir}/qt6/mkspecs/features/qmlcache.prf -%{mingw64_libdir}/qt6/mkspecs/features/qmltypes.prf -%{mingw64_libdir}/qt6/mkspecs/features/qtquickcompiler.prf %{mingw64_libdir}/qt6/mkspecs/modules/qt_lib_labsanimation.pri %{mingw64_libdir}/qt6/mkspecs/modules/qt_lib_labsanimation_private.pri %{mingw64_libdir}/qt6/mkspecs/modules/qt_lib_labsfolderlistmodel.pri @@ -637,8 +636,10 @@ rm -rf %{buildroot}%{mingw64_libdir}/objects-RelWithDebInfo/ %{mingw64_libdir}/qt6/mkspecs/modules/qt_lib_qmlcore.pri %{mingw64_libdir}/qt6/mkspecs/modules/qt_lib_qmlcore_private.pri %{mingw64_libdir}/qt6/mkspecs/modules/qt_lib_qmldebug_private.pri -%{mingw64_libdir}/qt6/mkspecs/modules/qt_lib_qmldevtools_private.pri %{mingw64_libdir}/qt6/mkspecs/modules/qt_lib_qmldom_private.pri +%{mingw64_libdir}/qt6/mkspecs/modules/qt_lib_qmlintegration.pri +%{mingw64_libdir}/qt6/mkspecs/modules/qt_lib_qmlintegration_private.pri +%{mingw64_libdir}/qt6/mkspecs/modules/qt_lib_qmllint_private.pri %{mingw64_libdir}/qt6/mkspecs/modules/qt_lib_qmllocalstorage.pri %{mingw64_libdir}/qt6/mkspecs/modules/qt_lib_qmllocalstorage_private.pri %{mingw64_libdir}/qt6/mkspecs/modules/qt_lib_qmlmodels.pri @@ -714,8 +715,9 @@ rm -rf %{buildroot}%{mingw64_libdir}/objects-RelWithDebInfo/ %{mingw64_datadir}/qt6/modules/QmlCompilerPrivate.json %{mingw64_datadir}/qt6/modules/QmlCore.json %{mingw64_datadir}/qt6/modules/QmlDebugPrivate.json -%{mingw64_datadir}/qt6/modules/QmlDevToolsPrivate.json %{mingw64_datadir}/qt6/modules/QmlDomPrivate.json +%{mingw64_datadir}/qt6/modules/QmlIntegration.json +%{mingw64_datadir}/qt6/modules/QmlLintPrivate.json %{mingw64_datadir}/qt6/modules/QmlLocalStorage.json %{mingw64_datadir}/qt6/modules/QmlModels.json %{mingw64_datadir}/qt6/modules/QmlWorkerScript.json diff --git a/qtdeclarative-qt6-suffix.patch b/qtdeclarative-qt6-suffix.patch index 218de0c..4e7de04 100644 --- a/qtdeclarative-qt6-suffix.patch +++ b/qtdeclarative-qt6-suffix.patch @@ -1,34 +1,33 @@ -diff -rupN --no-dereference qtdeclarative-everywhere-src-6.3.0/tools/qml/CMakeLists.txt qtdeclarative-everywhere-src-6.3.0-new/tools/qml/CMakeLists.txt +diff -rupN qtdeclarative-everywhere-src-6.3.0/tools/qml/CMakeLists.txt qtdeclarative-everywhere-src-6.3.0-new/tools/qml/CMakeLists.txt --- qtdeclarative-everywhere-src-6.3.0/tools/qml/CMakeLists.txt 2022-04-05 10:33:18.000000000 +0200 -+++ qtdeclarative-everywhere-src-6.3.0-new/tools/qml/CMakeLists.txt 2022-04-28 13:36:07.898538516 +0200 -@@ -15,6 +15,7 @@ qt_internal_add_app(qml ++++ qtdeclarative-everywhere-src-6.3.0-new/tools/qml/CMakeLists.txt 2022-04-28 23:28:42.694920477 +0200 +@@ -14,6 +14,7 @@ qt_internal_add_app(qml + Qt::QmlPrivate )
- set_target_properties(qml PROPERTIES WIN32_EXECUTABLE FALSE) +set_target_properties(qml PROPERTIES OUTPUT_NAME "qml-qt6") + set_target_properties(qml PROPERTIES WIN32_EXECUTABLE FALSE)
set_source_files_properties( - conf/default.qml -diff -rupN --no-dereference qtdeclarative-everywhere-src-6.3.0/tools/qmlpreview/CMakeLists.txt qtdeclarative-everywhere-src-6.3.0-new/tools/qmlpreview/CMakeLists.txt +diff -rupN qtdeclarative-everywhere-src-6.3.0/tools/qmlpreview/CMakeLists.txt qtdeclarative-everywhere-src-6.3.0-new/tools/qmlpreview/CMakeLists.txt --- qtdeclarative-everywhere-src-6.3.0/tools/qmlpreview/CMakeLists.txt 2022-04-05 10:33:18.000000000 +0200 -+++ qtdeclarative-everywhere-src-6.3.0-new/tools/qmlpreview/CMakeLists.txt 2022-04-28 13:36:07.899538551 +0200 -@@ -18,5 +18,7 @@ qt_internal_return_unless_building_tools ++++ qtdeclarative-everywhere-src-6.3.0-new/tools/qmlpreview/CMakeLists.txt 2022-04-28 23:28:37.181860874 +0200 +@@ -14,6 +14,7 @@ qt_internal_add_app(qmlpreview + Qt::Network + Qt::QmlDebugPrivate + ) ++set_target_properties(qmlpreview PROPERTIES OUTPUT_NAME "qmlpreview-qt6") + qt_internal_return_unless_building_tools()
set_target_properties(qmlpreview PROPERTIES WIN32_EXECUTABLE FALSE) - -+set_target_properties(qmlpreview PROPERTIES OUTPUT_NAME "qmlpreview-qt6") -+ - #### Keys ignored in scope 1:.:.:qmlpreview.pro:<TRUE>: - # QMAKE_TARGET_DESCRIPTION = "QML" "Preview" -diff -rupN --no-dereference qtdeclarative-everywhere-src-6.3.0/tools/qmlscene/CMakeLists.txt qtdeclarative-everywhere-src-6.3.0-new/tools/qmlscene/CMakeLists.txt +diff -rupN qtdeclarative-everywhere-src-6.3.0/tools/qmlscene/CMakeLists.txt qtdeclarative-everywhere-src-6.3.0-new/tools/qmlscene/CMakeLists.txt --- qtdeclarative-everywhere-src-6.3.0/tools/qmlscene/CMakeLists.txt 2022-04-05 10:33:18.000000000 +0200 -+++ qtdeclarative-everywhere-src-6.3.0-new/tools/qmlscene/CMakeLists.txt 2022-04-28 13:36:07.899538551 +0200 -@@ -22,6 +22,8 @@ qt_internal_return_unless_building_tools - - set_target_properties(qmlscene PROPERTIES WIN32_EXECUTABLE FALSE) - ++++ qtdeclarative-everywhere-src-6.3.0-new/tools/qmlscene/CMakeLists.txt 2022-04-28 23:28:39.630887316 +0200 +@@ -18,6 +18,7 @@ qt_internal_add_app(qmlscene + Qt::Quick + Qt::QuickPrivate + ) +set_target_properties(qmlscene PROPERTIES OUTPUT_NAME "qmlscene-qt6") -+ - #### Keys ignored in scope 1:.:.:qmlscene.pro:<TRUE>: - # QMAKE_TARGET_DESCRIPTION = "QML" "Scene" "Viewer" + qt_internal_return_unless_building_tools()
+ set_target_properties(qmlscene PROPERTIES WIN32_EXECUTABLE FALSE)
https://src.fedoraproject.org/rpms/mingw-qt6-qtdeclarative/c/5158f772a7b03aa...