diff --git a/.gitignore b/.gitignore index 2d7707d..a8a2bd7 100644 --- a/.gitignore +++ b/.gitignore @@ -17,3 +17,4 @@ /qtactiveqt-everywhere-src-5.12.4.tar.xz /qtactiveqt-everywhere-src-5.12.5.tar.xz /qtactiveqt-everywhere-src-5.13.2.tar.xz +/qtactiveqt-everywhere-src-5.14.2.tar.xz diff --git a/mingw-qt5-qtactiveqt.spec b/mingw-qt5-qtactiveqt.spec index 350b5ac..9b5fd99 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.13.2 -Release: 2%{?dist} +Version: 5.14.2 +Release: 1%{?dist} Summary: Qt5 for Windows - QtActiveQt component License: GPLv3 with exceptions or LGPLv2 with exceptions or BSD @@ -154,6 +154,9 @@ find %{buildroot} -name "*.prl" -delete %changelog +* Tue Apr 07 2020 Sandro Mani - 5.14.2-1 +- Update to 5.14.2 + * Wed Jan 29 2020 Fedora Release Engineering - 5.13.2-2 - Rebuilt for https://fedoraproject.org/wiki/Fedora_32_Mass_Rebuild diff --git a/qtactiveqt-fix-host-build.patch b/qtactiveqt-fix-host-build.patch index f457c44..ba06f96 100644 --- a/qtactiveqt-fix-host-build.patch +++ b/qtactiveqt-fix-host-build.patch @@ -1,6 +1,6 @@ -diff -rupN --no-dereference qtactiveqt-everywhere-src-5.13.2/src/tools/idc/idc.pro qtactiveqt-everywhere-src-5.13.2-new/src/tools/idc/idc.pro ---- qtactiveqt-everywhere-src-5.13.2/src/tools/idc/idc.pro 2019-10-14 12:20:33.000000000 +0200 -+++ qtactiveqt-everywhere-src-5.13.2-new/src/tools/idc/idc.pro 2019-12-11 10:19:29.375708870 +0100 +diff -rupN --no-dereference qtactiveqt-everywhere-src-5.14.2/src/tools/idc/idc.pro qtactiveqt-everywhere-src-5.14.2-new/src/tools/idc/idc.pro +--- qtactiveqt-everywhere-src-5.14.2/src/tools/idc/idc.pro 2020-03-03 14:10:30.000000000 +0100 ++++ qtactiveqt-everywhere-src-5.14.2-new/src/tools/idc/idc.pro 2020-04-07 19:42:44.742381780 +0200 @@ -1,4 +1,3 @@ -option(host_build) CONFIG += force_bootstrap diff --git a/qtactiveqt-spontaneous-event.patch b/qtactiveqt-spontaneous-event.patch index ab81d98..74509a7 100644 --- a/qtactiveqt-spontaneous-event.patch +++ b/qtactiveqt-spontaneous-event.patch @@ -1,7 +1,7 @@ -diff -rupN --no-dereference qtactiveqt-everywhere-src-5.13.2/src/activeqt/control/qaxserverbase.cpp qtactiveqt-everywhere-src-5.13.2-new/src/activeqt/control/qaxserverbase.cpp ---- qtactiveqt-everywhere-src-5.13.2/src/activeqt/control/qaxserverbase.cpp 2019-10-14 12:20:33.000000000 +0200 -+++ qtactiveqt-everywhere-src-5.13.2-new/src/activeqt/control/qaxserverbase.cpp 2019-12-11 10:19:29.432709728 +0100 -@@ -1875,9 +1875,6 @@ void QAxServerBase::resize(const QSize & +diff -rupN --no-dereference qtactiveqt-everywhere-src-5.14.2/src/activeqt/control/qaxserverbase.cpp qtactiveqt-everywhere-src-5.14.2-new/src/activeqt/control/qaxserverbase.cpp +--- qtactiveqt-everywhere-src-5.14.2/src/activeqt/control/qaxserverbase.cpp 2020-03-03 14:10:30.000000000 +0100 ++++ qtactiveqt-everywhere-src-5.14.2-new/src/activeqt/control/qaxserverbase.cpp 2020-04-07 19:42:44.782381844 +0200 +@@ -1855,9 +1855,6 @@ void QAxServerBase::resize(const QSize & // make sure we get a resize event even if not embedded as a control if (!m_hWnd && !qt.widget->isVisible() && newSize != oldSize) { QResizeEvent resizeEvent(newSize, oldSize); @@ -11,7 +11,7 @@ diff -rupN --no-dereference qtactiveqt-everywhere-src-5.13.2/src/activeqt/contro qt_sendSpontaneousEvent(qt.widget, &resizeEvent); } m_currentExtent = qt.widget->size(); -@@ -4081,12 +4078,10 @@ HRESULT WINAPI QAxServerBase::SetColorSc +@@ -4062,12 +4059,10 @@ HRESULT WINAPI QAxServerBase::SetColorSc } diff --git a/qtactiveqt-win64.patch b/qtactiveqt-win64.patch index 902b35c..5475723 100644 --- a/qtactiveqt-win64.patch +++ b/qtactiveqt-win64.patch @@ -1,7 +1,7 @@ -diff -rupN --no-dereference qtactiveqt-everywhere-src-5.13.2/src/activeqt/container/qaxbase.cpp qtactiveqt-everywhere-src-5.13.2-new/src/activeqt/container/qaxbase.cpp ---- qtactiveqt-everywhere-src-5.13.2/src/activeqt/container/qaxbase.cpp 2019-10-14 12:20:33.000000000 +0200 -+++ qtactiveqt-everywhere-src-5.13.2-new/src/activeqt/container/qaxbase.cpp 2019-12-11 10:19:29.405709322 +0100 -@@ -2209,6 +2209,10 @@ void MetaObjectGenerator::readClassInfo( +diff -rupN --no-dereference qtactiveqt-everywhere-src-5.14.2/src/activeqt/container/qaxbase.cpp qtactiveqt-everywhere-src-5.14.2-new/src/activeqt/container/qaxbase.cpp +--- qtactiveqt-everywhere-src-5.14.2/src/activeqt/container/qaxbase.cpp 2020-03-03 14:10:30.000000000 +0100 ++++ qtactiveqt-everywhere-src-5.14.2-new/src/activeqt/container/qaxbase.cpp 2020-04-07 19:42:44.761381811 +0200 +@@ -2204,6 +2204,10 @@ void MetaObjectGenerator::readClassInfo( const QStringList versions = controls.childGroups(); for (const QString &version : versions) { tlfile = controls.value(QLatin1Char('/') + version + QLatin1String("/0/win32/.")).toString(); @@ -12,10 +12,10 @@ diff -rupN --no-dereference qtactiveqt-everywhere-src-5.13.2/src/activeqt/contai if (!tlfile.isEmpty()) break; } -diff -rupN --no-dereference qtactiveqt-everywhere-src-5.13.2/tools/dumpcpp/main.cpp qtactiveqt-everywhere-src-5.13.2-new/tools/dumpcpp/main.cpp ---- qtactiveqt-everywhere-src-5.13.2/tools/dumpcpp/main.cpp 2019-10-14 12:20:33.000000000 +0200 -+++ qtactiveqt-everywhere-src-5.13.2-new/tools/dumpcpp/main.cpp 2019-12-11 10:19:29.406709337 +0100 -@@ -1552,6 +1552,10 @@ int main(int argc, char **argv) +diff -rupN --no-dereference qtactiveqt-everywhere-src-5.14.2/tools/dumpcpp/main.cpp qtactiveqt-everywhere-src-5.14.2-new/tools/dumpcpp/main.cpp +--- qtactiveqt-everywhere-src-5.14.2/tools/dumpcpp/main.cpp 2020-03-03 14:10:30.000000000 +0100 ++++ qtactiveqt-everywhere-src-5.14.2-new/tools/dumpcpp/main.cpp 2020-04-07 19:42:44.761381811 +0200 +@@ -1580,6 +1580,10 @@ int main(int argc, char **argv) typeLib = settings.value(QLatin1Char('/') + codes.at(c) + QLatin1String("/0/win32/.")).toString(); if (QFile::exists(typeLib)) break; @@ -26,7 +26,7 @@ diff -rupN --no-dereference qtactiveqt-everywhere-src-5.13.2/tools/dumpcpp/main. } if (!typeLib.isEmpty()) -@@ -1611,6 +1615,10 @@ int main(int argc, char **argv) +@@ -1639,6 +1643,10 @@ int main(int argc, char **argv) + QLatin1String("/win32/.")).toString(); if (QFile::exists(typeLib)) break; diff --git a/sources b/sources index e8623a9..61a6430 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (qtactiveqt-everywhere-src-5.13.2.tar.xz) = 75894d8f2912b26bed8c6ca09ef93a0e7cc0af76886019262059861b0a13d69d4648b8ef3c88c4d0ab3a14d943a8813ffb897006e464b0c9bec57b73de242784 +SHA512 (qtactiveqt-everywhere-src-5.14.2.tar.xz) = 730a9086d09659e869045f2bc2a5eb43f99447e1bc176159bbc59175562ef6a562bd7a24f9923f4ceac12fdd902104fd7dbc418d8acda9b127c3e3f2d871a8f3