[arch-commits] Commit in qt5-wayland/trunk (PKGBUILD)

[Antonio Rojas]

    Date: Tuesday, June 21, 2016 @ 15:39:36
  Author: arojas
Revision: 270425

Fix out-of-tree build

Modified:
  qt5-wayland/trunk/PKGBUILD

----------+
 PKGBUILD |   21 +++++++++++++--------
 1 file changed, 13 insertions(+), 8 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2016-06-21 14:33:27 UTC (rev 270424)
+++ PKGBUILD	2016-06-21 15:39:36 UTC (rev 270425)
@@ -13,24 +13,29 @@
 depends=('qt5-declarative' 'libxcomposite')
 groups=('qt' 'qt5')
 _pkgfqn="${pkgname/5-/}-opensource-src-${_qtver}"
-source=("http://download.qt.io/official_releases/qt/${pkgver%.*}/${_qtver}/submodules/${_pkgfqn}.tar.xz")
-md5sums=('2d2543a2564ee1b5db9f25dca9cc2e3b')
+source=("http://download.qt.io/official_releases/qt/${pkgver%.*}/${_qtver}/submodules/${_pkgfqn}.tar.xz"
+        qtbug-53945.patch::"https://github.com/qtproject/qtwayland/commit/75294be3.patch")
+md5sums=('2d2543a2564ee1b5db9f25dca9cc2e3b'
+         '887f656b651e230169ce02753f14d746')
 
 prepare() {
   mkdir -p build
+
+  cd ${_pkgfqn}
+# Fix out-of-tree build
+  patch -p1 -i ../qtbug-53945.patch
 }
 
 build() {
-#  cd build
-  cd ${_pkgfqn} # out-of-tree build fails https://bugreports.qt.io/browse/QTBUG-54148
-# qmake ../${_pkgfqn}
-  qmake .
+  cd build
+
+  qmake ../${_pkgfqn}
   make
 }
 
 package() {
-# cd build
-  cd ${_pkgfqn}
+  cd build
+
   make INSTALL_ROOT="$pkgdir" install
 
   # Drop QMAKE_PRL_BUILD_DIR because reference the build dir