diff --git a/.gitignore b/.gitignore index 51c1b7d..8e6d6e7 100644 --- a/.gitignore +++ b/.gitignore @@ -20,3 +20,4 @@ /qtactiveqt-everywhere-src-5.14.2.tar.xz /qtactiveqt-everywhere-src-5.15.1.tar.xz /qtactiveqt-everywhere-src-5.15.2.tar.xz +/qtactiveqt-everywhere-opensource-src-5.15.3.tar.xz diff --git a/mingw-qt5-qtactiveqt.spec b/mingw-qt5-qtactiveqt.spec index 8bc443c..84b0ea8 100644 --- a/mingw-qt5-qtactiveqt.spec +++ b/mingw-qt5-qtactiveqt.spec @@ -16,8 +16,8 @@ %define release_version %(echo %{version} | awk -F. '{print $1"."$2}') Name: mingw-qt5-%{qt_module} -Version: 5.15.2 -Release: 4%{?dist} +Version: 5.15.3 +Release: 1%{?dist} Summary: Qt5 for Windows - QtActiveQt component License: GPLv3 with exceptions or LGPLv2 with exceptions or BSD @@ -155,6 +155,9 @@ find %{buildroot} -name "*.prl" -delete %changelog +* Tue Mar 15 2022 Sandro Mani - 5.15.3-1 +- Update to 5.15.3 + * Thu Jan 20 2022 Fedora Release Engineering - 5.15.2-4 - Rebuilt for https://fedoraproject.org/wiki/Fedora_36_Mass_Rebuild diff --git a/qtactiveqt-fix-host-build.patch b/qtactiveqt-fix-host-build.patch index b7e2017..3b46779 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.15.2/src/tools/idc/idc.pro qtactiveqt-everywhere-src-5.15.2-new/src/tools/idc/idc.pro ---- qtactiveqt-everywhere-src-5.15.2/src/tools/idc/idc.pro 2020-10-27 09:02:11.000000000 +0100 -+++ qtactiveqt-everywhere-src-5.15.2-new/src/tools/idc/idc.pro 2020-11-23 16:48:02.069127450 +0100 +diff -rupN --no-dereference qtactiveqt-everywhere-src-5.15.3/src/tools/idc/idc.pro qtactiveqt-everywhere-src-5.15.3-new/src/tools/idc/idc.pro +--- qtactiveqt-everywhere-src-5.15.3/src/tools/idc/idc.pro 2021-03-18 11:17:11.000000000 +0100 ++++ qtactiveqt-everywhere-src-5.15.3-new/src/tools/idc/idc.pro 2022-03-15 15:13:08.227404585 +0100 @@ -1,4 +1,3 @@ -option(host_build) CONFIG += force_bootstrap diff --git a/qtactiveqt-spontaneous-event.patch b/qtactiveqt-spontaneous-event.patch index 5477fd7..9da9ba9 100644 --- a/qtactiveqt-spontaneous-event.patch +++ b/qtactiveqt-spontaneous-event.patch @@ -1,6 +1,6 @@ -diff -rupN --no-dereference qtactiveqt-everywhere-src-5.15.2/src/activeqt/control/qaxserverbase.cpp qtactiveqt-everywhere-src-5.15.2-new/src/activeqt/control/qaxserverbase.cpp ---- qtactiveqt-everywhere-src-5.15.2/src/activeqt/control/qaxserverbase.cpp 2020-10-27 09:02:11.000000000 +0100 -+++ qtactiveqt-everywhere-src-5.15.2-new/src/activeqt/control/qaxserverbase.cpp 2020-11-23 16:48:02.116127403 +0100 +diff -rupN --no-dereference qtactiveqt-everywhere-src-5.15.3/src/activeqt/control/qaxserverbase.cpp qtactiveqt-everywhere-src-5.15.3-new/src/activeqt/control/qaxserverbase.cpp +--- qtactiveqt-everywhere-src-5.15.3/src/activeqt/control/qaxserverbase.cpp 2021-03-18 11:17:11.000000000 +0100 ++++ qtactiveqt-everywhere-src-5.15.3-new/src/activeqt/control/qaxserverbase.cpp 2022-03-15 15:13:08.534404191 +0100 @@ -1852,9 +1852,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) { diff --git a/qtactiveqt-win64.patch b/qtactiveqt-win64.patch index 492bc87..2845855 100644 --- a/qtactiveqt-win64.patch +++ b/qtactiveqt-win64.patch @@ -1,6 +1,6 @@ -diff -rupN --no-dereference qtactiveqt-everywhere-src-5.15.2/src/activeqt/container/qaxbase.cpp qtactiveqt-everywhere-src-5.15.2-new/src/activeqt/container/qaxbase.cpp ---- qtactiveqt-everywhere-src-5.15.2/src/activeqt/container/qaxbase.cpp 2020-10-27 09:02:11.000000000 +0100 -+++ qtactiveqt-everywhere-src-5.15.2-new/src/activeqt/container/qaxbase.cpp 2020-11-23 16:48:02.088127431 +0100 +diff -rupN --no-dereference qtactiveqt-everywhere-src-5.15.3/src/activeqt/container/qaxbase.cpp qtactiveqt-everywhere-src-5.15.3-new/src/activeqt/container/qaxbase.cpp +--- qtactiveqt-everywhere-src-5.15.3/src/activeqt/container/qaxbase.cpp 2021-03-18 11:17:11.000000000 +0100 ++++ qtactiveqt-everywhere-src-5.15.3-new/src/activeqt/container/qaxbase.cpp 2022-03-15 15:13:08.341404438 +0100 @@ -2202,6 +2202,10 @@ void MetaObjectGenerator::readClassInfo( const QStringList versions = controls.childGroups(); for (const QString &version : versions) { @@ -12,9 +12,9 @@ diff -rupN --no-dereference qtactiveqt-everywhere-src-5.15.2/src/activeqt/contai if (!tlfile.isEmpty()) break; } -diff -rupN --no-dereference qtactiveqt-everywhere-src-5.15.2/tools/dumpcpp/main.cpp qtactiveqt-everywhere-src-5.15.2-new/tools/dumpcpp/main.cpp ---- qtactiveqt-everywhere-src-5.15.2/tools/dumpcpp/main.cpp 2020-10-27 09:02:11.000000000 +0100 -+++ qtactiveqt-everywhere-src-5.15.2-new/tools/dumpcpp/main.cpp 2020-11-23 16:48:02.088127431 +0100 +diff -rupN --no-dereference qtactiveqt-everywhere-src-5.15.3/tools/dumpcpp/main.cpp qtactiveqt-everywhere-src-5.15.3-new/tools/dumpcpp/main.cpp +--- qtactiveqt-everywhere-src-5.15.3/tools/dumpcpp/main.cpp 2021-03-18 11:17:11.000000000 +0100 ++++ qtactiveqt-everywhere-src-5.15.3-new/tools/dumpcpp/main.cpp 2022-03-15 15:13:08.350404427 +0100 @@ -1586,6 +1586,10 @@ int main(int argc, char **argv) typeLib = settings.value(keyPrefix + QLatin1String("win32/.")).toString(); if (QFile::exists(typeLib)) diff --git a/sources b/sources index 859f529..5d9e6aa 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (qtactiveqt-everywhere-src-5.15.2.tar.xz) = a2286a6736d14cf9b0dbf20af5ee8c23f94f57b6d4c0be41853e67109d87fd78dbf8f14eef2ce4b8d9ff2244af7ef139829ad7674d9ec9669434028961e65ec7 +SHA512 (qtactiveqt-everywhere-opensource-src-5.15.3.tar.xz) = 5a5fc0a98c4928e6cd27105e47288fe62713c0097a0c4fc555b3607b24f22eb0b9e5546944c7c8e6279d2a241a2935f9b7c64a2e2b5c635f0f35061227fee37a