From 22abc1ef48f89a3f6cd5cbc092eccd89920b3eff Mon Sep 17 00:00:00 2001 From: Sandro Mani Date: Jun 19 2018 19:40:06 +0000 Subject: Update to 5.11.1 --- diff --git a/.gitignore b/.gitignore index 2ee5ff8..49cab9e 100644 --- a/.gitignore +++ b/.gitignore @@ -10,3 +10,4 @@ /qtactiveqt-everywhere-src-5.10.0.tar.xz /qtactiveqt-everywhere-src-5.10.1.tar.xz /qtactiveqt-everywhere-src-5.11.0.tar.xz +/qtactiveqt-everywhere-src-5.11.1.tar.xz diff --git a/mingw-qt5-qtactiveqt.spec b/mingw-qt5-qtactiveqt.spec index 561829e..0b4349f 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.0 -Release: 1%{?pre:.%pre}%{?commit:.git%{shortcommit}}%{?dist} +Version: 5.11.1 +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 +* Tue Jun 19 2018 Sandro Mani - 5.11.1-1 +- Update to 5.11.1 + * Wed May 30 2018 Sandro Mani - 5.11.0-1 - Update to 5.11.0 diff --git a/qtactiveqt-fix-compilation.patch b/qtactiveqt-fix-compilation.patch index 316e808..cec3132 100644 --- a/qtactiveqt-fix-compilation.patch +++ b/qtactiveqt-fix-compilation.patch @@ -1,6 +1,6 @@ -diff -rupN qtactiveqt-everywhere-src-5.11.0/src/activeqt/control/qaxserverbase.cpp qtactiveqt-everywhere-src-5.11.0-new/src/activeqt/control/qaxserverbase.cpp ---- qtactiveqt-everywhere-src-5.11.0/src/activeqt/control/qaxserverbase.cpp 2018-04-20 13:57:05.000000000 +0200 -+++ qtactiveqt-everywhere-src-5.11.0-new/src/activeqt/control/qaxserverbase.cpp 2018-05-30 10:03:34.943986755 +0200 +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 @@ -4055,12 +4055,10 @@ HRESULT WINAPI QAxServerBase::SetColorSc } diff --git a/qtactiveqt-fix-host-build.patch b/qtactiveqt-fix-host-build.patch index 58edfc6..b1fe720 100644 --- a/qtactiveqt-fix-host-build.patch +++ b/qtactiveqt-fix-host-build.patch @@ -1,6 +1,6 @@ -diff -rupN qtactiveqt-everywhere-src-5.11.0/src/tools/idc/idc.pro qtactiveqt-everywhere-src-5.11.0-new/src/tools/idc/idc.pro ---- qtactiveqt-everywhere-src-5.11.0/src/tools/idc/idc.pro 2018-04-20 13:57:05.000000000 +0200 -+++ qtactiveqt-everywhere-src-5.11.0-new/src/tools/idc/idc.pro 2018-05-30 10:03:34.960986754 +0200 +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 @@ -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 94a7bf7..6f5b774 100644 --- a/qtactiveqt-fix-undefined-reference.patch +++ b/qtactiveqt-fix-undefined-reference.patch @@ -1,6 +1,6 @@ -diff -rupN qtactiveqt-everywhere-src-5.11.0/tools/dumpcpp/dumpcpp.pro qtactiveqt-everywhere-src-5.11.0-new/tools/dumpcpp/dumpcpp.pro ---- qtactiveqt-everywhere-src-5.11.0/tools/dumpcpp/dumpcpp.pro 2018-04-20 13:57:05.000000000 +0200 -+++ qtactiveqt-everywhere-src-5.11.0-new/tools/dumpcpp/dumpcpp.pro 2018-05-30 10:03:34.996986752 +0200 +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 @@ -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.0/tools/dumpcpp/dumpcpp.pro qtactiveqt QMAKE_TARGET_DESCRIPTION = "Active Qt DumpCpp" load(qt_tool) -diff -rupN qtactiveqt-everywhere-src-5.11.0/tools/dumpdoc/dumpdoc.pro qtactiveqt-everywhere-src-5.11.0-new/tools/dumpdoc/dumpdoc.pro ---- qtactiveqt-everywhere-src-5.11.0/tools/dumpdoc/dumpdoc.pro 2018-04-20 13:57:05.000000000 +0200 -+++ qtactiveqt-everywhere-src-5.11.0-new/tools/dumpdoc/dumpdoc.pro 2018-05-30 10:03:34.997986752 +0200 +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 @@ -1,6 +1,8 @@ QT += axcontainer widgets @@ -22,9 +22,9 @@ diff -rupN qtactiveqt-everywhere-src-5.11.0/tools/dumpdoc/dumpdoc.pro qtactiveqt QMAKE_TARGET_DESCRIPTION = "Active Qt DumpDoc" load(qt_tool) -diff -rupN qtactiveqt-everywhere-src-5.11.0/tools/testcon/testcon.pro qtactiveqt-everywhere-src-5.11.0-new/tools/testcon/testcon.pro ---- qtactiveqt-everywhere-src-5.11.0/tools/testcon/testcon.pro 2018-04-20 13:57:05.000000000 +0200 -+++ qtactiveqt-everywhere-src-5.11.0-new/tools/testcon/testcon.pro 2018-05-30 10:03:34.997986752 +0200 +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 @@ -10,6 +10,8 @@ RC_FILE = testcon.rc RESOURCES += testcon.qrc diff --git a/qtactiveqt-win64.patch b/qtactiveqt-win64.patch index 13a57f3..4b783f1 100644 --- a/qtactiveqt-win64.patch +++ b/qtactiveqt-win64.patch @@ -1,6 +1,6 @@ -diff -rupN qtactiveqt-everywhere-src-5.11.0/src/activeqt/container/qaxbase.cpp qtactiveqt-everywhere-src-5.11.0-new/src/activeqt/container/qaxbase.cpp ---- qtactiveqt-everywhere-src-5.11.0/src/activeqt/container/qaxbase.cpp 2018-04-20 13:57:05.000000000 +0200 -+++ qtactiveqt-everywhere-src-5.11.0-new/src/activeqt/container/qaxbase.cpp 2018-05-30 10:03:34.978986753 +0200 +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 @@ -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.0/src/activeqt/container/qaxbase.cpp q if (!tlfile.isEmpty()) break; } -diff -rupN qtactiveqt-everywhere-src-5.11.0/tools/dumpcpp/main.cpp qtactiveqt-everywhere-src-5.11.0-new/tools/dumpcpp/main.cpp ---- qtactiveqt-everywhere-src-5.11.0/tools/dumpcpp/main.cpp 2018-04-20 13:57:05.000000000 +0200 -+++ qtactiveqt-everywhere-src-5.11.0-new/tools/dumpcpp/main.cpp 2018-05-30 10:03:34.978986753 +0200 +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 @@ -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 9131ed1..59fbd2b 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (qtactiveqt-everywhere-src-5.11.0.tar.xz) = 61e163bf07a9e5759364b13d69962674050808c73f28f45e11f8aff5a9e424b0ff6b2d86f3651cacaf8efa2f02b7a11c00046d0bdc524489cc804a5e4e2c6d05 +SHA512 (qtactiveqt-everywhere-src-5.11.1.tar.xz) = a6fb4a3a53f5965e0913276a784f2fce81351a9c54cc190f15b431a497e04a4b823a8cec132713e382dc4e3ab2edef967e920c7aaa7392a72d7b12263c9f4876