[arch-commits] Commit in qt6-declarative/kde-unstable (PKGBUILD)

[Antonio Rojas]

    Date: Friday, April 9, 2021 @ 18:33:10
  Author: arojas
Revision: 412042

Use upstream script for /usr/bin symlinks

Modified:
  qt6-declarative/kde-unstable/PKGBUILD

----------+
 PKGBUILD |   16 +++++++++-------
 1 file changed, 9 insertions(+), 7 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2021-04-09 15:49:15 UTC (rev 412041)
+++ PKGBUILD	2021-04-09 18:33:10 UTC (rev 412042)
@@ -5,7 +5,7 @@
 pkgname=qt6-declarative
 _qtver=6.1.0-beta3
 pkgver=${_qtver/-/}
-pkgrel=1
+pkgrel=2
 arch=(x86_64)
 url='https://www.qt.io'
 license=(GPL3 LGPL3 FDL custom)
@@ -18,7 +18,8 @@
 sha256sums=('3fdc7b4cbd01891c5ff5a1f207419b5ac6c6ad42c537b78b3cda509e4c4afde4')
 
 build() {
-  cmake -B build -S $_pkgfn
+  cmake -B build -S $_pkgfn \
+    -DINSTALL_PUBLICBINDIR=usr/bin
   cmake --build build
 }
 
@@ -25,11 +26,12 @@
 package() {
   DESTDIR="$pkgdir" cmake --install build
 
-# Symlinks for backwards compatibility
-  mkdir "$pkgdir"/usr/bin
-  for b in "${pkgdir}"/usr/lib/qt6/bin/*; do
-    ln -rs "$pkgdir"/usr/lib/qt6/bin/$(basename $b) "$pkgdir"/usr/bin/$(basename $b)6
-  done
+  # Install symlinks for user-facing tools
+  cd "$pkgdir"
+  mkdir usr/bin
+  while read _line; do
+    ln -s $_line
+  done < "$srcdir"/build/user_facing_tool_links.txt
 
   install -d "$pkgdir"/usr/share/licenses
   ln -s /usr/share/licenses/qt6-base "$pkgdir"/usr/share/licenses/$pkgname