[arch-commits] Commit in qt6-doc/kde-unstable (PKGBUILD qt6-doc-bindir.patch)

[Antonio Rojas]

    Date: Wednesday, November 11, 2020 @ 21:42:55
  Author: arojas
Revision: 400426

Qt 6.0 beta 4

Added:
  qt6-doc/kde-unstable/qt6-doc-bindir.patch
Modified:
  qt6-doc/kde-unstable/PKGBUILD

----------------------+
 PKGBUILD             |   47 ++++++++++++++++++++++++-----------------------
 qt6-doc-bindir.patch |   18 ++++++++++++++++++
 2 files changed, 42 insertions(+), 23 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2020-11-11 20:12:57 UTC (rev 400425)
+++ PKGBUILD	2020-11-11 21:42:55 UTC (rev 400426)
@@ -10,41 +10,42 @@
 arch=('any')
 url='https://www.qt.io'
 license=(GPL3 LGPL3 FDL custom)
-makedepends=(mariadb-libs unixodbc postgresql alsa-lib gst-plugins-base-libs
-             gtk3 libpulse cups freetds vulkan-headers qt6-tools clang python llvm)
+makedepends=(cmake mariadb-libs unixodbc postgresql alsa-lib gst-plugins-base-libs
+             gtk3 libpulse cups freetds vulkan-headers clang python llvm qt6-tools)
 groups=(qt6)
 _pkgfn="qt-everywhere-src-${_qtver}"
-source=("https://download.qt.io/development_releases/qt/${pkgver%.*}/${_qtver}/single/${_pkgfn}.tar.xz")
-sha256sums=('3b35a834491408e74c4ea97c6599e44d0657fcd00a0709083815d25a507d6899')
+source=("https://download.qt.io/development_releases/qt/${pkgver%.*}/${_qtver}/single/${_pkgfn}.tar.xz"
+         qt6-doc-destdir.patch::"https://code.qt.io/cgit/qt/qtbase.git/patch/?id=30ba1855"
+         qt6-doc-bindir.patch)
+sha256sums=('3b35a834491408e74c4ea97c6599e44d0657fcd00a0709083815d25a507d6899'
+            '4ded3d934f42cf04d6707857a55ab0ab19abac262b48057b979c3a1710b0ae12'
+            '60eebdf88559fefdb2b7c65b5f4ec091942aa1ffa371bedb4080545383b46109')
 
 prepare() {
-  mkdir -p $_pkgfn/{qtbase,qttools}/bin
-  ln -s /usr/lib/qt6/bin/{uic,rcc} $_pkgfn/qtbase/bin
-  ln -s /usr/lib/qt6/bin/{qtattributionsscanner,qdoc,qhelpgenerator} $_pkgfn/qttools/bin
+  patch -d $_pkgfn/qtbase -p1 -i ../../qt6-doc-bindir.patch # Use installed tools
+  patch -d $_pkgfn/qtbase -p1 -i ../../qt6-doc-destdir.patch # Honor DESTDIR
 }
 
 build() {
-# Use qmake, see https://bugreports.qt.io/browse/QTBUG-87382
-  cd $_pkgfn
-  ./configure -confirm-license -opensource \
-    -prefix /usr \
-    -docdir /usr/share/doc/qt6 \
-    -headerdir /usr/include/qt6 \
-    -archdatadir /usr/lib/qt6 \
-    -datadir /usr/share/qt6 \
-    -bindir /usr/lib/qt6/bin \
-    -sysconfdir /etc/xdg \
-    -nomake examples
-  export PATH="/usr/lib/qt6/bin:$PATH"
-  make docs
+  cmake -B build -S $_pkgfn \
+    -DCMAKE_INSTALL_PREFIX=/usr \
+    -DINSTALL_BINDIR=lib/qt6/bin \
+    -DINSTALL_DOCDIR=share/doc/qt6 \
+    -DINSTALL_ARCHDATADIR=lib/qt6 \
+    -DINSTALL_DATADIR=share/qt6 \
+    -DINSTALL_INCLUDEDIR=include/qt6 \
+    -DINSTALL_MKSPECSDIR=lib/qt6/mkspecs \
+    -DINSTALL_EXAMPLESDIR=share/doc/qt6/examples \
+    -DQT_FEATURE_journald=ON \
+    -DQT_FEATURE_openssl_linked=ON
+  cmake --build build --target docs
 }
 
 package_qt6-doc() {
   pkgdesc='A cross-platform application and UI framework (Documentation)'
-  cd $_pkgfn
-  INSTALL_ROOT="$pkgdir" make install_docs
+  DESTDIR="$pkgdir" cmake --build build --target install_docs
 
-  install -Dm644 LICENSE* -t "$pkgdir"/usr/share/licenses/$pkgbase
+  install -Dm644 $_pkgfn/LICENSE* -t "$pkgdir"/usr/share/licenses/$pkgbase
 }
 
 package_qt6-examples() {

Added: qt6-doc-bindir.patch
===================================================================
--- qt6-doc-bindir.patch	                        (rev 0)
+++ qt6-doc-bindir.patch	2020-11-11 21:42:55 UTC (rev 400426)
@@ -0,0 +1,18 @@
+diff --git a/cmake/QtDocsHelpers.cmake b/cmake/QtDocsHelpers.cmake
+index 8e4bd28918..963114e1ec 100644
+--- a/cmake/QtDocsHelpers.cmake
++++ b/cmake/QtDocsHelpers.cmake
+@@ -31,12 +31,7 @@ function(qt_internal_add_docs)
+         return()
+     endif()
+ 
+-    if(QT_SUPERBUILD)
+-        set(doc_tools_dir "${QtBase_BINARY_DIR}/${INSTALL_BINDIR}")
+-    else()
+-        set(doc_tools_dir "${QT_BUILD_INTERNALS_RELOCATABLE_INSTALL_PREFIX}/${INSTALL_BINDIR}")
+-    endif()
+-
++    set(doc_tools_dir "/usr/lib/qt6/bin")
+     set(qdoc_bin "${doc_tools_dir}/qdoc${CMAKE_EXECUTABLE_SUFFIX}")
+     set(qtattributionsscanner_bin "${doc_tools_dir}/qtattributionsscanner${CMAKE_EXECUTABLE_SUFFIX}")
+     set(qhelpgenerator_bin "${doc_tools_dir}/qhelpgenerator${CMAKE_EXECUTABLE_SUFFIX}")