[arch-commits] Commit in (3 files)

[Antonio Rojas]

    Date: Tuesday, June 4, 2019 @ 15:34:21
  Author: arojas
Revision: 354824

Merge qt5-examples in the qt5-doc PKGBUILD

Modified:
  qt5-doc/kde-unstable/PKGBUILD
Deleted:
  qt5-examples/kde-unstable/
  qt5-examples/repos/kde-unstable-any/

----------+
 PKGBUILD |   37 ++++++++++++++++++++++++++++++++-----
 1 file changed, 32 insertions(+), 5 deletions(-)

Modified: qt5-doc/kde-unstable/PKGBUILD
===================================================================
--- qt5-doc/kde-unstable/PKGBUILD	2019-06-04 14:06:05 UTC (rev 354823)
+++ qt5-doc/kde-unstable/PKGBUILD	2019-06-04 15:34:21 UTC (rev 354824)
@@ -2,15 +2,14 @@
 # Contributor: Andrea Scarpino <andrea at archlinux.org>
 # Contributor: Michael Hansen <zrax0111 gmail com>
 
-pkgname=qt5-doc
+pkgbase=qt5-doc
+pkgname=(qt5-doc qt5-examples)
 _qtver=5.13.0-rc
 pkgver=${_qtver/-/}
-pkgrel=1
+pkgrel=2
 arch=('any')
 url='https://www.qt.io'
 license=('GPL3' 'LGPL3' 'FDL' 'custom')
-pkgdesc='A cross-platform application and UI framework (Documentation)'
-depends=('qt5-base')
 makedepends=('qt5-tools' 'python2' 'pciutils' 'libxtst' 'libxcursor' 'libxrandr' 'libxss' 'libxcomposite'
              'gperf' 'nss' 'clang')
 groups=('qt' 'qt5')
@@ -45,7 +44,10 @@
   make docs
 }
 
-package() {
+package_qt5-doc() {
+  pkgdesc='A cross-platform application and UI framework (Documentation)'
+  depends=('qt5-base')
+
   cd ${_pkgfqn}
   make INSTALL_ROOT="$pkgdir" install_docs
 
@@ -52,3 +54,28 @@
   install -d "$pkgdir"/usr/share/licenses
   ln -s /usr/share/licenses/qt5-base "$pkgdir"/usr/share/licenses/${pkgname}
 }
+
+package_qt5-examples() {
+  pkgdesc='Examples and demos from qt5 documentation'
+  depends=('qt5-doc')
+
+  _base="$pkgdir"/usr/share/doc/qt/examples
+
+  # The various example dirs have conflicting .pro files, but
+  # QtCreator requires them to be in the same top-level directory.
+  # Matching the Qt5 installer, only the qtbase project is kept.
+  mkdir -p $_base
+  cp ${_pkgfqn}/qtbase/examples/examples.pro $_base
+
+  _fdirs=$(find "${_pkgfqn}" -maxdepth 2 -type d -name examples)
+  for _dir in $_fdirs; do
+      _mod=$(basename ${_dir%/examples})
+
+      if [ -e "$_dir/README" ]; then
+        cp $_dir/README $_dir/README.$_mod
+      fi
+
+#     mkdir $_base/$_mod
+      cp -rn $_dir/* $_base
+  done
+}