diff --git a/extra/qt5-webengine/PKGBUILD b/extra/qt5-webengine/PKGBUILD index 3b77d8703..c7002e357 100644 --- a/extra/qt5-webengine/PKGBUILD +++ b/extra/qt5-webengine/PKGBUILD @@ -11,7 +11,7 @@ buildarch=12 pkgname=qt5-webengine _qtver=5.8.0 pkgver=${_qtver/-/} -pkgrel=3 +pkgrel=4 arch=('i686' 'x86_64') url='http://qt-project.org/' license=('GPL3' 'LGPL3' 'FDL' 'custom') @@ -25,6 +25,9 @@ _pkgfqn="${pkgname/5-/}-opensource-src-${_qtver}" source=("http://download.qt.io/official_releases/qt/${pkgver%.*}/${_qtver}/submodules/${_pkgfqn}.tar.xz" qt5-webengine-nss.patch qtwebengine-opensource-src-5.6.0-beta-no-neon.patch qtwebengine-5.7.0-icu58.patch qtbug-58488.patch::"https://github.com/qt/qtwebengine/commit/7e7dd262.patch" + qtbug-58381.patch::"https://github.com/qt/qtwebengine/commit/8e147ed3.patch" + qtbug-58515.patch::"https://github.com/qt/qtwebengine/commit/a6c6665d.patch" + qtbug-58673.patch::"https://github.com/qt/qtwebengine/commit/90501711.patch" system-ffmpeg.patch) md5sums=('6e7fb2be161c6db4d988a4f5b329672f' @@ -32,6 +35,9 @@ md5sums=('6e7fb2be161c6db4d988a4f5b329672f' '123d4d0d7db7473649ff2b5650330cc4' '9d225d1bf83ea45dbf6556d30d35fcb8' '3762cbdbc6a752e4d876e048e5e16de6' + '951ac7549fff82f9d1d11e9bf50556ba' + 'd5da5608285ad764f37fe196f9afe5a1' + 'c7b5acd58319d23d769c19f42323e8ec' '9f79b14f7c5ff603c1fcd87f37a8904f') prepare() { @@ -51,6 +57,11 @@ prepare() { # Prevent drop-down popups form stealing focus https://bugreports.qt.io/browse/QTBUG-58488 patch -p1 -i ../qtbug-58488.patch + # Backport some focus fixes + patch -p1 -i ../qtbug-58381.patch + patch -p1 -i ../qtbug-58515.patch + patch -p1 -i ../qtbug-58673.patch + [[ $CARCH == "armv7h" ]] && patch -p0 -i ../qtwebengine-opensource-src-5.6.0-beta-no-neon.patch patch -p1 -i ../system-ffmpeg.patch }