Attachment 215262 Details for Bug 247010 – v1

[patch] v1

qt5-5.15.0.v1.diff (text/plain), 381.81 KB, created by Tobias C. Berner on 2020-06-05 17:25:59 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Tobias C. Berner

Created: 2020-06-05 17:25:59 UTC

Size: 381.81 KB

patch

obsolete

>diff --git a/Mk/Uses/qt.mk b/Mk/Uses/qt.mk
>index c395a2e98b57..f47ab782f715 100644
>--- a/Mk/Uses/qt.mk
>+++ b/Mk/Uses/qt.mk
>@@ -24,7 +24,7 @@ _QT_MK_INCLUDED=	qt.mk
> 
> # Qt versions currently supported by the framework.
> _QT_SUPPORTED?=		5
>-QT5_VERSION?=		5.14.2
>+QT5_VERSION?=		5.15.0
> 
> # We accept the Qt version to be passed by either or all of the three mk files.
> .  if empty(qt_ARGS) && empty(qmake_ARGS) && empty(qt-dist_ARGS)
>diff --git a/comms/qt5-connectivity/pkg-plist b/comms/qt5-connectivity/pkg-plist
>index 05378831d47c..9f074e9576cc 100644
>--- a/comms/qt5-connectivity/pkg-plist
>+++ b/comms/qt5-connectivity/pkg-plist
>@@ -76,7 +76,7 @@
> %%QT_INCDIR%%/QtBluetooth/%%FULLVER%%/QtBluetooth/private/qlowenergycontroller_bluez_p.h
> %%QT_INCDIR%%/QtBluetooth/%%FULLVER%%/QtBluetooth/private/qlowenergycontroller_bluezdbus_p.h
> %%QT_INCDIR%%/QtBluetooth/%%FULLVER%%/QtBluetooth/private/qlowenergycontroller_darwin_p.h
>-%%QT_INCDIR%%/QtBluetooth/%%FULLVER%%/QtBluetooth/private/qlowenergycontroller_p.h
>+%%QT_INCDIR%%/QtBluetooth/%%FULLVER%%/QtBluetooth/private/qlowenergycontroller_dummy_p.h
> %%QT_INCDIR%%/QtBluetooth/%%FULLVER%%/QtBluetooth/private/qlowenergycontroller_win_p.h
> %%QT_INCDIR%%/QtBluetooth/%%FULLVER%%/QtBluetooth/private/qlowenergycontroller_winrt_new_p.h
> %%QT_INCDIR%%/QtBluetooth/%%FULLVER%%/QtBluetooth/private/qlowenergycontroller_winrt_p.h
>diff --git a/comms/qt5-serialbus/pkg-plist b/comms/qt5-serialbus/pkg-plist
>index 56e010bf7fdf..25fbb4795f87 100644
>--- a/comms/qt5-serialbus/pkg-plist
>+++ b/comms/qt5-serialbus/pkg-plist
>@@ -1,4 +1,5 @@
> %%QT_BINDIR%%/canbusutil
>+%%DEBUG%%%%QT_BINDIR%%/canbusutil.debug
> %%QT_INCDIR%%/QtSerialBus/%%FULLVER%%/QtSerialBus/private/qcanbusdevice_p.h
> %%QT_INCDIR%%/QtSerialBus/%%FULLVER%%/QtSerialBus/private/qcanbusdeviceinfo_p.h
> %%QT_INCDIR%%/QtSerialBus/%%FULLVER%%/QtSerialBus/private/qmodbus_symbols_p.h
>diff --git a/databases/qt5-sqldrivers-mysql/files/patch-src_plugins_sqldrivers_mysql_qsql__mysql.cpp b/databases/qt5-sqldrivers-mysql/files/patch-src_plugins_sqldrivers_mysql_qsql__mysql.cpp
>index 4add3e998f28..00e133f9195f 100644
>--- a/databases/qt5-sqldrivers-mysql/files/patch-src_plugins_sqldrivers_mysql_qsql__mysql.cpp
>+++ b/databases/qt5-sqldrivers-mysql/files/patch-src_plugins_sqldrivers_mysql_qsql__mysql.cpp
>@@ -17,12 +17,12 @@ This does not apply to the Qt4 port, which allows older compilers
> and the less-fragile approach would therefore break on old-gcc-in-base
> architectures.
> 
>---- src/plugins/sqldrivers/mysql/qsql_mysql.cpp.orig	2018-04-29 07:25:09 UTC
>+--- src/plugins/sqldrivers/mysql/qsql_mysql.cpp.orig	2020-03-11 15:29:12 UTC
> +++ src/plugins/sqldrivers/mysql/qsql_mysql.cpp
>-@@ -74,6 +74,14 @@ Q_DECLARE_METATYPE(MYSQL_STMT*)
>- #  define Q_CLIENT_MULTI_STATEMENTS 0
>- #endif
>-
>+@@ -71,6 +71,14 @@ Q_DECLARE_METATYPE(MYSQL_STMT*)
>+ // by redefining it we can regain source compatibility.
>+ using my_bool = decltype(mysql_stmt_bind_result(nullptr, nullptr));
>+ 
> +// MYSQL 8.0.1 no longer uses the my_bool type:
> +// https://dev.mysql.com/doc/relnotes/mysql/8.0/en/news-8-0-1.html
> +#if (MYSQL_VERSION_ID >= 80001) && !defined(MARIADB_BASE_VERSION)
>@@ -32,50 +32,32 @@ architectures.
> +#endif
> +
>  QT_BEGIN_NAMESPACE
>-
>+ 
>  class QMYSQLDriverPrivate : public QSqlDriverPrivate
>-@@ -232,7 +240,7 @@ class QMYSQLResultPrivate: public QSqlResultPrivate (p
>-               myField(0), type(QVariant::Invalid)
>-         {}
>-         char *outField;
>--        my_bool nullIndicator;
>-+        mysql_bool nullIndicator;
>-         ulong bufLength;
>-         MYSQL_FIELD *myField;
>-         QVariant::Type type;
>-@@ -983,7 +991,7 @@ bool QMYSQLResult::exec()
>+@@ -930,7 +938,7 @@ bool QMYSQLResult::exec()
>      MYSQL_BIND* currBind;
>      QVector<MYSQL_TIME *> timeVector;
>      QVector<QByteArray> stringVector;
> -    QVector<my_bool> nullVector;
> +    QVector<mysql_bool> nullVector;
>-
>+ 
>      const QVector<QVariant> values = boundValues();
>-
>-@@ -1004,7 +1012,7 @@ bool QMYSQLResult::exec()
>-
>+ 
>+@@ -951,7 +959,7 @@ bool QMYSQLResult::exec()
>+ 
>              currBind = &d->outBinds[i];
>-
>+ 
> -            nullVector[i] = static_cast<my_bool>(val.isNull());
> +            nullVector[i] = static_cast<mysql_bool>(val.isNull());
>              currBind->is_null = &nullVector[i];
>              currBind->length = 0;
>              currBind->is_unsigned = 0;
>-@@ -1101,7 +1109,7 @@ bool QMYSQLResult::exec()
>+@@ -1048,7 +1056,7 @@ bool QMYSQLResult::exec()
>      d->rowsAffected = mysql_stmt_affected_rows(d->stmt);
>-
>+ 
>      if (isSelect()) {
> -        my_bool update_max_length = true;
> +        mysql_bool update_max_length = true;
>-
>+ 
>          r = mysql_stmt_bind_result(d->stmt, d->inBinds);
>          if (r != 0) {
>-@@ -1312,7 +1320,7 @@ bool QMYSQLDriver::open(const QString& db,
>-     QString sslCAPath;
>-     QString sslCipher;
>- #if MYSQL_VERSION_ID >= 50000
>--    my_bool reconnect=false;
>-+    mysql_bool reconnect=false;
>-     uint connectTimeout = 0;
>-     uint readTimeout = 0;
>-     uint writeTimeout = 0;
>diff --git a/devel/liteide/Makefile b/devel/liteide/Makefile
>index f4aacda3abab..4264300ec2d3 100644
>--- a/devel/liteide/Makefile
>+++ b/devel/liteide/Makefile
>@@ -1,4 +1,4 @@
>-# $FreeBSD$
>+# $FreeBSD: head/devel/liteide/Makefile 532766 2020-04-24 16:00:17Z dmgk $
> 
> PORTNAME=	liteide
> DISTVERSIONPREFIX=	x
>diff --git a/devel/qt5-assistant/pkg-plist b/devel/qt5-assistant/pkg-plist
>index 04f1f0912ad8..be0eef627996 100644
>--- a/devel/qt5-assistant/pkg-plist
>+++ b/devel/qt5-assistant/pkg-plist
>@@ -1,2 +1,3 @@
> %%QT_BINDIR%%/assistant
>+%%DEBUG%%%%QT_BINDIR%%/assistant.debug
> share/pixmaps/assistant-qt5.png
>diff --git a/devel/qt5-buildtools/pkg-plist b/devel/qt5-buildtools/pkg-plist
>index 722ad634ffb7..744d1be6dcf3 100644
>--- a/devel/qt5-buildtools/pkg-plist
>+++ b/devel/qt5-buildtools/pkg-plist
>@@ -1,5 +1,7 @@
> %%QT_BINDIR%%/moc
>+%%DEBUG%%%%QT_BINDIR%%/moc.debug
> %%QT_BINDIR%%/rcc
>+%%DEBUG%%%%QT_BINDIR%%/rcc.debug
> %%QT_BINDIR%%/syncqt.pl
> %%QT_LIBDIR%%/libQt5Bootstrap.a
> %%QT_LIBDIR%%/libQt5Bootstrap.prl
>diff --git a/devel/qt5-core/Makefile b/devel/qt5-core/Makefile
>index 24b2927af51b..9c7400cff309 100644
>--- a/devel/qt5-core/Makefile
>+++ b/devel/qt5-core/Makefile
>@@ -2,7 +2,6 @@
> 
> PORTNAME=	core
> DISTVERSION=	${QT5_VERSION}
>-PORTREVISION=	3
> CATEGORIES=	devel
> PKGNAMEPREFIX=	qt5-
> 
>@@ -25,7 +24,7 @@ CONFIGURE_ARGS=	-no-accessibility -no-gif -no-libpng -no-libjpeg \
> 		-no-iconv -no-dbus -no-opengl \
> 		-no-egl -no-evdev \
> 		-no-fontconfig -no-freetype -no-gtk -no-harfbuzz \
>-		-no-libudev -no-xcb -no-xkb -no-xcb-xlib \
>+		-no-libudev -no-xcb -no-xcb-xlib \
> 		-no-xkbcommon -no-libinput
> USE_LDCONFIG=	${PREFIX}/${QT_LIBDIR_REL}
> 
>diff --git a/devel/qt5-core/files/patch-git_276fa83 b/devel/qt5-core/files/patch-git_276fa83
>deleted file mode 100644
>index 927c19ce2cc9..000000000000
>--- a/devel/qt5-core/files/patch-git_276fa83
>+++ /dev/null
>@@ -1,109 +0,0 @@
>-From 276fa8383a7535765be7182883ef4aade17ce013 Mon Sep 17 00:00:00 2001
>-From: Thiago Macieira <thiago.macieira@intel.com>
>-Date: Thu, 2 Apr 2020 12:08:41 -0300
>-Subject: QLibrary: fix deadlock caused by fix to QTBUG-39642
>-
>-Commit ae6f73e8566fa76470937aca737141183929a5ec inserted a mutex around
>-the entire load_sys(). We had reasoed that deadlocks would only occur if
>-the object creation in instance() recursed into its own instance(),
>-which was already a bug. But we had forgotten that dlopen()/
>-LoadLibrary() executes initialization code from the module being loaded,
>-which could cause a recursion back into the same QPluginLoader or
>-QLibrary object. This recursion is benign because the module *is* loaded
>-and dlopen()/LoadLibrary() returns the same handle.
>-
>-[ChangeLog][QtCore][QLibrary and QPluginLoader] Fixed a deadlock that
>-would happen if the plugin or library being loaded has load-time
>-initialization code (C++ global variables) that recursed back into the
>-same QLibrary or QPluginLoader object.
>-
>-PS: QLibraryPrivate::loadPlugin() updates pluginState outside a mutex
>-lock, so pluginState should be made an atomic variable. Once that is
>-done, we'll only need locking the mutex to update errorString (no
>-locking before loading).
>-
>-Fixes: QTBUG-83207
>-Task-number: QTBUG-39642
>-Change-Id: Ibdc95e9af7bd456a94ecfffd160209304e5ab2eb
>-Reviewed-by: Volker Hilsheimer <volker.hilsheimer@qt.io>
>-Reviewed-by: David Faure <david.faure@kdab.com>
>----
>- src/corelib/plugin/qlibrary.cpp      | 2 --
>- src/corelib/plugin/qlibrary_unix.cpp | 4 ++++
>- src/corelib/plugin/qlibrary_win.cpp  | 3 +++
>- 3 files changed, 7 insertions(+), 2 deletions(-)
>-
>-diff --git a/src/corelib/plugin/qlibrary.cpp b/src/corelib/plugin/qlibrary.cpp
>-index ddb053c26f..be9d92b204 100644
>---- src/corelib/plugin/qlibrary.cpp
>-+++ src/corelib/plugin/qlibrary.cpp
>-@@ -576,9 +576,7 @@ bool QLibraryPrivate::load()
>- 
>-     Q_TRACE(QLibraryPrivate_load_entry, fileName);
>- 
>--    mutex.lock();
>-     bool ret = load_sys();
>--    mutex.unlock();
>-     if (qt_debug_component()) {
>-         if (ret) {
>-             qDebug() << "loaded library" << fileName;
>-diff --git a/src/corelib/plugin/qlibrary_unix.cpp b/src/corelib/plugin/qlibrary_unix.cpp
>-index 017aa97b66..a5c72f81d9 100644
>---- src/corelib/plugin/qlibrary_unix.cpp
>-+++ src/corelib/plugin/qlibrary_unix.cpp
>-@@ -123,6 +123,7 @@ QStringList QLibraryPrivate::prefixes_sys()
>- 
>- bool QLibraryPrivate::load_sys()
>- {
>-+    QMutexLocker locker(&mutex);
>-     QString attempt;
>-     QFileSystemEntry fsEntry(fileName);
>- 
>-@@ -213,6 +214,7 @@ bool QLibraryPrivate::load_sys()
>-     }
>- #endif
>- 
>-+    locker.unlock();
>-     bool retry = true;
>-     Handle hnd = nullptr;
>-     for (int prefix = 0; retry && !hnd && prefix < prefixes.size(); prefix++) {
>-@@ -273,6 +275,8 @@ bool QLibraryPrivate::load_sys()
>-         }
>-     }
>- #endif
>-+
>-+    locker.relock();
>-     if (!hnd) {
>-         errorString = QLibrary::tr("Cannot load library %1: %2").arg(fileName, qdlerror());
>-     }
>-diff --git a/src/corelib/plugin/qlibrary_win.cpp b/src/corelib/plugin/qlibrary_win.cpp
>-index 000bf76276..ef58724be8 100644
>---- src/corelib/plugin/qlibrary_win.cpp
>-+++ src/corelib/plugin/qlibrary_win.cpp
>-@@ -78,6 +78,7 @@ bool QLibraryPrivate::load_sys()
>-     //     fileName
>-     //
>-     // NB If it's a plugin we do not ever try the ".dll" extension
>-+    QMutexLocker locker(&mutex);
>-     QStringList attempts;
>- 
>-     if (pluginState != IsAPlugin)
>-@@ -95,6 +96,7 @@ bool QLibraryPrivate::load_sys()
>-         attempts.prepend(QDir::rootPath() + fileName);
>- #endif
>- 
>-+    locker.unlock();
>-     Handle hnd = nullptr;
>-     for (const QString &attempt : qAsConst(attempts)) {
>- #ifndef Q_OS_WINRT
>-@@ -115,6 +117,7 @@ bool QLibraryPrivate::load_sys()
>- #ifndef Q_OS_WINRT
>-     SetErrorMode(oldmode);
>- #endif
>-+    locker.relock();
>-     if (!hnd) {
>-         errorString = QLibrary::tr("Cannot load library %1: %2").arg(
>-                     QDir::toNativeSeparators(fileName), qt_error_string());
>--- 
>-cgit v1.2.1
>-
>diff --git a/devel/qt5-core/files/patch-src_corelib_time_qtimezoneprivate__tz.cpp b/devel/qt5-core/files/patch-src_corelib_time_qtimezoneprivate__tz.cpp
>index ee621f7fc46f..475ee7baac68 100644
>--- a/devel/qt5-core/files/patch-src_corelib_time_qtimezoneprivate__tz.cpp
>+++ b/devel/qt5-core/files/patch-src_corelib_time_qtimezoneprivate__tz.cpp
>@@ -1,20 +1,28 @@
>---- src/corelib/time/qtimezoneprivate_tz.cpp.orig	2019-11-01 21:30:15 UTC
>+--- src/corelib/time/qtimezoneprivate_tz.cpp.orig	2020-05-11 08:15:08 UTC
> +++ src/corelib/time/qtimezoneprivate_tz.cpp
>-@@ -1126,6 +1126,17 @@ QByteArray QTzTimeZonePrivate::systemTimeZoneId() cons
>+@@ -1153,6 +1153,25 @@ QByteArray QTzTimeZonePrivate::systemTimeZoneId() cons
>          }
>      }
>  
>-+    // On many FreeBSD systems, /etc/localtime is a regular file while the actual name is in /var/db/zoneinfo
>++    // On some FreeBSD systems, /etc/localtime is a regular file while 
>++    // the actual name is in /var/db/zoneinfo
> +    if (ianaId.isEmpty()) {
> +        QFile tzif(QStringLiteral("/var/db/zoneinfo"));
> +        if (tzif.open(QIODevice::ReadOnly)) {
>-+            // TODO QTextStream inefficient, replace later
>-+            QTextStream ts(&tzif);
>-+            if (!ts.atEnd())
>-+                ianaId = ts.readLine().toUtf8();
>++            const int maximumTZNameLength = 256;
>++            QByteArray tzcontents( tzif.read( maximumTZNameLength ) );
>++            if (tzcontents.size() >= 2) {
>++                // Shortest TZ would be UTC, or r/z, but there's special
>++                // cases "GB" and "US"
>++                const int newlineIndex = tzcontents.indexOf('\n');
>++                if (newlineIndex < 0) // No newline in file
>++                    ianaId = tzcontents;
>++                if (newlineIndex > 2) // Newline, chop it off
>++                    ianaId = tzcontents.left(newlineIndex-1);
>++            }
> +        }
> +    }
> +
>-     // On some Red Hat distros /etc/localtime is real file with name held in /etc/sysconfig/clock
>-     // in a line like ZONE="Europe/Oslo" or TIMEZONE="Europe/Oslo"
>+     // Some systems (e.g. uClibc) have a default value for $TZ in /etc/TZ:
>      if (ianaId.isEmpty()) {
>+         QFile zone(QStringLiteral("/etc/TZ"));
>diff --git a/devel/qt5-core/pkg-plist b/devel/qt5-core/pkg-plist
>index d9503de2ab90..7f18db82f7b4 100644
>--- a/devel/qt5-core/pkg-plist
>+++ b/devel/qt5-core/pkg-plist
>@@ -9,10 +9,15 @@
> %%QT_INCDIR%%/QtCore/%%FULLVER%%/QtCore/private/qabstracttransition_p.h
> %%QT_INCDIR%%/QtCore/%%FULLVER%%/QtCore/private/qanimationgroup_p.h
> %%QT_INCDIR%%/QtCore/%%FULLVER%%/QtCore/private/qbig5codec_p.h
>+%%QT_INCDIR%%/QtCore/%%FULLVER%%/QtCore/private/qbinaryjson_p.h
>+%%QT_INCDIR%%/QtCore/%%FULLVER%%/QtCore/private/qbinaryjsonarray_p.h
>+%%QT_INCDIR%%/QtCore/%%FULLVER%%/QtCore/private/qbinaryjsonobject_p.h
>+%%QT_INCDIR%%/QtCore/%%FULLVER%%/QtCore/private/qbinaryjsonvalue_p.h
> %%QT_INCDIR%%/QtCore/%%FULLVER%%/QtCore/private/qbytearray_p.h
> %%QT_INCDIR%%/QtCore/%%FULLVER%%/QtCore/private/qbytedata_p.h
> %%QT_INCDIR%%/QtCore/%%FULLVER%%/QtCore/private/qcalendarbackend_p.h
> %%QT_INCDIR%%/QtCore/%%FULLVER%%/QtCore/private/qcalendarmath_p.h
>+%%QT_INCDIR%%/QtCore/%%FULLVER%%/QtCore/private/qcborcommon_p.h
> %%QT_INCDIR%%/QtCore/%%FULLVER%%/QtCore/private/qcborvalue_p.h
> %%QT_INCDIR%%/QtCore/%%FULLVER%%/QtCore/private/qcfsocketnotifier_p.h
> %%QT_INCDIR%%/QtCore/%%FULLVER%%/QtCore/private/qcollator_p.h
>@@ -30,6 +35,7 @@
> %%QT_INCDIR%%/QtCore/%%FULLVER%%/QtCore/private/qdebug_p.h
> %%QT_INCDIR%%/QtCore/%%FULLVER%%/QtCore/private/qdir_p.h
> %%QT_INCDIR%%/QtCore/%%FULLVER%%/QtCore/private/qdoublescanprint_p.h
>+%%QT_INCDIR%%/QtCore/%%FULLVER%%/QtCore/private/qduplicatetracker_p.h
> %%QT_INCDIR%%/QtCore/%%FULLVER%%/QtCore/private/qelfparser_p.h
> %%QT_INCDIR%%/QtCore/%%FULLVER%%/QtCore/private/qendian_p.h
> %%QT_INCDIR%%/QtCore/%%FULLVER%%/QtCore/private/qeucjpcodec_p.h
>@@ -182,6 +188,7 @@
> %%QT_INCDIR%%/QtCore/%%FULLVER%%/QtCore/private/qutfcodec_p.h
> %%QT_INCDIR%%/QtCore/%%FULLVER%%/QtCore/private/qvariant_p.h
> %%QT_INCDIR%%/QtCore/%%FULLVER%%/QtCore/private/qvariantanimation_p.h
>+%%QT_INCDIR%%/QtCore/%%FULLVER%%/QtCore/private/qwaitcondition_p.h
> %%QT_INCDIR%%/QtCore/%%FULLVER%%/QtCore/private/qwindowscodec_p.h
> %%QT_INCDIR%%/QtCore/%%FULLVER%%/QtCore/private/qwindowspipereader_p.h
> %%QT_INCDIR%%/QtCore/%%FULLVER%%/QtCore/private/qwindowspipewriter_p.h
>@@ -427,6 +434,7 @@
> %%QT_INCDIR%%/QtCore/QSignalTransition
> %%QT_INCDIR%%/QtCore/QSize
> %%QT_INCDIR%%/QtCore/QSizeF
>+%%QT_INCDIR%%/QtCore/QSocketDescriptor
> %%QT_INCDIR%%/QtCore/QSocketNotifier
> %%QT_INCDIR%%/QtCore/QSortFilterProxyModel
> %%QT_INCDIR%%/QtCore/QSpecialInteger
>@@ -559,6 +567,8 @@
> %%QT_INCDIR%%/QtCore/qcborcommon.h
> %%QT_INCDIR%%/QtCore/qcbormap.h
> %%QT_INCDIR%%/QtCore/qcborstream.h
>+%%QT_INCDIR%%/QtCore/qcborstreamreader.h
>+%%QT_INCDIR%%/QtCore/qcborstreamwriter.h
> %%QT_INCDIR%%/QtCore/qcborvalue.h
> %%QT_INCDIR%%/QtCore/qchar.h
> %%QT_INCDIR%%/QtCore/qcollator.h
>@@ -738,12 +748,14 @@
> %%QT_CMAKEDIR%%/Qt5Core/Qt5CoreConfigVersion.cmake
> %%QT_CMAKEDIR%%/Qt5Core/Qt5CoreMacros.cmake
> %%QT_BINDIR%%/qlalr
>+%%DEBUG%%%%QT_BINDIR%%/qlalr.debug
> %%QT_LIBDIR%%/libQt5Core.prl
> %%QT_LIBDIR%%/libQt5Core.so
> %%QT_LIBDIR%%/libQt5Core.so.5
> %%QT_LIBDIR%%/libQt5Core.so.%%SHORTVER%%
> %%QT_LIBDIR%%/libQt5Core.so.%%FULLVER%%
> %%DEBUG%%%%QT_LIBDIR%%/libQt5Core.so.%%FULLVER%%.debug
>+%%QT_LIBDIR%%/metatypes/qt5core_metatypes.json
> %%QT_MKSPECDIR%%/modules/qt_lib_core.pri
> %%QT_MKSPECDIR%%/modules/qt_lib_core_private.pri
> libdata/pkgconfig/Qt5Core.pc
>diff --git a/devel/qt5-dbus/pkg-plist b/devel/qt5-dbus/pkg-plist
>index 00256c658193..865f36ea2fcb 100644
>--- a/devel/qt5-dbus/pkg-plist
>+++ b/devel/qt5-dbus/pkg-plist
>@@ -75,7 +75,9 @@
> %%QT_LIBDIR%%/libQt5DBus.so.%%FULLVER%%
> %%DEBUG%%%%QT_LIBDIR%%/libQt5DBus.so.%%FULLVER%%.debug
> %%QT_BINDIR%%/qdbuscpp2xml
>+%%DEBUG%%%%QT_BINDIR%%/qdbuscpp2xml.debug
> %%QT_BINDIR%%/qdbusxml2cpp
>+%%DEBUG%%%%QT_BINDIR%%/qdbusxml2cpp.debug
> %%QT_MKSPECDIR%%/modules/qt_lib_dbus.pri
> %%QT_MKSPECDIR%%/modules/qt_lib_dbus_private.pri
> libdata/pkgconfig/Qt5DBus.pc
>diff --git a/devel/qt5-designer/pkg-plist b/devel/qt5-designer/pkg-plist
>index f37efab0fed4..223fd2507cf7 100644
>--- a/devel/qt5-designer/pkg-plist
>+++ b/devel/qt5-designer/pkg-plist
>@@ -182,6 +182,7 @@
> %%QT_CMAKEDIR%%/Qt5DesignerComponents/Qt5DesignerComponentsConfigVersion.cmake
> %%WEBKIT%%%%QT_CMAKEDIR%%/Qt5Designer/Qt5Designer_QWebViewPlugin.cmake
> %%QT_BINDIR%%/designer
>+%%DEBUG%%%%QT_BINDIR%%/designer.debug
> %%QT_LIBDIR%%/libQt5Designer.prl
> %%QT_LIBDIR%%/libQt5Designer.so
> %%QT_LIBDIR%%/libQt5Designer.so.5
>diff --git a/devel/qt5-help/Makefile b/devel/qt5-help/Makefile
>index c787fcd4c031..29518eebba58 100644
>--- a/devel/qt5-help/Makefile
>+++ b/devel/qt5-help/Makefile
>@@ -13,9 +13,6 @@ USE_QT=		core gui network sql widgets \
> 		buildtools_build sql-sqlite3_run
> USE_LDCONFIG=	${PREFIX}/${QT_LIBDIR_REL}
> 
>-BUILD_WRKSRC=	${WRKSRC}/src/assistant
>-INSTALL_WRKSRC=	${WRKSRC}/src/assistant
>-
> QT_BINARIES=	yes
> 
> .include <bsd.port.mk>
>diff --git a/devel/qt5-help/pkg-plist b/devel/qt5-help/pkg-plist
>index 544dc01eb8b3..2016fe2abff0 100644
>--- a/devel/qt5-help/pkg-plist
>+++ b/devel/qt5-help/pkg-plist
>@@ -1,20 +1,25 @@
>+%%QT_INCDIR%%/QtHelp/%%FULLVER%%/QtHelp/private/qfilternamedialog_p.h
> %%QT_INCDIR%%/QtHelp/%%FULLVER%%/QtHelp/private/qhelpcollectionhandler_p.h
> %%QT_INCDIR%%/QtHelp/%%FULLVER%%/QtHelp/private/qhelpdbreader_p.h
> %%QT_INCDIR%%/QtHelp/%%FULLVER%%/QtHelp/private/qhelpengine_p.h
>+%%QT_INCDIR%%/QtHelp/%%FULLVER%%/QtHelp/private/qhelpfiltersettings_p.h
> %%QT_INCDIR%%/QtHelp/%%FULLVER%%/QtHelp/private/qhelpsearchindexreader_default_p.h
> %%QT_INCDIR%%/QtHelp/%%FULLVER%%/QtHelp/private/qhelpsearchindexreader_p.h
> %%QT_INCDIR%%/QtHelp/%%FULLVER%%/QtHelp/private/qhelpsearchindexwriter_default_p.h
>+%%QT_INCDIR%%/QtHelp/%%FULLVER%%/QtHelp/private/qoptionswidget_p.h
> %%QT_INCDIR%%/QtHelp/QCompressedHelpInfo
> %%QT_INCDIR%%/QtHelp/QHelpContentItem
> %%QT_INCDIR%%/QtHelp/QHelpContentModel
> %%QT_INCDIR%%/QtHelp/QHelpContentWidget
> %%QT_INCDIR%%/QtHelp/QHelpEngine
> %%QT_INCDIR%%/QtHelp/QHelpEngineCore
>-%%QT_INCDIR%%/QtHelp/QHelpGlobal
> %%QT_INCDIR%%/QtHelp/QHelpFilterData
> %%QT_INCDIR%%/QtHelp/QHelpFilterEngine
>+%%QT_INCDIR%%/QtHelp/QHelpFilterSettingsWidget
>+%%QT_INCDIR%%/QtHelp/QHelpGlobal
> %%QT_INCDIR%%/QtHelp/QHelpIndexModel
> %%QT_INCDIR%%/QtHelp/QHelpIndexWidget
>+%%QT_INCDIR%%/QtHelp/QHelpLink
> %%QT_INCDIR%%/QtHelp/QHelpSearchEngine
> %%QT_INCDIR%%/QtHelp/QHelpSearchQuery
> %%QT_INCDIR%%/QtHelp/QHelpSearchQueryWidget
>@@ -30,7 +35,9 @@
> %%QT_INCDIR%%/QtHelp/qhelpenginecore.h
> %%QT_INCDIR%%/QtHelp/qhelpfilterdata.h
> %%QT_INCDIR%%/QtHelp/qhelpfilterengine.h
>+%%QT_INCDIR%%/QtHelp/qhelpfiltersettingswidget.h
> %%QT_INCDIR%%/QtHelp/qhelpindexwidget.h
>+%%QT_INCDIR%%/QtHelp/qhelplink.h
> %%QT_INCDIR%%/QtHelp/qhelpsearchengine.h
> %%QT_INCDIR%%/QtHelp/qhelpsearchquerywidget.h
> %%QT_INCDIR%%/QtHelp/qhelpsearchresultwidget.h
>@@ -45,7 +52,9 @@
> %%QT_LIBDIR%%/libQt5Help.so.%%FULLVER%%
> %%DEBUG%%%%QT_LIBDIR%%/libQt5Help.so.%%FULLVER%%.debug
> %%QT_BINDIR%%/qcollectiongenerator
>+%%DEBUG%%%%QT_BINDIR%%/qcollectiongenerator.debug
> %%QT_BINDIR%%/qhelpgenerator
>+%%DEBUG%%%%QT_BINDIR%%/qhelpgenerator.debug
> %%QT_MKSPECDIR%%/modules/qt_lib_help.pri
> %%QT_MKSPECDIR%%/modules/qt_lib_help_private.pri
> libdata/pkgconfig/Qt5Help.pc
>diff --git a/devel/qt5-linguist/pkg-plist b/devel/qt5-linguist/pkg-plist
>index 7289e1d37ac9..a5819cd82fda 100644
>--- a/devel/qt5-linguist/pkg-plist
>+++ b/devel/qt5-linguist/pkg-plist
>@@ -1,4 +1,5 @@
> %%QT_BINDIR%%/linguist
>+%%DEBUG%%%%QT_BINDIR%%/linguist.debug
> share/pixmaps/linguist-qt5.png
> %%QT_DATADIR%%/phrasebooks/danish.qph
> %%QT_DATADIR%%/phrasebooks/dutch.qph
>diff --git a/devel/qt5-linguisttools/pkg-plist b/devel/qt5-linguisttools/pkg-plist
>index 1cc5b3d425e5..710ffca62541 100644
>--- a/devel/qt5-linguisttools/pkg-plist
>+++ b/devel/qt5-linguisttools/pkg-plist
>@@ -2,10 +2,16 @@
> %%QT_CMAKEDIR%%/Qt5LinguistTools/Qt5LinguistToolsConfigVersion.cmake
> %%QT_CMAKEDIR%%/Qt5LinguistTools/Qt5LinguistToolsMacros.cmake
> %%QT_BINDIR%%/lconvert
>+%%DEBUG%%%%QT_BINDIR%%/lconvert.debug
> %%QT_BINDIR%%/lprodump
>+%%DEBUG%%%%QT_BINDIR%%/lprodump.debug
> %%QT_BINDIR%%/lrelease
> %%QT_BINDIR%%/lrelease-pro
>+%%DEBUG%%%%QT_BINDIR%%/lrelease-pro.debug
>+%%DEBUG%%%%QT_BINDIR%%/lrelease.debug
> %%QT_BINDIR%%/lupdate
> %%QT_BINDIR%%/lupdate-pro
>+%%DEBUG%%%%QT_BINDIR%%/lupdate-pro.debug
>+%%DEBUG%%%%QT_BINDIR%%/lupdate.debug
> man/man1/lrelease.1.gz
> man/man1/lupdate.1.gz
>diff --git a/devel/qt5-location/pkg-plist b/devel/qt5-location/pkg-plist
>index 1df24394cb46..3698410d16b9 100644
>--- a/devel/qt5-location/pkg-plist
>+++ b/devel/qt5-location/pkg-plist
>@@ -4,6 +4,7 @@
> %%QT_INCDIR%%/QtLocation/%%FULLVER%%/QtLocation/private/qcache3q_p.h
> %%QT_INCDIR%%/QtLocation/%%FULLVER%%/QtLocation/private/qdeclarativecategory_p.h
> %%QT_INCDIR%%/QtLocation/%%FULLVER%%/QtLocation/private/qdeclarativecirclemapitem_p.h
>+%%QT_INCDIR%%/QtLocation/%%FULLVER%%/QtLocation/private/qdeclarativecirclemapitem_p_p.h
> %%QT_INCDIR%%/QtLocation/%%FULLVER%%/QtLocation/private/qdeclarativecontactdetail_p.h
> %%QT_INCDIR%%/QtLocation/%%FULLVER%%/QtLocation/private/qdeclarativegeocodemodel_p.h
> %%QT_INCDIR%%/QtLocation/%%FULLVER%%/QtLocation/private/qdeclarativegeomaneuver_p.h
>@@ -12,6 +13,7 @@
> %%QT_INCDIR%%/QtLocation/%%FULLVER%%/QtLocation/private/qdeclarativegeomapitembase_p.h
> %%QT_INCDIR%%/QtLocation/%%FULLVER%%/QtLocation/private/qdeclarativegeomapitemgroup_p.h
> %%QT_INCDIR%%/QtLocation/%%FULLVER%%/QtLocation/private/qdeclarativegeomapitemtransitionmanager_p.h
>+%%QT_INCDIR%%/QtLocation/%%FULLVER%%/QtLocation/private/qdeclarativegeomapitemutils_p.h
> %%QT_INCDIR%%/QtLocation/%%FULLVER%%/QtLocation/private/qdeclarativegeomapitemview_p.h
> %%QT_INCDIR%%/QtLocation/%%FULLVER%%/QtLocation/private/qdeclarativegeomapparameter_p.h
> %%QT_INCDIR%%/QtLocation/%%FULLVER%%/QtLocation/private/qdeclarativegeomapquickitem_p.h
>@@ -31,9 +33,12 @@
> %%QT_INCDIR%%/QtLocation/%%FULLVER%%/QtLocation/private/qdeclarativeplaceimagemodel_p.h
> %%QT_INCDIR%%/QtLocation/%%FULLVER%%/QtLocation/private/qdeclarativeplaceuser_p.h
> %%QT_INCDIR%%/QtLocation/%%FULLVER%%/QtLocation/private/qdeclarativepolygonmapitem_p.h
>+%%QT_INCDIR%%/QtLocation/%%FULLVER%%/QtLocation/private/qdeclarativepolygonmapitem_p_p.h
> %%QT_INCDIR%%/QtLocation/%%FULLVER%%/QtLocation/private/qdeclarativepolylinemapitem_p.h
>+%%QT_INCDIR%%/QtLocation/%%FULLVER%%/QtLocation/private/qdeclarativepolylinemapitem_p_p.h
> %%QT_INCDIR%%/QtLocation/%%FULLVER%%/QtLocation/private/qdeclarativeratings_p.h
> %%QT_INCDIR%%/QtLocation/%%FULLVER%%/QtLocation/private/qdeclarativerectanglemapitem_p.h
>+%%QT_INCDIR%%/QtLocation/%%FULLVER%%/QtLocation/private/qdeclarativerectanglemapitem_p_p.h
> %%QT_INCDIR%%/QtLocation/%%FULLVER%%/QtLocation/private/qdeclarativereviewmodel_p.h
> %%QT_INCDIR%%/QtLocation/%%FULLVER%%/QtLocation/private/qdeclarativeroutemapitem_p.h
> %%QT_INCDIR%%/QtLocation/%%FULLVER%%/QtLocation/private/qdeclarativesearchmodelbase_p.h
>@@ -76,6 +81,7 @@
> %%QT_INCDIR%%/QtLocation/%%FULLVER%%/QtLocation/private/qgeoroutingmanager_p.h
> %%QT_INCDIR%%/QtLocation/%%FULLVER%%/QtLocation/private/qgeoroutingmanagerengine_p.h
> %%QT_INCDIR%%/QtLocation/%%FULLVER%%/QtLocation/private/qgeoserviceprovider_p.h
>+%%QT_INCDIR%%/QtLocation/%%FULLVER%%/QtLocation/private/qgeosimplify_p.h
> %%QT_INCDIR%%/QtLocation/%%FULLVER%%/QtLocation/private/qgeotiledmap_p.h
> %%QT_INCDIR%%/QtLocation/%%FULLVER%%/QtLocation/private/qgeotiledmap_p_p.h
> %%QT_INCDIR%%/QtLocation/%%FULLVER%%/QtLocation/private/qgeotiledmaplabs_p.h
>@@ -235,9 +241,9 @@
> %%QT_INCDIR%%/QtPositioning/%%FULLVER%%/QtPositioning/private/qgeopolygon_p.h
> %%QT_INCDIR%%/QtPositioning/%%FULLVER%%/QtPositioning/private/qgeopositioninfo_p.h
> %%QT_INCDIR%%/QtPositioning/%%FULLVER%%/QtPositioning/private/qgeopositioninfosource_p.h
>+%%QT_INCDIR%%/QtPositioning/%%FULLVER%%/QtPositioning/private/qgeorectangle_p.h
> %%QT_INCDIR%%/QtPositioning/%%FULLVER%%/QtPositioning/private/qgeosatelliteinfo_p.h
> %%QT_INCDIR%%/QtPositioning/%%FULLVER%%/QtPositioning/private/qgeosatelliteinfosource_p.h
>-%%QT_INCDIR%%/QtPositioning/%%FULLVER%%/QtPositioning/private/qgeorectangle_p.h
> %%QT_INCDIR%%/QtPositioning/%%FULLVER%%/QtPositioning/private/qgeoshape_p.h
> %%QT_INCDIR%%/QtPositioning/%%FULLVER%%/QtPositioning/private/qlocationdata_simulator_p.h
> %%QT_INCDIR%%/QtPositioning/%%FULLVER%%/QtPositioning/private/qlocationutils_p.h
>diff --git a/devel/qt5-qdbus/pkg-plist b/devel/qt5-qdbus/pkg-plist
>index 19e49353324e..5a66e33bce87 100644
>--- a/devel/qt5-qdbus/pkg-plist
>+++ b/devel/qt5-qdbus/pkg-plist
>@@ -1 +1,2 @@
> %%QT_BINDIR%%/qdbus
>+%%DEBUG%%%%QT_BINDIR%%/qdbus.debug
>diff --git a/devel/qt5-qdbusviewer/pkg-plist b/devel/qt5-qdbusviewer/pkg-plist
>index 0dcbd6d11ac5..2c82f1f0eb34 100644
>--- a/devel/qt5-qdbusviewer/pkg-plist
>+++ b/devel/qt5-qdbusviewer/pkg-plist
>@@ -1,2 +1,3 @@
> %%QT_BINDIR%%/qdbusviewer
>+%%DEBUG%%%%QT_BINDIR%%/qdbusviewer.debug
> share/pixmaps/qdbusviewer-qt5.png
>diff --git a/devel/qt5-qdoc/Makefile b/devel/qt5-qdoc/Makefile
>index 87d858a047d2..046a1584ca10 100644
>--- a/devel/qt5-qdoc/Makefile
>+++ b/devel/qt5-qdoc/Makefile
>@@ -17,10 +17,6 @@ USE_QT=		core declarative buildtools_build qdoc-data_run
> BUILD_WRKSRC=	${WRKSRC}/src/${PORTNAME}
> INSTALL_WRKSRC=	${BUILD_WRKSRC}
> 
>-PLIST_FILES=	${QT_BINDIR}/qdoc \
>-		${QT_CMAKEDIR}/Qt5DocTools/Qt5DocToolsConfig.cmake \
>-		${QT_CMAKEDIR}/Qt5DocTools/Qt5DocToolsConfigVersion.cmake
>-
> CONFIGURE_ENV=	LLVM_INSTALL_DIR=${LOCALBASE}/llvm${LLVM_DEFAULT}
> 
> QT_BINARIES=	yes
>diff --git a/devel/qt5-qdoc/pkg-plist b/devel/qt5-qdoc/pkg-plist
>new file mode 100644
>index 000000000000..90e3f2ce66c8
>--- /dev/null
>+++ b/devel/qt5-qdoc/pkg-plist
>@@ -0,0 +1,4 @@
>+%%QT_BINDIR%%/qdoc
>+%%DEBUG%%%%QT_BINDIR%%/qdoc.debug
>+%%QT_CMAKEDIR%%/Qt5DocTools/Qt5DocToolsConfig.cmake
>+%%QT_CMAKEDIR%%/Qt5DocTools/Qt5DocToolsConfigVersion.cmake
>diff --git a/devel/qt5-qmake/pkg-plist b/devel/qt5-qmake/pkg-plist
>index 19f33b2b5ae0..e7c83c09bf25 100644
>--- a/devel/qt5-qmake/pkg-plist
>+++ b/devel/qt5-qmake/pkg-plist
>@@ -90,6 +90,8 @@
> %%QT_MKSPECDIR%%/devices/freebsd-generic-clang/qplatformdefs.h
> %%QT_MKSPECDIR%%/devices/freebsd-rasp-pi-clang/qmake.conf
> %%QT_MKSPECDIR%%/devices/freebsd-rasp-pi-clang/qplatformdefs.h
>+%%QT_MKSPECDIR%%/devices/integrity-armv8-SA8155P/qmake.conf
>+%%QT_MKSPECDIR%%/devices/integrity-armv8-SA8155P/qplatformdefs.h
> %%QT_MKSPECDIR%%/devices/integrity-armv8-drive-cx/qmake.conf
> %%QT_MKSPECDIR%%/devices/integrity-armv8-drive-cx/qplatformdefs.h
> %%QT_MKSPECDIR%%/devices/integrity-armv8-msm8996au/qmake.conf
>@@ -229,6 +231,7 @@
> %%QT_MKSPECDIR%%/features/mac/sdk.prf
> %%QT_MKSPECDIR%%/features/mac/toolchain.prf
> %%QT_MKSPECDIR%%/features/mac/unsupported/objc_namespace.prf
>+%%QT_MKSPECDIR%%/features/metatypes.prf
> %%QT_MKSPECDIR%%/features/moc.prf
> %%QT_MKSPECDIR%%/features/no_debug_info.prf
> %%QT_MKSPECDIR%%/features/plugin_bundle.prf
>@@ -408,7 +411,7 @@
> %%QT_MKSPECDIR%%/macx-ios-clang/Info.plist.app
> %%QT_MKSPECDIR%%/macx-ios-clang/Info.plist.dSYM.in
> %%QT_MKSPECDIR%%/macx-ios-clang/Info.plist.lib
>-%%QT_MKSPECDIR%%/macx-ios-clang/LaunchScreen.xib
>+%%QT_MKSPECDIR%%/macx-ios-clang/LaunchScreen.storyboard
> %%QT_MKSPECDIR%%/macx-ios-clang/features/default_post.prf
> %%QT_MKSPECDIR%%/macx-ios-clang/qmake.conf
> %%QT_MKSPECDIR%%/macx-ios-clang/qplatformdefs.h
>diff --git a/devel/qt5-remoteobjects/pkg-plist b/devel/qt5-remoteobjects/pkg-plist
>index ee47a61f1b81..d4f4c65c3c45 100644
>--- a/devel/qt5-remoteobjects/pkg-plist
>+++ b/devel/qt5-remoteobjects/pkg-plist
>@@ -64,6 +64,7 @@
> %%QT_CMAKEDIR%%/Qt5RepParser/Qt5RepParserConfig.cmake
> %%QT_CMAKEDIR%%/Qt5RepParser/Qt5RepParserConfigVersion.cmake
> %%QT_BINDIR%%/repc
>+%%DEBUG%%%%QT_BINDIR%%/repc.debug
> %%QT_LIBDIR%%/libQt5RemoteObjects.prl
> %%QT_LIBDIR%%/libQt5RemoteObjects.so
> %%QT_LIBDIR%%/libQt5RemoteObjects.so.5
>diff --git a/devel/qt5-scxml/pkg-plist b/devel/qt5-scxml/pkg-plist
>index bf1c649594eb..7d52f2b426fb 100644
>--- a/devel/qt5-scxml/pkg-plist
>+++ b/devel/qt5-scxml/pkg-plist
>@@ -45,6 +45,7 @@
> %%QT_CMAKEDIR%%/Qt5Scxml/Qt5ScxmlConfigVersion.cmake
> %%QT_CMAKEDIR%%/Qt5Scxml/Qt5ScxmlMacros.cmake
> %%QT_BINDIR%%/qscxmlc
>+%%DEBUG%%%%QT_BINDIR%%/qscxmlc.debug
> %%QT_LIBDIR%%/libQt5Scxml.prl
> %%QT_LIBDIR%%/libQt5Scxml.so
> %%QT_LIBDIR%%/libQt5Scxml.so.5
>diff --git a/devel/qt5-testlib/pkg-plist b/devel/qt5-testlib/pkg-plist
>index 771655457828..f12f04a08da6 100644
>--- a/devel/qt5-testlib/pkg-plist
>+++ b/devel/qt5-testlib/pkg-plist
>@@ -11,25 +11,25 @@
> %%QT_INCDIR%%/QtTest/%%FULLVER%%/QtTest/private/qbenchmarktimemeasurers_p.h
> %%QT_INCDIR%%/QtTest/%%FULLVER%%/QtTest/private/qbenchmarkvalgrind_p.h
> %%QT_INCDIR%%/QtTest/%%FULLVER%%/QtTest/private/qcsvbenchmarklogger_p.h
>+%%QT_INCDIR%%/QtTest/%%FULLVER%%/QtTest/private/qjunittestlogger_p.h
> %%QT_INCDIR%%/QtTest/%%FULLVER%%/QtTest/private/qplaintestlogger_p.h
> %%QT_INCDIR%%/QtTest/%%FULLVER%%/QtTest/private/qsignaldumper_p.h
>-%%QT_INCDIR%%/QtTest/%%FULLVER%%/QtTest/private/qteamcitylogger_p.h
> %%QT_INCDIR%%/QtTest/%%FULLVER%%/QtTest/private/qtaptestlogger_p.h
>+%%QT_INCDIR%%/QtTest/%%FULLVER%%/QtTest/private/qteamcitylogger_p.h
> %%QT_INCDIR%%/QtTest/%%FULLVER%%/QtTest/private/qtestblacklist_p.h
> %%QT_INCDIR%%/QtTest/%%FULLVER%%/QtTest/private/qtestcoreelement_p.h
> %%QT_INCDIR%%/QtTest/%%FULLVER%%/QtTest/private/qtestcorelist_p.h
> %%QT_INCDIR%%/QtTest/%%FULLVER%%/QtTest/private/qtestelement_p.h
> %%QT_INCDIR%%/QtTest/%%FULLVER%%/QtTest/private/qtestelementattribute_p.h
> %%QT_INCDIR%%/QtTest/%%FULLVER%%/QtTest/private/qtesthelpers_p.h
>+%%QT_INCDIR%%/QtTest/%%FULLVER%%/QtTest/private/qtestjunitstreamer_p.h
> %%QT_INCDIR%%/QtTest/%%FULLVER%%/QtTest/private/qtestlog_p.h
> %%QT_INCDIR%%/QtTest/%%FULLVER%%/QtTest/private/qtestresult_p.h
> %%QT_INCDIR%%/QtTest/%%FULLVER%%/QtTest/private/qtesttable_p.h
> %%QT_INCDIR%%/QtTest/%%FULLVER%%/QtTest/private/qtestutil_macos_p.h
>-%%QT_INCDIR%%/QtTest/%%FULLVER%%/QtTest/private/qtestxunitstreamer_p.h
> %%QT_INCDIR%%/QtTest/%%FULLVER%%/QtTest/private/qttestlib-config_p.h
> %%QT_INCDIR%%/QtTest/%%FULLVER%%/QtTest/private/qxctestlogger_p.h
> %%QT_INCDIR%%/QtTest/%%FULLVER%%/QtTest/private/qxmltestlogger_p.h
>-%%QT_INCDIR%%/QtTest/%%FULLVER%%/QtTest/private/qxunittestlogger_p.h
> %%QT_INCDIR%%/QtTest/%%FULLVER%%/QtTest/private/valgrind_p.h
> %%QT_INCDIR%%/QtTest/QAbstractItemModelTester
> %%QT_INCDIR%%/QtTest/QEventSizeOfChecker
>diff --git a/devel/qt5/distinfo b/devel/qt5/distinfo
>index 55bf98575954..c3d3b8f661e3 100644
>--- a/devel/qt5/distinfo
>+++ b/devel/qt5/distinfo
>@@ -1,81 +1,81 @@
>-TIMESTAMP = 1586029185
>-SHA256 (KDE/Qt/5.14.2/qt3d-everywhere-src-5.14.2.tar.xz) = 9da82f1cc4b7d416d31ec96224c59d221473a48f6e579eef978f7d2e3932c674
>-SIZE (KDE/Qt/5.14.2/qt3d-everywhere-src-5.14.2.tar.xz) = 81576496
>-SHA256 (KDE/Qt/5.14.2/qtactiveqt-everywhere-src-5.14.2.tar.xz) = b53517d5d128719773a2941ba52da10acd7aa3149948862bc08c98f5b64152a9
>-SIZE (KDE/Qt/5.14.2/qtactiveqt-everywhere-src-5.14.2.tar.xz) = 265976
>-SHA256 (KDE/Qt/5.14.2/qtandroidextras-everywhere-src-5.14.2.tar.xz) = 4a8fd92b5c49a663cf0bd492804eaf1574d11137e2cbdd41d6bf5fad0c3c4d76
>-SIZE (KDE/Qt/5.14.2/qtandroidextras-everywhere-src-5.14.2.tar.xz) = 105844
>-SHA256 (KDE/Qt/5.14.2/qtbase-everywhere-src-5.14.2.tar.xz) = 48b9e79220941665a9dd827548c6428f7aa3052ccba8f4f7e039a94aa1d2b28a
>-SIZE (KDE/Qt/5.14.2/qtbase-everywhere-src-5.14.2.tar.xz) = 49865752
>-SHA256 (KDE/Qt/5.14.2/qtcharts-everywhere-src-5.14.2.tar.xz) = adb25203ea748d886cc3d8993c20def702115eccea311594592058134ba83bb7
>-SIZE (KDE/Qt/5.14.2/qtcharts-everywhere-src-5.14.2.tar.xz) = 4250508
>-SHA256 (KDE/Qt/5.14.2/qtconnectivity-everywhere-src-5.14.2.tar.xz) = abe67b3e3a775e2a2e27c62a5391f37007ffbe72bce58b96116995616cfcbc28
>-SIZE (KDE/Qt/5.14.2/qtconnectivity-everywhere-src-5.14.2.tar.xz) = 2804940
>-SHA256 (KDE/Qt/5.14.2/qtdatavis3d-everywhere-src-5.14.2.tar.xz) = 723c03db2d2805b1be4ca534ac7bc867a1a21894d33a7e9261a382f3fa9d0e20
>-SIZE (KDE/Qt/5.14.2/qtdatavis3d-everywhere-src-5.14.2.tar.xz) = 5190800
>-SHA256 (KDE/Qt/5.14.2/qtdeclarative-everywhere-src-5.14.2.tar.xz) = a3c4617adc9760347c93d2eb6c25d22f620cd22f44afa0494eb499a805831650
>-SIZE (KDE/Qt/5.14.2/qtdeclarative-everywhere-src-5.14.2.tar.xz) = 21305980
>-SHA256 (KDE/Qt/5.14.2/qtdoc-everywhere-src-5.14.2.tar.xz) = 5a55cdb55af35eb222d06179567851c175f24a3732f7dee5be073df4a893172b
>-SIZE (KDE/Qt/5.14.2/qtdoc-everywhere-src-5.14.2.tar.xz) = 5736088
>-SHA256 (KDE/Qt/5.14.2/qtgamepad-everywhere-src-5.14.2.tar.xz) = f77daadb4755cf760e11812264259fb103396fd1b06df1e06b5df162081c8d03
>-SIZE (KDE/Qt/5.14.2/qtgamepad-everywhere-src-5.14.2.tar.xz) = 386940
>-SHA256 (KDE/Qt/5.14.2/qtgraphicaleffects-everywhere-src-5.14.2.tar.xz) = 487a7f858244a08264363733055a8cf8b00e77c658c5608cc462817d15e4b50f
>-SIZE (KDE/Qt/5.14.2/qtgraphicaleffects-everywhere-src-5.14.2.tar.xz) = 14040880
>-SHA256 (KDE/Qt/5.14.2/qtimageformats-everywhere-src-5.14.2.tar.xz) = 733eca0165c15e046b106039c989dac7f6bc2ecf215396d965ed065369264f8c
>-SIZE (KDE/Qt/5.14.2/qtimageformats-everywhere-src-5.14.2.tar.xz) = 1805208
>-SHA256 (KDE/Qt/5.14.2/qtlocation-everywhere-src-5.14.2.tar.xz) = c37708bc396f6dac397b49a6a268d5edb39e1c8296ca2337ce9e80bde04775cc
>-SIZE (KDE/Qt/5.14.2/qtlocation-everywhere-src-5.14.2.tar.xz) = 6120852
>-SHA256 (KDE/Qt/5.14.2/qtlottie-everywhere-src-5.14.2.tar.xz) = 55d1392dc92cbec11263084360075dc5fc3fdc25c1969adfbdec84299b285978
>-SIZE (KDE/Qt/5.14.2/qtlottie-everywhere-src-5.14.2.tar.xz) = 82572
>-SHA256 (KDE/Qt/5.14.2/qtmacextras-everywhere-src-5.14.2.tar.xz) = d12587b46c84a7822194fc3ccf46f7c18ff3b31566d3dde4f5fe772f1d8776e5
>-SIZE (KDE/Qt/5.14.2/qtmacextras-everywhere-src-5.14.2.tar.xz) = 69360
>-SHA256 (KDE/Qt/5.14.2/qtmultimedia-everywhere-src-5.14.2.tar.xz) = 7acd8ede6835314206e407b35b668f0add67544577fb51fe67afb03137fb9fe9
>-SIZE (KDE/Qt/5.14.2/qtmultimedia-everywhere-src-5.14.2.tar.xz) = 3793964
>-SHA256 (KDE/Qt/5.14.2/qtnetworkauth-everywhere-src-5.14.2.tar.xz) = 4f00513dd18598487d02187b80b54c669662cf8a8f2573858c7f9282d7b9265e
>-SIZE (KDE/Qt/5.14.2/qtnetworkauth-everywhere-src-5.14.2.tar.xz) = 141424
>-SHA256 (KDE/Qt/5.14.2/qtpurchasing-everywhere-src-5.14.2.tar.xz) = 69b087001e8fcec5bb49ca333d5f44e6b7eb09f76421dc792fc9cd76dee9e851
>-SIZE (KDE/Qt/5.14.2/qtpurchasing-everywhere-src-5.14.2.tar.xz) = 208664
>-SHA256 (KDE/Qt/5.14.2/qtquickcontrols-everywhere-src-5.14.2.tar.xz) = d55def1dd4ee1250bd6a4e76849f4e362368b6411c2216d5f669c761216d4461
>-SIZE (KDE/Qt/5.14.2/qtquickcontrols-everywhere-src-5.14.2.tar.xz) = 5981560
>-SHA256 (KDE/Qt/5.14.2/qtquickcontrols2-everywhere-src-5.14.2.tar.xz) = faf7d349d8f4a8db36cd3c62a5724bcf689300f2fdb7dc1ea034392aab981560
>-SIZE (KDE/Qt/5.14.2/qtquickcontrols2-everywhere-src-5.14.2.tar.xz) = 8153752
>-SHA256 (KDE/Qt/5.14.2/qtremoteobjects-everywhere-src-5.14.2.tar.xz) = a6a601c4f4aab6fe41a462dae57033819f697e3317240a382cee45c08be614d6
>-SIZE (KDE/Qt/5.14.2/qtremoteobjects-everywhere-src-5.14.2.tar.xz) = 376740
>-SHA256 (KDE/Qt/5.14.2/qtscript-everywhere-src-5.14.2.tar.xz) = e9fd487ccb3cbf00e86b0b803aa79e9f6bbe7a337b8e97d069e040c3e0789bfe
>-SIZE (KDE/Qt/5.14.2/qtscript-everywhere-src-5.14.2.tar.xz) = 2654528
>-SHA256 (KDE/Qt/5.14.2/qtscxml-everywhere-src-5.14.2.tar.xz) = 030cea352a56074f577200f967ef37c959b2767127de61f766f59b0d99763790
>-SIZE (KDE/Qt/5.14.2/qtscxml-everywhere-src-5.14.2.tar.xz) = 433268
>-SHA256 (KDE/Qt/5.14.2/qtsensors-everywhere-src-5.14.2.tar.xz) = bccfca6910b0383d8f65823496ff5011abed2fa8fd446b4b27333d0fd7bb8c61
>-SIZE (KDE/Qt/5.14.2/qtsensors-everywhere-src-5.14.2.tar.xz) = 2050616
>-SHA256 (KDE/Qt/5.14.2/qtserialbus-everywhere-src-5.14.2.tar.xz) = 0b7762175a649a40c4dd619c5de61d772235dc86099343278e2c3229d0836a91
>-SIZE (KDE/Qt/5.14.2/qtserialbus-everywhere-src-5.14.2.tar.xz) = 349808
>-SHA256 (KDE/Qt/5.14.2/qtserialport-everywhere-src-5.14.2.tar.xz) = a6d977dd723ad4d3368b5163691405b8852f809974a96ec54103494e834aea21
>-SIZE (KDE/Qt/5.14.2/qtserialport-everywhere-src-5.14.2.tar.xz) = 316492
>-SHA256 (KDE/Qt/5.14.2/qtspeech-everywhere-src-5.14.2.tar.xz) = 5e9e8ea62f0207ba894df1e136df0af9fc5443c7817d28c39f0ea2bbae9ec6da
>-SIZE (KDE/Qt/5.14.2/qtspeech-everywhere-src-5.14.2.tar.xz) = 101100
>-SHA256 (KDE/Qt/5.14.2/qtsvg-everywhere-src-5.14.2.tar.xz) = c7d7faa01a3e7a6e4d38fafcec5529a488258218749779e6fa0e09a21173b5a1
>-SIZE (KDE/Qt/5.14.2/qtsvg-everywhere-src-5.14.2.tar.xz) = 1880100
>-SHA256 (KDE/Qt/5.14.2/qttools-everywhere-src-5.14.2.tar.xz) = 5bb0cf7832b88eb6bc9d4289f98307eb14b16a453ad6cf42cca13c4fe1a053c5
>-SIZE (KDE/Qt/5.14.2/qttools-everywhere-src-5.14.2.tar.xz) = 8815020
>-SHA256 (KDE/Qt/5.14.2/qttranslations-everywhere-src-5.14.2.tar.xz) = 2088ebee9f5dd0336c9fd11436899a95b7ce0141ce072290de1e8f315d82d1a6
>-SIZE (KDE/Qt/5.14.2/qttranslations-everywhere-src-5.14.2.tar.xz) = 1348684
>-SHA256 (KDE/Qt/5.14.2/qtvirtualkeyboard-everywhere-src-5.14.2.tar.xz) = 364f3338563e617e7c964a37170b415b546c5f82965e781271f9dada3e3868d7
>-SIZE (KDE/Qt/5.14.2/qtvirtualkeyboard-everywhere-src-5.14.2.tar.xz) = 10957372
>-SHA256 (KDE/Qt/5.14.2/qtwayland-everywhere-src-5.14.2.tar.xz) = d31633ca718fb407cf70870613d45d0ed80aa04c058586ac3036bae1aff7832a
>-SIZE (KDE/Qt/5.14.2/qtwayland-everywhere-src-5.14.2.tar.xz) = 544532
>-SHA256 (KDE/Qt/5.14.2/qtwebchannel-everywhere-src-5.14.2.tar.xz) = 7d1dc8441523638c3d455c7d408ec65aebc073acab80e24063865f929231f874
>-SIZE (KDE/Qt/5.14.2/qtwebchannel-everywhere-src-5.14.2.tar.xz) = 202592
>-SHA256 (KDE/Qt/5.14.2/qtwebengine-everywhere-src-5.14.2.tar.xz) = e169d6a75d8c397e04f843bc1b9585950fb9a001255cd18d6293f66fa8a6c947
>-SIZE (KDE/Qt/5.14.2/qtwebengine-everywhere-src-5.14.2.tar.xz) = 242467568
>-SHA256 (KDE/Qt/5.14.2/qtwebglplugin-everywhere-src-5.14.2.tar.xz) = eb4118910b65d03d8448658ac1646e860d337e59b82d6575beda21824e313417
>-SIZE (KDE/Qt/5.14.2/qtwebglplugin-everywhere-src-5.14.2.tar.xz) = 74140
>-SHA256 (KDE/Qt/5.14.2/qtwebsockets-everywhere-src-5.14.2.tar.xz) = f06e62b18313fe1b40a35566e79645de4a8e7ac9f7717d1d98a06c5b49afca84
>-SIZE (KDE/Qt/5.14.2/qtwebsockets-everywhere-src-5.14.2.tar.xz) = 252820
>-SHA256 (KDE/Qt/5.14.2/qtwebview-everywhere-src-5.14.2.tar.xz) = c61f9213ee84fd7408898c0194468208ffb51af9d257e87e6b53daf24f65ff4b
>-SIZE (KDE/Qt/5.14.2/qtwebview-everywhere-src-5.14.2.tar.xz) = 132840
>-SHA256 (KDE/Qt/5.14.2/qtwinextras-everywhere-src-5.14.2.tar.xz) = 980f1bc31b37c8597c0bac55f69ecf00d1677218ce82f7bc3933236cb6d907f2
>-SIZE (KDE/Qt/5.14.2/qtwinextras-everywhere-src-5.14.2.tar.xz) = 763632
>-SHA256 (KDE/Qt/5.14.2/qtx11extras-everywhere-src-5.14.2.tar.xz) = be9a84a03a2ee81771215264e5dff7a996d04be6192b8cdaa1d41e319a81545a
>-SIZE (KDE/Qt/5.14.2/qtx11extras-everywhere-src-5.14.2.tar.xz) = 135712
>-SHA256 (KDE/Qt/5.14.2/qtxmlpatterns-everywhere-src-5.14.2.tar.xz) = 219a876665345e3801baff71f31f30f5495c1cb9ab23fbbd27602632c80fcfb7
>-SIZE (KDE/Qt/5.14.2/qtxmlpatterns-everywhere-src-5.14.2.tar.xz) = 1404028
>+TIMESTAMP = 1590590537
>+SHA256 (KDE/Qt/5.15.0/qt3d-everywhere-src-5.15.0.tar.xz) = 61856f0c453b79e98b7a1e65ea8f59976fa78230ffa8dec959b5f4b45383dffd
>+SIZE (KDE/Qt/5.15.0/qt3d-everywhere-src-5.15.0.tar.xz) = 81921676
>+SHA256 (KDE/Qt/5.15.0/qtactiveqt-everywhere-src-5.15.0.tar.xz) = 1b455eacfb9ef49912d7a79040ea409a6ab88dfa192d313e6b5e02a79d741b51
>+SIZE (KDE/Qt/5.15.0/qtactiveqt-everywhere-src-5.15.0.tar.xz) = 267788
>+SHA256 (KDE/Qt/5.15.0/qtandroidextras-everywhere-src-5.15.0.tar.xz) = c9019185221e94e37e250c84acaebfb7b2f5342e8ad60cdcff052ac2b85ec671
>+SIZE (KDE/Qt/5.15.0/qtandroidextras-everywhere-src-5.15.0.tar.xz) = 183492
>+SHA256 (KDE/Qt/5.15.0/qtbase-everywhere-src-5.15.0.tar.xz) = 9e7af10aece15fa9500369efde69cb220eee8ec3a6818afe01ce1e7d484824c5
>+SIZE (KDE/Qt/5.15.0/qtbase-everywhere-src-5.15.0.tar.xz) = 49931940
>+SHA256 (KDE/Qt/5.15.0/qtcharts-everywhere-src-5.15.0.tar.xz) = 44a24fc16abcaf9ae97ecf3215f6f3b44ebdb3b73bcb4ed3549a51519e4883a7
>+SIZE (KDE/Qt/5.15.0/qtcharts-everywhere-src-5.15.0.tar.xz) = 4250568
>+SHA256 (KDE/Qt/5.15.0/qtconnectivity-everywhere-src-5.15.0.tar.xz) = f911fb8f8bf3a9958785d0378d25ced8989047938b7138d619854a94fa0b27dd
>+SIZE (KDE/Qt/5.15.0/qtconnectivity-everywhere-src-5.15.0.tar.xz) = 2803792
>+SHA256 (KDE/Qt/5.15.0/qtdatavis3d-everywhere-src-5.15.0.tar.xz) = 8f07747f371f7c515c667240a795105c89aa83c08d88ee92fa1ef7efccea10a3
>+SIZE (KDE/Qt/5.15.0/qtdatavis3d-everywhere-src-5.15.0.tar.xz) = 5190804
>+SHA256 (KDE/Qt/5.15.0/qtdeclarative-everywhere-src-5.15.0.tar.xz) = 9c3c93fb7d340b2f7d738d12408c047318c78973cb45bfc5ff6b3a57e1fef699
>+SIZE (KDE/Qt/5.15.0/qtdeclarative-everywhere-src-5.15.0.tar.xz) = 21493268
>+SHA256 (KDE/Qt/5.15.0/qtdoc-everywhere-src-5.15.0.tar.xz) = 07ca8db98c317f25cc9a041c48a6824baf63893bf5b535d6f8d266dea8c7659f
>+SIZE (KDE/Qt/5.15.0/qtdoc-everywhere-src-5.15.0.tar.xz) = 5742500
>+SHA256 (KDE/Qt/5.15.0/qtgamepad-everywhere-src-5.15.0.tar.xz) = dda54d9f90897944bed5e6af48a904a677fd97eb6f57ab08a2b232c431caf31a
>+SIZE (KDE/Qt/5.15.0/qtgamepad-everywhere-src-5.15.0.tar.xz) = 386724
>+SHA256 (KDE/Qt/5.15.0/qtgraphicaleffects-everywhere-src-5.15.0.tar.xz) = 0d2ea4bc73b9df13a4b739dcbc1e3c7b298c7e682f7f9252b232e3bde7b63eda
>+SIZE (KDE/Qt/5.15.0/qtgraphicaleffects-everywhere-src-5.15.0.tar.xz) = 14040716
>+SHA256 (KDE/Qt/5.15.0/qtimageformats-everywhere-src-5.15.0.tar.xz) = 83f32101b1a898fcb8ed6f11a657d1125484ac0c2223014b61849d9010efebc8
>+SIZE (KDE/Qt/5.15.0/qtimageformats-everywhere-src-5.15.0.tar.xz) = 1811092
>+SHA256 (KDE/Qt/5.15.0/qtlocation-everywhere-src-5.15.0.tar.xz) = c68b0778a521e5522641c41b1778999dd408ebfda1e0de166a83743268be5f3f
>+SIZE (KDE/Qt/5.15.0/qtlocation-everywhere-src-5.15.0.tar.xz) = 6542152
>+SHA256 (KDE/Qt/5.15.0/qtlottie-everywhere-src-5.15.0.tar.xz) = 2053f474dcd7184fdcae2507f47af6527f6ca25b4424483f9265853c3626c833
>+SIZE (KDE/Qt/5.15.0/qtlottie-everywhere-src-5.15.0.tar.xz) = 82384
>+SHA256 (KDE/Qt/5.15.0/qtmacextras-everywhere-src-5.15.0.tar.xz) = 95a8c35b30373224cdd6d1ca0bdda1a314b20e91551a4824e8ca7e50ce8ff439
>+SIZE (KDE/Qt/5.15.0/qtmacextras-everywhere-src-5.15.0.tar.xz) = 69248
>+SHA256 (KDE/Qt/5.15.0/qtmultimedia-everywhere-src-5.15.0.tar.xz) = 0708d867697f392dd3600c5c1c88f5c61b772a5250a4d059dca67b844af0fbd7
>+SIZE (KDE/Qt/5.15.0/qtmultimedia-everywhere-src-5.15.0.tar.xz) = 3796364
>+SHA256 (KDE/Qt/5.15.0/qtnetworkauth-everywhere-src-5.15.0.tar.xz) = 96c6107f6e85662a05f114c5b9bd3503a3100bd940e1494c73a99e77f9e7cf85
>+SIZE (KDE/Qt/5.15.0/qtnetworkauth-everywhere-src-5.15.0.tar.xz) = 141360
>+SHA256 (KDE/Qt/5.15.0/qtpurchasing-everywhere-src-5.15.0.tar.xz) = 2127f180c4889055d88e2b402b62be80a5a213a0e48d2056cc9a01d9913b3a16
>+SIZE (KDE/Qt/5.15.0/qtpurchasing-everywhere-src-5.15.0.tar.xz) = 208560
>+SHA256 (KDE/Qt/5.15.0/qtquickcontrols-everywhere-src-5.15.0.tar.xz) = 7072cf4cd27e9f18b36b1c48dec7c79608cf87ba847d3fc3de133f220ec1acee
>+SIZE (KDE/Qt/5.15.0/qtquickcontrols-everywhere-src-5.15.0.tar.xz) = 5981340
>+SHA256 (KDE/Qt/5.15.0/qtquickcontrols2-everywhere-src-5.15.0.tar.xz) = 839abda9b58cd8656b2e5f46afbb484e63df466481ace43318c4c2022684648f
>+SIZE (KDE/Qt/5.15.0/qtquickcontrols2-everywhere-src-5.15.0.tar.xz) = 8164236
>+SHA256 (KDE/Qt/5.15.0/qtremoteobjects-everywhere-src-5.15.0.tar.xz) = 86fcfdce77f13c7babdec4dc1d0c4b7b6b02e40120a4250dc59e911c53c08abf
>+SIZE (KDE/Qt/5.15.0/qtremoteobjects-everywhere-src-5.15.0.tar.xz) = 369100
>+SHA256 (KDE/Qt/5.15.0/qtscript-everywhere-src-5.15.0.tar.xz) = 02dc21b309621876a89671be27cea86a58e74a96aa28da65fe1b37a3aad29373
>+SIZE (KDE/Qt/5.15.0/qtscript-everywhere-src-5.15.0.tar.xz) = 2654416
>+SHA256 (KDE/Qt/5.15.0/qtscxml-everywhere-src-5.15.0.tar.xz) = 9c3a72bf5ebd07553b0049cc1943f04cff93b7e53bde8c81d652422dbf12ff72
>+SIZE (KDE/Qt/5.15.0/qtscxml-everywhere-src-5.15.0.tar.xz) = 433368
>+SHA256 (KDE/Qt/5.15.0/qtsensors-everywhere-src-5.15.0.tar.xz) = 12b17ed6cbe6c49c8ab71958bc5d8ad1c42bf20e2fa72613ede11001e98144da
>+SIZE (KDE/Qt/5.15.0/qtsensors-everywhere-src-5.15.0.tar.xz) = 2050404
>+SHA256 (KDE/Qt/5.15.0/qtserialbus-everywhere-src-5.15.0.tar.xz) = cee067c84d025e221b83d109b58ea16c4d2dc0af0aea45cc6724acd33a1b7379
>+SIZE (KDE/Qt/5.15.0/qtserialbus-everywhere-src-5.15.0.tar.xz) = 351232
>+SHA256 (KDE/Qt/5.15.0/qtserialport-everywhere-src-5.15.0.tar.xz) = ba19369069a707dffddca8d9c477bb2bb4aa26630dfee6792254c4bf9bd57a67
>+SIZE (KDE/Qt/5.15.0/qtserialport-everywhere-src-5.15.0.tar.xz) = 316596
>+SHA256 (KDE/Qt/5.15.0/qtspeech-everywhere-src-5.15.0.tar.xz) = 7219a878c14a24d0ca18d52df1717361b13aee96ac9790baf9ad2b383492dd61
>+SIZE (KDE/Qt/5.15.0/qtspeech-everywhere-src-5.15.0.tar.xz) = 101240
>+SHA256 (KDE/Qt/5.15.0/qtsvg-everywhere-src-5.15.0.tar.xz) = ee4d287e2e205ca8c08921b9cbe0fc58bf46be080b5359ad4d7fbdee44aeee0d
>+SIZE (KDE/Qt/5.15.0/qtsvg-everywhere-src-5.15.0.tar.xz) = 1870588
>+SHA256 (KDE/Qt/5.15.0/qttools-everywhere-src-5.15.0.tar.xz) = ddbcb49aab3a2e3672582c6e2e7bec0058feff790f67472343c79e2895e0e437
>+SIZE (KDE/Qt/5.15.0/qttools-everywhere-src-5.15.0.tar.xz) = 8850752
>+SHA256 (KDE/Qt/5.15.0/qttranslations-everywhere-src-5.15.0.tar.xz) = 45c43268d9df50784d4d8ca345fce9288a1055fd074ac0ef508097f7aeba22fe
>+SIZE (KDE/Qt/5.15.0/qttranslations-everywhere-src-5.15.0.tar.xz) = 1356928
>+SHA256 (KDE/Qt/5.15.0/qtvirtualkeyboard-everywhere-src-5.15.0.tar.xz) = f22f9204ab65578d9c8aa832a8a39108f826e00a7d391c7884ff490c587f34be
>+SIZE (KDE/Qt/5.15.0/qtvirtualkeyboard-everywhere-src-5.15.0.tar.xz) = 10957752
>+SHA256 (KDE/Qt/5.15.0/qtwayland-everywhere-src-5.15.0.tar.xz) = 084133e10bfbd32a28125639660c59975f23457bba6a79b30a25802cec76a9fb
>+SIZE (KDE/Qt/5.15.0/qtwayland-everywhere-src-5.15.0.tar.xz) = 562408
>+SHA256 (KDE/Qt/5.15.0/qtwebchannel-everywhere-src-5.15.0.tar.xz) = ea80510b363e6f92ce99932f06d176e43459c4a5159fe97b5ef96fcfbab5ed4f
>+SIZE (KDE/Qt/5.15.0/qtwebchannel-everywhere-src-5.15.0.tar.xz) = 202844
>+SHA256 (KDE/Qt/5.15.0/qtwebengine-everywhere-src-5.15.0.tar.xz) = c38e2fda7ed1b7d5a90f26abf231ec0715d78a5bc39a94673d8e39d75f04c5df
>+SIZE (KDE/Qt/5.15.0/qtwebengine-everywhere-src-5.15.0.tar.xz) = 278257432
>+SHA256 (KDE/Qt/5.15.0/qtwebglplugin-everywhere-src-5.15.0.tar.xz) = f7b81f25ddf7b3a0046daa7224bc1e18c8b754b00b1a33775f30f827a5cdca15
>+SIZE (KDE/Qt/5.15.0/qtwebglplugin-everywhere-src-5.15.0.tar.xz) = 73956
>+SHA256 (KDE/Qt/5.15.0/qtwebsockets-everywhere-src-5.15.0.tar.xz) = 87c2f6542778f9b65b3f208740c1d0db643fd0bede21404b9abb265355da5092
>+SIZE (KDE/Qt/5.15.0/qtwebsockets-everywhere-src-5.15.0.tar.xz) = 253616
>+SHA256 (KDE/Qt/5.15.0/qtwebview-everywhere-src-5.15.0.tar.xz) = b87ea205ce79c6b438ebe596e91fa80ba11f6aac7e89ffbf52b337d0fc8d6660
>+SIZE (KDE/Qt/5.15.0/qtwebview-everywhere-src-5.15.0.tar.xz) = 133044
>+SHA256 (KDE/Qt/5.15.0/qtwinextras-everywhere-src-5.15.0.tar.xz) = d77f2cb2ce83bdbfd0a970bc8d7d11c96b2df16befc257d6594f79dfd92abff0
>+SIZE (KDE/Qt/5.15.0/qtwinextras-everywhere-src-5.15.0.tar.xz) = 763572
>+SHA256 (KDE/Qt/5.15.0/qtx11extras-everywhere-src-5.15.0.tar.xz) = c72b6c188284facddcf82835af048240e721dc8d6d9e8a7bd71d76fd876881a1
>+SIZE (KDE/Qt/5.15.0/qtx11extras-everywhere-src-5.15.0.tar.xz) = 135648
>+SHA256 (KDE/Qt/5.15.0/qtxmlpatterns-everywhere-src-5.15.0.tar.xz) = 2752cf2aa25ebfda89c3736457e27b3d0c7c7ed290dcfd52c209f9f905998507
>+SIZE (KDE/Qt/5.15.0/qtxmlpatterns-everywhere-src-5.15.0.tar.xz) = 1403484
>diff --git a/graphics/qt5-3d/pkg-plist b/graphics/qt5-3d/pkg-plist
>index dc72d2f42e3c..ec2c0e8ec825 100644
>--- a/graphics/qt5-3d/pkg-plist
>+++ b/graphics/qt5-3d/pkg-plist
>@@ -164,6 +164,7 @@
> %%QT_INCDIR%%/Qt3DCore/%%FULLVER%%/Qt3DCore/private/qframeallocator_p_p.h
> %%QT_INCDIR%%/Qt3DCore/%%FULLVER%%/Qt3DCore/private/qhandle_p.h
> %%QT_INCDIR%%/Qt3DCore/%%FULLVER%%/Qt3DCore/private/qjoint_p.h
>+%%QT_INCDIR%%/Qt3DCore/%%FULLVER%%/Qt3DCore/private/qloadgltf_p.h
> %%QT_INCDIR%%/Qt3DCore/%%FULLVER%%/Qt3DCore/private/qlockableobserverinterface_p.h
> %%QT_INCDIR%%/Qt3DCore/%%FULLVER%%/Qt3DCore/private/qmath3d_p.h
> %%QT_INCDIR%%/Qt3DCore/%%FULLVER%%/Qt3DCore/private/qnode_p.h
>@@ -224,12 +225,9 @@
> %%QT_INCDIR%%/Qt3DCore/QBackendNodeMapperPtr
> %%QT_INCDIR%%/Qt3DCore/QComponent
> %%QT_INCDIR%%/Qt3DCore/QComponentAddedChange
>-%%QT_INCDIR%%/Qt3DCore/QComponentAddedChangePtr
> %%QT_INCDIR%%/Qt3DCore/QComponentRemovedChange
>-%%QT_INCDIR%%/Qt3DCore/QComponentRemovedChangePtr
> %%QT_INCDIR%%/Qt3DCore/QComponentVector
> %%QT_INCDIR%%/Qt3DCore/QDynamicPropertyUpdatedChange
>-%%QT_INCDIR%%/Qt3DCore/QDynamicPropertyUpdatedChangePtr
> %%QT_INCDIR%%/Qt3DCore/QEntity
> %%QT_INCDIR%%/Qt3DCore/QEntityPtr
> %%QT_INCDIR%%/Qt3DCore/QJoint
>@@ -240,33 +238,23 @@
> %%QT_INCDIR%%/Qt3DCore/QNodeCreatedChangeBase
> %%QT_INCDIR%%/Qt3DCore/QNodeCreatedChangeBasePtr
> %%QT_INCDIR%%/Qt3DCore/QNodeDestroyedChange
>-%%QT_INCDIR%%/Qt3DCore/QNodeDestroyedChangePtr
> %%QT_INCDIR%%/Qt3DCore/QNodeId
> %%QT_INCDIR%%/Qt3DCore/QNodeIdTypePair
> %%QT_INCDIR%%/Qt3DCore/QNodePtr
> %%QT_INCDIR%%/Qt3DCore/QNodeVector
> %%QT_INCDIR%%/Qt3DCore/QPropertyNodeAddedChange
>-%%QT_INCDIR%%/Qt3DCore/QPropertyNodeAddedChangePtr
> %%QT_INCDIR%%/Qt3DCore/QPropertyNodeRemovedChange
>-%%QT_INCDIR%%/Qt3DCore/QPropertyNodeRemovedChangePtr
> %%QT_INCDIR%%/Qt3DCore/QPropertyUpdatedChange
> %%QT_INCDIR%%/Qt3DCore/QPropertyUpdatedChangeBase
>-%%QT_INCDIR%%/Qt3DCore/QPropertyUpdatedChangeBasePtr
>-%%QT_INCDIR%%/Qt3DCore/QPropertyUpdatedChangePtr
> %%QT_INCDIR%%/Qt3DCore/QPropertyValueAddedChange
> %%QT_INCDIR%%/Qt3DCore/QPropertyValueAddedChangeBase
>-%%QT_INCDIR%%/Qt3DCore/QPropertyValueAddedChangeBasePtr
>-%%QT_INCDIR%%/Qt3DCore/QPropertyValueAddedChangePtr
> %%QT_INCDIR%%/Qt3DCore/QPropertyValueRemovedChange
> %%QT_INCDIR%%/Qt3DCore/QPropertyValueRemovedChangeBase
>-%%QT_INCDIR%%/Qt3DCore/QPropertyValueRemovedChangeBasePtr
>-%%QT_INCDIR%%/Qt3DCore/QPropertyValueRemovedChangePtr
> %%QT_INCDIR%%/Qt3DCore/QSceneChange
> %%QT_INCDIR%%/Qt3DCore/QSceneChangePtr
> %%QT_INCDIR%%/Qt3DCore/QSkeleton
> %%QT_INCDIR%%/Qt3DCore/QSkeletonLoader
> %%QT_INCDIR%%/Qt3DCore/QStaticPropertyUpdatedChangeBase
>-%%QT_INCDIR%%/Qt3DCore/QStaticPropertyUpdatedChangeBasePtr
> %%QT_INCDIR%%/Qt3DCore/QStaticPropertyValueAddedChangeBase
> %%QT_INCDIR%%/Qt3DCore/QStaticPropertyValueRemovedChangeBase
> %%QT_INCDIR%%/Qt3DCore/QTransform
>@@ -381,6 +369,7 @@
> %%QT_INCDIR%%/Qt3DExtras/QSpriteSheetItem
> %%QT_INCDIR%%/Qt3DExtras/QText2DEntity
> %%QT_INCDIR%%/Qt3DExtras/QTextureMaterial
>+%%QT_INCDIR%%/Qt3DExtras/QTexturedMetalRoughMaterial
> %%QT_INCDIR%%/Qt3DExtras/QTorusGeometry
> %%QT_INCDIR%%/Qt3DExtras/QTorusMesh
> %%QT_INCDIR%%/Qt3DExtras/Qt3DExtras
>@@ -679,6 +668,7 @@
> %%QT_INCDIR%%/Qt3DRender/%%FULLVER%%/Qt3DRender/private/abstractpickingjob_p.h
> %%QT_INCDIR%%/Qt3DRender/%%FULLVER%%/Qt3DRender/private/abstractrenderer_p.h
> %%QT_INCDIR%%/Qt3DRender/%%FULLVER%%/Qt3DRender/private/aligned_malloc_p.h
>+%%QT_INCDIR%%/Qt3DRender/%%FULLVER%%/Qt3DRender/private/apishadermanager_p.h
> %%QT_INCDIR%%/Qt3DRender/%%FULLVER%%/Qt3DRender/private/armature_p.h
> %%QT_INCDIR%%/Qt3DRender/%%FULLVER%%/Qt3DRender/private/attachmentpack_p.h
> %%QT_INCDIR%%/Qt3DRender/%%FULLVER%%/Qt3DRender/private/attribute_p.h
>@@ -696,9 +686,9 @@
> %%QT_INCDIR%%/Qt3DRender/%%FULLVER%%/Qt3DRender/private/cameralens_p.h
> %%QT_INCDIR%%/Qt3DRender/%%FULLVER%%/Qt3DRender/private/cameraselectornode_p.h
> %%QT_INCDIR%%/Qt3DRender/%%FULLVER%%/Qt3DRender/private/clearbuffers_p.h
>-%%QT_INCDIR%%/Qt3DRender/%%FULLVER%%/Qt3DRender/private/commandexecuter_p.h
> %%QT_INCDIR%%/Qt3DRender/%%FULLVER%%/Qt3DRender/private/computecommand_p.h
> %%QT_INCDIR%%/Qt3DRender/%%FULLVER%%/Qt3DRender/private/computefilteredboundingvolumejob_p.h
>+%%QT_INCDIR%%/Qt3DRender/%%FULLVER%%/Qt3DRender/private/debugoverlay_p.h
> %%QT_INCDIR%%/Qt3DRender/%%FULLVER%%/Qt3DRender/private/dispatchcompute_p.h
> %%QT_INCDIR%%/Qt3DRender/%%FULLVER%%/Qt3DRender/private/effect_p.h
> %%QT_INCDIR%%/Qt3DRender/%%FULLVER%%/Qt3DRender/private/entity_p.h
>@@ -707,7 +697,6 @@
> %%QT_INCDIR%%/Qt3DRender/%%FULLVER%%/Qt3DRender/private/entityvisitor_p.h
> %%QT_INCDIR%%/Qt3DRender/%%FULLVER%%/Qt3DRender/private/environmentlight_p.h
> %%QT_INCDIR%%/Qt3DRender/%%FULLVER%%/Qt3DRender/private/expandboundingvolumejob_p.h
>-%%QT_INCDIR%%/Qt3DRender/%%FULLVER%%/Qt3DRender/private/filtercompatibletechniquejob_p.h
> %%QT_INCDIR%%/Qt3DRender/%%FULLVER%%/Qt3DRender/private/filterentitybycomponentjob_p.h
> %%QT_INCDIR%%/Qt3DRender/%%FULLVER%%/Qt3DRender/private/filterkey_p.h
> %%QT_INCDIR%%/Qt3DRender/%%FULLVER%%/Qt3DRender/private/filterlayerentityjob_p.h
>@@ -715,7 +704,6 @@
> %%QT_INCDIR%%/Qt3DRender/%%FULLVER%%/Qt3DRender/private/framecleanupjob_p.h
> %%QT_INCDIR%%/Qt3DRender/%%FULLVER%%/Qt3DRender/private/framegraphnode_p.h
> %%QT_INCDIR%%/Qt3DRender/%%FULLVER%%/Qt3DRender/private/framegraphvisitor_p.h
>-%%QT_INCDIR%%/Qt3DRender/%%FULLVER%%/Qt3DRender/private/frameprofiler_p.h
> %%QT_INCDIR%%/Qt3DRender/%%FULLVER%%/Qt3DRender/private/frustumculling_p.h
> %%QT_INCDIR%%/Qt3DRender/%%FULLVER%%/Qt3DRender/private/frustumcullingjob_p.h
> %%QT_INCDIR%%/Qt3DRender/%%FULLVER%%/Qt3DRender/private/genericlambdajob_p.h
>@@ -723,23 +711,8 @@
> %%QT_INCDIR%%/Qt3DRender/%%FULLVER%%/Qt3DRender/private/geometry_p.h
> %%QT_INCDIR%%/Qt3DRender/%%FULLVER%%/Qt3DRender/private/geometryrenderer_p.h
> %%QT_INCDIR%%/Qt3DRender/%%FULLVER%%/Qt3DRender/private/geometryrenderermanager_p.h
>-%%QT_INCDIR%%/Qt3DRender/%%FULLVER%%/Qt3DRender/private/glbuffer_p.h
>-%%QT_INCDIR%%/Qt3DRender/%%FULLVER%%/Qt3DRender/private/glfence_p.h
>-%%QT_INCDIR%%/Qt3DRender/%%FULLVER%%/Qt3DRender/private/gltexture_p.h
>-%%QT_INCDIR%%/Qt3DRender/%%FULLVER%%/Qt3DRender/private/gltexturemanager_p.h
> %%QT_INCDIR%%/Qt3DRender/%%FULLVER%%/Qt3DRender/private/gltfskeletonloader_p.h
>-%%QT_INCDIR%%/Qt3DRender/%%FULLVER%%/Qt3DRender/private/graphicscontext_p.h
>-%%QT_INCDIR%%/Qt3DRender/%%FULLVER%%/Qt3DRender/private/graphicshelperes2_p.h
>-%%QT_INCDIR%%/Qt3DRender/%%FULLVER%%/Qt3DRender/private/graphicshelperes3_1_p.h
>-%%QT_INCDIR%%/Qt3DRender/%%FULLVER%%/Qt3DRender/private/graphicshelperes3_2_p.h
>-%%QT_INCDIR%%/Qt3DRender/%%FULLVER%%/Qt3DRender/private/graphicshelperes3_p.h
>-%%QT_INCDIR%%/Qt3DRender/%%FULLVER%%/Qt3DRender/private/graphicshelpergl2_p.h
>-%%QT_INCDIR%%/Qt3DRender/%%FULLVER%%/Qt3DRender/private/graphicshelpergl3_2_p.h
>-%%QT_INCDIR%%/Qt3DRender/%%FULLVER%%/Qt3DRender/private/graphicshelpergl3_3_p.h
>-%%QT_INCDIR%%/Qt3DRender/%%FULLVER%%/Qt3DRender/private/graphicshelpergl4_p.h
>-%%QT_INCDIR%%/Qt3DRender/%%FULLVER%%/Qt3DRender/private/graphicshelperinterface_p.h
> %%QT_INCDIR%%/Qt3DRender/%%FULLVER%%/Qt3DRender/private/handle_types_p.h
>-%%QT_INCDIR%%/Qt3DRender/%%FULLVER%%/Qt3DRender/private/imagesubmissioncontext_p.h
> %%QT_INCDIR%%/Qt3DRender/%%FULLVER%%/Qt3DRender/private/job_common_p.h
> %%QT_INCDIR%%/Qt3DRender/%%FULLVER%%/Qt3DRender/private/joint_p.h
> %%QT_INCDIR%%/Qt3DRender/%%FULLVER%%/Qt3DRender/private/layer_p.h
>@@ -754,7 +727,6 @@
> %%QT_INCDIR%%/Qt3DRender/%%FULLVER%%/Qt3DRender/private/loadskeletonjob_p.h
> %%QT_INCDIR%%/Qt3DRender/%%FULLVER%%/Qt3DRender/private/managers_p.h
> %%QT_INCDIR%%/Qt3DRender/%%FULLVER%%/Qt3DRender/private/material_p.h
>-%%QT_INCDIR%%/Qt3DRender/%%FULLVER%%/Qt3DRender/private/materialparametergathererjob_p.h
> %%QT_INCDIR%%/Qt3DRender/%%FULLVER%%/Qt3DRender/private/memorybarrier_p.h
> %%QT_INCDIR%%/Qt3DRender/%%FULLVER%%/Qt3DRender/private/nodefunctor_p.h
> %%QT_INCDIR%%/Qt3DRender/%%FULLVER%%/Qt3DRender/private/nodemanagers_p.h
>@@ -762,7 +734,6 @@
> %%QT_INCDIR%%/Qt3DRender/%%FULLVER%%/Qt3DRender/private/nopicking_p.h
> %%QT_INCDIR%%/Qt3DRender/%%FULLVER%%/Qt3DRender/private/objectpicker_p.h
> %%QT_INCDIR%%/Qt3DRender/%%FULLVER%%/Qt3DRender/private/offscreensurfacehelper_p.h
>-%%QT_INCDIR%%/Qt3DRender/%%FULLVER%%/Qt3DRender/private/openglvertexarrayobject_p.h
> %%QT_INCDIR%%/Qt3DRender/%%FULLVER%%/Qt3DRender/private/parameter_p.h
> %%QT_INCDIR%%/Qt3DRender/%%FULLVER%%/Qt3DRender/private/parameterpack_p.h
> %%QT_INCDIR%%/Qt3DRender/%%FULLVER%%/Qt3DRender/private/pickboundingvolumejob_p.h
>@@ -795,6 +766,7 @@
> %%QT_INCDIR%%/Qt3DRender/%%FULLVER%%/Qt3DRender/private/qcolormask_p.h
> %%QT_INCDIR%%/Qt3DRender/%%FULLVER%%/Qt3DRender/private/qcomputecommand_p.h
> %%QT_INCDIR%%/Qt3DRender/%%FULLVER%%/Qt3DRender/private/qcullface_p.h
>+%%QT_INCDIR%%/Qt3DRender/%%FULLVER%%/Qt3DRender/private/qdebugoverlay_p.h
> %%QT_INCDIR%%/Qt3DRender/%%FULLVER%%/Qt3DRender/private/qdepthrange_p.h
> %%QT_INCDIR%%/Qt3DRender/%%FULLVER%%/Qt3DRender/private/qdepthtest_p.h
> %%QT_INCDIR%%/Qt3DRender/%%FULLVER%%/Qt3DRender/private/qdirectionallight_p.h
>@@ -810,7 +782,6 @@
> %%QT_INCDIR%%/Qt3DRender/%%FULLVER%%/Qt3DRender/private/qgeometryloaderinterface_p.h
> %%QT_INCDIR%%/Qt3DRender/%%FULLVER%%/Qt3DRender/private/qgeometryrenderer_p.h
> %%QT_INCDIR%%/Qt3DRender/%%FULLVER%%/Qt3DRender/private/qgraphicsapifilter_p.h
>-%%QT_INCDIR%%/Qt3DRender/%%FULLVER%%/Qt3DRender/private/qgraphicsutils_p.h
> %%QT_INCDIR%%/Qt3DRender/%%FULLVER%%/Qt3DRender/private/qlayer_p.h
> %%QT_INCDIR%%/Qt3DRender/%%FULLVER%%/Qt3DRender/private/qlayerfilter_p.h
> %%QT_INCDIR%%/Qt3DRender/%%FULLVER%%/Qt3DRender/private/qlevelofdetail_p.h
>@@ -833,7 +804,10 @@
> %%QT_INCDIR%%/Qt3DRender/%%FULLVER%%/Qt3DRender/private/qray3d_p.h
> %%QT_INCDIR%%/Qt3DRender/%%FULLVER%%/Qt3DRender/private/qraycastingservice_p.h
> %%QT_INCDIR%%/Qt3DRender/%%FULLVER%%/Qt3DRender/private/qrenderaspect_p.h
>+%%QT_INCDIR%%/Qt3DRender/%%FULLVER%%/Qt3DRender/private/qrendercapabilities_p.h
> %%QT_INCDIR%%/Qt3DRender/%%FULLVER%%/Qt3DRender/private/qrendercapture_p.h
>+%%QT_INCDIR%%/Qt3DRender/%%FULLVER%%/Qt3DRender/private/qrendererplugin_p.h
>+%%QT_INCDIR%%/Qt3DRender/%%FULLVER%%/Qt3DRender/private/qrendererpluginfactory_p.h
> %%QT_INCDIR%%/Qt3DRender/%%FULLVER%%/Qt3DRender/private/qrenderpass_p.h
> %%QT_INCDIR%%/Qt3DRender/%%FULLVER%%/Qt3DRender/private/qrenderpassfilter_p.h
> %%QT_INCDIR%%/Qt3DRender/%%FULLVER%%/Qt3DRender/private/qrenderplugin_p.h
>@@ -857,7 +831,15 @@
> %%QT_INCDIR%%/Qt3DRender/%%FULLVER%%/Qt3DRender/private/qscissortest_p.h
> %%QT_INCDIR%%/Qt3DRender/%%FULLVER%%/Qt3DRender/private/qsetfence_p.h
> %%QT_INCDIR%%/Qt3DRender/%%FULLVER%%/Qt3DRender/private/qshaderdata_p.h
>+%%QT_INCDIR%%/Qt3DRender/%%FULLVER%%/Qt3DRender/private/qshaderformat_p.h
>+%%QT_INCDIR%%/Qt3DRender/%%FULLVER%%/Qt3DRender/private/qshadergenerator_p.h
>+%%QT_INCDIR%%/Qt3DRender/%%FULLVER%%/Qt3DRender/private/qshadergraph_p.h
>+%%QT_INCDIR%%/Qt3DRender/%%FULLVER%%/Qt3DRender/private/qshadergraphloader_p.h
> %%QT_INCDIR%%/Qt3DRender/%%FULLVER%%/Qt3DRender/private/qshaderimage_p.h
>+%%QT_INCDIR%%/Qt3DRender/%%FULLVER%%/Qt3DRender/private/qshaderlanguage_p.h
>+%%QT_INCDIR%%/Qt3DRender/%%FULLVER%%/Qt3DRender/private/qshadernode_p.h
>+%%QT_INCDIR%%/Qt3DRender/%%FULLVER%%/Qt3DRender/private/qshadernodeport_p.h
>+%%QT_INCDIR%%/Qt3DRender/%%FULLVER%%/Qt3DRender/private/qshadernodesloader_p.h
> %%QT_INCDIR%%/Qt3DRender/%%FULLVER%%/Qt3DRender/private/qshaderprogram_p.h
> %%QT_INCDIR%%/Qt3DRender/%%FULLVER%%/Qt3DRender/private/qshaderprogrambuilder_p.h
> %%QT_INCDIR%%/Qt3DRender/%%FULLVER%%/Qt3DRender/private/qsortpolicy_p.h
>@@ -881,15 +863,10 @@
> %%QT_INCDIR%%/Qt3DRender/%%FULLVER%%/Qt3DRender/private/qwaitfence_p.h
> %%QT_INCDIR%%/Qt3DRender/%%FULLVER%%/Qt3DRender/private/raycaster_p.h
> %%QT_INCDIR%%/Qt3DRender/%%FULLVER%%/Qt3DRender/private/raycastingjob_p.h
>-%%QT_INCDIR%%/Qt3DRender/%%FULLVER%%/Qt3DRender/private/renderbuffer_p.h
> %%QT_INCDIR%%/Qt3DRender/%%FULLVER%%/Qt3DRender/private/rendercapture_p.h
>-%%QT_INCDIR%%/Qt3DRender/%%FULLVER%%/Qt3DRender/private/rendercommand_p.h
>-%%QT_INCDIR%%/Qt3DRender/%%FULLVER%%/Qt3DRender/private/renderer_p.h
>-%%QT_INCDIR%%/Qt3DRender/%%FULLVER%%/Qt3DRender/private/renderercache_p.h
> %%QT_INCDIR%%/Qt3DRender/%%FULLVER%%/Qt3DRender/private/renderlogging_p.h
> %%QT_INCDIR%%/Qt3DRender/%%FULLVER%%/Qt3DRender/private/renderpass_p.h
> %%QT_INCDIR%%/Qt3DRender/%%FULLVER%%/Qt3DRender/private/renderpassfilternode_p.h
>-%%QT_INCDIR%%/Qt3DRender/%%FULLVER%%/Qt3DRender/private/renderqueue_p.h
> %%QT_INCDIR%%/Qt3DRender/%%FULLVER%%/Qt3DRender/private/rendersettings_p.h
> %%QT_INCDIR%%/Qt3DRender/%%FULLVER%%/Qt3DRender/private/renderstatenode_p.h
> %%QT_INCDIR%%/Qt3DRender/%%FULLVER%%/Qt3DRender/private/renderstates_p.h
>@@ -899,26 +876,17 @@
> %%QT_INCDIR%%/Qt3DRender/%%FULLVER%%/Qt3DRender/private/rendertargetoutput_p.h
> %%QT_INCDIR%%/Qt3DRender/%%FULLVER%%/Qt3DRender/private/rendertargetselectornode_p.h
> %%QT_INCDIR%%/Qt3DRender/%%FULLVER%%/Qt3DRender/private/renderthread_p.h
>-%%QT_INCDIR%%/Qt3DRender/%%FULLVER%%/Qt3DRender/private/renderview_p.h
>-%%QT_INCDIR%%/Qt3DRender/%%FULLVER%%/Qt3DRender/private/renderviewbuilder_p.h
>-%%QT_INCDIR%%/Qt3DRender/%%FULLVER%%/Qt3DRender/private/renderviewcommandbuilderjob_p.h
>-%%QT_INCDIR%%/Qt3DRender/%%FULLVER%%/Qt3DRender/private/renderviewcommandupdaterjob_p.h
>-%%QT_INCDIR%%/Qt3DRender/%%FULLVER%%/Qt3DRender/private/renderviewinitializerjob_p.h
>-%%QT_INCDIR%%/Qt3DRender/%%FULLVER%%/Qt3DRender/private/renderviewjobutils_p.h
> %%QT_INCDIR%%/Qt3DRender/%%FULLVER%%/Qt3DRender/private/resourceaccessor_p.h
> %%QT_INCDIR%%/Qt3DRender/%%FULLVER%%/Qt3DRender/private/scene_p.h
> %%QT_INCDIR%%/Qt3DRender/%%FULLVER%%/Qt3DRender/private/scenemanager_p.h
> %%QT_INCDIR%%/Qt3DRender/%%FULLVER%%/Qt3DRender/private/segmentsvisitor_p.h
> %%QT_INCDIR%%/Qt3DRender/%%FULLVER%%/Qt3DRender/private/sendbuffercapturejob_p.h
>-%%QT_INCDIR%%/Qt3DRender/%%FULLVER%%/Qt3DRender/private/sendrendercapturejob_p.h
> %%QT_INCDIR%%/Qt3DRender/%%FULLVER%%/Qt3DRender/private/setfence_p.h
> %%QT_INCDIR%%/Qt3DRender/%%FULLVER%%/Qt3DRender/private/shader_p.h
> %%QT_INCDIR%%/Qt3DRender/%%FULLVER%%/Qt3DRender/private/shaderbuilder_p.h
> %%QT_INCDIR%%/Qt3DRender/%%FULLVER%%/Qt3DRender/private/shadercache_p.h
> %%QT_INCDIR%%/Qt3DRender/%%FULLVER%%/Qt3DRender/private/shaderdata_p.h
> %%QT_INCDIR%%/Qt3DRender/%%FULLVER%%/Qt3DRender/private/shaderimage_p.h
>-%%QT_INCDIR%%/Qt3DRender/%%FULLVER%%/Qt3DRender/private/shaderparameterpack_p.h
>-%%QT_INCDIR%%/Qt3DRender/%%FULLVER%%/Qt3DRender/private/shadervariables_p.h
> %%QT_INCDIR%%/Qt3DRender/%%FULLVER%%/Qt3DRender/private/skeleton_p.h
> %%QT_INCDIR%%/Qt3DRender/%%FULLVER%%/Qt3DRender/private/skeletondata_p.h
> %%QT_INCDIR%%/Qt3DRender/%%FULLVER%%/Qt3DRender/private/sortpolicy_p.h
>@@ -927,14 +895,13 @@
> %%QT_INCDIR%%/Qt3DRender/%%FULLVER%%/Qt3DRender/private/statesetnode_p.h
> %%QT_INCDIR%%/Qt3DRender/%%FULLVER%%/Qt3DRender/private/statevariant_p.h
> %%QT_INCDIR%%/Qt3DRender/%%FULLVER%%/Qt3DRender/private/stringtoint_p.h
>-%%QT_INCDIR%%/Qt3DRender/%%FULLVER%%/Qt3DRender/private/submissioncontext_p.h
> %%QT_INCDIR%%/Qt3DRender/%%FULLVER%%/Qt3DRender/private/subtreeenabler_p.h
> %%QT_INCDIR%%/Qt3DRender/%%FULLVER%%/Qt3DRender/private/technique_p.h
> %%QT_INCDIR%%/Qt3DRender/%%FULLVER%%/Qt3DRender/private/techniquefilternode_p.h
> %%QT_INCDIR%%/Qt3DRender/%%FULLVER%%/Qt3DRender/private/techniquemanager_p.h
> %%QT_INCDIR%%/Qt3DRender/%%FULLVER%%/Qt3DRender/private/texture_p.h
>+%%QT_INCDIR%%/Qt3DRender/%%FULLVER%%/Qt3DRender/private/texturedatamanager_p.h
> %%QT_INCDIR%%/Qt3DRender/%%FULLVER%%/Qt3DRender/private/textureimage_p.h
>-%%QT_INCDIR%%/Qt3DRender/%%FULLVER%%/Qt3DRender/private/texturesubmissioncontext_p.h
> %%QT_INCDIR%%/Qt3DRender/%%FULLVER%%/Qt3DRender/private/transform_p.h
> %%QT_INCDIR%%/Qt3DRender/%%FULLVER%%/Qt3DRender/private/triangleboundingvolume_p.h
> %%QT_INCDIR%%/Qt3DRender/%%FULLVER%%/Qt3DRender/private/trianglesextractor_p.h
>@@ -951,6 +918,7 @@
> %%QT_INCDIR%%/Qt3DRender/%%FULLVER%%/Qt3DRender/private/viewportnode_p.h
> %%QT_INCDIR%%/Qt3DRender/%%FULLVER%%/Qt3DRender/private/visitorutils_p.h
> %%QT_INCDIR%%/Qt3DRender/%%FULLVER%%/Qt3DRender/private/vsyncframeadvanceservice_p.h
>+%%QT_INCDIR%%/Qt3DRender/%%FULLVER%%/Qt3DRender/private/vulkaninstance_p.h
> %%QT_INCDIR%%/Qt3DRender/%%FULLVER%%/Qt3DRender/private/waitfence_p.h
> %%QT_INCDIR%%/Qt3DRender/FunctorType
> %%QT_INCDIR%%/Qt3DRender/ParameterList
>@@ -980,6 +948,7 @@
> %%QT_INCDIR%%/Qt3DRender/QColorMask
> %%QT_INCDIR%%/Qt3DRender/QComputeCommand
> %%QT_INCDIR%%/Qt3DRender/QCullFace
>+%%QT_INCDIR%%/Qt3DRender/QDebugOverlay
> %%QT_INCDIR%%/Qt3DRender/QDepthRange
> %%QT_INCDIR%%/Qt3DRender/QDepthTest
> %%QT_INCDIR%%/Qt3DRender/QDirectionalLight
>@@ -1032,6 +1001,7 @@
> %%QT_INCDIR%%/Qt3DRender/QRayCaster
> %%QT_INCDIR%%/Qt3DRender/QRayCasterHit
> %%QT_INCDIR%%/Qt3DRender/QRenderAspect
>+%%QT_INCDIR%%/Qt3DRender/QRenderCapabilities
> %%QT_INCDIR%%/Qt3DRender/QRenderCapture
> %%QT_INCDIR%%/Qt3DRender/QRenderCaptureReply
> %%QT_INCDIR%%/Qt3DRender/QRenderPass
>@@ -1101,6 +1071,7 @@
> %%QT_INCDIR%%/Qt3DRender/qcolormask.h
> %%QT_INCDIR%%/Qt3DRender/qcomputecommand.h
> %%QT_INCDIR%%/Qt3DRender/qcullface.h
>+%%QT_INCDIR%%/Qt3DRender/qdebugoverlay.h
> %%QT_INCDIR%%/Qt3DRender/qdepthrange.h
> %%QT_INCDIR%%/Qt3DRender/qdepthtest.h
> %%QT_INCDIR%%/Qt3DRender/qdirectionallight.h
>@@ -1145,7 +1116,9 @@
> %%QT_INCDIR%%/Qt3DRender/qrastermode.h
> %%QT_INCDIR%%/Qt3DRender/qraycaster.h
> %%QT_INCDIR%%/Qt3DRender/qraycasterhit.h
>+%%QT_INCDIR%%/Qt3DRender/qrenderapi.h
> %%QT_INCDIR%%/Qt3DRender/qrenderaspect.h
>+%%QT_INCDIR%%/Qt3DRender/qrendercapabilities.h
> %%QT_INCDIR%%/Qt3DRender/qrendercapture.h
> %%QT_INCDIR%%/Qt3DRender/qrenderpass.h
> %%QT_INCDIR%%/Qt3DRender/qrenderpassfilter.h
>@@ -1217,8 +1190,10 @@
> %%QT_CMAKEDIR%%/Qt53DRender/Qt53DRender_GLTFGeometryLoaderPlugin.cmake
> %%QT_CMAKEDIR%%/Qt53DRender/Qt53DRender_GLTFSceneExportPlugin.cmake
> %%QT_CMAKEDIR%%/Qt53DRender/Qt53DRender_GLTFSceneImportPlugin.cmake
>+%%QT_CMAKEDIR%%/Qt53DRender/Qt53DRender_OpenGLRendererPlugin.cmake
> %%QT_CMAKEDIR%%/Qt53DRender/Qt53DRender_Scene2DPlugin.cmake
> %%QT_BINDIR%%/qgltf
>+%%DEBUG%%%%QT_BINDIR%%/qgltf.debug
> %%QT_LIBDIR%%/libQt53DAnimation.prl
> %%QT_LIBDIR%%/libQt53DAnimation.so
> %%QT_LIBDIR%%/libQt53DAnimation.so.5
>@@ -1319,6 +1294,8 @@
> %%DEBUG%%%%QT_PLUGINDIR%%/geometryloaders/libdefaultgeometryloader.so.debug
> %%QT_PLUGINDIR%%/geometryloaders/libgltfgeometryloader.so
> %%DEBUG%%%%QT_PLUGINDIR%%/geometryloaders/libgltfgeometryloader.so.debug
>+%%QT_PLUGINDIR%%/renderers/libopenglrenderer.so
>+%%DEBUG%%%%QT_PLUGINDIR%%/renderers/libopenglrenderer.so.debug
> %%QT_PLUGINDIR%%/renderplugins/libscene2d.so
> %%DEBUG%%%%QT_PLUGINDIR%%/renderplugins/libscene2d.so.debug
> %%QT_PLUGINDIR%%/sceneparsers/libassimpsceneimport.so
>diff --git a/graphics/qt5-pixeltool/pkg-plist b/graphics/qt5-pixeltool/pkg-plist
>index 06bbb23951da..4038b18358ec 100644
>--- a/graphics/qt5-pixeltool/pkg-plist
>+++ b/graphics/qt5-pixeltool/pkg-plist
>@@ -1 +1,2 @@
> %%QT_BINDIR%%/pixeltool
>+%%DEBUG%%%%QT_BINDIR%%/pixeltool.debug
>diff --git a/graphics/qt5-wayland/pkg-plist b/graphics/qt5-wayland/pkg-plist
>index 74414be5b605..fbf742b39cd4 100644
>--- a/graphics/qt5-wayland/pkg-plist
>+++ b/graphics/qt5-wayland/pkg-plist
>@@ -5,6 +5,7 @@
> %%QT_INCDIR%%/QtWaylandClient/%%FULLVER%%/QtWaylandClient/private/qwayland-qt-windowmanager.h
> %%QT_INCDIR%%/QtWaylandClient/%%FULLVER%%/QtWaylandClient/private/qwayland-server-buffer-extension.h
> %%QT_INCDIR%%/QtWaylandClient/%%FULLVER%%/QtWaylandClient/private/qwayland-surface-extension.h
>+%%QT_INCDIR%%/QtWaylandClient/%%FULLVER%%/QtWaylandClient/private/qwayland-tablet-unstable-v2.h
> %%QT_INCDIR%%/QtWaylandClient/%%FULLVER%%/QtWaylandClient/private/qwayland-text-input-unstable-v2.h
> %%QT_INCDIR%%/QtWaylandClient/%%FULLVER%%/QtWaylandClient/private/qwayland-touch-extension.h
> %%QT_INCDIR%%/QtWaylandClient/%%FULLVER%%/QtWaylandClient/private/qwayland-wayland.h
>@@ -50,7 +51,10 @@
> %%QT_INCDIR%%/QtWaylandClient/%%FULLVER%%/QtWaylandClient/private/qwaylandshmwindow_p.h
> %%QT_INCDIR%%/QtWaylandClient/%%FULLVER%%/QtWaylandClient/private/qwaylandsubsurface_p.h
> %%QT_INCDIR%%/QtWaylandClient/%%FULLVER%%/QtWaylandClient/private/qwaylandsurface_p.h
>+%%QT_INCDIR%%/QtWaylandClient/%%FULLVER%%/QtWaylandClient/private/qwaylandtabletv2_p.h
> %%QT_INCDIR%%/QtWaylandClient/%%FULLVER%%/QtWaylandClient/private/qwaylandtouch_p.h
>+%%QT_INCDIR%%/QtWaylandClient/%%FULLVER%%/QtWaylandClient/private/qwaylandvulkaninstance_p.h
>+%%QT_INCDIR%%/QtWaylandClient/%%FULLVER%%/QtWaylandClient/private/qwaylandvulkanwindow_p.h
> %%QT_INCDIR%%/QtWaylandClient/%%FULLVER%%/QtWaylandClient/private/qwaylandwindow_p.h
> %%QT_INCDIR%%/QtWaylandClient/%%FULLVER%%/QtWaylandClient/private/qwaylandwindowmanagerintegration_p.h
> %%QT_INCDIR%%/QtWaylandClient/%%FULLVER%%/QtWaylandClient/private/wayland-hardware-integration-client-protocol.h
>@@ -58,6 +62,7 @@
> %%QT_INCDIR%%/QtWaylandClient/%%FULLVER%%/QtWaylandClient/private/wayland-qt-windowmanager-client-protocol.h
> %%QT_INCDIR%%/QtWaylandClient/%%FULLVER%%/QtWaylandClient/private/wayland-server-buffer-extension-client-protocol.h
> %%QT_INCDIR%%/QtWaylandClient/%%FULLVER%%/QtWaylandClient/private/wayland-surface-extension-client-protocol.h
>+%%QT_INCDIR%%/QtWaylandClient/%%FULLVER%%/QtWaylandClient/private/wayland-tablet-unstable-v2-client-protocol.h
> %%QT_INCDIR%%/QtWaylandClient/%%FULLVER%%/QtWaylandClient/private/wayland-text-input-unstable-v2-client-protocol.h
> %%QT_INCDIR%%/QtWaylandClient/%%FULLVER%%/QtWaylandClient/private/wayland-touch-extension-client-protocol.h
> %%QT_INCDIR%%/QtWaylandClient/%%FULLVER%%/QtWaylandClient/private/wayland-wayland-client-protocol.h
>@@ -305,6 +310,7 @@
> %%QT_CMAKEDIR%%/Qt5WaylandCompositor/Qt5WaylandCompositor_ShmServerBufferIntegrationPlugin.cmake
> %%QT_CMAKEDIR%%/Qt5WaylandCompositor/Qt5WaylandCompositor_VulkanServerBufferIntegrationPlugin.cmake
> %%QT_BINDIR%%/qtwaylandscanner
>+%%DEBUG%%%%QT_BINDIR%%/qtwaylandscanner.debug
> %%QT_LIBDIR%%/libQt5WaylandClient.prl
> %%QT_LIBDIR%%/libQt5WaylandClient.so
> %%QT_LIBDIR%%/libQt5WaylandClient.so.5
>@@ -345,24 +351,24 @@
> %%DEBUG%%%%QT_PLUGINDIR%%/wayland-graphics-integration-client/libxcomposite-egl.so.debug
> %%QT_PLUGINDIR%%/wayland-graphics-integration-client/libxcomposite-glx.so
> %%DEBUG%%%%QT_PLUGINDIR%%/wayland-graphics-integration-client/libxcomposite-glx.so.debug
>-%%QT_PLUGINDIR%%/wayland-graphics-integration-server/libdmabuf-server.so
>-%%DEBUG%%%%QT_PLUGINDIR%%/wayland-graphics-integration-server/libdmabuf-server.so.debug
>-%%QT_PLUGINDIR%%/wayland-graphics-integration-server/libdrm-egl-server.so
>-%%DEBUG%%%%QT_PLUGINDIR%%/wayland-graphics-integration-server/libdrm-egl-server.so.debug
>-%%QT_PLUGINDIR%%/wayland-graphics-integration-server/liblinux-dmabuf-unstable-v1.so
>-%%DEBUG%%%%QT_PLUGINDIR%%/wayland-graphics-integration-server/liblinux-dmabuf-unstable-v1.so.debug
>-%%QT_PLUGINDIR%%/wayland-graphics-integration-server/libqt-plugin-wayland-egl.so
>-%%DEBUG%%%%QT_PLUGINDIR%%/wayland-graphics-integration-server/libqt-plugin-wayland-egl.so.debug
>-%%QT_PLUGINDIR%%/wayland-graphics-integration-server/libshm-emulation-server.so
>-%%DEBUG%%%%QT_PLUGINDIR%%/wayland-graphics-integration-server/libshm-emulation-server.so.debug
>-%%QT_PLUGINDIR%%/wayland-graphics-integration-server/libvulkan-server.so
>-%%DEBUG%%%%QT_PLUGINDIR%%/wayland-graphics-integration-server/libvulkan-server.so.debug
>-%%QT_PLUGINDIR%%/wayland-graphics-integration-server/libwayland-eglstream-controller.so
>-%%DEBUG%%%%QT_PLUGINDIR%%/wayland-graphics-integration-server/libwayland-eglstream-controller.so.debug
>-%%QT_PLUGINDIR%%/wayland-graphics-integration-server/libxcomposite-egl.so
>-%%DEBUG%%%%QT_PLUGINDIR%%/wayland-graphics-integration-server/libxcomposite-egl.so.debug
>-%%QT_PLUGINDIR%%/wayland-graphics-integration-server/libxcomposite-glx.so
>-%%DEBUG%%%%QT_PLUGINDIR%%/wayland-graphics-integration-server/libxcomposite-glx.so.debug
>+%%QT_PLUGINDIR%%/wayland-graphics-integration-server/libqt-wayland-compositor-dmabuf-server-buffer.so
>+%%DEBUG%%%%QT_PLUGINDIR%%/wayland-graphics-integration-server/libqt-wayland-compositor-dmabuf-server-buffer.so.debug
>+%%QT_PLUGINDIR%%/wayland-graphics-integration-server/libqt-wayland-compositor-drm-egl-server-buffer.so
>+%%DEBUG%%%%QT_PLUGINDIR%%/wayland-graphics-integration-server/libqt-wayland-compositor-drm-egl-server-buffer.so.debug
>+%%QT_PLUGINDIR%%/wayland-graphics-integration-server/libqt-wayland-compositor-linux-dmabuf-unstable-v1.so
>+%%DEBUG%%%%QT_PLUGINDIR%%/wayland-graphics-integration-server/libqt-wayland-compositor-linux-dmabuf-unstable-v1.so.debug
>+%%QT_PLUGINDIR%%/wayland-graphics-integration-server/libqt-wayland-compositor-shm-emulation-server.so
>+%%DEBUG%%%%QT_PLUGINDIR%%/wayland-graphics-integration-server/libqt-wayland-compositor-shm-emulation-server.so.debug
>+%%QT_PLUGINDIR%%/wayland-graphics-integration-server/libqt-wayland-compositor-vulkan-server.so
>+%%DEBUG%%%%QT_PLUGINDIR%%/wayland-graphics-integration-server/libqt-wayland-compositor-vulkan-server.so.debug
>+%%QT_PLUGINDIR%%/wayland-graphics-integration-server/libqt-wayland-compositor-wayland-egl.so
>+%%DEBUG%%%%QT_PLUGINDIR%%/wayland-graphics-integration-server/libqt-wayland-compositor-wayland-egl.so.debug
>+%%QT_PLUGINDIR%%/wayland-graphics-integration-server/libqt-wayland-compositor-wayland-eglstream-controller.so
>+%%DEBUG%%%%QT_PLUGINDIR%%/wayland-graphics-integration-server/libqt-wayland-compositor-wayland-eglstream-controller.so.debug
>+%%QT_PLUGINDIR%%/wayland-graphics-integration-server/libqt-wayland-compositor-xcomposite-egl.so
>+%%DEBUG%%%%QT_PLUGINDIR%%/wayland-graphics-integration-server/libqt-wayland-compositor-xcomposite-egl.so.debug
>+%%QT_PLUGINDIR%%/wayland-graphics-integration-server/libqt-wayland-compositor-xcomposite-glx.so
>+%%DEBUG%%%%QT_PLUGINDIR%%/wayland-graphics-integration-server/libqt-wayland-compositor-xcomposite-glx.so.debug
> %%QT_PLUGINDIR%%/wayland-shell-integration/libfullscreen-shell-v1.so
> %%DEBUG%%%%QT_PLUGINDIR%%/wayland-shell-integration/libfullscreen-shell-v1.so.debug
> %%QT_PLUGINDIR%%/wayland-shell-integration/libivi-shell.so
>diff --git a/misc/qt5-examples/distinfo b/misc/qt5-examples/distinfo
>index ce4d606b593c..f84a68955f4b 100644
>--- a/misc/qt5-examples/distinfo
>+++ b/misc/qt5-examples/distinfo
>@@ -1,3 +1,3 @@
>-TIMESTAMP = 1586029328
>-SHA256 (KDE/Qt/5.14.2/qt-everywhere-src-5.14.2.tar.xz) = c6fcd53c744df89e7d3223c02838a33309bd1c291fcb6f9341505fe99f7f19fa
>-SIZE (KDE/Qt/5.14.2/qt-everywhere-src-5.14.2.tar.xz) = 549205340
>+TIMESTAMP = 1590590417
>+SHA256 (KDE/Qt/5.15.0/qt-everywhere-src-5.15.0.tar.xz) = 22b63d7a7a45183865cc4141124f12b673e7a17b1fe2b91e433f6547c5d548c3
>+SIZE (KDE/Qt/5.15.0/qt-everywhere-src-5.15.0.tar.xz) = 592401236
>diff --git a/misc/qt5-examples/pkg-plist b/misc/qt5-examples/pkg-plist
>index 51b8fa1dbbe0..b9e669005e5a 100644
>--- a/misc/qt5-examples/pkg-plist
>+++ b/misc/qt5-examples/pkg-plist
>@@ -101,9 +101,29 @@
> %%QT_EXAMPLEDIR%%/activeqt/wrapper/wrapperax.rc
> %%QT_EXAMPLEDIR%%/aggregate/examples.pro
> %%QT_EXAMPLEDIR%%/androidextras/androidextras.pro
>-%%QT_EXAMPLEDIR%%/androidextras/notification/android-sources/AndroidManifest.xml
>-%%QT_EXAMPLEDIR%%/androidextras/notification/android-sources/res/drawable/icon.png
>-%%QT_EXAMPLEDIR%%/androidextras/notification/android-sources/src/org/qtproject/example/notification/NotificationClient.java
>+%%QT_EXAMPLEDIR%%/androidextras/jnimessenger/android/AndroidManifest.xml
>+%%QT_EXAMPLEDIR%%/androidextras/jnimessenger/android/res/drawable-hdpi/icon.png
>+%%QT_EXAMPLEDIR%%/androidextras/jnimessenger/android/res/drawable-ldpi/icon.png
>+%%QT_EXAMPLEDIR%%/androidextras/jnimessenger/android/res/drawable-mdpi/icon.png
>+%%QT_EXAMPLEDIR%%/androidextras/jnimessenger/android/res/drawable-xhdpi/icon.png
>+%%QT_EXAMPLEDIR%%/androidextras/jnimessenger/android/res/drawable-xxhdpi/icon.png
>+%%QT_EXAMPLEDIR%%/androidextras/jnimessenger/android/res/drawable-xxxhdpi/icon.png
>+%%QT_EXAMPLEDIR%%/androidextras/jnimessenger/android/src/org/qtproject/example/jnimessenger/JniMessenger.java
>+%%QT_EXAMPLEDIR%%/androidextras/jnimessenger/doc/src/qtandroidextras-example-jnimessenger.qdoc
>+%%QT_EXAMPLEDIR%%/androidextras/jnimessenger/jnimessenger.cpp
>+%%QT_EXAMPLEDIR%%/androidextras/jnimessenger/jnimessenger.h
>+%%QT_EXAMPLEDIR%%/androidextras/jnimessenger/jnimessenger.pro
>+%%QT_EXAMPLEDIR%%/androidextras/jnimessenger/main.cpp
>+%%QT_EXAMPLEDIR%%/androidextras/jnimessenger/main.qml
>+%%QT_EXAMPLEDIR%%/androidextras/jnimessenger/qml.qrc
>+%%QT_EXAMPLEDIR%%/androidextras/notification/android/AndroidManifest.xml
>+%%QT_EXAMPLEDIR%%/androidextras/notification/android/res/drawable-hdpi/icon.png
>+%%QT_EXAMPLEDIR%%/androidextras/notification/android/res/drawable-ldpi/icon.png
>+%%QT_EXAMPLEDIR%%/androidextras/notification/android/res/drawable-mdpi/icon.png
>+%%QT_EXAMPLEDIR%%/androidextras/notification/android/res/drawable-xhdpi/icon.png
>+%%QT_EXAMPLEDIR%%/androidextras/notification/android/res/drawable-xxhdpi/icon.png
>+%%QT_EXAMPLEDIR%%/androidextras/notification/android/res/drawable-xxxhdpi/icon.png
>+%%QT_EXAMPLEDIR%%/androidextras/notification/android/src/org/qtproject/example/notification/NotificationClient.java
> %%QT_EXAMPLEDIR%%/androidextras/notification/doc/src/qtandroidextras-example-notification.qdoc
> %%QT_EXAMPLEDIR%%/androidextras/notification/images/happy.png
> %%QT_EXAMPLEDIR%%/androidextras/notification/images/sad.png
>@@ -1494,6 +1514,7 @@
> %%QT_EXAMPLEDIR%%/linguist/trollprint/trollprint.pro
> %%QT_EXAMPLEDIR%%/linguist/trollprint/trollprint_pt.ts
> %%QT_EXAMPLEDIR%%/location/geojson_viewer/GeoJsonDelegate.qml
>+%%QT_EXAMPLEDIR%%/location/geojson_viewer/GeoJsonDelegateMapObject.qml
> %%QT_EXAMPLEDIR%%/location/geojson_viewer/data/01-point.json
> %%QT_EXAMPLEDIR%%/location/geojson_viewer/data/02-linestring.json
> %%QT_EXAMPLEDIR%%/location/geojson_viewer/data/03-multipoint.json
>@@ -2056,15 +2077,6 @@
> %%QT_EXAMPLEDIR%%/multimediawidgets/videowidget/videoplayer.h
> %%QT_EXAMPLEDIR%%/multimediawidgets/videowidget/videowidget.pro
> %%QT_EXAMPLEDIR%%/network/README
>-%%QT_EXAMPLEDIR%%/network/bearermonitor/bearermonitor.cpp
>-%%QT_EXAMPLEDIR%%/network/bearermonitor/bearermonitor.h
>-%%QT_EXAMPLEDIR%%/network/bearermonitor/bearermonitor.pro
>-%%QT_EXAMPLEDIR%%/network/bearermonitor/bearermonitor_240_320.ui
>-%%QT_EXAMPLEDIR%%/network/bearermonitor/bearermonitor_640_480.ui
>-%%QT_EXAMPLEDIR%%/network/bearermonitor/main.cpp
>-%%QT_EXAMPLEDIR%%/network/bearermonitor/sessionwidget.cpp
>-%%QT_EXAMPLEDIR%%/network/bearermonitor/sessionwidget.h
>-%%QT_EXAMPLEDIR%%/network/bearermonitor/sessionwidget.ui
> %%QT_EXAMPLEDIR%%/network/blockingfortuneclient/blockingclient.cpp
> %%QT_EXAMPLEDIR%%/network/blockingfortuneclient/blockingclient.h
> %%QT_EXAMPLEDIR%%/network/blockingfortuneclient/blockingfortuneclient.pro
>@@ -2486,6 +2498,67 @@
> %%QT_EXAMPLEDIR%%/opengl/threadedqopenglwidget/mainwindow.cpp
> %%QT_EXAMPLEDIR%%/opengl/threadedqopenglwidget/mainwindow.h
> %%QT_EXAMPLEDIR%%/opengl/threadedqopenglwidget/threadedqopenglwidget.pro
>+%%QT_EXAMPLEDIR%%/pdf/multipage/main.cpp
>+%%QT_EXAMPLEDIR%%/pdf/multipage/multipage.pro
>+%%QT_EXAMPLEDIR%%/pdf/multipage/resources/document-open.svg
>+%%QT_EXAMPLEDIR%%/pdf/multipage/resources/edit-clear.svg
>+%%QT_EXAMPLEDIR%%/pdf/multipage/resources/edit-copy.svg
>+%%QT_EXAMPLEDIR%%/pdf/multipage/resources/edit-select-all.svg
>+%%QT_EXAMPLEDIR%%/pdf/multipage/resources/go-down-search.svg
>+%%QT_EXAMPLEDIR%%/pdf/multipage/resources/go-next-view-page.svg
>+%%QT_EXAMPLEDIR%%/pdf/multipage/resources/go-previous-view-page.svg
>+%%QT_EXAMPLEDIR%%/pdf/multipage/resources/go-up-search.svg
>+%%QT_EXAMPLEDIR%%/pdf/multipage/resources/rotate-left.svg
>+%%QT_EXAMPLEDIR%%/pdf/multipage/resources/rotate-right.svg
>+%%QT_EXAMPLEDIR%%/pdf/multipage/resources/test.pdf
>+%%QT_EXAMPLEDIR%%/pdf/multipage/resources/zoom-fit-best.svg
>+%%QT_EXAMPLEDIR%%/pdf/multipage/resources/zoom-fit-width.svg
>+%%QT_EXAMPLEDIR%%/pdf/multipage/resources/zoom-in.svg
>+%%QT_EXAMPLEDIR%%/pdf/multipage/resources/zoom-original.svg
>+%%QT_EXAMPLEDIR%%/pdf/multipage/resources/zoom-out.svg
>+%%QT_EXAMPLEDIR%%/pdf/multipage/viewer.qml
>+%%QT_EXAMPLEDIR%%/pdf/multipage/viewer.qrc
>+%%QT_EXAMPLEDIR%%/pdf/pdf.pro
>+%%QT_EXAMPLEDIR%%/pdf/pdfviewer/main.cpp
>+%%QT_EXAMPLEDIR%%/pdf/pdfviewer/pdfviewer.pro
>+%%QT_EXAMPLEDIR%%/pdf/pdfviewer/resources/document-open.svg
>+%%QT_EXAMPLEDIR%%/pdf/pdfviewer/resources/edit-clear.svg
>+%%QT_EXAMPLEDIR%%/pdf/pdfviewer/resources/edit-copy.svg
>+%%QT_EXAMPLEDIR%%/pdf/pdfviewer/resources/edit-select-all.svg
>+%%QT_EXAMPLEDIR%%/pdf/pdfviewer/resources/go-down-search.svg
>+%%QT_EXAMPLEDIR%%/pdf/pdfviewer/resources/go-next-view-page.svg
>+%%QT_EXAMPLEDIR%%/pdf/pdfviewer/resources/go-previous-view-page.svg
>+%%QT_EXAMPLEDIR%%/pdf/pdfviewer/resources/go-up-search.svg
>+%%QT_EXAMPLEDIR%%/pdf/pdfviewer/resources/rotate-left.svg
>+%%QT_EXAMPLEDIR%%/pdf/pdfviewer/resources/rotate-right.svg
>+%%QT_EXAMPLEDIR%%/pdf/pdfviewer/resources/test.pdf
>+%%QT_EXAMPLEDIR%%/pdf/pdfviewer/resources/zoom-fit-best.svg
>+%%QT_EXAMPLEDIR%%/pdf/pdfviewer/resources/zoom-fit-width.svg
>+%%QT_EXAMPLEDIR%%/pdf/pdfviewer/resources/zoom-in.svg
>+%%QT_EXAMPLEDIR%%/pdf/pdfviewer/resources/zoom-original.svg
>+%%QT_EXAMPLEDIR%%/pdf/pdfviewer/resources/zoom-out.svg
>+%%QT_EXAMPLEDIR%%/pdf/pdfviewer/viewer.qml
>+%%QT_EXAMPLEDIR%%/pdf/pdfviewer/viewer.qrc
>+%%QT_EXAMPLEDIR%%/pdfwidgets/pdfviewer/doc/src/pdfviewer.qdoc
>+%%QT_EXAMPLEDIR%%/pdfwidgets/pdfviewer/images/busy.png
>+%%QT_EXAMPLEDIR%%/pdfwidgets/pdfviewer/images/fileopen.png
>+%%QT_EXAMPLEDIR%%/pdfwidgets/pdfviewer/images/go-next-24.png
>+%%QT_EXAMPLEDIR%%/pdfwidgets/pdfviewer/images/go-previous-24.png
>+%%QT_EXAMPLEDIR%%/pdfwidgets/pdfviewer/images/zoom-in-24.png
>+%%QT_EXAMPLEDIR%%/pdfwidgets/pdfviewer/images/zoom-in-32.png
>+%%QT_EXAMPLEDIR%%/pdfwidgets/pdfviewer/images/zoom-out-24.png
>+%%QT_EXAMPLEDIR%%/pdfwidgets/pdfviewer/images/zoom-out-32.png
>+%%QT_EXAMPLEDIR%%/pdfwidgets/pdfviewer/main.cpp
>+%%QT_EXAMPLEDIR%%/pdfwidgets/pdfviewer/mainwindow.cpp
>+%%QT_EXAMPLEDIR%%/pdfwidgets/pdfviewer/mainwindow.h
>+%%QT_EXAMPLEDIR%%/pdfwidgets/pdfviewer/mainwindow.ui
>+%%QT_EXAMPLEDIR%%/pdfwidgets/pdfviewer/pageselector.cpp
>+%%QT_EXAMPLEDIR%%/pdfwidgets/pdfviewer/pageselector.h
>+%%QT_EXAMPLEDIR%%/pdfwidgets/pdfviewer/pdfviewer.pro
>+%%QT_EXAMPLEDIR%%/pdfwidgets/pdfviewer/resources.qrc
>+%%QT_EXAMPLEDIR%%/pdfwidgets/pdfviewer/zoomselector.cpp
>+%%QT_EXAMPLEDIR%%/pdfwidgets/pdfviewer/zoomselector.h
>+%%QT_EXAMPLEDIR%%/pdfwidgets/pdfwidgets.pro
> %%QT_EXAMPLEDIR%%/positioning/geoflickr/doc/images/qml-flickr-1.jpg
> %%QT_EXAMPLEDIR%%/positioning/geoflickr/doc/src/geoflickr.qdoc
> %%QT_EXAMPLEDIR%%/positioning/geoflickr/flickr-90.qml
>@@ -2623,8 +2696,11 @@
> %%QT_EXAMPLEDIR%%/qml/dynamicscene/content/itemCreation.js
> %%QT_EXAMPLEDIR%%/qml/dynamicscene/doc/images/qml-dynamicscene-example.png
> %%QT_EXAMPLEDIR%%/qml/dynamicscene/doc/src/dynamicscene.qdoc
>+%%QT_EXAMPLEDIR%%/qml/dynamicscene/dynamicscene.pro
> %%QT_EXAMPLEDIR%%/qml/dynamicscene/dynamicscene.qml
> %%QT_EXAMPLEDIR%%/qml/dynamicscene/dynamicscene.qmlproject
>+%%QT_EXAMPLEDIR%%/qml/dynamicscene/dynamicscene.qrc
>+%%QT_EXAMPLEDIR%%/qml/dynamicscene/main.cpp
> %%QT_EXAMPLEDIR%%/qml/locale/locale.qml
> %%QT_EXAMPLEDIR%%/qml/networkaccessmanagerfactory/doc/src/networkaccessmanagerfactory.qdoc
> %%QT_EXAMPLEDIR%%/qml/networkaccessmanagerfactory/main.cpp
>@@ -2638,8 +2714,11 @@
> %%QT_EXAMPLEDIR%%/qml/qml-i18n/i18n/qml_en.ts
> %%QT_EXAMPLEDIR%%/qml/qml-i18n/i18n/qml_en_AU.ts
> %%QT_EXAMPLEDIR%%/qml/qml-i18n/i18n/qml_fr.ts
>+%%QT_EXAMPLEDIR%%/qml/qml-i18n/main.cpp
>+%%QT_EXAMPLEDIR%%/qml/qml-i18n/qml-i18n.pro
> %%QT_EXAMPLEDIR%%/qml/qml-i18n/qml-i18n.qml
> %%QT_EXAMPLEDIR%%/qml/qml-i18n/qml-i18n.qmlproject
>+%%QT_EXAMPLEDIR%%/qml/qml-i18n/qml-i18n.qrc
> %%QT_EXAMPLEDIR%%/qml/qml.pro
> %%QT_EXAMPLEDIR%%/qml/qmlextensionplugins/doc/images/qml-plugins-example.png
> %%QT_EXAMPLEDIR%%/qml/qmlextensionplugins/doc/src/qmlpluginex.qdoc
>@@ -2653,6 +2732,8 @@
> %%QT_EXAMPLEDIR%%/qml/qmlextensionplugins/plugins.qml
> %%QT_EXAMPLEDIR%%/qml/qmlextensionplugins/plugins.qmlproject
> %%QT_EXAMPLEDIR%%/qml/qmlextensionplugins/qmlextensionplugins.pro
>+%%QT_EXAMPLEDIR%%/qml/qmlextensionplugins/timemodel.cpp
>+%%QT_EXAMPLEDIR%%/qml/qmlextensionplugins/timemodel.h
> %%QT_EXAMPLEDIR%%/qml/referenceexamples/adding/adding.pro
> %%QT_EXAMPLEDIR%%/qml/referenceexamples/adding/adding.qrc
> %%QT_EXAMPLEDIR%%/qml/referenceexamples/adding/example.qml
>@@ -2783,7 +2864,6 @@
> %%QT_EXAMPLEDIR%%/qml/tutorials/extending-qml/chapter6-plugins/app.qml
> %%QT_EXAMPLEDIR%%/qml/tutorials/extending-qml/chapter6-plugins/app.qrc
> %%QT_EXAMPLEDIR%%/qml/tutorials/extending-qml/chapter6-plugins/chapter6-plugins.pro
>-%%QT_EXAMPLEDIR%%/qml/tutorials/extending-qml/chapter6-plugins/import/chartsplugin.cpp
> %%QT_EXAMPLEDIR%%/qml/tutorials/extending-qml/chapter6-plugins/import/chartsplugin.h
> %%QT_EXAMPLEDIR%%/qml/tutorials/extending-qml/chapter6-plugins/import/import.pro
> %%QT_EXAMPLEDIR%%/qml/tutorials/extending-qml/chapter6-plugins/import/piechart.cpp
>@@ -3304,6 +3384,7 @@
> %%QT_EXAMPLEDIR%%/quick/animation/basics/images/star.png
> %%QT_EXAMPLEDIR%%/quick/animation/basics/images/sun.png
> %%QT_EXAMPLEDIR%%/quick/animation/basics/property-animation.qml
>+%%QT_EXAMPLEDIR%%/quick/animation/behaviors/FocusRect.qml
> %%QT_EXAMPLEDIR%%/quick/animation/behaviors/SideRect.qml
> %%QT_EXAMPLEDIR%%/quick/animation/behaviors/behavior-example.qml
> %%QT_EXAMPLEDIR%%/quick/animation/behaviors/tvtennis.qml
>@@ -3354,8 +3435,11 @@
> %%QT_EXAMPLEDIR%%/quick/customitems/flipable/content/back.png
> %%QT_EXAMPLEDIR%%/quick/customitems/flipable/doc/images/qml-flipable-example.png
> %%QT_EXAMPLEDIR%%/quick/customitems/flipable/doc/src/flipable.qdoc
>+%%QT_EXAMPLEDIR%%/quick/customitems/flipable/flipable.pro
> %%QT_EXAMPLEDIR%%/quick/customitems/flipable/flipable.qml
> %%QT_EXAMPLEDIR%%/quick/customitems/flipable/flipable.qmlproject
>+%%QT_EXAMPLEDIR%%/quick/customitems/flipable/flipable.qrc
>+%%QT_EXAMPLEDIR%%/quick/customitems/flipable/main.cpp
> %%QT_EXAMPLEDIR%%/quick/customitems/maskedmousearea/images/cloud_1.png
> %%QT_EXAMPLEDIR%%/quick/customitems/maskedmousearea/images/cloud_2.png
> %%QT_EXAMPLEDIR%%/quick/customitems/maskedmousearea/images/moon.png
>@@ -3381,15 +3465,21 @@
> %%QT_EXAMPLEDIR%%/quick/customitems/scrollbar/ScrollBar.qml
> %%QT_EXAMPLEDIR%%/quick/customitems/scrollbar/doc/images/qml-scrollbar-example.png
> %%QT_EXAMPLEDIR%%/quick/customitems/scrollbar/doc/src/scrollbar.qdoc
>+%%QT_EXAMPLEDIR%%/quick/customitems/scrollbar/main.cpp
> %%QT_EXAMPLEDIR%%/quick/customitems/scrollbar/main.qml
> %%QT_EXAMPLEDIR%%/quick/customitems/scrollbar/pics/niagara_falls.jpg
>+%%QT_EXAMPLEDIR%%/quick/customitems/scrollbar/scrollbar.pro
> %%QT_EXAMPLEDIR%%/quick/customitems/scrollbar/scrollbar.qmlproject
>+%%QT_EXAMPLEDIR%%/quick/customitems/scrollbar/scrollbar.qrc
> %%QT_EXAMPLEDIR%%/quick/customitems/searchbox/SearchBox.qml
> %%QT_EXAMPLEDIR%%/quick/customitems/searchbox/images/clear.png
> %%QT_EXAMPLEDIR%%/quick/customitems/searchbox/images/lineedit-bg-focus.png
> %%QT_EXAMPLEDIR%%/quick/customitems/searchbox/images/lineedit-bg.png
>+%%QT_EXAMPLEDIR%%/quick/customitems/searchbox/main.cpp
> %%QT_EXAMPLEDIR%%/quick/customitems/searchbox/main.qml
>+%%QT_EXAMPLEDIR%%/quick/customitems/searchbox/searchbox.pro
> %%QT_EXAMPLEDIR%%/quick/customitems/searchbox/searchbox.qmlproject
>+%%QT_EXAMPLEDIR%%/quick/customitems/searchbox/searchbox.qrc
> %%QT_EXAMPLEDIR%%/quick/customitems/slideswitch/content/Switch.qml
> %%QT_EXAMPLEDIR%%/quick/customitems/slideswitch/content/background.png
> %%QT_EXAMPLEDIR%%/quick/customitems/slideswitch/content/background.svg
>@@ -3400,14 +3490,20 @@
> %%QT_EXAMPLEDIR%%/quick/customitems/spinner/content/Spinner.qml
> %%QT_EXAMPLEDIR%%/quick/customitems/spinner/content/spinner-bg.png
> %%QT_EXAMPLEDIR%%/quick/customitems/spinner/content/spinner-select.png
>+%%QT_EXAMPLEDIR%%/quick/customitems/spinner/main.cpp
> %%QT_EXAMPLEDIR%%/quick/customitems/spinner/main.qml
>+%%QT_EXAMPLEDIR%%/quick/customitems/spinner/spinner.pro
> %%QT_EXAMPLEDIR%%/quick/customitems/spinner/spinner.qmlproject
>+%%QT_EXAMPLEDIR%%/quick/customitems/spinner/spinner.qrc
> %%QT_EXAMPLEDIR%%/quick/customitems/tabwidget/TabWidget.qml
> %%QT_EXAMPLEDIR%%/quick/customitems/tabwidget/doc/images/qml-tabwidget-example.png
> %%QT_EXAMPLEDIR%%/quick/customitems/tabwidget/doc/images/tab.png
> %%QT_EXAMPLEDIR%%/quick/customitems/tabwidget/doc/src/tabwidget.qdoc
>+%%QT_EXAMPLEDIR%%/quick/customitems/tabwidget/main.cpp
> %%QT_EXAMPLEDIR%%/quick/customitems/tabwidget/main.qml
>+%%QT_EXAMPLEDIR%%/quick/customitems/tabwidget/tabwidget.pro
> %%QT_EXAMPLEDIR%%/quick/customitems/tabwidget/tabwidget.qmlproject
>+%%QT_EXAMPLEDIR%%/quick/customitems/tabwidget/tabwidget.qrc
> %%QT_EXAMPLEDIR%%/quick/delegatechooser/delegatechooser.pro
> %%QT_EXAMPLEDIR%%/quick/delegatechooser/delegatechooser.qml
> %%QT_EXAMPLEDIR%%/quick/delegatechooser/main.cpp
>@@ -3422,6 +3518,7 @@
> %%QT_EXAMPLEDIR%%/quick/draganddrop/tiles/DragTile.qml
> %%QT_EXAMPLEDIR%%/quick/draganddrop/tiles/DropTile.qml
> %%QT_EXAMPLEDIR%%/quick/draganddrop/tiles/tiles.qml
>+%%QT_EXAMPLEDIR%%/quick/draganddrop/views/Icon.qml
> %%QT_EXAMPLEDIR%%/quick/draganddrop/views/gridview.qml
> %%QT_EXAMPLEDIR%%/quick/embeddedinwidgets/TextBox.qml
> %%QT_EXAMPLEDIR%%/quick/embeddedinwidgets/embeddedinwidgets.pro
>@@ -3743,6 +3840,9 @@
> %%QT_EXAMPLEDIR%%/quick/scenegraph/fboitem/fboitem.qrc
> %%QT_EXAMPLEDIR%%/quick/scenegraph/fboitem/main.cpp
> %%QT_EXAMPLEDIR%%/quick/scenegraph/fboitem/main.qml
>+%%QT_EXAMPLEDIR%%/quick/scenegraph/fboitem/shaders/+qsb/checker.frag
>+%%QT_EXAMPLEDIR%%/quick/scenegraph/fboitem/shaders/checker.frag
>+%%QT_EXAMPLEDIR%%/quick/scenegraph/fboitem/shaders/checker_rhi.frag
> %%QT_EXAMPLEDIR%%/quick/scenegraph/graph/doc/images/graph-example.jpg
> %%QT_EXAMPLEDIR%%/quick/scenegraph/graph/doc/src/graph.qdoc
> %%QT_EXAMPLEDIR%%/quick/scenegraph/graph/graph.cpp
>@@ -3827,6 +3927,8 @@
> %%QT_EXAMPLEDIR%%/quick/scenegraph/simplematerial/simplematerial.cpp
> %%QT_EXAMPLEDIR%%/quick/scenegraph/simplematerial/simplematerial.pro
> %%QT_EXAMPLEDIR%%/quick/scenegraph/simplematerial/simplematerial.qrc
>+%%QT_EXAMPLEDIR%%/quick/scenegraph/simplematerial/simplematerialitem.cpp
>+%%QT_EXAMPLEDIR%%/quick/scenegraph/simplematerial/simplematerialitem.h
> %%QT_EXAMPLEDIR%%/quick/scenegraph/textureinthread/doc/images/textureinthread-example.jpg
> %%QT_EXAMPLEDIR%%/quick/scenegraph/textureinthread/doc/src/textureinthread.qdoc
> %%QT_EXAMPLEDIR%%/quick/scenegraph/textureinthread/error.qml
>@@ -3847,10 +3949,29 @@
> %%QT_EXAMPLEDIR%%/quick/scenegraph/twotextureproviders/doc/src/twotextureproviders.qdoc
> %%QT_EXAMPLEDIR%%/quick/scenegraph/twotextureproviders/main.cpp
> %%QT_EXAMPLEDIR%%/quick/scenegraph/twotextureproviders/main.qml
>+%%QT_EXAMPLEDIR%%/quick/scenegraph/twotextureproviders/shaders/+qsb/checker.frag
>+%%QT_EXAMPLEDIR%%/quick/scenegraph/twotextureproviders/shaders/+qsb/xorblender.frag
>+%%QT_EXAMPLEDIR%%/quick/scenegraph/twotextureproviders/shaders/+qsb/xorblender.vert
>+%%QT_EXAMPLEDIR%%/quick/scenegraph/twotextureproviders/shaders/checker.frag
>+%%QT_EXAMPLEDIR%%/quick/scenegraph/twotextureproviders/shaders/checker_rhi.frag
>+%%QT_EXAMPLEDIR%%/quick/scenegraph/twotextureproviders/shaders/xorblender.frag
>+%%QT_EXAMPLEDIR%%/quick/scenegraph/twotextureproviders/shaders/xorblender.vert
>+%%QT_EXAMPLEDIR%%/quick/scenegraph/twotextureproviders/shaders/xorblender_rhi.frag
>+%%QT_EXAMPLEDIR%%/quick/scenegraph/twotextureproviders/shaders/xorblender_rhi.vert
> %%QT_EXAMPLEDIR%%/quick/scenegraph/twotextureproviders/twotextureproviders.pro
> %%QT_EXAMPLEDIR%%/quick/scenegraph/twotextureproviders/twotextureproviders.qrc
> %%QT_EXAMPLEDIR%%/quick/scenegraph/twotextureproviders/xorblender.cpp
> %%QT_EXAMPLEDIR%%/quick/scenegraph/twotextureproviders/xorblender.h
>+%%QT_EXAMPLEDIR%%/quick/scenegraph/vulkantextureimport/doc/images/vulkantextureimport-example.jpg
>+%%QT_EXAMPLEDIR%%/quick/scenegraph/vulkantextureimport/doc/src/vulkantextureimport.qdoc
>+%%QT_EXAMPLEDIR%%/quick/scenegraph/vulkantextureimport/main.cpp
>+%%QT_EXAMPLEDIR%%/quick/scenegraph/vulkantextureimport/main.qml
>+%%QT_EXAMPLEDIR%%/quick/scenegraph/vulkantextureimport/squircle.frag.spv
>+%%QT_EXAMPLEDIR%%/quick/scenegraph/vulkantextureimport/squircle.vert.spv
>+%%QT_EXAMPLEDIR%%/quick/scenegraph/vulkantextureimport/vulkantextureimport.cpp
>+%%QT_EXAMPLEDIR%%/quick/scenegraph/vulkantextureimport/vulkantextureimport.h
>+%%QT_EXAMPLEDIR%%/quick/scenegraph/vulkantextureimport/vulkantextureimport.pro
>+%%QT_EXAMPLEDIR%%/quick/scenegraph/vulkantextureimport/vulkantextureimport.qrc
> %%QT_EXAMPLEDIR%%/quick/scenegraph/vulkanunderqml/doc/images/vulkanunderqml-example.jpg
> %%QT_EXAMPLEDIR%%/quick/scenegraph/vulkanunderqml/doc/src/vulkanunderqml.qdoc
> %%QT_EXAMPLEDIR%%/quick/scenegraph/vulkanunderqml/main.cpp
>@@ -3905,6 +4026,7 @@
> %%QT_EXAMPLEDIR%%/quick/shapes/content/item14.qml
> %%QT_EXAMPLEDIR%%/quick/shapes/content/item15.qml
> %%QT_EXAMPLEDIR%%/quick/shapes/content/item17.qml
>+%%QT_EXAMPLEDIR%%/quick/shapes/content/item18.qml
> %%QT_EXAMPLEDIR%%/quick/shapes/content/item2.qml
> %%QT_EXAMPLEDIR%%/quick/shapes/content/item3.qml
> %%QT_EXAMPLEDIR%%/quick/shapes/content/item4.qml
>@@ -4041,36 +4163,57 @@
> %%QT_EXAMPLEDIR%%/quick/touchinteraction/touchinteraction.qrc
> %%QT_EXAMPLEDIR%%/quick/tutorials/dynamicview/dynamicview1/PetsModel.qml
> %%QT_EXAMPLEDIR%%/quick/tutorials/dynamicview/dynamicview1/dynamicview.qml
>+%%QT_EXAMPLEDIR%%/quick/tutorials/dynamicview/dynamicview1/dynamicview1.pro
> %%QT_EXAMPLEDIR%%/quick/tutorials/dynamicview/dynamicview1/dynamicview1.qmlproject
>+%%QT_EXAMPLEDIR%%/quick/tutorials/dynamicview/dynamicview1/dynamicview1.qrc
>+%%QT_EXAMPLEDIR%%/quick/tutorials/dynamicview/dynamicview1/main.cpp
> %%QT_EXAMPLEDIR%%/quick/tutorials/dynamicview/dynamicview2/PetsModel.qml
> %%QT_EXAMPLEDIR%%/quick/tutorials/dynamicview/dynamicview2/dynamicview.qml
>+%%QT_EXAMPLEDIR%%/quick/tutorials/dynamicview/dynamicview2/dynamicview2.pro
> %%QT_EXAMPLEDIR%%/quick/tutorials/dynamicview/dynamicview2/dynamicview2.qmlproject
>+%%QT_EXAMPLEDIR%%/quick/tutorials/dynamicview/dynamicview2/dynamicview2.qrc
>+%%QT_EXAMPLEDIR%%/quick/tutorials/dynamicview/dynamicview2/main.cpp
> %%QT_EXAMPLEDIR%%/quick/tutorials/dynamicview/dynamicview3/PetsModel.qml
> %%QT_EXAMPLEDIR%%/quick/tutorials/dynamicview/dynamicview3/dynamicview.qml
>+%%QT_EXAMPLEDIR%%/quick/tutorials/dynamicview/dynamicview3/dynamicview3.pro
> %%QT_EXAMPLEDIR%%/quick/tutorials/dynamicview/dynamicview3/dynamicview3.qmlproject
>+%%QT_EXAMPLEDIR%%/quick/tutorials/dynamicview/dynamicview3/dynamicview3.qrc
>+%%QT_EXAMPLEDIR%%/quick/tutorials/dynamicview/dynamicview3/main.cpp
> %%QT_EXAMPLEDIR%%/quick/tutorials/dynamicview/dynamicview4/ListSelector.qml
> %%QT_EXAMPLEDIR%%/quick/tutorials/dynamicview/dynamicview4/PetsModel.qml
> %%QT_EXAMPLEDIR%%/quick/tutorials/dynamicview/dynamicview4/dynamicview.qml
>+%%QT_EXAMPLEDIR%%/quick/tutorials/dynamicview/dynamicview4/dynamicview4.pro
> %%QT_EXAMPLEDIR%%/quick/tutorials/dynamicview/dynamicview4/dynamicview4.qmlproject
>+%%QT_EXAMPLEDIR%%/quick/tutorials/dynamicview/dynamicview4/dynamicview4.qrc
>+%%QT_EXAMPLEDIR%%/quick/tutorials/dynamicview/dynamicview4/main.cpp
> %%QT_EXAMPLEDIR%%/quick/tutorials/helloworld/Cell.qml
> %%QT_EXAMPLEDIR%%/quick/tutorials/helloworld/tutorial1.qml
> %%QT_EXAMPLEDIR%%/quick/tutorials/helloworld/tutorial2.qml
> %%QT_EXAMPLEDIR%%/quick/tutorials/helloworld/tutorial3.qml
> %%QT_EXAMPLEDIR%%/quick/tutorials/samegame/samegame1/Block.qml
> %%QT_EXAMPLEDIR%%/quick/tutorials/samegame/samegame1/Button.qml
>+%%QT_EXAMPLEDIR%%/quick/tutorials/samegame/samegame1/main.cpp
> %%QT_EXAMPLEDIR%%/quick/tutorials/samegame/samegame1/samegame.qml
>+%%QT_EXAMPLEDIR%%/quick/tutorials/samegame/samegame1/samegame1.pro
> %%QT_EXAMPLEDIR%%/quick/tutorials/samegame/samegame1/samegame1.qmlproject
>+%%QT_EXAMPLEDIR%%/quick/tutorials/samegame/samegame1/samegame1.qrc
> %%QT_EXAMPLEDIR%%/quick/tutorials/samegame/samegame2/Block.qml
> %%QT_EXAMPLEDIR%%/quick/tutorials/samegame/samegame2/Button.qml
>+%%QT_EXAMPLEDIR%%/quick/tutorials/samegame/samegame2/main.cpp
> %%QT_EXAMPLEDIR%%/quick/tutorials/samegame/samegame2/samegame.js
> %%QT_EXAMPLEDIR%%/quick/tutorials/samegame/samegame2/samegame.qml
>+%%QT_EXAMPLEDIR%%/quick/tutorials/samegame/samegame2/samegame2.pro
> %%QT_EXAMPLEDIR%%/quick/tutorials/samegame/samegame2/samegame2.qmlproject
>+%%QT_EXAMPLEDIR%%/quick/tutorials/samegame/samegame2/samegame2.qrc
> %%QT_EXAMPLEDIR%%/quick/tutorials/samegame/samegame3/Block.qml
> %%QT_EXAMPLEDIR%%/quick/tutorials/samegame/samegame3/Button.qml
> %%QT_EXAMPLEDIR%%/quick/tutorials/samegame/samegame3/Dialog.qml
>+%%QT_EXAMPLEDIR%%/quick/tutorials/samegame/samegame3/main.cpp
> %%QT_EXAMPLEDIR%%/quick/tutorials/samegame/samegame3/samegame.js
> %%QT_EXAMPLEDIR%%/quick/tutorials/samegame/samegame3/samegame.qml
>+%%QT_EXAMPLEDIR%%/quick/tutorials/samegame/samegame3/samegame3.pro
> %%QT_EXAMPLEDIR%%/quick/tutorials/samegame/samegame3/samegame3.qmlproject
>+%%QT_EXAMPLEDIR%%/quick/tutorials/samegame/samegame3/samegame3.qrc
> %%QT_EXAMPLEDIR%%/quick/tutorials/samegame/samegame4/content/BoomBlock.qml
> %%QT_EXAMPLEDIR%%/quick/tutorials/samegame/samegame4/content/Button.qml
> %%QT_EXAMPLEDIR%%/quick/tutorials/samegame/samegame4/content/Dialog.qml
>@@ -4079,8 +4222,11 @@
> %%QT_EXAMPLEDIR%%/quick/tutorials/samegame/samegame4/highscores/score_data.xml
> %%QT_EXAMPLEDIR%%/quick/tutorials/samegame/samegame4/highscores/score_style.xsl
> %%QT_EXAMPLEDIR%%/quick/tutorials/samegame/samegame4/highscores/scores.php
>+%%QT_EXAMPLEDIR%%/quick/tutorials/samegame/samegame4/main.cpp
> %%QT_EXAMPLEDIR%%/quick/tutorials/samegame/samegame4/samegame.qml
>+%%QT_EXAMPLEDIR%%/quick/tutorials/samegame/samegame4/samegame4.pro
> %%QT_EXAMPLEDIR%%/quick/tutorials/samegame/samegame4/samegame4.qmlproject
>+%%QT_EXAMPLEDIR%%/quick/tutorials/samegame/samegame4/samegame4.qrc
> %%QT_EXAMPLEDIR%%/quick/tutorials/samegame/shared/pics/background.jpg
> %%QT_EXAMPLEDIR%%/quick/tutorials/samegame/shared/pics/blueStar.png
> %%QT_EXAMPLEDIR%%/quick/tutorials/samegame/shared/pics/blueStone.png
>@@ -4088,11 +4234,15 @@
> %%QT_EXAMPLEDIR%%/quick/tutorials/samegame/shared/pics/greenStone.png
> %%QT_EXAMPLEDIR%%/quick/tutorials/samegame/shared/pics/redStar.png
> %%QT_EXAMPLEDIR%%/quick/tutorials/samegame/shared/pics/redStone.png
>+%%QT_EXAMPLEDIR%%/quick/tutorials/samegame/shared/pics/shared.qrc
> %%QT_EXAMPLEDIR%%/quick/tutorials/samegame/shared/pics/star.png
> %%QT_EXAMPLEDIR%%/quick/tutorials/samegame/shared/pics/yellowStone.png
> %%QT_EXAMPLEDIR%%/quick/tutorials/tutorials.pro
> %%QT_EXAMPLEDIR%%/quick/views/delegatemodel/delegatemodel.qmlproject
> %%QT_EXAMPLEDIR%%/quick/views/delegatemodel/dragselection.qml
>+%%QT_EXAMPLEDIR%%/quick/views/delegatemodel/flipable.pro
>+%%QT_EXAMPLEDIR%%/quick/views/delegatemodel/flipable.qrc
>+%%QT_EXAMPLEDIR%%/quick/views/delegatemodel/main.cpp
> %%QT_EXAMPLEDIR%%/quick/views/delegatemodel/slideshow.qml
> %%QT_EXAMPLEDIR%%/quick/views/doc/images/qml-modelviews-example.png
> %%QT_EXAMPLEDIR%%/quick/views/doc/src/views.qdoc
>@@ -5739,21 +5889,6 @@
> %%QT_EXAMPLEDIR%%/svg/embeddedsvgviewer/files/default.svg
> %%QT_EXAMPLEDIR%%/svg/embeddedsvgviewer/files/v-slider-handle.svg
> %%QT_EXAMPLEDIR%%/svg/embeddedsvgviewer/main.cpp
>-%%QT_EXAMPLEDIR%%/svg/network/bearercloud/bearercloud.cpp
>-%%QT_EXAMPLEDIR%%/svg/network/bearercloud/bearercloud.h
>-%%QT_EXAMPLEDIR%%/svg/network/bearercloud/bearercloud.pro
>-%%QT_EXAMPLEDIR%%/svg/network/bearercloud/bluetooth.svg
>-%%QT_EXAMPLEDIR%%/svg/network/bearercloud/cell.svg
>-%%QT_EXAMPLEDIR%%/svg/network/bearercloud/cloud.cpp
>-%%QT_EXAMPLEDIR%%/svg/network/bearercloud/cloud.h
>-%%QT_EXAMPLEDIR%%/svg/network/bearercloud/gprs.svg
>-%%QT_EXAMPLEDIR%%/svg/network/bearercloud/icons.qrc
>-%%QT_EXAMPLEDIR%%/svg/network/bearercloud/lan.svg
>-%%QT_EXAMPLEDIR%%/svg/network/bearercloud/main.cpp
>-%%QT_EXAMPLEDIR%%/svg/network/bearercloud/umts.svg
>-%%QT_EXAMPLEDIR%%/svg/network/bearercloud/unknown.svg
>-%%QT_EXAMPLEDIR%%/svg/network/bearercloud/wlan.svg
>-%%QT_EXAMPLEDIR%%/svg/network/network.pro
> %%QT_EXAMPLEDIR%%/svg/opengl/framebufferobject/bubbles.svg
> %%QT_EXAMPLEDIR%%/svg/opengl/framebufferobject/designer.png
> %%QT_EXAMPLEDIR%%/svg/opengl/framebufferobject/framebufferobject.pro
>@@ -6709,6 +6844,7 @@
> %%QT_EXAMPLEDIR%%/widgets/doc/src/fontsampler.qdoc
> %%QT_EXAMPLEDIR%%/widgets/doc/src/fridgemagnets.qdoc
> %%QT_EXAMPLEDIR%%/widgets/doc/src/frozencolumn.qdoc
>+%%QT_EXAMPLEDIR%%/widgets/doc/src/gallery.qdoc
> %%QT_EXAMPLEDIR%%/widgets/doc/src/gradients.qdoc
> %%QT_EXAMPLEDIR%%/widgets/doc/src/graphicsview-anchorlayout.qdoc
> %%QT_EXAMPLEDIR%%/widgets/doc/src/graphicsview-flowlayout.qdoc
>@@ -6839,6 +6975,10 @@
> %%QT_EXAMPLEDIR%%/widgets/effects/fademessage/fademessage.pro
> %%QT_EXAMPLEDIR%%/widgets/effects/fademessage/fademessage.qrc
> %%QT_EXAMPLEDIR%%/widgets/effects/fademessage/main.cpp
>+%%QT_EXAMPLEDIR%%/widgets/gallery/gallery.pro
>+%%QT_EXAMPLEDIR%%/widgets/gallery/main.cpp
>+%%QT_EXAMPLEDIR%%/widgets/gallery/widgetgallery.cpp
>+%%QT_EXAMPLEDIR%%/widgets/gallery/widgetgallery.h
> %%QT_EXAMPLEDIR%%/widgets/gestures/gestures.pro
> %%QT_EXAMPLEDIR%%/widgets/gestures/imagegestures/doc/src/imagegestures.qdoc
> %%QT_EXAMPLEDIR%%/widgets/gestures/imagegestures/imagegestures.pro
>@@ -8064,17 +8204,6 @@
> %%QT_EXAMPLEDIR%%/xml/rsslisting/rsslisting.cpp
> %%QT_EXAMPLEDIR%%/xml/rsslisting/rsslisting.h
> %%QT_EXAMPLEDIR%%/xml/rsslisting/rsslisting.pro
>-%%QT_EXAMPLEDIR%%/xml/saxbookmarks/doc/images/saxbookmarks-example.png
>-%%QT_EXAMPLEDIR%%/xml/saxbookmarks/doc/src/saxbookmarks.qdoc
>-%%QT_EXAMPLEDIR%%/xml/saxbookmarks/jennifer.xbel
>-%%QT_EXAMPLEDIR%%/xml/saxbookmarks/main.cpp
>-%%QT_EXAMPLEDIR%%/xml/saxbookmarks/mainwindow.cpp
>-%%QT_EXAMPLEDIR%%/xml/saxbookmarks/mainwindow.h
>-%%QT_EXAMPLEDIR%%/xml/saxbookmarks/saxbookmarks.pro
>-%%QT_EXAMPLEDIR%%/xml/saxbookmarks/xbelgenerator.cpp
>-%%QT_EXAMPLEDIR%%/xml/saxbookmarks/xbelgenerator.h
>-%%QT_EXAMPLEDIR%%/xml/saxbookmarks/xbelhandler.cpp
>-%%QT_EXAMPLEDIR%%/xml/saxbookmarks/xbelhandler.h
> %%QT_EXAMPLEDIR%%/xml/streambookmarks/doc/images/xmlstreamexample-filemenu.png
> %%QT_EXAMPLEDIR%%/xml/streambookmarks/doc/images/xmlstreamexample-helpmenu.png
> %%QT_EXAMPLEDIR%%/xml/streambookmarks/doc/images/xmlstreamexample-screenshot.png
>diff --git a/multimedia/qt5-multimedia/pkg-plist b/multimedia/qt5-multimedia/pkg-plist
>index 6cf6cbddb6d3..bd6e017dd1d2 100644
>--- a/multimedia/qt5-multimedia/pkg-plist
>+++ b/multimedia/qt5-multimedia/pkg-plist
>@@ -31,10 +31,10 @@
> %%QT_INCDIR%%/QtMultimedia/%%FULLVER%%/QtMultimedia/private/qsoundeffect_qaudio_p.h
> %%QT_INCDIR%%/QtMultimedia/%%FULLVER%%/QtMultimedia/private/qtmultimedia-config_p.h
> %%QT_INCDIR%%/QtMultimedia/%%FULLVER%%/QtMultimedia/private/qtmultimediaglobal_p.h
>-%%QT_INCDIR%%/QtMultimedia/%%FULLVER%%/QtMultimedia/private/qvideoframe_p.h
> %%QT_INCDIR%%/QtMultimedia/%%FULLVER%%/QtMultimedia/private/qvideoframeconversionhelper_p.h
> %%QT_INCDIR%%/QtMultimedia/%%FULLVER%%/QtMultimedia/private/qvideooutputorientationhandler_p.h
> %%QT_INCDIR%%/QtMultimedia/%%FULLVER%%/QtMultimedia/private/qvideosurfaceoutput_p.h
>+%%QT_INCDIR%%/QtMultimedia/%%FULLVER%%/QtMultimedia/private/qvideosurfaces_p.h
> %%QT_INCDIR%%/QtMultimedia/%%FULLVER%%/QtMultimedia/private/qwavedecoder_p.h
> %%QT_INCDIR%%/QtMultimedia/QAbstractAudioDeviceInfo
> %%QT_INCDIR%%/QtMultimedia/QAbstractAudioInput
>diff --git a/net/qt5-network/Makefile b/net/qt5-network/Makefile
>index ea465f36e48e..f13994cfbbb2 100644
>--- a/net/qt5-network/Makefile
>+++ b/net/qt5-network/Makefile
>@@ -22,6 +22,13 @@ INSTALL_WRKSRC=	${BUILD_WRKSRC}
> QT_DEFINES=	OPENSSL SSL
> QT_CONFIG=	openssl
> 
>+.include <bsd.port.pre.mk>
>+
>+.if ${OPSYS} == FreeBSD && ${OSVERSION} < 1200085 && ${SSL_DEFAULT} == "base"
>+# 1200085	339270	October 19, 2018	12.0-STABLE after updating OpenSSL to version 1.1.1.
>+BROKEN=		Qt5 requires Openssl 1.1.1, upgrade to FreeBSD 12.x/13.x or add DEFAULT_VERSIONS+=ssl=[openssl|libressl*] to /etc/make.conf
>+.endif
>+
> post-patch:
> 	@${REINPLACE_CMD} -e 's|/usr/local|${LOCALBASE}|g' \
> 		${BUILD_WRKSRC}/ssl/qsslsocket_openssl.cpp
>@@ -44,4 +51,4 @@ post-install:
> 		${SETENV} ${MAKE_ENV} ${MAKE} ${MAKE_FLAGS} ${MAKEFILE} \
> 		${MAKE_ARGS} ${INSTALL_TARGET}
> 
>-.include <bsd.port.mk>
>+.include <bsd.port.post.mk>
>diff --git a/net/qt5-network/files/patch-src_network_ssl_qsslcontext__openssl.cpp b/net/qt5-network/files/patch-src_network_ssl_qsslcontext__openssl.cpp
>new file mode 100644
>index 000000000000..70fcbb69b9fd
>--- /dev/null
>+++ b/net/qt5-network/files/patch-src_network_ssl_qsslcontext__openssl.cpp
>@@ -0,0 +1,18 @@
>+--- src/network/ssl/qsslcontext_openssl.cpp.orig	2020-05-17 21:00:32 UTC
>++++ src/network/ssl/qsslcontext_openssl.cpp
>+@@ -696,6 +696,7 @@ void QSslContext::applyBackendConfig(QSslContext *sslC
>+     }
>+ #endif // ocsp
>+ 
>++#if !defined(LIBRESSL_VERSION_NUMBER)
>+     QSharedPointer<SSL_CONF_CTX> cctx(q_SSL_CONF_CTX_new(), &q_SSL_CONF_CTX_free);
>+     if (cctx) {
>+         q_SSL_CONF_CTX_set_ssl_ctx(cctx.data(), sslContext->ctx);
>+@@ -746,6 +747,7 @@ void QSslContext::applyBackendConfig(QSslContext *sslC
>+         sslContext->errorStr = msgErrorSettingBackendConfig(QSslSocket::tr("SSL_CONF_CTX_new() failed"));
>+         sslContext->errorCode = QSslError::UnspecifiedError;
>+     }
>++#endif
>+ }
>+ 
>+ QT_END_NAMESPACE
>diff --git a/net/qt5-network/files/patch-src_network_ssl_qsslcontext_openssl.cpp b/net/qt5-network/files/patch-src_network_ssl_qsslcontext_openssl.cpp
>deleted file mode 100644
>index 12f029175207..000000000000
>--- a/net/qt5-network/files/patch-src_network_ssl_qsslcontext_openssl.cpp
>+++ /dev/null
>@@ -1,11 +0,0 @@
>---- src/network/ssl/qsslcontext_openssl.cpp.orig	2019-10-01 08:05:51 UTC
>-+++ src/network/ssl/qsslcontext_openssl.cpp
>-@@ -265,7 +265,7 @@ void QSslContext::applyBackendConfig(QSslContext *sslC
>-     }
>- #endif // ocsp
>- 
>--#if OPENSSL_VERSION_NUMBER >= 0x10002000L
>-+#if OPENSSL_VERSION_NUMBER >= 0x10002000L && !defined(LIBRESSL_VERSION_NUMBER)
>-     if (QSslSocket::sslLibraryVersionNumber() >= 0x10002000L) {
>-         QSharedPointer<SSL_CONF_CTX> cctx(q_SSL_CONF_CTX_new(), &q_SSL_CONF_CTX_free);
>-         if (cctx) {
>diff --git a/net/qt5-network/files/patch-src_network_ssl_qsslsocket_openssl_symbols.cpp b/net/qt5-network/files/patch-src_network_ssl_qsslsocket__openssl__symbols.cpp
>similarity index 65%
>rename from net/qt5-network/files/patch-src_network_ssl_qsslsocket_openssl_symbols.cpp
>rename to net/qt5-network/files/patch-src_network_ssl_qsslsocket__openssl__symbols.cpp
>index 390855e9df06..1649b786741a 100644
>--- a/net/qt5-network/files/patch-src_network_ssl_qsslsocket_openssl_symbols.cpp
>+++ b/net/qt5-network/files/patch-src_network_ssl_qsslsocket__openssl__symbols.cpp
>@@ -1,7 +1,7 @@
>---- src/network/ssl/qsslsocket_openssl_symbols.cpp.orig	2019-10-25 09:16:48.000000000 +0200
>-+++ src/network/ssl/qsslsocket_openssl_symbols.cpp	2019-11-01 20:03:08.715014000 +0100
>-@@ -152,6 +152,14 @@
>- DEFINEFUNC(int, EVP_CIPHER_CTX_reset, EVP_CIPHER_CTX *c, c, return 0, return)
>+--- src/network/ssl/qsslsocket_openssl_symbols.cpp.orig	2020-05-05 11:59:27 UTC
>++++ src/network/ssl/qsslsocket_openssl_symbols.cpp
>+@@ -147,6 +147,14 @@ DEFINEFUNC(int, EVP_CIPHER_CTX_reset, EVP_CIPHER_CTX *
>+ DEFINEFUNC(int, EVP_PKEY_up_ref, EVP_PKEY *a, a, return 0, return)
>  DEFINEFUNC(int, EVP_PKEY_base_id, EVP_PKEY *a, a, return NID_undef, return)
>  DEFINEFUNC(int, RSA_bits, RSA *a, a, return 0, return)
> +#ifdef LIBRESSL_VERSION_NUMBER
>@@ -15,7 +15,7 @@
>  DEFINEFUNC(int, DSA_bits, DSA *a, a, return 0, return)
>  DEFINEFUNC(int, OPENSSL_sk_num, OPENSSL_STACK *a, a, return -1, return)
>  DEFINEFUNC2(void, OPENSSL_sk_pop_free, OPENSSL_STACK *a, a, void (*b)(void*), b, return, DUMMYARG)
>-@@ -159,6 +167,7 @@
>+@@ -154,6 +162,7 @@ DEFINEFUNC(OPENSSL_STACK *, OPENSSL_sk_new_null, DUMMY
>  DEFINEFUNC2(void, OPENSSL_sk_push, OPENSSL_STACK *a, a, void *b, b, return, DUMMYARG)
>  DEFINEFUNC(void, OPENSSL_sk_free, OPENSSL_STACK *a, a, return, DUMMYARG)
>  DEFINEFUNC2(void *, OPENSSL_sk_value, OPENSSL_STACK *a, a, int b, b, return nullptr, return)
>@@ -23,28 +23,23 @@
>  DEFINEFUNC(int, SSL_session_reused, SSL *a, a, return 0, return)
>  DEFINEFUNC2(unsigned long, SSL_CTX_set_options, SSL_CTX *ctx, ctx, unsigned long op, op, return 0, return)
>  #ifdef TLS1_3_VERSION
>-@@ -443,7 +452,7 @@
>+@@ -351,12 +360,14 @@ DEFINEFUNC2(int, SSL_CTX_use_PrivateKey, SSL_CTX *a, a
>  DEFINEFUNC2(int, SSL_CTX_use_RSAPrivateKey, SSL_CTX *a, a, RSA *b, b, return -1, return)
>  DEFINEFUNC3(int, SSL_CTX_use_PrivateKey_file, SSL_CTX *a, a, const char *b, b, int c, c, return -1, return)
>  DEFINEFUNC(X509_STORE *, SSL_CTX_get_cert_store, const SSL_CTX *a, a, return nullptr, return)
>--#if OPENSSL_VERSION_NUMBER >= 0x10002000L
>-+#if OPENSSL_VERSION_NUMBER >= 0x10002000L && !defined(LIBRESSL_VERSION_NUMBER)
>++#if !defined(LIBRESSL_VERSION_NUMBER)
>  DEFINEFUNC(SSL_CONF_CTX *, SSL_CONF_CTX_new, DUMMYARG, DUMMYARG, return nullptr, return);
>  DEFINEFUNC(void, SSL_CONF_CTX_free, SSL_CONF_CTX *a, a, return ,return);
>  DEFINEFUNC2(void, SSL_CONF_CTX_set_ssl_ctx, SSL_CONF_CTX *a, a, SSL_CTX *b, b, return, return);
>-@@ -839,8 +848,8 @@
>- #endif
>- #if defined(SHLIB_VERSION_NUMBER) && !defined(Q_OS_QNX) // on QNX, the libs are always libssl.so and libcrypto.so
>-     // first attempt: the canonical name is libssl.so.<SHLIB_VERSION_NUMBER>
>--    libssl->setFileNameAndVersion(QLatin1String("ssl"), QLatin1String(SHLIB_VERSION_NUMBER));
>--    libcrypto->setFileNameAndVersion(QLatin1String("crypto"), QLatin1String(SHLIB_VERSION_NUMBER));
>-+    libssl->setFileNameAndVersion(QLatin1String("%%OPENSSLLIB%%/libssl"), QLatin1String(SHLIB_VERSION_NUMBER));
>-+    libcrypto->setFileNameAndVersion(QLatin1String("%%OPENSSLLIB%%/libcrypto"), QLatin1String(SHLIB_VERSION_NUMBER));
>-     if (libcrypto->load() && libssl->load()) {
>-         // libssl.so.<SHLIB_VERSION_NUMBER> and libcrypto.so.<SHLIB_VERSION_NUMBER> found
>-         return pair;
>-@@ -980,12 +989,21 @@
>-     RESOLVEFUNC(EVP_CIPHER_CTX_reset)
>+ DEFINEFUNC2(unsigned int, SSL_CONF_CTX_set_flags, SSL_CONF_CTX *a, a, unsigned int b, b, return 0, return);
>+ DEFINEFUNC(int, SSL_CONF_CTX_finish, SSL_CONF_CTX *a, a, return 0, return);
>+ DEFINEFUNC3(int, SSL_CONF_cmd, SSL_CONF_CTX *a, a, const char *b, b, const char *c, c, return 0, return);
>++#endif
>+ DEFINEFUNC(void, SSL_free, SSL *a, a, return, DUMMYARG)
>+ DEFINEFUNC(STACK_OF(SSL_CIPHER) *, SSL_get_ciphers, const SSL *a, a, return nullptr, return)
>+ DEFINEFUNC(const SSL_CIPHER *, SSL_get_current_cipher, SSL *a, a, return nullptr, return)
>+@@ -834,12 +845,21 @@ bool q_resolveOpenSslSymbols()
>+     RESOLVEFUNC(EVP_PKEY_up_ref)
>      RESOLVEFUNC(EVP_PKEY_base_id)
>      RESOLVEFUNC(RSA_bits)
> +#ifdef LIBRESSL_VERSION_NUMBER
>@@ -64,8 +59,8 @@
> +#endif
>      RESOLVEFUNC(DH_get0_pqg)
>      RESOLVEFUNC(SSL_CTX_set_options)
>- #ifdef TLS1_3_VERSION
>-@@ -1024,7 +1042,9 @@
>+ 
>+@@ -881,7 +901,9 @@ bool q_resolveOpenSslSymbols()
>  
>      RESOLVEFUNC(SSL_SESSION_get_ticket_lifetime_hint)
>      RESOLVEFUNC(DH_bits)
>@@ -75,12 +70,18 @@
>  
>  #if QT_CONFIG(dtls)
>      RESOLVEFUNC(DTLSv1_listen)
>-@@ -1280,7 +1300,7 @@
>+@@ -1041,12 +1063,14 @@ bool q_resolveOpenSslSymbols()
>      RESOLVEFUNC(SSL_CTX_use_RSAPrivateKey)
>      RESOLVEFUNC(SSL_CTX_use_PrivateKey_file)
>      RESOLVEFUNC(SSL_CTX_get_cert_store);
>--#if OPENSSL_VERSION_NUMBER >= 0x10002000L
>-+#if OPENSSL_VERSION_NUMBER >= 0x10002000L && !defined(LIBRESSL_VERSION_NUMBER)
>++#if !defined(LIBRESSL_VERSION_NUMBER)
>      RESOLVEFUNC(SSL_CONF_CTX_new);
>      RESOLVEFUNC(SSL_CONF_CTX_free);
>      RESOLVEFUNC(SSL_CONF_CTX_set_ssl_ctx);
>+     RESOLVEFUNC(SSL_CONF_CTX_set_flags);
>+     RESOLVEFUNC(SSL_CONF_CTX_finish);
>+     RESOLVEFUNC(SSL_CONF_cmd);
>++#endif
>+     RESOLVEFUNC(SSL_accept)
>+     RESOLVEFUNC(SSL_clear)
>+     RESOLVEFUNC(SSL_connect)
>diff --git a/net/qt5-network/files/patch-qsslsocket_openssl11_symbols_p.h b/net/qt5-network/files/patch-src_network_ssl_qsslsocket__openssl__symbols__p.h
>similarity index 63%
>rename from net/qt5-network/files/patch-qsslsocket_openssl11_symbols_p.h
>rename to net/qt5-network/files/patch-src_network_ssl_qsslsocket__openssl__symbols__p.h
>index 7265a2835970..5b48c17f4b03 100644
>--- a/net/qt5-network/files/patch-qsslsocket_openssl11_symbols_p.h
>+++ b/net/qt5-network/files/patch-src_network_ssl_qsslsocket__openssl__symbols__p.h
>@@ -1,8 +1,23 @@
>---- src/network/ssl/qsslsocket_openssl11_symbols_p.h.orig	2019-10-01 07:47:24 UTC
>-+++ src/network/ssl/qsslsocket_openssl11_symbols_p.h
>-@@ -77,20 +77,49 @@
>+--- src/network/ssl/qsslsocket_openssl_symbols_p.h.orig	2020-05-05 11:59:27 UTC
>++++ src/network/ssl/qsslsocket_openssl_symbols_p.h
>+@@ -72,6 +72,14 @@
>+ #include "qsslsocket_openssl_p.h"
>+ #include <QtCore/qglobal.h>
>  
>- const unsigned char * q_ASN1_STRING_get0_data(const ASN1_STRING *x);
>++#if defined(LIBRESSL_VERSION_NUMBER) && LIBRESSL_VERSION_NUMBER >= 0x20700000L
>++# define TLS1_2_VERSION 0x0303
>++# define TLS_MAX_VERSION TLS1_2_VERSION
>++# define TLS_ANY_VERSION 0x10000
>++# define DTLS1_2_VERSION                 0xFEFD
>++# define DTLS_MAX_VERSION                DTLS1_2_VERSION
>++#endif
>++
>+ #if QT_CONFIG(ocsp)
>+ #include "qocsp_p.h"
>+ #endif
>+@@ -225,22 +233,50 @@ QT_BEGIN_NAMESPACE
>+ // content of the header here. Later, can be better sorted/split into groups,
>+ // depending on the functionality.
>  
> +#if defined(LIBRESSL_VERSION_NUMBER) && LIBRESSL_VERSION_NUMBER >= 0x20700000L
> +// LibreSSL 2.7 has stack_st but not OPENSSL_STACK
>@@ -13,7 +28,8 @@
> +typedef int (*X509_STORE_CTX_verify_cb)(int, X509_STORE_CTX *);
> +#endif
> +
>-+
>+ const unsigned char * q_ASN1_STRING_get0_data(const ASN1_STRING *x);
>+ 
>  Q_AUTOTEST_EXPORT BIO *q_BIO_new(const BIO_METHOD *a);
>  Q_AUTOTEST_EXPORT const BIO_METHOD *q_BIO_s_mem();
>  
>@@ -50,22 +66,32 @@
>  int q_SSL_session_reused(SSL *a);
>  unsigned long q_SSL_CTX_set_options(SSL_CTX *ctx, unsigned long op);
>  int q_OPENSSL_init_ssl(uint64_t opts, const OPENSSL_INIT_SETTINGS *settings);
>-@@ -113,12 +142,15 @@
>- void q_DH_get0_pqg(const DH *dh, const BIGNUM **p, const BIGNUM **q, const BIGNUM **g);
>- int q_DH_bits(DH *dh);
>- 
>--# define q_SSL_load_error_strings() q_OPENSSL_init_ssl(OPENSSL_INIT_LOAD_SSL_STRINGS \
>-+#define q_SSL_load_error_strings() q_OPENSSL_init_ssl(OPENSSL_INIT_LOAD_SSL_STRINGS \
>+@@ -266,8 +302,13 @@ int q_DH_bits(DH *dh);
>+ # define q_SSL_load_error_strings() q_OPENSSL_init_ssl(OPENSSL_INIT_LOAD_SSL_STRINGS \
>                                                         | OPENSSL_INIT_LOAD_CRYPTO_STRINGS, NULL)
>--
>+ 
> +#ifdef LIBRESSL_VERSION_NUMBER
> +#define q_SKM_sk_num(type, st) ((int (*)(const STACK_OF(type) *))q_sk_num)(st)
> +#define q_SKM_sk_value(type, st,i) ((type * (*)(const STACK_OF(type) *, int))q_sk_value)(st, i)
> +#else
>  #define q_SKM_sk_num(type, st) ((int (*)(const STACK_OF(type) *))q_OPENSSL_sk_num)(st)
>  #define q_SKM_sk_value(type, st,i) ((type * (*)(const STACK_OF(type) *, int))q_OPENSSL_sk_value)(st, i)
>--
> +#endif
>+ 
>  #define q_OPENSSL_add_all_algorithms_conf()  q_OPENSSL_init_crypto(OPENSSL_INIT_ADD_ALL_CIPHERS \
>                                                                     | OPENSSL_INIT_ADD_ALL_DIGESTS \
>-                                                                    | OPENSSL_INIT_LOAD_CONFIG, NULL)
>+@@ -494,12 +535,14 @@ int q_SSL_CTX_use_PrivateKey(SSL_CTX *a, EVP_PKEY *b);
>+ int q_SSL_CTX_use_RSAPrivateKey(SSL_CTX *a, RSA *b);
>+ int q_SSL_CTX_use_PrivateKey_file(SSL_CTX *a, const char *b, int c);
>+ X509_STORE *q_SSL_CTX_get_cert_store(const SSL_CTX *a);
>++#if !defined(LIBRESSL_VERSION_NUMBER)
>+ SSL_CONF_CTX *q_SSL_CONF_CTX_new();
>+ void q_SSL_CONF_CTX_free(SSL_CONF_CTX *a);
>+ void q_SSL_CONF_CTX_set_ssl_ctx(SSL_CONF_CTX *a, SSL_CTX *b);
>+ unsigned int q_SSL_CONF_CTX_set_flags(SSL_CONF_CTX *a, unsigned int b);
>+ int q_SSL_CONF_CTX_finish(SSL_CONF_CTX *a);
>+ int q_SSL_CONF_cmd(SSL_CONF_CTX *a, const char *b, const char *c);
>++#endif
>+ void q_SSL_free(SSL *a);
>+ STACK_OF(SSL_CIPHER) *q_SSL_get_ciphers(const SSL *a);
>+ const SSL_CIPHER *q_SSL_get_current_cipher(SSL *a);
>diff --git a/net/qt5-network/files/patch-src_network_ssl_qsslsocket_openssl.cpp b/net/qt5-network/files/patch-src_network_ssl_qsslsocket_openssl.cpp
>deleted file mode 100644
>index e27e18c1af5c..000000000000
>--- a/net/qt5-network/files/patch-src_network_ssl_qsslsocket_openssl.cpp
>+++ /dev/null
>@@ -1,11 +0,0 @@
>---- src/network/ssl/qsslsocket_openssl.cpp.orig	2019-10-01 08:09:52 UTC
>-+++ src/network/ssl/qsslsocket_openssl.cpp
>-@@ -604,7 +604,7 @@ bool QSslSocketBackendPrivate::initSslContext()
>-             q_SSL_set_psk_server_callback(ssl, &q_ssl_psk_server_callback);
>-     }
>- #endif
>--#if OPENSSL_VERSION_NUMBER >= 0x10101006L
>-+#if OPENSSL_VERSION_NUMBER >= 0x10101006L && !defined(LIBRESSL_VERSION_NUMBER)
>-     // Set the client callback for TLSv1.3 PSK
>-     if (mode == QSslSocket::SslClientMode
>-         && QSslSocket::sslLibraryBuildVersionNumber() >= 0x10101006L) {
>diff --git a/net/qt5-network/files/patch-src_network_ssl_qsslsocket_openssl_symbols_p.h b/net/qt5-network/files/patch-src_network_ssl_qsslsocket_openssl_symbols_p.h
>deleted file mode 100644
>index 95bf257e919b..000000000000
>--- a/net/qt5-network/files/patch-src_network_ssl_qsslsocket_openssl_symbols_p.h
>+++ /dev/null
>@@ -1,26 +0,0 @@
>---- src/network/ssl/qsslsocket_openssl_symbols_p.h.orig	2019-10-01 07:47:06 UTC
>-+++ src/network/ssl/qsslsocket_openssl_symbols_p.h
>-@@ -72,6 +72,14 @@
>- #include "qsslsocket_openssl_p.h"
>- #include <QtCore/qglobal.h>
>- 
>-+#if defined(LIBRESSL_VERSION_NUMBER) && LIBRESSL_VERSION_NUMBER >= 0x20700000L
>-+# define TLS1_2_VERSION 0x0303
>-+# define TLS_MAX_VERSION TLS1_2_VERSION
>-+# define TLS_ANY_VERSION 0x10000
>-+# define DTLS1_2_VERSION                 0xFEFD
>-+# define DTLS_MAX_VERSION                DTLS1_2_VERSION
>-+#endif
>-+
>- #if QT_CONFIG(ocsp)
>- #include "qocsp_p.h"
>- #endif
>-@@ -372,7 +378,7 @@ int q_SSL_CTX_use_PrivateKey(SSL_CTX *a, EVP_PKEY *b);
>- int q_SSL_CTX_use_RSAPrivateKey(SSL_CTX *a, RSA *b);
>- int q_SSL_CTX_use_PrivateKey_file(SSL_CTX *a, const char *b, int c);
>- X509_STORE *q_SSL_CTX_get_cert_store(const SSL_CTX *a);
>--#if OPENSSL_VERSION_NUMBER >= 0x10002000L
>-+#if OPENSSL_VERSION_NUMBER >= 0x10002000L  && !defined(LIBRESSL_VERSION_NUMBER)
>- SSL_CONF_CTX *q_SSL_CONF_CTX_new();
>- void q_SSL_CONF_CTX_free(SSL_CONF_CTX *a);
>- void q_SSL_CONF_CTX_set_ssl_ctx(SSL_CONF_CTX *a, SSL_CTX *b);
>diff --git a/net/qt5-network/pkg-plist b/net/qt5-network/pkg-plist
>index 5a99b318b5c2..26d208ad0ddc 100644
>--- a/net/qt5-network/pkg-plist
>+++ b/net/qt5-network/pkg-plist
>@@ -80,10 +80,8 @@
> %%QT_INCDIR%%/QtNetwork/%%FULLVER%%/QtNetwork/private/qsslkey_p.h
> %%QT_INCDIR%%/QtNetwork/%%FULLVER%%/QtNetwork/private/qsslpresharedkeyauthenticator_p.h
> %%QT_INCDIR%%/QtNetwork/%%FULLVER%%/QtNetwork/private/qsslsocket_mac_p.h
>-%%QT_INCDIR%%/QtNetwork/%%FULLVER%%/QtNetwork/private/qsslsocket_openssl11_symbols_p.h
> %%QT_INCDIR%%/QtNetwork/%%FULLVER%%/QtNetwork/private/qsslsocket_openssl_p.h
> %%QT_INCDIR%%/QtNetwork/%%FULLVER%%/QtNetwork/private/qsslsocket_openssl_symbols_p.h
>-%%QT_INCDIR%%/QtNetwork/%%FULLVER%%/QtNetwork/private/qsslsocket_opensslpre11_symbols_p.h
> %%QT_INCDIR%%/QtNetwork/%%FULLVER%%/QtNetwork/private/qsslsocket_p.h
> %%QT_INCDIR%%/QtNetwork/%%FULLVER%%/QtNetwork/private/qsslsocket_schannel_p.h
> %%QT_INCDIR%%/QtNetwork/%%FULLVER%%/QtNetwork/private/qsslsocket_winrt_p.h
>@@ -130,6 +128,7 @@
> %%QT_INCDIR%%/QtNetwork/QNetworkRequest
> %%QT_INCDIR%%/QtNetwork/QNetworkSession
> %%QT_INCDIR%%/QtNetwork/QOcspResponse
>+%%QT_INCDIR%%/QtNetwork/QPasswordDigestor
> %%QT_INCDIR%%/QtNetwork/QSctpServer
> %%QT_INCDIR%%/QtNetwork/QSctpSocket
> %%QT_INCDIR%%/QtNetwork/QSsl
>diff --git a/sysutils/qt5-qtdiag/Makefile b/sysutils/qt5-qtdiag/Makefile
>index f920486fc864..69b1ba38913d 100644
>--- a/sysutils/qt5-qtdiag/Makefile
>+++ b/sysutils/qt5-qtdiag/Makefile
>@@ -11,17 +11,6 @@ COMMENT=	Tool for reporting diagnostic information about Qt and its environment
> USES=		compiler:c++11-lang qmake:outsource qt-dist:5,tools
> USE_QT=		core gui
> 
>-PLIST_FILES=	${QT_BINDIR}/qtdiag
>-
>-# Similarly to x11/qt5-qev, it makes more sense to just run the build system
>-# from the qtdiag directory. If we run it from the top of the source tree, it
>-# will look for a lot more dependencies for other tools such as lupdate, which
>-# we do not really have to depend on.
>-WRKSRC_SUBDIR=	src/${PORTNAME}
>-
> QT_BINARIES=	yes
> 
>-post-patch:
>-	${CP} ${WRKSRC}/../../.qmake.conf ${WRKSRC}
>-
> .include <bsd.port.mk>
>diff --git a/sysutils/qt5-qtdiag/files/patch-src_src.pro b/sysutils/qt5-qtdiag/files/patch-src_src.pro
>new file mode 100644
>index 000000000000..bd60f76a0549
>--- /dev/null
>+++ b/sysutils/qt5-qtdiag/files/patch-src_src.pro
>@@ -0,0 +1,58 @@
>+--- src/src.pro.orig	2020-04-12 20:01:59 UTC
>++++ src/src.pro
>+@@ -1,54 +1,3 @@
>+ TEMPLATE = subdirs
>+ 
>+-qtHaveModule(widgets) {
>+-    no-png {
>+-        message("Some graphics-related tools are unavailable without PNG support")
>+-    } else {
>+-        QT_FOR_CONFIG += widgets
>+-        qtConfig(pushbutton):qtConfig(toolbutton) {
>+-            SUBDIRS = assistant \
>+-                      designer \
>+-                      pixeltool
>+-
>+-            linguist.depends = designer
>+-        }
>+-        qtHaveModule(quick):qtConfig(thread):qtConfig(toolbutton): SUBDIRS += distancefieldgenerator
>+-    }
>+-}
>+-
>+-SUBDIRS += linguist \
>+-    qtattributionsscanner
>+-
>+-qtConfig(library) {
>+-    !android|android_app: SUBDIRS += qtplugininfo
>+-}
>+-
>+-include($$OUT_PWD/qdoc/qtqdoc-config.pri)
>+-QT_FOR_CONFIG += qdoc-private
>+-qtConfig(qdoc): qtConfig(thread): SUBDIRS += qdoc
>+-
>+-!android|android_app: SUBDIRS += qtpaths
>+-
>+-macos {
>+-    SUBDIRS += macdeployqt
>+-}
>+-
>+-qtHaveModule(dbus): SUBDIRS += qdbus
>+-
>+-win32|winrt:SUBDIRS += windeployqt
>+-winrt:SUBDIRS += winrtrunner
>+-qtHaveModule(gui):!wasm:!android:!uikit:!qnx:!winrt: SUBDIRS += qtdiag
>+-
>+-qtNomakeTools( \
>+-    distancefieldgenerator \
>+-    pixeltool \
>+-)
>+-
>+-# This is necessary to avoid a race condition between toolchain.prf
>+-# invocations in a module-by-module cross-build.
>+-cross_compile:isEmpty(QMAKE_HOST_CXX.INCDIRS) {
>+-    qdoc.depends += qtattributionsscanner
>+-    windeployqt.depends += qtattributionsscanner
>+-    winrtrunner.depends += qtattributionsscanner
>+-    linguist.depends += qtattributionsscanner
>+-}
>++SUBDIRS = qtdiag
>diff --git a/sysutils/qt5-qtdiag/pkg-plist b/sysutils/qt5-qtdiag/pkg-plist
>new file mode 100644
>index 000000000000..27f4c89c4467
>--- /dev/null
>+++ b/sysutils/qt5-qtdiag/pkg-plist
>@@ -0,0 +1,2 @@
>+%%QT_BINDIR%%/qtdiag
>+%%DEBUG%%%%QT_BINDIR%%/qtdiag.debug
>diff --git a/sysutils/qt5-qtpaths/Makefile b/sysutils/qt5-qtpaths/Makefile
>index 2ae61bbe340c..319a0b653198 100644
>--- a/sysutils/qt5-qtpaths/Makefile
>+++ b/sysutils/qt5-qtpaths/Makefile
>@@ -11,17 +11,6 @@ COMMENT=	Command line client to QStandardPaths
> USES=		compiler:c++11-lang qmake:outsource qt-dist:5,tools
> USE_QT=		core
> 
>-PLIST_FILES=	${QT_BINDIR}/qtpaths
>-
>-# Similarly to x11/qt5-qev, it makes more sense to just run the build system
>-# from the qtpaths directory. If we run it from the top of the source tree, it
>-# will look for a lot more dependencies for other tools such as lupdate, which
>-# we do not really have to depend on.
>-WRKSRC_SUBDIR=	src/${PORTNAME}
>-
> QT_BINARIES=	yes
> 
>-post-patch:
>-	${CP} ${WRKSRC}/../../.qmake.conf ${WRKSRC}
>-
> .include <bsd.port.mk>
>diff --git a/sysutils/qt5-qtpaths/files/patch-src_src.pro b/sysutils/qt5-qtpaths/files/patch-src_src.pro
>new file mode 100644
>index 000000000000..0d759da395aa
>--- /dev/null
>+++ b/sysutils/qt5-qtpaths/files/patch-src_src.pro
>@@ -0,0 +1,58 @@
>+--- src/src.pro.orig	2020-04-12 20:15:00 UTC
>++++ src/src.pro
>+@@ -1,54 +1,3 @@
>+ TEMPLATE = subdirs
>+ 
>+-qtHaveModule(widgets) {
>+-    no-png {
>+-        message("Some graphics-related tools are unavailable without PNG support")
>+-    } else {
>+-        QT_FOR_CONFIG += widgets
>+-        qtConfig(pushbutton):qtConfig(toolbutton) {
>+-            SUBDIRS = assistant \
>+-                      designer \
>+-                      pixeltool
>+-
>+-            linguist.depends = designer
>+-        }
>+-        qtHaveModule(quick):qtConfig(thread):qtConfig(toolbutton): SUBDIRS += distancefieldgenerator
>+-    }
>+-}
>+-
>+-SUBDIRS += linguist \
>+-    qtattributionsscanner
>+-
>+-qtConfig(library) {
>+-    !android|android_app: SUBDIRS += qtplugininfo
>+-}
>+-
>+-include($$OUT_PWD/qdoc/qtqdoc-config.pri)
>+-QT_FOR_CONFIG += qdoc-private
>+-qtConfig(qdoc): qtConfig(thread): SUBDIRS += qdoc
>+-
>+-!android|android_app: SUBDIRS += qtpaths
>+-
>+-macos {
>+-    SUBDIRS += macdeployqt
>+-}
>+-
>+-qtHaveModule(dbus): SUBDIRS += qdbus
>+-
>+-win32|winrt:SUBDIRS += windeployqt
>+-winrt:SUBDIRS += winrtrunner
>+-qtHaveModule(gui):!wasm:!android:!uikit:!qnx:!winrt: SUBDIRS += qtdiag
>+-
>+-qtNomakeTools( \
>+-    distancefieldgenerator \
>+-    pixeltool \
>+-)
>+-
>+-# This is necessary to avoid a race condition between toolchain.prf
>+-# invocations in a module-by-module cross-build.
>+-cross_compile:isEmpty(QMAKE_HOST_CXX.INCDIRS) {
>+-    qdoc.depends += qtattributionsscanner
>+-    windeployqt.depends += qtattributionsscanner
>+-    winrtrunner.depends += qtattributionsscanner
>+-    linguist.depends += qtattributionsscanner
>+-}
>++SUBDIRS = qtpaths
>diff --git a/sysutils/qt5-qtpaths/pkg-plist b/sysutils/qt5-qtpaths/pkg-plist
>new file mode 100644
>index 000000000000..6a5b89e9c63d
>--- /dev/null
>+++ b/sysutils/qt5-qtpaths/pkg-plist
>@@ -0,0 +1,2 @@
>+%%QT_BINDIR%%/qtpaths
>+%%DEBUG%%%%QT_BINDIR%%/qtpaths.debug
>diff --git a/sysutils/qt5-qtplugininfo/Makefile b/sysutils/qt5-qtplugininfo/Makefile
>index f673af1fb15c..a73c885bc609 100644
>--- a/sysutils/qt5-qtplugininfo/Makefile
>+++ b/sysutils/qt5-qtplugininfo/Makefile
>@@ -11,17 +11,6 @@ COMMENT=	Qt5 plugin metadata dumper
> USES=		compiler:c++11-lang qmake:outsource qt-dist:5,tools
> USE_QT=		core
> 
>-PLIST_FILES=	${QT_BINDIR}/qtplugininfo
>-
>-# Similarly to x11/qt5-qev, it makes more sense to just run the build system
>-# from the qtplugininfo directory. If we run it from the top of the source tree, it
>-# will look for a lot more dependencies for other tools such as lupdate, which
>-# we do not really have to depend on.
>-WRKSRC_SUBDIR=	src/${PORTNAME}
>-
> QT_BINARIES=	yes
> 
>-post-patch:
>-	${CP} ${WRKSRC}/../../.qmake.conf ${WRKSRC}
>-
> .include <bsd.port.mk>
>diff --git a/sysutils/qt5-qtplugininfo/files/patch-src_src.pro b/sysutils/qt5-qtplugininfo/files/patch-src_src.pro
>new file mode 100644
>index 000000000000..fa51d093fd95
>--- /dev/null
>+++ b/sysutils/qt5-qtplugininfo/files/patch-src_src.pro
>@@ -0,0 +1,58 @@
>+--- src/src.pro.orig	2020-04-12 20:04:17 UTC
>++++ src/src.pro
>+@@ -1,54 +1,3 @@
>+ TEMPLATE = subdirs
>+ 
>+-qtHaveModule(widgets) {
>+-    no-png {
>+-        message("Some graphics-related tools are unavailable without PNG support")
>+-    } else {
>+-        QT_FOR_CONFIG += widgets
>+-        qtConfig(pushbutton):qtConfig(toolbutton) {
>+-            SUBDIRS = assistant \
>+-                      designer \
>+-                      pixeltool
>+-
>+-            linguist.depends = designer
>+-        }
>+-        qtHaveModule(quick):qtConfig(thread):qtConfig(toolbutton): SUBDIRS += distancefieldgenerator
>+-    }
>+-}
>+-
>+-SUBDIRS += linguist \
>+-    qtattributionsscanner
>+-
>+-qtConfig(library) {
>+-    !android|android_app: SUBDIRS += qtplugininfo
>+-}
>+-
>+-include($$OUT_PWD/qdoc/qtqdoc-config.pri)
>+-QT_FOR_CONFIG += qdoc-private
>+-qtConfig(qdoc): qtConfig(thread): SUBDIRS += qdoc
>+-
>+-!android|android_app: SUBDIRS += qtpaths
>+-
>+-macos {
>+-    SUBDIRS += macdeployqt
>+-}
>+-
>+-qtHaveModule(dbus): SUBDIRS += qdbus
>+-
>+-win32|winrt:SUBDIRS += windeployqt
>+-winrt:SUBDIRS += winrtrunner
>+-qtHaveModule(gui):!wasm:!android:!uikit:!qnx:!winrt: SUBDIRS += qtdiag
>+-
>+-qtNomakeTools( \
>+-    distancefieldgenerator \
>+-    pixeltool \
>+-)
>+-
>+-# This is necessary to avoid a race condition between toolchain.prf
>+-# invocations in a module-by-module cross-build.
>+-cross_compile:isEmpty(QMAKE_HOST_CXX.INCDIRS) {
>+-    qdoc.depends += qtattributionsscanner
>+-    windeployqt.depends += qtattributionsscanner
>+-    winrtrunner.depends += qtattributionsscanner
>+-    linguist.depends += qtattributionsscanner
>+-}
>++SUBDIRS = qtplugininfo
>diff --git a/sysutils/qt5-qtplugininfo/pkg-plist b/sysutils/qt5-qtplugininfo/pkg-plist
>new file mode 100644
>index 000000000000..9857c634cf74
>--- /dev/null
>+++ b/sysutils/qt5-qtplugininfo/pkg-plist
>@@ -0,0 +1,2 @@
>+%%QT_BINDIR%%/qtplugininfo
>+%%DEBUG%%%%QT_BINDIR%%/qtplugininfo.debug
>diff --git a/textproc/qt5-xml/pkg-plist b/textproc/qt5-xml/pkg-plist
>index cc554fd05be0..5e194e1dda55 100644
>--- a/textproc/qt5-xml/pkg-plist
>+++ b/textproc/qt5-xml/pkg-plist
>@@ -1,3 +1,5 @@
>+%%QT_INCDIR%%/QtXml/%%FULLVER%%/QtXml/private/qdom_p.h
>+%%QT_INCDIR%%/QtXml/%%FULLVER%%/QtXml/private/qdomhelpers_p.h
> %%QT_INCDIR%%/QtXml/%%FULLVER%%/QtXml/private/qtxml-config_p.h
> %%QT_INCDIR%%/QtXml/%%FULLVER%%/QtXml/private/qxml_p.h
> %%QT_INCDIR%%/QtXml/QDomAttr
>diff --git a/textproc/qt5-xmlpatterns/pkg-plist b/textproc/qt5-xmlpatterns/pkg-plist
>index 4260c461e899..9764ea806df2 100644
>--- a/textproc/qt5-xmlpatterns/pkg-plist
>+++ b/textproc/qt5-xmlpatterns/pkg-plist
>@@ -412,7 +412,9 @@
> %%QT_LIBDIR%%/libQt5XmlPatterns.so.%%FULLVER%%
> %%DEBUG%%%%QT_LIBDIR%%/libQt5XmlPatterns.so.%%FULLVER%%.debug
> %%QT_BINDIR%%/xmlpatterns
>+%%DEBUG%%%%QT_BINDIR%%/xmlpatterns.debug
> %%QT_BINDIR%%/xmlpatternsvalidator
>+%%DEBUG%%%%QT_BINDIR%%/xmlpatternsvalidator.debug
> %%QT_MKSPECDIR%%/modules/qt_lib_xmlpatterns.pri
> %%QT_MKSPECDIR%%/modules/qt_lib_xmlpatterns_private.pri
> libdata/pkgconfig/Qt5XmlPatterns.pc
>diff --git a/www/qt5-webengine/Makefile b/www/qt5-webengine/Makefile
>index acbe6a6b789d..db861e455bbc 100644
>--- a/www/qt5-webengine/Makefile
>+++ b/www/qt5-webengine/Makefile
>@@ -48,7 +48,7 @@ LIB_DEPENDS=	libavcodec.so:multimedia/ffmpeg \
> 		libwebp.so:graphics/webp
> 
> DISTINFO_FILE=	${.CURDIR}/distinfo
>-QT5_VERSION=	5.14.2
>+QT5_VERSION=	5.15.0
> 
> OPTIONS_SINGLE=		AUDIO
> OPTIONS_SINGLE_AUDIO=	ALSA PULSEAUDIO SNDIO
>diff --git a/www/qt5-webengine/distinfo b/www/qt5-webengine/distinfo
>index 927e5aeb1e1b..9228ceb422d9 100644
>--- a/www/qt5-webengine/distinfo
>+++ b/www/qt5-webengine/distinfo
>@@ -1,3 +1,3 @@
>-TIMESTAMP = 1586559398
>-SHA256 (KDE/Qt/5.14.2/qtwebengine-everywhere-src-5.14.2.tar.xz) = e169d6a75d8c397e04f843bc1b9585950fb9a001255cd18d6293f66fa8a6c947
>-SIZE (KDE/Qt/5.14.2/qtwebengine-everywhere-src-5.14.2.tar.xz) = 242467568
>+TIMESTAMP = 1590608885
>+SHA256 (KDE/Qt/5.15.0/qtwebengine-everywhere-src-5.15.0.tar.xz) = c38e2fda7ed1b7d5a90f26abf231ec0715d78a5bc39a94673d8e39d75f04c5df
>+SIZE (KDE/Qt/5.15.0/qtwebengine-everywhere-src-5.15.0.tar.xz) = 278257432
>diff --git a/www/qt5-webengine/files/patch-configure.pri b/www/qt5-webengine/files/patch-configure.pri
>index f153617e41fd..82636d8a2f51 100644
>--- a/www/qt5-webengine/files/patch-configure.pri
>+++ b/www/qt5-webengine/files/patch-configure.pri
>@@ -1,21 +1,21 @@
>---- configure.pri.orig	2019-12-03 07:18:02 UTC
>+--- configure.pri.orig	2020-04-08 09:41:36 UTC
> +++ configure.pri
> @@ -114,7 +114,7 @@ defineTest(qtwebengine_platformError) {
>  defineTest(qtConfTest_detectPlatform) {
>      QT_FOR_CONFIG += gui-private
>  
>--    !linux:!win32:!macos {
>-+    !linux:!win32:!macos:!unix: {
>+-    !linux:!win32:!macos:!ios {
>++    !linux:!win32:!macos:!ios:!unix: {
>          qtwebengine_platformError("Unknown platform. Qt WebEngine only supports Linux, Windows, and macOS.")
>      } else {
>          linux:qtwebengine_isLinuxPlatformSupported() {
>-@@ -126,6 +126,9 @@ defineTest(qtConfTest_detectPlatform) {
>+@@ -125,6 +125,9 @@ defineTest(qtConfTest_detectPlatform) {
>+         }
>          macos:qtwebengine_isMacOsPlatformSupported() {
>              $${1}.platform = "macos"
>-         }
>++        }
> +        unix:qtwebengine_isLinuxPlatformSupported() {
> +            $${1}.platform = "linux"
>-+        }
>-     }
>- 
>-     !isEmpty(platformError) {
>+         }
>+         ios:qtwebengine_isMacOsPlatformSupported() {
>+             $${1}.platform = "ios"
>diff --git a/www/qt5-webengine/files/patch-src_3rdparty_chromium_base_allocator_partition__allocator_partition__alloc.cc b/www/qt5-webengine/files/patch-src_3rdparty_chromium_base_allocator_partition__allocator_partition__alloc.cc
>deleted file mode 100644
>index 99737cac979c..000000000000
>--- a/www/qt5-webengine/files/patch-src_3rdparty_chromium_base_allocator_partition__allocator_partition__alloc.cc
>+++ /dev/null
>@@ -1,11 +0,0 @@
>---- src/3rdparty/chromium/base/allocator/partition_allocator/partition_alloc.cc.orig	2019-05-23 12:39:34 UTC
>-+++ src/3rdparty/chromium/base/allocator/partition_allocator/partition_alloc.cc
>-@@ -440,7 +440,7 @@ static size_t PartitionPurgePage(internal::PartitionPa
>- #endif
>-       }
>-       // Terminate the freelist chain.
>--      *entry_ptr = nullptr;
>-+      *entry_ptr = internal::PartitionFreelistEntry::Transform(nullptr);
>-       // The freelist head is stored unmasked.
>-       page->freelist_head =
>-           internal::PartitionFreelistEntry::Transform(page->freelist_head);
>diff --git a/www/qt5-webengine/files/patch-src_3rdparty_chromium_base_debug_elf__reader.cc b/www/qt5-webengine/files/patch-src_3rdparty_chromium_base_debug_elf__reader.cc
>index 6ac7376c3b82..dd7e0c12869c 100644
>--- a/www/qt5-webengine/files/patch-src_3rdparty_chromium_base_debug_elf__reader.cc
>+++ b/www/qt5-webengine/files/patch-src_3rdparty_chromium_base_debug_elf__reader.cc
>@@ -1,18 +1,18 @@
>---- src/3rdparty/chromium/base/debug/elf_reader.cc.orig	2019-11-27 21:12:25 UTC
>+--- src/3rdparty/chromium/base/debug/elf_reader.cc.orig	2020-04-08 09:41:36 UTC
> +++ src/3rdparty/chromium/base/debug/elf_reader.cc
>-@@ -83,6 +83,7 @@ size_t ReadElfBuildId(const void* elf_mapped_base,
>-         reinterpret_cast<const Nhdr*>(elf_base + header.p_vaddr);
>+@@ -98,6 +98,7 @@ size_t ReadElfBuildId(const void* elf_mapped_base,
>      bool found = false;
>-     while (current_note < section_end) {
>+     while (current_section < section_end) {
>+       current_note = reinterpret_cast<const Nhdr*>(current_section);
> +#if !defined(OS_BSD)
>        if (current_note->n_type == NT_GNU_BUILD_ID) {
>-         const char* note_name =
>-             reinterpret_cast<const char*>(current_note) + sizeof(Nhdr);
>-@@ -92,6 +93,7 @@ size_t ReadElfBuildId(const void* elf_mapped_base,
>+         StringPiece note_name(current_section + sizeof(Nhdr),
>+                               current_note->n_namesz);
>+@@ -107,6 +108,7 @@ size_t ReadElfBuildId(const void* elf_mapped_base,
>            break;
>          }
>        }
> +#endif
>  
>-       current_note = reinterpret_cast<const Nhdr*>(
>-           reinterpret_cast<const char*>(current_note) + sizeof(Nhdr) +
>+       size_t section_size = bits::Align(current_note->n_namesz, 4) +
>+                             bits::Align(current_note->n_descsz, 4) +
>diff --git a/www/qt5-webengine/files/patch-src_3rdparty_chromium_base_files_file__path__watcher__kqueue.h b/www/qt5-webengine/files/patch-src_3rdparty_chromium_base_files_file__path__watcher__kqueue.h
>index 7e5329dc161c..9e7a24cdca8a 100644
>--- a/www/qt5-webengine/files/patch-src_3rdparty_chromium_base_files_file__path__watcher__kqueue.h
>+++ b/www/qt5-webengine/files/patch-src_3rdparty_chromium_base_files_file__path__watcher__kqueue.h
>@@ -1,4 +1,4 @@
>---- src/3rdparty/chromium/base/files/file_path_watcher_kqueue.h.orig	2017-01-26 00:49:07 UTC
>+--- src/3rdparty/chromium/base/files/file_path_watcher_kqueue.h.orig	2020-03-16 14:04:24 UTC
> +++ src/3rdparty/chromium/base/files/file_path_watcher_kqueue.h
> @@ -5,6 +5,10 @@
>  #ifndef BASE_FILES_FILE_PATH_WATCHER_KQUEUE_H_
>diff --git a/www/qt5-webengine/files/patch-src_3rdparty_chromium_base_i18n_icu__util.cc b/www/qt5-webengine/files/patch-src_3rdparty_chromium_base_i18n_icu__util.cc
>index 4d7ee99e9f95..b47db51f2b94 100644
>--- a/www/qt5-webengine/files/patch-src_3rdparty_chromium_base_i18n_icu__util.cc
>+++ b/www/qt5-webengine/files/patch-src_3rdparty_chromium_base_i18n_icu__util.cc
>@@ -1,32 +1,20 @@
>---- src/3rdparty/chromium/base/i18n/icu_util.cc.orig	2019-11-27 21:12:25 UTC
>+--- src/3rdparty/chromium/base/i18n/icu_util.cc.orig	2020-04-08 09:41:36 UTC
> +++ src/3rdparty/chromium/base/i18n/icu_util.cc
>-@@ -20,7 +20,7 @@
>- #include "build/build_config.h"
>- #include "third_party/icu/source/common/unicode/putil.h"
>- #include "third_party/icu/source/common/unicode/udata.h"
>--#if (defined(OS_LINUX) && !defined(OS_CHROMEOS)) || defined(OS_ANDROID)
>-+#if ((defined(OS_LINUX) || defined(OS_BSD)) && !defined(OS_CHROMEOS)) || defined(OS_ANDROID)
>- #include "third_party/icu/source/i18n/unicode/timezone.h"
>+@@ -43,7 +43,7 @@
>  #endif
>  
>-@@ -68,7 +68,11 @@ wchar_t g_debug_icu_pf_filename[_MAX_PATH];
>- // No need to change the filename in multiple places (gyp files, windows
>- // build pkg configurations, etc). 'l' stands for Little Endian.
>- // This variable is exported through the header file.
>-+#if defined(ARCH_CPU_LITTLE_ENDIAN)
>- const char kIcuDataFileName[] = "icudtl.dat";
>-+#else
>-+const char kIcuDataFileName[] = "icudtb.dat";
>-+#endif
>- #if defined(OS_ANDROID)
>- const char kAndroidAssetsIcuDataFileName[] = "assets/icudtl.dat";
>- #endif
>-@@ -290,7 +294,7 @@ bool InitializeICU() {
>- // TODO(jungshik): Some callers do not care about tz at all. If necessary,
>- // add a boolean argument to this function to init'd the default tz only
>- // when requested.
>--#if defined(OS_LINUX) && !defined(OS_CHROMEOS)
>-+#if (defined(OS_LINUX) || defined(OS_BSD)) && !defined(OS_CHROMEOS)
>-   if (result)
>-     std::unique_ptr<icu::TimeZone> zone(icu::TimeZone::createDefault());
>+ #if defined(OS_ANDROID) || defined(OS_FUCHSIA) || \
>+-    (defined(OS_LINUX) && !defined(IS_CHROMECAST))
>++    (defined(OS_LINUX) && !defined(IS_CHROMECAST)) || defined(OS_BSD)
>+ #include "third_party/icu/source/i18n/unicode/timezone.h"
>  #endif
>+ 
>+@@ -293,7 +293,7 @@ void InitializeIcuTimeZone() {
>+       fuchsia::IntlProfileWatcher::GetPrimaryTimeZoneIdForIcuInitialization();
>+   icu::TimeZone::adoptDefault(
>+       icu::TimeZone::createTimeZone(icu::UnicodeString::fromUTF8(zone_id)));
>+-#elif defined(OS_LINUX) && !defined(IS_CHROMECAST)
>++#elif (defined(OS_LINUX) && !defined(IS_CHROMECAST)) || defined(OS_BSD)
>+   // To respond to the timezone change properly, the default timezone
>+   // cache in ICU has to be populated on starting up.
>+   // See TimeZoneMonitorLinux::NotifyClientsFromImpl().
>diff --git a/www/qt5-webengine/files/patch-src_3rdparty_chromium_base_linux__util.cc b/www/qt5-webengine/files/patch-src_3rdparty_chromium_base_linux__util.cc
>index 261fbfd49519..d477cf109bb0 100644
>--- a/www/qt5-webengine/files/patch-src_3rdparty_chromium_base_linux__util.cc
>+++ b/www/qt5-webengine/files/patch-src_3rdparty_chromium_base_linux__util.cc
>@@ -1,6 +1,6 @@
>---- src/3rdparty/chromium/base/linux_util.cc.orig	2018-11-13 18:25:11 UTC
>+--- src/3rdparty/chromium/base/linux_util.cc.orig	2020-03-16 14:04:24 UTC
> +++ src/3rdparty/chromium/base/linux_util.cc
>-@@ -111,12 +111,14 @@ char g_linux_distro[kDistroSize] =
>+@@ -144,6 +144,8 @@ char g_linux_distro[kDistroSize] =
>      "CrOS";
>  #elif defined(OS_ANDROID)
>      "Android";
>@@ -9,6 +9,8 @@
>  #else  // if defined(OS_LINUX)
>      "Unknown";
>  #endif
>+@@ -164,7 +166,7 @@ BASE_EXPORT std::string GetKeyValueFromOSReleaseFileFo
>+ }
>  
>  std::string GetLinuxDistro() {
> -#if defined(OS_CHROMEOS) || defined(OS_ANDROID)
>diff --git a/www/qt5-webengine/files/patch-src_3rdparty_chromium_base_memory_madv__free__discardable__memory__posix.cc b/www/qt5-webengine/files/patch-src_3rdparty_chromium_base_memory_madv__free__discardable__memory__posix.cc
>new file mode 100644
>index 000000000000..5aa744d1575d
>--- /dev/null
>+++ b/www/qt5-webengine/files/patch-src_3rdparty_chromium_base_memory_madv__free__discardable__memory__posix.cc
>@@ -0,0 +1,11 @@
>+--- src/3rdparty/chromium/base/memory/madv_free_discardable_memory_posix.cc.orig	2020-04-08 09:41:36 UTC
>++++ src/3rdparty/chromium/base/memory/madv_free_discardable_memory_posix.cc
>+@@ -271,7 +271,7 @@ void MadvFreeDiscardableMemoryPosix::SetKeepMemoryForT
>+ 
>+ bool MadvFreeDiscardableMemoryPosix::IsResident() const {
>+   DFAKE_SCOPED_RECURSIVE_LOCK(thread_collision_warner_);
>+-#ifdef OS_MACOSX
>++#if defined(OS_MACOSX) || defined(OS_BSD)
>+   std::vector<char> vec(allocated_pages_);
>+ #else
>+   std::vector<unsigned char> vec(allocated_pages_);
>diff --git a/www/qt5-webengine/files/patch-src_3rdparty_chromium_base_memory_protected__memory__posix.cc b/www/qt5-webengine/files/patch-src_3rdparty_chromium_base_memory_protected__memory__posix.cc
>deleted file mode 100644
>index f92921f33751..000000000000
>--- a/www/qt5-webengine/files/patch-src_3rdparty_chromium_base_memory_protected__memory__posix.cc
>+++ /dev/null
>@@ -1,31 +0,0 @@
>---- src/3rdparty/chromium/base/memory/protected_memory_posix.cc.orig	2019-11-27 21:12:25 UTC
>-+++ src/3rdparty/chromium/base/memory/protected_memory_posix.cc
>-@@ -8,9 +8,9 @@
>- #include <sys/mman.h>
>- #include <unistd.h>
>- 
>--#if defined(OS_LINUX)
>-+#if defined(OS_LINUX) || defined(OS_BSD)
>- #include <sys/resource.h>
>--#endif  // defined(OS_LINUX)
>-+#endif  // defined(OS_LINUX) || defined(OS_BSD)
>- 
>- #if defined(OS_MACOSX) && !defined(OS_IOS)
>- #include <mach/mach.h>
>-@@ -44,7 +44,7 @@ bool AutoWritableMemory::SetMemoryReadOnly(void* start
>-   return SetMemory(start, end, PROT_READ);
>- }
>- 
>--#if defined(OS_LINUX)
>-+#if defined(OS_LINUX) || defined(OS_BSD)
>- void AssertMemoryIsReadOnly(const void* ptr) {
>- #if DCHECK_IS_ON()
>-   const uintptr_t page_mask = ~(base::GetPageSize() - 1);
>-@@ -74,6 +74,6 @@ void AssertMemoryIsReadOnly(const void* ptr) {
>-   DCHECK_EQ(region_info.protection, VM_PROT_READ);
>- #endif  // DCHECK_IS_ON()
>- }
>--#endif  // defined(OS_LINUX) || (defined(OS_MACOSX) && !defined(OS_IOS))
>-+#endif  // defined(OS_LINUX) || (defined(OS_MACOSX) && !defined(OS_IOS)) || defined(OS_BSD)
>- 
>- }  // namespace base
>diff --git a/www/qt5-webengine/files/patch-src_3rdparty_chromium_base_profiler_register__context.h b/www/qt5-webengine/files/patch-src_3rdparty_chromium_base_profiler_register__context.h
>new file mode 100644
>index 000000000000..e43368959186
>--- /dev/null
>+++ b/www/qt5-webengine/files/patch-src_3rdparty_chromium_base_profiler_register__context.h
>@@ -0,0 +1,60 @@
>+--- src/3rdparty/chromium/base/profiler/register_context.h.orig	2020-04-08 09:41:36 UTC
>++++ src/3rdparty/chromium/base/profiler/register_context.h
>+@@ -17,7 +17,7 @@
>+ #include <windows.h>
>+ #elif defined(OS_MACOSX)
>+ #include <mach/machine/thread_status.h>
>+-#elif defined(OS_ANDROID) || defined(OS_LINUX)
>++#elif defined(OS_ANDROID) || defined(OS_LINUX) || defined(OS_BSD)
>+ #include <sys/ucontext.h>
>+ #endif
>+ 
>+@@ -152,6 +152,48 @@ inline uintptr_t& RegisterContextInstructionPointer(mc
>+ }
>+ 
>+ #endif  // #if defined(ARCH_CPU_ARM_FAMILY) && defined(ARCH_CPU_32_BITS)
>++
>++#elif defined(OS_FREEBSD)
>++
>++using RegisterContext = mcontext_t;
>++
>++#if defined(ARCH_CPU_X86_64)
>++inline uintptr_t& RegisterContextStackPointer(mcontext_t* context) {
>++  return AsUintPtr(&context->mc_rsp);
>++}
>++
>++inline uintptr_t& RegisterContextFramePointer(mcontext_t* context) {
>++  return AsUintPtr(&context->mc_rbp);
>++}
>++
>++inline uintptr_t& RegisterContextInstructionPointer(mcontext_t* context) {
>++  return AsUintPtr(&context->mc_rip);
>++}
>++#elif defined(ARCH_CPU_X86)
>++inline uintptr_t& RegisterContextStackPointer(mcontext_t* context) {
>++  return AsUintPtr(&context->mc_esp);
>++}
>++
>++inline uintptr_t& RegisterContextFramePointer(mcontext_t* context) {
>++  return AsUintPtr(&context->mc_ebp);
>++}
>++
>++inline uintptr_t& RegisterContextInstructionPointer(mcontext_t* context) {
>++  return AsUintPtr(&context->mc_eip);
>++}
>++#elif defined(ARCH_CPU_ARM64)
>++inline uintptr_t& RegisterContextStackPointer(mcontext_t* context) {
>++  return AsUintPtr(&context->mc_gpregs.gp_sp);
>++}
>++
>++inline uintptr_t& RegisterContextFramePointer(mcontext_t* context) {
>++  return AsUintPtr(&context->mc_gpregs.gp_x[29]);
>++}
>++
>++inline uintptr_t& RegisterContextInstructionPointer(mcontext_t* context) {
>++  return AsUintPtr(&context->mc_gpregs.gp_elr);
>++}
>++#endif
>+ 
>+ #else  // #if defined(OS_WIN)
>+ 
>diff --git a/www/qt5-webengine/files/patch-src_3rdparty_chromium_base_profiler_sampling__profiler__thread__token.cc b/www/qt5-webengine/files/patch-src_3rdparty_chromium_base_profiler_sampling__profiler__thread__token.cc
>new file mode 100644
>index 000000000000..318762d4070a
>--- /dev/null
>+++ b/www/qt5-webengine/files/patch-src_3rdparty_chromium_base_profiler_sampling__profiler__thread__token.cc
>@@ -0,0 +1,11 @@
>+--- src/3rdparty/chromium/base/profiler/sampling_profiler_thread_token.cc.orig	2020-04-08 09:41:36 UTC
>++++ src/3rdparty/chromium/base/profiler/sampling_profiler_thread_token.cc
>+@@ -7,7 +7,7 @@
>+ namespace base {
>+ 
>+ SamplingProfilerThreadToken GetSamplingProfilerCurrentThreadToken() {
>+-#if defined(OS_ANDROID) || defined(OS_LINUX)
>++#if defined(OS_ANDROID) || defined(OS_LINUX) || defined(OS_BSD)
>+   return {PlatformThread::CurrentId(), pthread_self()};
>+ #else
>+   return {PlatformThread::CurrentId()};
>diff --git a/www/qt5-webengine/files/patch-src_3rdparty_chromium_base_profiler_sampling__profiler__thread__token.h b/www/qt5-webengine/files/patch-src_3rdparty_chromium_base_profiler_sampling__profiler__thread__token.h
>new file mode 100644
>index 000000000000..0954d059cff0
>--- /dev/null
>+++ b/www/qt5-webengine/files/patch-src_3rdparty_chromium_base_profiler_sampling__profiler__thread__token.h
>@@ -0,0 +1,20 @@
>+--- src/3rdparty/chromium/base/profiler/sampling_profiler_thread_token.h.orig	2020-04-08 09:41:36 UTC
>++++ src/3rdparty/chromium/base/profiler/sampling_profiler_thread_token.h
>+@@ -9,7 +9,7 @@
>+ #include "base/threading/platform_thread.h"
>+ #include "build/build_config.h"
>+ 
>+-#if defined(OS_ANDROID) || defined(OS_LINUX)
>++#if defined(OS_ANDROID) || defined(OS_LINUX) || defined(OS_BSD)
>+ #include <pthread.h>
>+ #endif
>+ 
>+@@ -21,7 +21,7 @@ namespace base {
>+ // functions used to obtain the stack base address.
>+ struct SamplingProfilerThreadToken {
>+   PlatformThreadId id;
>+-#if defined(OS_ANDROID) || defined(OS_LINUX)
>++#if defined(OS_ANDROID) || defined(OS_LINUX) || defined(OS_BSD)
>+   pthread_t pthread_id;
>+ #endif
>+ };
>diff --git a/www/qt5-webengine/files/patch-src_3rdparty_chromium_base_profiler_stack__copier__signal.cc b/www/qt5-webengine/files/patch-src_3rdparty_chromium_base_profiler_stack__copier__signal.cc
>new file mode 100644
>index 000000000000..12139c160f63
>--- /dev/null
>+++ b/www/qt5-webengine/files/patch-src_3rdparty_chromium_base_profiler_stack__copier__signal.cc
>@@ -0,0 +1,65 @@
>+--- src/3rdparty/chromium/base/profiler/stack_copier_signal.cc.orig	2020-04-08 09:41:36 UTC
>++++ src/3rdparty/chromium/base/profiler/stack_copier_signal.cc
>+@@ -4,10 +4,16 @@
>+ 
>+ #include "base/profiler/stack_copier_signal.h"
>+ 
>++#if defined(OS_LINUX)
>+ #include <linux/futex.h>
>++#include <syscall.h>
>++#elif defined(OS_FREEBSD)
>++#include <sys/types.h>
>++#include <sys/thr.h>
>++#include <sys/umtx.h>
>++#endif
>+ #include <signal.h>
>+ #include <sys/ucontext.h>
>+-#include <syscall.h>
>+ 
>+ #include <atomic>
>+ 
>+@@ -35,8 +41,13 @@ class AsyncSafeWaitableEvent {
>+     // for a pthread mutex. So, also check the condition.
>+     while (true) {
>+       int res =
>++#if defined(OS_LINUX)
>+           syscall(SYS_futex, futex_int_ptr(), FUTEX_WAIT | FUTEX_PRIVATE_FLAG,
>+                   0, nullptr, nullptr, 0);
>++#elif defined(OS_FREEBSD)
>++          _umtx_op(futex_int_ptr(), UMTX_OP_WAIT_UINT_PRIVATE, 0, nullptr,
>++                   nullptr);
>++#endif
>+       if (futex_.load(std::memory_order_acquire) != 0)
>+         return true;
>+       if (res != 0)
>+@@ -46,8 +57,12 @@ class AsyncSafeWaitableEvent {
>+ 
>+   void Signal() {
>+     futex_.store(1, std::memory_order_release);
>++#if defined(OS_LINUX)
>+     syscall(SYS_futex, futex_int_ptr(), FUTEX_WAKE | FUTEX_PRIVATE_FLAG, 1,
>+             nullptr, nullptr, 0);
>++#elif defined(OS_FREEBSD)
>++    _umtx_op(futex_int_ptr(), UMTX_OP_WAKE_PRIVATE, 1, nullptr, nullptr);
>++#endif
>+   }
>+ 
>+  private:
>+@@ -201,11 +216,17 @@ bool StackCopierSignal::CopyStack(StackBuffer* stack_b
>+     if (!scoped_sigaction.succeeded())
>+       return false;
>+ 
>++#if defined(OS_LINUX)
>+     if (syscall(SYS_tgkill, getpid(), thread_delegate_->GetThreadId(),
>+                 SIGURG) != 0) {
>+       NOTREACHED();
>+       return false;
>+     }
>++#elif defined(OS_FREEBSD)
>++    if (thr_kill2(getpid(), thread_delegate_->GetThreadId(), SIGURG) != 0) {
>++      return false;
>++    }
>++#endif
>+     bool finished_waiting = wait_event.Wait();
>+     TRACE_EVENT_END0(TRACE_DISABLED_BY_DEFAULT("cpu_profiler.debug"),
>+                      "StackCopierSignal copy stack");
>diff --git a/www/qt5-webengine/files/patch-src_3rdparty_chromium_base_profiler_thread__delegate__posix.cc b/www/qt5-webengine/files/patch-src_3rdparty_chromium_base_profiler_thread__delegate__posix.cc
>new file mode 100644
>index 000000000000..c939a8020f99
>--- /dev/null
>+++ b/www/qt5-webengine/files/patch-src_3rdparty_chromium_base_profiler_thread__delegate__posix.cc
>@@ -0,0 +1,63 @@
>+--- src/3rdparty/chromium/base/profiler/thread_delegate_posix.cc.orig	2020-04-08 09:41:36 UTC
>++++ src/3rdparty/chromium/base/profiler/thread_delegate_posix.cc
>+@@ -3,6 +3,9 @@
>+ // found in the LICENSE file.
>+ 
>+ #include <pthread.h>
>++#if defined(__FreeBSD__)
>++#include <pthread_np.h>
>++#endif
>+ 
>+ #include "base/process/process_handle.h"
>+ #include "base/profiler/thread_delegate_posix.h"
>+@@ -17,12 +20,20 @@ namespace {
>+ uintptr_t GetThreadStackBaseAddressImpl(
>+     SamplingProfilerThreadToken thread_token) {
>+   pthread_attr_t attr;
>++#if defined(OS_FREEBSD)
>++  pthread_attr_init(&attr);
>++  pthread_attr_get_np(thread_token.pthread_id, &attr);
>++#elif defined(OS_LINUX)
>+   pthread_getattr_np(thread_token.pthread_id, &attr);
>++#endif
>+   // See crbug.com/617730 for limitations of this approach on Linux.
>+   void* address;
>+   size_t size;
>+   pthread_attr_getstack(&attr, &address, &size);
>+   const uintptr_t base_address = reinterpret_cast<uintptr_t>(address) + size;
>++#if defined(OS_FREEBSD)
>++  pthread_attr_destroy(&attr);
>++#endif
>+   return base_address;
>+ }
>+ 
>+@@ -88,11 +99,19 @@ std::vector<uintptr_t*> ThreadDelegatePosix::GetRegist
>+   for (size_t i = 19; i <= 29; ++i)
>+     registers.push_back(reinterpret_cast<uintptr_t*>(&thread_context->regs[i]));
>+   return registers;
>+-#elif defined(ARCH_CPU_X86_64)  // #if defined(ARCH_CPU_ARM_FAMILY) &&
>+-                                // defined(ARCH_CPU_32_BITS)
>++#elif defined(ARCH_CPU_X86_64)
>+   return {
>+       // Return the set of callee-save registers per the x86-64 System V ABI
>+       // section 3.2.1, plus the stack pointer.
>++#if defined(OS_FREEBSD)
>++      reinterpret_cast<uintptr_t*>(&thread_context->mc_rbp),
>++      reinterpret_cast<uintptr_t*>(&thread_context->mc_rbx),
>++      reinterpret_cast<uintptr_t*>(&thread_context->mc_r12),
>++      reinterpret_cast<uintptr_t*>(&thread_context->mc_r13),
>++      reinterpret_cast<uintptr_t*>(&thread_context->mc_r14),
>++      reinterpret_cast<uintptr_t*>(&thread_context->mc_r15),
>++      reinterpret_cast<uintptr_t*>(&thread_context->mc_rsp),
>++#else
>+       reinterpret_cast<uintptr_t*>(&thread_context->gregs[REG_RBP]),
>+       reinterpret_cast<uintptr_t*>(&thread_context->gregs[REG_RBX]),
>+       reinterpret_cast<uintptr_t*>(&thread_context->gregs[REG_R12]),
>+@@ -100,6 +119,7 @@ std::vector<uintptr_t*> ThreadDelegatePosix::GetRegist
>+       reinterpret_cast<uintptr_t*>(&thread_context->gregs[REG_R14]),
>+       reinterpret_cast<uintptr_t*>(&thread_context->gregs[REG_R15]),
>+       reinterpret_cast<uintptr_t*>(&thread_context->gregs[REG_RSP]),
>++#endif
>+   };
>+ #else  // #if defined(ARCH_CPU_ARM_FAMILY) && defined(ARCH_CPU_32_BITS)
>+   // Unimplemented for other architectures.
>diff --git a/www/qt5-webengine/files/patch-src_3rdparty_chromium_base_security__unittest.cc b/www/qt5-webengine/files/patch-src_3rdparty_chromium_base_security__unittest.cc
>index 04c1e1b70841..7dbb4163a24b 100644
>--- a/www/qt5-webengine/files/patch-src_3rdparty_chromium_base_security__unittest.cc
>+++ b/www/qt5-webengine/files/patch-src_3rdparty_chromium_base_security__unittest.cc
>@@ -1,6 +1,6 @@
>---- src/3rdparty/chromium/base/security_unittest.cc.orig	2018-11-13 18:25:11 UTC
>+--- src/3rdparty/chromium/base/security_unittest.cc.orig	2020-04-08 09:41:36 UTC
> +++ src/3rdparty/chromium/base/security_unittest.cc
>-@@ -59,7 +59,7 @@ NOINLINE Type HideValueFromCompiler(volatile Type valu
>+@@ -60,7 +60,7 @@ NOINLINE Type HideValueFromCompiler(volatile Type valu
>  // FAILS_ is too clunky.
>  void OverflowTestsSoftExpectTrue(bool overflow_detected) {
>    if (!overflow_detected) {
>diff --git a/www/qt5-webengine/files/patch-src_3rdparty_chromium_base_strings_string__number__conversions__unittest.cc b/www/qt5-webengine/files/patch-src_3rdparty_chromium_base_strings_string__number__conversions__unittest.cc
>deleted file mode 100644
>index 2c01ffc584ee..000000000000
>--- a/www/qt5-webengine/files/patch-src_3rdparty_chromium_base_strings_string__number__conversions__unittest.cc
>+++ /dev/null
>@@ -1,24 +0,0 @@
>---- src/3rdparty/chromium/base/strings/string_number_conversions_unittest.cc.orig	2019-05-23 12:39:34 UTC
>-+++ src/3rdparty/chromium/base/strings/string_number_conversions_unittest.cc
>-@@ -829,12 +829,21 @@ TEST(StringNumberConversionsTest, DoubleToString) {
>-   }
>- 
>-   // The following two values were seen in crashes in the wild.
>-+#if defined(ARCH_CPU_LITTLE_ENDIAN)
>-   const char input_bytes[8] = {0, 0, 0, 0, '\xee', '\x6d', '\x73', '\x42'};
>-+#else
>-+  const char input_bytes[8] = {'\x42', '\x73', '\x6d', '\xee', 0, 0, 0, 0};
>-+#endif
>-   double input = 0;
>-   memcpy(&input, input_bytes, base::size(input_bytes));
>-   EXPECT_EQ("1335179083776", NumberToString(input));
>-+#if defined(ARCH_CPU_LITTLE_ENDIAN)
>-   const char input_bytes2[8] =
>-       {0, 0, 0, '\xa0', '\xda', '\x6c', '\x73', '\x42'};
>-+#else
>-+  const char input_bytes2[8] =
>-+      {'\x42', '\x73', '\x6c', '\xda', '\xa0', 0, 0, 0};
>-+#endif
>-   input = 0;
>-   memcpy(&input, input_bytes2, base::size(input_bytes2));
>-   EXPECT_EQ("1334890332160", NumberToString(input));
>diff --git a/www/qt5-webengine/files/patch-src_3rdparty_chromium_base_synchronization_lock__impl.h b/www/qt5-webengine/files/patch-src_3rdparty_chromium_base_synchronization_lock__impl.h
>new file mode 100644
>index 000000000000..438382b2c2b2
>--- /dev/null
>+++ b/www/qt5-webengine/files/patch-src_3rdparty_chromium_base_synchronization_lock__impl.h
>@@ -0,0 +1,16 @@
>+--- src/3rdparty/chromium/base/synchronization/lock_impl.h.orig	2020-04-08 09:41:36 UTC
>++++ src/3rdparty/chromium/base/synchronization/lock_impl.h
>+@@ -67,10 +67,13 @@ void LockImpl::Unlock() {
>+   ::ReleaseSRWLockExclusive(reinterpret_cast<PSRWLOCK>(&native_handle_));
>+ }
>+ #elif defined(OS_POSIX) || defined(OS_FUCHSIA)
>++#pragma GCC diagnostic push
>++#pragma GCC diagnostic ignored "-Wthread-safety-analysis"
>+ void LockImpl::Unlock() {
>+   int rv = pthread_mutex_unlock(&native_handle_);
>+   DCHECK_EQ(rv, 0) << ". " << strerror(rv);
>+ }
>++#pragma GCC diagnostic pop
>+ #endif
>+ 
>+ // This is an implementation used for AutoLock templated on the lock type.
>diff --git a/www/qt5-webengine/files/patch-src_3rdparty_chromium_base_system_sys__info.h b/www/qt5-webengine/files/patch-src_3rdparty_chromium_base_system_sys__info.h
>index 6ca8ef772b5a..40ecbccdbdef 100644
>--- a/www/qt5-webengine/files/patch-src_3rdparty_chromium_base_system_sys__info.h
>+++ b/www/qt5-webengine/files/patch-src_3rdparty_chromium_base_system_sys__info.h
>@@ -1,6 +1,15 @@
>---- src/3rdparty/chromium/base/system/sys_info.h.orig	2019-11-27 21:12:25 UTC
>+--- src/3rdparty/chromium/base/system/sys_info.h.orig	2020-03-16 14:04:24 UTC
> +++ src/3rdparty/chromium/base/system/sys_info.h
>-@@ -192,7 +192,7 @@ class BASE_EXPORT SysInfo {
>+@@ -188,6 +188,8 @@ class BASE_EXPORT SysInfo {
>+   // See also SysUtils.java, method isLowEndDevice.
>+   static bool IsLowEndDevice();
>+ 
>++  static uint64_t MaxSharedMemorySize();
>++
>+  private:
>+   FRIEND_TEST_ALL_PREFIXES(SysInfoTest, AmountOfAvailablePhysicalMemory);
>+   FRIEND_TEST_ALL_PREFIXES(debug::SystemMetricsTest, ParseMeminfo);
>+@@ -197,7 +199,7 @@ class BASE_EXPORT SysInfo {
>    static bool IsLowEndDeviceImpl();
>    static HardwareInfo GetHardwareInfoSync();
>  
>diff --git a/www/qt5-webengine/files/patch-src_3rdparty_chromium_base_system_sys__info__freebsd.cc b/www/qt5-webengine/files/patch-src_3rdparty_chromium_base_system_sys__info__freebsd.cc
>index f6c7d3df059e..f4c9afa6ddb0 100644
>--- a/www/qt5-webengine/files/patch-src_3rdparty_chromium_base_system_sys__info__freebsd.cc
>+++ b/www/qt5-webengine/files/patch-src_3rdparty_chromium_base_system_sys__info__freebsd.cc
>@@ -1,6 +1,6 @@
>---- src/3rdparty/chromium/base/system/sys_info_freebsd.cc.orig	2019-11-27 21:12:25 UTC
>+--- src/3rdparty/chromium/base/system/sys_info_freebsd.cc.orig	2020-03-16 14:04:24 UTC
> +++ src/3rdparty/chromium/base/system/sys_info_freebsd.cc
>-@@ -13,26 +13,46 @@
>+@@ -13,26 +13,59 @@
>  namespace base {
>  
>  int64_t SysInfo::AmountOfPhysicalMemoryImpl() {
>@@ -21,11 +21,6 @@
>    return static_cast<int64_t>(pages) * page_size;
>  }
>  
>--// static
>--uint64_t SysInfo::MaxSharedMemorySize() {
>--  size_t limit;
>--  size_t size = sizeof(limit);
>--  if (sysctlbyname("kern.ipc.shmmax", &limit, &size, NULL, 0) < 0) {
> +int64_t SysInfo::AmountOfAvailablePhysicalMemoryImpl() {
> +  int page_size, r = 0;
> +  unsigned pgfree, pginact, pgcache;
>@@ -40,14 +35,13 @@
> +  if(r == 0)
> +    r = sysctlbyname("vm.stats.vm.v_cache_count", &pgcache, &szpg, NULL, 0);
> +  if(r == -1) {
>-     NOTREACHED();
>-     return 0;
>-   }
>--  return static_cast<uint64_t>(limit);
>++    NOTREACHED();
>++    return 0;
>++  }
> +  return static_cast<int64_t>((pgfree + pginact + pgcache) * page_size);
>- }
>- 
>-+// static
>++}
>++
>+ // static
> +std::string SysInfo::CPUModelName() {
> +  int mib[] = { CTL_HW, HW_MODEL };
> +  char name[256];
>@@ -56,4 +50,18 @@
> +    return name;
> +  return std::string();
> +}
>++
>++// static
>+ uint64_t SysInfo::MaxSharedMemorySize() {
>+   size_t limit;
>+   size_t size = sizeof(limit);
>++
>+   if (sysctlbyname("kern.ipc.shmmax", &limit, &size, NULL, 0) < 0) {
>+     NOTREACHED();
>+     return 0;
>+   }
>++
>+   return static_cast<uint64_t>(limit);
>+ }
>+-
>  }  // namespace base
>diff --git a/www/qt5-webengine/files/patch-src_3rdparty_chromium_base_third__party_dmg__fp_dtoa.cc b/www/qt5-webengine/files/patch-src_3rdparty_chromium_base_third__party_dmg__fp_dtoa.cc
>deleted file mode 100644
>index f55aef76e854..000000000000
>--- a/www/qt5-webengine/files/patch-src_3rdparty_chromium_base_third__party_dmg__fp_dtoa.cc
>+++ /dev/null
>@@ -1,14 +0,0 @@
>---- src/3rdparty/chromium/base/third_party/dmg_fp/dtoa.cc.orig	2019-05-23 12:39:34 UTC
>-+++ src/3rdparty/chromium/base/third_party/dmg_fp/dtoa.cc
>-@@ -186,7 +186,11 @@
>-  *	used for input more than STRTOD_DIGLIM digits long (default 40).
>-  */
>- 
>-+#ifdef __BIG_ENDIAN__
>-+#define IEEE_MC68k
>-+#else
>- #define IEEE_8087
>-+#endif
>- #define NO_HEX_FP
>- 
>- #ifndef Long
>diff --git a/www/qt5-webengine/files/patch-src_3rdparty_chromium_build_config_compiler_BUILD.gn b/www/qt5-webengine/files/patch-src_3rdparty_chromium_build_config_compiler_BUILD.gn
>index f9aa5649b5ca..a2e836730ec9 100644
>--- a/www/qt5-webengine/files/patch-src_3rdparty_chromium_build_config_compiler_BUILD.gn
>+++ b/www/qt5-webengine/files/patch-src_3rdparty_chromium_build_config_compiler_BUILD.gn
>@@ -1,4 +1,4 @@
>---- src/3rdparty/chromium/build/config/compiler/BUILD.gn.orig	2019-11-27 21:12:25 UTC
>+--- src/3rdparty/chromium/build/config/compiler/BUILD.gn.orig	2020-03-16 14:04:24 UTC
> +++ src/3rdparty/chromium/build/config/compiler/BUILD.gn
> @@ -60,7 +60,7 @@ declare_args() {
>    # only two architectures that are currently checked in). Turn this off when
>@@ -9,16 +9,16 @@
>        (current_cpu == "x64" || current_cpu == "x86")
>    binutils_path = rebase_path("//third_party/binutils/Linux_x64/Release/bin",
>                                root_build_dir)
>-@@ -301,7 +301,7 @@ config("compiler") {
>+@@ -309,7 +309,7 @@ config("compiler") {
>+ 
>      # Linker warnings.
>      if (fatal_linker_warnings && !(is_chromeos && current_cpu == "arm") &&
>-         !(is_android && use_order_profiling) && !is_mac && !is_ios &&
>--        current_os != "aix") {
>-+        current_os != "aix" && !is_bsd) {
>+-        !is_mac && !is_ios && current_os != "aix") {
>++        !is_mac && !is_ios && current_os != "aix" && !is_bsd) {
>        # TODO(jochen): Enable this on chromeos on arm. http://crbug.com/356580
>-       # TODO(lizeb,pasko): Fix link errors when linking with order_profiling=1
>-       # crbug.com/485542
>-@@ -407,7 +407,7 @@ config("compiler") {
>+       ldflags += [ "-Wl,--fatal-warnings" ]
>+     }
>+@@ -416,7 +416,7 @@ config("compiler") {
>  
>      # Compiler instrumentation can introduce dependencies in DSOs to symbols in
>      # the executable they are loaded into, so they are unresolved at link-time.
>@@ -27,7 +27,16 @@
>        ldflags += [
>          "-Wl,-z,defs",
>          "-Wl,--as-needed",
>-@@ -786,7 +786,7 @@ config("compiler_cpu_abi") {
>+@@ -516,7 +516,7 @@ config("compiler") {
>+     }
>+   }
>+ 
>+-  if (is_clang && !is_nacl && !use_xcode_clang && !use_qt) {
>++  if (is_clang && !is_nacl && !use_xcode_clang && !use_qt && !is_bsd) {
>+     cflags += [ "-fcrash-diagnostics-dir=" +
>+                 rebase_path("//tools/clang/crashreports", root_build_dir) ]
>+ 
>+@@ -787,7 +787,7 @@ config("compiler_cpu_abi") {
>          cflags += [ "-mtune=$arm_tune" ]
>        }
>      } else if (current_cpu == "arm64") {
>@@ -36,7 +45,7 @@
>          cflags += [ "--target=aarch64-linux-gnu" ]
>          ldflags += [ "--target=aarch64-linux-gnu" ]
>        }
>-@@ -1147,7 +1147,7 @@ config("compiler_deterministic") {
>+@@ -1138,7 +1138,7 @@ config("compiler_deterministic") {
>        "-Xclang",
>        ".",
>      ]
>@@ -45,7 +54,7 @@
>        # We don't use clang -cc1as on Windows (yet? https://crbug.com/762167)
>        asmflags = [ "-Wa,-fdebug-compilation-dir,." ]
>      }
>-@@ -1553,7 +1553,7 @@ config("default_warnings") {
>+@@ -1545,7 +1545,7 @@ config("default_warnings") {
>          cflags += [ "-Wno-nonportable-include-path" ]
>        }
>  
>@@ -54,7 +63,7 @@
>          # Flags NaCl (Clang 3.7) and Xcode 9.2 (Clang clang-900.0.39.2) do not
>          # recognize.
>          cflags += [
>-@@ -1761,7 +1761,7 @@ config("thin_archive") {
>+@@ -1775,7 +1775,7 @@ config("thin_archive") {
>    # Mac and iOS use the mac-specific "libtool" command, not ar, which doesn't
>    # have a "thin archive" mode (it does accept -T, but it means truncating
>    # archive names to 16 characters, which is not what we want).
>@@ -63,7 +72,7 @@
>      arflags = [ "-T" ]
>    } else if (is_win && use_lld) {
>      arflags = [ "/llvmlibthin" ]
>-@@ -2356,7 +2356,7 @@ config("symbols") {
>+@@ -2373,7 +2373,7 @@ config("symbols") {
>      # flag, so we can use use -g1 for pnacl and nacl-clang compiles.
>      # gcc nacl is is_nacl && !is_clang, pnacl and nacl-clang are && is_clang.
>      if (!is_nacl || is_clang) {
>@@ -72,7 +81,7 @@
>      }
>  
>      if (use_debug_fission && !is_nacl && !is_android) {
>-@@ -2377,7 +2377,7 @@ config("symbols") {
>+@@ -2394,7 +2394,7 @@ config("symbols") {
>      # DWARF info may be corrupt; offsets in a range list entry are in different
>      # sections" there.  Maybe just a bug in nacl_switch_32.S.
>      if (!is_mac && !is_ios && !is_nacl && current_cpu != "x86" &&
>diff --git a/www/qt5-webengine/files/patch-src_3rdparty_chromium_build_config_features.gni b/www/qt5-webengine/files/patch-src_3rdparty_chromium_build_config_features.gni
>index c0676a68156b..bab3166c078d 100644
>--- a/www/qt5-webengine/files/patch-src_3rdparty_chromium_build_config_features.gni
>+++ b/www/qt5-webengine/files/patch-src_3rdparty_chromium_build_config_features.gni
>@@ -1,7 +1,7 @@
>---- src/3rdparty/chromium/build/config/features.gni.orig	2018-11-13 18:25:11 UTC
>+--- src/3rdparty/chromium/build/config/features.gni.orig	2020-04-29 07:57:35 UTC
> +++ src/3rdparty/chromium/build/config/features.gni
>-@@ -46,7 +46,7 @@ declare_args() {
>-   fieldtrial_testing_like_official_build = is_chrome_branded
>+@@ -26,7 +26,7 @@ declare_args() {
>+   proprietary_codecs = is_chrome_branded || is_chromecast
>  
>    # libudev usage. This currently only affects the content layer.
> -  use_udev = is_linux && !is_chromecast
>diff --git a/www/qt5-webengine/files/patch-src_3rdparty_chromium_build_linux_unbundle_libxml.gn b/www/qt5-webengine/files/patch-src_3rdparty_chromium_build_linux_unbundle_libxml.gn
>new file mode 100644
>index 000000000000..bb6257c864bb
>--- /dev/null
>+++ b/www/qt5-webengine/files/patch-src_3rdparty_chromium_build_linux_unbundle_libxml.gn
>@@ -0,0 +1,53 @@
>+--- src/3rdparty/chromium/build/linux/unbundle/libxml.gn.orig	2020-04-08 09:41:36 UTC
>++++ src/3rdparty/chromium/build/linux/unbundle/libxml.gn
>+@@ -8,11 +8,48 @@ pkg_config("system_libxml") {
>+   packages = [ "libxml-2.0" ]
>+ }
>+ 
>+-static_library("libxml") {
>++source_set("libxml") {
>++  public_configs = [ ":system_libxml" ]
>++}
>++
>++static_library("libxml_utils") {
>++  # Do not expand this visibility list without first consulting with the
>++  # Security Team.
>++  visibility = [
>++    ":xml_reader",
>++    ":xml_writer",
>++    "//base/test:test_support",
>++    "//services/data_decoder:xml_parser_fuzzer",
>++  ]
>+   sources = [
>+     "chromium/libxml_utils.cc",
>+     "chromium/libxml_utils.h",
>+   ]
>+-
>+   public_configs = [ ":system_libxml" ]
>++}
>++
>++static_library("xml_reader") {
>++  # Do not expand this visibility list without first consulting with the
>++  # Security Team.
>++  visibility = [
>++    "//base/test:test_support",
>++    "//components/policy/core/common:unit_tests",
>++    "//services/data_decoder:*",
>++    "//tools/traffic_annotation/auditor:auditor_sources",
>++  ]
>++  sources = [
>++    "chromium/xml_reader.cc",
>++    "chromium/xml_reader.h",
>++  ]
>++  deps = [ ":libxml_utils" ]
>++}
>++
>++static_library("xml_writer") {
>++  # The XmlWriter is considered safe to use from any target.
>++  visibility = [ "*" ]
>++  sources = [
>++    "chromium/xml_writer.cc",
>++    "chromium/xml_writer.h",
>++  ]
>++  deps = [ ":libxml_utils" ]
>+ }
>diff --git a/www/qt5-webengine/files/patch-src_3rdparty_chromium_chrome_app_theme_chrome__unscaled__resources.grd b/www/qt5-webengine/files/patch-src_3rdparty_chromium_chrome_app_theme_chrome__unscaled__resources.grd
>index 719712ea20a1..af978a3e0c75 100644
>--- a/www/qt5-webengine/files/patch-src_3rdparty_chromium_chrome_app_theme_chrome__unscaled__resources.grd
>+++ b/www/qt5-webengine/files/patch-src_3rdparty_chromium_chrome_app_theme_chrome__unscaled__resources.grd
>@@ -1,4 +1,4 @@
>---- src/3rdparty/chromium/chrome/app/theme/chrome_unscaled_resources.grd.orig	2019-11-27 21:12:25 UTC
>+--- src/3rdparty/chromium/chrome/app/theme/chrome_unscaled_resources.grd.orig	2020-04-08 09:41:36 UTC
> +++ src/3rdparty/chromium/chrome/app/theme/chrome_unscaled_resources.grd
> @@ -18,7 +18,7 @@
>          <include name="IDR_PRODUCT_LOGO_64" file="google_chrome/product_logo_64.png" type="BINDATA" />
>@@ -9,12 +9,3 @@
>            <include name="IDR_PRODUCT_LOGO_128_BETA" file="google_chrome/product_logo_128_beta.png" type="BINDATA" />
>            <include name="IDR_PRODUCT_LOGO_128_DEV" file="google_chrome/product_logo_128_dev.png" type="BINDATA" />
>          </if>
>-@@ -109,7 +109,7 @@
>-         <include name="IDR_PROFILE_AVATAR_2X_25" file="default_200_percent/common/profile_avatar_sun_cloud.png" type="BINDATA" />
>-         <include name="IDR_PROFILE_AVATAR_2X_26" file="default_200_percent/common/profile_avatar_placeholder.png" type="BINDATA" />
>-       </if>
>--      <if expr="is_linux and enable_app_list">
>-+      <if expr="is_posix and enable_app_list">
>-         
>-         <if expr="_google_chrome">
>-           <then>
>diff --git a/www/qt5-webengine/files/patch-src_3rdparty_chromium_chrome_browser_ui_webui_chrome__web__ui__controller__factory.cc b/www/qt5-webengine/files/patch-src_3rdparty_chromium_chrome_browser_ui_webui_chrome__web__ui__controller__factory.cc
>index 30d3fdaf7d31..a344a88fd4a2 100644
>--- a/www/qt5-webengine/files/patch-src_3rdparty_chromium_chrome_browser_ui_webui_chrome__web__ui__controller__factory.cc
>+++ b/www/qt5-webengine/files/patch-src_3rdparty_chromium_chrome_browser_ui_webui_chrome__web__ui__controller__factory.cc
>@@ -1,7 +1,7 @@
>---- src/3rdparty/chromium/chrome/browser/ui/webui/chrome_web_ui_controller_factory.cc.orig	2019-11-27 21:12:25 UTC
>+--- src/3rdparty/chromium/chrome/browser/ui/webui/chrome_web_ui_controller_factory.cc.orig	2020-03-16 14:04:24 UTC
> +++ src/3rdparty/chromium/chrome/browser/ui/webui/chrome_web_ui_controller_factory.cc
>-@@ -206,11 +206,11 @@
>- #include "chrome/browser/ui/webui/set_as_default_browser_ui_win.h"
>+@@ -209,11 +209,11 @@
>+ #include "chrome/browser/ui/webui/conflicts/conflicts_ui.h"
>  #endif
>  
> -#if defined(OS_WIN) || defined(OS_MACOSX) || defined(OS_LINUX)
>@@ -9,12 +9,12 @@
>  #include "chrome/browser/ui/webui/discards/discards_ui.h"
>  #endif
>  
>--#if defined(OS_LINUX) || defined(OS_ANDROID)
>-+#if defined(OS_LINUX) || defined(OS_ANDROID) || defined(OS_BSD)
>- #include "chrome/browser/ui/webui/sandbox_internals_ui.h"
>+-#if defined(OS_WIN) || defined(OS_LINUX) || defined(OS_ANDROID)
>++#if defined(OS_WIN) || defined(OS_LINUX) || defined(OS_ANDROID) || defined(OS_BSD)
>+ #include "chrome/browser/ui/webui/sandbox/sandbox_internals_ui.h"
>  #endif
>  
>-@@ -323,7 +323,7 @@ bool IsAboutUI(const GURL& url) {
>+@@ -311,7 +311,7 @@ bool IsAboutUI(const GURL& url) {
>  #if !defined(OS_ANDROID)
>            || url.host_piece() == chrome::kChromeUITermsHost
>  #endif
>@@ -23,7 +23,7 @@
>            || url.host_piece() == chrome::kChromeUILinuxProxyConfigHost
>  #endif
>  #if defined(OS_CHROMEOS)
>-@@ -638,7 +638,7 @@ WebUIFactoryFunction GetWebUIFactoryFunction(WebUI* we
>+@@ -624,7 +624,7 @@ WebUIFactoryFunction GetWebUIFactoryFunction(WebUI* we
>    if (url.host_piece() == chrome::kChromeUINaClHost)
>      return &NewWebUI<NaClUI>;
>  #endif
>@@ -32,12 +32,12 @@
>    if (url.host_piece() == chrome::kChromeUITabModalConfirmDialogHost)
>      return &NewWebUI<ConstrainedWebDialogUI>;
>  #endif
>-@@ -681,17 +681,17 @@ WebUIFactoryFunction GetWebUIFactoryFunction(WebUI* we
>+@@ -674,17 +674,17 @@ WebUIFactoryFunction GetWebUIFactoryFunction(WebUI* we
>      return &NewWebUI<CastUI>;
>    }
>  #endif
>--#if defined(OS_LINUX) || defined(OS_ANDROID)
>-+#if defined(OS_LINUX) || defined(OS_ANDROID) || defined(OS_BSD)
>+-#if defined(OS_WIN) || defined(OS_LINUX) || defined(OS_ANDROID)
>++#if defined(OS_WIN) || defined(OS_LINUX) || defined(OS_ANDROID) || defined(OS_BSD)
>    if (url.host_piece() == chrome::kChromeUISandboxHost) {
>      return &NewWebUI<SandboxInternalsUI>;
>    }
>diff --git a/www/qt5-webengine/files/patch-src_3rdparty_chromium_chrome_common_chrome__paths.cc b/www/qt5-webengine/files/patch-src_3rdparty_chromium_chrome_common_chrome__paths.cc
>index 78796dc2dab0..088947e36de6 100644
>--- a/www/qt5-webengine/files/patch-src_3rdparty_chromium_chrome_common_chrome__paths.cc
>+++ b/www/qt5-webengine/files/patch-src_3rdparty_chromium_chrome_common_chrome__paths.cc
>@@ -1,6 +1,6 @@
>---- src/3rdparty/chromium/chrome/common/chrome_paths.cc.orig	2019-11-27 21:12:25 UTC
>+--- src/3rdparty/chromium/chrome/common/chrome_paths.cc.orig	2020-03-16 14:04:24 UTC
> +++ src/3rdparty/chromium/chrome/common/chrome_paths.cc
>-@@ -52,21 +52,21 @@ const base::FilePath::CharType kPepperFlashSystemBaseD
>+@@ -51,21 +51,21 @@ const base::FilePath::CharType kPepperFlashSystemBaseD
>      FILE_PATH_LITERAL("Internet Plug-Ins/PepperFlashPlayer");
>  #endif
>  
>@@ -24,9 +24,9 @@
> -#endif  // defined(OS_LINUX)
> +#endif  // defined(OS_LINUX) || defined(OS_BSD)
>  
>- #if defined(OS_CHROMEOS)
>- const base::FilePath::CharType kChromeOSComponentFlash[] = FILE_PATH_LITERAL(
>-@@ -197,7 +197,7 @@ bool PathProvider(int key, base::FilePath* result) {
>+ #if defined(OS_LINUX) && BUILDFLAG(ENABLE_WIDEVINE_CDM_COMPONENT)
>+ // The name of the hint file that tells the latest component updated Widevine
>+@@ -204,7 +204,7 @@ bool PathProvider(int key, base::FilePath* result) {
>          return false;
>        break;
>      case chrome::DIR_DEFAULT_DOWNLOADS_SAFE:
>@@ -35,7 +35,17 @@
>        if (!GetUserDownloadsDirectorySafe(&cur))
>          return false;
>        break;
>-@@ -470,7 +470,7 @@ bool PathProvider(int key, base::FilePath* result) {
>+@@ -495,6 +495,9 @@ bool PathProvider(int key, base::FilePath* result) {
>+     case chrome::DIR_POLICY_FILES: {
>+ #if BUILDFLAG(GOOGLE_CHROME_BRANDING)
>+       cur = base::FilePath(FILE_PATH_LITERAL("/etc/opt/chrome/policies"));
>++#elif defined(OS_BSD)
>++      cur = base::FilePath(FILE_PATH_LITERAL(
>++          "/usr/local/etc/chrome/policies"));
>+ #else
>+       cur = base::FilePath(FILE_PATH_LITERAL("/etc/chromium/policies"));
>+ #endif
>+@@ -502,7 +505,7 @@ bool PathProvider(int key, base::FilePath* result) {
>      }
>  #endif
>  #if defined(OS_CHROMEOS) || \
>@@ -44,7 +54,7 @@
>      case chrome::DIR_USER_EXTERNAL_EXTENSIONS: {
>        if (!base::PathService::Get(chrome::DIR_USER_DATA, &cur))
>          return false;
>-@@ -478,7 +478,7 @@ bool PathProvider(int key, base::FilePath* result) {
>+@@ -510,7 +513,7 @@ bool PathProvider(int key, base::FilePath* result) {
>        break;
>      }
>  #endif
>@@ -53,7 +63,7 @@
>      case chrome::DIR_STANDALONE_EXTERNAL_EXTENSIONS: {
>        cur = base::FilePath(kFilepathSinglePrefExtensions);
>        break;
>-@@ -513,7 +513,7 @@ bool PathProvider(int key, base::FilePath* result) {
>+@@ -545,7 +548,7 @@ bool PathProvider(int key, base::FilePath* result) {
>  #endif
>        break;
>  
>@@ -62,7 +72,7 @@
>      case chrome::DIR_NATIVE_MESSAGING:
>  #if defined(OS_MACOSX)
>  #if BUILDFLAG(GOOGLE_CHROME_BRANDING)
>-@@ -527,6 +527,9 @@ bool PathProvider(int key, base::FilePath* result) {
>+@@ -559,6 +562,9 @@ bool PathProvider(int key, base::FilePath* result) {
>  #if BUILDFLAG(GOOGLE_CHROME_BRANDING)
>        cur = base::FilePath(FILE_PATH_LITERAL(
>            "/etc/opt/chrome/native-messaging-hosts"));
>@@ -72,7 +82,7 @@
>  #else
>        cur = base::FilePath(FILE_PATH_LITERAL(
>            "/etc/chromium/native-messaging-hosts"));
>-@@ -539,7 +542,7 @@ bool PathProvider(int key, base::FilePath* result) {
>+@@ -571,7 +577,7 @@ bool PathProvider(int key, base::FilePath* result) {
>          return false;
>        cur = cur.Append(FILE_PATH_LITERAL("NativeMessagingHosts"));
>        break;
>@@ -81,7 +91,7 @@
>  #if !defined(OS_ANDROID)
>      case chrome::DIR_GLOBAL_GCM_STORE:
>        if (!base::PathService::Get(chrome::DIR_USER_DATA, &cur))
>-@@ -547,7 +550,7 @@ bool PathProvider(int key, base::FilePath* result) {
>+@@ -579,7 +585,7 @@ bool PathProvider(int key, base::FilePath* result) {
>        cur = cur.Append(kGCMStoreDirname);
>        break;
>  #endif  // !defined(OS_ANDROID)
>@@ -90,7 +100,7 @@
>      case chrome::FILE_COMPONENT_FLASH_HINT:
>        if (!base::PathService::Get(
>                chrome::DIR_COMPONENT_UPDATED_PEPPER_FLASH_PLUGIN, &cur)) {
>-@@ -555,7 +558,7 @@ bool PathProvider(int key, base::FilePath* result) {
>+@@ -587,7 +593,7 @@ bool PathProvider(int key, base::FilePath* result) {
>        }
>        cur = cur.Append(kComponentUpdatedFlashHint);
>        break;
>diff --git a/www/qt5-webengine/files/patch-src_3rdparty_chromium_chrome_common_webui__url__constants.cc b/www/qt5-webengine/files/patch-src_3rdparty_chromium_chrome_common_webui__url__constants.cc
>index 637d6f7c120d..f02817656c6a 100644
>--- a/www/qt5-webengine/files/patch-src_3rdparty_chromium_chrome_common_webui__url__constants.cc
>+++ b/www/qt5-webengine/files/patch-src_3rdparty_chromium_chrome_common_webui__url__constants.cc
>@@ -1,6 +1,6 @@
>---- src/3rdparty/chromium/chrome/common/webui_url_constants.cc.orig	2019-11-27 21:12:25 UTC
>+--- src/3rdparty/chromium/chrome/common/webui_url_constants.cc.orig	2020-04-08 09:41:36 UTC
> +++ src/3rdparty/chromium/chrome/common/webui_url_constants.cc
>-@@ -314,7 +314,7 @@ const char kChromeUIMetroFlowURL[] = "chrome://make-me
>+@@ -318,7 +318,7 @@ bool IsSystemWebUIHost(base::StringPiece host) {
>  const char kChromeUICastHost[] = "cast";
>  #endif
>  
>@@ -9,12 +9,12 @@
>  const char kChromeUIDiscardsHost[] = "discards";
>  const char kChromeUIDiscardsURL[] = "chrome://discards/";
>  const char kChromeUIHatsHost[] = "hats";
>-@@ -325,17 +325,17 @@ const char kChromeUIHatsURL[] = "chrome://hats/";
>+@@ -329,17 +329,17 @@ const char kChromeUIHatsURL[] = "chrome://hats/";
>  const char kChromeUILinuxProxyConfigHost[] = "linux-proxy-config";
>  #endif
>  
>--#if defined(OS_LINUX) || defined(OS_ANDROID)
>-+#if defined(OS_LINUX) || defined(OS_ANDROID) || defined(OS_BSD)
>+-#if defined(OS_WIN) || defined(OS_LINUX) || defined(OS_ANDROID)
>++#if defined(OS_WIN) || defined(OS_LINUX) || defined(OS_ANDROID) || defined(OS_BSD)
>  const char kChromeUISandboxHost[] = "sandbox";
>  #endif
>  
>@@ -26,11 +26,11 @@
>  #endif
>  
> -#if (defined(OS_LINUX) && defined(TOOLKIT_VIEWS)) || defined(USE_AURA)
>-+#if ((defined(OS_BSD) || defined(OS_LINUX)) && defined(TOOLKIT_VIEWS)) || defined(USE_AURA)
>++#if ((defined(OS_LINUX) || defined(OS_BSD)) && defined(TOOLKIT_VIEWS)) || defined(USE_AURA)
>  const char kChromeUITabModalConfirmDialogHost[] = "tab-modal-confirm-dialog";
>  #endif
>  
>-@@ -579,13 +579,13 @@ const char* const kChromeHostURLs[] = {
>+@@ -605,13 +605,13 @@ const char* const kChromeHostURLs[] = {
>      kChromeUIInternetDetailDialogHost,
>      kChromeUIAssistantOptInHost,
>  #endif
>@@ -41,8 +41,8 @@
>  #if defined(OS_POSIX) && !defined(OS_MACOSX) && !defined(OS_ANDROID)
>      kChromeUILinuxProxyConfigHost,
>  #endif
>--#if defined(OS_LINUX) || defined(OS_ANDROID)
>-+#if defined(OS_LINUX) || defined(OS_ANDROID) || defined(OS_BSD)
>+-#if defined(OS_WIN) || defined(OS_LINUX) || defined(OS_ANDROID)
>++#if defined(OS_WIN) || defined(OS_LINUX) || defined(OS_ANDROID) || defined(OS_BSD)
>      kChromeUISandboxHost,
>  #endif
>  #if defined(OS_WIN)
>diff --git a/www/qt5-webengine/files/patch-src_3rdparty_chromium_chrome_common_webui__url__constants.h b/www/qt5-webengine/files/patch-src_3rdparty_chromium_chrome_common_webui__url__constants.h
>index 7960c2d6ed27..ecf37559478f 100644
>--- a/www/qt5-webengine/files/patch-src_3rdparty_chromium_chrome_common_webui__url__constants.h
>+++ b/www/qt5-webengine/files/patch-src_3rdparty_chromium_chrome_common_webui__url__constants.h
>@@ -1,6 +1,6 @@
>---- src/3rdparty/chromium/chrome/common/webui_url_constants.h.orig	2019-11-27 21:12:25 UTC
>+--- src/3rdparty/chromium/chrome/common/webui_url_constants.h.orig	2020-03-16 14:04:24 UTC
> +++ src/3rdparty/chromium/chrome/common/webui_url_constants.h
>-@@ -272,7 +272,7 @@ extern const char kChromeUIMetroFlowURL[];
>+@@ -268,7 +268,7 @@ bool IsSystemWebUIHost(base::StringPiece host);
>  extern const char kChromeUICastHost[];
>  #endif
>  
>@@ -9,12 +9,12 @@
>  extern const char kChromeUIDiscardsHost[];
>  extern const char kChromeUIDiscardsURL[];
>  extern const char kChromeUIHatsHost[];
>-@@ -284,17 +284,17 @@ extern const char kChromeUIHatsURL[];
>+@@ -280,17 +280,17 @@ extern const char kChromeUIHatsURL[];
>  extern const char kChromeUILinuxProxyConfigHost[];
>  #endif
>  
>--#if defined(OS_LINUX) || defined(OS_ANDROID)
>-+#if defined(OS_LINUX) || defined(OS_ANDROID) || defined(OS_BSD)
>+-#if defined(OS_WIN) || defined(OS_LINUX) || defined(OS_ANDROID)
>++#if defined(OS_WIN) || defined(OS_LINUX) || defined(OS_ANDROID) || defined(OS_BSD)
>  extern const char kChromeUISandboxHost[];
>  #endif
>  
>@@ -26,7 +26,7 @@
>  #endif
>  
> -#if (defined(OS_LINUX) && defined(TOOLKIT_VIEWS)) || defined(USE_AURA)
>-+#if ((defined(OS_BSD) || defined(OS_LINUX)) && defined(TOOLKIT_VIEWS)) || defined(USE_AURA)
>++#if ((defined(OS_LINUX) || defined(OS_BSD)) && defined(TOOLKIT_VIEWS)) || defined(USE_AURA)
>  extern const char kChromeUITabModalConfirmDialogHost[];
>  #endif
>  
>diff --git a/www/qt5-webengine/files/patch-src_3rdparty_chromium_components_crash_content_app_BUILD.gn b/www/qt5-webengine/files/patch-src_3rdparty_chromium_components_crash_content_app_BUILD.gn
>index 2683361d0990..74680fe2c99e 100644
>--- a/www/qt5-webengine/files/patch-src_3rdparty_chromium_components_crash_content_app_BUILD.gn
>+++ b/www/qt5-webengine/files/patch-src_3rdparty_chromium_components_crash_content_app_BUILD.gn
>@@ -1,6 +1,11 @@
>---- src/3rdparty/chromium/components/crash/content/app/BUILD.gn.orig	2019-11-27 21:12:25 UTC
>+--- src/3rdparty/chromium/components/crash/content/app/BUILD.gn.orig	2020-03-16 14:04:24 UTC
> +++ src/3rdparty/chromium/components/crash/content/app/BUILD.gn
>-@@ -54,7 +54,7 @@ static_library("app") {
>+@@ -51,17 +51,20 @@ static_library("app") {
>+     "crashpad_win.cc",
>+   ]
>+ 
>+-  if (is_mac || is_win || is_android || is_linux) {
>++  if ((is_mac || is_win || is_android || is_linux) && !is_bsd) {
>      sources += [ "crashpad.cc" ]
>    }
>  
>@@ -9,12 +14,39 @@
>      sources += [
>        "breakpad_linux.cc",
>        "breakpad_linux.h",
>-@@ -96,7 +96,7 @@ static_library("app") {
>-       "//sandbox",
>+       "breakpad_linux_impl.h",
>+     ]
>+   }
>++  if (is_bsd) {
>++    sources -= [ "crashpad_linux.cc" ]
>++  }
>+ 
>+   defines = [ "CRASH_IMPLEMENTATION" ]
>+ 
>+@@ -73,7 +76,7 @@ static_library("app") {
>+     "//build:branding_buildflags",
>+   ]
>+ 
>+-  if (is_mac || is_win || is_android || is_linux) {
>++  if ((is_mac || is_win || is_android || is_linux) && !is_bsd) {
>+     deps += [
>+       "//third_party/crashpad/crashpad/client",
>+       "//third_party/crashpad/crashpad/util",
>+@@ -99,7 +102,7 @@ static_library("app") {
>      ]
>+   }
>+ 
>+-  if (is_linux) {
>++  if (is_linux && !is_bsd) {
>+     deps += [ "//third_party/breakpad:client" ]
>+   }
>+ 
>+@@ -130,7 +133,7 @@ static_library("app") {
>+     libs = [ "log" ]
>+   }
>  
>--    if (is_linux) {
>-+    if (is_linux && !is_bsd) {
>-       deps += [
>-         "//content/public/common",
>-         "//third_party/breakpad:client",
>+-  if (is_linux) {
>++  if (is_linux && !is_bsd) {
>+     data_deps = [
>+       "//third_party/crashpad/crashpad/handler:crashpad_handler",
>+     ]
>diff --git a/www/qt5-webengine/files/patch-src_3rdparty_chromium_components_crash_core_common_BUILD.gn b/www/qt5-webengine/files/patch-src_3rdparty_chromium_components_crash_core_common_BUILD.gn
>index a1be56e5a543..31dad0abae33 100644
>--- a/www/qt5-webengine/files/patch-src_3rdparty_chromium_components_crash_core_common_BUILD.gn
>+++ b/www/qt5-webengine/files/patch-src_3rdparty_chromium_components_crash_core_common_BUILD.gn
>@@ -1,4 +1,4 @@
>---- src/3rdparty/chromium/components/crash/core/common/BUILD.gn.orig	2019-11-27 21:12:25 UTC
>+--- src/3rdparty/chromium/components/crash/core/common/BUILD.gn.orig	2020-03-16 14:04:24 UTC
> +++ src/3rdparty/chromium/components/crash/core/common/BUILD.gn
> @@ -7,7 +7,7 @@ import("//components/gwp_asan/buildflags/buildflags.gn
>  
>@@ -9,15 +9,18 @@
>  }
>  
>  group("common") {
>-@@ -93,7 +93,6 @@ target(crash_key_target_type, "crash_key") {
>+@@ -110,7 +110,9 @@ target(crash_key_target_type, "crash_key_lib") {
>        ]
>      }
>  
> -    deps += [ "//third_party/breakpad:client" ]
>-   }
>- }
>- 
>-@@ -153,7 +152,7 @@ source_set("unit_tests") {
>++    if (!is_bsd) {
>++      deps += [ "//third_party/breakpad:client" ]
>++    }
>+     if (use_combined_annotations) {
>+       public_deps += [ "//third_party/crashpad/crashpad/client" ]
>+     }
>+@@ -173,7 +175,7 @@ source_set("unit_tests") {
>      sources += [ "objc_zombie_unittest.mm" ]
>    }
>  
>diff --git a/www/qt5-webengine/files/patch-src_3rdparty_chromium_components_neterror_resources_neterror.js b/www/qt5-webengine/files/patch-src_3rdparty_chromium_components_neterror_resources_neterror.js
>index 66d03ffa166c..6fee612e68ba 100644
>--- a/www/qt5-webengine/files/patch-src_3rdparty_chromium_components_neterror_resources_neterror.js
>+++ b/www/qt5-webengine/files/patch-src_3rdparty_chromium_components_neterror_resources_neterror.js
>@@ -1,9 +1,9 @@
>---- src/3rdparty/chromium/components/neterror/resources/neterror.js.orig	2018-11-13 18:25:11 UTC
>+--- src/3rdparty/chromium/components/neterror/resources/neterror.js.orig	2020-04-08 09:41:36 UTC
> +++ src/3rdparty/chromium/components/neterror/resources/neterror.js
>-@@ -153,7 +153,7 @@ function setUpCachedButton(buttonStrings) {
>+@@ -201,7 +201,7 @@ function setUpCachedButton(buttonStrings) {
>  }
>  
>- var primaryControlOnLeft = true;
>+ let primaryControlOnLeft = true;
> -// <if expr="is_macosx or is_ios or is_linux or is_android">
> +// <if expr="is_macosx or is_ios or is_linux or is_android or is_bsd">
>  primaryControlOnLeft = false;
>diff --git a/www/qt5-webengine/files/patch-src_3rdparty_chromium_components_safe__browsing_db_util__unittest.cc b/www/qt5-webengine/files/patch-src_3rdparty_chromium_components_safe__browsing_db_util__unittest.cc
>deleted file mode 100644
>index 18f884a7589f..000000000000
>--- a/www/qt5-webengine/files/patch-src_3rdparty_chromium_components_safe__browsing_db_util__unittest.cc
>+++ /dev/null
>@@ -1,24 +0,0 @@
>---- src/3rdparty/chromium/components/safe_browsing/db/util_unittest.cc.orig	2019-05-23 12:39:34 UTC
>-+++ src/3rdparty/chromium/components/safe_browsing/db/util_unittest.cc
>-@@ -12,6 +12,12 @@
>- #include "testing/gtest/include/gtest/gtest.h"
>- #include "url/gurl.h"
>- 
>-+#if defined(OS_WIN)
>-+#include <winsock2.h>
>-+#elif defined(OS_POSIX)
>-+#include <arpa/inet.h>
>-+#endif
>-+
>- namespace safe_browsing {
>- 
>- TEST(SafeBrowsingDbUtilTest, UrlToFullHashes) {
>-@@ -83,7 +89,7 @@ TEST(SafeBrowsingDbUtilTest, StringToSBFullHashAndSBFu
>-   // 31 chars plus the last \0 as full_hash.
>-   const std::string hash_in = "12345678902234567890323456789012";
>-   SBFullHash hash_out = StringToSBFullHash(hash_in);
>--  EXPECT_EQ(0x34333231U, hash_out.prefix);
>-+  EXPECT_EQ(htonl(0x31323334U), hash_out.prefix);
>-   EXPECT_EQ(0, memcmp(hash_in.data(), hash_out.full_hash, sizeof(SBFullHash)));
>- 
>-   std::string hash_final = SBFullHashToString(hash_out);
>diff --git a/www/qt5-webengine/files/patch-src_3rdparty_chromium_content_browser_builtin__service__manifests.cc b/www/qt5-webengine/files/patch-src_3rdparty_chromium_content_browser_builtin__service__manifests.cc
>deleted file mode 100644
>index 6ee23f6cf0a4..000000000000
>--- a/www/qt5-webengine/files/patch-src_3rdparty_chromium_content_browser_builtin__service__manifests.cc
>+++ /dev/null
>@@ -1,20 +0,0 @@
>---- src/3rdparty/chromium/content/browser/builtin_service_manifests.cc.orig	2019-11-27 21:12:25 UTC
>-+++ src/3rdparty/chromium/content/browser/builtin_service_manifests.cc
>-@@ -32,7 +32,7 @@
>- #include "services/tracing/manifest.h"
>- #include "services/video_capture/public/cpp/manifest.h"
>- 
>--#if defined(OS_LINUX)
>-+#if defined(OS_LINUX) || defined(OS_BSD)
>- #include "components/services/font/public/cpp/manifest.h"  // nogncheck
>- #endif
>- 
>-@@ -99,7 +99,7 @@ const std::vector<service_manager::Manifest>& GetBuilt
>-                   : service_manager::Manifest::ExecutionMode::
>-                         kInProcessBuiltin),
>- #endif
>--#if defined(OS_LINUX)
>-+#if defined(OS_LINUX) || defined(OS_BSD)
>-           font_service::GetManifest(),
>- #endif
>- #if defined(OS_CHROMEOS)
>diff --git a/www/qt5-webengine/files/patch-src_3rdparty_chromium_content_browser_compositor_gpu__process__transport__factory.cc b/www/qt5-webengine/files/patch-src_3rdparty_chromium_content_browser_compositor_gpu__process__transport__factory.cc
>new file mode 100644
>index 000000000000..0343dc839339
>--- /dev/null
>+++ b/www/qt5-webengine/files/patch-src_3rdparty_chromium_content_browser_compositor_gpu__process__transport__factory.cc
>@@ -0,0 +1,11 @@
>+--- src/3rdparty/chromium/content/browser/compositor/gpu_process_transport_factory.cc.orig	2020-03-16 14:04:24 UTC
>++++ src/3rdparty/chromium/content/browser/compositor/gpu_process_transport_factory.cc
>+@@ -114,7 +114,7 @@ viz::FrameSinkManagerImpl* GetFrameSinkManager() {
>+   return content::BrowserMainLoop::GetInstance()->GetFrameSinkManager();
>+ }
>+ 
>+-#if defined(OS_LINUX) && !defined(OS_CHROMEOS)
>++#if (defined(OS_LINUX) && !defined(OS_CHROMEOS)) || defined(OS_BSD)
>+ class HostDisplayClient : public viz::HostDisplayClient {
>+  public:
>+   explicit HostDisplayClient(ui::Compositor* compositor)
>diff --git a/www/qt5-webengine/files/patch-src_3rdparty_chromium_content_browser_compositor_software__browser__compositor__output__surface.cc b/www/qt5-webengine/files/patch-src_3rdparty_chromium_content_browser_compositor_software__browser__compositor__output__surface.cc
>new file mode 100644
>index 000000000000..a0065ea651b0
>--- /dev/null
>+++ b/www/qt5-webengine/files/patch-src_3rdparty_chromium_content_browser_compositor_software__browser__compositor__output__surface.cc
>@@ -0,0 +1,20 @@
>+--- src/3rdparty/chromium/content/browser/compositor/software_browser_compositor_output_surface.cc.orig	2020-03-16 14:04:24 UTC
>++++ src/3rdparty/chromium/content/browser/compositor/software_browser_compositor_output_surface.cc
>+@@ -89,7 +89,7 @@ void SoftwareBrowserCompositorOutputSurface::SwapBuffe
>+     const gfx::Size& pixel_size) {
>+   latency_tracker_.OnGpuSwapBuffersCompleted(latency_info);
>+   client_->DidReceiveSwapBuffersAck({swap_time, swap_time});
>+-#if defined(OS_LINUX) && !defined(OS_CHROMEOS)
>++#if (defined(OS_LINUX) && !defined(OS_CHROMEOS)) || defined(OS_BSD)
>+   if (needs_swap_size_notifications_)
>+     client_->DidSwapWithSize(pixel_size);
>+ #endif
>+@@ -129,7 +129,7 @@ unsigned SoftwareBrowserCompositorOutputSurface::Updat
>+   return 0;
>+ }
>+ 
>+-#if defined(OS_LINUX) && !defined(OS_CHROMEOS)
>++#if (defined(OS_LINUX) && !defined(OS_CHROMEOS)) || defined(OS_BSD)
>+ void SoftwareBrowserCompositorOutputSurface::SetNeedsSwapSizeNotifications(
>+     bool needs_swap_size_notifications) {
>+   needs_swap_size_notifications_ = needs_swap_size_notifications;
>diff --git a/www/qt5-webengine/files/patch-src_3rdparty_chromium_content_browser_compositor_software__browser__compositor__output__surface.h b/www/qt5-webengine/files/patch-src_3rdparty_chromium_content_browser_compositor_software__browser__compositor__output__surface.h
>new file mode 100644
>index 000000000000..fdfb01dea16a
>--- /dev/null
>+++ b/www/qt5-webengine/files/patch-src_3rdparty_chromium_content_browser_compositor_software__browser__compositor__output__surface.h
>@@ -0,0 +1,20 @@
>+--- src/3rdparty/chromium/content/browser/compositor/software_browser_compositor_output_surface.h.orig	2020-03-16 14:04:24 UTC
>++++ src/3rdparty/chromium/content/browser/compositor/software_browser_compositor_output_surface.h
>+@@ -39,7 +39,7 @@ class CONTENT_EXPORT SoftwareBrowserCompositorOutputSu
>+   gfx::BufferFormat GetOverlayBufferFormat() const override;
>+   uint32_t GetFramebufferCopyTextureFormat() override;
>+   unsigned UpdateGpuFence() override;
>+-#if defined(OS_LINUX) && !defined(OS_CHROMEOS)
>++#if (defined(OS_LINUX) && !defined(OS_CHROMEOS)) || defined(OS_BSD)
>+   void SetNeedsSwapSizeNotifications(
>+       bool needs_swap_size_notifications) override;
>+ #endif
>+@@ -55,7 +55,7 @@ class CONTENT_EXPORT SoftwareBrowserCompositorOutputSu
>+   base::TimeDelta refresh_interval_;
>+   ui::LatencyTracker latency_tracker_;
>+ 
>+-#if defined(OS_LINUX) && !defined(OS_CHROMEOS)
>++#if (defined(OS_LINUX) && !defined(OS_CHROMEOS)) || defined(OS_BSD)
>+   bool needs_swap_size_notifications_ = false;
>+ #endif
>+ 
>diff --git a/www/qt5-webengine/files/patch-src_3rdparty_chromium_content_browser_devtools_protocol_system__info__handler.cc b/www/qt5-webengine/files/patch-src_3rdparty_chromium_content_browser_devtools_protocol_system__info__handler.cc
>new file mode 100644
>index 000000000000..522db7b2f24b
>--- /dev/null
>+++ b/www/qt5-webengine/files/patch-src_3rdparty_chromium_content_browser_devtools_protocol_system__info__handler.cc
>@@ -0,0 +1,11 @@
>+--- src/3rdparty/chromium/content/browser/devtools/protocol/system_info_handler.cc.orig	2020-03-16 14:04:24 UTC
>++++ src/3rdparty/chromium/content/browser/devtools/protocol/system_info_handler.cc
>+@@ -48,7 +48,7 @@ std::unique_ptr<SystemInfo::Size> GfxSizeToSystemInfoS
>+ // Give the GPU process a few seconds to provide GPU info.
>+ // Linux Debug builds need more time -- see Issue 796437.
>+ // Windows builds need more time -- see Issue 873112 and 1004472.
>+-#if (defined(OS_LINUX) && !defined(NDEBUG))
>++#if ((defined(OS_LINUX) || defined(OS_BSD)) && !defined(NDEBUG))
>+ const int kGPUInfoWatchdogTimeoutMs = 20000;
>+ #elif defined(OS_WIN)
>+ const int kGPUInfoWatchdogTimeoutMs = 30000;
>diff --git a/www/qt5-webengine/files/patch-src_3rdparty_chromium_content_browser_ppapi__plugin__process__host__receiver__bindings.cc b/www/qt5-webengine/files/patch-src_3rdparty_chromium_content_browser_ppapi__plugin__process__host__receiver__bindings.cc
>new file mode 100644
>index 000000000000..25b0bff9f590
>--- /dev/null
>+++ b/www/qt5-webengine/files/patch-src_3rdparty_chromium_content_browser_ppapi__plugin__process__host__receiver__bindings.cc
>@@ -0,0 +1,20 @@
>+--- src/3rdparty/chromium/content/browser/ppapi_plugin_process_host_receiver_bindings.cc.orig	2020-03-16 14:04:24 UTC
>++++ src/3rdparty/chromium/content/browser/ppapi_plugin_process_host_receiver_bindings.cc
>+@@ -8,7 +8,7 @@
>+ 
>+ #include "build/build_config.h"
>+ 
>+-#if defined(OS_LINUX)
>++#if defined(OS_LINUX) || defined(OS_BSD)
>+ #include "components/services/font/public/mojom/font_service.mojom.h"  // nogncheck
>+ #include "content/browser/font_service.h"  // nogncheck
>+ #endif
>+@@ -17,7 +17,7 @@ namespace content {
>+ 
>+ void PpapiPluginProcessHost::BindHostReceiver(
>+     mojo::GenericPendingReceiver receiver) {
>+-#if defined(OS_LINUX)
>++#if defined(OS_LINUX) || defined(OS_BSD)
>+   if (auto font_receiver = receiver.As<font_service::mojom::FontService>())
>+     ConnectToFontService(std::move(font_receiver));
>+ #endif
>diff --git a/www/qt5-webengine/files/patch-src_3rdparty_chromium_content_browser_renderer__host_render__process__host__impl.cc b/www/qt5-webengine/files/patch-src_3rdparty_chromium_content_browser_renderer__host_render__process__host__impl.cc
>index a41d27711120..4bb971655ad5 100644
>--- a/www/qt5-webengine/files/patch-src_3rdparty_chromium_content_browser_renderer__host_render__process__host__impl.cc
>+++ b/www/qt5-webengine/files/patch-src_3rdparty_chromium_content_browser_renderer__host_render__process__host__impl.cc
>@@ -1,15 +1,15 @@
>---- src/3rdparty/chromium/content/browser/renderer_host/render_process_host_impl.cc.orig	2019-11-27 21:12:25 UTC
>+--- src/3rdparty/chromium/content/browser/renderer_host/render_process_host_impl.cc.orig	2020-03-16 14:04:24 UTC
> +++ src/3rdparty/chromium/content/browser/renderer_host/render_process_host_impl.cc
>-@@ -230,7 +230,7 @@
>- #include "content/browser/compositor/image_transport_factory.h"
>+@@ -236,7 +236,7 @@
>+ #include "content/browser/gpu/gpu_data_manager_impl.h"
>  #endif
>  
> -#if defined(OS_LINUX)
> +#if defined(OS_LINUX) || defined(OS_BSD)
>  #include <sys/resource.h>
>  #include <sys/time.h>
>- #endif
>-@@ -1232,7 +1232,7 @@ static constexpr size_t kUnknownPlatformProcessLimit =
>+ 
>+@@ -1165,7 +1165,7 @@ static constexpr size_t kUnknownPlatformProcessLimit =
>  // to indicate failure and std::numeric_limits<size_t>::max() to indicate
>  // unlimited.
>  size_t GetPlatformProcessLimit() {
>@@ -18,7 +18,7 @@
>    struct rlimit limit;
>    if (getrlimit(RLIMIT_NPROC, &limit) != 0)
>      return kUnknownPlatformProcessLimit;
>-@@ -1243,7 +1243,7 @@ size_t GetPlatformProcessLimit() {
>+@@ -1176,7 +1176,7 @@ size_t GetPlatformProcessLimit() {
>  #else
>    // TODO(https://crbug.com/104689): Implement on other platforms.
>    return kUnknownPlatformProcessLimit;
>@@ -27,7 +27,16 @@
>  }
>  #endif  // !defined(OS_ANDROID) && !defined(OS_CHROMEOS)
>  
>-@@ -1651,7 +1651,7 @@ bool RenderProcessHostImpl::Init() {
>+@@ -1218,7 +1218,7 @@ void RenderProcessHostImpl::IOThreadHostImpl::BindHost
>+       return;
>+   }
>+ 
>+-#if defined(OS_LINUX)
>++#if defined(OS_LINUX) || defined(OS_BSD)
>+   if (auto font_receiver = receiver.As<font_service::mojom::FontService>()) {
>+     ConnectToFontService(std::move(font_receiver));
>+     return;
>+@@ -1588,7 +1588,7 @@ bool RenderProcessHostImpl::Init() {
>    renderer_prefix =
>        browser_command_line.GetSwitchValueNative(switches::kRendererCmdPrefix);
>  
>diff --git a/www/qt5-webengine/files/patch-src_3rdparty_chromium_content_browser_service__manager_service__manager__context.cc b/www/qt5-webengine/files/patch-src_3rdparty_chromium_content_browser_service__manager_service__manager__context.cc
>deleted file mode 100644
>index c7784c310ed4..000000000000
>--- a/www/qt5-webengine/files/patch-src_3rdparty_chromium_content_browser_service__manager_service__manager__context.cc
>+++ /dev/null
>@@ -1,35 +0,0 @@
>---- src/3rdparty/chromium/content/browser/service_manager/service_manager_context.cc.orig	2019-11-27 21:12:25 UTC
>-+++ src/3rdparty/chromium/content/browser/service_manager/service_manager_context.cc
>-@@ -98,7 +98,7 @@
>- #include "content/public/android/content_jni_headers/ContentNfcDelegate_jni.h"
>- #endif
>- 
>--#if defined(OS_LINUX)
>-+#if defined(OS_LINUX) || defined(OS_BSD)
>- #include "components/services/font/font_service_app.h"
>- #include "components/services/font/public/mojom/constants.mojom.h"  // nogncheck
>- #endif
>-@@ -341,12 +341,12 @@ void CreateInProcessAudioService(
>-                      BrowserMainLoop::GetAudioManager(), std::move(request)));
>- }
>- 
>--#if defined(OS_LINUX)
>-+#if defined(OS_LINUX) || defined(OS_BSD)
>- std::unique_ptr<service_manager::Service> CreateFontService(
>-     service_manager::mojom::ServiceRequest request) {
>-   return std::make_unique<font_service::FontServiceApp>(std::move(request));
>- }
>--#endif  // defined(OS_LINUX)
>-+#endif  // defined(OS_LINUX) || defined(OS_BSD)
>- 
>- std::unique_ptr<service_manager::Service> CreateResourceCoordinatorService(
>-     service_manager::mojom::ServiceRequest request) {
>-@@ -657,7 +657,7 @@ ServiceManagerContext::ServiceManagerContext(
>-         base::BindRepeating(&CreateVideoCaptureService));
>-   }
>- 
>--#if defined(OS_LINUX)
>-+#if defined(OS_LINUX) || defined(OS_BSD)
>-   RegisterInProcessService(
>-       font_service::mojom::kServiceName,
>-       base::CreateSequencedTaskRunnerWithTraits(
>diff --git a/www/qt5-webengine/files/patch-src_3rdparty_chromium_content_browser_utility__process__host.cc b/www/qt5-webengine/files/patch-src_3rdparty_chromium_content_browser_utility__process__host.cc
>index abd7591245eb..a77671406a9d 100644
>--- a/www/qt5-webengine/files/patch-src_3rdparty_chromium_content_browser_utility__process__host.cc
>+++ b/www/qt5-webengine/files/patch-src_3rdparty_chromium_content_browser_utility__process__host.cc
>@@ -1,6 +1,6 @@
>---- src/3rdparty/chromium/content/browser/utility_process_host.cc.orig	2019-11-27 21:12:25 UTC
>+--- src/3rdparty/chromium/content/browser/utility_process_host.cc.orig	2020-04-08 09:41:36 UTC
> +++ src/3rdparty/chromium/content/browser/utility_process_host.cc
>-@@ -211,7 +211,7 @@ UtilityProcessHost::UtilityProcessHost()
>+@@ -209,7 +209,7 @@ UtilityProcessHost::UtilityProcessHost()
>  
>  UtilityProcessHost::UtilityProcessHost(std::unique_ptr<Client> client)
>      : sandbox_type_(service_manager::SANDBOX_TYPE_UTILITY),
>diff --git a/www/qt5-webengine/files/patch-src_3rdparty_chromium_content_gpu_gpu__main.cc b/www/qt5-webengine/files/patch-src_3rdparty_chromium_content_gpu_gpu__main.cc
>index c1c6a5a81eac..e033dd27625d 100644
>--- a/www/qt5-webengine/files/patch-src_3rdparty_chromium_content_gpu_gpu__main.cc
>+++ b/www/qt5-webengine/files/patch-src_3rdparty_chromium_content_gpu_gpu__main.cc
>@@ -1,6 +1,6 @@
>---- src/3rdparty/chromium/content/gpu/gpu_main.cc.orig	2019-11-27 21:12:25 UTC
>+--- src/3rdparty/chromium/content/gpu/gpu_main.cc.orig	2020-03-16 14:04:24 UTC
> +++ src/3rdparty/chromium/content/gpu/gpu_main.cc
>-@@ -84,7 +84,7 @@
>+@@ -85,7 +85,7 @@
>  #include "ui/gfx/x/x11_switches.h"    // nogncheck
>  #endif
>  
>@@ -9,7 +9,7 @@
>  #include "content/gpu/gpu_sandbox_hook_linux.h"
>  #include "content/public/common/sandbox_init.h"
>  #include "services/service_manager/sandbox/linux/sandbox_linux.h"
>-@@ -113,7 +113,7 @@ namespace content {
>+@@ -106,7 +106,7 @@ namespace content {
>  
>  namespace {
>  
>@@ -18,7 +18,7 @@
>  bool StartSandboxLinux(gpu::GpuWatchdogThread*,
>                         const gpu::GPUInfo*,
>                         const gpu::GpuPreferences&);
>-@@ -174,7 +174,7 @@ class ContentSandboxHelper : public gpu::GpuSandboxHel
>+@@ -167,7 +167,7 @@ class ContentSandboxHelper : public gpu::GpuSandboxHel
>    bool EnsureSandboxInitialized(gpu::GpuWatchdogThread* watchdog_thread,
>                                  const gpu::GPUInfo* gpu_info,
>                                  const gpu::GpuPreferences& gpu_prefs) override {
>@@ -27,16 +27,16 @@
>      return StartSandboxLinux(watchdog_thread, gpu_info, gpu_prefs);
>  #elif defined(OS_WIN)
>      return StartSandboxWindows(sandbox_info_);
>-@@ -280,7 +280,7 @@ int GpuMain(const MainFunctionParams& parameters) {
>+@@ -273,7 +273,7 @@ int GpuMain(const MainFunctionParams& parameters) {
>      main_thread_task_executor =
>          std::make_unique<base::SingleThreadTaskExecutor>(
>-             gpu_preferences.message_loop_type);
>+             gpu_preferences.message_pump_type);
> -#elif defined(OS_LINUX)
> +#elif defined(OS_LINUX) || defined(OS_BSD)
>  #error "Unsupported Linux platform."
>  #elif defined(OS_MACOSX)
>      // Cross-process CoreAnimation requires a CFRunLoop to function at all, and
>-@@ -388,7 +388,7 @@ int GpuMain(const MainFunctionParams& parameters) {
>+@@ -379,7 +379,7 @@ int GpuMain(const MainFunctionParams& parameters) {
>  
>  namespace {
>  
>@@ -45,7 +45,7 @@
>  bool StartSandboxLinux(gpu::GpuWatchdogThread* watchdog_thread,
>                         const gpu::GPUInfo* gpu_info,
>                         const gpu::GpuPreferences& gpu_prefs) {
>-@@ -423,7 +423,7 @@ bool StartSandboxLinux(gpu::GpuWatchdogThread* watchdo
>+@@ -414,7 +414,7 @@ bool StartSandboxLinux(gpu::GpuWatchdogThread* watchdo
>  
>    return res;
>  }
>diff --git a/www/qt5-webengine/files/patch-src_3rdparty_chromium_content_ppapi__plugin_ppapi__blink__platform__impl.cc b/www/qt5-webengine/files/patch-src_3rdparty_chromium_content_ppapi__plugin_ppapi__blink__platform__impl.cc
>index bc7e39710b93..aaf54946fa06 100644
>--- a/www/qt5-webengine/files/patch-src_3rdparty_chromium_content_ppapi__plugin_ppapi__blink__platform__impl.cc
>+++ b/www/qt5-webengine/files/patch-src_3rdparty_chromium_content_ppapi__plugin_ppapi__blink__platform__impl.cc
>@@ -1,34 +1,25 @@
>---- src/3rdparty/chromium/content/ppapi_plugin/ppapi_blink_platform_impl.cc.orig	2019-05-23 12:39:34 UTC
>+--- src/3rdparty/chromium/content/ppapi_plugin/ppapi_blink_platform_impl.cc.orig	2020-04-08 09:41:36 UTC
> +++ src/3rdparty/chromium/content/ppapi_plugin/ppapi_blink_platform_impl.cc
>-@@ -20,7 +20,7 @@
>+@@ -19,7 +19,7 @@
>  
>  #if defined(OS_MACOSX)
>  #include "content/child/child_process_sandbox_support_impl_mac.h"
> -#elif defined(OS_LINUX)
> +#elif defined(OS_LINUX) || defined(OS_BSD)
>  #include "content/child/child_process_sandbox_support_impl_linux.h"
>+ #include "mojo/public/cpp/bindings/pending_remote.h"
>  #endif
>- 
> @@ -34,7 +34,7 @@ typedef struct CGFont* CGFontRef;
>  namespace content {
>  
>  PpapiBlinkPlatformImpl::PpapiBlinkPlatformImpl() {
> -#if defined(OS_LINUX)
> +#if defined(OS_LINUX) || defined(OS_BSD)
>-   font_loader_ =
>-       sk_make_sp<font_service::FontLoader>(ChildThread::Get()->GetConnector());
>-   SkFontConfigInterface::SetGlobal(font_loader_);
>-@@ -49,7 +49,7 @@ PpapiBlinkPlatformImpl::~PpapiBlinkPlatformImpl() {
>- }
>- 
>- void PpapiBlinkPlatformImpl::Shutdown() {
>--#if defined(OS_LINUX) || defined(OS_MACOSX)
>-+#if defined(OS_LINUX) || defined(OS_MACOSX) || defined(OS_BSD)
>-   // SandboxSupport contains a map of OutOfProcessFont objects, which hold
>-   // WebStrings and WebVectors, which become invalidated when blink is shut
>-   // down. Hence, we need to clear that map now, just before blink::shutdown()
>-@@ -59,7 +59,7 @@ void PpapiBlinkPlatformImpl::Shutdown() {
>- }
>+   mojo::PendingRemote<font_service::mojom::FontService> font_service;
>+   ChildThread::Get()->BindHostReceiver(
>+       font_service.InitWithNewPipeAndPassReceiver());
>+@@ -52,7 +52,7 @@ PpapiBlinkPlatformImpl::~PpapiBlinkPlatformImpl() {
>+ void PpapiBlinkPlatformImpl::Shutdown() {}
>  
>  blink::WebSandboxSupport* PpapiBlinkPlatformImpl::GetSandboxSupport() {
> -#if defined(OS_LINUX) || defined(OS_MACOSX)
>diff --git a/www/qt5-webengine/files/patch-src_3rdparty_chromium_content_public_app_v8__snapshot__overlay__manifest.cc b/www/qt5-webengine/files/patch-src_3rdparty_chromium_content_public_app_v8__snapshot__overlay__manifest.cc
>deleted file mode 100644
>index e0889cfd8d66..000000000000
>--- a/www/qt5-webengine/files/patch-src_3rdparty_chromium_content_public_app_v8__snapshot__overlay__manifest.cc
>+++ /dev/null
>@@ -1,11 +0,0 @@
>---- src/3rdparty/chromium/content/public/app/v8_snapshot_overlay_manifest.cc.orig	2019-05-23 12:39:34 UTC
>-+++ src/3rdparty/chromium/content/public/app/v8_snapshot_overlay_manifest.cc
>-@@ -15,7 +15,7 @@ namespace content {
>- const service_manager::Manifest& GetV8SnapshotOverlayManifest() {
>-   static base::NoDestructor<service_manager::Manifest> manifest {
>-     service_manager::ManifestBuilder()
>--#if defined(OS_LINUX)
>-+#if defined(OS_LINUX) || defined(OS_BSD)
>-         .PreloadFile(kV8NativesDataDescriptor,
>-                      base::FilePath(FILE_PATH_LITERAL("natives_blob.bin")))
>- #if defined(USE_V8_CONTEXT_SNAPSHOT)
>diff --git a/www/qt5-webengine/files/patch-src_3rdparty_chromium_content_public_common_common__param__traits__macros.h b/www/qt5-webengine/files/patch-src_3rdparty_chromium_content_public_common_common__param__traits__macros.h
>index cdea4b04b252..c35c92d4478f 100644
>--- a/www/qt5-webengine/files/patch-src_3rdparty_chromium_content_public_common_common__param__traits__macros.h
>+++ b/www/qt5-webengine/files/patch-src_3rdparty_chromium_content_public_common_common__param__traits__macros.h
>@@ -1,9 +1,9 @@
>---- src/3rdparty/chromium/content/public/common/common_param_traits_macros.h.orig	2019-05-23 12:39:34 UTC
>+--- src/3rdparty/chromium/content/public/common/common_param_traits_macros.h.orig	2020-04-08 09:41:36 UTC
> +++ src/3rdparty/chromium/content/public/common/common_param_traits_macros.h
>-@@ -328,7 +328,7 @@ IPC_STRUCT_TRAITS_BEGIN(content::RendererPreferences)
>+@@ -333,7 +333,7 @@ IPC_STRUCT_TRAITS_BEGIN(blink::mojom::RendererPreferen
>+   IPC_STRUCT_TRAITS_MEMBER(accept_languages)
>    IPC_STRUCT_TRAITS_MEMBER(disable_client_blocked_error_page)
>    IPC_STRUCT_TRAITS_MEMBER(plugin_fullscreen_allowed)
>-   IPC_STRUCT_TRAITS_MEMBER(network_contry_iso)
> -#if defined(OS_LINUX)
> +#if defined(OS_LINUX) || defined(OS_BSD)
>    IPC_STRUCT_TRAITS_MEMBER(system_font_family_name)
>diff --git a/www/qt5-webengine/files/patch-src_3rdparty_chromium_content_public_common_content__features.cc b/www/qt5-webengine/files/patch-src_3rdparty_chromium_content_public_common_content__features.cc
>index 1981366ab473..00e26170dfdf 100644
>--- a/www/qt5-webengine/files/patch-src_3rdparty_chromium_content_public_common_content__features.cc
>+++ b/www/qt5-webengine/files/patch-src_3rdparty_chromium_content_public_common_content__features.cc
>@@ -1,15 +1,15 @@
>---- src/3rdparty/chromium/content/public/common/content_features.cc.orig	2019-11-27 21:12:25 UTC
>+--- src/3rdparty/chromium/content/public/common/content_features.cc.orig	2020-03-16 14:04:24 UTC
> +++ src/3rdparty/chromium/content/public/common/content_features.cc
>-@@ -43,7 +43,7 @@ const base::Feature kAudioServiceLaunchOnStartup{
>- // Runs the audio service in a separate process.
>+@@ -54,7 +54,7 @@ const base::Feature kAudioServiceLaunchOnStartup{
>  const base::Feature kAudioServiceOutOfProcess{
>    "AudioServiceOutOfProcess",
>--#if defined(OS_LINUX) && !defined(OS_CHROMEOS)
>-+#if defined(OS_LINUX) && !defined(OS_CHROMEOS) || defined(OS_BSD)
>+ #if defined(OS_WIN) || defined(OS_MACOSX) || \
>+-    (defined(OS_LINUX) && !defined(OS_CHROMEOS))
>++    (defined(OS_LINUX) && !defined(OS_CHROMEOS)) || defined(OS_BSD)
>        base::FEATURE_ENABLED_BY_DEFAULT
>  #else
>        base::FEATURE_DISABLED_BY_DEFAULT
>-@@ -618,7 +618,7 @@ const base::Feature kWebAssemblyThreads {
>+@@ -634,7 +634,7 @@ const base::Feature kWebAssemblyThreads {
>  };
>  
>  // Enable WebAssembly trap handler.
>@@ -18,7 +18,7 @@
>      defined(ARCH_CPU_X86_64)
>  const base::Feature kWebAssemblyTrapHandler{"WebAssemblyTrapHandler",
>                                              base::FEATURE_ENABLED_BY_DEFAULT};
>-@@ -653,7 +653,7 @@ const base::Feature kWebAuthBle{"WebAuthenticationBle"
>+@@ -669,7 +669,7 @@ const base::Feature kWebAuthBle{"WebAuthenticationBle"
>  // https://w3c.github.io/webauthn
>  const base::Feature kWebAuthCable {
>    "WebAuthenticationCable",
>diff --git a/www/qt5-webengine/files/patch-src_3rdparty_chromium_content_renderer_render__thread__impl.cc b/www/qt5-webengine/files/patch-src_3rdparty_chromium_content_renderer_render__thread__impl.cc
>index f6237ce8754e..cdd7d477f3c8 100644
>--- a/www/qt5-webengine/files/patch-src_3rdparty_chromium_content_renderer_render__thread__impl.cc
>+++ b/www/qt5-webengine/files/patch-src_3rdparty_chromium_content_renderer_render__thread__impl.cc
>@@ -1,6 +1,6 @@
>---- src/3rdparty/chromium/content/renderer/render_thread_impl.cc.orig	2019-11-27 21:12:25 UTC
>+--- src/3rdparty/chromium/content/renderer/render_thread_impl.cc.orig	2020-03-16 14:04:24 UTC
> +++ src/3rdparty/chromium/content/renderer/render_thread_impl.cc
>-@@ -186,12 +186,21 @@
>+@@ -188,12 +188,21 @@
>  #include "mojo/public/cpp/bindings/message_dumper.h"
>  #endif
>  
>@@ -22,7 +22,7 @@
>  using base::ThreadRestrictions;
>  using blink::WebDocument;
>  using blink::WebFrame;
>-@@ -904,7 +913,7 @@ void RenderThreadImpl::Init() {
>+@@ -927,7 +936,7 @@ void RenderThreadImpl::Init() {
>    DCHECK(parsed_num_raster_threads) << string_value;
>    DCHECK_GT(num_raster_threads, 0);
>  
>@@ -31,16 +31,16 @@
>    categorized_worker_pool_->SetBackgroundingCallback(
>        main_thread_scheduler_->DefaultTaskRunner(),
>        base::BindOnce(
>-@@ -933,7 +942,7 @@ void RenderThreadImpl::Init() {
>+@@ -957,7 +966,7 @@ void RenderThreadImpl::Init() {
>    base::DiscardableMemoryAllocator::SetInstance(
>        discardable_shared_memory_manager_.get());
>  
> -#if defined(OS_LINUX)
> +#if defined(OS_LINUX) || defined(OS_BSD)
>-   render_message_filter()->SetThreadPriority(
>-       ChildProcess::current()->io_thread_id(), base::ThreadPriority::DISPLAY);
>- #endif
>-@@ -1313,7 +1322,7 @@ media::GpuVideoAcceleratorFactories* RenderThreadImpl:
>+   if (base::FeatureList::IsEnabled(
>+           blink::features::kBlinkCompositorUseDisplayThreadPriority)) {
>+     render_message_filter()->SetThreadPriority(
>+@@ -1333,7 +1342,7 @@ media::GpuVideoAcceleratorFactories* RenderThreadImpl:
>        !cmd_line->HasSwitch(switches::kDisableGpuMemoryBufferVideoFrames);
>  #else
>        cmd_line->HasSwitch(switches::kEnableGpuMemoryBufferVideoFrames);
>diff --git a/www/qt5-webengine/files/patch-src_3rdparty_chromium_content_renderer_renderer__blink__platform__impl.cc b/www/qt5-webengine/files/patch-src_3rdparty_chromium_content_renderer_renderer__blink__platform__impl.cc
>index 5753c3696617..868fc376dfe8 100644
>--- a/www/qt5-webengine/files/patch-src_3rdparty_chromium_content_renderer_renderer__blink__platform__impl.cc
>+++ b/www/qt5-webengine/files/patch-src_3rdparty_chromium_content_renderer_renderer__blink__platform__impl.cc
>@@ -1,6 +1,6 @@
>---- src/3rdparty/chromium/content/renderer/renderer_blink_platform_impl.cc.orig	2019-05-23 12:39:34 UTC
>+--- src/3rdparty/chromium/content/renderer/renderer_blink_platform_impl.cc.orig	2020-04-08 09:41:36 UTC
> +++ src/3rdparty/chromium/content/renderer/renderer_blink_platform_impl.cc
>-@@ -109,7 +109,7 @@
>+@@ -99,7 +99,7 @@
>  
>  #if defined(OS_MACOSX)
>  #include "content/child/child_process_sandbox_support_impl_mac.h"
>@@ -9,34 +9,25 @@
>  #include "content/child/child_process_sandbox_support_impl_linux.h"
>  #endif
>  
>-@@ -204,7 +204,7 @@ RendererBlinkPlatformImpl::RendererBlinkPlatformImpl(
>-                      ->Clone();
>+@@ -174,7 +174,7 @@ RendererBlinkPlatformImpl::RendererBlinkPlatformImpl(
>+   if (RenderThreadImpl::current()) {
>+     io_runner_ = RenderThreadImpl::current()->GetIOTaskRunner();
>      thread_safe_sender_ = RenderThreadImpl::current()->thread_safe_sender();
>-     blob_registry_.reset(new WebBlobRegistryImpl(thread_safe_sender_.get()));
> -#if defined(OS_LINUX)
> +#if defined(OS_LINUX) || defined(OS_BSD)
>-     font_loader_ = sk_make_sp<font_service::FontLoader>(connector_.get());
>-     SkFontConfigInterface::SetGlobal(font_loader_);
>+     mojo::PendingRemote<font_service::mojom::FontService> font_service;
>+     RenderThreadImpl::current()->BindHostReceiver(
>+         font_service.InitWithNewPipeAndPassReceiver());
>+@@ -184,7 +184,7 @@ RendererBlinkPlatformImpl::RendererBlinkPlatformImpl(
>  #endif
>-@@ -213,7 +213,7 @@ RendererBlinkPlatformImpl::RendererBlinkPlatformImpl(
>-     connector_ = service_manager::Connector::Create(&request);
>    }
>  
> -#if defined(OS_LINUX) || defined(OS_MACOSX)
> +#if defined(OS_LINUX) || defined(OS_MACOSX) || defined(OS_BSD)
>-   if (g_sandbox_enabled && sandboxEnabled()) {
>+   if (sandboxEnabled()) {
>  #if defined(OS_MACOSX)
>-     sandbox_support_.reset(new WebSandboxSupportMac(connector_.get()));
>-@@ -241,7 +241,7 @@ RendererBlinkPlatformImpl::~RendererBlinkPlatformImpl(
>- }
>- 
>- void RendererBlinkPlatformImpl::Shutdown() {
>--#if defined(OS_LINUX) || defined(OS_MACOSX)
>-+#if defined(OS_LINUX) || defined(OS_MACOSX) || defined(OS_BSD)
>-   // SandboxSupport contains a map of OutOfProcessFont objects, which hold
>-   // WebStrings and WebVectors, which become invalidated when blink is shut
>-   // down. Hence, we need to clear that map now, just before blink::shutdown()
>-@@ -322,7 +322,7 @@ RendererBlinkPlatformImpl::CreateNetworkURLLoaderFacto
>+     sandbox_support_ = std::make_unique<WebSandboxSupportMac>();
>+@@ -266,7 +266,7 @@ RendererBlinkPlatformImpl::CreateNetworkURLLoaderFacto
>  
>  void RendererBlinkPlatformImpl::SetDisplayThreadPriority(
>      base::PlatformThreadId thread_id) {
>@@ -45,7 +36,7 @@
>    if (RenderThreadImpl* render_thread = RenderThreadImpl::current()) {
>      render_thread->render_message_filter()->SetThreadPriority(
>          thread_id, base::ThreadPriority::DISPLAY);
>-@@ -335,7 +335,7 @@ blink::BlameContext* RendererBlinkPlatformImpl::GetTop
>+@@ -279,7 +279,7 @@ blink::BlameContext* RendererBlinkPlatformImpl::GetTop
>  }
>  
>  blink::WebSandboxSupport* RendererBlinkPlatformImpl::GetSandboxSupport() {
>diff --git a/www/qt5-webengine/files/patch-src_3rdparty_chromium_content_renderer_renderer__blink__platform__impl.h b/www/qt5-webengine/files/patch-src_3rdparty_chromium_content_renderer_renderer__blink__platform__impl.h
>index 7a5c7fec5ebe..51de136951ec 100644
>--- a/www/qt5-webengine/files/patch-src_3rdparty_chromium_content_renderer_renderer__blink__platform__impl.h
>+++ b/www/qt5-webengine/files/patch-src_3rdparty_chromium_content_renderer_renderer__blink__platform__impl.h
>@@ -1,16 +1,16 @@
>---- src/3rdparty/chromium/content/renderer/renderer_blink_platform_impl.h.orig	2019-05-23 12:39:34 UTC
>+--- src/3rdparty/chromium/content/renderer/renderer_blink_platform_impl.h.orig	2020-04-29 07:57:35 UTC
> +++ src/3rdparty/chromium/content/renderer/renderer_blink_platform_impl.h
>-@@ -29,7 +29,7 @@
>+@@ -31,7 +31,7 @@
>+ #include "third_party/blink/public/mojom/cache_storage/cache_storage.mojom.h"
>  #include "third_party/blink/public/mojom/loader/code_cache.mojom.h"
>- #include "third_party/blink/public/platform/modules/webdatabase/web_database.mojom.h"
>  
> -#if defined(OS_LINUX)
> +#if defined(OS_LINUX) || defined(OS_BSD)
>  #include "components/services/font/public/cpp/font_loader.h"  // nogncheck
>  #include "third_party/skia/include/core/SkRefCnt.h"           // nogncheck
>  #endif
>-@@ -263,7 +263,7 @@ class CONTENT_EXPORT RendererBlinkPlatformImpl : publi
>-   std::unique_ptr<service_manager::Connector> connector_;
>+@@ -221,7 +221,7 @@ class CONTENT_EXPORT RendererBlinkPlatformImpl : publi
>+ 
>    scoped_refptr<base::SingleThreadTaskRunner> io_runner_;
>  
> -#if defined(OS_LINUX) || defined(OS_MACOSX)
>@@ -18,9 +18,9 @@
>    std::unique_ptr<blink::WebSandboxSupport> sandbox_support_;
>  #endif
>  
>-@@ -298,7 +298,7 @@ class CONTENT_EXPORT RendererBlinkPlatformImpl : publi
>-   blink::mojom::CodeCacheHostPtrInfo code_cache_host_info_;
>-   scoped_refptr<blink::mojom::ThreadSafeCodeCacheHostPtr> code_cache_host_;
>+@@ -245,7 +245,7 @@ class CONTENT_EXPORT RendererBlinkPlatformImpl : publi
>+   mojo::PendingRemote<blink::mojom::CodeCacheHost> code_cache_host_remote_;
>+   mojo::SharedRemote<blink::mojom::CodeCacheHost> code_cache_host_;
>  
> -#if defined(OS_LINUX)
> +#if defined(OS_LINUX) || defined(OS_BSD)
>diff --git a/www/qt5-webengine/files/patch-src_3rdparty_chromium_content_utility_utility__blink__platform__with__sandbox__support__impl.cc b/www/qt5-webengine/files/patch-src_3rdparty_chromium_content_utility_utility__blink__platform__with__sandbox__support__impl.cc
>index 42d80491e7fe..f03e88ba881d 100644
>--- a/www/qt5-webengine/files/patch-src_3rdparty_chromium_content_utility_utility__blink__platform__with__sandbox__support__impl.cc
>+++ b/www/qt5-webengine/files/patch-src_3rdparty_chromium_content_utility_utility__blink__platform__with__sandbox__support__impl.cc
>@@ -1,6 +1,6 @@
>---- src/3rdparty/chromium/content/utility/utility_blink_platform_with_sandbox_support_impl.cc.orig	2019-05-23 12:39:34 UTC
>+--- src/3rdparty/chromium/content/utility/utility_blink_platform_with_sandbox_support_impl.cc.orig	2020-03-16 14:04:24 UTC
> +++ src/3rdparty/chromium/content/utility/utility_blink_platform_with_sandbox_support_impl.cc
>-@@ -8,7 +8,7 @@
>+@@ -9,7 +9,7 @@
>  
>  #if defined(OS_MACOSX)
>  #include "content/child/child_process_sandbox_support_impl_mac.h"
>@@ -10,15 +10,15 @@
>  #endif
>  
> @@ -17,7 +17,7 @@ namespace content {
>+ 
>  UtilityBlinkPlatformWithSandboxSupportImpl::
>-     UtilityBlinkPlatformWithSandboxSupportImpl(
>-         service_manager::Connector* connector) {
>+     UtilityBlinkPlatformWithSandboxSupportImpl() {
> -#if defined(OS_LINUX)
> +#if defined(OS_LINUX) || defined(OS_BSD)
>-   font_loader_ = sk_make_sp<font_service::FontLoader>(connector);
>-   SkFontConfigInterface::SetGlobal(font_loader_);
>-   sandbox_support_ = std::make_unique<WebSandboxSupportLinux>(font_loader_);
>-@@ -31,7 +31,7 @@ UtilityBlinkPlatformWithSandboxSupportImpl::
>+   mojo::PendingRemote<font_service::mojom::FontService> font_service;
>+   UtilityThread::Get()->BindHostReceiver(
>+       font_service.InitWithNewPipeAndPassReceiver());
>+@@ -34,7 +34,7 @@ UtilityBlinkPlatformWithSandboxSupportImpl::
>  
>  blink::WebSandboxSupport*
>  UtilityBlinkPlatformWithSandboxSupportImpl::GetSandboxSupport() {
>diff --git a/www/qt5-webengine/files/patch-src_3rdparty_chromium_device_gamepad_hid__writer__linux.cc b/www/qt5-webengine/files/patch-src_3rdparty_chromium_device_gamepad_hid__writer__linux.cc
>new file mode 100644
>index 000000000000..42ab68374280
>--- /dev/null
>+++ b/www/qt5-webengine/files/patch-src_3rdparty_chromium_device_gamepad_hid__writer__linux.cc
>@@ -0,0 +1,11 @@
>+--- src/3rdparty/chromium/device/gamepad/hid_writer_linux.cc.orig	2020-03-16 14:04:24 UTC
>++++ src/3rdparty/chromium/device/gamepad/hid_writer_linux.cc
>+@@ -4,6 +4,8 @@
>+ 
>+ #include "device/gamepad/hid_writer_linux.h"
>+ 
>++#include <unistd.h>
>++
>+ #include "base/posix/eintr_wrapper.h"
>+ 
>+ namespace device {
>diff --git a/www/qt5-webengine/files/patch-src_3rdparty_chromium_extensions_browser_browser__context__keyed__service__factories.cc b/www/qt5-webengine/files/patch-src_3rdparty_chromium_extensions_browser_browser__context__keyed__service__factories.cc
>index fd64af88ccf4..adc37efe2f1b 100644
>--- a/www/qt5-webengine/files/patch-src_3rdparty_chromium_extensions_browser_browser__context__keyed__service__factories.cc
>+++ b/www/qt5-webengine/files/patch-src_3rdparty_chromium_extensions_browser_browser__context__keyed__service__factories.cc
>@@ -1,9 +1,9 @@
>---- src/3rdparty/chromium/extensions/browser/browser_context_keyed_service_factories.cc.orig	2019-05-23 12:39:34 UTC
>+--- src/3rdparty/chromium/extensions/browser/browser_context_keyed_service_factories.cc.orig	2020-04-08 09:41:36 UTC
> +++ src/3rdparty/chromium/extensions/browser/browser_context_keyed_service_factories.cc
>-@@ -93,7 +93,7 @@ void EnsureBrowserContextKeyedServiceFactoriesBuilt() 
>- #if defined(OS_CHROMEOS)
>-   NetworkingConfigServiceFactory::GetInstance();
>- #endif
>+@@ -81,7 +81,7 @@ void EnsureBrowserContextKeyedServiceFactoriesBuilt() 
>+   IdleManagerFactory::GetInstance();
>+ #endif // !defined(TOOLKIT_QT)
>+   ManagementAPI::GetFactoryInstance();
> -#if defined(OS_LINUX) || defined(OS_WIN) || defined(OS_MACOSX)
> +#if defined(OS_LINUX) || defined(OS_WIN) || defined(OS_MACOSX) || defined(OS_BSD)
>    NetworkingPrivateEventRouterFactory::GetInstance();
>diff --git a/www/qt5-webengine/files/patch-src_3rdparty_chromium_gpu_command__buffer_service_external__vk__image__backing.cc b/www/qt5-webengine/files/patch-src_3rdparty_chromium_gpu_command__buffer_service_external__vk__image__backing.cc
>index 3e9d359ab855..e1216d1f527d 100644
>--- a/www/qt5-webengine/files/patch-src_3rdparty_chromium_gpu_command__buffer_service_external__vk__image__backing.cc
>+++ b/www/qt5-webengine/files/patch-src_3rdparty_chromium_gpu_command__buffer_service_external__vk__image__backing.cc
>@@ -1,6 +1,15 @@
>---- src/3rdparty/chromium/gpu/command_buffer/service/external_vk_image_backing.cc.orig	2019-11-27 21:12:25 UTC
>+--- src/3rdparty/chromium/gpu/command_buffer/service/external_vk_image_backing.cc.orig	2020-04-08 09:41:36 UTC
> +++ src/3rdparty/chromium/gpu/command_buffer/service/external_vk_image_backing.cc
>-@@ -25,7 +25,7 @@
>+@@ -26,7 +26,7 @@
>+ #include "ui/gl/buildflags.h"
>+ #include "ui/gl/gl_context.h"
>+ 
>+-#if defined(OS_LINUX) && BUILDFLAG(USE_DAWN)
>++#if (defined(OS_LINUX) || defined(OS_BSD)) && BUILDFLAG(USE_DAWN)
>+ #include "gpu/command_buffer/service/external_vk_image_dawn_representation.h"
>+ #endif
>+ 
>+@@ -34,7 +34,7 @@
>  #include "gpu/vulkan/fuchsia/vulkan_fuchsia_ext.h"
>  #endif
>  
>@@ -9,21 +18,56 @@
>  #define GL_HANDLE_TYPE_OPAQUE_FD_EXT 0x9586
>  #endif
>  
>-@@ -451,7 +451,7 @@ ExternalVkImageBacking::ProduceGLTexture(SharedImageMa
>- #if defined(OS_FUCHSIA)
>+@@ -537,7 +537,7 @@ std::unique_ptr<SharedImageRepresentationDawn>
>+ ExternalVkImageBacking::ProduceDawn(SharedImageManager* manager,
>+                                     MemoryTypeTracker* tracker,
>+                                     WGPUDevice wgpuDevice) {
>+-#if defined(OS_LINUX) && BUILDFLAG(USE_DAWN)
>++#if (defined(OS_LINUX) || defined(OS_BSD)) && BUILDFLAG(USE_DAWN)
>+   if (!wgpu_format_) {
>+     DLOG(ERROR) << "Format not supported for Dawn";
>+     return nullptr;
>+@@ -560,14 +560,14 @@ ExternalVkImageBacking::ProduceDawn(SharedImageManager
>+   return std::make_unique<ExternalVkImageDawnRepresentation>(
>+       manager, this, tracker, wgpuDevice, wgpu_format_.value(), memory_fd,
>+       image_info.fAlloc.fSize, memory_type_index_.value());
>+-#else  // !defined(OS_LINUX) || !BUILDFLAG(USE_DAWN)
>++#else  // !defined(OS_LINUX) || !defined(OS_BSD) || !BUILDFLAG(USE_DAWN)
>    NOTIMPLEMENTED_LOG_ONCE();
>    return nullptr;
>--#elif defined(OS_LINUX)
>-+#elif defined(OS_LINUX) || defined(OS_BSD)
>+ #endif
>+ }
>+ 
>+ GLuint ExternalVkImageBacking::ProduceGLTextureInternal() {
>+-#if defined(OS_LINUX)
>++#if defined(OS_LINUX) || defined(OS_BSD)
>    GrVkImageInfo image_info;
>    bool result = backend_texture_.getVkImageInfo(&image_info);
>    DCHECK(result);
>-@@ -520,7 +520,7 @@ ExternalVkImageBacking::ProduceGLTexture(SharedImageMa
>+@@ -631,7 +631,7 @@ ExternalVkImageBacking::ProduceGLTexture(SharedImageMa
>+     return nullptr;
>    }
>-   return std::make_unique<ExternalVkImageGlRepresentation>(
>-       manager, this, tracker, texture_, texture_->service_id());
>--#else  // !defined(OS_LINUX) && !defined(OS_FUCHSIA)
>-+#else  // !defined(OS_LINUX) && !defined(OS_FUCHSIA) && !defined(OS_BSD)
>- #error Unsupported OS
>- #endif
>+ 
>+-#if defined(OS_LINUX)
>++#if defined(OS_LINUX) || defined(OS_BSD)
>+   if (!texture_) {
>+     GLuint texture_service_id = ProduceGLTextureInternal();
>+     if (!texture_service_id)
>+@@ -677,7 +677,7 @@ ExternalVkImageBacking::ProduceGLTexturePassthrough(
>+     return nullptr;
>+   }
>+ 
>+-#if defined(OS_LINUX)
>++#if defined(OS_LINUX) || defined(OS_BSD)
>+   if (!texture_passthrough_) {
>+     GLuint texture_service_id = ProduceGLTextureInternal();
>+     if (!texture_service_id)
>+@@ -715,7 +715,7 @@ ExternalVkImageBacking::ProduceSkia(
>+                                                              tracker);
>  }
>+ 
>+-#ifdef OS_LINUX
>++#if defined(OS_LINUX) || defined(OS_BSD)
>+ int ExternalVkImageBacking::GetMemoryFd(const GrVkImageInfo& image_info) {
>+   VkMemoryGetFdInfoKHR get_fd_info;
>+   get_fd_info.sType = VK_STRUCTURE_TYPE_MEMORY_GET_FD_INFO_KHR;
>diff --git a/www/qt5-webengine/files/patch-src_3rdparty_chromium_gpu_command__buffer_service_external__vk__image__backing.h b/www/qt5-webengine/files/patch-src_3rdparty_chromium_gpu_command__buffer_service_external__vk__image__backing.h
>new file mode 100644
>index 000000000000..b6b9518ef816
>--- /dev/null
>+++ b/www/qt5-webengine/files/patch-src_3rdparty_chromium_gpu_command__buffer_service_external__vk__image__backing.h
>@@ -0,0 +1,11 @@
>+--- src/3rdparty/chromium/gpu/command_buffer/service/external_vk_image_backing.h.orig	2020-03-16 14:04:24 UTC
>++++ src/3rdparty/chromium/gpu/command_buffer/service/external_vk_image_backing.h
>+@@ -131,7 +131,7 @@ class ExternalVkImageBacking final : public SharedImag
>+                          base::Optional<DawnTextureFormat> dawn_format,
>+                          base::Optional<uint32_t> memory_type_index);
>+ 
>+-#ifdef OS_LINUX
>++#if defined(OS_LINUX) || defined(OS_BSD)
>+   // Extract file descriptor from image
>+   int GetMemoryFd(const GrVkImageInfo& image_info);
>+ #endif
>diff --git a/www/qt5-webengine/files/patch-src_3rdparty_chromium_gpu_ipc_common_gpu__memory__buffer__support.cc b/www/qt5-webengine/files/patch-src_3rdparty_chromium_gpu_ipc_common_gpu__memory__buffer__support.cc
>index 9d480d9201f9..60189c32c7cc 100644
>--- a/www/qt5-webengine/files/patch-src_3rdparty_chromium_gpu_ipc_common_gpu__memory__buffer__support.cc
>+++ b/www/qt5-webengine/files/patch-src_3rdparty_chromium_gpu_ipc_common_gpu__memory__buffer__support.cc
>@@ -1,4 +1,4 @@
>---- src/3rdparty/chromium/gpu/ipc/common/gpu_memory_buffer_support.cc.orig	2019-11-27 21:12:25 UTC
>+--- src/3rdparty/chromium/gpu/ipc/common/gpu_memory_buffer_support.cc.orig	2020-03-16 14:04:24 UTC
> +++ src/3rdparty/chromium/gpu/ipc/common/gpu_memory_buffer_support.cc
> @@ -12,7 +12,7 @@
>  #include "gpu/ipc/common/gpu_memory_buffer_impl_io_surface.h"
>@@ -18,16 +18,16 @@
>  #include "gpu/ipc/common/gpu_memory_buffer_impl_native_pixmap.h"
>  #endif
>  
>-@@ -111,7 +111,7 @@ bool GpuMemoryBufferSupport::IsNativeGpuMemoryBufferCo
>+@@ -112,7 +112,7 @@ bool GpuMemoryBufferSupport::IsNativeGpuMemoryBufferCo
>  #elif defined(USE_OZONE)
>-   return ui::OzonePlatform::EnsureInstance()->IsNativePixmapConfigSupported(
>-       format, usage);
>+   return ui::OzonePlatform::GetInstance()->IsNativePixmapConfigSupported(format,
>+                                                                          usage);
> -#elif defined(OS_LINUX)
> +#elif defined(OS_LINUX) || defined(OS_BSD)
>    return false;  // TODO(julian.isorce): Add linux support.
>  #elif defined(OS_WIN)
>    switch (usage) {
>-@@ -167,7 +167,7 @@ GpuMemoryBufferSupport::CreateGpuMemoryBufferImplFromH
>+@@ -168,7 +168,7 @@ GpuMemoryBufferSupport::CreateGpuMemoryBufferImplFromH
>        return GpuMemoryBufferImplIOSurface::CreateFromHandle(
>            std::move(handle), size, format, usage, std::move(callback));
>  #endif
>diff --git a/www/qt5-webengine/files/patch-src_3rdparty_chromium_gpu_ipc_service_gpu__init.cc b/www/qt5-webengine/files/patch-src_3rdparty_chromium_gpu_ipc_service_gpu__init.cc
>index 654a2c4eaa9e..b8717ba1964d 100644
>--- a/www/qt5-webengine/files/patch-src_3rdparty_chromium_gpu_ipc_service_gpu__init.cc
>+++ b/www/qt5-webengine/files/patch-src_3rdparty_chromium_gpu_ipc_service_gpu__init.cc
>@@ -1,4 +1,4 @@
>---- src/3rdparty/chromium/gpu/ipc/service/gpu_init.cc.orig	2019-11-27 21:12:25 UTC
>+--- src/3rdparty/chromium/gpu/ipc/service/gpu_init.cc.orig	2020-03-16 14:04:24 UTC
> +++ src/3rdparty/chromium/gpu/ipc/service/gpu_init.cc
> @@ -109,7 +109,7 @@ void InitializePlatformOverlaySettings(GPUInfo* gpu_in
>  #endif
>@@ -16,9 +16,9 @@
> -#endif  // OS_LINUX && !OS_CHROMEOS && !IS_CHROMECAST
> +#endif  // (OS_LINUX && !OS_CHROMEOS && !IS_CHROMECAST) || OS_BSD
>  
>- }  // namespace
>- 
>-@@ -152,7 +152,7 @@ bool GpuInit::InitializeAndStartSandbox(base::CommandL
>+ class GpuWatchdogInit {
>+  public:
>+@@ -165,7 +165,7 @@ bool GpuInit::InitializeAndStartSandbox(base::CommandL
>    // crash during feature collection.
>    gpu::SetKeysForCrashLogging(gpu_info_);
>  
>@@ -27,7 +27,7 @@
>    if (gpu_info_.gpu.vendor_id == 0x10de &&  // NVIDIA
>        gpu_info_.gpu.driver_vendor == "NVIDIA" && !CanAccessNvidiaDeviceFile())
>      return false;
>-@@ -228,7 +228,7 @@ bool GpuInit::InitializeAndStartSandbox(base::CommandL
>+@@ -246,7 +246,7 @@ bool GpuInit::InitializeAndStartSandbox(base::CommandL
>    sandbox_helper_->PreSandboxStartup();
>  
>    bool attempted_startsandbox = false;
>@@ -36,7 +36,7 @@
>    // On Chrome OS ARM Mali, GPU driver userspace creates threads when
>    // initializing a GL context, so start the sandbox early.
>    // TODO(zmo): Need to collect OS version before this.
>-@@ -237,7 +237,7 @@ bool GpuInit::InitializeAndStartSandbox(base::CommandL
>+@@ -255,7 +255,7 @@ bool GpuInit::InitializeAndStartSandbox(base::CommandL
>          watchdog_thread_.get(), &gpu_info_, gpu_preferences_);
>      attempted_startsandbox = true;
>    }
>@@ -45,7 +45,7 @@
>  
>    base::TimeTicks before_initialize_one_off = base::TimeTicks::Now();
>  
>-@@ -284,14 +284,14 @@ bool GpuInit::InitializeAndStartSandbox(base::CommandL
>+@@ -280,14 +280,14 @@ bool GpuInit::InitializeAndStartSandbox(base::CommandL
>    }
>    if (gl_initialized && use_swiftshader &&
>        gl::GetGLImplementation() != gl::kGLImplementationSwiftShaderGL) {
>@@ -62,25 +62,25 @@
>    }
>    if (!gl_initialized)
>      gl_initialized = gl::init::InitializeGLNoExtensionsOneOff();
>-@@ -317,7 +317,7 @@ bool GpuInit::InitializeAndStartSandbox(base::CommandL
>-         command_line, gpu_feature_info_,
>-         gpu_preferences_.disable_software_rasterizer, false);
>-     if (use_swiftshader) {
>+@@ -314,7 +314,7 @@ bool GpuInit::InitializeAndStartSandbox(base::CommandL
>+           command_line, gpu_feature_info_,
>+           gpu_preferences_.disable_software_rasterizer, false);
>+       if (use_swiftshader) {
> -#if defined(OS_LINUX)
> +#if defined(OS_LINUX) || defined(OS_BSD)
>-       VLOG(1) << "Quit GPU process launch to fallback to SwiftShader cleanly "
>-               << "on Linux";
>-       return false;
>-@@ -328,7 +328,7 @@ bool GpuInit::InitializeAndStartSandbox(base::CommandL
>-                 << "failed";
>+         VLOG(1) << "Quit GPU process launch to fallback to SwiftShader cleanly "
>+                 << "on Linux";
>          return false;
>-       }
>+@@ -326,7 +326,7 @@ bool GpuInit::InitializeAndStartSandbox(base::CommandL
>+               << "failed";
>+           return false;
>+         }
> -#endif  // OS_LINUX
> +#endif  // OS_LINUX || OS_BSD
>-     }
>-   }
>- 
>-@@ -357,7 +357,7 @@ bool GpuInit::InitializeAndStartSandbox(base::CommandL
>+       }
>+     } else {  // use_swiftshader == true
>+       switch (gpu_preferences_.use_vulkan) {
>+@@ -413,7 +413,7 @@ bool GpuInit::InitializeAndStartSandbox(base::CommandL
>  
>    InitializePlatformOverlaySettings(&gpu_info_);
>  
>@@ -89,7 +89,7 @@
>    // Driver may create a compatibility profile context when collect graphics
>    // information on Linux platform. Try to collect graphics information
>    // based on core profile context after disabling platform extensions.
>-@@ -376,7 +376,7 @@ bool GpuInit::InitializeAndStartSandbox(base::CommandL
>+@@ -432,7 +432,7 @@ bool GpuInit::InitializeAndStartSandbox(base::CommandL
>        return false;
>      }
>    }
>@@ -98,7 +98,7 @@
>  
>    if (use_swiftshader) {
>      AdjustInfoToSwiftShader();
>-@@ -552,7 +552,7 @@ void GpuInit::InitializeInProcess(base::CommandLine* c
>+@@ -604,7 +604,7 @@ void GpuInit::InitializeInProcess(base::CommandLine* c
>  
>    InitializePlatformOverlaySettings(&gpu_info_);
>  
>@@ -107,7 +107,7 @@
>    // Driver may create a compatibility profile context when collect graphics
>    // information on Linux platform. Try to collect graphics information
>    // based on core profile context after disabling platform extensions.
>-@@ -572,7 +572,7 @@ void GpuInit::InitializeInProcess(base::CommandLine* c
>+@@ -624,7 +624,7 @@ void GpuInit::InitializeInProcess(base::CommandLine* c
>        }
>      }
>    }
>diff --git a/www/qt5-webengine/files/patch-src_3rdparty_chromium_gpu_ipc_service_gpu__watchdog__thread.cc b/www/qt5-webengine/files/patch-src_3rdparty_chromium_gpu_ipc_service_gpu__watchdog__thread.cc
>index d70f4c7fcd62..ad955d10cfb0 100644
>--- a/www/qt5-webengine/files/patch-src_3rdparty_chromium_gpu_ipc_service_gpu__watchdog__thread.cc
>+++ b/www/qt5-webengine/files/patch-src_3rdparty_chromium_gpu_ipc_service_gpu__watchdog__thread.cc
>@@ -1,52 +1,42 @@
>---- src/3rdparty/chromium/gpu/ipc/service/gpu_watchdog_thread.cc.orig	2019-11-27 21:12:25 UTC
>+--- src/3rdparty/chromium/gpu/ipc/service/gpu_watchdog_thread.cc.orig	2020-03-16 14:04:24 UTC
> +++ src/3rdparty/chromium/gpu/ipc/service/gpu_watchdog_thread.cc
>-@@ -45,8 +45,10 @@ const int kGpuTimeout = 10000;
>+@@ -40,7 +40,7 @@ const int kGpuTimeout = 15000;
>+ const int kGpuTimeout = 10000;
>  #endif
>  
>- #if defined(USE_X11)
>-+#if !defined(OS_BSD)
>+-#if defined(USE_X11)
>++#if defined(USE_X11) && !defined(OS_BSD)
>  const base::FilePath::CharType kTtyFilePath[] =
>      FILE_PATH_LITERAL("/sys/class/tty/tty0/active");
>-+#endif
>- const unsigned char text[20] = "check";
>  #endif
>- 
>-@@ -68,9 +70,12 @@ GpuWatchdogThreadImplV1::GpuWatchdogThreadImplV1()
>+@@ -59,7 +59,7 @@ GpuWatchdogThreadImplV1::GpuWatchdogThreadImplV1()
>+       arm_cpu_time_(),
>+ #endif
>+       suspension_counter_(this)
>+-#if defined(USE_X11)
>++#if defined(USE_X11) && !defined(OS_BSD)
>        ,
>-       display_(nullptr),
>-       window_(0),
>--      atom_(x11::None),
>-+      atom_(x11::None)
>-+#if !defined(OS_BSD)
>-+      ,
>        host_tty_(-1)
>  #endif
>-+#endif
>- {
>-   base::subtle::NoBarrier_Store(&awaiting_acknowledge_, false);
>- 
>-@@ -85,7 +90,9 @@ GpuWatchdogThreadImplV1::GpuWatchdogThreadImplV1()
>+@@ -76,7 +76,7 @@ GpuWatchdogThreadImplV1::GpuWatchdogThreadImplV1()
>+   DCHECK(result);
>  #endif
>  
>- #if defined(USE_X11)
>-+#if !defined(OS_BSD)
>+-#if defined(USE_X11)
>++#if defined(USE_X11) && !defined(OS_BSD)
>    tty_file_ = base::OpenFile(base::FilePath(kTtyFilePath), "r");
>-+#endif
>-   SetupXServer();
>+   host_tty_ = GetActiveTTY();
>  #endif
>-   base::MessageLoopCurrent::Get()->AddTaskObserver(&task_observer_);
>-@@ -230,8 +237,10 @@ GpuWatchdogThreadImplV1::~GpuWatchdogThreadImplV1() {
>+@@ -222,7 +222,7 @@ GpuWatchdogThreadImplV1::~GpuWatchdogThreadImplV1() {
>+ 
>    base::PowerMonitor::RemoveObserver(this);
>  
>- #if defined(USE_X11)
>-+#if !defined(OS_BSD)
>+-#if defined(USE_X11)
>++#if defined(USE_X11) && !defined(OS_BSD)
>    if (tty_file_)
>      fclose(tty_file_);
>-+#endif
>-   if (display_) {
>-     DCHECK(window_);
>-     XDestroyWindow(display_, window_);
>-@@ -431,7 +440,7 @@ void GpuWatchdogThreadImplV1::DeliberatelyTerminateToR
>+ #endif
>+@@ -371,7 +371,7 @@ void GpuWatchdogThreadImplV1::DeliberatelyTerminateToR
>      return;
>  #endif
>  
>@@ -55,17 +45,7 @@
>    // Don't crash if we're not on the TTY of our host X11 server.
>    int active_tty = GetActiveTTY();
>    if (host_tty_ != -1 && active_tty != -1 && host_tty_ != active_tty) {
>-@@ -515,7 +524,9 @@ void GpuWatchdogThreadImplV1::SetupXServer() {
>-                       CopyFromParent, InputOutput, CopyFromParent, 0, nullptr);
>-     atom_ = XInternAtom(display_, "CHECK", x11::False);
>-   }
>-+#if !defined(OS_BSD)
>-   host_tty_ = GetActiveTTY();
>-+#endif
>- }
>- 
>- void GpuWatchdogThreadImplV1::SetupXChangeProp() {
>-@@ -615,7 +626,7 @@ base::ThreadTicks GpuWatchdogThreadImplV1::GetWatchedT
>+@@ -528,7 +528,7 @@ base::ThreadTicks GpuWatchdogThreadImplV1::GetWatchedT
>  }
>  #endif
>  
>diff --git a/www/qt5-webengine/files/patch-src_3rdparty_chromium_gpu_ipc_service_gpu__watchdog__thread.h b/www/qt5-webengine/files/patch-src_3rdparty_chromium_gpu_ipc_service_gpu__watchdog__thread.h
>index 769dc7f8e6c7..c9eeb17b8bf9 100644
>--- a/www/qt5-webengine/files/patch-src_3rdparty_chromium_gpu_ipc_service_gpu__watchdog__thread.h
>+++ b/www/qt5-webengine/files/patch-src_3rdparty_chromium_gpu_ipc_service_gpu__watchdog__thread.h
>@@ -1,13 +1,20 @@
>---- src/3rdparty/chromium/gpu/ipc/service/gpu_watchdog_thread.h.orig	2019-05-23 12:39:34 UTC
>+--- src/3rdparty/chromium/gpu/ipc/service/gpu_watchdog_thread.h.orig	2020-03-16 14:04:24 UTC
> +++ src/3rdparty/chromium/gpu/ipc/service/gpu_watchdog_thread.h
>-@@ -191,8 +191,10 @@ class GPU_IPC_SERVICE_EXPORT GpuWatchdogThread : publi
>-   XDisplay* display_;
>-   gfx::AcceleratedWidget window_;
>-   XAtom atom_;
>-+#if !defined(OS_BSD)
>+@@ -171,7 +171,7 @@ class GPU_IPC_SERVICE_EXPORT GpuWatchdogThreadImplV1
>+   base::ThreadTicks GetWatchedThreadTime();
>+ #endif
>+ 
>+-#if defined(USE_X11)
>++#if defined(USE_X11) && !defined(OS_BSD)
>+   int GetActiveTTY() const;
>+ #endif
>+ 
>+@@ -219,7 +219,7 @@ class GPU_IPC_SERVICE_EXPORT GpuWatchdogThreadImplV1
>+   base::Time check_time_;
>+   base::TimeTicks check_timeticks_;
>+ 
>+-#if defined(USE_X11)
>++#if defined(USE_X11) && !defined(OS_BSD)
>    FILE* tty_file_;
>    int host_tty_;
>-+#endif
>  #endif
>- 
>-   base::RepeatingClosure alternative_terminate_for_testing_;
>diff --git a/www/qt5-webengine/files/patch-src_3rdparty_chromium_gpu_vulkan_vulkan__function__pointers.h b/www/qt5-webengine/files/patch-src_3rdparty_chromium_gpu_vulkan_vulkan__function__pointers.h
>index 7018ac682d2a..67051efb3abe 100644
>--- a/www/qt5-webengine/files/patch-src_3rdparty_chromium_gpu_vulkan_vulkan__function__pointers.h
>+++ b/www/qt5-webengine/files/patch-src_3rdparty_chromium_gpu_vulkan_vulkan__function__pointers.h
>@@ -1,6 +1,6 @@
>---- src/3rdparty/chromium/gpu/vulkan/vulkan_function_pointers.h.orig	2019-11-27 21:12:25 UTC
>+--- src/3rdparty/chromium/gpu/vulkan/vulkan_function_pointers.h.orig	2020-03-16 14:04:24 UTC
> +++ src/3rdparty/chromium/gpu/vulkan/vulkan_function_pointers.h
>-@@ -161,14 +161,14 @@ struct VulkanFunctionPointers {
>+@@ -178,15 +178,15 @@ struct VulkanFunctionPointers {
>        vkGetAndroidHardwareBufferPropertiesANDROIDFn = nullptr;
>  #endif  // defined(OS_ANDROID)
>  
>@@ -14,12 +14,13 @@
> -#if defined(OS_LINUX)
> +#if defined(OS_LINUX) || defined(OS_BSD)
>    PFN_vkGetMemoryFdKHR vkGetMemoryFdKHRFn = nullptr;
>+   PFN_vkGetMemoryFdPropertiesKHR vkGetMemoryFdPropertiesKHRFn = nullptr;
> -#endif  // defined(OS_LINUX)
> +#endif  // defined(OS_LINUX) || defined(OS_BSD)
>  
>  #if defined(OS_FUCHSIA)
>    PFN_vkImportSemaphoreZirconHandleFUCHSIA
>-@@ -342,16 +342,16 @@ struct VulkanFunctionPointers {
>+@@ -374,18 +374,18 @@ struct VulkanFunctionPointers {
>        ->vkGetAndroidHardwareBufferPropertiesANDROIDFn
>  #endif  // defined(OS_ANDROID)
>  
>@@ -35,6 +36,8 @@
> -#if defined(OS_LINUX)
> +#if defined(OS_LINUX) || defined(OS_BSD)
>  #define vkGetMemoryFdKHR gpu::GetVulkanFunctionPointers()->vkGetMemoryFdKHRFn
>+ #define vkGetMemoryFdPropertiesKHR \
>+   gpu::GetVulkanFunctionPointers()->vkGetMemoryFdPropertiesKHRFn
> -#endif  // defined(OS_LINUX)
> +#endif  // defined(OS_LINUX) || defined(OS_BSD)
>  
>diff --git a/www/qt5-webengine/files/patch-src_3rdparty_chromium_media_base_video__frame.cc b/www/qt5-webengine/files/patch-src_3rdparty_chromium_media_base_video__frame.cc
>index a3c666cca659..1852a3b25f3a 100644
>--- a/www/qt5-webengine/files/patch-src_3rdparty_chromium_media_base_video__frame.cc
>+++ b/www/qt5-webengine/files/patch-src_3rdparty_chromium_media_base_video__frame.cc
>@@ -1,6 +1,6 @@
>---- src/3rdparty/chromium/media/base/video_frame.cc.orig	2019-11-27 21:12:25 UTC
>+--- src/3rdparty/chromium/media/base/video_frame.cc.orig	2020-03-16 14:04:24 UTC
> +++ src/3rdparty/chromium/media/base/video_frame.cc
>-@@ -52,7 +52,7 @@ static std::string StorageTypeToString(
>+@@ -57,7 +57,7 @@ std::string VideoFrame::StorageTypeToString(
>        return "OWNED_MEMORY";
>      case VideoFrame::STORAGE_SHMEM:
>        return "SHMEM";
>@@ -9,7 +9,7 @@
>      case VideoFrame::STORAGE_DMABUFS:
>        return "DMABUFS";
>  #endif
>-@@ -67,7 +67,7 @@ static std::string StorageTypeToString(
>+@@ -74,7 +74,7 @@ std::string VideoFrame::StorageTypeToString(
>  // static
>  bool VideoFrame::IsStorageTypeMappable(VideoFrame::StorageType storage_type) {
>    return
>@@ -18,7 +18,7 @@
>        // This is not strictly needed but makes explicit that, at VideoFrame
>        // level, DmaBufs are not mappable from userspace.
>        storage_type != VideoFrame::STORAGE_DMABUFS &&
>-@@ -186,7 +186,7 @@ static base::Optional<VideoFrameLayout> GetDefaultLayo
>+@@ -257,7 +257,7 @@ static base::Optional<VideoFrameLayout> GetDefaultLayo
>    return VideoFrameLayout::CreateWithPlanes(format, coded_size, planes);
>  }
>  
>@@ -27,7 +27,7 @@
>  // This class allows us to embed a vector<ScopedFD> into a scoped_refptr, and
>  // thus to have several VideoFrames share the same set of DMABUF FDs.
>  class VideoFrame::DmabufHolder
>-@@ -204,7 +204,7 @@ class VideoFrame::DmabufHolder
>+@@ -275,7 +275,7 @@ class VideoFrame::DmabufHolder
>    friend class base::RefCountedThreadSafe<DmabufHolder>;
>    ~DmabufHolder() = default;
>  };
>@@ -36,7 +36,7 @@
>  
>  // static
>  bool VideoFrame::IsValidConfig(VideoPixelFormat format,
>-@@ -510,7 +510,7 @@ scoped_refptr<VideoFrame> VideoFrame::WrapExternalYuva
>+@@ -588,7 +588,7 @@ scoped_refptr<VideoFrame> VideoFrame::WrapExternalGpuM
>    return frame;
>  }
>  
>@@ -45,17 +45,17 @@
>  // static
>  scoped_refptr<VideoFrame> VideoFrame::WrapExternalDmabufs(
>      const VideoFrameLayout& layout,
>-@@ -642,7 +642,7 @@ scoped_refptr<VideoFrame> VideoFrame::WrapVideoFrame(
>+@@ -724,7 +724,7 @@ scoped_refptr<VideoFrame> VideoFrame::WrapVideoFrame(
>      }
>    }
>  
> -#if defined(OS_LINUX)
> +#if defined(OS_LINUX) || defined(OS_BSD)
>-   DCHECK(frame.dmabuf_fds_);
>+   DCHECK(frame->dmabuf_fds_);
>    // If there are any |dmabuf_fds_| plugged in, we should refer them too.
>-   wrapping_frame->dmabuf_fds_ = frame.dmabuf_fds_;
>-@@ -960,7 +960,7 @@ size_t VideoFrame::shared_memory_offset() const {
>-   return shared_memory_offset_;
>+   wrapping_frame->dmabuf_fds_ = frame->dmabuf_fds_;
>+@@ -1050,7 +1050,7 @@ VideoFrame::mailbox_holder(size_t texture_index) const
>+                         : mailbox_holders_[texture_index];
>  }
>  
> -#if defined(OS_LINUX)
>@@ -63,10 +63,10 @@
>  const std::vector<base::ScopedFD>& VideoFrame::DmabufFds() const {
>    DCHECK_EQ(storage_type_, STORAGE_DMABUFS);
>  
>-@@ -1112,7 +1112,7 @@ VideoFrame::VideoFrame(const VideoFrameLayout& layout,
>+@@ -1133,7 +1133,7 @@ VideoFrame::VideoFrame(const VideoFrameLayout& layout,
>+       storage_type_(storage_type),
>        visible_rect_(Intersection(visible_rect, gfx::Rect(layout.coded_size()))),
>        natural_size_(natural_size),
>-       shared_memory_offset_(0),
> -#if defined(OS_LINUX)
> +#if defined(OS_LINUX) || defined(OS_BSD)
>        dmabuf_fds_(base::MakeRefCounted<DmabufHolder>()),
>diff --git a/www/qt5-webengine/files/patch-src_3rdparty_chromium_media_base_video__frame.h b/www/qt5-webengine/files/patch-src_3rdparty_chromium_media_base_video__frame.h
>index 3ec6e468dc62..1250f8a74c1d 100644
>--- a/www/qt5-webengine/files/patch-src_3rdparty_chromium_media_base_video__frame.h
>+++ b/www/qt5-webengine/files/patch-src_3rdparty_chromium_media_base_video__frame.h
>@@ -1,6 +1,6 @@
>---- src/3rdparty/chromium/media/base/video_frame.h.orig	2019-11-27 21:12:25 UTC
>+--- src/3rdparty/chromium/media/base/video_frame.h.orig	2020-03-16 14:04:24 UTC
> +++ src/3rdparty/chromium/media/base/video_frame.h
>-@@ -42,9 +42,9 @@
>+@@ -39,9 +39,9 @@
>  #include "base/mac/scoped_cftyperef.h"
>  #endif  // defined(OS_MACOSX)
>  
>@@ -10,19 +10,19 @@
> -#endif  // defined(OS_LINUX)
> +#endif  // defined(OS_LINUX) || defined(OS_BSD)
>  
>- namespace media {
>- 
>-@@ -79,7 +79,7 @@ class MEDIA_EXPORT VideoFrame : public base::RefCounte
>+ namespace gfx {
>+ class GpuMemoryBuffer;
>+@@ -80,7 +80,7 @@ class MEDIA_EXPORT VideoFrame : public base::RefCounte
>      STORAGE_UNOWNED_MEMORY = 2,  // External, non owned data pointers.
>      STORAGE_OWNED_MEMORY = 3,  // VideoFrame has allocated its own data buffer.
>-     STORAGE_SHMEM = 4,         // Pixels are backed by Shared Memory.
>+     STORAGE_SHMEM = 4,         // Backed by unsafe (writable) shared memory.
> -#if defined(OS_LINUX)
> +#if defined(OS_LINUX) || defined(OS_BSD)
>      // TODO(mcasas): Consider turning this type into STORAGE_NATIVE
>      // based on the idea of using this same enum value for both DMA
>      // buffers on Linux and CVPixelBuffers on Mac (which currently use
>-@@ -273,7 +273,7 @@ class MEDIA_EXPORT VideoFrame : public base::RefCounte
>-       uint8_t* a_data,
>+@@ -245,7 +245,7 @@ class MEDIA_EXPORT VideoFrame : public base::RefCounte
>+       ReleaseMailboxCB mailbox_holder_release_cb,
>        base::TimeDelta timestamp);
>  
> -#if defined(OS_LINUX)
>@@ -30,18 +30,18 @@
>    // Wraps provided dmabufs
>    // (https://www.kernel.org/doc/html/latest/driver-api/dma-buf.html) with a
>    // VideoFrame. The frame will take ownership of |dmabuf_fds|, and will
>-@@ -469,7 +469,7 @@ class MEDIA_EXPORT VideoFrame : public base::RefCounte
>-   // Returns the offset into the shared memory where the frame data begins.
>-   size_t shared_memory_offset() const;
>+@@ -476,7 +476,7 @@ class MEDIA_EXPORT VideoFrame : public base::RefCounte
>+   // mailbox, the caller must wait for the included sync point.
>+   const gpu::MailboxHolder& mailbox_holder(size_t texture_index) const;
>  
> -#if defined(OS_LINUX)
> +#if defined(OS_LINUX) || defined(OS_BSD)
>    // Returns a vector containing the backing DmaBufs for this frame. The number
>    // of returned DmaBufs will be equal or less than the number of planes of
>    // the frame. If there are less, this means that the last FD contains the
>-@@ -672,7 +672,7 @@ class MEDIA_EXPORT VideoFrame : public base::RefCounte
>-   // memory.
>-   size_t shared_memory_offset_;
>+@@ -662,7 +662,7 @@ class MEDIA_EXPORT VideoFrame : public base::RefCounte
>+   // GPU memory buffer, if this frame is STORAGE_GPU_MEMORY_BUFFER.
>+   std::unique_ptr<gfx::GpuMemoryBuffer> gpu_memory_buffer_;
>  
> -#if defined(OS_LINUX)
> +#if defined(OS_LINUX) || defined(OS_BSD)
>diff --git a/www/qt5-webengine/files/patch-src_3rdparty_chromium_media_capture_video_linux_video__capture__device__factory__linux.cc b/www/qt5-webengine/files/patch-src_3rdparty_chromium_media_capture_video_linux_video__capture__device__factory__linux.cc
>index 4e32bacd9fd9..40829d866458 100644
>--- a/www/qt5-webengine/files/patch-src_3rdparty_chromium_media_capture_video_linux_video__capture__device__factory__linux.cc
>+++ b/www/qt5-webengine/files/patch-src_3rdparty_chromium_media_capture_video_linux_video__capture__device__factory__linux.cc
>@@ -1,4 +1,4 @@
>---- src/3rdparty/chromium/media/capture/video/linux/video_capture_device_factory_linux.cc.orig	2019-11-27 21:12:25 UTC
>+--- src/3rdparty/chromium/media/capture/video/linux/video_capture_device_factory_linux.cc.orig	2020-04-08 09:41:36 UTC
> +++ src/3rdparty/chromium/media/capture/video/linux/video_capture_device_factory_linux.cc
> @@ -315,6 +315,7 @@ void VideoCaptureDeviceFactoryLinux::GetSupportedForma
>      supported_format.pixel_format =
>diff --git a/www/qt5-webengine/files/patch-src_3rdparty_chromium_media_capture_video_linux_video__capture__device__linux.cc b/www/qt5-webengine/files/patch-src_3rdparty_chromium_media_capture_video_linux_video__capture__device__linux.cc
>index eab705865f45..a6ecfe020c9c 100644
>--- a/www/qt5-webengine/files/patch-src_3rdparty_chromium_media_capture_video_linux_video__capture__device__linux.cc
>+++ b/www/qt5-webengine/files/patch-src_3rdparty_chromium_media_capture_video_linux_video__capture__device__linux.cc
>@@ -1,4 +1,4 @@
>---- src/3rdparty/chromium/media/capture/video/linux/video_capture_device_linux.cc.orig	2019-11-27 21:12:25 UTC
>+--- src/3rdparty/chromium/media/capture/video/linux/video_capture_device_linux.cc.orig	2020-04-08 09:41:36 UTC
> +++ src/3rdparty/chromium/media/capture/video/linux/video_capture_device_linux.cc
> @@ -17,8 +17,10 @@
>  #include <sys/videoio.h>
>diff --git a/www/qt5-webengine/files/patch-src_3rdparty_chromium_media_capture_video_mock__gpu__memory__buffer__manager.cc b/www/qt5-webengine/files/patch-src_3rdparty_chromium_media_capture_video_mock__gpu__memory__buffer__manager.cc
>deleted file mode 100644
>index 92d2bfa1bb8f..000000000000
>--- a/www/qt5-webengine/files/patch-src_3rdparty_chromium_media_capture_video_mock__gpu__memory__buffer__manager.cc
>+++ /dev/null
>@@ -1,11 +0,0 @@
>---- src/3rdparty/chromium/media/capture/video/mock_gpu_memory_buffer_manager.cc.orig	2019-05-23 12:39:34 UTC
>-+++ src/3rdparty/chromium/media/capture/video/mock_gpu_memory_buffer_manager.cc
>-@@ -103,7 +103,7 @@ class FakeGpuMemoryBuffer : public gfx::GpuMemoryBuffe
>-     gfx::GpuMemoryBufferHandle handle;
>-     handle.type = gfx::NATIVE_PIXMAP;
>-     handle.id = handle_.id;
>--#if defined(OS_LINUX)
>-+#if defined(OS_LINUX) || defined(OS_BSD)
>-     handle.native_pixmap_handle =
>-         gfx::CloneHandleForIPC(handle_.native_pixmap_handle);
>- #endif
>diff --git a/www/qt5-webengine/files/patch-src_3rdparty_chromium_media_capture_video_shared__memory__handle__provider.cc b/www/qt5-webengine/files/patch-src_3rdparty_chromium_media_capture_video_shared__memory__handle__provider.cc
>deleted file mode 100644
>index a17f0b87ce6a..000000000000
>--- a/www/qt5-webengine/files/patch-src_3rdparty_chromium_media_capture_video_shared__memory__handle__provider.cc
>+++ /dev/null
>@@ -1,11 +0,0 @@
>---- src/3rdparty/chromium/media/capture/video/shared_memory_handle_provider.cc.orig	2019-03-07 09:23:57 UTC
>-+++ src/3rdparty/chromium/media/capture/video/shared_memory_handle_provider.cc
>-@@ -63,7 +63,7 @@ bool SharedMemoryHandleProvider::InitFromMojoHandle(
>-   return true;
>- }
>- 
>--#if defined(OS_LINUX)
>-+#if defined(OS_LINUX) || defined(OS_BSD)
>- bool SharedMemoryHandleProvider::InitAsReadOnlyFromRawFileDescriptor(
>-     mojo::ScopedHandle fd_handle,
>-     uint32_t memory_size_in_bytes) {
>diff --git a/www/qt5-webengine/files/patch-src_3rdparty_chromium_media_capture_video_shared__memory__handle__provider.h b/www/qt5-webengine/files/patch-src_3rdparty_chromium_media_capture_video_shared__memory__handle__provider.h
>deleted file mode 100644
>index 7ccc971368ef..000000000000
>--- a/www/qt5-webengine/files/patch-src_3rdparty_chromium_media_capture_video_shared__memory__handle__provider.h
>+++ /dev/null
>@@ -1,11 +0,0 @@
>---- src/3rdparty/chromium/media/capture/video/shared_memory_handle_provider.h.orig	2019-03-07 09:23:57 UTC
>-+++ src/3rdparty/chromium/media/capture/video/shared_memory_handle_provider.h
>-@@ -38,7 +38,7 @@ class CAPTURE_EXPORT SharedMemoryHandleProvider
>- 
>- // This requires platforms where base::SharedMemoryHandle is backed by a
>- // file descriptor.
>--#if defined(OS_LINUX)
>-+#if defined(OS_LINUX) || defined(OS_BSD)
>-   bool InitAsReadOnlyFromRawFileDescriptor(mojo::ScopedHandle fd_handle,
>-                                            uint32_t memory_size_in_bytes);
>- #endif  // defined(OS_LINUX)
>diff --git a/www/qt5-webengine/files/patch-src_3rdparty_chromium_media_gpu_buffer__validation.cc b/www/qt5-webengine/files/patch-src_3rdparty_chromium_media_gpu_buffer__validation.cc
>new file mode 100644
>index 000000000000..bacd13f50584
>--- /dev/null
>+++ b/www/qt5-webengine/files/patch-src_3rdparty_chromium_media_gpu_buffer__validation.cc
>@@ -0,0 +1,48 @@
>+--- src/3rdparty/chromium/media/gpu/buffer_validation.cc.orig	2020-03-16 14:04:24 UTC
>++++ src/3rdparty/chromium/media/gpu/buffer_validation.cc
>+@@ -12,15 +12,15 @@
>+ #include "ui/gfx/geometry/size.h"
>+ #include "ui/gfx/gpu_memory_buffer.h"
>+ 
>+-#if defined(OS_LINUX)
>++#if defined(OS_LINUX) || defined(OS_BSD)
>+ #include <sys/types.h>
>+ #include <unistd.h>
>+-#endif  // defined(OS_LINUX)
>++#endif  // defined(OS_LINUX) || defined(OS_BSD)
>+ 
>+ namespace media {
>+ 
>+ bool GetFileSize(const int fd, size_t* size) {
>+-#if defined(OS_LINUX)
>++#if defined(OS_LINUX) || defined(OS_BSD)
>+   if (fd < 0) {
>+     VLOGF(1) << "Invalid file descriptor";
>+     return false;
>+@@ -46,7 +46,7 @@ bool GetFileSize(const int fd, size_t* size) {
>+ #else
>+   NOTIMPLEMENTED();
>+   return false;
>+-#endif  // defined(OS_LINUX)
>++#endif  // defined(OS_LINUX) || defined(OS_BSD)
>+ }
>+ 
>+ bool VerifyGpuMemoryBufferHandle(media::VideoPixelFormat pixel_format,
>+@@ -56,7 +56,7 @@ bool VerifyGpuMemoryBufferHandle(media::VideoPixelForm
>+     VLOGF(1) << "Unexpected GpuMemoryBufferType: " << gmb_handle.type;
>+     return false;
>+   }
>+-#if defined(OS_LINUX)
>++#if defined(OS_LINUX) || defined(OS_BSD)
>+   const size_t num_planes = media::VideoFrame::NumPlanes(pixel_format);
>+   if (num_planes != gmb_handle.native_pixmap_handle.planes.size() ||
>+       num_planes == 0) {
>+@@ -108,7 +108,7 @@ bool VerifyGpuMemoryBufferHandle(media::VideoPixelForm
>+ #else
>+   NOTIMPLEMENTED();
>+   return false;
>+-#endif  // defined(OS_LINUX)
>++#endif  // defined(OS_LINUX) || defined(OS_BSD)
>+ }
>+ 
>+ }  // namespace media
>diff --git a/www/qt5-webengine/files/patch-src_3rdparty_chromium_media_gpu_libyuv__image__processor.cc b/www/qt5-webengine/files/patch-src_3rdparty_chromium_media_gpu_chromeos_libyuv__image__processor.cc
>similarity index 70%
>rename from www/qt5-webengine/files/patch-src_3rdparty_chromium_media_gpu_libyuv__image__processor.cc
>rename to www/qt5-webengine/files/patch-src_3rdparty_chromium_media_gpu_chromeos_libyuv__image__processor.cc
>index 0f66833092f1..568b96912d2b 100644
>--- a/www/qt5-webengine/files/patch-src_3rdparty_chromium_media_gpu_libyuv__image__processor.cc
>+++ b/www/qt5-webengine/files/patch-src_3rdparty_chromium_media_gpu_chromeos_libyuv__image__processor.cc
>@@ -1,6 +1,6 @@
>---- src/3rdparty/chromium/media/gpu/libyuv_image_processor.cc.orig	2019-11-27 21:12:25 UTC
>-+++ src/3rdparty/chromium/media/gpu/libyuv_image_processor.cc
>-@@ -91,7 +91,7 @@ std::unique_ptr<LibYUVImageProcessor> LibYUVImageProce
>+--- src/3rdparty/chromium/media/gpu/chromeos/libyuv_image_processor.cc.orig	2020-04-08 09:41:36 UTC
>++++ src/3rdparty/chromium/media/gpu/chromeos/libyuv_image_processor.cc
>+@@ -82,7 +82,7 @@ std::unique_ptr<LibYUVImageProcessor> LibYUVImageProce
>    // LibYUVImageProcessor supports only memory-based video frame for input.
>    VideoFrame::StorageType input_storage_type = VideoFrame::STORAGE_UNKNOWN;
>    for (auto input_type : input_config.preferred_storage_types) {
>@@ -8,8 +8,8 @@
> +#if defined(OS_LINUX) || defined(OS_BSD)
>      if (input_type == VideoFrame::STORAGE_DMABUFS) {
>        video_frame_mapper = VideoFrameMapperFactory::CreateMapper(
>-           input_config.layout.format(), true);
>-@@ -100,7 +100,7 @@ std::unique_ptr<LibYUVImageProcessor> LibYUVImageProce
>+           input_config.fourcc.ToVideoPixelFormat(), VideoFrame::STORAGE_DMABUFS,
>+@@ -92,7 +92,7 @@ std::unique_ptr<LibYUVImageProcessor> LibYUVImageProce
>          break;
>        }
>      }
>@@ -18,7 +18,7 @@
>  
>      if (VideoFrame::IsStorageTypeMappable(input_type)) {
>        input_storage_type = input_type;
>-@@ -203,7 +203,7 @@ void LibYUVImageProcessor::ProcessTask(scoped_refptr<V
>+@@ -191,7 +191,7 @@ void LibYUVImageProcessor::ProcessTask(scoped_refptr<V
>                                         FrameReadyCB cb) {
>    DCHECK(process_thread_.task_runner()->BelongsToCurrentThread());
>    DVLOGF(4);
>@@ -27,7 +27,7 @@
>    if (input_frame->storage_type() == VideoFrame::STORAGE_DMABUFS) {
>      DCHECK_NE(video_frame_mapper_.get(), nullptr);
>      input_frame = video_frame_mapper_->Map(std::move(input_frame));
>-@@ -213,7 +213,7 @@ void LibYUVImageProcessor::ProcessTask(scoped_refptr<V
>+@@ -201,7 +201,7 @@ void LibYUVImageProcessor::ProcessTask(scoped_refptr<V
>        return;
>      }
>    }
>diff --git a/www/qt5-webengine/files/patch-src_3rdparty_chromium_media_gpu_linux_platform__video__frame__utils.cc b/www/qt5-webengine/files/patch-src_3rdparty_chromium_media_gpu_linux_platform__video__frame__utils.cc
>index a75d181da367..85144b81ab47 100644
>--- a/www/qt5-webengine/files/patch-src_3rdparty_chromium_media_gpu_linux_platform__video__frame__utils.cc
>+++ b/www/qt5-webengine/files/patch-src_3rdparty_chromium_media_gpu_linux_platform__video__frame__utils.cc
>@@ -1,20 +1,45 @@
>---- src/3rdparty/chromium/media/gpu/linux/platform_video_frame_utils.cc.orig	2019-11-27 21:12:25 UTC
>+--- src/3rdparty/chromium/media/gpu/linux/platform_video_frame_utils.cc.orig	2020-03-16 14:04:24 UTC
> +++ src/3rdparty/chromium/media/gpu/linux/platform_video_frame_utils.cc
>-@@ -121,7 +121,7 @@ gfx::GpuMemoryBufferHandle CreateGpuMemoryBufferHandle
>-   DCHECK(video_frame);
>+@@ -19,16 +19,16 @@
>+ #include "ui/gfx/linux/native_pixmap_dmabuf.h"
>+ #include "ui/gfx/native_pixmap.h"
>  
>-   gfx::GpuMemoryBufferHandle handle;
> -#if defined(OS_LINUX)
> +#if defined(OS_LINUX) || defined(OS_BSD)
>-   handle.type = gfx::NATIVE_PIXMAP;
>- 
>-   std::vector<base::ScopedFD> duped_fds =
>-@@ -136,7 +136,7 @@ gfx::GpuMemoryBufferHandle CreateGpuMemoryBufferHandle
>-   }
>- #else
>-   NOTREACHED();
>+ #include "gpu/ipc/common/gpu_client_ids.h"
>+ #include "gpu/ipc/service/gpu_memory_buffer_factory.h"
> -#endif  // defined(OS_LINUX)
> +#endif  // defined(OS_LINUX) || defined(OS_BSD)
>-   return handle;
>+ 
>+ namespace media {
>+ 
>+ namespace {
>+ 
>+-#if defined(OS_LINUX)
>++#if defined(OS_LINUX) || defined(OS_BSD)
>+ 
>+ scoped_refptr<VideoFrame> CreateVideoFrameGpu(
>+     gpu::GpuMemoryBufferFactory* factory,
>+@@ -92,7 +92,7 @@ scoped_refptr<VideoFrame> CreateVideoFrameGpu(
>+                      gpu::kPlatformVideoFramePoolClientId));
>+   return frame;
>  }
>+-#endif  // defined(OS_LINUX)
>++#endif  // defined(OS_LINUX) || defined(OS_BSD)
>+ 
>+ }  // namespace
>  
>+@@ -104,11 +104,11 @@ scoped_refptr<VideoFrame> CreatePlatformVideoFrame(
>+     const gfx::Size& natural_size,
>+     base::TimeDelta timestamp,
>+     gfx::BufferUsage buffer_usage) {
>+-#if defined(OS_LINUX)
>++#if defined(OS_LINUX) || defined(OS_BSD)
>+   return CreateVideoFrameGpu(gpu_memory_buffer_factory, pixel_format,
>+                              coded_size, visible_rect, natural_size, timestamp,
>+                              buffer_usage);
>+-#endif  // defined(OS_LINUX)
>++#endif  // defined(OS_LINUX) || defined(OS_BSD)
>+   NOTREACHED();
>+   return nullptr;
>+ }
>diff --git a/www/qt5-webengine/files/patch-src_3rdparty_chromium_media_mojo_clients_mojo__video__encode__accelerator.cc b/www/qt5-webengine/files/patch-src_3rdparty_chromium_media_mojo_clients_mojo__video__encode__accelerator.cc
>index 19e66c2c15fe..f44565e54196 100644
>--- a/www/qt5-webengine/files/patch-src_3rdparty_chromium_media_mojo_clients_mojo__video__encode__accelerator.cc
>+++ b/www/qt5-webengine/files/patch-src_3rdparty_chromium_media_mojo_clients_mojo__video__encode__accelerator.cc
>@@ -1,4 +1,4 @@
>---- src/3rdparty/chromium/media/mojo/clients/mojo_video_encode_accelerator.cc.orig	2019-11-27 21:12:25 UTC
>+--- src/3rdparty/chromium/media/mojo/clients/mojo_video_encode_accelerator.cc.orig	2020-03-16 14:04:24 UTC
> +++ src/3rdparty/chromium/media/mojo/clients/mojo_video_encode_accelerator.cc
> @@ -124,7 +124,7 @@ void MojoVideoEncodeAccelerator::Encode(scoped_refptr<
>              frame->layout().num_planes());
>@@ -6,6 +6,6 @@
>  
> -#if defined(OS_LINUX)
> +#if defined(OS_LINUX) || defined(OS_BSD)
>+   // TODO(crbug.com/1003197): Remove this once we stop supporting STORAGE_DMABUF
>+   // in VideoEncodeAccelerator.
>    if (frame->storage_type() == VideoFrame::STORAGE_DMABUFS) {
>-     DCHECK(frame->HasDmaBufs());
>-     vea_->Encode(
>diff --git a/www/qt5-webengine/files/patch-src_3rdparty_chromium_media_mojo_interfaces_video__frame__struct__traits.cc b/www/qt5-webengine/files/patch-src_3rdparty_chromium_media_mojo_mojom_video__frame__mojom__traits.cc
>similarity index 51%
>rename from www/qt5-webengine/files/patch-src_3rdparty_chromium_media_mojo_interfaces_video__frame__struct__traits.cc
>rename to www/qt5-webengine/files/patch-src_3rdparty_chromium_media_mojo_mojom_video__frame__mojom__traits.cc
>index c3237c78fb2d..fa3c6ce23cac 100644
>--- a/www/qt5-webengine/files/patch-src_3rdparty_chromium_media_mojo_interfaces_video__frame__struct__traits.cc
>+++ b/www/qt5-webengine/files/patch-src_3rdparty_chromium_media_mojo_mojom_video__frame__mojom__traits.cc
>@@ -1,6 +1,18 @@
>---- src/3rdparty/chromium/media/mojo/interfaces/video_frame_struct_traits.cc.orig	2020-04-05 20:03:42 UTC
>-+++ src/3rdparty/chromium/media/mojo/interfaces/video_frame_struct_traits.cc
>-@@ -49,7 +49,7 @@ media::mojom::VideoFrameDataPtr MakeVideoFrameData(
>+--- src/3rdparty/chromium/media/mojo/mojom/video_frame_mojom_traits.cc.orig	2020-04-08 09:41:36 UTC
>++++ src/3rdparty/chromium/media/mojo/mojom/video_frame_mojom_traits.cc
>+@@ -20,9 +20,9 @@
>+ #include "ui/gfx/mojom/buffer_types_mojom_traits.h"
>+ #include "ui/gfx/mojom/color_space_mojom_traits.h"
>+ 
>+-#if defined(OS_LINUX)
>++#if defined(OS_LINUX) || defined(OS_BSD)
>+ #include "base/posix/eintr_wrapper.h"
>+-#endif  // defined(OS_LINUX)
>++#endif  // defined(OS_LINUX) || defined(OS_BSD)
>+ 
>+ namespace mojo {
>+ 
>+@@ -60,7 +60,7 @@ media::mojom::VideoFrameDataPtr MakeVideoFrameData(
>              mojo_frame->PlaneOffset(media::VideoFrame::kVPlane)));
>    }
>  
>@@ -9,7 +21,7 @@
>    if (input->storage_type() == media::VideoFrame::STORAGE_DMABUFS) {
>      std::vector<mojo::ScopedHandle> dmabuf_fds;
>  
>-@@ -142,7 +142,7 @@ bool StructTraits<media::mojom::VideoFrameDataView,
>+@@ -161,7 +161,7 @@ bool StructTraits<media::mojom::VideoFrameDataView,
>          shared_buffer_data.u_offset(), shared_buffer_data.v_offset(),
>          shared_buffer_data.y_stride(), shared_buffer_data.u_stride(),
>          shared_buffer_data.v_stride(), timestamp);
>diff --git a/www/qt5-webengine/files/patch-src_3rdparty_chromium_media_renderers_paint__canvas__video__renderer.cc b/www/qt5-webengine/files/patch-src_3rdparty_chromium_media_renderers_paint__canvas__video__renderer.cc
>deleted file mode 100644
>index e5bfbcdd8356..000000000000
>--- a/www/qt5-webengine/files/patch-src_3rdparty_chromium_media_renderers_paint__canvas__video__renderer.cc
>+++ /dev/null
>@@ -1,22 +0,0 @@
>---- src/3rdparty/chromium/media/renderers/paint_canvas_video_renderer.cc.orig	2019-05-23 12:39:34 UTC
>-+++ src/3rdparty/chromium/media/renderers/paint_canvas_video_renderer.cc
>-@@ -31,8 +31,7 @@
>- 
>- // Skia internal format depends on a platform. On Android it is ABGR, on others
>- // it is ARGB.
>--#if SK_B32_SHIFT == 0 && SK_G32_SHIFT == 8 && SK_R32_SHIFT == 16 && \
>--    SK_A32_SHIFT == 24
>-+#if SK_PMCOLOR_BYTE_ORDER(B,G,R,A)
>- #define LIBYUV_I420_TO_ARGB libyuv::I420ToARGB
>- #define LIBYUV_I422_TO_ARGB libyuv::I422ToARGB
>- #define LIBYUV_I444_TO_ARGB libyuv::I444ToARGB
>-@@ -42,8 +41,7 @@
>- #define LIBYUV_I010_TO_ARGB libyuv::I010ToARGB
>- #define LIBYUV_H010_TO_ARGB libyuv::H010ToARGB
>- #define LIBYUV_NV12_TO_ARGB libyuv::NV12ToARGB
>--#elif SK_R32_SHIFT == 0 && SK_G32_SHIFT == 8 && SK_B32_SHIFT == 16 && \
>--    SK_A32_SHIFT == 24
>-+#elif SK_PMCOLOR_BYTE_ORDER(R,G,B,A)
>- #define LIBYUV_I420_TO_ARGB libyuv::I420ToABGR
>- #define LIBYUV_I422_TO_ARGB libyuv::I422ToABGR
>- #define LIBYUV_I444_TO_ARGB libyuv::I444ToABGR
>diff --git a/www/qt5-webengine/files/patch-src_3rdparty_chromium_media_video_fake__gpu__memory__buffer.cc b/www/qt5-webengine/files/patch-src_3rdparty_chromium_media_video_fake__gpu__memory__buffer.cc
>new file mode 100644
>index 000000000000..abf65d69a066
>--- /dev/null
>+++ b/www/qt5-webengine/files/patch-src_3rdparty_chromium_media_video_fake__gpu__memory__buffer.cc
>@@ -0,0 +1,47 @@
>+--- src/3rdparty/chromium/media/video/fake_gpu_memory_buffer.cc.orig	2020-03-16 14:04:24 UTC
>++++ src/3rdparty/chromium/media/video/fake_gpu_memory_buffer.cc
>+@@ -6,7 +6,7 @@
>+ 
>+ #include "build/build_config.h"
>+ 
>+-#if defined(OS_LINUX)
>++#if defined(OS_LINUX) || defined(OS_BSD)
>+ #include <fcntl.h>
>+ #include <sys/stat.h>
>+ #include <sys/types.h>
>+@@ -44,7 +44,7 @@ class FakeGpuMemoryBufferImpl : public gpu::GpuMemoryB
>+ 
>+ }  // namespace
>+ 
>+-#if defined(OS_LINUX)
>++#if defined(OS_LINUX) || defined(OS_BSD)
>+ base::ScopedFD GetDummyFD() {
>+   base::ScopedFD fd(open("/dev/zero", O_RDWR));
>+   DCHECK(fd.is_valid());
>+@@ -67,7 +67,7 @@ FakeGpuMemoryBuffer::FakeGpuMemoryBuffer(const gfx::Si
>+   // Set a dummy id since this is for testing only.
>+   handle_.id = gfx::GpuMemoryBufferId(0);
>+ 
>+-#if defined(OS_LINUX)
>++#if defined(OS_LINUX) || defined(OS_BSD)
>+   // Set a dummy fd since this is for testing only.
>+   handle_.native_pixmap_handle.planes.push_back(
>+       gfx::NativePixmapPlane(size_.width(), 0, y_plane_size, GetDummyFD()));
>+@@ -76,7 +76,7 @@ FakeGpuMemoryBuffer::FakeGpuMemoryBuffer(const gfx::Si
>+         size_.width(), handle_.native_pixmap_handle.planes[0].size,
>+         uv_plane_size, GetDummyFD()));
>+   }
>+-#endif  // defined(OS_LINUX)
>++#endif  // defined(OS_LINUX) || defined(OS_BSD)
>+ }
>+ 
>+ FakeGpuMemoryBuffer::~FakeGpuMemoryBuffer() = default;
>+@@ -135,7 +135,7 @@ gfx::GpuMemoryBufferHandle FakeGpuMemoryBuffer::CloneH
>+   gfx::GpuMemoryBufferHandle handle;
>+   handle.type = gfx::NATIVE_PIXMAP;
>+   handle.id = handle_.id;
>+-#if defined(OS_LINUX)
>++#if defined(OS_LINUX) || defined(OS_BSD)
>+   handle.native_pixmap_handle =
>+       gfx::CloneHandleForIPC(handle_.native_pixmap_handle);
>+ #endif
>diff --git a/www/qt5-webengine/files/patch-src_3rdparty_chromium_media_webrtc_webrtc__switches.cc b/www/qt5-webengine/files/patch-src_3rdparty_chromium_media_webrtc_webrtc__switches.cc
>new file mode 100644
>index 000000000000..f19a5e3f59ad
>--- /dev/null
>+++ b/www/qt5-webengine/files/patch-src_3rdparty_chromium_media_webrtc_webrtc__switches.cc
>@@ -0,0 +1,18 @@
>+--- src/3rdparty/chromium/media/webrtc/webrtc_switches.cc.orig	2020-03-16 14:04:24 UTC
>++++ src/3rdparty/chromium/media/webrtc/webrtc_switches.cc
>+@@ -44,7 +44,7 @@ namespace media {
>+ 
>+ bool IsWebRtcApmInAudioServiceEnabled() {
>+ #if defined(OS_WIN) || defined(OS_MACOSX) || \
>+-    (defined(OS_LINUX) && !defined(OS_CHROMEOS))
>++    (defined(OS_LINUX) && !defined(OS_CHROMEOS)) || defined(OS_BSD)
>+   return base::FeatureList::IsEnabled(features::kWebRtcApmInAudioService) &&
>+          !base::CommandLine::ForCurrentProcess()->HasSwitch(
>+              switches::kForceDisableWebRtcApmInAudioService);
>+@@ -53,4 +53,4 @@ bool IsWebRtcApmInAudioServiceEnabled() {
>+ #endif
>+ }
>+ 
>+-}  // namespace media
>+\ No newline at end of file
>++}  // namespace media
>diff --git a/www/qt5-webengine/files/patch-src_3rdparty_chromium_mojo_public_c_system_thunks.cc b/www/qt5-webengine/files/patch-src_3rdparty_chromium_mojo_public_c_system_thunks.cc
>index 741f3a4bb445..13d86e7b7993 100644
>--- a/www/qt5-webengine/files/patch-src_3rdparty_chromium_mojo_public_c_system_thunks.cc
>+++ b/www/qt5-webengine/files/patch-src_3rdparty_chromium_mojo_public_c_system_thunks.cc
>@@ -1,6 +1,6 @@
>---- src/3rdparty/chromium/mojo/public/c/system/thunks.cc.orig	2019-05-23 12:39:34 UTC
>+--- src/3rdparty/chromium/mojo/public/c/system/thunks.cc.orig	2020-04-08 09:41:36 UTC
> +++ src/3rdparty/chromium/mojo/public/c/system/thunks.cc
>-@@ -16,7 +16,7 @@
>+@@ -15,7 +15,7 @@
>  #include "build/build_config.h"
>  #include "mojo/public/c/system/core.h"
>  
>@@ -9,16 +9,7 @@
>  #include "base/environment.h"
>  #include "base/files/file_path.h"
>  #include "base/optional.h"
>-@@ -28,7 +28,7 @@ namespace {
>- 
>- typedef void (*MojoGetSystemThunksFunction)(MojoSystemThunks* thunks);
>- 
>--#if defined(OS_CHROMEOS) || defined(OS_LINUX) || defined(OS_WIN)
>-+#if defined(OS_CHROMEOS) || defined(OS_LINUX) || defined(OS_WIN) || defined(OS_BSD)
>- PROTECTED_MEMORY_SECTION
>- base::ProtectedMemory<MojoGetSystemThunksFunction> g_get_thunks;
>- #endif
>-@@ -65,7 +65,7 @@ namespace mojo {
>+@@ -58,7 +58,7 @@ namespace mojo {
>  class CoreLibraryInitializer {
>   public:
>    CoreLibraryInitializer(const MojoInitializeOptions* options) {
>@@ -27,7 +18,7 @@
>      bool application_provided_path = false;
>      base::Optional<base::FilePath> library_path;
>      if (options && options->struct_size >= sizeof(*options) &&
>-@@ -84,7 +84,7 @@ class CoreLibraryInitializer {
>+@@ -77,7 +77,7 @@ class CoreLibraryInitializer {
>  
>      if (!library_path) {
>        // Default to looking for the library in the current working directory.
>@@ -36,7 +27,18 @@
>        const base::FilePath::CharType kDefaultLibraryPathValue[] =
>            FILE_PATH_LITERAL("./libmojo_core.so");
>  #elif defined(OS_WIN)
>-@@ -147,7 +147,7 @@ class CoreLibraryInitializer {
>+@@ -127,16 +127,16 @@ class CoreLibraryInitializer {
>+ 
>+     CHECK_GT(g_thunks.size, 0u)
>+         << "Invalid mojo_core library: " << library_path->value();
>+-#else   // defined(OS_CHROMEOS) || defined(OS_LINUX)
>++#else   // defined(OS_CHROMEOS) || defined(OS_LINUX) || defined(OS_BSD)
>+     NOTREACHED()
>+         << "Dynamic mojo_core loading is not supported on this platform.";
>+-#endif  // defined(OS_CHROMEOS) || defined(OS_LINUX)
>++#endif  // defined(OS_CHROMEOS) || defined(OS_LINUX) || defined(OS_BSD)
>+   }
>+ 
>    ~CoreLibraryInitializer() = default;
>  
>   private:
>diff --git a/www/qt5-webengine/files/patch-src_3rdparty_chromium_net_BUILD.gn b/www/qt5-webengine/files/patch-src_3rdparty_chromium_net_BUILD.gn
>index 93a361d8bebf..dc18be76e737 100644
>--- a/www/qt5-webengine/files/patch-src_3rdparty_chromium_net_BUILD.gn
>+++ b/www/qt5-webengine/files/patch-src_3rdparty_chromium_net_BUILD.gn
>@@ -1,6 +1,6 @@
>---- src/3rdparty/chromium/net/BUILD.gn.orig	2019-11-27 21:12:25 UTC
>+--- src/3rdparty/chromium/net/BUILD.gn.orig	2020-04-08 09:41:36 UTC
> +++ src/3rdparty/chromium/net/BUILD.gn
>-@@ -105,7 +105,7 @@ net_configs = [
>+@@ -103,7 +103,7 @@ net_configs = [
>    "//build/config/compiler:wexit_time_destructors",
>  ]
>  
>@@ -9,7 +9,25 @@
>    net_configs += [ "//build/config/linux:libresolv" ]
>  }
>  
>-@@ -1913,7 +1913,7 @@ component("net") {
>+@@ -1834,6 +1834,17 @@ component("net") {
>+       ]
>+     }
>+ 
>++    if (is_bsd) {
>++      sources -= [
>++        "base/address_tracker_linux.cc",
>++        "base/address_tracker_linux.h",
>++        "base/network_change_notifier_linux.cc",
>++        "base/network_change_notifier_linux.h",
>++        "base/network_interfaces_linux.cc",
>++        "base/network_interfaces_linux.h",
>++      ]
>++    }
>++
>+     if (is_mac) {
>+       sources += [
>+         "base/network_notification_thread_mac.cc",
>+@@ -1960,7 +1971,7 @@ component("net") {
>        }
>      }
>  
>@@ -18,7 +36,7 @@
>        sources += [
>          "base/network_change_notifier_posix.cc",
>          "base/network_change_notifier_posix.h",
>-@@ -1946,7 +1946,7 @@ component("net") {
>+@@ -1991,7 +2002,7 @@ component("net") {
>      }
>  
>      # Use getifaddrs() on POSIX platforms, except Linux and Android.
>@@ -27,20 +45,3 @@
>        sources += [
>          "base/network_interfaces_getifaddrs.cc",
>          "base/network_interfaces_getifaddrs.h",
>-@@ -2040,6 +2040,16 @@ component("net") {
>-       ]
>- 
>-       sources -= [ "disk_cache/blockfile/file_posix.cc" ]
>-+    }
>-+
>-+    if (is_bsd) {
>-+      sources -= [
>-+         "base/address_tracker_linux.cc",
>-+         "base/address_tracker_linux.h",
>-+         "base/network_change_notifier_linux.cc",
>-+         "base/network_change_notifier_linux.h",
>-+         "base/network_interfaces_linux.cc",
>-+      ]
>-     }
>- 
>-     if (is_ios || is_mac) {
>diff --git a/www/qt5-webengine/files/patch-src_3rdparty_chromium_net_base_address__tracker__linux.cc b/www/qt5-webengine/files/patch-src_3rdparty_chromium_net_base_address__tracker__linux.cc
>index 65ddb377dfb4..ddaeaa1a2a4b 100644
>--- a/www/qt5-webengine/files/patch-src_3rdparty_chromium_net_base_address__tracker__linux.cc
>+++ b/www/qt5-webengine/files/patch-src_3rdparty_chromium_net_base_address__tracker__linux.cc
>@@ -1,105 +1,16 @@
>---- src/3rdparty/chromium/net/base/address_tracker_linux.cc.orig	2019-11-27 21:12:25 UTC
>+--- src/3rdparty/chromium/net/base/address_tracker_linux.cc.orig	2020-04-08 09:41:36 UTC
> +++ src/3rdparty/chromium/net/base/address_tracker_linux.cc
>-@@ -21,96 +21,10 @@
>- namespace net {
>- namespace internal {
>+@@ -5,7 +5,9 @@
>+ #include "net/base/address_tracker_linux.h"
>  
>--namespace {
>--
>--// Some kernel functions such as wireless_send_event and rtnetlink_ifinfo_prep
>--// may send spurious messages over rtnetlink. RTM_NEWLINK messages where
>--// ifi_change == 0 and rta_type == IFLA_WIRELESS should be ignored.
>--bool IgnoreWirelessChange(const struct nlmsghdr* header,
>--                          const struct ifinfomsg* msg) {
>--  size_t length = IFLA_PAYLOAD(header);
>--  for (const struct rtattr* attr = IFLA_RTA(msg); RTA_OK(attr, length);
>--       attr = RTA_NEXT(attr, length)) {
>--    if (attr->rta_type == IFLA_WIRELESS && msg->ifi_change == 0)
>--      return true;
>--  }
>--  return false;
>--}
>--
>--// Retrieves address from NETLINK address message.
>--// Sets |really_deprecated| for IPv6 addresses with preferred lifetimes of 0.
>--bool GetAddress(const struct nlmsghdr* header,
>--                IPAddress* out,
>--                bool* really_deprecated) {
>--  if (really_deprecated)
>--    *really_deprecated = false;
>--  const struct ifaddrmsg* msg =
>--      reinterpret_cast<struct ifaddrmsg*>(NLMSG_DATA(header));
>--  size_t address_length = 0;
>--  switch (msg->ifa_family) {
>--    case AF_INET:
>--      address_length = IPAddress::kIPv4AddressSize;
>--      break;
>--    case AF_INET6:
>--      address_length = IPAddress::kIPv6AddressSize;
>--      break;
>--    default:
>--      // Unknown family.
>--      return false;
>--  }
>--  // Use IFA_ADDRESS unless IFA_LOCAL is present. This behavior here is based on
>--  // getaddrinfo in glibc (check_pf.c). Judging from kernel implementation of
>--  // NETLINK, IPv4 addresses have only the IFA_ADDRESS attribute, while IPv6
>--  // have the IFA_LOCAL attribute.
>--  uint8_t* address = NULL;
>--  uint8_t* local = NULL;
>--  size_t length = IFA_PAYLOAD(header);
>--  for (const struct rtattr* attr =
>--           reinterpret_cast<const struct rtattr*>(IFA_RTA(msg));
>--       RTA_OK(attr, length);
>--       attr = RTA_NEXT(attr, length)) {
>--    switch (attr->rta_type) {
>--      case IFA_ADDRESS:
>--        DCHECK_GE(RTA_PAYLOAD(attr), address_length);
>--        address = reinterpret_cast<uint8_t*>(RTA_DATA(attr));
>--        break;
>--      case IFA_LOCAL:
>--        DCHECK_GE(RTA_PAYLOAD(attr), address_length);
>--        local = reinterpret_cast<uint8_t*>(RTA_DATA(attr));
>--        break;
>--      case IFA_CACHEINFO: {
>--        const struct ifa_cacheinfo *cache_info =
>--            reinterpret_cast<const struct ifa_cacheinfo*>(RTA_DATA(attr));
>--        if (really_deprecated)
>--          *really_deprecated = (cache_info->ifa_prefered == 0);
>--      } break;
>--      default:
>--        break;
>--    }
>--  }
>--  if (local)
>--    address = local;
>--  if (!address)
>--    return false;
>--  *out = IPAddress(address, address_length);
>--  return true;
>--}
>--
>--}  // namespace
>--
>- // static
>- char* AddressTrackerLinux::GetInterfaceName(int interface_index, char* buf) {
>--  memset(buf, 0, IFNAMSIZ);
>--  base::ScopedFD ioctl_socket = GetSocketForIoctl();
>--  if (!ioctl_socket.is_valid())
>--    return buf;
>--
>--  struct ifreq ifr = {};
>--  ifr.ifr_ifindex = interface_index;
>--
>--  if (ioctl(ioctl_socket.get(), SIOCGIFNAME, &ifr) == 0)
>--    strncpy(buf, ifr.ifr_name, IFNAMSIZ - 1);
>--  return buf;
>-+  NOTIMPLEMENTED();
>-+  return NULL;
>- }
>- 
>- AddressTrackerLinux::AddressTrackerLinux()
>-@@ -147,6 +61,7 @@ AddressTrackerLinux::AddressTrackerLinux(
>+ #include <errno.h>
>++#if !defined(OS_BSD)
>+ #include <linux/if.h>
>++#endif
>+ #include <stdint.h>
>+ #include <sys/ioctl.h>
>+ #include <utility>
>+@@ -177,6 +179,7 @@ AddressTrackerLinux::AddressTrackerLinux(
>  AddressTrackerLinux::~AddressTrackerLinux() = default;
>  
>  void AddressTrackerLinux::Init() {
>@@ -107,7 +18,7 @@
>    netlink_fd_.reset(socket(AF_NETLINK, SOCK_RAW, NETLINK_ROUTE));
>    if (!netlink_fd_.is_valid()) {
>      PLOG(ERROR) << "Could not create NETLINK socket";
>-@@ -242,6 +157,7 @@ void AddressTrackerLinux::AbortAndForceOnline() {
>+@@ -272,6 +275,7 @@ void AddressTrackerLinux::AbortAndForceOnline() {
>    connection_type_initialized_cv_.Broadcast();
>  }
>  
>@@ -115,7 +26,7 @@
>  AddressTrackerLinux::AddressMap AddressTrackerLinux::GetAddressMap() const {
>    AddressTrackerAutoLock lock(*this, address_map_lock_);
>    return address_map_;
>-@@ -260,6 +176,7 @@ bool AddressTrackerLinux::IsInterfaceIgnored(int inter
>+@@ -290,6 +294,7 @@ bool AddressTrackerLinux::IsInterfaceIgnored(int inter
>    const char* interface_name = get_interface_name_(interface_index, buf);
>    return ignored_interfaces_.find(interface_name) != ignored_interfaces_.end();
>  }
>@@ -123,15 +34,15 @@
>  
>  NetworkChangeNotifier::ConnectionType
>  AddressTrackerLinux::GetCurrentConnectionType() {
>-@@ -318,6 +235,7 @@ void AddressTrackerLinux::HandleMessage(char* buffer,
>+@@ -348,6 +353,7 @@ void AddressTrackerLinux::HandleMessage(const char* bu
>                                          bool* address_changed,
>                                          bool* link_changed,
>                                          bool* tunnel_changed) {
> +#if !defined(OS_FREEBSD)
>    DCHECK(buffer);
>-   for (struct nlmsghdr* header = reinterpret_cast<struct nlmsghdr*>(buffer);
>-        NLMSG_OK(header, length);
>-@@ -414,6 +332,10 @@ void AddressTrackerLinux::HandleMessage(char* buffer,
>+   // Note that NLMSG_NEXT decrements |length| to reflect the number of bytes
>+   // remaining in |buffer|.
>+@@ -460,6 +466,10 @@ void AddressTrackerLinux::HandleMessage(const char* bu
>          break;
>      }
>    }
>@@ -142,7 +53,7 @@
>  }
>  
>  void AddressTrackerLinux::OnFileCanReadWithoutBlocking() {
>-@@ -441,31 +363,7 @@ bool AddressTrackerLinux::IsTunnelInterfaceName(const 
>+@@ -487,31 +497,7 @@ bool AddressTrackerLinux::IsTunnelInterfaceName(const 
>  }
>  
>  void AddressTrackerLinux::UpdateCurrentConnectionType() {
>@@ -174,4 +85,4 @@
> +  NOTIMPLEMENTED();
>  }
>  
>- int AddressTrackerLinux::GetThreadsWaitingForConnectionTypeInitForTesting()
>+ int AddressTrackerLinux::GetThreadsWaitingForConnectionTypeInitForTesting() {
>diff --git a/www/qt5-webengine/files/patch-src_3rdparty_chromium_pdf_pdfium_pdfium__engine.cc b/www/qt5-webengine/files/patch-src_3rdparty_chromium_pdf_pdfium_pdfium__engine.cc
>index c6927f629f78..2994c665f947 100644
>--- a/www/qt5-webengine/files/patch-src_3rdparty_chromium_pdf_pdfium_pdfium__engine.cc
>+++ b/www/qt5-webengine/files/patch-src_3rdparty_chromium_pdf_pdfium_pdfium__engine.cc
>@@ -1,56 +1,56 @@
>---- src/3rdparty/chromium/pdf/pdfium/pdfium_engine.cc.orig	2019-11-27 21:12:25 UTC
>+--- src/3rdparty/chromium/pdf/pdfium/pdfium_engine.cc.orig	2020-03-16 14:04:24 UTC
> +++ src/3rdparty/chromium/pdf/pdfium/pdfium_engine.cc
>-@@ -138,7 +138,7 @@ constexpr base::TimeDelta kMaxProgressivePaintTime =
>- constexpr base::TimeDelta kMaxInitialProgressivePaintTime =
>-     base::TimeDelta::FromMilliseconds(250);
>+@@ -52,7 +52,7 @@
>+ #include "ui/gfx/geometry/rect.h"
>+ #include "v8/include/v8.h"
>  
> -#if defined(OS_LINUX)
> +#if defined(OS_LINUX) || defined(OS_BSD)
>+ #include "pdf/pdfium/pdfium_font_linux.h"
>+ #endif
>  
>- PP_Instance g_last_instance_id;
>- 
>-@@ -560,7 +560,7 @@ bool InitializeSDK() {
>+@@ -377,7 +377,7 @@ void InitializeSDK(bool enable_v8) {
>    config.m_v8EmbedderSlot = gin::kEmbedderPDFium;
>    FPDF_InitLibraryWithConfig(&config);
>  
> -#if defined(OS_LINUX)
> +#if defined(OS_LINUX) || defined(OS_BSD)
>-   // Font loading doesn't work in the renderer sandbox in Linux.
>-   FPDF_SetSystemFontInfo(&g_font_info);
>+   InitializeLinuxFontMapper();
>  #endif
>-@@ -593,7 +593,7 @@ PDFiumEngine::PDFiumEngine(PDFEngine::Client* client, 
>+ 
>+@@ -411,7 +411,7 @@ PDFiumEngine::PDFiumEngine(PDFEngine::Client* client, 
>    IFSDK_PAUSE::user = nullptr;
>    IFSDK_PAUSE::NeedToPauseNow = Pause_NeedToPauseNow;
>  
> -#if defined(OS_LINUX)
> +#if defined(OS_LINUX) || defined(OS_BSD)
>    // PreviewModeClient does not know its pp::Instance.
>-   pp::Instance* instance = client_->GetPluginInstance();
>-   if (instance)
>-@@ -1045,7 +1045,7 @@ pp::Buffer_Dev PDFiumEngine::PrintPagesAsRasterPdf(
>+   SetLastInstance(client_->GetPluginInstance());
>+ #endif
>+@@ -867,7 +867,7 @@ pp::Buffer_Dev PDFiumEngine::PrintPagesAsRasterPdf(
>  
>    KillFormFocus();
>  
> -#if defined(OS_LINUX)
> +#if defined(OS_LINUX) || defined(OS_BSD)
>-   g_last_instance_id = client_->GetPluginInstance()->pp_instance();
>+   SetLastInstance(client_->GetPluginInstance());
>  #endif
>  
>-@@ -2898,7 +2898,7 @@ bool PDFiumEngine::ContinuePaint(int progressive_index
>+@@ -2798,7 +2798,7 @@ bool PDFiumEngine::ContinuePaint(int progressive_index
>    DCHECK(image_data);
>  
>    last_progressive_start_time_ = base::Time::Now();
> -#if defined(OS_LINUX)
> +#if defined(OS_LINUX) || defined(OS_BSD)
>-   g_last_instance_id = client_->GetPluginInstance()->pp_instance();
>+   SetLastInstance(client_->GetPluginInstance());
>  #endif
>  
>-@@ -3368,7 +3368,7 @@ void PDFiumEngine::SetCurrentPage(int index) {
>+@@ -3292,7 +3292,7 @@ void PDFiumEngine::SetCurrentPage(int index) {
>      FORM_DoPageAAction(old_page, form(), FPDFPAGE_AACTION_CLOSE);
>    }
>    most_visible_page_ = index;
> -#if defined(OS_LINUX)
> +#if defined(OS_LINUX) || defined(OS_BSD)
>-   g_last_instance_id = client_->GetPluginInstance()->pp_instance();
>+   SetLastInstance(client_->GetPluginInstance());
>  #endif
>    if (most_visible_page_ != -1 && called_do_document_action_) {
>diff --git a/www/qt5-webengine/files/patch-src_3rdparty_chromium_printing_backend_print__backend__cups.h b/www/qt5-webengine/files/patch-src_3rdparty_chromium_printing_backend_print__backend__cups.h
>deleted file mode 100644
>index b496870402f7..000000000000
>--- a/www/qt5-webengine/files/patch-src_3rdparty_chromium_printing_backend_print__backend__cups.h
>+++ /dev/null
>@@ -1,11 +0,0 @@
>---- src/3rdparty/chromium/printing/backend/print_backend_cups.h.orig	2019-05-23 12:39:34 UTC
>-+++ src/3rdparty/chromium/printing/backend/print_backend_cups.h
>-@@ -5,6 +5,8 @@
>- #ifndef PRINTING_BACKEND_PRINT_BACKEND_CUPS_H_
>- #define PRINTING_BACKEND_PRINT_BACKEND_CUPS_H_
>- 
>-+#include <cups/ppd.h>
>-+
>- #include <string>
>- 
>- #include "base/files/file_util.h"
>diff --git a/www/qt5-webengine/files/patch-src_3rdparty_chromium_services_content_simple__browser_simple__browser__service.cc b/www/qt5-webengine/files/patch-src_3rdparty_chromium_services_content_simple__browser_simple__browser__service.cc
>deleted file mode 100644
>index 418346117bb9..000000000000
>--- a/www/qt5-webengine/files/patch-src_3rdparty_chromium_services_content_simple__browser_simple__browser__service.cc
>+++ /dev/null
>@@ -1,20 +0,0 @@
>---- src/3rdparty/chromium/services/content/simple_browser/simple_browser_service.cc.orig	2019-11-27 21:12:25 UTC
>-+++ src/3rdparty/chromium/services/content/simple_browser/simple_browser_service.cc
>-@@ -7,7 +7,7 @@
>- #include "build/build_config.h"
>- #include "services/content/simple_browser/window.h"
>- 
>--#if defined(OS_LINUX)
>-+#if defined(OS_LINUX) || defined(OS_BSD)
>- #include "third_party/skia/include/ports/SkFontConfigInterface.h"  // nogncheck
>- #endif
>- 
>-@@ -23,7 +23,7 @@ SimpleBrowserService::~SimpleBrowserService() = defaul
>- 
>- void SimpleBrowserService::OnStart() {
>-   if (ui_initialization_mode_ == UIInitializationMode::kInitializeUI) {
>--#if defined(OS_LINUX)
>-+#if defined(OS_LINUX) || defined(OS_BSD)
>-     font_loader_ =
>-         sk_make_sp<font_service::FontLoader>(service_binding_.GetConnector());
>-     SkFontConfigInterface::SetGlobal(font_loader_);
>diff --git a/www/qt5-webengine/files/patch-src_3rdparty_chromium_services_content_simple__browser_simple__browser__service.h b/www/qt5-webengine/files/patch-src_3rdparty_chromium_services_content_simple__browser_simple__browser__service.h
>deleted file mode 100644
>index 912959c28429..000000000000
>--- a/www/qt5-webengine/files/patch-src_3rdparty_chromium_services_content_simple__browser_simple__browser__service.h
>+++ /dev/null
>@@ -1,20 +0,0 @@
>---- src/3rdparty/chromium/services/content/simple_browser/simple_browser_service.h.orig	2019-11-27 21:12:25 UTC
>-+++ src/3rdparty/chromium/services/content/simple_browser/simple_browser_service.h
>-@@ -15,7 +15,7 @@
>- #include "services/service_manager/public/cpp/service_binding.h"
>- #include "services/service_manager/public/mojom/service.mojom.h"
>- 
>--#if defined(OS_LINUX)
>-+#if defined(OS_LINUX) || defined(OS_BSD)
>- #include "components/services/font/public/cpp/font_loader.h"  // nogncheck
>- #endif
>- 
>-@@ -45,7 +45,7 @@ class COMPONENT_EXPORT(SIMPLE_BROWSER) SimpleBrowserSe
>-   // service_manager::Service:
>-   void OnStart() override;
>- 
>--#if defined(OS_LINUX)
>-+#if defined(OS_LINUX) || defined(OS_BSD)
>-   sk_sp<font_service::FontLoader> font_loader_;
>- #endif
>- 
>diff --git a/www/qt5-webengine/files/patch-src_3rdparty_chromium_services_device_geolocation_location__arbitrator.cc b/www/qt5-webengine/files/patch-src_3rdparty_chromium_services_device_geolocation_location__arbitrator.cc
>index 5d8f17bc143a..9f63b2eb7c59 100644
>--- a/www/qt5-webengine/files/patch-src_3rdparty_chromium_services_device_geolocation_location__arbitrator.cc
>+++ b/www/qt5-webengine/files/patch-src_3rdparty_chromium_services_device_geolocation_location__arbitrator.cc
>@@ -1,11 +1,11 @@
>---- src/3rdparty/chromium/services/device/geolocation/location_arbitrator.cc.orig	2018-11-13 18:25:11 UTC
>+--- src/3rdparty/chromium/services/device/geolocation/location_arbitrator.cc.orig	2020-03-16 14:04:24 UTC
> +++ src/3rdparty/chromium/services/device/geolocation/location_arbitrator.cc
>-@@ -167,7 +167,7 @@ LocationArbitrator::NewNetworkLocationProvider(
>+@@ -159,7 +159,7 @@ LocationArbitrator::NewNetworkLocationProvider(
>+ 
>  std::unique_ptr<LocationProvider>
>  LocationArbitrator::NewSystemLocationProvider() {
>- #if defined(OS_WIN) || defined(OS_MACOSX) || defined(OS_LINUX) || \
>--    defined(OS_FUCHSIA)
>-+    defined(OS_FUCHSIA) || defined(OS_BSD)
>+-#if defined(OS_MACOSX) || defined(OS_LINUX) || defined(OS_FUCHSIA)
>++#if defined(OS_MACOSX) || defined(OS_LINUX) || defined(OS_FUCHSIA) || defined(OS_BSD)
>    return nullptr;
>  #else
>    return device::NewSystemLocationProvider();
>diff --git a/www/qt5-webengine/files/patch-src_3rdparty_chromium_services_device_time__zone__monitor_time__zone__monitor.cc b/www/qt5-webengine/files/patch-src_3rdparty_chromium_services_device_time__zone__monitor_time__zone__monitor.cc
>deleted file mode 100644
>index 863eaa5deba8..000000000000
>--- a/www/qt5-webengine/files/patch-src_3rdparty_chromium_services_device_time__zone__monitor_time__zone__monitor.cc
>+++ /dev/null
>@@ -1,20 +0,0 @@
>---- src/3rdparty/chromium/services/device/time_zone_monitor/time_zone_monitor.cc.orig	2019-05-23 12:39:34 UTC
>-+++ src/3rdparty/chromium/services/device/time_zone_monitor/time_zone_monitor.cc
>-@@ -29,7 +29,7 @@ void TimeZoneMonitor::Bind(device::mojom::TimeZoneMoni
>- 
>- void TimeZoneMonitor::NotifyClients() {
>-   DCHECK(thread_checker_.CalledOnValidThread());
>--#if defined(OS_CHROMEOS) || (defined(OS_LINUX) && defined(IS_CHROMECAST))
>-+#if defined(OS_CHROMEOS) || ((defined(OS_BSD) || defined(OS_LINUX)) && defined(IS_CHROMECAST))
>-   // On CrOS (and Chromecast), ICU's default tz is already set to a new zone. No
>-   // need to redetect it with detectHostTimeZone().
>-   std::unique_ptr<icu::TimeZone> new_zone(icu::TimeZone::createDefault());
>-@@ -41,7 +41,7 @@ void TimeZoneMonitor::NotifyClients() {
>- #else
>-   std::unique_ptr<icu::TimeZone> new_zone(icu::TimeZone::detectHostTimeZone());
>- #endif
>--#if defined(OS_LINUX) && !defined(IS_CHROMECAST)
>-+#if (defined(OS_LINUX) && !defined(IS_CHROMECAST)) || defined(OS_BSD)
>-   // We get here multiple times on Linux per a single tz change, but
>-   // want to update the ICU default zone and notify renderer only once.
>-   std::unique_ptr<icu::TimeZone> current_zone(icu::TimeZone::createDefault());
>diff --git a/www/qt5-webengine/files/patch-src_3rdparty_chromium_services_service__manager_sandbox_sandbox__type.cc b/www/qt5-webengine/files/patch-src_3rdparty_chromium_services_service__manager_sandbox_sandbox__type.cc
>deleted file mode 100644
>index bd6f29a6f52d..000000000000
>--- a/www/qt5-webengine/files/patch-src_3rdparty_chromium_services_service__manager_sandbox_sandbox__type.cc
>+++ /dev/null
>@@ -1,11 +0,0 @@
>---- src/3rdparty/chromium/services/service_manager/sandbox/sandbox_type.cc.orig	2019-05-23 12:39:34 UTC
>-+++ src/3rdparty/chromium/services/service_manager/sandbox/sandbox_type.cc
>-@@ -25,7 +25,7 @@ bool IsUnsandboxedSandboxType(SandboxType sandbox_type
>-           service_manager::features::kXRSandbox);
>- #endif
>-     case SANDBOX_TYPE_AUDIO:
>--#if defined(OS_WIN) || defined(OS_MACOSX) || defined(OS_LINUX)
>-+#if defined(OS_WIN) || defined(OS_MACOSX) || defined(OS_LINUX) || defined(OS_BSD)
>-       return !base::FeatureList::IsEnabled(
>-           service_manager::features::kAudioServiceSandbox);
>- #else
>diff --git a/www/qt5-webengine/files/patch-src_3rdparty_chromium_services_tracing_public_cpp_perfetto_trace__event__data__source.cc b/www/qt5-webengine/files/patch-src_3rdparty_chromium_services_tracing_public_cpp_perfetto_trace__event__data__source.cc
>new file mode 100644
>index 000000000000..93dc17e0014d
>--- /dev/null
>+++ b/www/qt5-webengine/files/patch-src_3rdparty_chromium_services_tracing_public_cpp_perfetto_trace__event__data__source.cc
>@@ -0,0 +1,11 @@
>+--- src/3rdparty/chromium/services/tracing/public/cpp/perfetto/trace_event_data_source.cc.orig	2020-03-16 14:04:24 UTC
>++++ src/3rdparty/chromium/services/tracing/public/cpp/perfetto/trace_event_data_source.cc
>+@@ -102,7 +102,7 @@ void WriteMetadataProto(ChromeMetadataPacket* metadata
>+ #endif  // defined(OS_ANDROID) && defined(OFFICIAL_BUILD)
>+ }
>+ 
>+-#if defined(OS_LINUX) || defined(OS_ANDROID) || defined(OS_FUCHSIA)
>++#if defined(OS_LINUX) || defined(OS_ANDROID) || defined(OS_FUCHSIA) || defined(OS_BSD)
>+ // Linux, Android, and Fuchsia all use CLOCK_MONOTONIC. See crbug.com/166153
>+ // about efforts to unify base::TimeTicks across all platforms.
>+ constexpr perfetto::protos::pbzero::ClockSnapshot::Clock::BuiltinClocks
>diff --git a/www/qt5-webengine/files/patch-src_3rdparty_chromium_services_video__capture_broadcasting__receiver.cc b/www/qt5-webengine/files/patch-src_3rdparty_chromium_services_video__capture_broadcasting__receiver.cc
>index 85cf5a55c188..e8f0d5652fdc 100644
>--- a/www/qt5-webengine/files/patch-src_3rdparty_chromium_services_video__capture_broadcasting__receiver.cc
>+++ b/www/qt5-webengine/files/patch-src_3rdparty_chromium_services_video__capture_broadcasting__receiver.cc
>@@ -1,4 +1,4 @@
>---- src/3rdparty/chromium/services/video_capture/broadcasting_receiver.cc.orig	2019-11-27 21:12:25 UTC
>+--- src/3rdparty/chromium/services/video_capture/broadcasting_receiver.cc.orig	2020-03-16 14:04:24 UTC
> +++ src/3rdparty/chromium/services/video_capture/broadcasting_receiver.cc
> @@ -40,7 +40,7 @@ void CloneSharedBufferHandle(const mojo::ScopedSharedB
>  void CloneSharedBufferToRawFileDescriptorHandle(
>@@ -6,15 +6,15 @@
>      media::mojom::VideoBufferHandlePtr* target) {
> -#if defined(OS_LINUX)
> +#if defined(OS_LINUX) || defined(OS_BSD)
>-   media::SharedMemoryHandleProvider provider;
>-   provider.InitFromMojoHandle(
>-       source->Clone(mojo::SharedBufferHandle::AccessMode::READ_WRITE));
>-@@ -180,7 +180,7 @@ void BroadcastingReceiver::BufferContext::
>+   // |source| is unwrapped to a |PlatformSharedMemoryRegion|, from whence a file
>+   // descriptor can be extracted which is then mojo-wrapped.
>+   base::subtle::PlatformSharedMemoryRegion platform_region =
>+@@ -183,7 +183,7 @@ void BroadcastingReceiver::BufferContext::
>      ConvertRawFileDescriptorToSharedBuffer() {
>    DCHECK(buffer_handle_->is_shared_memory_via_raw_file_descriptor());
>  
> -#if defined(OS_LINUX)
> +#if defined(OS_LINUX) || defined(OS_BSD)
>-   media::SharedMemoryHandleProvider provider;
>-   provider.InitAsReadOnlyFromRawFileDescriptor(
>-       std::move(buffer_handle_->get_shared_memory_via_raw_file_descriptor()
>+   // The conversion unwraps the descriptor from its mojo handle to the raw file
>+   // descriptor (ie, an int). This is used to create a
>+   // PlatformSharedMemoryRegion which is then wrapped as a
>diff --git a/www/qt5-webengine/files/patch-src_3rdparty_chromium_third__party_angle_BUILD.gn b/www/qt5-webengine/files/patch-src_3rdparty_chromium_third__party_angle_BUILD.gn
>index f4531feb1661..0009731cbbdd 100644
>--- a/www/qt5-webengine/files/patch-src_3rdparty_chromium_third__party_angle_BUILD.gn
>+++ b/www/qt5-webengine/files/patch-src_3rdparty_chromium_third__party_angle_BUILD.gn
>@@ -1,16 +1,16 @@
>---- src/3rdparty/chromium/third_party/angle/BUILD.gn.orig	2019-05-23 12:39:34 UTC
>+--- src/3rdparty/chromium/third_party/angle/BUILD.gn.orig	2020-04-08 09:41:36 UTC
> +++ src/3rdparty/chromium/third_party/angle/BUILD.gn
>-@@ -268,7 +268,8 @@ angle_static_library("angle_gpu_info_util") {
>+@@ -381,7 +381,8 @@ angle_static_library("angle_gpu_info_util") {
>    if (is_linux || is_fuchsia) {
>      sources += libangle_gpu_info_util_linux_sources
>  
>--    if (use_x11) {
>-+    # Somewhere "use_x11" is set to false, so we need to add is_bsd here
>-+    if (use_x11 || is_bsd) {
>+-    if (angle_use_x11) {
>++    # Somewhere "angle_use_x11" is set to false, so we need to add is_bsd here
>++    if (angle_use_x11 || is_bsd) {
>        sources += libangle_gpu_info_util_x11_sources
>        deps += [ "src/third_party/libXNVCtrl:libXNVCtrl" ]
>        defines += [ "GPU_INFO_USE_X11" ]
>-@@ -276,6 +277,7 @@ angle_static_library("angle_gpu_info_util") {
>+@@ -389,6 +390,7 @@ angle_static_library("angle_gpu_info_util") {
>          "X11",
>          "Xi",
>          "Xext",
>@@ -18,8 +18,8 @@
>        ]
>      }
>    }
>-@@ -842,10 +844,6 @@ foreach(is_shared_library,
>-     libs = []
>+@@ -1107,10 +1109,6 @@ foreach(is_shared_library,
>+ 
>      if (is_linux) {
>        sources += util_linux_sources
> -      libs += [
>diff --git a/www/qt5-webengine/files/patch-src_3rdparty_chromium_third__party_angle_src_libANGLE_Display.cpp b/www/qt5-webengine/files/patch-src_3rdparty_chromium_third__party_angle_src_libANGLE_Display.cpp
>index e2411f87a27d..cb31945f0cc5 100644
>--- a/www/qt5-webengine/files/patch-src_3rdparty_chromium_third__party_angle_src_libANGLE_Display.cpp
>+++ b/www/qt5-webengine/files/patch-src_3rdparty_chromium_third__party_angle_src_libANGLE_Display.cpp
>@@ -1,20 +1,11 @@
>---- src/3rdparty/chromium/third_party/angle/src/libANGLE/Display.cpp.orig	2019-05-23 12:39:34 UTC
>+--- src/3rdparty/chromium/third_party/angle/src/libANGLE/Display.cpp.orig	2020-04-08 09:41:36 UTC
> +++ src/3rdparty/chromium/third_party/angle/src/libANGLE/Display.cpp
>-@@ -64,7 +64,7 @@
>- #if defined(ANGLE_ENABLE_VULKAN)
>- #    if defined(ANGLE_PLATFORM_WINDOWS)
>- #        include "libANGLE/renderer/vulkan/win32/DisplayVkWin32.h"
>+@@ -269,7 +269,7 @@ rx::DisplayImpl *CreateDisplayFromAttribs(const Attrib
>+             {
>+                 impl = rx::CreateVulkanWin32Display(state);
>+             }
> -#    elif defined(ANGLE_PLATFORM_LINUX)
> +#    elif defined(ANGLE_PLATFORM_POSIX)
>- #        include "libANGLE/renderer/vulkan/xcb/DisplayVkXcb.h"
>- #    elif defined(ANGLE_PLATFORM_ANDROID)
>- #        include "libANGLE/renderer/vulkan/android/DisplayVkAndroid.h"
>-@@ -216,7 +216,7 @@ rx::DisplayImpl *CreateDisplayFromAttribs(const Attrib
>- #if defined(ANGLE_ENABLE_VULKAN)
>- #    if defined(ANGLE_PLATFORM_WINDOWS)
>-             impl = new rx::DisplayVkWin32(state);
>--#    elif defined(ANGLE_PLATFORM_LINUX)
>-+#    elif defined(ANGLE_PLATFORM_POSIX)
>-             impl = new rx::DisplayVkXcb(state);
>- #    elif defined(ANGLE_PLATFORM_ANDROID)
>-             impl = new rx::DisplayVkAndroid(state);
>+             if (rx::IsVulkanXcbDisplayAvailable())
>+             {
>+                 impl = rx::CreateVulkanXcbDisplay(state);
>diff --git a/www/qt5-webengine/files/patch-src_3rdparty_chromium_third__party_angle_src_libANGLE_renderer_vulkan_DisplayVk__api.h b/www/qt5-webengine/files/patch-src_3rdparty_chromium_third__party_angle_src_libANGLE_renderer_vulkan_DisplayVk__api.h
>new file mode 100644
>index 000000000000..1a15bf015cbd
>--- /dev/null
>+++ b/www/qt5-webengine/files/patch-src_3rdparty_chromium_third__party_angle_src_libANGLE_renderer_vulkan_DisplayVk__api.h
>@@ -0,0 +1,11 @@
>+--- src/3rdparty/chromium/third_party/angle/src/libANGLE/renderer/vulkan/DisplayVk_api.h.orig	2020-04-08 09:41:36 UTC
>++++ src/3rdparty/chromium/third_party/angle/src/libANGLE/renderer/vulkan/DisplayVk_api.h
>+@@ -19,7 +19,7 @@ bool IsVulkanWin32DisplayAvailable();
>+ DisplayImpl *CreateVulkanWin32Display(const egl::DisplayState &state);
>+ #endif  // defined(ANGLE_PLATFORM_WINDOWS)
>+ 
>+-#if defined(ANGLE_PLATFORM_LINUX)
>++#if defined(ANGLE_PLATFORM_POSIX)
>+ bool IsVulkanXcbDisplayAvailable();
>+ DisplayImpl *CreateVulkanXcbDisplay(const egl::DisplayState &state);
>+ #endif  // defined(ANGLE_PLATFORM_LINUX)
>diff --git a/www/qt5-webengine/files/patch-src_3rdparty_chromium_third__party_angle_third__party_vulkan-loader_src_loader_loader.c b/www/qt5-webengine/files/patch-src_3rdparty_chromium_third__party_angle_third__party_vulkan-loader_src_loader_loader.c
>new file mode 100644
>index 000000000000..ed18d6ae3f53
>--- /dev/null
>+++ b/www/qt5-webengine/files/patch-src_3rdparty_chromium_third__party_angle_third__party_vulkan-loader_src_loader_loader.c
>@@ -0,0 +1,11 @@
>+--- src/3rdparty/chromium/third_party/angle/third_party/vulkan-loader/src/loader/loader.c.orig	2020-03-16 14:04:24 UTC
>++++ src/3rdparty/chromium/third_party/angle/third_party/vulkan-loader/src/loader/loader.c
>+@@ -229,7 +229,7 @@ void *loader_device_heap_realloc(const struct loader_d
>+ }
>+ 
>+ // Environment variables
>+-#if defined(__linux__) || defined(__APPLE__)
>++#if defined(__linux__) || defined(__APPLE__) || defined(__FreeBSD__)
>+ 
>+ static inline bool IsHighIntegrity() {
>+     return geteuid() != getuid() || getegid() != getgid();
>diff --git a/www/qt5-webengine/files/patch-src_3rdparty_chromium_third__party_angle_third__party_vulkan-loader_src_loader_vk__loader__platform.h b/www/qt5-webengine/files/patch-src_3rdparty_chromium_third__party_angle_third__party_vulkan-loader_src_loader_vk__loader__platform.h
>new file mode 100644
>index 000000000000..807a5b65c952
>--- /dev/null
>+++ b/www/qt5-webengine/files/patch-src_3rdparty_chromium_third__party_angle_third__party_vulkan-loader_src_loader_vk__loader__platform.h
>@@ -0,0 +1,11 @@
>+--- src/3rdparty/chromium/third_party/angle/third_party/vulkan-loader/src/loader/vk_loader_platform.h.orig	2020-03-16 14:04:24 UTC
>++++ src/3rdparty/chromium/third_party/angle/third_party/vulkan-loader/src/loader/vk_loader_platform.h
>+@@ -31,7 +31,7 @@
>+ #include "vulkan/vk_platform.h"
>+ #include "vulkan/vk_sdk_platform.h"
>+ 
>+-#if defined(__linux__) || defined(__APPLE__)
>++#if defined(__linux__) || defined(__APPLE__) || defined(__FreeBSD__)
>+ /* Linux-specific common code: */
>+ 
>+ // Headers:
>diff --git a/www/qt5-webengine/files/patch-src_3rdparty_chromium_third__party_blink_renderer_core_scroll_scrollbar__theme__aura.cc b/www/qt5-webengine/files/patch-src_3rdparty_chromium_third__party_blink_renderer_core_scroll_scrollbar__theme__aura.cc
>index f080d7a00a5a..6e2d5d46b40d 100644
>--- a/www/qt5-webengine/files/patch-src_3rdparty_chromium_third__party_blink_renderer_core_scroll_scrollbar__theme__aura.cc
>+++ b/www/qt5-webengine/files/patch-src_3rdparty_chromium_third__party_blink_renderer_core_scroll_scrollbar__theme__aura.cc
>@@ -1,6 +1,15 @@
>---- src/3rdparty/chromium/third_party/blink/renderer/core/scroll/scrollbar_theme_aura.cc.orig	2019-11-27 21:12:25 UTC
>+--- src/3rdparty/chromium/third_party/blink/renderer/core/scroll/scrollbar_theme_aura.cc.orig	2020-03-16 14:04:24 UTC
> +++ src/3rdparty/chromium/third_party/blink/renderer/core/scroll/scrollbar_theme_aura.cc
>-@@ -332,7 +332,7 @@ ScrollbarPart ScrollbarThemeAura::InvalidateOnThumbPos
>+@@ -152,7 +152,7 @@ bool ScrollbarThemeAura::SupportsDragSnapBack() const 
>+ // Disable snapback on desktop Linux to better integrate with the desktop
>+ // behavior. Typically, Linux apps do not implement scrollbar snapback (this
>+ // is true for at least GTK and QT apps).
>+-#if (defined(OS_LINUX) && !defined(OS_CHROMEOS))
>++#if (defined(OS_LINUX) && !defined(OS_CHROMEOS)) || defined(OS_BSD)
>+   return false;
>+ #endif
>+ 
>+@@ -335,7 +335,7 @@ ScrollbarPart ScrollbarThemeAura::PartsToInvalidateOnT
>  
>  bool ScrollbarThemeAura::ShouldCenterOnThumb(const Scrollbar& scrollbar,
>                                               const WebMouseEvent& event) {
>@@ -9,12 +18,3 @@
>    if (event.button == WebPointerProperties::Button::kMiddle)
>      return true;
>  #endif
>-@@ -347,7 +347,7 @@ bool ScrollbarThemeAura::ShouldSnapBackToDragOrigin(
>- // Disable snapback on desktop Linux to better integrate with the desktop
>- // behavior.  Typically, Linux apps do not implement scrollbar snapback (this is
>- // true for at least GTK and QT apps).
>--#if (defined(OS_LINUX) && !defined(OS_CHROMEOS))
>-+#if (defined(OS_LINUX) && !defined(OS_CHROMEOS)) || defined(OS_BSD)
>-   return false;
>- #endif
>- 
>diff --git a/www/qt5-webengine/files/patch-src_3rdparty_chromium_third__party_blink_renderer_modules_mediastream_processed__local__audio__source.cc b/www/qt5-webengine/files/patch-src_3rdparty_chromium_third__party_blink_renderer_modules_mediastream_processed__local__audio__source.cc
>new file mode 100644
>index 000000000000..2c123e619050
>--- /dev/null
>+++ b/www/qt5-webengine/files/patch-src_3rdparty_chromium_third__party_blink_renderer_modules_mediastream_processed__local__audio__source.cc
>@@ -0,0 +1,11 @@
>+--- src/3rdparty/chromium/third_party/blink/renderer/modules/mediastream/processed_local_audio_source.cc.orig	2020-03-16 14:04:24 UTC
>++++ src/3rdparty/chromium/third_party/blink/renderer/modules/mediastream/processed_local_audio_source.cc
>+@@ -430,7 +430,7 @@ void ProcessedLocalAudioSource::CaptureUsingProcessor(
>+     bool key_pressed) {
>+ #if defined(OS_WIN) || defined(OS_MACOSX)
>+   DCHECK_LE(volume, 1.0);
>+-#elif (defined(OS_LINUX) && !defined(OS_CHROMEOS)) || defined(OS_OPENBSD)
>++#elif (defined(OS_LINUX) && !defined(OS_CHROMEOS)) || defined(OS_BSD)
>+   // We have a special situation on Linux where the microphone volume can be
>+   // "higher than maximum". The input volume slider in the sound preference
>+   // allows the user to set a scaling that is higher than 100%. It means that
>diff --git a/www/qt5-webengine/files/patch-src_3rdparty_chromium_third__party_blink_renderer_platform_fonts_font__cache.cc b/www/qt5-webengine/files/patch-src_3rdparty_chromium_third__party_blink_renderer_platform_fonts_font__cache.cc
>index fbdbc5bab073..bebd6e0da392 100644
>--- a/www/qt5-webengine/files/patch-src_3rdparty_chromium_third__party_blink_renderer_platform_fonts_font__cache.cc
>+++ b/www/qt5-webengine/files/patch-src_3rdparty_chromium_third__party_blink_renderer_platform_fonts_font__cache.cc
>@@ -1,4 +1,4 @@
>---- src/3rdparty/chromium/third_party/blink/renderer/platform/fonts/font_cache.cc.orig	2019-11-27 21:12:25 UTC
>+--- src/3rdparty/chromium/third_party/blink/renderer/platform/fonts/font_cache.cc.orig	2020-04-08 09:41:36 UTC
> +++ src/3rdparty/chromium/third_party/blink/renderer/platform/fonts/font_cache.cc
> @@ -76,7 +76,7 @@ static const char kColorEmojiLocale[] = "und-Zsye";
>  
>@@ -13,8 +13,8 @@
>  FontPlatformData* FontCache::SystemFontPlatformData(
>      const FontDescription& font_description) {
>    const AtomicString& family = FontCache::SystemFontFamily();
>--#if defined(OS_LINUX)
>-+#if defined(OS_LINUX) || defined(OS_BSD)
>+-#if defined(OS_LINUX) || defined(OS_FUCHSIA)
>++#if defined(OS_LINUX) || defined(OS_FUCHSIA) || defined(OS_BSD)
>    if (family.IsEmpty() || family == font_family_names::kSystemUi)
>      return nullptr;
>  #else
>diff --git a/www/qt5-webengine/files/patch-src_3rdparty_chromium_third__party_blink_renderer_platform_fonts_font__cache.h b/www/qt5-webengine/files/patch-src_3rdparty_chromium_third__party_blink_renderer_platform_fonts_font__cache.h
>index e7f56d46416a..d828f921c22b 100644
>--- a/www/qt5-webengine/files/patch-src_3rdparty_chromium_third__party_blink_renderer_platform_fonts_font__cache.h
>+++ b/www/qt5-webengine/files/patch-src_3rdparty_chromium_third__party_blink_renderer_platform_fonts_font__cache.h
>@@ -1,6 +1,15 @@
>---- src/3rdparty/chromium/third_party/blink/renderer/platform/fonts/font_cache.h.orig	2019-11-27 21:12:25 UTC
>+--- src/3rdparty/chromium/third_party/blink/renderer/platform/fonts/font_cache.h.orig	2020-04-08 09:41:36 UTC
> +++ src/3rdparty/chromium/third_party/blink/renderer/platform/fonts/font_cache.h
>-@@ -154,7 +154,7 @@ class PLATFORM_EXPORT FontCache {
>+@@ -58,7 +58,7 @@
>+ #include "third_party/skia/include/core/SkFontMgr.h"
>+ #include "third_party/skia/include/core/SkRefCnt.h"
>+ 
>+-#if defined(OS_LINUX)
>++#if defined(OS_LINUX) || defined(OS_BSD)
>+ #include "ui/gfx/font_fallback_linux.h"
>+ #endif
>+ 
>+@@ -166,7 +166,7 @@ class PLATFORM_EXPORT FontCache {
>    sk_sp<SkFontMgr> FontManager() { return font_manager_; }
>    static void SetFontManager(sk_sp<SkFontMgr>);
>  
>@@ -9,25 +18,21 @@
>    // These are needed for calling QueryRenderStyleForStrike, since
>    // gfx::GetFontRenderParams makes distinctions based on DSF.
>    static float DeviceScaleFactor() { return device_scale_factor_; }
>-@@ -215,7 +215,7 @@ class PLATFORM_EXPORT FontCache {
>+@@ -241,11 +241,11 @@ class PLATFORM_EXPORT FontCache {
>        const FontDescription&);
>  #endif  // defined(OS_ANDROID)
>  
> -#if defined(OS_LINUX)
> +#if defined(OS_LINUX) || defined(OS_BSD)
>-   struct PlatformFallbackFont {
>-     String name;
>-     std::string filename;
>-@@ -227,7 +227,7 @@ class PLATFORM_EXPORT FontCache {
>-   static void GetFontForCharacter(UChar32,
>+   static bool GetFontForCharacter(UChar32,
>                                    const char* preferred_locale,
>-                                   PlatformFallbackFont*);
>+                                   gfx::FallbackFontData*);
> -#endif  // defined(OS_LINUX)
> +#endif  // defined(OS_LINUX) || defined(OS_BSD)
>  
>    scoped_refptr<SimpleFontData> FontDataFromFontPlatformData(
>        const FontPlatformData*,
>-@@ -299,12 +299,12 @@ class PLATFORM_EXPORT FontCache {
>+@@ -317,12 +317,12 @@ class PLATFORM_EXPORT FontCache {
>                                     const FontFaceCreationParams&,
>                                     std::string& name);
>  
>@@ -42,8 +47,8 @@
>  
>    scoped_refptr<SimpleFontData> FallbackOnStandardFontStyle(
>        const FontDescription&,
>-@@ -336,7 +336,7 @@ class PLATFORM_EXPORT FontCache {
>-   bool is_test_font_mgr_ = false;
>+@@ -356,7 +356,7 @@ class PLATFORM_EXPORT FontCache {
>+   std::unique_ptr<FallbackFamilyStyleCache> fallback_params_cache_;
>  #endif  // defined(OS_WIN)
>  
> -#if defined(OS_LINUX) || defined(OS_CHROMEOS)
>diff --git a/www/qt5-webengine/files/patch-src_3rdparty_chromium_third__party_flatbuffers_src_include_flatbuffers_base.h b/www/qt5-webengine/files/patch-src_3rdparty_chromium_third__party_flatbuffers_src_include_flatbuffers_base.h
>deleted file mode 100644
>index 1aafdf3282ad..000000000000
>--- a/www/qt5-webengine/files/patch-src_3rdparty_chromium_third__party_flatbuffers_src_include_flatbuffers_base.h
>+++ /dev/null
>@@ -1,24 +0,0 @@
>---- src/3rdparty/chromium/third_party/flatbuffers/src/include/flatbuffers/base.h.orig	2019-05-23 12:39:34 UTC
>-+++ src/3rdparty/chromium/third_party/flatbuffers/src/include/flatbuffers/base.h
>-@@ -220,18 +220,15 @@ template<typename T> T EndianSwap(T t) {
>-   if (sizeof(T) == 1) {   // Compile-time if-then's.
>-     return t;
>-   } else if (sizeof(T) == 2) {
>--    union { T t; uint16_t i; } u;
>--    u.t = t;
>-+    union U { T t; uint16_t i; U(const T& t_) : t(t_) {}} u(t);
>-     u.i = FLATBUFFERS_BYTESWAP16(u.i);
>-     return u.t;
>-   } else if (sizeof(T) == 4) {
>--    union { T t; uint32_t i; } u;
>--    u.t = t;
>-+    union U { T t; uint32_t i; U(const T& t_) : t(t_) {}} u(t);
>-     u.i = FLATBUFFERS_BYTESWAP32(u.i);
>-     return u.t;
>-   } else if (sizeof(T) == 8) {
>--    union { T t; uint64_t i; } u;
>--    u.t = t;
>-+    union U { T t; uint64_t i; U(const T& t_) : t(t_) {}} u(t);
>-     u.i = FLATBUFFERS_BYTESWAP64(u.i);
>-     return u.t;
>-   } else {
>diff --git a/www/qt5-webengine/files/patch-src_3rdparty_chromium_third__party_flatbuffers_src_include_flatbuffers_minireflect.h b/www/qt5-webengine/files/patch-src_3rdparty_chromium_third__party_flatbuffers_src_include_flatbuffers_minireflect.h
>deleted file mode 100644
>index 8d26cd9b60a0..000000000000
>--- a/www/qt5-webengine/files/patch-src_3rdparty_chromium_third__party_flatbuffers_src_include_flatbuffers_minireflect.h
>+++ /dev/null
>@@ -1,73 +0,0 @@
>---- src/3rdparty/chromium/third_party/flatbuffers/src/include/flatbuffers/minireflect.h.orig	2019-05-23 12:39:34 UTC
>-+++ src/3rdparty/chromium/third_party/flatbuffers/src/include/flatbuffers/minireflect.h
>-@@ -122,58 +122,58 @@ inline void IterateValue(ElementaryType type, const ui
>-                          soffset_t vector_index, IterationVisitor *visitor) {
>-   switch (type) {
>-     case ET_UTYPE: {
>--      auto tval = *reinterpret_cast<const uint8_t *>(val);
>-+      auto tval = ReadScalar<uint8_t>(val);
>-       visitor->UType(tval, EnumName(tval, type_table));
>-       break;
>-     }
>-     case ET_BOOL: {
>--      visitor->Bool(*reinterpret_cast<const uint8_t *>(val) != 0);
>-+      visitor->Bool(ReadScalar<uint8_t>(val) != 0);
>-       break;
>-     }
>-     case ET_CHAR: {
>--      auto tval = *reinterpret_cast<const int8_t *>(val);
>-+      auto tval = ReadScalar<int8_t>(val);
>-       visitor->Char(tval, EnumName(tval, type_table));
>-       break;
>-     }
>-     case ET_UCHAR: {
>--      auto tval = *reinterpret_cast<const uint8_t *>(val);
>-+      auto tval = ReadScalar<uint8_t>(val);
>-       visitor->UChar(tval, EnumName(tval, type_table));
>-       break;
>-     }
>-     case ET_SHORT: {
>--      auto tval = *reinterpret_cast<const int16_t *>(val);
>-+      auto tval = ReadScalar<int16_t>(val);
>-       visitor->Short(tval, EnumName(tval, type_table));
>-       break;
>-     }
>-     case ET_USHORT: {
>--      auto tval = *reinterpret_cast<const uint16_t *>(val);
>-+      auto tval = ReadScalar<uint16_t>(val);
>-       visitor->UShort(tval, EnumName(tval, type_table));
>-       break;
>-     }
>-     case ET_INT: {
>--      auto tval = *reinterpret_cast<const int32_t *>(val);
>-+      auto tval = ReadScalar<int32_t>(val);
>-       visitor->Int(tval, EnumName(tval, type_table));
>-       break;
>-     }
>-     case ET_UINT: {
>--      auto tval = *reinterpret_cast<const uint32_t *>(val);
>-+      auto tval = ReadScalar<uint32_t>(val);
>-       visitor->UInt(tval, EnumName(tval, type_table));
>-       break;
>-     }
>-     case ET_LONG: {
>--      visitor->Long(*reinterpret_cast<const int64_t *>(val));
>-+      visitor->Long(ReadScalar<int64_t>(val));
>-       break;
>-     }
>-     case ET_ULONG: {
>--      visitor->ULong(*reinterpret_cast<const uint64_t *>(val));
>-+      visitor->ULong(ReadScalar<uint64_t>(val));
>-       break;
>-     }
>-     case ET_FLOAT: {
>--      visitor->Float(*reinterpret_cast<const float *>(val));
>-+      visitor->Float(ReadScalar<float>(val));
>-       break;
>-     }
>-     case ET_DOUBLE: {
>--      visitor->Double(*reinterpret_cast<const double *>(val));
>-+      visitor->Double(ReadScalar<double>(val));
>-       break;
>-     }
>-     case ET_STRING: {
>diff --git a/www/qt5-webengine/files/patch-src_3rdparty_chromium_third__party_perfetto_include_perfetto_ext_base_time.h b/www/qt5-webengine/files/patch-src_3rdparty_chromium_third__party_perfetto_include_perfetto_base_time.h
>similarity index 93%
>rename from www/qt5-webengine/files/patch-src_3rdparty_chromium_third__party_perfetto_include_perfetto_ext_base_time.h
>rename to www/qt5-webengine/files/patch-src_3rdparty_chromium_third__party_perfetto_include_perfetto_base_time.h
>index b5b966160dfd..85a41bc4a2d8 100644
>--- a/www/qt5-webengine/files/patch-src_3rdparty_chromium_third__party_perfetto_include_perfetto_ext_base_time.h
>+++ b/www/qt5-webengine/files/patch-src_3rdparty_chromium_third__party_perfetto_include_perfetto_base_time.h
>@@ -1,5 +1,5 @@
>---- src/3rdparty/chromium/third_party/perfetto/include/perfetto/ext/base/time.h.orig	2019-11-27 21:12:25 UTC
>-+++ src/3rdparty/chromium/third_party/perfetto/include/perfetto/ext/base/time.h
>+--- src/3rdparty/chromium/third_party/perfetto/include/perfetto/base/time.h.orig	2020-03-16 14:04:24 UTC
>++++ src/3rdparty/chromium/third_party/perfetto/include/perfetto/base/time.h
> @@ -123,6 +123,9 @@ inline TimeNanos GetTimeInternalNs(clockid_t clk_id) {
>  // Return ns from boot. Conversely to GetWallTimeNs, this clock counts also time
>  // during suspend (when supported).
>diff --git a/www/qt5-webengine/files/patch-src_3rdparty_chromium_third__party_skia_src_opts_SkRasterPipeline__opts.h b/www/qt5-webengine/files/patch-src_3rdparty_chromium_third__party_skia_src_opts_SkRasterPipeline__opts.h
>index ead17cf27510..a849c519e8df 100644
>--- a/www/qt5-webengine/files/patch-src_3rdparty_chromium_third__party_skia_src_opts_SkRasterPipeline__opts.h
>+++ b/www/qt5-webengine/files/patch-src_3rdparty_chromium_third__party_skia_src_opts_SkRasterPipeline__opts.h
>@@ -1,11 +1,25 @@
>---- src/3rdparty/chromium/third_party/skia/src/opts/SkRasterPipeline_opts.h.orig	2020-05-25 17:49:17 UTC
>+--- src/3rdparty/chromium/third_party/skia/src/opts/SkRasterPipeline_opts.h.orig	2020-05-31 18:04:09 UTC
> +++ src/3rdparty/chromium/third_party/skia/src/opts/SkRasterPipeline_opts.h
>-@@ -996,7 +996,7 @@ SI F from_half(U16 h) {
>+@@ -988,9 +988,7 @@ SI F approx_powf(F x, F y) {
>+ SI F from_half(U16 h) {
>+ #if defined(JUMPER_IS_NEON) && defined(SK_CPU_ARM64) \
>+     && !defined(SK_BUILD_FOR_GOOGLE3)  // Temporary workaround for some Google3 builds.
>+-    __fp16 fp16;
>+-    memcpy(&fp16, &h, sizeof(U16));
>+-    return float(fp16);
>++    return vcvt_f32_f16(h);
>  
>+ #elif defined(JUMPER_IS_HSW) || defined(JUMPER_IS_AVX512)
>+     return _mm256_cvtph_ps(h);
>+@@ -1011,10 +1009,7 @@ SI F from_half(U16 h) {
>  SI U16 to_half(F f) {
>  #if defined(JUMPER_IS_NEON) && defined(SK_CPU_ARM64) \
>--    && !defined(SK_BUILD_FOR_GOOGLE3)  // Temporary workaround for some Google3 builds.
>-+    && ! (defined(SK_BUILD_FOR_GOOGLE3) || defined(ARMV8_OS_FREEBSD))  // Temporary workaround for some Google3 builds.
>-     __fp16 fp16 = __fp16(f);
>-     U16 u16;
>-     memcpy(&u16, &fp16, sizeof(U16));
>+     && !defined(SK_BUILD_FOR_GOOGLE3)  // Temporary workaround for some Google3 builds.
>+-    __fp16 fp16 = __fp16(f);
>+-    U16 u16;
>+-    memcpy(&u16, &fp16, sizeof(U16));
>+-    return u16;
>++    return vcvt_f16_f32(f);
>+ 
>+ #elif defined(JUMPER_IS_HSW) || defined(JUMPER_IS_AVX512)
>+     return _mm256_cvtps_ph(f, _MM_FROUND_CUR_DIRECTION);
>diff --git a/www/qt5-webengine/files/patch-src_3rdparty_chromium_third__party_webrtc_common__audio_wav__file.cc b/www/qt5-webengine/files/patch-src_3rdparty_chromium_third__party_webrtc_common__audio_wav__file.cc
>deleted file mode 100644
>index 556dcba397a2..000000000000
>--- a/www/qt5-webengine/files/patch-src_3rdparty_chromium_third__party_webrtc_common__audio_wav__file.cc
>+++ /dev/null
>@@ -1,49 +0,0 @@
>---- src/3rdparty/chromium/third_party/webrtc/common_audio/wav_file.cc.orig	2019-11-27 21:12:25 UTC
>-+++ src/3rdparty/chromium/third_party/webrtc/common_audio/wav_file.cc
>-@@ -102,13 +102,15 @@ size_t WavReader::num_samples() const {
>- }
>- 
>- size_t WavReader::ReadSamples(size_t num_samples, int16_t* samples) {
>--#ifndef WEBRTC_ARCH_LITTLE_ENDIAN
>--#error "Need to convert samples to big-endian when reading from WAV file"
>--#endif
>-   // There could be metadata after the audio; ensure we don't read it.
>-   num_samples = std::min(num_samples, num_samples_remaining_);
>-   const size_t read =
>-       fread(samples, sizeof(*samples), num_samples, file_handle_);
>-+#ifndef WEBRTC_ARCH_LITTLE_ENDIAN
>-+  for (size_t i = 0; i < read; i++) {
>-+      samples[i] = __builtin_bswap16(samples[i]);
>-+  }
>-+#endif
>-   // If we didn't read what was requested, ensure we've reached the EOF.
>-   RTC_CHECK(read == num_samples || feof(file_handle_));
>-   RTC_CHECK_LE(read, num_samples_remaining_);
>-@@ -179,11 +181,25 @@ size_t WavWriter::num_samples() const {
>- 
>- void WavWriter::WriteSamples(const int16_t* samples, size_t num_samples) {
>- #ifndef WEBRTC_ARCH_LITTLE_ENDIAN
>--#error "Need to convert samples to little-endian when writing to WAV file"
>--#endif
>-+  static const size_t kChunksize = 4096 / sizeof(uint16_t);
>-+  for (size_t i = 0; i < num_samples; i += kChunksize) {
>-+    int16_t isamples[kChunksize];
>-+    const size_t chunk = std::min(kChunksize, num_samples - i);
>-+    for (size_t j = 0; j < chunk; j++) {
>-+      isamples[j] = __builtin_bswap16(samples[i + j]);
>-+    }
>-+    const size_t written =
>-+    fwrite(isamples, sizeof(*isamples), chunk, file_handle_);
>-+    RTC_CHECK_EQ(chunk, written);
>-+    num_samples_ += written;
>-+    RTC_CHECK(num_samples_ >= written);  // detect size_t overflow
>-+  }
>-+#else
>-+	 
>-   RTC_CHECK(file_.Write(samples, sizeof(*samples) * num_samples));
>-   num_samples_ += num_samples;
>-   RTC_CHECK(num_samples_ >= num_samples);  // detect size_t overflow
>-+#endif
>- }
>- 
>- void WavWriter::WriteSamples(const float* samples, size_t num_samples) {
>diff --git a/www/qt5-webengine/files/patch-src_3rdparty_chromium_third__party_webrtc_rtc__base_third__party_sigslot_sigslot.h b/www/qt5-webengine/files/patch-src_3rdparty_chromium_third__party_webrtc_rtc__base_third__party_sigslot_sigslot.h
>new file mode 100644
>index 000000000000..dd114b8533a5
>--- /dev/null
>+++ b/www/qt5-webengine/files/patch-src_3rdparty_chromium_third__party_webrtc_rtc__base_third__party_sigslot_sigslot.h
>@@ -0,0 +1,19 @@
>+--- src/3rdparty/chromium/third_party/webrtc/rtc_base/third_party/sigslot/sigslot.h.orig	2020-04-08 09:41:36 UTC
>++++ src/3rdparty/chromium/third_party/webrtc/rtc_base/third_party/sigslot/sigslot.h
>+@@ -178,6 +178,8 @@ class multi_threaded_local {
>+ #endif  // _SIGSLOT_HAS_WIN32_THREADS
>+ 
>+ #ifdef _SIGSLOT_HAS_POSIX_THREADS
>++#pragma GCC diagnostic push
>++#pragma GCC diagnostic ignored "-Wthread-safety-analysis"
>+ // The multi threading policies only get compiled in if they are enabled.
>+ class multi_threaded_global {
>+  public:
>+@@ -201,6 +203,7 @@ class multi_threaded_local {
>+  private:
>+   pthread_mutex_t m_mutex;
>+ };
>++#pragma GCC diagnostic pop
>+ #endif  // _SIGSLOT_HAS_POSIX_THREADS
>+ 
>+ template <class mt_policy>
>diff --git a/www/qt5-webengine/files/patch-src_3rdparty_chromium_ui_base_webui_web__ui__util.cc b/www/qt5-webengine/files/patch-src_3rdparty_chromium_ui_base_webui_web__ui__util.cc
>new file mode 100644
>index 000000000000..0a0178a00a4e
>--- /dev/null
>+++ b/www/qt5-webengine/files/patch-src_3rdparty_chromium_ui_base_webui_web__ui__util.cc
>@@ -0,0 +1,11 @@
>+--- src/3rdparty/chromium/ui/base/webui/web_ui_util.cc.orig	2020-03-16 14:04:24 UTC
>++++ src/3rdparty/chromium/ui/base/webui/web_ui_util.cc
>+@@ -227,7 +227,7 @@ std::string GetFontFamily() {
>+ 
>+ // TODO(dnicoara) Remove Ozone check when PlatformFont support is introduced
>+ // into Ozone: crbug.com/320050
>+-#if defined(OS_LINUX) && !defined(OS_CHROMEOS) && !defined(USE_OZONE)
>++#if (defined(OS_LINUX) || defined(OS_BSD)) && !defined(OS_CHROMEOS) && !defined(USE_OZONE)
>+   font_family = ui::ResourceBundle::GetSharedInstance().GetFont(
>+       ui::ResourceBundle::BaseFont).GetFontName() + ", " + font_family;
>+ #endif
>diff --git a/www/qt5-webengine/files/patch-src_3rdparty_chromium_ui_base_x_x11__shm__image__pool__base.cc b/www/qt5-webengine/files/patch-src_3rdparty_chromium_ui_base_x_x11__shm__image__pool__base.cc
>new file mode 100644
>index 000000000000..9b08a7ec6d0b
>--- /dev/null
>+++ b/www/qt5-webengine/files/patch-src_3rdparty_chromium_ui_base_x_x11__shm__image__pool__base.cc
>@@ -0,0 +1,43 @@
>+--- src/3rdparty/chromium/ui/base/x/x11_shm_image_pool_base.cc.orig	2020-04-08 09:41:36 UTC
>++++ src/3rdparty/chromium/ui/base/x/x11_shm_image_pool_base.cc
>+@@ -16,6 +16,7 @@
>+ #include "base/environment.h"
>+ #include "base/location.h"
>+ #include "base/strings/string_util.h"
>++#include "base/system/sys_info.h"
>+ #include "base/threading/thread_task_runner_handle.h"
>+ #include "build/build_config.h"
>+ #include "ui/events/platform/platform_event_dispatcher.h"
>+@@ -43,10 +44,14 @@ constexpr float kShmResizeShrinkThreshold =
>+     1.0f / (kShmResizeThreshold * kShmResizeThreshold);
>+ 
>+ std::size_t MaxShmSegmentSizeImpl() {
>++#if defined(OS_BSD)
>++  return base::SysInfo::MaxSharedMemorySize();
>++#else
>+   struct shminfo info;
>+   if (shmctl(0, IPC_INFO, reinterpret_cast<struct shmid_ds*>(&info)) == -1)
>+     return 0;
>+   return info.shmmax;
>++#endif
>+ }
>+ 
>+ std::size_t MaxShmSegmentSize() {
>+@@ -172,7 +177,7 @@ bool XShmImagePoolBase::Resize(const gfx::Size& pixel_
>+         shmctl(state.shminfo_.shmid, IPC_RMID, 0);
>+         return false;
>+       }
>+-#if defined(OS_LINUX)
>++#if defined(OS_LINUX) || defined(OS_BSD)
>+       // On Linux, a shmid can still be attached after IPC_RMID if otherwise
>+       // kept alive.  Detach before XShmAttach to prevent a memory leak in case
>+       // the process dies.
>+@@ -182,7 +187,7 @@ bool XShmImagePoolBase::Resize(const gfx::Size& pixel_
>+       if (!XShmAttach(display_, &state.shminfo_))
>+         return false;
>+       state.shmem_attached_to_server_ = true;
>+-#if !defined(OS_LINUX)
>++#if !defined(OS_LINUX) && !defined(OS_BSD)
>+       // The Linux-specific shmctl behavior above may not be portable, so we're
>+       // forced to do IPC_RMID after the server has attached to the segment.
>+       // XShmAttach is asynchronous, so we must also sync.
>diff --git a/www/qt5-webengine/files/patch-src_3rdparty_chromium_ui_compositor_compositor.cc b/www/qt5-webengine/files/patch-src_3rdparty_chromium_ui_compositor_compositor.cc
>new file mode 100644
>index 000000000000..1f2b84b597a0
>--- /dev/null
>+++ b/www/qt5-webengine/files/patch-src_3rdparty_chromium_ui_compositor_compositor.cc
>@@ -0,0 +1,11 @@
>+--- src/3rdparty/chromium/ui/compositor/compositor.cc.orig	2020-03-16 14:04:24 UTC
>++++ src/3rdparty/chromium/ui/compositor/compositor.cc
>+@@ -681,7 +681,7 @@ void Compositor::OnFrameTokenChanged(uint32_t frame_to
>+   NOTREACHED();
>+ }
>+ 
>+-#if defined(OS_LINUX) && !defined(OS_CHROMEOS)
>++#if (defined(OS_LINUX) && !defined(OS_CHROMEOS)) || defined(OS_BSD)
>+ void Compositor::OnCompleteSwapWithNewSize(const gfx::Size& size) {
>+   for (auto& observer : observer_list_)
>+     observer.OnCompositingCompleteSwapWithNewSize(this, size);
>diff --git a/www/qt5-webengine/files/patch-src_3rdparty_chromium_ui_compositor_compositor.h b/www/qt5-webengine/files/patch-src_3rdparty_chromium_ui_compositor_compositor.h
>new file mode 100644
>index 000000000000..9c89d86720eb
>--- /dev/null
>+++ b/www/qt5-webengine/files/patch-src_3rdparty_chromium_ui_compositor_compositor.h
>@@ -0,0 +1,11 @@
>+--- src/3rdparty/chromium/ui/compositor/compositor.h.orig	2020-03-16 14:04:24 UTC
>++++ src/3rdparty/chromium/ui/compositor/compositor.h
>+@@ -412,7 +412,7 @@ class COMPOSITOR_EXPORT Compositor : public cc::LayerT
>+   void OnFirstSurfaceActivation(const viz::SurfaceInfo& surface_info) override;
>+   void OnFrameTokenChanged(uint32_t frame_token) override;
>+ 
>+-#if defined(OS_LINUX) && !defined(OS_CHROMEOS)
>++#if (defined(OS_LINUX) && !defined(OS_CHROMEOS)) || defined(OS_BSD)
>+   void OnCompleteSwapWithNewSize(const gfx::Size& size);
>+ #endif
>+ 
>diff --git a/www/qt5-webengine/files/patch-src_3rdparty_chromium_ui_compositor_compositor__observer.h b/www/qt5-webengine/files/patch-src_3rdparty_chromium_ui_compositor_compositor__observer.h
>new file mode 100644
>index 000000000000..5769d7057408
>--- /dev/null
>+++ b/www/qt5-webengine/files/patch-src_3rdparty_chromium_ui_compositor_compositor__observer.h
>@@ -0,0 +1,16 @@
>+--- src/3rdparty/chromium/ui/compositor/compositor_observer.h.orig	2020-03-16 14:04:24 UTC
>++++ src/3rdparty/chromium/ui/compositor/compositor_observer.h
>+@@ -42,11 +42,11 @@ class COMPOSITOR_EXPORT CompositorObserver {
>+   // Called when a child of the compositor is resizing.
>+   virtual void OnCompositingChildResizing(Compositor* compositor) {}
>+ 
>+-#if defined(OS_LINUX) && !defined(OS_CHROMEOS)
>++#if (defined(OS_LINUX) && !defined(OS_CHROMEOS)) || defined(OS_BSD)
>+   // Called when a swap with new size is completed.
>+   virtual void OnCompositingCompleteSwapWithNewSize(ui::Compositor* compositor,
>+                                                     const gfx::Size& size) {}
>+-#endif  // defined(OS_LINUX)
>++#endif  // defined(OS_LINUX) || defined(OS_BSD)
>+ 
>+   // Called at the top of the compositor's destructor, to give observers a
>+   // chance to remove themselves.
>diff --git a/www/qt5-webengine/files/patch-src_3rdparty_chromium_ui_compositor_host_host__context__factory__private.cc b/www/qt5-webengine/files/patch-src_3rdparty_chromium_ui_compositor_host_host__context__factory__private.cc
>new file mode 100644
>index 000000000000..74862ac85de6
>--- /dev/null
>+++ b/www/qt5-webengine/files/patch-src_3rdparty_chromium_ui_compositor_host_host__context__factory__private.cc
>@@ -0,0 +1,11 @@
>+--- src/3rdparty/chromium/ui/compositor/host/host_context_factory_private.cc.orig	2020-03-16 14:04:24 UTC
>++++ src/3rdparty/chromium/ui/compositor/host/host_context_factory_private.cc
>+@@ -31,7 +31,7 @@ namespace {
>+ 
>+ static const char* kBrowser = "Browser";
>+ 
>+-#if defined(OS_LINUX) && !defined(OS_CHROMEOS)
>++#if (defined(OS_LINUX) && !defined(OS_CHROMEOS)) || defined(OS_BSD)
>+ class HostDisplayClient : public viz::HostDisplayClient {
>+  public:
>+   explicit HostDisplayClient(ui::Compositor* compositor)
>diff --git a/www/qt5-webengine/files/patch-src_3rdparty_chromium_ui_gfx_color__analysis.cc b/www/qt5-webengine/files/patch-src_3rdparty_chromium_ui_gfx_color__analysis.cc
>index d227a65ba74a..4e36c51d4810 100644
>--- a/www/qt5-webengine/files/patch-src_3rdparty_chromium_ui_gfx_color__analysis.cc
>+++ b/www/qt5-webengine/files/patch-src_3rdparty_chromium_ui_gfx_color__analysis.cc
>@@ -1,14 +1,14 @@
>---- src/3rdparty/chromium/ui/gfx/color_analysis.cc.orig	2019-05-23 12:39:34 UTC
>+--- src/3rdparty/chromium/ui/gfx/color_analysis.cc.orig	2020-04-08 09:41:36 UTC
> +++ src/3rdparty/chromium/ui/gfx/color_analysis.cc
>-@@ -16,6 +16,7 @@
>- #include <vector>
>- 
>+@@ -18,6 +18,7 @@
>+ #include "base/bind.h"
>+ #include "base/callback.h"
>  #include "base/logging.h"
> +#include "base/sys_byteorder.h"
>+ #include "base/numerics/ranges.h"
>  #include "third_party/skia/include/core/SkBitmap.h"
>  #include "third_party/skia/include/core/SkUnPreMultiply.h"
>- #include "ui/gfx/codec/png_codec.h"
>-@@ -506,10 +507,17 @@ SkColor FindClosestColor(const uint8_t* image,
>+@@ -438,10 +439,17 @@ SkColor FindClosestColor(const uint8_t* image,
>    SkColor best_color = color;
>    const uint8_t* byte = image;
>    for (int i = 0; i < width * height; ++i) {
>@@ -26,7 +26,7 @@
>      // Ignore fully transparent pixels.
>      if (a == 0)
>        continue;
>-@@ -527,7 +535,6 @@ SkColor FindClosestColor(const uint8_t* image,
>+@@ -459,7 +467,6 @@ SkColor FindClosestColor(const uint8_t* image,
>  
>  // For a 16x16 icon on an Intel Core i5 this function takes approximately
>  // 0.5 ms to run.
>@@ -34,7 +34,7 @@
>  SkColor CalculateKMeanColorOfBuffer(uint8_t* decoded_data,
>                                      int img_width,
>                                      int img_height,
>-@@ -550,10 +557,17 @@ SkColor CalculateKMeanColorOfBuffer(uint8_t* decoded_d
>+@@ -482,10 +489,17 @@ SkColor CalculateKMeanColorOfBuffer(uint8_t* decoded_d
>          int pixel_pos = sampler->GetSample(img_width, img_height) %
>              (img_width * img_height);
>  
>@@ -52,7 +52,7 @@
>          // Skip fully transparent pixels as they usually contain black in their
>          // RGB channels but do not contribute to the visual image.
>          if (a == 0)
>-@@ -602,10 +616,17 @@ SkColor CalculateKMeanColorOfBuffer(uint8_t* decoded_d
>+@@ -534,10 +548,17 @@ SkColor CalculateKMeanColorOfBuffer(uint8_t* decoded_d
>        uint8_t* pixel = decoded_data;
>        uint8_t* decoded_data_end = decoded_data + (img_width * img_height * 4);
>        while (pixel < decoded_data_end) {
>@@ -70,7 +70,7 @@
>          // Skip transparent pixels, see above.
>          if (a == 0)
>            continue;
>-@@ -683,8 +704,12 @@ SkColor CalculateKMeanColorOfPNG(scoped_refptr<base::R
>+@@ -615,8 +636,12 @@ SkColor CalculateKMeanColorOfPNG(scoped_refptr<base::R
>  
>    if (png.get() && png->size() &&
>        gfx::PNGCodec::Decode(png->front(), png->size(),
>diff --git a/www/qt5-webengine/files/patch-src_3rdparty_chromium_ui_gfx_font__util.cc b/www/qt5-webengine/files/patch-src_3rdparty_chromium_ui_gfx_font__util.cc
>new file mode 100644
>index 000000000000..9d20fb9830bd
>--- /dev/null
>+++ b/www/qt5-webengine/files/patch-src_3rdparty_chromium_ui_gfx_font__util.cc
>@@ -0,0 +1,25 @@
>+--- src/3rdparty/chromium/ui/gfx/font_util.cc.orig	2020-03-16 14:04:24 UTC
>++++ src/3rdparty/chromium/ui/gfx/font_util.cc
>+@@ -6,7 +6,7 @@
>+ 
>+ #include "build/build_config.h"
>+ 
>+-#if defined(OS_LINUX)
>++#if defined(OS_LINUX) || defined(OS_BSD)
>+ #include <fontconfig/fontconfig.h>
>+ #include "ui/gfx/linux/fontconfig_util.h"
>+ #endif
>+@@ -24,11 +24,11 @@ void InitializeFonts() {
>+   // background (resources have not yet been granted to cast) since it prevents
>+   // the long delay the user would have seen on first rendering.
>+ 
>+-#if defined(OS_LINUX)
>++#if defined(OS_LINUX) || defined(OS_BSD)
>+   // Ensures the config is created on this thread.
>+   FcConfig* config = GetGlobalFontConfig();
>+   DCHECK(config);
>+-#endif  // OS_LINUX
>++#endif  // OS_LINUX || OS_BSD
>+ 
>+ #if defined(OS_WIN)
>+   gfx::win::InitializeDirectWrite();
>diff --git a/www/qt5-webengine/files/patch-src_3rdparty_chromium_ui_gfx_gpu__memory__buffer.cc b/www/qt5-webengine/files/patch-src_3rdparty_chromium_ui_gfx_gpu__memory__buffer.cc
>new file mode 100644
>index 000000000000..86d8a62ad8c7
>--- /dev/null
>+++ b/www/qt5-webengine/files/patch-src_3rdparty_chromium_ui_gfx_gpu__memory__buffer.cc
>@@ -0,0 +1,11 @@
>+--- src/3rdparty/chromium/ui/gfx/gpu_memory_buffer.cc.orig	2020-03-16 14:04:24 UTC
>++++ src/3rdparty/chromium/ui/gfx/gpu_memory_buffer.cc
>+@@ -28,7 +28,7 @@ GpuMemoryBufferHandle GpuMemoryBufferHandle::Clone() c
>+   handle.region = region.Duplicate();
>+   handle.offset = offset;
>+   handle.stride = stride;
>+-#if defined(OS_LINUX) || defined(OS_FUCHSIA)
>++#if defined(OS_LINUX) || defined(OS_FUCHSIA) || defined(OS_BSD)
>+   handle.native_pixmap_handle = CloneHandleForIPC(native_pixmap_handle);
>+ #elif defined(OS_MACOSX) && !defined(OS_IOS)
>+   NOTIMPLEMENTED();
>diff --git a/www/qt5-webengine/files/patch-src_3rdparty_chromium_ui_gfx_ipc_gfx__param__traits__macros.h b/www/qt5-webengine/files/patch-src_3rdparty_chromium_ui_gfx_ipc_gfx__param__traits__macros.h
>index 74380c450bc7..d02d1fe690a4 100644
>--- a/www/qt5-webengine/files/patch-src_3rdparty_chromium_ui_gfx_ipc_gfx__param__traits__macros.h
>+++ b/www/qt5-webengine/files/patch-src_3rdparty_chromium_ui_gfx_ipc_gfx__param__traits__macros.h
>@@ -1,4 +1,4 @@
>---- src/3rdparty/chromium/ui/gfx/ipc/gfx_param_traits_macros.h.orig	2019-11-27 21:12:25 UTC
>+--- src/3rdparty/chromium/ui/gfx/ipc/gfx_param_traits_macros.h.orig	2020-03-16 14:04:24 UTC
> +++ src/3rdparty/chromium/ui/gfx/ipc/gfx_param_traits_macros.h
> @@ -18,7 +18,7 @@
>  #include "ui/gfx/selection_bound.h"
>@@ -33,3 +33,12 @@
>    IPC_STRUCT_TRAITS_MEMBER(fd)
>  #elif defined(OS_FUCHSIA)
>    IPC_STRUCT_TRAITS_MEMBER(vmo)
>+@@ -80,7 +80,7 @@ IPC_STRUCT_TRAITS_END()
>+ 
>+ IPC_STRUCT_TRAITS_BEGIN(gfx::NativePixmapHandle)
>+   IPC_STRUCT_TRAITS_MEMBER(planes)
>+-#if defined(OS_LINUX)
>++#if defined(OS_LINUX) || defined(OS_BSD)
>+   IPC_STRUCT_TRAITS_MEMBER(modifier)
>+ #endif
>+ #if defined(OS_FUCHSIA)
>diff --git a/www/qt5-webengine/files/patch-src_3rdparty_chromium_ui_gfx_mojo_buffer__types__struct__traits.cc b/www/qt5-webengine/files/patch-src_3rdparty_chromium_ui_gfx_mojom_buffer__types__mojom__traits.cc
>similarity index 78%
>rename from www/qt5-webengine/files/patch-src_3rdparty_chromium_ui_gfx_mojo_buffer__types__struct__traits.cc
>rename to www/qt5-webengine/files/patch-src_3rdparty_chromium_ui_gfx_mojom_buffer__types__mojom__traits.cc
>index 02a6078491a9..4783ac3a12c1 100644
>--- a/www/qt5-webengine/files/patch-src_3rdparty_chromium_ui_gfx_mojo_buffer__types__struct__traits.cc
>+++ b/www/qt5-webengine/files/patch-src_3rdparty_chromium_ui_gfx_mojom_buffer__types__mojom__traits.cc
>@@ -1,5 +1,5 @@
>---- src/3rdparty/chromium/ui/gfx/mojo/buffer_types_struct_traits.cc.orig	2020-04-05 18:54:38 UTC
>-+++ src/3rdparty/chromium/ui/gfx/mojo/buffer_types_struct_traits.cc
>+--- src/3rdparty/chromium/ui/gfx/mojom/buffer_types_mojom_traits.cc.orig	2020-03-16 14:04:24 UTC
>++++ src/3rdparty/chromium/ui/gfx/mojom/buffer_types_mojom_traits.cc
> @@ -24,15 +24,15 @@ bool StructTraits<gfx::mojom::BufferUsageAndFormatData
>    return data.ReadUsage(&out->usage) && data.ReadFormat(&out->format);
>  }
>@@ -37,8 +37,17 @@
>  
>    return true;
>  }
>-@@ -71,7 +71,7 @@ bool StructTraits<
>+@@ -62,7 +62,7 @@ bool StructTraits<
>+     gfx::mojom::NativePixmapHandleDataView,
>+     gfx::NativePixmapHandle>::Read(gfx::mojom::NativePixmapHandleDataView data,
>+                                    gfx::NativePixmapHandle* out) {
>+-#if defined(OS_LINUX)
>++#if defined(OS_LINUX) || defined(OS_BSD)
>    out->modifier = data.modifier();
>+ #endif
>+ 
>+@@ -75,7 +75,7 @@ bool StructTraits<
>+ 
>    return data.ReadPlanes(&out->planes);
>  }
> -#endif  // defined(OS_LINUX) || defined(USE_OZONE)
>@@ -46,7 +55,7 @@
>  
>  gfx::mojom::GpuMemoryBufferPlatformHandlePtr StructTraits<
>      gfx::mojom::GpuMemoryBufferHandleDataView,
>-@@ -84,7 +84,7 @@ gfx::mojom::GpuMemoryBufferPlatformHandlePtr StructTra
>+@@ -88,7 +88,7 @@ gfx::mojom::GpuMemoryBufferPlatformHandlePtr StructTra
>        return gfx::mojom::GpuMemoryBufferPlatformHandle::NewSharedMemoryHandle(
>            std::move(handle.region));
>      case gfx::NATIVE_PIXMAP:
>@@ -55,7 +64,7 @@
>        return gfx::mojom::GpuMemoryBufferPlatformHandle::NewNativePixmapHandle(
>            std::move(handle.native_pixmap_handle));
>  #else
>-@@ -160,7 +160,7 @@ bool StructTraits<gfx::mojom::GpuMemoryBufferHandleDat
>+@@ -164,7 +164,7 @@ bool StructTraits<gfx::mojom::GpuMemoryBufferHandleDat
>        out->type = gfx::SHARED_MEMORY_BUFFER;
>        out->region = std::move(platform_handle->get_shared_memory_handle());
>        return true;
>diff --git a/www/qt5-webengine/files/patch-src_3rdparty_chromium_ui_gfx_mojo_buffer__types__struct__traits.h b/www/qt5-webengine/files/patch-src_3rdparty_chromium_ui_gfx_mojom_buffer__types__mojom__traits.h
>similarity index 50%
>rename from www/qt5-webengine/files/patch-src_3rdparty_chromium_ui_gfx_mojo_buffer__types__struct__traits.h
>rename to www/qt5-webengine/files/patch-src_3rdparty_chromium_ui_gfx_mojom_buffer__types__mojom__traits.h
>index b343337a83e9..0f073697fb0b 100644
>--- a/www/qt5-webengine/files/patch-src_3rdparty_chromium_ui_gfx_mojo_buffer__types__struct__traits.h
>+++ b/www/qt5-webengine/files/patch-src_3rdparty_chromium_ui_gfx_mojom_buffer__types__mojom__traits.h
>@@ -1,6 +1,6 @@
>---- src/3rdparty/chromium/ui/gfx/mojo/buffer_types_struct_traits.h.orig	2020-04-05 18:58:53 UTC
>-+++ src/3rdparty/chromium/ui/gfx/mojo/buffer_types_struct_traits.h
>-@@ -193,7 +193,7 @@ struct StructTraits<gfx::mojom::GpuMemoryBufferIdDataV
>+--- src/3rdparty/chromium/ui/gfx/mojom/buffer_types_mojom_traits.h.orig	2020-03-16 14:04:24 UTC
>++++ src/3rdparty/chromium/ui/gfx/mojom/buffer_types_mojom_traits.h
>+@@ -194,7 +194,7 @@ struct StructTraits<gfx::mojom::GpuMemoryBufferIdDataV
>    }
>  };
>  
>@@ -9,7 +9,16 @@
>  template <>
>  struct StructTraits<gfx::mojom::NativePixmapPlaneDataView,
>                      gfx::NativePixmapPlane> {
>-@@ -237,7 +237,7 @@ struct StructTraits<gfx::mojom::NativePixmapHandleData
>+@@ -220,7 +220,7 @@ struct StructTraits<gfx::mojom::NativePixmapHandleData
>+     return pixmap_handle.planes;
>+   }
>+ 
>+-#if defined(OS_LINUX)
>++#if defined(OS_LINUX) || defined(OS_BSD)
>+   static uint64_t modifier(const gfx::NativePixmapHandle& pixmap_handle) {
>+     return pixmap_handle.modifier;
>+   }
>+@@ -244,7 +244,7 @@ struct StructTraits<gfx::mojom::NativePixmapHandleData
>    static bool Read(gfx::mojom::NativePixmapHandleDataView data,
>                     gfx::NativePixmapHandle* out);
>  };
>diff --git a/www/qt5-webengine/files/patch-src_3rdparty_chromium_ui_gfx_native__pixmap__handle.cc b/www/qt5-webengine/files/patch-src_3rdparty_chromium_ui_gfx_native__pixmap__handle.cc
>index c216339ecce7..34b47cb78998 100644
>--- a/www/qt5-webengine/files/patch-src_3rdparty_chromium_ui_gfx_native__pixmap__handle.cc
>+++ b/www/qt5-webengine/files/patch-src_3rdparty_chromium_ui_gfx_native__pixmap__handle.cc
>@@ -1,4 +1,4 @@
>---- src/3rdparty/chromium/ui/gfx/native_pixmap_handle.cc.orig	2019-11-27 21:12:25 UTC
>+--- src/3rdparty/chromium/ui/gfx/native_pixmap_handle.cc.orig	2020-03-16 14:04:24 UTC
> +++ src/3rdparty/chromium/ui/gfx/native_pixmap_handle.cc
> @@ -33,7 +33,7 @@ NativePixmapPlane::NativePixmapPlane() : stride(0), of
>  NativePixmapPlane::NativePixmapPlane(int stride,
>@@ -27,3 +27,12 @@
>      DCHECK(plane.fd.is_valid());
>      base::ScopedFD fd_dup(HANDLE_EINTR(dup(plane.fd.get())));
>      if (!fd_dup.is_valid()) {
>+@@ -98,7 +98,7 @@ NativePixmapHandle CloneHandleForIPC(const NativePixma
>+ #endif
>+   }
>+ 
>+-#if defined(OS_LINUX)
>++#if defined(OS_LINUX) || defined(OS_BSD)
>+   clone.modifier = handle.modifier;
>+ #endif
>+ 
>diff --git a/www/qt5-webengine/files/patch-src_3rdparty_chromium_ui_gfx_native__pixmap__handle.h b/www/qt5-webengine/files/patch-src_3rdparty_chromium_ui_gfx_native__pixmap__handle.h
>index 0242e9115c33..a637774f9203 100644
>--- a/www/qt5-webengine/files/patch-src_3rdparty_chromium_ui_gfx_native__pixmap__handle.h
>+++ b/www/qt5-webengine/files/patch-src_3rdparty_chromium_ui_gfx_native__pixmap__handle.h
>@@ -1,4 +1,4 @@
>---- src/3rdparty/chromium/ui/gfx/native_pixmap_handle.h.orig	2019-11-27 21:12:25 UTC
>+--- src/3rdparty/chromium/ui/gfx/native_pixmap_handle.h.orig	2020-03-16 14:04:24 UTC
> +++ src/3rdparty/chromium/ui/gfx/native_pixmap_handle.h
> @@ -15,7 +15,7 @@
>  #include "build/build_config.h"
>@@ -27,3 +27,12 @@
>    // File descriptor for the underlying memory object (usually dmabuf).
>    base::ScopedFD fd;
>  #elif defined(OS_FUCHSIA)
>+@@ -82,7 +82,7 @@ struct GFX_EXPORT NativePixmapHandle {
>+ 
>+   std::vector<NativePixmapPlane> planes;
>+ 
>+-#if defined(OS_LINUX)
>++#if defined(OS_LINUX) || defined(OS_BSD)
>+   // The modifier is retrieved from GBM library and passed to EGL driver.
>+   // Generally it's platform specific, and we don't need to modify it in
>+   // Chromium code. Also one per plane per entry.
>diff --git a/www/qt5-webengine/files/patch-src_3rdparty_chromium_ui_gl_gl__bindings__autogen__glx.cc b/www/qt5-webengine/files/patch-src_3rdparty_chromium_ui_gl_gl__bindings__autogen__glx.cc
>index aaa3dfc3b30f..39eeaa6fd8fd 100644
>--- a/www/qt5-webengine/files/patch-src_3rdparty_chromium_ui_gl_gl__bindings__autogen__glx.cc
>+++ b/www/qt5-webengine/files/patch-src_3rdparty_chromium_ui_gl_gl__bindings__autogen__glx.cc
>@@ -52,7 +52,7 @@
> +  return result;
> +}
> +
>-+__GLXextFuncPtr DebugGLXApi::glXGetProcAddressARBFn(const GLubyte* procName) {
>++__GLXextFuncPtr LogGLXApi::glXGetProcAddressARBFn(const GLubyte* procName) {
> +  GL_SERVICE_LOG("glXGetProcAddressARB"
> +                 << "(" << static_cast<const void*>(procName) << ")");
> +  __GLXextFuncPtr result = glx_api_->glXGetProcAddressARBFn(procName);
>diff --git a/www/qt5-webengine/files/patch-src_3rdparty_chromium_ui_gl_gl__surface__glx.cc b/www/qt5-webengine/files/patch-src_3rdparty_chromium_ui_gl_gl__surface__glx.cc
>deleted file mode 100644
>index e220b22d3ce8..000000000000
>--- a/www/qt5-webengine/files/patch-src_3rdparty_chromium_ui_gl_gl__surface__glx.cc
>+++ /dev/null
>@@ -1,14 +0,0 @@
>---- src/3rdparty/chromium/ui/gl/gl_surface_glx.cc.orig	2019-11-27 21:12:25 UTC
>-+++ src/3rdparty/chromium/ui/gl/gl_surface_glx.cc
>-@@ -461,7 +461,10 @@ bool GLSurfaceGLX::InitializeOneOff() {
>-     return false;
>-   }
>- 
>--  const auto& visual_info = gl::GLVisualPickerGLX::GetInstance()->rgba_visual();
>-+  const auto& visual_info = 
>-+    ui::IsCompositingManagerPresent()
>-+      ? gl::GLVisualPickerGLX::GetInstance()->rgba_visual()
>-+      : gl::GLVisualPickerGLX::GetInstance()->system_visual();
>-   g_visual = visual_info.visual;
>-   g_depth = visual_info.depth;
>-   g_colormap =
>diff --git a/www/qt5-webengine/files/patch-src_3rdparty_chromium_ui_platform__window_platform__window__init__properties.h b/www/qt5-webengine/files/patch-src_3rdparty_chromium_ui_platform__window_platform__window__init__properties.h
>new file mode 100644
>index 000000000000..33499a3eaee7
>--- /dev/null
>+++ b/www/qt5-webengine/files/patch-src_3rdparty_chromium_ui_platform__window_platform__window__init__properties.h
>@@ -0,0 +1,20 @@
>+--- src/3rdparty/chromium/ui/platform_window/platform_window_init_properties.h.orig	2020-04-08 09:41:36 UTC
>++++ src/3rdparty/chromium/ui/platform_window/platform_window_init_properties.h
>+@@ -41,7 +41,7 @@ enum class PlatformWindowOpacity {
>+ 
>+ class WorkspaceExtensionDelegate;
>+ 
>+-#if defined(OS_LINUX)
>++#if defined(OS_LINUX) || defined(OS_BSD)
>+ class X11ExtensionDelegate;
>+ #endif
>+ 
>+@@ -82,7 +82,7 @@ struct COMPONENT_EXPORT(PLATFORM_WINDOW) PlatformWindo
>+ 
>+   WorkspaceExtensionDelegate* workspace_extension_delegate = nullptr;
>+ 
>+-#if defined(OS_LINUX)
>++#if defined(OS_LINUX) || defined(OS_BSD)
>+   bool prefer_dark_theme = false;
>+   gfx::ImageSkia* icon = nullptr;
>+   base::Optional<int> background_color;
>diff --git a/www/qt5-webengine/files/patch-src_3rdparty_chromium_ui_views_style_platform__style.cc b/www/qt5-webengine/files/patch-src_3rdparty_chromium_ui_views_style_platform__style.cc
>index 0ad263123369..9ecf0352cfe4 100644
>--- a/www/qt5-webengine/files/patch-src_3rdparty_chromium_ui_views_style_platform__style.cc
>+++ b/www/qt5-webengine/files/patch-src_3rdparty_chromium_ui_views_style_platform__style.cc
>@@ -1,11 +1,11 @@
>---- src/3rdparty/chromium/ui/views/style/platform_style.cc.orig	2018-11-13 18:25:11 UTC
>+--- src/3rdparty/chromium/ui/views/style/platform_style.cc.orig	2020-04-08 09:41:36 UTC
> +++ src/3rdparty/chromium/ui/views/style/platform_style.cc
>-@@ -19,7 +19,7 @@
>+@@ -74,7 +74,7 @@ gfx::Range PlatformStyle::RangeToDeleteBackwards(const
>  
>- #if defined(OS_CHROMEOS)
>- #include "ui/views/controls/scrollbar/overlay_scroll_bar.h"
>--#elif defined(OS_LINUX)
>-+#elif defined(OS_LINUX) || defined(OS_BSD)
>- #define DESKTOP_LINUX
>- #endif
>+ #endif  // OS_MACOSX
>  
>+-#if !BUILDFLAG(ENABLE_DESKTOP_AURA) || !defined(OS_LINUX)
>++#if !BUILDFLAG(ENABLE_DESKTOP_AURA) || !(defined(OS_LINUX) || defined(OS_BSD))
>+ // static
>+ std::unique_ptr<Border> PlatformStyle::CreateThemedLabelButtonBorder(
>+     LabelButton* button) {
>diff --git a/www/qt5-webengine/files/patch-src_3rdparty_chromium_ui_views_views__delegate.cc b/www/qt5-webengine/files/patch-src_3rdparty_chromium_ui_views_views__delegate.cc
>index caa9e8ef7390..eee90b00f726 100644
>--- a/www/qt5-webengine/files/patch-src_3rdparty_chromium_ui_views_views__delegate.cc
>+++ b/www/qt5-webengine/files/patch-src_3rdparty_chromium_ui_views_views__delegate.cc
>@@ -1,11 +1,11 @@
>---- src/3rdparty/chromium/ui/views/views_delegate.cc.orig	2018-11-13 18:25:11 UTC
>+--- src/3rdparty/chromium/ui/views/views_delegate.cc.orig	2020-04-08 09:41:36 UTC
> +++ src/3rdparty/chromium/ui/views/views_delegate.cc
>-@@ -87,7 +87,7 @@ HICON ViewsDelegate::GetSmallWindowIcon() const {
>+@@ -85,7 +85,7 @@ HICON ViewsDelegate::GetSmallWindowIcon() const {
>  bool ViewsDelegate::IsWindowInMetro(gfx::NativeWindow window) const {
>    return false;
>  }
>--#elif defined(OS_LINUX) && !defined(OS_CHROMEOS)
>-+#elif (defined(OS_LINUX) && !defined(OS_CHROMEOS)) || defined(OS_FREEBSD)
>+-#elif defined(OS_LINUX) && BUILDFLAG(ENABLE_DESKTOP_AURA)
>++#elif (defined(OS_LINUX) || defined(OS_BSD)) && BUILDFLAG(ENABLE_DESKTOP_AURA)
>  gfx::ImageSkia* ViewsDelegate::GetDefaultWindowIcon() const {
>    return nullptr;
>  }
>diff --git a/www/qt5-webengine/files/patch-src_3rdparty_chromium_ui_views_views__delegate.h b/www/qt5-webengine/files/patch-src_3rdparty_chromium_ui_views_views__delegate.h
>index 50d47039e256..acb86f06a0d4 100644
>--- a/www/qt5-webengine/files/patch-src_3rdparty_chromium_ui_views_views__delegate.h
>+++ b/www/qt5-webengine/files/patch-src_3rdparty_chromium_ui_views_views__delegate.h
>@@ -1,11 +1,11 @@
>---- src/3rdparty/chromium/ui/views/views_delegate.h.orig	2018-11-13 18:25:11 UTC
>+--- src/3rdparty/chromium/ui/views/views_delegate.h.orig	2020-04-08 09:41:36 UTC
> +++ src/3rdparty/chromium/ui/views/views_delegate.h
>-@@ -155,7 +155,7 @@ class VIEWS_EXPORT ViewsDelegate {
>+@@ -131,7 +131,7 @@ class VIEWS_EXPORT ViewsDelegate {
>    // Returns true if the window passed in is in the Windows 8 metro
>    // environment.
>    virtual bool IsWindowInMetro(gfx::NativeWindow window) const;
>--#elif defined(OS_LINUX) && !defined(OS_CHROMEOS)
>-+#elif defined(OS_LINUX) && !defined(OS_CHROMEOS) || defined(OS_FREEBSD)
>+-#elif defined(OS_LINUX) && BUILDFLAG(ENABLE_DESKTOP_AURA)
>++#elif (defined(OS_LINUX) || defined(OS_BSD)) && BUILDFLAG(ENABLE_DESKTOP_AURA)
>    virtual gfx::ImageSkia* GetDefaultWindowIcon() const;
>  #endif
>  
>diff --git a/www/qt5-webengine/files/patch-src_3rdparty_chromium_ui_views_widget_desktop__aura_desktop__window__tree__host__platform.cc b/www/qt5-webengine/files/patch-src_3rdparty_chromium_ui_views_widget_desktop__aura_desktop__window__tree__host__platform.cc
>index e13df0269e65..7e3f6c926e5b 100644
>--- a/www/qt5-webengine/files/patch-src_3rdparty_chromium_ui_views_widget_desktop__aura_desktop__window__tree__host__platform.cc
>+++ b/www/qt5-webengine/files/patch-src_3rdparty_chromium_ui_views_widget_desktop__aura_desktop__window__tree__host__platform.cc
>@@ -1,20 +1,11 @@
>---- src/3rdparty/chromium/ui/views/widget/desktop_aura/desktop_window_tree_host_platform.cc.orig	2019-05-23 12:39:34 UTC
>+--- src/3rdparty/chromium/ui/views/widget/desktop_aura/desktop_window_tree_host_platform.cc.orig	2020-03-16 14:04:24 UTC
> +++ src/3rdparty/chromium/ui/views/widget/desktop_aura/desktop_window_tree_host_platform.cc
>-@@ -89,7 +89,7 @@ void DesktopWindowTreeHostPlatform::OnNativeWidgetCrea
>-     const Widget::InitParams& params) {
>-   native_widget_delegate_->OnNativeWidgetCreated();
>- 
>--#if defined(OS_LINUX)
>-+#if defined(OS_LINUX) || defined(OS_BSD)
>-   // Setup a non_client_window_event_filter, which handles resize/move, double
>-   // click and other events.
>-   DCHECK(!non_client_window_event_filter_);
>-@@ -540,7 +540,7 @@ void DesktopWindowTreeHostPlatform::Relayout() {
>- }
>- 
>- void DesktopWindowTreeHostPlatform::RemoveNonClientEventFilter() {
>--#if defined(OS_LINUX)
>-+#if defined(OS_LINUX) || defined(OS_BSD)
>-   if (!non_client_window_event_filter_)
>-     return;
>+@@ -732,7 +732,7 @@ void DesktopWindowTreeHostPlatform::AddAdditionalInitP
>+ // DesktopWindowTreeHost:
>  
>+ // Linux subclasses this host and adds some Linux specific bits.
>+-#if !defined(OS_LINUX)
>++#if !defined(OS_LINUX) && !defined(OS_BSD)
>+ // static
>+ DesktopWindowTreeHost* DesktopWindowTreeHost::Create(
>+     internal::NativeWidgetDelegate* native_widget_delegate,
>diff --git a/www/qt5-webengine/files/patch-src_3rdparty_chromium_ui_views_widget_desktop__aura_desktop__window__tree__host__platform.h b/www/qt5-webengine/files/patch-src_3rdparty_chromium_ui_views_widget_desktop__aura_desktop__window__tree__host__platform.h
>deleted file mode 100644
>index 444d508d0b2e..000000000000
>--- a/www/qt5-webengine/files/patch-src_3rdparty_chromium_ui_views_widget_desktop__aura_desktop__window__tree__host__platform.h
>+++ /dev/null
>@@ -1,11 +0,0 @@
>---- src/3rdparty/chromium/ui/views/widget/desktop_aura/desktop_window_tree_host_platform.h.orig	2019-05-23 12:39:34 UTC
>-+++ src/3rdparty/chromium/ui/views/widget/desktop_aura/desktop_window_tree_host_platform.h
>-@@ -119,7 +119,7 @@ class VIEWS_EXPORT DesktopWindowTreeHostPlatform
>- 
>-   bool is_active_ = false;
>- 
>--#if defined(OS_LINUX)
>-+#if defined(OS_LINUX) || defined(OS_BSD)
>-   // A handler for events intended for non client area.
>-   std::unique_ptr<WindowEventFilter> non_client_window_event_filter_;
>- #endif
>diff --git a/www/qt5-webengine/files/patch-src_3rdparty_chromium_ui_views_widget_native__widget__aura.cc b/www/qt5-webengine/files/patch-src_3rdparty_chromium_ui_views_widget_native__widget__aura.cc
>new file mode 100644
>index 000000000000..ebd2c14397fd
>--- /dev/null
>+++ b/www/qt5-webengine/files/patch-src_3rdparty_chromium_ui_views_widget_native__widget__aura.cc
>@@ -0,0 +1,27 @@
>+--- src/3rdparty/chromium/ui/views/widget/native_widget_aura.cc.orig	2020-04-08 09:41:36 UTC
>++++ src/3rdparty/chromium/ui/views/widget/native_widget_aura.cc
>+@@ -64,7 +64,7 @@
>+ #include "ui/views/widget/desktop_aura/desktop_window_tree_host_win.h"
>+ #endif
>+ 
>+-#if BUILDFLAG(ENABLE_DESKTOP_AURA) && defined(OS_LINUX)
>++#if BUILDFLAG(ENABLE_DESKTOP_AURA) && (defined(OS_LINUX) || defined(OS_BSD))
>+ #include "ui/views/linux_ui/linux_ui.h"
>+ #include "ui/views/widget/desktop_aura/desktop_window_tree_host_linux.h"
>+ #endif
>+@@ -1095,13 +1095,13 @@ void Widget::CloseAllSecondaryWidgets() {
>+   EnumThreadWindows(GetCurrentThreadId(), WindowCallbackProc, 0);
>+ #endif
>+ 
>+-#if BUILDFLAG(ENABLE_DESKTOP_AURA) && defined(OS_LINUX)
>++#if BUILDFLAG(ENABLE_DESKTOP_AURA) && (defined(OS_LINUX) || defined(OS_BSD))
>+   DesktopWindowTreeHostLinux::CleanUpWindowList(CloseWindow);
>+ #endif
>+ }
>+ 
>+ const ui::NativeTheme* Widget::GetNativeTheme() const {
>+-#if BUILDFLAG(ENABLE_DESKTOP_AURA) && defined(OS_LINUX)
>++#if BUILDFLAG(ENABLE_DESKTOP_AURA) && (defined(OS_LINUX) || defined(OS_BSD))
>+   const LinuxUI* linux_ui = LinuxUI::instance();
>+   if (linux_ui) {
>+     ui::NativeTheme* native_theme =
>diff --git a/www/qt5-webengine/files/patch-src_3rdparty_chromium_ui_views_window_dialog__delegate.cc b/www/qt5-webengine/files/patch-src_3rdparty_chromium_ui_views_window_dialog__delegate.cc
>index d8fa4d4bae13..2fe1dc02974f 100644
>--- a/www/qt5-webengine/files/patch-src_3rdparty_chromium_ui_views_window_dialog__delegate.cc
>+++ b/www/qt5-webengine/files/patch-src_3rdparty_chromium_ui_views_window_dialog__delegate.cc
>@@ -1,11 +1,11 @@
>---- src/3rdparty/chromium/ui/views/window/dialog_delegate.cc.orig	2018-11-13 18:25:11 UTC
>+--- src/3rdparty/chromium/ui/views/window/dialog_delegate.cc.orig	2020-04-08 09:41:36 UTC
> +++ src/3rdparty/chromium/ui/views/window/dialog_delegate.cc
>-@@ -65,7 +65,7 @@ Widget::InitParams DialogDelegate::GetDialogWidgetInit
>-   params.bounds = bounds;
>-   DialogDelegate* dialog = delegate->AsDialogDelegate();
>+@@ -59,7 +59,7 @@ Widget* DialogDelegate::CreateDialogWidget(WidgetDeleg
>  
>--#if defined(OS_LINUX) && !defined(OS_CHROMEOS)
>-+#if (defined(OS_LINUX) || defined(OS_BSD)) && !defined(OS_CHROMEOS)
>+ // static
>+ bool DialogDelegate::CanSupportCustomFrame(gfx::NativeView parent) {
>+-#if defined(OS_LINUX) && BUILDFLAG(ENABLE_DESKTOP_AURA)
>++#if (defined(OS_LINUX) || defined(OS_BSD)) && BUILDFLAG(ENABLE_DESKTOP_AURA)
>    // The new style doesn't support unparented dialogs on Linux desktop.
>-   if (dialog)
>-     dialog->supports_custom_frame_ &= parent != NULL;
>+   return parent != nullptr;
>+ #elif defined(OS_WIN)
>diff --git a/www/qt5-webengine/files/patch-src_3rdparty_chromium_ui_views_window_frame__background.cc b/www/qt5-webengine/files/patch-src_3rdparty_chromium_ui_views_window_frame__background.cc
>index 797f804cfe46..5360a93b4abd 100644
>--- a/www/qt5-webengine/files/patch-src_3rdparty_chromium_ui_views_window_frame__background.cc
>+++ b/www/qt5-webengine/files/patch-src_3rdparty_chromium_ui_views_window_frame__background.cc
>@@ -1,11 +1,11 @@
>---- src/3rdparty/chromium/ui/views/window/frame_background.cc.orig	2019-05-23 12:39:34 UTC
>+--- src/3rdparty/chromium/ui/views/window/frame_background.cc.orig	2020-04-08 09:41:36 UTC
> +++ src/3rdparty/chromium/ui/views/window/frame_background.cc
>-@@ -122,7 +122,7 @@ void FrameBackground::PaintMaximized(gfx::Canvas* canv
>+@@ -107,7 +107,7 @@ void FrameBackground::PaintMaximized(gfx::Canvas* canv
>                                       const View* view) const {
>  // Fill the top with the frame color first so we have a constant background
>  // for areas not covered by the theme image.
>--#if defined(OS_LINUX) && !defined(OS_CHROMEOS)
>-+#if (defined(OS_LINUX) || defined(OS_BSD)) && !defined(OS_CHROMEOS)
>+-#if defined(OS_LINUX) && BUILDFLAG(ENABLE_DESKTOP_AURA)
>++#if (defined(OS_LINUX) || defined(OS_BSD)) && BUILDFLAG(ENABLE_DESKTOP_AURA)
>    auto* native_theme = view->GetNativeTheme();
>    ui::NativeTheme::ExtraParams params;
>    params.frame_top_area.use_custom_frame = use_custom_frame_;
>diff --git a/www/qt5-webengine/files/patch-src_3rdparty_chromium_v8_include_v8config.h b/www/qt5-webengine/files/patch-src_3rdparty_chromium_v8_include_v8config.h
>new file mode 100644
>index 000000000000..13a34f3c8cae
>--- /dev/null
>+++ b/www/qt5-webengine/files/patch-src_3rdparty_chromium_v8_include_v8config.h
>@@ -0,0 +1,21 @@
>+--- src/3rdparty/chromium/v8/include/v8config.h.orig	2020-04-08 09:41:36 UTC
>++++ src/3rdparty/chromium/v8/include/v8config.h
>+@@ -273,7 +273,18 @@
>+ # define V8_HAS_ATTRIBUTE_WARN_UNUSED_RESULT \
>+     (__has_attribute(warn_unused_result))
>+ 
>++// Work around Clang bug present in 9.0.1, at least.
>++//
>++// Clang stores alignment as a 32-bit unsigned integer, but V8 only uses
>++// V8_ASSUME_ALIGNED() for a 4GB (2^32) alignment
>++// (kPtrComprIsolateRootAlignment).  As such, the alignment overflows and
>++// becomes zero, triggering an internal Clang assertion that alignment must not
>++// be zero.
>++#if 0
>+ # define V8_HAS_BUILTIN_ASSUME_ALIGNED (__has_builtin(__builtin_assume_aligned))
>++#else
>++# define V8_HAS_BUILTIN_ASSUME_ALIGNED 0
>++#endif
>+ # define V8_HAS_BUILTIN_BSWAP16 (__has_builtin(__builtin_bswap16))
>+ # define V8_HAS_BUILTIN_BSWAP32 (__has_builtin(__builtin_bswap32))
>+ # define V8_HAS_BUILTIN_BSWAP64 (__has_builtin(__builtin_bswap64))
>diff --git a/www/qt5-webengine/files/patch-src_3rdparty_chromium_v8_src_api_api.cc b/www/qt5-webengine/files/patch-src_3rdparty_chromium_v8_src_api_api.cc
>index 9d1b1fd2b650..0b7a73a388f7 100644
>--- a/www/qt5-webengine/files/patch-src_3rdparty_chromium_v8_src_api_api.cc
>+++ b/www/qt5-webengine/files/patch-src_3rdparty_chromium_v8_src_api_api.cc
>@@ -1,15 +1,6 @@
>---- src/3rdparty/chromium/v8/src/api/api.cc.orig	2019-11-27 21:12:25 UTC
>+--- src/3rdparty/chromium/v8/src/api/api.cc.orig	2020-04-08 09:41:36 UTC
> +++ src/3rdparty/chromium/v8/src/api/api.cc
>-@@ -110,7 +110,7 @@
>- #include "src/wasm/wasm-result.h"
>- #include "src/wasm/wasm-serialization.h"
>- 
>--#if V8_OS_LINUX || V8_OS_MACOSX
>-+#if V8_OS_LINUX || V8_OS_MACOSX || V8_OS_OPENBSD || V8_OS_FREEBSD
>- #include <signal.h>
>- #include "include/v8-wasm-trap-handler-posix.h"
>- #include "src/trap-handler/handler-inside-posix.h"
>-@@ -5550,7 +5550,7 @@ bool v8::V8::Initialize() {
>+@@ -5653,7 +5653,7 @@ bool v8::V8::Initialize() {
>    return true;
>  }
>  
>diff --git a/www/qt5-webengine/files/patch-src_3rdparty_chromium_v8_src_codegen_arm_cpu-arm.cc b/www/qt5-webengine/files/patch-src_3rdparty_chromium_v8_src_codegen_arm_cpu-arm.cc
>deleted file mode 100644
>index bcf1ee72ea95..000000000000
>--- a/www/qt5-webengine/files/patch-src_3rdparty_chromium_v8_src_codegen_arm_cpu-arm.cc
>+++ /dev/null
>@@ -1,22 +0,0 @@
>---- src/3rdparty/chromium/v8/src/codegen/arm/cpu-arm.cc.orig	2019-11-27 21:12:25 UTC
>-+++ src/3rdparty/chromium/v8/src/codegen/arm/cpu-arm.cc
>-@@ -7,6 +7,9 @@
>- #ifdef __QNXNTO__
>- #include <sys/mman.h>  // for cache flushing.
>- #undef MAP_TYPE        // NOLINT
>-+#elif defined(__FreeBSD__)
>-+#include <sys/types.h>
>-+#include <machine/sysarch.h> // for cache flushing.
>- #else
>- #include <sys/syscall.h>  // for cache flushing.
>- #endif
>-@@ -25,6 +28,9 @@ V8_NOINLINE void CpuFeatures::FlushICache(void* start,
>- #if !defined(USE_SIMULATOR)
>- #if V8_OS_QNX
>-   msync(start, size, MS_SYNC | MS_INVALIDATE_ICACHE);
>-+#elif defined(__FreeBSD__)
>-+  struct arm_sync_icache_args args = { .addr = (uintptr_t)start, .len = size };
>-+  sysarch(ARM_SYNC_ICACHE, (void *)&args);
>- #else
>-   register uint32_t beg asm("r0") = reinterpret_cast<uint32_t>(start);
>-   register uint32_t end asm("r1") = beg + size;
>diff --git a/www/qt5-webengine/files/patch-src_3rdparty_chromium_v8_src_libsampler_sampler.cc b/www/qt5-webengine/files/patch-src_3rdparty_chromium_v8_src_libsampler_sampler.cc
>deleted file mode 100644
>index 9097657f2740..000000000000
>--- a/www/qt5-webengine/files/patch-src_3rdparty_chromium_v8_src_libsampler_sampler.cc
>+++ /dev/null
>@@ -1,15 +0,0 @@
>---- src/3rdparty/chromium/v8/src/libsampler/sampler.cc.orig	2019-01-16 10:59:47 UTC
>-+++ src/3rdparty/chromium/v8/src/libsampler/sampler.cc
>-@@ -550,9 +550,9 @@ void SignalHandler::FillRegisterState(void* context, R
>-   state->sp = reinterpret_cast<void*>(mcontext.mc_rsp);
>-   state->fp = reinterpret_cast<void*>(mcontext.mc_rbp);
>- #elif V8_HOST_ARCH_ARM
>--  state->pc = reinterpret_cast<void*>(mcontext.mc_r15);
>--  state->sp = reinterpret_cast<void*>(mcontext.mc_r13);
>--  state->fp = reinterpret_cast<void*>(mcontext.mc_r11);
>-+  state->pc = reinterpret_cast<void*>(mcontext.__gregs[_REG_PC]);
>-+  state->sp = reinterpret_cast<void*>(mcontext.__gregs[_REG_SP]);
>-+  state->fp = reinterpret_cast<void*>(mcontext.__gregs[_REG_FP]);
>- #endif  // V8_HOST_ARCH_*
>- #elif V8_OS_NETBSD
>- #if V8_HOST_ARCH_IA32
>diff --git a/www/qt5-webengine/files/patch-src_3rdparty_chromium_v8_src_trap-handler_handler-inside-posix.cc b/www/qt5-webengine/files/patch-src_3rdparty_chromium_v8_src_trap-handler_handler-inside-posix.cc
>deleted file mode 100644
>index 9471e58ff3c2..000000000000
>--- a/www/qt5-webengine/files/patch-src_3rdparty_chromium_v8_src_trap-handler_handler-inside-posix.cc
>+++ /dev/null
>@@ -1,20 +0,0 @@
>---- src/3rdparty/chromium/v8/src/trap-handler/handler-inside-posix.cc.orig	2019-05-23 12:39:34 UTC
>-+++ src/3rdparty/chromium/v8/src/trap-handler/handler-inside-posix.cc
>-@@ -27,7 +27,7 @@
>- 
>- #include <signal.h>
>- 
>--#ifdef V8_OS_LINUX
>-+#if defined(V8_OS_LINUX) || defined(V8_OS_FREEBSD)
>- #include <ucontext.h>
>- #elif V8_OS_MACOSX
>- #include <sys/ucontext.h>
>-@@ -112,6 +112,8 @@ bool TryHandleSignal(int signum, siginfo_t* info, void
>-     auto* context_rip = &uc->uc_mcontext.gregs[REG_RIP];
>- #elif V8_OS_MACOSX
>-     auto* context_rip = &uc->uc_mcontext->__ss.__rip;
>-+#elif V8_OS_FREEBSD
>-+    auto* context_rip = &uc->uc_mcontext.mc_rip;
>- #else
>- #error Unsupported platform
>- #endif
>diff --git a/www/qt5-webengine/files/patch-src_3rdparty_chromium_v8_src_trap-handler_handler-inside-posix.h b/www/qt5-webengine/files/patch-src_3rdparty_chromium_v8_src_trap-handler_handler-inside-posix.h
>deleted file mode 100644
>index 022f9bddfbe7..000000000000
>--- a/www/qt5-webengine/files/patch-src_3rdparty_chromium_v8_src_trap-handler_handler-inside-posix.h
>+++ /dev/null
>@@ -1,11 +0,0 @@
>---- src/3rdparty/chromium/v8/src/trap-handler/handler-inside-posix.h.orig	2019-05-23 12:39:34 UTC
>-+++ src/3rdparty/chromium/v8/src/trap-handler/handler-inside-posix.h
>-@@ -12,7 +12,7 @@ namespace v8 {
>- namespace internal {
>- namespace trap_handler {
>- 
>--#if V8_OS_LINUX
>-+#if defined(V8_OS_LINUX) || defined(V8_OS_FREEBSD)
>- constexpr int kOobSignal = SIGSEGV;
>- #elif V8_OS_MACOSX
>- constexpr int kOobSignal = SIGBUS;
>diff --git a/www/qt5-webengine/files/patch-src_3rdparty_chromium_v8_src_trap-handler_trap-handler.h b/www/qt5-webengine/files/patch-src_3rdparty_chromium_v8_src_trap-handler_trap-handler.h
>deleted file mode 100644
>index 220b06e116a1..000000000000
>--- a/www/qt5-webengine/files/patch-src_3rdparty_chromium_v8_src_trap-handler_trap-handler.h
>+++ /dev/null
>@@ -1,11 +0,0 @@
>---- src/3rdparty/chromium/v8/src/trap-handler/trap-handler.h.orig	2019-05-23 12:39:34 UTC
>-+++ src/3rdparty/chromium/v8/src/trap-handler/trap-handler.h
>-@@ -23,6 +23,8 @@ namespace trap_handler {
>- #define V8_TRAP_HANDLER_SUPPORTED true
>- #elif V8_TARGET_ARCH_X64 && V8_OS_MACOSX
>- #define V8_TRAP_HANDLER_SUPPORTED true
>-+#elif V8_TARGET_ARCH_X64 && V8_OS_FREEBSD
>-+#define V8_TRAP_HANDLER_SUPPORTED true
>- #else
>- #define V8_TRAP_HANDLER_SUPPORTED false
>- #endif
>diff --git a/www/qt5-webengine/files/patch-src_3rdparty_chromium_v8_test_BUILD.gn b/www/qt5-webengine/files/patch-src_3rdparty_chromium_v8_test_BUILD.gn
>index e639351c8780..c2330ca88c01 100644
>--- a/www/qt5-webengine/files/patch-src_3rdparty_chromium_v8_test_BUILD.gn
>+++ b/www/qt5-webengine/files/patch-src_3rdparty_chromium_v8_test_BUILD.gn
>@@ -1,6 +1,6 @@
>---- src/3rdparty/chromium/v8/test/BUILD.gn.orig	2019-11-27 21:12:25 UTC
>+--- src/3rdparty/chromium/v8/test/BUILD.gn.orig	2020-04-08 09:41:36 UTC
> +++ src/3rdparty/chromium/v8/test/BUILD.gn
>-@@ -32,7 +32,7 @@ group("gn_all") {
>+@@ -31,7 +31,7 @@ group("gn_all") {
>      deps += [
>        "cctest:cctest",
>        "cctest:generate-bytecode-expectations",
>@@ -9,10 +9,10 @@
>      ]
>    }
>  }
>-@@ -82,10 +82,10 @@ group("v8_bot_default") {
>+@@ -73,10 +73,10 @@ group("v8_bot_default") {
>+     "message:v8_message",
>      "mjsunit:v8_mjsunit",
>      "mkgrokdump:mkgrokdump",
>-     "preparser:v8_preparser",
> -    "unittests:unittests",
> +    #"unittests:unittests",
>      "wasm-api-tests:wasm_api_tests",
>@@ -22,10 +22,10 @@
>      "webkit:v8_webkit",
>    ]
>  }
>-@@ -103,10 +103,10 @@ group("v8_default") {
>+@@ -93,10 +93,10 @@ group("v8_default") {
>+     "message:v8_message",
>      "mjsunit:v8_mjsunit",
>      "mkgrokdump:mkgrokdump",
>-     "preparser:v8_preparser",
> -    "unittests:unittests",
> +    #"unittests:unittests",
>      "wasm-api-tests:wasm_api_tests",
>diff --git a/www/qt5-webengine/files/patch-src_3rdparty_gn_build_gen.py b/www/qt5-webengine/files/patch-src_3rdparty_gn_build_gen.py
>index 8c0e18808ad9..c0aa44936469 100644
>--- a/www/qt5-webengine/files/patch-src_3rdparty_gn_build_gen.py
>+++ b/www/qt5-webengine/files/patch-src_3rdparty_gn_build_gen.py
>@@ -1,4 +1,4 @@
>---- src/3rdparty/gn/build/gen.py.orig	2019-11-27 21:12:25 UTC
>+--- src/3rdparty/gn/build/gen.py.orig	2020-03-16 14:04:24 UTC
> +++ src/3rdparty/gn/build/gen.py
> @@ -69,6 +69,9 @@ class Platform(object):
>    def is_aix(self):
>@@ -10,7 +10,7 @@
>    def is_posix(self):
>      return self._platform in ['linux', 'freebsd', 'darwin', 'aix', 'openbsd']
>  
>-@@ -364,6 +367,11 @@ def WriteGNNinja(path, platform, host, options):
>+@@ -371,6 +374,11 @@ def WriteGNNinja(path, platform, host, options):
>      elif platform.is_aix():
>        cflags_cc.append('-maix64')
>        ldflags.append('-maix64')
>diff --git a/www/qt5-webengine/files/patch-src_buildtools_config_support.pri b/www/qt5-webengine/files/patch-src_buildtools_config_support.pri
>index a095ab1330a8..8b602303f42b 100644
>--- a/www/qt5-webengine/files/patch-src_buildtools_config_support.pri
>+++ b/www/qt5-webengine/files/patch-src_buildtools_config_support.pri
>@@ -1,9 +1,9 @@
>---- src/buildtools/config/support.pri.orig	2020-01-09 09:16:12 UTC
>+--- src/buildtools/config/support.pri.orig	2020-03-16 14:04:24 UTC
> +++ src/buildtools/config/support.pri
>-@@ -68,6 +68,7 @@ defineReplace(qtwebengine_checkError) {
>- 
>+@@ -64,6 +64,7 @@ defineReplace(qtwebengine_checkError) {
>      linux:!qtwebengine_checkErrorForLinux():return(false)
>-     win:!qtwebengine_checkErrorForWindows():return(false)
>+     win32:!qtwebengine_checkErrorForWindows():return(false)
>+     macos:!qtwebengine_checkErrorForMacOS():return(false)
> +    unix:!qtwebengine_checkErrorForLinux():return(false)
>  
>      sanitizer: !qtConfig(webengine-sanitizer) {
>diff --git a/www/qt5-webengine/files/patch-src_core_api_core__api.pro b/www/qt5-webengine/files/patch-src_core_api_core__api.pro
>index eb8901da2aed..746730b40447 100644
>--- a/www/qt5-webengine/files/patch-src_core_api_core__api.pro
>+++ b/www/qt5-webengine/files/patch-src_core_api_core__api.pro
>@@ -1,11 +1,11 @@
>---- src/core/api/core_api.pro.orig	2018-11-27 04:10:38 UTC
>+--- src/core/api/core_api.pro.orig	2020-03-16 14:04:24 UTC
> +++ src/core/api/core_api.pro
>-@@ -58,7 +58,7 @@ SOURCES = \
>+@@ -66,7 +66,7 @@ SOURCES = \
>      qwebengineurlschemehandler.cpp
>  
>  ### Qt6 Remove this workaround
> -unix:!isEmpty(QMAKE_LFLAGS_VERSION_SCRIPT):!static {
> +linux:!isEmpty(QMAKE_LFLAGS_VERSION_SCRIPT):!static {
>-     CONFIG -= warning_clean
>      SOURCES += qtbug-60565.cpp \
>                 qtbug-61521.cpp
>+ }
>diff --git a/www/qt5-webengine/files/patch-src_pdf_pdfcore.pro b/www/qt5-webengine/files/patch-src_pdf_pdfcore.pro
>new file mode 100644
>index 000000000000..1c39092b2471
>--- /dev/null
>+++ b/www/qt5-webengine/files/patch-src_pdf_pdfcore.pro
>@@ -0,0 +1,18 @@
>+--- src/pdf/pdfcore.pro.orig	2020-03-16 14:04:24 UTC
>++++ src/pdf/pdfcore.pro
>+@@ -32,13 +32,13 @@ for(object, NINJA_OBJECTS): RSP_CONTENT += $$object
>+ write_file($$RSP_FILE, RSP_CONTENT)
>+ 
>+ macos:LIBS_PRIVATE += -Wl,-filelist,$$shell_quote($$RSP_FILE)
>+-linux:LIBS_PRIVATE += @$$RSP_FILE
>++unix:LIBS_PRIVATE += @$$RSP_FILE
>+ 
>+ # QTBUG-58710 add main rsp file on windows
>+ win32:QMAKE_LFLAGS += @$$RSP_FILE
>+ 
>+ !isEmpty(NINJA_ARCHIVES) {
>+-    linux: LIBS_PRIVATE += -Wl,--start-group $$NINJA_ARCHIVES -Wl,--end-group
>++    unix: LIBS_PRIVATE += -Wl,--start-group $$NINJA_ARCHIVES -Wl,--end-group
>+     else: LIBS_PRIVATE += $$NINJA_ARCHIVES
>+ }
>+ 
>diff --git a/www/qt5-webengine/pkg-plist b/www/qt5-webengine/pkg-plist
>index d88c0f6a929e..4ad5d3765c9c 100644
>--- a/www/qt5-webengine/pkg-plist
>+++ b/www/qt5-webengine/pkg-plist
>@@ -1,4 +1,46 @@
>-%%QT_BINDIR%%/qwebengine_convert_dict
>+%%QT_INCDIR%%/QtPdf/%%FULLVER%%/QtPdf/private/qpdfdestination_p.h
>+%%QT_INCDIR%%/QtPdf/%%FULLVER%%/QtPdf/private/qpdfdocument_p.h
>+%%QT_INCDIR%%/QtPdf/%%FULLVER%%/QtPdf/private/qpdflinkmodel_p.h
>+%%QT_INCDIR%%/QtPdf/%%FULLVER%%/QtPdf/private/qpdflinkmodel_p_p.h
>+%%QT_INCDIR%%/QtPdf/%%FULLVER%%/QtPdf/private/qpdfsearchmodel_p.h
>+%%QT_INCDIR%%/QtPdf/%%FULLVER%%/QtPdf/private/qpdfsearchresult_p.h
>+%%QT_INCDIR%%/QtPdf/%%FULLVER%%/QtPdf/private/qpdfselection_p.h
>+%%QT_INCDIR%%/QtPdf/%%FULLVER%%/QtPdf/private/qtpdf-config_p.h
>+%%QT_INCDIR%%/QtPdf/QPdfBookmarkModel
>+%%QT_INCDIR%%/QtPdf/QPdfDestination
>+%%QT_INCDIR%%/QtPdf/QPdfDocument
>+%%QT_INCDIR%%/QtPdf/QPdfDocumentRenderOptions
>+%%QT_INCDIR%%/QtPdf/QPdfPageNavigation
>+%%QT_INCDIR%%/QtPdf/QPdfPageRenderer
>+%%QT_INCDIR%%/QtPdf/QPdfSearchModel
>+%%QT_INCDIR%%/QtPdf/QPdfSearchResult
>+%%QT_INCDIR%%/QtPdf/QPdfSelection
>+%%QT_INCDIR%%/QtPdf/QtPdf
>+%%QT_INCDIR%%/QtPdf/QtPdfDepends
>+%%QT_INCDIR%%/QtPdf/QtPdfVersion
>+%%QT_INCDIR%%/QtPdf/qpdfbookmarkmodel.h
>+%%QT_INCDIR%%/QtPdf/qpdfdestination.h
>+%%QT_INCDIR%%/QtPdf/qpdfdocument.h
>+%%QT_INCDIR%%/QtPdf/qpdfdocumentrenderoptions.h
>+%%QT_INCDIR%%/QtPdf/qpdfnamespace.h
>+%%QT_INCDIR%%/QtPdf/qpdfpagenavigation.h
>+%%QT_INCDIR%%/QtPdf/qpdfpagerenderer.h
>+%%QT_INCDIR%%/QtPdf/qpdfsearchmodel.h
>+%%QT_INCDIR%%/QtPdf/qpdfsearchresult.h
>+%%QT_INCDIR%%/QtPdf/qpdfselection.h
>+%%QT_INCDIR%%/QtPdf/qtpdf-config.h
>+%%QT_INCDIR%%/QtPdf/qtpdfglobal.h
>+%%QT_INCDIR%%/QtPdf/qtpdfversion.h
>+%%QT_INCDIR%%/QtPdfWidgets/%%FULLVER%%/QtPdfWidgets/private/qpdfview_p.h
>+%%QT_INCDIR%%/QtPdfWidgets/%%FULLVER%%/QtPdfWidgets/private/qtpdfwidgets-config_p.h
>+%%QT_INCDIR%%/QtPdfWidgets/QPdfView
>+%%QT_INCDIR%%/QtPdfWidgets/QtPdfWidgets
>+%%QT_INCDIR%%/QtPdfWidgets/QtPdfWidgetsDepends
>+%%QT_INCDIR%%/QtPdfWidgets/QtPdfWidgetsVersion
>+%%QT_INCDIR%%/QtPdfWidgets/qpdfview.h
>+%%QT_INCDIR%%/QtPdfWidgets/qtpdfwidgets-config.h
>+%%QT_INCDIR%%/QtPdfWidgets/qtpdfwidgetsglobal.h
>+%%QT_INCDIR%%/QtPdfWidgets/qtpdfwidgetsversion.h
> %%QT_INCDIR%%/QtWebEngine/%%FULLVER%%/QtWebEngine/private/qquickwebengineaction_p.h
> %%QT_INCDIR%%/QtWebEngine/%%FULLVER%%/QtWebEngine/private/qquickwebengineaction_p_p.h
> %%QT_INCDIR%%/QtWebEngine/%%FULLVER%%/QtWebEngine/private/qquickwebenginecertificateerror_p.h
>@@ -21,8 +63,8 @@
> %%QT_INCDIR%%/QtWebEngine/%%FULLVER%%/QtWebEngine/private/qquickwebenginetouchhandleprovider_p_p.h
> %%QT_INCDIR%%/QtWebEngine/%%FULLVER%%/QtWebEngine/private/qquickwebengineview_p.h
> %%QT_INCDIR%%/QtWebEngine/%%FULLVER%%/QtWebEngine/private/qquickwebengineview_p_p.h
>-%%QT_INCDIR%%/QtWebEngine/%%FULLVER%%/QtWebEngine/private/qtwebengineglobal_p.h
> %%QT_INCDIR%%/QtWebEngine/%%FULLVER%%/QtWebEngine/private/qtwebengine-config_p.h
>+%%QT_INCDIR%%/QtWebEngine/%%FULLVER%%/QtWebEngine/private/qtwebengineglobal_p.h
> %%QT_INCDIR%%/QtWebEngine/QQuickWebEngineProfile
> %%QT_INCDIR%%/QtWebEngine/QQuickWebEngineScript
> %%QT_INCDIR%%/QtWebEngine/QtWebEngine
>@@ -30,15 +72,15 @@
> %%QT_INCDIR%%/QtWebEngine/QtWebEngineVersion
> %%QT_INCDIR%%/QtWebEngine/qquickwebengineprofile.h
> %%QT_INCDIR%%/QtWebEngine/qquickwebenginescript.h
>+%%QT_INCDIR%%/QtWebEngine/qtwebengine-config.h
> %%QT_INCDIR%%/QtWebEngine/qtwebengineglobal.h
> %%QT_INCDIR%%/QtWebEngine/qtwebengineversion.h
>-%%QT_INCDIR%%/QtWebEngine/qtwebengine-config.h
>+%%QT_INCDIR%%/QtWebEngineCore/%%FULLVER%%/QtWebEngineCore/private/qtwebenginecore-config_p.h
> %%QT_INCDIR%%/QtWebEngineCore/%%FULLVER%%/QtWebEngineCore/private/qtwebenginecoreglobal_p.h
> %%QT_INCDIR%%/QtWebEngineCore/%%FULLVER%%/QtWebEngineCore/private/qwebenginecallback_p.h
> %%QT_INCDIR%%/QtWebEngineCore/%%FULLVER%%/QtWebEngineCore/private/qwebenginecookiestore_p.h
> %%QT_INCDIR%%/QtWebEngineCore/%%FULLVER%%/QtWebEngineCore/private/qwebenginemessagepumpscheduler_p.h
> %%QT_INCDIR%%/QtWebEngineCore/%%FULLVER%%/QtWebEngineCore/private/qwebengineurlrequestinfo_p.h
>-%%QT_INCDIR%%/QtWebEngineCore/%%FULLVER%%/QtWebEngineCore/private/qtwebenginecore-config_p.h
> %%QT_INCDIR%%/QtWebEngineCore/QWebEngineCallback
> %%QT_INCDIR%%/QtWebEngineCore/QWebEngineClientCertificateStore
> %%QT_INCDIR%%/QtWebEngineCore/QWebEngineCookieStore
>@@ -55,9 +97,9 @@
> %%QT_INCDIR%%/QtWebEngineCore/QtWebEngineCore
> %%QT_INCDIR%%/QtWebEngineCore/QtWebEngineCoreDepends
> %%QT_INCDIR%%/QtWebEngineCore/QtWebEngineCoreVersion
>+%%QT_INCDIR%%/QtWebEngineCore/qtwebenginecore-config.h
> %%QT_INCDIR%%/QtWebEngineCore/qtwebenginecoreglobal.h
> %%QT_INCDIR%%/QtWebEngineCore/qtwebenginecoreversion.h
>-%%QT_INCDIR%%/QtWebEngineCore/qtwebenginecore-config.h
> %%QT_INCDIR%%/QtWebEngineCore/qwebenginecallback.h
> %%QT_INCDIR%%/QtWebEngineCore/qwebengineclientcertificatestore.h
> %%QT_INCDIR%%/QtWebEngineCore/qwebenginecookiestore.h
>@@ -71,6 +113,7 @@
> %%QT_INCDIR%%/QtWebEngineCore/qwebengineurlrequestjob.h
> %%QT_INCDIR%%/QtWebEngineCore/qwebengineurlscheme.h
> %%QT_INCDIR%%/QtWebEngineCore/qwebengineurlschemehandler.h
>+%%QT_INCDIR%%/QtWebEngineWidgets/%%FULLVER%%/QtWebEngineWidgets/private/qtwebenginewidgets-config_p.h
> %%QT_INCDIR%%/QtWebEngineWidgets/%%FULLVER%%/QtWebEngineWidgets/private/qwebenginedownloaditem_p.h
> %%QT_INCDIR%%/QtWebEngineWidgets/%%FULLVER%%/QtWebEngineWidgets/private/qwebenginehistory_p.h
> %%QT_INCDIR%%/QtWebEngineWidgets/%%FULLVER%%/QtWebEngineWidgets/private/qwebenginenotificationpresenter_p.h
>@@ -78,7 +121,6 @@
> %%QT_INCDIR%%/QtWebEngineWidgets/%%FULLVER%%/QtWebEngineWidgets/private/qwebengineprofile_p.h
> %%QT_INCDIR%%/QtWebEngineWidgets/%%FULLVER%%/QtWebEngineWidgets/private/qwebenginescriptcollection_p.h
> %%QT_INCDIR%%/QtWebEngineWidgets/%%FULLVER%%/QtWebEngineWidgets/private/qwebengineview_p.h
>-%%QT_INCDIR%%/QtWebEngineWidgets/%%FULLVER%%/QtWebEngineWidgets/private/qtwebenginewidgets-config_p.h
> %%QT_INCDIR%%/QtWebEngineWidgets/QWebEngineCertificateError
> %%QT_INCDIR%%/QtWebEngineWidgets/QWebEngineClientCertificateSelection
> %%QT_INCDIR%%/QtWebEngineWidgets/QWebEngineContextMenuData
>@@ -95,6 +137,7 @@
> %%QT_INCDIR%%/QtWebEngineWidgets/QtWebEngineWidgets
> %%QT_INCDIR%%/QtWebEngineWidgets/QtWebEngineWidgetsDepends
> %%QT_INCDIR%%/QtWebEngineWidgets/QtWebEngineWidgetsVersion
>+%%QT_INCDIR%%/QtWebEngineWidgets/qtwebenginewidgets-config.h
> %%QT_INCDIR%%/QtWebEngineWidgets/qtwebenginewidgetsglobal.h
> %%QT_INCDIR%%/QtWebEngineWidgets/qtwebenginewidgetsversion.h
> %%QT_INCDIR%%/QtWebEngineWidgets/qwebenginecertificateerror.h
>@@ -109,14 +152,32 @@
> %%QT_INCDIR%%/QtWebEngineWidgets/qwebenginescriptcollection.h
> %%QT_INCDIR%%/QtWebEngineWidgets/qwebenginesettings.h
> %%QT_INCDIR%%/QtWebEngineWidgets/qwebengineview.h
>-%%QT_INCDIR%%/QtWebEngineWidgets/qtwebenginewidgets-config.h
> %%QT_CMAKEDIR%%/Qt5Designer/Qt5Designer_QWebEngineViewPlugin.cmake
>+%%QT_CMAKEDIR%%/Qt5Gui/Qt5Gui_QPdfPlugin.cmake
>+%%QT_CMAKEDIR%%/Qt5Pdf/Qt5PdfConfig.cmake
>+%%QT_CMAKEDIR%%/Qt5Pdf/Qt5PdfConfigVersion.cmake
>+%%QT_CMAKEDIR%%/Qt5PdfWidgets/Qt5PdfWidgetsConfig.cmake
>+%%QT_CMAKEDIR%%/Qt5PdfWidgets/Qt5PdfWidgetsConfigVersion.cmake
> %%QT_CMAKEDIR%%/Qt5WebEngine/Qt5WebEngineConfig.cmake
> %%QT_CMAKEDIR%%/Qt5WebEngine/Qt5WebEngineConfigVersion.cmake
> %%QT_CMAKEDIR%%/Qt5WebEngineCore/Qt5WebEngineCoreConfig.cmake
> %%QT_CMAKEDIR%%/Qt5WebEngineCore/Qt5WebEngineCoreConfigVersion.cmake
> %%QT_CMAKEDIR%%/Qt5WebEngineWidgets/Qt5WebEngineWidgetsConfig.cmake
> %%QT_CMAKEDIR%%/Qt5WebEngineWidgets/Qt5WebEngineWidgetsConfigVersion.cmake
>+%%QT_BINDIR%%/qwebengine_convert_dict
>+@comment %%DEBUG%%%%QT_BINDIR%%/qwebengine_convert_dict.debug
>+%%QT_LIBDIR%%/libQt5Pdf.prl
>+%%QT_LIBDIR%%/libQt5Pdf.so
>+%%QT_LIBDIR%%/libQt5Pdf.so.5
>+%%QT_LIBDIR%%/libQt5Pdf.so.%%SHORTVER%%
>+%%QT_LIBDIR%%/libQt5Pdf.so.%%FULLVER%%
>+@comment %%DEBUG%%%%QT_LIBDIR%%/libQt5Pdf.so.%%FULLVER%%.debug
>+%%QT_LIBDIR%%/libQt5PdfWidgets.prl
>+%%QT_LIBDIR%%/libQt5PdfWidgets.so
>+%%QT_LIBDIR%%/libQt5PdfWidgets.so.5
>+%%QT_LIBDIR%%/libQt5PdfWidgets.so.%%SHORTVER%%
>+%%QT_LIBDIR%%/libQt5PdfWidgets.so.%%FULLVER%%
>+@comment %%DEBUG%%%%QT_LIBDIR%%/libQt5PdfWidgets.so.%%FULLVER%%.debug
> %%QT_LIBDIR%%/libQt5WebEngine.prl
> %%QT_LIBDIR%%/libQt5WebEngine.so
> %%QT_LIBDIR%%/libQt5WebEngine.so.5
>@@ -135,6 +196,10 @@
> %%QT_LIBDIR%%/libQt5WebEngineWidgets.so.%%SHORTVER%%
> %%QT_LIBDIR%%/libQt5WebEngineWidgets.so.%%FULLVER%%
> @comment %%DEBUG%%%%QT_LIBDIR%%/libQt5WebEngineWidgets.so.%%FULLVER%%.debug
>+%%QT_MKSPECDIR%%/modules/qt_lib_pdf.pri
>+%%QT_MKSPECDIR%%/modules/qt_lib_pdf_private.pri
>+%%QT_MKSPECDIR%%/modules/qt_lib_pdfwidgets.pri
>+%%QT_MKSPECDIR%%/modules/qt_lib_pdfwidgets_private.pri
> %%QT_MKSPECDIR%%/modules/qt_lib_webengine.pri
> %%QT_MKSPECDIR%%/modules/qt_lib_webengine_private.pri
> %%QT_MKSPECDIR%%/modules/qt_lib_webenginecore.pri
>@@ -144,6 +209,15 @@
> %%QT_MKSPECDIR%%/modules/qt_lib_webenginewidgets_private.pri
> %%QT_PLUGINDIR%%/designer/libqwebengineview.so
> @comment %%DEBUG%%%%QT_PLUGINDIR%%/designer/libqwebengineview.so.debug
>+%%QT_PLUGINDIR%%/imageformats/libqpdf.so
>+@comment %%DEBUG%%%%QT_PLUGINDIR%%/imageformats/libqpdf.so.debug
>+%%QT_QMLDIR%%/QtQuick/Pdf/libpdfplugin.so
>+@comment %%DEBUG%%%%QT_QMLDIR%%/QtQuick/Pdf/libpdfplugin.so.debug
>+%%QT_QMLDIR%%/QtQuick/Pdf/plugins.qmltypes
>+%%QT_QMLDIR%%/QtQuick/Pdf/qml/PdfMultiPageView.qml
>+%%QT_QMLDIR%%/QtQuick/Pdf/qml/PdfPageView.qml
>+%%QT_QMLDIR%%/QtQuick/Pdf/qml/PdfScrollablePageView.qml
>+%%QT_QMLDIR%%/QtQuick/Pdf/qmldir
> %%QT_QMLDIR%%/QtWebEngine/Controls1Delegates/AlertDialog.qml
> %%QT_QMLDIR%%/QtWebEngine/Controls1Delegates/AuthenticationDialog.qml
> %%QT_QMLDIR%%/QtWebEngine/Controls1Delegates/ColorDialog.qml
>@@ -172,10 +246,13 @@
> @comment %%DEBUG%%%%QT_QMLDIR%%/QtWebEngine/libqtwebengineplugin.so.debug
> %%QT_QMLDIR%%/QtWebEngine/plugins.qmltypes
> %%QT_QMLDIR%%/QtWebEngine/qmldir
>+libdata/pkgconfig/Qt5Pdf.pc
>+libdata/pkgconfig/Qt5PdfWidgets.pc
> libdata/pkgconfig/Qt5WebEngine.pc
> libdata/pkgconfig/Qt5WebEngineCore.pc
> libdata/pkgconfig/Qt5WebEngineWidgets.pc
> %%QT_LIBEXECDIR%%/QtWebEngineProcess
>+@comment %%DEBUG%%%%QT_LIBEXECDIR%%/QtWebEngineProcess.debug
> %%BE%%%%QT_DATADIR%%/resources/icudtb.dat
> %%LE%%%%QT_DATADIR%%/resources/icudtl.dat
> %%QT_DATADIR%%/resources/qtwebengine_devtools_resources.pak
>diff --git a/x11-themes/qt5-style-plugins/Makefile b/x11-themes/qt5-style-plugins/Makefile
>index 14fc90c63c34..340db3ed90f5 100644
>--- a/x11-themes/qt5-style-plugins/Makefile
>+++ b/x11-themes/qt5-style-plugins/Makefile
>@@ -14,6 +14,8 @@ COMMENT=	Additional Styles for Qt 5 and KDE
> 
> LICENSE=	LGPL21
> 
>+BROKEN=		Not compatible with modern Qt
>+
> LIB_DEPENDS=	libfontconfig.so:x11-fonts/fontconfig \
> 		libfreetype.so:print/freetype2
> 
>diff --git a/x11-toolkits/qt5-declarative/pkg-plist b/x11-toolkits/qt5-declarative/pkg-plist
>index 0c4c41eb3ba3..0178b9f98c64 100644
>--- a/x11-toolkits/qt5-declarative/pkg-plist
>+++ b/x11-toolkits/qt5-declarative/pkg-plist
>@@ -5,6 +5,7 @@
> %%QT_INCDIR%%/QtPacketProtocol/QtPacketProtocolDepends
> %%QT_INCDIR%%/QtPacketProtocol/QtPacketProtocolVersion
> %%QT_INCDIR%%/QtPacketProtocol/qtpacketprotocolversion.h
>+%%QT_INCDIR%%/QtQml/%%FULLVER%%/QtQml/private/inlinecomponentutils_p.h
> %%QT_INCDIR%%/QtQml/%%FULLVER%%/QtQml/private/qabstractanimationjob_p.h
> %%QT_INCDIR%%/QtQml/%%FULLVER%%/QtQml/private/qanimationgroupjob_p.h
> %%QT_INCDIR%%/QtQml/%%FULLVER%%/QtQml/private/qanimationjobutil_p.h
>@@ -246,11 +247,12 @@
> %%QT_INCDIR%%/QtQml/QJSValueList
> %%QT_INCDIR%%/QtQml/QQmlAbstractUrlInterceptor
> %%QT_INCDIR%%/QtQml/QQmlApplicationEngine
>-%%QT_INCDIR%%/QtQml/QQmlAttachedPropertiesFunc
> %%QT_INCDIR%%/QtQml/QQmlComponent
> %%QT_INCDIR%%/QtQml/QQmlContext
> %%QT_INCDIR%%/QtQml/QQmlDebuggingEnabler
> %%QT_INCDIR%%/QtQml/QQmlEngine
>+%%QT_INCDIR%%/QtQml/QQmlEngineExtensionInterface
>+%%QT_INCDIR%%/QtQml/QQmlEngineExtensionPlugin
> %%QT_INCDIR%%/QtQml/QQmlError
> %%QT_INCDIR%%/QtQml/QQmlExpression
> %%QT_INCDIR%%/QtQml/QQmlExtensionInterface
>@@ -263,6 +265,7 @@
> %%QT_INCDIR%%/QtQml/QQmlInfo
> %%QT_INCDIR%%/QtQml/QQmlListProperty
> %%QT_INCDIR%%/QtQml/QQmlListReference
>+%%QT_INCDIR%%/QtQml/QQmlModuleRegistration
> %%QT_INCDIR%%/QtQml/QQmlNetworkAccessManagerFactory
> %%QT_INCDIR%%/QtQml/QQmlParserStatus
> %%QT_INCDIR%%/QtQml/QQmlProperties
>@@ -272,6 +275,7 @@
> %%QT_INCDIR%%/QtQml/QQmlScriptString
> %%QT_INCDIR%%/QtQml/QQmlTypeInfo
> %%QT_INCDIR%%/QtQml/QQmlTypesExtensionInterface
>+%%QT_INCDIR%%/QtQml/QmlTypeAndRevisionsRegistration
> %%QT_INCDIR%%/QtQml/QtQml
> %%QT_INCDIR%%/QtQml/QtQmlDepends
> %%QT_INCDIR%%/QtQml/QtQmlVersion
>@@ -294,6 +298,7 @@
> %%QT_INCDIR%%/QtQml/qqmlincubator.h
> %%QT_INCDIR%%/QtQml/qqmlinfo.h
> %%QT_INCDIR%%/QtQml/qqmllist.h
>+%%QT_INCDIR%%/QtQml/qqmlmoduleregistration.h
> %%QT_INCDIR%%/QtQml/qqmlnetworkaccessmanagerfactory.h
> %%QT_INCDIR%%/QtQml/qqmlparserstatus.h
> %%QT_INCDIR%%/QtQml/qqmlprivate.h
>@@ -309,6 +314,7 @@
> %%QT_INCDIR%%/QtQmlDebug/%%FULLVER%%/QtQmlDebug/private/qqmldebugclient_p_p.h
> %%QT_INCDIR%%/QtQmlDebug/%%FULLVER%%/QtQmlDebug/private/qqmldebugconnection_p.h
> %%QT_INCDIR%%/QtQmlDebug/%%FULLVER%%/QtQmlDebug/private/qqmldebugmessageclient_p.h
>+%%QT_INCDIR%%/QtQmlDebug/%%FULLVER%%/QtQmlDebug/private/qqmldebugtranslationclient_p.h
> %%QT_INCDIR%%/QtQmlDebug/%%FULLVER%%/QtQmlDebug/private/qqmlenginecontrolclient_p.h
> %%QT_INCDIR%%/QtQmlDebug/%%FULLVER%%/QtQmlDebug/private/qqmlenginecontrolclient_p_p.h
> %%QT_INCDIR%%/QtQmlDebug/%%FULLVER%%/QtQmlDebug/private/qqmlenginedebugclient_p.h
>@@ -331,9 +337,9 @@
> %%QT_INCDIR%%/QtQmlDebug/QtQmlDebugDepends
> %%QT_INCDIR%%/QtQmlDebug/QtQmlDebugVersion
> %%QT_INCDIR%%/QtQmlDebug/qtqmldebugversion.h
>+%%QT_INCDIR%%/QtQmlModels/%%FULLVER%%/QtQmlModels/private/qqmlabstractdelegatecomponent_p.h
> %%QT_INCDIR%%/QtQmlModels/%%FULLVER%%/QtQmlModels/private/qqmladaptormodel_p.h
> %%QT_INCDIR%%/QtQmlModels/%%FULLVER%%/QtQmlModels/private/qqmlchangeset_p.h
>-%%QT_INCDIR%%/QtQmlModels/%%FULLVER%%/QtQmlModels/private/qqmldelegatecomponent_p.h
> %%QT_INCDIR%%/QtQmlModels/%%FULLVER%%/QtQmlModels/private/qqmldelegatemodel_p.h
> %%QT_INCDIR%%/QtQmlModels/%%FULLVER%%/QtQmlModels/private/qqmldelegatemodel_p_p.h
> %%QT_INCDIR%%/QtQmlModels/%%FULLVER%%/QtQmlModels/private/qqmlinstantiator_p.h
>@@ -346,8 +352,6 @@
> %%QT_INCDIR%%/QtQmlModels/%%FULLVER%%/QtQmlModels/private/qqmlmodelsmodule_p.h
> %%QT_INCDIR%%/QtQmlModels/%%FULLVER%%/QtQmlModels/private/qqmlobjectmodel_p.h
> %%QT_INCDIR%%/QtQmlModels/%%FULLVER%%/QtQmlModels/private/qqmltableinstancemodel_p.h
>-%%QT_INCDIR%%/QtQmlModels/%%FULLVER%%/QtQmlModels/private/qqmltablemodel_p.h
>-%%QT_INCDIR%%/QtQmlModels/%%FULLVER%%/QtQmlModels/private/qqmltablemodelcolumn_p.h
> %%QT_INCDIR%%/QtQmlModels/%%FULLVER%%/QtQmlModels/private/qquickpackage_p.h
> %%QT_INCDIR%%/QtQmlModels/%%FULLVER%%/QtQmlModels/private/qtqmlmodels-config_p.h
> %%QT_INCDIR%%/QtQmlModels/%%FULLVER%%/QtQmlModels/private/qtqmlmodelsglobal_p.h
>@@ -388,7 +392,6 @@
> %%QT_INCDIR%%/QtQuick/%%FULLVER%%/QtQuick/private/qquickbehavior_p.h
> %%QT_INCDIR%%/QtQuick/%%FULLVER%%/QtQuick/private/qquickborderimage_p.h
> %%QT_INCDIR%%/QtQuick/%%FULLVER%%/QtQuick/private/qquickborderimage_p_p.h
>-%%QT_INCDIR%%/QtQuick/%%FULLVER%%/QtQuick/private/qquickboundaryrule_p.h
> %%QT_INCDIR%%/QtQuick/%%FULLVER%%/QtQuick/private/qquickcanvascontext_p.h
> %%QT_INCDIR%%/QtQuick/%%FULLVER%%/QtQuick/private/qquickcanvasitem_p.h
> %%QT_INCDIR%%/QtQuick/%%FULLVER%%/QtQuick/private/qquickclipnode_p.h
>@@ -417,6 +420,7 @@
> %%QT_INCDIR%%/QtQuick/%%FULLVER%%/QtQuick/private/qquickfocusscope_p.h
> %%QT_INCDIR%%/QtQuick/%%FULLVER%%/QtQuick/private/qquickfontloader_p.h
> %%QT_INCDIR%%/QtQuick/%%FULLVER%%/QtQuick/private/qquickfontmetrics_p.h
>+%%QT_INCDIR%%/QtQuick/%%FULLVER%%/QtQuick/private/qquickforeignutils_p.h
> %%QT_INCDIR%%/QtQuick/%%FULLVER%%/QtQuick/private/qquickgenericshadereffect_p.h
> %%QT_INCDIR%%/QtQuick/%%FULLVER%%/QtQuick/private/qquickgraphicsinfo_p.h
> %%QT_INCDIR%%/QtQuick/%%FULLVER%%/QtQuick/private/qquickgridview_p.h
>@@ -516,7 +520,6 @@
> %%QT_INCDIR%%/QtQuick/%%FULLVER%%/QtQuick/private/qquicktransition_p.h
> %%QT_INCDIR%%/QtQuick/%%FULLVER%%/QtQuick/private/qquicktransitionmanager_p_p.h
> %%QT_INCDIR%%/QtQuick/%%FULLVER%%/QtQuick/private/qquicktranslate_p.h
>-%%QT_INCDIR%%/QtQuick/%%FULLVER%%/QtQuick/private/qquickutilmodule_p.h
> %%QT_INCDIR%%/QtQuick/%%FULLVER%%/QtQuick/private/qquickvalidator_p.h
> %%QT_INCDIR%%/QtQuick/%%FULLVER%%/QtQuick/private/qquickvaluetypes_p.h
> %%QT_INCDIR%%/QtQuick/%%FULLVER%%/QtQuick/private/qquickview_p.h
>@@ -568,7 +571,6 @@
> %%QT_INCDIR%%/QtQuick/%%FULLVER%%/QtQuick/private/qsgrhiatlastexture_p.h
> %%QT_INCDIR%%/QtQuick/%%FULLVER%%/QtQuick/private/qsgrhidistancefieldglyphcache_p.h
> %%QT_INCDIR%%/QtQuick/%%FULLVER%%/QtQuick/private/qsgrhilayer_p.h
>-%%QT_INCDIR%%/QtQuick/%%FULLVER%%/QtQuick/private/qsgrhinativetextureimporter_p.h
> %%QT_INCDIR%%/QtQuick/%%FULLVER%%/QtQuick/private/qsgrhishadereffectnode_p.h
> %%QT_INCDIR%%/QtQuick/%%FULLVER%%/QtQuick/private/qsgrhisupport_p.h
> %%QT_INCDIR%%/QtQuick/%%FULLVER%%/QtQuick/private/qsgrhitextureglyphcache_p.h
>@@ -729,7 +731,7 @@
> %%QT_INCDIR%%/QtQuickShapes/qquickshapesglobal.h
> %%QT_INCDIR%%/QtQuickShapes/qtquickshapesversion.h
> %%QT_INCDIR%%/QtQuickTest/%%FULLVER%%/QtQuickTest/private/qtestoptions_p.h
>-%%QT_INCDIR%%/QtQuickTest/%%FULLVER%%/QtQuickTest/private/quicktestevent_p.h
>+%%QT_INCDIR%%/QtQuickTest/%%FULLVER%%/QtQuickTest/private/quicktest_p.h
> %%QT_INCDIR%%/QtQuickTest/%%FULLVER%%/QtQuickTest/private/quicktestresult_p.h
> %%QT_INCDIR%%/QtQuickTest/QtQuickTest
> %%QT_INCDIR%%/QtQuickTest/QtQuickTestDepends
>@@ -783,16 +785,31 @@
> %%QT_CMAKEDIR%%/Qt5QuickWidgets/Qt5QuickWidgetsConfig.cmake
> %%QT_CMAKEDIR%%/Qt5QuickWidgets/Qt5QuickWidgetsConfigVersion.cmake
> %%QT_BINDIR%%/qml
>+%%DEBUG%%%%QT_BINDIR%%/qml.debug
> %%QT_BINDIR%%/qmlcachegen
>+%%DEBUG%%%%QT_BINDIR%%/qmlcachegen.debug
> %%QT_BINDIR%%/qmleasing
>+%%DEBUG%%%%QT_BINDIR%%/qmleasing.debug
>+%%QT_BINDIR%%/qmlformat
>+%%DEBUG%%%%QT_BINDIR%%/qmlformat.debug
> %%QT_BINDIR%%/qmlimportscanner
>+%%DEBUG%%%%QT_BINDIR%%/qmlimportscanner.debug
> %%QT_BINDIR%%/qmllint
>+%%DEBUG%%%%QT_BINDIR%%/qmllint.debug
> %%QT_BINDIR%%/qmlmin
>+%%DEBUG%%%%QT_BINDIR%%/qmlmin.debug
> %%QT_BINDIR%%/qmlplugindump
>+%%DEBUG%%%%QT_BINDIR%%/qmlplugindump.debug
> %%QT_BINDIR%%/qmlpreview
>+%%DEBUG%%%%QT_BINDIR%%/qmlpreview.debug
> %%QT_BINDIR%%/qmlprofiler
>+%%DEBUG%%%%QT_BINDIR%%/qmlprofiler.debug
> %%QT_BINDIR%%/qmlscene
>+%%DEBUG%%%%QT_BINDIR%%/qmlscene.debug
> %%QT_BINDIR%%/qmltestrunner
>+%%DEBUG%%%%QT_BINDIR%%/qmltestrunner.debug
>+%%QT_BINDIR%%/qmltyperegistrar
>+%%DEBUG%%%%QT_BINDIR%%/qmltyperegistrar.debug
> %%QT_LIBDIR%%/libQt5PacketProtocol.a
> %%QT_LIBDIR%%/libQt5PacketProtocol.prl
> %%QT_LIBDIR%%/libQt5Qml.prl
>@@ -847,7 +864,14 @@
> %%QT_LIBDIR%%/libQt5QuickWidgets.so.%%SHORTVER%%
> %%QT_LIBDIR%%/libQt5QuickWidgets.so.%%FULLVER%%
> %%DEBUG%%%%QT_LIBDIR%%/libQt5QuickWidgets.so.%%FULLVER%%.debug
>+%%QT_LIBDIR%%/metatypes/qt5qml_metatypes.json
>+%%QT_LIBDIR%%/metatypes/qt5qmlmodels_metatypes.json
>+%%QT_LIBDIR%%/metatypes/qt5qmlworkerscript_metatypes.json
>+%%QT_LIBDIR%%/metatypes/qt5quick_metatypes.json
>+%%QT_LIBDIR%%/metatypes/qt5quickparticles_metatypes.json
>+%%QT_LIBDIR%%/metatypes/qt5quickshapes_metatypes.json
> %%QT_MKSPECDIR%%/features/qmlcache.prf
>+%%QT_MKSPECDIR%%/features/qmltypes.prf
> %%QT_MKSPECDIR%%/features/qtquickcompiler.prf
> %%QT_MKSPECDIR%%/modules/qt_lib_packetprotocol_private.pri
> %%QT_MKSPECDIR%%/modules/qt_lib_qml.pri
>@@ -866,6 +890,7 @@
> %%QT_MKSPECDIR%%/modules/qt_lib_quickshapes_private.pri
> %%QT_MKSPECDIR%%/modules/qt_lib_quickwidgets.pri
> %%QT_MKSPECDIR%%/modules/qt_lib_quickwidgets_private.pri
>+%%QT_LIBDIR%%/metatypes/qt5quicktest_metatypes.json
> %%QT_PLUGINDIR%%/qmltooling/libqmldbg_debugger.so
> %%DEBUG%%%%QT_PLUGINDIR%%/qmltooling/libqmldbg_debugger.so.debug
> %%QT_PLUGINDIR%%/qmltooling/libqmldbg_inspector.so
>@@ -912,6 +937,8 @@
> %%DEBUG%%%%QT_QMLDIR%%/Qt/labs/wavefrontmesh/libqmlwavefrontmeshplugin.so.debug
> %%QT_QMLDIR%%/Qt/labs/wavefrontmesh/plugins.qmltypes
> %%QT_QMLDIR%%/Qt/labs/wavefrontmesh/qmldir
>+%%QT_QMLDIR%%/Qt/test/qtestroot/plugins.qmltypes
>+%%QT_QMLDIR%%/Qt/test/qtestroot/qmldir
> %%QT_QMLDIR%%/QtQml/Models.2/libmodelsplugin.so
> %%DEBUG%%%%QT_QMLDIR%%/QtQml/Models.2/libmodelsplugin.so.debug
> %%QT_QMLDIR%%/QtQml/Models.2/plugins.qmltypes
>diff --git a/x11-toolkits/qt5-gui/pkg-plist b/x11-toolkits/qt5-gui/pkg-plist
>index bebc701c559a..36ea92ed3763 100644
>--- a/x11-toolkits/qt5-gui/pkg-plist
>+++ b/x11-toolkits/qt5-gui/pkg-plist
>@@ -853,6 +853,7 @@
> %%QT_CMAKEDIR%%/Qt5XkbCommonSupport/Qt5XkbCommonSupportConfig.cmake
> %%QT_CMAKEDIR%%/Qt5XkbCommonSupport/Qt5XkbCommonSupportConfigVersion.cmake
> %%QT_BINDIR%%/qvkgen
>+%%DEBUG%%%%QT_BINDIR%%/qvkgen.debug
> %%QT_LIBDIR%%/libQt5AccessibilitySupport.a
> %%QT_LIBDIR%%/libQt5AccessibilitySupport.prl
> %%QT_LIBDIR%%/libQt5DeviceDiscoverySupport.a
>@@ -899,6 +900,7 @@
> %%DEBUG%%%%QT_LIBDIR%%/libQt5XcbQpa.so.%%FULLVER%%.debug
> %%QT_LIBDIR%%/libQt5XkbCommonSupport.a
> %%QT_LIBDIR%%/libQt5XkbCommonSupport.prl
>+%%QT_LIBDIR%%/metatypes/qt5gui_metatypes.json
> %%QT_MKSPECDIR%%/modules/qt_lib_accessibility_support_private.pri
> %%QT_MKSPECDIR%%/modules/qt_lib_devicediscovery_support_private.pri
> %%QT_MKSPECDIR%%/modules/qt_lib_edid_support_private.pri
>diff --git a/x11-toolkits/qt5-quickcontrols2/pkg-plist b/x11-toolkits/qt5-quickcontrols2/pkg-plist
>index adaa0b9c175a..18f80cf78854 100644
>--- a/x11-toolkits/qt5-quickcontrols2/pkg-plist
>+++ b/x11-toolkits/qt5-quickcontrols2/pkg-plist
>@@ -583,5 +583,17 @@
> %%DEBUG%%%%QT_QMLDIR%%/QtQuick/Templates.2/libqtquicktemplates2plugin.so.debug
> %%QT_QMLDIR%%/QtQuick/Templates.2/plugins.qmltypes
> %%QT_QMLDIR%%/QtQuick/Templates.2/qmldir
>+%%QT_INCDIR%%/QtQuickTemplates2/%%FULLVER%%/QtQuickTemplates2/private/qquickheaderview_p.h
>+%%QT_INCDIR%%/QtQuickTemplates2/%%FULLVER%%/QtQuickTemplates2/private/qquickheaderview_p_p.h
>+%%QT_QMLDIR%%/QtQuick/Controls.2/Fusion/HorizontalHeaderView.qml
>+%%QT_QMLDIR%%/QtQuick/Controls.2/Fusion/VerticalHeaderView.qml
>+%%QT_QMLDIR%%/QtQuick/Controls.2/HorizontalHeaderView.qml
>+%%QT_QMLDIR%%/QtQuick/Controls.2/Imagine/HorizontalHeaderView.qml
>+%%QT_QMLDIR%%/QtQuick/Controls.2/Imagine/VerticalHeaderView.qml
>+%%QT_QMLDIR%%/QtQuick/Controls.2/Material/HorizontalHeaderView.qml
>+%%QT_QMLDIR%%/QtQuick/Controls.2/Material/VerticalHeaderView.qml
>+%%QT_QMLDIR%%/QtQuick/Controls.2/Universal/HorizontalHeaderView.qml
>+%%QT_QMLDIR%%/QtQuick/Controls.2/Universal/VerticalHeaderView.qml
>+%%QT_QMLDIR%%/QtQuick/Controls.2/VerticalHeaderView.qml
> libdata/pkgconfig/Qt5QuickControls2.pc
> libdata/pkgconfig/Qt5QuickTemplates2.pc
>diff --git a/x11-toolkits/qt5-widgets/pkg-plist b/x11-toolkits/qt5-widgets/pkg-plist
>index e4ee61c243c6..dfb2585415c1 100644
>--- a/x11-toolkits/qt5-widgets/pkg-plist
>+++ b/x11-toolkits/qt5-widgets/pkg-plist
>@@ -291,6 +291,7 @@
> %%QT_INCDIR%%/QtWidgets/QStyleOptionTabBarBaseV2
> %%QT_INCDIR%%/QtWidgets/QStyleOptionTabV2
> %%QT_INCDIR%%/QtWidgets/QStyleOptionTabV3
>+%%QT_INCDIR%%/QtWidgets/QStyleOptionTabV4
> %%QT_INCDIR%%/QtWidgets/QStyleOptionTabWidgetFrame
> %%QT_INCDIR%%/QtWidgets/QStyleOptionTabWidgetFrameV2
> %%QT_INCDIR%%/QtWidgets/QStyleOptionTitleBar
>@@ -486,7 +487,9 @@
> %%QT_LIBDIR%%/libQt5Widgets.so.%%SHORTVER%%
> %%QT_LIBDIR%%/libQt5Widgets.so.%%FULLVER%%
> %%DEBUG%%%%QT_LIBDIR%%/libQt5Widgets.so.%%FULLVER%%.debug
>+%%QT_LIBDIR%%/metatypes/qt5widgets_metatypes.json
> %%QT_BINDIR%%/uic
>+%%DEBUG%%%%QT_BINDIR%%/uic.debug
> %%QT_MKSPECDIR%%/modules/qt_lib_widgets.pri
> %%QT_MKSPECDIR%%/modules/qt_lib_widgets_private.pri
> %%GTK3%%%%QT_PLUGINDIR%%/platformthemes/libqgtk3.so
>diff --git a/x11/qt5-qev/Makefile b/x11/qt5-qev/Makefile
>index 973be4d3cfde..dfd1eb0ba620 100644
>--- a/x11/qt5-qev/Makefile
>+++ b/x11/qt5-qev/Makefile
>@@ -11,15 +11,6 @@ COMMENT=	Qt QWidget events introspection tool
> USES=		compiler:c++11-lang qmake qt-dist:5,tools
> USE_QT=		core widgets
> 
>-WRKSRC_SUBDIR=	src/${PORTNAME}
>-
> QT_BINARIES=	yes
> 
>-# qev is not connected to qttool's build system, so we cannot just run qmake qt-dist:5,tools
>-# and set {BUILD,INSTALL}_WRKSRC.
>-# Instead, we run qmake qt-dist:5,tools from src/${PORTNAME} but need to copy .qmake qt-dist:5,tools.conf to
>-# it for all required variables to be set (MODULE_VERSION etc).
>-post-patch:
>-	${CP} ${WRKSRC}/../../.qmake.conf ${WRKSRC}
>-
> .include <bsd.port.mk>
>diff --git a/x11/qt5-qev/files/patch-src_src.pro b/x11/qt5-qev/files/patch-src_src.pro
>new file mode 100644
>index 000000000000..50751bb518e9
>--- /dev/null
>+++ b/x11/qt5-qev/files/patch-src_src.pro
>@@ -0,0 +1,58 @@
>+--- src/src.pro.orig	2020-04-12 19:54:33 UTC
>++++ src/src.pro
>+@@ -1,54 +1,3 @@
>+ TEMPLATE = subdirs
>+ 
>+-qtHaveModule(widgets) {
>+-    no-png {
>+-        message("Some graphics-related tools are unavailable without PNG support")
>+-    } else {
>+-        QT_FOR_CONFIG += widgets
>+-        qtConfig(pushbutton):qtConfig(toolbutton) {
>+-            SUBDIRS = assistant \
>+-                      designer \
>+-                      pixeltool
>+-
>+-            linguist.depends = designer
>+-        }
>+-        qtHaveModule(quick):qtConfig(thread):qtConfig(toolbutton): SUBDIRS += distancefieldgenerator
>+-    }
>+-}
>+-
>+-SUBDIRS += linguist \
>+-    qtattributionsscanner
>+-
>+-qtConfig(library) {
>+-    !android|android_app: SUBDIRS += qtplugininfo
>+-}
>+-
>+-include($$OUT_PWD/qdoc/qtqdoc-config.pri)
>+-QT_FOR_CONFIG += qdoc-private
>+-qtConfig(qdoc): qtConfig(thread): SUBDIRS += qdoc
>+-
>+-!android|android_app: SUBDIRS += qtpaths
>+-
>+-macos {
>+-    SUBDIRS += macdeployqt
>+-}
>+-
>+-qtHaveModule(dbus): SUBDIRS += qdbus
>+-
>+-win32|winrt:SUBDIRS += windeployqt
>+-winrt:SUBDIRS += winrtrunner
>+-qtHaveModule(gui):!wasm:!android:!uikit:!qnx:!winrt: SUBDIRS += qtdiag
>+-
>+-qtNomakeTools( \
>+-    distancefieldgenerator \
>+-    pixeltool \
>+-)
>+-
>+-# This is necessary to avoid a race condition between toolchain.prf
>+-# invocations in a module-by-module cross-build.
>+-cross_compile:isEmpty(QMAKE_HOST_CXX.INCDIRS) {
>+-    qdoc.depends += qtattributionsscanner
>+-    windeployqt.depends += qtattributionsscanner
>+-    winrtrunner.depends += qtattributionsscanner
>+-    linguist.depends += qtattributionsscanner
>+-}
>++SUBDIRS = qev
>diff --git a/x11/qt5-qev/pkg-plist b/x11/qt5-qev/pkg-plist
>index 122603d1a0d0..1b3e89084109 100644
>--- a/x11/qt5-qev/pkg-plist
>+++ b/x11/qt5-qev/pkg-plist
>@@ -1 +1,2 @@
> %%QT_BINDIR%%/qev
>+%%DEBUG%%%%QT_BINDIR%%/qev.debug

Actions: View | Diff

Attachments on bug 247010: 215262