Attachment #215262 for bug #247010

View | Details | Raw Unified | Return to bug 247010
Collapse All | Expand All

Lines 24-30 _QT_MK_INCLUDED= qt.mk Link Here

(-)b/Mk/Uses/qt.mk (-1 / +1 lines)
24		24
25	# Qt versions currently supported by the framework.	25	# Qt versions currently supported by the framework.
26	_QT_SUPPORTED?= 5	26	_QT_SUPPORTED?= 5
27	QT5_VERSION?= 5.14.2	27	QT5_VERSION?= 5.15.0
28		28
29	# We accept the Qt version to be passed by either or all of the three mk files.	29	# We accept the Qt version to be passed by either or all of the three mk files.
30	. if empty(qt_ARGS) && empty(qmake_ARGS) && empty(qt-dist_ARGS)	30	. if empty(qt_ARGS) && empty(qmake_ARGS) && empty(qt-dist_ARGS)

Lines 76-82 Link Here

(-)b/comms/qt5-connectivity/pkg-plist (-1 / +1 lines)
76	%%QT_INCDIR%%/QtBluetooth/%%FULLVER%%/QtBluetooth/private/qlowenergycontroller_bluez_p.h	76	%%QT_INCDIR%%/QtBluetooth/%%FULLVER%%/QtBluetooth/private/qlowenergycontroller_bluez_p.h
77	%%QT_INCDIR%%/QtBluetooth/%%FULLVER%%/QtBluetooth/private/qlowenergycontroller_bluezdbus_p.h	77	%%QT_INCDIR%%/QtBluetooth/%%FULLVER%%/QtBluetooth/private/qlowenergycontroller_bluezdbus_p.h
78	%%QT_INCDIR%%/QtBluetooth/%%FULLVER%%/QtBluetooth/private/qlowenergycontroller_darwin_p.h	78	%%QT_INCDIR%%/QtBluetooth/%%FULLVER%%/QtBluetooth/private/qlowenergycontroller_darwin_p.h
79	%%QT_INCDIR%%/QtBluetooth/%%FULLVER%%/QtBluetooth/private/qlowenergycontroller_p.h	79	%%QT_INCDIR%%/QtBluetooth/%%FULLVER%%/QtBluetooth/private/qlowenergycontroller_dummy_p.h
80	%%QT_INCDIR%%/QtBluetooth/%%FULLVER%%/QtBluetooth/private/qlowenergycontroller_win_p.h	80	%%QT_INCDIR%%/QtBluetooth/%%FULLVER%%/QtBluetooth/private/qlowenergycontroller_win_p.h
81	%%QT_INCDIR%%/QtBluetooth/%%FULLVER%%/QtBluetooth/private/qlowenergycontroller_winrt_new_p.h	81	%%QT_INCDIR%%/QtBluetooth/%%FULLVER%%/QtBluetooth/private/qlowenergycontroller_winrt_new_p.h
82	%%QT_INCDIR%%/QtBluetooth/%%FULLVER%%/QtBluetooth/private/qlowenergycontroller_winrt_p.h	82	%%QT_INCDIR%%/QtBluetooth/%%FULLVER%%/QtBluetooth/private/qlowenergycontroller_winrt_p.h

Lines 1-4 Link Here

(-)b/comms/qt5-serialbus/pkg-plist (+1 lines)
1	%%QT_BINDIR%%/canbusutil	1	%%QT_BINDIR%%/canbusutil
		2	%%DEBUG%%%%QT_BINDIR%%/canbusutil.debug
2	%%QT_INCDIR%%/QtSerialBus/%%FULLVER%%/QtSerialBus/private/qcanbusdevice_p.h	3	%%QT_INCDIR%%/QtSerialBus/%%FULLVER%%/QtSerialBus/private/qcanbusdevice_p.h
3	%%QT_INCDIR%%/QtSerialBus/%%FULLVER%%/QtSerialBus/private/qcanbusdeviceinfo_p.h	4	%%QT_INCDIR%%/QtSerialBus/%%FULLVER%%/QtSerialBus/private/qcanbusdeviceinfo_p.h
4	%%QT_INCDIR%%/QtSerialBus/%%FULLVER%%/QtSerialBus/private/qmodbus_symbols_p.h	5	%%QT_INCDIR%%/QtSerialBus/%%FULLVER%%/QtSerialBus/private/qmodbus_symbols_p.h




and the less-fragile approach would therefore break on old-gcc-in-base
architectures.

--- src/plugins/sqldrivers/mysql/qsql_mysql.cpp.orig	2020-03-11 15:29:12 UTC
+++ src/plugins/sqldrivers/mysql/qsql_mysql.cpp
@@ -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)

+#endif
+
 QT_BEGIN_NAMESPACE
 
 class QMYSQLDriverPrivate : public QSqlDriverPrivate
@@ -930,7 +938,7 @@ bool QMYSQLResult::exec()
               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()
     MYSQL_BIND* currBind;
     QVector<MYSQL_TIME *> timeVector;
     QVector<QByteArray> stringVector;
-    QVector<my_bool> nullVector;
+    QVector<mysql_bool> nullVector;
 
     const QVector<QVariant> values = boundValues();
 
@@ -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;
@@ -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;

Lines 1-4 Link Here

(-)b/devel/liteide/Makefile (-1 / +1 lines)
1	# $FreeBSD$	1	# $FreeBSD: head/devel/liteide/Makefile 532766 2020-04-24 16:00:17Z dmgk $
2		2
3	PORTNAME= liteide	3	PORTNAME= liteide
4	DISTVERSIONPREFIX= x	4	DISTVERSIONPREFIX= x

Lines 1-2 Link Here

(-)b/devel/qt5-assistant/pkg-plist (+1 lines)
1	%%QT_BINDIR%%/assistant	1	%%QT_BINDIR%%/assistant
		2	%%DEBUG%%%%QT_BINDIR%%/assistant.debug
2	share/pixmaps/assistant-qt5.png	3	share/pixmaps/assistant-qt5.png

Lines 1-5 Link Here

(-)b/devel/qt5-buildtools/pkg-plist (+2 lines)
1	%%QT_BINDIR%%/moc	1	%%QT_BINDIR%%/moc
		2	%%DEBUG%%%%QT_BINDIR%%/moc.debug
2	%%QT_BINDIR%%/rcc	3	%%QT_BINDIR%%/rcc
		4	%%DEBUG%%%%QT_BINDIR%%/rcc.debug
3	%%QT_BINDIR%%/syncqt.pl	5	%%QT_BINDIR%%/syncqt.pl
4	%%QT_LIBDIR%%/libQt5Bootstrap.a	6	%%QT_LIBDIR%%/libQt5Bootstrap.a
5	%%QT_LIBDIR%%/libQt5Bootstrap.prl	7	%%QT_LIBDIR%%/libQt5Bootstrap.prl

Lines 2-8 Link Here

(-)b/devel/qt5-core/Makefile (-2 / +1 lines)
2		2
3	PORTNAME= core	3	PORTNAME= core
4	DISTVERSION= ${QT5_VERSION}	4	DISTVERSION= ${QT5_VERSION}
5	PORTREVISION= 3
6	CATEGORIES= devel	5	CATEGORIES= devel
7	PKGNAMEPREFIX= qt5-	6	PKGNAMEPREFIX= qt5-
8		7
Lines 25-31 CONFIGURE_ARGS= -no-accessibility -no-gif -no-libpng -no-libjpeg \ Link Here
25	-no-iconv -no-dbus -no-opengl \	24	-no-iconv -no-dbus -no-opengl \
26	-no-egl -no-evdev \	25	-no-egl -no-evdev \
27	-no-fontconfig -no-freetype -no-gtk -no-harfbuzz \	26	-no-fontconfig -no-freetype -no-gtk -no-harfbuzz \
28	-no-libudev -no-xcb -no-xkb -no-xcb-xlib \	27	-no-libudev -no-xcb -no-xcb-xlib \
29	-no-xkbcommon -no-libinput	28	-no-xkbcommon -no-libinput
30	USE_LDCONFIG= ${PREFIX}/${QT_LIBDIR_REL}	29	USE_LDCONFIG= ${PREFIX}/${QT_LIBDIR_REL}
31		30




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





--- src/corelib/time/qtimezoneprivate_tz.cpp.orig	2020-05-11 08:15:08 UTC
+++ src/corelib/time/qtimezoneprivate_tz.cpp
@@ -1153,6 +1153,25 @@ QByteArray QTzTimeZonePrivate::systemTimeZoneId() cons
         }
     }
 
+    // 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)) {
+            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);
+            }
+        }
+    }
+
     // Some systems (e.g. uClibc) have a default value for $TZ in /etc/TZ:
     // in a line like ZONE="Europe/Oslo" or TIMEZONE="Europe/Oslo"
     if (ianaId.isEmpty()) {
         QFile zone(QStringLiteral("/etc/TZ"));

Lines 9-18 Link Here

(-)b/devel/qt5-core/pkg-plist (+12 lines)
9	%%QT_INCDIR%%/QtCore/%%FULLVER%%/QtCore/private/qabstracttransition_p.h	9	%%QT_INCDIR%%/QtCore/%%FULLVER%%/QtCore/private/qabstracttransition_p.h
10	%%QT_INCDIR%%/QtCore/%%FULLVER%%/QtCore/private/qanimationgroup_p.h	10	%%QT_INCDIR%%/QtCore/%%FULLVER%%/QtCore/private/qanimationgroup_p.h
11	%%QT_INCDIR%%/QtCore/%%FULLVER%%/QtCore/private/qbig5codec_p.h	11	%%QT_INCDIR%%/QtCore/%%FULLVER%%/QtCore/private/qbig5codec_p.h
		12	%%QT_INCDIR%%/QtCore/%%FULLVER%%/QtCore/private/qbinaryjson_p.h
		13	%%QT_INCDIR%%/QtCore/%%FULLVER%%/QtCore/private/qbinaryjsonarray_p.h
		14	%%QT_INCDIR%%/QtCore/%%FULLVER%%/QtCore/private/qbinaryjsonobject_p.h
		15	%%QT_INCDIR%%/QtCore/%%FULLVER%%/QtCore/private/qbinaryjsonvalue_p.h
12	%%QT_INCDIR%%/QtCore/%%FULLVER%%/QtCore/private/qbytearray_p.h	16	%%QT_INCDIR%%/QtCore/%%FULLVER%%/QtCore/private/qbytearray_p.h
13	%%QT_INCDIR%%/QtCore/%%FULLVER%%/QtCore/private/qbytedata_p.h	17	%%QT_INCDIR%%/QtCore/%%FULLVER%%/QtCore/private/qbytedata_p.h
14	%%QT_INCDIR%%/QtCore/%%FULLVER%%/QtCore/private/qcalendarbackend_p.h	18	%%QT_INCDIR%%/QtCore/%%FULLVER%%/QtCore/private/qcalendarbackend_p.h
15	%%QT_INCDIR%%/QtCore/%%FULLVER%%/QtCore/private/qcalendarmath_p.h	19	%%QT_INCDIR%%/QtCore/%%FULLVER%%/QtCore/private/qcalendarmath_p.h
		20	%%QT_INCDIR%%/QtCore/%%FULLVER%%/QtCore/private/qcborcommon_p.h
16	%%QT_INCDIR%%/QtCore/%%FULLVER%%/QtCore/private/qcborvalue_p.h	21	%%QT_INCDIR%%/QtCore/%%FULLVER%%/QtCore/private/qcborvalue_p.h
17	%%QT_INCDIR%%/QtCore/%%FULLVER%%/QtCore/private/qcfsocketnotifier_p.h	22	%%QT_INCDIR%%/QtCore/%%FULLVER%%/QtCore/private/qcfsocketnotifier_p.h
18	%%QT_INCDIR%%/QtCore/%%FULLVER%%/QtCore/private/qcollator_p.h	23	%%QT_INCDIR%%/QtCore/%%FULLVER%%/QtCore/private/qcollator_p.h
Lines 30-35 Link Here
30	%%QT_INCDIR%%/QtCore/%%FULLVER%%/QtCore/private/qdebug_p.h	35	%%QT_INCDIR%%/QtCore/%%FULLVER%%/QtCore/private/qdebug_p.h
31	%%QT_INCDIR%%/QtCore/%%FULLVER%%/QtCore/private/qdir_p.h	36	%%QT_INCDIR%%/QtCore/%%FULLVER%%/QtCore/private/qdir_p.h
32	%%QT_INCDIR%%/QtCore/%%FULLVER%%/QtCore/private/qdoublescanprint_p.h	37	%%QT_INCDIR%%/QtCore/%%FULLVER%%/QtCore/private/qdoublescanprint_p.h
		38	%%QT_INCDIR%%/QtCore/%%FULLVER%%/QtCore/private/qduplicatetracker_p.h
33	%%QT_INCDIR%%/QtCore/%%FULLVER%%/QtCore/private/qelfparser_p.h	39	%%QT_INCDIR%%/QtCore/%%FULLVER%%/QtCore/private/qelfparser_p.h
34	%%QT_INCDIR%%/QtCore/%%FULLVER%%/QtCore/private/qendian_p.h	40	%%QT_INCDIR%%/QtCore/%%FULLVER%%/QtCore/private/qendian_p.h
35	%%QT_INCDIR%%/QtCore/%%FULLVER%%/QtCore/private/qeucjpcodec_p.h	41	%%QT_INCDIR%%/QtCore/%%FULLVER%%/QtCore/private/qeucjpcodec_p.h
Lines 182-187 Link Here
182	%%QT_INCDIR%%/QtCore/%%FULLVER%%/QtCore/private/qutfcodec_p.h	188	%%QT_INCDIR%%/QtCore/%%FULLVER%%/QtCore/private/qutfcodec_p.h
183	%%QT_INCDIR%%/QtCore/%%FULLVER%%/QtCore/private/qvariant_p.h	189	%%QT_INCDIR%%/QtCore/%%FULLVER%%/QtCore/private/qvariant_p.h
184	%%QT_INCDIR%%/QtCore/%%FULLVER%%/QtCore/private/qvariantanimation_p.h	190	%%QT_INCDIR%%/QtCore/%%FULLVER%%/QtCore/private/qvariantanimation_p.h
		191	%%QT_INCDIR%%/QtCore/%%FULLVER%%/QtCore/private/qwaitcondition_p.h
185	%%QT_INCDIR%%/QtCore/%%FULLVER%%/QtCore/private/qwindowscodec_p.h	192	%%QT_INCDIR%%/QtCore/%%FULLVER%%/QtCore/private/qwindowscodec_p.h
186	%%QT_INCDIR%%/QtCore/%%FULLVER%%/QtCore/private/qwindowspipereader_p.h	193	%%QT_INCDIR%%/QtCore/%%FULLVER%%/QtCore/private/qwindowspipereader_p.h
187	%%QT_INCDIR%%/QtCore/%%FULLVER%%/QtCore/private/qwindowspipewriter_p.h	194	%%QT_INCDIR%%/QtCore/%%FULLVER%%/QtCore/private/qwindowspipewriter_p.h
Lines 427-432 Link Here
427	%%QT_INCDIR%%/QtCore/QSignalTransition	434	%%QT_INCDIR%%/QtCore/QSignalTransition
428	%%QT_INCDIR%%/QtCore/QSize	435	%%QT_INCDIR%%/QtCore/QSize
429	%%QT_INCDIR%%/QtCore/QSizeF	436	%%QT_INCDIR%%/QtCore/QSizeF
		437	%%QT_INCDIR%%/QtCore/QSocketDescriptor
430	%%QT_INCDIR%%/QtCore/QSocketNotifier	438	%%QT_INCDIR%%/QtCore/QSocketNotifier
431	%%QT_INCDIR%%/QtCore/QSortFilterProxyModel	439	%%QT_INCDIR%%/QtCore/QSortFilterProxyModel
432	%%QT_INCDIR%%/QtCore/QSpecialInteger	440	%%QT_INCDIR%%/QtCore/QSpecialInteger
Lines 559-564 Link Here
559	%%QT_INCDIR%%/QtCore/qcborcommon.h	567	%%QT_INCDIR%%/QtCore/qcborcommon.h
560	%%QT_INCDIR%%/QtCore/qcbormap.h	568	%%QT_INCDIR%%/QtCore/qcbormap.h
561	%%QT_INCDIR%%/QtCore/qcborstream.h	569	%%QT_INCDIR%%/QtCore/qcborstream.h
		570	%%QT_INCDIR%%/QtCore/qcborstreamreader.h
		571	%%QT_INCDIR%%/QtCore/qcborstreamwriter.h
562	%%QT_INCDIR%%/QtCore/qcborvalue.h	572	%%QT_INCDIR%%/QtCore/qcborvalue.h
563	%%QT_INCDIR%%/QtCore/qchar.h	573	%%QT_INCDIR%%/QtCore/qchar.h
564	%%QT_INCDIR%%/QtCore/qcollator.h	574	%%QT_INCDIR%%/QtCore/qcollator.h
Lines 738-749 Link Here
738	%%QT_CMAKEDIR%%/Qt5Core/Qt5CoreConfigVersion.cmake	748	%%QT_CMAKEDIR%%/Qt5Core/Qt5CoreConfigVersion.cmake
739	%%QT_CMAKEDIR%%/Qt5Core/Qt5CoreMacros.cmake	749	%%QT_CMAKEDIR%%/Qt5Core/Qt5CoreMacros.cmake
740	%%QT_BINDIR%%/qlalr	750	%%QT_BINDIR%%/qlalr
		751	%%DEBUG%%%%QT_BINDIR%%/qlalr.debug
741	%%QT_LIBDIR%%/libQt5Core.prl	752	%%QT_LIBDIR%%/libQt5Core.prl
742	%%QT_LIBDIR%%/libQt5Core.so	753	%%QT_LIBDIR%%/libQt5Core.so
743	%%QT_LIBDIR%%/libQt5Core.so.5	754	%%QT_LIBDIR%%/libQt5Core.so.5
744	%%QT_LIBDIR%%/libQt5Core.so.%%SHORTVER%%	755	%%QT_LIBDIR%%/libQt5Core.so.%%SHORTVER%%
745	%%QT_LIBDIR%%/libQt5Core.so.%%FULLVER%%	756	%%QT_LIBDIR%%/libQt5Core.so.%%FULLVER%%
746	%%DEBUG%%%%QT_LIBDIR%%/libQt5Core.so.%%FULLVER%%.debug	757	%%DEBUG%%%%QT_LIBDIR%%/libQt5Core.so.%%FULLVER%%.debug
		758	%%QT_LIBDIR%%/metatypes/qt5core_metatypes.json
747	%%QT_MKSPECDIR%%/modules/qt_lib_core.pri	759	%%QT_MKSPECDIR%%/modules/qt_lib_core.pri
748	%%QT_MKSPECDIR%%/modules/qt_lib_core_private.pri	760	%%QT_MKSPECDIR%%/modules/qt_lib_core_private.pri
749	libdata/pkgconfig/Qt5Core.pc	761	libdata/pkgconfig/Qt5Core.pc

Lines 75-81 Link Here

(-)b/devel/qt5-dbus/pkg-plist (+2 lines)
75	%%QT_LIBDIR%%/libQt5DBus.so.%%FULLVER%%	75	%%QT_LIBDIR%%/libQt5DBus.so.%%FULLVER%%
76	%%DEBUG%%%%QT_LIBDIR%%/libQt5DBus.so.%%FULLVER%%.debug	76	%%DEBUG%%%%QT_LIBDIR%%/libQt5DBus.so.%%FULLVER%%.debug
77	%%QT_BINDIR%%/qdbuscpp2xml	77	%%QT_BINDIR%%/qdbuscpp2xml
		78	%%DEBUG%%%%QT_BINDIR%%/qdbuscpp2xml.debug
78	%%QT_BINDIR%%/qdbusxml2cpp	79	%%QT_BINDIR%%/qdbusxml2cpp
		80	%%DEBUG%%%%QT_BINDIR%%/qdbusxml2cpp.debug
79	%%QT_MKSPECDIR%%/modules/qt_lib_dbus.pri	81	%%QT_MKSPECDIR%%/modules/qt_lib_dbus.pri
80	%%QT_MKSPECDIR%%/modules/qt_lib_dbus_private.pri	82	%%QT_MKSPECDIR%%/modules/qt_lib_dbus_private.pri
81	libdata/pkgconfig/Qt5DBus.pc	83	libdata/pkgconfig/Qt5DBus.pc

Lines 182-187 Link Here

(-)b/devel/qt5-designer/pkg-plist (+1 lines)
182	%%QT_CMAKEDIR%%/Qt5DesignerComponents/Qt5DesignerComponentsConfigVersion.cmake	182	%%QT_CMAKEDIR%%/Qt5DesignerComponents/Qt5DesignerComponentsConfigVersion.cmake
183	%%WEBKIT%%%%QT_CMAKEDIR%%/Qt5Designer/Qt5Designer_QWebViewPlugin.cmake	183	%%WEBKIT%%%%QT_CMAKEDIR%%/Qt5Designer/Qt5Designer_QWebViewPlugin.cmake
184	%%QT_BINDIR%%/designer	184	%%QT_BINDIR%%/designer
		185	%%DEBUG%%%%QT_BINDIR%%/designer.debug
185	%%QT_LIBDIR%%/libQt5Designer.prl	186	%%QT_LIBDIR%%/libQt5Designer.prl
186	%%QT_LIBDIR%%/libQt5Designer.so	187	%%QT_LIBDIR%%/libQt5Designer.so
187	%%QT_LIBDIR%%/libQt5Designer.so.5	188	%%QT_LIBDIR%%/libQt5Designer.so.5

Lines 13-21 USE_QT= core gui network sql widgets \ Link Here

(-)b/devel/qt5-help/Makefile (-3 lines)
13	buildtools_build sql-sqlite3_run	13	buildtools_build sql-sqlite3_run
14	USE_LDCONFIG= ${PREFIX}/${QT_LIBDIR_REL}	14	USE_LDCONFIG= ${PREFIX}/${QT_LIBDIR_REL}
15		15
16	BUILD_WRKSRC= ${WRKSRC}/src/assistant
17	INSTALL_WRKSRC= ${WRKSRC}/src/assistant
18
19	QT_BINARIES= yes	16	QT_BINARIES= yes
20		17
21	.include <bsd.port.mk>	18	.include <bsd.port.mk>




%%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

%%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

%%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

Lines 1-4 Link Here

(-)b/devel/qt5-linguist/pkg-plist (+1 lines)
1	%%QT_BINDIR%%/linguist	1	%%QT_BINDIR%%/linguist
		2	%%DEBUG%%%%QT_BINDIR%%/linguist.debug
2	share/pixmaps/linguist-qt5.png	3	share/pixmaps/linguist-qt5.png
3	%%QT_DATADIR%%/phrasebooks/danish.qph	4	%%QT_DATADIR%%/phrasebooks/danish.qph
4	%%QT_DATADIR%%/phrasebooks/dutch.qph	5	%%QT_DATADIR%%/phrasebooks/dutch.qph

Lines 2-11 Link Here

(-)b/devel/qt5-linguisttools/pkg-plist (+6 lines)
2	%%QT_CMAKEDIR%%/Qt5LinguistTools/Qt5LinguistToolsConfigVersion.cmake	2	%%QT_CMAKEDIR%%/Qt5LinguistTools/Qt5LinguistToolsConfigVersion.cmake
3	%%QT_CMAKEDIR%%/Qt5LinguistTools/Qt5LinguistToolsMacros.cmake	3	%%QT_CMAKEDIR%%/Qt5LinguistTools/Qt5LinguistToolsMacros.cmake
4	%%QT_BINDIR%%/lconvert	4	%%QT_BINDIR%%/lconvert
		5	%%DEBUG%%%%QT_BINDIR%%/lconvert.debug
5	%%QT_BINDIR%%/lprodump	6	%%QT_BINDIR%%/lprodump
		7	%%DEBUG%%%%QT_BINDIR%%/lprodump.debug
6	%%QT_BINDIR%%/lrelease	8	%%QT_BINDIR%%/lrelease
7	%%QT_BINDIR%%/lrelease-pro	9	%%QT_BINDIR%%/lrelease-pro
		10	%%DEBUG%%%%QT_BINDIR%%/lrelease-pro.debug
		11	%%DEBUG%%%%QT_BINDIR%%/lrelease.debug
8	%%QT_BINDIR%%/lupdate	12	%%QT_BINDIR%%/lupdate
9	%%QT_BINDIR%%/lupdate-pro	13	%%QT_BINDIR%%/lupdate-pro
		14	%%DEBUG%%%%QT_BINDIR%%/lupdate-pro.debug
		15	%%DEBUG%%%%QT_BINDIR%%/lupdate.debug
10	man/man1/lrelease.1.gz	16	man/man1/lrelease.1.gz
11	man/man1/lupdate.1.gz	17	man/man1/lupdate.1.gz




%%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

%%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

%%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

%%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

%%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

Line 1 Link Here

(-)b/devel/qt5-qdbus/pkg-plist (+1 lines)
1	%%QT_BINDIR%%/qdbus	1	%%QT_BINDIR%%/qdbus
		2	%%DEBUG%%%%QT_BINDIR%%/qdbus.debug

Lines 1-2 Link Here

(-)b/devel/qt5-qdbusviewer/pkg-plist (+1 lines)
1	%%QT_BINDIR%%/qdbusviewer	1	%%QT_BINDIR%%/qdbusviewer
		2	%%DEBUG%%%%QT_BINDIR%%/qdbusviewer.debug
2	share/pixmaps/qdbusviewer-qt5.png	3	share/pixmaps/qdbusviewer-qt5.png

Lines 17-26 USE_QT= core declarative buildtools_build qdoc-data_run Link Here

(-)b/devel/qt5-qdoc/Makefile (-4 lines)
17	BUILD_WRKSRC= ${WRKSRC}/src/${PORTNAME}	17	BUILD_WRKSRC= ${WRKSRC}/src/${PORTNAME}
18	INSTALL_WRKSRC= ${BUILD_WRKSRC}	18	INSTALL_WRKSRC= ${BUILD_WRKSRC}
19		19
20	PLIST_FILES= ${QT_BINDIR}/qdoc \
21	${QT_CMAKEDIR}/Qt5DocTools/Qt5DocToolsConfig.cmake \
22	${QT_CMAKEDIR}/Qt5DocTools/Qt5DocToolsConfigVersion.cmake
23
24	CONFIGURE_ENV= LLVM_INSTALL_DIR=${LOCALBASE}/llvm${LLVM_DEFAULT}	20	CONFIGURE_ENV= LLVM_INSTALL_DIR=${LOCALBASE}/llvm${LLVM_DEFAULT}
25		21
26	QT_BINARIES= yes	22	QT_BINARIES= yes

Added Link Here

(-)b/devel/qt5-qdoc/pkg-plist (+4 lines)
1	%%QT_BINDIR%%/qdoc
2	%%DEBUG%%%%QT_BINDIR%%/qdoc.debug
3	%%QT_CMAKEDIR%%/Qt5DocTools/Qt5DocToolsConfig.cmake
4	%%QT_CMAKEDIR%%/Qt5DocTools/Qt5DocToolsConfigVersion.cmake

Lines 64-69 Link Here

(-)b/devel/qt5-remoteobjects/pkg-plist (+1 lines)
64	%%QT_CMAKEDIR%%/Qt5RepParser/Qt5RepParserConfig.cmake	64	%%QT_CMAKEDIR%%/Qt5RepParser/Qt5RepParserConfig.cmake
65	%%QT_CMAKEDIR%%/Qt5RepParser/Qt5RepParserConfigVersion.cmake	65	%%QT_CMAKEDIR%%/Qt5RepParser/Qt5RepParserConfigVersion.cmake
66	%%QT_BINDIR%%/repc	66	%%QT_BINDIR%%/repc
		67	%%DEBUG%%%%QT_BINDIR%%/repc.debug
67	%%QT_LIBDIR%%/libQt5RemoteObjects.prl	68	%%QT_LIBDIR%%/libQt5RemoteObjects.prl
68	%%QT_LIBDIR%%/libQt5RemoteObjects.so	69	%%QT_LIBDIR%%/libQt5RemoteObjects.so
69	%%QT_LIBDIR%%/libQt5RemoteObjects.so.5	70	%%QT_LIBDIR%%/libQt5RemoteObjects.so.5

Lines 45-50 Link Here

(-)b/devel/qt5-scxml/pkg-plist (+1 lines)
45	%%QT_CMAKEDIR%%/Qt5Scxml/Qt5ScxmlConfigVersion.cmake	45	%%QT_CMAKEDIR%%/Qt5Scxml/Qt5ScxmlConfigVersion.cmake
46	%%QT_CMAKEDIR%%/Qt5Scxml/Qt5ScxmlMacros.cmake	46	%%QT_CMAKEDIR%%/Qt5Scxml/Qt5ScxmlMacros.cmake
47	%%QT_BINDIR%%/qscxmlc	47	%%QT_BINDIR%%/qscxmlc
		48	%%DEBUG%%%%QT_BINDIR%%/qscxmlc.debug
48	%%QT_LIBDIR%%/libQt5Scxml.prl	49	%%QT_LIBDIR%%/libQt5Scxml.prl
49	%%QT_LIBDIR%%/libQt5Scxml.so	50	%%QT_LIBDIR%%/libQt5Scxml.so
50	%%QT_LIBDIR%%/libQt5Scxml.so.5	51	%%QT_LIBDIR%%/libQt5Scxml.so.5




%%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




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




%%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

%%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

%%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

%%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

%%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

%%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

%%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

%%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

%%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

%%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

%%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

%%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

%%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

%%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

%%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

%%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

%%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

%%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

%%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

%%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

%%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

%%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

%%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

%%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

%%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

Line 1 Link Here

(-)b/graphics/qt5-pixeltool/pkg-plist (+1 lines)
1	%%QT_BINDIR%%/pixeltool	1	%%QT_BINDIR%%/pixeltool
		2	%%DEBUG%%%%QT_BINDIR%%/pixeltool.debug

Lines 1-3 Link Here

(-)b/misc/qt5-examples/distinfo (-3 / +3 lines)
1	TIMESTAMP = 1586029328	1	TIMESTAMP = 1590590417
2	SHA256 (KDE/Qt/5.14.2/qt-everywhere-src-5.14.2.tar.xz) = c6fcd53c744df89e7d3223c02838a33309bd1c291fcb6f9341505fe99f7f19fa	2	SHA256 (KDE/Qt/5.15.0/qt-everywhere-src-5.15.0.tar.xz) = 22b63d7a7a45183865cc4141124f12b673e7a17b1fe2b91e433f6547c5d548c3
3	SIZE (KDE/Qt/5.14.2/qt-everywhere-src-5.14.2.tar.xz) = 549205340	3	SIZE (KDE/Qt/5.15.0/qt-everywhere-src-5.15.0.tar.xz) = 592401236




%%QT_EXAMPLEDIR%%/activeqt/wrapper/wrapperax.rc
%%QT_EXAMPLEDIR%%/aggregate/examples.pro
%%QT_EXAMPLEDIR%%/androidextras/androidextras.pro
%%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

%%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

%%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

%%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

%%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

%%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

%%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

%%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

%%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

%%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

%%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

%%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

%%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

%%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

%%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

%%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

%%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

%%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

%%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

%%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

%%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

%%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

%%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

%%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

Lines 31-40 Link Here

(-)b/multimedia/qt5-multimedia/pkg-plist (-1 / +1 lines)
31	%%QT_INCDIR%%/QtMultimedia/%%FULLVER%%/QtMultimedia/private/qsoundeffect_qaudio_p.h	31	%%QT_INCDIR%%/QtMultimedia/%%FULLVER%%/QtMultimedia/private/qsoundeffect_qaudio_p.h
32	%%QT_INCDIR%%/QtMultimedia/%%FULLVER%%/QtMultimedia/private/qtmultimedia-config_p.h	32	%%QT_INCDIR%%/QtMultimedia/%%FULLVER%%/QtMultimedia/private/qtmultimedia-config_p.h
33	%%QT_INCDIR%%/QtMultimedia/%%FULLVER%%/QtMultimedia/private/qtmultimediaglobal_p.h	33	%%QT_INCDIR%%/QtMultimedia/%%FULLVER%%/QtMultimedia/private/qtmultimediaglobal_p.h
34	%%QT_INCDIR%%/QtMultimedia/%%FULLVER%%/QtMultimedia/private/qvideoframe_p.h
35	%%QT_INCDIR%%/QtMultimedia/%%FULLVER%%/QtMultimedia/private/qvideoframeconversionhelper_p.h	34	%%QT_INCDIR%%/QtMultimedia/%%FULLVER%%/QtMultimedia/private/qvideoframeconversionhelper_p.h
36	%%QT_INCDIR%%/QtMultimedia/%%FULLVER%%/QtMultimedia/private/qvideooutputorientationhandler_p.h	35	%%QT_INCDIR%%/QtMultimedia/%%FULLVER%%/QtMultimedia/private/qvideooutputorientationhandler_p.h
37	%%QT_INCDIR%%/QtMultimedia/%%FULLVER%%/QtMultimedia/private/qvideosurfaceoutput_p.h	36	%%QT_INCDIR%%/QtMultimedia/%%FULLVER%%/QtMultimedia/private/qvideosurfaceoutput_p.h
		37	%%QT_INCDIR%%/QtMultimedia/%%FULLVER%%/QtMultimedia/private/qvideosurfaces_p.h
38	%%QT_INCDIR%%/QtMultimedia/%%FULLVER%%/QtMultimedia/private/qwavedecoder_p.h	38	%%QT_INCDIR%%/QtMultimedia/%%FULLVER%%/QtMultimedia/private/qwavedecoder_p.h
39	%%QT_INCDIR%%/QtMultimedia/QAbstractAudioDeviceInfo	39	%%QT_INCDIR%%/QtMultimedia/QAbstractAudioDeviceInfo
40	%%QT_INCDIR%%/QtMultimedia/QAbstractAudioInput	40	%%QT_INCDIR%%/QtMultimedia/QAbstractAudioInput

Lines 22-27 INSTALL_WRKSRC= ${BUILD_WRKSRC} Link Here

(-)b/net/qt5-network/Makefile (-1 / +8 lines)
22	QT_DEFINES= OPENSSL SSL	22	QT_DEFINES= OPENSSL SSL
23	QT_CONFIG= openssl	23	QT_CONFIG= openssl
24		24
		25	.include <bsd.port.pre.mk>
		26
		27	.if ${OPSYS} == FreeBSD && ${OSVERSION} < 1200085 && ${SSL_DEFAULT} == "base"
		28	# 1200085 339270 October 19, 2018 12.0-STABLE after updating OpenSSL to version 1.1.1.
		29	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
		30	.endif
		31
25	post-patch:	32	post-patch:
26	@${REINPLACE_CMD} -e 's\|/usr/local\|${LOCALBASE}\|g' \	33	@${REINPLACE_CMD} -e 's\|/usr/local\|${LOCALBASE}\|g' \
27	${BUILD_WRKSRC}/ssl/qsslsocket_openssl.cpp	34	${BUILD_WRKSRC}/ssl/qsslsocket_openssl.cpp
Lines 44-47 post-install: Link Here
44	${SETENV} ${MAKE_ENV} ${MAKE} ${MAKE_FLAGS} ${MAKEFILE} \	51	${SETENV} ${MAKE_ENV} ${MAKE} ${MAKE_FLAGS} ${MAKEFILE} \
45	${MAKE_ARGS} ${INSTALL_TARGET}	52	${MAKE_ARGS} ${INSTALL_TARGET}
46		53
47	.include <bsd.port.mk>	54	.include <bsd.port.post.mk>




--- 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

Removed Link Here

(-)a/net/qt5-network/files/patch-src_network_ssl_qsslcontext_openssl.cpp (-11 lines)
1	--- src/network/ssl/qsslcontext_openssl.cpp.orig 2019-10-01 08:05:51 UTC
2	+++ src/network/ssl/qsslcontext_openssl.cpp
3	@@ -265,7 +265,7 @@ void QSslContext::applyBackendConfig(QSslContext *sslC
4	}
5	#endif // ocsp
6
7	-#if OPENSSL_VERSION_NUMBER >= 0x10002000L
8	+#if OPENSSL_VERSION_NUMBER >= 0x10002000L && !defined(LIBRESSL_VERSION_NUMBER)
9	if (QSslSocket::sslLibraryVersionNumber() >= 0x10002000L) {
10	QSharedPointer<SSL_CONF_CTX> cctx(q_SSL_CONF_CTX_new(), &q_SSL_CONF_CTX_free);
11	if (cctx) {




--- 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

 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)
@@ -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)

 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
@@ -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 !defined(LIBRESSL_VERSION_NUMBER)
+#if OPENSSL_VERSION_NUMBER >= 0x10002000L && !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);
 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)
         // libssl.so.<SHLIB_VERSION_NUMBER> and libcrypto.so.<SHLIB_VERSION_NUMBER> found
         return pair;
@@ -980,12 +989,21 @@
     RESOLVEFUNC(EVP_CIPHER_CTX_reset)
     RESOLVEFUNC(EVP_PKEY_base_id)
     RESOLVEFUNC(RSA_bits)
+#ifdef LIBRESSL_VERSION_NUMBER

+#endif
     RESOLVEFUNC(DH_get0_pqg)
     RESOLVEFUNC(SSL_CTX_set_options)
 
@@ -881,7 +901,9 @@ bool q_resolveOpenSslSymbols()
 
     RESOLVEFUNC(SSL_SESSION_get_ticket_lifetime_hint)
     RESOLVEFUNC(DH_bits)

 
 #if QT_CONFIG(dtls)
     RESOLVEFUNC(DTLSv1_listen)
@@ -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 !defined(LIBRESSL_VERSION_NUMBER)
+#if OPENSSL_VERSION_NUMBER >= 0x10002000L && !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)

Lines 1-8 Link Here

(-)b/net/qt5-network/files/patch-src_network_ssl_qsslsocket__openssl__symbols__p.h (-14 / +40 lines)
1	--- src/network/ssl/qsslsocket_openssl11_symbols_p.h.orig 2019-10-01 07:47:24 UTC	1	--- src/network/ssl/qsslsocket_openssl_symbols_p.h.orig 2020-05-05 11:59:27 UTC
2	+++ src/network/ssl/qsslsocket_openssl11_symbols_p.h	2	+++ src/network/ssl/qsslsocket_openssl_symbols_p.h
3	@@ -77,20 +77,49 @@	3	@@ -72,6 +72,14 @@
		4	#include "qsslsocket_openssl_p.h"
		5	#include <QtCore/qglobal.h>
4		6
5	const unsigned char * q_ASN1_STRING_get0_data(const ASN1_STRING *x);	7	+#if defined(LIBRESSL_VERSION_NUMBER) && LIBRESSL_VERSION_NUMBER >= 0x20700000L
		8	+# define TLS1_2_VERSION 0x0303
		9	+# define TLS_MAX_VERSION TLS1_2_VERSION
		10	+# define TLS_ANY_VERSION 0x10000
		11	+# define DTLS1_2_VERSION 0xFEFD
		12	+# define DTLS_MAX_VERSION DTLS1_2_VERSION
		13	+#endif
		14	+
		15	#if QT_CONFIG(ocsp)
		16	#include "qocsp_p.h"
		17	#endif
		18	@@ -225,22 +233,50 @@ QT_BEGIN_NAMESPACE
		19	// content of the header here. Later, can be better sorted/split into groups,
		20	// depending on the functionality.
6		21
7	+#if defined(LIBRESSL_VERSION_NUMBER) && LIBRESSL_VERSION_NUMBER >= 0x20700000L	22	+#if defined(LIBRESSL_VERSION_NUMBER) && LIBRESSL_VERSION_NUMBER >= 0x20700000L
8	+// LibreSSL 2.7 has stack_st but not OPENSSL_STACK	23	+// LibreSSL 2.7 has stack_st but not OPENSSL_STACK
Lines 13-19 Link Here
13	+typedef int (X509_STORE_CTX_verify_cb)(int, X509_STORE_CTX );	28	+typedef int (X509_STORE_CTX_verify_cb)(int, X509_STORE_CTX );
14	+#endif	29	+#endif
15	+	30	+
16	+	31	const unsigned char * q_ASN1_STRING_get0_data(const ASN1_STRING *x);
		32
17	Q_AUTOTEST_EXPORT BIO q_BIO_new(const BIO_METHOD a);	33	Q_AUTOTEST_EXPORT BIO q_BIO_new(const BIO_METHOD a);
18	Q_AUTOTEST_EXPORT const BIO_METHOD *q_BIO_s_mem();	34	Q_AUTOTEST_EXPORT const BIO_METHOD *q_BIO_s_mem();
19		35
Lines 50-71 Link Here
50	int q_SSL_session_reused(SSL *a);	66	int q_SSL_session_reused(SSL *a);
51	unsigned long q_SSL_CTX_set_options(SSL_CTX *ctx, unsigned long op);	67	unsigned long q_SSL_CTX_set_options(SSL_CTX *ctx, unsigned long op);
52	int q_OPENSSL_init_ssl(uint64_t opts, const OPENSSL_INIT_SETTINGS *settings);	68	int q_OPENSSL_init_ssl(uint64_t opts, const OPENSSL_INIT_SETTINGS *settings);
53	@@ -113,12 +142,15 @@	69	@@ -266,8 +302,13 @@ int q_DH_bits(DH *dh);
54	void q_DH_get0_pqg(const DH dh, const BIGNUM p, const BIGNUM q, const BIGNUM *g);	70	# define q_SSL_load_error_strings() q_OPENSSL_init_ssl(OPENSSL_INIT_LOAD_SSL_STRINGS \
55	int q_DH_bits(DH *dh);
56
57	-# define q_SSL_load_error_strings() q_OPENSSL_init_ssl(OPENSSL_INIT_LOAD_SSL_STRINGS \
58	+#define q_SSL_load_error_strings() q_OPENSSL_init_ssl(OPENSSL_INIT_LOAD_SSL_STRINGS \
59	\| OPENSSL_INIT_LOAD_CRYPTO_STRINGS, NULL)	71	\| OPENSSL_INIT_LOAD_CRYPTO_STRINGS, NULL)
60	-	72
61	+#ifdef LIBRESSL_VERSION_NUMBER	73	+#ifdef LIBRESSL_VERSION_NUMBER
62	+#define q_SKM_sk_num(type, st) ((int ()(const STACK_OF(type) ))q_sk_num)(st)	74	+#define q_SKM_sk_num(type, st) ((int ()(const STACK_OF(type) ))q_sk_num)(st)
63	+#define q_SKM_sk_value(type, st,i) ((type * ()(const STACK_OF(type) , int))q_sk_value)(st, i)	75	+#define q_SKM_sk_value(type, st,i) ((type * ()(const STACK_OF(type) , int))q_sk_value)(st, i)
64	+#else	76	+#else
65	#define q_SKM_sk_num(type, st) ((int ()(const STACK_OF(type) ))q_OPENSSL_sk_num)(st)	77	#define q_SKM_sk_num(type, st) ((int ()(const STACK_OF(type) ))q_OPENSSL_sk_num)(st)
66	#define q_SKM_sk_value(type, st,i) ((type * ()(const STACK_OF(type) , int))q_OPENSSL_sk_value)(st, i)	78	#define q_SKM_sk_value(type, st,i) ((type * ()(const STACK_OF(type) , int))q_OPENSSL_sk_value)(st, i)
67	-
68	+#endif	79	+#endif
		80
69	#define q_OPENSSL_add_all_algorithms_conf() q_OPENSSL_init_crypto(OPENSSL_INIT_ADD_ALL_CIPHERS \	81	#define q_OPENSSL_add_all_algorithms_conf() q_OPENSSL_init_crypto(OPENSSL_INIT_ADD_ALL_CIPHERS \
70	\| OPENSSL_INIT_ADD_ALL_DIGESTS \	82	\| OPENSSL_INIT_ADD_ALL_DIGESTS \
71	\| OPENSSL_INIT_LOAD_CONFIG, NULL)	83	@@ -494,12 +535,14 @@ int q_SSL_CTX_use_PrivateKey(SSL_CTX a, EVP_PKEY b);
		84	int q_SSL_CTX_use_RSAPrivateKey(SSL_CTX a, RSA b);
		85	int q_SSL_CTX_use_PrivateKey_file(SSL_CTX a, const char b, int c);
		86	X509_STORE q_SSL_CTX_get_cert_store(const SSL_CTX a);
		87	+#if !defined(LIBRESSL_VERSION_NUMBER)
		88	SSL_CONF_CTX *q_SSL_CONF_CTX_new();
		89	void q_SSL_CONF_CTX_free(SSL_CONF_CTX *a);
		90	void q_SSL_CONF_CTX_set_ssl_ctx(SSL_CONF_CTX a, SSL_CTX b);
		91	unsigned int q_SSL_CONF_CTX_set_flags(SSL_CONF_CTX *a, unsigned int b);
		92	int q_SSL_CONF_CTX_finish(SSL_CONF_CTX *a);
		93	int q_SSL_CONF_cmd(SSL_CONF_CTX a, const char b, const char *c);
		94	+#endif
		95	void q_SSL_free(SSL *a);
		96	STACK_OF(SSL_CIPHER) q_SSL_get_ciphers(const SSL a);
		97	const SSL_CIPHER q_SSL_get_current_cipher(SSL a);

Removed Link Here

(-)a/net/qt5-network/files/patch-src_network_ssl_qsslsocket_openssl.cpp (-11 lines)
1	--- src/network/ssl/qsslsocket_openssl.cpp.orig 2019-10-01 08:09:52 UTC
2	+++ src/network/ssl/qsslsocket_openssl.cpp
3	@@ -604,7 +604,7 @@ bool QSslSocketBackendPrivate::initSslContext()
4	q_SSL_set_psk_server_callback(ssl, &q_ssl_psk_server_callback);
5	}
6	#endif
7	-#if OPENSSL_VERSION_NUMBER >= 0x10101006L
8	+#if OPENSSL_VERSION_NUMBER >= 0x10101006L && !defined(LIBRESSL_VERSION_NUMBER)
9	// Set the client callback for TLSv1.3 PSK
10	if (mode == QSslSocket::SslClientMode
11	&& QSslSocket::sslLibraryBuildVersionNumber() >= 0x10101006L) {




--- 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);




%%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

%%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




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>




--- 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

Added Link Here

(-)b/sysutils/qt5-qtdiag/pkg-plist (+2 lines)
1	%%QT_BINDIR%%/qtdiag
2	%%DEBUG%%%%QT_BINDIR%%/qtdiag.debug




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>




--- 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

Added Link Here

(-)b/sysutils/qt5-qtpaths/pkg-plist (+2 lines)
1	%%QT_BINDIR%%/qtpaths
2	%%DEBUG%%%%QT_BINDIR%%/qtpaths.debug




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>




--- 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

Added Link Here

(-)b/sysutils/qt5-qtplugininfo/pkg-plist (+2 lines)
1	%%QT_BINDIR%%/qtplugininfo
2	%%DEBUG%%%%QT_BINDIR%%/qtplugininfo.debug

Lines 1-3 Link Here

(-)b/textproc/qt5-xml/pkg-plist (+2 lines)
		1	%%QT_INCDIR%%/QtXml/%%FULLVER%%/QtXml/private/qdom_p.h
		2	%%QT_INCDIR%%/QtXml/%%FULLVER%%/QtXml/private/qdomhelpers_p.h
1	%%QT_INCDIR%%/QtXml/%%FULLVER%%/QtXml/private/qtxml-config_p.h	3	%%QT_INCDIR%%/QtXml/%%FULLVER%%/QtXml/private/qtxml-config_p.h
2	%%QT_INCDIR%%/QtXml/%%FULLVER%%/QtXml/private/qxml_p.h	4	%%QT_INCDIR%%/QtXml/%%FULLVER%%/QtXml/private/qxml_p.h
3	%%QT_INCDIR%%/QtXml/QDomAttr	5	%%QT_INCDIR%%/QtXml/QDomAttr

Lines 412-418 Link Here

(-)b/textproc/qt5-xmlpatterns/pkg-plist (+2 lines)
412	%%QT_LIBDIR%%/libQt5XmlPatterns.so.%%FULLVER%%	412	%%QT_LIBDIR%%/libQt5XmlPatterns.so.%%FULLVER%%
413	%%DEBUG%%%%QT_LIBDIR%%/libQt5XmlPatterns.so.%%FULLVER%%.debug	413	%%DEBUG%%%%QT_LIBDIR%%/libQt5XmlPatterns.so.%%FULLVER%%.debug
414	%%QT_BINDIR%%/xmlpatterns	414	%%QT_BINDIR%%/xmlpatterns
		415	%%DEBUG%%%%QT_BINDIR%%/xmlpatterns.debug
415	%%QT_BINDIR%%/xmlpatternsvalidator	416	%%QT_BINDIR%%/xmlpatternsvalidator
		417	%%DEBUG%%%%QT_BINDIR%%/xmlpatternsvalidator.debug
416	%%QT_MKSPECDIR%%/modules/qt_lib_xmlpatterns.pri	418	%%QT_MKSPECDIR%%/modules/qt_lib_xmlpatterns.pri
417	%%QT_MKSPECDIR%%/modules/qt_lib_xmlpatterns_private.pri	419	%%QT_MKSPECDIR%%/modules/qt_lib_xmlpatterns_private.pri
418	libdata/pkgconfig/Qt5XmlPatterns.pc	420	libdata/pkgconfig/Qt5XmlPatterns.pc

Lines 48-54 LIB_DEPENDS= libavcodec.so:multimedia/ffmpeg \ Link Here

(-)b/www/qt5-webengine/Makefile (-1 / +1 lines)
48	libwebp.so:graphics/webp	48	libwebp.so:graphics/webp
49		49
50	DISTINFO_FILE= ${.CURDIR}/distinfo	50	DISTINFO_FILE= ${.CURDIR}/distinfo
51	QT5_VERSION= 5.14.2	51	QT5_VERSION= 5.15.0
52		52
53	OPTIONS_SINGLE= AUDIO	53	OPTIONS_SINGLE= AUDIO
54	OPTIONS_SINGLE_AUDIO= ALSA PULSEAUDIO SNDIO	54	OPTIONS_SINGLE_AUDIO= ALSA PULSEAUDIO SNDIO

Lines 1-3 Link Here

(-)b/www/qt5-webengine/distinfo (-3 / +3 lines)
1	TIMESTAMP = 1586559398	1	TIMESTAMP = 1590608885
2	SHA256 (KDE/Qt/5.14.2/qtwebengine-everywhere-src-5.14.2.tar.xz) = e169d6a75d8c397e04f843bc1b9585950fb9a001255cd18d6293f66fa8a6c947	2	SHA256 (KDE/Qt/5.15.0/qtwebengine-everywhere-src-5.15.0.tar.xz) = c38e2fda7ed1b7d5a90f26abf231ec0715d78a5bc39a94673d8e39d75f04c5df
3	SIZE (KDE/Qt/5.14.2/qtwebengine-everywhere-src-5.14.2.tar.xz) = 242467568	3	SIZE (KDE/Qt/5.15.0/qtwebengine-everywhere-src-5.15.0.tar.xz) = 278257432




--- 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:!ios {
+    !linux:!win32:!macos:!ios:!unix: {
         qtwebengine_platformError("Unknown platform. Qt WebEngine only supports Linux, Windows, and macOS.")
     } else {
         linux:qtwebengine_isLinuxPlatformSupported() {
@@ -125,6 +125,9 @@ defineTest(qtConfTest_detectPlatform) {
         }
         macos:qtwebengine_isMacOsPlatformSupported() {
             $${1}.platform = "macos"
+        }
+        unix:qtwebengine_isLinuxPlatformSupported() {
+            $${1}.platform = "linux"
         }
         ios:qtwebengine_isMacOsPlatformSupported() {
             $${1}.platform = "ios"
     !isEmpty(platformError) {

Removed Link Here

(-)a/www/qt5-webengine/files/patch-src_3rdparty_chromium_base_allocator_partition__allocator_partition__alloc.cc (-11 lines)
1	--- src/3rdparty/chromium/base/allocator/partition_allocator/partition_alloc.cc.orig 2019-05-23 12:39:34 UTC
2	+++ src/3rdparty/chromium/base/allocator/partition_allocator/partition_alloc.cc
3	@@ -440,7 +440,7 @@ static size_t PartitionPurgePage(internal::PartitionPa
4	#endif
5	}
6	// Terminate the freelist chain.
7	- *entry_ptr = nullptr;
8	+ *entry_ptr = internal::PartitionFreelistEntry::Transform(nullptr);
9	// The freelist head is stored unmasked.
10	page->freelist_head =
11	internal::PartitionFreelistEntry::Transform(page->freelist_head);




--- src/3rdparty/chromium/base/debug/elf_reader.cc.orig	2020-04-08 09:41:36 UTC
+++ src/3rdparty/chromium/base/debug/elf_reader.cc
@@ -98,6 +98,7 @@ size_t ReadElfBuildId(const void* elf_mapped_base,
         reinterpret_cast<const Nhdr*>(elf_base + header.p_vaddr);
     bool found = false;
     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) {
         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
 
       size_t section_size = bits::Align(current_note->n_namesz, 4) +
                             bits::Align(current_note->n_descsz, 4) +

Lines 1-4 Link Here

(-)b/www/qt5-webengine/files/patch-src_3rdparty_chromium_base_files_file__path__watcher__kqueue.h (-1 / +1 lines)
1	--- src/3rdparty/chromium/base/files/file_path_watcher_kqueue.h.orig 2017-01-26 00:49:07 UTC	1	--- src/3rdparty/chromium/base/files/file_path_watcher_kqueue.h.orig 2020-03-16 14:04:24 UTC
2	+++ src/3rdparty/chromium/base/files/file_path_watcher_kqueue.h	2	+++ src/3rdparty/chromium/base/files/file_path_watcher_kqueue.h
3	@@ -5,6 +5,10 @@	3	@@ -5,6 +5,10 @@
4	#ifndef BASE_FILES_FILE_PATH_WATCHER_KQUEUE_H_	4	#ifndef BASE_FILES_FILE_PATH_WATCHER_KQUEUE_H_




--- src/3rdparty/chromium/base/i18n/icu_util.cc.orig	2020-04-08 09:41:36 UTC
+++ src/3rdparty/chromium/base/i18n/icu_util.cc
@@ -43,7 +43,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"
 #endif
 
 #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"
+#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());
 #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().

Lines 1-6 Link Here

(-)b/www/qt5-webengine/files/patch-src_3rdparty_chromium_base_linux__util.cc (-2 / +4 lines)
1	--- src/3rdparty/chromium/base/linux_util.cc.orig 2018-11-13 18:25:11 UTC	1	--- src/3rdparty/chromium/base/linux_util.cc.orig 2020-03-16 14:04:24 UTC
2	+++ src/3rdparty/chromium/base/linux_util.cc	2	+++ src/3rdparty/chromium/base/linux_util.cc
3	@@ -111,12 +111,14 @@ char g_linux_distro[kDistroSize] =	3	@@ -144,6 +144,8 @@ char g_linux_distro[kDistroSize] =
4	"CrOS";	4	"CrOS";
5	#elif defined(OS_ANDROID)	5	#elif defined(OS_ANDROID)
6	"Android";	6	"Android";
Lines 9-14 Link Here
9	#else // if defined(OS_LINUX)	9	#else // if defined(OS_LINUX)
10	"Unknown";	10	"Unknown";
11	#endif	11	#endif
		12	@@ -164,7 +166,7 @@ BASE_EXPORT std::string GetKeyValueFromOSReleaseFileFo
		13	}
12		14
13	std::string GetLinuxDistro() {	15	std::string GetLinuxDistro() {
14	-#if defined(OS_CHROMEOS) \|\| defined(OS_ANDROID)	16	-#if defined(OS_CHROMEOS) \|\| defined(OS_ANDROID)

Added Link Here

(-)b/www/qt5-webengine/files/patch-src_3rdparty_chromium_base_memory_madv__free__discardable__memory__posix.cc (+11 lines)
1	--- src/3rdparty/chromium/base/memory/madv_free_discardable_memory_posix.cc.orig 2020-04-08 09:41:36 UTC
2	+++ src/3rdparty/chromium/base/memory/madv_free_discardable_memory_posix.cc
3	@@ -271,7 +271,7 @@ void MadvFreeDiscardableMemoryPosix::SetKeepMemoryForT
4
5	bool MadvFreeDiscardableMemoryPosix::IsResident() const {
6	DFAKE_SCOPED_RECURSIVE_LOCK(thread_collision_warner_);
7	-#ifdef OS_MACOSX
8	+#if defined(OS_MACOSX) \|\| defined(OS_BSD)
9	std::vector<char> vec(allocated_pages_);
10	#else
11	std::vector<unsigned char> vec(allocated_pages_);




--- 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




--- 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)
 

Added Link Here

(-)b/www/qt5-webengine/files/patch-src_3rdparty_chromium_base_profiler_sampling__profiler__thread__token.cc (+11 lines)
1	--- src/3rdparty/chromium/base/profiler/sampling_profiler_thread_token.cc.orig 2020-04-08 09:41:36 UTC
2	+++ src/3rdparty/chromium/base/profiler/sampling_profiler_thread_token.cc
3	@@ -7,7 +7,7 @@
4	namespace base {
5
6	SamplingProfilerThreadToken GetSamplingProfilerCurrentThreadToken() {
7	-#if defined(OS_ANDROID) \|\| defined(OS_LINUX)
8	+#if defined(OS_ANDROID) \|\| defined(OS_LINUX) \|\| defined(OS_BSD)
9	return {PlatformThread::CurrentId(), pthread_self()};
10	#else
11	return {PlatformThread::CurrentId()};




--- 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
 };




--- 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");




--- 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.

Lines 1-6 Link Here

(-)b/www/qt5-webengine/files/patch-src_3rdparty_chromium_base_security__unittest.cc (-2 / +2 lines)
1	--- src/3rdparty/chromium/base/security_unittest.cc.orig 2018-11-13 18:25:11 UTC	1	--- src/3rdparty/chromium/base/security_unittest.cc.orig 2020-04-08 09:41:36 UTC
2	+++ src/3rdparty/chromium/base/security_unittest.cc	2	+++ src/3rdparty/chromium/base/security_unittest.cc
3	@@ -59,7 +59,7 @@ NOINLINE Type HideValueFromCompiler(volatile Type valu	3	@@ -60,7 +60,7 @@ NOINLINE Type HideValueFromCompiler(volatile Type valu
4	// FAILS_ is too clunky.	4	// FAILS_ is too clunky.
5	void OverflowTestsSoftExpectTrue(bool overflow_detected) {	5	void OverflowTestsSoftExpectTrue(bool overflow_detected) {
6	if (!overflow_detected) {	6	if (!overflow_detected) {




--- 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));




--- 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.

Lines 1-6 Link Here

(-)b/www/qt5-webengine/files/patch-src_3rdparty_chromium_base_system_sys__info.h (-2 / +11 lines)
1	--- src/3rdparty/chromium/base/system/sys_info.h.orig 2019-11-27 21:12:25 UTC	1	--- src/3rdparty/chromium/base/system/sys_info.h.orig 2020-03-16 14:04:24 UTC
2	+++ src/3rdparty/chromium/base/system/sys_info.h	2	+++ src/3rdparty/chromium/base/system/sys_info.h
3	@@ -192,7 +192,7 @@ class BASE_EXPORT SysInfo {	3	@@ -188,6 +188,8 @@ class BASE_EXPORT SysInfo {
		4	// See also SysUtils.java, method isLowEndDevice.
		5	static bool IsLowEndDevice();
		6
		7	+ static uint64_t MaxSharedMemorySize();
		8	+
		9	private:
		10	FRIEND_TEST_ALL_PREFIXES(SysInfoTest, AmountOfAvailablePhysicalMemory);
		11	FRIEND_TEST_ALL_PREFIXES(debug::SystemMetricsTest, ParseMeminfo);
		12	@@ -197,7 +199,7 @@ class BASE_EXPORT SysInfo {
4	static bool IsLowEndDeviceImpl();	13	static bool IsLowEndDeviceImpl();
5	static HardwareInfo GetHardwareInfoSync();	14	static HardwareInfo GetHardwareInfoSync();
6		15




--- 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,59 @@
 namespace base {
 
 int64_t SysInfo::AmountOfPhysicalMemoryImpl() {

   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;

+  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);
+  return static_cast<int64_t>((pgfree + pginact + pgcache) * page_size);
+}
+
 // static
+std::string SysInfo::CPUModelName() {
+  int mib[] = { CTL_HW, HW_MODEL };
+  char name[256];

+    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




--- 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




--- 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

       (current_cpu == "x64" || current_cpu == "x86")
   binutils_path = rebase_path("//third_party/binutils/Linux_x64/Release/bin",
                               root_build_dir)
@@ -309,7 +309,7 @@ config("compiler") {
 
     # Linker warnings.
     if (fatal_linker_warnings && !(is_chromeos && current_cpu == "arm") &&
-        !is_mac && !is_ios && current_os != "aix") {
+        !is_mac && !is_ios && current_os != "aix" && !is_bsd) {
+        current_os != "aix" && !is_bsd) {
       # TODO(jochen): Enable this on chromeos on arm. http://crbug.com/356580
       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.

       ldflags += [
         "-Wl,-z,defs",
         "-Wl,--as-needed",
@@ -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") {

         cflags += [ "--target=aarch64-linux-gnu" ]
         ldflags += [ "--target=aarch64-linux-gnu" ]
       }
@@ -1138,7 +1138,7 @@ config("compiler_deterministic") {
       "-Xclang",
       ".",
     ]

       # We don't use clang -cc1as on Windows (yet? https://crbug.com/762167)
       asmflags = [ "-Wa,-fdebug-compilation-dir,." ]
     }
@@ -1545,7 +1545,7 @@ config("default_warnings") {
         cflags += [ "-Wno-nonportable-include-path" ]
       }
 

         # Flags NaCl (Clang 3.7) and Xcode 9.2 (Clang clang-900.0.39.2) do not
         # recognize.
         cflags += [
@@ -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).

     arflags = [ "-T" ]
   } else if (is_win && use_lld) {
     arflags = [ "/llvmlibthin" ]
@@ -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) {

     }
 
     if (use_debug_fission && !is_nacl && !is_android) {
@@ -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" &&

Lines 1-7 Link Here

(-)b/www/qt5-webengine/files/patch-src_3rdparty_chromium_build_config_features.gni (-3 / +3 lines)
1	--- src/3rdparty/chromium/build/config/features.gni.orig 2018-11-13 18:25:11 UTC	1	--- src/3rdparty/chromium/build/config/features.gni.orig 2020-04-29 07:57:35 UTC
2	+++ src/3rdparty/chromium/build/config/features.gni	2	+++ src/3rdparty/chromium/build/config/features.gni
3	@@ -46,7 +46,7 @@ declare_args() {	3	@@ -26,7 +26,7 @@ declare_args() {
4	fieldtrial_testing_like_official_build = is_chrome_branded	4	proprietary_codecs = is_chrome_branded \|\| is_chromecast
5		5
6	# libudev usage. This currently only affects the content layer.	6	# libudev usage. This currently only affects the content layer.
7	- use_udev = is_linux && !is_chromecast	7	- use_udev = is_linux && !is_chromecast




--- 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" ]
 }




--- 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" />

           <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">
         <!-- App Launcher icons for desktop icon. -->
         <if expr="_google_chrome">
           <then>




--- 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
@@ -209,11 +209,11 @@
 #include "chrome/browser/ui/webui/conflicts/conflicts_ui.h"
 #endif
 
-#if defined(OS_WIN) || defined(OS_MACOSX) || defined(OS_LINUX)

 #include "chrome/browser/ui/webui/discards/discards_ui.h"
 #endif
 
-#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
 
@@ -311,7 +311,7 @@ bool IsAboutUI(const GURL& url) {
 #if !defined(OS_ANDROID)
           || url.host_piece() == chrome::kChromeUITermsHost
 #endif

           || url.host_piece() == chrome::kChromeUILinuxProxyConfigHost
 #endif
 #if defined(OS_CHROMEOS)
@@ -624,7 +624,7 @@ WebUIFactoryFunction GetWebUIFactoryFunction(WebUI* we
   if (url.host_piece() == chrome::kChromeUINaClHost)
     return &NewWebUI<NaClUI>;
 #endif

   if (url.host_piece() == chrome::kChromeUITabModalConfirmDialogHost)
     return &NewWebUI<ConstrainedWebDialogUI>;
 #endif
@@ -674,17 +674,17 @@ WebUIFactoryFunction GetWebUIFactoryFunction(WebUI* we
     return &NewWebUI<CastUI>;
   }
 #endif
-#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>;
   }




--- src/3rdparty/chromium/chrome/common/chrome_paths.cc.orig	2020-03-16 14:04:24 UTC
+++ src/3rdparty/chromium/chrome/common/chrome_paths.cc
@@ -51,21 +51,21 @@ const base::FilePath::CharType kPepperFlashSystemBaseD
     FILE_PATH_LITERAL("Internet Plug-Ins/PepperFlashPlayer");
 #endif
 

-#endif  // defined(OS_LINUX)
+#endif  // defined(OS_LINUX) || defined(OS_BSD)
 
 #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:

       if (!GetUserDownloadsDirectorySafe(&cur))
         return false;
       break;
@@ -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) || \

     case chrome::DIR_USER_EXTERNAL_EXTENSIONS: {
       if (!base::PathService::Get(chrome::DIR_USER_DATA, &cur))
         return false;
@@ -510,7 +513,7 @@ bool PathProvider(int key, base::FilePath* result) {
       break;
     }
 #endif

     case chrome::DIR_STANDALONE_EXTERNAL_EXTENSIONS: {
       cur = base::FilePath(kFilepathSinglePrefExtensions);
       break;
@@ -545,7 +548,7 @@ bool PathProvider(int key, base::FilePath* result) {
 #endif
       break;
 

     case chrome::DIR_NATIVE_MESSAGING:
 #if defined(OS_MACOSX)
 #if BUILDFLAG(GOOGLE_CHROME_BRANDING)
@@ -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"));

 #else
       cur = base::FilePath(FILE_PATH_LITERAL(
           "/etc/chromium/native-messaging-hosts"));
@@ -571,7 +577,7 @@ bool PathProvider(int key, base::FilePath* result) {
         return false;
       cur = cur.Append(FILE_PATH_LITERAL("NativeMessagingHosts"));
       break;

 #if !defined(OS_ANDROID)
     case chrome::DIR_GLOBAL_GCM_STORE:
       if (!base::PathService::Get(chrome::DIR_USER_DATA, &cur))
@@ -579,7 +585,7 @@ bool PathProvider(int key, base::FilePath* result) {
       cur = cur.Append(kGCMStoreDirname);
       break;
 #endif  // !defined(OS_ANDROID)

     case chrome::FILE_COMPONENT_FLASH_HINT:
       if (!base::PathService::Get(
               chrome::DIR_COMPONENT_UPDATED_PEPPER_FLASH_PLUGIN, &cur)) {
@@ -587,7 +593,7 @@ bool PathProvider(int key, base::FilePath* result) {
       }
       cur = cur.Append(kComponentUpdatedFlashHint);
       break;




--- 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
@@ -318,7 +318,7 @@ bool IsSystemWebUIHost(base::StringPiece host) {
 const char kChromeUICastHost[] = "cast";
 #endif
 

 const char kChromeUIDiscardsHost[] = "discards";
 const char kChromeUIDiscardsURL[] = "chrome://discards/";
 const char kChromeUIHatsHost[] = "hats";
@@ -329,17 +329,17 @@ const char kChromeUIHatsURL[] = "chrome://hats/";
 const char kChromeUILinuxProxyConfigHost[] = "linux-proxy-config";
 #endif
 
-#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
 

 #endif
 
-#if (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
 
@@ -605,13 +605,13 @@ const char* const kChromeHostURLs[] = {
     kChromeUIInternetDetailDialogHost,
     kChromeUIAssistantOptInHost,
 #endif

 #if defined(OS_POSIX) && !defined(OS_MACOSX) && !defined(OS_ANDROID)
     kChromeUILinuxProxyConfigHost,
 #endif
-#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)




--- 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
@@ -268,7 +268,7 @@ bool IsSystemWebUIHost(base::StringPiece host);
 extern const char kChromeUICastHost[];
 #endif
 

 extern const char kChromeUIDiscardsHost[];
 extern const char kChromeUIDiscardsURL[];
 extern const char kChromeUIHatsHost[];
@@ -280,17 +280,17 @@ extern const char kChromeUIHatsURL[];
 extern const char kChromeUILinuxProxyConfigHost[];
 #endif
 
-#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
 

 #endif
 
-#if (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
 

Lines 1-6 Link Here

(-)b/www/qt5-webengine/files/patch-src_3rdparty_chromium_components_crash_content_app_BUILD.gn (-9 / +41 lines)
1	--- src/3rdparty/chromium/components/crash/content/app/BUILD.gn.orig 2019-11-27 21:12:25 UTC	1	--- src/3rdparty/chromium/components/crash/content/app/BUILD.gn.orig 2020-03-16 14:04:24 UTC
2	+++ src/3rdparty/chromium/components/crash/content/app/BUILD.gn	2	+++ src/3rdparty/chromium/components/crash/content/app/BUILD.gn
3	@@ -54,7 +54,7 @@ static_library("app") {	3	@@ -51,17 +51,20 @@ static_library("app") {
		4	"crashpad_win.cc",
		5	]
		6
		7	- if (is_mac \|\| is_win \|\| is_android \|\| is_linux) {
		8	+ if ((is_mac \|\| is_win \|\| is_android \|\| is_linux) && !is_bsd) {
4	sources += [ "crashpad.cc" ]	9	sources += [ "crashpad.cc" ]
5	}	10	}
6		11
Lines 9-20 Link Here
9	sources += [	14	sources += [
10	"breakpad_linux.cc",	15	"breakpad_linux.cc",
11	"breakpad_linux.h",	16	"breakpad_linux.h",
12	@@ -96,7 +96,7 @@ static_library("app") {	17	"breakpad_linux_impl.h",
13	"//sandbox",	18	]
		19	}
		20	+ if (is_bsd) {
		21	+ sources -= [ "crashpad_linux.cc" ]
		22	+ }
		23
		24	defines = [ "CRASH_IMPLEMENTATION" ]
		25
		26	@@ -73,7 +76,7 @@ static_library("app") {
		27	"//build:branding_buildflags",
		28	]
		29
		30	- if (is_mac \|\| is_win \|\| is_android \|\| is_linux) {
		31	+ if ((is_mac \|\| is_win \|\| is_android \|\| is_linux) && !is_bsd) {
		32	deps += [
		33	"//third_party/crashpad/crashpad/client",
		34	"//third_party/crashpad/crashpad/util",
		35	@@ -99,7 +102,7 @@ static_library("app") {
14	]	36	]
		37	}
		38
		39	- if (is_linux) {
		40	+ if (is_linux && !is_bsd) {
		41	deps += [ "//third_party/breakpad:client" ]
		42	}
		43
		44	@@ -130,7 +133,7 @@ static_library("app") {
		45	libs = [ "log" ]
		46	}
15		47
16	- if (is_linux) {	48	- if (is_linux) {
17	+ if (is_linux && !is_bsd) {	49	+ if (is_linux && !is_bsd) {
18	deps += [	50	data_deps = [
19	"//content/public/common",	51	"//third_party/crashpad/crashpad/handler:crashpad_handler",
20	"//third_party/breakpad:client",	52	]




--- 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
 

 }
 
 group("common") {
@@ -110,7 +110,9 @@ target(crash_key_target_type, "crash_key_lib") {
       ]
     }
 
-    deps += [ "//third_party/breakpad:client" ]
+    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" ]
   }
 

Lines 1-9 Link Here

(-)b/www/qt5-webengine/files/patch-src_3rdparty_chromium_components_neterror_resources_neterror.js (-3 / +3 lines)
1	--- src/3rdparty/chromium/components/neterror/resources/neterror.js.orig 2018-11-13 18:25:11 UTC	1	--- src/3rdparty/chromium/components/neterror/resources/neterror.js.orig 2020-04-08 09:41:36 UTC
2	+++ src/3rdparty/chromium/components/neterror/resources/neterror.js	2	+++ src/3rdparty/chromium/components/neterror/resources/neterror.js
3	@@ -153,7 +153,7 @@ function setUpCachedButton(buttonStrings) {	3	@@ -201,7 +201,7 @@ function setUpCachedButton(buttonStrings) {
4	}	4	}
5		5
6	var primaryControlOnLeft = true;	6	let primaryControlOnLeft = true;
7	-// <if expr="is_macosx or is_ios or is_linux or is_android">	7	-// <if expr="is_macosx or is_ios or is_linux or is_android">
8	+// <if expr="is_macosx or is_ios or is_linux or is_android or is_bsd">	8	+// <if expr="is_macosx or is_ios or is_linux or is_android or is_bsd">
9	primaryControlOnLeft = false;	9	primaryControlOnLeft = false;




--- 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);




--- 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)

Added Link Here

(-)b/www/qt5-webengine/files/patch-src_3rdparty_chromium_content_browser_compositor_gpu__process__transport__factory.cc (+11 lines)
1	--- src/3rdparty/chromium/content/browser/compositor/gpu_process_transport_factory.cc.orig 2020-03-16 14:04:24 UTC
2	+++ src/3rdparty/chromium/content/browser/compositor/gpu_process_transport_factory.cc
3	@@ -114,7 +114,7 @@ viz::FrameSinkManagerImpl* GetFrameSinkManager() {
4	return content::BrowserMainLoop::GetInstance()->GetFrameSinkManager();
5	}
6
7	-#if defined(OS_LINUX) && !defined(OS_CHROMEOS)
8	+#if (defined(OS_LINUX) && !defined(OS_CHROMEOS)) \|\| defined(OS_BSD)
9	class HostDisplayClient : public viz::HostDisplayClient {
10	public:
11	explicit HostDisplayClient(ui::Compositor* compositor)




--- 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;




--- 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
 

Added Link Here

(-)b/www/qt5-webengine/files/patch-src_3rdparty_chromium_content_browser_devtools_protocol_system__info__handler.cc (+11 lines)
1	--- src/3rdparty/chromium/content/browser/devtools/protocol/system_info_handler.cc.orig 2020-03-16 14:04:24 UTC
2	+++ src/3rdparty/chromium/content/browser/devtools/protocol/system_info_handler.cc
3	@@ -48,7 +48,7 @@ std::unique_ptr<SystemInfo::Size> GfxSizeToSystemInfoS
4	// Give the GPU process a few seconds to provide GPU info.
5	// Linux Debug builds need more time -- see Issue 796437.
6	// Windows builds need more time -- see Issue 873112 and 1004472.
7	-#if (defined(OS_LINUX) && !defined(NDEBUG))
8	+#if ((defined(OS_LINUX) \|\| defined(OS_BSD)) && !defined(NDEBUG))
9	const int kGPUInfoWatchdogTimeoutMs = 20000;
10	#elif defined(OS_WIN)
11	const int kGPUInfoWatchdogTimeoutMs = 30000;




--- 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




--- 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
@@ -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>
 
@@ -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() {

   struct rlimit limit;
   if (getrlimit(RLIMIT_NPROC, &limit) != 0)
     return kUnknownPlatformProcessLimit;
@@ -1176,7 +1176,7 @@ size_t GetPlatformProcessLimit() {
 #else
   // TODO(https://crbug.com/104689): Implement on other platforms.
   return kUnknownPlatformProcessLimit;

 }
 #endif  // !defined(OS_ANDROID) && !defined(OS_CHROMEOS)
 
@@ -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);
 




--- 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(

Lines 1-6 Link Here

(-)b/www/qt5-webengine/files/patch-src_3rdparty_chromium_content_browser_utility__process__host.cc (-2 / +2 lines)
1	--- src/3rdparty/chromium/content/browser/utility_process_host.cc.orig 2019-11-27 21:12:25 UTC	1	--- src/3rdparty/chromium/content/browser/utility_process_host.cc.orig 2020-04-08 09:41:36 UTC
2	+++ src/3rdparty/chromium/content/browser/utility_process_host.cc	2	+++ src/3rdparty/chromium/content/browser/utility_process_host.cc
3	@@ -211,7 +211,7 @@ UtilityProcessHost::UtilityProcessHost()	3	@@ -209,7 +209,7 @@ UtilityProcessHost::UtilityProcessHost()
4		4
5	UtilityProcessHost::UtilityProcessHost(std::unique_ptr<Client> client)	5	UtilityProcessHost::UtilityProcessHost(std::unique_ptr<Client> client)
6	: sandbox_type_(service_manager::SANDBOX_TYPE_UTILITY),	6	: sandbox_type_(service_manager::SANDBOX_TYPE_UTILITY),




--- src/3rdparty/chromium/content/gpu/gpu_main.cc.orig	2020-03-16 14:04:24 UTC
+++ src/3rdparty/chromium/content/gpu/gpu_main.cc
@@ -85,7 +85,7 @@
 #include "ui/gfx/x/x11_switches.h"    // nogncheck
 #endif
 

 #include "content/gpu/gpu_sandbox_hook_linux.h"
 #include "content/public/common/sandbox_init.h"
 #include "services/service_manager/sandbox/linux/sandbox_linux.h"
@@ -106,7 +106,7 @@ namespace content {
 
 namespace {
 

 bool StartSandboxLinux(gpu::GpuWatchdogThread*,
                        const gpu::GPUInfo*,
                        const gpu::GpuPreferences&);
@@ -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 {

     return StartSandboxLinux(watchdog_thread, gpu_info, gpu_prefs);
 #elif defined(OS_WIN)
     return StartSandboxWindows(sandbox_info_);
@@ -273,7 +273,7 @@ int GpuMain(const MainFunctionParams& parameters) {
     main_thread_task_executor =
         std::make_unique<base::SingleThreadTaskExecutor>(
             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
@@ -379,7 +379,7 @@ int GpuMain(const MainFunctionParams& parameters) {
 
 namespace {
 

 bool StartSandboxLinux(gpu::GpuWatchdogThread* watchdog_thread,
                        const gpu::GPUInfo* gpu_info,
                        const gpu::GpuPreferences& gpu_prefs) {
@@ -414,7 +414,7 @@ bool StartSandboxLinux(gpu::GpuWatchdogThread* watchdo
 
   return res;
 }




--- 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
@@ -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)
   mojo::PendingRemote<font_service::mojom::FontService> font_service;
   ChildThread::Get()->BindHostReceiver(
       font_service.InitWithNewPipeAndPassReceiver());
@@ -52,7 +52,7 @@ PpapiBlinkPlatformImpl::~PpapiBlinkPlatformImpl() {
 void PpapiBlinkPlatformImpl::Shutdown() {}
 
 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() {
 }
 
 blink::WebSandboxSupport* PpapiBlinkPlatformImpl::GetSandboxSupport() {
-#if defined(OS_LINUX) || defined(OS_MACOSX)

Removed Link Here

(-)a/www/qt5-webengine/files/patch-src_3rdparty_chromium_content_public_app_v8__snapshot__overlay__manifest.cc (-11 lines)
1	--- src/3rdparty/chromium/content/public/app/v8_snapshot_overlay_manifest.cc.orig 2019-05-23 12:39:34 UTC
2	+++ src/3rdparty/chromium/content/public/app/v8_snapshot_overlay_manifest.cc
3	@@ -15,7 +15,7 @@ namespace content {
4	const service_manager::Manifest& GetV8SnapshotOverlayManifest() {
5	static base::NoDestructor<service_manager::Manifest> manifest {
6	service_manager::ManifestBuilder()
7	-#if defined(OS_LINUX)
8	+#if defined(OS_LINUX) \|\| defined(OS_BSD)
9	.PreloadFile(kV8NativesDataDescriptor,
10	base::FilePath(FILE_PATH_LITERAL("natives_blob.bin")))
11	#if defined(USE_V8_CONTEXT_SNAPSHOT)

Lines 1-9 Link Here

(-)b/www/qt5-webengine/files/patch-src_3rdparty_chromium_content_public_common_common__param__traits__macros.h (-3 / +3 lines)
1	--- src/3rdparty/chromium/content/public/common/common_param_traits_macros.h.orig 2019-05-23 12:39:34 UTC	1	--- src/3rdparty/chromium/content/public/common/common_param_traits_macros.h.orig 2020-04-08 09:41:36 UTC
2	+++ src/3rdparty/chromium/content/public/common/common_param_traits_macros.h	2	+++ src/3rdparty/chromium/content/public/common/common_param_traits_macros.h
3	@@ -328,7 +328,7 @@ IPC_STRUCT_TRAITS_BEGIN(content::RendererPreferences)	3	@@ -333,7 +333,7 @@ IPC_STRUCT_TRAITS_BEGIN(blink::mojom::RendererPreferen
		4	IPC_STRUCT_TRAITS_MEMBER(accept_languages)
4	IPC_STRUCT_TRAITS_MEMBER(disable_client_blocked_error_page)	5	IPC_STRUCT_TRAITS_MEMBER(disable_client_blocked_error_page)
5	IPC_STRUCT_TRAITS_MEMBER(plugin_fullscreen_allowed)	6	IPC_STRUCT_TRAITS_MEMBER(plugin_fullscreen_allowed)
6	IPC_STRUCT_TRAITS_MEMBER(network_contry_iso)
7	-#if defined(OS_LINUX)	7	-#if defined(OS_LINUX)
8	+#if defined(OS_LINUX) \|\| defined(OS_BSD)	8	+#if defined(OS_LINUX) \|\| defined(OS_BSD)
9	IPC_STRUCT_TRAITS_MEMBER(system_font_family_name)	9	IPC_STRUCT_TRAITS_MEMBER(system_font_family_name)




--- 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
@@ -54,7 +54,7 @@ const base::Feature kAudioServiceLaunchOnStartup{
 // Runs the audio service in a separate process.
 const base::Feature kAudioServiceOutOfProcess{
   "AudioServiceOutOfProcess",
 #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
@@ -634,7 +634,7 @@ const base::Feature kWebAssemblyThreads {
 };
 
 // Enable WebAssembly trap handler.

     defined(ARCH_CPU_X86_64)
 const base::Feature kWebAssemblyTrapHandler{"WebAssemblyTrapHandler",
                                             base::FEATURE_ENABLED_BY_DEFAULT};
@@ -669,7 +669,7 @@ const base::Feature kWebAuthBle{"WebAuthenticationBle"
 // https://w3c.github.io/webauthn
 const base::Feature kWebAuthCable {
   "WebAuthenticationCable",




--- 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
@@ -188,12 +188,21 @@
 #include "mojo/public/cpp/bindings/message_dumper.h"
 #endif
 

 using base::ThreadRestrictions;
 using blink::WebDocument;
 using blink::WebFrame;
@@ -927,7 +936,7 @@ void RenderThreadImpl::Init() {
   DCHECK(parsed_num_raster_threads) << string_value;
   DCHECK_GT(num_raster_threads, 0);
 

   categorized_worker_pool_->SetBackgroundingCallback(
       main_thread_scheduler_->DefaultTaskRunner(),
       base::BindOnce(
@@ -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)
   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);




--- 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
@@ -99,7 +99,7 @@
 
 #if defined(OS_MACOSX)
 #include "content/child/child_process_sandbox_support_impl_mac.h"

 #include "content/child/child_process_sandbox_support_impl_linux.h"
 #endif
 
@@ -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)
     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 (sandboxEnabled()) {
 #if defined(OS_MACOSX)
     sandbox_support_ = std::make_unique<WebSandboxSupportMac>();
@@ -266,7 +266,7 @@ RendererBlinkPlatformImpl::CreateNetworkURLLoaderFacto
 }
 
 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
 
 void RendererBlinkPlatformImpl::SetDisplayThreadPriority(
     base::PlatformThreadId thread_id) {

   if (RenderThreadImpl* render_thread = RenderThreadImpl::current()) {
     render_thread->render_message_filter()->SetThreadPriority(
         thread_id, base::ThreadPriority::DISPLAY);
@@ -279,7 +279,7 @@ blink::BlameContext* RendererBlinkPlatformImpl::GetTop
 }
 
 blink::WebSandboxSupport* RendererBlinkPlatformImpl::GetSandboxSupport() {




--- 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
@@ -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
@@ -221,7 +221,7 @@ class CONTENT_EXPORT RendererBlinkPlatformImpl : publi
 
   scoped_refptr<base::SingleThreadTaskRunner> io_runner_;
 
-#if defined(OS_LINUX) || defined(OS_MACOSX)

   std::unique_ptr<blink::WebSandboxSupport> sandbox_support_;
 #endif
 
@@ -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)




--- 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
@@ -9,7 +9,7 @@
 
 #if defined(OS_MACOSX)
 #include "content/child/child_process_sandbox_support_impl_mac.h"

 #endif
 
@@ -17,7 +17,7 @@ namespace content {
 
 UtilityBlinkPlatformWithSandboxSupportImpl::
     UtilityBlinkPlatformWithSandboxSupportImpl() {
         service_manager::Connector* connector) {
-#if defined(OS_LINUX)
+#if defined(OS_LINUX) || defined(OS_BSD)
   mojo::PendingRemote<font_service::mojom::FontService> font_service;
   UtilityThread::Get()->BindHostReceiver(
       font_service.InitWithNewPipeAndPassReceiver());
@@ -34,7 +34,7 @@ UtilityBlinkPlatformWithSandboxSupportImpl::
 
 blink::WebSandboxSupport*
 UtilityBlinkPlatformWithSandboxSupportImpl::GetSandboxSupport() {

Added Link Here

(-)b/www/qt5-webengine/files/patch-src_3rdparty_chromium_device_gamepad_hid__writer__linux.cc (+11 lines)
1	--- src/3rdparty/chromium/device/gamepad/hid_writer_linux.cc.orig 2020-03-16 14:04:24 UTC
2	+++ src/3rdparty/chromium/device/gamepad/hid_writer_linux.cc
3	@@ -4,6 +4,8 @@
4
5	#include "device/gamepad/hid_writer_linux.h"
6
7	+#include <unistd.h>
8	+
9	#include "base/posix/eintr_wrapper.h"
10
11	namespace device {

Lines 1-9 Link Here

(-)b/www/qt5-webengine/files/patch-src_3rdparty_chromium_extensions_browser_browser__context__keyed__service__factories.cc (-5 / +5 lines)
1	--- src/3rdparty/chromium/extensions/browser/browser_context_keyed_service_factories.cc.orig 2019-05-23 12:39:34 UTC	1	--- src/3rdparty/chromium/extensions/browser/browser_context_keyed_service_factories.cc.orig 2020-04-08 09:41:36 UTC
2	+++ src/3rdparty/chromium/extensions/browser/browser_context_keyed_service_factories.cc	2	+++ src/3rdparty/chromium/extensions/browser/browser_context_keyed_service_factories.cc
3	@@ -93,7 +93,7 @@ void EnsureBrowserContextKeyedServiceFactoriesBuilt()	3	@@ -81,7 +81,7 @@ void EnsureBrowserContextKeyedServiceFactoriesBuilt()
4	#if defined(OS_CHROMEOS)	4	IdleManagerFactory::GetInstance();
5	NetworkingConfigServiceFactory::GetInstance();	5	#endif // !defined(TOOLKIT_QT)
6	#endif	6	ManagementAPI::GetFactoryInstance();
7	-#if defined(OS_LINUX) \|\| defined(OS_WIN) \|\| defined(OS_MACOSX)	7	-#if defined(OS_LINUX) \|\| defined(OS_WIN) \|\| defined(OS_MACOSX)
8	+#if defined(OS_LINUX) \|\| defined(OS_WIN) \|\| defined(OS_MACOSX) \|\| defined(OS_BSD)	8	+#if defined(OS_LINUX) \|\| defined(OS_WIN) \|\| defined(OS_MACOSX) \|\| defined(OS_BSD)
9	NetworkingPrivateEventRouterFactory::GetInstance();	9	NetworkingPrivateEventRouterFactory::GetInstance();

Lines 1-6 Link Here

(-)b/www/qt5-webengine/files/patch-src_3rdparty_chromium_gpu_command__buffer_service_external__vk__image__backing.cc (-13 / +57 lines)
1	--- src/3rdparty/chromium/gpu/command_buffer/service/external_vk_image_backing.cc.orig 2019-11-27 21:12:25 UTC	1	--- src/3rdparty/chromium/gpu/command_buffer/service/external_vk_image_backing.cc.orig 2020-04-08 09:41:36 UTC
2	+++ src/3rdparty/chromium/gpu/command_buffer/service/external_vk_image_backing.cc	2	+++ src/3rdparty/chromium/gpu/command_buffer/service/external_vk_image_backing.cc
3	@@ -25,7 +25,7 @@	3	@@ -26,7 +26,7 @@
		4	#include "ui/gl/buildflags.h"
		5	#include "ui/gl/gl_context.h"
		6
		7	-#if defined(OS_LINUX) && BUILDFLAG(USE_DAWN)
		8	+#if (defined(OS_LINUX) \|\| defined(OS_BSD)) && BUILDFLAG(USE_DAWN)
		9	#include "gpu/command_buffer/service/external_vk_image_dawn_representation.h"
		10	#endif
		11
		12	@@ -34,7 +34,7 @@
4	#include "gpu/vulkan/fuchsia/vulkan_fuchsia_ext.h"	13	#include "gpu/vulkan/fuchsia/vulkan_fuchsia_ext.h"
5	#endif	14	#endif
6		15
Lines 9-29 Link Here
9	#define GL_HANDLE_TYPE_OPAQUE_FD_EXT 0x9586	18	#define GL_HANDLE_TYPE_OPAQUE_FD_EXT 0x9586
10	#endif	19	#endif
11		20
12	@@ -451,7 +451,7 @@ ExternalVkImageBacking::ProduceGLTexture(SharedImageMa	21	@@ -537,7 +537,7 @@ std::unique_ptr<SharedImageRepresentationDawn>
13	#if defined(OS_FUCHSIA)	22	ExternalVkImageBacking::ProduceDawn(SharedImageManager* manager,
		23	MemoryTypeTracker* tracker,
		24	WGPUDevice wgpuDevice) {
		25	-#if defined(OS_LINUX) && BUILDFLAG(USE_DAWN)
		26	+#if (defined(OS_LINUX) \|\| defined(OS_BSD)) && BUILDFLAG(USE_DAWN)
		27	if (!wgpu_format_) {
		28	DLOG(ERROR) << "Format not supported for Dawn";
		29	return nullptr;
		30	@@ -560,14 +560,14 @@ ExternalVkImageBacking::ProduceDawn(SharedImageManager
		31	return std::make_unique<ExternalVkImageDawnRepresentation>(
		32	manager, this, tracker, wgpuDevice, wgpu_format_.value(), memory_fd,
		33	image_info.fAlloc.fSize, memory_type_index_.value());
		34	-#else // !defined(OS_LINUX) \|\| !BUILDFLAG(USE_DAWN)
		35	+#else // !defined(OS_LINUX) \|\| !defined(OS_BSD) \|\| !BUILDFLAG(USE_DAWN)
14	NOTIMPLEMENTED_LOG_ONCE();	36	NOTIMPLEMENTED_LOG_ONCE();
15	return nullptr;	37	return nullptr;
16	-#elif defined(OS_LINUX)	38	#endif
17	+#elif defined(OS_LINUX) \|\| defined(OS_BSD)	39	}
		40
		41	GLuint ExternalVkImageBacking::ProduceGLTextureInternal() {
		42	-#if defined(OS_LINUX)
		43	+#if defined(OS_LINUX) \|\| defined(OS_BSD)
18	GrVkImageInfo image_info;	44	GrVkImageInfo image_info;
19	bool result = backend_texture_.getVkImageInfo(&image_info);	45	bool result = backend_texture_.getVkImageInfo(&image_info);
20	DCHECK(result);	46	DCHECK(result);
21	@@ -520,7 +520,7 @@ ExternalVkImageBacking::ProduceGLTexture(SharedImageMa	47	@@ -631,7 +631,7 @@ ExternalVkImageBacking::ProduceGLTexture(SharedImageMa
		48	return nullptr;
22	}	49	}
23	return std::make_unique<ExternalVkImageGlRepresentation>(	50
24	manager, this, tracker, texture_, texture_->service_id());	51	-#if defined(OS_LINUX)
25	-#else // !defined(OS_LINUX) && !defined(OS_FUCHSIA)	52	+#if defined(OS_LINUX) \|\| defined(OS_BSD)
26	+#else // !defined(OS_LINUX) && !defined(OS_FUCHSIA) && !defined(OS_BSD)	53	if (!texture_) {
27	#error Unsupported OS	54	GLuint texture_service_id = ProduceGLTextureInternal();
28	#endif	55	if (!texture_service_id)
		56	@@ -677,7 +677,7 @@ ExternalVkImageBacking::ProduceGLTexturePassthrough(
		57	return nullptr;
		58	}
		59
		60	-#if defined(OS_LINUX)
		61	+#if defined(OS_LINUX) \|\| defined(OS_BSD)
		62	if (!texture_passthrough_) {
		63	GLuint texture_service_id = ProduceGLTextureInternal();
		64	if (!texture_service_id)
		65	@@ -715,7 +715,7 @@ ExternalVkImageBacking::ProduceSkia(
		66	tracker);
29	}	67	}
		68
		69	-#ifdef OS_LINUX
		70	+#if defined(OS_LINUX) \|\| defined(OS_BSD)
		71	int ExternalVkImageBacking::GetMemoryFd(const GrVkImageInfo& image_info) {
		72	VkMemoryGetFdInfoKHR get_fd_info;
		73	get_fd_info.sType = VK_STRUCTURE_TYPE_MEMORY_GET_FD_INFO_KHR;

Added Link Here

(-)b/www/qt5-webengine/files/patch-src_3rdparty_chromium_gpu_command__buffer_service_external__vk__image__backing.h (+11 lines)
1	--- src/3rdparty/chromium/gpu/command_buffer/service/external_vk_image_backing.h.orig 2020-03-16 14:04:24 UTC
2	+++ src/3rdparty/chromium/gpu/command_buffer/service/external_vk_image_backing.h
3	@@ -131,7 +131,7 @@ class ExternalVkImageBacking final : public SharedImag
4	base::Optional<DawnTextureFormat> dawn_format,
5	base::Optional<uint32_t> memory_type_index);
6
7	-#ifdef OS_LINUX
8	+#if defined(OS_LINUX) \|\| defined(OS_BSD)
9	// Extract file descriptor from image
10	int GetMemoryFd(const GrVkImageInfo& image_info);
11	#endif




--- 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"

 #include "gpu/ipc/common/gpu_memory_buffer_impl_native_pixmap.h"
 #endif
 
@@ -112,7 +112,7 @@ bool GpuMemoryBufferSupport::IsNativeGpuMemoryBufferCo
 #elif defined(USE_OZONE)
   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) {
@@ -168,7 +168,7 @@ GpuMemoryBufferSupport::CreateGpuMemoryBufferImplFromH
       return GpuMemoryBufferImplIOSurface::CreateFromHandle(
           std::move(handle), size, format, usage, std::move(callback));
 #endif




--- 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

-#endif  // OS_LINUX && !OS_CHROMEOS && !IS_CHROMECAST
+#endif  // (OS_LINUX && !OS_CHROMEOS && !IS_CHROMECAST) || OS_BSD
 
 class GpuWatchdogInit {
  public:
@@ -165,7 +165,7 @@ bool GpuInit::InitializeAndStartSandbox(base::CommandL
   // crash during feature collection.
   gpu::SetKeysForCrashLogging(gpu_info_);
 

   if (gpu_info_.gpu.vendor_id == 0x10de &&  // NVIDIA
       gpu_info_.gpu.driver_vendor == "NVIDIA" && !CanAccessNvidiaDeviceFile())
     return false;
@@ -246,7 +246,7 @@ bool GpuInit::InitializeAndStartSandbox(base::CommandL
   sandbox_helper_->PreSandboxStartup();
 
   bool attempted_startsandbox = false;

   // 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.
@@ -255,7 +255,7 @@ bool GpuInit::InitializeAndStartSandbox(base::CommandL
         watchdog_thread_.get(), &gpu_info_, gpu_preferences_);
     attempted_startsandbox = true;
   }

 
   base::TimeTicks before_initialize_one_off = base::TimeTicks::Now();
 
@@ -280,14 +280,14 @@ bool GpuInit::InitializeAndStartSandbox(base::CommandL
   }
   if (gl_initialized && use_swiftshader &&
       gl::GetGLImplementation() != gl::kGLImplementationSwiftShaderGL) {

   }
   if (!gl_initialized)
     gl_initialized = gl::init::InitializeGLNoExtensionsOneOff();
@@ -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";
         return false;
@@ -326,7 +326,7 @@ bool GpuInit::InitializeAndStartSandbox(base::CommandL
               << "failed";
           return false;
         }
-#endif  // OS_LINUX
+#endif  // OS_LINUX || OS_BSD
       }
     } else {  // use_swiftshader == true
       switch (gpu_preferences_.use_vulkan) {
@@ -413,7 +413,7 @@ bool GpuInit::InitializeAndStartSandbox(base::CommandL
 
   InitializePlatformOverlaySettings(&gpu_info_);
 

   // 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.
@@ -432,7 +432,7 @@ bool GpuInit::InitializeAndStartSandbox(base::CommandL
       return false;
     }
   }

 
   if (use_swiftshader) {
     AdjustInfoToSwiftShader();
@@ -604,7 +604,7 @@ void GpuInit::InitializeInProcess(base::CommandLine* c
 
   InitializePlatformOverlaySettings(&gpu_info_);
 

   // 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.
@@ -624,7 +624,7 @@ void GpuInit::InitializeInProcess(base::CommandLine* c
       }
     }
   }




--- 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
@@ -40,7 +40,7 @@ const int kGpuTimeout = 15000;
 const int kGpuTimeout = 10000;
 #endif
 
-#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
@@ -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
@@ -76,7 +76,7 @@ GpuWatchdogThreadImplV1::GpuWatchdogThreadImplV1()
   DCHECK(result);
   base::subtle::NoBarrier_Store(&awaiting_acknowledge_, false);
 
@@ -85,7 +90,9 @@ GpuWatchdogThreadImplV1::GpuWatchdogThreadImplV1()
 #endif
 
-#if defined(USE_X11)
+#if defined(USE_X11) && !defined(OS_BSD)
   tty_file_ = base::OpenFile(base::FilePath(kTtyFilePath), "r");
   host_tty_ = GetActiveTTY();
   SetupXServer();
 #endif
@@ -222,7 +222,7 @@ GpuWatchdogThreadImplV1::~GpuWatchdogThreadImplV1() {
 
   base::PowerMonitor::RemoveObserver(this);
 
-#if defined(USE_X11)
+#if defined(USE_X11) && !defined(OS_BSD)
   if (tty_file_)
     fclose(tty_file_);
 #endif
@@ -371,7 +371,7 @@ void GpuWatchdogThreadImplV1::DeliberatelyTerminateToR
     DCHECK(window_);
     XDestroyWindow(display_, window_);
@@ -431,7 +440,7 @@ void GpuWatchdogThreadImplV1::DeliberatelyTerminateToR
     return;
 #endif
 

   // 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) {
@@ -528,7 +528,7 @@ base::ThreadTicks GpuWatchdogThreadImplV1::GetWatchedT
                       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
 }
 #endif
 




--- 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
@@ -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_;

Lines 1-6 Link Here

(-)b/www/qt5-webengine/files/patch-src_3rdparty_chromium_gpu_vulkan_vulkan__function__pointers.h (-3 / +6 lines)
1	--- src/3rdparty/chromium/gpu/vulkan/vulkan_function_pointers.h.orig 2019-11-27 21:12:25 UTC	1	--- src/3rdparty/chromium/gpu/vulkan/vulkan_function_pointers.h.orig 2020-03-16 14:04:24 UTC
2	+++ src/3rdparty/chromium/gpu/vulkan/vulkan_function_pointers.h	2	+++ src/3rdparty/chromium/gpu/vulkan/vulkan_function_pointers.h
3	@@ -161,14 +161,14 @@ struct VulkanFunctionPointers {	3	@@ -178,15 +178,15 @@ struct VulkanFunctionPointers {
4	vkGetAndroidHardwareBufferPropertiesANDROIDFn = nullptr;	4	vkGetAndroidHardwareBufferPropertiesANDROIDFn = nullptr;
5	#endif // defined(OS_ANDROID)	5	#endif // defined(OS_ANDROID)
6		6
Lines 14-25 Link Here
14	-#if defined(OS_LINUX)	14	-#if defined(OS_LINUX)
15	+#if defined(OS_LINUX) \|\| defined(OS_BSD)	15	+#if defined(OS_LINUX) \|\| defined(OS_BSD)
16	PFN_vkGetMemoryFdKHR vkGetMemoryFdKHRFn = nullptr;	16	PFN_vkGetMemoryFdKHR vkGetMemoryFdKHRFn = nullptr;
		17	PFN_vkGetMemoryFdPropertiesKHR vkGetMemoryFdPropertiesKHRFn = nullptr;
17	-#endif // defined(OS_LINUX)	18	-#endif // defined(OS_LINUX)
18	+#endif // defined(OS_LINUX) \|\| defined(OS_BSD)	19	+#endif // defined(OS_LINUX) \|\| defined(OS_BSD)
19		20
20	#if defined(OS_FUCHSIA)	21	#if defined(OS_FUCHSIA)
21	PFN_vkImportSemaphoreZirconHandleFUCHSIA	22	PFN_vkImportSemaphoreZirconHandleFUCHSIA
22	@@ -342,16 +342,16 @@ struct VulkanFunctionPointers {	23	@@ -374,18 +374,18 @@ struct VulkanFunctionPointers {
23	->vkGetAndroidHardwareBufferPropertiesANDROIDFn	24	->vkGetAndroidHardwareBufferPropertiesANDROIDFn
24	#endif // defined(OS_ANDROID)	25	#endif // defined(OS_ANDROID)
25		26
Lines 35-40 Link Here
35	-#if defined(OS_LINUX)	36	-#if defined(OS_LINUX)
36	+#if defined(OS_LINUX) \|\| defined(OS_BSD)	37	+#if defined(OS_LINUX) \|\| defined(OS_BSD)
37	#define vkGetMemoryFdKHR gpu::GetVulkanFunctionPointers()->vkGetMemoryFdKHRFn	38	#define vkGetMemoryFdKHR gpu::GetVulkanFunctionPointers()->vkGetMemoryFdKHRFn
		39	#define vkGetMemoryFdPropertiesKHR \
		40	gpu::GetVulkanFunctionPointers()->vkGetMemoryFdPropertiesKHRFn
38	-#endif // defined(OS_LINUX)	41	-#endif // defined(OS_LINUX)
39	+#endif // defined(OS_LINUX) \|\| defined(OS_BSD)	42	+#endif // defined(OS_LINUX) \|\| defined(OS_BSD)
40		43




--- src/3rdparty/chromium/media/base/video_frame.cc.orig	2020-03-16 14:04:24 UTC
+++ src/3rdparty/chromium/media/base/video_frame.cc
@@ -57,7 +57,7 @@ std::string VideoFrame::StorageTypeToString(
       return "OWNED_MEMORY";
     case VideoFrame::STORAGE_SHMEM:
       return "SHMEM";

     case VideoFrame::STORAGE_DMABUFS:
       return "DMABUFS";
 #endif
@@ -74,7 +74,7 @@ std::string VideoFrame::StorageTypeToString(
 // static
 bool VideoFrame::IsStorageTypeMappable(VideoFrame::StorageType storage_type) {
   return

       // This is not strictly needed but makes explicit that, at VideoFrame
       // level, DmaBufs are not mappable from userspace.
       storage_type != VideoFrame::STORAGE_DMABUFS &&
@@ -257,7 +257,7 @@ static base::Optional<VideoFrameLayout> GetDefaultLayo
   return VideoFrameLayout::CreateWithPlanes(format, coded_size, planes);
 }
 

 // 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
@@ -275,7 +275,7 @@ class VideoFrame::DmabufHolder
   friend class base::RefCountedThreadSafe<DmabufHolder>;
   ~DmabufHolder() = default;
 };

 
 // static
 bool VideoFrame::IsValidConfig(VideoPixelFormat format,
@@ -588,7 +588,7 @@ scoped_refptr<VideoFrame> VideoFrame::WrapExternalGpuM
   return frame;
 }
 

 // static
 scoped_refptr<VideoFrame> VideoFrame::WrapExternalDmabufs(
     const VideoFrameLayout& layout,
@@ -724,7 +724,7 @@ scoped_refptr<VideoFrame> VideoFrame::WrapVideoFrame(
     }
   }
 
-#if defined(OS_LINUX)
+#if defined(OS_LINUX) || defined(OS_BSD)
   DCHECK(frame->dmabuf_fds_);
   // If there are any |dmabuf_fds_| plugged in, we should refer them too.
   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)

 const std::vector<base::ScopedFD>& VideoFrame::DmabufFds() const {
   DCHECK_EQ(storage_type_, STORAGE_DMABUFS);
 
@@ -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>()),




--- src/3rdparty/chromium/media/base/video_frame.h.orig	2020-03-16 14:04:24 UTC
+++ src/3rdparty/chromium/media/base/video_frame.h
@@ -39,9 +39,9 @@
 #include "base/mac/scoped_cftyperef.h"
 #endif  // defined(OS_MACOSX)
 

-#endif  // defined(OS_LINUX)
+#endif  // defined(OS_LINUX) || defined(OS_BSD)
 
 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,         // 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
@@ -245,7 +245,7 @@ class MEDIA_EXPORT VideoFrame : public base::RefCounte
       ReleaseMailboxCB mailbox_holder_release_cb,
       base::TimeDelta timestamp);
 
-#if defined(OS_LINUX)

   // 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
@@ -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
@@ -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)

Lines 1-4 Link Here

(-)b/www/qt5-webengine/files/patch-src_3rdparty_chromium_media_capture_video_linux_video__capture__device__factory__linux.cc (-1 / +1 lines)
1	--- src/3rdparty/chromium/media/capture/video/linux/video_capture_device_factory_linux.cc.orig 2019-11-27 21:12:25 UTC	1	--- src/3rdparty/chromium/media/capture/video/linux/video_capture_device_factory_linux.cc.orig 2020-04-08 09:41:36 UTC
2	+++ src/3rdparty/chromium/media/capture/video/linux/video_capture_device_factory_linux.cc	2	+++ src/3rdparty/chromium/media/capture/video/linux/video_capture_device_factory_linux.cc
3	@@ -315,6 +315,7 @@ void VideoCaptureDeviceFactoryLinux::GetSupportedForma	3	@@ -315,6 +315,7 @@ void VideoCaptureDeviceFactoryLinux::GetSupportedForma
4	supported_format.pixel_format =	4	supported_format.pixel_format =

Lines 1-4 Link Here

(-)b/www/qt5-webengine/files/patch-src_3rdparty_chromium_media_capture_video_linux_video__capture__device__linux.cc (-1 / +1 lines)
1	--- src/3rdparty/chromium/media/capture/video/linux/video_capture_device_linux.cc.orig 2019-11-27 21:12:25 UTC	1	--- src/3rdparty/chromium/media/capture/video/linux/video_capture_device_linux.cc.orig 2020-04-08 09:41:36 UTC
2	+++ src/3rdparty/chromium/media/capture/video/linux/video_capture_device_linux.cc	2	+++ src/3rdparty/chromium/media/capture/video/linux/video_capture_device_linux.cc
3	@@ -17,8 +17,10 @@	3	@@ -17,8 +17,10 @@
4	#include <sys/videoio.h>	4	#include <sys/videoio.h>

Removed Link Here

(-)a/www/qt5-webengine/files/patch-src_3rdparty_chromium_media_capture_video_mock__gpu__memory__buffer__manager.cc (-11 lines)
1	--- src/3rdparty/chromium/media/capture/video/mock_gpu_memory_buffer_manager.cc.orig 2019-05-23 12:39:34 UTC
2	+++ src/3rdparty/chromium/media/capture/video/mock_gpu_memory_buffer_manager.cc
3	@@ -103,7 +103,7 @@ class FakeGpuMemoryBuffer : public gfx::GpuMemoryBuffe
4	gfx::GpuMemoryBufferHandle handle;
5	handle.type = gfx::NATIVE_PIXMAP;
6	handle.id = handle_.id;
7	-#if defined(OS_LINUX)
8	+#if defined(OS_LINUX) \|\| defined(OS_BSD)
9	handle.native_pixmap_handle =
10	gfx::CloneHandleForIPC(handle_.native_pixmap_handle);
11	#endif

Removed Link Here

(-)a/www/qt5-webengine/files/patch-src_3rdparty_chromium_media_capture_video_shared__memory__handle__provider.cc (-11 lines)
1	--- src/3rdparty/chromium/media/capture/video/shared_memory_handle_provider.cc.orig 2019-03-07 09:23:57 UTC
2	+++ src/3rdparty/chromium/media/capture/video/shared_memory_handle_provider.cc
3	@@ -63,7 +63,7 @@ bool SharedMemoryHandleProvider::InitFromMojoHandle(
4	return true;
5	}
6
7	-#if defined(OS_LINUX)
8	+#if defined(OS_LINUX) \|\| defined(OS_BSD)
9	bool SharedMemoryHandleProvider::InitAsReadOnlyFromRawFileDescriptor(
10	mojo::ScopedHandle fd_handle,
11	uint32_t memory_size_in_bytes) {

Removed Link Here

(-)a/www/qt5-webengine/files/patch-src_3rdparty_chromium_media_capture_video_shared__memory__handle__provider.h (-11 lines)
1	--- src/3rdparty/chromium/media/capture/video/shared_memory_handle_provider.h.orig 2019-03-07 09:23:57 UTC
2	+++ src/3rdparty/chromium/media/capture/video/shared_memory_handle_provider.h
3	@@ -38,7 +38,7 @@ class CAPTURE_EXPORT SharedMemoryHandleProvider
4
5	// This requires platforms where base::SharedMemoryHandle is backed by a
6	// file descriptor.
7	-#if defined(OS_LINUX)
8	+#if defined(OS_LINUX) \|\| defined(OS_BSD)
9	bool InitAsReadOnlyFromRawFileDescriptor(mojo::ScopedHandle fd_handle,
10	uint32_t memory_size_in_bytes);
11	#endif // defined(OS_LINUX)




--- 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




--- 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) {

+#if defined(OS_LINUX) || defined(OS_BSD)
     if (input_type == VideoFrame::STORAGE_DMABUFS) {
       video_frame_mapper = VideoFrameMapperFactory::CreateMapper(
           input_config.fourcc.ToVideoPixelFormat(), VideoFrame::STORAGE_DMABUFS,
@@ -92,7 +92,7 @@ std::unique_ptr<LibYUVImageProcessor> LibYUVImageProce
         break;
       }
     }

 
     if (VideoFrame::IsStorageTypeMappable(input_type)) {
       input_storage_type = input_type;
@@ -191,7 +191,7 @@ void LibYUVImageProcessor::ProcessTask(scoped_refptr<V
                                        FrameReadyCB cb) {
   DCHECK(process_thread_.task_runner()->BelongsToCurrentThread());
   DVLOGF(4);

   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));
@@ -201,7 +201,7 @@ void LibYUVImageProcessor::ProcessTask(scoped_refptr<V
       return;
     }
   }




--- 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
@@ -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)
 #include "gpu/ipc/common/gpu_client_ids.h"
 #include "gpu/ipc/service/gpu_memory_buffer_factory.h"
   std::vector<base::ScopedFD> duped_fds =
@@ -136,7 +136,7 @@ gfx::GpuMemoryBufferHandle CreateGpuMemoryBufferHandle
   }
 #else
   NOTREACHED();
-#endif  // defined(OS_LINUX)
+#endif  // defined(OS_LINUX) || defined(OS_BSD)
 
 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;
 }

Lines 1-4 Link Here

(-)b/www/qt5-webengine/files/patch-src_3rdparty_chromium_media_mojo_clients_mojo__video__encode__accelerator.cc (-3 / +3 lines)
1	--- src/3rdparty/chromium/media/mojo/clients/mojo_video_encode_accelerator.cc.orig 2019-11-27 21:12:25 UTC	1	--- src/3rdparty/chromium/media/mojo/clients/mojo_video_encode_accelerator.cc.orig 2020-03-16 14:04:24 UTC
2	+++ src/3rdparty/chromium/media/mojo/clients/mojo_video_encode_accelerator.cc	2	+++ src/3rdparty/chromium/media/mojo/clients/mojo_video_encode_accelerator.cc
3	@@ -124,7 +124,7 @@ void MojoVideoEncodeAccelerator::Encode(scoped_refptr<	3	@@ -124,7 +124,7 @@ void MojoVideoEncodeAccelerator::Encode(scoped_refptr<
4	frame->layout().num_planes());	4	frame->layout().num_planes());
Lines 6-11 Link Here
6		6
7	-#if defined(OS_LINUX)	7	-#if defined(OS_LINUX)
8	+#if defined(OS_LINUX) \|\| defined(OS_BSD)	8	+#if defined(OS_LINUX) \|\| defined(OS_BSD)
		9	// TODO(crbug.com/1003197): Remove this once we stop supporting STORAGE_DMABUF
		10	// in VideoEncodeAccelerator.
9	if (frame->storage_type() == VideoFrame::STORAGE_DMABUFS) {	11	if (frame->storage_type() == VideoFrame::STORAGE_DMABUFS) {
10	DCHECK(frame->HasDmaBufs());
11	vea_->Encode(




--- 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)));
   }
 

   if (input->storage_type() == media::VideoFrame::STORAGE_DMABUFS) {
     std::vector<mojo::ScopedHandle> dmabuf_fds;
 
@@ -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);




--- 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




--- 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




--- 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




--- 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
@@ -15,7 +15,7 @@
 #include "build/build_config.h"
 #include "mojo/public/c/system/core.h"
 

 #include "base/environment.h"
 #include "base/files/file_path.h"
 #include "base/optional.h"
@@ -58,7 +58,7 @@ namespace mojo {
 
 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 {
 class CoreLibraryInitializer {
  public:
   CoreLibraryInitializer(const MojoInitializeOptions* options) {

     bool application_provided_path = false;
     base::Optional<base::FilePath> library_path;
     if (options && options->struct_size >= sizeof(*options) &&
@@ -77,7 +77,7 @@ class CoreLibraryInitializer {
 
     if (!library_path) {
       // Default to looking for the library in the current working directory.

       const base::FilePath::CharType kDefaultLibraryPathValue[] =
           FILE_PATH_LITERAL("./libmojo_core.so");
 #elif defined(OS_WIN)
@@ -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:




--- src/3rdparty/chromium/net/BUILD.gn.orig	2020-04-08 09:41:36 UTC
+++ src/3rdparty/chromium/net/BUILD.gn
@@ -103,7 +103,7 @@ net_configs = [
   "//build/config/compiler:wexit_time_destructors",
 ]
 

   net_configs += [ "//build/config/linux:libresolv" ]
 }
 
@@ -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") {
       }
     }
 

       sources += [
         "base/network_change_notifier_posix.cc",
         "base/network_change_notifier_posix.h",
@@ -1991,7 +2002,7 @@ component("net") {
     }
 
     # Use getifaddrs() on POSIX platforms, except Linux and Android.

       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) {




--- 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
@@ -5,7 +5,9 @@
 #include "net/base/address_tracker_linux.h"
 namespace internal {
 
 #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(
-  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(
 AddressTrackerLinux::~AddressTrackerLinux() = default;
 
 void AddressTrackerLinux::Init() {

   netlink_fd_.reset(socket(AF_NETLINK, SOCK_RAW, NETLINK_ROUTE));
   if (!netlink_fd_.is_valid()) {
     PLOG(ERROR) << "Could not create NETLINK socket";
@@ -272,6 +275,7 @@ void AddressTrackerLinux::AbortAndForceOnline() {
   connection_type_initialized_cv_.Broadcast();
 }
 

 AddressTrackerLinux::AddressMap AddressTrackerLinux::GetAddressMap() const {
   AddressTrackerAutoLock lock(*this, address_map_lock_);
   return address_map_;
@@ -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();
 }

 
 NetworkChangeNotifier::ConnectionType
 AddressTrackerLinux::GetCurrentConnectionType() {
@@ -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);
   // 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;
     }
   }

 }
 
 void AddressTrackerLinux::OnFileCanReadWithoutBlocking() {
@@ -487,31 +497,7 @@ bool AddressTrackerLinux::IsTunnelInterfaceName(const 
 }
 
 void AddressTrackerLinux::UpdateCurrentConnectionType() {

+  NOTIMPLEMENTED();
 }
 
 int AddressTrackerLinux::GetThreadsWaitingForConnectionTypeInitForTesting() {




--- src/3rdparty/chromium/pdf/pdfium/pdfium_engine.cc.orig	2020-03-16 14:04:24 UTC
+++ src/3rdparty/chromium/pdf/pdfium/pdfium_engine.cc
@@ -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
 
@@ -377,7 +377,7 @@ void InitializeSDK(bool enable_v8) {
 
@@ -560,7 +560,7 @@ bool InitializeSDK() {
   config.m_v8EmbedderSlot = gin::kEmbedderPDFium;
   FPDF_InitLibraryWithConfig(&config);
 
-#if defined(OS_LINUX)
+#if defined(OS_LINUX) || defined(OS_BSD)
   InitializeLinuxFontMapper();
   FPDF_SetSystemFontInfo(&g_font_info);
 #endif
 
@@ -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.
   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)
   SetLastInstance(client_->GetPluginInstance());
 #endif
 
@@ -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)
   SetLastInstance(client_->GetPluginInstance());
 #endif
 
@@ -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)
   SetLastInstance(client_->GetPluginInstance());
 #endif
   if (most_visible_page_ != -1 && called_do_document_action_) {

Removed Link Here

(-)a/www/qt5-webengine/files/patch-src_3rdparty_chromium_printing_backend_print__backend__cups.h (-11 lines)
1	--- src/3rdparty/chromium/printing/backend/print_backend_cups.h.orig 2019-05-23 12:39:34 UTC
2	+++ src/3rdparty/chromium/printing/backend/print_backend_cups.h
3	@@ -5,6 +5,8 @@
4	#ifndef PRINTING_BACKEND_PRINT_BACKEND_CUPS_H_
5	#define PRINTING_BACKEND_PRINT_BACKEND_CUPS_H_
6
7	+#include <cups/ppd.h>
8	+
9	#include <string>
10
11	#include "base/files/file_util.h"




--- 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_);




--- 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
 




--- 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
@@ -159,7 +159,7 @@ LocationArbitrator::NewNetworkLocationProvider(
 
 std::unique_ptr<LocationProvider>
 LocationArbitrator::NewSystemLocationProvider() {
-#if defined(OS_MACOSX) || defined(OS_LINUX) || defined(OS_FUCHSIA)
+#if defined(OS_MACOSX) || defined(OS_LINUX) || defined(OS_FUCHSIA) || defined(OS_BSD)
+    defined(OS_FUCHSIA) || defined(OS_BSD)
   return nullptr;
 #else
   return device::NewSystemLocationProvider();




--- 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());

Removed Link Here

(-)a/www/qt5-webengine/files/patch-src_3rdparty_chromium_services_service__manager_sandbox_sandbox__type.cc (-11 lines)
1	--- src/3rdparty/chromium/services/service_manager/sandbox/sandbox_type.cc.orig 2019-05-23 12:39:34 UTC
2	+++ src/3rdparty/chromium/services/service_manager/sandbox/sandbox_type.cc
3	@@ -25,7 +25,7 @@ bool IsUnsandboxedSandboxType(SandboxType sandbox_type
4	service_manager::features::kXRSandbox);
5	#endif
6	case SANDBOX_TYPE_AUDIO:
7	-#if defined(OS_WIN) \|\| defined(OS_MACOSX) \|\| defined(OS_LINUX)
8	+#if defined(OS_WIN) \|\| defined(OS_MACOSX) \|\| defined(OS_LINUX) \|\| defined(OS_BSD)
9	return !base::FeatureList::IsEnabled(
10	service_manager::features::kAudioServiceSandbox);
11	#else

Added Link Here

(-)b/www/qt5-webengine/files/patch-src_3rdparty_chromium_services_tracing_public_cpp_perfetto_trace__event__data__source.cc (+11 lines)
1	--- src/3rdparty/chromium/services/tracing/public/cpp/perfetto/trace_event_data_source.cc.orig 2020-03-16 14:04:24 UTC
2	+++ src/3rdparty/chromium/services/tracing/public/cpp/perfetto/trace_event_data_source.cc
3	@@ -102,7 +102,7 @@ void WriteMetadataProto(ChromeMetadataPacket* metadata
4	#endif // defined(OS_ANDROID) && defined(OFFICIAL_BUILD)
5	}
6
7	-#if defined(OS_LINUX) \|\| defined(OS_ANDROID) \|\| defined(OS_FUCHSIA)
8	+#if defined(OS_LINUX) \|\| defined(OS_ANDROID) \|\| defined(OS_FUCHSIA) \|\| defined(OS_BSD)
9	// Linux, Android, and Fuchsia all use CLOCK_MONOTONIC. See crbug.com/166153
10	// about efforts to unify base::TimeTicks across all platforms.
11	constexpr perfetto::protos::pbzero::ClockSnapshot::Clock::BuiltinClocks




--- 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(

     media::mojom::VideoBufferHandlePtr* target) {
-#if defined(OS_LINUX)
+#if defined(OS_LINUX) || defined(OS_BSD)
   // |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)
   // 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




--- src/3rdparty/chromium/third_party/angle/BUILD.gn.orig	2020-04-08 09:41:36 UTC
+++ src/3rdparty/chromium/third_party/angle/BUILD.gn
@@ -381,7 +381,8 @@ angle_static_library("angle_gpu_info_util") {
   if (is_linux || is_fuchsia) {
     sources += libangle_gpu_info_util_linux_sources
 
-    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" ]
@@ -389,6 +390,7 @@ angle_static_library("angle_gpu_info_util") {
         "X11",
         "Xi",
         "Xext",

       ]
     }
   }
@@ -1107,10 +1109,6 @@ foreach(is_shared_library,
 
     if (is_linux) {
       sources += util_linux_sources
-      libs += [




--- 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
@@ -269,7 +269,7 @@ rx::DisplayImpl *CreateDisplayFromAttribs(const Attrib
             {
                 impl = rx::CreateVulkanWin32Display(state);
             }
-#    elif defined(ANGLE_PLATFORM_LINUX)
+#    elif defined(ANGLE_PLATFORM_POSIX)
             if (rx::IsVulkanXcbDisplayAvailable())
             {
                 impl = rx::CreateVulkanXcbDisplay(state);
@@ -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);

Added Link Here

(-)b/www/qt5-webengine/files/patch-src_3rdparty_chromium_third__party_angle_src_libANGLE_renderer_vulkan_DisplayVk__api.h (+11 lines)
1	--- src/3rdparty/chromium/third_party/angle/src/libANGLE/renderer/vulkan/DisplayVk_api.h.orig 2020-04-08 09:41:36 UTC
2	+++ src/3rdparty/chromium/third_party/angle/src/libANGLE/renderer/vulkan/DisplayVk_api.h
3	@@ -19,7 +19,7 @@ bool IsVulkanWin32DisplayAvailable();
4	DisplayImpl *CreateVulkanWin32Display(const egl::DisplayState &state);
5	#endif // defined(ANGLE_PLATFORM_WINDOWS)
6
7	-#if defined(ANGLE_PLATFORM_LINUX)
8	+#if defined(ANGLE_PLATFORM_POSIX)
9	bool IsVulkanXcbDisplayAvailable();
10	DisplayImpl *CreateVulkanXcbDisplay(const egl::DisplayState &state);
11	#endif // defined(ANGLE_PLATFORM_LINUX)

Added Link Here

(-)b/www/qt5-webengine/files/patch-src_3rdparty_chromium_third__party_angle_third__party_vulkan-loader_src_loader_loader.c (+11 lines)
1	--- src/3rdparty/chromium/third_party/angle/third_party/vulkan-loader/src/loader/loader.c.orig 2020-03-16 14:04:24 UTC
2	+++ src/3rdparty/chromium/third_party/angle/third_party/vulkan-loader/src/loader/loader.c
3	@@ -229,7 +229,7 @@ void *loader_device_heap_realloc(const struct loader_d
4	}
5
6	// Environment variables
7	-#if defined(__linux__) \|\| defined(__APPLE__)
8	+#if defined(__linux__) \|\| defined(__APPLE__) \|\| defined(__FreeBSD__)
9
10	static inline bool IsHighIntegrity() {
11	return geteuid() != getuid() \|\| getegid() != getgid();

Added Link Here

(-)b/www/qt5-webengine/files/patch-src_3rdparty_chromium_third__party_angle_third__party_vulkan-loader_src_loader_vk__loader__platform.h (+11 lines)
1	--- src/3rdparty/chromium/third_party/angle/third_party/vulkan-loader/src/loader/vk_loader_platform.h.orig 2020-03-16 14:04:24 UTC
2	+++ src/3rdparty/chromium/third_party/angle/third_party/vulkan-loader/src/loader/vk_loader_platform.h
3	@@ -31,7 +31,7 @@
4	#include "vulkan/vk_platform.h"
5	#include "vulkan/vk_sdk_platform.h"
6
7	-#if defined(__linux__) \|\| defined(__APPLE__)
8	+#if defined(__linux__) \|\| defined(__APPLE__) \|\| defined(__FreeBSD__)
9	/* Linux-specific common code: */
10
11	// Headers:




--- 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
@@ -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) {

   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
 

Added Link Here

(-)b/www/qt5-webengine/files/patch-src_3rdparty_chromium_third__party_blink_renderer_modules_mediastream_processed__local__audio__source.cc (+11 lines)
1	--- src/3rdparty/chromium/third_party/blink/renderer/modules/mediastream/processed_local_audio_source.cc.orig 2020-03-16 14:04:24 UTC
2	+++ src/3rdparty/chromium/third_party/blink/renderer/modules/mediastream/processed_local_audio_source.cc
3	@@ -430,7 +430,7 @@ void ProcessedLocalAudioSource::CaptureUsingProcessor(
4	bool key_pressed) {
5	#if defined(OS_WIN) \|\| defined(OS_MACOSX)
6	DCHECK_LE(volume, 1.0);
7	-#elif (defined(OS_LINUX) && !defined(OS_CHROMEOS)) \|\| defined(OS_OPENBSD)
8	+#elif (defined(OS_LINUX) && !defined(OS_CHROMEOS)) \|\| defined(OS_BSD)
9	// We have a special situation on Linux where the microphone volume can be
10	// "higher than maximum". The input volume slider in the sound preference
11	// allows the user to set a scaling that is higher than 100%. It means that

Lines 1-4 Link Here

(-)b/www/qt5-webengine/files/patch-src_3rdparty_chromium_third__party_blink_renderer_platform_fonts_font__cache.cc (-3 / +3 lines)
1	--- src/3rdparty/chromium/third_party/blink/renderer/platform/fonts/font_cache.cc.orig 2019-11-27 21:12:25 UTC	1	--- src/3rdparty/chromium/third_party/blink/renderer/platform/fonts/font_cache.cc.orig 2020-04-08 09:41:36 UTC
2	+++ src/3rdparty/chromium/third_party/blink/renderer/platform/fonts/font_cache.cc	2	+++ src/3rdparty/chromium/third_party/blink/renderer/platform/fonts/font_cache.cc
3	@@ -76,7 +76,7 @@ static const char kColorEmojiLocale[] = "und-Zsye";	3	@@ -76,7 +76,7 @@ static const char kColorEmojiLocale[] = "und-Zsye";
4		4
Lines 13-20 Link Here
13	FontPlatformData* FontCache::SystemFontPlatformData(	13	FontPlatformData* FontCache::SystemFontPlatformData(
14	const FontDescription& font_description) {	14	const FontDescription& font_description) {
15	const AtomicString& family = FontCache::SystemFontFamily();	15	const AtomicString& family = FontCache::SystemFontFamily();
16	-#if defined(OS_LINUX)	16	-#if defined(OS_LINUX) \|\| defined(OS_FUCHSIA)
17	+#if defined(OS_LINUX) \|\| defined(OS_BSD)	17	+#if defined(OS_LINUX) \|\| defined(OS_FUCHSIA) \|\| defined(OS_BSD)
18	if (family.IsEmpty() \|\| family == font_family_names::kSystemUi)	18	if (family.IsEmpty() \|\| family == font_family_names::kSystemUi)
19	return nullptr;	19	return nullptr;
20	#else	20	#else




--- 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
@@ -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>);
 

   // These are needed for calling QueryRenderStyleForStrike, since
   // gfx::GetFontRenderParams makes distinctions based on DSF.
   static float DeviceScaleFactor() { return device_scale_factor_; }
@@ -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)
   static bool GetFontForCharacter(UChar32,
     String name;
     std::string filename;
@@ -227,7 +227,7 @@ class PLATFORM_EXPORT FontCache {
   static void GetFontForCharacter(UChar32,
                                   const char* preferred_locale,
                                   gfx::FallbackFontData*);
-#endif  // defined(OS_LINUX)
+#endif  // defined(OS_LINUX) || defined(OS_BSD)
 
   scoped_refptr<SimpleFontData> FontDataFromFontPlatformData(
       const FontPlatformData*,
@@ -317,12 +317,12 @@ class PLATFORM_EXPORT FontCache {
                                    const FontFaceCreationParams&,
                                    std::string& name);
 

 
   scoped_refptr<SimpleFontData> FallbackOnStandardFontStyle(
       const FontDescription&,
@@ -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)




--- 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 {




--- 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: {

Lines 1-5 Link Here

(-)b/www/qt5-webengine/files/patch-src_3rdparty_chromium_third__party_perfetto_include_perfetto_base_time.h (-2 / +2 lines)
1	--- src/3rdparty/chromium/third_party/perfetto/include/perfetto/ext/base/time.h.orig 2019-11-27 21:12:25 UTC	1	--- src/3rdparty/chromium/third_party/perfetto/include/perfetto/base/time.h.orig 2020-03-16 14:04:24 UTC
2	+++ src/3rdparty/chromium/third_party/perfetto/include/perfetto/ext/base/time.h	2	+++ src/3rdparty/chromium/third_party/perfetto/include/perfetto/base/time.h
3	@@ -123,6 +123,9 @@ inline TimeNanos GetTimeInternalNs(clockid_t clk_id) {	3	@@ -123,6 +123,9 @@ inline TimeNanos GetTimeInternalNs(clockid_t clk_id) {
4	// Return ns from boot. Conversely to GetWallTimeNs, this clock counts also time	4	// Return ns from boot. Conversely to GetWallTimeNs, this clock counts also time
5	// during suspend (when supported).	5	// during suspend (when supported).

Lines 1-11 Link Here

(-)b/www/qt5-webengine/files/patch-src_3rdparty_chromium_third__party_skia_src_opts_SkRasterPipeline__opts.h (-7 / +21 lines)
1	--- src/3rdparty/chromium/third_party/skia/src/opts/SkRasterPipeline_opts.h.orig 2020-05-25 17:49:17 UTC	1	--- src/3rdparty/chromium/third_party/skia/src/opts/SkRasterPipeline_opts.h.orig 2020-05-31 18:04:09 UTC
2	+++ src/3rdparty/chromium/third_party/skia/src/opts/SkRasterPipeline_opts.h	2	+++ src/3rdparty/chromium/third_party/skia/src/opts/SkRasterPipeline_opts.h
3	@@ -996,7 +996,7 @@ SI F from_half(U16 h) {	3	@@ -988,9 +988,7 @@ SI F approx_powf(F x, F y) {
		4	SI F from_half(U16 h) {
		5	#if defined(JUMPER_IS_NEON) && defined(SK_CPU_ARM64) \
		6	&& !defined(SK_BUILD_FOR_GOOGLE3) // Temporary workaround for some Google3 builds.
		7	- __fp16 fp16;
		8	- memcpy(&fp16, &h, sizeof(U16));
		9	- return float(fp16);
		10	+ return vcvt_f32_f16(h);
4		11
		12	#elif defined(JUMPER_IS_HSW) \|\| defined(JUMPER_IS_AVX512)
		13	return _mm256_cvtph_ps(h);
		14	@@ -1011,10 +1009,7 @@ SI F from_half(U16 h) {
5	SI U16 to_half(F f) {	15	SI U16 to_half(F f) {
6	#if defined(JUMPER_IS_NEON) && defined(SK_CPU_ARM64) \	16	#if defined(JUMPER_IS_NEON) && defined(SK_CPU_ARM64) \
7	- && !defined(SK_BUILD_FOR_GOOGLE3) // Temporary workaround for some Google3 builds.	17	&& !defined(SK_BUILD_FOR_GOOGLE3) // Temporary workaround for some Google3 builds.
8	+ && ! (defined(SK_BUILD_FOR_GOOGLE3) \|\| defined(ARMV8_OS_FREEBSD)) // Temporary workaround for some Google3 builds.	18	- __fp16 fp16 = __fp16(f);
9	__fp16 fp16 = __fp16(f);	19	- U16 u16;
10	U16 u16;	20	- memcpy(&u16, &fp16, sizeof(U16));
11	memcpy(&u16, &fp16, sizeof(U16));	21	- return u16;
		22	+ return vcvt_f16_f32(f);
		23
		24	#elif defined(JUMPER_IS_HSW) \|\| defined(JUMPER_IS_AVX512)
		25	return _mm256_cvtps_ph(f, _MM_FROUND_CUR_DIRECTION);




--- 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) {




--- 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>

Added Link Here

(-)b/www/qt5-webengine/files/patch-src_3rdparty_chromium_ui_base_webui_web__ui__util.cc (+11 lines)
1	--- src/3rdparty/chromium/ui/base/webui/web_ui_util.cc.orig 2020-03-16 14:04:24 UTC
2	+++ src/3rdparty/chromium/ui/base/webui/web_ui_util.cc
3	@@ -227,7 +227,7 @@ std::string GetFontFamily() {
4
5	// TODO(dnicoara) Remove Ozone check when PlatformFont support is introduced
6	// into Ozone: crbug.com/320050
7	-#if defined(OS_LINUX) && !defined(OS_CHROMEOS) && !defined(USE_OZONE)
8	+#if (defined(OS_LINUX) \|\| defined(OS_BSD)) && !defined(OS_CHROMEOS) && !defined(USE_OZONE)
9	font_family = ui::ResourceBundle::GetSharedInstance().GetFont(
10	ui::ResourceBundle::BaseFont).GetFontName() + ", " + font_family;
11	#endif




--- 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.

Added Link Here

(-)b/www/qt5-webengine/files/patch-src_3rdparty_chromium_ui_compositor_compositor.cc (+11 lines)
1	--- src/3rdparty/chromium/ui/compositor/compositor.cc.orig 2020-03-16 14:04:24 UTC
2	+++ src/3rdparty/chromium/ui/compositor/compositor.cc
3	@@ -681,7 +681,7 @@ void Compositor::OnFrameTokenChanged(uint32_t frame_to
4	NOTREACHED();
5	}
6
7	-#if defined(OS_LINUX) && !defined(OS_CHROMEOS)
8	+#if (defined(OS_LINUX) && !defined(OS_CHROMEOS)) \|\| defined(OS_BSD)
9	void Compositor::OnCompleteSwapWithNewSize(const gfx::Size& size) {
10	for (auto& observer : observer_list_)
11	observer.OnCompositingCompleteSwapWithNewSize(this, size);

Added Link Here

(-)b/www/qt5-webengine/files/patch-src_3rdparty_chromium_ui_compositor_compositor.h (+11 lines)
1	--- src/3rdparty/chromium/ui/compositor/compositor.h.orig 2020-03-16 14:04:24 UTC
2	+++ src/3rdparty/chromium/ui/compositor/compositor.h
3	@@ -412,7 +412,7 @@ class COMPOSITOR_EXPORT Compositor : public cc::LayerT
4	void OnFirstSurfaceActivation(const viz::SurfaceInfo& surface_info) override;
5	void OnFrameTokenChanged(uint32_t frame_token) override;
6
7	-#if defined(OS_LINUX) && !defined(OS_CHROMEOS)
8	+#if (defined(OS_LINUX) && !defined(OS_CHROMEOS)) \|\| defined(OS_BSD)
9	void OnCompleteSwapWithNewSize(const gfx::Size& size);
10	#endif
11




--- 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.

Added Link Here

(-)b/www/qt5-webengine/files/patch-src_3rdparty_chromium_ui_compositor_host_host__context__factory__private.cc (+11 lines)
1	--- src/3rdparty/chromium/ui/compositor/host/host_context_factory_private.cc.orig 2020-03-16 14:04:24 UTC
2	+++ src/3rdparty/chromium/ui/compositor/host/host_context_factory_private.cc
3	@@ -31,7 +31,7 @@ namespace {
4
5	static const char* kBrowser = "Browser";
6
7	-#if defined(OS_LINUX) && !defined(OS_CHROMEOS)
8	+#if (defined(OS_LINUX) && !defined(OS_CHROMEOS)) \|\| defined(OS_BSD)
9	class HostDisplayClient : public viz::HostDisplayClient {
10	public:
11	explicit HostDisplayClient(ui::Compositor* compositor)




--- src/3rdparty/chromium/ui/gfx/color_analysis.cc.orig	2020-04-08 09:41:36 UTC
+++ src/3rdparty/chromium/ui/gfx/color_analysis.cc
@@ -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"
@@ -438,10 +439,17 @@ SkColor FindClosestColor(const uint8_t* image,
@@ -506,10 +507,17 @@ SkColor FindClosestColor(const uint8_t* image,
   SkColor best_color = color;
   const uint8_t* byte = image;
   for (int i = 0; i < width * height; ++i) {

     // Ignore fully transparent pixels.
     if (a == 0)
       continue;
@@ -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.

 SkColor CalculateKMeanColorOfBuffer(uint8_t* decoded_data,
                                     int img_width,
                                     int img_height,
@@ -482,10 +489,17 @@ SkColor CalculateKMeanColorOfBuffer(uint8_t* decoded_d
         int pixel_pos = sampler->GetSample(img_width, img_height) %
             (img_width * img_height);
 

         // Skip fully transparent pixels as they usually contain black in their
         // RGB channels but do not contribute to the visual image.
         if (a == 0)
@@ -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) {

         // Skip transparent pixels, see above.
         if (a == 0)
           continue;
@@ -615,8 +636,12 @@ SkColor CalculateKMeanColorOfPNG(scoped_refptr<base::R
 
   if (png.get() && png->size() &&
       gfx::PNGCodec::Decode(png->front(), png->size(),




--- 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();

Added Link Here

(-)b/www/qt5-webengine/files/patch-src_3rdparty_chromium_ui_gfx_gpu__memory__buffer.cc (+11 lines)
1	--- src/3rdparty/chromium/ui/gfx/gpu_memory_buffer.cc.orig 2020-03-16 14:04:24 UTC
2	+++ src/3rdparty/chromium/ui/gfx/gpu_memory_buffer.cc
3	@@ -28,7 +28,7 @@ GpuMemoryBufferHandle GpuMemoryBufferHandle::Clone() c
4	handle.region = region.Duplicate();
5	handle.offset = offset;
6	handle.stride = stride;
7	-#if defined(OS_LINUX) \|\| defined(OS_FUCHSIA)
8	+#if defined(OS_LINUX) \|\| defined(OS_FUCHSIA) \|\| defined(OS_BSD)
9	handle.native_pixmap_handle = CloneHandleForIPC(native_pixmap_handle);
10	#elif defined(OS_MACOSX) && !defined(OS_IOS)
11	NOTIMPLEMENTED();




--- 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"

   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)

Lines 1-5 Link Here

(-)b/www/qt5-webengine/files/patch-src_3rdparty_chromium_ui_gfx_mojom_buffer__types__mojom__traits.cc (-5 / +14 lines)
1	--- src/3rdparty/chromium/ui/gfx/mojo/buffer_types_struct_traits.cc.orig 2020-04-05 18:54:38 UTC	1	--- src/3rdparty/chromium/ui/gfx/mojom/buffer_types_mojom_traits.cc.orig 2020-03-16 14:04:24 UTC
2	+++ src/3rdparty/chromium/ui/gfx/mojo/buffer_types_struct_traits.cc	2	+++ src/3rdparty/chromium/ui/gfx/mojom/buffer_types_mojom_traits.cc
3	@@ -24,15 +24,15 @@ bool StructTraits<gfx::mojom::BufferUsageAndFormatData	3	@@ -24,15 +24,15 @@ bool StructTraits<gfx::mojom::BufferUsageAndFormatData
4	return data.ReadUsage(&out->usage) && data.ReadFormat(&out->format);	4	return data.ReadUsage(&out->usage) && data.ReadFormat(&out->format);
5	}	5	}
Lines 37-44 Link Here
37		37
38	return true;	38	return true;
39	}	39	}
40	@@ -71,7 +71,7 @@ bool StructTraits<	40	@@ -62,7 +62,7 @@ bool StructTraits<
		41	gfx::mojom::NativePixmapHandleDataView,
		42	gfx::NativePixmapHandle>::Read(gfx::mojom::NativePixmapHandleDataView data,
		43	gfx::NativePixmapHandle* out) {
		44	-#if defined(OS_LINUX)
		45	+#if defined(OS_LINUX) \|\| defined(OS_BSD)
41	out->modifier = data.modifier();	46	out->modifier = data.modifier();
		47	#endif
		48
		49	@@ -75,7 +75,7 @@ bool StructTraits<
		50
42	return data.ReadPlanes(&out->planes);	51	return data.ReadPlanes(&out->planes);
43	}	52	}
44	-#endif // defined(OS_LINUX) \|\| defined(USE_OZONE)	53	-#endif // defined(OS_LINUX) \|\| defined(USE_OZONE)
Lines 46-52 Link Here
46		55
47	gfx::mojom::GpuMemoryBufferPlatformHandlePtr StructTraits<	56	gfx::mojom::GpuMemoryBufferPlatformHandlePtr StructTraits<
48	gfx::mojom::GpuMemoryBufferHandleDataView,	57	gfx::mojom::GpuMemoryBufferHandleDataView,
49	@@ -84,7 +84,7 @@ gfx::mojom::GpuMemoryBufferPlatformHandlePtr StructTra	58	@@ -88,7 +88,7 @@ gfx::mojom::GpuMemoryBufferPlatformHandlePtr StructTra
50	return gfx::mojom::GpuMemoryBufferPlatformHandle::NewSharedMemoryHandle(	59	return gfx::mojom::GpuMemoryBufferPlatformHandle::NewSharedMemoryHandle(
51	std::move(handle.region));	60	std::move(handle.region));
52	case gfx::NATIVE_PIXMAP:	61	case gfx::NATIVE_PIXMAP:
Lines 55-61 Link Here
55	return gfx::mojom::GpuMemoryBufferPlatformHandle::NewNativePixmapHandle(	64	return gfx::mojom::GpuMemoryBufferPlatformHandle::NewNativePixmapHandle(
56	std::move(handle.native_pixmap_handle));	65	std::move(handle.native_pixmap_handle));
57	#else	66	#else
58	@@ -160,7 +160,7 @@ bool StructTraits<gfx::mojom::GpuMemoryBufferHandleDat	67	@@ -164,7 +164,7 @@ bool StructTraits<gfx::mojom::GpuMemoryBufferHandleDat
59	out->type = gfx::SHARED_MEMORY_BUFFER;	68	out->type = gfx::SHARED_MEMORY_BUFFER;
60	out->region = std::move(platform_handle->get_shared_memory_handle());	69	out->region = std::move(platform_handle->get_shared_memory_handle());
61	return true;	70	return true;




--- 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
   }
 };
 

 template <>
 struct StructTraits<gfx::mojom::NativePixmapPlaneDataView,
                     gfx::NativePixmapPlane> {
@@ -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);
 };




--- 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,

     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
 




--- 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"

   // 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.

Lines 52-58 Link Here

(-)b/www/qt5-webengine/files/patch-src_3rdparty_chromium_ui_gl_gl__bindings__autogen__glx.cc (-1 / +1 lines)
52	+ return result;	52	+ return result;
53	+}	53	+}
54	+	54	+
55	+__GLXextFuncPtr DebugGLXApi::glXGetProcAddressARBFn(const GLubyte* procName) {	55	+__GLXextFuncPtr LogGLXApi::glXGetProcAddressARBFn(const GLubyte* procName) {
56	+ GL_SERVICE_LOG("glXGetProcAddressARB"	56	+ GL_SERVICE_LOG("glXGetProcAddressARB"
57	+ << "(" << static_cast<const void*>(procName) << ")");	57	+ << "(" << static_cast<const void*>(procName) << ")");
58	+ __GLXextFuncPtr result = glx_api_->glXGetProcAddressARBFn(procName);	58	+ __GLXextFuncPtr result = glx_api_->glXGetProcAddressARBFn(procName);




--- 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 =




--- 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;




--- 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
@@ -74,7 +74,7 @@ gfx::Range PlatformStyle::RangeToDeleteBackwards(const
 
 #endif  // OS_MACOSX
 #include "ui/views/controls/scrollbar/overlay_scroll_bar.h"
-#elif defined(OS_LINUX)
+#elif defined(OS_LINUX) || defined(OS_BSD)
 #define DESKTOP_LINUX
 #endif
 
-#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) {

Lines 1-11 Link Here

(-)b/www/qt5-webengine/files/patch-src_3rdparty_chromium_ui_views_views__delegate.cc (-4 / +4 lines)
1	--- src/3rdparty/chromium/ui/views/views_delegate.cc.orig 2018-11-13 18:25:11 UTC	1	--- src/3rdparty/chromium/ui/views/views_delegate.cc.orig 2020-04-08 09:41:36 UTC
2	+++ src/3rdparty/chromium/ui/views/views_delegate.cc	2	+++ src/3rdparty/chromium/ui/views/views_delegate.cc
3	@@ -87,7 +87,7 @@ HICON ViewsDelegate::GetSmallWindowIcon() const {	3	@@ -85,7 +85,7 @@ HICON ViewsDelegate::GetSmallWindowIcon() const {
4	bool ViewsDelegate::IsWindowInMetro(gfx::NativeWindow window) const {	4	bool ViewsDelegate::IsWindowInMetro(gfx::NativeWindow window) const {
5	return false;	5	return false;
6	}	6	}
7	-#elif defined(OS_LINUX) && !defined(OS_CHROMEOS)	7	-#elif defined(OS_LINUX) && BUILDFLAG(ENABLE_DESKTOP_AURA)
8	+#elif (defined(OS_LINUX) && !defined(OS_CHROMEOS)) \|\| defined(OS_FREEBSD)	8	+#elif (defined(OS_LINUX) \|\| defined(OS_BSD)) && BUILDFLAG(ENABLE_DESKTOP_AURA)
9	gfx::ImageSkia* ViewsDelegate::GetDefaultWindowIcon() const {	9	gfx::ImageSkia* ViewsDelegate::GetDefaultWindowIcon() const {
10	return nullptr;	10	return nullptr;
11	}	11	}

Lines 1-11 Link Here

(-)b/www/qt5-webengine/files/patch-src_3rdparty_chromium_ui_views_views__delegate.h (-4 / +4 lines)
1	--- src/3rdparty/chromium/ui/views/views_delegate.h.orig 2018-11-13 18:25:11 UTC	1	--- src/3rdparty/chromium/ui/views/views_delegate.h.orig 2020-04-08 09:41:36 UTC
2	+++ src/3rdparty/chromium/ui/views/views_delegate.h	2	+++ src/3rdparty/chromium/ui/views/views_delegate.h
3	@@ -155,7 +155,7 @@ class VIEWS_EXPORT ViewsDelegate {	3	@@ -131,7 +131,7 @@ class VIEWS_EXPORT ViewsDelegate {
4	// Returns true if the window passed in is in the Windows 8 metro	4	// Returns true if the window passed in is in the Windows 8 metro
5	// environment.	5	// environment.
6	virtual bool IsWindowInMetro(gfx::NativeWindow window) const;	6	virtual bool IsWindowInMetro(gfx::NativeWindow window) const;
7	-#elif defined(OS_LINUX) && !defined(OS_CHROMEOS)	7	-#elif defined(OS_LINUX) && BUILDFLAG(ENABLE_DESKTOP_AURA)
8	+#elif defined(OS_LINUX) && !defined(OS_CHROMEOS) \|\| defined(OS_FREEBSD)	8	+#elif (defined(OS_LINUX) \|\| defined(OS_BSD)) && BUILDFLAG(ENABLE_DESKTOP_AURA)
9	virtual gfx::ImageSkia* GetDefaultWindowIcon() const;	9	virtual gfx::ImageSkia* GetDefaultWindowIcon() const;
10	#endif	10	#endif
11		11




--- 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
@@ -732,7 +732,7 @@ void DesktopWindowTreeHostPlatform::AddAdditionalInitP
 // DesktopWindowTreeHost:
   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;
 
 // 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,

Removed Link Here

(-)a/www/qt5-webengine/files/patch-src_3rdparty_chromium_ui_views_widget_desktop__aura_desktop__window__tree__host__platform.h (-11 lines)
1	--- src/3rdparty/chromium/ui/views/widget/desktop_aura/desktop_window_tree_host_platform.h.orig 2019-05-23 12:39:34 UTC
2	+++ src/3rdparty/chromium/ui/views/widget/desktop_aura/desktop_window_tree_host_platform.h
3	@@ -119,7 +119,7 @@ class VIEWS_EXPORT DesktopWindowTreeHostPlatform
4
5	bool is_active_ = false;
6
7	-#if defined(OS_LINUX)
8	+#if defined(OS_LINUX) \|\| defined(OS_BSD)
9	// A handler for events intended for non client area.
10	std::unique_ptr<WindowEventFilter> non_client_window_event_filter_;
11	#endif




--- 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 =




--- 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
@@ -59,7 +59,7 @@ Widget* DialogDelegate::CreateDialogWidget(WidgetDeleg
   params.bounds = bounds;
   DialogDelegate* dialog = delegate->AsDialogDelegate();
 
 // 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.
   return parent != nullptr;
 #elif defined(OS_WIN)

Lines 1-11 Link Here

(-)b/www/qt5-webengine/files/patch-src_3rdparty_chromium_ui_views_window_frame__background.cc (-4 / +4 lines)
1	--- src/3rdparty/chromium/ui/views/window/frame_background.cc.orig 2019-05-23 12:39:34 UTC	1	--- src/3rdparty/chromium/ui/views/window/frame_background.cc.orig 2020-04-08 09:41:36 UTC
2	+++ src/3rdparty/chromium/ui/views/window/frame_background.cc	2	+++ src/3rdparty/chromium/ui/views/window/frame_background.cc
3	@@ -122,7 +122,7 @@ void FrameBackground::PaintMaximized(gfx::Canvas* canv	3	@@ -107,7 +107,7 @@ void FrameBackground::PaintMaximized(gfx::Canvas* canv
4	const View* view) const {	4	const View* view) const {
5	// Fill the top with the frame color first so we have a constant background	5	// Fill the top with the frame color first so we have a constant background
6	// for areas not covered by the theme image.	6	// for areas not covered by the theme image.
7	-#if defined(OS_LINUX) && !defined(OS_CHROMEOS)	7	-#if defined(OS_LINUX) && BUILDFLAG(ENABLE_DESKTOP_AURA)
8	+#if (defined(OS_LINUX) \|\| defined(OS_BSD)) && !defined(OS_CHROMEOS)	8	+#if (defined(OS_LINUX) \|\| defined(OS_BSD)) && BUILDFLAG(ENABLE_DESKTOP_AURA)
9	auto* native_theme = view->GetNativeTheme();	9	auto* native_theme = view->GetNativeTheme();
10	ui::NativeTheme::ExtraParams params;	10	ui::NativeTheme::ExtraParams params;
11	params.frame_top_area.use_custom_frame = use_custom_frame_;	11	params.frame_top_area.use_custom_frame = use_custom_frame_;




--- 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))




--- src/3rdparty/chromium/v8/src/api/api.cc.orig	2020-04-08 09:41:36 UTC
+++ src/3rdparty/chromium/v8/src/api/api.cc
@@ -5653,7 +5653,7 @@ bool v8::V8::Initialize() {
 #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() {
   return true;
 }
 




--- 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;




--- 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




--- 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

Removed Link Here

(-)a/www/qt5-webengine/files/patch-src_3rdparty_chromium_v8_src_trap-handler_handler-inside-posix.h (-11 lines)
1	--- src/3rdparty/chromium/v8/src/trap-handler/handler-inside-posix.h.orig 2019-05-23 12:39:34 UTC
2	+++ src/3rdparty/chromium/v8/src/trap-handler/handler-inside-posix.h
3	@@ -12,7 +12,7 @@ namespace v8 {
4	namespace internal {
5	namespace trap_handler {
6
7	-#if V8_OS_LINUX
8	+#if defined(V8_OS_LINUX) \|\| defined(V8_OS_FREEBSD)
9	constexpr int kOobSignal = SIGSEGV;
10	#elif V8_OS_MACOSX
11	constexpr int kOobSignal = SIGBUS;

Removed Link Here

(-)a/www/qt5-webengine/files/patch-src_3rdparty_chromium_v8_src_trap-handler_trap-handler.h (-11 lines)
1	--- src/3rdparty/chromium/v8/src/trap-handler/trap-handler.h.orig 2019-05-23 12:39:34 UTC
2	+++ src/3rdparty/chromium/v8/src/trap-handler/trap-handler.h
3	@@ -23,6 +23,8 @@ namespace trap_handler {
4	#define V8_TRAP_HANDLER_SUPPORTED true
5	#elif V8_TARGET_ARCH_X64 && V8_OS_MACOSX
6	#define V8_TRAP_HANDLER_SUPPORTED true
7	+#elif V8_TARGET_ARCH_X64 && V8_OS_FREEBSD
8	+#define V8_TRAP_HANDLER_SUPPORTED true
9	#else
10	#define V8_TRAP_HANDLER_SUPPORTED false
11	#endif




--- src/3rdparty/chromium/v8/test/BUILD.gn.orig	2020-04-08 09:41:36 UTC
+++ src/3rdparty/chromium/v8/test/BUILD.gn
@@ -31,7 +31,7 @@ group("gn_all") {
     deps += [
       "cctest:cctest",
       "cctest:generate-bytecode-expectations",

     ]
   }
 }
@@ -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",

     "webkit:v8_webkit",
   ]
 }
@@ -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",

Lines 1-4 Link Here

(-)b/www/qt5-webengine/files/patch-src_3rdparty_gn_build_gen.py (-2 / +2 lines)
1	--- src/3rdparty/gn/build/gen.py.orig 2019-11-27 21:12:25 UTC	1	--- src/3rdparty/gn/build/gen.py.orig 2020-03-16 14:04:24 UTC
2	+++ src/3rdparty/gn/build/gen.py	2	+++ src/3rdparty/gn/build/gen.py
3	@@ -69,6 +69,9 @@ class Platform(object):	3	@@ -69,6 +69,9 @@ class Platform(object):
4	def is_aix(self):	4	def is_aix(self):
Lines 10-16 Link Here
10	def is_posix(self):	10	def is_posix(self):
11	return self._platform in ['linux', 'freebsd', 'darwin', 'aix', 'openbsd']	11	return self._platform in ['linux', 'freebsd', 'darwin', 'aix', 'openbsd']
12		12
13	@@ -364,6 +367,11 @@ def WriteGNNinja(path, platform, host, options):	13	@@ -371,6 +374,11 @@ def WriteGNNinja(path, platform, host, options):
14	elif platform.is_aix():	14	elif platform.is_aix():
15	cflags_cc.append('-maix64')	15	cflags_cc.append('-maix64')
16	ldflags.append('-maix64')	16	ldflags.append('-maix64')

Lines 1-9 Link Here

(-)b/www/qt5-webengine/files/patch-src_buildtools_config_support.pri (-4 / +4 lines)
1	--- src/buildtools/config/support.pri.orig 2020-01-09 09:16:12 UTC	1	--- src/buildtools/config/support.pri.orig 2020-03-16 14:04:24 UTC
2	+++ src/buildtools/config/support.pri	2	+++ src/buildtools/config/support.pri
3	@@ -68,6 +68,7 @@ defineReplace(qtwebengine_checkError) {	3	@@ -64,6 +64,7 @@ defineReplace(qtwebengine_checkError) {
4
5	linux:!qtwebengine_checkErrorForLinux():return(false)	4	linux:!qtwebengine_checkErrorForLinux():return(false)
6	win:!qtwebengine_checkErrorForWindows():return(false)	5	win32:!qtwebengine_checkErrorForWindows():return(false)
		6	macos:!qtwebengine_checkErrorForMacOS():return(false)
7	+ unix:!qtwebengine_checkErrorForLinux():return(false)	7	+ unix:!qtwebengine_checkErrorForLinux():return(false)
8		8
9	sanitizer: !qtConfig(webengine-sanitizer) {	9	sanitizer: !qtConfig(webengine-sanitizer) {




--- src/core/api/core_api.pro.orig	2020-03-16 14:04:24 UTC
+++ src/core/api/core_api.pro
@@ -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
 }




--- 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
 }
 




%%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

%%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

%%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%%/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

%%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

%%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

%%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

%%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

%%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

%%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

%%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

@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

Lines 14-19 COMMENT= Additional Styles for Qt 5 and KDE Link Here

(-)b/x11-themes/qt5-style-plugins/Makefile (+2 lines)
14		14
15	LICENSE= LGPL21	15	LICENSE= LGPL21
16		16
		17	BROKEN= Not compatible with modern Qt
		18
17	LIB_DEPENDS= libfontconfig.so:x11-fonts/fontconfig \	19	LIB_DEPENDS= libfontconfig.so:x11-fonts/fontconfig \
18	libfreetype.so:print/freetype2	20	libfreetype.so:print/freetype2
19		21

Lines 5-10 Link Here

(-)b/x11-toolkits/qt5-declarative/pkg-plist (-8 / +35 lines)
5	%%QT_INCDIR%%/QtPacketProtocol/QtPacketProtocolDepends	5	%%QT_INCDIR%%/QtPacketProtocol/QtPacketProtocolDepends
6	%%QT_INCDIR%%/QtPacketProtocol/QtPacketProtocolVersion	6	%%QT_INCDIR%%/QtPacketProtocol/QtPacketProtocolVersion
7	%%QT_INCDIR%%/QtPacketProtocol/qtpacketprotocolversion.h	7	%%QT_INCDIR%%/QtPacketProtocol/qtpacketprotocolversion.h
		8	%%QT_INCDIR%%/QtQml/%%FULLVER%%/QtQml/private/inlinecomponentutils_p.h
8	%%QT_INCDIR%%/QtQml/%%FULLVER%%/QtQml/private/qabstractanimationjob_p.h	9	%%QT_INCDIR%%/QtQml/%%FULLVER%%/QtQml/private/qabstractanimationjob_p.h
9	%%QT_INCDIR%%/QtQml/%%FULLVER%%/QtQml/private/qanimationgroupjob_p.h	10	%%QT_INCDIR%%/QtQml/%%FULLVER%%/QtQml/private/qanimationgroupjob_p.h
10	%%QT_INCDIR%%/QtQml/%%FULLVER%%/QtQml/private/qanimationjobutil_p.h	11	%%QT_INCDIR%%/QtQml/%%FULLVER%%/QtQml/private/qanimationjobutil_p.h
Lines 246-256 Link Here
246	%%QT_INCDIR%%/QtQml/QJSValueList	247	%%QT_INCDIR%%/QtQml/QJSValueList
247	%%QT_INCDIR%%/QtQml/QQmlAbstractUrlInterceptor	248	%%QT_INCDIR%%/QtQml/QQmlAbstractUrlInterceptor
248	%%QT_INCDIR%%/QtQml/QQmlApplicationEngine	249	%%QT_INCDIR%%/QtQml/QQmlApplicationEngine
249	%%QT_INCDIR%%/QtQml/QQmlAttachedPropertiesFunc
250	%%QT_INCDIR%%/QtQml/QQmlComponent	250	%%QT_INCDIR%%/QtQml/QQmlComponent
251	%%QT_INCDIR%%/QtQml/QQmlContext	251	%%QT_INCDIR%%/QtQml/QQmlContext
252	%%QT_INCDIR%%/QtQml/QQmlDebuggingEnabler	252	%%QT_INCDIR%%/QtQml/QQmlDebuggingEnabler
253	%%QT_INCDIR%%/QtQml/QQmlEngine	253	%%QT_INCDIR%%/QtQml/QQmlEngine
		254	%%QT_INCDIR%%/QtQml/QQmlEngineExtensionInterface
		255	%%QT_INCDIR%%/QtQml/QQmlEngineExtensionPlugin
254	%%QT_INCDIR%%/QtQml/QQmlError	256	%%QT_INCDIR%%/QtQml/QQmlError
255	%%QT_INCDIR%%/QtQml/QQmlExpression	257	%%QT_INCDIR%%/QtQml/QQmlExpression
256	%%QT_INCDIR%%/QtQml/QQmlExtensionInterface	258	%%QT_INCDIR%%/QtQml/QQmlExtensionInterface
Lines 263-268 Link Here
263	%%QT_INCDIR%%/QtQml/QQmlInfo	265	%%QT_INCDIR%%/QtQml/QQmlInfo
264	%%QT_INCDIR%%/QtQml/QQmlListProperty	266	%%QT_INCDIR%%/QtQml/QQmlListProperty
265	%%QT_INCDIR%%/QtQml/QQmlListReference	267	%%QT_INCDIR%%/QtQml/QQmlListReference
		268	%%QT_INCDIR%%/QtQml/QQmlModuleRegistration
266	%%QT_INCDIR%%/QtQml/QQmlNetworkAccessManagerFactory	269	%%QT_INCDIR%%/QtQml/QQmlNetworkAccessManagerFactory
267	%%QT_INCDIR%%/QtQml/QQmlParserStatus	270	%%QT_INCDIR%%/QtQml/QQmlParserStatus
268	%%QT_INCDIR%%/QtQml/QQmlProperties	271	%%QT_INCDIR%%/QtQml/QQmlProperties
Lines 272-277 Link Here
272	%%QT_INCDIR%%/QtQml/QQmlScriptString	275	%%QT_INCDIR%%/QtQml/QQmlScriptString
273	%%QT_INCDIR%%/QtQml/QQmlTypeInfo	276	%%QT_INCDIR%%/QtQml/QQmlTypeInfo
274	%%QT_INCDIR%%/QtQml/QQmlTypesExtensionInterface	277	%%QT_INCDIR%%/QtQml/QQmlTypesExtensionInterface
		278	%%QT_INCDIR%%/QtQml/QmlTypeAndRevisionsRegistration
275	%%QT_INCDIR%%/QtQml/QtQml	279	%%QT_INCDIR%%/QtQml/QtQml
276	%%QT_INCDIR%%/QtQml/QtQmlDepends	280	%%QT_INCDIR%%/QtQml/QtQmlDepends
277	%%QT_INCDIR%%/QtQml/QtQmlVersion	281	%%QT_INCDIR%%/QtQml/QtQmlVersion
Lines 294-299 Link Here
294	%%QT_INCDIR%%/QtQml/qqmlincubator.h	298	%%QT_INCDIR%%/QtQml/qqmlincubator.h
295	%%QT_INCDIR%%/QtQml/qqmlinfo.h	299	%%QT_INCDIR%%/QtQml/qqmlinfo.h
296	%%QT_INCDIR%%/QtQml/qqmllist.h	300	%%QT_INCDIR%%/QtQml/qqmllist.h
		301	%%QT_INCDIR%%/QtQml/qqmlmoduleregistration.h
297	%%QT_INCDIR%%/QtQml/qqmlnetworkaccessmanagerfactory.h	302	%%QT_INCDIR%%/QtQml/qqmlnetworkaccessmanagerfactory.h
298	%%QT_INCDIR%%/QtQml/qqmlparserstatus.h	303	%%QT_INCDIR%%/QtQml/qqmlparserstatus.h
299	%%QT_INCDIR%%/QtQml/qqmlprivate.h	304	%%QT_INCDIR%%/QtQml/qqmlprivate.h
Lines 309-314 Link Here
309	%%QT_INCDIR%%/QtQmlDebug/%%FULLVER%%/QtQmlDebug/private/qqmldebugclient_p_p.h	314	%%QT_INCDIR%%/QtQmlDebug/%%FULLVER%%/QtQmlDebug/private/qqmldebugclient_p_p.h
310	%%QT_INCDIR%%/QtQmlDebug/%%FULLVER%%/QtQmlDebug/private/qqmldebugconnection_p.h	315	%%QT_INCDIR%%/QtQmlDebug/%%FULLVER%%/QtQmlDebug/private/qqmldebugconnection_p.h
311	%%QT_INCDIR%%/QtQmlDebug/%%FULLVER%%/QtQmlDebug/private/qqmldebugmessageclient_p.h	316	%%QT_INCDIR%%/QtQmlDebug/%%FULLVER%%/QtQmlDebug/private/qqmldebugmessageclient_p.h
		317	%%QT_INCDIR%%/QtQmlDebug/%%FULLVER%%/QtQmlDebug/private/qqmldebugtranslationclient_p.h
312	%%QT_INCDIR%%/QtQmlDebug/%%FULLVER%%/QtQmlDebug/private/qqmlenginecontrolclient_p.h	318	%%QT_INCDIR%%/QtQmlDebug/%%FULLVER%%/QtQmlDebug/private/qqmlenginecontrolclient_p.h
313	%%QT_INCDIR%%/QtQmlDebug/%%FULLVER%%/QtQmlDebug/private/qqmlenginecontrolclient_p_p.h	319	%%QT_INCDIR%%/QtQmlDebug/%%FULLVER%%/QtQmlDebug/private/qqmlenginecontrolclient_p_p.h
314	%%QT_INCDIR%%/QtQmlDebug/%%FULLVER%%/QtQmlDebug/private/qqmlenginedebugclient_p.h	320	%%QT_INCDIR%%/QtQmlDebug/%%FULLVER%%/QtQmlDebug/private/qqmlenginedebugclient_p.h
Lines 331-339 Link Here
331	%%QT_INCDIR%%/QtQmlDebug/QtQmlDebugDepends	337	%%QT_INCDIR%%/QtQmlDebug/QtQmlDebugDepends
332	%%QT_INCDIR%%/QtQmlDebug/QtQmlDebugVersion	338	%%QT_INCDIR%%/QtQmlDebug/QtQmlDebugVersion
333	%%QT_INCDIR%%/QtQmlDebug/qtqmldebugversion.h	339	%%QT_INCDIR%%/QtQmlDebug/qtqmldebugversion.h
		340	%%QT_INCDIR%%/QtQmlModels/%%FULLVER%%/QtQmlModels/private/qqmlabstractdelegatecomponent_p.h
334	%%QT_INCDIR%%/QtQmlModels/%%FULLVER%%/QtQmlModels/private/qqmladaptormodel_p.h	341	%%QT_INCDIR%%/QtQmlModels/%%FULLVER%%/QtQmlModels/private/qqmladaptormodel_p.h
335	%%QT_INCDIR%%/QtQmlModels/%%FULLVER%%/QtQmlModels/private/qqmlchangeset_p.h	342	%%QT_INCDIR%%/QtQmlModels/%%FULLVER%%/QtQmlModels/private/qqmlchangeset_p.h
336	%%QT_INCDIR%%/QtQmlModels/%%FULLVER%%/QtQmlModels/private/qqmldelegatecomponent_p.h
337	%%QT_INCDIR%%/QtQmlModels/%%FULLVER%%/QtQmlModels/private/qqmldelegatemodel_p.h	343	%%QT_INCDIR%%/QtQmlModels/%%FULLVER%%/QtQmlModels/private/qqmldelegatemodel_p.h
338	%%QT_INCDIR%%/QtQmlModels/%%FULLVER%%/QtQmlModels/private/qqmldelegatemodel_p_p.h	344	%%QT_INCDIR%%/QtQmlModels/%%FULLVER%%/QtQmlModels/private/qqmldelegatemodel_p_p.h
339	%%QT_INCDIR%%/QtQmlModels/%%FULLVER%%/QtQmlModels/private/qqmlinstantiator_p.h	345	%%QT_INCDIR%%/QtQmlModels/%%FULLVER%%/QtQmlModels/private/qqmlinstantiator_p.h
Lines 346-353 Link Here
346	%%QT_INCDIR%%/QtQmlModels/%%FULLVER%%/QtQmlModels/private/qqmlmodelsmodule_p.h	352	%%QT_INCDIR%%/QtQmlModels/%%FULLVER%%/QtQmlModels/private/qqmlmodelsmodule_p.h
347	%%QT_INCDIR%%/QtQmlModels/%%FULLVER%%/QtQmlModels/private/qqmlobjectmodel_p.h	353	%%QT_INCDIR%%/QtQmlModels/%%FULLVER%%/QtQmlModels/private/qqmlobjectmodel_p.h
348	%%QT_INCDIR%%/QtQmlModels/%%FULLVER%%/QtQmlModels/private/qqmltableinstancemodel_p.h	354	%%QT_INCDIR%%/QtQmlModels/%%FULLVER%%/QtQmlModels/private/qqmltableinstancemodel_p.h
349	%%QT_INCDIR%%/QtQmlModels/%%FULLVER%%/QtQmlModels/private/qqmltablemodel_p.h
350	%%QT_INCDIR%%/QtQmlModels/%%FULLVER%%/QtQmlModels/private/qqmltablemodelcolumn_p.h
351	%%QT_INCDIR%%/QtQmlModels/%%FULLVER%%/QtQmlModels/private/qquickpackage_p.h	355	%%QT_INCDIR%%/QtQmlModels/%%FULLVER%%/QtQmlModels/private/qquickpackage_p.h
352	%%QT_INCDIR%%/QtQmlModels/%%FULLVER%%/QtQmlModels/private/qtqmlmodels-config_p.h	356	%%QT_INCDIR%%/QtQmlModels/%%FULLVER%%/QtQmlModels/private/qtqmlmodels-config_p.h
353	%%QT_INCDIR%%/QtQmlModels/%%FULLVER%%/QtQmlModels/private/qtqmlmodelsglobal_p.h	357	%%QT_INCDIR%%/QtQmlModels/%%FULLVER%%/QtQmlModels/private/qtqmlmodelsglobal_p.h
Lines 388-394 Link Here
388	%%QT_INCDIR%%/QtQuick/%%FULLVER%%/QtQuick/private/qquickbehavior_p.h	392	%%QT_INCDIR%%/QtQuick/%%FULLVER%%/QtQuick/private/qquickbehavior_p.h
389	%%QT_INCDIR%%/QtQuick/%%FULLVER%%/QtQuick/private/qquickborderimage_p.h	393	%%QT_INCDIR%%/QtQuick/%%FULLVER%%/QtQuick/private/qquickborderimage_p.h
390	%%QT_INCDIR%%/QtQuick/%%FULLVER%%/QtQuick/private/qquickborderimage_p_p.h	394	%%QT_INCDIR%%/QtQuick/%%FULLVER%%/QtQuick/private/qquickborderimage_p_p.h
391	%%QT_INCDIR%%/QtQuick/%%FULLVER%%/QtQuick/private/qquickboundaryrule_p.h
392	%%QT_INCDIR%%/QtQuick/%%FULLVER%%/QtQuick/private/qquickcanvascontext_p.h	395	%%QT_INCDIR%%/QtQuick/%%FULLVER%%/QtQuick/private/qquickcanvascontext_p.h
393	%%QT_INCDIR%%/QtQuick/%%FULLVER%%/QtQuick/private/qquickcanvasitem_p.h	396	%%QT_INCDIR%%/QtQuick/%%FULLVER%%/QtQuick/private/qquickcanvasitem_p.h
394	%%QT_INCDIR%%/QtQuick/%%FULLVER%%/QtQuick/private/qquickclipnode_p.h	397	%%QT_INCDIR%%/QtQuick/%%FULLVER%%/QtQuick/private/qquickclipnode_p.h
Lines 417-422 Link Here
417	%%QT_INCDIR%%/QtQuick/%%FULLVER%%/QtQuick/private/qquickfocusscope_p.h	420	%%QT_INCDIR%%/QtQuick/%%FULLVER%%/QtQuick/private/qquickfocusscope_p.h
418	%%QT_INCDIR%%/QtQuick/%%FULLVER%%/QtQuick/private/qquickfontloader_p.h	421	%%QT_INCDIR%%/QtQuick/%%FULLVER%%/QtQuick/private/qquickfontloader_p.h
419	%%QT_INCDIR%%/QtQuick/%%FULLVER%%/QtQuick/private/qquickfontmetrics_p.h	422	%%QT_INCDIR%%/QtQuick/%%FULLVER%%/QtQuick/private/qquickfontmetrics_p.h
		423	%%QT_INCDIR%%/QtQuick/%%FULLVER%%/QtQuick/private/qquickforeignutils_p.h
420	%%QT_INCDIR%%/QtQuick/%%FULLVER%%/QtQuick/private/qquickgenericshadereffect_p.h	424	%%QT_INCDIR%%/QtQuick/%%FULLVER%%/QtQuick/private/qquickgenericshadereffect_p.h
421	%%QT_INCDIR%%/QtQuick/%%FULLVER%%/QtQuick/private/qquickgraphicsinfo_p.h	425	%%QT_INCDIR%%/QtQuick/%%FULLVER%%/QtQuick/private/qquickgraphicsinfo_p.h
422	%%QT_INCDIR%%/QtQuick/%%FULLVER%%/QtQuick/private/qquickgridview_p.h	426	%%QT_INCDIR%%/QtQuick/%%FULLVER%%/QtQuick/private/qquickgridview_p.h
Lines 516-522 Link Here
516	%%QT_INCDIR%%/QtQuick/%%FULLVER%%/QtQuick/private/qquicktransition_p.h	520	%%QT_INCDIR%%/QtQuick/%%FULLVER%%/QtQuick/private/qquicktransition_p.h
517	%%QT_INCDIR%%/QtQuick/%%FULLVER%%/QtQuick/private/qquicktransitionmanager_p_p.h	521	%%QT_INCDIR%%/QtQuick/%%FULLVER%%/QtQuick/private/qquicktransitionmanager_p_p.h
518	%%QT_INCDIR%%/QtQuick/%%FULLVER%%/QtQuick/private/qquicktranslate_p.h	522	%%QT_INCDIR%%/QtQuick/%%FULLVER%%/QtQuick/private/qquicktranslate_p.h
519	%%QT_INCDIR%%/QtQuick/%%FULLVER%%/QtQuick/private/qquickutilmodule_p.h
520	%%QT_INCDIR%%/QtQuick/%%FULLVER%%/QtQuick/private/qquickvalidator_p.h	523	%%QT_INCDIR%%/QtQuick/%%FULLVER%%/QtQuick/private/qquickvalidator_p.h
521	%%QT_INCDIR%%/QtQuick/%%FULLVER%%/QtQuick/private/qquickvaluetypes_p.h	524	%%QT_INCDIR%%/QtQuick/%%FULLVER%%/QtQuick/private/qquickvaluetypes_p.h
522	%%QT_INCDIR%%/QtQuick/%%FULLVER%%/QtQuick/private/qquickview_p.h	525	%%QT_INCDIR%%/QtQuick/%%FULLVER%%/QtQuick/private/qquickview_p.h
Lines 568-574 Link Here
568	%%QT_INCDIR%%/QtQuick/%%FULLVER%%/QtQuick/private/qsgrhiatlastexture_p.h	571	%%QT_INCDIR%%/QtQuick/%%FULLVER%%/QtQuick/private/qsgrhiatlastexture_p.h
569	%%QT_INCDIR%%/QtQuick/%%FULLVER%%/QtQuick/private/qsgrhidistancefieldglyphcache_p.h	572	%%QT_INCDIR%%/QtQuick/%%FULLVER%%/QtQuick/private/qsgrhidistancefieldglyphcache_p.h
570	%%QT_INCDIR%%/QtQuick/%%FULLVER%%/QtQuick/private/qsgrhilayer_p.h	573	%%QT_INCDIR%%/QtQuick/%%FULLVER%%/QtQuick/private/qsgrhilayer_p.h
571	%%QT_INCDIR%%/QtQuick/%%FULLVER%%/QtQuick/private/qsgrhinativetextureimporter_p.h
572	%%QT_INCDIR%%/QtQuick/%%FULLVER%%/QtQuick/private/qsgrhishadereffectnode_p.h	574	%%QT_INCDIR%%/QtQuick/%%FULLVER%%/QtQuick/private/qsgrhishadereffectnode_p.h
573	%%QT_INCDIR%%/QtQuick/%%FULLVER%%/QtQuick/private/qsgrhisupport_p.h	575	%%QT_INCDIR%%/QtQuick/%%FULLVER%%/QtQuick/private/qsgrhisupport_p.h
574	%%QT_INCDIR%%/QtQuick/%%FULLVER%%/QtQuick/private/qsgrhitextureglyphcache_p.h	576	%%QT_INCDIR%%/QtQuick/%%FULLVER%%/QtQuick/private/qsgrhitextureglyphcache_p.h
Lines 729-735 Link Here
729	%%QT_INCDIR%%/QtQuickShapes/qquickshapesglobal.h	731	%%QT_INCDIR%%/QtQuickShapes/qquickshapesglobal.h
730	%%QT_INCDIR%%/QtQuickShapes/qtquickshapesversion.h	732	%%QT_INCDIR%%/QtQuickShapes/qtquickshapesversion.h
731	%%QT_INCDIR%%/QtQuickTest/%%FULLVER%%/QtQuickTest/private/qtestoptions_p.h	733	%%QT_INCDIR%%/QtQuickTest/%%FULLVER%%/QtQuickTest/private/qtestoptions_p.h
732	%%QT_INCDIR%%/QtQuickTest/%%FULLVER%%/QtQuickTest/private/quicktestevent_p.h	734	%%QT_INCDIR%%/QtQuickTest/%%FULLVER%%/QtQuickTest/private/quicktest_p.h
733	%%QT_INCDIR%%/QtQuickTest/%%FULLVER%%/QtQuickTest/private/quicktestresult_p.h	735	%%QT_INCDIR%%/QtQuickTest/%%FULLVER%%/QtQuickTest/private/quicktestresult_p.h
734	%%QT_INCDIR%%/QtQuickTest/QtQuickTest	736	%%QT_INCDIR%%/QtQuickTest/QtQuickTest
735	%%QT_INCDIR%%/QtQuickTest/QtQuickTestDepends	737	%%QT_INCDIR%%/QtQuickTest/QtQuickTestDepends
Lines 783-798 Link Here
783	%%QT_CMAKEDIR%%/Qt5QuickWidgets/Qt5QuickWidgetsConfig.cmake	785	%%QT_CMAKEDIR%%/Qt5QuickWidgets/Qt5QuickWidgetsConfig.cmake
784	%%QT_CMAKEDIR%%/Qt5QuickWidgets/Qt5QuickWidgetsConfigVersion.cmake	786	%%QT_CMAKEDIR%%/Qt5QuickWidgets/Qt5QuickWidgetsConfigVersion.cmake
785	%%QT_BINDIR%%/qml	787	%%QT_BINDIR%%/qml
		788	%%DEBUG%%%%QT_BINDIR%%/qml.debug
786	%%QT_BINDIR%%/qmlcachegen	789	%%QT_BINDIR%%/qmlcachegen
		790	%%DEBUG%%%%QT_BINDIR%%/qmlcachegen.debug
787	%%QT_BINDIR%%/qmleasing	791	%%QT_BINDIR%%/qmleasing
		792	%%DEBUG%%%%QT_BINDIR%%/qmleasing.debug
		793	%%QT_BINDIR%%/qmlformat
		794	%%DEBUG%%%%QT_BINDIR%%/qmlformat.debug
788	%%QT_BINDIR%%/qmlimportscanner	795	%%QT_BINDIR%%/qmlimportscanner
		796	%%DEBUG%%%%QT_BINDIR%%/qmlimportscanner.debug
789	%%QT_BINDIR%%/qmllint	797	%%QT_BINDIR%%/qmllint
		798	%%DEBUG%%%%QT_BINDIR%%/qmllint.debug
790	%%QT_BINDIR%%/qmlmin	799	%%QT_BINDIR%%/qmlmin
		800	%%DEBUG%%%%QT_BINDIR%%/qmlmin.debug
791	%%QT_BINDIR%%/qmlplugindump	801	%%QT_BINDIR%%/qmlplugindump
		802	%%DEBUG%%%%QT_BINDIR%%/qmlplugindump.debug
792	%%QT_BINDIR%%/qmlpreview	803	%%QT_BINDIR%%/qmlpreview
		804	%%DEBUG%%%%QT_BINDIR%%/qmlpreview.debug
793	%%QT_BINDIR%%/qmlprofiler	805	%%QT_BINDIR%%/qmlprofiler
		806	%%DEBUG%%%%QT_BINDIR%%/qmlprofiler.debug
794	%%QT_BINDIR%%/qmlscene	807	%%QT_BINDIR%%/qmlscene
		808	%%DEBUG%%%%QT_BINDIR%%/qmlscene.debug
795	%%QT_BINDIR%%/qmltestrunner	809	%%QT_BINDIR%%/qmltestrunner
		810	%%DEBUG%%%%QT_BINDIR%%/qmltestrunner.debug
		811	%%QT_BINDIR%%/qmltyperegistrar
		812	%%DEBUG%%%%QT_BINDIR%%/qmltyperegistrar.debug
796	%%QT_LIBDIR%%/libQt5PacketProtocol.a	813	%%QT_LIBDIR%%/libQt5PacketProtocol.a
797	%%QT_LIBDIR%%/libQt5PacketProtocol.prl	814	%%QT_LIBDIR%%/libQt5PacketProtocol.prl
798	%%QT_LIBDIR%%/libQt5Qml.prl	815	%%QT_LIBDIR%%/libQt5Qml.prl
Lines 847-853 Link Here
847	%%QT_LIBDIR%%/libQt5QuickWidgets.so.%%SHORTVER%%	864	%%QT_LIBDIR%%/libQt5QuickWidgets.so.%%SHORTVER%%
848	%%QT_LIBDIR%%/libQt5QuickWidgets.so.%%FULLVER%%	865	%%QT_LIBDIR%%/libQt5QuickWidgets.so.%%FULLVER%%
849	%%DEBUG%%%%QT_LIBDIR%%/libQt5QuickWidgets.so.%%FULLVER%%.debug	866	%%DEBUG%%%%QT_LIBDIR%%/libQt5QuickWidgets.so.%%FULLVER%%.debug
		867	%%QT_LIBDIR%%/metatypes/qt5qml_metatypes.json
		868	%%QT_LIBDIR%%/metatypes/qt5qmlmodels_metatypes.json
		869	%%QT_LIBDIR%%/metatypes/qt5qmlworkerscript_metatypes.json
		870	%%QT_LIBDIR%%/metatypes/qt5quick_metatypes.json
		871	%%QT_LIBDIR%%/metatypes/qt5quickparticles_metatypes.json
		872	%%QT_LIBDIR%%/metatypes/qt5quickshapes_metatypes.json
850	%%QT_MKSPECDIR%%/features/qmlcache.prf	873	%%QT_MKSPECDIR%%/features/qmlcache.prf
		874	%%QT_MKSPECDIR%%/features/qmltypes.prf
851	%%QT_MKSPECDIR%%/features/qtquickcompiler.prf	875	%%QT_MKSPECDIR%%/features/qtquickcompiler.prf
852	%%QT_MKSPECDIR%%/modules/qt_lib_packetprotocol_private.pri	876	%%QT_MKSPECDIR%%/modules/qt_lib_packetprotocol_private.pri
853	%%QT_MKSPECDIR%%/modules/qt_lib_qml.pri	877	%%QT_MKSPECDIR%%/modules/qt_lib_qml.pri
Lines 866-871 Link Here
866	%%QT_MKSPECDIR%%/modules/qt_lib_quickshapes_private.pri	890	%%QT_MKSPECDIR%%/modules/qt_lib_quickshapes_private.pri
867	%%QT_MKSPECDIR%%/modules/qt_lib_quickwidgets.pri	891	%%QT_MKSPECDIR%%/modules/qt_lib_quickwidgets.pri
868	%%QT_MKSPECDIR%%/modules/qt_lib_quickwidgets_private.pri	892	%%QT_MKSPECDIR%%/modules/qt_lib_quickwidgets_private.pri
		893	%%QT_LIBDIR%%/metatypes/qt5quicktest_metatypes.json
869	%%QT_PLUGINDIR%%/qmltooling/libqmldbg_debugger.so	894	%%QT_PLUGINDIR%%/qmltooling/libqmldbg_debugger.so
870	%%DEBUG%%%%QT_PLUGINDIR%%/qmltooling/libqmldbg_debugger.so.debug	895	%%DEBUG%%%%QT_PLUGINDIR%%/qmltooling/libqmldbg_debugger.so.debug
871	%%QT_PLUGINDIR%%/qmltooling/libqmldbg_inspector.so	896	%%QT_PLUGINDIR%%/qmltooling/libqmldbg_inspector.so
Lines 912-917 Link Here
912	%%DEBUG%%%%QT_QMLDIR%%/Qt/labs/wavefrontmesh/libqmlwavefrontmeshplugin.so.debug	937	%%DEBUG%%%%QT_QMLDIR%%/Qt/labs/wavefrontmesh/libqmlwavefrontmeshplugin.so.debug
913	%%QT_QMLDIR%%/Qt/labs/wavefrontmesh/plugins.qmltypes	938	%%QT_QMLDIR%%/Qt/labs/wavefrontmesh/plugins.qmltypes
914	%%QT_QMLDIR%%/Qt/labs/wavefrontmesh/qmldir	939	%%QT_QMLDIR%%/Qt/labs/wavefrontmesh/qmldir
		940	%%QT_QMLDIR%%/Qt/test/qtestroot/plugins.qmltypes
		941	%%QT_QMLDIR%%/Qt/test/qtestroot/qmldir
915	%%QT_QMLDIR%%/QtQml/Models.2/libmodelsplugin.so	942	%%QT_QMLDIR%%/QtQml/Models.2/libmodelsplugin.so
916	%%DEBUG%%%%QT_QMLDIR%%/QtQml/Models.2/libmodelsplugin.so.debug	943	%%DEBUG%%%%QT_QMLDIR%%/QtQml/Models.2/libmodelsplugin.so.debug
917	%%QT_QMLDIR%%/QtQml/Models.2/plugins.qmltypes	944	%%QT_QMLDIR%%/QtQml/Models.2/plugins.qmltypes




%%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




%%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

%%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




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>




--- 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

Line 1 Link Here

(-)b/x11/qt5-qev/pkg-plist (+1 lines)
1	%%QT_BINDIR%%/qev	1	%%QT_BINDIR%%/qev
		2	%%DEBUG%%%%QT_BINDIR%%/qev.debug

Return to bug 247010

Lines 17-28 This does not apply to the Qt4 port, which allows older compilers Link Here

(-)b/databases/qt5-sqldrivers-mysql/files/patch-src_plugins_sqldrivers_mysql_qsql__mysql.cpp (-33 / +15 lines)
17	and the less-fragile approach would therefore break on old-gcc-in-base	17	and the less-fragile approach would therefore break on old-gcc-in-base
18	architectures.	18	architectures.
19		19
20	--- src/plugins/sqldrivers/mysql/qsql_mysql.cpp.orig 2018-04-29 07:25:09 UTC	20	--- src/plugins/sqldrivers/mysql/qsql_mysql.cpp.orig 2020-03-11 15:29:12 UTC
21	+++ src/plugins/sqldrivers/mysql/qsql_mysql.cpp	21	+++ src/plugins/sqldrivers/mysql/qsql_mysql.cpp
22	@@ -74,6 +74,14 @@ Q_DECLARE_METATYPE(MYSQL_STMT*)	22	@@ -71,6 +71,14 @@ Q_DECLARE_METATYPE(MYSQL_STMT*)
23	# define Q_CLIENT_MULTI_STATEMENTS 0	23	// by redefining it we can regain source compatibility.
24	#endif	24	using my_bool = decltype(mysql_stmt_bind_result(nullptr, nullptr));
25		25
26	+// MYSQL 8.0.1 no longer uses the my_bool type:	26	+// MYSQL 8.0.1 no longer uses the my_bool type:
27	+// https://dev.mysql.com/doc/relnotes/mysql/8.0/en/news-8-0-1.html	27	+// https://dev.mysql.com/doc/relnotes/mysql/8.0/en/news-8-0-1.html
28	+#if (MYSQL_VERSION_ID >= 80001) && !defined(MARIADB_BASE_VERSION)	28	+#if (MYSQL_VERSION_ID >= 80001) && !defined(MARIADB_BASE_VERSION)
Lines 32-81 architectures. Link Here
32	+#endif	32	+#endif
33	+	33	+
34	QT_BEGIN_NAMESPACE	34	QT_BEGIN_NAMESPACE
35		35
36	class QMYSQLDriverPrivate : public QSqlDriverPrivate	36	class QMYSQLDriverPrivate : public QSqlDriverPrivate
37	@@ -232,7 +240,7 @@ class QMYSQLResultPrivate: public QSqlResultPrivate (p	37	@@ -930,7 +938,7 @@ bool QMYSQLResult::exec()
38	myField(0), type(QVariant::Invalid)
39	{}
40	char *outField;
41	- my_bool nullIndicator;
42	+ mysql_bool nullIndicator;
43	ulong bufLength;
44	MYSQL_FIELD *myField;
45	QVariant::Type type;
46	@@ -983,7 +991,7 @@ bool QMYSQLResult::exec()
47	MYSQL_BIND* currBind;	38	MYSQL_BIND* currBind;
48	QVector<MYSQL_TIME *> timeVector;	39	QVector<MYSQL_TIME *> timeVector;
49	QVector<QByteArray> stringVector;	40	QVector<QByteArray> stringVector;
50	- QVector<my_bool> nullVector;	41	- QVector<my_bool> nullVector;
51	+ QVector<mysql_bool> nullVector;	42	+ QVector<mysql_bool> nullVector;
52		43
53	const QVector<QVariant> values = boundValues();	44	const QVector<QVariant> values = boundValues();
54		45
55	@@ -1004,7 +1012,7 @@ bool QMYSQLResult::exec()	46	@@ -951,7 +959,7 @@ bool QMYSQLResult::exec()
56		47
57	currBind = &d->outBinds[i];	48	currBind = &d->outBinds[i];
58		49
59	- nullVector[i] = static_cast<my_bool>(val.isNull());	50	- nullVector[i] = static_cast<my_bool>(val.isNull());
60	+ nullVector[i] = static_cast<mysql_bool>(val.isNull());	51	+ nullVector[i] = static_cast<mysql_bool>(val.isNull());
61	currBind->is_null = &nullVector[i];	52	currBind->is_null = &nullVector[i];
62	currBind->length = 0;	53	currBind->length = 0;
63	currBind->is_unsigned = 0;	54	currBind->is_unsigned = 0;
64	@@ -1101,7 +1109,7 @@ bool QMYSQLResult::exec()	55	@@ -1048,7 +1056,7 @@ bool QMYSQLResult::exec()
65	d->rowsAffected = mysql_stmt_affected_rows(d->stmt);	56	d->rowsAffected = mysql_stmt_affected_rows(d->stmt);
66		57
67	if (isSelect()) {	58	if (isSelect()) {
68	- my_bool update_max_length = true;	59	- my_bool update_max_length = true;
69	+ mysql_bool update_max_length = true;	60	+ mysql_bool update_max_length = true;
70		61
71	r = mysql_stmt_bind_result(d->stmt, d->inBinds);	62	r = mysql_stmt_bind_result(d->stmt, d->inBinds);
72	if (r != 0) {	63	if (r != 0) {
73	@@ -1312,7 +1320,7 @@ bool QMYSQLDriver::open(const QString& db,
74	QString sslCAPath;
75	QString sslCipher;
76	#if MYSQL_VERSION_ID >= 50000
77	- my_bool reconnect=false;
78	+ mysql_bool reconnect=false;
79	uint connectTimeout = 0;
80	uint readTimeout = 0;
81	uint writeTimeout = 0;

Removed Link Here

(-)a/devel/qt5-core/files/patch-git_276fa83 (-109 lines)
1	From 276fa8383a7535765be7182883ef4aade17ce013 Mon Sep 17 00:00:00 2001
2	From: Thiago Macieira <thiago.macieira@intel.com>
3	Date: Thu, 2 Apr 2020 12:08:41 -0300
4	Subject: QLibrary: fix deadlock caused by fix to QTBUG-39642
5
6	Commit ae6f73e8566fa76470937aca737141183929a5ec inserted a mutex around
7	the entire load_sys(). We had reasoed that deadlocks would only occur if
8	the object creation in instance() recursed into its own instance(),
9	which was already a bug. But we had forgotten that dlopen()/
10	LoadLibrary() executes initialization code from the module being loaded,
11	which could cause a recursion back into the same QPluginLoader or
12	QLibrary object. This recursion is benign because the module is loaded
13	and dlopen()/LoadLibrary() returns the same handle.
14
15	[ChangeLog][QtCore][QLibrary and QPluginLoader] Fixed a deadlock that
16	would happen if the plugin or library being loaded has load-time
17	initialization code (C++ global variables) that recursed back into the
18	same QLibrary or QPluginLoader object.
19
20	PS: QLibraryPrivate::loadPlugin() updates pluginState outside a mutex
21	lock, so pluginState should be made an atomic variable. Once that is
22	done, we'll only need locking the mutex to update errorString (no
23	locking before loading).
24
25	Fixes: QTBUG-83207
26	Task-number: QTBUG-39642
27	Change-Id: Ibdc95e9af7bd456a94ecfffd160209304e5ab2eb
28	Reviewed-by: Volker Hilsheimer <volker.hilsheimer@qt.io>
29	Reviewed-by: David Faure <david.faure@kdab.com>
30	---
31	src/corelib/plugin/qlibrary.cpp \| 2 --
32	src/corelib/plugin/qlibrary_unix.cpp \| 4 ++++
33	src/corelib/plugin/qlibrary_win.cpp \| 3 +++
34	3 files changed, 7 insertions(+), 2 deletions(-)
35
36	diff --git a/src/corelib/plugin/qlibrary.cpp b/src/corelib/plugin/qlibrary.cpp
37	index ddb053c26f..be9d92b204 100644
38	--- src/corelib/plugin/qlibrary.cpp
39	+++ src/corelib/plugin/qlibrary.cpp
40	@@ -576,9 +576,7 @@ bool QLibraryPrivate::load()
41
42	Q_TRACE(QLibraryPrivate_load_entry, fileName);
43
44	- mutex.lock();
45	bool ret = load_sys();
46	- mutex.unlock();
47	if (qt_debug_component()) {
48	if (ret) {
49	qDebug() << "loaded library" << fileName;
50	diff --git a/src/corelib/plugin/qlibrary_unix.cpp b/src/corelib/plugin/qlibrary_unix.cpp
51	index 017aa97b66..a5c72f81d9 100644
52	--- src/corelib/plugin/qlibrary_unix.cpp
53	+++ src/corelib/plugin/qlibrary_unix.cpp
54	@@ -123,6 +123,7 @@ QStringList QLibraryPrivate::prefixes_sys()
55
56	bool QLibraryPrivate::load_sys()
57	{
58	+ QMutexLocker locker(&mutex);
59	QString attempt;
60	QFileSystemEntry fsEntry(fileName);
61
62	@@ -213,6 +214,7 @@ bool QLibraryPrivate::load_sys()
63	}
64	#endif
65
66	+ locker.unlock();
67	bool retry = true;
68	Handle hnd = nullptr;
69	for (int prefix = 0; retry && !hnd && prefix < prefixes.size(); prefix++) {
70	@@ -273,6 +275,8 @@ bool QLibraryPrivate::load_sys()
71	}
72	}
73	#endif
74	+
75	+ locker.relock();
76	if (!hnd) {
77	errorString = QLibrary::tr("Cannot load library %1: %2").arg(fileName, qdlerror());
78	}
79	diff --git a/src/corelib/plugin/qlibrary_win.cpp b/src/corelib/plugin/qlibrary_win.cpp
80	index 000bf76276..ef58724be8 100644
81	--- src/corelib/plugin/qlibrary_win.cpp
82	+++ src/corelib/plugin/qlibrary_win.cpp
83	@@ -78,6 +78,7 @@ bool QLibraryPrivate::load_sys()
84	// fileName
85	//
86	// NB If it's a plugin we do not ever try the ".dll" extension
87	+ QMutexLocker locker(&mutex);
88	QStringList attempts;
89
90	if (pluginState != IsAPlugin)
91	@@ -95,6 +96,7 @@ bool QLibraryPrivate::load_sys()
92	attempts.prepend(QDir::rootPath() + fileName);
93	#endif
94
95	+ locker.unlock();
96	Handle hnd = nullptr;
97	for (const QString &attempt : qAsConst(attempts)) {
98	#ifndef Q_OS_WINRT
99	@@ -115,6 +117,7 @@ bool QLibraryPrivate::load_sys()
100	#ifndef Q_OS_WINRT
101	SetErrorMode(oldmode);
102	#endif
103	+ locker.relock();
104	if (!hnd) {
105	errorString = QLibrary::tr("Cannot load library %1: %2").arg(
106	QDir::toNativeSeparators(fileName), qt_error_string());
107	--
108	cgit v1.2.1
109

Lines 1-20 Link Here

(-)b/devel/qt5-core/files/patch-src_corelib_time_qtimezoneprivate__tz.cpp (-9 / +17 lines)
1	--- src/corelib/time/qtimezoneprivate_tz.cpp.orig 2019-11-01 21:30:15 UTC	1	--- src/corelib/time/qtimezoneprivate_tz.cpp.orig 2020-05-11 08:15:08 UTC
2	+++ src/corelib/time/qtimezoneprivate_tz.cpp	2	+++ src/corelib/time/qtimezoneprivate_tz.cpp
3	@@ -1126,6 +1126,17 @@ QByteArray QTzTimeZonePrivate::systemTimeZoneId() cons	3	@@ -1153,6 +1153,25 @@ QByteArray QTzTimeZonePrivate::systemTimeZoneId() cons
4	}	4	}
5	}	5	}
6		6
7	+ // On many FreeBSD systems, /etc/localtime is a regular file while the actual name is in /var/db/zoneinfo	7	+ // On some FreeBSD systems, /etc/localtime is a regular file while
		8	+ // the actual name is in /var/db/zoneinfo
8	+ if (ianaId.isEmpty()) {	9	+ if (ianaId.isEmpty()) {
9	+ QFile tzif(QStringLiteral("/var/db/zoneinfo"));	10	+ QFile tzif(QStringLiteral("/var/db/zoneinfo"));
10	+ if (tzif.open(QIODevice::ReadOnly)) {	11	+ if (tzif.open(QIODevice::ReadOnly)) {
11	+ // TODO QTextStream inefficient, replace later	12	+ const int maximumTZNameLength = 256;
12	+ QTextStream ts(&tzif);	13	+ QByteArray tzcontents( tzif.read( maximumTZNameLength ) );
13	+ if (!ts.atEnd())	14	+ if (tzcontents.size() >= 2) {
14	+ ianaId = ts.readLine().toUtf8();	15	+ // Shortest TZ would be UTC, or r/z, but there's special
		16	+ // cases "GB" and "US"
		17	+ const int newlineIndex = tzcontents.indexOf('\n');
		18	+ if (newlineIndex < 0) // No newline in file
		19	+ ianaId = tzcontents;
		20	+ if (newlineIndex > 2) // Newline, chop it off
		21	+ ianaId = tzcontents.left(newlineIndex-1);
		22	+ }
15	+ }	23	+ }
16	+ }	24	+ }
17	+	25	+
18	// On some Red Hat distros /etc/localtime is real file with name held in /etc/sysconfig/clock	26	// Some systems (e.g. uClibc) have a default value for $TZ in /etc/TZ:
19	// in a line like ZONE="Europe/Oslo" or TIMEZONE="Europe/Oslo"
20	if (ianaId.isEmpty()) {	27	if (ianaId.isEmpty()) {
		28	QFile zone(QStringLiteral("/etc/TZ"));

Lines 1-20 Link Here

(-)b/devel/qt5-help/pkg-plist (-1 / +10 lines)
		1	%%QT_INCDIR%%/QtHelp/%%FULLVER%%/QtHelp/private/qfilternamedialog_p.h
1	%%QT_INCDIR%%/QtHelp/%%FULLVER%%/QtHelp/private/qhelpcollectionhandler_p.h	2	%%QT_INCDIR%%/QtHelp/%%FULLVER%%/QtHelp/private/qhelpcollectionhandler_p.h
2	%%QT_INCDIR%%/QtHelp/%%FULLVER%%/QtHelp/private/qhelpdbreader_p.h	3	%%QT_INCDIR%%/QtHelp/%%FULLVER%%/QtHelp/private/qhelpdbreader_p.h
3	%%QT_INCDIR%%/QtHelp/%%FULLVER%%/QtHelp/private/qhelpengine_p.h	4	%%QT_INCDIR%%/QtHelp/%%FULLVER%%/QtHelp/private/qhelpengine_p.h
		5	%%QT_INCDIR%%/QtHelp/%%FULLVER%%/QtHelp/private/qhelpfiltersettings_p.h
4	%%QT_INCDIR%%/QtHelp/%%FULLVER%%/QtHelp/private/qhelpsearchindexreader_default_p.h	6	%%QT_INCDIR%%/QtHelp/%%FULLVER%%/QtHelp/private/qhelpsearchindexreader_default_p.h
5	%%QT_INCDIR%%/QtHelp/%%FULLVER%%/QtHelp/private/qhelpsearchindexreader_p.h	7	%%QT_INCDIR%%/QtHelp/%%FULLVER%%/QtHelp/private/qhelpsearchindexreader_p.h
6	%%QT_INCDIR%%/QtHelp/%%FULLVER%%/QtHelp/private/qhelpsearchindexwriter_default_p.h	8	%%QT_INCDIR%%/QtHelp/%%FULLVER%%/QtHelp/private/qhelpsearchindexwriter_default_p.h
		9	%%QT_INCDIR%%/QtHelp/%%FULLVER%%/QtHelp/private/qoptionswidget_p.h
7	%%QT_INCDIR%%/QtHelp/QCompressedHelpInfo	10	%%QT_INCDIR%%/QtHelp/QCompressedHelpInfo
8	%%QT_INCDIR%%/QtHelp/QHelpContentItem	11	%%QT_INCDIR%%/QtHelp/QHelpContentItem
9	%%QT_INCDIR%%/QtHelp/QHelpContentModel	12	%%QT_INCDIR%%/QtHelp/QHelpContentModel
10	%%QT_INCDIR%%/QtHelp/QHelpContentWidget	13	%%QT_INCDIR%%/QtHelp/QHelpContentWidget
11	%%QT_INCDIR%%/QtHelp/QHelpEngine	14	%%QT_INCDIR%%/QtHelp/QHelpEngine
12	%%QT_INCDIR%%/QtHelp/QHelpEngineCore	15	%%QT_INCDIR%%/QtHelp/QHelpEngineCore
13	%%QT_INCDIR%%/QtHelp/QHelpGlobal
14	%%QT_INCDIR%%/QtHelp/QHelpFilterData	16	%%QT_INCDIR%%/QtHelp/QHelpFilterData
15	%%QT_INCDIR%%/QtHelp/QHelpFilterEngine	17	%%QT_INCDIR%%/QtHelp/QHelpFilterEngine
		18	%%QT_INCDIR%%/QtHelp/QHelpFilterSettingsWidget
		19	%%QT_INCDIR%%/QtHelp/QHelpGlobal
16	%%QT_INCDIR%%/QtHelp/QHelpIndexModel	20	%%QT_INCDIR%%/QtHelp/QHelpIndexModel
17	%%QT_INCDIR%%/QtHelp/QHelpIndexWidget	21	%%QT_INCDIR%%/QtHelp/QHelpIndexWidget
		22	%%QT_INCDIR%%/QtHelp/QHelpLink
18	%%QT_INCDIR%%/QtHelp/QHelpSearchEngine	23	%%QT_INCDIR%%/QtHelp/QHelpSearchEngine
19	%%QT_INCDIR%%/QtHelp/QHelpSearchQuery	24	%%QT_INCDIR%%/QtHelp/QHelpSearchQuery
20	%%QT_INCDIR%%/QtHelp/QHelpSearchQueryWidget	25	%%QT_INCDIR%%/QtHelp/QHelpSearchQueryWidget
Lines 30-36 Link Here
30	%%QT_INCDIR%%/QtHelp/qhelpenginecore.h	35	%%QT_INCDIR%%/QtHelp/qhelpenginecore.h
31	%%QT_INCDIR%%/QtHelp/qhelpfilterdata.h	36	%%QT_INCDIR%%/QtHelp/qhelpfilterdata.h
32	%%QT_INCDIR%%/QtHelp/qhelpfilterengine.h	37	%%QT_INCDIR%%/QtHelp/qhelpfilterengine.h
		38	%%QT_INCDIR%%/QtHelp/qhelpfiltersettingswidget.h
33	%%QT_INCDIR%%/QtHelp/qhelpindexwidget.h	39	%%QT_INCDIR%%/QtHelp/qhelpindexwidget.h
		40	%%QT_INCDIR%%/QtHelp/qhelplink.h
34	%%QT_INCDIR%%/QtHelp/qhelpsearchengine.h	41	%%QT_INCDIR%%/QtHelp/qhelpsearchengine.h
35	%%QT_INCDIR%%/QtHelp/qhelpsearchquerywidget.h	42	%%QT_INCDIR%%/QtHelp/qhelpsearchquerywidget.h
36	%%QT_INCDIR%%/QtHelp/qhelpsearchresultwidget.h	43	%%QT_INCDIR%%/QtHelp/qhelpsearchresultwidget.h
Lines 45-51 Link Here
45	%%QT_LIBDIR%%/libQt5Help.so.%%FULLVER%%	52	%%QT_LIBDIR%%/libQt5Help.so.%%FULLVER%%
46	%%DEBUG%%%%QT_LIBDIR%%/libQt5Help.so.%%FULLVER%%.debug	53	%%DEBUG%%%%QT_LIBDIR%%/libQt5Help.so.%%FULLVER%%.debug
47	%%QT_BINDIR%%/qcollectiongenerator	54	%%QT_BINDIR%%/qcollectiongenerator
		55	%%DEBUG%%%%QT_BINDIR%%/qcollectiongenerator.debug
48	%%QT_BINDIR%%/qhelpgenerator	56	%%QT_BINDIR%%/qhelpgenerator
		57	%%DEBUG%%%%QT_BINDIR%%/qhelpgenerator.debug
49	%%QT_MKSPECDIR%%/modules/qt_lib_help.pri	58	%%QT_MKSPECDIR%%/modules/qt_lib_help.pri
50	%%QT_MKSPECDIR%%/modules/qt_lib_help_private.pri	59	%%QT_MKSPECDIR%%/modules/qt_lib_help_private.pri
51	libdata/pkgconfig/Qt5Help.pc	60	libdata/pkgconfig/Qt5Help.pc

Lines 4-9 Link Here

(-)b/devel/qt5-location/pkg-plist (-1 / +7 lines)
4	%%QT_INCDIR%%/QtLocation/%%FULLVER%%/QtLocation/private/qcache3q_p.h	4	%%QT_INCDIR%%/QtLocation/%%FULLVER%%/QtLocation/private/qcache3q_p.h
5	%%QT_INCDIR%%/QtLocation/%%FULLVER%%/QtLocation/private/qdeclarativecategory_p.h	5	%%QT_INCDIR%%/QtLocation/%%FULLVER%%/QtLocation/private/qdeclarativecategory_p.h
6	%%QT_INCDIR%%/QtLocation/%%FULLVER%%/QtLocation/private/qdeclarativecirclemapitem_p.h	6	%%QT_INCDIR%%/QtLocation/%%FULLVER%%/QtLocation/private/qdeclarativecirclemapitem_p.h
		7	%%QT_INCDIR%%/QtLocation/%%FULLVER%%/QtLocation/private/qdeclarativecirclemapitem_p_p.h
7	%%QT_INCDIR%%/QtLocation/%%FULLVER%%/QtLocation/private/qdeclarativecontactdetail_p.h	8	%%QT_INCDIR%%/QtLocation/%%FULLVER%%/QtLocation/private/qdeclarativecontactdetail_p.h
8	%%QT_INCDIR%%/QtLocation/%%FULLVER%%/QtLocation/private/qdeclarativegeocodemodel_p.h	9	%%QT_INCDIR%%/QtLocation/%%FULLVER%%/QtLocation/private/qdeclarativegeocodemodel_p.h
9	%%QT_INCDIR%%/QtLocation/%%FULLVER%%/QtLocation/private/qdeclarativegeomaneuver_p.h	10	%%QT_INCDIR%%/QtLocation/%%FULLVER%%/QtLocation/private/qdeclarativegeomaneuver_p.h
Lines 12-17 Link Here
12	%%QT_INCDIR%%/QtLocation/%%FULLVER%%/QtLocation/private/qdeclarativegeomapitembase_p.h	13	%%QT_INCDIR%%/QtLocation/%%FULLVER%%/QtLocation/private/qdeclarativegeomapitembase_p.h
13	%%QT_INCDIR%%/QtLocation/%%FULLVER%%/QtLocation/private/qdeclarativegeomapitemgroup_p.h	14	%%QT_INCDIR%%/QtLocation/%%FULLVER%%/QtLocation/private/qdeclarativegeomapitemgroup_p.h
14	%%QT_INCDIR%%/QtLocation/%%FULLVER%%/QtLocation/private/qdeclarativegeomapitemtransitionmanager_p.h	15	%%QT_INCDIR%%/QtLocation/%%FULLVER%%/QtLocation/private/qdeclarativegeomapitemtransitionmanager_p.h
		16	%%QT_INCDIR%%/QtLocation/%%FULLVER%%/QtLocation/private/qdeclarativegeomapitemutils_p.h
15	%%QT_INCDIR%%/QtLocation/%%FULLVER%%/QtLocation/private/qdeclarativegeomapitemview_p.h	17	%%QT_INCDIR%%/QtLocation/%%FULLVER%%/QtLocation/private/qdeclarativegeomapitemview_p.h
16	%%QT_INCDIR%%/QtLocation/%%FULLVER%%/QtLocation/private/qdeclarativegeomapparameter_p.h	18	%%QT_INCDIR%%/QtLocation/%%FULLVER%%/QtLocation/private/qdeclarativegeomapparameter_p.h
17	%%QT_INCDIR%%/QtLocation/%%FULLVER%%/QtLocation/private/qdeclarativegeomapquickitem_p.h	19	%%QT_INCDIR%%/QtLocation/%%FULLVER%%/QtLocation/private/qdeclarativegeomapquickitem_p.h
Lines 31-39 Link Here
31	%%QT_INCDIR%%/QtLocation/%%FULLVER%%/QtLocation/private/qdeclarativeplaceimagemodel_p.h	33	%%QT_INCDIR%%/QtLocation/%%FULLVER%%/QtLocation/private/qdeclarativeplaceimagemodel_p.h
32	%%QT_INCDIR%%/QtLocation/%%FULLVER%%/QtLocation/private/qdeclarativeplaceuser_p.h	34	%%QT_INCDIR%%/QtLocation/%%FULLVER%%/QtLocation/private/qdeclarativeplaceuser_p.h
33	%%QT_INCDIR%%/QtLocation/%%FULLVER%%/QtLocation/private/qdeclarativepolygonmapitem_p.h	35	%%QT_INCDIR%%/QtLocation/%%FULLVER%%/QtLocation/private/qdeclarativepolygonmapitem_p.h
		36	%%QT_INCDIR%%/QtLocation/%%FULLVER%%/QtLocation/private/qdeclarativepolygonmapitem_p_p.h
34	%%QT_INCDIR%%/QtLocation/%%FULLVER%%/QtLocation/private/qdeclarativepolylinemapitem_p.h	37	%%QT_INCDIR%%/QtLocation/%%FULLVER%%/QtLocation/private/qdeclarativepolylinemapitem_p.h
		38	%%QT_INCDIR%%/QtLocation/%%FULLVER%%/QtLocation/private/qdeclarativepolylinemapitem_p_p.h
35	%%QT_INCDIR%%/QtLocation/%%FULLVER%%/QtLocation/private/qdeclarativeratings_p.h	39	%%QT_INCDIR%%/QtLocation/%%FULLVER%%/QtLocation/private/qdeclarativeratings_p.h
36	%%QT_INCDIR%%/QtLocation/%%FULLVER%%/QtLocation/private/qdeclarativerectanglemapitem_p.h	40	%%QT_INCDIR%%/QtLocation/%%FULLVER%%/QtLocation/private/qdeclarativerectanglemapitem_p.h
		41	%%QT_INCDIR%%/QtLocation/%%FULLVER%%/QtLocation/private/qdeclarativerectanglemapitem_p_p.h
37	%%QT_INCDIR%%/QtLocation/%%FULLVER%%/QtLocation/private/qdeclarativereviewmodel_p.h	42	%%QT_INCDIR%%/QtLocation/%%FULLVER%%/QtLocation/private/qdeclarativereviewmodel_p.h
38	%%QT_INCDIR%%/QtLocation/%%FULLVER%%/QtLocation/private/qdeclarativeroutemapitem_p.h	43	%%QT_INCDIR%%/QtLocation/%%FULLVER%%/QtLocation/private/qdeclarativeroutemapitem_p.h
39	%%QT_INCDIR%%/QtLocation/%%FULLVER%%/QtLocation/private/qdeclarativesearchmodelbase_p.h	44	%%QT_INCDIR%%/QtLocation/%%FULLVER%%/QtLocation/private/qdeclarativesearchmodelbase_p.h
Lines 76-81 Link Here
76	%%QT_INCDIR%%/QtLocation/%%FULLVER%%/QtLocation/private/qgeoroutingmanager_p.h	81	%%QT_INCDIR%%/QtLocation/%%FULLVER%%/QtLocation/private/qgeoroutingmanager_p.h
77	%%QT_INCDIR%%/QtLocation/%%FULLVER%%/QtLocation/private/qgeoroutingmanagerengine_p.h	82	%%QT_INCDIR%%/QtLocation/%%FULLVER%%/QtLocation/private/qgeoroutingmanagerengine_p.h
78	%%QT_INCDIR%%/QtLocation/%%FULLVER%%/QtLocation/private/qgeoserviceprovider_p.h	83	%%QT_INCDIR%%/QtLocation/%%FULLVER%%/QtLocation/private/qgeoserviceprovider_p.h
		84	%%QT_INCDIR%%/QtLocation/%%FULLVER%%/QtLocation/private/qgeosimplify_p.h
79	%%QT_INCDIR%%/QtLocation/%%FULLVER%%/QtLocation/private/qgeotiledmap_p.h	85	%%QT_INCDIR%%/QtLocation/%%FULLVER%%/QtLocation/private/qgeotiledmap_p.h
80	%%QT_INCDIR%%/QtLocation/%%FULLVER%%/QtLocation/private/qgeotiledmap_p_p.h	86	%%QT_INCDIR%%/QtLocation/%%FULLVER%%/QtLocation/private/qgeotiledmap_p_p.h
81	%%QT_INCDIR%%/QtLocation/%%FULLVER%%/QtLocation/private/qgeotiledmaplabs_p.h	87	%%QT_INCDIR%%/QtLocation/%%FULLVER%%/QtLocation/private/qgeotiledmaplabs_p.h
Lines 235-243 Link Here
235	%%QT_INCDIR%%/QtPositioning/%%FULLVER%%/QtPositioning/private/qgeopolygon_p.h	241	%%QT_INCDIR%%/QtPositioning/%%FULLVER%%/QtPositioning/private/qgeopolygon_p.h
236	%%QT_INCDIR%%/QtPositioning/%%FULLVER%%/QtPositioning/private/qgeopositioninfo_p.h	242	%%QT_INCDIR%%/QtPositioning/%%FULLVER%%/QtPositioning/private/qgeopositioninfo_p.h
237	%%QT_INCDIR%%/QtPositioning/%%FULLVER%%/QtPositioning/private/qgeopositioninfosource_p.h	243	%%QT_INCDIR%%/QtPositioning/%%FULLVER%%/QtPositioning/private/qgeopositioninfosource_p.h
		244	%%QT_INCDIR%%/QtPositioning/%%FULLVER%%/QtPositioning/private/qgeorectangle_p.h
238	%%QT_INCDIR%%/QtPositioning/%%FULLVER%%/QtPositioning/private/qgeosatelliteinfo_p.h	245	%%QT_INCDIR%%/QtPositioning/%%FULLVER%%/QtPositioning/private/qgeosatelliteinfo_p.h
239	%%QT_INCDIR%%/QtPositioning/%%FULLVER%%/QtPositioning/private/qgeosatelliteinfosource_p.h	246	%%QT_INCDIR%%/QtPositioning/%%FULLVER%%/QtPositioning/private/qgeosatelliteinfosource_p.h
240	%%QT_INCDIR%%/QtPositioning/%%FULLVER%%/QtPositioning/private/qgeorectangle_p.h
241	%%QT_INCDIR%%/QtPositioning/%%FULLVER%%/QtPositioning/private/qgeoshape_p.h	247	%%QT_INCDIR%%/QtPositioning/%%FULLVER%%/QtPositioning/private/qgeoshape_p.h
242	%%QT_INCDIR%%/QtPositioning/%%FULLVER%%/QtPositioning/private/qlocationdata_simulator_p.h	248	%%QT_INCDIR%%/QtPositioning/%%FULLVER%%/QtPositioning/private/qlocationdata_simulator_p.h
243	%%QT_INCDIR%%/QtPositioning/%%FULLVER%%/QtPositioning/private/qlocationutils_p.h	249	%%QT_INCDIR%%/QtPositioning/%%FULLVER%%/QtPositioning/private/qlocationutils_p.h

Lines 90-95 Link Here

(-)b/devel/qt5-qmake/pkg-plist (-1 / +4 lines)
90	%%QT_MKSPECDIR%%/devices/freebsd-generic-clang/qplatformdefs.h	90	%%QT_MKSPECDIR%%/devices/freebsd-generic-clang/qplatformdefs.h
91	%%QT_MKSPECDIR%%/devices/freebsd-rasp-pi-clang/qmake.conf	91	%%QT_MKSPECDIR%%/devices/freebsd-rasp-pi-clang/qmake.conf
92	%%QT_MKSPECDIR%%/devices/freebsd-rasp-pi-clang/qplatformdefs.h	92	%%QT_MKSPECDIR%%/devices/freebsd-rasp-pi-clang/qplatformdefs.h
		93	%%QT_MKSPECDIR%%/devices/integrity-armv8-SA8155P/qmake.conf
		94	%%QT_MKSPECDIR%%/devices/integrity-armv8-SA8155P/qplatformdefs.h
93	%%QT_MKSPECDIR%%/devices/integrity-armv8-drive-cx/qmake.conf	95	%%QT_MKSPECDIR%%/devices/integrity-armv8-drive-cx/qmake.conf
94	%%QT_MKSPECDIR%%/devices/integrity-armv8-drive-cx/qplatformdefs.h	96	%%QT_MKSPECDIR%%/devices/integrity-armv8-drive-cx/qplatformdefs.h
95	%%QT_MKSPECDIR%%/devices/integrity-armv8-msm8996au/qmake.conf	97	%%QT_MKSPECDIR%%/devices/integrity-armv8-msm8996au/qmake.conf
Lines 229-234 Link Here
229	%%QT_MKSPECDIR%%/features/mac/sdk.prf	231	%%QT_MKSPECDIR%%/features/mac/sdk.prf
230	%%QT_MKSPECDIR%%/features/mac/toolchain.prf	232	%%QT_MKSPECDIR%%/features/mac/toolchain.prf
231	%%QT_MKSPECDIR%%/features/mac/unsupported/objc_namespace.prf	233	%%QT_MKSPECDIR%%/features/mac/unsupported/objc_namespace.prf
		234	%%QT_MKSPECDIR%%/features/metatypes.prf
232	%%QT_MKSPECDIR%%/features/moc.prf	235	%%QT_MKSPECDIR%%/features/moc.prf
233	%%QT_MKSPECDIR%%/features/no_debug_info.prf	236	%%QT_MKSPECDIR%%/features/no_debug_info.prf
234	%%QT_MKSPECDIR%%/features/plugin_bundle.prf	237	%%QT_MKSPECDIR%%/features/plugin_bundle.prf
Lines 408-414 Link Here
408	%%QT_MKSPECDIR%%/macx-ios-clang/Info.plist.app	411	%%QT_MKSPECDIR%%/macx-ios-clang/Info.plist.app
409	%%QT_MKSPECDIR%%/macx-ios-clang/Info.plist.dSYM.in	412	%%QT_MKSPECDIR%%/macx-ios-clang/Info.plist.dSYM.in
410	%%QT_MKSPECDIR%%/macx-ios-clang/Info.plist.lib	413	%%QT_MKSPECDIR%%/macx-ios-clang/Info.plist.lib
411	%%QT_MKSPECDIR%%/macx-ios-clang/LaunchScreen.xib	414	%%QT_MKSPECDIR%%/macx-ios-clang/LaunchScreen.storyboard
412	%%QT_MKSPECDIR%%/macx-ios-clang/features/default_post.prf	415	%%QT_MKSPECDIR%%/macx-ios-clang/features/default_post.prf
413	%%QT_MKSPECDIR%%/macx-ios-clang/qmake.conf	416	%%QT_MKSPECDIR%%/macx-ios-clang/qmake.conf
414	%%QT_MKSPECDIR%%/macx-ios-clang/qplatformdefs.h	417	%%QT_MKSPECDIR%%/macx-ios-clang/qplatformdefs.h

Lines 11-35 Link Here

(-)b/devel/qt5-testlib/pkg-plist (-3 / +3 lines)
11	%%QT_INCDIR%%/QtTest/%%FULLVER%%/QtTest/private/qbenchmarktimemeasurers_p.h	11	%%QT_INCDIR%%/QtTest/%%FULLVER%%/QtTest/private/qbenchmarktimemeasurers_p.h
12	%%QT_INCDIR%%/QtTest/%%FULLVER%%/QtTest/private/qbenchmarkvalgrind_p.h	12	%%QT_INCDIR%%/QtTest/%%FULLVER%%/QtTest/private/qbenchmarkvalgrind_p.h
13	%%QT_INCDIR%%/QtTest/%%FULLVER%%/QtTest/private/qcsvbenchmarklogger_p.h	13	%%QT_INCDIR%%/QtTest/%%FULLVER%%/QtTest/private/qcsvbenchmarklogger_p.h
		14	%%QT_INCDIR%%/QtTest/%%FULLVER%%/QtTest/private/qjunittestlogger_p.h
14	%%QT_INCDIR%%/QtTest/%%FULLVER%%/QtTest/private/qplaintestlogger_p.h	15	%%QT_INCDIR%%/QtTest/%%FULLVER%%/QtTest/private/qplaintestlogger_p.h
15	%%QT_INCDIR%%/QtTest/%%FULLVER%%/QtTest/private/qsignaldumper_p.h	16	%%QT_INCDIR%%/QtTest/%%FULLVER%%/QtTest/private/qsignaldumper_p.h
16	%%QT_INCDIR%%/QtTest/%%FULLVER%%/QtTest/private/qteamcitylogger_p.h
17	%%QT_INCDIR%%/QtTest/%%FULLVER%%/QtTest/private/qtaptestlogger_p.h	17	%%QT_INCDIR%%/QtTest/%%FULLVER%%/QtTest/private/qtaptestlogger_p.h
		18	%%QT_INCDIR%%/QtTest/%%FULLVER%%/QtTest/private/qteamcitylogger_p.h
18	%%QT_INCDIR%%/QtTest/%%FULLVER%%/QtTest/private/qtestblacklist_p.h	19	%%QT_INCDIR%%/QtTest/%%FULLVER%%/QtTest/private/qtestblacklist_p.h
19	%%QT_INCDIR%%/QtTest/%%FULLVER%%/QtTest/private/qtestcoreelement_p.h	20	%%QT_INCDIR%%/QtTest/%%FULLVER%%/QtTest/private/qtestcoreelement_p.h
20	%%QT_INCDIR%%/QtTest/%%FULLVER%%/QtTest/private/qtestcorelist_p.h	21	%%QT_INCDIR%%/QtTest/%%FULLVER%%/QtTest/private/qtestcorelist_p.h
21	%%QT_INCDIR%%/QtTest/%%FULLVER%%/QtTest/private/qtestelement_p.h	22	%%QT_INCDIR%%/QtTest/%%FULLVER%%/QtTest/private/qtestelement_p.h
22	%%QT_INCDIR%%/QtTest/%%FULLVER%%/QtTest/private/qtestelementattribute_p.h	23	%%QT_INCDIR%%/QtTest/%%FULLVER%%/QtTest/private/qtestelementattribute_p.h
23	%%QT_INCDIR%%/QtTest/%%FULLVER%%/QtTest/private/qtesthelpers_p.h	24	%%QT_INCDIR%%/QtTest/%%FULLVER%%/QtTest/private/qtesthelpers_p.h
		25	%%QT_INCDIR%%/QtTest/%%FULLVER%%/QtTest/private/qtestjunitstreamer_p.h
24	%%QT_INCDIR%%/QtTest/%%FULLVER%%/QtTest/private/qtestlog_p.h	26	%%QT_INCDIR%%/QtTest/%%FULLVER%%/QtTest/private/qtestlog_p.h
25	%%QT_INCDIR%%/QtTest/%%FULLVER%%/QtTest/private/qtestresult_p.h	27	%%QT_INCDIR%%/QtTest/%%FULLVER%%/QtTest/private/qtestresult_p.h
26	%%QT_INCDIR%%/QtTest/%%FULLVER%%/QtTest/private/qtesttable_p.h	28	%%QT_INCDIR%%/QtTest/%%FULLVER%%/QtTest/private/qtesttable_p.h
27	%%QT_INCDIR%%/QtTest/%%FULLVER%%/QtTest/private/qtestutil_macos_p.h	29	%%QT_INCDIR%%/QtTest/%%FULLVER%%/QtTest/private/qtestutil_macos_p.h
28	%%QT_INCDIR%%/QtTest/%%FULLVER%%/QtTest/private/qtestxunitstreamer_p.h
29	%%QT_INCDIR%%/QtTest/%%FULLVER%%/QtTest/private/qttestlib-config_p.h	30	%%QT_INCDIR%%/QtTest/%%FULLVER%%/QtTest/private/qttestlib-config_p.h
30	%%QT_INCDIR%%/QtTest/%%FULLVER%%/QtTest/private/qxctestlogger_p.h	31	%%QT_INCDIR%%/QtTest/%%FULLVER%%/QtTest/private/qxctestlogger_p.h
31	%%QT_INCDIR%%/QtTest/%%FULLVER%%/QtTest/private/qxmltestlogger_p.h	32	%%QT_INCDIR%%/QtTest/%%FULLVER%%/QtTest/private/qxmltestlogger_p.h
32	%%QT_INCDIR%%/QtTest/%%FULLVER%%/QtTest/private/qxunittestlogger_p.h
33	%%QT_INCDIR%%/QtTest/%%FULLVER%%/QtTest/private/valgrind_p.h	33	%%QT_INCDIR%%/QtTest/%%FULLVER%%/QtTest/private/valgrind_p.h
34	%%QT_INCDIR%%/QtTest/QAbstractItemModelTester	34	%%QT_INCDIR%%/QtTest/QAbstractItemModelTester
35	%%QT_INCDIR%%/QtTest/QEventSizeOfChecker	35	%%QT_INCDIR%%/QtTest/QEventSizeOfChecker

Lines 1-81 Link Here

(-)b/devel/qt5/distinfo (-81 / +81 lines)
1	TIMESTAMP = 1586029185	1	TIMESTAMP = 1590590537
2	SHA256 (KDE/Qt/5.14.2/qt3d-everywhere-src-5.14.2.tar.xz) = 9da82f1cc4b7d416d31ec96224c59d221473a48f6e579eef978f7d2e3932c674	2	SHA256 (KDE/Qt/5.15.0/qt3d-everywhere-src-5.15.0.tar.xz) = 61856f0c453b79e98b7a1e65ea8f59976fa78230ffa8dec959b5f4b45383dffd
3	SIZE (KDE/Qt/5.14.2/qt3d-everywhere-src-5.14.2.tar.xz) = 81576496	3	SIZE (KDE/Qt/5.15.0/qt3d-everywhere-src-5.15.0.tar.xz) = 81921676
4	SHA256 (KDE/Qt/5.14.2/qtactiveqt-everywhere-src-5.14.2.tar.xz) = b53517d5d128719773a2941ba52da10acd7aa3149948862bc08c98f5b64152a9	4	SHA256 (KDE/Qt/5.15.0/qtactiveqt-everywhere-src-5.15.0.tar.xz) = 1b455eacfb9ef49912d7a79040ea409a6ab88dfa192d313e6b5e02a79d741b51
5	SIZE (KDE/Qt/5.14.2/qtactiveqt-everywhere-src-5.14.2.tar.xz) = 265976	5	SIZE (KDE/Qt/5.15.0/qtactiveqt-everywhere-src-5.15.0.tar.xz) = 267788
6	SHA256 (KDE/Qt/5.14.2/qtandroidextras-everywhere-src-5.14.2.tar.xz) = 4a8fd92b5c49a663cf0bd492804eaf1574d11137e2cbdd41d6bf5fad0c3c4d76	6	SHA256 (KDE/Qt/5.15.0/qtandroidextras-everywhere-src-5.15.0.tar.xz) = c9019185221e94e37e250c84acaebfb7b2f5342e8ad60cdcff052ac2b85ec671
7	SIZE (KDE/Qt/5.14.2/qtandroidextras-everywhere-src-5.14.2.tar.xz) = 105844	7	SIZE (KDE/Qt/5.15.0/qtandroidextras-everywhere-src-5.15.0.tar.xz) = 183492
8	SHA256 (KDE/Qt/5.14.2/qtbase-everywhere-src-5.14.2.tar.xz) = 48b9e79220941665a9dd827548c6428f7aa3052ccba8f4f7e039a94aa1d2b28a	8	SHA256 (KDE/Qt/5.15.0/qtbase-everywhere-src-5.15.0.tar.xz) = 9e7af10aece15fa9500369efde69cb220eee8ec3a6818afe01ce1e7d484824c5
9	SIZE (KDE/Qt/5.14.2/qtbase-everywhere-src-5.14.2.tar.xz) = 49865752	9	SIZE (KDE/Qt/5.15.0/qtbase-everywhere-src-5.15.0.tar.xz) = 49931940
10	SHA256 (KDE/Qt/5.14.2/qtcharts-everywhere-src-5.14.2.tar.xz) = adb25203ea748d886cc3d8993c20def702115eccea311594592058134ba83bb7	10	SHA256 (KDE/Qt/5.15.0/qtcharts-everywhere-src-5.15.0.tar.xz) = 44a24fc16abcaf9ae97ecf3215f6f3b44ebdb3b73bcb4ed3549a51519e4883a7
11	SIZE (KDE/Qt/5.14.2/qtcharts-everywhere-src-5.14.2.tar.xz) = 4250508	11	SIZE (KDE/Qt/5.15.0/qtcharts-everywhere-src-5.15.0.tar.xz) = 4250568
12	SHA256 (KDE/Qt/5.14.2/qtconnectivity-everywhere-src-5.14.2.tar.xz) = abe67b3e3a775e2a2e27c62a5391f37007ffbe72bce58b96116995616cfcbc28	12	SHA256 (KDE/Qt/5.15.0/qtconnectivity-everywhere-src-5.15.0.tar.xz) = f911fb8f8bf3a9958785d0378d25ced8989047938b7138d619854a94fa0b27dd
13	SIZE (KDE/Qt/5.14.2/qtconnectivity-everywhere-src-5.14.2.tar.xz) = 2804940	13	SIZE (KDE/Qt/5.15.0/qtconnectivity-everywhere-src-5.15.0.tar.xz) = 2803792
14	SHA256 (KDE/Qt/5.14.2/qtdatavis3d-everywhere-src-5.14.2.tar.xz) = 723c03db2d2805b1be4ca534ac7bc867a1a21894d33a7e9261a382f3fa9d0e20	14	SHA256 (KDE/Qt/5.15.0/qtdatavis3d-everywhere-src-5.15.0.tar.xz) = 8f07747f371f7c515c667240a795105c89aa83c08d88ee92fa1ef7efccea10a3
15	SIZE (KDE/Qt/5.14.2/qtdatavis3d-everywhere-src-5.14.2.tar.xz) = 5190800	15	SIZE (KDE/Qt/5.15.0/qtdatavis3d-everywhere-src-5.15.0.tar.xz) = 5190804
16	SHA256 (KDE/Qt/5.14.2/qtdeclarative-everywhere-src-5.14.2.tar.xz) = a3c4617adc9760347c93d2eb6c25d22f620cd22f44afa0494eb499a805831650	16	SHA256 (KDE/Qt/5.15.0/qtdeclarative-everywhere-src-5.15.0.tar.xz) = 9c3c93fb7d340b2f7d738d12408c047318c78973cb45bfc5ff6b3a57e1fef699
17	SIZE (KDE/Qt/5.14.2/qtdeclarative-everywhere-src-5.14.2.tar.xz) = 21305980	17	SIZE (KDE/Qt/5.15.0/qtdeclarative-everywhere-src-5.15.0.tar.xz) = 21493268
18	SHA256 (KDE/Qt/5.14.2/qtdoc-everywhere-src-5.14.2.tar.xz) = 5a55cdb55af35eb222d06179567851c175f24a3732f7dee5be073df4a893172b	18	SHA256 (KDE/Qt/5.15.0/qtdoc-everywhere-src-5.15.0.tar.xz) = 07ca8db98c317f25cc9a041c48a6824baf63893bf5b535d6f8d266dea8c7659f
19	SIZE (KDE/Qt/5.14.2/qtdoc-everywhere-src-5.14.2.tar.xz) = 5736088	19	SIZE (KDE/Qt/5.15.0/qtdoc-everywhere-src-5.15.0.tar.xz) = 5742500
20	SHA256 (KDE/Qt/5.14.2/qtgamepad-everywhere-src-5.14.2.tar.xz) = f77daadb4755cf760e11812264259fb103396fd1b06df1e06b5df162081c8d03	20	SHA256 (KDE/Qt/5.15.0/qtgamepad-everywhere-src-5.15.0.tar.xz) = dda54d9f90897944bed5e6af48a904a677fd97eb6f57ab08a2b232c431caf31a
21	SIZE (KDE/Qt/5.14.2/qtgamepad-everywhere-src-5.14.2.tar.xz) = 386940	21	SIZE (KDE/Qt/5.15.0/qtgamepad-everywhere-src-5.15.0.tar.xz) = 386724
22	SHA256 (KDE/Qt/5.14.2/qtgraphicaleffects-everywhere-src-5.14.2.tar.xz) = 487a7f858244a08264363733055a8cf8b00e77c658c5608cc462817d15e4b50f	22	SHA256 (KDE/Qt/5.15.0/qtgraphicaleffects-everywhere-src-5.15.0.tar.xz) = 0d2ea4bc73b9df13a4b739dcbc1e3c7b298c7e682f7f9252b232e3bde7b63eda
23	SIZE (KDE/Qt/5.14.2/qtgraphicaleffects-everywhere-src-5.14.2.tar.xz) = 14040880	23	SIZE (KDE/Qt/5.15.0/qtgraphicaleffects-everywhere-src-5.15.0.tar.xz) = 14040716
24	SHA256 (KDE/Qt/5.14.2/qtimageformats-everywhere-src-5.14.2.tar.xz) = 733eca0165c15e046b106039c989dac7f6bc2ecf215396d965ed065369264f8c	24	SHA256 (KDE/Qt/5.15.0/qtimageformats-everywhere-src-5.15.0.tar.xz) = 83f32101b1a898fcb8ed6f11a657d1125484ac0c2223014b61849d9010efebc8
25	SIZE (KDE/Qt/5.14.2/qtimageformats-everywhere-src-5.14.2.tar.xz) = 1805208	25	SIZE (KDE/Qt/5.15.0/qtimageformats-everywhere-src-5.15.0.tar.xz) = 1811092
26	SHA256 (KDE/Qt/5.14.2/qtlocation-everywhere-src-5.14.2.tar.xz) = c37708bc396f6dac397b49a6a268d5edb39e1c8296ca2337ce9e80bde04775cc	26	SHA256 (KDE/Qt/5.15.0/qtlocation-everywhere-src-5.15.0.tar.xz) = c68b0778a521e5522641c41b1778999dd408ebfda1e0de166a83743268be5f3f
27	SIZE (KDE/Qt/5.14.2/qtlocation-everywhere-src-5.14.2.tar.xz) = 6120852	27	SIZE (KDE/Qt/5.15.0/qtlocation-everywhere-src-5.15.0.tar.xz) = 6542152
28	SHA256 (KDE/Qt/5.14.2/qtlottie-everywhere-src-5.14.2.tar.xz) = 55d1392dc92cbec11263084360075dc5fc3fdc25c1969adfbdec84299b285978	28	SHA256 (KDE/Qt/5.15.0/qtlottie-everywhere-src-5.15.0.tar.xz) = 2053f474dcd7184fdcae2507f47af6527f6ca25b4424483f9265853c3626c833
29	SIZE (KDE/Qt/5.14.2/qtlottie-everywhere-src-5.14.2.tar.xz) = 82572	29	SIZE (KDE/Qt/5.15.0/qtlottie-everywhere-src-5.15.0.tar.xz) = 82384
30	SHA256 (KDE/Qt/5.14.2/qtmacextras-everywhere-src-5.14.2.tar.xz) = d12587b46c84a7822194fc3ccf46f7c18ff3b31566d3dde4f5fe772f1d8776e5	30	SHA256 (KDE/Qt/5.15.0/qtmacextras-everywhere-src-5.15.0.tar.xz) = 95a8c35b30373224cdd6d1ca0bdda1a314b20e91551a4824e8ca7e50ce8ff439
31	SIZE (KDE/Qt/5.14.2/qtmacextras-everywhere-src-5.14.2.tar.xz) = 69360	31	SIZE (KDE/Qt/5.15.0/qtmacextras-everywhere-src-5.15.0.tar.xz) = 69248
32	SHA256 (KDE/Qt/5.14.2/qtmultimedia-everywhere-src-5.14.2.tar.xz) = 7acd8ede6835314206e407b35b668f0add67544577fb51fe67afb03137fb9fe9	32	SHA256 (KDE/Qt/5.15.0/qtmultimedia-everywhere-src-5.15.0.tar.xz) = 0708d867697f392dd3600c5c1c88f5c61b772a5250a4d059dca67b844af0fbd7
33	SIZE (KDE/Qt/5.14.2/qtmultimedia-everywhere-src-5.14.2.tar.xz) = 3793964	33	SIZE (KDE/Qt/5.15.0/qtmultimedia-everywhere-src-5.15.0.tar.xz) = 3796364
34	SHA256 (KDE/Qt/5.14.2/qtnetworkauth-everywhere-src-5.14.2.tar.xz) = 4f00513dd18598487d02187b80b54c669662cf8a8f2573858c7f9282d7b9265e	34	SHA256 (KDE/Qt/5.15.0/qtnetworkauth-everywhere-src-5.15.0.tar.xz) = 96c6107f6e85662a05f114c5b9bd3503a3100bd940e1494c73a99e77f9e7cf85
35	SIZE (KDE/Qt/5.14.2/qtnetworkauth-everywhere-src-5.14.2.tar.xz) = 141424	35	SIZE (KDE/Qt/5.15.0/qtnetworkauth-everywhere-src-5.15.0.tar.xz) = 141360
36	SHA256 (KDE/Qt/5.14.2/qtpurchasing-everywhere-src-5.14.2.tar.xz) = 69b087001e8fcec5bb49ca333d5f44e6b7eb09f76421dc792fc9cd76dee9e851	36	SHA256 (KDE/Qt/5.15.0/qtpurchasing-everywhere-src-5.15.0.tar.xz) = 2127f180c4889055d88e2b402b62be80a5a213a0e48d2056cc9a01d9913b3a16
37	SIZE (KDE/Qt/5.14.2/qtpurchasing-everywhere-src-5.14.2.tar.xz) = 208664	37	SIZE (KDE/Qt/5.15.0/qtpurchasing-everywhere-src-5.15.0.tar.xz) = 208560
38	SHA256 (KDE/Qt/5.14.2/qtquickcontrols-everywhere-src-5.14.2.tar.xz) = d55def1dd4ee1250bd6a4e76849f4e362368b6411c2216d5f669c761216d4461	38	SHA256 (KDE/Qt/5.15.0/qtquickcontrols-everywhere-src-5.15.0.tar.xz) = 7072cf4cd27e9f18b36b1c48dec7c79608cf87ba847d3fc3de133f220ec1acee
39	SIZE (KDE/Qt/5.14.2/qtquickcontrols-everywhere-src-5.14.2.tar.xz) = 5981560	39	SIZE (KDE/Qt/5.15.0/qtquickcontrols-everywhere-src-5.15.0.tar.xz) = 5981340
40	SHA256 (KDE/Qt/5.14.2/qtquickcontrols2-everywhere-src-5.14.2.tar.xz) = faf7d349d8f4a8db36cd3c62a5724bcf689300f2fdb7dc1ea034392aab981560	40	SHA256 (KDE/Qt/5.15.0/qtquickcontrols2-everywhere-src-5.15.0.tar.xz) = 839abda9b58cd8656b2e5f46afbb484e63df466481ace43318c4c2022684648f
41	SIZE (KDE/Qt/5.14.2/qtquickcontrols2-everywhere-src-5.14.2.tar.xz) = 8153752	41	SIZE (KDE/Qt/5.15.0/qtquickcontrols2-everywhere-src-5.15.0.tar.xz) = 8164236
42	SHA256 (KDE/Qt/5.14.2/qtremoteobjects-everywhere-src-5.14.2.tar.xz) = a6a601c4f4aab6fe41a462dae57033819f697e3317240a382cee45c08be614d6	42	SHA256 (KDE/Qt/5.15.0/qtremoteobjects-everywhere-src-5.15.0.tar.xz) = 86fcfdce77f13c7babdec4dc1d0c4b7b6b02e40120a4250dc59e911c53c08abf
43	SIZE (KDE/Qt/5.14.2/qtremoteobjects-everywhere-src-5.14.2.tar.xz) = 376740	43	SIZE (KDE/Qt/5.15.0/qtremoteobjects-everywhere-src-5.15.0.tar.xz) = 369100
44	SHA256 (KDE/Qt/5.14.2/qtscript-everywhere-src-5.14.2.tar.xz) = e9fd487ccb3cbf00e86b0b803aa79e9f6bbe7a337b8e97d069e040c3e0789bfe	44	SHA256 (KDE/Qt/5.15.0/qtscript-everywhere-src-5.15.0.tar.xz) = 02dc21b309621876a89671be27cea86a58e74a96aa28da65fe1b37a3aad29373
45	SIZE (KDE/Qt/5.14.2/qtscript-everywhere-src-5.14.2.tar.xz) = 2654528	45	SIZE (KDE/Qt/5.15.0/qtscript-everywhere-src-5.15.0.tar.xz) = 2654416
46	SHA256 (KDE/Qt/5.14.2/qtscxml-everywhere-src-5.14.2.tar.xz) = 030cea352a56074f577200f967ef37c959b2767127de61f766f59b0d99763790	46	SHA256 (KDE/Qt/5.15.0/qtscxml-everywhere-src-5.15.0.tar.xz) = 9c3a72bf5ebd07553b0049cc1943f04cff93b7e53bde8c81d652422dbf12ff72
47	SIZE (KDE/Qt/5.14.2/qtscxml-everywhere-src-5.14.2.tar.xz) = 433268	47	SIZE (KDE/Qt/5.15.0/qtscxml-everywhere-src-5.15.0.tar.xz) = 433368
48	SHA256 (KDE/Qt/5.14.2/qtsensors-everywhere-src-5.14.2.tar.xz) = bccfca6910b0383d8f65823496ff5011abed2fa8fd446b4b27333d0fd7bb8c61	48	SHA256 (KDE/Qt/5.15.0/qtsensors-everywhere-src-5.15.0.tar.xz) = 12b17ed6cbe6c49c8ab71958bc5d8ad1c42bf20e2fa72613ede11001e98144da
49	SIZE (KDE/Qt/5.14.2/qtsensors-everywhere-src-5.14.2.tar.xz) = 2050616	49	SIZE (KDE/Qt/5.15.0/qtsensors-everywhere-src-5.15.0.tar.xz) = 2050404
50	SHA256 (KDE/Qt/5.14.2/qtserialbus-everywhere-src-5.14.2.tar.xz) = 0b7762175a649a40c4dd619c5de61d772235dc86099343278e2c3229d0836a91	50	SHA256 (KDE/Qt/5.15.0/qtserialbus-everywhere-src-5.15.0.tar.xz) = cee067c84d025e221b83d109b58ea16c4d2dc0af0aea45cc6724acd33a1b7379
51	SIZE (KDE/Qt/5.14.2/qtserialbus-everywhere-src-5.14.2.tar.xz) = 349808	51	SIZE (KDE/Qt/5.15.0/qtserialbus-everywhere-src-5.15.0.tar.xz) = 351232
52	SHA256 (KDE/Qt/5.14.2/qtserialport-everywhere-src-5.14.2.tar.xz) = a6d977dd723ad4d3368b5163691405b8852f809974a96ec54103494e834aea21	52	SHA256 (KDE/Qt/5.15.0/qtserialport-everywhere-src-5.15.0.tar.xz) = ba19369069a707dffddca8d9c477bb2bb4aa26630dfee6792254c4bf9bd57a67
53	SIZE (KDE/Qt/5.14.2/qtserialport-everywhere-src-5.14.2.tar.xz) = 316492	53	SIZE (KDE/Qt/5.15.0/qtserialport-everywhere-src-5.15.0.tar.xz) = 316596
54	SHA256 (KDE/Qt/5.14.2/qtspeech-everywhere-src-5.14.2.tar.xz) = 5e9e8ea62f0207ba894df1e136df0af9fc5443c7817d28c39f0ea2bbae9ec6da	54	SHA256 (KDE/Qt/5.15.0/qtspeech-everywhere-src-5.15.0.tar.xz) = 7219a878c14a24d0ca18d52df1717361b13aee96ac9790baf9ad2b383492dd61
55	SIZE (KDE/Qt/5.14.2/qtspeech-everywhere-src-5.14.2.tar.xz) = 101100	55	SIZE (KDE/Qt/5.15.0/qtspeech-everywhere-src-5.15.0.tar.xz) = 101240
56	SHA256 (KDE/Qt/5.14.2/qtsvg-everywhere-src-5.14.2.tar.xz) = c7d7faa01a3e7a6e4d38fafcec5529a488258218749779e6fa0e09a21173b5a1	56	SHA256 (KDE/Qt/5.15.0/qtsvg-everywhere-src-5.15.0.tar.xz) = ee4d287e2e205ca8c08921b9cbe0fc58bf46be080b5359ad4d7fbdee44aeee0d
57	SIZE (KDE/Qt/5.14.2/qtsvg-everywhere-src-5.14.2.tar.xz) = 1880100	57	SIZE (KDE/Qt/5.15.0/qtsvg-everywhere-src-5.15.0.tar.xz) = 1870588
58	SHA256 (KDE/Qt/5.14.2/qttools-everywhere-src-5.14.2.tar.xz) = 5bb0cf7832b88eb6bc9d4289f98307eb14b16a453ad6cf42cca13c4fe1a053c5	58	SHA256 (KDE/Qt/5.15.0/qttools-everywhere-src-5.15.0.tar.xz) = ddbcb49aab3a2e3672582c6e2e7bec0058feff790f67472343c79e2895e0e437
59	SIZE (KDE/Qt/5.14.2/qttools-everywhere-src-5.14.2.tar.xz) = 8815020	59	SIZE (KDE/Qt/5.15.0/qttools-everywhere-src-5.15.0.tar.xz) = 8850752
60	SHA256 (KDE/Qt/5.14.2/qttranslations-everywhere-src-5.14.2.tar.xz) = 2088ebee9f5dd0336c9fd11436899a95b7ce0141ce072290de1e8f315d82d1a6	60	SHA256 (KDE/Qt/5.15.0/qttranslations-everywhere-src-5.15.0.tar.xz) = 45c43268d9df50784d4d8ca345fce9288a1055fd074ac0ef508097f7aeba22fe
61	SIZE (KDE/Qt/5.14.2/qttranslations-everywhere-src-5.14.2.tar.xz) = 1348684	61	SIZE (KDE/Qt/5.15.0/qttranslations-everywhere-src-5.15.0.tar.xz) = 1356928
62	SHA256 (KDE/Qt/5.14.2/qtvirtualkeyboard-everywhere-src-5.14.2.tar.xz) = 364f3338563e617e7c964a37170b415b546c5f82965e781271f9dada3e3868d7	62	SHA256 (KDE/Qt/5.15.0/qtvirtualkeyboard-everywhere-src-5.15.0.tar.xz) = f22f9204ab65578d9c8aa832a8a39108f826e00a7d391c7884ff490c587f34be
63	SIZE (KDE/Qt/5.14.2/qtvirtualkeyboard-everywhere-src-5.14.2.tar.xz) = 10957372	63	SIZE (KDE/Qt/5.15.0/qtvirtualkeyboard-everywhere-src-5.15.0.tar.xz) = 10957752
64	SHA256 (KDE/Qt/5.14.2/qtwayland-everywhere-src-5.14.2.tar.xz) = d31633ca718fb407cf70870613d45d0ed80aa04c058586ac3036bae1aff7832a	64	SHA256 (KDE/Qt/5.15.0/qtwayland-everywhere-src-5.15.0.tar.xz) = 084133e10bfbd32a28125639660c59975f23457bba6a79b30a25802cec76a9fb
65	SIZE (KDE/Qt/5.14.2/qtwayland-everywhere-src-5.14.2.tar.xz) = 544532	65	SIZE (KDE/Qt/5.15.0/qtwayland-everywhere-src-5.15.0.tar.xz) = 562408
66	SHA256 (KDE/Qt/5.14.2/qtwebchannel-everywhere-src-5.14.2.tar.xz) = 7d1dc8441523638c3d455c7d408ec65aebc073acab80e24063865f929231f874	66	SHA256 (KDE/Qt/5.15.0/qtwebchannel-everywhere-src-5.15.0.tar.xz) = ea80510b363e6f92ce99932f06d176e43459c4a5159fe97b5ef96fcfbab5ed4f
67	SIZE (KDE/Qt/5.14.2/qtwebchannel-everywhere-src-5.14.2.tar.xz) = 202592	67	SIZE (KDE/Qt/5.15.0/qtwebchannel-everywhere-src-5.15.0.tar.xz) = 202844
68	SHA256 (KDE/Qt/5.14.2/qtwebengine-everywhere-src-5.14.2.tar.xz) = e169d6a75d8c397e04f843bc1b9585950fb9a001255cd18d6293f66fa8a6c947	68	SHA256 (KDE/Qt/5.15.0/qtwebengine-everywhere-src-5.15.0.tar.xz) = c38e2fda7ed1b7d5a90f26abf231ec0715d78a5bc39a94673d8e39d75f04c5df
69	SIZE (KDE/Qt/5.14.2/qtwebengine-everywhere-src-5.14.2.tar.xz) = 242467568	69	SIZE (KDE/Qt/5.15.0/qtwebengine-everywhere-src-5.15.0.tar.xz) = 278257432
70	SHA256 (KDE/Qt/5.14.2/qtwebglplugin-everywhere-src-5.14.2.tar.xz) = eb4118910b65d03d8448658ac1646e860d337e59b82d6575beda21824e313417	70	SHA256 (KDE/Qt/5.15.0/qtwebglplugin-everywhere-src-5.15.0.tar.xz) = f7b81f25ddf7b3a0046daa7224bc1e18c8b754b00b1a33775f30f827a5cdca15
71	SIZE (KDE/Qt/5.14.2/qtwebglplugin-everywhere-src-5.14.2.tar.xz) = 74140	71	SIZE (KDE/Qt/5.15.0/qtwebglplugin-everywhere-src-5.15.0.tar.xz) = 73956
72	SHA256 (KDE/Qt/5.14.2/qtwebsockets-everywhere-src-5.14.2.tar.xz) = f06e62b18313fe1b40a35566e79645de4a8e7ac9f7717d1d98a06c5b49afca84	72	SHA256 (KDE/Qt/5.15.0/qtwebsockets-everywhere-src-5.15.0.tar.xz) = 87c2f6542778f9b65b3f208740c1d0db643fd0bede21404b9abb265355da5092
73	SIZE (KDE/Qt/5.14.2/qtwebsockets-everywhere-src-5.14.2.tar.xz) = 252820	73	SIZE (KDE/Qt/5.15.0/qtwebsockets-everywhere-src-5.15.0.tar.xz) = 253616
74	SHA256 (KDE/Qt/5.14.2/qtwebview-everywhere-src-5.14.2.tar.xz) = c61f9213ee84fd7408898c0194468208ffb51af9d257e87e6b53daf24f65ff4b	74	SHA256 (KDE/Qt/5.15.0/qtwebview-everywhere-src-5.15.0.tar.xz) = b87ea205ce79c6b438ebe596e91fa80ba11f6aac7e89ffbf52b337d0fc8d6660
75	SIZE (KDE/Qt/5.14.2/qtwebview-everywhere-src-5.14.2.tar.xz) = 132840	75	SIZE (KDE/Qt/5.15.0/qtwebview-everywhere-src-5.15.0.tar.xz) = 133044
76	SHA256 (KDE/Qt/5.14.2/qtwinextras-everywhere-src-5.14.2.tar.xz) = 980f1bc31b37c8597c0bac55f69ecf00d1677218ce82f7bc3933236cb6d907f2	76	SHA256 (KDE/Qt/5.15.0/qtwinextras-everywhere-src-5.15.0.tar.xz) = d77f2cb2ce83bdbfd0a970bc8d7d11c96b2df16befc257d6594f79dfd92abff0
77	SIZE (KDE/Qt/5.14.2/qtwinextras-everywhere-src-5.14.2.tar.xz) = 763632	77	SIZE (KDE/Qt/5.15.0/qtwinextras-everywhere-src-5.15.0.tar.xz) = 763572
78	SHA256 (KDE/Qt/5.14.2/qtx11extras-everywhere-src-5.14.2.tar.xz) = be9a84a03a2ee81771215264e5dff7a996d04be6192b8cdaa1d41e319a81545a	78	SHA256 (KDE/Qt/5.15.0/qtx11extras-everywhere-src-5.15.0.tar.xz) = c72b6c188284facddcf82835af048240e721dc8d6d9e8a7bd71d76fd876881a1
79	SIZE (KDE/Qt/5.14.2/qtx11extras-everywhere-src-5.14.2.tar.xz) = 135712	79	SIZE (KDE/Qt/5.15.0/qtx11extras-everywhere-src-5.15.0.tar.xz) = 135648
80	SHA256 (KDE/Qt/5.14.2/qtxmlpatterns-everywhere-src-5.14.2.tar.xz) = 219a876665345e3801baff71f31f30f5495c1cb9ab23fbbd27602632c80fcfb7	80	SHA256 (KDE/Qt/5.15.0/qtxmlpatterns-everywhere-src-5.15.0.tar.xz) = 2752cf2aa25ebfda89c3736457e27b3d0c7c7ed290dcfd52c209f9f905998507
81	SIZE (KDE/Qt/5.14.2/qtxmlpatterns-everywhere-src-5.14.2.tar.xz) = 1404028	81	SIZE (KDE/Qt/5.15.0/qtxmlpatterns-everywhere-src-5.15.0.tar.xz) = 1403484

Lines 5-10 Link Here

(-)b/graphics/qt5-wayland/pkg-plist (-18 / +24 lines)
5	%%QT_INCDIR%%/QtWaylandClient/%%FULLVER%%/QtWaylandClient/private/qwayland-qt-windowmanager.h	5	%%QT_INCDIR%%/QtWaylandClient/%%FULLVER%%/QtWaylandClient/private/qwayland-qt-windowmanager.h
6	%%QT_INCDIR%%/QtWaylandClient/%%FULLVER%%/QtWaylandClient/private/qwayland-server-buffer-extension.h	6	%%QT_INCDIR%%/QtWaylandClient/%%FULLVER%%/QtWaylandClient/private/qwayland-server-buffer-extension.h
7	%%QT_INCDIR%%/QtWaylandClient/%%FULLVER%%/QtWaylandClient/private/qwayland-surface-extension.h	7	%%QT_INCDIR%%/QtWaylandClient/%%FULLVER%%/QtWaylandClient/private/qwayland-surface-extension.h
		8	%%QT_INCDIR%%/QtWaylandClient/%%FULLVER%%/QtWaylandClient/private/qwayland-tablet-unstable-v2.h
8	%%QT_INCDIR%%/QtWaylandClient/%%FULLVER%%/QtWaylandClient/private/qwayland-text-input-unstable-v2.h	9	%%QT_INCDIR%%/QtWaylandClient/%%FULLVER%%/QtWaylandClient/private/qwayland-text-input-unstable-v2.h
9	%%QT_INCDIR%%/QtWaylandClient/%%FULLVER%%/QtWaylandClient/private/qwayland-touch-extension.h	10	%%QT_INCDIR%%/QtWaylandClient/%%FULLVER%%/QtWaylandClient/private/qwayland-touch-extension.h
10	%%QT_INCDIR%%/QtWaylandClient/%%FULLVER%%/QtWaylandClient/private/qwayland-wayland.h	11	%%QT_INCDIR%%/QtWaylandClient/%%FULLVER%%/QtWaylandClient/private/qwayland-wayland.h
Lines 50-56 Link Here
50	%%QT_INCDIR%%/QtWaylandClient/%%FULLVER%%/QtWaylandClient/private/qwaylandshmwindow_p.h	51	%%QT_INCDIR%%/QtWaylandClient/%%FULLVER%%/QtWaylandClient/private/qwaylandshmwindow_p.h
51	%%QT_INCDIR%%/QtWaylandClient/%%FULLVER%%/QtWaylandClient/private/qwaylandsubsurface_p.h	52	%%QT_INCDIR%%/QtWaylandClient/%%FULLVER%%/QtWaylandClient/private/qwaylandsubsurface_p.h
52	%%QT_INCDIR%%/QtWaylandClient/%%FULLVER%%/QtWaylandClient/private/qwaylandsurface_p.h	53	%%QT_INCDIR%%/QtWaylandClient/%%FULLVER%%/QtWaylandClient/private/qwaylandsurface_p.h
		54	%%QT_INCDIR%%/QtWaylandClient/%%FULLVER%%/QtWaylandClient/private/qwaylandtabletv2_p.h
53	%%QT_INCDIR%%/QtWaylandClient/%%FULLVER%%/QtWaylandClient/private/qwaylandtouch_p.h	55	%%QT_INCDIR%%/QtWaylandClient/%%FULLVER%%/QtWaylandClient/private/qwaylandtouch_p.h
		56	%%QT_INCDIR%%/QtWaylandClient/%%FULLVER%%/QtWaylandClient/private/qwaylandvulkaninstance_p.h
		57	%%QT_INCDIR%%/QtWaylandClient/%%FULLVER%%/QtWaylandClient/private/qwaylandvulkanwindow_p.h
54	%%QT_INCDIR%%/QtWaylandClient/%%FULLVER%%/QtWaylandClient/private/qwaylandwindow_p.h	58	%%QT_INCDIR%%/QtWaylandClient/%%FULLVER%%/QtWaylandClient/private/qwaylandwindow_p.h
55	%%QT_INCDIR%%/QtWaylandClient/%%FULLVER%%/QtWaylandClient/private/qwaylandwindowmanagerintegration_p.h	59	%%QT_INCDIR%%/QtWaylandClient/%%FULLVER%%/QtWaylandClient/private/qwaylandwindowmanagerintegration_p.h
56	%%QT_INCDIR%%/QtWaylandClient/%%FULLVER%%/QtWaylandClient/private/wayland-hardware-integration-client-protocol.h	60	%%QT_INCDIR%%/QtWaylandClient/%%FULLVER%%/QtWaylandClient/private/wayland-hardware-integration-client-protocol.h
Lines 58-63 Link Here
58	%%QT_INCDIR%%/QtWaylandClient/%%FULLVER%%/QtWaylandClient/private/wayland-qt-windowmanager-client-protocol.h	62	%%QT_INCDIR%%/QtWaylandClient/%%FULLVER%%/QtWaylandClient/private/wayland-qt-windowmanager-client-protocol.h
59	%%QT_INCDIR%%/QtWaylandClient/%%FULLVER%%/QtWaylandClient/private/wayland-server-buffer-extension-client-protocol.h	63	%%QT_INCDIR%%/QtWaylandClient/%%FULLVER%%/QtWaylandClient/private/wayland-server-buffer-extension-client-protocol.h
60	%%QT_INCDIR%%/QtWaylandClient/%%FULLVER%%/QtWaylandClient/private/wayland-surface-extension-client-protocol.h	64	%%QT_INCDIR%%/QtWaylandClient/%%FULLVER%%/QtWaylandClient/private/wayland-surface-extension-client-protocol.h
		65	%%QT_INCDIR%%/QtWaylandClient/%%FULLVER%%/QtWaylandClient/private/wayland-tablet-unstable-v2-client-protocol.h
61	%%QT_INCDIR%%/QtWaylandClient/%%FULLVER%%/QtWaylandClient/private/wayland-text-input-unstable-v2-client-protocol.h	66	%%QT_INCDIR%%/QtWaylandClient/%%FULLVER%%/QtWaylandClient/private/wayland-text-input-unstable-v2-client-protocol.h
62	%%QT_INCDIR%%/QtWaylandClient/%%FULLVER%%/QtWaylandClient/private/wayland-touch-extension-client-protocol.h	67	%%QT_INCDIR%%/QtWaylandClient/%%FULLVER%%/QtWaylandClient/private/wayland-touch-extension-client-protocol.h
63	%%QT_INCDIR%%/QtWaylandClient/%%FULLVER%%/QtWaylandClient/private/wayland-wayland-client-protocol.h	68	%%QT_INCDIR%%/QtWaylandClient/%%FULLVER%%/QtWaylandClient/private/wayland-wayland-client-protocol.h
Lines 305-310 Link Here
305	%%QT_CMAKEDIR%%/Qt5WaylandCompositor/Qt5WaylandCompositor_ShmServerBufferIntegrationPlugin.cmake	310	%%QT_CMAKEDIR%%/Qt5WaylandCompositor/Qt5WaylandCompositor_ShmServerBufferIntegrationPlugin.cmake
306	%%QT_CMAKEDIR%%/Qt5WaylandCompositor/Qt5WaylandCompositor_VulkanServerBufferIntegrationPlugin.cmake	311	%%QT_CMAKEDIR%%/Qt5WaylandCompositor/Qt5WaylandCompositor_VulkanServerBufferIntegrationPlugin.cmake
307	%%QT_BINDIR%%/qtwaylandscanner	312	%%QT_BINDIR%%/qtwaylandscanner
		313	%%DEBUG%%%%QT_BINDIR%%/qtwaylandscanner.debug
308	%%QT_LIBDIR%%/libQt5WaylandClient.prl	314	%%QT_LIBDIR%%/libQt5WaylandClient.prl
309	%%QT_LIBDIR%%/libQt5WaylandClient.so	315	%%QT_LIBDIR%%/libQt5WaylandClient.so
310	%%QT_LIBDIR%%/libQt5WaylandClient.so.5	316	%%QT_LIBDIR%%/libQt5WaylandClient.so.5
Lines 345-368 Link Here
345	%%DEBUG%%%%QT_PLUGINDIR%%/wayland-graphics-integration-client/libxcomposite-egl.so.debug	351	%%DEBUG%%%%QT_PLUGINDIR%%/wayland-graphics-integration-client/libxcomposite-egl.so.debug
346	%%QT_PLUGINDIR%%/wayland-graphics-integration-client/libxcomposite-glx.so	352	%%QT_PLUGINDIR%%/wayland-graphics-integration-client/libxcomposite-glx.so
347	%%DEBUG%%%%QT_PLUGINDIR%%/wayland-graphics-integration-client/libxcomposite-glx.so.debug	353	%%DEBUG%%%%QT_PLUGINDIR%%/wayland-graphics-integration-client/libxcomposite-glx.so.debug
348	%%QT_PLUGINDIR%%/wayland-graphics-integration-server/libdmabuf-server.so	354	%%QT_PLUGINDIR%%/wayland-graphics-integration-server/libqt-wayland-compositor-dmabuf-server-buffer.so
349	%%DEBUG%%%%QT_PLUGINDIR%%/wayland-graphics-integration-server/libdmabuf-server.so.debug	355	%%DEBUG%%%%QT_PLUGINDIR%%/wayland-graphics-integration-server/libqt-wayland-compositor-dmabuf-server-buffer.so.debug
350	%%QT_PLUGINDIR%%/wayland-graphics-integration-server/libdrm-egl-server.so	356	%%QT_PLUGINDIR%%/wayland-graphics-integration-server/libqt-wayland-compositor-drm-egl-server-buffer.so
351	%%DEBUG%%%%QT_PLUGINDIR%%/wayland-graphics-integration-server/libdrm-egl-server.so.debug	357	%%DEBUG%%%%QT_PLUGINDIR%%/wayland-graphics-integration-server/libqt-wayland-compositor-drm-egl-server-buffer.so.debug
352	%%QT_PLUGINDIR%%/wayland-graphics-integration-server/liblinux-dmabuf-unstable-v1.so	358	%%QT_PLUGINDIR%%/wayland-graphics-integration-server/libqt-wayland-compositor-linux-dmabuf-unstable-v1.so
353	%%DEBUG%%%%QT_PLUGINDIR%%/wayland-graphics-integration-server/liblinux-dmabuf-unstable-v1.so.debug	359	%%DEBUG%%%%QT_PLUGINDIR%%/wayland-graphics-integration-server/libqt-wayland-compositor-linux-dmabuf-unstable-v1.so.debug
354	%%QT_PLUGINDIR%%/wayland-graphics-integration-server/libqt-plugin-wayland-egl.so	360	%%QT_PLUGINDIR%%/wayland-graphics-integration-server/libqt-wayland-compositor-shm-emulation-server.so
355	%%DEBUG%%%%QT_PLUGINDIR%%/wayland-graphics-integration-server/libqt-plugin-wayland-egl.so.debug	361	%%DEBUG%%%%QT_PLUGINDIR%%/wayland-graphics-integration-server/libqt-wayland-compositor-shm-emulation-server.so.debug
356	%%QT_PLUGINDIR%%/wayland-graphics-integration-server/libshm-emulation-server.so	362	%%QT_PLUGINDIR%%/wayland-graphics-integration-server/libqt-wayland-compositor-vulkan-server.so
357	%%DEBUG%%%%QT_PLUGINDIR%%/wayland-graphics-integration-server/libshm-emulation-server.so.debug	363	%%DEBUG%%%%QT_PLUGINDIR%%/wayland-graphics-integration-server/libqt-wayland-compositor-vulkan-server.so.debug
358	%%QT_PLUGINDIR%%/wayland-graphics-integration-server/libvulkan-server.so	364	%%QT_PLUGINDIR%%/wayland-graphics-integration-server/libqt-wayland-compositor-wayland-egl.so
359	%%DEBUG%%%%QT_PLUGINDIR%%/wayland-graphics-integration-server/libvulkan-server.so.debug	365	%%DEBUG%%%%QT_PLUGINDIR%%/wayland-graphics-integration-server/libqt-wayland-compositor-wayland-egl.so.debug
360	%%QT_PLUGINDIR%%/wayland-graphics-integration-server/libwayland-eglstream-controller.so	366	%%QT_PLUGINDIR%%/wayland-graphics-integration-server/libqt-wayland-compositor-wayland-eglstream-controller.so
361	%%DEBUG%%%%QT_PLUGINDIR%%/wayland-graphics-integration-server/libwayland-eglstream-controller.so.debug	367	%%DEBUG%%%%QT_PLUGINDIR%%/wayland-graphics-integration-server/libqt-wayland-compositor-wayland-eglstream-controller.so.debug
362	%%QT_PLUGINDIR%%/wayland-graphics-integration-server/libxcomposite-egl.so	368	%%QT_PLUGINDIR%%/wayland-graphics-integration-server/libqt-wayland-compositor-xcomposite-egl.so
363	%%DEBUG%%%%QT_PLUGINDIR%%/wayland-graphics-integration-server/libxcomposite-egl.so.debug	369	%%DEBUG%%%%QT_PLUGINDIR%%/wayland-graphics-integration-server/libqt-wayland-compositor-xcomposite-egl.so.debug
364	%%QT_PLUGINDIR%%/wayland-graphics-integration-server/libxcomposite-glx.so	370	%%QT_PLUGINDIR%%/wayland-graphics-integration-server/libqt-wayland-compositor-xcomposite-glx.so
365	%%DEBUG%%%%QT_PLUGINDIR%%/wayland-graphics-integration-server/libxcomposite-glx.so.debug	371	%%DEBUG%%%%QT_PLUGINDIR%%/wayland-graphics-integration-server/libqt-wayland-compositor-xcomposite-glx.so.debug
366	%%QT_PLUGINDIR%%/wayland-shell-integration/libfullscreen-shell-v1.so	372	%%QT_PLUGINDIR%%/wayland-shell-integration/libfullscreen-shell-v1.so
367	%%DEBUG%%%%QT_PLUGINDIR%%/wayland-shell-integration/libfullscreen-shell-v1.so.debug	373	%%DEBUG%%%%QT_PLUGINDIR%%/wayland-shell-integration/libfullscreen-shell-v1.so.debug
368	%%QT_PLUGINDIR%%/wayland-shell-integration/libivi-shell.so	374	%%QT_PLUGINDIR%%/wayland-shell-integration/libivi-shell.so

Lines 80-89 Link Here

(-)b/net/qt5-network/pkg-plist (-2 / +1 lines)
80	%%QT_INCDIR%%/QtNetwork/%%FULLVER%%/QtNetwork/private/qsslkey_p.h	80	%%QT_INCDIR%%/QtNetwork/%%FULLVER%%/QtNetwork/private/qsslkey_p.h
81	%%QT_INCDIR%%/QtNetwork/%%FULLVER%%/QtNetwork/private/qsslpresharedkeyauthenticator_p.h	81	%%QT_INCDIR%%/QtNetwork/%%FULLVER%%/QtNetwork/private/qsslpresharedkeyauthenticator_p.h
82	%%QT_INCDIR%%/QtNetwork/%%FULLVER%%/QtNetwork/private/qsslsocket_mac_p.h	82	%%QT_INCDIR%%/QtNetwork/%%FULLVER%%/QtNetwork/private/qsslsocket_mac_p.h
83	%%QT_INCDIR%%/QtNetwork/%%FULLVER%%/QtNetwork/private/qsslsocket_openssl11_symbols_p.h
84	%%QT_INCDIR%%/QtNetwork/%%FULLVER%%/QtNetwork/private/qsslsocket_openssl_p.h	83	%%QT_INCDIR%%/QtNetwork/%%FULLVER%%/QtNetwork/private/qsslsocket_openssl_p.h
85	%%QT_INCDIR%%/QtNetwork/%%FULLVER%%/QtNetwork/private/qsslsocket_openssl_symbols_p.h	84	%%QT_INCDIR%%/QtNetwork/%%FULLVER%%/QtNetwork/private/qsslsocket_openssl_symbols_p.h
86	%%QT_INCDIR%%/QtNetwork/%%FULLVER%%/QtNetwork/private/qsslsocket_opensslpre11_symbols_p.h
87	%%QT_INCDIR%%/QtNetwork/%%FULLVER%%/QtNetwork/private/qsslsocket_p.h	85	%%QT_INCDIR%%/QtNetwork/%%FULLVER%%/QtNetwork/private/qsslsocket_p.h
88	%%QT_INCDIR%%/QtNetwork/%%FULLVER%%/QtNetwork/private/qsslsocket_schannel_p.h	86	%%QT_INCDIR%%/QtNetwork/%%FULLVER%%/QtNetwork/private/qsslsocket_schannel_p.h
89	%%QT_INCDIR%%/QtNetwork/%%FULLVER%%/QtNetwork/private/qsslsocket_winrt_p.h	87	%%QT_INCDIR%%/QtNetwork/%%FULLVER%%/QtNetwork/private/qsslsocket_winrt_p.h
Lines 130-135 Link Here
130	%%QT_INCDIR%%/QtNetwork/QNetworkRequest	128	%%QT_INCDIR%%/QtNetwork/QNetworkRequest
131	%%QT_INCDIR%%/QtNetwork/QNetworkSession	129	%%QT_INCDIR%%/QtNetwork/QNetworkSession
132	%%QT_INCDIR%%/QtNetwork/QOcspResponse	130	%%QT_INCDIR%%/QtNetwork/QOcspResponse
		131	%%QT_INCDIR%%/QtNetwork/QPasswordDigestor
133	%%QT_INCDIR%%/QtNetwork/QSctpServer	132	%%QT_INCDIR%%/QtNetwork/QSctpServer
134	%%QT_INCDIR%%/QtNetwork/QSctpSocket	133	%%QT_INCDIR%%/QtNetwork/QSctpSocket
135	%%QT_INCDIR%%/QtNetwork/QSsl	134	%%QT_INCDIR%%/QtNetwork/QSsl

Lines 11-27 COMMENT= Tool for reporting diagnostic information about Qt and its environment Link Here

(-)b/sysutils/qt5-qtdiag/Makefile (-11 lines)
11	USES= compiler:c++11-lang qmake:outsource qt-dist:5,tools	11	USES= compiler:c++11-lang qmake:outsource qt-dist:5,tools
12	USE_QT= core gui	12	USE_QT= core gui
13		13
14	PLIST_FILES= ${QT_BINDIR}/qtdiag
15
16	# Similarly to x11/qt5-qev, it makes more sense to just run the build system
17	# from the qtdiag directory. If we run it from the top of the source tree, it
18	# will look for a lot more dependencies for other tools such as lupdate, which
19	# we do not really have to depend on.
20	WRKSRC_SUBDIR= src/${PORTNAME}
21
22	QT_BINARIES= yes	14	QT_BINARIES= yes
23		15
24	post-patch:
25	${CP} ${WRKSRC}/../../.qmake.conf ${WRKSRC}
26
27	.include <bsd.port.mk>	16	.include <bsd.port.mk>

Added Link Here

(-)b/sysutils/qt5-qtdiag/files/patch-src_src.pro (+58 lines)
1	--- src/src.pro.orig 2020-04-12 20:01:59 UTC
2	+++ src/src.pro
3	@@ -1,54 +1,3 @@
4	TEMPLATE = subdirs
5
6	-qtHaveModule(widgets) {
7	- no-png {
8	- message("Some graphics-related tools are unavailable without PNG support")
9	- } else {
10	- QT_FOR_CONFIG += widgets
11	- qtConfig(pushbutton):qtConfig(toolbutton) {
12	- SUBDIRS = assistant \
13	- designer \
14	- pixeltool
15	-
16	- linguist.depends = designer
17	- }
18	- qtHaveModule(quick):qtConfig(thread):qtConfig(toolbutton): SUBDIRS += distancefieldgenerator
19	- }
20	-}
21	-
22	-SUBDIRS += linguist \
23	- qtattributionsscanner
24	-
25	-qtConfig(library) {
26	- !android\|android_app: SUBDIRS += qtplugininfo
27	-}
28	-
29	-include($$OUT_PWD/qdoc/qtqdoc-config.pri)
30	-QT_FOR_CONFIG += qdoc-private
31	-qtConfig(qdoc): qtConfig(thread): SUBDIRS += qdoc
32	-
33	-!android\|android_app: SUBDIRS += qtpaths
34	-
35	-macos {
36	- SUBDIRS += macdeployqt
37	-}
38	-
39	-qtHaveModule(dbus): SUBDIRS += qdbus
40	-
41	-win32\|winrt:SUBDIRS += windeployqt
42	-winrt:SUBDIRS += winrtrunner
43	-qtHaveModule(gui):!wasm:!android:!uikit:!qnx:!winrt: SUBDIRS += qtdiag
44	-
45	-qtNomakeTools( \
46	- distancefieldgenerator \
47	- pixeltool \
48	-)
49	-
50	-# This is necessary to avoid a race condition between toolchain.prf
51	-# invocations in a module-by-module cross-build.
52	-cross_compile:isEmpty(QMAKE_HOST_CXX.INCDIRS) {
53	- qdoc.depends += qtattributionsscanner
54	- windeployqt.depends += qtattributionsscanner
55	- winrtrunner.depends += qtattributionsscanner
56	- linguist.depends += qtattributionsscanner
57	-}
58	+SUBDIRS = qtdiag

Lines 11-27 COMMENT= Command line client to QStandardPaths Link Here

(-)b/sysutils/qt5-qtpaths/Makefile (-11 lines)
11	USES= compiler:c++11-lang qmake:outsource qt-dist:5,tools	11	USES= compiler:c++11-lang qmake:outsource qt-dist:5,tools
12	USE_QT= core	12	USE_QT= core
13		13
14	PLIST_FILES= ${QT_BINDIR}/qtpaths
15
16	# Similarly to x11/qt5-qev, it makes more sense to just run the build system
17	# from the qtpaths directory. If we run it from the top of the source tree, it
18	# will look for a lot more dependencies for other tools such as lupdate, which
19	# we do not really have to depend on.
20	WRKSRC_SUBDIR= src/${PORTNAME}
21
22	QT_BINARIES= yes	14	QT_BINARIES= yes
23		15
24	post-patch:
25	${CP} ${WRKSRC}/../../.qmake.conf ${WRKSRC}
26
27	.include <bsd.port.mk>	16	.include <bsd.port.mk>

Added Link Here

(-)b/sysutils/qt5-qtpaths/files/patch-src_src.pro (+58 lines)
1	--- src/src.pro.orig 2020-04-12 20:15:00 UTC
2	+++ src/src.pro
3	@@ -1,54 +1,3 @@
4	TEMPLATE = subdirs
5
6	-qtHaveModule(widgets) {
7	- no-png {
8	- message("Some graphics-related tools are unavailable without PNG support")
9	- } else {
10	- QT_FOR_CONFIG += widgets
11	- qtConfig(pushbutton):qtConfig(toolbutton) {
12	- SUBDIRS = assistant \
13	- designer \
14	- pixeltool
15	-
16	- linguist.depends = designer
17	- }
18	- qtHaveModule(quick):qtConfig(thread):qtConfig(toolbutton): SUBDIRS += distancefieldgenerator
19	- }
20	-}
21	-
22	-SUBDIRS += linguist \
23	- qtattributionsscanner
24	-
25	-qtConfig(library) {
26	- !android\|android_app: SUBDIRS += qtplugininfo
27	-}
28	-
29	-include($$OUT_PWD/qdoc/qtqdoc-config.pri)
30	-QT_FOR_CONFIG += qdoc-private
31	-qtConfig(qdoc): qtConfig(thread): SUBDIRS += qdoc
32	-
33	-!android\|android_app: SUBDIRS += qtpaths
34	-
35	-macos {
36	- SUBDIRS += macdeployqt
37	-}
38	-
39	-qtHaveModule(dbus): SUBDIRS += qdbus
40	-
41	-win32\|winrt:SUBDIRS += windeployqt
42	-winrt:SUBDIRS += winrtrunner
43	-qtHaveModule(gui):!wasm:!android:!uikit:!qnx:!winrt: SUBDIRS += qtdiag
44	-
45	-qtNomakeTools( \
46	- distancefieldgenerator \
47	- pixeltool \
48	-)
49	-
50	-# This is necessary to avoid a race condition between toolchain.prf
51	-# invocations in a module-by-module cross-build.
52	-cross_compile:isEmpty(QMAKE_HOST_CXX.INCDIRS) {
53	- qdoc.depends += qtattributionsscanner
54	- windeployqt.depends += qtattributionsscanner
55	- winrtrunner.depends += qtattributionsscanner
56	- linguist.depends += qtattributionsscanner
57	-}
58	+SUBDIRS = qtpaths

Lines 11-27 COMMENT= Qt5 plugin metadata dumper Link Here

(-)b/sysutils/qt5-qtplugininfo/Makefile (-11 lines)
11	USES= compiler:c++11-lang qmake:outsource qt-dist:5,tools	11	USES= compiler:c++11-lang qmake:outsource qt-dist:5,tools
12	USE_QT= core	12	USE_QT= core
13		13
14	PLIST_FILES= ${QT_BINDIR}/qtplugininfo
15
16	# Similarly to x11/qt5-qev, it makes more sense to just run the build system
17	# from the qtplugininfo directory. If we run it from the top of the source tree, it
18	# will look for a lot more dependencies for other tools such as lupdate, which
19	# we do not really have to depend on.
20	WRKSRC_SUBDIR= src/${PORTNAME}
21
22	QT_BINARIES= yes	14	QT_BINARIES= yes
23		15
24	post-patch:
25	${CP} ${WRKSRC}/../../.qmake.conf ${WRKSRC}
26
27	.include <bsd.port.mk>	16	.include <bsd.port.mk>

Added Link Here

(-)b/sysutils/qt5-qtplugininfo/files/patch-src_src.pro (+58 lines)
1	--- src/src.pro.orig 2020-04-12 20:04:17 UTC
2	+++ src/src.pro
3	@@ -1,54 +1,3 @@
4	TEMPLATE = subdirs
5
6	-qtHaveModule(widgets) {
7	- no-png {
8	- message("Some graphics-related tools are unavailable without PNG support")
9	- } else {
10	- QT_FOR_CONFIG += widgets
11	- qtConfig(pushbutton):qtConfig(toolbutton) {
12	- SUBDIRS = assistant \
13	- designer \
14	- pixeltool
15	-
16	- linguist.depends = designer
17	- }
18	- qtHaveModule(quick):qtConfig(thread):qtConfig(toolbutton): SUBDIRS += distancefieldgenerator
19	- }
20	-}
21	-
22	-SUBDIRS += linguist \
23	- qtattributionsscanner
24	-
25	-qtConfig(library) {
26	- !android\|android_app: SUBDIRS += qtplugininfo
27	-}
28	-
29	-include($$OUT_PWD/qdoc/qtqdoc-config.pri)
30	-QT_FOR_CONFIG += qdoc-private
31	-qtConfig(qdoc): qtConfig(thread): SUBDIRS += qdoc
32	-
33	-!android\|android_app: SUBDIRS += qtpaths
34	-
35	-macos {
36	- SUBDIRS += macdeployqt
37	-}
38	-
39	-qtHaveModule(dbus): SUBDIRS += qdbus
40	-
41	-win32\|winrt:SUBDIRS += windeployqt
42	-winrt:SUBDIRS += winrtrunner
43	-qtHaveModule(gui):!wasm:!android:!uikit:!qnx:!winrt: SUBDIRS += qtdiag
44	-
45	-qtNomakeTools( \
46	- distancefieldgenerator \
47	- pixeltool \
48	-)
49	-
50	-# This is necessary to avoid a race condition between toolchain.prf
51	-# invocations in a module-by-module cross-build.
52	-cross_compile:isEmpty(QMAKE_HOST_CXX.INCDIRS) {
53	- qdoc.depends += qtattributionsscanner
54	- windeployqt.depends += qtattributionsscanner
55	- winrtrunner.depends += qtattributionsscanner
56	- linguist.depends += qtattributionsscanner
57	-}
58	+SUBDIRS = qtplugininfo

Lines 1-21 Link Here

(-)b/www/qt5-webengine/files/patch-configure.pri (-9 / +9 lines)
1	--- configure.pri.orig 2019-12-03 07:18:02 UTC	1	--- configure.pri.orig 2020-04-08 09:41:36 UTC
2	+++ configure.pri	2	+++ configure.pri
3	@@ -114,7 +114,7 @@ defineTest(qtwebengine_platformError) {	3	@@ -114,7 +114,7 @@ defineTest(qtwebengine_platformError) {
4	defineTest(qtConfTest_detectPlatform) {	4	defineTest(qtConfTest_detectPlatform) {
5	QT_FOR_CONFIG += gui-private	5	QT_FOR_CONFIG += gui-private
6		6
7	- !linux:!win32:!macos {	7	- !linux:!win32:!macos:!ios {
8	+ !linux:!win32:!macos:!unix: {	8	+ !linux:!win32:!macos:!ios:!unix: {
9	qtwebengine_platformError("Unknown platform. Qt WebEngine only supports Linux, Windows, and macOS.")	9	qtwebengine_platformError("Unknown platform. Qt WebEngine only supports Linux, Windows, and macOS.")
10	} else {	10	} else {
11	linux:qtwebengine_isLinuxPlatformSupported() {	11	linux:qtwebengine_isLinuxPlatformSupported() {
12	@@ -126,6 +126,9 @@ defineTest(qtConfTest_detectPlatform) {	12	@@ -125,6 +125,9 @@ defineTest(qtConfTest_detectPlatform) {
		13	}
13	macos:qtwebengine_isMacOsPlatformSupported() {	14	macos:qtwebengine_isMacOsPlatformSupported() {
14	$${1}.platform = "macos"	15	$${1}.platform = "macos"
15	}	16	+ }
16	+ unix:qtwebengine_isLinuxPlatformSupported() {	17	+ unix:qtwebengine_isLinuxPlatformSupported() {
17	+ $${1}.platform = "linux"	18	+ $${1}.platform = "linux"
18	+ }	19	}
19	}	20	ios:qtwebengine_isMacOsPlatformSupported() {
20		21	$${1}.platform = "ios"
21	!isEmpty(platformError) {

Lines 1-18 Link Here

(-)b/www/qt5-webengine/files/patch-src_3rdparty_chromium_base_debug_elf__reader.cc (-9 / +9 lines)
1	--- src/3rdparty/chromium/base/debug/elf_reader.cc.orig 2019-11-27 21:12:25 UTC	1	--- src/3rdparty/chromium/base/debug/elf_reader.cc.orig 2020-04-08 09:41:36 UTC
2	+++ src/3rdparty/chromium/base/debug/elf_reader.cc	2	+++ src/3rdparty/chromium/base/debug/elf_reader.cc
3	@@ -83,6 +83,7 @@ size_t ReadElfBuildId(const void* elf_mapped_base,	3	@@ -98,6 +98,7 @@ size_t ReadElfBuildId(const void* elf_mapped_base,
4	reinterpret_cast<const Nhdr*>(elf_base + header.p_vaddr);
5	bool found = false;	4	bool found = false;
6	while (current_note < section_end) {	5	while (current_section < section_end) {
		6	current_note = reinterpret_cast<const Nhdr*>(current_section);
7	+#if !defined(OS_BSD)	7	+#if !defined(OS_BSD)
8	if (current_note->n_type == NT_GNU_BUILD_ID) {	8	if (current_note->n_type == NT_GNU_BUILD_ID) {
9	const char* note_name =	9	StringPiece note_name(current_section + sizeof(Nhdr),
10	reinterpret_cast<const char*>(current_note) + sizeof(Nhdr);	10	current_note->n_namesz);
11	@@ -92,6 +93,7 @@ size_t ReadElfBuildId(const void* elf_mapped_base,	11	@@ -107,6 +108,7 @@ size_t ReadElfBuildId(const void* elf_mapped_base,
12	break;	12	break;
13	}	13	}
14	}	14	}
15	+#endif	15	+#endif
16		16
17	current_note = reinterpret_cast<const Nhdr*>(	17	size_t section_size = bits::Align(current_note->n_namesz, 4) +
18	reinterpret_cast<const char*>(current_note) + sizeof(Nhdr) +	18	bits::Align(current_note->n_descsz, 4) +

Lines 1-32 Link Here

(-)b/www/qt5-webengine/files/patch-src_3rdparty_chromium_base_i18n_icu__util.cc (-28 / +16 lines)
1	--- src/3rdparty/chromium/base/i18n/icu_util.cc.orig 2019-11-27 21:12:25 UTC	1	--- src/3rdparty/chromium/base/i18n/icu_util.cc.orig 2020-04-08 09:41:36 UTC
2	+++ src/3rdparty/chromium/base/i18n/icu_util.cc	2	+++ src/3rdparty/chromium/base/i18n/icu_util.cc
3	@@ -20,7 +20,7 @@	3	@@ -43,7 +43,7 @@
4	#include "build/build_config.h"
5	#include "third_party/icu/source/common/unicode/putil.h"
6	#include "third_party/icu/source/common/unicode/udata.h"
7	-#if (defined(OS_LINUX) && !defined(OS_CHROMEOS)) \|\| defined(OS_ANDROID)
8	+#if ((defined(OS_LINUX) \|\| defined(OS_BSD)) && !defined(OS_CHROMEOS)) \|\| defined(OS_ANDROID)
9	#include "third_party/icu/source/i18n/unicode/timezone.h"
10	#endif	4	#endif
11		5
12	@@ -68,7 +68,11 @@ wchar_t g_debug_icu_pf_filename[_MAX_PATH];	6	#if defined(OS_ANDROID) \|\| defined(OS_FUCHSIA) \|\| \
13	// No need to change the filename in multiple places (gyp files, windows	7	- (defined(OS_LINUX) && !defined(IS_CHROMECAST))
14	// build pkg configurations, etc). 'l' stands for Little Endian.	8	+ (defined(OS_LINUX) && !defined(IS_CHROMECAST)) \|\| defined(OS_BSD)
15	// This variable is exported through the header file.	9	#include "third_party/icu/source/i18n/unicode/timezone.h"
16	+#if defined(ARCH_CPU_LITTLE_ENDIAN)
17	const char kIcuDataFileName[] = "icudtl.dat";
18	+#else
19	+const char kIcuDataFileName[] = "icudtb.dat";
20	+#endif
21	#if defined(OS_ANDROID)
22	const char kAndroidAssetsIcuDataFileName[] = "assets/icudtl.dat";
23	#endif
24	@@ -290,7 +294,7 @@ bool InitializeICU() {
25	// TODO(jungshik): Some callers do not care about tz at all. If necessary,
26	// add a boolean argument to this function to init'd the default tz only
27	// when requested.
28	-#if defined(OS_LINUX) && !defined(OS_CHROMEOS)
29	+#if (defined(OS_LINUX) \|\| defined(OS_BSD)) && !defined(OS_CHROMEOS)
30	if (result)
31	std::unique_ptr<icu::TimeZone> zone(icu::TimeZone::createDefault());
32	#endif	10	#endif
		11
		12	@@ -293,7 +293,7 @@ void InitializeIcuTimeZone() {
		13	fuchsia::IntlProfileWatcher::GetPrimaryTimeZoneIdForIcuInitialization();
		14	icu::TimeZone::adoptDefault(
		15	icu::TimeZone::createTimeZone(icu::UnicodeString::fromUTF8(zone_id)));
		16	-#elif defined(OS_LINUX) && !defined(IS_CHROMECAST)
		17	+#elif (defined(OS_LINUX) && !defined(IS_CHROMECAST)) \|\| defined(OS_BSD)
		18	// To respond to the timezone change properly, the default timezone
		19	// cache in ICU has to be populated on starting up.
		20	// See TimeZoneMonitorLinux::NotifyClientsFromImpl().

Removed Link Here

(-)a/www/qt5-webengine/files/patch-src_3rdparty_chromium_base_memory_protected__memory__posix.cc (-31 lines)
1	--- src/3rdparty/chromium/base/memory/protected_memory_posix.cc.orig 2019-11-27 21:12:25 UTC
2	+++ src/3rdparty/chromium/base/memory/protected_memory_posix.cc
3	@@ -8,9 +8,9 @@
4	#include <sys/mman.h>
5	#include <unistd.h>
6
7	-#if defined(OS_LINUX)
8	+#if defined(OS_LINUX) \|\| defined(OS_BSD)
9	#include <sys/resource.h>
10	-#endif // defined(OS_LINUX)
11	+#endif // defined(OS_LINUX) \|\| defined(OS_BSD)
12
13	#if defined(OS_MACOSX) && !defined(OS_IOS)
14	#include <mach/mach.h>
15	@@ -44,7 +44,7 @@ bool AutoWritableMemory::SetMemoryReadOnly(void* start
16	return SetMemory(start, end, PROT_READ);
17	}
18
19	-#if defined(OS_LINUX)
20	+#if defined(OS_LINUX) \|\| defined(OS_BSD)
21	void AssertMemoryIsReadOnly(const void* ptr) {
22	#if DCHECK_IS_ON()
23	const uintptr_t page_mask = ~(base::GetPageSize() - 1);
24	@@ -74,6 +74,6 @@ void AssertMemoryIsReadOnly(const void* ptr) {
25	DCHECK_EQ(region_info.protection, VM_PROT_READ);
26	#endif // DCHECK_IS_ON()
27	}
28	-#endif // defined(OS_LINUX) \|\| (defined(OS_MACOSX) && !defined(OS_IOS))
29	+#endif // defined(OS_LINUX) \|\| (defined(OS_MACOSX) && !defined(OS_IOS)) \|\| defined(OS_BSD)
30
31	} // namespace base

Removed Link Here

(-)a/www/qt5-webengine/files/patch-src_3rdparty_chromium_base_strings_string__number__conversions__unittest.cc (-24 lines)
1	--- src/3rdparty/chromium/base/strings/string_number_conversions_unittest.cc.orig 2019-05-23 12:39:34 UTC
2	+++ src/3rdparty/chromium/base/strings/string_number_conversions_unittest.cc
3	@@ -829,12 +829,21 @@ TEST(StringNumberConversionsTest, DoubleToString) {
4	}
5
6	// The following two values were seen in crashes in the wild.
7	+#if defined(ARCH_CPU_LITTLE_ENDIAN)
8	const char input_bytes[8] = {0, 0, 0, 0, '\xee', '\x6d', '\x73', '\x42'};
9	+#else
10	+ const char input_bytes[8] = {'\x42', '\x73', '\x6d', '\xee', 0, 0, 0, 0};
11	+#endif
12	double input = 0;
13	memcpy(&input, input_bytes, base::size(input_bytes));
14	EXPECT_EQ("1335179083776", NumberToString(input));
15	+#if defined(ARCH_CPU_LITTLE_ENDIAN)
16	const char input_bytes2[8] =
17	{0, 0, 0, '\xa0', '\xda', '\x6c', '\x73', '\x42'};
18	+#else
19	+ const char input_bytes2[8] =
20	+ {'\x42', '\x73', '\x6c', '\xda', '\xa0', 0, 0, 0};
21	+#endif
22	input = 0;
23	memcpy(&input, input_bytes2, base::size(input_bytes2));
24	EXPECT_EQ("1334890332160", NumberToString(input));

Added Link Here

(-)b/www/qt5-webengine/files/patch-src_3rdparty_chromium_base_synchronization_lock__impl.h (+16 lines)
1	--- src/3rdparty/chromium/base/synchronization/lock_impl.h.orig 2020-04-08 09:41:36 UTC
2	+++ src/3rdparty/chromium/base/synchronization/lock_impl.h
3	@@ -67,10 +67,13 @@ void LockImpl::Unlock() {
4	::ReleaseSRWLockExclusive(reinterpret_cast<PSRWLOCK>(&native_handle_));
5	}
6	#elif defined(OS_POSIX) \|\| defined(OS_FUCHSIA)
7	+#pragma GCC diagnostic push
8	+#pragma GCC diagnostic ignored "-Wthread-safety-analysis"
9	void LockImpl::Unlock() {
10	int rv = pthread_mutex_unlock(&native_handle_);
11	DCHECK_EQ(rv, 0) << ". " << strerror(rv);
12	}
13	+#pragma GCC diagnostic pop
14	#endif
15
16	// This is an implementation used for AutoLock templated on the lock type.

Removed Link Here

(-)a/www/qt5-webengine/files/patch-src_3rdparty_chromium_base_third__party_dmg__fp_dtoa.cc (-14 lines)
1	--- src/3rdparty/chromium/base/third_party/dmg_fp/dtoa.cc.orig 2019-05-23 12:39:34 UTC
2	+++ src/3rdparty/chromium/base/third_party/dmg_fp/dtoa.cc
3	@@ -186,7 +186,11 @@
4	* used for input more than STRTOD_DIGLIM digits long (default 40).
5	*/
6
7	+#ifdef __BIG_ENDIAN__
8	+#define IEEE_MC68k
9	+#else
10	#define IEEE_8087
11	+#endif
12	#define NO_HEX_FP
13
14	#ifndef Long

Lines 1-4 Link Here

(-)b/www/qt5-webengine/files/patch-src_3rdparty_chromium_build_config_compiler_BUILD.gn (-14 / +23 lines)
1	--- src/3rdparty/chromium/build/config/compiler/BUILD.gn.orig 2019-11-27 21:12:25 UTC	1	--- src/3rdparty/chromium/build/config/compiler/BUILD.gn.orig 2020-03-16 14:04:24 UTC
2	+++ src/3rdparty/chromium/build/config/compiler/BUILD.gn	2	+++ src/3rdparty/chromium/build/config/compiler/BUILD.gn
3	@@ -60,7 +60,7 @@ declare_args() {	3	@@ -60,7 +60,7 @@ declare_args() {
4	# only two architectures that are currently checked in). Turn this off when	4	# only two architectures that are currently checked in). Turn this off when
Lines 9-24 Link Here
9	(current_cpu == "x64" \|\| current_cpu == "x86")	9	(current_cpu == "x64" \|\| current_cpu == "x86")
10	binutils_path = rebase_path("//third_party/binutils/Linux_x64/Release/bin",	10	binutils_path = rebase_path("//third_party/binutils/Linux_x64/Release/bin",
11	root_build_dir)	11	root_build_dir)
12	@@ -301,7 +301,7 @@ config("compiler") {	12	@@ -309,7 +309,7 @@ config("compiler") {
		13
13	# Linker warnings.	14	# Linker warnings.
14	if (fatal_linker_warnings && !(is_chromeos && current_cpu == "arm") &&	15	if (fatal_linker_warnings && !(is_chromeos && current_cpu == "arm") &&
15	!(is_android && use_order_profiling) && !is_mac && !is_ios &&	16	- !is_mac && !is_ios && current_os != "aix") {
16	- current_os != "aix") {	17	+ !is_mac && !is_ios && current_os != "aix" && !is_bsd) {
17	+ current_os != "aix" && !is_bsd) {
18	# TODO(jochen): Enable this on chromeos on arm. http://crbug.com/356580	18	# TODO(jochen): Enable this on chromeos on arm. http://crbug.com/356580
19	# TODO(lizeb,pasko): Fix link errors when linking with order_profiling=1	19	ldflags += [ "-Wl,--fatal-warnings" ]
20	# crbug.com/485542	20	}
21	@@ -407,7 +407,7 @@ config("compiler") {	21	@@ -416,7 +416,7 @@ config("compiler") {
22		22
23	# Compiler instrumentation can introduce dependencies in DSOs to symbols in	23	# Compiler instrumentation can introduce dependencies in DSOs to symbols in
24	# the executable they are loaded into, so they are unresolved at link-time.	24	# the executable they are loaded into, so they are unresolved at link-time.
Lines 27-33 Link Here
27	ldflags += [	27	ldflags += [
28	"-Wl,-z,defs",	28	"-Wl,-z,defs",
29	"-Wl,--as-needed",	29	"-Wl,--as-needed",
30	@@ -786,7 +786,7 @@ config("compiler_cpu_abi") {	30	@@ -516,7 +516,7 @@ config("compiler") {
		31	}
		32	}
		33
		34	- if (is_clang && !is_nacl && !use_xcode_clang && !use_qt) {
		35	+ if (is_clang && !is_nacl && !use_xcode_clang && !use_qt && !is_bsd) {
		36	cflags += [ "-fcrash-diagnostics-dir=" +
		37	rebase_path("//tools/clang/crashreports", root_build_dir) ]
		38
		39	@@ -787,7 +787,7 @@ config("compiler_cpu_abi") {
31	cflags += [ "-mtune=$arm_tune" ]	40	cflags += [ "-mtune=$arm_tune" ]
32	}	41	}
33	} else if (current_cpu == "arm64") {	42	} else if (current_cpu == "arm64") {
Lines 36-42 Link Here
36	cflags += [ "--target=aarch64-linux-gnu" ]	45	cflags += [ "--target=aarch64-linux-gnu" ]
37	ldflags += [ "--target=aarch64-linux-gnu" ]	46	ldflags += [ "--target=aarch64-linux-gnu" ]
38	}	47	}
39	@@ -1147,7 +1147,7 @@ config("compiler_deterministic") {	48	@@ -1138,7 +1138,7 @@ config("compiler_deterministic") {
40	"-Xclang",	49	"-Xclang",
41	".",	50	".",
42	]	51	]
Lines 45-51 Link Here
45	# We don't use clang -cc1as on Windows (yet? https://crbug.com/762167)	54	# We don't use clang -cc1as on Windows (yet? https://crbug.com/762167)
46	asmflags = [ "-Wa,-fdebug-compilation-dir,." ]	55	asmflags = [ "-Wa,-fdebug-compilation-dir,." ]
47	}	56	}
48	@@ -1553,7 +1553,7 @@ config("default_warnings") {	57	@@ -1545,7 +1545,7 @@ config("default_warnings") {
49	cflags += [ "-Wno-nonportable-include-path" ]	58	cflags += [ "-Wno-nonportable-include-path" ]
50	}	59	}
51		60
Lines 54-60 Link Here
54	# Flags NaCl (Clang 3.7) and Xcode 9.2 (Clang clang-900.0.39.2) do not	63	# Flags NaCl (Clang 3.7) and Xcode 9.2 (Clang clang-900.0.39.2) do not
55	# recognize.	64	# recognize.
56	cflags += [	65	cflags += [
57	@@ -1761,7 +1761,7 @@ config("thin_archive") {	66	@@ -1775,7 +1775,7 @@ config("thin_archive") {
58	# Mac and iOS use the mac-specific "libtool" command, not ar, which doesn't	67	# Mac and iOS use the mac-specific "libtool" command, not ar, which doesn't
59	# have a "thin archive" mode (it does accept -T, but it means truncating	68	# have a "thin archive" mode (it does accept -T, but it means truncating
60	# archive names to 16 characters, which is not what we want).	69	# archive names to 16 characters, which is not what we want).
Lines 63-69 Link Here
63	arflags = [ "-T" ]	72	arflags = [ "-T" ]
64	} else if (is_win && use_lld) {	73	} else if (is_win && use_lld) {
65	arflags = [ "/llvmlibthin" ]	74	arflags = [ "/llvmlibthin" ]
66	@@ -2356,7 +2356,7 @@ config("symbols") {	75	@@ -2373,7 +2373,7 @@ config("symbols") {
67	# flag, so we can use use -g1 for pnacl and nacl-clang compiles.	76	# flag, so we can use use -g1 for pnacl and nacl-clang compiles.
68	# gcc nacl is is_nacl && !is_clang, pnacl and nacl-clang are && is_clang.	77	# gcc nacl is is_nacl && !is_clang, pnacl and nacl-clang are && is_clang.
69	if (!is_nacl \|\| is_clang) {	78	if (!is_nacl \|\| is_clang) {
Lines 72-78 Link Here
72	}	81	}
73		82
74	if (use_debug_fission && !is_nacl && !is_android) {	83	if (use_debug_fission && !is_nacl && !is_android) {
75	@@ -2377,7 +2377,7 @@ config("symbols") {	84	@@ -2394,7 +2394,7 @@ config("symbols") {
76	# DWARF info may be corrupt; offsets in a range list entry are in different	85	# DWARF info may be corrupt; offsets in a range list entry are in different
77	# sections" there. Maybe just a bug in nacl_switch_32.S.	86	# sections" there. Maybe just a bug in nacl_switch_32.S.
78	if (!is_mac && !is_ios && !is_nacl && current_cpu != "x86" &&	87	if (!is_mac && !is_ios && !is_nacl && current_cpu != "x86" &&

Added Link Here

(-)b/www/qt5-webengine/files/patch-src_3rdparty_chromium_build_linux_unbundle_libxml.gn (+53 lines)
1	--- src/3rdparty/chromium/build/linux/unbundle/libxml.gn.orig 2020-04-08 09:41:36 UTC
2	+++ src/3rdparty/chromium/build/linux/unbundle/libxml.gn
3	@@ -8,11 +8,48 @@ pkg_config("system_libxml") {
4	packages = [ "libxml-2.0" ]
5	}
6
7	-static_library("libxml") {
8	+source_set("libxml") {
9	+ public_configs = [ ":system_libxml" ]
10	+}
11	+
12	+static_library("libxml_utils") {
13	+ # Do not expand this visibility list without first consulting with the
14	+ # Security Team.
15	+ visibility = [
16	+ ":xml_reader",
17	+ ":xml_writer",
18	+ "//base/test:test_support",
19	+ "//services/data_decoder:xml_parser_fuzzer",
20	+ ]
21	sources = [
22	"chromium/libxml_utils.cc",
23	"chromium/libxml_utils.h",
24	]
25	-
26	public_configs = [ ":system_libxml" ]
27	+}
28	+
29	+static_library("xml_reader") {
30	+ # Do not expand this visibility list without first consulting with the
31	+ # Security Team.
32	+ visibility = [
33	+ "//base/test:test_support",
34	+ "//components/policy/core/common:unit_tests",
35	+ "//services/data_decoder:*",
36	+ "//tools/traffic_annotation/auditor:auditor_sources",
37	+ ]
38	+ sources = [
39	+ "chromium/xml_reader.cc",
40	+ "chromium/xml_reader.h",
41	+ ]
42	+ deps = [ ":libxml_utils" ]
43	+}
44	+
45	+static_library("xml_writer") {
46	+ # The XmlWriter is considered safe to use from any target.
47	+ visibility = [ "*" ]
48	+ sources = [
49	+ "chromium/xml_writer.cc",
50	+ "chromium/xml_writer.h",
51	+ ]
52	+ deps = [ ":libxml_utils" ]
53	}

Lines 1-4 Link Here

(-)b/www/qt5-webengine/files/patch-src_3rdparty_chromium_chrome_app_theme_chrome__unscaled__resources.grd (-10 / +1 lines)
1	--- src/3rdparty/chromium/chrome/app/theme/chrome_unscaled_resources.grd.orig 2019-11-27 21:12:25 UTC	1	--- src/3rdparty/chromium/chrome/app/theme/chrome_unscaled_resources.grd.orig 2020-04-08 09:41:36 UTC
2	+++ src/3rdparty/chromium/chrome/app/theme/chrome_unscaled_resources.grd	2	+++ src/3rdparty/chromium/chrome/app/theme/chrome_unscaled_resources.grd
3	@@ -18,7 +18,7 @@	3	@@ -18,7 +18,7 @@
4	<include name="IDR_PRODUCT_LOGO_64" file="google_chrome/product_logo_64.png" type="BINDATA" />	4	<include name="IDR_PRODUCT_LOGO_64" file="google_chrome/product_logo_64.png" type="BINDATA" />
Lines 9-20 Link Here
9	<include name="IDR_PRODUCT_LOGO_128_BETA" file="google_chrome/product_logo_128_beta.png" type="BINDATA" />	9	<include name="IDR_PRODUCT_LOGO_128_BETA" file="google_chrome/product_logo_128_beta.png" type="BINDATA" />
10	<include name="IDR_PRODUCT_LOGO_128_DEV" file="google_chrome/product_logo_128_dev.png" type="BINDATA" />	10	<include name="IDR_PRODUCT_LOGO_128_DEV" file="google_chrome/product_logo_128_dev.png" type="BINDATA" />
11	</if>	11	</if>
12	@@ -109,7 +109,7 @@
13	<include name="IDR_PROFILE_AVATAR_2X_25" file="default_200_percent/common/profile_avatar_sun_cloud.png" type="BINDATA" />
14	<include name="IDR_PROFILE_AVATAR_2X_26" file="default_200_percent/common/profile_avatar_placeholder.png" type="BINDATA" />
15	</if>
16	- <if expr="is_linux and enable_app_list">
17	+ <if expr="is_posix and enable_app_list">
18	<!-- App Launcher icons for desktop icon. -->
19	<if expr="_google_chrome">
20	<then>

Lines 1-7 Link Here

(-)b/www/qt5-webengine/files/patch-src_3rdparty_chromium_chrome_browser_ui_webui_chrome__web__ui__controller__factory.cc (-11 / +11 lines)
1	--- src/3rdparty/chromium/chrome/browser/ui/webui/chrome_web_ui_controller_factory.cc.orig 2019-11-27 21:12:25 UTC	1	--- src/3rdparty/chromium/chrome/browser/ui/webui/chrome_web_ui_controller_factory.cc.orig 2020-03-16 14:04:24 UTC
2	+++ src/3rdparty/chromium/chrome/browser/ui/webui/chrome_web_ui_controller_factory.cc	2	+++ src/3rdparty/chromium/chrome/browser/ui/webui/chrome_web_ui_controller_factory.cc
3	@@ -206,11 +206,11 @@	3	@@ -209,11 +209,11 @@
4	#include "chrome/browser/ui/webui/set_as_default_browser_ui_win.h"	4	#include "chrome/browser/ui/webui/conflicts/conflicts_ui.h"
5	#endif	5	#endif
6		6
7	-#if defined(OS_WIN) \|\| defined(OS_MACOSX) \|\| defined(OS_LINUX)	7	-#if defined(OS_WIN) \|\| defined(OS_MACOSX) \|\| defined(OS_LINUX)
Lines 9-20 Link Here
9	#include "chrome/browser/ui/webui/discards/discards_ui.h"	9	#include "chrome/browser/ui/webui/discards/discards_ui.h"
10	#endif	10	#endif
11		11
12	-#if defined(OS_LINUX) \|\| defined(OS_ANDROID)	12	-#if defined(OS_WIN) \|\| defined(OS_LINUX) \|\| defined(OS_ANDROID)
13	+#if defined(OS_LINUX) \|\| defined(OS_ANDROID) \|\| defined(OS_BSD)	13	+#if defined(OS_WIN) \|\| defined(OS_LINUX) \|\| defined(OS_ANDROID) \|\| defined(OS_BSD)
14	#include "chrome/browser/ui/webui/sandbox_internals_ui.h"	14	#include "chrome/browser/ui/webui/sandbox/sandbox_internals_ui.h"
15	#endif	15	#endif
16		16
17	@@ -323,7 +323,7 @@ bool IsAboutUI(const GURL& url) {	17	@@ -311,7 +311,7 @@ bool IsAboutUI(const GURL& url) {
18	#if !defined(OS_ANDROID)	18	#if !defined(OS_ANDROID)
19	\|\| url.host_piece() == chrome::kChromeUITermsHost	19	\|\| url.host_piece() == chrome::kChromeUITermsHost
20	#endif	20	#endif
Lines 23-29 Link Here
23	\|\| url.host_piece() == chrome::kChromeUILinuxProxyConfigHost	23	\|\| url.host_piece() == chrome::kChromeUILinuxProxyConfigHost
24	#endif	24	#endif
25	#if defined(OS_CHROMEOS)	25	#if defined(OS_CHROMEOS)
26	@@ -638,7 +638,7 @@ WebUIFactoryFunction GetWebUIFactoryFunction(WebUI* we	26	@@ -624,7 +624,7 @@ WebUIFactoryFunction GetWebUIFactoryFunction(WebUI* we
27	if (url.host_piece() == chrome::kChromeUINaClHost)	27	if (url.host_piece() == chrome::kChromeUINaClHost)
28	return &NewWebUI<NaClUI>;	28	return &NewWebUI<NaClUI>;
29	#endif	29	#endif
Lines 32-43 Link Here
32	if (url.host_piece() == chrome::kChromeUITabModalConfirmDialogHost)	32	if (url.host_piece() == chrome::kChromeUITabModalConfirmDialogHost)
33	return &NewWebUI<ConstrainedWebDialogUI>;	33	return &NewWebUI<ConstrainedWebDialogUI>;
34	#endif	34	#endif
35	@@ -681,17 +681,17 @@ WebUIFactoryFunction GetWebUIFactoryFunction(WebUI* we	35	@@ -674,17 +674,17 @@ WebUIFactoryFunction GetWebUIFactoryFunction(WebUI* we
36	return &NewWebUI<CastUI>;	36	return &NewWebUI<CastUI>;
37	}	37	}
38	#endif	38	#endif
39	-#if defined(OS_LINUX) \|\| defined(OS_ANDROID)	39	-#if defined(OS_WIN) \|\| defined(OS_LINUX) \|\| defined(OS_ANDROID)
40	+#if defined(OS_LINUX) \|\| defined(OS_ANDROID) \|\| defined(OS_BSD)	40	+#if defined(OS_WIN) \|\| defined(OS_LINUX) \|\| defined(OS_ANDROID) \|\| defined(OS_BSD)
41	if (url.host_piece() == chrome::kChromeUISandboxHost) {	41	if (url.host_piece() == chrome::kChromeUISandboxHost) {
42	return &NewWebUI<SandboxInternalsUI>;	42	return &NewWebUI<SandboxInternalsUI>;
43	}	43	}

Lines 1-6 Link Here

(-)b/www/qt5-webengine/files/patch-src_3rdparty_chromium_chrome_common_chrome__paths.cc (-12 / +22 lines)
1	--- src/3rdparty/chromium/chrome/common/chrome_paths.cc.orig 2019-11-27 21:12:25 UTC	1	--- src/3rdparty/chromium/chrome/common/chrome_paths.cc.orig 2020-03-16 14:04:24 UTC
2	+++ src/3rdparty/chromium/chrome/common/chrome_paths.cc	2	+++ src/3rdparty/chromium/chrome/common/chrome_paths.cc
3	@@ -52,21 +52,21 @@ const base::FilePath::CharType kPepperFlashSystemBaseD	3	@@ -51,21 +51,21 @@ const base::FilePath::CharType kPepperFlashSystemBaseD
4	FILE_PATH_LITERAL("Internet Plug-Ins/PepperFlashPlayer");	4	FILE_PATH_LITERAL("Internet Plug-Ins/PepperFlashPlayer");
5	#endif	5	#endif
6		6
Lines 24-32 Link Here
24	-#endif // defined(OS_LINUX)	24	-#endif // defined(OS_LINUX)
25	+#endif // defined(OS_LINUX) \|\| defined(OS_BSD)	25	+#endif // defined(OS_LINUX) \|\| defined(OS_BSD)
26		26
27	#if defined(OS_CHROMEOS)	27	#if defined(OS_LINUX) && BUILDFLAG(ENABLE_WIDEVINE_CDM_COMPONENT)
28	const base::FilePath::CharType kChromeOSComponentFlash[] = FILE_PATH_LITERAL(	28	// The name of the hint file that tells the latest component updated Widevine
29	@@ -197,7 +197,7 @@ bool PathProvider(int key, base::FilePath* result) {	29	@@ -204,7 +204,7 @@ bool PathProvider(int key, base::FilePath* result) {
30	return false;	30	return false;
31	break;	31	break;
32	case chrome::DIR_DEFAULT_DOWNLOADS_SAFE:	32	case chrome::DIR_DEFAULT_DOWNLOADS_SAFE:
Lines 35-41 Link Here
35	if (!GetUserDownloadsDirectorySafe(&cur))	35	if (!GetUserDownloadsDirectorySafe(&cur))
36	return false;	36	return false;
37	break;	37	break;
38	@@ -470,7 +470,7 @@ bool PathProvider(int key, base::FilePath* result) {	38	@@ -495,6 +495,9 @@ bool PathProvider(int key, base::FilePath* result) {
		39	case chrome::DIR_POLICY_FILES: {
		40	#if BUILDFLAG(GOOGLE_CHROME_BRANDING)
		41	cur = base::FilePath(FILE_PATH_LITERAL("/etc/opt/chrome/policies"));
		42	+#elif defined(OS_BSD)
		43	+ cur = base::FilePath(FILE_PATH_LITERAL(
		44	+ "/usr/local/etc/chrome/policies"));
		45	#else
		46	cur = base::FilePath(FILE_PATH_LITERAL("/etc/chromium/policies"));
		47	#endif
		48	@@ -502,7 +505,7 @@ bool PathProvider(int key, base::FilePath* result) {
39	}	49	}
40	#endif	50	#endif
41	#if defined(OS_CHROMEOS) \|\| \	51	#if defined(OS_CHROMEOS) \|\| \
Lines 44-50 Link Here
44	case chrome::DIR_USER_EXTERNAL_EXTENSIONS: {	54	case chrome::DIR_USER_EXTERNAL_EXTENSIONS: {
45	if (!base::PathService::Get(chrome::DIR_USER_DATA, &cur))	55	if (!base::PathService::Get(chrome::DIR_USER_DATA, &cur))
46	return false;	56	return false;
47	@@ -478,7 +478,7 @@ bool PathProvider(int key, base::FilePath* result) {	57	@@ -510,7 +513,7 @@ bool PathProvider(int key, base::FilePath* result) {
48	break;	58	break;
49	}	59	}
50	#endif	60	#endif
Lines 53-59 Link Here
53	case chrome::DIR_STANDALONE_EXTERNAL_EXTENSIONS: {	63	case chrome::DIR_STANDALONE_EXTERNAL_EXTENSIONS: {
54	cur = base::FilePath(kFilepathSinglePrefExtensions);	64	cur = base::FilePath(kFilepathSinglePrefExtensions);
55	break;	65	break;
56	@@ -513,7 +513,7 @@ bool PathProvider(int key, base::FilePath* result) {	66	@@ -545,7 +548,7 @@ bool PathProvider(int key, base::FilePath* result) {
57	#endif	67	#endif
58	break;	68	break;
59		69
Lines 62-68 Link Here
62	case chrome::DIR_NATIVE_MESSAGING:	72	case chrome::DIR_NATIVE_MESSAGING:
63	#if defined(OS_MACOSX)	73	#if defined(OS_MACOSX)
64	#if BUILDFLAG(GOOGLE_CHROME_BRANDING)	74	#if BUILDFLAG(GOOGLE_CHROME_BRANDING)
65	@@ -527,6 +527,9 @@ bool PathProvider(int key, base::FilePath* result) {	75	@@ -559,6 +562,9 @@ bool PathProvider(int key, base::FilePath* result) {
66	#if BUILDFLAG(GOOGLE_CHROME_BRANDING)	76	#if BUILDFLAG(GOOGLE_CHROME_BRANDING)
67	cur = base::FilePath(FILE_PATH_LITERAL(	77	cur = base::FilePath(FILE_PATH_LITERAL(
68	"/etc/opt/chrome/native-messaging-hosts"));	78	"/etc/opt/chrome/native-messaging-hosts"));
Lines 72-78 Link Here
72	#else	82	#else
73	cur = base::FilePath(FILE_PATH_LITERAL(	83	cur = base::FilePath(FILE_PATH_LITERAL(
74	"/etc/chromium/native-messaging-hosts"));	84	"/etc/chromium/native-messaging-hosts"));
75	@@ -539,7 +542,7 @@ bool PathProvider(int key, base::FilePath* result) {	85	@@ -571,7 +577,7 @@ bool PathProvider(int key, base::FilePath* result) {
76	return false;	86	return false;
77	cur = cur.Append(FILE_PATH_LITERAL("NativeMessagingHosts"));	87	cur = cur.Append(FILE_PATH_LITERAL("NativeMessagingHosts"));
78	break;	88	break;
Lines 81-87 Link Here
81	#if !defined(OS_ANDROID)	91	#if !defined(OS_ANDROID)
82	case chrome::DIR_GLOBAL_GCM_STORE:	92	case chrome::DIR_GLOBAL_GCM_STORE:
83	if (!base::PathService::Get(chrome::DIR_USER_DATA, &cur))	93	if (!base::PathService::Get(chrome::DIR_USER_DATA, &cur))
84	@@ -547,7 +550,7 @@ bool PathProvider(int key, base::FilePath* result) {	94	@@ -579,7 +585,7 @@ bool PathProvider(int key, base::FilePath* result) {
85	cur = cur.Append(kGCMStoreDirname);	95	cur = cur.Append(kGCMStoreDirname);
86	break;	96	break;
87	#endif // !defined(OS_ANDROID)	97	#endif // !defined(OS_ANDROID)
Lines 90-96 Link Here
90	case chrome::FILE_COMPONENT_FLASH_HINT:	100	case chrome::FILE_COMPONENT_FLASH_HINT:
91	if (!base::PathService::Get(	101	if (!base::PathService::Get(
92	chrome::DIR_COMPONENT_UPDATED_PEPPER_FLASH_PLUGIN, &cur)) {	102	chrome::DIR_COMPONENT_UPDATED_PEPPER_FLASH_PLUGIN, &cur)) {
93	@@ -555,7 +558,7 @@ bool PathProvider(int key, base::FilePath* result) {	103	@@ -587,7 +593,7 @@ bool PathProvider(int key, base::FilePath* result) {
94	}	104	}
95	cur = cur.Append(kComponentUpdatedFlashHint);	105	cur = cur.Append(kComponentUpdatedFlashHint);
96	break;	106	break;

Removed Link Here

(-)a/www/qt5-webengine/files/patch-src_3rdparty_chromium_components_safe__browsing_db_util__unittest.cc (-24 lines)
1	--- src/3rdparty/chromium/components/safe_browsing/db/util_unittest.cc.orig 2019-05-23 12:39:34 UTC
2	+++ src/3rdparty/chromium/components/safe_browsing/db/util_unittest.cc
3	@@ -12,6 +12,12 @@
4	#include "testing/gtest/include/gtest/gtest.h"
5	#include "url/gurl.h"
6
7	+#if defined(OS_WIN)
8	+#include <winsock2.h>
9	+#elif defined(OS_POSIX)
10	+#include <arpa/inet.h>
11	+#endif
12	+
13	namespace safe_browsing {
14
15	TEST(SafeBrowsingDbUtilTest, UrlToFullHashes) {
16	@@ -83,7 +89,7 @@ TEST(SafeBrowsingDbUtilTest, StringToSBFullHashAndSBFu
17	// 31 chars plus the last \0 as full_hash.
18	const std::string hash_in = "12345678902234567890323456789012";
19	SBFullHash hash_out = StringToSBFullHash(hash_in);
20	- EXPECT_EQ(0x34333231U, hash_out.prefix);
21	+ EXPECT_EQ(htonl(0x31323334U), hash_out.prefix);
22	EXPECT_EQ(0, memcmp(hash_in.data(), hash_out.full_hash, sizeof(SBFullHash)));
23
24	std::string hash_final = SBFullHashToString(hash_out);

Lines 1-6 Link Here

(-)b/www/qt5-webengine/files/patch-src_3rdparty_chromium_content_gpu_gpu__main.cc (-8 / +8 lines)
1	--- src/3rdparty/chromium/content/gpu/gpu_main.cc.orig 2019-11-27 21:12:25 UTC	1	--- src/3rdparty/chromium/content/gpu/gpu_main.cc.orig 2020-03-16 14:04:24 UTC
2	+++ src/3rdparty/chromium/content/gpu/gpu_main.cc	2	+++ src/3rdparty/chromium/content/gpu/gpu_main.cc
3	@@ -84,7 +84,7 @@	3	@@ -85,7 +85,7 @@
4	#include "ui/gfx/x/x11_switches.h" // nogncheck	4	#include "ui/gfx/x/x11_switches.h" // nogncheck
5	#endif	5	#endif
6		6
Lines 9-15 Link Here
9	#include "content/gpu/gpu_sandbox_hook_linux.h"	9	#include "content/gpu/gpu_sandbox_hook_linux.h"
10	#include "content/public/common/sandbox_init.h"	10	#include "content/public/common/sandbox_init.h"
11	#include "services/service_manager/sandbox/linux/sandbox_linux.h"	11	#include "services/service_manager/sandbox/linux/sandbox_linux.h"
12	@@ -113,7 +113,7 @@ namespace content {	12	@@ -106,7 +106,7 @@ namespace content {
13		13
14	namespace {	14	namespace {
15		15
Lines 18-24 Link Here
18	bool StartSandboxLinux(gpu::GpuWatchdogThread*,	18	bool StartSandboxLinux(gpu::GpuWatchdogThread*,
19	const gpu::GPUInfo*,	19	const gpu::GPUInfo*,
20	const gpu::GpuPreferences&);	20	const gpu::GpuPreferences&);
21	@@ -174,7 +174,7 @@ class ContentSandboxHelper : public gpu::GpuSandboxHel	21	@@ -167,7 +167,7 @@ class ContentSandboxHelper : public gpu::GpuSandboxHel
22	bool EnsureSandboxInitialized(gpu::GpuWatchdogThread* watchdog_thread,	22	bool EnsureSandboxInitialized(gpu::GpuWatchdogThread* watchdog_thread,
23	const gpu::GPUInfo* gpu_info,	23	const gpu::GPUInfo* gpu_info,
24	const gpu::GpuPreferences& gpu_prefs) override {	24	const gpu::GpuPreferences& gpu_prefs) override {
Lines 27-42 Link Here
27	return StartSandboxLinux(watchdog_thread, gpu_info, gpu_prefs);	27	return StartSandboxLinux(watchdog_thread, gpu_info, gpu_prefs);
28	#elif defined(OS_WIN)	28	#elif defined(OS_WIN)
29	return StartSandboxWindows(sandbox_info_);	29	return StartSandboxWindows(sandbox_info_);
30	@@ -280,7 +280,7 @@ int GpuMain(const MainFunctionParams& parameters) {	30	@@ -273,7 +273,7 @@ int GpuMain(const MainFunctionParams& parameters) {
31	main_thread_task_executor =	31	main_thread_task_executor =
32	std::make_unique<base::SingleThreadTaskExecutor>(	32	std::make_unique<base::SingleThreadTaskExecutor>(
33	gpu_preferences.message_loop_type);	33	gpu_preferences.message_pump_type);
34	-#elif defined(OS_LINUX)	34	-#elif defined(OS_LINUX)
35	+#elif defined(OS_LINUX) \|\| defined(OS_BSD)	35	+#elif defined(OS_LINUX) \|\| defined(OS_BSD)
36	#error "Unsupported Linux platform."	36	#error "Unsupported Linux platform."
37	#elif defined(OS_MACOSX)	37	#elif defined(OS_MACOSX)
38	// Cross-process CoreAnimation requires a CFRunLoop to function at all, and	38	// Cross-process CoreAnimation requires a CFRunLoop to function at all, and
39	@@ -388,7 +388,7 @@ int GpuMain(const MainFunctionParams& parameters) {	39	@@ -379,7 +379,7 @@ int GpuMain(const MainFunctionParams& parameters) {
40		40
41	namespace {	41	namespace {
42		42
Lines 45-51 Link Here
45	bool StartSandboxLinux(gpu::GpuWatchdogThread* watchdog_thread,	45	bool StartSandboxLinux(gpu::GpuWatchdogThread* watchdog_thread,
46	const gpu::GPUInfo* gpu_info,	46	const gpu::GPUInfo* gpu_info,
47	const gpu::GpuPreferences& gpu_prefs) {	47	const gpu::GpuPreferences& gpu_prefs) {
48	@@ -423,7 +423,7 @@ bool StartSandboxLinux(gpu::GpuWatchdogThread* watchdo	48	@@ -414,7 +414,7 @@ bool StartSandboxLinux(gpu::GpuWatchdogThread* watchdo
49		49
50	return res;	50	return res;
51	}	51	}