[gentoo-commits] repo/gentoo:master commit in: dev-qt/qtsvg/files/, dev-qt/qtsvg/

[gentoo-commits] repo/gentoo:master commit in: dev-qt/qtsvg/files/, dev-qt/qtsvg/

[Andreas Sturmlechner]

commit:     c87989bb5ff982772175581acf7eb874a901cc10
Author:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
AuthorDate: Thu Jan 16 16:02:00 2020 +0000
Commit:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Thu Jan 16 16:06:48 2020 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=c87989bb

dev-qt/qtsvg: Revert the keep-aspectratio feature (from 5.14.1)

Requested-by: Lars Wendler <polynomial-c <AT> gentoo.org>
Package-Manager: Portage-2.3.84, Repoman-2.3.20
Signed-off-by: Andreas Sturmlechner <asturm <AT> gentoo.org>

 .../qtsvg-5.14.0-revert-keep-aspectratio.patch     | 85 ++++++++++++++++++++++
 dev-qt/qtsvg/qtsvg-5.14.0-r1.ebuild                | 25 +++++++
 2 files changed, 110 insertions(+)

diff --git a/dev-qt/qtsvg/files/qtsvg-5.14.0-revert-keep-aspectratio.patch b/dev-qt/qtsvg/files/qtsvg-5.14.0-revert-keep-aspectratio.patch
new file mode 100644
index 00000000000..589492ca6ba
--- /dev/null
+++ b/dev-qt/qtsvg/files/qtsvg-5.14.0-revert-keep-aspectratio.patch
@@ -0,0 +1,85 @@
+From 51694a5e293ae4eb7b83167e7cb54822907eb594 Mon Sep 17 00:00:00 2001
+From: Eirik Aavitsland <eirik.aavitsland@qt.io>
+Date: Thu, 9 Jan 2020 11:03:44 +0100
+Subject: [PATCH] Revert the keep-aspectratio feature for 5.14.1
+
+This was introduced as non-optional behavior for 5.14.0, but caused
+many regressions. This patch reverts that, and instead prepares for
+introducing it as an opt-in feature in Qt 5.15.
+
+[ChangeLog][QSVGRenderer] In Qt 5.14.0, rendering would keep aspect
+ratio implied by the viewbox, independently of the specified target
+area. This caused many regressions with existing code, so is reverted
+now in 5.14.1. The feature will instead be available as an opt-in in
+Qt 5.15.
+
+Task-number: QTBUG-81259
+Change-Id: I3efa2db864eb80ee00e8a067e56d9912bab36442
+---
+ src/svg/qsvgtinydocument.cpp                 | 14 ++++++++------
+ tests/auto/qsvgrenderer/tst_qsvgrenderer.cpp |  3 +++
+ 2 files changed, 11 insertions(+), 6 deletions(-)
+
+diff --git a/src/svg/qsvgtinydocument.cpp b/src/svg/qsvgtinydocument.cpp
+index 56960bf..b364634 100644
+--- a/src/svg/qsvgtinydocument.cpp
++++ b/src/svg/qsvgtinydocument.cpp
+@@ -420,9 +420,10 @@ void QSvgTinyDocument::mapSourceToTarget(QPainter *p, const QRectF &targetRect,
+         source = viewBox();
+ 
+     if (source != target && !source.isNull()) {
+-        if (m_implicitViewBox || !sourceRect.isNull()) {
+-            // Code path used when no view box is set, or when an explicit source size is given which
+-            // overrides it (which is the case when we're rendering only a specific element by id).
++#if (QT_VERSION >= QT_VERSION_CHECK(5, 15, 0))
++        if (m_implicitViewBox || !preserveAspectRatio()) {
++            // Code path used when no view box is set, or IgnoreAspectRatio requested
++#endif
+             QTransform transform;
+             transform.scale(target.width() / source.width(),
+                             target.height() / source.height());
+@@ -431,10 +432,10 @@ void QSvgTinyDocument::mapSourceToTarget(QPainter *p, const QRectF &targetRect,
+                          target.y() - c2.y());
+             p->scale(target.width() / source.width(),
+                      target.height() / source.height());
++#if (QT_VERSION >= QT_VERSION_CHECK(5, 15, 0))
+         } else {
+-            // Code path used when a view box is specified and we're not rendering a specific element by id
+-            // but the entire document. This attempts to emulate the default values of the <preserveAspectRatio>
+-            // tag that's implicitly defined when <viewbox> is used.
++            // Code path used when KeepAspectRatio is requested. This attempts to emulate the default values
++            // of the <preserveAspectRatio tag that's implicitly defined when <viewbox> is used.
+ 
+             // Scale the view box into the view port (target) by preserve the aspect ratio.
+             QSizeF viewBoxSize = source.size();
+@@ -451,6 +452,7 @@ void QSvgTinyDocument::mapSourceToTarget(QPainter *p, const QRectF &targetRect,
+             p->translate(target.x() - source.x(),
+                          target.y() - source.y());
+         }
++#endif
+     }
+ }
+ 
+diff --git a/tests/auto/qsvgrenderer/tst_qsvgrenderer.cpp b/tests/auto/qsvgrenderer/tst_qsvgrenderer.cpp
+index 309c646..43a3eb8 100644
+--- a/tests/auto/qsvgrenderer/tst_qsvgrenderer.cpp
++++ b/tests/auto/qsvgrenderer/tst_qsvgrenderer.cpp
+@@ -269,6 +269,8 @@ void tst_QSvgRenderer::testMapViewBoxToTarget()
+         QCOMPARE(picture.boundingRect(), QRect(125, 125, 250, 250));
+     }
+ 
++#if 0
++    // Requires keep-aspectratio feature
+     { // Viewport and viewBox specified -> scale 500x500 square to 1000x750 while preserving aspect ratio gives 750x750
+         data = "<svg width=\"1000\" height=\"750\" viewBox=\"-250 -250 500 500\"><g><rect x=\"0\" y=\"0\" width=\"500\" height=\"500\" /></g></svg>";
+         QPicture picture;
+@@ -278,6 +280,7 @@ void tst_QSvgRenderer::testMapViewBoxToTarget()
+         painter.end();
+         QCOMPARE(picture.boundingRect(), QRect(500, 375, 750, 750));
+     }
++#endif
+ }
+ 
+ void tst_QSvgRenderer::testRenderElement()
+-- 
+2.25.0

