From 7249d33b05833d8446aac95ad34f35fcbbe43a2f Mon Sep 17 00:00:00 2001
From: Martchus <martchus@gmx.net>
Date: Wed, 7 Oct 2020 18:29:41 +0200
Subject: [PATCH] Improve qt6-* packages

---
 qt6-5compat/default/PKGBUILD           | 2 +-
 qt6-5compat/default/PKGBUILD.sh.ep     | 2 +-
 qt6-base/default/PKGBUILD              | 4 ++--
 qt6-declarative/default/PKGBUILD.sh.ep | 2 +-
 qt6-shadertools/default/PKGBUILD       | 2 +-
 qt6-shadertools/default/PKGBUILD.sh.ep | 2 +-
 qt6-tools/default/PKGBUILD             | 7 ++++++-
 qt6-tools/default/PKGBUILD.sh.ep       | 4 ++--
 8 files changed, 15 insertions(+), 10 deletions(-)

diff --git a/qt6-5compat/default/PKGBUILD b/qt6-5compat/default/PKGBUILD
index 1c984a5b..bc788762 100644
--- a/qt6-5compat/default/PKGBUILD
+++ b/qt6-5compat/default/PKGBUILD
@@ -10,7 +10,7 @@ pkgrel=1
 arch=(x86_64)
 url='https://www.qt.io'
 license=(GPL3 LGPL3 FDL custom)
-pkgdesc='Classes from Qt 5'
+pkgdesc='Module that contains unsupported Qt 5 APIs'
 depends=(qt6-base)
 makedepends=(cmake ninja)
 groups=(qt6)
diff --git a/qt6-5compat/default/PKGBUILD.sh.ep b/qt6-5compat/default/PKGBUILD.sh.ep
index 57289f05..1bbb8eab 100644
--- a/qt6-5compat/default/PKGBUILD.sh.ep
+++ b/qt6-5compat/default/PKGBUILD.sh.ep
@@ -6,6 +6,6 @@ pkgrel=1
 arch=(x86_64)
 url='https://www.qt.io'
 license=(GPL3 LGPL3 FDL custom)
-pkgdesc='Classes from Qt 5'
+pkgdesc='Module that contains unsupported Qt 5 APIs'
 depends=(qt6-base)
 makedepends=(cmake ninja)
diff --git a/qt6-base/default/PKGBUILD b/qt6-base/default/PKGBUILD
index 2cc12429..75352ed2 100644
--- a/qt6-base/default/PKGBUILD
+++ b/qt6-base/default/PKGBUILD
@@ -39,8 +39,8 @@ build() {
     -DINSTALL_INCLUDEDIR=include/qt6 \
     -DINSTALL_MKSPECSDIR=lib/qt6/mkspecs \
     -DINSTALL_EXAMPLESDIR=share/doc/qt6/examples \
-    -DQT_FEATURE_journald=ON
-#    -DQT_FEATURE_openssl_linked=ON
+    -DQT_FEATURE_journald=ON \
+    -DQT_FEATURE_openssl_linked=ON
   VERBOSE=1 cmake --build build
 }
 
diff --git a/qt6-declarative/default/PKGBUILD.sh.ep b/qt6-declarative/default/PKGBUILD.sh.ep
index da5ff79d..6ad143a7 100644
--- a/qt6-declarative/default/PKGBUILD.sh.ep
+++ b/qt6-declarative/default/PKGBUILD.sh.ep
@@ -12,4 +12,4 @@ url='https://www.qt.io'
 license=(GPL3 LGPL3 FDL custom)
 pkgdesc='Classes for QML and JavaScript languages'
 depends=(qt6-base)
-makedepends=(cmake python vulkan-headers at-spi2-core ninja)
\ No newline at end of file
+makedepends=(cmake python vulkan-headers at-spi2-core ninja)
diff --git a/qt6-shadertools/default/PKGBUILD b/qt6-shadertools/default/PKGBUILD
index a1cd0b73..16ee56c1 100644
--- a/qt6-shadertools/default/PKGBUILD
+++ b/qt6-shadertools/default/PKGBUILD
@@ -10,7 +10,7 @@ pkgrel=1
 arch=(x86_64)
 url='https://www.qt.io'
 license=(GPL3 LGPL3 FDL custom)
-pkgdesc='Shader tools'
+pkgdesc='Experimental module providing APIs and a host tool to host tool to perform graphics and compute shader conditioning for the upcoming Qt graphics abstraction layer'
 depends=(qt6-base)
 makedepends=(cmake vulkan-headers ninja)
 groups=(qt6)
diff --git a/qt6-shadertools/default/PKGBUILD.sh.ep b/qt6-shadertools/default/PKGBUILD.sh.ep
index 0acee3de..d9e2cde3 100644
--- a/qt6-shadertools/default/PKGBUILD.sh.ep
+++ b/qt6-shadertools/default/PKGBUILD.sh.ep
@@ -6,6 +6,6 @@ pkgrel=1
 arch=(x86_64)
 url='https://www.qt.io'
 license=(GPL3 LGPL3 FDL custom)
-pkgdesc='Shader tools'
+pkgdesc='Experimental module providing APIs and a host tool to host tool to perform graphics and compute shader conditioning for the upcoming Qt graphics abstraction layer'
 depends=(qt6-base)
 makedepends=(cmake vulkan-headers ninja)
diff --git a/qt6-tools/default/PKGBUILD b/qt6-tools/default/PKGBUILD
index b9da8628..708af6f1 100644
--- a/qt6-tools/default/PKGBUILD
+++ b/qt6-tools/default/PKGBUILD
@@ -13,7 +13,7 @@ license=(GPL3 LGPL3 FDL custom)
 pkgdesc='A cross-platform application and UI framework (Development Tools, QtHelp)'
 depends=(qt6-base hicolor-icon-theme)
 makedepends=(cmake qt6-declarative vulkan-headers llvm clang ninja)
-optdepends=('clang: for qdoc')
+optdepends=('clang: for qdoc and lupdate')
 groups=(qt6)
 _pkgfqn="${pkgname/6-/}-everywhere-src-${_qtver}"
 source=("https://download.qt.io/development_releases/qt/${pkgver%.*}/${_qtver}/submodules/${_pkgfqn}.tar.xz")
@@ -27,6 +27,11 @@ build() {
 package() {
   DESTDIR="$pkgdir" cmake --install build
 
+  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)-qt6
+  done
+
   # Drop QMAKE_PRL_BUILD_DIR because reference the build dir
   find "$pkgdir/usr/lib" -type f -name '*.prl' \
     -exec sed -i -e '/^QMAKE_PRL_BUILD_DIR/d' {} \;
diff --git a/qt6-tools/default/PKGBUILD.sh.ep b/qt6-tools/default/PKGBUILD.sh.ep
index 3420e87b..cadae7ef 100644
--- a/qt6-tools/default/PKGBUILD.sh.ep
+++ b/qt6-tools/default/PKGBUILD.sh.ep
@@ -1,4 +1,4 @@
-% layout 'qt6-module';
+% layout 'qt6-module', has_binaries => 1;
 \
 _qtver=6.0.0-alpha
 pkgver=${_qtver/-/}
@@ -9,4 +9,4 @@ license=(GPL3 LGPL3 FDL custom)
 pkgdesc='A cross-platform application and UI framework (Development Tools, QtHelp)'
 depends=(qt6-base hicolor-icon-theme)
 makedepends=(cmake qt6-declarative vulkan-headers llvm clang ninja)
-optdepends=('clang: for qdoc')
+optdepends=('clang: for qdoc and lupdate')