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

[Antonio Rojas]

    Date: Wednesday, March 16, 2016 @ 20:40:01
  Author: arojas
Revision: 261925

Backport critical fixes for QDBus deadlocks

Modified:
  qt5-base/trunk/PKGBUILD

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

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2016-03-16 18:29:52 UTC (rev 261924)
+++ PKGBUILD	2016-03-16 19:40:01 UTC (rev 261925)
@@ -5,7 +5,7 @@
 pkgname=qt5-base
 _qtver=5.6.0
 pkgver=${_qtver/-/}
-pkgrel=1
+pkgrel=2
 arch=('i686' 'x86_64')
 url='http://qt-project.org/'
 license=('GPL3' 'LGPL' 'FDL' 'custom')
@@ -25,9 +25,13 @@
 conflicts=('qt')
 groups=('qt' 'qt5')
 _pkgfqn="${pkgname/5-/}-opensource-src-${_qtver}"
-source=("http://download.qt.io/official_releases/qt/${pkgver%.*}/${_qtver}/submodules/${_pkgfqn}.tar.xz" qt5-alsa1.11.patch)
+source=("http://download.qt.io/official_releases/qt/${pkgver%.*}/${_qtver}/submodules/${_pkgfqn}.tar.xz" qt5-alsa1.11.patch
+        qtbug-51648.patch qtbug-51649.patch qtbug-51676.patch)
 md5sums=('d6b6cfd333c22829c6c85fc52ceed019'
-         '5e96b5cfa248b8b071919adb27abc715')
+         '5e96b5cfa248b8b071919adb27abc715'
+         'b09aa4f5763f013b06153fbdbc844404'
+         'ef981ff6892337cdab424ebb113b3c39'
+         'f59a1ea0f10a055ba930a53832933482')
 
 prepare() {
   cd ${_pkgfqn}
@@ -48,6 +52,11 @@
 
   # Fix ALSA 1.11 detection
   patch -p1 -i ../qt5-alsa1.11.patch
+
+  # Backport fixes for QtDBus deadlocks
+  patch -p1 -i ../qtbug-51648.patch
+  patch -p1 -i ../qtbug-51649.patch
+  patch -p1 -i ../qtbug-51676.patch
 }
 
 build() {