Accepting request 1116108 from KDE:Qt:5.15

Qt 5.15.11. Not fully built yet, qtlocation needed a fix. (forwarded request 1116057 from favogt)

OBS-URL: https://build.opensuse.org/request/show/1116108
OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/libqt5-qtdeclarative?expand=0&rev=81

0001-JIT-Add-missing-STORE-LOAD-_ACC-to-CreateCallContext.patch

@@ -1,48 +0,0 @@
-From cb4f59d2dfbb9def4298688ec87e6b1caf8b622f Mon Sep 17 00:00:00 2001
-From: Ulf Hermann <ulf.hermann@qt.io>
-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
-Reviewed-by: <carl@carlschwan.eu>
-Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org>
-Reviewed-by: Fabian Kosmale <fabian.kosmale@qt.io>
-(cherry picked from commit 15ec024152a1d1d99a4934f7b2408e7af7b2552a)
----
- 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 45150cfffd..5ad53faf95 100644
---- a/src/qml/jit/qv4baselinejit.cpp
-+++ b/src/qml/jit/qv4baselinejit.cpp
-@@ -540,6 +540,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(); }
-@@ -547,9 +549,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.40.1
-

_service

@@ -1,12 +1,12 @@
 <services>
   <service name="obs_scm" mode="disabled">
    <param name="changesgenerate">enable</param>
-   <param name="versionformat">5.15.10+kde@TAG_OFFSET@</param>
+   <param name="versionformat">5.15.11+kde@TAG_OFFSET@</param>
    <param name="url">https://invent.kde.org/qt/qt/qtdeclarative.git</param>
    <param name="scm">git</param>
    <param name="filename">qtdeclarative-everywhere-src</param>
    <param name="revision">kde/5.15</param>
-   <param name="parent-tag">v5.15.10-lts-lgpl</param>
+   <param name="parent-tag">v5.15.11-lts-lgpl</param>
    <param name="changesgenerate">enable</param>
   </service>
   <service name="set_version" mode="disabled"/>

_servicedata

@@ -1,4 +1,4 @@
 <servicedata>
 <service name="tar_scm">
                 <param name="url">https://invent.kde.org/qt/qt/qtdeclarative.git</param>
-              <param name="changesrevision">5352f113b3c7a5af2ad2741d593c6e6a758eb93e</param></service></servicedata>
+              <param name="changesrevision">1b0e366092bcfae0392592c3b7891f0e47af1018</param></service></servicedata>

libqt5-qtdeclarative.changes

