From 3165984cabcb10853aca2403466df751217dcae8 Mon Sep 17 00:00:00 2001 From: psykose Date: Mon, 9 May 2022 14:50:10 +0000 Subject: community/qt6-qtbase: link user facing tools this also exposes qmake6, which lets things actually find qt6 qmake without needing to have it specified in the qt6 lib path by hand in some cases --- community/qt6-qtbase/APKBUILD | 12 ++++++++++-- 1 file changed, 10 insertions(+), 2 deletions(-) diff --git a/community/qt6-qtbase/APKBUILD b/community/qt6-qtbase/APKBUILD index 1662b3d53e0..925d6a617b9 100644 --- a/community/qt6-qtbase/APKBUILD +++ b/community/qt6-qtbase/APKBUILD @@ -1,7 +1,7 @@ # Maintainer: Bart Ribbers pkgname=qt6-qtbase pkgver=6.3.0 -pkgrel=0 +pkgrel=1 pkgdesc="A cross-platform application and UI framework" url="https://qt.io/" arch="all" @@ -14,7 +14,6 @@ _sub=" $pkgname-x11 " depends="xdg-utils" -# TODO: Add vulkan-loader-dev, right now it's linked wrongly depends_dev="$_sub cups-dev dbus-dev @@ -79,6 +78,7 @@ build() { -DCMAKE_BUILD_TYPE=RelWithDebInfo \ -DCMAKE_INSTALL_PREFIX=/usr \ -DINSTALL_BINDIR=lib/qt6/bin \ + -DINSTALL_PUBLICBINDIR=usr/bin \ -DINSTALL_DOCDIR=share/doc/qt6 \ -DINSTALL_ARCHDATADIR=lib/qt6 \ -DINSTALL_DATADIR=share/qt6 \ @@ -99,11 +99,19 @@ check() { package() { DESTDIR="$pkgdir" cmake --install build + + # add symlinks for qt6 dev tools + cd "$pkgdir" + mkdir -p usr/bin + while read _line; do + ln -sv $_line + done < "$builddir"/build/user_facing_tool_links.txt } dev() { default_dev + amove usr/bin amove usr/lib/qt6/bin } -- cgit v1.2.3