extra/qt5-webengine to 5.15.0-1

This commit is contained in:
Kevin Mihelich 2020-06-03 19:55:23 +00:00
parent f19c95698f
commit fd1762cd44
2 changed files with 23 additions and 8 deletions

View file

@ -9,9 +9,9 @@ buildarch=12
highmem=1 highmem=1
pkgname=qt5-webengine pkgname=qt5-webengine
_qtver=5.14.2 _qtver=5.15.0
pkgver=${_qtver/-/} pkgver=${_qtver/-/}
pkgrel=3 pkgrel=1
arch=('x86_64') arch=('x86_64')
url='https://www.qt.io' url='https://www.qt.io'
license=('LGPL3' 'LGPL2.1' 'BSD') license=('LGPL3' 'LGPL2.1' 'BSD')
@ -23,27 +23,30 @@ groups=('qt' 'qt5')
_pkgfqn="${pkgname/5-/}-everywhere-src-${_qtver}" _pkgfqn="${pkgname/5-/}-everywhere-src-${_qtver}"
source=("https://download.qt.io/official_releases/qt/${pkgver%.*}/${_qtver}/submodules/${_pkgfqn}.tar.xz" source=("https://download.qt.io/official_releases/qt/${pkgver%.*}/${_qtver}/submodules/${_pkgfqn}.tar.xz"
icu67.patch icu67.patch
qt5-webengine-gcc10.patch
0001-ARM-toolchain-fixes.patch 0001-ARM-toolchain-fixes.patch
0002-Fix-ARM-skia-ICE.patch) 0002-Fix-ARM-skia-ICE.patch)
sha256sums=('e169d6a75d8c397e04f843bc1b9585950fb9a001255cd18d6293f66fa8a6c947' sha256sums=('c38e2fda7ed1b7d5a90f26abf231ec0715d78a5bc39a94673d8e39d75f04c5df'
'5315977307e69d20b3e856d3f8724835b08e02085a4444a5c5cefea83fd7d006' '5315977307e69d20b3e856d3f8724835b08e02085a4444a5c5cefea83fd7d006'
'8d73112da8bb95ae9b1c84e403e08563a5dbf3dc02f79cd931e1b0ac15a3be37'
'6cd3f4877e239c83df5ede59c74db2b2e84b4adce66ef83d30b3b4a3f04677e8'
'f389de929c6d27217a1c7e3e7118b06e4d15e17123c96ace2c7a791ecad6bcc7') 'f389de929c6d27217a1c7e3e7118b06e4d15e17123c96ace2c7a791ecad6bcc7')
prepare() { prepare() {
mkdir -p build mkdir -p build
patch -Np3 -d $_pkgfqn/src/3rdparty/chromium/v8 <icu67.patch cd $_pkgfqn
patch -Np3 -d src/3rdparty/chromium/v8 < ../icu67.patch # Fix build with ICU 67
cd src/3rdparty/chromium
patch -p1 -i "$srcdir"/qt5-webengine-gcc10.patch
sed -e 's|7-9|7-9\|10|' -i $_pkgfqn/configure.pri # Support ninja 1.10 cd "$srcdir/$_pkgfqn/src/3rdparty"
cd $_pkgfqn/src/3rdparty
patch -p1 -i ${srcdir}/0001-ARM-toolchain-fixes.patch patch -p1 -i ${srcdir}/0001-ARM-toolchain-fixes.patch
patch -p1 -i ${srcdir}/0002-Fix-ARM-skia-ICE.patch patch -p1 -i ${srcdir}/0002-Fix-ARM-skia-ICE.patch
} }
build() { build() {
cd build cd build
qmake ../${_pkgfqn} -- \ qmake ../${_pkgfqn} -- \
-proprietary-codecs \ -proprietary-codecs \
-system-ffmpeg \ -system-ffmpeg \

View file

@ -0,0 +1,12 @@
diff --git a/base/trace_event/trace_event_memory_overhead.h b/base/trace_event/trace_event_memory_overhead.h
index 69468d4..3f5b786 100644
--- a/base/trace_event/trace_event_memory_overhead.h
+++ b/base/trace_event/trace_event_memory_overhead.h
@@ -9,6 +9,7 @@
#include <stdint.h>
#include <unordered_map>
+#include <string>
#include "base/base_export.h"
#include "base/macros.h"