[neon/kf6/kf6-ksvg/Neon/release_jammy] debian/patches: Bring in patch from unstable.

[Scarlett Moore]

Git commit 7d501ae180121f91e30dc41aaf73422bf96cf059 by Scarlett Moore.
Committed on 25/04/2024 at 16:56.
Pushed by scarlettmoore into branch 'Neon/release_jammy'.

Bring in patch from unstable.

A  +1    -0    debian/patches/series
A  +28   -0    debian/patches/upstream_dont_call_update_on_missing_marginobject.patch

https://invent.kde.org/neon/kf6/kf6-ksvg/-/commit/7d501ae180121f91e30dc41aaf73422bf96cf059

diff --git a/debian/patches/series b/debian/patches/series
new file mode 100644
index 0000000..5863dae
--- /dev/null
+++ b/debian/patches/series
@@ -0,0 +1 @@
+upstream_dont_call_update_on_missing_marginobject.patch
diff --git a/debian/patches/upstream_dont_call_update_on_missing_marginobject.patch b/debian/patches/upstream_dont_call_update_on_missing_marginobject.patch
new file mode 100644
index 0000000..3be9f7b
--- /dev/null
+++ b/debian/patches/upstream_dont_call_update_on_missing_marginobject.patch
@@ -0,0 +1,28 @@
+From 81a7b3bbd43a4f1aae2e516380b0fd9f9b5f7ab0 Mon Sep 17 00:00:00 2001
+From: Kevin Ottens <kevin.ottens at enioka.com>
+Date: Thu, 25 Apr 2024 18:19:42 +0200
+Subject: [PATCH] Don't call update on missing marginObject
+
+The presence of the margin object was correctly checked for the updated
+value of m_oldMargins. But it was not evaluated before deciding to call
+update() which would lead to a crash.
+---
+ src/declarativeimports/framesvgitem.cpp | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/src/declarativeimports/framesvgitem.cpp b/src/declarativeimports/framesvgitem.cpp
+index 5f9b2b10..678bdcbe 100644
+--- a/src/declarativeimports/framesvgitem.cpp
++++ b/src/declarativeimports/framesvgitem.cpp
+@@ -313,7 +313,7 @@ public:
+         const QList<qreal> oldMarginsBefore = m_oldMargins;
+         m_oldMargins = m_marginsObject ? m_marginsObject->margins() : QList<qreal>();
+ 
+-        if (oldMarginsBefore != m_oldMargins) {
++        if (m_marginsObject && oldMarginsBefore != m_oldMargins) {
+             m_marginsObject->update();
+         }
+     }
+-- 
+GitLab
+