From 92da1280fe35729973bd4438b77a1087714448b8 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?= Date: Sun, 23 Jun 2024 10:44:29 +0700 Subject: [PATCH] qt6-svg: update to 6.7.2. --- ...nullptr-dereference-with-invalid-SVG.patch | 29 ------------------- srcpkgs/qt6-svg/template | 6 ++-- 2 files changed, 3 insertions(+), 32 deletions(-) delete mode 100644 srcpkgs/qt6-svg/patches/Fix-nullptr-dereference-with-invalid-SVG.patch diff --git a/srcpkgs/qt6-svg/patches/Fix-nullptr-dereference-with-invalid-SVG.patch b/srcpkgs/qt6-svg/patches/Fix-nullptr-dereference-with-invalid-SVG.patch deleted file mode 100644 index 9f0de172e65..00000000000 --- a/srcpkgs/qt6-svg/patches/Fix-nullptr-dereference-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: 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/srcpkgs/qt6-svg/template b/srcpkgs/qt6-svg/template index 8f545f8a309..fecf0655fdb 100644 --- a/srcpkgs/qt6-svg/template +++ b/srcpkgs/qt6-svg/template @@ -1,16 +1,16 @@ # Template file for 'qt6-svg' pkgname=qt6-svg -version=6.6.0 +version=6.7.2 revision=1 build_style=cmake hostmakedepends="qt6-base perl" -makedepends="qt6-base-devel" +makedepends="qt6-base-private-devel" short_desc="Cross-platform application and UI framework (QT6) - qt6-svg component" maintainer="John " license="GPL-3.0-only with Qt-GPL-exception-1.0, GPL-2.0-or-later, LGPL-3.0-only" homepage="https://qt.io/" distfiles="http://download.qt.io/official_releases/qt/${version%.*}/${version}/submodules/qtsvg-everywhere-src-${version}.tar.xz" -checksum=33da25fef51102f564624a7ea3e57cb4a0a31b7b44783d1af5749ac36d3c72de +checksum=fb0d1286a35be3583fee34aeb5843c94719e07193bdf1d4d8b0dc14009caef01 if [ "$XBPS_CHECK_PKGS" ]; then configure_args="-DQT_BUILD_TESTS=ON"