git » qt5-webengine.git » commit 0b3de97

Qt 5.15.0

author Antonio Rojas
2020-05-26 08:39:20 UTC
committer Antonio Rojas
2020-05-26 08:39:20 UTC
parent 63f8a0803abb18a8dd0cdaf022d9629cbd508897

Qt 5.15.0

PKGBUILD +11 -9
qt5-webengine-gcc10.patch +12 -0

diff --git a/PKGBUILD b/PKGBUILD
index a688f58..97a65e1 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -2,9 +2,9 @@
 # Contributor: Andrea Scarpino <andrea@archlinux.org>
 
 pkgname=qt5-webengine
-_qtver=5.14.2
+_qtver=5.15.0
 pkgver=${_qtver/-/}
-pkgrel=3
+pkgrel=1
 arch=('x86_64')
 url='https://www.qt.io'
 license=('LGPL3' 'LGPL2.1' 'BSD')
@@ -15,21 +15,23 @@ makedepends=('python2' 'gperf' 'jsoncpp' 'ninja' 'qt5-tools' 'poppler')
 groups=('qt' 'qt5')
 _pkgfqn="${pkgname/5-/}-everywhere-src-${_qtver}"
 source=("https://download.qt.io/official_releases/qt/${pkgver%.*}/${_qtver}/submodules/${_pkgfqn}.tar.xz"
-        icu67.patch)
-sha256sums=('e169d6a75d8c397e04f843bc1b9585950fb9a001255cd18d6293f66fa8a6c947'
-            '5315977307e69d20b3e856d3f8724835b08e02085a4444a5c5cefea83fd7d006')
+        icu67.patch
+        qt5-webengine-gcc10.patch)
+sha256sums=('c38e2fda7ed1b7d5a90f26abf231ec0715d78a5bc39a94673d8e39d75f04c5df'
+            '5315977307e69d20b3e856d3f8724835b08e02085a4444a5c5cefea83fd7d006'
+            '8d73112da8bb95ae9b1c84e403e08563a5dbf3dc02f79cd931e1b0ac15a3be37')
 
 prepare() {
   mkdir -p build
 
-  patch -Np3 -d $_pkgfqn/src/3rdparty/chromium/v8 <icu67.patch
-
-  sed -e 's|7-9|7-9\|10|' -i $_pkgfqn/configure.pri # Support ninja 1.10
+  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
 }
 
 build() {
   cd build
-
   qmake ../${_pkgfqn} -- \
     -proprietary-codecs \
     -system-ffmpeg \
diff --git a/qt5-webengine-gcc10.patch b/qt5-webengine-gcc10.patch
new file mode 100644
index 0000000..e2ed0c3
--- /dev/null
+++ b/qt5-webengine-gcc10.patch
@@ -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"