diff --git a/srcpkgs/qt6-wayland-private-devel b/srcpkgs/qt6-wayland-private-devel new file mode 120000 index 00000000000..c4dec18ea9a --- /dev/null +++ b/srcpkgs/qt6-wayland-private-devel @@ -0,0 +1 @@ +qt6-wayland \ No newline at end of file diff --git a/srcpkgs/qt6-wayland/template b/srcpkgs/qt6-wayland/template index ef4dc11a949..1abb9396baf 100644 --- a/srcpkgs/qt6-wayland/template +++ b/srcpkgs/qt6-wayland/template @@ -1,12 +1,12 @@ # Template file for 'qt6-wayland' pkgname=qt6-wayland -version=6.6.0 +version=6.7.2 revision=1 build_style=cmake 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 +makedepends="qt6-base-private-devel wayland-devel libxkbcommon-devel + qt6-declarative-private-devel libXcomposite-devel MesaLib-devel Vulkan-Headers libdrm-devel" checkdepends="dbus mesa-dri" short_desc="Cross-platform application and UI framework - Wayland" @@ -14,9 +14,9 @@ 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=30c3d82d85d050c83370710a26d12c802199c51eba5c2726e9d6243edd03b7e8 +checksum=a2a057e1dd644bd44abb9990fecc194b2e25c2e0f39e81aa9fee4c1e5e2a8a5b -subpackages="qt6-wayland-tools qt6-wayland-devel" +subpackages="qt6-wayland-tools qt6-wayland-private-devel qt6-wayland-devel" if [ "$CROSS_BUILD" ]; then configure_args="-DQT_FORCE_BUILD_TOOLS=true" @@ -37,6 +37,20 @@ qt6-wayland-tools_package() { } } +qt6-wayland-private-devel_package() { + depends="qt6-wayland-devel>=${version}_${revision}" + short_desc+=" - private development files" + pkg_install() { + for dir in $(cd ${DESTDIR} && find usr/include -type d -name private); do + vmove "$dir" + done + vmove "usr/lib/cmake/*Private" + vmove "usr/lib/qt6/metatypes/*private_*_metatypes.json" + vmove "usr/lib/qt6/mkspecs/modules/*_private.pri" + vmove "usr/lib/qt6/modules/*Private.json" + } +} + qt6-wayland-devel_package() { depends="qt6-wayland-tools>=${version}_${revision} qt6-base-devel>=${version}_1" short_desc+=" - development files"