diff --git a/.gitignore b/.gitignore index 49cab9e..7d61792 100644 --- a/.gitignore +++ b/.gitignore @@ -11,3 +11,4 @@ /qtactiveqt-everywhere-src-5.10.1.tar.xz /qtactiveqt-everywhere-src-5.11.0.tar.xz /qtactiveqt-everywhere-src-5.11.1.tar.xz +/qtactiveqt-everywhere-src-5.11.2.tar.xz diff --git a/mingw-qt5-qtactiveqt.spec b/mingw-qt5-qtactiveqt.spec index a185b77..1ac0730 100644 --- a/mingw-qt5-qtactiveqt.spec +++ b/mingw-qt5-qtactiveqt.spec @@ -16,8 +16,8 @@ %global release_version %(echo %{version} | awk -F. '{print $1"."$2}') Name: mingw-qt5-%{qt_module} -Version: 5.11.1 -Release: 2%{?dist} +Version: 5.11.2 +Release: 1%{?dist} Summary: Qt5 for Windows - QtActiveQt component License: GPLv3 with exceptions or LGPLv2 with exceptions or BSD @@ -156,6 +156,9 @@ find %{buildroot} -name "*.prl" -delete %changelog +* Sat Sep 22 2018 Sandro Mani - 5.11.2-1 +- Update to 5.11.2 + * Fri Jul 13 2018 Fedora Release Engineering - 5.11.1-2 - Rebuilt for https://fedoraproject.org/wiki/Fedora_29_Mass_Rebuild diff --git a/qtactiveqt-fix-compilation.patch b/qtactiveqt-fix-compilation.patch index cec3132..b4f55e6 100644 --- a/qtactiveqt-fix-compilation.patch +++ b/qtactiveqt-fix-compilation.patch @@ -1,6 +1,6 @@ -diff -rupN qtactiveqt-everywhere-src-5.11.1/src/activeqt/control/qaxserverbase.cpp qtactiveqt-everywhere-src-5.11.1-new/src/activeqt/control/qaxserverbase.cpp ---- qtactiveqt-everywhere-src-5.11.1/src/activeqt/control/qaxserverbase.cpp 2018-06-12 09:03:32.000000000 +0200 -+++ qtactiveqt-everywhere-src-5.11.1-new/src/activeqt/control/qaxserverbase.cpp 2018-06-19 21:39:57.840986955 +0200 +diff -rupN qtactiveqt-everywhere-src-5.11.2/src/activeqt/control/qaxserverbase.cpp qtactiveqt-everywhere-src-5.11.2-new/src/activeqt/control/qaxserverbase.cpp +--- qtactiveqt-everywhere-src-5.11.2/src/activeqt/control/qaxserverbase.cpp 2018-08-29 06:54:32.000000000 +0200 ++++ qtactiveqt-everywhere-src-5.11.2-new/src/activeqt/control/qaxserverbase.cpp 2018-09-22 22:02:07.278760756 +0200 @@ -4055,12 +4055,10 @@ HRESULT WINAPI QAxServerBase::SetColorSc } diff --git a/qtactiveqt-fix-host-build.patch b/qtactiveqt-fix-host-build.patch index b1fe720..cba4c2c 100644 --- a/qtactiveqt-fix-host-build.patch +++ b/qtactiveqt-fix-host-build.patch @@ -1,6 +1,6 @@ -diff -rupN qtactiveqt-everywhere-src-5.11.1/src/tools/idc/idc.pro qtactiveqt-everywhere-src-5.11.1-new/src/tools/idc/idc.pro ---- qtactiveqt-everywhere-src-5.11.1/src/tools/idc/idc.pro 2018-06-12 09:03:32.000000000 +0200 -+++ qtactiveqt-everywhere-src-5.11.1-new/src/tools/idc/idc.pro 2018-06-19 21:39:57.856986954 +0200 +diff -rupN qtactiveqt-everywhere-src-5.11.2/src/tools/idc/idc.pro qtactiveqt-everywhere-src-5.11.2-new/src/tools/idc/idc.pro +--- qtactiveqt-everywhere-src-5.11.2/src/tools/idc/idc.pro 2018-08-29 06:54:32.000000000 +0200 ++++ qtactiveqt-everywhere-src-5.11.2-new/src/tools/idc/idc.pro 2018-09-22 22:02:07.294760755 +0200 @@ -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 6f5b774..4bbcba8 100644 --- a/qtactiveqt-fix-undefined-reference.patch +++ b/qtactiveqt-fix-undefined-reference.patch @@ -1,6 +1,6 @@ -diff -rupN qtactiveqt-everywhere-src-5.11.1/tools/dumpcpp/dumpcpp.pro qtactiveqt-everywhere-src-5.11.1-new/tools/dumpcpp/dumpcpp.pro ---- qtactiveqt-everywhere-src-5.11.1/tools/dumpcpp/dumpcpp.pro 2018-06-12 09:03:32.000000000 +0200 -+++ qtactiveqt-everywhere-src-5.11.1-new/tools/dumpcpp/dumpcpp.pro 2018-06-19 21:39:57.893986952 +0200 +diff -rupN qtactiveqt-everywhere-src-5.11.2/tools/dumpcpp/dumpcpp.pro qtactiveqt-everywhere-src-5.11.2-new/tools/dumpcpp/dumpcpp.pro +--- qtactiveqt-everywhere-src-5.11.2/tools/dumpcpp/dumpcpp.pro 2018-08-29 06:54:32.000000000 +0200 ++++ qtactiveqt-everywhere-src-5.11.2-new/tools/dumpcpp/dumpcpp.pro 2018-09-22 22:02:07.342760752 +0200 @@ -2,6 +2,8 @@ QT += axcontainer widgets core-private DEFINES += QT_NO_CAST_TO_ASCII QT_ASCII_CAST_WARNINGS @@ -10,9 +10,9 @@ diff -rupN qtactiveqt-everywhere-src-5.11.1/tools/dumpcpp/dumpcpp.pro qtactiveqt QMAKE_TARGET_DESCRIPTION = "Active Qt DumpCpp" load(qt_tool) -diff -rupN qtactiveqt-everywhere-src-5.11.1/tools/dumpdoc/dumpdoc.pro qtactiveqt-everywhere-src-5.11.1-new/tools/dumpdoc/dumpdoc.pro ---- qtactiveqt-everywhere-src-5.11.1/tools/dumpdoc/dumpdoc.pro 2018-06-12 09:03:32.000000000 +0200 -+++ qtactiveqt-everywhere-src-5.11.1-new/tools/dumpdoc/dumpdoc.pro 2018-06-19 21:39:57.894986952 +0200 +diff -rupN qtactiveqt-everywhere-src-5.11.2/tools/dumpdoc/dumpdoc.pro qtactiveqt-everywhere-src-5.11.2-new/tools/dumpdoc/dumpdoc.pro +--- qtactiveqt-everywhere-src-5.11.2/tools/dumpdoc/dumpdoc.pro 2018-08-29 06:54:32.000000000 +0200 ++++ qtactiveqt-everywhere-src-5.11.2-new/tools/dumpdoc/dumpdoc.pro 2018-09-22 22:02:07.342760752 +0200 @@ -1,6 +1,8 @@ QT += axcontainer widgets @@ -22,9 +22,9 @@ diff -rupN qtactiveqt-everywhere-src-5.11.1/tools/dumpdoc/dumpdoc.pro qtactiveqt QMAKE_TARGET_DESCRIPTION = "Active Qt DumpDoc" load(qt_tool) -diff -rupN qtactiveqt-everywhere-src-5.11.1/tools/testcon/testcon.pro qtactiveqt-everywhere-src-5.11.1-new/tools/testcon/testcon.pro ---- qtactiveqt-everywhere-src-5.11.1/tools/testcon/testcon.pro 2018-06-12 09:03:32.000000000 +0200 -+++ qtactiveqt-everywhere-src-5.11.1-new/tools/testcon/testcon.pro 2018-06-19 21:39:57.894986952 +0200 +diff -rupN qtactiveqt-everywhere-src-5.11.2/tools/testcon/testcon.pro qtactiveqt-everywhere-src-5.11.2-new/tools/testcon/testcon.pro +--- qtactiveqt-everywhere-src-5.11.2/tools/testcon/testcon.pro 2018-08-29 06:54:32.000000000 +0200 ++++ qtactiveqt-everywhere-src-5.11.2-new/tools/testcon/testcon.pro 2018-09-22 22:02:07.343760752 +0200 @@ -10,6 +10,8 @@ RC_FILE = testcon.rc RESOURCES += testcon.qrc diff --git a/qtactiveqt-win64.patch b/qtactiveqt-win64.patch index 4b783f1..28ca4d4 100644 --- a/qtactiveqt-win64.patch +++ b/qtactiveqt-win64.patch @@ -1,6 +1,6 @@ -diff -rupN qtactiveqt-everywhere-src-5.11.1/src/activeqt/container/qaxbase.cpp qtactiveqt-everywhere-src-5.11.1-new/src/activeqt/container/qaxbase.cpp ---- qtactiveqt-everywhere-src-5.11.1/src/activeqt/container/qaxbase.cpp 2018-06-12 09:03:32.000000000 +0200 -+++ qtactiveqt-everywhere-src-5.11.1-new/src/activeqt/container/qaxbase.cpp 2018-06-19 21:39:57.873986953 +0200 +diff -rupN qtactiveqt-everywhere-src-5.11.2/src/activeqt/container/qaxbase.cpp qtactiveqt-everywhere-src-5.11.2-new/src/activeqt/container/qaxbase.cpp +--- qtactiveqt-everywhere-src-5.11.2/src/activeqt/container/qaxbase.cpp 2018-08-29 06:54:32.000000000 +0200 ++++ qtactiveqt-everywhere-src-5.11.2-new/src/activeqt/container/qaxbase.cpp 2018-09-22 22:02:07.315760754 +0200 @@ -2180,6 +2180,10 @@ void MetaObjectGenerator::readClassInfo( const QStringList versions = controls.childGroups(); for (const QString &version : versions) { @@ -12,9 +12,9 @@ diff -rupN qtactiveqt-everywhere-src-5.11.1/src/activeqt/container/qaxbase.cpp q if (!tlfile.isEmpty()) break; } -diff -rupN qtactiveqt-everywhere-src-5.11.1/tools/dumpcpp/main.cpp qtactiveqt-everywhere-src-5.11.1-new/tools/dumpcpp/main.cpp ---- qtactiveqt-everywhere-src-5.11.1/tools/dumpcpp/main.cpp 2018-06-12 09:03:32.000000000 +0200 -+++ qtactiveqt-everywhere-src-5.11.1-new/tools/dumpcpp/main.cpp 2018-06-19 21:39:57.873986953 +0200 +diff -rupN qtactiveqt-everywhere-src-5.11.2/tools/dumpcpp/main.cpp qtactiveqt-everywhere-src-5.11.2-new/tools/dumpcpp/main.cpp +--- qtactiveqt-everywhere-src-5.11.2/tools/dumpcpp/main.cpp 2018-08-29 06:54:32.000000000 +0200 ++++ qtactiveqt-everywhere-src-5.11.2-new/tools/dumpcpp/main.cpp 2018-09-22 22:02:07.316760754 +0200 @@ -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 59fbd2b..a30506a 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (qtactiveqt-everywhere-src-5.11.1.tar.xz) = a6fb4a3a53f5965e0913276a784f2fce81351a9c54cc190f15b431a497e04a4b823a8cec132713e382dc4e3ab2edef967e920c7aaa7392a72d7b12263c9f4876 +SHA512 (qtactiveqt-everywhere-src-5.11.2.tar.xz) = 50027f3429a4e9f140e259f228ea46420284a9632bba3ed92b9b44fbc1c168b6b2d039986d6a07e17ae1afff4f0aec3ccfe8a660322449a3258ab251c1910135