mirror of
https://github.com/void-linux/void-packages.git
synced 2025-06-08 08:03:51 +02:00
qt6-svg: update to 6.6.0.
This commit is contained in:
parent
8701b2b80b
commit
aaf6d9c0a6
2 changed files with 31 additions and 2 deletions
|
@ -0,0 +1,29 @@
|
||||||
|
From edc8ca7f1e45302223b4b7962a57a30918f84c8d Mon Sep 17 00:00:00 2001
|
||||||
|
From: Paul Olav Tvete <paul.tvete@qt.io>
|
||||||
|
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 <eskil.abrahamsen-blomfeldt@qt.io>
|
||||||
|
---
|
||||||
|
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<const QSvgUse *> active = {})
|
||||||
|
{
|
||||||
|
+ if (Q_UNLIKELY(!node))
|
||||||
|
+ return false;
|
||||||
|
switch (node->type()) {
|
||||||
|
case QSvgNode::DOC:
|
||||||
|
case QSvgNode::G:
|
||||||
|
--
|
||||||
|
cgit v1.2.3
|
||||||
|
|
|
@ -1,6 +1,6 @@
|
||||||
# Template file for 'qt6-svg'
|
# Template file for 'qt6-svg'
|
||||||
pkgname=qt6-svg
|
pkgname=qt6-svg
|
||||||
version=6.5.2
|
version=6.6.0
|
||||||
revision=1
|
revision=1
|
||||||
build_style=cmake
|
build_style=cmake
|
||||||
hostmakedepends="qt6-base perl"
|
hostmakedepends="qt6-base perl"
|
||||||
|
@ -10,7 +10,7 @@ maintainer="John <me@johnnynator.dev>"
|
||||||
license="GPL-3.0-only with Qt-GPL-exception-1.0, GPL-2.0-or-later, LGPL-3.0-only"
|
license="GPL-3.0-only with Qt-GPL-exception-1.0, GPL-2.0-or-later, LGPL-3.0-only"
|
||||||
homepage="https://qt.io/"
|
homepage="https://qt.io/"
|
||||||
distfiles="http://download.qt.io/official_releases/qt/${version%.*}/${version}/submodules/qtsvg-everywhere-src-${version}.tar.xz"
|
distfiles="http://download.qt.io/official_releases/qt/${version%.*}/${version}/submodules/qtsvg-everywhere-src-${version}.tar.xz"
|
||||||
checksum=48b4cc1093af2e0ab3bea30f60651bddd877a2335d16e7207879a2e9e81963a3
|
checksum=33da25fef51102f564624a7ea3e57cb4a0a31b7b44783d1af5749ac36d3c72de
|
||||||
|
|
||||||
if [ "$XBPS_CHECK_PKGS" ]; then
|
if [ "$XBPS_CHECK_PKGS" ]; then
|
||||||
configure_args="-DQT_BUILD_TESTS=ON"
|
configure_args="-DQT_BUILD_TESTS=ON"
|
||||||
|
|
Loading…
Add table
Reference in a new issue