diff --git a/main/qt6-svg/.checksums b/main/qt6-svg/.checksums index 315dde43b..7d9405c61 100644 --- a/main/qt6-svg/.checksums +++ b/main/qt6-svg/.checksums @@ -1,2 +1 @@ -cc3fb6ed36be5039070d67c6612f68df qt6-svg-6.6.0.tar.xz -a38f96411474f968ec2d644cbe248ea8 qtbug-11794.patch +db41246a8427fadfee1a6830a80ee5d0 qt6-svg-6.6.1.tar.xz diff --git a/main/qt6-svg/.pkgfiles b/main/qt6-svg/.pkgfiles index 1659ccbff..8bfcdd621 100644 --- a/main/qt6-svg/.pkgfiles +++ b/main/qt6-svg/.pkgfiles @@ -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 diff --git a/main/qt6-svg/qtbug-11794.patch b/main/qt6-svg/qtbug-11794.patch deleted file mode 100644 index 9f0de172e..000000000 --- a/main/qt6-svg/qtbug-11794.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/main/qt6-svg/spkgbuild b/main/qt6-svg/spkgbuild index 76dca57b4..0e7add181 100644 --- a/main/qt6-svg/spkgbuild +++ b/main/qt6-svg/spkgbuild @@ -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"