diff --git a/.gitignore b/.gitignore index 451a743..73d7c0e 100644 --- a/.gitignore +++ b/.gitignore @@ -11,3 +11,4 @@ /qtsvg-everywhere-src-5.14.2.tar.xz /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 diff --git a/qt5-qtsvg.spec b/qt5-qtsvg.spec index 1a7bde7..9670362 100644 --- a/qt5-qtsvg.spec +++ b/qt5-qtsvg.spec @@ -2,14 +2,14 @@ Summary: Qt5 - Support for rendering and displaying SVG Name: qt5-%{qt_module} -Version: 5.15.2 -Release: 7%{?dist} +Version: 5.15.3 +Release: 1%{?dist} # See LGPL_EXCEPTIONS.txt, LICENSE.GPL3, respectively, for exception details License: LGPLv2 with exceptions or GPLv3 with exceptions Url: http://www.qt.io %global majmin %(echo %{version} | cut -d. -f1-2) -Source0: https://download.qt.io/official_releases/qt/%{majmin}/%{version}/submodules/%{qt_module}-everywhere-src-%{version}.tar.xz +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 @@ -90,6 +90,9 @@ popd %changelog +* Fri Mar 04 2022 Jan Grulich - 5.15.3-1 +- 5.15.3 + * Fri Jan 21 2022 Fedora Release Engineering - 5.15.2-7 - Rebuilt for https://fedoraproject.org/wiki/Fedora_36_Mass_Rebuild 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 index 83db864..bb9610c 100644 --- 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 @@ -1,25 +1,18 @@ -diff -up qtsvg-everywhere-src-5.15.2/src/svg/qsvghandler.cpp.orig qtsvg-everywhere-src-5.15.2/src/svg/qsvghandler.cpp ---- qtsvg-everywhere-src-5.15.2/src/svg/qsvghandler.cpp.orig 2020-10-27 09:02:11.000000000 +0100 -+++ qtsvg-everywhere-src-5.15.2/src/svg/qsvghandler.cpp 2021-03-09 17:48:50.187425243 +0100 -@@ -65,6 +65,7 @@ - #include "private/qmath_p.h" - - #include "float.h" -+#include - - QT_BEGIN_NAMESPACE - -@@ -672,6 +673,9 @@ static qreal toDouble(const QChar *&str) +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 (std::fpclassify(float(val)) != FP_NORMAL) -+ val = 0; ++ if (qFpClassify(float(val)) != FP_NORMAL) + val = 0; } return val; - -@@ -3043,6 +3047,8 @@ static QSvgStyleProperty *createRadialGr +@@ -3046,6 +3047,8 @@ static QSvgStyleProperty *createRadialGradientNode(QSvgNode *node, ncy = toDouble(cy); if (!r.isEmpty()) nr = toDouble(r); diff --git a/qtsvg-5.15.2-do-strict-error-checking-when-parsing-path-nodes.patch b/qtsvg-5.15.2-do-strict-error-checking-when-parsing-path-nodes.patch index 1b365b7..d47d0e3 100644 --- a/qtsvg-5.15.2-do-strict-error-checking-when-parsing-path-nodes.patch +++ b/qtsvg-5.15.2-do-strict-error-checking-when-parsing-path-nodes.patch @@ -1,25 +1,26 @@ -diff -up qtsvg-everywhere-src-5.15.2/src/svg/qsvghandler.cpp.orig qtsvg-everywhere-src-5.15.2/src/svg/qsvghandler.cpp ---- qtsvg-everywhere-src-5.15.2/src/svg/qsvghandler.cpp.orig 2022-01-18 17:48:18.619191388 +0100 -+++ qtsvg-everywhere-src-5.15.2/src/svg/qsvghandler.cpp 2022-01-18 17:48:28.755246206 +0100 -@@ -1615,6 +1615,7 @@ static void pathArc(QPainterPath &path, - +diff --git a/src/svg/qsvghandler.cpp b/src/svg/qsvghandler.cpp +index b3d9aaf..402a71f 100644 +--- a/src/svg/qsvghandler.cpp ++++ b/src/svg/qsvghandler.cpp +@@ -1614,6 +1614,7 @@ static void pathArc(QPainterPath &path, + static bool parsePathDataFast(const QStringRef &dataStr, QPainterPath &path) { + const int maxElementCount = 0x7fff; // Assume file corruption if more path elements than this qreal x0 = 0, y0 = 0; // starting point qreal x = 0, y = 0; // current point char lastMode = 0; -@@ -1622,7 +1623,8 @@ static bool parsePathDataFast(const QStr +@@ -1621,7 +1622,8 @@ static bool parsePathDataFast(const QStringRef &dataStr, QPainterPath &path) const QChar *str = dataStr.constData(); const QChar *end = str + dataStr.size(); - + - while (str != end) { + bool ok = true; + while (ok && str != end) { while (str->isSpace() && (str + 1) != end) ++str; QChar pathElem = *str; -@@ -1636,14 +1638,13 @@ static bool parsePathDataFast(const QStr +@@ -1635,14 +1637,13 @@ static bool parsePathDataFast(const QStringRef &dataStr, QPainterPath &path) arg.append(0);//dummy const qreal *num = arg.constData(); int count = arg.count(); @@ -36,7 +37,7 @@ diff -up qtsvg-everywhere-src-5.15.2/src/svg/qsvghandler.cpp.orig qtsvg-everywhe break; } x = x0 = num[0] + offsetX; -@@ -1660,8 +1661,7 @@ static bool parsePathDataFast(const QStr +@@ -1659,8 +1660,7 @@ static bool parsePathDataFast(const QStringRef &dataStr, QPainterPath &path) break; case 'M': { if (count < 2) { @@ -46,7 +47,7 @@ diff -up qtsvg-everywhere-src-5.15.2/src/svg/qsvghandler.cpp.orig qtsvg-everywhe break; } x = x0 = num[0]; -@@ -1687,8 +1687,7 @@ static bool parsePathDataFast(const QStr +@@ -1686,8 +1686,7 @@ static bool parsePathDataFast(const QStringRef &dataStr, QPainterPath &path) break; case 'l': { if (count < 2) { @@ -56,7 +57,7 @@ diff -up qtsvg-everywhere-src-5.15.2/src/svg/qsvghandler.cpp.orig qtsvg-everywhe break; } x = num[0] + offsetX; -@@ -1701,8 +1700,7 @@ static bool parsePathDataFast(const QStr +@@ -1700,8 +1699,7 @@ static bool parsePathDataFast(const QStringRef &dataStr, QPainterPath &path) break; case 'L': { if (count < 2) { @@ -66,7 +67,7 @@ diff -up qtsvg-everywhere-src-5.15.2/src/svg/qsvghandler.cpp.orig qtsvg-everywhe break; } x = num[0]; -@@ -1742,8 +1740,7 @@ static bool parsePathDataFast(const QStr +@@ -1741,8 +1739,7 @@ static bool parsePathDataFast(const QStringRef &dataStr, QPainterPath &path) break; case 'c': { if (count < 6) { @@ -76,7 +77,7 @@ diff -up qtsvg-everywhere-src-5.15.2/src/svg/qsvghandler.cpp.orig qtsvg-everywhe break; } QPointF c1(num[0] + offsetX, num[1] + offsetY); -@@ -1759,8 +1756,7 @@ static bool parsePathDataFast(const QStr +@@ -1758,8 +1755,7 @@ static bool parsePathDataFast(const QStringRef &dataStr, QPainterPath &path) } case 'C': { if (count < 6) { @@ -86,7 +87,7 @@ diff -up qtsvg-everywhere-src-5.15.2/src/svg/qsvghandler.cpp.orig qtsvg-everywhe break; } QPointF c1(num[0], num[1]); -@@ -1776,8 +1772,7 @@ static bool parsePathDataFast(const QStr +@@ -1775,8 +1771,7 @@ static bool parsePathDataFast(const QStringRef &dataStr, QPainterPath &path) } case 's': { if (count < 4) { @@ -96,7 +97,7 @@ diff -up qtsvg-everywhere-src-5.15.2/src/svg/qsvghandler.cpp.orig qtsvg-everywhe break; } QPointF c1; -@@ -1798,8 +1793,7 @@ static bool parsePathDataFast(const QStr +@@ -1797,8 +1792,7 @@ static bool parsePathDataFast(const QStringRef &dataStr, QPainterPath &path) } case 'S': { if (count < 4) { @@ -106,7 +107,7 @@ diff -up qtsvg-everywhere-src-5.15.2/src/svg/qsvghandler.cpp.orig qtsvg-everywhe break; } QPointF c1; -@@ -1820,8 +1814,7 @@ static bool parsePathDataFast(const QStr +@@ -1819,8 +1813,7 @@ static bool parsePathDataFast(const QStringRef &dataStr, QPainterPath &path) } case 'q': { if (count < 4) { @@ -116,7 +117,7 @@ diff -up qtsvg-everywhere-src-5.15.2/src/svg/qsvghandler.cpp.orig qtsvg-everywhe break; } QPointF c(num[0] + offsetX, num[1] + offsetY); -@@ -1836,8 +1829,7 @@ static bool parsePathDataFast(const QStr +@@ -1835,8 +1828,7 @@ static bool parsePathDataFast(const QStringRef &dataStr, QPainterPath &path) } case 'Q': { if (count < 4) { @@ -126,7 +127,7 @@ diff -up qtsvg-everywhere-src-5.15.2/src/svg/qsvghandler.cpp.orig qtsvg-everywhe break; } QPointF c(num[0], num[1]); -@@ -1852,8 +1844,7 @@ static bool parsePathDataFast(const QStr +@@ -1851,8 +1843,7 @@ static bool parsePathDataFast(const QStringRef &dataStr, QPainterPath &path) } case 't': { if (count < 2) { @@ -136,7 +137,7 @@ diff -up qtsvg-everywhere-src-5.15.2/src/svg/qsvghandler.cpp.orig qtsvg-everywhe break; } QPointF e(num[0] + offsetX, num[1] + offsetY); -@@ -1873,8 +1864,7 @@ static bool parsePathDataFast(const QStr +@@ -1872,8 +1863,7 @@ static bool parsePathDataFast(const QStringRef &dataStr, QPainterPath &path) } case 'T': { if (count < 2) { @@ -146,7 +147,7 @@ diff -up qtsvg-everywhere-src-5.15.2/src/svg/qsvghandler.cpp.orig qtsvg-everywhe break; } QPointF e(num[0], num[1]); -@@ -1894,8 +1884,7 @@ static bool parsePathDataFast(const QStr +@@ -1893,8 +1883,7 @@ static bool parsePathDataFast(const QStringRef &dataStr, QPainterPath &path) } case 'a': { if (count < 7) { @@ -156,7 +157,7 @@ diff -up qtsvg-everywhere-src-5.15.2/src/svg/qsvghandler.cpp.orig qtsvg-everywhe break; } qreal rx = (*num++); -@@ -1917,8 +1906,7 @@ static bool parsePathDataFast(const QStr +@@ -1916,8 +1905,7 @@ static bool parsePathDataFast(const QStringRef &dataStr, QPainterPath &path) break; case 'A': { if (count < 7) { @@ -166,7 +167,7 @@ diff -up qtsvg-everywhere-src-5.15.2/src/svg/qsvghandler.cpp.orig qtsvg-everywhe break; } qreal rx = (*num++); -@@ -1939,12 +1927,15 @@ static bool parsePathDataFast(const QStr +@@ -1938,12 +1926,15 @@ static bool parsePathDataFast(const QStringRef &dataStr, QPainterPath &path) } break; default: @@ -182,16 +183,16 @@ diff -up qtsvg-everywhere-src-5.15.2/src/svg/qsvghandler.cpp.orig qtsvg-everywhe - return true; + return ok; } - + static bool parseStyle(QSvgNode *node, -@@ -2980,8 +2971,8 @@ static QSvgNode *createPathNode(QSvgNode - +@@ -2979,8 +2970,8 @@ static QSvgNode *createPathNode(QSvgNode *parent, + QPainterPath qpath; qpath.setFillRule(Qt::WindingFill); - //XXX do error handling - parsePathDataFast(data, qpath); + if (!parsePathDataFast(data, qpath)) + qCWarning(lcSvgHandler, "Invalid path data; path truncated."); - + QSvgNode *path = new QSvgPath(parent, qpath); return path; diff --git a/sources b/sources index c985c88..c7d8934 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (qtsvg-everywhere-src-5.15.2.tar.xz) = 101e9c8fc05b1bb9c4e869564bff8e5723dd35f0ef557185e56e9dc12fdce74c531522c9642cdff639900eccf7ed0e04bfa48142741259697dded990fb481730 +SHA512 (qtsvg-everywhere-opensource-src-5.15.3.tar.xz) = 288ce98bb6dd746564c7ffbd0d8221d0816c62b7e33424cd21d945b40308292ec9a0b1e2b9cca6ce91d606c06813f05068cad590d827810383175bebfa8ab527