From 331bf0ffb482acf66c245ba60b716147bbf01f0f Mon Sep 17 00:00:00 2001
From: Gerasim Troeglazov <3dEyes@gmail.com>
Date: Mon, 6 Nov 2023 13:33:24 +1000
Subject: [PATCH] qt6_svg: bump version

---
 dev-qt/qt6-svg/patches/qt6_svg-6.6.0.patchset | 29 +++++++++++++++++++
 ..._svg-6.5.0.recipe => qt6_svg-6.6.0.recipe} |  3 +-
 2 files changed, 31 insertions(+), 1 deletion(-)
 create mode 100644 dev-qt/qt6-svg/patches/qt6_svg-6.6.0.patchset
 rename dev-qt/qt6-svg/{qt6_svg-6.5.0.recipe => qt6_svg-6.6.0.recipe} (95%)

diff --git a/dev-qt/qt6-svg/patches/qt6_svg-6.6.0.patchset b/dev-qt/qt6-svg/patches/qt6_svg-6.6.0.patchset
new file mode 100644
index 000000000..9f0de172e
--- /dev/null
+++ b/dev-qt/qt6-svg/patches/qt6_svg-6.6.0.patchset
@@ -0,0 +1,29 @@
+From edc8ca7f1e45302223b4b7962a57a30918f84c8d Mon Sep 17 00:00:00 2001
+From: Paul Olav Tvete <paul.tvete@qt.io>
+Date: Tue, 10 Oct 2023 10:14:22 +0200
+Subject: Fix nullptr dereference with invalid SVG
+
+Fixes: QTBUG-117944
+Pick-to: 6.6 6.5 6.2
+Change-Id: I9059dc28c750fc0585f1fb982152b211c323c6cd
+Reviewed-by: Eskil Abrahamsen Blomfeldt <eskil.abrahamsen-blomfeldt@qt.io>
+---
+ src/svg/qsvghandler.cpp | 2 ++
+ 1 file changed, 2 insertions(+)
+
+diff --git a/src/svg/qsvghandler.cpp b/src/svg/qsvghandler.cpp
+index e6877ac..1cffbc3 100644
+--- a/src/svg/qsvghandler.cpp
++++ b/src/svg/qsvghandler.cpp
+@@ -3620,6 +3620,8 @@ void QSvgHandler::init()
+ 
+ static bool detectCycles(const QSvgNode *node, QList<const QSvgUse *> active = {})
+ {
++    if (Q_UNLIKELY(!node))
++        return false;
+     switch (node->type()) {
+     case QSvgNode::DOC:
+     case QSvgNode::G:
+-- 
+cgit v1.2.3
+
diff --git a/dev-qt/qt6-svg/qt6_svg-6.5.0.recipe b/dev-qt/qt6-svg/qt6_svg-6.6.0.recipe
similarity index 95%
rename from dev-qt/qt6-svg/qt6_svg-6.5.0.recipe
rename to dev-qt/qt6-svg/qt6_svg-6.6.0.recipe
index 1f2385579..06713057b 100644
--- a/dev-qt/qt6-svg/qt6_svg-6.5.0.recipe
+++ b/dev-qt/qt6-svg/qt6_svg-6.6.0.recipe
@@ -10,8 +10,9 @@ LICENSE="GNU LGPL v2.1
 	GNU FDL v1"
 REVISION="1"
 SOURCE_URI="https://download.qt.io/official_releases/qt/${portVersion%.*}/$portVersion/submodules/qtsvg-everywhere-src-$portVersion.tar.xz"
-CHECKSUM_SHA256="64ca7e61f44d51e28bcbb4e0509299b53a9a7e38879e00a7fe91643196067a4f"
+CHECKSUM_SHA256="33da25fef51102f564624a7ea3e57cb4a0a31b7b44783d1af5749ac36d3c72de"
 SOURCE_DIR="qtsvg-everywhere-src-$portVersion"
+PATCHES="qt6_svg-$portVersion.patchset"
 
 ARCHITECTURES="all !x86_gcc2"
 SECONDARY_ARCHITECTURES="x86"