diff --git a/.gitignore b/.gitignore index d9448b9..7a2e4f5 100644 --- a/.gitignore +++ b/.gitignore @@ -7,3 +7,4 @@ /qtactiveqt-opensource-src-5.9.1.tar.xz /qtactiveqt-opensource-src-5.9.2.tar.xz /qtactiveqt-opensource-src-5.9.3.tar.xz +/qtactiveqt-opensource-src-5.9.4.tar.xz diff --git a/mingw-qt5-qtactiveqt.spec b/mingw-qt5-qtactiveqt.spec index d4a4d68..f33e4e5 100644 --- a/mingw-qt5-qtactiveqt.spec +++ b/mingw-qt5-qtactiveqt.spec @@ -16,7 +16,7 @@ %global release_version %(echo %{version} | awk -F. '{print $1"."$2}') Name: mingw-qt5-%{qt_module} -Version: 5.9.3 +Version: 5.9.4 Release: 1%{?pre:.%pre}%{?commit:.git%{shortcommit}}%{?dist} Summary: Qt5 for Windows - QtActiveQt component @@ -156,6 +156,9 @@ find %{buildroot} -name "*.prl" -delete %changelog +* Mon Jan 29 2018 Sandro Mani - 5.9.4-1 +- Update to 5.9.4 + * Mon Nov 27 2017 Sandro Mani - 5.9.3-1 - Update to 5.9.3 diff --git a/qtactiveqt-fix-compilation.patch b/qtactiveqt-fix-compilation.patch index ba05652..1376cce 100644 --- a/qtactiveqt-fix-compilation.patch +++ b/qtactiveqt-fix-compilation.patch @@ -1,6 +1,6 @@ -diff -rupN qtactiveqt-opensource-src-5.9.3/src/activeqt/control/qaxserverbase.cpp qtactiveqt-opensource-src-5.9.3-new/src/activeqt/control/qaxserverbase.cpp ---- qtactiveqt-opensource-src-5.9.3/src/activeqt/control/qaxserverbase.cpp 2017-11-08 08:55:46.000000000 +0100 -+++ qtactiveqt-opensource-src-5.9.3-new/src/activeqt/control/qaxserverbase.cpp 2017-11-27 10:19:20.443300915 +0100 +diff -rupN qtactiveqt-opensource-src-5.9.4/src/activeqt/control/qaxserverbase.cpp qtactiveqt-opensource-src-5.9.4-new/src/activeqt/control/qaxserverbase.cpp +--- qtactiveqt-opensource-src-5.9.4/src/activeqt/control/qaxserverbase.cpp 2018-01-05 09:24:28.000000000 +0100 ++++ qtactiveqt-opensource-src-5.9.4-new/src/activeqt/control/qaxserverbase.cpp 2018-01-29 10:35:43.825909296 +0100 @@ -4055,12 +4055,10 @@ HRESULT WINAPI QAxServerBase::SetColorSc } diff --git a/qtactiveqt-fix-host-build.patch b/qtactiveqt-fix-host-build.patch index bac5ab4..c9ffc04 100644 --- a/qtactiveqt-fix-host-build.patch +++ b/qtactiveqt-fix-host-build.patch @@ -1,6 +1,6 @@ -diff -rupN qtactiveqt-opensource-src-5.9.3/src/tools/idc/idc.pro qtactiveqt-opensource-src-5.9.3-new/src/tools/idc/idc.pro ---- qtactiveqt-opensource-src-5.9.3/src/tools/idc/idc.pro 2017-11-08 08:55:46.000000000 +0100 -+++ qtactiveqt-opensource-src-5.9.3-new/src/tools/idc/idc.pro 2017-11-27 10:19:20.458300864 +0100 +diff -rupN qtactiveqt-opensource-src-5.9.4/src/tools/idc/idc.pro qtactiveqt-opensource-src-5.9.4-new/src/tools/idc/idc.pro +--- qtactiveqt-opensource-src-5.9.4/src/tools/idc/idc.pro 2018-01-05 09:24:28.000000000 +0100 ++++ qtactiveqt-opensource-src-5.9.4-new/src/tools/idc/idc.pro 2018-01-29 10:35:43.839909295 +0100 @@ -1,4 +1,3 @@ -option(host_build) CONFIG += force_bootstrap diff --git a/qtactiveqt-fix-undefined-reference.patch b/qtactiveqt-fix-undefined-reference.patch index 9eab1de..0fe16ef 100644 --- a/qtactiveqt-fix-undefined-reference.patch +++ b/qtactiveqt-fix-undefined-reference.patch @@ -1,6 +1,6 @@ -diff -rupN qtactiveqt-opensource-src-5.9.3/tools/dumpcpp/dumpcpp.pro qtactiveqt-opensource-src-5.9.3-new/tools/dumpcpp/dumpcpp.pro ---- qtactiveqt-opensource-src-5.9.3/tools/dumpcpp/dumpcpp.pro 2017-11-08 08:55:46.000000000 +0100 -+++ qtactiveqt-opensource-src-5.9.3-new/tools/dumpcpp/dumpcpp.pro 2017-11-27 10:19:20.487300765 +0100 +diff -rupN qtactiveqt-opensource-src-5.9.4/tools/dumpcpp/dumpcpp.pro qtactiveqt-opensource-src-5.9.4-new/tools/dumpcpp/dumpcpp.pro +--- qtactiveqt-opensource-src-5.9.4/tools/dumpcpp/dumpcpp.pro 2018-01-05 09:24:28.000000000 +0100 ++++ qtactiveqt-opensource-src-5.9.4-new/tools/dumpcpp/dumpcpp.pro 2018-01-29 10:35:43.869909294 +0100 @@ -2,5 +2,7 @@ QT += axcontainer widgets core-private DEFINES += QT_NO_CAST_TO_ASCII QT_ASCII_CAST_WARNINGS @@ -9,9 +9,9 @@ diff -rupN qtactiveqt-opensource-src-5.9.3/tools/dumpcpp/dumpcpp.pro qtactiveqt- +mingw: LIBS_PRIVATE += -luuid load(qt_tool) -diff -rupN qtactiveqt-opensource-src-5.9.3/tools/dumpdoc/dumpdoc.pro qtactiveqt-opensource-src-5.9.3-new/tools/dumpdoc/dumpdoc.pro ---- qtactiveqt-opensource-src-5.9.3/tools/dumpdoc/dumpdoc.pro 2017-11-08 08:55:46.000000000 +0100 -+++ qtactiveqt-opensource-src-5.9.3-new/tools/dumpdoc/dumpdoc.pro 2017-11-27 10:19:20.487300765 +0100 +diff -rupN qtactiveqt-opensource-src-5.9.4/tools/dumpdoc/dumpdoc.pro qtactiveqt-opensource-src-5.9.4-new/tools/dumpdoc/dumpdoc.pro +--- qtactiveqt-opensource-src-5.9.4/tools/dumpdoc/dumpdoc.pro 2018-01-05 09:24:28.000000000 +0100 ++++ qtactiveqt-opensource-src-5.9.4-new/tools/dumpdoc/dumpdoc.pro 2018-01-29 10:35:43.869909294 +0100 @@ -1,5 +1,7 @@ QT += axcontainer widgets @@ -20,9 +20,9 @@ diff -rupN qtactiveqt-opensource-src-5.9.3/tools/dumpdoc/dumpdoc.pro qtactiveqt- +mingw: LIBS_PRIVATE += -luuid load(qt_tool) -diff -rupN qtactiveqt-opensource-src-5.9.3/tools/testcon/testcon.pro qtactiveqt-opensource-src-5.9.3-new/tools/testcon/testcon.pro ---- qtactiveqt-opensource-src-5.9.3/tools/testcon/testcon.pro 2017-11-08 08:55:46.000000000 +0100 -+++ qtactiveqt-opensource-src-5.9.3-new/tools/testcon/testcon.pro 2017-11-27 10:19:20.487300765 +0100 +diff -rupN qtactiveqt-opensource-src-5.9.4/tools/testcon/testcon.pro qtactiveqt-opensource-src-5.9.4-new/tools/testcon/testcon.pro +--- qtactiveqt-opensource-src-5.9.4/tools/testcon/testcon.pro 2018-01-05 09:24:28.000000000 +0100 ++++ qtactiveqt-opensource-src-5.9.4-new/tools/testcon/testcon.pro 2018-01-29 10:35:43.869909294 +0100 @@ -9,6 +9,8 @@ FORMS = mainwindow.ui invokemethod.ui RC_FILE = testcon.rc diff --git a/qtactiveqt-win64.patch b/qtactiveqt-win64.patch index 003a9d9..505290e 100644 --- a/qtactiveqt-win64.patch +++ b/qtactiveqt-win64.patch @@ -1,6 +1,6 @@ -diff -rupN qtactiveqt-opensource-src-5.9.3/src/activeqt/container/qaxbase.cpp qtactiveqt-opensource-src-5.9.3-new/src/activeqt/container/qaxbase.cpp ---- qtactiveqt-opensource-src-5.9.3/src/activeqt/container/qaxbase.cpp 2017-11-08 08:55:46.000000000 +0100 -+++ qtactiveqt-opensource-src-5.9.3-new/src/activeqt/container/qaxbase.cpp 2017-11-27 10:19:20.471300820 +0100 +diff -rupN qtactiveqt-opensource-src-5.9.4/src/activeqt/container/qaxbase.cpp qtactiveqt-opensource-src-5.9.4-new/src/activeqt/container/qaxbase.cpp +--- qtactiveqt-opensource-src-5.9.4/src/activeqt/container/qaxbase.cpp 2018-01-05 09:24:28.000000000 +0100 ++++ qtactiveqt-opensource-src-5.9.4-new/src/activeqt/container/qaxbase.cpp 2018-01-29 10:35:43.853909295 +0100 @@ -2180,6 +2180,10 @@ void MetaObjectGenerator::readClassInfo( const QStringList versions = controls.childGroups(); for (const QString &version : versions) { @@ -12,9 +12,9 @@ diff -rupN qtactiveqt-opensource-src-5.9.3/src/activeqt/container/qaxbase.cpp qt if (!tlfile.isEmpty()) break; } -diff -rupN qtactiveqt-opensource-src-5.9.3/tools/dumpcpp/main.cpp qtactiveqt-opensource-src-5.9.3-new/tools/dumpcpp/main.cpp ---- qtactiveqt-opensource-src-5.9.3/tools/dumpcpp/main.cpp 2017-11-08 08:55:46.000000000 +0100 -+++ qtactiveqt-opensource-src-5.9.3-new/tools/dumpcpp/main.cpp 2017-11-27 10:19:20.472300816 +0100 +diff -rupN qtactiveqt-opensource-src-5.9.4/tools/dumpcpp/main.cpp qtactiveqt-opensource-src-5.9.4-new/tools/dumpcpp/main.cpp +--- qtactiveqt-opensource-src-5.9.4/tools/dumpcpp/main.cpp 2018-01-05 09:24:28.000000000 +0100 ++++ qtactiveqt-opensource-src-5.9.4-new/tools/dumpcpp/main.cpp 2018-01-29 10:35:43.854909295 +0100 @@ -1539,6 +1539,10 @@ int main(int argc, char **argv) typeLib = settings.value(QLatin1Char('/') + codes.at(c) + QLatin1String("/0/win32/.")).toString(); if (QFile::exists(typeLib)) diff --git a/sources b/sources index 908bad5..497d996 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (qtactiveqt-opensource-src-5.9.3.tar.xz) = 2cfc711bfedb790ee25daa4ff120aa93d63ec7752ce0c1ba2d938de1ec8cd4232ebc315c1b06a85bc23c85584be158fe2b3472d94cef615013e0c30bafbc21a2 +SHA512 (qtactiveqt-opensource-src-5.9.4.tar.xz) = 4af6f391d5cd04f536cc962be3f32476f54dcd3ce3f4e38f85d5766e5e57c0650b6e05636bbbde9134ec34f0180fdf2eb0e6f92b321166aec19d2ea1d1dd9128