diff --git a/dev-qt/qtsvg/qtsvg-5.14.0-r1.ebuild b/dev-qt/qtsvg/qtsvg-5.14.0-r1.ebuild
new file mode 100644
index 00000000000..4716b5e4790
--- /dev/null
+++ b/dev-qt/qtsvg/qtsvg-5.14.0-r1.ebuild
@@ -0,0 +1,25 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+inherit qt5-build
+
+DESCRIPTION="SVG rendering library for the Qt5 framework"
+
+if [[ ${QT5_BUILD_TYPE} == release ]]; then
+	KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~sparc ~x86"
+fi
+
+IUSE=""
+
+RDEPEND="
+	~dev-qt/qtcore-${PV}
+	~dev-qt/qtgui-${PV}
+	~dev-qt/qtwidgets-${PV}
+	sys-libs/zlib:=
+"
+DEPEND="${RDEPEND}
+	test? ( ~dev-qt/qtxml-${PV} )
+"
+
+PATCHES=( "${FILESDIR}/${P}-revert-keep-aspectratio.patch" ) # QTBUG-81259

[gentoo-commits] repo/gentoo:master commit in: dev-qt/qtsvg/files/, dev-qt/qtsvg/

[Andreas Sturmlechner]

commit:     9ef3c826d27668a617a0ccc9a24d50b48fd37730
Author:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
AuthorDate: Sat May  6 18:17:56 2023 +0000
Commit:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Sat May  6 18:17:56 2023 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=9ef3c826

dev-qt/qtsvg: QSvgFont: Initialize used member, remove unused

"Fixed undefined behavior from using uninitialized variable."

Signed-off-by: Andreas Sturmlechner <asturm <AT> gentoo.org>

 .../files/qtsvg-5.15.9-fix-ub-ossfuzz-22618.patch  | 59 ++++++++++++++++++++++
 dev-qt/qtsvg/qtsvg-5.15.9-r1.ebuild                | 27 ++++++++++
 2 files changed, 86 insertions(+)

