From 6cc7fffdbfa87e81d8468b7e288608eec5715996 Mon Sep 17 00:00:00 2001 From: Sandro Mani Date: Apr 17 2019 21:53:37 +0000 Subject: Update to 5.12.3 --- diff --git a/.gitignore b/.gitignore index 62ae7a0..45609f8 100644 --- a/.gitignore +++ b/.gitignore @@ -24,3 +24,4 @@ /qtdeclarative-everywhere-src-5.11.1.tar.xz /qtdeclarative-everywhere-src-5.11.2.tar.xz /qtdeclarative-everywhere-src-5.11.3.tar.xz +/qtdeclarative-everywhere-src-5.12.3.tar.xz diff --git a/0001-Build-QML-dev-tools-as-shared-library.patch b/0001-Build-QML-dev-tools-as-shared-library.patch index 5d635c1..6d62b65 100644 --- a/0001-Build-QML-dev-tools-as-shared-library.patch +++ b/0001-Build-QML-dev-tools-as-shared-library.patch @@ -1,10 +1,10 @@ -diff -rupN qtdeclarative-everywhere-src-5.11.3/src/qmldevtools/qmldevtools.pro qtdeclarative-everywhere-src-5.11.3-new/src/qmldevtools/qmldevtools.pro ---- qtdeclarative-everywhere-src-5.11.3/src/qmldevtools/qmldevtools.pro 2018-11-20 11:19:12.000000000 +0100 -+++ qtdeclarative-everywhere-src-5.11.3-new/src/qmldevtools/qmldevtools.pro 2019-01-14 15:48:48.347794576 +0100 +diff -rupN qtdeclarative-everywhere-src-5.12.3/src/qmldevtools/qmldevtools.pro qtdeclarative-everywhere-src-5.12.3-new/src/qmldevtools/qmldevtools.pro +--- qtdeclarative-everywhere-src-5.12.3/src/qmldevtools/qmldevtools.pro 2019-04-08 11:12:26.000000000 +0200 ++++ qtdeclarative-everywhere-src-5.12.3-new/src/qmldevtools/qmldevtools.pro 2019-04-17 23:51:30.274435307 +0200 @@ -2,6 +2,10 @@ option(host_build) TARGET = QtQmlDevTools QT = core-private - CONFIG += minimal_syncqt internal_module qmldevtools_build + CONFIG += minimal_syncqt internal_module qmldevtools_build generated_privates +win32:!contains(CONFIG, static) { + CONFIG += shared + CONFIG -= static staticlib diff --git a/0002-Ensure-static-plugins-are-exported.patch b/0002-Ensure-static-plugins-are-exported.patch index cca31f8..1948ff5 100644 --- a/0002-Ensure-static-plugins-are-exported.patch +++ b/0002-Ensure-static-plugins-are-exported.patch @@ -1,6 +1,6 @@ -diff -rupN qtdeclarative-everywhere-src-5.11.3/src/qml/Qt5QmlConfigExtras.cmake.in qtdeclarative-everywhere-src-5.11.3-new/src/qml/Qt5QmlConfigExtras.cmake.in ---- qtdeclarative-everywhere-src-5.11.3/src/qml/Qt5QmlConfigExtras.cmake.in 2018-11-20 11:19:12.000000000 +0100 -+++ qtdeclarative-everywhere-src-5.11.3-new/src/qml/Qt5QmlConfigExtras.cmake.in 2019-01-14 15:48:49.057794175 +0100 +diff -rupN qtdeclarative-everywhere-src-5.12.3/src/qml/Qt5QmlConfigExtras.cmake.in qtdeclarative-everywhere-src-5.12.3-new/src/qml/Qt5QmlConfigExtras.cmake.in +--- qtdeclarative-everywhere-src-5.12.3/src/qml/Qt5QmlConfigExtras.cmake.in 2019-04-08 11:12:26.000000000 +0200 ++++ qtdeclarative-everywhere-src-5.12.3-new/src/qml/Qt5QmlConfigExtras.cmake.in 2019-04-17 23:51:31.352433583 +0200 @@ -1,4 +1,4 @@ -file(GLOB _qt5qml_other_plugins "${CMAKE_CURRENT_LIST_DIR}/Qt5Qml_*Factory.cmake") +file(GLOB _qt5qml_other_plugins "${CMAKE_CURRENT_LIST_DIR}/*Qt5Qml_*Factory.cmake") diff --git a/0003-Prevent-exporting-QML-parser-symbols-on-static-build.patch b/0003-Prevent-exporting-QML-parser-symbols-on-static-build.patch index e74c840..5d00866 100644 --- a/0003-Prevent-exporting-QML-parser-symbols-on-static-build.patch +++ b/0003-Prevent-exporting-QML-parser-symbols-on-static-build.patch @@ -1,6 +1,6 @@ -diff -rupN qtdeclarative-everywhere-src-5.11.3/src/qml/parser/qqmljsglobal_p.h qtdeclarative-everywhere-src-5.11.3-new/src/qml/parser/qqmljsglobal_p.h ---- qtdeclarative-everywhere-src-5.11.3/src/qml/parser/qqmljsglobal_p.h 2018-11-20 11:19:12.000000000 +0100 -+++ qtdeclarative-everywhere-src-5.11.3-new/src/qml/parser/qqmljsglobal_p.h 2019-01-14 15:48:49.724793798 +0100 +diff -rupN qtdeclarative-everywhere-src-5.12.3/src/qml/parser/qqmljsglobal_p.h qtdeclarative-everywhere-src-5.12.3-new/src/qml/parser/qqmljsglobal_p.h +--- qtdeclarative-everywhere-src-5.12.3/src/qml/parser/qqmljsglobal_p.h 2019-04-08 11:12:26.000000000 +0200 ++++ qtdeclarative-everywhere-src-5.12.3-new/src/qml/parser/qqmljsglobal_p.h 2019-04-17 23:51:32.396431914 +0200 @@ -56,9 +56,9 @@ # define QT_QML_BEGIN_NAMESPACE # define QT_QML_END_NAMESPACE diff --git a/mingw-qt5-qtdeclarative.spec b/mingw-qt5-qtdeclarative.spec index d221517..21eecb4 100644 --- a/mingw-qt5-qtdeclarative.spec +++ b/mingw-qt5-qtdeclarative.spec @@ -9,7 +9,7 @@ %global __debug_install_post %%{mingw_debug_install_post}; %{_rpmconfigdir}/find-debuginfo.sh %{?_missing_build_ids_terminate_build:--strict-build-id} %{?_find_debuginfo_opts} "%{_builddir}/%%{?buildsubdir}" %{nil} %global qt_module qtdeclarative -#global pre beta +#global pre rc #global commit dd1d6b56271caf3f90e536b3ad9dab58c873f202 #global shortcommit %(c=%{commit}; echo ${c:0:7}) @@ -24,8 +24,8 @@ %global release_version %(echo %{version} | awk -F. '{print $1"."$2}') Name: mingw-qt5-%{qt_module} -Version: 5.11.3 -Release: 2%{?dist} +Version: 5.12.3 +Release: 1%{?pre:.%pre}%{?dist} Summary: Qt5 for Windows - QtDeclarative component # See LICENSE.GPL LICENSE.LGPL LGPL_EXCEPTION.txt, for details @@ -43,7 +43,7 @@ Patch1: 0001-Build-QML-dev-tools-as-shared-library.patch Patch2: 0002-Ensure-static-plugins-are-exported.patch Patch3: 0003-Prevent-exporting-QML-parser-symbols-on-static-build.patch -# Include masm sources when building libQmlDevTools, otherwise undefined references occur +# Fix undefined references Patch4: qtdeclarative_masm.patch @@ -177,7 +177,7 @@ mkdir .git %build -MINGW_BUILDDIR_SUFFIX=_static %mingw_qmake_qt5 ../%{qt_module}.pro CONFIG+=static DEFINES+=QT_OPENGL_ES_2_ANGLE_STATIC +MINGW_BUILDDIR_SUFFIX=_static %mingw_qmake_qt5 ../%{qt_module}.pro CONFIG+=static MINGW_BUILDDIR_SUFFIX=_static %mingw_make %{?_smp_mflags} MINGW_BUILDDIR_SUFFIX=_shared %mingw_qmake_qt5 ../%{qt_module}.pro @@ -222,12 +222,14 @@ find %{buildroot}%{mingw64_libdir}/qt5 | grep .dll\$ | sed s@"^%{buildroot}"@"%% %{mingw32_bindir}/Qt5Qml.dll %{mingw32_bindir}/Qt5Quick.dll %{mingw32_bindir}/Qt5QuickParticles.dll +%{mingw32_bindir}/Qt5QuickShapes.dll %{mingw32_bindir}/Qt5QuickTest.dll %{mingw32_bindir}/Qt5QuickWidgets.dll %{mingw32_bindir}/qmlplugindump-qt5.exe %{mingw32_bindir}/qmlscene.exe %{mingw32_bindir}/qml.exe %{mingw32_bindir}/qmleasing.exe +%{mingw32_bindir}/qmlpreview.exe %{mingw32_bindir}/qmlprofiler.exe %{mingw32_bindir}/qmltestrunner.exe %{mingw32_includedir}/qt5/QtPacketProtocol/ @@ -235,13 +237,15 @@ find %{buildroot}%{mingw64_libdir}/qt5 | grep .dll\$ | sed s@"^%{buildroot}"@"%% %{mingw32_includedir}/qt5/QtQmlDebug/ %{mingw32_includedir}/qt5/QtQuick/ %{mingw32_includedir}/qt5/QtQuickParticles/ +%{mingw32_includedir}/qt5/QtQuickShapes/ %{mingw32_includedir}/qt5/QtQuickTest/ %{mingw32_includedir}/qt5/QtQuickWidgets/ %{mingw32_libdir}/libQt5Qml.dll.a %{mingw32_libdir}/libQt5Quick.dll.a +%{mingw32_libdir}/libQt5QuickParticles.dll.a +%{mingw32_libdir}/libQt5QuickShapes.dll.a %{mingw32_libdir}/libQt5QuickTest.dll.a %{mingw32_libdir}/libQt5QuickWidgets.dll.a -%{mingw32_libdir}/libQt5QuickParticles.dll.a %{mingw32_libdir}/cmake/Qt5Qml/ %{mingw32_libdir}/cmake/Qt5Quick/ %{mingw32_libdir}/cmake/Qt5QuickCompiler/ @@ -258,6 +262,7 @@ find %{buildroot}%{mingw64_libdir}/qt5 | grep .dll\$ | sed s@"^%{buildroot}"@"%% %{mingw32_libdir}/qt5/plugins/qmltooling/qmldbg_messages.dll %{mingw32_libdir}/qt5/plugins/qmltooling/qmldbg_native.dll %{mingw32_libdir}/qt5/plugins/qmltooling/qmldbg_nativedebugger.dll +%{mingw32_libdir}/qt5/plugins/qmltooling/qmldbg_preview.dll %{mingw32_libdir}/qt5/plugins/qmltooling/qmldbg_profiler.dll %{mingw32_libdir}/qt5/plugins/qmltooling/qmldbg_quickprofiler.dll %{mingw32_libdir}/qt5/plugins/qmltooling/qmldbg_server.dll @@ -270,10 +275,10 @@ find %{buildroot}%{mingw64_libdir}/qt5 | grep .dll\$ | sed s@"^%{buildroot}"@"%% %{mingw32_libdir}/qt5/qml/Qt/labs/folderlistmodel/plugins.qmltypes %{mingw32_libdir}/qt5/qml/Qt/labs/folderlistmodel/qmldir %{mingw32_libdir}/qt5/qml/Qt/labs/folderlistmodel/qmlfolderlistmodelplugin.dll -%dir %{mingw32_libdir}/qt5/qml/Qt/labs/handlers -%{mingw32_libdir}/qt5/qml/Qt/labs/handlers/handlersplugin.dll -%{mingw32_libdir}/qt5/qml/Qt/labs/handlers/qmldir -%{mingw32_libdir}/qt5/qml/Qt/labs/handlers/plugins.qmltypes +%dir %{mingw32_libdir}/qt5/qml/Qt/labs/qmlmodels +%{mingw32_libdir}/qt5/qml/Qt/labs/qmlmodels/plugins.qmltypes +%{mingw32_libdir}/qt5/qml/Qt/labs/qmlmodels/qmldir +%{mingw32_libdir}/qt5/qml/Qt/labs/qmlmodels/labsmodelsplugin.dll %dir %{mingw32_libdir}/qt5/qml/Qt/labs/settings %{mingw32_libdir}/qt5/qml/Qt/labs/settings/plugins.qmltypes %{mingw32_libdir}/qt5/qml/Qt/labs/settings/qmldir @@ -282,6 +287,10 @@ find %{buildroot}%{mingw64_libdir}/qt5 | grep .dll\$ | sed s@"^%{buildroot}"@"%% %{mingw32_libdir}/qt5/qml/Qt/labs/sharedimage/plugins.qmltypes %{mingw32_libdir}/qt5/qml/Qt/labs/sharedimage/qmldir %{mingw32_libdir}/qt5/qml/Qt/labs/sharedimage/sharedimageplugin.dll +%dir %{mingw32_libdir}/qt5/qml/Qt/labs/wavefrontmesh +%{mingw32_libdir}/qt5/qml/Qt/labs/wavefrontmesh/plugins.qmltypes +%{mingw32_libdir}/qt5/qml/Qt/labs/wavefrontmesh/qmldir +%{mingw32_libdir}/qt5/qml/Qt/labs/wavefrontmesh/qmlwavefrontmeshplugin.dll %dir %{mingw32_libdir}/qt5/qml/QtQml %{mingw32_libdir}/qt5/qml/QtQml/plugins.qmltypes %{mingw32_libdir}/qt5/qml/QtQml/qmldir @@ -293,11 +302,11 @@ find %{buildroot}%{mingw64_libdir}/qt5 | grep .dll\$ | sed s@"^%{buildroot}"@"%% %{mingw32_libdir}/qt5/qml/QtQml/StateMachine/plugins.qmltypes %{mingw32_libdir}/qt5/qml/QtQml/StateMachine/qmldir %{mingw32_libdir}/qt5/qml/QtQml/StateMachine/qtqmlstatemachine.dll -%dir %{mingw32_libdir}/qt5/qml/QtQuick %dir %{mingw32_libdir}/qt5/qml/QtQuick.2 %{mingw32_libdir}/qt5/qml/QtQuick.2/plugins.qmltypes %{mingw32_libdir}/qt5/qml/QtQuick.2/qmldir %{mingw32_libdir}/qt5/qml/QtQuick.2/qtquick2plugin.dll +%dir %{mingw32_libdir}/qt5/qml/QtQuick/ %dir %{mingw32_libdir}/qt5/qml/QtQuick/Layouts %{mingw32_libdir}/qt5/qml/QtQuick/Layouts/plugins.qmltypes %{mingw32_libdir}/qt5/qml/QtQuick/Layouts/qmldir @@ -337,6 +346,7 @@ find %{buildroot}%{mingw64_libdir}/qt5 | grep .dll\$ | sed s@"^%{buildroot}"@"%% %{mingw32_datadir}/qt5/mkspecs/modules/qt_lib_quick.pri %{mingw32_datadir}/qt5/mkspecs/modules/qt_lib_quick_private.pri %{mingw32_datadir}/qt5/mkspecs/modules/qt_lib_quickparticles_private.pri +%{mingw32_datadir}/qt5/mkspecs/modules/qt_lib_quickshapes_private.pri %{mingw32_datadir}/qt5/mkspecs/modules/qt_lib_quickwidgets.pri %{mingw32_datadir}/qt5/mkspecs/modules/qt_lib_quickwidgets_private.pri %{mingw32_datadir}/qt5/mkspecs/modules/qt_plugin_qmldbg_debugger.pri @@ -345,6 +355,7 @@ find %{buildroot}%{mingw64_libdir}/qt5 | grep .dll\$ | sed s@"^%{buildroot}"@"%% %{mingw32_datadir}/qt5/mkspecs/modules/qt_plugin_qmldbg_messages.pri %{mingw32_datadir}/qt5/mkspecs/modules/qt_plugin_qmldbg_native.pri %{mingw32_datadir}/qt5/mkspecs/modules/qt_plugin_qmldbg_nativedebugger.pri +%{mingw32_datadir}/qt5/mkspecs/modules/qt_plugin_qmldbg_preview.pri %{mingw32_datadir}/qt5/mkspecs/modules/qt_plugin_qmldbg_profiler.pri %{mingw32_datadir}/qt5/mkspecs/modules/qt_plugin_qmldbg_quickprofiler.pri %{mingw32_datadir}/qt5/mkspecs/modules/qt_plugin_qmldbg_server.pri @@ -366,6 +377,7 @@ find %{buildroot}%{mingw64_libdir}/qt5 | grep .dll\$ | sed s@"^%{buildroot}"@"%% %{mingw32_libdir}/libQt5Qml.a %{mingw32_libdir}/libQt5Quick.a %{mingw32_libdir}/libQt5QuickParticles.a +%{mingw32_libdir}/libQt5QuickShapes.a %{mingw32_libdir}/libQt5QuickTest.a %{mingw32_libdir}/libQt5QuickWidgets.a %{mingw32_libdir}/qt5/plugins/qmltooling/libqmldbg_debugger.a @@ -374,14 +386,16 @@ find %{buildroot}%{mingw64_libdir}/qt5 | grep .dll\$ | sed s@"^%{buildroot}"@"%% %{mingw32_libdir}/qt5/plugins/qmltooling/libqmldbg_messages.a %{mingw32_libdir}/qt5/plugins/qmltooling/libqmldbg_native.a %{mingw32_libdir}/qt5/plugins/qmltooling/libqmldbg_nativedebugger.a +%{mingw32_libdir}/qt5/plugins/qmltooling/libqmldbg_preview.a %{mingw32_libdir}/qt5/plugins/qmltooling/libqmldbg_profiler.a %{mingw32_libdir}/qt5/plugins/qmltooling/libqmldbg_quickprofiler.a %{mingw32_libdir}/qt5/plugins/qmltooling/libqmldbg_server.a %{mingw32_libdir}/qt5/plugins/qmltooling/libqmldbg_tcp.a %{mingw32_libdir}/qt5/qml/Qt/labs/folderlistmodel/libqmlfolderlistmodelplugin.a -%{mingw32_libdir}/qt5/qml/Qt/labs/handlers/libhandlersplugin.a +%{mingw32_libdir}/qt5/qml/Qt/labs/qmlmodels/liblabsmodelsplugin.a %{mingw32_libdir}/qt5/qml/Qt/labs/settings/libqmlsettingsplugin.a %{mingw32_libdir}/qt5/qml/Qt/labs/sharedimage/libsharedimageplugin.a +%{mingw32_libdir}/qt5/qml/Qt/labs/wavefrontmesh/libqmlwavefrontmeshplugin.a %{mingw32_libdir}/qt5/qml/QtQml/Models.2/libmodelsplugin.a %{mingw32_libdir}/qt5/qml/QtQml/StateMachine/libqtqmlstatemachine.a %{mingw32_libdir}/qt5/qml/QtQuick.2/libqtquick2plugin.a @@ -398,12 +412,14 @@ find %{buildroot}%{mingw64_libdir}/qt5 | grep .dll\$ | sed s@"^%{buildroot}"@"%% %{mingw64_bindir}/Qt5Qml.dll %{mingw64_bindir}/Qt5Quick.dll %{mingw64_bindir}/Qt5QuickParticles.dll +%{mingw64_bindir}/Qt5QuickShapes.dll %{mingw64_bindir}/Qt5QuickTest.dll %{mingw64_bindir}/Qt5QuickWidgets.dll %{mingw64_bindir}/qmlplugindump-qt5.exe %{mingw64_bindir}/qmlscene.exe %{mingw64_bindir}/qml.exe %{mingw64_bindir}/qmleasing.exe +%{mingw64_bindir}/qmlpreview.exe %{mingw64_bindir}/qmlprofiler.exe %{mingw64_bindir}/qmltestrunner.exe %{mingw64_includedir}/qt5/QtPacketProtocol/ @@ -411,13 +427,15 @@ find %{buildroot}%{mingw64_libdir}/qt5 | grep .dll\$ | sed s@"^%{buildroot}"@"%% %{mingw64_includedir}/qt5/QtQmlDebug/ %{mingw64_includedir}/qt5/QtQuick/ %{mingw64_includedir}/qt5/QtQuickParticles/ +%{mingw64_includedir}/qt5/QtQuickShapes/ %{mingw64_includedir}/qt5/QtQuickTest/ %{mingw64_includedir}/qt5/QtQuickWidgets/ %{mingw64_libdir}/libQt5Qml.dll.a %{mingw64_libdir}/libQt5Quick.dll.a +%{mingw64_libdir}/libQt5QuickParticles.dll.a +%{mingw64_libdir}/libQt5QuickShapes.dll.a %{mingw64_libdir}/libQt5QuickTest.dll.a %{mingw64_libdir}/libQt5QuickWidgets.dll.a -%{mingw64_libdir}/libQt5QuickParticles.dll.a %{mingw64_libdir}/cmake/Qt5Qml/ %{mingw64_libdir}/cmake/Qt5Quick/ %{mingw64_libdir}/cmake/Qt5QuickCompiler/ @@ -434,6 +452,7 @@ find %{buildroot}%{mingw64_libdir}/qt5 | grep .dll\$ | sed s@"^%{buildroot}"@"%% %{mingw64_libdir}/qt5/plugins/qmltooling/qmldbg_messages.dll %{mingw64_libdir}/qt5/plugins/qmltooling/qmldbg_native.dll %{mingw64_libdir}/qt5/plugins/qmltooling/qmldbg_nativedebugger.dll +%{mingw64_libdir}/qt5/plugins/qmltooling/qmldbg_preview.dll %{mingw64_libdir}/qt5/plugins/qmltooling/qmldbg_profiler.dll %{mingw64_libdir}/qt5/plugins/qmltooling/qmldbg_quickprofiler.dll %{mingw64_libdir}/qt5/plugins/qmltooling/qmldbg_server.dll @@ -446,10 +465,10 @@ find %{buildroot}%{mingw64_libdir}/qt5 | grep .dll\$ | sed s@"^%{buildroot}"@"%% %{mingw64_libdir}/qt5/qml/Qt/labs/folderlistmodel/plugins.qmltypes %{mingw64_libdir}/qt5/qml/Qt/labs/folderlistmodel/qmldir %{mingw64_libdir}/qt5/qml/Qt/labs/folderlistmodel/qmlfolderlistmodelplugin.dll -%dir %{mingw64_libdir}/qt5/qml/Qt/labs/handlers -%{mingw64_libdir}/qt5/qml/Qt/labs/handlers/handlersplugin.dll -%{mingw64_libdir}/qt5/qml/Qt/labs/handlers/qmldir -%{mingw64_libdir}/qt5/qml/Qt/labs/handlers/plugins.qmltypes +%dir %{mingw64_libdir}/qt5/qml/Qt/labs/qmlmodels +%{mingw64_libdir}/qt5/qml/Qt/labs/qmlmodels/plugins.qmltypes +%{mingw64_libdir}/qt5/qml/Qt/labs/qmlmodels/qmldir +%{mingw64_libdir}/qt5/qml/Qt/labs/qmlmodels/labsmodelsplugin.dll %dir %{mingw64_libdir}/qt5/qml/Qt/labs/settings %{mingw64_libdir}/qt5/qml/Qt/labs/settings/plugins.qmltypes %{mingw64_libdir}/qt5/qml/Qt/labs/settings/qmldir @@ -458,6 +477,10 @@ find %{buildroot}%{mingw64_libdir}/qt5 | grep .dll\$ | sed s@"^%{buildroot}"@"%% %{mingw64_libdir}/qt5/qml/Qt/labs/sharedimage/plugins.qmltypes %{mingw64_libdir}/qt5/qml/Qt/labs/sharedimage/qmldir %{mingw64_libdir}/qt5/qml/Qt/labs/sharedimage/sharedimageplugin.dll +%dir %{mingw64_libdir}/qt5/qml/Qt/labs/wavefrontmesh +%{mingw64_libdir}/qt5/qml/Qt/labs/wavefrontmesh/plugins.qmltypes +%{mingw64_libdir}/qt5/qml/Qt/labs/wavefrontmesh/qmldir +%{mingw64_libdir}/qt5/qml/Qt/labs/wavefrontmesh/qmlwavefrontmeshplugin.dll %dir %{mingw64_libdir}/qt5/qml/QtQml %{mingw64_libdir}/qt5/qml/QtQml/plugins.qmltypes %{mingw64_libdir}/qt5/qml/QtQml/qmldir @@ -469,11 +492,11 @@ find %{buildroot}%{mingw64_libdir}/qt5 | grep .dll\$ | sed s@"^%{buildroot}"@"%% %{mingw64_libdir}/qt5/qml/QtQml/StateMachine/plugins.qmltypes %{mingw64_libdir}/qt5/qml/QtQml/StateMachine/qmldir %{mingw64_libdir}/qt5/qml/QtQml/StateMachine/qtqmlstatemachine.dll -%dir %{mingw64_libdir}/qt5/qml/QtQuick %dir %{mingw64_libdir}/qt5/qml/QtQuick.2 %{mingw64_libdir}/qt5/qml/QtQuick.2/plugins.qmltypes %{mingw64_libdir}/qt5/qml/QtQuick.2/qmldir %{mingw64_libdir}/qt5/qml/QtQuick.2/qtquick2plugin.dll +%dir %{mingw64_libdir}/qt5/qml/QtQuick/ %dir %{mingw64_libdir}/qt5/qml/QtQuick/Layouts %{mingw64_libdir}/qt5/qml/QtQuick/Layouts/plugins.qmltypes %{mingw64_libdir}/qt5/qml/QtQuick/Layouts/qmldir @@ -513,6 +536,7 @@ find %{buildroot}%{mingw64_libdir}/qt5 | grep .dll\$ | sed s@"^%{buildroot}"@"%% %{mingw64_datadir}/qt5/mkspecs/modules/qt_lib_quick.pri %{mingw64_datadir}/qt5/mkspecs/modules/qt_lib_quick_private.pri %{mingw64_datadir}/qt5/mkspecs/modules/qt_lib_quickparticles_private.pri +%{mingw64_datadir}/qt5/mkspecs/modules/qt_lib_quickshapes_private.pri %{mingw64_datadir}/qt5/mkspecs/modules/qt_lib_quickwidgets.pri %{mingw64_datadir}/qt5/mkspecs/modules/qt_lib_quickwidgets_private.pri %{mingw64_datadir}/qt5/mkspecs/modules/qt_plugin_qmldbg_debugger.pri @@ -521,6 +545,7 @@ find %{buildroot}%{mingw64_libdir}/qt5 | grep .dll\$ | sed s@"^%{buildroot}"@"%% %{mingw64_datadir}/qt5/mkspecs/modules/qt_plugin_qmldbg_messages.pri %{mingw64_datadir}/qt5/mkspecs/modules/qt_plugin_qmldbg_native.pri %{mingw64_datadir}/qt5/mkspecs/modules/qt_plugin_qmldbg_nativedebugger.pri +%{mingw64_datadir}/qt5/mkspecs/modules/qt_plugin_qmldbg_preview.pri %{mingw64_datadir}/qt5/mkspecs/modules/qt_plugin_qmldbg_profiler.pri %{mingw64_datadir}/qt5/mkspecs/modules/qt_plugin_qmldbg_quickprofiler.pri %{mingw64_datadir}/qt5/mkspecs/modules/qt_plugin_qmldbg_server.pri @@ -542,6 +567,7 @@ find %{buildroot}%{mingw64_libdir}/qt5 | grep .dll\$ | sed s@"^%{buildroot}"@"%% %{mingw64_libdir}/libQt5Qml.a %{mingw64_libdir}/libQt5Quick.a %{mingw64_libdir}/libQt5QuickParticles.a +%{mingw64_libdir}/libQt5QuickShapes.a %{mingw64_libdir}/libQt5QuickTest.a %{mingw64_libdir}/libQt5QuickWidgets.a %{mingw64_libdir}/qt5/plugins/qmltooling/libqmldbg_debugger.a @@ -550,14 +576,16 @@ find %{buildroot}%{mingw64_libdir}/qt5 | grep .dll\$ | sed s@"^%{buildroot}"@"%% %{mingw64_libdir}/qt5/plugins/qmltooling/libqmldbg_messages.a %{mingw64_libdir}/qt5/plugins/qmltooling/libqmldbg_native.a %{mingw64_libdir}/qt5/plugins/qmltooling/libqmldbg_nativedebugger.a +%{mingw64_libdir}/qt5/plugins/qmltooling/libqmldbg_preview.a %{mingw64_libdir}/qt5/plugins/qmltooling/libqmldbg_profiler.a %{mingw64_libdir}/qt5/plugins/qmltooling/libqmldbg_quickprofiler.a %{mingw64_libdir}/qt5/plugins/qmltooling/libqmldbg_server.a %{mingw64_libdir}/qt5/plugins/qmltooling/libqmldbg_tcp.a %{mingw64_libdir}/qt5/qml/Qt/labs/folderlistmodel/libqmlfolderlistmodelplugin.a -%{mingw64_libdir}/qt5/qml/Qt/labs/handlers/libhandlersplugin.a +%{mingw64_libdir}/qt5/qml/Qt/labs/qmlmodels/liblabsmodelsplugin.a %{mingw64_libdir}/qt5/qml/Qt/labs/settings/libqmlsettingsplugin.a %{mingw64_libdir}/qt5/qml/Qt/labs/sharedimage/libsharedimageplugin.a +%{mingw64_libdir}/qt5/qml/Qt/labs/wavefrontmesh/libqmlwavefrontmeshplugin.a %{mingw64_libdir}/qt5/qml/QtQml/Models.2/libmodelsplugin.a %{mingw64_libdir}/qt5/qml/QtQml/StateMachine/libqtqmlstatemachine.a %{mingw64_libdir}/qt5/qml/QtQuick.2/libqtquick2plugin.a @@ -570,6 +598,9 @@ find %{buildroot}%{mingw64_libdir}/qt5 | grep .dll\$ | sed s@"^%{buildroot}"@"%% %changelog +* Wed Apr 17 2019 Sandro Mani - 5.12.3-1 +- Update to 5.12.3 + * Fri Feb 01 2019 Fedora Release Engineering - 5.11.3-2 - Rebuilt for https://fedoraproject.org/wiki/Fedora_30_Mass_Rebuild diff --git a/qtdeclarative_masm.patch b/qtdeclarative_masm.patch index 5c627a5..98c9e12 100644 --- a/qtdeclarative_masm.patch +++ b/qtdeclarative_masm.patch @@ -1,6 +1,19 @@ -diff -rupN qtdeclarative-everywhere-src-5.11.3/src/qmldevtools/qmldevtools.pro qtdeclarative-everywhere-src-5.11.3-new/src/qmldevtools/qmldevtools.pro ---- qtdeclarative-everywhere-src-5.11.3/src/qmldevtools/qmldevtools.pro 2019-01-14 15:48:49.055794176 +0100 -+++ qtdeclarative-everywhere-src-5.11.3-new/src/qmldevtools/qmldevtools.pro 2019-01-14 15:48:50.386793425 +0100 +diff -rupN qtdeclarative-everywhere-src-5.12.3/src/3rdparty/masm/masm.pri qtdeclarative-everywhere-src-5.12.3-new/src/3rdparty/masm/masm.pri +--- qtdeclarative-everywhere-src-5.12.3/src/3rdparty/masm/masm.pri 2019-04-08 11:12:26.000000000 +0200 ++++ qtdeclarative-everywhere-src-5.12.3-new/src/3rdparty/masm/masm.pri 2019-04-17 23:51:33.440430248 +0200 +@@ -130,6 +130,7 @@ QMAKE_EXTRA_COMPILERS += retgen + } + + linux { +- requires(qtConfig(dlopen)) +- QMAKE_USE_PRIVATE += libdl ++# requires(qtConfig(dlopen)) ++# QMAKE_USE_PRIVATE += libdl ++ LIBS += -ldl + } +diff -rupN qtdeclarative-everywhere-src-5.12.3/src/qmldevtools/qmldevtools.pro qtdeclarative-everywhere-src-5.12.3-new/src/qmldevtools/qmldevtools.pro +--- qtdeclarative-everywhere-src-5.12.3/src/qmldevtools/qmldevtools.pro 2019-04-17 23:51:31.350433586 +0200 ++++ qtdeclarative-everywhere-src-5.12.3-new/src/qmldevtools/qmldevtools.pro 2019-04-17 23:51:33.440430248 +0200 @@ -17,6 +17,7 @@ clang:if(greaterThan(QT_CLANG_MAJOR_VERS WERROR += -Wno-error=unused-const-variable diff --git a/sources b/sources index 07efbb7..78d275f 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (qtdeclarative-everywhere-src-5.11.3.tar.xz) = 07d440b10ba2fbd700a191791cb6991fb9ce72c78787340e7f564bdb2bef24b035e15fe2aecd36d58f8794e56bd0aa35d28b350a73707e27748e54d46609e1a0 +SHA512 (qtdeclarative-everywhere-src-5.12.3.tar.xz) = 0caddcfee36cbf52bacd3a400d304511255715e2b5a58c1621ca8120610427c57511785457a9e7fa55975b86e7924a3cffddeb7e2e8e6622af85b7ebac35dd20