git » qt5-base.git » commit 618c4ce

Qt 5.9.1

author Antonio Rojas
2017-07-01 14:19:52 UTC
committer Antonio Rojas
2017-07-01 14:19:52 UTC
parent cdd407d51e592f35ef75a7811ce2a56c1d0c51fb

Qt 5.9.1

PKGBUILD +4 -13

diff --git a/PKGBUILD b/PKGBUILD
index 537c8eb..b0fed14 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -4,9 +4,9 @@
 
 pkgbase=qt5-base
 pkgname=(qt5-base qt5-xcb-private-headers)
-_qtver=5.9.0
+_qtver=5.9.1
 pkgver=${_qtver/-/}
-pkgrel=2
+pkgrel=1
 arch=('i686' 'x86_64')
 url='http://qt-project.org/'
 license=('GPL3' 'LGPL3' 'FDL' 'custom')
@@ -26,12 +26,8 @@ optdepends=('qt5-svg: to use SVG icon themes'
 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"
-        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')
+source=("http://download.qt.io/official_releases/qt/${pkgver%.*}/${_qtver}/submodules/${_pkgfqn}.tar.xz")
+sha256sums=('bc9a21e9f6fff9629019fdf9f989f064751d5073c3a28dc596def92f4d4275c6')
 
 prepare() {
   cd ${_pkgfqn}
@@ -49,11 +45,6 @@ prepare() {
 
   # 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() {