[neon/qt6/qt6-svg/Neon/release] debian/patches: drop unnecessary patches

[Carlos De Maine]

Git commit 298047ae28e9ba7d92bd41dc3257ac83ef3f1dc0 by Carlos De Maine.
Committed on 09/12/2023 at 01:35.
Pushed by carlosdem into branch 'Neon/release'.

drop unnecessary patches

D  +0    -36   debian/patches/CVE-2023-32573-qtsvg-6.5.diff
D  +0    -14   debian/patches/CVE-2023-45872-qtsvg-6.6.0.diff
M  +0    -2    debian/patches/series

https://invent.kde.org/neon/qt6/qt6-svg/-/commit/298047ae28e9ba7d92bd41dc3257ac83ef3f1dc0

diff --git a/debian/patches/CVE-2023-32573-qtsvg-6.5.diff b/debian/patches/CVE-2023-32573-qtsvg-6.5.diff
deleted file mode 100644
index aa86f2a..0000000
--- a/debian/patches/CVE-2023-32573-qtsvg-6.5.diff
+++ /dev/null
@@ -1,36 +0,0 @@
---- a/src/svg/qsvgfont_p.h
-+++ b/src/svg/qsvgfont_p.h
-@@ -38,6 +38,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);
-@@ -50,9 +51,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;
- };
-
-
---- a/src/svg/qsvghandler.cpp
-+++ b/src/svg/qsvghandler.cpp
-@@ -2622,7 +2622,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);
-
-
diff --git a/debian/patches/CVE-2023-45872-qtsvg-6.6.0.diff b/debian/patches/CVE-2023-45872-qtsvg-6.6.0.diff
deleted file mode 100644
index 4dcb62e..0000000
--- a/debian/patches/CVE-2023-45872-qtsvg-6.6.0.diff
+++ /dev/null
@@ -1,14 +0,0 @@
-diff --git a/src/svg/qsvghandler.cpp b/src/svg/qsvghandler.cpp
-index 2649422..335500a 100644
---- 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/debian/patches/series b/debian/patches/series
index 5be2f7f..e69de29 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,2 +0,0 @@
-#CVE-2023-32573-qtsvg-6.5.diff # is in 6.5.1
-CVE-2023-45872-qtsvg-6.6.0.diff