From 47ceed711052abc1d1305bf234b6ba1c9f55be6a Mon Sep 17 00:00:00 2001 From: Gerasim Troeglazov <3dEyes@gmail.com> Date: Sun, 14 Apr 2024 15:00:26 +1000 Subject: [PATCH] qt6_svg: bump version --- dev-qt/qt6-svg/patches/qt6_svg-6.6.0.patchset | 29 ------------------- ..._svg-6.6.0.recipe => qt6_svg-6.7.0.recipe} | 8 ++--- 2 files changed, 4 insertions(+), 33 deletions(-) delete mode 100644 dev-qt/qt6-svg/patches/qt6_svg-6.6.0.patchset rename dev-qt/qt6-svg/{qt6_svg-6.6.0.recipe => qt6_svg-6.7.0.recipe} (88%) diff --git a/dev-qt/qt6-svg/patches/qt6_svg-6.6.0.patchset b/dev-qt/qt6-svg/patches/qt6_svg-6.6.0.patchset deleted file mode 100644 index 9f0de172e..000000000 --- a/dev-qt/qt6-svg/patches/qt6_svg-6.6.0.patchset +++ /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: 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 e6877ac..1cffbc3 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: --- -cgit v1.2.3 - diff --git a/dev-qt/qt6-svg/qt6_svg-6.6.0.recipe b/dev-qt/qt6-svg/qt6_svg-6.7.0.recipe similarity index 88% rename from dev-qt/qt6-svg/qt6_svg-6.6.0.recipe rename to dev-qt/qt6-svg/qt6_svg-6.7.0.recipe index 06713057b..18a541ed2 100644 --- a/dev-qt/qt6-svg/qt6_svg-6.6.0.recipe +++ b/dev-qt/qt6-svg/qt6_svg-6.7.0.recipe @@ -4,15 +4,15 @@ used for developing software with a graphical user interface, and also used \ for developing non-GUI programs such as command-line tools and consoles for \ servers." HOMEPAGE="https://qt.io/" -COPYRIGHT="2015-2023 The Qt Company Ltd." +COPYRIGHT="2015-2024 The Qt Company Ltd." LICENSE="GNU LGPL v2.1 GNU LGPL v3 GNU FDL v1" REVISION="1" -SOURCE_URI="https://download.qt.io/official_releases/qt/${portVersion%.*}/$portVersion/submodules/qtsvg-everywhere-src-$portVersion.tar.xz" -CHECKSUM_SHA256="33da25fef51102f564624a7ea3e57cb4a0a31b7b44783d1af5749ac36d3c72de" +QT_MIRROR_URI="https://qt-mirror.dannhauer.de/archive" +SOURCE_URI="$QT_MIRROR_URI/qt/${portVersion%.*}/$portVersion/submodules/qtsvg-everywhere-src-$portVersion.tar.xz" +CHECKSUM_SHA256="1518f40e08ff5e6153a6e26e5b95b033413ac143b70795dc1317e7f73ebf922d" SOURCE_DIR="qtsvg-everywhere-src-$portVersion" -PATCHES="qt6_svg-$portVersion.patchset" ARCHITECTURES="all !x86_gcc2" SECONDARY_ARCHITECTURES="x86"