From 49865e9b05780788e3c174f32324d31932c08864 Mon Sep 17 00:00:00 2001 From: John Date: Fri, 13 Oct 2023 19:13:16 +0200 Subject: [PATCH] qt6-webchannel: update to 6.6.0. --- common/shlibs | 1 + srcpkgs/qt6-webchannel/patches/test.patch | 11 +++++++++++ srcpkgs/qt6-webchannel/template | 10 ++++++---- 3 files changed, 18 insertions(+), 4 deletions(-) create mode 100644 srcpkgs/qt6-webchannel/patches/test.patch diff --git a/common/shlibs b/common/shlibs index f99d5d3c693..9036a675c1a 100644 --- a/common/shlibs +++ b/common/shlibs @@ -2048,6 +2048,7 @@ libQt6VirtualKeyboard.so.6 qt6-virtualkeyboard-6.1.0_1 libQt6SerialPort.so.6 qt6-serialport-6.2.0alpha_1 libQt6WebSockets.so.6 qt6-websockets-6.2.0alpha_1 libQt6WebChannel.so.6 qt6-webchannel-6.2.0alpha_1 +libQt6WebChannelQuick.so.6 qt6-webchannel-6.6.0_1 libQt6Positioning.so.6 qt6-position-6.5.2_1 libQt6PositioningQuick.so.6 qt6-position-6.5.2_1 libQt6Location.so.6 qt6-location-6.5.2_2 diff --git a/srcpkgs/qt6-webchannel/patches/test.patch b/srcpkgs/qt6-webchannel/patches/test.patch new file mode 100644 index 00000000000..0b0b36b7747 --- /dev/null +++ b/srcpkgs/qt6-webchannel/patches/test.patch @@ -0,0 +1,11 @@ +--- qt6-webchannel-6.6.0/tests/auto/cmake/CMakeLists.txt 2023-10-03 21:09:44.000000000 +0200 ++++ - 2023-10-13 22:38:26.259148142 +0200 +@@ -13,7 +13,7 @@ + project(webchannel_cmake_tests) + enable_testing() + +-set(required_packages Core WebChannel) ++set(required_packages Core) + + # Setup the test when called as a completely standalone project. + if(TARGET Qt6::Core) diff --git a/srcpkgs/qt6-webchannel/template b/srcpkgs/qt6-webchannel/template index a1ee8200e01..1718abb31b7 100644 --- a/srcpkgs/qt6-webchannel/template +++ b/srcpkgs/qt6-webchannel/template @@ -1,6 +1,6 @@ # Template file for 'qt6-webchannel' pkgname=qt6-webchannel -version=6.5.2 +version=6.6.0 revision=1 build_style=cmake hostmakedepends="perl qt6-base qt6-declarative-host-tools" @@ -10,10 +10,12 @@ maintainer="John " license="(LGPL-3.0-only OR GPL-2.0-only OR GPL-3.0-only) AND GPL-3.0-only with Qt-GPL-exception-1.0" homepage="https://qt.io/" distfiles="http://download.qt.io/official_releases/qt/${version%.*}/${version}/submodules/qtwebchannel-everywhere-src-${version}.tar.xz" -checksum=c188d9fa6e535b850b574fa9e47c6089555b8df1fe041dcb13aeeca336b78e63 +checksum=fddcb38e6d5843f9c7570654f1a12aaf0086e5a01f7bf3cf170064fcc5a3f51c -pre_check() { - export QML2_IMPORT_PATH="$wrksrc/build/lib/qt6/qml" +do_check() { + cd build + export QML2_IMPORT_PATH="$wrksrc/build/lib${XBPS_TARGET_WORDSIZE}/qt6/qml" + ctest -E module_includes } post_install() {