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

[Antonio Rojas]

    Date: Wednesday, June 7, 2017 @ 21:12:43
  Author: arojas
Revision: 298151

Backport some bug fixes

Modified:
  qt5-base/trunk/PKGBUILD

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

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2017-06-07 20:50:21 UTC (rev 298150)
+++ PKGBUILD	2017-06-07 21:12:43 UTC (rev 298151)
@@ -6,7 +6,7 @@
 pkgname=(qt5-base qt5-xcb-private-headers)
 _qtver=5.9.0
 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=('267eb2af1a203c087f2113f43b08014d0e2d2cb269295b8602d869a2fad5296c')
+source=("http://download.qt.io/official_releases/qt/${pkgver%.*}/${_qtver}/submodules/${_pkgfqn}.tar.xz"
+        qtbug-61140.patch::"https://github.com/qt/qtbase/commit/744fd39e.patch"
+        qtbug-60558.patch::"https://github.com/qt/qtbase/commit/f45c6c18.patch")
+sha256sums=('267eb2af1a203c087f2113f43b08014d0e2d2cb269295b8602d869a2fad5296c'
+            'a00d8a0284e0c774c00dc72277edc63579212476ec1d4ebb6246bfd1035e3e4a'
+            'e9d5189baf7a1d8957bd5b00474732412377ac761128e99066aa3314626f7989')
 
 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
+
+  # Don't destroy foreign windows
+  patch -p1 -i ../qtbug-61140.patch
+  # Fix crashes with QtCurve
+  patch -p1 -i ../qtbug-60558.patch
 }
 
 build() {