github-personal/ports
1
0
Fork 0
mirror of https://github.com/outbackdingo/ports.git synced 2026-01-27 10:20:12 +00:00
Code Issues Packages Projects Releases Wiki Activity

qt6-svg: upgrade to 6.6.1

Browse Source
This commit is contained in:
Victor Tebar
2023-11-28 12:49:24 +00:00
parent 8cf749987f
commit 41446a4fc3
4 changed files with 22 additions and 54 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
main/qt6-svg/.checksums
View File

@@ -1,2 +1 @@
cc3fb6ed36be5039070d67c6612f68df qt6-svg-6.6.0.tar.xz
a38f96411474f968ec2d644cbe248ea8 qtbug-11794.patch
db41246a8427fadfee1a6830a80ee5d0 qt6-svg-6.6.1.tar.xz

34
main/qt6-svg/.pkgfiles
View File

@@ -1,20 +1,20 @@
qt6-svg-6.6.0-2
qt6-svg-6.6.1-1
drwxr-xr-x root/root usr/
drwxr-xr-x root/root usr/include/
drwxr-xr-x root/root usr/include/qt6/
drwxr-xr-x root/root usr/include/qt6/QtSvg/
drwxr-xr-x root/root usr/include/qt6/QtSvg/6.6.0/
drwxr-xr-x root/root usr/include/qt6/QtSvg/6.6.0/QtSvg/
drwxr-xr-x root/root usr/include/qt6/QtSvg/6.6.0/QtSvg/private/
-rw-r--r-- root/root usr/include/qt6/QtSvg/6.6.0/QtSvg/private/qsvgfont_p.h
-rw-r--r-- root/root usr/include/qt6/QtSvg/6.6.0/QtSvg/private/qsvggraphics_p.h
-rw-r--r-- root/root usr/include/qt6/QtSvg/6.6.0/QtSvg/private/qsvghandler_p.h
-rw-r--r-- root/root usr/include/qt6/QtSvg/6.6.0/QtSvg/private/qsvgnode_p.h
-rw-r--r-- root/root usr/include/qt6/QtSvg/6.6.0/QtSvg/private/qsvgstructure_p.h
-rw-r--r-- root/root usr/include/qt6/QtSvg/6.6.0/QtSvg/private/qsvgstyle_p.h
-rw-r--r-- root/root usr/include/qt6/QtSvg/6.6.0/QtSvg/private/qsvgtinydocument_p.h
-rw-r--r-- root/root usr/include/qt6/QtSvg/6.6.0/QtSvg/private/qtsvgexports_p.h
-rw-r--r-- root/root usr/include/qt6/QtSvg/6.6.0/QtSvg/private/qtsvgglobal_p.h
drwxr-xr-x root/root usr/include/qt6/QtSvg/6.6.1/
drwxr-xr-x root/root usr/include/qt6/QtSvg/6.6.1/QtSvg/
drwxr-xr-x root/root usr/include/qt6/QtSvg/6.6.1/QtSvg/private/
-rw-r--r-- root/root usr/include/qt6/QtSvg/6.6.1/QtSvg/private/qsvgfont_p.h
-rw-r--r-- root/root usr/include/qt6/QtSvg/6.6.1/QtSvg/private/qsvggraphics_p.h
-rw-r--r-- root/root usr/include/qt6/QtSvg/6.6.1/QtSvg/private/qsvghandler_p.h
-rw-r--r-- root/root usr/include/qt6/QtSvg/6.6.1/QtSvg/private/qsvgnode_p.h
-rw-r--r-- root/root usr/include/qt6/QtSvg/6.6.1/QtSvg/private/qsvgstructure_p.h
-rw-r--r-- root/root usr/include/qt6/QtSvg/6.6.1/QtSvg/private/qsvgstyle_p.h
-rw-r--r-- root/root usr/include/qt6/QtSvg/6.6.1/QtSvg/private/qsvgtinydocument_p.h
-rw-r--r-- root/root usr/include/qt6/QtSvg/6.6.1/QtSvg/private/qtsvgexports_p.h
-rw-r--r-- root/root usr/include/qt6/QtSvg/6.6.1/QtSvg/private/qtsvgglobal_p.h
-rw-r--r-- root/root usr/include/qt6/QtSvg/QSvgGenerator
-rw-r--r-- root/root usr/include/qt6/QtSvg/QSvgRenderer
-rw-r--r-- root/root usr/include/qt6/QtSvg/QtSvg
@@ -74,12 +74,12 @@ drwxr-xr-x root/root usr/lib/cmake/Qt6SvgWidgets/
-rw-r--r-- root/root usr/lib/cmake/Qt6SvgWidgets/Qt6SvgWidgetsVersionlessTargets.cmake
-rw-r--r-- root/root usr/lib/libQt6Svg.prl
lrwxrwxrwx root/root usr/lib/libQt6Svg.so -> libQt6Svg.so.6
lrwxrwxrwx root/root usr/lib/libQt6Svg.so.6 -> libQt6Svg.so.6.6.0
-rwxr-xr-x root/root usr/lib/libQt6Svg.so.6.6.0
lrwxrwxrwx root/root usr/lib/libQt6Svg.so.6 -> libQt6Svg.so.6.6.1
-rwxr-xr-x root/root usr/lib/libQt6Svg.so.6.6.1
-rw-r--r-- root/root usr/lib/libQt6SvgWidgets.prl
lrwxrwxrwx root/root usr/lib/libQt6SvgWidgets.so -> libQt6SvgWidgets.so.6
lrwxrwxrwx root/root usr/lib/libQt6SvgWidgets.so.6 -> libQt6SvgWidgets.so.6.6.0
-rwxr-xr-x root/root usr/lib/libQt6SvgWidgets.so.6.6.0
lrwxrwxrwx root/root usr/lib/libQt6SvgWidgets.so.6 -> libQt6SvgWidgets.so.6.6.1
-rwxr-xr-x root/root usr/lib/libQt6SvgWidgets.so.6.6.1
drwxr-xr-x root/root usr/lib/pkgconfig/
-rw-r--r-- root/root usr/lib/pkgconfig/Qt6Svg.pc
-rw-r--r-- root/root usr/lib/pkgconfig/Qt6SvgWidgets.pc

29
main/qt6-svg/qtbug-11794.patch
View File

@@ -1,29 +0,0 @@
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

10
main/qt6-svg/spkgbuild
View File

@@ -3,17 +3,15 @@
# depends : qt6-base
name=qt6-svg
version=6.6.0
release=2
source="$name-$version.tar.xz::https://download.qt.io/official_releases/qt/${version%.*}/$version/submodules/qtsvg-everywhere-src-$version.tar.xz
qtbug-11794.patch"
version=6.6.1
release=1
source="$name-$version.tar.xz::https://download.qt.io/official_releases/qt/${version%.*}/$version/submodules/qtsvg-everywhere-src-$version.tar.xz"
build() {
patch -Np1 -d qtsvg-everywhere-src-$version -i $SRC/qtbug-11794.patch
cmake -S qtsvg-everywhere-src-$version -B build -G Ninja \
-D QT_USE_CCACHE=$(scratch isinstalled ccache && echo ON || echo OFF) \
-D INSTALL_PUBLICBINDIR=usr/bin \
-D QT_USE_CCACHE=ON \
-D CMAKE_BUILD_TYPE=Release \
-D CMAKE_CXX_FLAGS_RELEASE="$CXXFLAGS" \
-D CMAKE_C_FLAGS_RELEASE="$CFLAGS"