From aa02803a3c7f3acfb050e23bd5aaa4f861ae7866 Mon Sep 17 00:00:00 2001 From: Sandro Mani Date: Apr 13 2023 07:47:49 +0000 Subject: Update to 5.15.9 --- diff --git a/.gitignore b/.gitignore index cb77cb4..85b376a 100644 --- a/.gitignore +++ b/.gitignore @@ -26,3 +26,4 @@ /qtactiveqt-everywhere-opensource-src-5.15.6.tar.xz /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 diff --git a/mingw-qt5-qtactiveqt.spec b/mingw-qt5-qtactiveqt.spec index 528a24d..6f3ed84 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.8 -Release: 2%{?dist} +Version: 5.15.9 +Release: 1%{?dist} Summary: Qt5 for Windows - QtActiveQt component License: GPLv3 with exceptions or LGPLv2 with exceptions or BSD @@ -157,6 +157,9 @@ find %{buildroot} -name "*.prl" -delete %changelog +* Thu Apr 13 2023 Sandro Mani - 5.15.9-1 +- Update to 5.15.9 + * Thu Jan 19 2023 Fedora Release Engineering - 5.15.8-2 - Rebuilt for https://fedoraproject.org/wiki/Fedora_38_Mass_Rebuild diff --git a/qtactiveqt-fix-host-build.patch b/qtactiveqt-fix-host-build.patch index 2ed6dfb..150b29c 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.8/src/tools/idc/idc.pro qtactiveqt-everywhere-src-5.15.8-new/src/tools/idc/idc.pro ---- qtactiveqt-everywhere-src-5.15.8/src/tools/idc/idc.pro 2022-11-10 21:42:16.000000000 +0100 -+++ qtactiveqt-everywhere-src-5.15.8-new/src/tools/idc/idc.pro 2023-01-09 15:36:31.929166275 +0100 +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 @@ -1,4 +1,3 @@ -option(host_build) CONFIG += force_bootstrap diff --git a/qtactiveqt-spontaneous-event.patch b/qtactiveqt-spontaneous-event.patch index 4f99e34..0d858f9 100644 --- a/qtactiveqt-spontaneous-event.patch +++ b/qtactiveqt-spontaneous-event.patch @@ -1,6 +1,6 @@ -diff -rupN --no-dereference qtactiveqt-everywhere-src-5.15.8/src/activeqt/control/qaxserverbase.cpp qtactiveqt-everywhere-src-5.15.8-new/src/activeqt/control/qaxserverbase.cpp ---- qtactiveqt-everywhere-src-5.15.8/src/activeqt/control/qaxserverbase.cpp 2022-11-10 21:42:16.000000000 +0100 -+++ qtactiveqt-everywhere-src-5.15.8-new/src/activeqt/control/qaxserverbase.cpp 2023-01-09 15:36:32.278166930 +0100 +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 @@ -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 721af4b..e8474e8 100644 --- a/qtactiveqt-win64.patch +++ b/qtactiveqt-win64.patch @@ -1,6 +1,6 @@ -diff -rupN --no-dereference qtactiveqt-everywhere-src-5.15.8/src/activeqt/container/qaxbase.cpp qtactiveqt-everywhere-src-5.15.8-new/src/activeqt/container/qaxbase.cpp ---- qtactiveqt-everywhere-src-5.15.8/src/activeqt/container/qaxbase.cpp 2022-11-10 21:42:16.000000000 +0100 -+++ qtactiveqt-everywhere-src-5.15.8-new/src/activeqt/container/qaxbase.cpp 2023-01-09 15:36:32.095166587 +0100 +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 @@ -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.8/src/activeqt/contai if (!tlfile.isEmpty()) break; } -diff -rupN --no-dereference qtactiveqt-everywhere-src-5.15.8/tools/dumpcpp/main.cpp qtactiveqt-everywhere-src-5.15.8-new/tools/dumpcpp/main.cpp ---- qtactiveqt-everywhere-src-5.15.8/tools/dumpcpp/main.cpp 2022-11-10 21:42:16.000000000 +0100 -+++ qtactiveqt-everywhere-src-5.15.8-new/tools/dumpcpp/main.cpp 2023-01-09 15:36:32.100166596 +0100 +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 @@ -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 015765c..a393ece 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (qtactiveqt-everywhere-opensource-src-5.15.8.tar.xz) = 018a2dbaccb23e9f5ecb8f5cdf42a34199a54bbb70d4857f4cf875854460bc6a0150adbb5681f1305ba95f1809918038d2346d1acc980cb0f8522a68019538e7 +SHA512 (qtactiveqt-everywhere-opensource-src-5.15.9.tar.xz) = b4d728bc1a28a15c3fc14d40a6dd2801c898d17a9c18c773b794abb629432efd6888cb56517a8fac0764eeacc436040d4406e05f322a43b84fafa036c2ba5d2c