From 3da749fcb20cec190243a33df68280895d8ce65e Mon Sep 17 00:00:00 2001 From: Rmys Date: Tue, 5 Jul 2022 20:50:00 +0300 Subject: [PATCH] qt5-5.15.5 --- .../toolkit/qt5/qt5-connectivity/pspec.xml | 23 +- .../qt5/qt5-graphicaleffects/pspec.xml | 23 +- .../toolkit/qt5/qt5-imageformats/pspec.xml | 19 +- desktop/toolkit/qt5/qt5-keychain/actions.py | 2 +- desktop/toolkit/qt5/qt5-keychain/pspec.xml | 19 +- desktop/toolkit/qt5/qt5-location/pspec.xml | 27 ++- desktop/toolkit/qt5/qt5-multimedia/pspec.xml | 27 ++- .../toolkit/qt5/qt5-quickcontrols/pspec.xml | 23 +- desktop/toolkit/qt5/qt5-script/pspec.xml | 21 +- desktop/toolkit/qt5/qt5-sensors/pspec.xml | 25 ++- desktop/toolkit/qt5/qt5-serialport/pspec.xml | 21 +- .../toolkit/qt5/qt5-svg/files/qt_kde.patch | 203 +++--------------- desktop/toolkit/qt5/qt5-svg/pspec.xml | 21 +- .../toolkit/qt5/qt5-translations/pspec.xml | 19 +- desktop/toolkit/qt5/qt5-webchannel/pspec.xml | 29 ++- desktop/toolkit/qt5/qt5-websockets/pspec.xml | 25 ++- desktop/toolkit/qt5/qt5-x11extras/pspec.xml | 19 +- desktop/toolkit/qt5/qt5-xmlpatterns/pspec.xml | 25 ++- 18 files changed, 271 insertions(+), 300 deletions(-) diff --git a/desktop/toolkit/qt5/qt5-connectivity/pspec.xml b/desktop/toolkit/qt5/qt5-connectivity/pspec.xml index c41ab59479..d3b944528a 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.3/submodules/qtconnectivity-everywhere-opensource-src-5.15.3.tar.xz + http://download.qt.io/official_releases/qt/5.15/5.15.5/submodules/qtconnectivity-everywhere-opensource-src-5.15.5.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 @@ + + 2022-07-05 + 5.15.5 + Version bump. + Mustafa Cinasal + muscnsl@gmail.com + 2022-04-18 5.15.3 diff --git a/desktop/toolkit/qt5/qt5-graphicaleffects/pspec.xml b/desktop/toolkit/qt5/qt5-graphicaleffects/pspec.xml index 5016eaf33c..aca8c5a3d1 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.3/submodules/qtgraphicaleffects-everywhere-opensource-src-5.15.3.tar.xz + http://download.qt.io/official_releases/qt/5.15/5.15.5/submodules/qtgraphicaleffects-everywhere-opensource-src-5.15.5.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 @@ + + 2022-07-05 + 5.15.5 + Version bump. + Mustafa Cinasal + muscnsl@gmail.com + 2022-04-18 5.15.3 diff --git a/desktop/toolkit/qt5/qt5-imageformats/pspec.xml b/desktop/toolkit/qt5/qt5-imageformats/pspec.xml index b742b8db24..dd9b708cfa 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.3/submodules/qtimageformats-everywhere-opensource-src-5.15.3.tar.xz + http://download.qt.io/official_releases/qt/5.15/5.15.5/submodules/qtimageformats-everywhere-opensource-src-5.15.5.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 @@ + + 2022-07-05 + 5.15.5 + Version bump. + Mustafa Cinasal + muscnsl@gmail.com + 2022-04-18 5.15.3 diff --git a/desktop/toolkit/qt5/qt5-keychain/actions.py b/desktop/toolkit/qt5/qt5-keychain/actions.py index ef976e181c..c7c32b4bdf 100755 --- a/desktop/toolkit/qt5/qt5-keychain/actions.py +++ b/desktop/toolkit/qt5/qt5-keychain/actions.py @@ -17,5 +17,5 @@ def install(): kde5.install() - pisitools.dodoc("ChangeLog", "COPYING", "ReadMe.txt") + pisitools.dodoc("ChangeLog", "COPYING", "ReadMe*") diff --git a/desktop/toolkit/qt5/qt5-keychain/pspec.xml b/desktop/toolkit/qt5/qt5-keychain/pspec.xml index 99a7c92cee..1a37a7d854 100755 --- a/desktop/toolkit/qt5/qt5-keychain/pspec.xml +++ b/desktop/toolkit/qt5/qt5-keychain/pspec.xml @@ -11,13 +11,13 @@ BSD Provides support for secure credentials storage Qt5-Keychain is a Qt API to store passwords and other secret data securely. How the data is stored depends on the platform - https://github.com/frankosterfeld/qtkeychain/archive/v0.11.1.tar.gz + https://github.com/frankosterfeld/qtkeychain/archive/v0.13.2.tar.gz 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 @@ -25,7 +25,7 @@ Provides support for secure credentials storage libgcc - qt5-base + qt5-base /usr/lib @@ -46,6 +46,13 @@ + + 2022-07-05 + 0.13.2 + Version bump. + Mustafa Cinasal + muscnsl@gmail.com + 2022-04-18 0.11.1 diff --git a/desktop/toolkit/qt5/qt5-location/pspec.xml b/desktop/toolkit/qt5/qt5-location/pspec.xml index 8bb1405f4d..a5236e082d 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.3/submodules/qtlocation-everywhere-opensource-src-5.15.3.tar.xz + http://download.qt.io/official_releases/qt/5.15/5.15.5/submodules/qtlocation-everywhere-opensource-src-5.15.5.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 @@ + + 2022-07-05 + 5.15.5 + Version bump. + Mustafa Cinasal + muscnsl@gmail.com + 2022-04-18 5.15.3 diff --git a/desktop/toolkit/qt5/qt5-multimedia/pspec.xml b/desktop/toolkit/qt5/qt5-multimedia/pspec.xml index a8daa0adb8..4edee8f420 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.3/submodules/qtmultimedia-everywhere-opensource-src-5.15.3.tar.xz + http://download.qt.io/official_releases/qt/5.15/5.15.5/submodules/qtmultimedia-everywhere-opensource-src-5.15.5.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 + + 2022-07-05 + 5.15.5 + Version bump. + Mustafa Cinasal + muscnsl@gmail.com + 2022-04-18 5.15.3 diff --git a/desktop/toolkit/qt5/qt5-quickcontrols/pspec.xml b/desktop/toolkit/qt5/qt5-quickcontrols/pspec.xml index 75a2166180..4151cd9996 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.3/submodules/qtquickcontrols-everywhere-opensource-src-5.15.3.tar.xz + http://download.qt.io/official_releases/qt/5.15/5.15.5/submodules/qtquickcontrols-everywhere-opensource-src-5.15.5.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 @@ + + 2022-07-05 + 5.15.5 + Version bump. + Mustafa Cinasal + muscnsl@gmail.com + 2022-04-18 5.15.3 diff --git a/desktop/toolkit/qt5/qt5-script/pspec.xml b/desktop/toolkit/qt5/qt5-script/pspec.xml index c8e45d8731..b19b89ae5d 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.3/submodules/qtscript-everywhere-opensource-src-5.15.3.tar.xz + https://download.qt.io/official_releases/qt/5.15/5.15.5/submodules/qtscript-everywhere-opensource-src-5.15.5.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 @@ + + 2022-07-05 + 5.15.5 + Version bump. + Mustafa Cinasal + muscnsl@gmail.com + 2022-04-18 5.15.3 diff --git a/desktop/toolkit/qt5/qt5-sensors/pspec.xml b/desktop/toolkit/qt5/qt5-sensors/pspec.xml index 2c26b3da4c..6254794d5e 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.3/submodules/qtsensors-everywhere-opensource-src-5.15.3.tar.xz + http://download.qt.io/official_releases/qt/5.15/5.15.5/submodules/qtsensors-everywhere-opensource-src-5.15.5.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 @@ + + 2022-07-05 + 5.15.5 + Version bump. + Mustafa Cinasal + muscnsl@gmail.com + 2022-04-18 5.15.3 diff --git a/desktop/toolkit/qt5/qt5-serialport/pspec.xml b/desktop/toolkit/qt5/qt5-serialport/pspec.xml index 136d304aab..ea208573dc 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.3/submodules/qtserialport-everywhere-opensource-src-5.15.3.tar.xz + http://download.qt.io/official_releases/qt/5.15/5.15.5/submodules/qtserialport-everywhere-opensource-src-5.15.5.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 @@ + + 2022-07-05 + 5.15.5 + Version bump. + Mustafa Cinasal + muscnsl@gmail.com + 2022-04-18 5.15.3 diff --git a/desktop/toolkit/qt5/qt5-svg/files/qt_kde.patch b/desktop/toolkit/qt5/qt5-svg/files/qt_kde.patch index 899cbb4ab8..4e4ceb1d6d 100644 --- a/desktop/toolkit/qt5/qt5-svg/files/qt_kde.patch +++ b/desktop/toolkit/qt5/qt5-svg/files/qt_kde.patch @@ -1,52 +1,8 @@ diff --git a/src/plugins/imageformats/svg/qsvgiohandler.cpp b/src/plugins/imageformats/svg/qsvgiohandler.cpp -index bd39b2a..fd3529a 100644 +index 4136aaf..fd3529a 100644 --- a/src/plugins/imageformats/svg/qsvgiohandler.cpp +++ b/src/plugins/imageformats/svg/qsvgiohandler.cpp -@@ -118,6 +118,24 @@ QSvgIOHandler::~QSvgIOHandler() - delete d; - } - -+static bool isPossiblySvg(QIODevice *device, bool *isCompressed = nullptr) -+{ -+ constexpr int bufSize = 64; -+ char buf[bufSize]; -+ const qint64 readLen = device->peek(buf, bufSize); -+ if (readLen < 8) -+ return false; -+# ifndef QT_NO_COMPRESS -+ if (quint8(buf[0]) == 0x1f && quint8(buf[1]) == 0x8b) { -+ if (isCompressed) -+ *isCompressed = true; -+ return true; -+ } -+# endif -+ QTextStream str(QByteArray::fromRawData(buf, readLen)); -+ QByteArray ba = str.read(16).trimmed().toLatin1(); -+ return ba.startsWith("loaded && !d->readDone) - return true; // Will happen if we have been asked for the size - -- QByteArray buf = device()->peek(16); --#ifndef QT_NO_COMPRESS -- if (buf.startsWith("\x1f\x8b")) { -- setFormat("svgz"); -- return true; -- } else --#endif -- if (buf.contains("fill(d->backColor.rgba()); QPainter p(image); d->r.render(&p, bounds); -@@ -260,12 +274,7 @@ bool QSvgIOHandler::supportsOption(ImageOption option) const - - bool QSvgIOHandler::canRead(QIODevice *device) - { -- QByteArray buf = device->peek(16); -- return --#ifndef QT_NO_COMPRESS -- buf.startsWith("\x1f\x8b") || --#endif -- buf.contains(" parseNumbersList(const QChar *&str) +@@ -728,15 +728,25 @@ static QVector parseNumbersList(const QChar *&str) return points; } @@ -111,7 +43,7 @@ index b3d9aaf..f2653af 100644 while (str->isSpace()) ++str; -@@ -1382,8 +1393,10 @@ static void parseFont(QSvgNode *node, +@@ -1383,8 +1393,10 @@ static void parseFont(QSvgNode *node, case FontSizeNone: break; case FontSizeValue: { @@ -124,7 +56,7 @@ index b3d9aaf..f2653af 100644 } break; default: -@@ -1614,6 +1627,7 @@ static void pathArc(QPainterPath &path, +@@ -1615,6 +1627,7 @@ static void pathArc(QPainterPath &path, static bool parsePathDataFast(const QStringRef &dataStr, QPainterPath &path) { @@ -132,7 +64,7 @@ index b3d9aaf..f2653af 100644 qreal x0 = 0, y0 = 0; // starting point qreal x = 0, y = 0; // current point char lastMode = 0; -@@ -1621,28 +1635,31 @@ static bool parsePathDataFast(const QStringRef &dataStr, QPainterPath &path) +@@ -1622,28 +1635,31 @@ static bool parsePathDataFast(const QStringRef &dataStr, QPainterPath &path) const QChar *str = dataStr.constData(); const QChar *end = str + dataStr.size(); @@ -169,7 +101,7 @@ index b3d9aaf..f2653af 100644 break; } x = x0 = num[0] + offsetX; -@@ -1659,8 +1676,7 @@ static bool parsePathDataFast(const QStringRef &dataStr, QPainterPath &path) +@@ -1660,8 +1676,7 @@ static bool parsePathDataFast(const QStringRef &dataStr, QPainterPath &path) break; case 'M': { if (count < 2) { @@ -179,7 +111,7 @@ index b3d9aaf..f2653af 100644 break; } x = x0 = num[0]; -@@ -1686,8 +1702,7 @@ static bool parsePathDataFast(const QStringRef &dataStr, QPainterPath &path) +@@ -1687,8 +1702,7 @@ static bool parsePathDataFast(const QStringRef &dataStr, QPainterPath &path) break; case 'l': { if (count < 2) { @@ -189,7 +121,7 @@ index b3d9aaf..f2653af 100644 break; } x = num[0] + offsetX; -@@ -1700,8 +1715,7 @@ static bool parsePathDataFast(const QStringRef &dataStr, QPainterPath &path) +@@ -1701,8 +1715,7 @@ static bool parsePathDataFast(const QStringRef &dataStr, QPainterPath &path) break; case 'L': { if (count < 2) { @@ -199,7 +131,7 @@ index b3d9aaf..f2653af 100644 break; } x = num[0]; -@@ -1741,8 +1755,7 @@ static bool parsePathDataFast(const QStringRef &dataStr, QPainterPath &path) +@@ -1742,8 +1755,7 @@ static bool parsePathDataFast(const QStringRef &dataStr, QPainterPath &path) break; case 'c': { if (count < 6) { @@ -209,7 +141,7 @@ index b3d9aaf..f2653af 100644 break; } QPointF c1(num[0] + offsetX, num[1] + offsetY); -@@ -1758,8 +1771,7 @@ static bool parsePathDataFast(const QStringRef &dataStr, QPainterPath &path) +@@ -1759,8 +1771,7 @@ static bool parsePathDataFast(const QStringRef &dataStr, QPainterPath &path) } case 'C': { if (count < 6) { @@ -219,7 +151,7 @@ index b3d9aaf..f2653af 100644 break; } QPointF c1(num[0], num[1]); -@@ -1775,8 +1787,7 @@ static bool parsePathDataFast(const QStringRef &dataStr, QPainterPath &path) +@@ -1776,8 +1787,7 @@ static bool parsePathDataFast(const QStringRef &dataStr, QPainterPath &path) } case 's': { if (count < 4) { @@ -229,7 +161,7 @@ index b3d9aaf..f2653af 100644 break; } QPointF c1; -@@ -1797,8 +1808,7 @@ static bool parsePathDataFast(const QStringRef &dataStr, QPainterPath &path) +@@ -1798,8 +1808,7 @@ static bool parsePathDataFast(const QStringRef &dataStr, QPainterPath &path) } case 'S': { if (count < 4) { @@ -239,7 +171,7 @@ index b3d9aaf..f2653af 100644 break; } QPointF c1; -@@ -1819,8 +1829,7 @@ static bool parsePathDataFast(const QStringRef &dataStr, QPainterPath &path) +@@ -1820,8 +1829,7 @@ static bool parsePathDataFast(const QStringRef &dataStr, QPainterPath &path) } case 'q': { if (count < 4) { @@ -249,7 +181,7 @@ index b3d9aaf..f2653af 100644 break; } QPointF c(num[0] + offsetX, num[1] + offsetY); -@@ -1835,8 +1844,7 @@ static bool parsePathDataFast(const QStringRef &dataStr, QPainterPath &path) +@@ -1836,8 +1844,7 @@ static bool parsePathDataFast(const QStringRef &dataStr, QPainterPath &path) } case 'Q': { if (count < 4) { @@ -259,7 +191,7 @@ index b3d9aaf..f2653af 100644 break; } QPointF c(num[0], num[1]); -@@ -1851,8 +1859,7 @@ static bool parsePathDataFast(const QStringRef &dataStr, QPainterPath &path) +@@ -1852,8 +1859,7 @@ static bool parsePathDataFast(const QStringRef &dataStr, QPainterPath &path) } case 't': { if (count < 2) { @@ -269,7 +201,7 @@ index b3d9aaf..f2653af 100644 break; } QPointF e(num[0] + offsetX, num[1] + offsetY); -@@ -1872,8 +1879,7 @@ static bool parsePathDataFast(const QStringRef &dataStr, QPainterPath &path) +@@ -1873,8 +1879,7 @@ static bool parsePathDataFast(const QStringRef &dataStr, QPainterPath &path) } case 'T': { if (count < 2) { @@ -279,7 +211,7 @@ index b3d9aaf..f2653af 100644 break; } QPointF e(num[0], num[1]); -@@ -1893,8 +1899,7 @@ static bool parsePathDataFast(const QStringRef &dataStr, QPainterPath &path) +@@ -1894,8 +1899,7 @@ static bool parsePathDataFast(const QStringRef &dataStr, QPainterPath &path) } case 'a': { if (count < 7) { @@ -289,7 +221,7 @@ index b3d9aaf..f2653af 100644 break; } qreal rx = (*num++); -@@ -1916,8 +1921,7 @@ static bool parsePathDataFast(const QStringRef &dataStr, QPainterPath &path) +@@ -1917,8 +1921,7 @@ static bool parsePathDataFast(const QStringRef &dataStr, QPainterPath &path) break; case 'A': { if (count < 7) { @@ -299,7 +231,7 @@ index b3d9aaf..f2653af 100644 break; } qreal rx = (*num++); -@@ -1938,12 +1942,15 @@ static bool parsePathDataFast(const QStringRef &dataStr, QPainterPath &path) +@@ -1939,12 +1942,15 @@ static bool parsePathDataFast(const QStringRef &dataStr, QPainterPath &path) } break; default: @@ -317,7 +249,7 @@ index b3d9aaf..f2653af 100644 } static bool parseStyle(QSvgNode *node, -@@ -2357,6 +2364,27 @@ static bool parseAnimateNode(QSvgNode *parent, +@@ -2358,6 +2364,27 @@ static bool parseAnimateNode(QSvgNode *parent, return true; } @@ -345,7 +277,7 @@ index b3d9aaf..f2653af 100644 static bool parseAnimateColorNode(QSvgNode *parent, const QXmlStreamAttributes &attributes, QSvgHandler *handler) -@@ -2390,23 +2418,13 @@ static bool parseAnimateColorNode(QSvgNode *parent, +@@ -2391,23 +2418,13 @@ static bool parseAnimateColorNode(QSvgNode *parent, } } @@ -376,7 +308,7 @@ index b3d9aaf..f2653af 100644 QSvgAnimateColor *anim = new QSvgAnimateColor(begin, end, 0); anim->setArgs((targetStr == QLatin1String("fill")), colors); -@@ -2496,24 +2514,13 @@ static bool parseAnimateTransformNode(QSvgNode *parent, +@@ -2497,24 +2514,13 @@ static bool parseAnimateTransformNode(QSvgNode *parent, } } @@ -408,7 +340,7 @@ index b3d9aaf..f2653af 100644 QSvgAnimateTransform::TransformType type = QSvgAnimateTransform::Empty; if (typeStr == QLatin1String("translate")) { -@@ -2569,6 +2576,8 @@ static QSvgNode *createCircleNode(QSvgNode *parent, +@@ -2570,6 +2576,8 @@ static QSvgNode *createCircleNode(QSvgNode *parent, qreal ncx = toDouble(cx); qreal ncy = toDouble(cy); qreal nr = toDouble(r); @@ -417,7 +349,7 @@ index b3d9aaf..f2653af 100644 QRectF rect(ncx-nr, ncy-nr, nr*2, nr*2); QSvgNode *circle = new QSvgCircle(parent, rect); -@@ -2979,8 +2988,8 @@ static QSvgNode *createPathNode(QSvgNode *parent, +@@ -2980,8 +2988,8 @@ static QSvgNode *createPathNode(QSvgNode *parent, QPainterPath qpath; qpath.setFillRule(Qt::WindingFill); @@ -428,7 +360,7 @@ index b3d9aaf..f2653af 100644 QSvgNode *path = new QSvgPath(parent, qpath); return path; -@@ -3039,13 +3048,16 @@ static QSvgStyleProperty *createRadialGradientNode(QSvgNode *node, +@@ -3040,15 +3048,16 @@ static QSvgStyleProperty *createRadialGradientNode(QSvgNode *node, qreal ncx = 0.5; qreal ncy = 0.5; @@ -441,12 +373,14 @@ index b3d9aaf..f2653af 100644 + qreal nr = 0.0; if (!r.isEmpty()) nr = toDouble(r); +- if (nr < 0.5) +- nr = 0.5; + if (nr <= 0.0) + return nullptr; qreal nfx = ncx; if (!fx.isEmpty()) -@@ -3341,7 +3353,9 @@ static QSvgNode *createTextNode(QSvgNode *parent, +@@ -3344,7 +3353,9 @@ static QSvgNode *createTextNode(QSvgNode *parent, //### editable and rotate not handled QSvgHandler::LengthType type; qreal nx = parseLength(x, type, handler); @@ -456,7 +390,7 @@ index b3d9aaf..f2653af 100644 QSvgNode *text = new QSvgText(parent, QPointF(nx, ny)); return text; -@@ -3682,9 +3696,7 @@ void QSvgHandler::parse() +@@ -3685,9 +3696,7 @@ void QSvgHandler::parse() case QXmlStreamReader::EndElement: endElement(xml->name()); ++remainingUnfinishedElements; @@ -487,81 +421,6 @@ index b89608b..89c9e4e 100644 if (key <= MAX_HASH_VALUE && key >= 0) return str == QLatin1String(wordlist[key]); } -diff --git a/tests/auto/qsvgplugin/simple_Utf16BE.svg b/tests/auto/qsvgplugin/simple_Utf16BE.svg -new file mode 100644 -index 0000000..c3312cb -Binary files /dev/null and b/tests/auto/qsvgplugin/simple_Utf16BE.svg differ -diff --git a/tests/auto/qsvgplugin/simple_Utf16LE.svg b/tests/auto/qsvgplugin/simple_Utf16LE.svg -new file mode 100644 -index 0000000..cdbeda9 -Binary files /dev/null and b/tests/auto/qsvgplugin/simple_Utf16LE.svg differ -diff --git a/tests/auto/qsvgplugin/simple_Utf32BE.svg b/tests/auto/qsvgplugin/simple_Utf32BE.svg -new file mode 100644 -index 0000000..0d5d02c -Binary files /dev/null and b/tests/auto/qsvgplugin/simple_Utf32BE.svg differ -diff --git a/tests/auto/qsvgplugin/simple_Utf32LE.svg b/tests/auto/qsvgplugin/simple_Utf32LE.svg -new file mode 100644 -index 0000000..58a7159 -Binary files /dev/null and b/tests/auto/qsvgplugin/simple_Utf32LE.svg differ -diff --git a/tests/auto/qsvgplugin/simple_Utf8.svg b/tests/auto/qsvgplugin/simple_Utf8.svg -new file mode 100644 -index 0000000..2052c48 ---- /dev/null -+++ b/tests/auto/qsvgplugin/simple_Utf8.svg -@@ -0,0 +1,3 @@ -+ -+ -+ -diff --git a/tests/auto/qsvgplugin/tst_qsvgplugin.cpp b/tests/auto/qsvgplugin/tst_qsvgplugin.cpp -index e1f84f3..73bbe8b 100644 ---- a/tests/auto/qsvgplugin/tst_qsvgplugin.cpp -+++ b/tests/auto/qsvgplugin/tst_qsvgplugin.cpp -@@ -61,6 +61,8 @@ private slots: - void checkSize_data(); - void checkSize(); - void checkImageInclude(); -+ void encodings_data(); -+ void encodings(); - }; - - -@@ -145,6 +147,36 @@ void tst_QSvgPlugin::checkImageInclude() - logMessages.clear(); - } - -+void tst_QSvgPlugin::encodings_data() -+{ -+ QTest::addColumn("filename"); -+ -+ QTest::newRow("utf-8") << QFINDTESTDATA("simple_Utf8.svg"); -+ QTest::newRow("utf-16LE") << QFINDTESTDATA("simple_Utf16LE.svg"); -+ QTest::newRow("utf-16BE") << QFINDTESTDATA("simple_Utf16BE.svg"); -+ QTest::newRow("utf-32LE") << QFINDTESTDATA("simple_Utf32LE.svg"); -+ QTest::newRow("utf-32BE") << QFINDTESTDATA("simple_Utf32BE.svg"); -+} -+ -+void tst_QSvgPlugin::encodings() -+{ -+ QFETCH(QString, filename); -+ -+ { -+ QFile file(filename); -+ file.open(QIODevice::ReadOnly); -+ QVERIFY(QSvgIOHandler::canRead(&file)); -+ } -+ -+ QFile file(filename); -+ file.open(QIODevice::ReadOnly); -+ QSvgIOHandler plugin; -+ plugin.setDevice(&file); -+ QVERIFY(plugin.canRead()); -+ QImage img; -+ QVERIFY(plugin.read(&img)); -+ QCOMPARE(img.size(), QSize(50, 50)); -+} - - QTEST_MAIN(tst_QSvgPlugin) - #include "tst_qsvgplugin.moc" diff --git a/tests/auto/qsvgrenderer/tst_qsvgrenderer.cpp b/tests/auto/qsvgrenderer/tst_qsvgrenderer.cpp index 8f1f03b..36c76ec 100644 --- a/tests/auto/qsvgrenderer/tst_qsvgrenderer.cpp diff --git a/desktop/toolkit/qt5/qt5-svg/pspec.xml b/desktop/toolkit/qt5/qt5-svg/pspec.xml index 81a113941d..87a91702ee 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.3/submodules/qtsvg-everywhere-opensource-src-5.15.3.tar.xz + http://download.qt.io/official_releases/qt/5.15/5.15.5/submodules/qtsvg-everywhere-opensource-src-5.15.5.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 @@ + + 2022-07-05 + 5.15.5 + Version bump. + Mustafa Cinasal + muscnsl@gmail.com + 2022-04-18 5.15.3 diff --git a/desktop/toolkit/qt5/qt5-translations/pspec.xml b/desktop/toolkit/qt5/qt5-translations/pspec.xml index 5dd99b46e9..c42c2f640e 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.3/submodules/qttranslations-everywhere-opensource-src-5.15.3.tar.xz + http://download.qt.io/official_releases/qt/5.15/5.15.5/submodules/qttranslations-everywhere-opensource-src-5.15.5.tar.xz - qt5-base-devel - qt5-assistant-devel - qt5-sql-sqlite - qt5-linguist + qt5-base-devel + qt5-assistant-devel + qt5-sql-sqlite + qt5-linguist qt_kde.patch @@ -30,11 +30,18 @@ /usr/share/licenses/ - qt5-base + qt5-base + + 2022-07-05 + 5.15.5 + Version bump. + Mustafa Cinasal + muscnsl@gmail.com + 2022-04-18 5.15.3 diff --git a/desktop/toolkit/qt5/qt5-webchannel/pspec.xml b/desktop/toolkit/qt5/qt5-webchannel/pspec.xml index 48d818119b..8254126d0f 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.3/submodules/qtwebchannel-everywhere-opensource-src-5.15.3.tar.xz + http://download.qt.io/official_releases/qt/5.15/5.15.5/submodules/qtwebchannel-everywhere-opensource-src-5.15.5.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 + + 2022-07-05 + 5.15.5 + Version bump. + Mustafa Cinasal + muscnsl@gmail.com + 2022-04-18 5.15.3 diff --git a/desktop/toolkit/qt5/qt5-websockets/pspec.xml b/desktop/toolkit/qt5/qt5-websockets/pspec.xml index 12a6e93ad1..1c7d16e7d5 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.3/submodules/qtwebsockets-everywhere-opensource-src-5.15.3.tar.xz + http://download.qt.io/official_releases/qt/5.15/5.15.5/submodules/qtwebsockets-everywhere-opensource-src-5.15.5.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 + + 2022-07-05 + 5.15.5 + Version bump. + Mustafa Cinasal + muscnsl@gmail.com + 2022-04-18 5.15.3 diff --git a/desktop/toolkit/qt5/qt5-x11extras/pspec.xml b/desktop/toolkit/qt5/qt5-x11extras/pspec.xml index 414ba9b7fb..9e371c8088 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.3/submodules/qtx11extras-everywhere-opensource-src-5.15.3.tar.xz + http://download.qt.io/official_releases/qt/5.15/5.15.5/submodules/qtx11extras-everywhere-opensource-src-5.15.5.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 @@ + + 2022-07-05 + 5.15.5 + Version bump. + Mustafa Cinasal + muscnsl@gmail.com + 2022-04-18 5.15.3 diff --git a/desktop/toolkit/qt5/qt5-xmlpatterns/pspec.xml b/desktop/toolkit/qt5/qt5-xmlpatterns/pspec.xml index e4241e2714..66d63a0d1b 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.3/submodules/qtxmlpatterns-everywhere-opensource-src-5.15.3.tar.xz + http://download.qt.io/official_releases/qt/5.15/5.15.5/submodules/qtxmlpatterns-everywhere-opensource-src-5.15.5.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 @@ + + 2022-07-05 + 5.15.5 + Version bump. + Mustafa Cinasal + muscnsl@gmail.com + 2022-04-18 5.15.3