@@ -1,3 +1,66 @@
+-------------------------------------------------------------------
+Fri Oct  6 06:38:21 UTC 2023 - Fabian Vogt <fabian@ritter-vogt.de>
+
+- Update to version 5.15.11+kde30, rebased upstream:
+  * Flickable: prevent fixup() from being called while dragging
+  * Adjust baselineOffset correctly when fontSizeMode == HorizontalFit
+  * QQmlVMEMetaObjectEndpoint: ensure property cache before accessing it
+  * Text: Re-layout the text when a alignment is set and the height grows
+  * Blacklist 1 tests in tst_qquickflickable on macos
+  * Fix fractional scaling of text in Qt Quick
+  * qqmlprivate.h: make static constexpr members c++11 compliant
+  * V4: Account for the guard pages when allocating stack space
+  * Blacklist 1 tests in tst_QQuickLoader on ubuntu-20.04
+  * Flickable: let changing contentItem pos also affect the drag starting pos
+  * Blacklist 1 tests in tst_QParallelAnimationGroupJob on macos
+  * StackLayout: Do not set size of children to (-1, -1)
+  * V4: Mark InternalClass parents when running GC
+  * A11Y: Send Scrolling Events when Flickable moves
+  * doc: Add missing PointerHandler.CanTakeOverFromItems enum value
+  * Qml: Don't crash on nested group properties with aliases
+  * QV4::CompiledData: fix GCC 12 -Werror=uninitialized errors
+  * QQuickText/Edit: fix C++20 -Wdeprecated-enum-enum-conversion warnings
+  * Android: Fix crash on tap handler with a S-Pen
+  * masm: fix -Wdeprecated-enum-enum-conversion
+  * Add listing of the components and scripts that belongs to the qml module
+  * QML: Port QV4::CompiledData::RegExp to new special integer bitfield
+  * QML: Port QV4::CompiledData::JSClassMember to new special integer bitfield
+  * QML: Port QV4::CompiledData::Object to new special integer bitfield
+  * QML: Port icutils::Node to new special integer bitfield
+  * QML: Port QV4::CompiledData::Lookup to new special integer bitfield
+  * QML: Port QV4::CompiledData::Binding to new special integer bitfield
+  * QML: Port QV4::CompiledData::Property to new special integer bitfield
+  * QML: Port QV4::CompiledData::Alias to new special integer bitfield
+  * QML: Port QV4::CompiledData::ParameterType to new special integer bitfield
+  * QML: Port QV4::CompiledData::Location to new special integer bitfield
+  * Fix Qt build with Python being in path with spaces
+  * Quick test lib: Account for DPR when grabbing sub-image
+  * qqw: Invalidate and reinitialize the scenegraph correctly
+  * Fix rendernode example wrt stacking
+  * Stop using the same buffer for vertex and index data
+  * Fix race condition on QQmlEnginePrivate::qml_debugging_enabled
+  * qqmlimport.cpp: remove unused qreadwritelock.h
+  * QQmlDebug: reliably print the debugger warning
+  * QQmlListCompositor: suppress GCC 12 -Warray-bounds warnings
+  * Doc: QQuickTextInput: Mark all readonly properties as such
+  * MouseArea: don't override preventStealing on mouse release
+  * MultiPointTouchArea: remap touchpoint positions when filtering
+- Commits dropped by the rebase:
+  * Revert "Fix missing glyphs when using NativeRendering"
+  * Fix missing glyphs when using NativeRendering
+
+-------------------------------------------------------------------
+Thu Sep 28 12:04:50 UTC 2023 - Fabian Vogt <fvogt@suse.com>
+
+- Update to version 5.15.10+kde31:
+  * QML: Make notify list thread safe
+  * QtQml: Clean up QQmlData ctor
+  * QRecyclePool: fix potential UB
+  * QQmlJs::MemoryPool: fix potential UB (pointer overflow)
+  * JIT: Add missing {STORE|LOAD}_ACC() to CreateCallContext
+- Drop patches, now upstream:
+  * 0001-JIT-Add-missing-STORE-LOAD-_ACC-to-CreateCallContext.patch
+
 -------------------------------------------------------------------
 Tue Jun 13 12:58:39 UTC 2023 - Fabian Vogt <fabian@ritter-vogt.de>
 

libqt5-qtdeclarative.spec

@@ -19,11 +19,11 @@
 %define qt5_snapshot 1
 %define libname libQtQuick5
 %define base_name libqt5
-%define real_version 5.15.10
+%define real_version 5.15.11
-%define so_version 5.15.10
+%define so_version 5.15.11
 %define tar_version qtdeclarative-everywhere-src-%{version}
 Name:           libqt5-qtdeclarative
-Version:        5.15.10+kde26
+Version:        5.15.11+kde30
 Release:        0
 Summary:        Qt 5 Declarative Library
 License:        LGPL-3.0-only OR (GPL-2.0-only OR GPL-3.0-or-later)
@@ -31,8 +31,6 @@ Group:          Development/Libraries/X11
 URL:            https://www.qt.io
 Source:         %{tar_version}.tar.xz
 Source1:        baselibs.conf
-# https://invent.kde.org/qt/qt/qtdeclarative/-/merge_requests/49
-Patch100:       0001-JIT-Add-missing-STORE-LOAD-_ACC-to-CreateCallContext.patch
 # https://invent.kde.org/qt/qt/qtdeclarative/-/merge_requests/32
 Patch103:       qtdeclarative-5.15.0-FixMaxXMaxYExtent.patch
 BuildRequires:  fdupes

qtdeclarative-everywhere-src-5.15.10+kde26.obscpio

@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:5e2d952652c169fd60e2f56bb60dbe1aa127103ed36bd8b51fcb0de0eb194f88
-size 143483406

qtdeclarative-everywhere-src.obsinfo

@@ -1,4 +1,4 @@
 name: qtdeclarative-everywhere-src
-version: 5.15.10+kde26
+version: 5.15.11+kde30
-mtime: 1686589738
+mtime: 1696543783
-commit: 5352f113b3c7a5af2ad2741d593c6e6a758eb93e
+commit: 1b0e366092bcfae0392592c3b7891f0e47af1018