extra/qt6-tools to 6.1.0-1

extra/qt6-tools/PKGBUILD

@@ -6,7 +6,7 @@
 #  - explicitly link v5/v6 with libatomic
 
 pkgname=qt6-tools
-_qtver=6.0.4
+_qtver=6.1.0
 pkgver=${_qtver/-/}
 pkgrel=1
 arch=(x86_64)
@@ -17,24 +17,26 @@ depends=(qt6-base)
 makedepends=(cmake qt6-declarative vulkan-headers clang llvm)
 optdepends=('clang: for qdoc and lupdate')
 groups=(qt6)
-_pkgfn="${pkgname/6-/}-everywhere-src-${_qtver}"
-source=("https://download.qt.io/official_releases/qt/${pkgver%.*}/$_qtver/submodules/$_pkgfn.tar.xz")
-sha256sums=('935f41131a05440d69e24a14ab5d1216dab8edcfe48140861705755d49648e30')
+_pkgfn="${pkgname/6-/}-everywhere-src-$_qtver"
+source=(https://download.qt.io/official_releases/qt/${pkgver%.*}/$_qtver/submodules/$_pkgfn.tar.xz)
+sha256sums=('6263030c1120a30b0541d37b52dc0be0ea04bbb8d1695ec9648f0bd77e421f3e')
 
 build() {
   [[ $CARCH == "arm" || $CARCH == "armv6h" ]] && echo "target_link_libraries(qtdiag PRIVATE atomic)" >> ${_pkgfn}/src/qtdiag/CMakeLists.txt
-  cmake -B build -S $_pkgfn
+  cmake -B build -S $_pkgfn \
+    -DINSTALL_PUBLICBINDIR=usr/bin
   cmake --build build
 }
 
 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