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

[Antonio Rojas]

    Date: Tuesday, July 4, 2017 @ 12:33:39
  Author: arojas
Revision: 299668

- Fix build of accessibility
- Fix navigation in offline docs (FS#54575)

Modified:
  qt5-base/trunk/PKGBUILD

----------+
 PKGBUILD |   15 ++++++++++++---
 1 file changed, 12 insertions(+), 3 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2017-07-04 11:55:53 UTC (rev 299667)
+++ PKGBUILD	2017-07-04 12:33:39 UTC (rev 299668)
@@ -6,7 +6,7 @@
 pkgname=(qt5-base qt5-xcb-private-headers)
 _qtver=5.9.1
 pkgver=${_qtver/-/}
-pkgrel=1
+pkgrel=2
 arch=('i686' 'x86_64')
 url='http://qt-project.org/'
 license=('GPL3' 'LGPL3' 'FDL' 'custom')
@@ -26,8 +26,12 @@
 conflicts=('qtchooser')
 groups=('qt' 'qt5')
 _pkgfqn="${pkgbase/5-/}-opensource-src-${_qtver}"
-source=("http://download.qt.io/official_releases/qt/${pkgver%.*}/${_qtver}/submodules/${_pkgfqn}.tar.xz")
-sha256sums=('bc9a21e9f6fff9629019fdf9f989f064751d5073c3a28dc596def92f4d4275c6')
+source=("http://download.qt.io/official_releases/qt/${pkgver%.*}/${_qtver}/submodules/${_pkgfqn}.tar.xz"
+        qtbug-61731.patch::"https://github.com/qt/qtbase/commit/386af91c.patch"
+        qtcreatorbug-18448.patch::"https://github.com/qt/qtbase/commit/2a9f678f.patch")
+sha256sums=('bc9a21e9f6fff9629019fdf9f989f064751d5073c3a28dc596def92f4d4275c6'
+            'b164a873894cfc783980e883082d2b22b5aab00166c6751f66e78d4c41c3e2e3'
+            '5f878d144ac18097376dce154a411449cde181ddce2d93501114f890c9cdb1c3')
 
 prepare() {
   cd ${_pkgfqn}
@@ -45,6 +49,11 @@
 
   # Fix missing private includes https://bugreports.qt.io/browse/QTBUG-37417
   sed -e '/CMAKE_NO_PRIVATE_INCLUDES\ \=\ true/d' -i mkspecs/features/create_cmake.prf
+
+  # Fix accessibility build 
+  patch -p1 -i ../qtbug-61731.patch
+  # Fix doc navigation
+  patch -p1 -i ../qtcreatorbug-18448.patch
 }
 
 build() {