[neon/qt/qtsvg/Neon/release] debian/patches: drop all patches

Carlos De Maine null at kde.org
Thu Jul 25 08:40:39 BST 2024


Git commit 8ca94c0f47b6a5bb24add894a5ed8ae7f653a317 by Carlos De Maine.
Committed on 25/07/2024 at 07:40.
Pushed by carlosdem into branch 'Neon/release'.

drop all patches

D  +0    -34   debian/patches/CVE-2023-32573.diff
D  +0    -1    debian/patches/series

https://invent.kde.org/neon/qt/qtsvg/-/commit/8ca94c0f47b6a5bb24add894a5ed8ae7f653a317

diff --git a/debian/patches/CVE-2023-32573.diff b/debian/patches/CVE-2023-32573.diff
deleted file mode 100644
index 390c071..0000000
--- a/debian/patches/CVE-2023-32573.diff
+++ /dev/null
@@ -1,34 +0,0 @@
-Description: QSvgFont: initialize m_unitsPerEm to fix undefined behavior
-Origin: upstream, https://download.qt.io/official_releases/qt/5.15/CVE-2023-32573-qtsvg-5.15.diff
-Last-Update: 2023-05-21
-
---- 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,7 +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_unitsPerEm = DEFAULT_UNITS_PER_EM;
-     qreal m_ascent;
-     qreal m_descent;
-     qreal m_horizAdvX;
---- a/src/svg/qsvghandler.cpp
-+++ b/src/svg/qsvghandler.cpp
-@@ -2668,7 +2668,7 @@ static bool parseFontFaceNode(QSvgStyleP
- 
-     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/series b/debian/patches/series
deleted file mode 100644
index 47137d8..0000000
--- a/debian/patches/series
+++ /dev/null
@@ -1 +0,0 @@
-CVE-2023-32573.diff


More information about the Neon-commits mailing list