git » qt5-base.git » commit 32eb937

Attempt to package qt5-xcb-private-headers along with qt5-base,

author Felix Yan
2017-04-13 14:58:21 UTC
committer Felix Yan
2017-04-13 14:58:21 UTC
parent 6d992e88a8f9af65aef0ce6cdc74cf89f6100b8e

Attempt to package qt5-xcb-private-headers along with qt5-base,

so we don't rely on a third-party repo to fetch the headers over git
and won't delay on new qt release.

PKGBUILD +21 -5

diff --git a/PKGBUILD b/PKGBUILD
index 7534c99..6480ff5 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -2,10 +2,11 @@
 # Maintainer: Felix Yan <felixonmars@archlinux.org>
 # Contributor: Andrea Scarpino <andrea@archlinux.org>
 
-pkgname=qt5-base
+pkgbase=qt5-base
+pkgname=(qt5-base qt5-xcb-private-headers)
 _qtver=5.8.0
 pkgver=${_qtver/-/}
-pkgrel=9
+pkgrel=10
 arch=('i686' 'x86_64')
 url='http://qt-project.org/'
 license=('GPL3' 'LGPL3' 'FDL' 'custom')
@@ -24,7 +25,7 @@ optdepends=('qt5-svg: to use SVG icon themes'
             'gtk3: GTK platform plugin')
 conflicts=('qtchooser')
 groups=('qt' 'qt5')
-_pkgfqn="${pkgname/5-/}-opensource-src-${_qtver}"
+_pkgfqn="${pkgbase/5-/}-opensource-src-${_qtver}"
 source=("http://download.qt.io/official_releases/qt/${pkgver%.*}/${_qtver}/submodules/${_pkgfqn}.tar.xz"
         qt5-base-journald.patch::"https://github.com/qt/qtbase/commit/0c8f3229.patch"
         plasma-crash-1.patch::https://github.com/qt/qtbase/commit/3bd0fd8f.patch
@@ -91,12 +92,14 @@ build() {
   make
 }
 
-package() {
+package_qt5-base() {
+  pkgdesc='A cross-platform application and UI framework'
+
   cd ${_pkgfqn}
   make INSTALL_ROOT="${pkgdir}" install
 
   install -D -m644 LGPL_EXCEPTION.txt \
-    "${pkgdir}"/usr/share/licenses/${pkgname}/LGPL_EXCEPTION.txt
+    "${pkgdir}"/usr/share/licenses/${pkgbase}/LGPL_EXCEPTION.txt
 
   # Drop QMAKE_PRL_BUILD_DIR because reference the build dir
   find "${pkgdir}/usr/lib" -type f -name '*.prl' \
@@ -111,3 +114,16 @@ package() {
     ln -s /usr/bin/$(basename $b) "${pkgdir}"/usr/bin/$(basename $b)-qt5
   done
 }
+
+package_qt5-xcb-private-headers() {
+  pkgdesc='Private headers for Qt5 Xcb'
+
+  depends=("qt5-base=$pkgver")
+  optdepends=()
+  groups=()
+  conflicts=()
+
+  cd ${_pkgfqn}
+  install -d -m755 "$pkgdir"/usr/include/qtxcb-private
+  cp -r src/plugins/platforms/xcb/*.h "$pkgdir"/usr/include/qtxcb-private/
+}