[neon/qt6/qt6-svg/Neon/unstable] debian/patches: fix warning

Carlos De Maine null at kde.org
Sun Nov 26 21:59:35 GMT 2023


Git commit 7c50f86fce0cadc6942eed62e7b0d0c2c3e4e60a by Carlos De Maine.
Committed on 26/11/2023 at 22:59.
Pushed by carlosdem into branch 'Neon/unstable'.

fix warning

D  +0    -36   debian/patches/CVE-2023-32573-qtsvg-6.5.diff

https://invent.kde.org/neon/qt6/qt6-svg/-/commit/7c50f86fce0cadc6942eed62e7b0d0c2c3e4e60a

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);
-
-


More information about the Neon-commits mailing list