diff --git a/0001-fix-nullptr-derefence-with-invalid-SVG.patch b/0001-fix-nullptr-derefence-with-invalid-SVG.patch deleted file mode 100644 index bf44878..0000000 --- a/0001-fix-nullptr-derefence-with-invalid-SVG.patch +++ /dev/null @@ -1,29 +0,0 @@ -From edc8ca7f1e45302223b4b7962a57a30918f84c8d Mon Sep 17 00:00:00 2001 -From: Paul Olav Tvete -Date: Tue, 10 Oct 2023 10:14:22 +0200 -Subject: [PATCH] Fix nullptr dereference with invalid SVG - -Fixes: QTBUG-117944 -Pick-to: 6.6 6.5 6.2 -Change-Id: I9059dc28c750fc0585f1fb982152b211c323c6cd -Reviewed-by: Eskil Abrahamsen Blomfeldt ---- - src/svg/qsvghandler.cpp | 2 ++ - 1 file changed, 2 insertions(+) - -diff --git a/src/svg/qsvghandler.cpp b/src/svg/qsvghandler.cpp -index e6877acc..1cffbc37 100644 ---- a/src/svg/qsvghandler.cpp -+++ b/src/svg/qsvghandler.cpp -@@ -3620,6 +3620,8 @@ void QSvgHandler::init() - - static bool detectCycles(const QSvgNode *node, QList active = {}) - { -+ if (Q_UNLIKELY(!node)) -+ return false; - switch (node->type()) { - case QSvgNode::DOC: - case QSvgNode::G: --- -2.16.3 - diff --git a/0002-make-sure-we-do-not-load-invalid-SVGs-twice.patch b/0002-make-sure-we-do-not-load-invalid-SVGs-twice.patch deleted file mode 100644 index 66bf3dc..0000000 --- a/0002-make-sure-we-do-not-load-invalid-SVGs-twice.patch +++ /dev/null @@ -1,79 +0,0 @@ -From a090bd1f9a7bfa14f06b14570c6a5a37843931c6 Mon Sep 17 00:00:00 2001 -From: Paul Olav Tvete -Date: Tue, 10 Oct 2023 11:41:41 +0200 -Subject: [PATCH] Make sure we don't load invalid SVGs twice - -Fixes a bug where loading an invalid SVG that happens -to be valid XML could behave differently in QML and C++, -because readimage() in qquickpixmapcache.cpp calls -QImageReader::size() twice. - -Task-number: QTBUG-117944 -Pick-to: 6.6 6.5 -Change-Id: Ibef7f54627c76414c66f81804f5f46f2db3594ba -Reviewed-by: Eirik Aavitsland -Reviewed-by: Qt CI Bot ---- - src/plugins/imageformats/svg/qsvgiohandler.cpp | 16 +++++++++------- - 1 file changed, 9 insertions(+), 7 deletions(-) - -diff --git a/src/plugins/imageformats/svg/qsvgiohandler.cpp b/src/plugins/imageformats/svg/qsvgiohandler.cpp -index b04ee6b2..570c9829 100644 ---- a/src/plugins/imageformats/svg/qsvgiohandler.cpp -+++ b/src/plugins/imageformats/svg/qsvgiohandler.cpp -@@ -19,7 +19,7 @@ class QSvgIOHandlerPrivate - { - public: - QSvgIOHandlerPrivate(QSvgIOHandler *qq) -- : q(qq), loaded(false), readDone(false), backColor(Qt::transparent) -+ : q(qq), loadAttempted(false), loadStatus(false), readDone(false), backColor(Qt::transparent) - {} - - bool load(QIODevice *device); -@@ -31,7 +31,8 @@ public: - QRect clipRect; - QSize scaledSize; - QRect scaledClipRect; -- bool loaded; -+ bool loadAttempted; -+ bool loadStatus; - bool readDone; - QColor backColor; - }; -@@ -39,8 +40,9 @@ public: - - bool QSvgIOHandlerPrivate::load(QIODevice *device) - { -- if (loaded) -- return true; -+ if (loadAttempted) -+ return loadStatus; -+ loadAttempted = true; - if (q->format().isEmpty()) - q->canRead(); - -@@ -63,10 +65,10 @@ bool QSvgIOHandlerPrivate::load(QIODevice *device) - - if (res) { - defaultSize = r.defaultSize(); -- loaded = true; -+ loadStatus = true; - } - -- return loaded; -+ return loadStatus; - } - - -@@ -105,7 +107,7 @@ bool QSvgIOHandler::canRead() const - { - if (!device()) - return false; -- if (d->loaded && !d->readDone) -+ if (d->loadStatus && !d->readDone) - return true; // Will happen if we have been asked for the size - - bool isCompressed = false; --- -2.16.3 - diff --git a/qt6-svg.changes b/qt6-svg.changes index d22640f..3ba6e3f 100644 --- a/qt6-svg.changes +++ b/qt6-svg.changes @@ -1,3 +1,12 @@ +------------------------------------------------------------------- +Mon Nov 27 14:00:19 UTC 2023 - Christophe Marin + +- Update to 6.6.1: + * https://www.qt.io/blog/qt-6.6.1-released +- Drop patches, merged upstream: + * 0001-fix-nullptr-derefence-with-invalid-SVG.patch + * 0002-make-sure-we-do-not-load-invalid-SVGs-twice.patch + ------------------------------------------------------------------- Mon Oct 16 14:40:42 UTC 2023 - Manfred Hollstein diff --git a/qt6-svg.spec b/qt6-svg.spec index 3c29cdb..909206e 100644 --- a/qt6-svg.spec +++ b/qt6-svg.spec @@ -16,7 +16,7 @@ # -%define real_version 6.6.0 +%define real_version 6.6.1 %define short_version 6.6 %define tar_name qtsvg-everywhere-src %define tar_suffix %{nil} @@ -27,16 +27,12 @@ %endif # Name: qt6-svg%{?pkg_suffix} -Version: 6.6.0 +Version: 6.6.1 Release: 0 Summary: Classes for rendering and displaying SVG drawings License: LGPL-3.0-only OR (GPL-2.0-only OR GPL-3.0-or-later) URL: https://www.qt.io Source: https://download.qt.io/official_releases/qt/%{short_version}/%{real_version}%{tar_suffix}/submodules/%{tar_name}-%{real_version}%{tar_suffix}.tar.xz -# PATCH-FIX-UPSTREAM 0001-fix-nullptr-derefence-with-invalid-SVG.patch QTBUG-117944 boo#1216269 -Patch01: 0001-fix-nullptr-derefence-with-invalid-SVG.patch -# PATCH-FIX-UPSTREAM 0002-make-sure-we-do-not-load-invalid-SVGs-twice.patch boo#1216269 -Patch02: 0002-make-sure-we-do-not-load-invalid-SVGs-twice.patch Source99: qt6-svg-rpmlintrc BuildRequires: pkgconfig BuildRequires: qt6-core-private-devel diff --git a/qtsvg-everywhere-src-6.6.0.tar.xz b/qtsvg-everywhere-src-6.6.0.tar.xz deleted file mode 100644 index 99258db..0000000 --- a/qtsvg-everywhere-src-6.6.0.tar.xz +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:33da25fef51102f564624a7ea3e57cb4a0a31b7b44783d1af5749ac36d3c72de -size 1651728 diff --git a/qtsvg-everywhere-src-6.6.1.tar.xz b/qtsvg-everywhere-src-6.6.1.tar.xz new file mode 100644 index 0000000..f396d47 --- /dev/null +++ b/qtsvg-everywhere-src-6.6.1.tar.xz @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:248deb56d26a463cf3162f530358ccf90cfb654bbf518bb35ddf81b205e09228 +size 1651976