diff --git a/desktop/toolkit/qt5/qt5-connectivity/pspec.xml b/desktop/toolkit/qt5/qt5-connectivity/pspec.xml index ee230dc15b..050fbdd029 100755 --- a/desktop/toolkit/qt5/qt5-connectivity/pspec.xml +++ b/desktop/toolkit/qt5/qt5-connectivity/pspec.xml @@ -11,21 +11,21 @@ Provides access to Bluetooth hardware Provides access to Bluetooth hardware LGPLv2.1-linking-exception - http://download.qt.io/official_releases/qt/5.15/5.15.7/submodules/qtconnectivity-everywhere-opensource-src-5.15.7.tar.xz + http://download.qt.io/official_releases/qt/5.15/5.15.9/submodules/qtconnectivity-everywhere-opensource-src-5.15.9.tar.xz bluez-libs-devel - qt5-sql-sqlite - qt5-base-devel - qt5-assistant-devel - qt5-declarative-devel + qt5-sql-sqlite + qt5-base-devel + qt5-assistant-devel + qt5-declarative-devel qt5-connectivity - qt5-base - qt5-declarative + qt5-base + qt5-declarative bluez-libs libgcc @@ -46,7 +46,7 @@ qt5-connectivity - qt5-base-devel + qt5-base-devel @@ -61,6 +61,13 @@ + + 2023-04-10 + 5.15.9 + Version bump. + Mustafa Cinasal + muscnsl@gmail.com + 2022-12-21 5.15.7 diff --git a/desktop/toolkit/qt5/qt5-graphicaleffects/pspec.xml b/desktop/toolkit/qt5/qt5-graphicaleffects/pspec.xml index 6256b2ff92..b0df083b22 100755 --- a/desktop/toolkit/qt5/qt5-graphicaleffects/pspec.xml +++ b/desktop/toolkit/qt5/qt5-graphicaleffects/pspec.xml @@ -11,20 +11,20 @@ Graphical effects for use with Qt Quick 2 Graphical effects for use with Qt Quick 2 LGPLv2.1-linking-exception - http://download.qt.io/official_releases/qt/5.15/5.15.7/submodules/qtgraphicaleffects-everywhere-opensource-src-5.15.7.tar.xz + http://download.qt.io/official_releases/qt/5.15/5.15.9/submodules/qtgraphicaleffects-everywhere-opensource-src-5.15.9.tar.xz - qt5-sql-sqlite - qt5-base-devel - qt5-assistant-devel - qt5-declarative-devel + qt5-sql-sqlite + qt5-base-devel + qt5-assistant-devel + qt5-declarative-devel qt5-graphicaleffects - qt5-base - qt5-declarative + qt5-base + qt5-declarative libgcc @@ -38,7 +38,7 @@ qt5-graphicaleffects-docs - qt5-base + qt5-base /usr/share/doc/qt5 @@ -46,6 +46,13 @@ + + 2023-04-10 + 5.15.9 + Version bump. + Mustafa Cinasal + muscnsl@gmail.com + 2022-12-21 5.15.7 diff --git a/desktop/toolkit/qt5/qt5-imageformats/pspec.xml b/desktop/toolkit/qt5/qt5-imageformats/pspec.xml index 447febadda..7a982db097 100755 --- a/desktop/toolkit/qt5/qt5-imageformats/pspec.xml +++ b/desktop/toolkit/qt5/qt5-imageformats/pspec.xml @@ -11,11 +11,11 @@ Plugins for additional image formats: TIFF, MNG, TGA, WBMP Plugins for additional image formats: TIFF, MNG, TGA, WBMP LGPLv2.1-linking-exception - http://download.qt.io/official_releases/qt/5.15/5.15.7/submodules/qtimageformats-everywhere-opensource-src-5.15.7.tar.xz + http://download.qt.io/official_releases/qt/5.15/5.15.9/submodules/qtimageformats-everywhere-opensource-src-5.15.9.tar.xz - qt5-base-devel - qt5-assistant-devel - qt5-sql-sqlite + qt5-base-devel + qt5-assistant-devel + qt5-sql-sqlite jasper-devel libmng-devel libjpeg-turbo-devel @@ -28,7 +28,7 @@ qt5-imageformats - qt5-base + qt5-base libgcc libmng tiff @@ -45,7 +45,7 @@ qt5-imageformats-docs - qt5-base + qt5-base /usr/share/doc @@ -53,6 +53,13 @@ + + 2023-04-10 + 5.15.9 + Version bump. + Mustafa Cinasal + muscnsl@gmail.com + 2022-12-21 5.15.7 diff --git a/desktop/toolkit/qt5/qt5-keychain/pspec.xml b/desktop/toolkit/qt5/qt5-keychain/pspec.xml index 46137107e9..d1bce117dc 100755 --- a/desktop/toolkit/qt5/qt5-keychain/pspec.xml +++ b/desktop/toolkit/qt5/qt5-keychain/pspec.xml @@ -15,10 +15,10 @@ libsecret-devel extra-cmake-modules - qt5-assistant-devel - qt5-base-devel - qt5-designer-devel - qt5-linguist + qt5-assistant-devel + qt5-base-devel + qt5-designer-devel + qt5-linguist @@ -27,7 +27,7 @@ libgcc libsecret - qt5-base + qt5-base /usr/lib @@ -48,6 +48,13 @@ + + 2023-04-10 + 0.13.2 + Rebuild qt5.15.9 + Mustafa Cinasal + muscnsl@gmail.com + 2022-12-21 0.13.2 diff --git a/desktop/toolkit/qt5/qt5-location/pspec.xml b/desktop/toolkit/qt5/qt5-location/pspec.xml index 7152f15c14..b6a7a9b8b8 100755 --- a/desktop/toolkit/qt5/qt5-location/pspec.xml +++ b/desktop/toolkit/qt5/qt5-location/pspec.xml @@ -11,7 +11,7 @@ Provides access to position, satellite and area monitoring classes Provides access to position, satellite and area monitoring classes LGPLv2.1-linking-exception - http://download.qt.io/official_releases/qt/5.15/5.15.7/submodules/qtlocation-everywhere-opensource-src-5.15.7.tar.xz + http://download.qt.io/official_releases/qt/5.15/5.15.9/submodules/qtlocation-everywhere-opensource-src-5.15.9.tar.xz mesa-devel zlib-devel @@ -20,10 +20,10 @@ gconf-devel glib2-devel geoclue-devel - qt5-sql-sqlite - qt5-base-devel - qt5-assistant-devel - qt5-declarative-devel + qt5-sql-sqlite + qt5-base-devel + qt5-assistant-devel + qt5-declarative-devel @@ -37,8 +37,8 @@ gypsy libgcc geoclue - qt5-base - qt5-declarative + qt5-base + qt5-declarative /usr/lib @@ -55,15 +55,15 @@ qt5-location - qt5-base-devel - qt5-declarative-devel + qt5-base-devel + qt5-declarative-devel qt5-location-docs - qt5-base + qt5-base /usr/share/doc @@ -71,6 +71,13 @@ + + 2023-04-10 + 5.15.9 + Version bump. + Mustafa Cinasal + muscnsl@gmail.com + 2022-12-21 5.15.7 diff --git a/desktop/toolkit/qt5/qt5-multimedia/pspec.xml b/desktop/toolkit/qt5/qt5-multimedia/pspec.xml index 4cbcd98b6e..9b9ab06e72 100755 --- a/desktop/toolkit/qt5/qt5-multimedia/pspec.xml +++ b/desktop/toolkit/qt5/qt5-multimedia/pspec.xml @@ -11,7 +11,7 @@ Classes for audio, video, radio and camera functionality Classes for audio, video, radio and camera functionality LGPLv2.1-linking-exception - http://download.qt.io/official_releases/qt/5.15/5.15.7/submodules/qtmultimedia-everywhere-opensource-src-5.15.7.tar.xz + http://download.qt.io/official_releases/qt/5.15/5.15.9/submodules/qtmultimedia-everywhere-opensource-src-5.15.9.tar.xz icu4c-devel openal-devel @@ -20,10 +20,10 @@ pulseaudio-libs-devel gst-plugins-bad-devel mesa-devel - qt5-sql-sqlite - qt5-base-devel - qt5-assistant-devel - qt5-declarative-devel + qt5-sql-sqlite + qt5-base-devel + qt5-assistant-devel + qt5-declarative-devel gst-plugins-base-devel @@ -44,8 +44,8 @@ gst-plugins-bad pulseaudio-libs mesa - qt5-base - qt5-declarative + qt5-base + qt5-declarative gst-plugins-base @@ -58,8 +58,8 @@ qt5-multimedia - qt5-base-devel - qt5-declarative-devel + qt5-base-devel + qt5-declarative-devel @@ -69,11 +69,18 @@ /usr/share/doc - qt5-base + qt5-base + + 2023-04-10 + 5.15.9 + Version bump. + Mustafa Cinasal + muscnsl@gmail.com + 2022-12-21 5.15.7 diff --git a/desktop/toolkit/qt5/qt5-quickcontrols/pspec.xml b/desktop/toolkit/qt5/qt5-quickcontrols/pspec.xml index 76253d0258..4537d935bd 100755 --- a/desktop/toolkit/qt5/qt5-quickcontrols/pspec.xml +++ b/desktop/toolkit/qt5/qt5-quickcontrols/pspec.xml @@ -11,13 +11,13 @@ Reusable Qt Quick based UI controls to create classic desktop-style user interfaces Reusable Qt Quick based UI controls to create classic desktop-style user interfaces LGPLv2.1-linking-exception - http://download.qt.io/official_releases/qt/5.15/5.15.7/submodules/qtquickcontrols-everywhere-opensource-src-5.15.7.tar.xz + http://download.qt.io/official_releases/qt/5.15/5.15.9/submodules/qtquickcontrols-everywhere-opensource-src-5.15.9.tar.xz mesa-devel - qt5-sql-sqlite - qt5-base-devel - qt5-assistant-devel - qt5-declarative-devel + qt5-sql-sqlite + qt5-base-devel + qt5-assistant-devel + qt5-declarative-devel @@ -25,8 +25,8 @@ qt5-quickcontrols libgcc - qt5-base - qt5-declarative + qt5-base + qt5-declarative /usr/lib @@ -38,7 +38,7 @@ qt5-quickcontrols-docs - qt5-base + qt5-base /usr/share/doc @@ -46,6 +46,13 @@ + + 2023-04-10 + 5.15.9 + Version bump. + Mustafa Cinasal + muscnsl@gmail.com + 2022-12-21 5.15.7 diff --git a/desktop/toolkit/qt5/qt5-remoteobjects/pspec.xml b/desktop/toolkit/qt5/qt5-remoteobjects/pspec.xml index 5475f804e8..ce95647f35 100755 --- a/desktop/toolkit/qt5/qt5-remoteobjects/pspec.xml +++ b/desktop/toolkit/qt5/qt5-remoteobjects/pspec.xml @@ -12,12 +12,12 @@ LGPLv2.1-linking-exception Inter-process communication (IPC) module developed for Qt qt5-remoteobjects, Inter-process communication (IPC) module developed for Qt - http://download.qt.io/official_releases/qt/5.15/5.15.7/submodules/qtremoteobjects-everywhere-opensource-src-5.15.7.tar.xz + http://download.qt.io/official_releases/qt/5.15/5.15.9/submodules/qtremoteobjects-everywhere-opensource-src-5.15.9.tar.xz - qt5-base-devel - qt5-sql-sqlite - qt5-assistant-devel - qt5-declarative-devel + qt5-base-devel + qt5-sql-sqlite + qt5-assistant-devel + qt5-declarative-devel @@ -25,9 +25,9 @@ qt5-remoteobjects Inter-process communication (IPC) module developed for Qt - qt5-base - qt5-assistant - qt5-declarative + qt5-base + qt5-assistant + qt5-declarative /usr/lib @@ -46,8 +46,8 @@ qt5-remoteobjects - qt5-base-devel - qt5-declarative-devel + qt5-base-devel + qt5-declarative-devel @@ -55,7 +55,7 @@ qt5-remoteobjects-docs Documentation files for qt5-remoteobjects - qt5-remoteobjects + qt5-remoteobjects /usr/share/doc @@ -63,6 +63,13 @@ + + 2023-04-10 + 5.15.9 + Version bump. + Mustafa Cinasal + muscnsl@gmail.com + 2022-12-21 5.15.7 diff --git a/desktop/toolkit/qt5/qt5-script/pspec.xml b/desktop/toolkit/qt5/qt5-script/pspec.xml index cbb5136883..08c4a7c12b 100755 --- a/desktop/toolkit/qt5/qt5-script/pspec.xml +++ b/desktop/toolkit/qt5/qt5-script/pspec.xml @@ -11,11 +11,11 @@ Classes for making Qt applications scriptable. Provided for Qt 5.x compatibility Classes for making Qt applications scriptable. Provided for Qt 5.x compatibility LGPLv2.1-linking-exception - https://download.qt.io/official_releases/qt/5.15/5.15.7/submodules/qtscript-everywhere-opensource-src-5.15.7.tar.xz + https://download.qt.io/official_releases/qt/5.15/5.15.9/submodules/qtscript-everywhere-opensource-src-5.15.9.tar.xz - qt5-base-devel - qt5-assistant-devel - qt5-sql-sqlite + qt5-base-devel + qt5-assistant-devel + qt5-sql-sqlite mesa-devel libgcc @@ -24,7 +24,7 @@ qt5-script - qt5-base + qt5-base libgcc @@ -37,7 +37,7 @@ qt5-script-devel - qt5-base-devel + qt5-base-devel qt5-script @@ -49,7 +49,7 @@ qt5-script-docs - qt5-base + qt5-base /usr/share/doc/qt5 @@ -57,6 +57,13 @@ + + 2023-04-10 + 5.15.9 + Version bump. + Mustafa Cinasal + muscnsl@gmail.com + 2022-12-21 5.15.7 diff --git a/desktop/toolkit/qt5/qt5-sensors/pspec.xml b/desktop/toolkit/qt5/qt5-sensors/pspec.xml index 4276579bcf..a48dec092d 100755 --- a/desktop/toolkit/qt5/qt5-sensors/pspec.xml +++ b/desktop/toolkit/qt5/qt5-sensors/pspec.xml @@ -11,12 +11,12 @@ Provides access to sensor hardware and motion gesture recognition Provides access to sensor hardware and motion gesture recognition LGPLv2.1-linking-exception - http://download.qt.io/official_releases/qt/5.15/5.15.7/submodules/qtsensors-everywhere-opensource-src-5.15.7.tar.xz + http://download.qt.io/official_releases/qt/5.15/5.15.9/submodules/qtsensors-everywhere-opensource-src-5.15.9.tar.xz - qt5-sql-sqlite - qt5-base-devel - qt5-assistant-devel - qt5-declarative-devel + qt5-sql-sqlite + qt5-base-devel + qt5-assistant-devel + qt5-declarative-devel @@ -24,8 +24,8 @@ qt5-sensors libgcc - qt5-base - qt5-declarative + qt5-base + qt5-declarative /usr/lib @@ -38,7 +38,7 @@ qt5-sensors-devel qt5-sensors - qt5-base-devel + qt5-base-devel /usr/lib/pkgconfig @@ -49,7 +49,7 @@ qt5-sensors-docs - qt5-base + qt5-base /usr/share/doc/qt5 @@ -58,6 +58,13 @@ + + 2023-04-10 + 5.15.9 + Version bump. + Mustafa Cinasal + muscnsl@gmail.com + 2022-12-21 5.15.7 diff --git a/desktop/toolkit/qt5/qt5-serialport/pspec.xml b/desktop/toolkit/qt5/qt5-serialport/pspec.xml index 129c473ec5..9077bd6394 100755 --- a/desktop/toolkit/qt5/qt5-serialport/pspec.xml +++ b/desktop/toolkit/qt5/qt5-serialport/pspec.xml @@ -11,11 +11,11 @@ Provides access to hardware and virtual serial ports Provides access to hardware and virtual serial ports LGPLv2.1-linking-exception - http://download.qt.io/official_releases/qt/5.15/5.15.7/submodules/qtserialport-everywhere-opensource-src-5.15.7.tar.xz + http://download.qt.io/official_releases/qt/5.15/5.15.9/submodules/qtserialport-everywhere-opensource-src-5.15.9.tar.xz - qt5-base-devel - qt5-assistant-devel - qt5-sql-sqlite + qt5-base-devel + qt5-assistant-devel + qt5-sql-sqlite eudev-devel @@ -23,7 +23,7 @@ qt5-serialport - qt5-base + qt5-base eudev libgcc @@ -37,7 +37,7 @@ qt5-serialport-devel - qt5-base-devel + qt5-base-devel qt5-serialport @@ -49,7 +49,7 @@ qt5-serialport-docs - qt5-base + qt5-base /usr/share/doc/qt5 @@ -57,6 +57,13 @@ + + 2023-04-10 + 5.15.9 + Version bump. + Mustafa Cinasal + muscnsl@gmail.com + 2022-12-21 5.15.7 diff --git a/desktop/toolkit/qt5/qt5-svg/files/qt_kde.patch b/desktop/toolkit/qt5/qt5-svg/files/qt_kde.patch index c9b5e09ac6..b8e2093e2c 100644 --- a/desktop/toolkit/qt5/qt5-svg/files/qt_kde.patch +++ b/desktop/toolkit/qt5/qt5-svg/files/qt_kde.patch @@ -1,8 +1,8 @@ diff --git a/src/plugins/imageformats/svg/qsvgiohandler.cpp b/src/plugins/imageformats/svg/qsvgiohandler.cpp -index 4136aaf..fd3529a 100644 +index 561e77e..12e0574 100644 --- a/src/plugins/imageformats/svg/qsvgiohandler.cpp +++ b/src/plugins/imageformats/svg/qsvgiohandler.cpp -@@ -189,6 +189,8 @@ bool QSvgIOHandler::read(QImage *image) +@@ -191,6 +191,8 @@ bool QSvgIOHandler::read(QImage *image) } } if (!finalSize.isEmpty()) { @@ -12,7 +12,7 @@ index 4136aaf..fd3529a 100644 QPainter p(image); d->r.render(&p, bounds); diff --git a/src/svg/qsvghandler.cpp b/src/svg/qsvghandler.cpp -index 299efac..8dda563 100644 +index b2227b6..8dda563 100644 --- a/src/svg/qsvghandler.cpp +++ b/src/svg/qsvghandler.cpp @@ -1393,9 +1393,10 @@ static void parseFont(QSvgNode *node, @@ -29,220 +29,26 @@ index 299efac..8dda563 100644 } break; default: -@@ -1626,6 +1627,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; -@@ -1633,7 +1635,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; -@@ -1650,14 +1653,13 @@ static bool parsePathDataFast(const QStringRef &dataStr, QPainterPath &path) - arg.append(0);//dummy - const qreal *num = arg.constData(); - int count = arg.count(); -- while (count > 0) { -+ while (ok && count > 0) { - qreal offsetX = x; // correction offsets - qreal offsetY = y; // for relative commands - switch (pathElem.unicode()) { - case 'm': { - if (count < 2) { -- num++; -- count--; -+ ok = false; - break; - } - x = x0 = num[0] + offsetX; -@@ -1674,8 +1676,7 @@ static bool parsePathDataFast(const QStringRef &dataStr, QPainterPath &path) - break; - case 'M': { - if (count < 2) { -- num++; -- count--; -+ ok = false; - break; - } - x = x0 = num[0]; -@@ -1701,8 +1702,7 @@ static bool parsePathDataFast(const QStringRef &dataStr, QPainterPath &path) - break; - case 'l': { - if (count < 2) { -- num++; -- count--; -+ ok = false; - break; - } - x = num[0] + offsetX; -@@ -1715,8 +1715,7 @@ static bool parsePathDataFast(const QStringRef &dataStr, QPainterPath &path) - break; - case 'L': { - if (count < 2) { -- num++; -- count--; -+ ok = false; - break; - } - x = num[0]; -@@ -1756,8 +1755,7 @@ static bool parsePathDataFast(const QStringRef &dataStr, QPainterPath &path) - break; - case 'c': { - if (count < 6) { -- num += count; -- count = 0; -+ ok = false; - break; - } - QPointF c1(num[0] + offsetX, num[1] + offsetY); -@@ -1773,8 +1771,7 @@ static bool parsePathDataFast(const QStringRef &dataStr, QPainterPath &path) - } - case 'C': { - if (count < 6) { -- num += count; -- count = 0; -+ ok = false; - break; - } - QPointF c1(num[0], num[1]); -@@ -1790,8 +1787,7 @@ static bool parsePathDataFast(const QStringRef &dataStr, QPainterPath &path) - } - case 's': { - if (count < 4) { -- num += count; -- count = 0; -+ ok = false; - break; - } - QPointF c1; -@@ -1812,8 +1808,7 @@ static bool parsePathDataFast(const QStringRef &dataStr, QPainterPath &path) - } - case 'S': { - if (count < 4) { -- num += count; -- count = 0; -+ ok = false; - break; - } - QPointF c1; -@@ -1834,8 +1829,7 @@ static bool parsePathDataFast(const QStringRef &dataStr, QPainterPath &path) - } - case 'q': { - if (count < 4) { -- num += count; -- count = 0; -+ ok = false; - break; - } - QPointF c(num[0] + offsetX, num[1] + offsetY); -@@ -1850,8 +1844,7 @@ static bool parsePathDataFast(const QStringRef &dataStr, QPainterPath &path) - } - case 'Q': { - if (count < 4) { -- num += count; -- count = 0; -+ ok = false; - break; - } - QPointF c(num[0], num[1]); -@@ -1866,8 +1859,7 @@ static bool parsePathDataFast(const QStringRef &dataStr, QPainterPath &path) - } - case 't': { - if (count < 2) { -- num += count; -- count = 0; -+ ok = false; - break; - } - QPointF e(num[0] + offsetX, num[1] + offsetY); -@@ -1887,8 +1879,7 @@ static bool parsePathDataFast(const QStringRef &dataStr, QPainterPath &path) - } - case 'T': { - if (count < 2) { -- num += count; -- count = 0; -+ ok = false; - break; - } - QPointF e(num[0], num[1]); -@@ -1908,8 +1899,7 @@ static bool parsePathDataFast(const QStringRef &dataStr, QPainterPath &path) - } - case 'a': { - if (count < 7) { -- num += count; -- count = 0; -+ ok = false; - break; - } - qreal rx = (*num++); -@@ -1931,8 +1921,7 @@ static bool parsePathDataFast(const QStringRef &dataStr, QPainterPath &path) - break; - case 'A': { - if (count < 7) { -- num += count; -- count = 0; -+ ok = false; - break; - } - qreal rx = (*num++); -@@ -1953,12 +1942,15 @@ static bool parsePathDataFast(const QStringRef &dataStr, QPainterPath &path) - } - break; - default: -- return false; -+ ok = false; -+ break; - } - lastMode = pathElem.toLatin1(); -+ if (path.elementCount() > maxElementCount) -+ ok = false; - } - } -- return true; -+ return ok; - } - - static bool parseStyle(QSvgNode *node, -@@ -2522,6 +2514,8 @@ static bool parseAnimateTransformNode(QSvgNode *parent, +@@ -2513,6 +2514,8 @@ static bool parseAnimateTransformNode(QSvgNode *parent, ++s; } } + if (vals.count() % 3 != 0) + return false; - + bool ok = true; int begin = parseClockValue(beginStr, &ok); -@@ -2585,6 +2579,8 @@ static QSvgNode *createCircleNode(QSvgNode *parent, +@@ -2576,6 +2579,8 @@ static QSvgNode *createCircleNode(QSvgNode *parent, qreal ncx = toDouble(cx); qreal ncy = toDouble(cy); qreal nr = toDouble(r); + if (nr < 0.0) + return nullptr; - + QRectF rect(ncx-nr, ncy-nr, nr*2, nr*2); QSvgNode *circle = new QSvgCircle(parent, rect); -@@ -2995,8 +2991,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; -@@ -3055,15 +3051,16 @@ static QSvgStyleProperty *createRadialGradientNode(QSvgNode *node, - +@@ -3046,15 +3051,16 @@ static QSvgStyleProperty *createRadialGradientNode(QSvgNode *node, + qreal ncx = 0.5; qreal ncy = 0.5; - qreal nr = 0.5; @@ -258,37 +64,26 @@ index 299efac..8dda563 100644 - nr = 0.5; + if (nr <= 0.0) + return nullptr; - + qreal nfx = ncx; if (!fx.isEmpty()) -@@ -3359,7 +3356,9 @@ static QSvgNode *createTextNode(QSvgNode *parent, +@@ -3350,7 +3356,9 @@ static QSvgNode *createTextNode(QSvgNode *parent, //### editable and rotate not handled QSvgHandler::LengthType type; qreal nx = parseLength(x, type, handler); + nx = convertToPixels(nx, true, type); qreal ny = parseLength(y, type, handler); + ny = convertToPixels(ny, true, type); - + QSvgNode *text = new QSvgText(parent, QPointF(nx, ny)); return text; -@@ -3700,9 +3699,7 @@ void QSvgHandler::parse() - case QXmlStreamReader::EndElement: - endElement(xml->name()); - ++remainingUnfinishedElements; -- // if we are using somebody else's qxmlstreamreader -- // we should not read until the end of the stream -- done = !m_ownsReader && (xml->name() == QLatin1String("svg")); -+ done = (xml->name() == QLatin1String("svg")); - break; - case QXmlStreamReader::Characters: - characters(xml->text()); diff --git a/src/svg/qsvgstructure.cpp b/src/svg/qsvgstructure.cpp index b89608b..89c9e4e 100644 --- a/src/svg/qsvgstructure.cpp +++ b/src/svg/qsvgstructure.cpp @@ -255,9 +255,13 @@ inline static bool isSupportedSvgFeature(const QString &str) }; - + if (str.length() <= MAX_WORD_LENGTH && str.length() >= MIN_WORD_LENGTH) { + const char16_t unicode44 = str.at(44).unicode(); + const char16_t unicode45 = str.at(45).unicode(); @@ -309,7 +104,7 @@ index 63d0797..19e7154 100644 @@ -433,8 +433,16 @@ void QSvgTinyDocument::draw(QPainter *p, QSvgExtraStates &) draw(p); } - + +static bool isValidMatrix(const QTransform &transform) +{ + qreal determinant = transform.determinant(); @@ -331,7 +126,7 @@ index 63d0797..19e7154 100644 + if (!isValidMatrix(p->worldTransform())) + p->setWorldTransform(oldTransform); } - + QRectF QSvgTinyDocument::boundsOnElement(const QString &id) const diff --git a/tests/auto/qsvgrenderer/tst_qsvgrenderer.cpp b/tests/auto/qsvgrenderer/tst_qsvgrenderer.cpp index 36c76ec..db71e02 100644 @@ -343,13 +138,13 @@ index 36c76ec..db71e02 100644 void oss_fuzz_24738(); + void illegalAnimateTransform_data(); + void illegalAnimateTransform(); - + #ifndef QT_NO_COMPRESS void testGzLoading(); @@ -1646,5 +1648,22 @@ void tst_QSvgRenderer::oss_fuzz_24738() QSvgRenderer().load(QByteArray("")); } - + +void tst_QSvgRenderer::illegalAnimateTransform_data() +{ + QTest::addColumn("svg"); diff --git a/desktop/toolkit/qt5/qt5-svg/pspec.xml b/desktop/toolkit/qt5/qt5-svg/pspec.xml index 1125b3e8ac..e21e74d312 100755 --- a/desktop/toolkit/qt5/qt5-svg/pspec.xml +++ b/desktop/toolkit/qt5/qt5-svg/pspec.xml @@ -9,12 +9,12 @@ LGPLv2.1-linking-exception Classes for displaying the contents of SVG files Classes for displaying the contents of SVG files - http://download.qt.io/official_releases/qt/5.15/5.15.7/submodules/qtsvg-everywhere-opensource-src-5.15.7.tar.xz + http://download.qt.io/official_releases/qt/5.15/5.15.9/submodules/qtsvg-everywhere-opensource-src-5.15.9.tar.xz mesa-devel - qt5-base-devel - qt5-assistant-devel - qt5-sql-sqlite + qt5-base-devel + qt5-assistant-devel + qt5-sql-sqlite zlib-devel @@ -25,7 +25,7 @@ qt5-svg libgcc - qt5-base + qt5-base zlib @@ -39,7 +39,7 @@ qt5-svg-devel Development files for qt5-svg - qt5-base-devel + qt5-base-devel qt5-svg @@ -51,7 +51,7 @@ qt5-svg-docs - qt5-base + qt5-base /usr/share/doc @@ -60,6 +60,13 @@ + + 2023-04-10 + 5.15.9 + Version bump. + Mustafa Cinasal + muscnsl@gmail.com + 2022-12-21 5.15.7 diff --git a/desktop/toolkit/qt5/qt5-translations/pspec.xml b/desktop/toolkit/qt5/qt5-translations/pspec.xml index c1077b2a24..d386a5f49d 100755 --- a/desktop/toolkit/qt5/qt5-translations/pspec.xml +++ b/desktop/toolkit/qt5/qt5-translations/pspec.xml @@ -11,12 +11,12 @@ A cross-platform application and UI framework (Translations) A cross-platform application and UI framework (Translations) LGPLv2.1-linking-exception - http://download.qt.io/official_releases/qt/5.15/5.15.7/submodules/qttranslations-everywhere-opensource-src-5.15.7.tar.xz + http://download.qt.io/official_releases/qt/5.15/5.15.9/submodules/qttranslations-everywhere-opensource-src-5.15.9.tar.xz - qt5-base-devel - qt5-assistant-devel - qt5-sql-sqlite - qt5-linguist + qt5-base-devel + qt5-assistant-devel + qt5-sql-sqlite + qt5-linguist @@ -30,11 +30,18 @@ /usr/share/licenses/ - qt5-base + qt5-base + + 2023-04-10 + 5.15.9 + Version bump. + Mustafa Cinasal + muscnsl@gmail.com + 2022-12-21 5.15.7 diff --git a/desktop/toolkit/qt5/qt5-webchannel/pspec.xml b/desktop/toolkit/qt5/qt5-webchannel/pspec.xml index 3fd8812b4e..e872e8aaa9 100755 --- a/desktop/toolkit/qt5/qt5-webchannel/pspec.xml +++ b/desktop/toolkit/qt5/qt5-webchannel/pspec.xml @@ -11,12 +11,12 @@ Provides access to QObject or QML objects from HTML clients for seamless integration of Qt applications with HTML/JavaScript clients Provides access to QObject or QML objects from HTML clients for seamless integration of Qt applications with HTML/JavaScript clients LGPLv2.1-linking-exception - http://download.qt.io/official_releases/qt/5.15/5.15.7/submodules/qtwebchannel-everywhere-opensource-src-5.15.7.tar.xz + http://download.qt.io/official_releases/qt/5.15/5.15.9/submodules/qtwebchannel-everywhere-opensource-src-5.15.9.tar.xz - qt5-sql-sqlite - qt5-base-devel - qt5-assistant-devel - qt5-declarative-devel + qt5-sql-sqlite + qt5-base-devel + qt5-assistant-devel + qt5-declarative-devel @@ -29,8 +29,8 @@ libgcc - qt5-base - qt5-declarative + qt5-base + qt5-declarative @@ -42,8 +42,8 @@ qt5-webchannel - qt5-base-devel - qt5-declarative-devel + qt5-base-devel + qt5-declarative-devel @@ -54,12 +54,19 @@ libgcc - qt5-base - qt5-declarative + qt5-base + qt5-declarative + + 2023-04-10 + 5.15.9 + Version bump. + Mustafa Cinasal + muscnsl@gmail.com + 2022-12-21 5.15.7 diff --git a/desktop/toolkit/qt5/qt5-websockets/pspec.xml b/desktop/toolkit/qt5/qt5-websockets/pspec.xml index 093b2344ec..eb9b2009a2 100755 --- a/desktop/toolkit/qt5/qt5-websockets/pspec.xml +++ b/desktop/toolkit/qt5/qt5-websockets/pspec.xml @@ -11,12 +11,12 @@ Provides WebSocket communication compliant with RFC 6455 Provides WebSocket communication compliant with RFC 6455 LGPLv2.1-linking-exception - http://download.qt.io/official_releases/qt/5.15/5.15.7/submodules/qtwebsockets-everywhere-opensource-src-5.15.7.tar.xz + http://download.qt.io/official_releases/qt/5.15/5.15.9/submodules/qtwebsockets-everywhere-opensource-src-5.15.9.tar.xz - qt5-sql-sqlite - qt5-base-devel - qt5-assistant-devel - qt5-declarative-devel + qt5-sql-sqlite + qt5-base-devel + qt5-assistant-devel + qt5-declarative-devel @@ -28,8 +28,8 @@ libgcc - qt5-base - qt5-declarative + qt5-base + qt5-declarative @@ -41,7 +41,7 @@ qt5-websockets - qt5-base-devel + qt5-base-devel @@ -51,11 +51,18 @@ /usr/share/doc/qt5 - qt5-base + qt5-base + + 2023-04-10 + 5.15.9 + Version bump. + Mustafa Cinasal + muscnsl@gmail.com + 2022-12-21 5.15.7 diff --git a/desktop/toolkit/qt5/qt5-x11extras/pspec.xml b/desktop/toolkit/qt5/qt5-x11extras/pspec.xml index a058e2ff23..f67643b80d 100755 --- a/desktop/toolkit/qt5/qt5-x11extras/pspec.xml +++ b/desktop/toolkit/qt5/qt5-x11extras/pspec.xml @@ -11,11 +11,11 @@ Provides platform-specific APIs for X11 Provides platform-specific APIs for X11 LGPLv2.1-linking-exception - http://download.qt.io/official_releases/qt/5.15/5.15.7/submodules/qtx11extras-everywhere-opensource-src-5.15.7.tar.xz + http://download.qt.io/official_releases/qt/5.15/5.15.9/submodules/qtx11extras-everywhere-opensource-src-5.15.9.tar.xz - qt5-base-devel - qt5-assistant-devel - qt5-sql-sqlite + qt5-base-devel + qt5-assistant-devel + qt5-sql-sqlite mesa-devel @@ -23,7 +23,7 @@ qt5-x11extras - qt5-base + qt5-base /usr/lib @@ -40,7 +40,7 @@ qt5-x11extras - qt5-base-devel + qt5-base-devel @@ -56,6 +56,13 @@ + + 2023-04-10 + 5.15.9 + Version bump. + Mustafa Cinasal + muscnsl@gmail.com + 2022-12-21 5.15.7 diff --git a/desktop/toolkit/qt5/qt5-xmlpatterns/pspec.xml b/desktop/toolkit/qt5/qt5-xmlpatterns/pspec.xml index e6abf5a335..be8a0085d5 100755 --- a/desktop/toolkit/qt5/qt5-xmlpatterns/pspec.xml +++ b/desktop/toolkit/qt5/qt5-xmlpatterns/pspec.xml @@ -11,20 +11,20 @@ Support for XPath, XQuery, XSLT and XML schema validation Support for XPath, XQuery, XSLT and XML schema validation LGPLv2.1-linking-exception - http://download.qt.io/official_releases/qt/5.15/5.15.7/submodules/qtxmlpatterns-everywhere-opensource-src-5.15.7.tar.xz + http://download.qt.io/official_releases/qt/5.15/5.15.9/submodules/qtxmlpatterns-everywhere-opensource-src-5.15.9.tar.xz - qt5-base-devel - qt5-assistant-devel - qt5-sql-sqlite - qt5-declarative-devel + qt5-base-devel + qt5-assistant-devel + qt5-sql-sqlite + qt5-declarative-devel qt5-xmlpatterns - qt5-base - qt5-declarative + qt5-base + qt5-declarative libgcc @@ -44,14 +44,14 @@ qt5-xmlpatterns - qt5-base-devel + qt5-base-devel qt5-xmlpatterns-docs - qt5-base + qt5-base /usr/share/doc/qt5 @@ -59,6 +59,13 @@ + + 2023-04-10 + 5.15.9 + Version bump. + Mustafa Cinasal + muscnsl@gmail.com + 2022-12-21 5.15.7