diff --git a/PKGBUILD b/PKGBUILD index 823ab62dcf71fb3fa2b36500fb24aec856ed32a4..7b8cac1d543d4fdad083d690e7e1438f74f48497 100644 --- a/PKGBUILD +++ b/PKGBUILD @@ -5,9 +5,9 @@ pkgbase=qt5-base pkgname=(qt5-base qt5-xcb-private-headers) -_qtver=5.9.1 +_qtver=5.9.2 pkgver=${_qtver/-/} -pkgrel=6 +pkgrel=2 arch=(x86_64) url='http://qt-project.org/' license=('GPL3' 'LGPL3' 'FDL' 'custom') @@ -28,12 +28,8 @@ 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-61731.patch::"https://github.com/qt/qtbase/commit/386af91c.patch" - qtcreatorbug-18448.patch::"https://github.com/qt/qtbase/commit/2a9f678f.patch" 'harmony-fix.diff') -sha256sums=('bc9a21e9f6fff9629019fdf9f989f064751d5073c3a28dc596def92f4d4275c6' - 'b164a873894cfc783980e883082d2b22b5aab00166c6751f66e78d4c41c3e2e3' - '5f878d144ac18097376dce154a411449cde181ddce2d93501114f890c9cdb1c3' +sha256sums=('7fe2bb468955f633c71b3ddd3c269e68a2c4137a4e5b8dd12dcdb34cbc6d609b' '8451c0a86e887492b706950ce533c616e687b790c54e86fb1f405dc2074737a3') validpgpkeys=('6DD4217456569BA711566AC7F06E8FDE7B45DAAC') # Eric Vidal @@ -54,10 +50,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 - # Fix accessibility build - patch -p1 -i ../qtbug-61731.patch - # Fix doc navigation - patch -p1 -i ../qtcreatorbug-18448.patch # Freetype 2.8.1 patch -p1 -i ../harmony-fix.diff } diff --git a/rebuild.list b/rebuild.list index 54a1dde2cc95fabaaf3b3d6c0e1bcc2c61e269ad..feec5ff0ca3c1ead49937fd2c4d9dd56ad79007b 100644 --- a/rebuild.list +++ b/rebuild.list @@ -7,9 +7,8 @@ skrooge * kwin lxqt-qtplugin pyqt5 * -qt5-styleplugins +qt5-styleplugins * deepin-qt5integration * -deepin-tool-kit * deepin-file-manager * dtkwidget * dtkwm *