From f2f3128aca6996ceb05ee5c3de1882b62bfd6d8f Mon Sep 17 00:00:00 2001 From: Sandro Mani Date: Jun 15 2023 12:10:07 +0000 Subject: Update to 5.15.10 --- diff --git a/.gitignore b/.gitignore index 85b376a..cc0ce47 100644 --- a/.gitignore +++ b/.gitignore @@ -27,3 +27,4 @@ /qtactiveqt-everywhere-opensource-src-5.15.7.tar.xz /qtactiveqt-everywhere-opensource-src-5.15.8.tar.xz /qtactiveqt-everywhere-opensource-src-5.15.9.tar.xz +/qtactiveqt-everywhere-opensource-src-5.15.10.tar.xz diff --git a/mingw-qt5-qtactiveqt.spec b/mingw-qt5-qtactiveqt.spec index 6f3ed84..e0bbe46 100644 --- a/mingw-qt5-qtactiveqt.spec +++ b/mingw-qt5-qtactiveqt.spec @@ -16,7 +16,7 @@ %define release_version %(echo %{version} | awk -F. '{print $1"."$2}') Name: mingw-qt5-%{qt_module} -Version: 5.15.9 +Version: 5.15.10 Release: 1%{?dist} Summary: Qt5 for Windows - QtActiveQt component @@ -157,6 +157,9 @@ find %{buildroot} -name "*.prl" -delete %changelog +* Thu Jun 15 2023 Sandro Mani - 5.15.10-1 +- Update to 5.15.10 + * Thu Apr 13 2023 Sandro Mani - 5.15.9-1 - Update to 5.15.9 diff --git a/qtactiveqt-fix-host-build.patch b/qtactiveqt-fix-host-build.patch index 150b29c..6bcb995 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.9/src/tools/idc/idc.pro qtactiveqt-everywhere-src-5.15.9-new/src/tools/idc/idc.pro ---- qtactiveqt-everywhere-src-5.15.9/src/tools/idc/idc.pro 2023-03-23 14:59:14.000000000 +0100 -+++ qtactiveqt-everywhere-src-5.15.9-new/src/tools/idc/idc.pro 2023-04-13 09:47:43.985087892 +0200 +diff -rupN --no-dereference qtactiveqt-everywhere-src-5.15.10/src/tools/idc/idc.pro qtactiveqt-everywhere-src-5.15.10-new/src/tools/idc/idc.pro +--- qtactiveqt-everywhere-src-5.15.10/src/tools/idc/idc.pro 2023-04-24 09:13:30.000000000 +0200 ++++ qtactiveqt-everywhere-src-5.15.10-new/src/tools/idc/idc.pro 2023-06-15 14:10:02.993801536 +0200 @@ -1,4 +1,3 @@ -option(host_build) CONFIG += force_bootstrap diff --git a/qtactiveqt-spontaneous-event.patch b/qtactiveqt-spontaneous-event.patch index 0d858f9..8a0387b 100644 --- a/qtactiveqt-spontaneous-event.patch +++ b/qtactiveqt-spontaneous-event.patch @@ -1,6 +1,6 @@ -diff -rupN --no-dereference qtactiveqt-everywhere-src-5.15.9/src/activeqt/control/qaxserverbase.cpp qtactiveqt-everywhere-src-5.15.9-new/src/activeqt/control/qaxserverbase.cpp ---- qtactiveqt-everywhere-src-5.15.9/src/activeqt/control/qaxserverbase.cpp 2023-03-23 14:59:14.000000000 +0100 -+++ qtactiveqt-everywhere-src-5.15.9-new/src/activeqt/control/qaxserverbase.cpp 2023-04-13 09:47:44.055087861 +0200 +diff -rupN --no-dereference qtactiveqt-everywhere-src-5.15.10/src/activeqt/control/qaxserverbase.cpp qtactiveqt-everywhere-src-5.15.10-new/src/activeqt/control/qaxserverbase.cpp +--- qtactiveqt-everywhere-src-5.15.10/src/activeqt/control/qaxserverbase.cpp 2023-04-24 09:13:30.000000000 +0200 ++++ qtactiveqt-everywhere-src-5.15.10-new/src/activeqt/control/qaxserverbase.cpp 2023-06-15 14:10:03.055802102 +0200 @@ -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 e8474e8..7ae4381 100644 --- a/qtactiveqt-win64.patch +++ b/qtactiveqt-win64.patch @@ -1,6 +1,6 @@ -diff -rupN --no-dereference qtactiveqt-everywhere-src-5.15.9/src/activeqt/container/qaxbase.cpp qtactiveqt-everywhere-src-5.15.9-new/src/activeqt/container/qaxbase.cpp ---- qtactiveqt-everywhere-src-5.15.9/src/activeqt/container/qaxbase.cpp 2023-03-23 14:59:14.000000000 +0100 -+++ qtactiveqt-everywhere-src-5.15.9-new/src/activeqt/container/qaxbase.cpp 2023-04-13 09:47:44.021087876 +0200 +diff -rupN --no-dereference qtactiveqt-everywhere-src-5.15.10/src/activeqt/container/qaxbase.cpp qtactiveqt-everywhere-src-5.15.10-new/src/activeqt/container/qaxbase.cpp +--- qtactiveqt-everywhere-src-5.15.10/src/activeqt/container/qaxbase.cpp 2023-04-24 09:13:30.000000000 +0200 ++++ qtactiveqt-everywhere-src-5.15.10-new/src/activeqt/container/qaxbase.cpp 2023-06-15 14:10:03.023801810 +0200 @@ -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.9/src/activeqt/contai if (!tlfile.isEmpty()) break; } -diff -rupN --no-dereference qtactiveqt-everywhere-src-5.15.9/tools/dumpcpp/main.cpp qtactiveqt-everywhere-src-5.15.9-new/tools/dumpcpp/main.cpp ---- qtactiveqt-everywhere-src-5.15.9/tools/dumpcpp/main.cpp 2023-03-23 14:59:14.000000000 +0100 -+++ qtactiveqt-everywhere-src-5.15.9-new/tools/dumpcpp/main.cpp 2023-04-13 09:47:44.022087875 +0200 +diff -rupN --no-dereference qtactiveqt-everywhere-src-5.15.10/tools/dumpcpp/main.cpp qtactiveqt-everywhere-src-5.15.10-new/tools/dumpcpp/main.cpp +--- qtactiveqt-everywhere-src-5.15.10/tools/dumpcpp/main.cpp 2023-04-24 09:13:30.000000000 +0200 ++++ qtactiveqt-everywhere-src-5.15.10-new/tools/dumpcpp/main.cpp 2023-06-15 14:10:03.024801819 +0200 @@ -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 a393ece..259967b 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (qtactiveqt-everywhere-opensource-src-5.15.9.tar.xz) = b4d728bc1a28a15c3fc14d40a6dd2801c898d17a9c18c773b794abb629432efd6888cb56517a8fac0764eeacc436040d4406e05f322a43b84fafa036c2ba5d2c +SHA512 (qtactiveqt-everywhere-opensource-src-5.15.10.tar.xz) = 67ebe2eb0b45c128d9e57305f378900d21348d75960800e7848134452c1c01688219b36e712bceff76e942ce05e5100881194409627a7902a6d613938656550b