diff --git a/extra/qt5-webengine/PKGBUILD b/extra/qt5-webengine/PKGBUILD index b3994cfa7..59fec55f8 100644 --- a/extra/qt5-webengine/PKGBUILD +++ b/extra/qt5-webengine/PKGBUILD @@ -9,32 +9,35 @@ buildarch=12 highmem=1 pkgname=qt5-webengine -_qtver=5.15.1 +_qtver=5.15.2 pkgver=${_qtver/-/} -pkgrel=3 +pkgrel=1 arch=('x86_64') url='https://www.qt.io' license=('LGPL3' 'LGPL2.1' 'BSD') pkgdesc='Provides support for web applications using the Chromium browser project' depends=('qt5-webchannel' 'qt5-location' 'libxcomposite' 'libxrandr' 'pciutils' 'libxss' 'libevent' 'snappy' 'nss' 'libxslt' 'minizip' 'ffmpeg' 're2' 'libvpx' 'krb5' 'ttf-font') -makedepends=('python2' 'gperf' 'jsoncpp' 'ninja' 'qt5-tools' 'poppler' 'libpipewire02' 'nodejs') +makedepends=('python2' 'gperf' 'jsoncpp' 'ninja' 'qt5-tools' 'poppler' 'libpipewire02' 'nodejs' 'libxtst') optdepends=('libpipewire02: WebRTC desktop sharing under Wayland') groups=('qt' 'qt5') _pkgfqn="${pkgname/5-/}-everywhere-src-${_qtver}" source=("https://download.qt.io/official_releases/qt/${pkgver%.*}/${_qtver}/submodules/${_pkgfqn}.tar.xz" - qtbug-86752.patch::"https://code.qt.io/cgit/qt/qtwebengine-chromium.git/patch/?id=4e828b3b" + qt5-webengine-icu-68.patch::"https://code.qt.io/cgit/qt/qtwebengine-chromium.git/patch/?id=9236b21c" 0001-ARM-toolchain-fixes.patch 0002-Fix-ARM-skia-ICE.patch) -sha256sums=('f903e98fe3cd717161252710125fce011cf882ced96c24968b0c38811fbefdf2' - 'b9fde4d76a031c4bdba19b628ff9435647f54915546d977869568093f361d1b9' +sha256sums=('c8afca0e43d84f7bd595436fbe4d13a5bbdb81ec5104d605085d07545b6f91e0' + 'e3364f29db7a1630e9959123b34e6bcd25ba66cd1714638b8b9b6fd6fd527539' '6cd3f4877e239c83df5ede59c74db2b2e84b4adce66ef83d30b3b4a3f04677e8' 'f389de929c6d27217a1c7e3e7118b06e4d15e17123c96ace2c7a791ecad6bcc7') prepare() { mkdir -p build - patch -d $_pkgfqn/src/3rdparty -p1 -i "$srcdir"/qtbug-86752.patch # https://bugreports.qt.io/browse/QTBUG-86752 +# Disable jumbo build https://bugreports.qt.io/browse/QTBUG-88657 + sed -i 's|use_jumbo_build=true|use_jumbo_build=false|' -i ${_pkgfqn}/src/buildtools/config/common.pri + + patch -d $_pkgfqn/src/3rdparty/ -p1 -i "$srcdir"/qt5-webengine-icu-68.patch # Fix build with ICU 68 cd "$srcdir/$_pkgfqn/src/3rdparty" patch -p1 -i ${srcdir}/0001-ARM-toolchain-fixes.patch