diff --git a/common/shlibs b/common/shlibs index 0550aed5dd8..4ee2d172e66 100644 --- a/common/shlibs +++ b/common/shlibs @@ -2076,6 +2076,8 @@ 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 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 libQt6MultimediaWidgets.so.6 qt6-multimedia-6.3.1_1 libQt6MultimediaQuick.so.6 qt6-multimedia-6.3.1_1 libQt6Multimedia.so.6 qt6-multimedia-6.3.1_1 diff --git a/srcpkgs/qt6-location/patches/no-cmake-test.patch b/srcpkgs/qt6-location/patches/no-cmake-test.patch deleted file mode 100644 index 3d43a3a7968..00000000000 --- a/srcpkgs/qt6-location/patches/no-cmake-test.patch +++ /dev/null @@ -1,10 +0,0 @@ ---- qt6-location-6.4.2.orig/tests/auto/CMakeLists.txt -+++ qt6-location-6.4.2/tests/auto/CMakeLists.txt -@@ -18,7 +18,6 @@ - add_subdirectory(qgeosatelliteinfosource) - add_subdirectory(qnmeasatelliteinfosource) - add_subdirectory(qwebmercator) --add_subdirectory(cmake) - if (QT6_IS_SHARED_LIBS_BUILD) - add_subdirectory(positionplugin) - add_subdirectory(positionplugintest) diff --git a/srcpkgs/qt6-location/template b/srcpkgs/qt6-location/template index 5454291207f..23542e2b5fd 100644 --- a/srcpkgs/qt6-location/template +++ b/srcpkgs/qt6-location/template @@ -1,16 +1,17 @@ # Template file for 'qt6-location' pkgname=qt6-location version=6.5.2 -revision=1 +revision=2 build_style=cmake hostmakedepends="perl qt6-base qt6-declarative-host-tools" -makedepends="qt6-serialport-devel qt6-declarative-devel GConf-devel" +makedepends="qt6-serialport-devel qt6-declarative-devel qt6-position-devel + GConf-devel" short_desc="Cross-platform application and UI framework - location" 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/qtpositioning-everywhere-src-${version}.tar.xz" -checksum=70493f03748d1c5b1577e4c011c0af9bcaffcdc6c5e519362605b01f917614fa +distfiles="http://download.qt.io/official_releases/qt/${version%.*}/${version}/submodules/qtlocation-everywhere-src-${version}.tar.xz" +checksum=891d7d64c26617bf1993a6d8b3d206ec9ce5b0a5396146f691b11d895fd86dfb pre_check() { export QML2_IMPORT_PATH="$wrksrc/build/lib/qt6/qml" @@ -21,7 +22,8 @@ post_install() { } qt6-location-devel_package() { - depends="${sourcepkg}>=${version}_${revision} qt6-base-devel>=${version}_1" + depends="${sourcepkg}>=${version}_${revision} + qt6-base-devel>=${version}_1 qt6-position-devel>=${version}_1" short_desc+=" - development files" pkg_install() { vmove usr/include