diff --git a/srcpkgs/qt6-declarative/patches/qml-broken-test.patch b/srcpkgs/qt6-declarative/patches/qml-broken-test.patch deleted file mode 100644 index b16412fcd5e..00000000000 --- a/srcpkgs/qt6-declarative/patches/qml-broken-test.patch +++ /dev/null @@ -1,64 +0,0 @@ ---- qt6-declarative-6.4.2.orig/tests/auto/quickcontrols2/controls/data/tst_rangeslider.qml -+++ qt6-declarative-6.4.2/tests/auto/quickcontrols2/controls/data/tst_rangeslider.qml -@@ -602,61 +602,6 @@ TestCase { - } - - function test_overlappingHandles() { -- var control = createTemporaryObject(sliderComponent, testCase) -- verify(control) -- -- // By default, we force the second handle to be after the first in -- // terms of stacking order *and* z value. -- compare(control.second.handle.z, 1) -- compare(control.first.handle.z, 0) -- control.first.value = 0 -- control.second.value = 0 -- -- // When both handles overlap, only the handle with the higher Z value -- // should be hovered. -- mouseMove(control, control.second.handle.x, control.second.handle.y) -- compare(control.second.hovered, true) -- compare(control.first.hovered, false) -- -- // Both are at the same position, so it doesn't matter whose coordinates we use. -- mousePress(control, control.first.handle.x, control.first.handle.y, Qt.LeftButton) -- verify(control.second.pressed) -- compare(control.second.handle.z, 1) -- compare(control.first.handle.z, 0) -- -- // Move the second handle out of the way. -- mouseMove(control, control.width, control.first.handle.y) -- mouseRelease(control, control.width, control.first.handle.y, Qt.LeftButton) -- verify(!control.second.pressed) -- compare(control.second.value, 1.0) -- compare(control.second.handle.z, 1) -- compare(control.first.handle.z, 0) -- -- // The first handle should not be hovered. -- compare(control.first.hovered, false) -- -- // Move the first handle on top of the second. -- mousePress(control, control.first.handle.x, control.first.handle.y, Qt.LeftButton) -- verify(control.first.pressed) -- compare(control.first.handle.z, 1) -- compare(control.second.handle.z, 0) -- -- mouseMove(control, control.width, control.first.handle.y) -- mouseRelease(control, control.width, control.first.handle.y, Qt.LeftButton) -- verify(!control.first.pressed) -- compare(control.first.handle.z, 1) -- compare(control.second.handle.z, 0) -- -- // The most recently pressed handle (the first) should have the higher z value. -- mousePress(control, control.first.handle.x, control.first.handle.y, Qt.LeftButton) -- verify(control.first.pressed) -- compare(control.first.handle.z, 1) -- compare(control.second.handle.z, 0) -- -- mouseRelease(control, control.first.handle.x, control.first.handle.y, Qt.LeftButton) -- verify(!control.first.pressed) -- compare(control.first.handle.z, 1) -- compare(control.second.handle.z, 0) - } - - function test_keys_data() { diff --git a/srcpkgs/qt6-declarative/template b/srcpkgs/qt6-declarative/template index a3d921f9ea1..22e58f1578e 100644 --- a/srcpkgs/qt6-declarative/template +++ b/srcpkgs/qt6-declarative/template @@ -1,6 +1,6 @@ # Template file for 'qt6-declarative' pkgname=qt6-declarative -version=6.4.2 +version=6.5.0 revision=1 build_style=cmake configure_args="-DQT_BUILD_TESTS=ON" @@ -11,7 +11,7 @@ maintainer="John " license="GPL-3.0-only with Qt-GPL-exception-1.0, LGPL-3.0-only, GPL-2.0-or-later" homepage="https://www.qt.io" distfiles="https://download.qt.io/official_releases/qt/${version%.*}/${version}/submodules/qtdeclarative-everywhere-src-${version}.tar.xz" -checksum=a4bdd983de4e9cbca0f85b767dbdd8598711554e370a06da8f509ded4430f5bd +checksum=f7d631cd8ebc1491dad0f30f1b5326ae812bee4ad706e61157816a82bf588c97 replaces="qt6-quickcontrols2>=0" if [ "$CROSS_BUILD" ]; then @@ -96,13 +96,13 @@ qt6-declarative-devel_package() { replaces="qt6-quickcontrols2-devel>=0" pkg_install() { vmove usr/include - vmove usr/lib/metatypes + vmove usr/lib/qt6/metatypes vmove usr/lib/pkgconfig vmove usr/lib/qt6/mkspecs vmove "usr/lib/*.so" vmove "usr/lib/*.a" vmove "usr/lib/*.prl" - vmove usr/share/qt6/modules + vmove usr/lib/qt6/modules for _f in ${DESTDIR}/usr/lib/cmake/*; do case "$_f" in *Tools) ;;