diff --git a/dev-qt/qtsvg/files/qtsvg-5.15.9-fix-ub-ossfuzz-22618.patch b/dev-qt/qtsvg/files/qtsvg-5.15.9-fix-ub-ossfuzz-22618.patch
new file mode 100644
index 000000000000..adc43d7c3fba
--- /dev/null
+++ b/dev-qt/qtsvg/files/qtsvg-5.15.9-fix-ub-ossfuzz-22618.patch
@@ -0,0 +1,59 @@
+From 837b5163e17edbd3a9f098e9a1ab73febab419b4 Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?Robert=20L=C3=B6hning?= <robert.loehning@qt.io>
+Date: Mon, 24 Apr 2023 15:27:17 +0200
+Subject: [PATCH] QSvgFont: Initialize used member, remove unused
+
+Credit to OSS-Fuzz
+
+[ChangeLog][QtSvg] Fixed undefined behavior from using uninitialized
+variable.
+
+Pick-to: 6.5 6.2 5.15
+Coverity-Id: 22618
+Change-Id: Id52277bb0e2845f4d342e187dbb8093e9276b70c
+Reviewed-by: Eskil Abrahamsen Blomfeldt <eskil.abrahamsen-blomfeldt@qt.io>
+(cherry picked from commit ff22c3ccf8ccf813fdcfda23f7740ba73ba5ce0a)
+---
+ src/svg/qsvgfont_p.h    | 5 ++---
+ src/svg/qsvghandler.cpp | 2 +-
+ 2 files changed, 3 insertions(+), 4 deletions(-)
+
+diff --git a/src/svg/qsvgfont_p.h b/src/svg/qsvgfont_p.h
+index fd0a3fab..fcffbe85 100644
+--- a/src/svg/qsvgfont_p.h
++++ b/src/svg/qsvgfont_p.h
+@@ -74,6 +74,7 @@ public:
+ class Q_SVG_PRIVATE_EXPORT QSvgFont : public QSvgRefCounted
+ {
+ public:
++    static constexpr qreal DEFAULT_UNITS_PER_EM = 1000;
+     QSvgFont(qreal horizAdvX);
+ 
+     void setFamilyName(const QString &name);
+@@ -86,9 +87,7 @@ public:
+     void draw(QPainter *p, const QPointF &point, const QString &str, qreal pixelSize, Qt::Alignment alignment) const;
+ public:
+     QString m_familyName;
+-    qreal m_unitsPerEm;
+-    qreal m_ascent;
+-    qreal m_descent;
++    qreal m_unitsPerEm = DEFAULT_UNITS_PER_EM;
+     qreal m_horizAdvX;
+     QHash<QChar, QSvgGlyph> m_glyphs;
+ };
+diff --git a/src/svg/qsvghandler.cpp b/src/svg/qsvghandler.cpp
+index 8dda5632..222b6d89 100644
+--- a/src/svg/qsvghandler.cpp
++++ b/src/svg/qsvghandler.cpp
+@@ -2671,7 +2671,7 @@ static bool parseFontFaceNode(QSvgStyleProperty *parent,
+ 
+     qreal unitsPerEm = toDouble(unitsPerEmStr);
+     if (!unitsPerEm)
+-        unitsPerEm = 1000;
++        unitsPerEm = QSvgFont::DEFAULT_UNITS_PER_EM;
+ 
+     if (!name.isEmpty())
+         font->setFamilyName(name);
+-- 
+GitLab
+

diff --git a/dev-qt/qtsvg/qtsvg-5.15.9-r1.ebuild b/dev-qt/qtsvg/qtsvg-5.15.9-r1.ebuild
new file mode 100644
index 000000000000..96f2aa87d916
--- /dev/null
+++ b/dev-qt/qtsvg/qtsvg-5.15.9-r1.ebuild
@@ -0,0 +1,27 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+if [[ ${PV} != *9999* ]]; then
+	QT5_KDEPATCHSET_REV=1
+	KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~loong ~ppc ~ppc64 ~riscv ~sparc ~x86"
+fi
+
+inherit qt5-build
+
+DESCRIPTION="SVG rendering library for the Qt5 framework"
+
+IUSE=""
+
+RDEPEND="
+	=dev-qt/qtcore-${QT5_PV}*
+	=dev-qt/qtgui-${QT5_PV}*
+	=dev-qt/qtwidgets-${QT5_PV}*
+	sys-libs/zlib:=
+"
+DEPEND="${RDEPEND}
+	test? ( =dev-qt/qtxml-${QT5_PV}* )
+"
+
+PATCHES=( "${FILESDIR}/${P}-fix-ub-ossfuzz-22618.patch" )

[gentoo-commits] repo/gentoo:master commit in: dev-qt/qtsvg/files/, dev-qt/qtsvg/

[Andreas Sturmlechner]

commit:     0311fd2de453d668cd5b5b8bc08f0e7a1cb31268
Author:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
AuthorDate: Thu Jul 13 07:36:03 2023 +0000
Commit:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Thu Jul 13 08:42:08 2023 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=0311fd2d

dev-qt/qtsvg: drop 5.15.9

Signed-off-by: Andreas Sturmlechner <asturm <AT> gentoo.org>

 dev-qt/qtsvg/Manifest                              |  2 -
 .../files/qtsvg-5.15.9-fix-ub-ossfuzz-22618.patch  | 59 ----------------------
 dev-qt/qtsvg/qtsvg-5.15.9-r1.ebuild                | 27 ----------
 3 files changed, 88 deletions(-)

diff --git a/dev-qt/qtsvg/Manifest b/dev-qt/qtsvg/Manifest
index de856c1f1af5..c41057f35c86 100644
--- a/dev-qt/qtsvg/Manifest
+++ b/dev-qt/qtsvg/Manifest
@@ -1,5 +1,3 @@
 DIST qtsvg-5.15.10-gentoo-kde-1.tar.xz 5012 BLAKE2B 2eaab709cf165108b6f18ffd88ee7333ebbbca94500fcd426e155c4ef85670b565ed5db6a89c31e542118a4f048bb347375964e9056badd3c7ad5cabe3367d3e SHA512 2d3168540cfbb51302a3824f936c1c33a01864793a5eb56287dd0b13bd2ed3b23df3049d295fa5ecd94d453deed67542f5bcccc6071570a802cf04c1caef6138
-DIST qtsvg-5.15.9-gentoo-kde-1.tar.xz 4368 BLAKE2B d2758227d565d9043022e22d0eaa34cdd4b851435e331c30af8c4b2b232a068d5bd222389588dd01ab872611d34da0be90f4921377de63e7b5477c0d74bb5090 SHA512 2b99a16e277795431ea7953119efe70a9bcf084b2cd1e63003d4ba032067eeaaacac47239788a5860c1d5960af738df7bda4a317b484f3f64e1cd1e3aa31b749
 DIST qtsvg-everywhere-opensource-src-5.15.10.tar.xz 1889960 BLAKE2B 14ee7bbf0914e47d8fc39790ce597fca0085e6018d33878752e707a9ece567bb139bc2f1e689840d6641aa6db958240a4f97fab69e7200385ddb2ee53abc5f04 SHA512 6de19c1dd6584f95bc3abbd391495bbdc13f15cc677a0c9e7afa2a0beffef8f8128eab5ccda741ed95af4553203b9daf1fc0327197912945e7211aeace33c6e7
-DIST qtsvg-everywhere-opensource-src-5.15.9.tar.xz 1889044 BLAKE2B 0163c88701d510ab99a1d0d91f98fced612e428fdb04573aba5e819cb7a713d283e1cae94f0e31a7016d14a1f61f202a417453f63768ebdfa185772abcf0cf71 SHA512 e091c059492662fad713d1f99bfa5e21a8f8e77e24b067d176a6e732b420a22e3777fa99a880c6f992a19b2e5b16c01f131da875d9e08e6a515108b468192fe5
 DIST qtsvg-everywhere-src-6.5.1.tar.xz 1728900 BLAKE2B 9003463afefb97fea05dcac2b9a56f31c3e5a64a76e4a3b4b04bccfe73c691f48a4c8696aeda7359d113c6fd7c8ec7c0bc094d092f3db2338e0ca136792b7705 SHA512 4df0e02aa9b21091eb71a536befc52d8e7bd5f6d9fa757fcf0ac2f11e44d3f84b44d73551e44bd6a1045891bc9c0ed471820a94b8f014b3a82cccf32b10ac437

diff --git a/dev-qt/qtsvg/files/qtsvg-5.15.9-fix-ub-ossfuzz-22618.patch b/dev-qt/qtsvg/files/qtsvg-5.15.9-fix-ub-ossfuzz-22618.patch
deleted file mode 100644
index adc43d7c3fba..000000000000
--- a/dev-qt/qtsvg/files/qtsvg-5.15.9-fix-ub-ossfuzz-22618.patch
+++ /dev/null
@@ -1,59 +0,0 @@
-From 837b5163e17edbd3a9f098e9a1ab73febab419b4 Mon Sep 17 00:00:00 2001
-From: =?UTF-8?q?Robert=20L=C3=B6hning?= <robert.loehning@qt.io>
-Date: Mon, 24 Apr 2023 15:27:17 +0200
-Subject: [PATCH] QSvgFont: Initialize used member, remove unused
-
-Credit to OSS-Fuzz
-
-[ChangeLog][QtSvg] Fixed undefined behavior from using uninitialized
-variable.
-
-Pick-to: 6.5 6.2 5.15
-Coverity-Id: 22618
-Change-Id: Id52277bb0e2845f4d342e187dbb8093e9276b70c
-Reviewed-by: Eskil Abrahamsen Blomfeldt <eskil.abrahamsen-blomfeldt@qt.io>
-(cherry picked from commit ff22c3ccf8ccf813fdcfda23f7740ba73ba5ce0a)
----
- src/svg/qsvgfont_p.h    | 5 ++---
- src/svg/qsvghandler.cpp | 2 +-
- 2 files changed, 3 insertions(+), 4 deletions(-)
-
-diff --git a/src/svg/qsvgfont_p.h b/src/svg/qsvgfont_p.h
-index fd0a3fab..fcffbe85 100644
---- a/src/svg/qsvgfont_p.h
-+++ b/src/svg/qsvgfont_p.h
-@@ -74,6 +74,7 @@ public:
- class Q_SVG_PRIVATE_EXPORT QSvgFont : public QSvgRefCounted
- {
- public:
-+    static constexpr qreal DEFAULT_UNITS_PER_EM = 1000;
-     QSvgFont(qreal horizAdvX);
- 
-     void setFamilyName(const QString &name);
-@@ -86,9 +87,7 @@ public:
-     void draw(QPainter *p, const QPointF &point, const QString &str, qreal pixelSize, Qt::Alignment alignment) const;
- public:
-     QString m_familyName;
--    qreal m_unitsPerEm;
--    qreal m_ascent;
--    qreal m_descent;
-+    qreal m_unitsPerEm = DEFAULT_UNITS_PER_EM;
-     qreal m_horizAdvX;
-     QHash<QChar, QSvgGlyph> m_glyphs;
- };
-diff --git a/src/svg/qsvghandler.cpp b/src/svg/qsvghandler.cpp
-index 8dda5632..222b6d89 100644
---- a/src/svg/qsvghandler.cpp
-+++ b/src/svg/qsvghandler.cpp
-@@ -2671,7 +2671,7 @@ static bool parseFontFaceNode(QSvgStyleProperty *parent,
- 
-     qreal unitsPerEm = toDouble(unitsPerEmStr);
-     if (!unitsPerEm)
--        unitsPerEm = 1000;
-+        unitsPerEm = QSvgFont::DEFAULT_UNITS_PER_EM;
- 
-     if (!name.isEmpty())
-         font->setFamilyName(name);
--- 
-GitLab
-

diff --git a/dev-qt/qtsvg/qtsvg-5.15.9-r1.ebuild b/dev-qt/qtsvg/qtsvg-5.15.9-r1.ebuild
deleted file mode 100644
index dc7913ed59bd..000000000000
--- a/dev-qt/qtsvg/qtsvg-5.15.9-r1.ebuild
+++ /dev/null
@@ -1,27 +0,0 @@
-# Copyright 1999-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-if [[ ${PV} != *9999* ]]; then
-	QT5_KDEPATCHSET_REV=1
-	KEYWORDS="amd64 arm arm64 ~hppa ~loong ppc ppc64 ~riscv ~sparc x86"
-fi
-
-inherit qt5-build
-
-DESCRIPTION="SVG rendering library for the Qt5 framework"
-
-IUSE=""
-
-RDEPEND="
-	=dev-qt/qtcore-${QT5_PV}*
-	=dev-qt/qtgui-${QT5_PV}*
-	=dev-qt/qtwidgets-${QT5_PV}*
-	sys-libs/zlib:=
-"
-DEPEND="${RDEPEND}
-	test? ( =dev-qt/qtxml-${QT5_PV}* )
-"
-
-PATCHES=( "${FILESDIR}/${P}-fix-ub-ossfuzz-22618.patch" )

[gentoo-commits] repo/gentoo:master commit in: dev-qt/qtsvg/files/, dev-qt/qtsvg/

[Ionen Wolkens]

commit:     37a5ee017ab4bc745fdff6626603ceb5ebbdd129
Author:     Ionen Wolkens <ionen <AT> gentoo <DOT> org>
AuthorDate: Thu Oct 12 19:47:56 2023 +0000
Commit:     Ionen Wolkens <ionen <AT> gentoo <DOT> org>
CommitDate: Thu Oct 12 19:52:36 2023 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=37a5ee01

dev-qt/qtsvg: backport qt6.6 fix for crash with invalid SVGs

Bug: https://bugs.gentoo.org/915582
Signed-off-by: Ionen Wolkens <ionen <AT> gentoo.org>

 dev-qt/qtsvg/files/qtsvg-6.6.0-invalid-svg-crash.patch | 18 ++++++++++++++++++
 .../{qtsvg-6.6.0.ebuild => qtsvg-6.6.0-r1.ebuild}      |  4 ++++
 2 files changed, 22 insertions(+)

diff --git a/dev-qt/qtsvg/files/qtsvg-6.6.0-invalid-svg-crash.patch b/dev-qt/qtsvg/files/qtsvg-6.6.0-invalid-svg-crash.patch
new file mode 100644
index 000000000000..950cac7d679e
--- /dev/null
+++ b/dev-qt/qtsvg/files/qtsvg-6.6.0-invalid-svg-crash.patch
@@ -0,0 +1,18 @@
+https://bugs.gentoo.org/915582
+https://bugreports.qt.io/browse/QTBUG-117944
+https://codereview.qt-project.org/c/qt/qtsvg/+/510692
+https://github.com/qt/qtsvg/commit/effc44495a33babd4cf7a2044123f420e6b3da1c
+From: Paul Olav Tvete <paul.tvete@qt.io>
+Date: Tue, 10 Oct 2023 10:14:22 +0200
+Subject: [PATCH] Fix nullptr dereference with invalid SVG
+--- a/src/svg/qsvghandler.cpp
++++ b/src/svg/qsvghandler.cpp
+@@ -3606,6 +3606,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:

diff --git a/dev-qt/qtsvg/qtsvg-6.6.0.ebuild b/dev-qt/qtsvg/qtsvg-6.6.0-r1.ebuild
similarity index 85%
rename from dev-qt/qtsvg/qtsvg-6.6.0.ebuild
rename to dev-qt/qtsvg/qtsvg-6.6.0-r1.ebuild
index e1b14151f896..4ee65f5cee0e 100644
--- a/dev-qt/qtsvg/qtsvg-6.6.0.ebuild
+++ b/dev-qt/qtsvg/qtsvg-6.6.0-r1.ebuild
@@ -16,3 +16,7 @@ RDEPEND="
 	sys-libs/zlib:=
 "
 DEPEND="${RDEPEND}"
+
+PATCHES=(
+	"${FILESDIR}"/${P}-invalid-svg-crash.patch
+)