From aaf6d9c0a6a140c8e267ee2422ece89f08b7d409 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Fri, 13 Oct 2023 19:13:06 +0200
Subject: [PATCH] qt6-svg: update to 6.6.0.

---
 ...nullptr-dereference-with-invalid-SVG.patch | 29 +++++++++++++++++++
 srcpkgs/qt6-svg/template                      |  4 +--
 2 files changed, 31 insertions(+), 2 deletions(-)
 create mode 100644 srcpkgs/qt6-svg/patches/Fix-nullptr-dereference-with-invalid-SVG.patch

diff --git a/srcpkgs/qt6-svg/patches/Fix-nullptr-dereference-with-invalid-SVG.patch b/srcpkgs/qt6-svg/patches/Fix-nullptr-dereference-with-invalid-SVG.patch
new file mode 100644
index 00000000000..9f0de172e65
--- /dev/null
+++ b/srcpkgs/qt6-svg/patches/Fix-nullptr-dereference-with-invalid-SVG.patch
@@ -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/srcpkgs/qt6-svg/template b/srcpkgs/qt6-svg/template
index 4c3efefd457..8f545f8a309 100644
--- a/srcpkgs/qt6-svg/template
+++ b/srcpkgs/qt6-svg/template
@@ -1,6 +1,6 @@
 # Template file for 'qt6-svg'
 pkgname=qt6-svg
-version=6.5.2
+version=6.6.0
 revision=1
 build_style=cmake
 hostmakedepends="qt6-base perl"
@@ -10,7 +10,7 @@ maintainer="John <me@johnnynator.dev>"
 license="GPL-3.0-only with Qt-GPL-exception-1.0, GPL-2.0-or-later, LGPL-3.0-only"
 homepage="https://qt.io/"
 distfiles="http://download.qt.io/official_releases/qt/${version%.*}/${version}/submodules/qtsvg-everywhere-src-${version}.tar.xz"
-checksum=48b4cc1093af2e0ab3bea30f60651bddd877a2335d16e7207879a2e9e81963a3
+checksum=33da25fef51102f564624a7ea3e57cb4a0a31b7b44783d1af5749ac36d3c72de
 
 if [ "$XBPS_CHECK_PKGS" ]; then
 	configure_args="-DQT_BUILD_TESTS=ON"