diff -Nru qtsvg-opensource-src-5.15.2/debian/changelog qtsvg-opensource-src-5.15.3/debian/changelog --- qtsvg-opensource-src-5.15.2/debian/changelog 2022-01-09 13:26:35.000000000 +0000 +++ qtsvg-opensource-src-5.15.3/debian/changelog 2022-03-05 19:01:03.000000000 +0000 @@ -1,3 +1,13 @@ +qtsvg-opensource-src (5.15.3-1) experimental; urgency=medium + + * New upstream release. + * Update debian/watch. + * Bump Qt build-dependencies to 5.15.3. + * Bump ABI version to 5-15-3. + * Refresh debian/patches/CVE-2021-3481.diff. + + -- Dmitry Shachnev Sat, 05 Mar 2022 22:01:03 +0300 + qtsvg-opensource-src (5.15.2-4) unstable; urgency=medium * Backport upstream commit to do stricter error checking when parsing path diff -Nru qtsvg-opensource-src-5.15.2/debian/control qtsvg-opensource-src-5.15.3/debian/control --- qtsvg-opensource-src-5.15.2/debian/control 2022-01-09 13:26:35.000000000 +0000 +++ qtsvg-opensource-src-5.15.3/debian/control 2022-03-05 19:01:03.000000000 +0000 @@ -12,15 +12,15 @@ Build-Depends: dbus, debhelper-compat (= 13), dpkg-dev (>= 1.17.14), - libqt5opengl5-dev (>= 5.15.2+dfsg~), + libqt5opengl5-dev (>= 5.15.3+dfsg~), pkg-kde-tools (>= 0.15.17), - qtbase5-dev (>= 5.15.2+dfsg~), - qtbase5-private-dev (>= 5.15.2+dfsg~), + qtbase5-dev (>= 5.15.3+dfsg~), + qtbase5-private-dev (>= 5.15.3+dfsg~), zlib1g-dev -Build-Depends-Indep: qdoc-qt5 (>= 5.15.2~) , - qhelpgenerator-qt5 (>= 5.15.2~) , - qtattributionsscanner-qt5 (>= 5.15.2~) , - qtbase5-doc-html (>= 5.15.2+dfsg~) +Build-Depends-Indep: qdoc-qt5 (>= 5.15.3~) , + qhelpgenerator-qt5 (>= 5.15.3~) , + qtattributionsscanner-qt5 (>= 5.15.3~) , + qtbase5-doc-html (>= 5.15.3+dfsg~) Standards-Version: 4.6.0 Homepage: https://doc.qt.io/qt-5/qtsvg-index.html Vcs-Git: https://salsa.debian.org/qt-kde-team/qt/qtsvg.git @@ -29,7 +29,7 @@ Package: libqt5svg5 Architecture: any Multi-Arch: same -Provides: qtsvg-abi-5-15-2 +Provides: qtsvg-abi-5-15-3 Pre-Depends: dpkg (>= 1.15.6~), ${misc:Pre-Depends} Depends: ${misc:Depends}, ${shlibs:Depends} Description: Qt 5 SVG module diff -Nru qtsvg-opensource-src-5.15.2/debian/libqt5svg5.symbols qtsvg-opensource-src-5.15.3/debian/libqt5svg5.symbols --- qtsvg-opensource-src-5.15.2/debian/libqt5svg5.symbols 2022-01-09 13:26:35.000000000 +0000 +++ qtsvg-opensource-src-5.15.3/debian/libqt5svg5.symbols 2022-03-05 19:01:03.000000000 +0000 @@ -1,6 +1,6 @@ # SymbolsHelper-Confirmed: 5.15.2 alpha amd64 arm64 ppc64 s390x x32 libQt5Svg.so.5 libqt5svg5 #MINVER# -| libqt5svg5 #MINVER#, qtsvg-abi-5-15-2 +| libqt5svg5 #MINVER#, qtsvg-abi-5-15-3 * Build-Depends-Package: libqt5svg5-dev Qt_5.0@Qt_5.0 5.6.0~beta Qt_5.10@Qt_5.10 5.10.0 diff -Nru qtsvg-opensource-src-5.15.2/debian/patches/CVE-2021-3481.diff qtsvg-opensource-src-5.15.3/debian/patches/CVE-2021-3481.diff --- qtsvg-opensource-src-5.15.2/debian/patches/CVE-2021-3481.diff 2022-01-09 13:26:35.000000000 +0000 +++ qtsvg-opensource-src-5.15.3/debian/patches/CVE-2021-3481.diff 2022-03-05 19:01:03.000000000 +0000 @@ -1,30 +1,20 @@ Description: clamp parsed doubles to float representable values -Origin: upstream, commits: - https://code.qt.io/cgit/qt/qtsvg.git/commit/?id=aceea78cc05ac8ff - https://code.qt.io/cgit/qt/qtsvg.git/commit/?id=bfd6ee0d8cf34b63 -Last-Update: 2021-04-12 +Origin: upstream, https://code.qt.io/cgit/qt/qtsvg.git/commit/?id=bfd6ee0d8cf34b63 +Last-Update: 2022-03-05 --- a/src/svg/qsvghandler.cpp +++ b/src/svg/qsvghandler.cpp -@@ -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) +@@ -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; + val = 0; } return val; - -@@ -3043,6 +3047,8 @@ static QSvgStyleProperty *createRadialGr +@@ -3046,6 +3047,8 @@ static QSvgStyleProperty *createRadialGr ncy = toDouble(cy); if (!r.isEmpty()) nr = toDouble(r); diff -Nru qtsvg-opensource-src-5.15.2/debian/watch qtsvg-opensource-src-5.15.3/debian/watch --- qtsvg-opensource-src-5.15.2/debian/watch 2022-01-09 13:26:35.000000000 +0000 +++ qtsvg-opensource-src-5.15.3/debian/watch 2022-03-05 19:01:03.000000000 +0000 @@ -1,2 +1,2 @@ version=4 -https://download.qt.io/archive/qt/5.15/([\d\.]*)/submodules/qtsvg-everywhere-src-([^-]*)\.tar\.xz +https://download.qt.io/archive/qt/5.15/([\d\.]*)/submodules/qtsvg-everywhere-opensource-src-([^-]*)\.tar\.xz diff -Nru qtsvg-opensource-src-5.15.2/dist/changes-5.12.10 qtsvg-opensource-src-5.15.3/dist/changes-5.12.10 --- qtsvg-opensource-src-5.15.2/dist/changes-5.12.10 1970-01-01 00:00:00.000000000 +0000 +++ qtsvg-opensource-src-5.15.3/dist/changes-5.12.10 2021-03-18 12:54:01.000000000 +0000 @@ -0,0 +1,46 @@ +Qt 5.12.10 is a bug-fix release. It maintains both forward and backward +compatibility (source and binary) with Qt 5.12.9. + +For more details, refer to the online documentation included in this +distribution. The documentation is also available online: + + https://doc.qt.io/qt-5.12/index.html + +The Qt version 5.12 series is binary compatible with the 5.11.x series. +Applications compiled for 5.11 will continue to run with 5.12. + +Some of the changes listed in this file include issue tracking numbers +corresponding to tasks in the Qt Bug Tracker: + + https://bugreports.qt.io/ + +Each of these identifiers can be entered in the bug tracker to obtain more +information about a particular change. + +**************************************************************************** +* Library * +**************************************************************************** + + - This release fixes a number of cases where input fuzzing has + revealed that corrupt or pathological input could result in crashes + or undefined behavior: + oss-fuzz-23588 + oss-fuzz-23606 + oss-fuzz-23633 + oss-fuzz-23643 + oss-fuzz-23644 + oss-fuzz-23731 + oss-fuzz-24000 + oss-fuzz-24028 + oss-fuzz-24131 + oss-fuzz-24146 + oss-fuzz-24308 + oss-fuzz-24611 + oss-fuzz-24738 + +Third-Party Code +---------------- + + - XSVG license was re-classified to HPND-sell-variant, "Historical Permission + Notice and Disclaimer - sell variant" + diff -Nru qtsvg-opensource-src-5.15.2/include/QtSvg/5.15.2/QtSvg/private/qsvgfont_p.h qtsvg-opensource-src-5.15.3/include/QtSvg/5.15.2/QtSvg/private/qsvgfont_p.h --- qtsvg-opensource-src-5.15.2/include/QtSvg/5.15.2/QtSvg/private/qsvgfont_p.h 2020-10-27 08:02:11.000000000 +0000 +++ qtsvg-opensource-src-5.15.3/include/QtSvg/5.15.2/QtSvg/private/qsvgfont_p.h 1970-01-01 00:00:00.000000000 +0000 @@ -1 +0,0 @@ -#include "../../../../../src/svg/qsvgfont_p.h" diff -Nru qtsvg-opensource-src-5.15.2/include/QtSvg/5.15.2/QtSvg/private/qsvggraphics_p.h qtsvg-opensource-src-5.15.3/include/QtSvg/5.15.2/QtSvg/private/qsvggraphics_p.h --- qtsvg-opensource-src-5.15.2/include/QtSvg/5.15.2/QtSvg/private/qsvggraphics_p.h 2020-10-27 08:02:11.000000000 +0000 +++ qtsvg-opensource-src-5.15.3/include/QtSvg/5.15.2/QtSvg/private/qsvggraphics_p.h 1970-01-01 00:00:00.000000000 +0000 @@ -1 +0,0 @@ -#include "../../../../../src/svg/qsvggraphics_p.h" diff -Nru qtsvg-opensource-src-5.15.2/include/QtSvg/5.15.2/QtSvg/private/qsvghandler_p.h qtsvg-opensource-src-5.15.3/include/QtSvg/5.15.2/QtSvg/private/qsvghandler_p.h --- qtsvg-opensource-src-5.15.2/include/QtSvg/5.15.2/QtSvg/private/qsvghandler_p.h 2020-10-27 08:02:11.000000000 +0000 +++ qtsvg-opensource-src-5.15.3/include/QtSvg/5.15.2/QtSvg/private/qsvghandler_p.h 1970-01-01 00:00:00.000000000 +0000 @@ -1 +0,0 @@ -#include "../../../../../src/svg/qsvghandler_p.h" diff -Nru qtsvg-opensource-src-5.15.2/include/QtSvg/5.15.2/QtSvg/private/qsvgnode_p.h qtsvg-opensource-src-5.15.3/include/QtSvg/5.15.2/QtSvg/private/qsvgnode_p.h --- qtsvg-opensource-src-5.15.2/include/QtSvg/5.15.2/QtSvg/private/qsvgnode_p.h 2020-10-27 08:02:11.000000000 +0000 +++ qtsvg-opensource-src-5.15.3/include/QtSvg/5.15.2/QtSvg/private/qsvgnode_p.h 1970-01-01 00:00:00.000000000 +0000 @@ -1 +0,0 @@ -#include "../../../../../src/svg/qsvgnode_p.h" diff -Nru qtsvg-opensource-src-5.15.2/include/QtSvg/5.15.2/QtSvg/private/qsvgstructure_p.h qtsvg-opensource-src-5.15.3/include/QtSvg/5.15.2/QtSvg/private/qsvgstructure_p.h --- qtsvg-opensource-src-5.15.2/include/QtSvg/5.15.2/QtSvg/private/qsvgstructure_p.h 2020-10-27 08:02:11.000000000 +0000 +++ qtsvg-opensource-src-5.15.3/include/QtSvg/5.15.2/QtSvg/private/qsvgstructure_p.h 1970-01-01 00:00:00.000000000 +0000 @@ -1 +0,0 @@ -#include "../../../../../src/svg/qsvgstructure_p.h" diff -Nru qtsvg-opensource-src-5.15.2/include/QtSvg/5.15.2/QtSvg/private/qsvgstyle_p.h qtsvg-opensource-src-5.15.3/include/QtSvg/5.15.2/QtSvg/private/qsvgstyle_p.h --- qtsvg-opensource-src-5.15.2/include/QtSvg/5.15.2/QtSvg/private/qsvgstyle_p.h 2020-10-27 08:02:11.000000000 +0000 +++ qtsvg-opensource-src-5.15.3/include/QtSvg/5.15.2/QtSvg/private/qsvgstyle_p.h 1970-01-01 00:00:00.000000000 +0000 @@ -1 +0,0 @@ -#include "../../../../../src/svg/qsvgstyle_p.h" diff -Nru qtsvg-opensource-src-5.15.2/include/QtSvg/5.15.2/QtSvg/private/qsvgtinydocument_p.h qtsvg-opensource-src-5.15.3/include/QtSvg/5.15.2/QtSvg/private/qsvgtinydocument_p.h --- qtsvg-opensource-src-5.15.2/include/QtSvg/5.15.2/QtSvg/private/qsvgtinydocument_p.h 2020-10-27 08:02:11.000000000 +0000 +++ qtsvg-opensource-src-5.15.3/include/QtSvg/5.15.2/QtSvg/private/qsvgtinydocument_p.h 1970-01-01 00:00:00.000000000 +0000 @@ -1 +0,0 @@ -#include "../../../../../src/svg/qsvgtinydocument_p.h" diff -Nru qtsvg-opensource-src-5.15.2/include/QtSvg/5.15.2/QtSvg/private/qtsvgglobal_p.h qtsvg-opensource-src-5.15.3/include/QtSvg/5.15.2/QtSvg/private/qtsvgglobal_p.h --- qtsvg-opensource-src-5.15.2/include/QtSvg/5.15.2/QtSvg/private/qtsvgglobal_p.h 2020-10-27 08:02:11.000000000 +0000 +++ qtsvg-opensource-src-5.15.3/include/QtSvg/5.15.2/QtSvg/private/qtsvgglobal_p.h 1970-01-01 00:00:00.000000000 +0000 @@ -1 +0,0 @@ -#include "../../../../../src/svg/qtsvgglobal_p.h" diff -Nru qtsvg-opensource-src-5.15.2/include/QtSvg/5.15.3/QtSvg/private/qsvgfont_p.h qtsvg-opensource-src-5.15.3/include/QtSvg/5.15.3/QtSvg/private/qsvgfont_p.h --- qtsvg-opensource-src-5.15.2/include/QtSvg/5.15.3/QtSvg/private/qsvgfont_p.h 1970-01-01 00:00:00.000000000 +0000 +++ qtsvg-opensource-src-5.15.3/include/QtSvg/5.15.3/QtSvg/private/qsvgfont_p.h 2021-03-18 12:54:01.000000000 +0000 @@ -0,0 +1 @@ +#include "../../../../../src/svg/qsvgfont_p.h" diff -Nru qtsvg-opensource-src-5.15.2/include/QtSvg/5.15.3/QtSvg/private/qsvggraphics_p.h qtsvg-opensource-src-5.15.3/include/QtSvg/5.15.3/QtSvg/private/qsvggraphics_p.h --- qtsvg-opensource-src-5.15.2/include/QtSvg/5.15.3/QtSvg/private/qsvggraphics_p.h 1970-01-01 00:00:00.000000000 +0000 +++ qtsvg-opensource-src-5.15.3/include/QtSvg/5.15.3/QtSvg/private/qsvggraphics_p.h 2021-03-18 12:54:01.000000000 +0000 @@ -0,0 +1 @@ +#include "../../../../../src/svg/qsvggraphics_p.h" diff -Nru qtsvg-opensource-src-5.15.2/include/QtSvg/5.15.3/QtSvg/private/qsvghandler_p.h qtsvg-opensource-src-5.15.3/include/QtSvg/5.15.3/QtSvg/private/qsvghandler_p.h --- qtsvg-opensource-src-5.15.2/include/QtSvg/5.15.3/QtSvg/private/qsvghandler_p.h 1970-01-01 00:00:00.000000000 +0000 +++ qtsvg-opensource-src-5.15.3/include/QtSvg/5.15.3/QtSvg/private/qsvghandler_p.h 2021-03-18 12:54:01.000000000 +0000 @@ -0,0 +1 @@ +#include "../../../../../src/svg/qsvghandler_p.h" diff -Nru qtsvg-opensource-src-5.15.2/include/QtSvg/5.15.3/QtSvg/private/qsvgnode_p.h qtsvg-opensource-src-5.15.3/include/QtSvg/5.15.3/QtSvg/private/qsvgnode_p.h --- qtsvg-opensource-src-5.15.2/include/QtSvg/5.15.3/QtSvg/private/qsvgnode_p.h 1970-01-01 00:00:00.000000000 +0000 +++ qtsvg-opensource-src-5.15.3/include/QtSvg/5.15.3/QtSvg/private/qsvgnode_p.h 2021-03-18 12:54:01.000000000 +0000 @@ -0,0 +1 @@ +#include "../../../../../src/svg/qsvgnode_p.h" diff -Nru qtsvg-opensource-src-5.15.2/include/QtSvg/5.15.3/QtSvg/private/qsvgstructure_p.h qtsvg-opensource-src-5.15.3/include/QtSvg/5.15.3/QtSvg/private/qsvgstructure_p.h --- qtsvg-opensource-src-5.15.2/include/QtSvg/5.15.3/QtSvg/private/qsvgstructure_p.h 1970-01-01 00:00:00.000000000 +0000 +++ qtsvg-opensource-src-5.15.3/include/QtSvg/5.15.3/QtSvg/private/qsvgstructure_p.h 2021-03-18 12:54:01.000000000 +0000 @@ -0,0 +1 @@ +#include "../../../../../src/svg/qsvgstructure_p.h" diff -Nru qtsvg-opensource-src-5.15.2/include/QtSvg/5.15.3/QtSvg/private/qsvgstyle_p.h qtsvg-opensource-src-5.15.3/include/QtSvg/5.15.3/QtSvg/private/qsvgstyle_p.h --- qtsvg-opensource-src-5.15.2/include/QtSvg/5.15.3/QtSvg/private/qsvgstyle_p.h 1970-01-01 00:00:00.000000000 +0000 +++ qtsvg-opensource-src-5.15.3/include/QtSvg/5.15.3/QtSvg/private/qsvgstyle_p.h 2021-03-18 12:54:01.000000000 +0000 @@ -0,0 +1 @@ +#include "../../../../../src/svg/qsvgstyle_p.h" diff -Nru qtsvg-opensource-src-5.15.2/include/QtSvg/5.15.3/QtSvg/private/qsvgtinydocument_p.h qtsvg-opensource-src-5.15.3/include/QtSvg/5.15.3/QtSvg/private/qsvgtinydocument_p.h --- qtsvg-opensource-src-5.15.2/include/QtSvg/5.15.3/QtSvg/private/qsvgtinydocument_p.h 1970-01-01 00:00:00.000000000 +0000 +++ qtsvg-opensource-src-5.15.3/include/QtSvg/5.15.3/QtSvg/private/qsvgtinydocument_p.h 2021-03-18 12:54:01.000000000 +0000 @@ -0,0 +1 @@ +#include "../../../../../src/svg/qsvgtinydocument_p.h" diff -Nru qtsvg-opensource-src-5.15.2/include/QtSvg/5.15.3/QtSvg/private/qtsvgglobal_p.h qtsvg-opensource-src-5.15.3/include/QtSvg/5.15.3/QtSvg/private/qtsvgglobal_p.h --- qtsvg-opensource-src-5.15.2/include/QtSvg/5.15.3/QtSvg/private/qtsvgglobal_p.h 1970-01-01 00:00:00.000000000 +0000 +++ qtsvg-opensource-src-5.15.3/include/QtSvg/5.15.3/QtSvg/private/qtsvgglobal_p.h 2021-03-18 12:54:01.000000000 +0000 @@ -0,0 +1 @@ +#include "../../../../../src/svg/qtsvgglobal_p.h" diff -Nru qtsvg-opensource-src-5.15.2/include/QtSvg/qtsvgversion.h qtsvg-opensource-src-5.15.3/include/QtSvg/qtsvgversion.h --- qtsvg-opensource-src-5.15.2/include/QtSvg/qtsvgversion.h 2020-11-12 17:24:08.000000000 +0000 +++ qtsvg-opensource-src-5.15.3/include/QtSvg/qtsvgversion.h 2021-03-29 18:26:52.000000000 +0000 @@ -2,8 +2,8 @@ #ifndef QT_QTSVG_VERSION_H #define QT_QTSVG_VERSION_H -#define QTSVG_VERSION_STR "5.15.2" +#define QTSVG_VERSION_STR "5.15.3" -#define QTSVG_VERSION 0x050F02 +#define QTSVG_VERSION 0x050F03 #endif // QT_QTSVG_VERSION_H diff -Nru qtsvg-opensource-src-5.15.2/.qmake.conf qtsvg-opensource-src-5.15.3/.qmake.conf --- qtsvg-opensource-src-5.15.2/.qmake.conf 2020-10-27 08:02:11.000000000 +0000 +++ qtsvg-opensource-src-5.15.3/.qmake.conf 2021-03-18 12:54:01.000000000 +0000 @@ -3,4 +3,4 @@ CONFIG += warning_clean DEFINES += QT_NO_FOREACH -MODULE_VERSION = 5.15.2 +MODULE_VERSION = 5.15.3 diff -Nru qtsvg-opensource-src-5.15.2/.QT-ENTERPRISE-LICENSE-AGREEMENT qtsvg-opensource-src-5.15.3/.QT-ENTERPRISE-LICENSE-AGREEMENT --- qtsvg-opensource-src-5.15.2/.QT-ENTERPRISE-LICENSE-AGREEMENT 2020-11-12 17:24:08.790267500 +0000 +++ qtsvg-opensource-src-5.15.3/.QT-ENTERPRISE-LICENSE-AGREEMENT 2021-03-29 18:26:53.002202300 +0000 @@ -1,5 +1,5 @@ QT LICENSE AGREEMENT -Agreement version 4.2.3 +Agreement version 4.3 This Qt License Agreement ("Agreement") is a legal agreement for the licensing of Licensed Software (as defined below) between The Qt Company (as defined @@ -159,14 +159,8 @@ "Party" or "Parties" shall mean Licensee and/or The Qt Company. -"Permitted Software" shall mean any (i) open source software (excluding Open -Source Qt) that is a) generally available for public in source code form -without additional cost under any of the licenses approved by Open Source -Initiative as listed on https://opensource.org/licenses; and (b) is in no -way, directly or indirectly, developed by or for or otherwise related to or -in the interest of the Licensee or its Affiliates, or (ii) software The Qt -Company has made available via its Qt Marketplace online distribution -channel. +"Permitted Combination" shall have the meaning as set forth in Section +3.4(viii). "Pre-Release Code" shall have the meaning as set forth in Section 4. @@ -308,10 +302,10 @@ Upon expiry of the initially agreed License Term, the respective License Terms shall be automatically extended to one or more Renewal Term(s), unless and -until either Party notifies the other Party in writing that it does not wish -to continue the License Term, such notification to be provided to the other -Party no less than thirty (30) days before expiry of the respective License -Term. +until either Party notifies the other Party in writing, or any other method +acceptable to The Qt Company, that it does not wish to continue the License +Term, such notification to be provided to the other Party no less than thirty +(30) days before expiry of the respective License Term. Unless otherwise agreed between the Parties, Renewal Term shall be of equal length with the initial License Term. @@ -323,8 +317,10 @@ Any price or other term specified for a Renewal Term shall be valid only for the specified time. -The Qt Company may request the Licensee to place a purchase order corresponding -to a quote by The Qt Company for the relevant Renewal Term. +The Qt Company may either request the Licensee to place a purchase order +corresponding to a quote by The Qt Company, or uses Licensees stored Credit +Card information in the QtAccount to automatically charge the Licensee for the +relevant Renewal Term. In the event Licensee does not prevent auto-renewal pursuant the above, but a Renewal Term is nevertheless not duly ordered within 30 days from the date of @@ -750,11 +746,13 @@ Notwithstanding the above, in the event the Agreement expires or is terminated: (i) as a result of The Qt Company choosing not to renew the Development - License(s) as set forth in Section 3.1, then all valid licenses - possessed by the Licensee at such date shall be extended to be valid - in perpetuity under the terms of this Agreement and Licensee is - entitled to purchase additional licenses as set forth in - Section 10.2; or + License(s) as set forth in Section 3.1, and where such decision of + non-renewal is not due to any ongoing breach or alleged breach (as + reasonably determined by The Qt Company) by Licensee of the terms of this + Agreement or any applicable license terms of Open Source Qt, then all valid + licenses possessed by the Licensee at such date shall be extended to be + valid in perpetuity under the terms of this Agreement and Licensee is + entitled to purchase additional licenses as set forth in Section 10.2; or (ii) for reason other than by The Qt Company pursuant to item (i) above or pursuant to Section 12.2, then the Licensee is entitled, for a period of six (6) months after the effective date of termination, @@ -950,7 +948,8 @@ The modules and/or tools that are included in the respective product - Qt for Application Development (QtAD), Qt for Device Creation (QtDC), Qt for MCUs (QtMCU), Qt 3D Studio (Qt3DS) and Qt Design Studio (QtDS) - are -marked with 'X' in the below table. +marked with 'X' in the below table. The modules and tools are ported to Qt 6 +in stages and are subject to availability. Parts of the product that are permitted for distribution in object-code form only ("Redistributables") are marked with 'R' in the below table. @@ -968,6 +967,8 @@ +-----------------------------------------------------------------------+ | Qt Network | X, R | X, R | | | | +-----------------------------------------------------------------------+ +| Qt PDF | X, R | X, R | | | | ++-----------------------------------------------------------------------+ | Qt QML | X, R | X, R | | | | +-----------------------------------------------------------------------+ | Qt Quick | X, R | X, R | | | | @@ -1066,7 +1067,7 @@ +-----------------------------------------------------------------------+ | Qt Charts | X, R | X, R | | | | +-----------------------------------------------------------------------+ -| Qt Data visualization | X, R | X, R | | | | +| Qt Data Visualization | X, R | X, R | | | | +-----------------------------------------------------------------------+ | Qt Virtual Keyboard | X, R | X, R | | | | +-----------------------------------------------------------------------+ @@ -1086,16 +1087,16 @@ +-----------------------------------------------------------------------+ | Qt Designer (Qt Widget Designer) | X | X | | | | +-----------------------------------------------------------------------+ -| Qt Quick Designer (Qt Creator | X | X | X | | | +| Qt Quick Designer (Qt Creator | X, R | X, R | X, R | | | | plugin) | | | | | | +-----------------------------------------------------------------------+ -| Qt Linguist | X | X | X | | | +| Qt Linguist | X, R | X, R | X, R | | | +-----------------------------------------------------------------------+ -| Qt Assistant | X | X | X | | | +| Qt Assistant | X, R | X, R | X, R | | | +-----------------------------------------------------------------------+ -| Lupdate | X | X | X | | | +| Lupdate | X, R | X, R | X, R | | | +-----------------------------------------------------------------------+ -| Lrelease | X | X | X | | | +| Lrelease | X, R | X, R | X, R | | | +-----------------------------------------------------------------------+ | Qmake | X | X | | | | +-----------------------------------------------------------------------+ @@ -1142,7 +1143,8 @@ invoice. The Modules and/or Tools of the Licensed Software that are included with each -Add-On Product respectively are marked with 'X' in the below table. +Add-On Product respectively are marked with 'X' in the below table. The modules +are ported to Qt 6 in stages and are subject to availability. Parts of the respective Add-On Product that are permitted for distribution in object-code form only ("Redistributables") are marked with 'R' in the below @@ -1311,4 +1313,3 @@ Except for the modifications specified above, this Appendix carries no change to the terms of the Agreement which shall remain in full force. - diff -Nru qtsvg-opensource-src-5.15.2/.QT-FOR-APPLICATION-DEVELOPMENT-LICENSE-AGREEMENT qtsvg-opensource-src-5.15.3/.QT-FOR-APPLICATION-DEVELOPMENT-LICENSE-AGREEMENT --- qtsvg-opensource-src-5.15.2/.QT-FOR-APPLICATION-DEVELOPMENT-LICENSE-AGREEMENT 2020-11-12 17:24:08.790267500 +0000 +++ qtsvg-opensource-src-5.15.3/.QT-FOR-APPLICATION-DEVELOPMENT-LICENSE-AGREEMENT 2021-03-29 18:26:52.998202300 +0000 @@ -1,5 +1,5 @@ QT LICENSE AGREEMENT -Agreement version 4.2.3 +Agreement version 4.3 This Qt License Agreement ("Agreement") is a legal agreement for the licensing of Licensed Software (as defined below) between The Qt Company (as defined @@ -159,14 +159,8 @@ "Party" or "Parties" shall mean Licensee and/or The Qt Company. -"Permitted Software" shall mean any (i) open source software (excluding Open -Source Qt) that is a) generally available for public in source code form -without additional cost under any of the licenses approved by Open Source -Initiative as listed on https://opensource.org/licenses; and (b) is in no -way, directly or indirectly, developed by or for or otherwise related to or -in the interest of the Licensee or its Affiliates, or (ii) software The Qt -Company has made available via its Qt Marketplace online distribution -channel. +"Permitted Combination" shall have the meaning as set forth in Section +3.4(viii). "Pre-Release Code" shall have the meaning as set forth in Section 4. @@ -308,10 +302,10 @@ Upon expiry of the initially agreed License Term, the respective License Terms shall be automatically extended to one or more Renewal Term(s), unless and -until either Party notifies the other Party in writing that it does not wish -to continue the License Term, such notification to be provided to the other -Party no less than thirty (30) days before expiry of the respective License -Term. +until either Party notifies the other Party in writing, or any other method +acceptable to The Qt Company, that it does not wish to continue the License +Term, such notification to be provided to the other Party no less than thirty +(30) days before expiry of the respective License Term. Unless otherwise agreed between the Parties, Renewal Term shall be of equal length with the initial License Term. @@ -323,8 +317,10 @@ Any price or other term specified for a Renewal Term shall be valid only for the specified time. -The Qt Company may request the Licensee to place a purchase order corresponding -to a quote by The Qt Company for the relevant Renewal Term. +The Qt Company may either request the Licensee to place a purchase order +corresponding to a quote by The Qt Company, or uses Licensees stored Credit +Card information in the QtAccount to automatically charge the Licensee for the +relevant Renewal Term. In the event Licensee does not prevent auto-renewal pursuant the above, but a Renewal Term is nevertheless not duly ordered within 30 days from the date of @@ -750,11 +746,13 @@ Notwithstanding the above, in the event the Agreement expires or is terminated: (i) as a result of The Qt Company choosing not to renew the Development - License(s) as set forth in Section 3.1, then all valid licenses - possessed by the Licensee at such date shall be extended to be valid - in perpetuity under the terms of this Agreement and Licensee is - entitled to purchase additional licenses as set forth in - Section 10.2; or + License(s) as set forth in Section 3.1, and where such decision of + non-renewal is not due to any ongoing breach or alleged breach (as + reasonably determined by The Qt Company) by Licensee of the terms of this + Agreement or any applicable license terms of Open Source Qt, then all valid + licenses possessed by the Licensee at such date shall be extended to be + valid in perpetuity under the terms of this Agreement and Licensee is + entitled to purchase additional licenses as set forth in Section 10.2; or (ii) for reason other than by The Qt Company pursuant to item (i) above or pursuant to Section 12.2, then the Licensee is entitled, for a period of six (6) months after the effective date of termination, @@ -950,7 +948,8 @@ The modules and/or tools that are included in the respective product - Qt for Application Development (QtAD), Qt for Device Creation (QtDC), Qt for MCUs (QtMCU), Qt 3D Studio (Qt3DS) and Qt Design Studio (QtDS) - are -marked with 'X' in the below table. +marked with 'X' in the below table. The modules and tools are ported to Qt 6 +in stages and are subject to availability. Parts of the product that are permitted for distribution in object-code form only ("Redistributables") are marked with 'R' in the below table. @@ -968,6 +967,8 @@ +-----------------------------------------------------------------------+ | Qt Network | X, R | X, R | | | | +-----------------------------------------------------------------------+ +| Qt PDF | X, R | X, R | | | | ++-----------------------------------------------------------------------+ | Qt QML | X, R | X, R | | | | +-----------------------------------------------------------------------+ | Qt Quick | X, R | X, R | | | | @@ -1066,7 +1067,7 @@ +-----------------------------------------------------------------------+ | Qt Charts | X, R | X, R | | | | +-----------------------------------------------------------------------+ -| Qt Data visualization | X, R | X, R | | | | +| Qt Data Visualization | X, R | X, R | | | | +-----------------------------------------------------------------------+ | Qt Virtual Keyboard | X, R | X, R | | | | +-----------------------------------------------------------------------+ @@ -1086,16 +1087,16 @@ +-----------------------------------------------------------------------+ | Qt Designer (Qt Widget Designer) | X | X | | | | +-----------------------------------------------------------------------+ -| Qt Quick Designer (Qt Creator | X | X | X | | | +| Qt Quick Designer (Qt Creator | X, R | X, R | X, R | | | | plugin) | | | | | | +-----------------------------------------------------------------------+ -| Qt Linguist | X | X | X | | | +| Qt Linguist | X, R | X, R | X, R | | | +-----------------------------------------------------------------------+ -| Qt Assistant | X | X | X | | | +| Qt Assistant | X, R | X, R | X, R | | | +-----------------------------------------------------------------------+ -| Lupdate | X | X | X | | | +| Lupdate | X, R | X, R | X, R | | | +-----------------------------------------------------------------------+ -| Lrelease | X | X | X | | | +| Lrelease | X, R | X, R | X, R | | | +-----------------------------------------------------------------------+ | Qmake | X | X | | | | +-----------------------------------------------------------------------+ @@ -1142,7 +1143,8 @@ invoice. The Modules and/or Tools of the Licensed Software that are included with each -Add-On Product respectively are marked with 'X' in the below table. +Add-On Product respectively are marked with 'X' in the below table. The modules +are ported to Qt 6 in stages and are subject to availability. Parts of the respective Add-On Product that are permitted for distribution in object-code form only ("Redistributables") are marked with 'R' in the below @@ -1311,4 +1313,3 @@ Except for the modifications specified above, this Appendix carries no change to the terms of the Agreement which shall remain in full force. - diff -Nru qtsvg-opensource-src-5.15.2/.QT-FOR-AUTOMATION-LICENSE-AGREEMENT qtsvg-opensource-src-5.15.3/.QT-FOR-AUTOMATION-LICENSE-AGREEMENT --- qtsvg-opensource-src-5.15.2/.QT-FOR-AUTOMATION-LICENSE-AGREEMENT 2020-11-12 17:24:08.790267500 +0000 +++ qtsvg-opensource-src-5.15.3/.QT-FOR-AUTOMATION-LICENSE-AGREEMENT 2021-03-29 18:26:52.998202300 +0000 @@ -1,5 +1,5 @@ QT LICENSE AGREEMENT -Agreement version 4.2.3 +Agreement version 4.3 This Qt License Agreement ("Agreement") is a legal agreement for the licensing of Licensed Software (as defined below) between The Qt Company (as defined @@ -159,14 +159,8 @@ "Party" or "Parties" shall mean Licensee and/or The Qt Company. -"Permitted Software" shall mean any (i) open source software (excluding Open -Source Qt) that is a) generally available for public in source code form -without additional cost under any of the licenses approved by Open Source -Initiative as listed on https://opensource.org/licenses; and (b) is in no -way, directly or indirectly, developed by or for or otherwise related to or -in the interest of the Licensee or its Affiliates, or (ii) software The Qt -Company has made available via its Qt Marketplace online distribution -channel. +"Permitted Combination" shall have the meaning as set forth in Section +3.4(viii). "Pre-Release Code" shall have the meaning as set forth in Section 4. @@ -308,10 +302,10 @@ Upon expiry of the initially agreed License Term, the respective License Terms shall be automatically extended to one or more Renewal Term(s), unless and -until either Party notifies the other Party in writing that it does not wish -to continue the License Term, such notification to be provided to the other -Party no less than thirty (30) days before expiry of the respective License -Term. +until either Party notifies the other Party in writing, or any other method +acceptable to The Qt Company, that it does not wish to continue the License +Term, such notification to be provided to the other Party no less than thirty +(30) days before expiry of the respective License Term. Unless otherwise agreed between the Parties, Renewal Term shall be of equal length with the initial License Term. @@ -323,8 +317,10 @@ Any price or other term specified for a Renewal Term shall be valid only for the specified time. -The Qt Company may request the Licensee to place a purchase order corresponding -to a quote by The Qt Company for the relevant Renewal Term. +The Qt Company may either request the Licensee to place a purchase order +corresponding to a quote by The Qt Company, or uses Licensees stored Credit +Card information in the QtAccount to automatically charge the Licensee for the +relevant Renewal Term. In the event Licensee does not prevent auto-renewal pursuant the above, but a Renewal Term is nevertheless not duly ordered within 30 days from the date of @@ -750,11 +746,13 @@ Notwithstanding the above, in the event the Agreement expires or is terminated: (i) as a result of The Qt Company choosing not to renew the Development - License(s) as set forth in Section 3.1, then all valid licenses - possessed by the Licensee at such date shall be extended to be valid - in perpetuity under the terms of this Agreement and Licensee is - entitled to purchase additional licenses as set forth in - Section 10.2; or + License(s) as set forth in Section 3.1, and where such decision of + non-renewal is not due to any ongoing breach or alleged breach (as + reasonably determined by The Qt Company) by Licensee of the terms of this + Agreement or any applicable license terms of Open Source Qt, then all valid + licenses possessed by the Licensee at such date shall be extended to be + valid in perpetuity under the terms of this Agreement and Licensee is + entitled to purchase additional licenses as set forth in Section 10.2; or (ii) for reason other than by The Qt Company pursuant to item (i) above or pursuant to Section 12.2, then the Licensee is entitled, for a period of six (6) months after the effective date of termination, @@ -950,7 +948,8 @@ The modules and/or tools that are included in the respective product - Qt for Application Development (QtAD), Qt for Device Creation (QtDC), Qt for MCUs (QtMCU), Qt 3D Studio (Qt3DS) and Qt Design Studio (QtDS) - are -marked with 'X' in the below table. +marked with 'X' in the below table. The modules and tools are ported to Qt 6 +in stages and are subject to availability. Parts of the product that are permitted for distribution in object-code form only ("Redistributables") are marked with 'R' in the below table. @@ -968,6 +967,8 @@ +-----------------------------------------------------------------------+ | Qt Network | X, R | X, R | | | | +-----------------------------------------------------------------------+ +| Qt PDF | X, R | X, R | | | | ++-----------------------------------------------------------------------+ | Qt QML | X, R | X, R | | | | +-----------------------------------------------------------------------+ | Qt Quick | X, R | X, R | | | | @@ -1066,7 +1067,7 @@ +-----------------------------------------------------------------------+ | Qt Charts | X, R | X, R | | | | +-----------------------------------------------------------------------+ -| Qt Data visualization | X, R | X, R | | | | +| Qt Data Visualization | X, R | X, R | | | | +-----------------------------------------------------------------------+ | Qt Virtual Keyboard | X, R | X, R | | | | +-----------------------------------------------------------------------+ @@ -1086,16 +1087,16 @@ +-----------------------------------------------------------------------+ | Qt Designer (Qt Widget Designer) | X | X | | | | +-----------------------------------------------------------------------+ -| Qt Quick Designer (Qt Creator | X | X | X | | | +| Qt Quick Designer (Qt Creator | X, R | X, R | X, R | | | | plugin) | | | | | | +-----------------------------------------------------------------------+ -| Qt Linguist | X | X | X | | | +| Qt Linguist | X, R | X, R | X, R | | | +-----------------------------------------------------------------------+ -| Qt Assistant | X | X | X | | | +| Qt Assistant | X, R | X, R | X, R | | | +-----------------------------------------------------------------------+ -| Lupdate | X | X | X | | | +| Lupdate | X, R | X, R | X, R | | | +-----------------------------------------------------------------------+ -| Lrelease | X | X | X | | | +| Lrelease | X, R | X, R | X, R | | | +-----------------------------------------------------------------------+ | Qmake | X | X | | | | +-----------------------------------------------------------------------+ @@ -1142,7 +1143,8 @@ invoice. The Modules and/or Tools of the Licensed Software that are included with each -Add-On Product respectively are marked with 'X' in the below table. +Add-On Product respectively are marked with 'X' in the below table. The modules +are ported to Qt 6 in stages and are subject to availability. Parts of the respective Add-On Product that are permitted for distribution in object-code form only ("Redistributables") are marked with 'R' in the below @@ -1311,4 +1313,3 @@ Except for the modifications specified above, this Appendix carries no change to the terms of the Agreement which shall remain in full force. - diff -Nru qtsvg-opensource-src-5.15.2/.QT-FOR-DEVICE-CREATION-LICENSE-AGREEMENT qtsvg-opensource-src-5.15.3/.QT-FOR-DEVICE-CREATION-LICENSE-AGREEMENT --- qtsvg-opensource-src-5.15.2/.QT-FOR-DEVICE-CREATION-LICENSE-AGREEMENT 2020-11-12 17:24:08.790267500 +0000 +++ qtsvg-opensource-src-5.15.3/.QT-FOR-DEVICE-CREATION-LICENSE-AGREEMENT 2021-03-29 18:26:52.998202300 +0000 @@ -1,5 +1,5 @@ QT LICENSE AGREEMENT -Agreement version 4.2.3 +Agreement version 4.3 This Qt License Agreement ("Agreement") is a legal agreement for the licensing of Licensed Software (as defined below) between The Qt Company (as defined @@ -159,14 +159,8 @@ "Party" or "Parties" shall mean Licensee and/or The Qt Company. -"Permitted Software" shall mean any (i) open source software (excluding Open -Source Qt) that is a) generally available for public in source code form -without additional cost under any of the licenses approved by Open Source -Initiative as listed on https://opensource.org/licenses; and (b) is in no -way, directly or indirectly, developed by or for or otherwise related to or -in the interest of the Licensee or its Affiliates, or (ii) software The Qt -Company has made available via its Qt Marketplace online distribution -channel. +"Permitted Combination" shall have the meaning as set forth in Section +3.4(viii). "Pre-Release Code" shall have the meaning as set forth in Section 4. @@ -308,10 +302,10 @@ Upon expiry of the initially agreed License Term, the respective License Terms shall be automatically extended to one or more Renewal Term(s), unless and -until either Party notifies the other Party in writing that it does not wish -to continue the License Term, such notification to be provided to the other -Party no less than thirty (30) days before expiry of the respective License -Term. +until either Party notifies the other Party in writing, or any other method +acceptable to The Qt Company, that it does not wish to continue the License +Term, such notification to be provided to the other Party no less than thirty +(30) days before expiry of the respective License Term. Unless otherwise agreed between the Parties, Renewal Term shall be of equal length with the initial License Term. @@ -323,8 +317,10 @@ Any price or other term specified for a Renewal Term shall be valid only for the specified time. -The Qt Company may request the Licensee to place a purchase order corresponding -to a quote by The Qt Company for the relevant Renewal Term. +The Qt Company may either request the Licensee to place a purchase order +corresponding to a quote by The Qt Company, or uses Licensees stored Credit +Card information in the QtAccount to automatically charge the Licensee for the +relevant Renewal Term. In the event Licensee does not prevent auto-renewal pursuant the above, but a Renewal Term is nevertheless not duly ordered within 30 days from the date of @@ -750,11 +746,13 @@ Notwithstanding the above, in the event the Agreement expires or is terminated: (i) as a result of The Qt Company choosing not to renew the Development - License(s) as set forth in Section 3.1, then all valid licenses - possessed by the Licensee at such date shall be extended to be valid - in perpetuity under the terms of this Agreement and Licensee is - entitled to purchase additional licenses as set forth in - Section 10.2; or + License(s) as set forth in Section 3.1, and where such decision of + non-renewal is not due to any ongoing breach or alleged breach (as + reasonably determined by The Qt Company) by Licensee of the terms of this + Agreement or any applicable license terms of Open Source Qt, then all valid + licenses possessed by the Licensee at such date shall be extended to be + valid in perpetuity under the terms of this Agreement and Licensee is + entitled to purchase additional licenses as set forth in Section 10.2; or (ii) for reason other than by The Qt Company pursuant to item (i) above or pursuant to Section 12.2, then the Licensee is entitled, for a period of six (6) months after the effective date of termination, @@ -950,7 +948,8 @@ The modules and/or tools that are included in the respective product - Qt for Application Development (QtAD), Qt for Device Creation (QtDC), Qt for MCUs (QtMCU), Qt 3D Studio (Qt3DS) and Qt Design Studio (QtDS) - are -marked with 'X' in the below table. +marked with 'X' in the below table. The modules and tools are ported to Qt 6 +in stages and are subject to availability. Parts of the product that are permitted for distribution in object-code form only ("Redistributables") are marked with 'R' in the below table. @@ -968,6 +967,8 @@ +-----------------------------------------------------------------------+ | Qt Network | X, R | X, R | | | | +-----------------------------------------------------------------------+ +| Qt PDF | X, R | X, R | | | | ++-----------------------------------------------------------------------+ | Qt QML | X, R | X, R | | | | +-----------------------------------------------------------------------+ | Qt Quick | X, R | X, R | | | | @@ -1066,7 +1067,7 @@ +-----------------------------------------------------------------------+ | Qt Charts | X, R | X, R | | | | +-----------------------------------------------------------------------+ -| Qt Data visualization | X, R | X, R | | | | +| Qt Data Visualization | X, R | X, R | | | | +-----------------------------------------------------------------------+ | Qt Virtual Keyboard | X, R | X, R | | | | +-----------------------------------------------------------------------+ @@ -1086,16 +1087,16 @@ +-----------------------------------------------------------------------+ | Qt Designer (Qt Widget Designer) | X | X | | | | +-----------------------------------------------------------------------+ -| Qt Quick Designer (Qt Creator | X | X | X | | | +| Qt Quick Designer (Qt Creator | X, R | X, R | X, R | | | | plugin) | | | | | | +-----------------------------------------------------------------------+ -| Qt Linguist | X | X | X | | | +| Qt Linguist | X, R | X, R | X, R | | | +-----------------------------------------------------------------------+ -| Qt Assistant | X | X | X | | | +| Qt Assistant | X, R | X, R | X, R | | | +-----------------------------------------------------------------------+ -| Lupdate | X | X | X | | | +| Lupdate | X, R | X, R | X, R | | | +-----------------------------------------------------------------------+ -| Lrelease | X | X | X | | | +| Lrelease | X, R | X, R | X, R | | | +-----------------------------------------------------------------------+ | Qmake | X | X | | | | +-----------------------------------------------------------------------+ @@ -1142,7 +1143,8 @@ invoice. The Modules and/or Tools of the Licensed Software that are included with each -Add-On Product respectively are marked with 'X' in the below table. +Add-On Product respectively are marked with 'X' in the below table. The modules +are ported to Qt 6 in stages and are subject to availability. Parts of the respective Add-On Product that are permitted for distribution in object-code form only ("Redistributables") are marked with 'R' in the below @@ -1311,4 +1313,3 @@ Except for the modifications specified above, this Appendix carries no change to the terms of the Agreement which shall remain in full force. - diff -Nru qtsvg-opensource-src-5.15.2/src/svg/qsvghandler.cpp qtsvg-opensource-src-5.15.3/src/svg/qsvghandler.cpp --- qtsvg-opensource-src-5.15.2/src/svg/qsvghandler.cpp 2020-10-27 08:02:11.000000000 +0000 +++ qtsvg-opensource-src-5.15.3/src/svg/qsvghandler.cpp 2021-03-18 12:54:01.000000000 +0000 @@ -65,6 +65,7 @@ #include "private/qmath_p.h" #include "float.h" +#include QT_BEGIN_NAMESPACE @@ -672,6 +673,8 @@ val = -val; } else { val = QByteArray::fromRawData(temp, pos).toDouble(); + if (qFpClassify(val) != FP_NORMAL) + val = 0; } return val; diff -Nru qtsvg-opensource-src-5.15.2/.tag qtsvg-opensource-src-5.15.3/.tag --- qtsvg-opensource-src-5.15.2/.tag 2020-10-27 08:02:11.000000000 +0000 +++ qtsvg-opensource-src-5.15.3/.tag 2021-03-18 12:54:01.000000000 +0000 @@ -1 +1 @@ -52d3788c7b0116ea3db232dccca5f1e3f1e229ac +b4dfef869ab1ff25c8b511d52371d8b7a18d6902