[packages/qt5-qtsvg] up to 5.15.14

[atler]

commit 4933329ec6f98a23cb9b584f529cb59fe837b195
Author: Jan Palus <atler at pld-linux.org>
Date:   Sun May 26 11:33:03 2024 +0200

    up to 5.15.14

 CVE-2023-32573-qtsvg-5.15.diff | 34 ----------------------------------
 qt5-qtsvg.spec                 |  6 ++----
 2 files changed, 2 insertions(+), 38 deletions(-)
---
diff --git a/qt5-qtsvg.spec b/qt5-qtsvg.spec
index 2c5727c..6ff8c5e 100644
--- a/qt5-qtsvg.spec
+++ b/qt5-qtsvg.spec
@@ -8,13 +8,12 @@
 Summary:	The Qt5 Svg library
 Summary(pl.UTF-8):	Biblioteka Qt5 Svg
 Name:		qt5-%{orgname}
-Version:	5.15.13
+Version:	5.15.14
 Release:	1
 License:	LGPL v3 or GPL v2 or GPL v3 or comercial
 Group:		X11/Libraries
 Source0:	https://download.qt.io/official_releases/qt/5.15/%{version}/submodules/%{orgname}-everywhere-opensource-src-%{version}.tar.xz
-# Source0-md5:	480f00693f742c1b12f88385e538f1be
-Patch0:		CVE-2023-32573-qtsvg-5.15.diff
+# Source0-md5:	b271a1fec0769074f8f4838842ff6768
 URL:		https://www.qt.io/
 BuildRequires:	Qt5Core-devel >= %{qtbase_ver}
 BuildRequires:	Qt5Gui-devel >= %{qtbase_ver}
@@ -125,7 +124,6 @@ Przykłady do biblioteki Qt5 Svg.
 
 %prep
 %setup -q -n %{orgname}-everywhere-src-%{version}
-%patch0 -p1
 
 %build
 %{qmake_qt5}
diff --git a/CVE-2023-32573-qtsvg-5.15.diff b/CVE-2023-32573-qtsvg-5.15.diff
deleted file mode 100644
index 0554756..0000000
--- a/CVE-2023-32573-qtsvg-5.15.diff
+++ /dev/null
@@ -1,34 +0,0 @@
---- 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;
- };
-
-
---- a/src/svg/qsvghandler.cpp
-+++ b/src/svg/qsvghandler.cpp
-@@ -2668,7 +2668,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);
================================================================

---- gitweb:

http://git.pld-linux.org/gitweb.cgi/packages/qt5-qtsvg.git/commitdiff/4933329ec6f98a23cb9b584f529cb59fe837b195