diff --git a/.gitignore b/.gitignore index 5ed3e4f..e63e244 100644 --- a/.gitignore +++ b/.gitignore @@ -19,3 +19,4 @@ /qtdeclarative-everywhere-src-6.4.2.tar.xz /qtdeclarative-everywhere-src-6.4.3.tar.xz /qtdeclarative-everywhere-src-6.5.0.tar.xz +/qtdeclarative-everywhere-src-6.5.1.tar.xz diff --git a/qt-QTBUG-111935-fix-V4-jit.patch b/qt-QTBUG-111935-fix-V4-jit.patch deleted file mode 100644 index 96ad2c1..0000000 --- a/qt-QTBUG-111935-fix-V4-jit.patch +++ /dev/null @@ -1,44 +0,0 @@ -From e2bdde18d9758efdc6a0d7d106aad56995df1271 Mon Sep 17 00:00:00 2001 -From: Ulf Hermann -Date: Wed, 15 Mar 2023 08:59:43 +0100 -Subject: [PATCH] JIT: Add missing {STORE|LOAD}_ACC() to CreateCallContext - -We cannot assume anything about the accumulator register after calling -PushCallContext::call(). Also add a note about not needing to re-load -the accumulator on ThrowException. - -Pick-to: 6.5 6.2 5.15 -Fixes: QTBUG-111935 -Change-Id: I7196585e1d2697c215f4fe87d8d7ac9b98b622a3 ---- - src/qml/jit/qv4baselinejit.cpp | 4 ++++ - 1 file changed, 4 insertions(+) - -diff --git a/src/qml/jit/qv4baselinejit.cpp b/src/qml/jit/qv4baselinejit.cpp -index 14e183adb8..1d65169dce 100644 ---- a/src/qml/jit/qv4baselinejit.cpp -+++ b/src/qml/jit/qv4baselinejit.cpp -@@ -506,6 +506,8 @@ void BaselineJIT::generate_ThrowException() - as->passEngineAsArg(0); - BASELINEJIT_GENERATE_RUNTIME_CALL(ThrowException, CallResultDestination::Ignore); - as->gotoCatchException(); -+ -+ // LOAD_ACC(); <- not needed here since it would be unreachable. - } - - void BaselineJIT::generate_GetException() { as->getException(); } -@@ -513,9 +515,11 @@ void BaselineJIT::generate_SetException() { as->setException(); } - - void BaselineJIT::generate_CreateCallContext() - { -+ STORE_ACC(); - as->prepareCallWithArgCount(1); - as->passCppFrameAsArg(0); - BASELINEJIT_GENERATE_RUNTIME_CALL(PushCallContext, CallResultDestination::Ignore); -+ LOAD_ACC(); - } - - void BaselineJIT::generate_PushCatchContext(int index, int name) { as->pushCatchContext(index, name); } --- -2.39.2 - diff --git a/qt6-qtdeclarative.spec b/qt6-qtdeclarative.spec index 54a0047..e53fa77 100644 --- a/qt6-qtdeclarative.spec +++ b/qt6-qtdeclarative.spec @@ -15,8 +15,8 @@ Summary: Qt6 - QtDeclarative component Name: qt6-%{qt_module} -Version: 6.5.0 -Release: 2%{?dist} +Version: 6.5.1 +Release: 1%{?dist} License: LGPL-3.0-only OR GPL-3.0-only WITH Qt-GPL-exception-1.0 Url: http://www.qt.io @@ -34,9 +34,6 @@ Source0: https://download.qt.io/official_releases/qt/%{majmin}/%{version}/submod Source5: qv4global_p-multilib.h ## upstream patches -### From: https://codereview.qt-project.org/c/qt/qtdeclarative/+/466808 -### Cf. https://bugzilla.redhat.com/show_bug.cgi?id=2177696 -Patch0: qt-QTBUG-111935-fix-V4-jit.patch ## upstreamable patches @@ -330,6 +327,9 @@ make check -k -C tests ||: %endif %changelog +* Mon May 22 2023 Jan Grulich - 6.5.1-1 +- 6.5.1 + * Mon Apr 03 2023 Yaakov Selkowitz - 6.5.0-2 - Enable qmlls diff --git a/sources b/sources index ddee865..1ba0ec8 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (qtdeclarative-everywhere-src-6.5.0.tar.xz) = df31f08be3849b2775c1fbeb72f9922f7fa64b8b18b506e5ce309b718cfaeef9bb7225cb55610c8cf695f85e5fc0430461f1317b335358b4196b5e48242a7d00 +SHA512 (qtdeclarative-everywhere-src-6.5.1.tar.xz) = 7ec840e42b1042263aa41c5d339cfa8a7921e3c5f217e710df0737b2c5c44b1e6c0fae155af934087f5a623d9370f30f83ec5691eb473e52b46486f4938173c7