From 76ba3cbda4e03060a57b4b3468661bee5a02d120 Mon Sep 17 00:00:00 2001
From: Jan Grulich <jgrulich@redhat.com>
Date: Tue, 17 May 2022 10:02:19 +0200
Subject: [PATCH] 5.15.4

---
 .gitignore                                    |  1 +
 qt5-qtsvg.spec                                |  6 +++--
 ...ubles-to-float-representtable-values.patch | 23 -------------------
 sources                                       |  2 +-
 4 files changed, 6 insertions(+), 26 deletions(-)
 delete mode 100644 qtsvg-5.15.2-clamp-parsed-doubles-to-float-representtable-values.patch

diff --git a/.gitignore b/.gitignore
index 73d7c0e..6434372 100644
--- a/.gitignore
+++ b/.gitignore
@@ -12,3 +12,4 @@
 /qtsvg-everywhere-src-5.15.1.tar.xz
 /qtsvg-everywhere-src-5.15.2.tar.xz
 /qtsvg-everywhere-opensource-src-5.15.3.tar.xz
+/qtsvg-everywhere-opensource-src-5.15.4.tar.xz
diff --git a/qt5-qtsvg.spec b/qt5-qtsvg.spec
index 9670362..015012b 100644
--- a/qt5-qtsvg.spec
+++ b/qt5-qtsvg.spec
@@ -2,7 +2,7 @@
 
 Summary: Qt5 - Support for rendering and displaying SVG
 Name:    qt5-%{qt_module}
-Version: 5.15.3
+Version: 5.15.4
 Release: 1%{?dist}
 
 # See LGPL_EXCEPTIONS.txt, LICENSE.GPL3, respectively, for exception details
@@ -12,7 +12,6 @@ Url:     http://www.qt.io
 Source0: https://download.qt.io/official_releases/qt/%{majmin}/%{version}/submodules/%{qt_module}-everywhere-opensource-src-%{version}.tar.xz
 
 # upstream fix
-Patch0: qtsvg-5.15.2-clamp-parsed-doubles-to-float-representtable-values.patch
 Patch1: qtsvg-5.15.2-do-strict-error-checking-when-parsing-path-nodes.patch
 
 BuildRequires: make
@@ -90,6 +89,9 @@ popd
 
 
 %changelog
+* Mon May 16 2022 Jan Grulich <jgrulich@redhat.com> - 5.15.4-1
+- 5.15.4
+
 * Fri Mar 04 2022 Jan Grulich <jgrulich@redhat.com> - 5.15.3-1
 - 5.15.3
 
diff --git a/qtsvg-5.15.2-clamp-parsed-doubles-to-float-representtable-values.patch b/qtsvg-5.15.2-clamp-parsed-doubles-to-float-representtable-values.patch
deleted file mode 100644
index bb9610c..0000000
--- a/qtsvg-5.15.2-clamp-parsed-doubles-to-float-representtable-values.patch
+++ /dev/null
@@ -1,23 +0,0 @@
-diff --git a/src/svg/qsvghandler.cpp b/src/svg/qsvghandler.cpp
-index b3d9aaf..9dac05c 100644
---- a/src/svg/qsvghandler.cpp
-+++ b/src/svg/qsvghandler.cpp
-@@ -673,7 +673,8 @@ static qreal toDouble(const QChar *&str)
-             val = -val;
-     } else {
-         val = QByteArray::fromRawData(temp, pos).toDouble();
--        if (qFpClassify(val) != FP_NORMAL)
-+        // Do not tolerate values too wild to be represented normally by floats
-+        if (qFpClassify(float(val)) != FP_NORMAL)
-             val = 0;
-     }
-     return val;
-@@ -3046,6 +3047,8 @@ static QSvgStyleProperty *createRadialGradientNode(QSvgNode *node,
-         ncy = toDouble(cy);
-     if (!r.isEmpty())
-         nr = toDouble(r);
-+    if (nr < 0.5)
-+        nr = 0.5;
- 
-     qreal nfx = ncx;
-     if (!fx.isEmpty())
diff --git a/sources b/sources
index c7d8934..e10f866 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-SHA512 (qtsvg-everywhere-opensource-src-5.15.3.tar.xz) = 288ce98bb6dd746564c7ffbd0d8221d0816c62b7e33424cd21d945b40308292ec9a0b1e2b9cca6ce91d606c06813f05068cad590d827810383175bebfa8ab527
+SHA512 (qtsvg-everywhere-opensource-src-5.15.4.tar.xz) = 364400e17cdc659ff1a521f7bd171c5dfe537136f263cd5f64c6b5e27b0398d83ae0b5fe46e77847f3a2feccf0ea75f9591ff4b932d0250e5859272630b5a31c