From cbbd500360a8ca8db39fefcfccd3d150bc8aab21 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?= Date: Sat, 18 Feb 2023 09:38:48 +0700 Subject: [PATCH] qt6-wayland: update to 6.4.2. --- srcpkgs/qt6-wayland-tools | 1 + srcpkgs/qt6-wayland/template | 22 ++++++++++++++++------ 2 files changed, 17 insertions(+), 6 deletions(-) create mode 120000 srcpkgs/qt6-wayland-tools diff --git a/srcpkgs/qt6-wayland-tools b/srcpkgs/qt6-wayland-tools new file mode 120000 index 00000000000..c4dec18ea9a --- /dev/null +++ b/srcpkgs/qt6-wayland-tools @@ -0,0 +1 @@ +qt6-wayland \ No newline at end of file diff --git a/srcpkgs/qt6-wayland/template b/srcpkgs/qt6-wayland/template index 5c044947248..3b45f98bc7c 100644 --- a/srcpkgs/qt6-wayland/template +++ b/srcpkgs/qt6-wayland/template @@ -1,10 +1,9 @@ # Template file for 'qt6-wayland' pkgname=qt6-wayland -version=6.4.0 +version=6.4.2 revision=1 build_style=cmake -hostmakedepends="qt6-base-devel perl pkg-config wayland-devel - qt6-declarative-devel" +hostmakedepends="qt6-base perl pkg-config wayland-devel qt6-declarative-host-tools" # XXX: Qml as optional dep makedepends="qt6-base-devel wayland-devel libxkbcommon-devel qt6-declarative-devel @@ -15,11 +14,13 @@ 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/qtwayland-everywhere-src-${version}.tar.xz" -checksum=f08ba8e14fbec34d57332ad897c5a9150453ed07a611abb18c89c6cc5e5b62fc +checksum=24cf1a0af751ab1637b4815d5c5f3704483d5fa7bedbd3519e6fc020d8be135f + +subpackages="qt6-wayland-tools qt6-wayland-devel" if [ "$CROSS_BUILD" ]; then configure_args="-DQT_FORCE_BUILD_TOOLS=true" - hostmakedepends+=" qt6-wayland-devel" + hostmakedepends+=" qt6-wayland-tools" fi do_check() { @@ -27,8 +28,17 @@ do_check() { dbus-run-session ctest -E 'tst_seatv4' } +qt6-wayland-tools_package() { + depends="${sourcepkg}>=${version}_${revision}" + short_desc+=" - Tools" + pkg_install() { + vmove usr/lib/qt6/libexec + vmove "usr/lib/cmake/*Tools" + } +} + qt6-wayland-devel_package() { - depends="${sourcepkg}>=${version}_${revision} qt6-base-devel>=${version}_1" + depends="qt6-wayland-tools>=${version}_${revision} qt6-base-devel>=${version}_1" short_desc+=" - development files" pkg_install() { vmove usr/include