Attachment #213064 for bug #244964

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.13.2	27	QT5_VERSION?= 5.14.1
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)




MAINTAINER=	kde@FreeBSD.org
COMMENT=	Accessibilty features for Qt5

USES=		compiler:c++11-lang gl pkgconfig qmake:outsource,norecursive \
		qt-dist:5,speech xorg
USE_GL=		gl
USE_QT=		core gui buildtools_build qmake_build

SPEECHD_USES=		gettext-runtime gnome
SPEECHD_USE=		GNOME=glib20
SPEECHD_LIB_DEPENDS=	libspeechd.so:accessibility/speech-dispatcher
SPEECHD_VARS=		QMAKE_CONFIGURE_ARGS+=--feature-speechd
SPEECHD_VARS_OFF=	QMAKE_CONFIGURE_ARGS+=--no-feature-speechd

FLITE_DESC=		Festival Lite Backend
FLITE_LIB_DEPENDS=	libflite.so:audio/flite
FLITE_USE=		QT=multimedia,network
FLITE_VARS=		QMAKE_CONFIGURE_ARGS+=--feature-flite
FLITE_VARS_OFF=		QMAKE_CONFIGURE_ARGS+=--no-feature-flite

.include <bsd.port.mk>




--- qtspeech.pro.orig	2019-02-16 08:32:35 UTC
+++ qtspeech.pro
@@ -1,7 +1,11 @@
 load(configure)
-qtCompileTest(flite)
-qtCompileTest(flite_alsa)
-!packagesExist(speech-dispatcher) {
-    qtCompileTest(speechd)
+with_flite {
+	qtCompileTest(flite)
+	qtCompileTest(flite_alsa)
+}
+with_speechd {
+	!packagesExist(speech-dispatcher) {
+	    qtCompileTest(speechd)
+	}
 }
 load(qt_parts)




--- src/plugins/tts/tts.pro.orig	2019-02-16 08:43:06 UTC
+++ src/plugins/tts/tts.pro
@@ -1,10 +1,12 @@
 TEMPLATE = subdirs
 
-unix {
-    CONFIG += link_pkgconfig
-    config_speechd | packagesExist(speech-dispatcher) {
-        SUBDIRS += speechdispatcher
-    }
+with_speechd {
+	unix {
+	    CONFIG += link_pkgconfig
+	    config_speechd | packagesExist(speech-dispatcher) {
+	        SUBDIRS += speechdispatcher
+	    }
+	}
 }
 
 windows:!winrt: SUBDIRS += sapi
@@ -15,6 +17,8 @@ uikit: SUBDIRS += ios
 
 android: SUBDIRS += android
 
-config_flite | config_flite_alsa {
-    SUBDIRS += flite
+with_flite {
+	config_flite | config_flite_alsa {
+	    SUBDIRS += flite
+	}
 }

Lines 56-61 CFLAGS_i386= -fPIC Link Here

(-)b/cad/qcad/Makefile (+3 lines)
56	CXXFLAGS_i386= -fPIC	56	CXXFLAGS_i386= -fPIC
57		57
58	pre-configure:	58	pre-configure:
		59	${MKDIR} ${WRKSRC}/src/3rdparty/qt-labs-qtscriptgenerator-${_QT_VERSION}
		60	${CP} ${WRKSRC}/src/3rdparty/qt-labs-qtscriptgenerator-5.13.2/qt-labs-qtscriptgenerator-5.13.2.pro \
		61	${WRKSRC}/src/3rdparty/qt-labs-qtscriptgenerator-${_QT_VERSION}/qt-labs-qtscriptgenerator-${_QT_VERSION}.pro
59	${REINPLACE_CMD} -e "s\|%%DATADIR%%\|${DATADIR}\|" \	62	${REINPLACE_CMD} -e "s\|%%DATADIR%%\|${DATADIR}\|" \
60	${WRKSRC}/src/core/RS.cpp	63	${WRKSRC}/src/core/RS.cpp
61	${REINPLACE_CMD} -e "s\|%%DATADIR%%\|${DATADIR}\|" \	64	${REINPLACE_CMD} -e "s\|%%DATADIR%%\|${DATADIR}\|" \

Lines 2-8 Link Here

(-)b/comms/qt5-serialbus/Makefile (-1 lines)
2		2
3	PORTNAME= serialbus	3	PORTNAME= serialbus
4	DISTVERSION= ${QT5_VERSION}	4	DISTVERSION= ${QT5_VERSION}
5	PORTREVISION= 1
6	CATEGORIES= comms	5	CATEGORIES= comms
7	PKGNAMEPREFIX= qt5-	6	PKGNAMEPREFIX= qt5-
8		7

Lines 2-8 Link Here

(-)b/devel/qt5-assistant/Makefile (-1 lines)
2		2
3	PORTNAME= assistant	3	PORTNAME= assistant
4	DISTVERSION= ${QT5_VERSION}	4	DISTVERSION= ${QT5_VERSION}
5	PORTREVISION= 1
6	CATEGORIES= devel	5	CATEGORIES= devel
7	PKGNAMEPREFIX= qt5-	6	PKGNAMEPREFIX= qt5-
8		7

Lines 2-8 Link Here

(-)b/devel/qt5-buildtools/Makefile (-1 lines)
2		2
3	PORTNAME= buildtools	3	PORTNAME= buildtools
4	DISTVERSION= ${QT5_VERSION}	4	DISTVERSION= ${QT5_VERSION}
5	PORTREVISION= 1
6	CATEGORIES= devel	5	CATEGORIES= devel
7	PKGNAMEPREFIX= qt5-	6	PKGNAMEPREFIX= qt5-
8		7

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= 2
6	CATEGORIES= devel	5	CATEGORIES= devel
7	PKGNAMEPREFIX= qt5-	6	PKGNAMEPREFIX= qt5-
8		7
Lines 35-41 QT_BINARIES= yes Link Here
35	QT_DEFINES= GLIB	34	QT_DEFINES= GLIB
36	QT_CONFIG= glib icu	35	QT_CONFIG= glib icu
37		36
38	MORE_WRKSRCS= src/tools/bootstrap src/tools/qfloat16-tables src/corelib src/tools/qlalr	37	MORE_WRKSRCS= src/tools/bootstrap src/corelib src/tools/qlalr
39		38
40	.include <bsd.port.pre.mk>	39	.include <bsd.port.pre.mk>
41	# FreeBSD base gained /etc/os-release in r354922, which	40	# FreeBSD base gained /etc/os-release in r354922, which

Lines 1-6 Link Here

(-)b/devel/qt5-core/files/patch-src_corelib_time_qtimezoneprivate__tz.cpp (-3 / +3 lines)
1	--- src/corelib/tools/qtimezoneprivate_tz.cpp.orig 2018-06-13 08:09:13.578248000 -0700	1	--- src/corelib/time/qtimezoneprivate_tz.cpp.orig 2019-11-01 21:30:15 UTC
2	+++ src/corelib/tools/qtimezoneprivate_tz.cpp 2018-06-13 08:11:15.328743000 -0700	2	+++ src/corelib/time/qtimezoneprivate_tz.cpp
3	@@ -1072,6 +1072,17 @@ QByteArray QTzTimeZonePrivate::systemTim	3	@@ -1126,6 +1126,17 @@ QByteArray QTzTimeZonePrivate::systemTimeZoneId() cons
4	}	4	}
5	}	5	}
6		6

Lines 2-8 Link Here

(-)b/devel/qt5-dbus/Makefile (-1 lines)
2		2
3	PORTNAME= dbus	3	PORTNAME= dbus
4	DISTVERSION= ${QT5_VERSION}	4	DISTVERSION= ${QT5_VERSION}
5	PORTREVISION= 1
6	CATEGORIES= devel	5	CATEGORIES= devel
7	PKGNAMEPREFIX= qt5-	6	PKGNAMEPREFIX= qt5-
8		7

Lines 2-8 Link Here

(-)b/devel/qt5-designer/Makefile (-1 lines)
2		2
3	PORTNAME= designer	3	PORTNAME= designer
4	DISTVERSION= ${QT5_VERSION}	4	DISTVERSION= ${QT5_VERSION}
5	PORTREVISION= 1
6	CATEGORIES= devel	5	CATEGORIES= devel
7	PKGNAMEPREFIX= qt5-	6	PKGNAMEPREFIX= qt5-
8		7

Lines 2-8 Link Here

(-)b/devel/qt5-help/Makefile (-1 lines)
2		2
3	PORTNAME= help	3	PORTNAME= help
4	DISTVERSION= ${QT5_VERSION}	4	DISTVERSION= ${QT5_VERSION}
5	PORTREVISION= 1
6	CATEGORIES= devel	5	CATEGORIES= devel
7	PKGNAMEPREFIX= qt5-	6	PKGNAMEPREFIX= qt5-
8		7

Lines 2-8 Link Here

(-)b/devel/qt5-linguist/Makefile (-1 lines)
2		2
3	PORTNAME= linguist	3	PORTNAME= linguist
4	DISTVERSION= ${QT5_VERSION}	4	DISTVERSION= ${QT5_VERSION}
5	PORTREVISION= 1
6	CATEGORIES= devel	5	CATEGORIES= devel
7	PKGNAMEPREFIX= qt5-	6	PKGNAMEPREFIX= qt5-
8		7

Lines 2-8 Link Here

(-)b/devel/qt5-linguisttools/Makefile (-1 lines)
2		2
3	PORTNAME= linguisttools	3	PORTNAME= linguisttools
4	DISTVERSION= ${QT5_VERSION}	4	DISTVERSION= ${QT5_VERSION}
5	PORTREVISION= 1
6	CATEGORIES= devel	5	CATEGORIES= devel
7	PKGNAMEPREFIX= qt5-	6	PKGNAMEPREFIX= qt5-
8		7

Lines 2-8 Link Here

(-)b/devel/qt5-qdbus/Makefile (-1 lines)
2		2
3	PORTNAME= qdbus	3	PORTNAME= qdbus
4	DISTVERSION= ${QT5_VERSION}	4	DISTVERSION= ${QT5_VERSION}
5	PORTREVISION= 1
6	CATEGORIES= devel	5	CATEGORIES= devel
7	PKGNAMEPREFIX= qt5-	6	PKGNAMEPREFIX= qt5-
8		7

Lines 2-8 Link Here

(-)b/devel/qt5-qdbusviewer/Makefile (-1 lines)
2		2
3	PORTNAME= qdbusviewer	3	PORTNAME= qdbusviewer
4	DISTVERSION= ${QT5_VERSION}	4	DISTVERSION= ${QT5_VERSION}
5	PORTREVISION= 1
6	CATEGORIES= devel	5	CATEGORIES= devel
7	PKGNAMEPREFIX= qt5-	6	PKGNAMEPREFIX= qt5-
8		7

Lines 14-19 Link Here

(-)b/devel/qt5-qdoc-data/pkg-plist (+1 lines)
14	%%QT_DOCDIR%%/global/includes-online/search.qdoc	14	%%QT_DOCDIR%%/global/includes-online/search.qdoc
15	%%QT_DOCDIR%%/global/includes/examples-run.qdocinc	15	%%QT_DOCDIR%%/global/includes/examples-run.qdocinc
16	%%QT_DOCDIR%%/global/includes/module-use.qdocinc	16	%%QT_DOCDIR%%/global/includes/module-use.qdocinc
		17	%%QT_DOCDIR%%/global/includes/standardpath/functiondocs.qdocinc
17	%%QT_DOCDIR%%/global/macros.qdocconf	18	%%QT_DOCDIR%%/global/macros.qdocconf
18	%%QT_DOCDIR%%/global/manifest-meta.qdocconf	19	%%QT_DOCDIR%%/global/manifest-meta.qdocconf
19	%%QT_DOCDIR%%/global/qt-cpp-defines.qdocconf	20	%%QT_DOCDIR%%/global/qt-cpp-defines.qdocconf





PORTNAME=	qdoc
DISTVERSION=	${QT5_VERSION}
PORTREVISION=	1
CATEGORIES=	devel textproc
PKGNAMEPREFIX=	qt5-


BUILD_WRKSRC=	${WRKSRC}/src/${PORTNAME}
INSTALL_WRKSRC=	${BUILD_WRKSRC}

PLIST_FILES=	${QT_BINDIR}/qdoc \
		${QT_CMAKEDIR}/Qt5DocTools/Qt5DocToolsConfig.cmake \
		${QT_CMAKEDIR}/Qt5DocTools/Qt5DocToolsConfigVersion.cmake

CONFIGURE_ENV=	LLVM_INSTALL_DIR=${LOCALBASE}/llvm${LLVM_DEFAULT}


Added Link Here

(-)b/devel/qt5-qdoc/files/patch-src_qdoc_qdoc.pro (+10 lines)
1	--- src/qdoc/qdoc.pro.orig 2019-12-31 21:11:48 UTC
2	+++ src/qdoc/qdoc.pro
3	@@ -152,6 +152,6 @@ cmake_qdoc_config_version_file.output = $$MODULE_BASE_
4	QMAKE_SUBSTITUTES += cmake_qdoc_config_file cmake_qdoc_config_version_file
5
6	cmake_qdoc_tools_files.files += $$cmake_qdoc_config_file.output $$cmake_qdoc_config_version_file.output
7	-cmake_qdoc_tools_files.path = $$[QT_INSTALL_LIBS]/cmake/Qt5DocTools
8	+cmake_qdoc_tools_files.path = $$[QT_INSTALL_PREFIX]/lib/cmake/Qt5DocTools
9	cmake_qdoc_tools_files.CONFIG = no_check_exist
10	INSTALLS += cmake_qdoc_tools_files

Lines 2-8 Link Here

(-)b/devel/qt5-qmake/Makefile (-1 lines)
2		2
3	PORTNAME= qmake	3	PORTNAME= qmake
4	DISTVERSION= ${QT5_VERSION}	4	DISTVERSION= ${QT5_VERSION}
5	PORTREVISION= 2
6	CATEGORIES= devel	5	CATEGORIES= devel
7	PKGNAMEPREFIX= qt5-	6	PKGNAMEPREFIX= qt5-
8		7

Lines 2-8 Link Here

(-)b/devel/qt5-remoteobjects/Makefile (-1 lines)
2		2
3	PORTNAME= remoteobjects	3	PORTNAME= remoteobjects
4	DISTVERSION= ${QT5_VERSION}	4	DISTVERSION= ${QT5_VERSION}
5	PORTREVISION= 1
6	CATEGORIES= devel	5	CATEGORIES= devel
7	PKGNAMEPREFIX= qt5-	6	PKGNAMEPREFIX= qt5-
8		7

Lines 2-8 Link Here

(-)b/devel/qt5-scxml/Makefile (-1 lines)
2		2
3	PORTNAME= scxml	3	PORTNAME= scxml
4	DISTVERSION= ${QT5_VERSION}	4	DISTVERSION= ${QT5_VERSION}
5	PORTREVISION= 1
6	CATEGORIES= devel	5	CATEGORIES= devel
7	PKGNAMEPREFIX= qt5-	6	PKGNAMEPREFIX= qt5-
8		7

Lines 2-8 Link Here

(-)b/devel/qt5/Makefile (-1 lines)
2		2
3	PORTNAME= qt5	3	PORTNAME= qt5
4	DISTVERSION= ${QT5_VERSION}	4	DISTVERSION= ${QT5_VERSION}
5	PORTREVISION= 3
6	CATEGORIES= devel	5	CATEGORIES= devel
7		6
8	MAINTAINER= kde@FreeBSD.org	7	MAINTAINER= kde@FreeBSD.org




TIMESTAMP = 1580149510
SHA256 (KDE/Qt/5.14.1/qt3d-everywhere-src-5.14.1.tar.xz) = 86f425e8bdf55b7b3f6a8384c2b9cffee30407fcf87ece0db060fdfb797a0774
SIZE (KDE/Qt/5.14.1/qt3d-everywhere-src-5.14.1.tar.xz) = 81561704
SHA256 (KDE/Qt/5.14.1/qtactiveqt-everywhere-src-5.14.1.tar.xz) = 457dba433497d79a0ee0e44f9f8cf8afbcbb2e36861f98516413a688a5e88aa0
SIZE (KDE/Qt/5.14.1/qtactiveqt-everywhere-src-5.14.1.tar.xz) = 265688
SHA256 (KDE/Qt/5.14.1/qtandroidextras-everywhere-src-5.14.1.tar.xz) = 7986b087532ec6011c8dfa03977cf945f42ec245e84e941acebbe9068f1ca3c6
SIZE (KDE/Qt/5.14.1/qtandroidextras-everywhere-src-5.14.1.tar.xz) = 105860
SHA256 (KDE/Qt/5.14.1/qtbase-everywhere-src-5.14.1.tar.xz) = d9d423a6e7bcf1055c0372fc029f14a6fe67dd62c67b83095cde68b60b762cf7
SIZE (KDE/Qt/5.14.1/qtbase-everywhere-src-5.14.1.tar.xz) = 49828188
SHA256 (KDE/Qt/5.14.1/qtcharts-everywhere-src-5.14.1.tar.xz) = 3dd7466c06130ec3a7842189a203a72576e7ed5424950903410fa1a4f70d9c2b
SIZE (KDE/Qt/5.14.1/qtcharts-everywhere-src-5.14.1.tar.xz) = 4250588
SHA256 (KDE/Qt/5.14.1/qtconnectivity-everywhere-src-5.14.1.tar.xz) = ef0cb1883c0e765cacf6c8b9422997b93fd861cf2289e56791615401eefa2d72
SIZE (KDE/Qt/5.14.1/qtconnectivity-everywhere-src-5.14.1.tar.xz) = 2803040
SHA256 (KDE/Qt/5.14.1/qtdatavis3d-everywhere-src-5.14.1.tar.xz) = cfb94803a88c7405abf78ac445c4603b614889504fbf5279c9c192451a378f96
SIZE (KDE/Qt/5.14.1/qtdatavis3d-everywhere-src-5.14.1.tar.xz) = 5190456
SHA256 (KDE/Qt/5.14.1/qtdeclarative-everywhere-src-5.14.1.tar.xz) = 762fe495d2f97fd70f06dc7d3929506ea3b5e3151ad813e0629209b7bc504c8a
SIZE (KDE/Qt/5.14.1/qtdeclarative-everywhere-src-5.14.1.tar.xz) = 21299728
SHA256 (KDE/Qt/5.14.1/qtdoc-everywhere-src-5.14.1.tar.xz) = 17c66b4c0bbee3d7d7ed8e93453d2b994b2a16921b0789dc198fdb8085988c4b
SIZE (KDE/Qt/5.14.1/qtdoc-everywhere-src-5.14.1.tar.xz) = 5735776
SHA256 (KDE/Qt/5.14.1/qtgamepad-everywhere-src-5.14.1.tar.xz) = 13277d7362ebe912b55e233674bc862e4b5342705c9207bd16c83f107d0e3499
SIZE (KDE/Qt/5.14.1/qtgamepad-everywhere-src-5.14.1.tar.xz) = 386892
SHA256 (KDE/Qt/5.14.1/qtgraphicaleffects-everywhere-src-5.14.1.tar.xz) = aabb87d9f982a8cb213de06b954cef29551f2d9ce10afa0ff9e5571203b56138
SIZE (KDE/Qt/5.14.1/qtgraphicaleffects-everywhere-src-5.14.1.tar.xz) = 14040704
SHA256 (KDE/Qt/5.14.1/qtimageformats-everywhere-src-5.14.1.tar.xz) = b8b177ea68df3a99f45740cb3193e3b38738c5e2b272028445bd31a4305c8e5e
SIZE (KDE/Qt/5.14.1/qtimageformats-everywhere-src-5.14.1.tar.xz) = 1810072
SHA256 (KDE/Qt/5.14.1/qtlocation-everywhere-src-5.14.1.tar.xz) = a0dd1712a5b7a0425b57d17318294b6f7e968c4b81d52048696d029b04d2f12f
SIZE (KDE/Qt/5.14.1/qtlocation-everywhere-src-5.14.1.tar.xz) = 6119236
SHA256 (KDE/Qt/5.14.1/qtlottie-everywhere-src-5.14.1.tar.xz) = 098fbb8d8ce1288f940a3203f1353b4da522623d59fe5bed61abd3df41e5b2aa
SIZE (KDE/Qt/5.14.1/qtlottie-everywhere-src-5.14.1.tar.xz) = 82616
SHA256 (KDE/Qt/5.14.1/qtmacextras-everywhere-src-5.14.1.tar.xz) = 8c263fdba519d7e04bc64767883283eedede0752aa47cc440670129725696e29
SIZE (KDE/Qt/5.14.1/qtmacextras-everywhere-src-5.14.1.tar.xz) = 69340
SHA256 (KDE/Qt/5.14.1/qtmultimedia-everywhere-src-5.14.1.tar.xz) = c458121c8db7ff77eefe643a7c9847ff324647f2603bb5664bcafa6435edeae7
SIZE (KDE/Qt/5.14.1/qtmultimedia-everywhere-src-5.14.1.tar.xz) = 3795732
SHA256 (KDE/Qt/5.14.1/qtnetworkauth-everywhere-src-5.14.1.tar.xz) = e7f9705d014056a0d8a9751e7ad4b472f1184b8ef822124f0363753730536ae0
SIZE (KDE/Qt/5.14.1/qtnetworkauth-everywhere-src-5.14.1.tar.xz) = 141432
SHA256 (KDE/Qt/5.14.1/qtpurchasing-everywhere-src-5.14.1.tar.xz) = bcb0a7f62be4a116feee4af759b89a55084c0364327a83ab0b73acdc60eab8a9
SIZE (KDE/Qt/5.14.1/qtpurchasing-everywhere-src-5.14.1.tar.xz) = 208688
SHA256 (KDE/Qt/5.14.1/qtquickcontrols-everywhere-src-5.14.1.tar.xz) = 54519e7c6748bb9af46435a7ba2ce1c53e4ad164a70e88915fe0e61277540a1a
SIZE (KDE/Qt/5.14.1/qtquickcontrols-everywhere-src-5.14.1.tar.xz) = 5982788
SHA256 (KDE/Qt/5.14.1/qtquickcontrols2-everywhere-src-5.14.1.tar.xz) = 52d652c48933cc8416a91138eb6fb4c31625734265671f286b6c0d3e27d120ae
SIZE (KDE/Qt/5.14.1/qtquickcontrols2-everywhere-src-5.14.1.tar.xz) = 8151808
SHA256 (KDE/Qt/5.14.1/qtremoteobjects-everywhere-src-5.14.1.tar.xz) = 189c8bddaebde0420742af0d85b7e7bf00c558f030bc0a7b704ce86072706e75
SIZE (KDE/Qt/5.14.1/qtremoteobjects-everywhere-src-5.14.1.tar.xz) = 376104
SHA256 (KDE/Qt/5.14.1/qtscript-everywhere-src-5.14.1.tar.xz) = d8071e665935f7f6733f5ef700054a0cbbf8b569e7900439b89d3301f70adadd
SIZE (KDE/Qt/5.14.1/qtscript-everywhere-src-5.14.1.tar.xz) = 2654744
SHA256 (KDE/Qt/5.14.1/qtscxml-everywhere-src-5.14.1.tar.xz) = 6dbcf012cc11931050c8d9422cbf478ee173dfb0c5b8aebf0f829b6f74d741aa
SIZE (KDE/Qt/5.14.1/qtscxml-everywhere-src-5.14.1.tar.xz) = 433256
SHA256 (KDE/Qt/5.14.1/qtsensors-everywhere-src-5.14.1.tar.xz) = eda3862cf079ac2357553be4faaae0136aa017e954506ca0c4239995b5be214c
SIZE (KDE/Qt/5.14.1/qtsensors-everywhere-src-5.14.1.tar.xz) = 2050076
SHA256 (KDE/Qt/5.14.1/qtserialbus-everywhere-src-5.14.1.tar.xz) = a49f72ef59e2ad82155269bd54322bf2638d2793b5adc0cd44ae99bab88f1045
SIZE (KDE/Qt/5.14.1/qtserialbus-everywhere-src-5.14.1.tar.xz) = 349772
SHA256 (KDE/Qt/5.14.1/qtserialport-everywhere-src-5.14.1.tar.xz) = ac7e51e99294998fae8bb3e2feebbd1820ecd774eb9ad8e7ea507f5bd06dcd6f
SIZE (KDE/Qt/5.14.1/qtserialport-everywhere-src-5.14.1.tar.xz) = 316528
SHA256 (KDE/Qt/5.14.1/qtspeech-everywhere-src-5.14.1.tar.xz) = abd9a1863a64de0a148ae37e5fdecde7fd486348f7b26c054008f8506223e425
SIZE (KDE/Qt/5.14.1/qtspeech-everywhere-src-5.14.1.tar.xz) = 101072
SHA256 (KDE/Qt/5.14.1/qtsvg-everywhere-src-5.14.1.tar.xz) = 8540a57312f815f81a45b891b49959d776727fde17579bb6bf1a537996bc9359
SIZE (KDE/Qt/5.14.1/qtsvg-everywhere-src-5.14.1.tar.xz) = 1879708
SHA256 (KDE/Qt/5.14.1/qttools-everywhere-src-5.14.1.tar.xz) = 7f5e6370cf4ed59f2bdd6517870cdcb1df9a055bbd885d056d90938ab302c70c
SIZE (KDE/Qt/5.14.1/qttools-everywhere-src-5.14.1.tar.xz) = 8810972
SHA256 (KDE/Qt/5.14.1/qttranslations-everywhere-src-5.14.1.tar.xz) = a7598068802f4ddda99865ea9c3503015d02ed1e1ff5875e936b42ab8eb2de46
SIZE (KDE/Qt/5.14.1/qttranslations-everywhere-src-5.14.1.tar.xz) = 1348664
SHA256 (KDE/Qt/5.14.1/qtvirtualkeyboard-everywhere-src-5.14.1.tar.xz) = 277baaf6043328d06585c7a9046461308aa7602b21f531bcda12e6df5bce5295
SIZE (KDE/Qt/5.14.1/qtvirtualkeyboard-everywhere-src-5.14.1.tar.xz) = 10950684
SHA256 (KDE/Qt/5.14.1/qtwayland-everywhere-src-5.14.1.tar.xz) = 2a03b9f554e88c5824ef237c814b3dd45844c022e97be0e091f4a502ca4c9520
SIZE (KDE/Qt/5.14.1/qtwayland-everywhere-src-5.14.1.tar.xz) = 544744
SHA256 (KDE/Qt/5.14.1/qtwebchannel-everywhere-src-5.14.1.tar.xz) = 3af5262fde14c7dfe7bcc12d5796a482837bd09f0878851fd8de5db0b1985e6a
SIZE (KDE/Qt/5.14.1/qtwebchannel-everywhere-src-5.14.1.tar.xz) = 202524
SHA256 (KDE/Qt/5.14.1/qtwebengine-everywhere-src-5.14.1.tar.xz) = 4ec77040a876a83aa2a833ebfe7b3e88dcc167ceb317095eb226a0b8d455e887
SIZE (KDE/Qt/5.14.1/qtwebengine-everywhere-src-5.14.1.tar.xz) = 242438244
SHA256 (KDE/Qt/5.14.1/qtwebglplugin-everywhere-src-5.14.1.tar.xz) = de7768ab6a8de06e09467b6dc8714fa71ed5781e2654aa3498a7105328f565a6
SIZE (KDE/Qt/5.14.1/qtwebglplugin-everywhere-src-5.14.1.tar.xz) = 74120
SHA256 (KDE/Qt/5.14.1/qtwebsockets-everywhere-src-5.14.1.tar.xz) = 742fb3d39043728ca4fc1533e9a1e3b701bc5bf4e27cba316077e9f0df0b3fef
SIZE (KDE/Qt/5.14.1/qtwebsockets-everywhere-src-5.14.1.tar.xz) = 252616
SHA256 (KDE/Qt/5.14.1/qtwebview-everywhere-src-5.14.1.tar.xz) = 8c18e7686d1480eb255b68e57a196f3ebc37cc4e2fbcd698ec3bed903517adff
SIZE (KDE/Qt/5.14.1/qtwebview-everywhere-src-5.14.1.tar.xz) = 132824
SHA256 (KDE/Qt/5.14.1/qtwinextras-everywhere-src-5.14.1.tar.xz) = 222b888b89a8fb02948faf985e8614ac543603a000c1cf2e7489f8bf15ccc3cc
SIZE (KDE/Qt/5.14.1/qtwinextras-everywhere-src-5.14.1.tar.xz) = 763656
SHA256 (KDE/Qt/5.14.1/qtx11extras-everywhere-src-5.14.1.tar.xz) = b268907deb06570671c1f584feb1508e7fded129209a268183decc122bfac181
SIZE (KDE/Qt/5.14.1/qtx11extras-everywhere-src-5.14.1.tar.xz) = 135740
SHA256 (KDE/Qt/5.14.1/qtxmlpatterns-everywhere-src-5.14.1.tar.xz) = fb993a112e591c84ea159a752a4026031a212a7af6f31a1b288552c924c18224
SIZE (KDE/Qt/5.14.1/qtxmlpatterns-everywhere-src-5.14.1.tar.xz) = 1403600




to fix up the paths so that cmake files still land in the the "correct" location
in /usr/local/lib/cmake -- as this seemed to be the least intrusive method.

--- mkspecs/features/create_cmake.prf.orig	2019-10-19 18:36:13.000000000 +0200
+++ mkspecs/features/create_cmake.prf	2019-11-01 22:20:25.732072000 +0100
@@ -78,13 +78,13 @@
@@ -48,7 +48,7 @@
 }
 
 CMAKE_INCLUDE_DIR = $$cmakeRelativePath($$[QT_INSTALL_HEADERS], $$[QT_INSTALL_PREFIX])

     CMAKE_INCLUDE_DIR = $$[QT_INSTALL_HEADERS]/
     CMAKE_INCLUDE_DIR_IS_ABSOLUTE = True
 }
@@ -56,7 +56,7 @@
 !exists($$first(QT.$${MODULE}_private.includes)): CMAKE_NO_PRIVATE_INCLUDES = true
 
 CMAKE_LIB_DIR = $$cmakeRelativePath($$[QT_INSTALL_LIBS], $$[QT_INSTALL_PREFIX])
-contains(CMAKE_LIB_DIR,"^\\.\\./.*") {

     CMAKE_LIB_DIR = $$[QT_INSTALL_LIBS]/
     CMAKE_LIB_DIR_IS_ABSOLUTE = True
 } else {
@@ -95,13 +95,13 @@
 }
 
 CMAKE_BIN_DIR = $$cmakeRelativePath($$[QT_HOST_BINS], $$[QT_INSTALL_PREFIX])

     CMAKE_PLUGIN_DIR = $$[QT_INSTALL_PLUGINS]/
     CMAKE_PLUGIN_DIR_IS_ABSOLUTE = True
 }
@@ -259,7 +259,7 @@
       cmake_target_file
 
     cmake_qt5_plugin_file.files = $$cmake_target_file.output
     static|staticlib: cmake_qt5_plugin_file.files += $$cmake_qt5_plugin_import_file.output
-    cmake_qt5_plugin_file.path = $$[QT_INSTALL_LIBS]/cmake/Qt5$${CMAKE_MODULE_NAME}
+    cmake_qt5_plugin_file.path = $$[QT_INSTALL_PREFIX]/lib/cmake/Qt5$${CMAKE_MODULE_NAME}
     INSTALLS += cmake_qt5_plugin_file
 
     return()
@@ -406,7 +406,7 @@
     cmake_qt5_module_files.files += $$cmake_macros_file.output
 }
 

Lines 10-15 COMMENT= Colour Management System (CMS) Link Here

(-)b/graphics/oyranos/Makefile (+2 lines)
10		10
11	LICENSE= BSD3CLAUSE	11	LICENSE= BSD3CLAUSE
12		12
		13	BROKEN= Does not build with Qt5-5.14
		14
13	RUN_DEPENDS= ${LOCALBASE}/share/color/icc/OpenICC/sRGB.icc:graphics/icc-profiles-openicc \	15	RUN_DEPENDS= ${LOCALBASE}/share/color/icc/OpenICC/sRGB.icc:graphics/icc-profiles-openicc \
14	${LOCALBASE}/share/color/icc/basICColor/ISOcoated_v2_300_bas.ICC:graphics/icc-profiles-basiccolor \	16	${LOCALBASE}/share/color/icc/basICColor/ISOcoated_v2_300_bas.ICC:graphics/icc-profiles-basiccolor \
15	xcalib:x11/xcalib	17	xcalib:x11/xcalib

Lines 2-8 Link Here

(-)b/graphics/qt5-3d/Makefile (-1 lines)
2		2
3	PORTNAME= 3d	3	PORTNAME= 3d
4	DISTVERSION= ${QT5_VERSION}	4	DISTVERSION= ${QT5_VERSION}
5	PORTREVISION= 2
6	CATEGORIES= graphics	5	CATEGORIES= graphics
7	PKGNAMEPREFIX= qt5-	6	PKGNAMEPREFIX= qt5-
8		7




%%QT_INCDIR%%/Qt3DAnimation/%%FULLVER%%/Qt3DAnimation/private/abstractevaluateclipanimatorjob_p.h
%%QT_INCDIR%%/Qt3DAnimation/%%FULLVER%%/Qt3DAnimation/private/additiveclipblend_p.h
%%QT_INCDIR%%/Qt3DAnimation/%%FULLVER%%/Qt3DAnimation/private/animationclip_p.h
%%QT_INCDIR%%/Qt3DAnimation/%%FULLVER%%/Qt3DAnimation/private/animationlogging_p.h

%%QT_INCDIR%%/Qt3DCore/%%FULLVER%%/Qt3DCore/private/qaspectjobmanager_p.h
%%QT_INCDIR%%/Qt3DCore/%%FULLVER%%/Qt3DCore/private/qaspectjobproviderinterface_p.h
%%QT_INCDIR%%/Qt3DCore/%%FULLVER%%/Qt3DCore/private/qaspectmanager_p.h
%%QT_INCDIR%%/Qt3DCore/%%FULLVER%%/Qt3DCore/private/qaspectthread_p.h
%%QT_INCDIR%%/Qt3DCore/%%FULLVER%%/Qt3DCore/private/qbackendnode_p.h
%%QT_INCDIR%%/Qt3DCore/%%FULLVER%%/Qt3DCore/private/qbackendnodefactory_p.h
%%QT_INCDIR%%/Qt3DCore/%%FULLVER%%/Qt3DCore/private/qboundedcircularbuffer_p.h
%%QT_INCDIR%%/Qt3DCore/%%FULLVER%%/Qt3DCore/private/qchangearbiter_p.h
%%QT_INCDIR%%/Qt3DCore/%%FULLVER%%/Qt3DCore/private/qcircularbuffer_p.h

%%QT_INCDIR%%/Qt3DCore/%%FULLVER%%/Qt3DCore/private/qresourcemanager_p.h
%%QT_INCDIR%%/Qt3DCore/%%FULLVER%%/Qt3DCore/private/qscene_p.h
%%QT_INCDIR%%/Qt3DCore/%%FULLVER%%/Qt3DCore/private/qscenechange_p.h
%%QT_INCDIR%%/Qt3DCore/%%FULLVER%%/Qt3DCore/private/qsceneobserverinterface_p.h
%%QT_INCDIR%%/Qt3DCore/%%FULLVER%%/Qt3DCore/private/qscheduler_p.h
%%QT_INCDIR%%/Qt3DCore/%%FULLVER%%/Qt3DCore/private/qservicelocator_p.h
%%QT_INCDIR%%/Qt3DCore/%%FULLVER%%/Qt3DCore/private/qskeleton_p.h

%%QT_INCDIR%%/Qt3DInput/%%FULLVER%%/Qt3DInput/private/axisaccumulator_p.h
%%QT_INCDIR%%/Qt3DInput/%%FULLVER%%/Qt3DInput/private/axisaccumulatorjob_p.h
%%QT_INCDIR%%/Qt3DInput/%%FULLVER%%/Qt3DInput/private/axissetting_p.h
%%QT_INCDIR%%/Qt3DInput/%%FULLVER%%/Qt3DInput/private/backendnode_p.h
%%QT_INCDIR%%/Qt3DInput/%%FULLVER%%/Qt3DInput/private/buttonaxisinput_p.h
%%QT_INCDIR%%/Qt3DInput/%%FULLVER%%/Qt3DInput/private/eventsourcesetterhelper_p.h
%%QT_INCDIR%%/Qt3DInput/%%FULLVER%%/Qt3DInput/private/genericdevicebackendnode_p.h

%%QT_INCDIR%%/Qt3DQuickRender/%%FULLVER%%/Qt3DQuickRender/private/quick3dparameter_p_p.h
%%QT_INCDIR%%/Qt3DQuickRender/%%FULLVER%%/Qt3DQuickRender/private/quick3draycaster_p.h
%%QT_INCDIR%%/Qt3DQuickRender/%%FULLVER%%/Qt3DQuickRender/private/quick3draycaster_p_p.h
%%QT_INCDIR%%/Qt3DQuickRender/%%FULLVER%%/Qt3DQuickRender/private/quick3dscreenraycaster_p.h
%%QT_INCDIR%%/Qt3DQuickRender/%%FULLVER%%/Qt3DQuickRender/private/quick3dscreenraycaster_p_p.h
%%QT_INCDIR%%/Qt3DQuickRender/%%FULLVER%%/Qt3DQuickRender/private/quick3drenderpass_p.h
%%QT_INCDIR%%/Qt3DQuickRender/%%FULLVER%%/Qt3DQuickRender/private/quick3drenderpassfilter_p.h
%%QT_INCDIR%%/Qt3DQuickRender/%%FULLVER%%/Qt3DQuickRender/private/quick3drendertargetoutput_p.h
%%QT_INCDIR%%/Qt3DQuickRender/%%FULLVER%%/Qt3DQuickRender/private/quick3drendertargetselector_p.h
%%QT_INCDIR%%/Qt3DQuickRender/%%FULLVER%%/Qt3DQuickRender/private/quick3dscene_p.h
%%QT_INCDIR%%/Qt3DQuickRender/%%FULLVER%%/Qt3DQuickRender/private/quick3dscreenraycaster_p.h
%%QT_INCDIR%%/Qt3DQuickRender/%%FULLVER%%/Qt3DQuickRender/private/quick3dscreenraycaster_p_p.h
%%QT_INCDIR%%/Qt3DQuickRender/%%FULLVER%%/Qt3DQuickRender/private/quick3dshaderdata_p.h
%%QT_INCDIR%%/Qt3DQuickRender/%%FULLVER%%/Qt3DQuickRender/private/quick3dshaderdataarray_p.h
%%QT_INCDIR%%/Qt3DQuickRender/%%FULLVER%%/Qt3DQuickRender/private/quick3dstateset_p.h

%%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/apitexturemanager_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/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/commandthread_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/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/entity_p_p.h
%%QT_INCDIR%%/Qt3DRender/%%FULLVER%%/Qt3DRender/private/entityaccumulator_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/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/glcommands_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/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/loadgeometryjob_p.h
%%QT_INCDIR%%/Qt3DRender/%%FULLVER%%/Qt3DRender/private/loadscenejob_p.h
%%QT_INCDIR%%/Qt3DRender/%%FULLVER%%/Qt3DRender/private/loadskeletonjob_p.h
%%QT_INCDIR%%/Qt3DRender/%%FULLVER%%/Qt3DRender/private/loadtexturedatajob_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/nodefunctor_p.h
%%QT_INCDIR%%/Qt3DRender/%%FULLVER%%/Qt3DRender/private/nodemanagers_p.h
%%QT_INCDIR%%/Qt3DRender/%%FULLVER%%/Qt3DRender/private/nodraw_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/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/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/qdispatchcompute_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/qlevelofdetailswitch_p.h
%%QT_INCDIR%%/Qt3DRender/%%FULLVER%%/Qt3DRender/private/qlinewidth_p.h
%%QT_INCDIR%%/Qt3DRender/%%FULLVER%%/Qt3DRender/private/qmaterial_p.h
%%QT_INCDIR%%/Qt3DRender/%%FULLVER%%/Qt3DRender/private/qmemorybarrier_p.h

%%QT_INCDIR%%/Qt3DRender/%%FULLVER%%/Qt3DRender/private/qparameter_p.h
%%QT_INCDIR%%/Qt3DRender/%%FULLVER%%/Qt3DRender/private/qpickevent_p.h
%%QT_INCDIR%%/Qt3DRender/%%FULLVER%%/Qt3DRender/private/qpickingsettings_p.h
%%QT_INCDIR%%/Qt3DRender/%%FULLVER%%/Qt3DRender/private/qpicktriangleevent_p.h
%%QT_INCDIR%%/Qt3DRender/%%FULLVER%%/Qt3DRender/private/qpointlight_p.h
%%QT_INCDIR%%/Qt3DRender/%%FULLVER%%/Qt3DRender/private/qpointsize_p.h
%%QT_INCDIR%%/Qt3DRender/%%FULLVER%%/Qt3DRender/private/qpolygonoffset_p.h
%%QT_INCDIR%%/Qt3DRender/%%FULLVER%%/Qt3DRender/private/qproximityfilter_p.h
%%QT_INCDIR%%/Qt3DRender/%%FULLVER%%/Qt3DRender/private/qrastermode_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/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/qshaderimage_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/qstenciloperationarguments_p.h
%%QT_INCDIR%%/Qt3DRender/%%FULLVER%%/Qt3DRender/private/qstenciltest_p.h
%%QT_INCDIR%%/Qt3DRender/%%FULLVER%%/Qt3DRender/private/qstenciltestarguments_p.h
%%QT_INCDIR%%/Qt3DRender/%%FULLVER%%/Qt3DRender/private/qsubtreeenabler_p.h
%%QT_INCDIR%%/Qt3DRender/%%FULLVER%%/Qt3DRender/private/qt3drender-config_p.h
%%QT_INCDIR%%/Qt3DRender/%%FULLVER%%/Qt3DRender/private/qt3drender_global_p.h
%%QT_INCDIR%%/Qt3DRender/%%FULLVER%%/Qt3DRender/private/qtechnique_p.h
%%QT_INCDIR%%/Qt3DRender/%%FULLVER%%/Qt3DRender/private/qtechniquefilter_p.h
%%QT_INCDIR%%/Qt3DRender/%%FULLVER%%/Qt3DRender/private/qtexture_p.h
%%QT_INCDIR%%/Qt3DRender/%%FULLVER%%/Qt3DRender/private/qtexturedataupdate_p.h
%%QT_INCDIR%%/Qt3DRender/%%FULLVER%%/Qt3DRender/private/qtextureimage_p.h
%%QT_INCDIR%%/Qt3DRender/%%FULLVER%%/Qt3DRender/private/qtextureimagedata_p.h
%%QT_INCDIR%%/Qt3DRender/%%FULLVER%%/Qt3DRender/private/qurlhelper_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/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/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/trianglesextractor_p.h
%%QT_INCDIR%%/Qt3DRender/%%FULLVER%%/Qt3DRender/private/trianglesvisitor_p.h
%%QT_INCDIR%%/Qt3DRender/%%FULLVER%%/Qt3DRender/private/uniform_p.h
%%QT_INCDIR%%/Qt3DRender/%%FULLVER%%/Qt3DRender/private/updateentityhierarchyjob_p.h
%%QT_INCDIR%%/Qt3DRender/%%FULLVER%%/Qt3DRender/private/updateentitylayersjob_p.h
%%QT_INCDIR%%/Qt3DRender/%%FULLVER%%/Qt3DRender/private/updatelevelofdetailjob_p.h
%%QT_INCDIR%%/Qt3DRender/%%FULLVER%%/Qt3DRender/private/updatemeshtrianglelistjob_p.h

%%QT_INCDIR%%/Qt3DRender/QColorMask
%%QT_INCDIR%%/Qt3DRender/QComputeCommand
%%QT_INCDIR%%/Qt3DRender/QCullFace
%%QT_INCDIR%%/Qt3DRender/QDepthRange
%%QT_INCDIR%%/Qt3DRender/QDepthTest
%%QT_INCDIR%%/Qt3DRender/QDirectionalLight
%%QT_INCDIR%%/Qt3DRender/QDispatchCompute

%%QT_INCDIR%%/Qt3DRender/QMultiSampleAntiAliasing
%%QT_INCDIR%%/Qt3DRender/QNoDepthMask
%%QT_INCDIR%%/Qt3DRender/QNoDraw
%%QT_INCDIR%%/Qt3DRender/QNoPicking
%%QT_INCDIR%%/Qt3DRender/QObjectPicker
%%QT_INCDIR%%/Qt3DRender/QPaintedTextureImage
%%QT_INCDIR%%/Qt3DRender/QParameter

%%QT_INCDIR%%/Qt3DRender/QPointSize
%%QT_INCDIR%%/Qt3DRender/QPolygonOffset
%%QT_INCDIR%%/Qt3DRender/QProximityFilter
%%QT_INCDIR%%/Qt3DRender/QRasterMode
%%QT_INCDIR%%/Qt3DRender/QRayCaster
%%QT_INCDIR%%/Qt3DRender/QRayCasterHit
%%QT_INCDIR%%/Qt3DRender/QRenderAspect

%%QT_INCDIR%%/Qt3DRender/QSeamlessCubemap
%%QT_INCDIR%%/Qt3DRender/QSetFence
%%QT_INCDIR%%/Qt3DRender/QShaderData
%%QT_INCDIR%%/Qt3DRender/QShaderImage
%%QT_INCDIR%%/Qt3DRender/QShaderProgram
%%QT_INCDIR%%/Qt3DRender/QShaderProgramBuilder
%%QT_INCDIR%%/Qt3DRender/QSortPolicy

%%QT_INCDIR%%/Qt3DRender/QStencilOperationArguments
%%QT_INCDIR%%/Qt3DRender/QStencilTest
%%QT_INCDIR%%/Qt3DRender/QStencilTestArguments
%%QT_INCDIR%%/Qt3DRender/QSubtreeEnabler
%%QT_INCDIR%%/Qt3DRender/QTechnique
%%QT_INCDIR%%/Qt3DRender/QTechniqueFilter
%%QT_INCDIR%%/Qt3DRender/QTexture
%%QT_INCDIR%%/Qt3DRender/QTextureData
%%QT_INCDIR%%/Qt3DRender/QTextureDataPtr
%%QT_INCDIR%%/Qt3DRender/QTextureDataUpdate
%%QT_INCDIR%%/Qt3DRender/QTextureGenerator
%%QT_INCDIR%%/Qt3DRender/QTextureGeneratorPtr
%%QT_INCDIR%%/Qt3DRender/QTextureImage

%%QT_INCDIR%%/Qt3DRender/qcolormask.h
%%QT_INCDIR%%/Qt3DRender/qcomputecommand.h
%%QT_INCDIR%%/Qt3DRender/qcullface.h
%%QT_INCDIR%%/Qt3DRender/qdepthrange.h
%%QT_INCDIR%%/Qt3DRender/qdepthtest.h
%%QT_INCDIR%%/Qt3DRender/qdirectionallight.h
%%QT_INCDIR%%/Qt3DRender/qdispatchcompute.h

%%QT_INCDIR%%/Qt3DRender/qmultisampleantialiasing.h
%%QT_INCDIR%%/Qt3DRender/qnodepthmask.h
%%QT_INCDIR%%/Qt3DRender/qnodraw.h
%%QT_INCDIR%%/Qt3DRender/qnopicking.h
%%QT_INCDIR%%/Qt3DRender/qobjectpicker.h
%%QT_INCDIR%%/Qt3DRender/qpaintedtextureimage.h
%%QT_INCDIR%%/Qt3DRender/qparameter.h

%%QT_INCDIR%%/Qt3DRender/qpointsize.h
%%QT_INCDIR%%/Qt3DRender/qpolygonoffset.h
%%QT_INCDIR%%/Qt3DRender/qproximityfilter.h
%%QT_INCDIR%%/Qt3DRender/qrastermode.h
%%QT_INCDIR%%/Qt3DRender/qraycaster.h
%%QT_INCDIR%%/Qt3DRender/qraycasterhit.h
%%QT_INCDIR%%/Qt3DRender/qrenderaspect.h

%%QT_INCDIR%%/Qt3DRender/qseamlesscubemap.h
%%QT_INCDIR%%/Qt3DRender/qsetfence.h
%%QT_INCDIR%%/Qt3DRender/qshaderdata.h
%%QT_INCDIR%%/Qt3DRender/qshaderimage.h
%%QT_INCDIR%%/Qt3DRender/qshaderprogram.h
%%QT_INCDIR%%/Qt3DRender/qshaderprogrambuilder.h
%%QT_INCDIR%%/Qt3DRender/qsortpolicy.h

%%QT_INCDIR%%/Qt3DRender/qstenciloperationarguments.h
%%QT_INCDIR%%/Qt3DRender/qstenciltest.h
%%QT_INCDIR%%/Qt3DRender/qstenciltestarguments.h
%%QT_INCDIR%%/Qt3DRender/qsubtreeenabler.h
%%QT_INCDIR%%/Qt3DRender/qt3drender-config.h
%%QT_INCDIR%%/Qt3DRender/qt3drender_global.h
%%QT_INCDIR%%/Qt3DRender/qt3drenderversion.h

%%QT_INCDIR%%/Qt3DRender/qtechniquefilter.h
%%QT_INCDIR%%/Qt3DRender/qtexture.h
%%QT_INCDIR%%/Qt3DRender/qtexturedata.h
%%QT_INCDIR%%/Qt3DRender/qtexturedataupdate.h
%%QT_INCDIR%%/Qt3DRender/qtexturegenerator.h
%%QT_INCDIR%%/Qt3DRender/qtextureimage.h
%%QT_INCDIR%%/Qt3DRender/qtextureimagedata.h

Lines 2-8 Link Here

(-)b/graphics/qt5-imageformats/Makefile (-1 lines)
2		2
3	PORTNAME= imageformats	3	PORTNAME= imageformats
4	DISTVERSION= ${QT5_VERSION}	4	DISTVERSION= ${QT5_VERSION}
5	PORTREVISION= 1
6	CATEGORIES= graphics	5	CATEGORIES= graphics
7	PKGNAMEPREFIX= qt5-	6	PKGNAMEPREFIX= qt5-
8		7

Lines 2-8 Link Here

(-)b/graphics/qt5-pixeltool/Makefile (-1 lines)
2		2
3	PORTNAME= pixeltool	3	PORTNAME= pixeltool
4	DISTVERSION= ${QT5_VERSION}	4	DISTVERSION= ${QT5_VERSION}
5	PORTREVISION= 1
6	CATEGORIES= graphics	5	CATEGORIES= graphics
7	PKGNAMEPREFIX= qt5-	6	PKGNAMEPREFIX= qt5-
8		7

Lines 19-28 Link Here

(-)b/graphics/qt5-svg/pkg-plist (-2 / +2 lines)
19	%%QT_INCDIR%%/QtSvg/qsvgwidget.h	19	%%QT_INCDIR%%/QtSvg/qsvgwidget.h
20	%%QT_INCDIR%%/QtSvg/qtsvgglobal.h	20	%%QT_INCDIR%%/QtSvg/qtsvgglobal.h
21	%%QT_INCDIR%%/QtSvg/qtsvgversion.h	21	%%QT_INCDIR%%/QtSvg/qtsvgversion.h
		22	%%QT_CMAKEDIR%%/Qt5Gui/Qt5Gui_QSvgIconPlugin.cmake
		23	%%QT_CMAKEDIR%%/Qt5Gui/Qt5Gui_QSvgPlugin.cmake
22	%%QT_CMAKEDIR%%/Qt5Svg/Qt5SvgConfig.cmake	24	%%QT_CMAKEDIR%%/Qt5Svg/Qt5SvgConfig.cmake
23	%%QT_CMAKEDIR%%/Qt5Svg/Qt5SvgConfigVersion.cmake	25	%%QT_CMAKEDIR%%/Qt5Svg/Qt5SvgConfigVersion.cmake
24	%%QT_CMAKEDIR%%/Qt5Svg/Qt5Svg_QSvgIconPlugin.cmake
25	%%QT_CMAKEDIR%%/Qt5Svg/Qt5Svg_QSvgPlugin.cmake
26	%%QT_LIBDIR%%/libQt5Svg.prl	26	%%QT_LIBDIR%%/libQt5Svg.prl
27	%%QT_LIBDIR%%/libQt5Svg.so	27	%%QT_LIBDIR%%/libQt5Svg.so
28	%%QT_LIBDIR%%/libQt5Svg.so.5	28	%%QT_LIBDIR%%/libQt5Svg.so.5

Lines 2-8 Link Here

(-)b/graphics/qt5-wayland/Makefile (-1 lines)
2		2
3	PORTNAME= wayland	3	PORTNAME= wayland
4	DISTVERSION= ${QT5_VERSION}	4	DISTVERSION= ${QT5_VERSION}
5	PORTREVISION= 1
6	CATEGORIES= graphics	5	CATEGORIES= graphics
7	PKGNAMEPREFIX= qt5-	6	PKGNAMEPREFIX= qt5-
8		7




%%QT_INCDIR%%/QtWaylandClient/%%FULLVER%%/QtWaylandClient/private/qwayland-text-input-unstable-v2.h
%%QT_INCDIR%%/QtWaylandClient/%%FULLVER%%/QtWaylandClient/private/qwayland-touch-extension.h
%%QT_INCDIR%%/QtWaylandClient/%%FULLVER%%/QtWaylandClient/private/qwayland-wayland.h
%%QT_INCDIR%%/QtWaylandClient/%%FULLVER%%/QtWaylandClient/private/qwayland-wp-primary-selection-unstable-v1.h
%%QT_INCDIR%%/QtWaylandClient/%%FULLVER%%/QtWaylandClient/private/qwayland-xdg-output-unstable-v1.h
%%QT_INCDIR%%/QtWaylandClient/%%FULLVER%%/QtWaylandClient/private/qwaylandabstractdecoration_p.h
%%QT_INCDIR%%/QtWaylandClient/%%FULLVER%%/QtWaylandClient/private/qwaylandbuffer_p.h

%%QT_INCDIR%%/QtWaylandClient/%%FULLVER%%/QtWaylandClient/private/qwaylandinputdeviceintegrationplugin_p.h
%%QT_INCDIR%%/QtWaylandClient/%%FULLVER%%/QtWaylandClient/private/qwaylandintegration_p.h
%%QT_INCDIR%%/QtWaylandClient/%%FULLVER%%/QtWaylandClient/private/qwaylandnativeinterface_p.h
%%QT_INCDIR%%/QtWaylandClient/%%FULLVER%%/QtWaylandClient/private/qwaylandprimaryselectionv1_p.h
%%QT_INCDIR%%/QtWaylandClient/%%FULLVER%%/QtWaylandClient/private/qwaylandqtkey_p.h
%%QT_INCDIR%%/QtWaylandClient/%%FULLVER%%/QtWaylandClient/private/qwaylandscreen_p.h
%%QT_INCDIR%%/QtWaylandClient/%%FULLVER%%/QtWaylandClient/private/qwaylandserverbufferintegration_p.h

%%QT_INCDIR%%/QtWaylandClient/%%FULLVER%%/QtWaylandClient/private/qwaylandshmbackingstore_p.h
%%QT_INCDIR%%/QtWaylandClient/%%FULLVER%%/QtWaylandClient/private/qwaylandshmwindow_p.h
%%QT_INCDIR%%/QtWaylandClient/%%FULLVER%%/QtWaylandClient/private/qwaylandsubsurface_p.h
%%QT_INCDIR%%/QtWaylandClient/%%FULLVER%%/QtWaylandClient/private/qwaylandsurface_p.h
%%QT_INCDIR%%/QtWaylandClient/%%FULLVER%%/QtWaylandClient/private/qwaylandtouch_p.h
%%QT_INCDIR%%/QtWaylandClient/%%FULLVER%%/QtWaylandClient/private/qwaylandwindow_p.h
%%QT_INCDIR%%/QtWaylandClient/%%FULLVER%%/QtWaylandClient/private/qwaylandwindowmanagerintegration_p.h

%%QT_INCDIR%%/QtWaylandClient/%%FULLVER%%/QtWaylandClient/private/wayland-text-input-unstable-v2-client-protocol.h
%%QT_INCDIR%%/QtWaylandClient/%%FULLVER%%/QtWaylandClient/private/wayland-touch-extension-client-protocol.h
%%QT_INCDIR%%/QtWaylandClient/%%FULLVER%%/QtWaylandClient/private/wayland-wayland-client-protocol.h
%%QT_INCDIR%%/QtWaylandClient/%%FULLVER%%/QtWaylandClient/private/wayland-wp-primary-selection-unstable-v1-client-protocol.h
%%QT_INCDIR%%/QtWaylandClient/%%FULLVER%%/QtWaylandClient/private/wayland-xdg-output-unstable-v1-client-protocol.h
%%QT_INCDIR%%/QtWaylandClient/QWaylandClientExtension
%%QT_INCDIR%%/QtWaylandClient/QWaylandClientExtensionTemplate

%%QT_INCDIR%%/QtWaylandCompositor/%%FULLVER%%/QtWaylandCompositor/private/qtwaylandcompositor-config_p.h
%%QT_INCDIR%%/QtWaylandCompositor/%%FULLVER%%/QtWaylandCompositor/private/qtwaylandcompositorglobal_p.h
%%QT_INCDIR%%/QtWaylandCompositor/%%FULLVER%%/QtWaylandCompositor/private/qwayland-server-hardware-integration.h
%%QT_INCDIR%%/QtWaylandCompositor/%%FULLVER%%/QtWaylandCompositor/private/qwayland-server-idle-inhibit-unstable-v1.h
%%QT_INCDIR%%/QtWaylandCompositor/%%FULLVER%%/QtWaylandCompositor/private/qwayland-server-ivi-application.h
%%QT_INCDIR%%/QtWaylandCompositor/%%FULLVER%%/QtWaylandCompositor/private/qwayland-server-qt-key-unstable-v1.h
%%QT_INCDIR%%/QtWaylandCompositor/%%FULLVER%%/QtWaylandCompositor/private/qwayland-server-qt-texture-sharing-unstable-v1.h
%%QT_INCDIR%%/QtWaylandCompositor/%%FULLVER%%/QtWaylandCompositor/private/qwayland-server-qt-windowmanager.h
%%QT_INCDIR%%/QtWaylandCompositor/%%FULLVER%%/QtWaylandCompositor/private/qwayland-server-scaler.h
%%QT_INCDIR%%/QtWaylandCompositor/%%FULLVER%%/QtWaylandCompositor/private/qwayland-server-server-buffer-extension.h

%%QT_INCDIR%%/QtWaylandCompositor/%%FULLVER%%/QtWaylandCompositor/private/qwayland-server-viewporter.h
%%QT_INCDIR%%/QtWaylandCompositor/%%FULLVER%%/QtWaylandCompositor/private/qwayland-server-wayland.h
%%QT_INCDIR%%/QtWaylandCompositor/%%FULLVER%%/QtWaylandCompositor/private/qwayland-server-xdg-decoration-unstable-v1.h
%%QT_INCDIR%%/QtWaylandCompositor/%%FULLVER%%/QtWaylandCompositor/private/qwayland-server-xdg-output-unstable-v1.h
%%QT_INCDIR%%/QtWaylandCompositor/%%FULLVER%%/QtWaylandCompositor/private/qwayland-server-xdg-shell-unstable-v5_p.h
%%QT_INCDIR%%/QtWaylandCompositor/%%FULLVER%%/QtWaylandCompositor/private/qwayland-server-xdg-shell-unstable-v6.h
%%QT_INCDIR%%/QtWaylandCompositor/%%FULLVER%%/QtWaylandCompositor/private/qwayland-server-xdg-shell.h
%%QT_INCDIR%%/QtWaylandCompositor/%%FULLVER%%/QtWaylandCompositor/private/qwaylandcompositor_p.h
%%QT_INCDIR%%/QtWaylandCompositor/%%FULLVER%%/QtWaylandCompositor/private/qwaylandcompositorextension_p.h
%%QT_INCDIR%%/QtWaylandCompositor/%%FULLVER%%/QtWaylandCompositor/private/qwaylanddestroylistener_p.h
%%QT_INCDIR%%/QtWaylandCompositor/%%FULLVER%%/QtWaylandCompositor/private/qwaylandidleinhibitv1_p.h
%%QT_INCDIR%%/QtWaylandCompositor/%%FULLVER%%/QtWaylandCompositor/private/qwaylandinputmethodcontrol_p.h
%%QT_INCDIR%%/QtWaylandCompositor/%%FULLVER%%/QtWaylandCompositor/private/qwaylandiviapplication_p.h
%%QT_INCDIR%%/QtWaylandCompositor/%%FULLVER%%/QtWaylandCompositor/private/qwaylandivisurface_p.h

%%QT_INCDIR%%/QtWaylandCompositor/%%FULLVER%%/QtWaylandCompositor/private/qwaylandwlshell_p.h
%%QT_INCDIR%%/QtWaylandCompositor/%%FULLVER%%/QtWaylandCompositor/private/qwaylandwlshellintegration_p.h
%%QT_INCDIR%%/QtWaylandCompositor/%%FULLVER%%/QtWaylandCompositor/private/qwaylandxdgdecorationv1_p.h
%%QT_INCDIR%%/QtWaylandCompositor/%%FULLVER%%/QtWaylandCompositor/private/qwaylandxdgoutputv1_p.h
%%QT_INCDIR%%/QtWaylandCompositor/%%FULLVER%%/QtWaylandCompositor/private/qwaylandxdgshell_p.h
%%QT_INCDIR%%/QtWaylandCompositor/%%FULLVER%%/QtWaylandCompositor/private/qwaylandxdgshellintegration_p.h
%%QT_INCDIR%%/QtWaylandCompositor/%%FULLVER%%/QtWaylandCompositor/private/qwaylandxdgshellv5_p.h

%%QT_INCDIR%%/QtWaylandCompositor/%%FULLVER%%/QtWaylandCompositor/private/qwlserverbufferintegrationplugin_p.h
%%QT_INCDIR%%/QtWaylandCompositor/%%FULLVER%%/QtWaylandCompositor/private/qwltexturesharingextension_p.h
%%QT_INCDIR%%/QtWaylandCompositor/%%FULLVER%%/QtWaylandCompositor/private/wayland-hardware-integration-server-protocol.h
%%QT_INCDIR%%/QtWaylandCompositor/%%FULLVER%%/QtWaylandCompositor/private/wayland-idle-inhibit-unstable-v1-server-protocol.h
%%QT_INCDIR%%/QtWaylandCompositor/%%FULLVER%%/QtWaylandCompositor/private/wayland-ivi-application-server-protocol.h
%%QT_INCDIR%%/QtWaylandCompositor/%%FULLVER%%/QtWaylandCompositor/private/wayland-qt-key-unstable-v1-server-protocol.h
%%QT_INCDIR%%/QtWaylandCompositor/%%FULLVER%%/QtWaylandCompositor/private/wayland-qt-texture-sharing-unstable-v1-server-protocol.h
%%QT_INCDIR%%/QtWaylandCompositor/%%FULLVER%%/QtWaylandCompositor/private/wayland-qt-windowmanager-server-protocol.h
%%QT_INCDIR%%/QtWaylandCompositor/%%FULLVER%%/QtWaylandCompositor/private/wayland-scaler-server-protocol.h
%%QT_INCDIR%%/QtWaylandCompositor/%%FULLVER%%/QtWaylandCompositor/private/wayland-server-buffer-extension-server-protocol.h

%%QT_INCDIR%%/QtWaylandCompositor/%%FULLVER%%/QtWaylandCompositor/private/wayland-viewporter-server-protocol.h
%%QT_INCDIR%%/QtWaylandCompositor/%%FULLVER%%/QtWaylandCompositor/private/wayland-wayland-server-protocol.h
%%QT_INCDIR%%/QtWaylandCompositor/%%FULLVER%%/QtWaylandCompositor/private/wayland-xdg-decoration-unstable-v1-server-protocol.h
%%QT_INCDIR%%/QtWaylandCompositor/%%FULLVER%%/QtWaylandCompositor/private/wayland-xdg-output-unstable-v1-server-protocol.h
%%QT_INCDIR%%/QtWaylandCompositor/%%FULLVER%%/QtWaylandCompositor/private/wayland-xdg-shell-server-protocol.h
%%QT_INCDIR%%/QtWaylandCompositor/%%FULLVER%%/QtWaylandCompositor/private/wayland-xdg-shell-unstable-v5-server-protocol_p.h
%%QT_INCDIR%%/QtWaylandCompositor/%%FULLVER%%/QtWaylandCompositor/private/wayland-xdg-shell-unstable-v6-server-protocol.h

%%QT_INCDIR%%/QtWaylandCompositor/QWaylandCompositorExtensionTemplate
%%QT_INCDIR%%/QtWaylandCompositor/QWaylandDestroyListener
%%QT_INCDIR%%/QtWaylandCompositor/QWaylandDrag
%%QT_INCDIR%%/QtWaylandCompositor/QWaylandIdleInhibitManagerV1
%%QT_INCDIR%%/QtWaylandCompositor/QWaylandInputMethodControl
%%QT_INCDIR%%/QtWaylandCompositor/QWaylandIviApplication
%%QT_INCDIR%%/QtWaylandCompositor/QWaylandIviSurface

%%QT_INCDIR%%/QtWaylandCompositor/QWaylandQuickExtension
%%QT_INCDIR%%/QtWaylandCompositor/QWaylandQuickItem
%%QT_INCDIR%%/QtWaylandCompositor/QWaylandQuickOutput
%%QT_INCDIR%%/QtWaylandCompositor/QWaylandQuickShellIntegration
%%QT_INCDIR%%/QtWaylandCompositor/QWaylandQuickShellSurfaceItem
%%QT_INCDIR%%/QtWaylandCompositor/QWaylandQuickSurface
%%QT_INCDIR%%/QtWaylandCompositor/QWaylandQuickXdgOutputV1
%%QT_INCDIR%%/QtWaylandCompositor/QWaylandResource
%%QT_INCDIR%%/QtWaylandCompositor/QWaylandSeat
%%QT_INCDIR%%/QtWaylandCompositor/QWaylandShell

%%QT_INCDIR%%/QtWaylandCompositor/QWaylandWlShell
%%QT_INCDIR%%/QtWaylandCompositor/QWaylandWlShellSurface
%%QT_INCDIR%%/QtWaylandCompositor/QWaylandXdgDecorationManagerV1
%%QT_INCDIR%%/QtWaylandCompositor/QWaylandXdgOutputManagerV1
%%QT_INCDIR%%/QtWaylandCompositor/QWaylandXdgOutputV1
%%QT_INCDIR%%/QtWaylandCompositor/QWaylandXdgPopup
%%QT_INCDIR%%/QtWaylandCompositor/QWaylandXdgPopupV5
%%QT_INCDIR%%/QtWaylandCompositor/QWaylandXdgPopupV6

%%QT_INCDIR%%/QtWaylandCompositor/qwaylanddestroylistener.h
%%QT_INCDIR%%/QtWaylandCompositor/qwaylanddrag.h
%%QT_INCDIR%%/QtWaylandCompositor/qwaylandexport.h
%%QT_INCDIR%%/QtWaylandCompositor/qwaylandidleinhibitv1.h
%%QT_INCDIR%%/QtWaylandCompositor/qwaylandinputmethodcontrol.h
%%QT_INCDIR%%/QtWaylandCompositor/qwaylandiviapplication.h
%%QT_INCDIR%%/QtWaylandCompositor/qwaylandivisurface.h

%%QT_INCDIR%%/QtWaylandCompositor/qwaylandquickextension.h
%%QT_INCDIR%%/QtWaylandCompositor/qwaylandquickitem.h
%%QT_INCDIR%%/QtWaylandCompositor/qwaylandquickoutput.h
%%QT_INCDIR%%/QtWaylandCompositor/qwaylandquickshellintegration.h
%%QT_INCDIR%%/QtWaylandCompositor/qwaylandquickshellsurfaceitem.h
%%QT_INCDIR%%/QtWaylandCompositor/qwaylandquicksurface.h
%%QT_INCDIR%%/QtWaylandCompositor/qwaylandquickxdgoutputv1.h
%%QT_INCDIR%%/QtWaylandCompositor/qwaylandresource.h
%%QT_INCDIR%%/QtWaylandCompositor/qwaylandseat.h
%%QT_INCDIR%%/QtWaylandCompositor/qwaylandshell.h

%%QT_INCDIR%%/QtWaylandCompositor/qwaylandwlscaler.h
%%QT_INCDIR%%/QtWaylandCompositor/qwaylandwlshell.h
%%QT_INCDIR%%/QtWaylandCompositor/qwaylandxdgdecorationv1.h
%%QT_INCDIR%%/QtWaylandCompositor/qwaylandxdgoutputv1.h
%%QT_INCDIR%%/QtWaylandCompositor/qwaylandxdgshell.h
%%QT_INCDIR%%/QtWaylandCompositor/qwaylandxdgshellv5.h
%%QT_INCDIR%%/QtWaylandCompositor/qwaylandxdgshellv6.h

%%QT_CMAKEDIR%%/Qt5WaylandClient/Qt5WaylandClient_QWaylandXdgShellV5IntegrationPlugin.cmake
%%QT_CMAKEDIR%%/Qt5WaylandClient/Qt5WaylandClient_QWaylandXdgShellV6IntegrationPlugin.cmake
%%QT_CMAKEDIR%%/Qt5WaylandClient/Qt5WaylandClient_ShmServerBufferPlugin.cmake
%%QT_CMAKEDIR%%/Qt5WaylandClient/Qt5WaylandClient_VulkanServerBufferPlugin.cmake
%%QT_CMAKEDIR%%/Qt5WaylandCompositor/Qt5WaylandCompositorConfig.cmake
%%QT_CMAKEDIR%%/Qt5WaylandCompositor/Qt5WaylandCompositorConfigVersion.cmake
%%QT_CMAKEDIR%%/Qt5WaylandCompositor/Qt5WaylandCompositor_DmaBufServerBufferIntegrationPlugin.cmake

%%QT_CMAKEDIR%%/Qt5WaylandCompositor/Qt5WaylandCompositor_QWaylandXCompositeEglClientBufferIntegrationPlugin.cmake
%%QT_CMAKEDIR%%/Qt5WaylandCompositor/Qt5WaylandCompositor_QWaylandXCompositeGlxClientBufferIntegrationPlugin.cmake
%%QT_CMAKEDIR%%/Qt5WaylandCompositor/Qt5WaylandCompositor_ShmServerBufferIntegrationPlugin.cmake
%%QT_CMAKEDIR%%/Qt5WaylandCompositor/Qt5WaylandCompositor_VulkanServerBufferIntegrationPlugin.cmake
%%QT_BINDIR%%/qtwaylandscanner
%%QT_LIBDIR%%/libQt5WaylandClient.prl
%%QT_LIBDIR%%/libQt5WaylandClient.so

%%DEBUG%%%%QT_PLUGINDIR%%/wayland-graphics-integration-client/libqt-plugin-wayland-egl.so.debug
%%QT_PLUGINDIR%%/wayland-graphics-integration-client/libshm-emulation-server.so
%%DEBUG%%%%QT_PLUGINDIR%%/wayland-graphics-integration-client/libshm-emulation-server.so.debug
%%QT_PLUGINDIR%%/wayland-graphics-integration-client/libvulkan-server.so
%%DEBUG%%%%QT_PLUGINDIR%%/wayland-graphics-integration-client/libvulkan-server.so.debug
%%QT_PLUGINDIR%%/wayland-graphics-integration-client/libxcomposite-egl.so
%%DEBUG%%%%QT_PLUGINDIR%%/wayland-graphics-integration-client/libxcomposite-egl.so.debug
%%QT_PLUGINDIR%%/wayland-graphics-integration-client/libxcomposite-glx.so

%%DEBUG%%%%QT_PLUGINDIR%%/wayland-graphics-integration-server/libqt-plugin-wayland-egl.so.debug
%%QT_PLUGINDIR%%/wayland-graphics-integration-server/libshm-emulation-server.so
%%DEBUG%%%%QT_PLUGINDIR%%/wayland-graphics-integration-server/libshm-emulation-server.so.debug
%%QT_PLUGINDIR%%/wayland-graphics-integration-server/libvulkan-server.so
%%DEBUG%%%%QT_PLUGINDIR%%/wayland-graphics-integration-server/libvulkan-server.so.debug
%%QT_PLUGINDIR%%/wayland-graphics-integration-server/libwayland-eglstream-controller.so
%%DEBUG%%%%QT_PLUGINDIR%%/wayland-graphics-integration-server/libwayland-eglstream-controller.so.debug
%%QT_PLUGINDIR%%/wayland-graphics-integration-server/libxcomposite-egl.so

%%DEBUG%%%%QT_PLUGINDIR%%/wayland-shell-integration/libxdg-shell-v6.so.debug
%%QT_PLUGINDIR%%/wayland-shell-integration/libxdg-shell.so
%%DEBUG%%%%QT_PLUGINDIR%%/wayland-shell-integration/libxdg-shell.so.debug
%%QT_QMLDIR%%/QtWayland/Client/TextureSharing/libqwaylandtexturesharing.so
%%DEBUG%%%%QT_QMLDIR%%/QtWayland/Client/TextureSharing/libqwaylandtexturesharing.so.debug
%%QT_QMLDIR%%/QtWayland/Client/TextureSharing/qmldir
%%QT_QMLDIR%%/QtWayland/Compositor/TextureSharingExtension/libqwaylandtexturesharingextension.so
%%DEBUG%%%%QT_QMLDIR%%/QtWayland/Compositor/TextureSharingExtension/libqwaylandtexturesharingextension.so.debug
%%QT_QMLDIR%%/QtWayland/Compositor/TextureSharingExtension/qmldir
%%DEBUG%%%%QT_QMLDIR%%/QtWayland/Compositor/WaylandCursorItem.qml
%%DEBUG%%%%QT_QMLDIR%%/QtWayland/Compositor/WaylandOutputWindow.qml
%%QT_QMLDIR%%/QtWayland/Compositor/libqwaylandcompositorplugin.so
%%DEBUG%%%%QT_QMLDIR%%/QtWayland/Compositor/libqwaylandcompositorplugin.so.debug
%%QT_QMLDIR%%/QtWayland/Compositor/plugins.qmltypes
%%QT_QMLDIR%%/QtWayland/Compositor/qmldir
libdata/pkgconfig/Qt5WaylandClient.pc
libdata/pkgconfig/Qt5WaylandCompositor.pc

Lines 13-18 COMMENT= Keyboard-oriented desktop scientific calculator Link Here

(-)b/math/speedcrunch/Makefile (+2 lines)
13		13
14	LICENSE= GPLv2+	14	LICENSE= GPLv2+
15		15
		16	BROKEN= Does not build with Qt5-5.14
		17
16	BB_ACCOUNT= heldercorreia	18	BB_ACCOUNT= heldercorreia
17	BB_PROJECT= ${PORTNAME}	19	BB_PROJECT= ${PORTNAME}
18	BB_COMMIT= c0fc9c68d292	20	BB_COMMIT= c0fc9c68d292

Lines 1-3 Link Here

(-)b/misc/qt5-examples/distinfo (-3 / +3 lines)
1	TIMESTAMP = 1572555131	1	TIMESTAMP = 1580149672
2	SHA256 (KDE/Qt/5.13.2/qt-everywhere-src-5.13.2.tar.xz) = 55e8273536be41f4f63064a79e552a22133848bb419400b6fa8e9fc0dc05de08	2	SHA256 (KDE/Qt/5.14.1/qt-everywhere-src-5.14.1.tar.xz) = 6f17f488f512b39c2feb57d83a5e0a13dcef32999bea2e2a8f832f54a29badb8
3	SIZE (KDE/Qt/5.13.2/qt-everywhere-src-5.13.2.tar.xz) = 500830260	3	SIZE (KDE/Qt/5.14.1/qt-everywhere-src-5.14.1.tar.xz) = 549084824

Lines 1830-1835 Link Here

(-)b/misc/qt5-examples/pkg-plist (-8 / +151 lines)
1830	%%QT_EXAMPLEDIR%%/multimedia/spectrum/doc/src/spectrum.qdoc	1830	%%QT_EXAMPLEDIR%%/multimedia/spectrum/doc/src/spectrum.qdoc
1831	%%QT_EXAMPLEDIR%%/multimedia/spectrum/spectrum.pri	1831	%%QT_EXAMPLEDIR%%/multimedia/spectrum/spectrum.pri
1832	%%QT_EXAMPLEDIR%%/multimedia/spectrum/spectrum.pro	1832	%%QT_EXAMPLEDIR%%/multimedia/spectrum/spectrum.pro
		1833	%%QT_EXAMPLEDIR%%/multimedia/video/android/android.pro
		1834	%%QT_EXAMPLEDIR%%/multimedia/video/android/gstreamer/gstreamer.pro
		1835	%%QT_EXAMPLEDIR%%/multimedia/video/android/gstreamer/main.cpp
		1836	%%QT_EXAMPLEDIR%%/multimedia/video/android/gstreamer/main.qml
		1837	%%QT_EXAMPLEDIR%%/multimedia/video/android/gstreamer/qml.qrc
1833	%%QT_EXAMPLEDIR%%/multimedia/video/doc/images/qmlvideo-menu.jpg	1838	%%QT_EXAMPLEDIR%%/multimedia/video/doc/images/qmlvideo-menu.jpg
1834	%%QT_EXAMPLEDIR%%/multimedia/video/doc/images/qmlvideo-overlay.jpg	1839	%%QT_EXAMPLEDIR%%/multimedia/video/doc/images/qmlvideo-overlay.jpg
1835	%%QT_EXAMPLEDIR%%/multimedia/video/doc/images/qmlvideofx-camera-glow.jpg	1840	%%QT_EXAMPLEDIR%%/multimedia/video/doc/images/qmlvideofx-camera-glow.jpg
Lines 2890-2895 Link Here
2890	%%QT_EXAMPLEDIR%%/qt3d/controls/controls.qrc	2895	%%QT_EXAMPLEDIR%%/qt3d/controls/controls.qrc
2891	%%QT_EXAMPLEDIR%%/qt3d/controls/main.cpp	2896	%%QT_EXAMPLEDIR%%/qt3d/controls/main.cpp
2892	%%QT_EXAMPLEDIR%%/qt3d/controls/main.qml	2897	%%QT_EXAMPLEDIR%%/qt3d/controls/main.qml
		2898	%%QT_EXAMPLEDIR%%/qt3d/controlsunderlay/Logo.qml
		2899	%%QT_EXAMPLEDIR%%/qt3d/controlsunderlay/Qt_logo.obj
		2900	%%QT_EXAMPLEDIR%%/qt3d/controlsunderlay/controls.qrc
		2901	%%QT_EXAMPLEDIR%%/qt3d/controlsunderlay/controlsunderlay.pro
		2902	%%QT_EXAMPLEDIR%%/qt3d/controlsunderlay/main.cpp
		2903	%%QT_EXAMPLEDIR%%/qt3d/controlsunderlay/main.qml
2893	%%QT_EXAMPLEDIR%%/qt3d/exampleresources/assets/LICENSE	2904	%%QT_EXAMPLEDIR%%/qt3d/exampleresources/assets/LICENSE
2894	%%QT_EXAMPLEDIR%%/qt3d/exampleresources/assets/cubemaps/default/default_irradiance.dds	2905	%%QT_EXAMPLEDIR%%/qt3d/exampleresources/assets/cubemaps/default/default_irradiance.dds
2895	%%QT_EXAMPLEDIR%%/qt3d/exampleresources/assets/cubemaps/default/default_specular.dds	2906	%%QT_EXAMPLEDIR%%/qt3d/exampleresources/assets/cubemaps/default/default_specular.dds
Lines 3153-3158 Link Here
3153	%%QT_EXAMPLEDIR%%/qt3d/scene3d/main.qml	3164	%%QT_EXAMPLEDIR%%/qt3d/scene3d/main.qml
3154	%%QT_EXAMPLEDIR%%/qt3d/scene3d/scene3d.pro	3165	%%QT_EXAMPLEDIR%%/qt3d/scene3d/scene3d.pro
3155	%%QT_EXAMPLEDIR%%/qt3d/scene3d/scene3d.qrc	3166	%%QT_EXAMPLEDIR%%/qt3d/scene3d/scene3d.qrc
		3167	%%QT_EXAMPLEDIR%%/qt3d/scene3dview/AnimatedEntity.qml
		3168	%%QT_EXAMPLEDIR%%/qt3d/scene3dview/doc/images/scene3dview.png
		3169	%%QT_EXAMPLEDIR%%/qt3d/scene3dview/doc/src/scene3dview.qdoc
		3170	%%QT_EXAMPLEDIR%%/qt3d/scene3dview/main.cpp
		3171	%%QT_EXAMPLEDIR%%/qt3d/scene3dview/main.qml
		3172	%%QT_EXAMPLEDIR%%/qt3d/scene3dview/scene3dview.pro
		3173	%%QT_EXAMPLEDIR%%/qt3d/scene3dview/scene3dview.qrc
3156	%%QT_EXAMPLEDIR%%/qt3d/shadow-map-qml/AdsEffect.qml	3174	%%QT_EXAMPLEDIR%%/qt3d/shadow-map-qml/AdsEffect.qml
3157	%%QT_EXAMPLEDIR%%/qt3d/shadow-map-qml/AdsMaterial.qml	3175	%%QT_EXAMPLEDIR%%/qt3d/shadow-map-qml/AdsMaterial.qml
3158	%%QT_EXAMPLEDIR%%/qt3d/shadow-map-qml/GroundPlane.qml	3176	%%QT_EXAMPLEDIR%%/qt3d/shadow-map-qml/GroundPlane.qml
Lines 3432-3448 Link Here
3432	%%QT_EXAMPLEDIR%%/quick/imageelements/content/colors-round.sci	3450	%%QT_EXAMPLEDIR%%/quick/imageelements/content/colors-round.sci
3433	%%QT_EXAMPLEDIR%%/quick/imageelements/content/colors-stretch.sci	3451	%%QT_EXAMPLEDIR%%/quick/imageelements/content/colors-stretch.sci
3434	%%QT_EXAMPLEDIR%%/quick/imageelements/content/colors.png	3452	%%QT_EXAMPLEDIR%%/quick/imageelements/content/colors.png
		3453	%%QT_EXAMPLEDIR%%/quick/imageelements/content/multi.ico
3435	%%QT_EXAMPLEDIR%%/quick/imageelements/content/qt-logo.png	3454	%%QT_EXAMPLEDIR%%/quick/imageelements/content/qt-logo.png
3436	%%QT_EXAMPLEDIR%%/quick/imageelements/content/shadow.png	3455	%%QT_EXAMPLEDIR%%/quick/imageelements/content/shadow.png
3437	%%QT_EXAMPLEDIR%%/quick/imageelements/content/speaker.png	3456	%%QT_EXAMPLEDIR%%/quick/imageelements/content/speaker.png
3438	%%QT_EXAMPLEDIR%%/quick/imageelements/doc/images/qml-imageelements-example.png	3457	%%QT_EXAMPLEDIR%%/quick/imageelements/doc/images/qml-imageelements-example.png
3439	%%QT_EXAMPLEDIR%%/quick/imageelements/doc/src/imageelements.qdoc	3458	%%QT_EXAMPLEDIR%%/quick/imageelements/doc/src/imageelements.qdoc
		3459	%%QT_EXAMPLEDIR%%/quick/imageelements/framestepping.qml
3440	%%QT_EXAMPLEDIR%%/quick/imageelements/image.qml	3460	%%QT_EXAMPLEDIR%%/quick/imageelements/image.qml
3441	%%QT_EXAMPLEDIR%%/quick/imageelements/imageelements.pro	3461	%%QT_EXAMPLEDIR%%/quick/imageelements/imageelements.pro
3442	%%QT_EXAMPLEDIR%%/quick/imageelements/imageelements.qml	3462	%%QT_EXAMPLEDIR%%/quick/imageelements/imageelements.qml
3443	%%QT_EXAMPLEDIR%%/quick/imageelements/imageelements.qmlproject	3463	%%QT_EXAMPLEDIR%%/quick/imageelements/imageelements.qmlproject
3444	%%QT_EXAMPLEDIR%%/quick/imageelements/imageelements.qrc	3464	%%QT_EXAMPLEDIR%%/quick/imageelements/imageelements.qrc
3445	%%QT_EXAMPLEDIR%%/quick/imageelements/main.cpp	3465	%%QT_EXAMPLEDIR%%/quick/imageelements/main.cpp
		3466	%%QT_EXAMPLEDIR%%/quick/imageelements/multiframeborderimage.qml
3446	%%QT_EXAMPLEDIR%%/quick/imageelements/shadows.qml	3467	%%QT_EXAMPLEDIR%%/quick/imageelements/shadows.qml
3447	%%QT_EXAMPLEDIR%%/quick/imageelements/spritesequence.qml	3468	%%QT_EXAMPLEDIR%%/quick/imageelements/spritesequence.qml
3448	%%QT_EXAMPLEDIR%%/quick/imageprovider/ImageProviderCore/qmldir	3469	%%QT_EXAMPLEDIR%%/quick/imageprovider/ImageProviderCore/qmldir
Lines 3704-3709 Link Here
3704	%%QT_EXAMPLEDIR%%/quick/scenegraph/customgeometry/doc/src/customgeometry.qdoc	3725	%%QT_EXAMPLEDIR%%/quick/scenegraph/customgeometry/doc/src/customgeometry.qdoc
3705	%%QT_EXAMPLEDIR%%/quick/scenegraph/customgeometry/main.cpp	3726	%%QT_EXAMPLEDIR%%/quick/scenegraph/customgeometry/main.cpp
3706	%%QT_EXAMPLEDIR%%/quick/scenegraph/customgeometry/main.qml	3727	%%QT_EXAMPLEDIR%%/quick/scenegraph/customgeometry/main.qml
		3728	%%QT_EXAMPLEDIR%%/quick/scenegraph/d3d11underqml/d3d11squircle.cpp
		3729	%%QT_EXAMPLEDIR%%/quick/scenegraph/d3d11underqml/d3d11squircle.h
		3730	%%QT_EXAMPLEDIR%%/quick/scenegraph/d3d11underqml/d3d11underqml.pro
		3731	%%QT_EXAMPLEDIR%%/quick/scenegraph/d3d11underqml/d3d11underqml.qrc
		3732	%%QT_EXAMPLEDIR%%/quick/scenegraph/d3d11underqml/doc/images/d3d11underqml-example.jpg
		3733	%%QT_EXAMPLEDIR%%/quick/scenegraph/d3d11underqml/doc/src/d3d11underqml.qdoc
		3734	%%QT_EXAMPLEDIR%%/quick/scenegraph/d3d11underqml/main.cpp
		3735	%%QT_EXAMPLEDIR%%/quick/scenegraph/d3d11underqml/main.qml
		3736	%%QT_EXAMPLEDIR%%/quick/scenegraph/d3d11underqml/squircle.frag
		3737	%%QT_EXAMPLEDIR%%/quick/scenegraph/d3d11underqml/squircle.vert
		3738	%%QT_EXAMPLEDIR%%/quick/scenegraph/fboitem/doc/images/fboitem-example.jpg
		3739	%%QT_EXAMPLEDIR%%/quick/scenegraph/fboitem/doc/src/fboitem.qdoc
		3740	%%QT_EXAMPLEDIR%%/quick/scenegraph/fboitem/fboinsgrenderer.cpp
		3741	%%QT_EXAMPLEDIR%%/quick/scenegraph/fboitem/fboinsgrenderer.h
		3742	%%QT_EXAMPLEDIR%%/quick/scenegraph/fboitem/fboitem.pro
		3743	%%QT_EXAMPLEDIR%%/quick/scenegraph/fboitem/fboitem.qrc
		3744	%%QT_EXAMPLEDIR%%/quick/scenegraph/fboitem/main.cpp
		3745	%%QT_EXAMPLEDIR%%/quick/scenegraph/fboitem/main.qml
3707	%%QT_EXAMPLEDIR%%/quick/scenegraph/graph/doc/images/graph-example.jpg	3746	%%QT_EXAMPLEDIR%%/quick/scenegraph/graph/doc/images/graph-example.jpg
3708	%%QT_EXAMPLEDIR%%/quick/scenegraph/graph/doc/src/graph.qdoc	3747	%%QT_EXAMPLEDIR%%/quick/scenegraph/graph/doc/src/graph.qdoc
3709	%%QT_EXAMPLEDIR%%/quick/scenegraph/graph/graph.cpp	3748	%%QT_EXAMPLEDIR%%/quick/scenegraph/graph/graph.cpp
Lines 3722-3727 Link Here
3722	%%QT_EXAMPLEDIR%%/quick/scenegraph/graph/shaders/line.vsh	3761	%%QT_EXAMPLEDIR%%/quick/scenegraph/graph/shaders/line.vsh
3723	%%QT_EXAMPLEDIR%%/quick/scenegraph/graph/shaders/noisy.fsh	3762	%%QT_EXAMPLEDIR%%/quick/scenegraph/graph/shaders/noisy.fsh
3724	%%QT_EXAMPLEDIR%%/quick/scenegraph/graph/shaders/noisy.vsh	3763	%%QT_EXAMPLEDIR%%/quick/scenegraph/graph/shaders/noisy.vsh
		3764	%%QT_EXAMPLEDIR%%/quick/scenegraph/metaltextureimport/doc/images/metaltextureimport-example.jpg
		3765	%%QT_EXAMPLEDIR%%/quick/scenegraph/metaltextureimport/doc/src/metaltextureimport.qdoc
		3766	%%QT_EXAMPLEDIR%%/quick/scenegraph/metaltextureimport/main.cpp
		3767	%%QT_EXAMPLEDIR%%/quick/scenegraph/metaltextureimport/main.qml
		3768	%%QT_EXAMPLEDIR%%/quick/scenegraph/metaltextureimport/metaltextureimport.h
		3769	%%QT_EXAMPLEDIR%%/quick/scenegraph/metaltextureimport/metaltextureimport.mm
		3770	%%QT_EXAMPLEDIR%%/quick/scenegraph/metaltextureimport/metaltextureimport.pro
		3771	%%QT_EXAMPLEDIR%%/quick/scenegraph/metaltextureimport/metaltextureimport.qrc
		3772	%%QT_EXAMPLEDIR%%/quick/scenegraph/metaltextureimport/squircle.frag
		3773	%%QT_EXAMPLEDIR%%/quick/scenegraph/metaltextureimport/squircle.vert
		3774	%%QT_EXAMPLEDIR%%/quick/scenegraph/metalunderqml/doc/images/metalunderqml-example.jpg
		3775	%%QT_EXAMPLEDIR%%/quick/scenegraph/metalunderqml/doc/src/metalunderqml.qdoc
		3776	%%QT_EXAMPLEDIR%%/quick/scenegraph/metalunderqml/main.cpp
		3777	%%QT_EXAMPLEDIR%%/quick/scenegraph/metalunderqml/main.qml
		3778	%%QT_EXAMPLEDIR%%/quick/scenegraph/metalunderqml/metalsquircle.h
		3779	%%QT_EXAMPLEDIR%%/quick/scenegraph/metalunderqml/metalsquircle.mm
		3780	%%QT_EXAMPLEDIR%%/quick/scenegraph/metalunderqml/metalunderqml.pro
		3781	%%QT_EXAMPLEDIR%%/quick/scenegraph/metalunderqml/metalunderqml.qrc
		3782	%%QT_EXAMPLEDIR%%/quick/scenegraph/metalunderqml/squircle.frag
		3783	%%QT_EXAMPLEDIR%%/quick/scenegraph/metalunderqml/squircle.vert
3725	%%QT_EXAMPLEDIR%%/quick/scenegraph/openglunderqml/doc/images/openglunderqml-example.jpg	3784	%%QT_EXAMPLEDIR%%/quick/scenegraph/openglunderqml/doc/images/openglunderqml-example.jpg
3726	%%QT_EXAMPLEDIR%%/quick/scenegraph/openglunderqml/doc/src/openglunderqml.qdoc	3785	%%QT_EXAMPLEDIR%%/quick/scenegraph/openglunderqml/doc/src/openglunderqml.qdoc
3727	%%QT_EXAMPLEDIR%%/quick/scenegraph/openglunderqml/main.cpp	3786	%%QT_EXAMPLEDIR%%/quick/scenegraph/openglunderqml/main.cpp
Lines 3734-3741 Link Here
3734	%%QT_EXAMPLEDIR%%/quick/scenegraph/rendernode/customrenderitem.h	3793	%%QT_EXAMPLEDIR%%/quick/scenegraph/rendernode/customrenderitem.h
3735	%%QT_EXAMPLEDIR%%/quick/scenegraph/rendernode/d3d12renderer.cpp	3794	%%QT_EXAMPLEDIR%%/quick/scenegraph/rendernode/d3d12renderer.cpp
3736	%%QT_EXAMPLEDIR%%/quick/scenegraph/rendernode/d3d12renderer.h	3795	%%QT_EXAMPLEDIR%%/quick/scenegraph/rendernode/d3d12renderer.h
		3796	%%QT_EXAMPLEDIR%%/quick/scenegraph/rendernode/doc/images/rendernode-example.jpg
		3797	%%QT_EXAMPLEDIR%%/quick/scenegraph/rendernode/doc/src/rendernode.qdoc
3737	%%QT_EXAMPLEDIR%%/quick/scenegraph/rendernode/main.cpp	3798	%%QT_EXAMPLEDIR%%/quick/scenegraph/rendernode/main.cpp
3738	%%QT_EXAMPLEDIR%%/quick/scenegraph/rendernode/main.qml	3799	%%QT_EXAMPLEDIR%%/quick/scenegraph/rendernode/main.qml
		3800	%%QT_EXAMPLEDIR%%/quick/scenegraph/rendernode/metalrenderer.h
		3801	%%QT_EXAMPLEDIR%%/quick/scenegraph/rendernode/metalrenderer.mm
		3802	%%QT_EXAMPLEDIR%%/quick/scenegraph/rendernode/metalshader.frag
		3803	%%QT_EXAMPLEDIR%%/quick/scenegraph/rendernode/metalshader.vert
3739	%%QT_EXAMPLEDIR%%/quick/scenegraph/rendernode/openglrenderer.cpp	3804	%%QT_EXAMPLEDIR%%/quick/scenegraph/rendernode/openglrenderer.cpp
3740	%%QT_EXAMPLEDIR%%/quick/scenegraph/rendernode/openglrenderer.h	3805	%%QT_EXAMPLEDIR%%/quick/scenegraph/rendernode/openglrenderer.h
3741	%%QT_EXAMPLEDIR%%/quick/scenegraph/rendernode/rendernode.pro	3806	%%QT_EXAMPLEDIR%%/quick/scenegraph/rendernode/rendernode.pro
Lines 3754-3773 Link Here
3754	%%QT_EXAMPLEDIR%%/quick/scenegraph/sgengine/window.h	3819	%%QT_EXAMPLEDIR%%/quick/scenegraph/sgengine/window.h
3755	%%QT_EXAMPLEDIR%%/quick/scenegraph/shared/logorenderer.cpp	3820	%%QT_EXAMPLEDIR%%/quick/scenegraph/shared/logorenderer.cpp
3756	%%QT_EXAMPLEDIR%%/quick/scenegraph/shared/logorenderer.h	3821	%%QT_EXAMPLEDIR%%/quick/scenegraph/shared/logorenderer.h
		3822	%%QT_EXAMPLEDIR%%/quick/scenegraph/shared/squircle_rhi.frag
		3823	%%QT_EXAMPLEDIR%%/quick/scenegraph/shared/squircle_rhi.vert
3757	%%QT_EXAMPLEDIR%%/quick/scenegraph/simplematerial/doc/images/simplematerial-example.jpg	3824	%%QT_EXAMPLEDIR%%/quick/scenegraph/simplematerial/doc/images/simplematerial-example.jpg
3758	%%QT_EXAMPLEDIR%%/quick/scenegraph/simplematerial/doc/src/simplematerial.qdoc	3825	%%QT_EXAMPLEDIR%%/quick/scenegraph/simplematerial/doc/src/simplematerial.qdoc
3759	%%QT_EXAMPLEDIR%%/quick/scenegraph/simplematerial/main.qml	3826	%%QT_EXAMPLEDIR%%/quick/scenegraph/simplematerial/main.qml
3760	%%QT_EXAMPLEDIR%%/quick/scenegraph/simplematerial/simplematerial.cpp	3827	%%QT_EXAMPLEDIR%%/quick/scenegraph/simplematerial/simplematerial.cpp
3761	%%QT_EXAMPLEDIR%%/quick/scenegraph/simplematerial/simplematerial.pro	3828	%%QT_EXAMPLEDIR%%/quick/scenegraph/simplematerial/simplematerial.pro
3762	%%QT_EXAMPLEDIR%%/quick/scenegraph/simplematerial/simplematerial.qrc	3829	%%QT_EXAMPLEDIR%%/quick/scenegraph/simplematerial/simplematerial.qrc
3763	%%QT_EXAMPLEDIR%%/quick/scenegraph/textureinsgnode/doc/images/textureinsgnode-example.jpg
3764	%%QT_EXAMPLEDIR%%/quick/scenegraph/textureinsgnode/doc/src/textureinsgnode.qdoc
3765	%%QT_EXAMPLEDIR%%/quick/scenegraph/textureinsgnode/fboinsgrenderer.cpp
3766	%%QT_EXAMPLEDIR%%/quick/scenegraph/textureinsgnode/fboinsgrenderer.h
3767	%%QT_EXAMPLEDIR%%/quick/scenegraph/textureinsgnode/main.cpp
3768	%%QT_EXAMPLEDIR%%/quick/scenegraph/textureinsgnode/main.qml
3769	%%QT_EXAMPLEDIR%%/quick/scenegraph/textureinsgnode/textureinsgnode.pro
3770	%%QT_EXAMPLEDIR%%/quick/scenegraph/textureinsgnode/textureinsgnode.qrc
3771	%%QT_EXAMPLEDIR%%/quick/scenegraph/textureinthread/doc/images/textureinthread-example.jpg	3830	%%QT_EXAMPLEDIR%%/quick/scenegraph/textureinthread/doc/images/textureinthread-example.jpg
3772	%%QT_EXAMPLEDIR%%/quick/scenegraph/textureinthread/doc/src/textureinthread.qdoc	3831	%%QT_EXAMPLEDIR%%/quick/scenegraph/textureinthread/doc/src/textureinthread.qdoc
3773	%%QT_EXAMPLEDIR%%/quick/scenegraph/textureinthread/error.qml	3832	%%QT_EXAMPLEDIR%%/quick/scenegraph/textureinthread/error.qml
Lines 3792-3797 Link Here
3792	%%QT_EXAMPLEDIR%%/quick/scenegraph/twotextureproviders/twotextureproviders.qrc	3851	%%QT_EXAMPLEDIR%%/quick/scenegraph/twotextureproviders/twotextureproviders.qrc
3793	%%QT_EXAMPLEDIR%%/quick/scenegraph/twotextureproviders/xorblender.cpp	3852	%%QT_EXAMPLEDIR%%/quick/scenegraph/twotextureproviders/xorblender.cpp
3794	%%QT_EXAMPLEDIR%%/quick/scenegraph/twotextureproviders/xorblender.h	3853	%%QT_EXAMPLEDIR%%/quick/scenegraph/twotextureproviders/xorblender.h
		3854	%%QT_EXAMPLEDIR%%/quick/scenegraph/vulkanunderqml/doc/images/vulkanunderqml-example.jpg
		3855	%%QT_EXAMPLEDIR%%/quick/scenegraph/vulkanunderqml/doc/src/vulkanunderqml.qdoc
		3856	%%QT_EXAMPLEDIR%%/quick/scenegraph/vulkanunderqml/main.cpp
		3857	%%QT_EXAMPLEDIR%%/quick/scenegraph/vulkanunderqml/main.qml
		3858	%%QT_EXAMPLEDIR%%/quick/scenegraph/vulkanunderqml/squircle.frag.spv
		3859	%%QT_EXAMPLEDIR%%/quick/scenegraph/vulkanunderqml/squircle.vert.spv
		3860	%%QT_EXAMPLEDIR%%/quick/scenegraph/vulkanunderqml/vulkansquircle.cpp
		3861	%%QT_EXAMPLEDIR%%/quick/scenegraph/vulkanunderqml/vulkansquircle.h
		3862	%%QT_EXAMPLEDIR%%/quick/scenegraph/vulkanunderqml/vulkanunderqml.pro
		3863	%%QT_EXAMPLEDIR%%/quick/scenegraph/vulkanunderqml/vulkanunderqml.qrc
3795	%%QT_EXAMPLEDIR%%/quick/shadereffects/content/Slider.qml	3864	%%QT_EXAMPLEDIR%%/quick/shadereffects/content/Slider.qml
3796	%%QT_EXAMPLEDIR%%/quick/shadereffects/content/face-smile.png	3865	%%QT_EXAMPLEDIR%%/quick/shadereffects/content/face-smile.png
3797	%%QT_EXAMPLEDIR%%/quick/shadereffects/content/qt-logo.png	3866	%%QT_EXAMPLEDIR%%/quick/shadereffects/content/qt-logo.png
Lines 3801-3810 Link Here
3801	%%QT_EXAMPLEDIR%%/quick/shadereffects/content/shaders/+hlsl/outline.frag	3870	%%QT_EXAMPLEDIR%%/quick/shadereffects/content/shaders/+hlsl/outline.frag
3802	%%QT_EXAMPLEDIR%%/quick/shadereffects/content/shaders/+hlsl/shadow.frag	3871	%%QT_EXAMPLEDIR%%/quick/shadereffects/content/shaders/+hlsl/shadow.frag
3803	%%QT_EXAMPLEDIR%%/quick/shadereffects/content/shaders/+hlsl/wobble.frag	3872	%%QT_EXAMPLEDIR%%/quick/shadereffects/content/shaders/+hlsl/wobble.frag
		3873	%%QT_EXAMPLEDIR%%/quick/shadereffects/content/shaders/+qsb/blur.frag
		3874	%%QT_EXAMPLEDIR%%/quick/shadereffects/content/shaders/+qsb/colorize.frag
		3875	%%QT_EXAMPLEDIR%%/quick/shadereffects/content/shaders/+qsb/genie.vert
		3876	%%QT_EXAMPLEDIR%%/quick/shadereffects/content/shaders/+qsb/outline.frag
		3877	%%QT_EXAMPLEDIR%%/quick/shadereffects/content/shaders/+qsb/shadow.frag
		3878	%%QT_EXAMPLEDIR%%/quick/shadereffects/content/shaders/+qsb/wobble.frag
3804	%%QT_EXAMPLEDIR%%/quick/shadereffects/content/shaders/blur.frag	3879	%%QT_EXAMPLEDIR%%/quick/shadereffects/content/shaders/blur.frag
3805	%%QT_EXAMPLEDIR%%/quick/shadereffects/content/shaders/colorize.frag	3880	%%QT_EXAMPLEDIR%%/quick/shadereffects/content/shaders/colorize.frag
3806	%%QT_EXAMPLEDIR%%/quick/shadereffects/content/shaders/genie.vert	3881	%%QT_EXAMPLEDIR%%/quick/shadereffects/content/shaders/genie.vert
3807	%%QT_EXAMPLEDIR%%/quick/shadereffects/content/shaders/outline.frag	3882	%%QT_EXAMPLEDIR%%/quick/shadereffects/content/shaders/outline.frag
		3883	%%QT_EXAMPLEDIR%%/quick/shadereffects/content/shaders/rhi/blur.frag
		3884	%%QT_EXAMPLEDIR%%/quick/shadereffects/content/shaders/rhi/colorize.frag
		3885	%%QT_EXAMPLEDIR%%/quick/shadereffects/content/shaders/rhi/compile.bat
		3886	%%QT_EXAMPLEDIR%%/quick/shadereffects/content/shaders/rhi/genie.vert
		3887	%%QT_EXAMPLEDIR%%/quick/shadereffects/content/shaders/rhi/outline.frag
		3888	%%QT_EXAMPLEDIR%%/quick/shadereffects/content/shaders/rhi/shadow.frag
		3889	%%QT_EXAMPLEDIR%%/quick/shadereffects/content/shaders/rhi/wobble.frag
3808	%%QT_EXAMPLEDIR%%/quick/shadereffects/content/shaders/shadow.frag	3890	%%QT_EXAMPLEDIR%%/quick/shadereffects/content/shaders/shadow.frag
3809	%%QT_EXAMPLEDIR%%/quick/shadereffects/content/shaders/wobble.frag	3891	%%QT_EXAMPLEDIR%%/quick/shadereffects/content/shaders/wobble.frag
3810	%%QT_EXAMPLEDIR%%/quick/shadereffects/doc/images/qml-shadereffects-example.png	3892	%%QT_EXAMPLEDIR%%/quick/shadereffects/doc/images/qml-shadereffects-example.png
Lines 4975-4980 Link Here
4975	%%QT_EXAMPLEDIR%%/remoteobjects/ssl/sslserver/timemodel.cpp	5057	%%QT_EXAMPLEDIR%%/remoteobjects/ssl/sslserver/timemodel.cpp
4976	%%QT_EXAMPLEDIR%%/remoteobjects/ssl/sslserver/timemodel.h	5058	%%QT_EXAMPLEDIR%%/remoteobjects/ssl/sslserver/timemodel.h
4977	%%QT_EXAMPLEDIR%%/remoteobjects/timemodel.rep	5059	%%QT_EXAMPLEDIR%%/remoteobjects/timemodel.rep
		5060	%%QT_EXAMPLEDIR%%/remoteobjects/websockets/common/cert/cert.qrc
		5061	%%QT_EXAMPLEDIR%%/remoteobjects/websockets/common/cert/client.crt
		5062	%%QT_EXAMPLEDIR%%/remoteobjects/websockets/common/cert/client.key
		5063	%%QT_EXAMPLEDIR%%/remoteobjects/websockets/common/cert/rootCA.key
		5064	%%QT_EXAMPLEDIR%%/remoteobjects/websockets/common/cert/rootCA.pem
		5065	%%QT_EXAMPLEDIR%%/remoteobjects/websockets/common/cert/rootCA.srl
		5066	%%QT_EXAMPLEDIR%%/remoteobjects/websockets/common/cert/server.crt
		5067	%%QT_EXAMPLEDIR%%/remoteobjects/websockets/common/cert/server.key
		5068	%%QT_EXAMPLEDIR%%/remoteobjects/websockets/common/common.pri
		5069	%%QT_EXAMPLEDIR%%/remoteobjects/websockets/common/websocketiodevice.cpp
		5070	%%QT_EXAMPLEDIR%%/remoteobjects/websockets/common/websocketiodevice.h
		5071	%%QT_EXAMPLEDIR%%/remoteobjects/websockets/websockets.pro
		5072	%%QT_EXAMPLEDIR%%/remoteobjects/websockets/wsclient/main.cpp
		5073	%%QT_EXAMPLEDIR%%/remoteobjects/websockets/wsclient/wsclient.pro
		5074	%%QT_EXAMPLEDIR%%/remoteobjects/websockets/wsserver/main.cpp
		5075	%%QT_EXAMPLEDIR%%/remoteobjects/websockets/wsserver/wsserver.pro
4978	%%QT_EXAMPLEDIR%%/script/README	5076	%%QT_EXAMPLEDIR%%/script/README
4979	%%QT_EXAMPLEDIR%%/script/calculator/calculator.js	5077	%%QT_EXAMPLEDIR%%/script/calculator/calculator.js
4980	%%QT_EXAMPLEDIR%%/script/calculator/calculator.pro	5078	%%QT_EXAMPLEDIR%%/script/calculator/calculator.pro
Lines 5290-5295 Link Here
5290	%%QT_EXAMPLEDIR%%/sensors/sensor_explorer/import/import.json	5388	%%QT_EXAMPLEDIR%%/sensors/sensor_explorer/import/import.json
5291	%%QT_EXAMPLEDIR%%/sensors/sensor_explorer/import/import.pro	5389	%%QT_EXAMPLEDIR%%/sensors/sensor_explorer/import/import.pro
5292	%%QT_EXAMPLEDIR%%/sensors/sensor_explorer/import/main.cpp	5390	%%QT_EXAMPLEDIR%%/sensors/sensor_explorer/import/main.cpp
		5391	%%QT_EXAMPLEDIR%%/sensors/sensor_explorer/import/main.h
5293	%%QT_EXAMPLEDIR%%/sensors/sensor_explorer/import/propertyinfo.cpp	5392	%%QT_EXAMPLEDIR%%/sensors/sensor_explorer/import/propertyinfo.cpp
5294	%%QT_EXAMPLEDIR%%/sensors/sensor_explorer/import/propertyinfo.h	5393	%%QT_EXAMPLEDIR%%/sensors/sensor_explorer/import/propertyinfo.h
5295	%%QT_EXAMPLEDIR%%/sensors/sensor_explorer/import/qmldir	5394	%%QT_EXAMPLEDIR%%/sensors/sensor_explorer/import/qmldir
Lines 5909-5914 Link Here
5909	%%QT_EXAMPLEDIR%%/wayland/spanning-screens/main.qml	6008	%%QT_EXAMPLEDIR%%/wayland/spanning-screens/main.qml
5910	%%QT_EXAMPLEDIR%%/wayland/spanning-screens/spanning-screens.pro	6009	%%QT_EXAMPLEDIR%%/wayland/spanning-screens/spanning-screens.pro
5911	%%QT_EXAMPLEDIR%%/wayland/spanning-screens/spanning-screens.qrc	6010	%%QT_EXAMPLEDIR%%/wayland/spanning-screens/spanning-screens.qrc
		6011	%%QT_EXAMPLEDIR%%/wayland/texture-sharing/README
		6012	%%QT_EXAMPLEDIR%%/wayland/texture-sharing/custom-compositor/compositor.qrc
		6013	%%QT_EXAMPLEDIR%%/wayland/texture-sharing/custom-compositor/custom-compositor.pro
		6014	%%QT_EXAMPLEDIR%%/wayland/texture-sharing/custom-compositor/images/background.png
		6015	%%QT_EXAMPLEDIR%%/wayland/texture-sharing/custom-compositor/images/car.ktx
		6016	%%QT_EXAMPLEDIR%%/wayland/texture-sharing/custom-compositor/images/qt4.astc
		6017	%%QT_EXAMPLEDIR%%/wayland/texture-sharing/custom-compositor/images/qt_logo.png
		6018	%%QT_EXAMPLEDIR%%/wayland/texture-sharing/custom-compositor/main.cpp
		6019	%%QT_EXAMPLEDIR%%/wayland/texture-sharing/custom-compositor/qml/main.qml
		6020	%%QT_EXAMPLEDIR%%/wayland/texture-sharing/minimal-compositor.qml
		6021	%%QT_EXAMPLEDIR%%/wayland/texture-sharing/qml-client/main.cpp
		6022	%%QT_EXAMPLEDIR%%/wayland/texture-sharing/qml-client/main.qml
		6023	%%QT_EXAMPLEDIR%%/wayland/texture-sharing/qml-client/qml-client.pro
		6024	%%QT_EXAMPLEDIR%%/wayland/texture-sharing/qml-client/qml-client.qrc
		6025	%%QT_EXAMPLEDIR%%/wayland/texture-sharing/texture-sharing.pro
5912	%%QT_EXAMPLEDIR%%/wayland/wayland.pro	6026	%%QT_EXAMPLEDIR%%/wayland/wayland.pro
5913	%%QT_EXAMPLEDIR%%/webchannel/chatclient-html/chatclient-html.pro	6027	%%QT_EXAMPLEDIR%%/webchannel/chatclient-html/chatclient-html.pro
5914	%%QT_EXAMPLEDIR%%/webchannel/chatclient-html/chatclient.html	6028	%%QT_EXAMPLEDIR%%/webchannel/chatclient-html/chatclient.html
Lines 5964-5969 Link Here
5964	%%QT_EXAMPLEDIR%%/webengine/customdialogs/doc/images/customdialogs-menu.png	6078	%%QT_EXAMPLEDIR%%/webengine/customdialogs/doc/images/customdialogs-menu.png
5965	%%QT_EXAMPLEDIR%%/webengine/customdialogs/doc/images/customdialogs-prompt1.png	6079	%%QT_EXAMPLEDIR%%/webengine/customdialogs/doc/images/customdialogs-prompt1.png
5966	%%QT_EXAMPLEDIR%%/webengine/customdialogs/doc/images/customdialogs-prompt2.png	6080	%%QT_EXAMPLEDIR%%/webengine/customdialogs/doc/images/customdialogs-prompt2.png
		6081	%%QT_EXAMPLEDIR%%/webengine/customdialogs/doc/images/customdialogs-tooltip.png
5967	%%QT_EXAMPLEDIR%%/webengine/customdialogs/doc/images/customdialogs.png	6082	%%QT_EXAMPLEDIR%%/webengine/customdialogs/doc/images/customdialogs.png
5968	%%QT_EXAMPLEDIR%%/webengine/customdialogs/doc/src/customdialogs.qdoc	6083	%%QT_EXAMPLEDIR%%/webengine/customdialogs/doc/src/customdialogs.qdoc
5969	%%QT_EXAMPLEDIR%%/webengine/customdialogs/forms/Authentication.qml	6084	%%QT_EXAMPLEDIR%%/webengine/customdialogs/forms/Authentication.qml
Lines 5986-5991 Link Here
5986	%%QT_EXAMPLEDIR%%/webengine/customdialogs/server.cpp	6101	%%QT_EXAMPLEDIR%%/webengine/customdialogs/server.cpp
5987	%%QT_EXAMPLEDIR%%/webengine/customdialogs/server.h	6102	%%QT_EXAMPLEDIR%%/webengine/customdialogs/server.h
5988	%%QT_EXAMPLEDIR%%/webengine/customdialogs/style.css	6103	%%QT_EXAMPLEDIR%%/webengine/customdialogs/style.css
		6104	%%QT_EXAMPLEDIR%%/webengine/lifecycle/WebBrowser.qml
		6105	%%QT_EXAMPLEDIR%%/webengine/lifecycle/WebTab.qml
		6106	%%QT_EXAMPLEDIR%%/webengine/lifecycle/WebTabBar.qml
		6107	%%QT_EXAMPLEDIR%%/webengine/lifecycle/WebTabButton.qml
		6108	%%QT_EXAMPLEDIR%%/webengine/lifecycle/WebTabStack.qml
		6109	%%QT_EXAMPLEDIR%%/webengine/lifecycle/WebToolButton.qml
		6110	%%QT_EXAMPLEDIR%%/webengine/lifecycle/doc/images/lifecycle-automatic.png
		6111	%%QT_EXAMPLEDIR%%/webengine/lifecycle/doc/images/lifecycle-manual.png
		6112	%%QT_EXAMPLEDIR%%/webengine/lifecycle/doc/images/lifecycle.png
		6113	%%QT_EXAMPLEDIR%%/webengine/lifecycle/doc/src/lifecycle.qdoc
		6114	%%QT_EXAMPLEDIR%%/webengine/lifecycle/lifecycle.pro
		6115	%%QT_EXAMPLEDIR%%/webengine/lifecycle/main.cpp
		6116	%%QT_EXAMPLEDIR%%/webengine/lifecycle/qtquickcontrols2.conf
		6117	%%QT_EXAMPLEDIR%%/webengine/lifecycle/resources.qrc
5989	%%QT_EXAMPLEDIR%%/webengine/minimal/doc/src/minimal.qdoc	6118	%%QT_EXAMPLEDIR%%/webengine/minimal/doc/src/minimal.qdoc
5990	%%QT_EXAMPLEDIR%%/webengine/minimal/main.cpp	6119	%%QT_EXAMPLEDIR%%/webengine/minimal/main.cpp
5991	%%QT_EXAMPLEDIR%%/webengine/minimal/main.qml	6120	%%QT_EXAMPLEDIR%%/webengine/minimal/main.qml
Lines 5995-6000 Link Here
5995	%%QT_EXAMPLEDIR%%/webengine/quicknanobrowser/BrowserDialog.qml	6124	%%QT_EXAMPLEDIR%%/webengine/quicknanobrowser/BrowserDialog.qml
5996	%%QT_EXAMPLEDIR%%/webengine/quicknanobrowser/BrowserWindow.qml	6125	%%QT_EXAMPLEDIR%%/webengine/quicknanobrowser/BrowserWindow.qml
5997	%%QT_EXAMPLEDIR%%/webengine/quicknanobrowser/DownloadView.qml	6126	%%QT_EXAMPLEDIR%%/webengine/quicknanobrowser/DownloadView.qml
		6127	%%QT_EXAMPLEDIR%%/webengine/quicknanobrowser/FindBar.qml
5998	%%QT_EXAMPLEDIR%%/webengine/quicknanobrowser/FullScreenNotification.qml	6128	%%QT_EXAMPLEDIR%%/webengine/quicknanobrowser/FullScreenNotification.qml
5999	%%QT_EXAMPLEDIR%%/webengine/quicknanobrowser/doc/images/quicknanobrowser-demo.jpg	6129	%%QT_EXAMPLEDIR%%/webengine/quicknanobrowser/doc/images/quicknanobrowser-demo.jpg
6000	%%QT_EXAMPLEDIR%%/webengine/quicknanobrowser/doc/src/quicknanobrowser.qdoc	6130	%%QT_EXAMPLEDIR%%/webengine/quicknanobrowser/doc/src/quicknanobrowser.qdoc
Lines 7245-7250 Link Here
7245	%%QT_EXAMPLEDIR%%/widgets/painting/transformations/transformations.pro	7375	%%QT_EXAMPLEDIR%%/widgets/painting/transformations/transformations.pro
7246	%%QT_EXAMPLEDIR%%/widgets/painting/transformations/window.cpp	7376	%%QT_EXAMPLEDIR%%/widgets/painting/transformations/window.cpp
7247	%%QT_EXAMPLEDIR%%/widgets/painting/transformations/window.h	7377	%%QT_EXAMPLEDIR%%/widgets/painting/transformations/window.h
		7378	%%QT_EXAMPLEDIR%%/widgets/qnx/foreignwindows/collector.cpp
		7379	%%QT_EXAMPLEDIR%%/widgets/qnx/foreignwindows/collector.h
		7380	%%QT_EXAMPLEDIR%%/widgets/qnx/foreignwindows/foreignwindows.pro
		7381	%%QT_EXAMPLEDIR%%/widgets/qnx/foreignwindows/main.cpp
7248	%%QT_EXAMPLEDIR%%/widgets/richtext/README	7382	%%QT_EXAMPLEDIR%%/widgets/richtext/README
7249	%%QT_EXAMPLEDIR%%/widgets/richtext/calendar/calendar.pro	7383	%%QT_EXAMPLEDIR%%/widgets/richtext/calendar/calendar.pro
7250	%%QT_EXAMPLEDIR%%/widgets/richtext/calendar/main.cpp	7384	%%QT_EXAMPLEDIR%%/widgets/richtext/calendar/main.cpp
Lines 7264-7270 Link Here
7264	%%QT_EXAMPLEDIR%%/widgets/richtext/syntaxhighlighter/mainwindow.h	7398	%%QT_EXAMPLEDIR%%/widgets/richtext/syntaxhighlighter/mainwindow.h
7265	%%QT_EXAMPLEDIR%%/widgets/richtext/syntaxhighlighter/syntaxhighlighter.pro	7399	%%QT_EXAMPLEDIR%%/widgets/richtext/syntaxhighlighter/syntaxhighlighter.pro
7266	%%QT_EXAMPLEDIR%%/widgets/richtext/textedit/example.html	7400	%%QT_EXAMPLEDIR%%/widgets/richtext/textedit/example.html
		7401	%%QT_EXAMPLEDIR%%/widgets/richtext/textedit/example.md
7267	%%QT_EXAMPLEDIR%%/widgets/richtext/textedit/images/logo32.png	7402	%%QT_EXAMPLEDIR%%/widgets/richtext/textedit/images/logo32.png
		7403	%%QT_EXAMPLEDIR%%/widgets/richtext/textedit/images/mac/checkbox-checked.png
		7404	%%QT_EXAMPLEDIR%%/widgets/richtext/textedit/images/mac/checkbox.png
7268	%%QT_EXAMPLEDIR%%/widgets/richtext/textedit/images/mac/editcopy.png	7405	%%QT_EXAMPLEDIR%%/widgets/richtext/textedit/images/mac/editcopy.png
7269	%%QT_EXAMPLEDIR%%/widgets/richtext/textedit/images/mac/editcut.png	7406	%%QT_EXAMPLEDIR%%/widgets/richtext/textedit/images/mac/editcut.png
7270	%%QT_EXAMPLEDIR%%/widgets/richtext/textedit/images/mac/editpaste.png	7407	%%QT_EXAMPLEDIR%%/widgets/richtext/textedit/images/mac/editpaste.png
Lines 7275-7280 Link Here
7275	%%QT_EXAMPLEDIR%%/widgets/richtext/textedit/images/mac/fileopen.png	7412	%%QT_EXAMPLEDIR%%/widgets/richtext/textedit/images/mac/fileopen.png
7276	%%QT_EXAMPLEDIR%%/widgets/richtext/textedit/images/mac/fileprint.png	7413	%%QT_EXAMPLEDIR%%/widgets/richtext/textedit/images/mac/fileprint.png
7277	%%QT_EXAMPLEDIR%%/widgets/richtext/textedit/images/mac/filesave.png	7414	%%QT_EXAMPLEDIR%%/widgets/richtext/textedit/images/mac/filesave.png
		7415	%%QT_EXAMPLEDIR%%/widgets/richtext/textedit/images/mac/format-indent-less.png
		7416	%%QT_EXAMPLEDIR%%/widgets/richtext/textedit/images/mac/format-indent-more.png
7278	%%QT_EXAMPLEDIR%%/widgets/richtext/textedit/images/mac/textbold.png	7417	%%QT_EXAMPLEDIR%%/widgets/richtext/textedit/images/mac/textbold.png
7279	%%QT_EXAMPLEDIR%%/widgets/richtext/textedit/images/mac/textcenter.png	7418	%%QT_EXAMPLEDIR%%/widgets/richtext/textedit/images/mac/textcenter.png
7280	%%QT_EXAMPLEDIR%%/widgets/richtext/textedit/images/mac/textitalic.png	7419	%%QT_EXAMPLEDIR%%/widgets/richtext/textedit/images/mac/textitalic.png
Lines 7284-7289 Link Here
7284	%%QT_EXAMPLEDIR%%/widgets/richtext/textedit/images/mac/textunder.png	7423	%%QT_EXAMPLEDIR%%/widgets/richtext/textedit/images/mac/textunder.png
7285	%%QT_EXAMPLEDIR%%/widgets/richtext/textedit/images/mac/zoomin.png	7424	%%QT_EXAMPLEDIR%%/widgets/richtext/textedit/images/mac/zoomin.png
7286	%%QT_EXAMPLEDIR%%/widgets/richtext/textedit/images/mac/zoomout.png	7425	%%QT_EXAMPLEDIR%%/widgets/richtext/textedit/images/mac/zoomout.png
		7426	%%QT_EXAMPLEDIR%%/widgets/richtext/textedit/images/win/checkbox-checked.png
		7427	%%QT_EXAMPLEDIR%%/widgets/richtext/textedit/images/win/checkbox.png
7287	%%QT_EXAMPLEDIR%%/widgets/richtext/textedit/images/win/editcopy.png	7428	%%QT_EXAMPLEDIR%%/widgets/richtext/textedit/images/win/editcopy.png
7288	%%QT_EXAMPLEDIR%%/widgets/richtext/textedit/images/win/editcut.png	7429	%%QT_EXAMPLEDIR%%/widgets/richtext/textedit/images/win/editcut.png
7289	%%QT_EXAMPLEDIR%%/widgets/richtext/textedit/images/win/editpaste.png	7430	%%QT_EXAMPLEDIR%%/widgets/richtext/textedit/images/win/editpaste.png
Lines 7294-7299 Link Here
7294	%%QT_EXAMPLEDIR%%/widgets/richtext/textedit/images/win/fileopen.png	7435	%%QT_EXAMPLEDIR%%/widgets/richtext/textedit/images/win/fileopen.png
7295	%%QT_EXAMPLEDIR%%/widgets/richtext/textedit/images/win/fileprint.png	7436	%%QT_EXAMPLEDIR%%/widgets/richtext/textedit/images/win/fileprint.png
7296	%%QT_EXAMPLEDIR%%/widgets/richtext/textedit/images/win/filesave.png	7437	%%QT_EXAMPLEDIR%%/widgets/richtext/textedit/images/win/filesave.png
		7438	%%QT_EXAMPLEDIR%%/widgets/richtext/textedit/images/win/format-indent-less.png
		7439	%%QT_EXAMPLEDIR%%/widgets/richtext/textedit/images/win/format-indent-more.png
7297	%%QT_EXAMPLEDIR%%/widgets/richtext/textedit/images/win/textbold.png	7440	%%QT_EXAMPLEDIR%%/widgets/richtext/textedit/images/win/textbold.png
7298	%%QT_EXAMPLEDIR%%/widgets/richtext/textedit/images/win/textcenter.png	7441	%%QT_EXAMPLEDIR%%/widgets/richtext/textedit/images/win/textcenter.png
7299	%%QT_EXAMPLEDIR%%/widgets/richtext/textedit/images/win/textitalic.png	7442	%%QT_EXAMPLEDIR%%/widgets/richtext/textedit/images/win/textitalic.png




%%QT_L10NDIR%%/linguist_ru.qm
%%QT_L10NDIR%%/linguist_sk.qm
%%QT_L10NDIR%%/linguist_sl.qm
%%QT_L10NDIR%%/linguist_sv.qm
%%QT_L10NDIR%%/linguist_uk.qm
%%QT_L10NDIR%%/linguist_zh_CN.qm
%%QT_L10NDIR%%/linguist_zh_TW.qm

%%QT_L10NDIR%%/qt_he.qm
%%QT_L10NDIR%%/qt_help_ar.qm
%%QT_L10NDIR%%/qt_help_bg.qm
%%QT_L10NDIR%%/qt_help_ca.qm
%%QT_L10NDIR%%/qt_help_cs.qm
%%QT_L10NDIR%%/qt_help_da.qm
%%QT_L10NDIR%%/qt_help_de.qm

%%QT_L10NDIR%%/qtbase_uk.qm
%%QT_L10NDIR%%/qtbase_zh_TW.qm
%%QT_L10NDIR%%/qtconnectivity_bg.qm
%%QT_L10NDIR%%/qtconnectivity_ca.qm
%%QT_L10NDIR%%/qtconnectivity_da.qm
%%QT_L10NDIR%%/qtconnectivity_de.qm
%%QT_L10NDIR%%/qtconnectivity_en.qm

%%QT_L10NDIR%%/qtdeclarative_sk.qm
%%QT_L10NDIR%%/qtdeclarative_uk.qm
%%QT_L10NDIR%%/qtlocation_bg.qm
%%QT_L10NDIR%%/qtlocation_ca.qm
%%QT_L10NDIR%%/qtlocation_da.qm
%%QT_L10NDIR%%/qtlocation_de.qm
%%QT_L10NDIR%%/qtlocation_en.qm

%%QT_L10NDIR%%/qtserialport_pl.qm
%%QT_L10NDIR%%/qtserialport_ru.qm
%%QT_L10NDIR%%/qtserialport_uk.qm
%%QT_L10NDIR%%/qtwebengine_ca.qm
%%QT_L10NDIR%%/qtwebengine_de.qm
%%QT_L10NDIR%%/qtwebengine_en.qm
%%QT_L10NDIR%%/qtwebengine_es.qm

%%QT_L10NDIR%%/qtwebengine_pl.qm
%%QT_L10NDIR%%/qtwebengine_ru.qm
%%QT_L10NDIR%%/qtwebengine_uk.qm
%%QT_L10NDIR%%/qtwebsockets_ca.qm
%%QT_L10NDIR%%/qtwebsockets_de.qm
%%QT_L10NDIR%%/qtwebsockets_en.qm
%%QT_L10NDIR%%/qtwebsockets_es.qm

Lines 12-17 COMMENT= Sewing pattern drafting tool aiming to remake the garment industry Link Here

(-)b/misc/valentina/Makefile (+2 lines)
12	LICENSE= GPLv3	12	LICENSE= GPLv3
13	LICENSE_FILE= ${WRKSRC}/LICENSE_GPL.txt	13	LICENSE_FILE= ${WRKSRC}/LICENSE_GPL.txt
14		14
		15	BROKEN= Does not build with Qt5-5.14
		16
15	USES= compiler:c++11-lang desktop-file-utils gl gmake qmake qt:5	17	USES= compiler:c++11-lang desktop-file-utils gl gmake qmake qt:5
16	USE_QT= concurrent core gui network opengl printsupport svg widgets xml xmlpatterns buildtools_build linguisttools_build testlib_build	18	USE_QT= concurrent core gui network opengl printsupport svg widgets xml xmlpatterns buildtools_build linguisttools_build testlib_build
17	USE_GL= gl	19	USE_GL= gl

Lines 2-8 Link Here

(-)b/multimedia/qt5-multimedia/Makefile (-1 lines)
2		2
3	PORTNAME= multimedia	3	PORTNAME= multimedia
4	DISTVERSION= ${QT5_VERSION}	4	DISTVERSION= ${QT5_VERSION}
5	PORTREVISION= 1
6	CATEGORIES= multimedia	5	CATEGORIES= multimedia
7	PKGNAMEPREFIX= qt5-	6	PKGNAMEPREFIX= qt5-
8		7




%%QT_INCDIR%%/QtMultimedia/%%FULLVER%%/QtMultimedia/private/qaudiohelpers_p.h
%%QT_INCDIR%%/QtMultimedia/%%FULLVER%%/QtMultimedia/private/qaudiosystempluginext_p.h
%%QT_INCDIR%%/QtMultimedia/%%FULLVER%%/QtMultimedia/private/qcamera_p.h
%%QT_INCDIR%%/QtMultimedia/%%FULLVER%%/QtMultimedia/private/qdeclarativevideooutput_backend_p.h
%%QT_INCDIR%%/QtMultimedia/%%FULLVER%%/QtMultimedia/private/qdeclarativevideooutput_p.h
%%QT_INCDIR%%/QtMultimedia/%%FULLVER%%/QtMultimedia/private/qimagevideobuffer_p.h
%%QT_INCDIR%%/QtMultimedia/%%FULLVER%%/QtMultimedia/private/qmediacontrol_p.h
%%QT_INCDIR%%/QtMultimedia/%%FULLVER%%/QtMultimedia/private/qmedianetworkplaylistprovider_p.h

%%QT_INCDIR%%/QtMultimedia/%%FULLVER%%/QtMultimedia/private/qmultimediautils_p.h
%%QT_INCDIR%%/QtMultimedia/%%FULLVER%%/QtMultimedia/private/qplaylistfileparser_p.h
%%QT_INCDIR%%/QtMultimedia/%%FULLVER%%/QtMultimedia/private/qsamplecache_p.h
%%QT_INCDIR%%/QtMultimedia/%%FULLVER%%/QtMultimedia/private/qsgvideonode_p.h
%%QT_INCDIR%%/QtMultimedia/%%FULLVER%%/QtMultimedia/private/qsoundeffect_pulse_p.h
%%QT_INCDIR%%/QtMultimedia/%%FULLVER%%/QtMultimedia/private/qsoundeffect_qaudio_p.h
%%QT_INCDIR%%/QtMultimedia/%%FULLVER%%/QtMultimedia/private/qtmultimedia-config_p.h
%%QT_INCDIR%%/QtMultimedia/%%FULLVER%%/QtMultimedia/private/qtmultimediaglobal_p.h
%%QT_INCDIR%%/QtMultimedia/%%FULLVER%%/QtMultimedia/private/qtmultimediaquickdefs_p.h
%%QT_INCDIR%%/QtMultimedia/%%FULLVER%%/QtMultimedia/private/qvideoframe_p.h
%%QT_INCDIR%%/QtMultimedia/%%FULLVER%%/QtMultimedia/private/qvideoframeconversionhelper_p.h
%%QT_INCDIR%%/QtMultimedia/%%FULLVER%%/QtMultimedia/private/qvideooutputorientationhandler_p.h

%%GSTREAMER%%%%QT_INCDIR%%/QtMultimediaGstTools/%%FULLVER%%/QtMultimediaGstTools/private/qgstreamerbufferprobe_p.h
%%GSTREAMER%%%%QT_INCDIR%%/QtMultimediaGstTools/%%FULLVER%%/QtMultimediaGstTools/private/qgstreamerbushelper_p.h
%%GSTREAMER%%%%QT_INCDIR%%/QtMultimediaGstTools/%%FULLVER%%/QtMultimediaGstTools/private/qgstreamermessage_p.h
%%GSTREAMER%%%%QT_INCDIR%%/QtMultimediaGstTools/%%FULLVER%%/QtMultimediaGstTools/private/qgstreamermirtexturerenderer_p.h
%%GSTREAMER%%%%QT_INCDIR%%/QtMultimediaGstTools/%%FULLVER%%/QtMultimediaGstTools/private/qgstreamerplayercontrol_p.h
%%GSTREAMER%%%%QT_INCDIR%%/QtMultimediaGstTools/%%FULLVER%%/QtMultimediaGstTools/private/qgstreamerplayersession_p.h
%%GSTREAMER%%%%QT_INCDIR%%/QtMultimediaGstTools/%%FULLVER%%/QtMultimediaGstTools/private/qgstreamervideoinputdevicecontrol_p.h

%%GSTREAMER%%%%QT_INCDIR%%/QtMultimediaGstTools/%%FULLVER%%/QtMultimediaGstTools/private/qgstvideorendererplugin_p.h
%%GSTREAMER%%%%QT_INCDIR%%/QtMultimediaGstTools/%%FULLVER%%/QtMultimediaGstTools/private/qgstvideorenderersink_p.h
%%GSTREAMER%%%%QT_INCDIR%%/QtMultimediaGstTools/%%FULLVER%%/QtMultimediaGstTools/private/qvideosurfacegstsink_p.h
%%QT_INCDIR%%/QtMultimediaQuick/%%FULLVER%%/QtMultimediaQuick/private/qdeclarativevideooutput_backend_p.h
%%QT_INCDIR%%/QtMultimediaQuick/%%FULLVER%%/QtMultimediaQuick/private/qdeclarativevideooutput_p.h
%%QT_INCDIR%%/QtMultimediaQuick/%%FULLVER%%/QtMultimediaQuick/private/qdeclarativevideooutput_render_p.h
%%QT_INCDIR%%/QtMultimediaQuick/%%FULLVER%%/QtMultimediaQuick/private/qdeclarativevideooutput_window_p.h
%%QT_INCDIR%%/QtMultimediaQuick/%%FULLVER%%/QtMultimediaQuick/private/qsgvideonode_p.h
%%QT_INCDIR%%/QtMultimediaQuick/%%FULLVER%%/QtMultimediaQuick/private/qsgvideonode_rgb_p.h
%%QT_INCDIR%%/QtMultimediaQuick/%%FULLVER%%/QtMultimediaQuick/private/qsgvideonode_texture_p.h
%%QT_INCDIR%%/QtMultimediaQuick/%%FULLVER%%/QtMultimediaQuick/private/qsgvideonode_yuv_p.h
%%QT_INCDIR%%/QtMultimediaQuick/%%FULLVER%%/QtMultimediaQuick/private/qtmultimediaquickdefs_p.h
%%QT_INCDIR%%/QtMultimediaQuick/QtMultimediaQuick
%%QT_INCDIR%%/QtMultimediaQuick/QtMultimediaQuickDepends
%%QT_INCDIR%%/QtMultimediaQuick/QtMultimediaQuickVersion

%%QT_INCDIR%%/QtMultimediaWidgets/qvideowidgetcontrol.h
%%QT_CMAKEDIR%%/Qt5MultimediaWidgets/Qt5MultimediaWidgetsConfig.cmake
%%QT_CMAKEDIR%%/Qt5MultimediaWidgets/Qt5MultimediaWidgetsConfigVersion.cmake
%%QT_CMAKEDIR%%/Qt5MultimediaGstTools/Qt5MultimediaGstToolsConfig.cmake
%%QT_CMAKEDIR%%/Qt5MultimediaGstTools/Qt5MultimediaGstToolsConfigVersion.cmake
%%QT_CMAKEDIR%%/Qt5MultimediaQuick/Qt5MultimediaQuickConfig.cmake
%%QT_CMAKEDIR%%/Qt5MultimediaQuick/Qt5MultimediaQuickConfigVersion.cmake
%%QT_CMAKEDIR%%/Qt5Multimedia/Qt5MultimediaConfig.cmake




--- src/network/ssl/qsslsocket_openssl11_symbols_p.h.orig	2019-10-01 07:47:24 UTC
+++ src/network/ssl/qsslsocket_openssl11_symbols_p.h
@@ -77,19 +77,48 @@
 
 const unsigned char * q_ASN1_STRING_get0_data(const ASN1_STRING *x);
 
+#if defined(LIBRESSL_VERSION_NUMBER) && LIBRESSL_VERSION_NUMBER >= 0x20700000L
+// LibreSSL 2.7 has stack_st but not OPENSSL_STACK
+typedef struct stack_st OPENSSL_STACK; /* Use STACK_OF(...) instead */
+// From the signature in LibreSSL
+#define OPENSSL_INIT_SETTINGS void
+// https://github.com/openssl/openssl/blob/master/include/openssl/x509_vfy.h#L63
+typedef int (*X509_STORE_CTX_verify_cb)(int, X509_STORE_CTX *);
+#endif
+
+
 Q_AUTOTEST_EXPORT BIO *q_BIO_new(const BIO_METHOD *a);
 Q_AUTOTEST_EXPORT const BIO_METHOD *q_BIO_s_mem();
 
-int q_DSA_bits(DSA *a);
+#ifdef LIBRESSL_VERSION_NUMBER
+#define q_DSA_bits(dsa) q_BN_num_bits((dsa)->p)
+#else
+ int q_DSA_bits(DSA *a);
+#endif
 int q_EVP_CIPHER_CTX_reset(EVP_CIPHER_CTX *c);
 int q_EVP_PKEY_base_id(EVP_PKEY *a);
 int q_RSA_bits(RSA *a);
+#ifdef LIBRESSL_VERSION_NUMBER
+int q_sk_num(OPENSSL_STACK *a);
+void q_sk_pop_free(OPENSSL_STACK *a, void (*b)(void *));
+OPENSSL_STACK *q_sk_new_null();
+void q_sk_push(OPENSSL_STACK *st, void *data);
+void q_sk_free(OPENSSL_STACK *a);
+void * q_sk_value(OPENSSL_STACK *a, int b);
+#define q_OPENSSL_sk_num(a) q_sk_num(a)
+#define q_OPENSSL_sk_pop_free(a, b) q_sk_pop_free(a, b)
+#define q_OPENSSL_sk_new_null() q_sk_new_null()
+#define q_OPENSSL_sk_push(a, b) q_sk_push(a, b)
+#define q_OPENSSL_sk_free q_sk_free
+#define q_OPENSSL_sk_value(a, b) q_sk_value(a, b)
+#else
 Q_AUTOTEST_EXPORT int q_OPENSSL_sk_num(OPENSSL_STACK *a);
 Q_AUTOTEST_EXPORT void q_OPENSSL_sk_pop_free(OPENSSL_STACK *a, void (*b)(void *));
 Q_AUTOTEST_EXPORT OPENSSL_STACK *q_OPENSSL_sk_new_null();
 Q_AUTOTEST_EXPORT void q_OPENSSL_sk_push(OPENSSL_STACK *st, void *data);
 Q_AUTOTEST_EXPORT void q_OPENSSL_sk_free(OPENSSL_STACK *a);
 Q_AUTOTEST_EXPORT void * q_OPENSSL_sk_value(OPENSSL_STACK *a, int b);
+#endif
 int q_SSL_session_reused(SSL *a);
 unsigned long q_SSL_CTX_set_options(SSL_CTX *ctx, unsigned long op);
 int q_OPENSSL_init_ssl(uint64_t opts, const OPENSSL_INIT_SETTINGS *settings);
@@ -110,12 +139,15 @@ STACK_OF(X509) *q_X509_STORE_CTX_get0_chain(X509_STORE
 void q_DH_get0_pqg(const DH *dh, const BIGNUM **p, const BIGNUM **q, const BIGNUM **g);
 int q_DH_bits(DH *dh);
 
-# define q_SSL_load_error_strings() q_OPENSSL_init_ssl(OPENSSL_INIT_LOAD_SSL_STRINGS \
+#define q_SSL_load_error_strings() q_OPENSSL_init_ssl(OPENSSL_INIT_LOAD_SSL_STRINGS \
                                                        | OPENSSL_INIT_LOAD_CRYPTO_STRINGS, NULL)
-
+#ifdef LIBRESSL_VERSION_NUMBER
+#define q_SKM_sk_num(type, st) ((int (*)(const STACK_OF(type) *))q_sk_num)(st)
+#define q_SKM_sk_value(type, st,i) ((type * (*)(const STACK_OF(type) *, int))q_sk_value)(st, i)
+#else
 #define q_SKM_sk_num(type, st) ((int (*)(const STACK_OF(type) *))q_OPENSSL_sk_num)(st)
 #define q_SKM_sk_value(type, st,i) ((type * (*)(const STACK_OF(type) *, int))q_OPENSSL_sk_value)(st, i)
-
+#endif
 #define q_OPENSSL_add_all_algorithms_conf()  q_OPENSSL_init_crypto(OPENSSL_INIT_ADD_ALL_CIPHERS \
                                                                    | OPENSSL_INIT_ADD_ALL_DIGESTS \
                                                                    | OPENSSL_INIT_LOAD_CONFIG, NULL)

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

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.cpp.orig	2019-10-25 09:16:48.000000000 +0200
+++ src/network/ssl/qsslsocket_openssl_symbols.cpp	2019-11-01 20:03:08.715014000 +0100
@@ -152,6 +152,14 @@
 DEFINEFUNC(int, EVP_CIPHER_CTX_reset, EVP_CIPHER_CTX *c, c, return 0, return)
 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, sk_num, OPENSSL_STACK *a, a, return -1, return)
+DEFINEFUNC2(void, sk_pop_free, OPENSSL_STACK *a, a, void (*b)(void*), b, return, DUMMYARG)
+DEFINEFUNC(OPENSSL_STACK *, sk_new_null, DUMMYARG, DUMMYARG, return nullptr, return)
+DEFINEFUNC2(void, sk_push, OPENSSL_STACK *a, a, void *b, b, return, DUMMYARG)
+DEFINEFUNC(void, sk_free, OPENSSL_STACK *a, a, return, DUMMYARG)
+DEFINEFUNC2(void *, sk_value, OPENSSL_STACK *a, a, int b, b, return nullptr, return)
+#else
 DEFINEFUNC(int, DSA_bits, DSA *a, a, return 0, return)
 DEFINEFUNC(int, OPENSSL_sk_num, OPENSSL_STACK *a, a, return -1, return)
 DEFINEFUNC2(void, OPENSSL_sk_pop_free, OPENSSL_STACK *a, a, void (*b)(void*), b, return, DUMMYARG)
@@ -159,6 +167,7 @@
 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)
+#endif
 DEFINEFUNC(int, SSL_session_reused, SSL *a, a, return 0, return)
 DEFINEFUNC2(unsigned long, SSL_CTX_set_options, SSL_CTX *ctx, ctx, unsigned long op, op, return 0, return)
 #ifdef TLS1_3_VERSION
@@ -443,7 +452,7 @@
 DEFINEFUNC2(int, SSL_CTX_use_RSAPrivateKey, SSL_CTX *a, a, RSA *b, b, return -1, return)
 DEFINEFUNC3(int, SSL_CTX_use_PrivateKey_file, SSL_CTX *a, a, const char *b, b, int c, c, return -1, return)
 DEFINEFUNC(X509_STORE *, SSL_CTX_get_cert_store, const SSL_CTX *a, a, return nullptr, return)
-#if OPENSSL_VERSION_NUMBER >= 0x10002000L
+#if OPENSSL_VERSION_NUMBER >= 0x10002000L && !defined(LIBRESSL_VERSION_NUMBER)
 DEFINEFUNC(SSL_CONF_CTX *, SSL_CONF_CTX_new, DUMMYARG, DUMMYARG, return nullptr, return);
 DEFINEFUNC(void, SSL_CONF_CTX_free, SSL_CONF_CTX *a, a, return ,return);
 DEFINEFUNC2(void, SSL_CONF_CTX_set_ssl_ctx, SSL_CONF_CTX *a, a, SSL_CTX *b, b, return, return);
@@ -839,8 +848,8 @@
 #endif
 #if defined(SHLIB_VERSION_NUMBER) && !defined(Q_OS_QNX) // on QNX, the libs are always libssl.so and libcrypto.so
     // first attempt: the canonical name is libssl.so.<SHLIB_VERSION_NUMBER>
-    libssl->setFileNameAndVersion(QLatin1String("ssl"), QLatin1String(SHLIB_VERSION_NUMBER));
-    libcrypto->setFileNameAndVersion(QLatin1String("crypto"), QLatin1String(SHLIB_VERSION_NUMBER));
+    libssl->setFileNameAndVersion(QLatin1String("%%OPENSSLLIB%%/libssl"), QLatin1String(SHLIB_VERSION_NUMBER));
+    libcrypto->setFileNameAndVersion(QLatin1String("%%OPENSSLLIB%%/libcrypto"), QLatin1String(SHLIB_VERSION_NUMBER));
     if (libcrypto->load() && libssl->load()) {
         // libssl.so.<SHLIB_VERSION_NUMBER> and libcrypto.so.<SHLIB_VERSION_NUMBER> found
         return pair;
@@ -980,12 +989,21 @@
     RESOLVEFUNC(EVP_CIPHER_CTX_reset)
     RESOLVEFUNC(EVP_PKEY_base_id)
     RESOLVEFUNC(RSA_bits)
+#ifdef LIBRESSL_VERSION_NUMBER
+    RESOLVEFUNC(sk_new_null)
+    RESOLVEFUNC(sk_push)
+    RESOLVEFUNC(sk_free)
+    RESOLVEFUNC(sk_num)
+    RESOLVEFUNC(sk_pop_free)
+    RESOLVEFUNC(sk_value)
+#else
     RESOLVEFUNC(OPENSSL_sk_new_null)
     RESOLVEFUNC(OPENSSL_sk_push)
     RESOLVEFUNC(OPENSSL_sk_free)
     RESOLVEFUNC(OPENSSL_sk_num)
     RESOLVEFUNC(OPENSSL_sk_pop_free)
     RESOLVEFUNC(OPENSSL_sk_value)
+#endif
     RESOLVEFUNC(DH_get0_pqg)
     RESOLVEFUNC(SSL_CTX_set_options)
 #ifdef TLS1_3_VERSION
@@ -1024,7 +1042,9 @@
 
     RESOLVEFUNC(SSL_SESSION_get_ticket_lifetime_hint)
     RESOLVEFUNC(DH_bits)
+#ifndef LIBRESSL_VERSION_NUMBER
     RESOLVEFUNC(DSA_bits)
+#endif
 
 #if QT_CONFIG(dtls)
     RESOLVEFUNC(DTLSv1_listen)
@@ -1280,7 +1300,7 @@
     RESOLVEFUNC(SSL_CTX_use_RSAPrivateKey)
     RESOLVEFUNC(SSL_CTX_use_PrivateKey_file)
     RESOLVEFUNC(SSL_CTX_get_cert_store);
-#if OPENSSL_VERSION_NUMBER >= 0x10002000L
+#if OPENSSL_VERSION_NUMBER >= 0x10002000L && !defined(LIBRESSL_VERSION_NUMBER)
     RESOLVEFUNC(SSL_CONF_CTX_new);
     RESOLVEFUNC(SSL_CONF_CTX_free);
     RESOLVEFUNC(SSL_CONF_CTX_set_ssl_ctx);




--- 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,12 @@
 #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
+#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/qnativesocketengine_p.h
%%QT_INCDIR%%/QtNetwork/%%FULLVER%%/QtNetwork/private/qnativesocketengine_winrt_p.h
%%QT_INCDIR%%/QtNetwork/%%FULLVER%%/QtNetwork/private/qnet_unix_p.h
%%QT_INCDIR%%/QtNetwork/%%FULLVER%%/QtNetwork/private/qnetconmonitor_p.h
%%QT_INCDIR%%/QtNetwork/%%FULLVER%%/QtNetwork/private/qnetworkaccessauthenticationmanager_p.h
%%QT_INCDIR%%/QtNetwork/%%FULLVER%%/QtNetwork/private/qnetworkaccessbackend_p.h
%%QT_INCDIR%%/QtNetwork/%%FULLVER%%/QtNetwork/private/qnetworkaccesscache_p.h

%%QT_INCDIR%%/QtNetwork/QHostInfo
%%QT_INCDIR%%/QtNetwork/QHstsPolicy
%%QT_INCDIR%%/QtNetwork/QHttpMultiPart
%%QT_INCDIR%%/QtNetwork/QHttp2Configuration
%%QT_INCDIR%%/QtNetwork/QHttpPart
%%QT_INCDIR%%/QtNetwork/QIPv6Address
%%QT_INCDIR%%/QtNetwork/QLocalServer

%%QT_INCDIR%%/QtNetwork/qhostaddress.h
%%QT_INCDIR%%/QtNetwork/qhostinfo.h
%%QT_INCDIR%%/QtNetwork/qhstspolicy.h
%%QT_INCDIR%%/QtNetwork/qhttp2configuration.h
%%QT_INCDIR%%/QtNetwork/qhttpmultipart.h
%%QT_INCDIR%%/QtNetwork/qlocalserver.h
%%QT_INCDIR%%/QtNetwork/qlocalsocket.h

Lines 2-8 Link Here

(-)b/sysutils/qt5-qtdiag/Makefile (-1 lines)
2		2
3	PORTNAME= qtdiag	3	PORTNAME= qtdiag
4	DISTVERSION= ${QT5_VERSION}	4	DISTVERSION= ${QT5_VERSION}
5	PORTREVISION= 1
6	CATEGORIES= sysutils	5	CATEGORIES= sysutils
7	PKGNAMEPREFIX= qt5-	6	PKGNAMEPREFIX= qt5-
8		7

Lines 2-8 Link Here

(-)b/sysutils/qt5-qtpaths/Makefile (-1 lines)
2		2
3	PORTNAME= qtpaths	3	PORTNAME= qtpaths
4	DISTVERSION= ${QT5_VERSION}	4	DISTVERSION= ${QT5_VERSION}
5	PORTREVISION= 1
6	CATEGORIES= sysutils	5	CATEGORIES= sysutils
7	PKGNAMEPREFIX= qt5-	6	PKGNAMEPREFIX= qt5-
8		7

Lines 2-8 Link Here

(-)b/sysutils/qt5-qtplugininfo/Makefile (-1 lines)
2		2
3	PORTNAME= qtplugininfo	3	PORTNAME= qtplugininfo
4	DISTVERSION= ${QT5_VERSION}	4	DISTVERSION= ${QT5_VERSION}
5	PORTREVISION= 1
6	CATEGORIES= sysutils	5	CATEGORIES= sysutils
7	PKGNAMEPREFIX= qt5-	6	PKGNAMEPREFIX= qt5-
8		7

Lines 2-8 Link Here

(-)b/textproc/qt5-xmlpatterns/Makefile (-1 lines)
2		2
3	PORTNAME= xmlpatterns	3	PORTNAME= xmlpatterns
4	DISTVERSION= ${QT5_VERSION}	4	DISTVERSION= ${QT5_VERSION}
5	PORTREVISION= 1
6	CATEGORIES= textproc	5	CATEGORIES= textproc
7	PKGNAMEPREFIX= qt5-	6	PKGNAMEPREFIX= qt5-
8		7





PORTNAME=	webengine
DISTVERSION=	${QT5_VERSION}
PORTREVISION=	3
CATEGORIES=	www
PKGNAMEPREFIX=	qt5-


		libwebp.so:graphics/webp

DISTINFO_FILE=	${.CURDIR}/distinfo
QT5_VERSION=	5.14.0

OPTIONS_SINGLE=		AUDIO
OPTIONS_SINGLE_AUDIO=	ALSA PULSEAUDIO SNDIO

USE_GNOME=	glib20 libxml2 libxslt
USE_QT=		core declarative designer gui location network webchannel \
		widgets buildtools_build qmake_build printsupport
USE_XORG=	x11 xcb xcomposite xcursor xdamage xext xfixes xi xorgproto \
		xrandr xrender xscrnsaver xtst

USE_LDCONFIG=	${QT_LIBDIR}


post-extract:
# Install FreeBSD's freebsd.pri file.
	${CP} ${FILESDIR}/freebsd.pri ${WRKSRC}/src/buildtools/config/freebsd.pri

post-extract-SNDIO-on:
	@cd ${WRKSRC}/src/3rdparty/chromium/media/audio && ${MKDIR} sndio openbsd

Lines 1-3 Link Here

(-)b/www/qt5-webengine/distinfo (-3 / +3 lines)
1	TIMESTAMP = 1572640408	1	TIMESTAMP = 1578321366
2	SHA256 (KDE/Qt/5.13.2/qtwebengine-everywhere-src-5.13.2.tar.xz) = adcf56b5de6f34744bba2307b696fc75611884f4270e87dfa760d6e99dd711bb	2	SHA256 (KDE/Qt/5.14.0/qtwebengine-everywhere-src-5.14.0.tar.xz) = 74f8c11cc318612c8d9dc87cf791badb1efe7080c10d8b3ed5843b249a942d32
3	SIZE (KDE/Qt/5.13.2/qtwebengine-everywhere-src-5.13.2.tar.xz) = 255593964	3	SIZE (KDE/Qt/5.14.0/qtwebengine-everywhere-src-5.14.0.tar.xz) = 241565016




 
     EXPECT_CALL(callback_, OnError()).Times(2);
 
--- src/3rdparty/chromium/third_party/libjingle_xmpp/task_runner/taskrunner.cc.orig	2019-03-07 09:23:57 UTC
+++ src/3rdparty/chromium/third_party/libjingle_xmpp/task_runner/taskrunner.cc
@@ -80,7 +80,7 @@ void TaskRunner::InternalRunTasks(bool in_destructor) 
   std::vector<Task *>::iterator it;
   it = std::remove(tasks_.begin(),
                    tasks_.end(),
-                   reinterpret_cast<Task *>(NULL));
+                   static_cast<Task *>(NULL));
 
   tasks_.erase(it, tasks_.end());
   tasks_running_ = false;
 
--- src/3rdparty/chromium/third_party/sfntly/src/cpp/src/sfntly/table/core/cmap_table.cc.orig	2018-11-13 18:25:11 UTC
+++ src/3rdparty/chromium/third_party/sfntly/src/cpp/src/sfntly/table/core/cmap_table.cc
@@ -439,7 +439,7 @@ CMapTable::CMapFormat0::Builder::Builder(

Removed Link Here

(-)a/www/qt5-webengine/files/patch-config.tests_khr_khr.pro (-8 lines)
1	--- config.tests/khr/khr.pro.orig 2018-11-27 04:10:38 UTC
2	+++ config.tests/khr/khr.pro
3	@@ -3,4 +3,4 @@
4
5	CONFIG-=qt
6
7	-linux:SOURCES += khr.cpp
8	+unix:SOURCES += khr.cpp

Removed Link Here

(-)a/www/qt5-webengine/files/patch-config.tests_snappy_snappy.pro (-7 lines)
1	--- config.tests/snappy/snappy.pro.orig 2018-11-27 04:10:38 UTC
2	+++ config.tests/snappy/snappy.pro
3	@@ -1,3 +1,3 @@
4	-linux:SOURCES += snappy.cpp
5	+unix:SOURCES += snappy.cpp
6	LIBS += -lsnappy
7	CONFIG -= qt




--- configure.pri.orig	2019-12-03 07:18:02 UTC
+++ configure.pri
@@ -114,7 +114,7 @@ defineTest(qtwebengine_platformError) {
 defineTest(qtConfTest_detectPlatform) {
     QT_FOR_CONFIG += gui-private
 
-    !linux:!win32:!macos {
+    !linux:!win32:!macos:!unix: {
         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"
         }
     }
 




--- mkspecs/features/configure.prf.orig	2019-10-23 10:30:33 UTC
+++ mkspecs/features/configure.prf
@@ -26,7 +26,7 @@ defineTest(runConfigure) {
         return(false)
     }
 
-    linux:contains(QT_CONFIG,no-pkg-config) {
+    unix:contains(QT_CONFIG,no-pkg-config) {
         skipBuild("pkg-config is required")
         return(false)
     }
@@ -68,17 +68,17 @@ defineTest(runConfigure) {
         return(false);
     }
 
-    linux {
+    unix {
 
         !qtConfig(webengine-host-pkg-config) {
             skipBuild("Host pkg-config is required")
             return(false)
         }
 
-        !qtConfig(webengine-system-glibc) {
-            skipBuild("A suitable version >= 2.27 of libc could not be found.")
-            return(false)
-        }
+        #!qtConfig(webengine-system-glibc) {
+        #    skipBuild("A suitable version >= 2.27 of libc could not be found.")
+        #    return(false)
+        #}
 
         QT_FOR_CONFIG += gui-private
 




--- mkspecs/features/functions.prf.orig	2019-12-03 07:18:02 UTC
settings to gn.

--- mkspecs/features/functions.prf.orig	2019-05-24 09:01:39 UTC
+++ mkspecs/features/functions.prf
@@ -75,6 +75,7 @@ defineReplace(gnArgs) {
     linux: include($$QTWEBENGINE_ROOT/src/buildtools/config/linux.pri)
     macos: include($$QTWEBENGINE_ROOT/src/buildtools/config/mac_osx.pri)
     win32: include($$QTWEBENGINE_ROOT/src/buildtools/config/windows.pri)
+    freebsd: include($$QTWEBENGINE_ROOT/src/buildtools/config/freebsd.pri)
     isEmpty(gn_args): error(No gn_args found please make sure you have valid configuration.)
     return($$gn_args)
 }
@@ -87,6 +88,7 @@ defineReplace(gnArch) {
     contains(qtArch, "arm64"): return(arm64)
     contains(qtArch, "mips"): return(mipsel)
     contains(qtArch, "mips64"): return(mips64el)

     return(unknown)
 }
 
@@ -94,6 +96,7 @@ defineReplace(gnOS) {
     macos: return(mac)
     win32: return(win)
     linux: return(linux)




--- mkspecs/features/platform.prf.orig	2019-05-24 09:01:39 UTC
+++ mkspecs/features/platform.prf
@@ -11,7 +11,7 @@ defineTest(isQtMinimum) {
 
 defineTest(isPlatformSupported) {
   QT_FOR_CONFIG += gui-private
-  linux {
+  unix {
     if(!gcc:!clang)|intel_icc {
       skipBuild("Qt WebEngine on Linux requires clang or GCC.")
       return(false)
@@ -84,6 +84,7 @@ defineTest(isArchSupported) {
     contains(QT_ARCH, "arm")|contains(QT_ARCH, "arm64"): return(true)
     contains(QT_ARCH, "mips"): return(true)
 #     contains(QT_ARCH, "mips64"): return(true)
+    contains(QT_ARCH, "power64"): return(true)
 
     skipBuild("QtWebEngine can only be built for x86, x86-64, ARM, Aarch64, and MIPSel architectures.")
     return(false)

Lines 1-7 Link Here

(-)b/www/qt5-webengine/files/patch-src_3rdparty_chromium_BUILD.gn (-13 / +21 lines)
1	--- src/3rdparty/chromium/BUILD.gn.orig 2019-03-01 17:04:22 UTC	1	--- src/3rdparty/chromium/BUILD.gn.orig 2019-11-27 21:12:25 UTC
2	+++ src/3rdparty/chromium/BUILD.gn	2	+++ src/3rdparty/chromium/BUILD.gn
3	@@ -366,7 +366,7 @@ group("gn_all") {	3	@@ -400,7 +400,7 @@ group("gn_all") {
4	[ "//third_party/android_crazy_linker:android_crazy_linker_zip_fuzzer" ]	4	]
5	}	5	}
6		6
7	- if (is_linux \|\| is_android) {	7	- if (is_linux \|\| is_android) {
Lines 9-15 Link Here
9	deps += [	9	deps += [
10	"//third_party/breakpad:breakpad_unittests",	10	"//third_party/breakpad:breakpad_unittests",
11	"//third_party/breakpad:core-2-minidump",	11	"//third_party/breakpad:core-2-minidump",
12	@@ -408,8 +408,6 @@ group("gn_all") {	12	@@ -441,8 +441,6 @@ group("gn_all") {
13	"//net:disk_cache_memory_test",	13	"//net:disk_cache_memory_test",
14	"//net:quic_client",	14	"//net:quic_client",
15	"//net:quic_server",	15	"//net:quic_server",
Lines 18-27 Link Here
18	"//testing:empty_main",	18	"//testing:empty_main",
19	]	19	]
20		20
21	@@ -466,10 +464,6 @@ group("gn_all") {	21	@@ -497,10 +495,6 @@ group("gn_all") {
		22	"//chrome/test:load_library_perf_tests",
		23	"//chrome/test:sync_performance_tests",
22	"//chrome/test/chromedriver:chromedriver",	24	"//chrome/test/chromedriver:chromedriver",
23	"//chrome/test/chromedriver:chromedriver_tests",
24	"//components/sync:run_sync_testserver",
25	- "//courgette:courgette",	25	- "//courgette:courgette",
26	- "//courgette:courgette_fuzz",	26	- "//courgette:courgette_fuzz",
27	- "//courgette:courgette_minimal_tool",	27	- "//courgette:courgette_minimal_tool",
Lines 29-35 Link Here
29	"//media/cast:generate_barcode_video",	29	"//media/cast:generate_barcode_video",
30	"//media/cast:generate_timecode_audio",	30	"//media/cast:generate_timecode_audio",
31	"//net:crash_cache",	31	"//net:crash_cache",
32	@@ -536,10 +530,6 @@ group("gn_all") {	32	@@ -567,10 +561,6 @@ group("gn_all") {
33	"//mojo:mojo_perftests",	33	"//mojo:mojo_perftests",
34	"//services/service_manager/public/cpp",	34	"//services/service_manager/public/cpp",
35	"//testing/gmock:gmock_main",	35	"//testing/gmock:gmock_main",
Lines 40-46 Link Here
40	]	40	]
41		41
42	if (!is_android) {	42	if (!is_android) {
43	@@ -614,7 +604,7 @@ group("gn_all") {	43	@@ -644,7 +634,7 @@ group("gn_all") {
44	host_os == "win" && !use_qt) {	44	host_os == "win" && !use_qt) {
45	deps += [ "//chrome/test/mini_installer:mini_installer_tests" ]	45	deps += [ "//chrome/test/mini_installer:mini_installer_tests" ]
46	}	46	}
Lines 49-55 Link Here
49	deps += [ "//third_party/breakpad:symupload($host_toolchain)" ]	49	deps += [ "//third_party/breakpad:symupload($host_toolchain)" ]
50	}	50	}
51		51
52	@@ -853,7 +843,6 @@ if (is_chromeos) {	52	@@ -783,7 +773,6 @@ group("gn_all") {
		53	"//chrome/browser/vr:vr_common_perftests",
		54	"//chrome/browser/vr:vr_common_unittests",
		55	"//chrome/browser/vr:vr_pixeltests",
		56	- "//tools/perf/contrib/vr_benchmarks:vr_perf_tests",
		57	]
		58	if (is_desktop_linux && use_ozone) {
		59	deps += [ "//chrome/browser/vr/testapp:vr_testapp" ]
		60	@@ -902,7 +891,6 @@ if (is_chromeos) {
53	"//ppapi/examples/video_decode",	61	"//ppapi/examples/video_decode",
54	"//sandbox/linux:chrome_sandbox",	62	"//sandbox/linux:chrome_sandbox",
55	"//sandbox/linux:sandbox_linux_unittests",	63	"//sandbox/linux:sandbox_linux_unittests",
Lines 57-63 Link Here
57		65
58	# Blocked on https://github.com/catapult-project/catapult/issues/2297	66	# Blocked on https://github.com/catapult-project/catapult/issues/2297
59	#"//third_party/catapult/telemetry:bitmaptools",	67	#"//third_party/catapult/telemetry:bitmaptools",
60	@@ -958,7 +947,7 @@ if (!is_ios && !use_qt) {	68	@@ -1070,7 +1058,7 @@ if (!is_ios && !use_qt) {
61	]	69	]
62	}	70	}
63		71
Lines 66-72 Link Here
66	data_deps +=	74	data_deps +=
67	[ "//third_party/breakpad:minidump_stackwalk($host_toolchain)" ]	75	[ "//third_party/breakpad:minidump_stackwalk($host_toolchain)" ]
68	}	76	}
69	@@ -967,7 +956,7 @@ if (!is_ios && !use_qt) {	77	@@ -1079,7 +1067,7 @@ if (!is_ios && !use_qt) {
70	data_deps += [ "//third_party/breakpad:dump_syms($host_toolchain)" ]	78	data_deps += [ "//third_party/breakpad:dump_syms($host_toolchain)" ]
71	}	79	}
72		80
Lines 75-81 Link Here
75	data_deps += [ "//third_party/breakpad:dump_syms($host_toolchain)" ]	83	data_deps += [ "//third_party/breakpad:dump_syms($host_toolchain)" ]
76	}	84	}
77		85
78	@@ -1091,9 +1080,6 @@ group("chromium_builder_perf") {	86	@@ -1221,9 +1209,6 @@ group("chromium_builder_perf") {
79		87
80	if (is_win) {	88	if (is_win) {
81	data_deps += [ "//chrome/installer/mini_installer:mini_installer" ]	89	data_deps += [ "//chrome/installer/mini_installer:mini_installer" ]

Lines 1-11 Link Here

(-)b/www/qt5-webengine/files/patch-src_3rdparty_chromium_base_allocator_allocator__shim.cc (-5 / +5 lines)
1	--- src/3rdparty/chromium/base/allocator/allocator_shim.cc.orig 2018-11-13 18:25:11 UTC	1	--- src/3rdparty/chromium/base/allocator/allocator_shim.cc.orig 2019-11-27 21:12:25 UTC
2	+++ src/3rdparty/chromium/base/allocator/allocator_shim.cc	2	+++ src/3rdparty/chromium/base/allocator/allocator_shim.cc
3	@@ -69,7 +69,7 @@ inline const allocator::AllocatorDispatch* GetChainHea	3	@@ -70,7 +70,7 @@ inline const base::allocator::AllocatorDispatch* GetCh
4	// Unfortunately due to that bug NoBarrier_Load() is mistakenly fully	4	// Unfortunately due to that bug NoBarrier_Load() is mistakenly fully
5	// barriered on Linux+Clang, and that causes visible perf regressons.	5	// barriered on Linux+Clang, and that causes visible perf regressons.
6	return reinterpret_cast<const allocator::AllocatorDispatch*>(	6	return reinterpret_cast<const base::allocator::AllocatorDispatch*>(
7	-#if defined(OS_LINUX) && defined(__clang__)	7	-#if defined(OS_LINUX) && defined(__clang__)
8	+#if (defined(OS_BSD) \|\| defined(OS_LINUX)) && defined(__clang__)	8	+#if (defined(OS_BSD) \|\| defined(OS_LINUX)) && defined(__clang__)
9	static_cast<const volatile subtle::AtomicWord>(&g_chain_head)	9	static_cast<const volatile base::subtle::AtomicWord>(&g_chain_head)
10	#else	10	#else
11	subtle::NoBarrier_Load(&g_chain_head)	11	base::subtle::NoBarrier_Load(&g_chain_head)




--- src/3rdparty/chromium/base/allocator/allocator_shim_default_dispatch_to_glibc.cc.orig	2019-11-27 21:12:25 UTC
+++ src/3rdparty/chromium/base/allocator/allocator_shim_default_dispatch_to_glibc.cc
@@ -5,18 +5,28 @@
 
 #include "base/allocator/allocator_shim.h"
 
 #include <dlfcn.h>
-#include <malloc.h>
+#include <stdio.h>
+#include <stdlib.h>

-void __libc_free(void* ptr);
+void* __malloc(size_t size);
+void* __calloc(size_t n, size_t size);
+void* __realloc(void* address, size_t len);
+void* __memalign(size_t alignment, size_t size) {
+  void *ret;
+  if (__posix_memalign(&ret, alignment, size) != 0) {
+    return nullptr;
+  } else {
+    return ret;
+  }
+}
+int __posix_memalign(void **ptr, size_t alignment, size_t size);

 }  // extern "C"
 
 namespace {
@@ -24,32 +34,32 @@ namespace {
 using base::allocator::AllocatorDispatch;
 
 void* GlibcMalloc(const AllocatorDispatch*, size_t size, void* context) {

Removed Link Here

(-)a/www/qt5-webengine/files/patch-src_3rdparty_chromium_base_allocator_partition__allocator_page__allocator.cc (-11 lines)
1	--- src/3rdparty/chromium/base/allocator/partition_allocator/page_allocator.cc.orig 2019-05-23 12:39:34 UTC
2	+++ src/3rdparty/chromium/base/allocator/partition_allocator/page_allocator.cc
3	@@ -115,7 +115,7 @@ void* AllocPages(void* address,
4	uintptr_t align_base_mask = ~align_offset_mask;
5	DCHECK(!(reinterpret_cast<uintptr_t>(address) & align_offset_mask));
6
7	-#if defined(OS_LINUX) && defined(ARCH_CPU_64_BITS)
8	+#if (defined(OS_BSD) \|\| defined(OS_LINUX)) && defined(ARCH_CPU_64_BITS)
9	// On 64 bit Linux, we may need to adjust the address space limit for
10	// guarded allocations.
11	if (length >= kMinimumGuardedMemorySize) {




--- src/3rdparty/chromium/base/allocator/partition_allocator/page_allocator_internals_posix.h.orig	2019-11-27 21:12:25 UTC
+++ src/3rdparty/chromium/base/allocator/partition_allocator/page_allocator_internals_posix.h
@@ -16,7 +16,7 @@
 
 #include <mach/mach.h>
 #endif
-#if defined(OS_LINUX)

 #include <sys/resource.h>
 
 #include <algorithm>
@@ -48,7 +48,7 @@ int GetAccessFlags(PageAccessibilityConfiguration acce
   }
 }
 
-#if defined(OS_LINUX) && defined(ARCH_CPU_64_BITS)
+#if (defined(OS_BSD) || defined(OS_LINUX)) && defined(ARCH_CPU_64_BITS)
 
 // Multiple guarded memory regions may exceed the process address space limit.
 // This function will raise or lower the limit by |amount|.
@@ -68,7 +68,7 @@ bool AdjustAddressSpaceLimit(int64_t amount) {
 // schemes that reduce that to 4 GiB.
 constexpr size_t kMinimumGuardedMemorySize = 1ULL << 32;  // 4 GiB
 
-#endif  // defined(OS_LINUX) && defined(ARCH_CPU_64_BITS)
+#endif  // (defined(OS_BSD) || defined(OS_LINUX)) && defined(ARCH_CPU_64_BITS)
 
 void* SystemAllocPagesInternal(void* hint,
                                size_t length,
@@ -134,7 +134,7 @@ void SetSystemPagesAccessInternal(
 void FreePagesInternal(void* address, size_t length) {
   CHECK(!munmap(address, length));
 
-#if defined(OS_LINUX) && defined(ARCH_CPU_64_BITS)
+#if (defined(OS_BSD) || defined(OS_LINUX)) && defined(ARCH_CPU_64_BITS)
   // Restore the address space limit.
   if (length >= kMinimumGuardedMemorySize) {
     CHECK(AdjustAddressSpaceLimit(-base::checked_cast<int64_t>(length)));




--- src/3rdparty/chromium/base/base_switches.cc.orig	2019-11-27 21:12:25 UTC
+++ src/3rdparty/chromium/base/base_switches.cc
@@ -114,7 +114,7 @@ const char kWaitForDebugger[] = "wait-for-debugger";
 const char kDisableUsbKeyboardDetect[]      = "disable-usb-keyboard-detect";
 #endif
 
-#if defined(OS_LINUX) && !defined(OS_CHROMEOS)
+#if (defined(OS_LINUX) && !defined(OS_CHROMEOS)) || defined(OS_BSD)
 // The /dev/shm partition is too small in certain VM environments, causing
 // Chrome to fail or crash (see http://crbug.com/715363). Use this flag to
 // work-around this issue (a temporary directory will always be used to create
@@ -135,7 +135,7 @@ const char kEnableCrashReporterForTesting[] =
 const char kEnableReachedCodeProfiler[] = "enable-reached-code-profiler";
 #endif
 
-#if defined(OS_LINUX)
+#if defined(OS_LINUX) || defined(OS_BSD)
 // Controls whether or not retired instruction counts are surfaced for threads
 // in trace events on Linux.
 //




--- src/3rdparty/chromium/base/base_switches.h.orig	2019-11-27 21:12:25 UTC
+++ src/3rdparty/chromium/base/base_switches.h
@@ -37,7 +37,7 @@ extern const char kWaitForDebugger[];
 extern const char kDisableUsbKeyboardDetect[];
 #endif
 
-#if defined(OS_LINUX) && !defined(OS_CHROMEOS)
+#if (defined(OS_LINUX) && !defined(OS_CHROMEOS)) || defined(OS_BSD)
 extern const char kDisableDevShmUsage[];
 #endif
 
@@ -50,7 +50,7 @@ extern const char kEnableReachedCodeProfiler[];
 extern const char kOrderfileMemoryOptimization[];
 #endif
 
-#if defined(OS_LINUX)
+#if defined(OS_LINUX) || defined(OS_BSD)
 extern const char kEnableThreadInstructionCount[];
 #endif
 




--- src/3rdparty/chromium/base/cpu.cc.orig	2019-11-27 21:12:25 UTC
+++ src/3rdparty/chromium/base/cpu.cc
@@ -15,7 +15,7 @@
 #include "base/stl_util.h"
 #include "build/build_config.h"
 
-#if defined(ARCH_CPU_ARM_FAMILY) && (defined(OS_ANDROID) || defined(OS_LINUX))
+#if defined(ARCH_CPU_ARM_FAMILY) && (defined(OS_ANDROID) || defined(OS_LINUX) || defined(OS_BSD))
 #include "base/files/file_util.h"
 #endif
 
@@ -98,7 +98,7 @@ uint64_t xgetbv(uint32_t xcr) {
 
 #endif  // ARCH_CPU_X86_FAMILY
 
-#if defined(ARCH_CPU_ARM_FAMILY) && (defined(OS_ANDROID) || defined(OS_LINUX))
+#if defined(ARCH_CPU_ARM_FAMILY) && (defined(OS_ANDROID) || defined(OS_LINUX) || defined(OS_BSD))
 std::string* CpuInfoBrand() {
   static std::string* brand = []() {
     // This function finds the value from /proc/cpuinfo under the key "model
@@ -128,7 +128,7 @@ std::string* CpuInfoBrand() {
   return brand;
 }
 #endif  // defined(ARCH_CPU_ARM_FAMILY) && (defined(OS_ANDROID) ||
-        // defined(OS_LINUX))
+        // defined(OS_LINUX) || defined(OS_BSD))
 
 }  // namespace
 
@@ -252,7 +252,7 @@ void CPU::Initialize() {
     }
   }
 #elif defined(ARCH_CPU_ARM_FAMILY)
-#if (defined(OS_ANDROID) || defined(OS_LINUX))
+#if (defined(OS_ANDROID) || defined(OS_LINUX) || defined(OS_BSD))
   cpu_brand_ = *CpuInfoBrand();
 #elif defined(OS_WIN)
   // Windows makes high-resolution thread timing information available in




--- src/3rdparty/chromium/base/debug/elf_reader.cc.orig	2019-11-27 21:12:25 UTC
+++ src/3rdparty/chromium/base/debug/elf_reader.cc
@@ -83,6 +83,7 @@ size_t ReadElfBuildId(const void* elf_mapped_base,
         reinterpret_cast<const Nhdr*>(elf_base + header.p_vaddr);
     bool found = false;
     while (current_note < section_end) {
+#if !defined(OS_BSD)
       if (current_note->n_type == NT_GNU_BUILD_ID) {
         const char* note_name =
             reinterpret_cast<const char*>(current_note) + sizeof(Nhdr);
@@ -92,6 +93,7 @@ size_t ReadElfBuildId(const void* elf_mapped_base,
           break;
         }
       }
+#endif
 
       current_note = reinterpret_cast<const Nhdr*>(
           reinterpret_cast<const char*>(current_note) + sizeof(Nhdr) +




--- src/3rdparty/chromium/base/debug/elf_reader_linux.cc.orig	2018-11-13 18:25:11 UTC
+++ src/3rdparty/chromium/base/debug/elf_reader_linux.cc
@@ -41,8 +41,10 @@ Optional<std::string> ElfSegmentBuildIDNoteAsString(co
   const void* section_end = segment.data() + segment.size_bytes();
   const Nhdr* note_header = reinterpret_cast<const Nhdr*>(segment.data());
   while (note_header < section_end) {
+#if !defined(OS_BSD)
     if (note_header->n_type == NT_GNU_BUILD_ID)
       break;
+#endif
     note_header = reinterpret_cast<const Nhdr*>(
         reinterpret_cast<const char*>(note_header) + sizeof(Nhdr) +
         bits::Align(note_header->n_namesz, 4) +

Lines 1-9 Link Here

(-)b/www/qt5-webengine/files/patch-src_3rdparty_chromium_base_debug_stack__trace.h (-5 / +5 lines)
1	--- src/3rdparty/chromium/base/debug/stack_trace.h.orig 2018-11-13 18:25:11 UTC	1	--- src/3rdparty/chromium/base/debug/stack_trace.h.orig 2019-11-27 21:12:25 UTC
2	+++ src/3rdparty/chromium/base/debug/stack_trace.h	2	+++ src/3rdparty/chromium/base/debug/stack_trace.h
3	@@ -16,6 +16,7 @@	3	@@ -19,6 +19,7 @@
4	#include "build/build_config.h"	4	#if !defined(OS_NACL)
5		5	#include <signal.h>
6	#if defined(OS_POSIX)	6	#endif
7	+#include <sys/stdint.h>	7	+#include <sys/stdint.h>
8	#include <unistd.h>	8	#include <unistd.h>
9	#endif	9	#endif

Added Link Here

(-)b/www/qt5-webengine/files/patch-src_3rdparty_chromium_base_files_file__path__watcher.cc (+11 lines)
1	--- src/3rdparty/chromium/base/files/file_path_watcher.cc.orig 2019-11-27 21:12:25 UTC
2	+++ src/3rdparty/chromium/base/files/file_path_watcher.cc
3	@@ -20,7 +20,7 @@ FilePathWatcher::~FilePathWatcher() {
4	// static
5	bool FilePathWatcher::RecursiveWatchAvailable() {
6	#if (defined(OS_MACOSX) && !defined(OS_IOS)) \|\| defined(OS_WIN) \|\| \
7	- defined(OS_LINUX) \|\| defined(OS_ANDROID) \|\| defined(OS_AIX)
8	+ defined(OS_LINUX) \|\| defined(OS_ANDROID) \|\| defined(OS_AIX) \|\| defined(OS_BSD)
9	return true;
10	#else
11	// FSEvents isn't available on iOS.

Removed Link Here

(-)a/www/qt5-webengine/files/patch-src_3rdparty_chromium_base_files_memory__mapped__file__posix.cc (-11 lines)
1	--- src/3rdparty/chromium/base/files/memory_mapped_file_posix.cc.orig 2018-11-13 18:25:11 UTC
2	+++ src/3rdparty/chromium/base/files/memory_mapped_file_posix.cc
3	@@ -110,6 +110,8 @@ bool MemoryMappedFile::MapFileRegionToMemory(
4	// Only Android API>=21 supports the fallocate call. Older versions need
5	// to manually extend the file by writing zeros at block intervals.
6	do_manual_extension = true;
7	+#elif defined(OS_BSD)
8	+ do_manual_extension = true;
9	#elif defined(OS_MACOSX)
10	// MacOS doesn't support fallocate even though their new APFS filesystem
11	// does support sparse files. It does, however, have the functionality

Added Link Here

(-)b/www/qt5-webengine/files/patch-src_3rdparty_chromium_base_files_scoped__file.cc (+11 lines)
1	--- src/3rdparty/chromium/base/files/scoped_file.cc.orig 2019-11-27 21:12:25 UTC
2	+++ src/3rdparty/chromium/base/files/scoped_file.cc
3	@@ -30,7 +30,7 @@ void ScopedFDCloseTraits::Free(int fd) {
4	// a single open directory would bypass the entire security model.
5	int ret = IGNORE_EINTR(close(fd));
6
7	-#if defined(OS_LINUX) \|\| defined(OS_MACOSX) \|\| defined(OS_FUCHSIA) \|\| \
8	+#if defined(OS_LINUX) \|\| defined(OS_MACOSX) \|\| defined(OS_FUCHSIA) \|\| defined(OS_BSD) \|\| \
9	defined(OS_ANDROID)
10	// NB: Some file descriptors can return errors from close() e.g. network
11	// filesystems such as NFS and Linux input devices. On Linux, macOS, and

Lines 1-5 Link Here

(-)b/www/qt5-webengine/files/patch-src_3rdparty_chromium_base_hash_sha1.cc (-2 / +2 lines)
1	--- src/3rdparty/chromium/base/sha1.cc.orig 2019-05-23 12:39:34 UTC	1	--- src/3rdparty/chromium/base/hash/sha1.cc.orig 2019-11-27 21:12:25 UTC
2	+++ src/3rdparty/chromium/base/sha1.cc	2	+++ src/3rdparty/chromium/base/hash/sha1.cc
3	@@ -110,8 +110,10 @@ void SecureHashAlgorithm::Final() {	3	@@ -110,8 +110,10 @@ void SecureHashAlgorithm::Final() {
4	Pad();	4	Pad();
5	Process();	5	Process();

Lines 1-5 Link Here

(-)b/www/qt5-webengine/files/patch-src_3rdparty_chromium_base_i18n_icu__util.cc (-4 / +4 lines)
1	--- src/3rdparty/chromium/base/i18n/icu_util.cc.orig 2019-05-23 14:39:34.000000000 +0200	1	--- src/3rdparty/chromium/base/i18n/icu_util.cc.orig 2019-11-27 21:12:25 UTC
2	+++ src/3rdparty/chromium/base/i18n/icu_util.cc 2019-10-27 22:58:57.501541000 +0100	2	+++ src/3rdparty/chromium/base/i18n/icu_util.cc
3	@@ -20,7 +20,7 @@	3	@@ -20,7 +20,7 @@
4	#include "build/build_config.h"	4	#include "build/build_config.h"
5	#include "third_party/icu/source/common/unicode/putil.h"	5	#include "third_party/icu/source/common/unicode/putil.h"
Lines 9-15 Link Here
9	#include "third_party/icu/source/i18n/unicode/timezone.h"	9	#include "third_party/icu/source/i18n/unicode/timezone.h"
10	#endif	10	#endif
11		11
12	@@ -75,7 +75,11 @@	12	@@ -68,7 +68,11 @@ wchar_t g_debug_icu_pf_filename[_MAX_PATH];
13	// No need to change the filename in multiple places (gyp files, windows	13	// No need to change the filename in multiple places (gyp files, windows
14	// build pkg configurations, etc). 'l' stands for Little Endian.	14	// build pkg configurations, etc). 'l' stands for Little Endian.
15	// This variable is exported through the header file.	15	// This variable is exported through the header file.
Lines 21-27 Link Here
21	#if defined(OS_ANDROID)	21	#if defined(OS_ANDROID)
22	const char kAndroidAssetsIcuDataFileName[] = "assets/icudtl.dat";	22	const char kAndroidAssetsIcuDataFileName[] = "assets/icudtl.dat";
23	#endif	23	#endif
24	@@ -320,7 +324,7 @@	24	@@ -290,7 +294,7 @@ bool InitializeICU() {
25	// TODO(jungshik): Some callers do not care about tz at all. If necessary,	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	26	// add a boolean argument to this function to init'd the default tz only
27	// when requested.	27	// when requested.




--- src/3rdparty/chromium/base/memory/platform_shared_memory_region.h.orig	2019-11-27 21:12:25 UTC
+++ src/3rdparty/chromium/base/memory/platform_shared_memory_region.h
@@ -28,7 +28,7 @@
 #include "base/files/scoped_file.h"
 #endif
 
-#if defined(OS_LINUX)
+#if defined(OS_LINUX) || defined(OS_BSD)
 namespace content {
 class SandboxIPCHandler;
 }
@@ -122,7 +122,7 @@ class BASE_EXPORT PlatformSharedMemoryRegion {
     kMaxValue = GET_SHMEM_TEMP_DIR_FAILURE
   };
 
-#if defined(OS_LINUX)
+#if defined(OS_LINUX) || defined(OS_BSD)
   // Structure to limit access to executable region creation.
   struct ExecutableRegion {
    private:
@@ -276,7 +276,7 @@ class BASE_EXPORT PlatformSharedMemoryRegion {
                            CheckPlatformHandlePermissionsCorrespondToMode);
   static PlatformSharedMemoryRegion Create(Mode mode,
                                            size_t size
-#if defined(OS_LINUX)
+#if defined(OS_LINUX) || defined(OS_BSD)
                                            ,
                                            bool executable = false
 #endif




--- src/3rdparty/chromium/base/memory/platform_shared_memory_region_posix.cc.orig	2019-11-27 21:12:25 UTC
+++ src/3rdparty/chromium/base/memory/platform_shared_memory_region_posix.cc
@@ -76,7 +76,7 @@ FDPair ScopedFDPair::get() const {
   return {fd.get(), readonly_fd.get()};
 }
 
-#if defined(OS_LINUX)
+#if defined(OS_LINUX) || defined(OS_BSD)
 // static
 ScopedFD PlatformSharedMemoryRegion::ExecutableRegion::CreateFD(size_t size) {
   PlatformSharedMemoryRegion region =
@@ -85,7 +85,7 @@ ScopedFD PlatformSharedMemoryRegion::ExecutableRegion:
     return region.PassPlatformHandle().fd;
   return ScopedFD();
 }
-#endif  // defined(OS_LINUX)
+#endif  // defined(OS_LINUX) || defined(OS_BSD)
 
 // static
 PlatformSharedMemoryRegion PlatformSharedMemoryRegion::Take(
@@ -224,7 +224,7 @@ bool PlatformSharedMemoryRegion::MapAtInternal(off_t o
 // static
 PlatformSharedMemoryRegion PlatformSharedMemoryRegion::Create(Mode mode,
                                                               size_t size
-#if defined(OS_LINUX)
+#if defined(OS_LINUX) || defined(OS_BSD)
                                                               ,
                                                               bool executable
 #endif
@@ -255,7 +255,7 @@ PlatformSharedMemoryRegion PlatformSharedMemoryRegion:
   // flag.
   FilePath directory;
   if (!GetShmemTempDir(
-#if defined(OS_LINUX)
+#if defined(OS_LINUX) || defined(OS_BSD)
           executable,
 #else
           false /* executable */,




--- 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/numerics/safe_math_shared_impl.h.orig	2019-11-27 21:12:25 UTC
+++ src/3rdparty/chromium/base/numerics/safe_math_shared_impl.h
@@ -23,8 +23,7 @@
 
 // Where available use builtin math overflow support on Clang and GCC.
 #elif !defined(__native_client__) &&                         \
       ((defined(__clang__) &&                                \
-        ((__clang_major__ > 3) ||                            \
-         (__clang_major__ == 3 && __clang_minor__ >= 4))) || \
+        (__clang_major__ > 6)) ||                            \
        (defined(__GNUC__) && __GNUC__ >= 5))
 #include "base/numerics/safe_math_clang_gcc_impl.h"
 #define BASE_HAS_OPTIMIZED_SAFE_MATH (1)




--- src/3rdparty/chromium/base/process/process_metrics.cc.orig	2019-11-27 21:12:25 UTC
+++ src/3rdparty/chromium/base/process/process_metrics.cc
@@ -57,7 +57,7 @@ SystemMetrics SystemMetrics::Sample() {
   SystemMetrics system_metrics;
 
   system_metrics.committed_memory_ = GetSystemCommitCharge();
-#if defined(OS_LINUX) || defined(OS_ANDROID)
+#if defined(OS_LINUX) || defined(OS_ANDROID) || defined(OS_BSD)
   GetSystemMemoryInfo(&system_metrics.memory_info_);
   GetVmStatInfo(&system_metrics.vmstat_info_);
   GetSystemDiskInfo(&system_metrics.disk_info_);
@@ -75,7 +75,7 @@ std::unique_ptr<Value> SystemMetrics::ToValue() const 
   std::unique_ptr<DictionaryValue> res(new DictionaryValue());
 
   res->SetIntKey("committed_memory", static_cast<int>(committed_memory_));
-#if defined(OS_LINUX) || defined(OS_ANDROID)
+#if defined(OS_LINUX) || defined(OS_ANDROID) || defined(OS_BSD)
   std::unique_ptr<DictionaryValue> meminfo = memory_info_.ToValue();
   std::unique_ptr<DictionaryValue> vmstat = vmstat_info_.ToValue();
   meminfo->MergeDictionary(vmstat.get());
@@ -126,7 +126,7 @@ double ProcessMetrics::GetPlatformIndependentCPUUsage(
 }
 #endif




--- src/3rdparty/chromium/base/process/process_metrics.h.orig	2019-11-27 21:12:25 UTC
+++ src/3rdparty/chromium/base/process/process_metrics.h
@@ -41,7 +41,7 @@ namespace base {
 // Full declaration is in process_metrics_iocounters.h.

   // Resident Set Size is a Linux/Android specific memory concept. Do not
   // attempt to extend this to other platforms.
   BASE_EXPORT size_t GetResidentSetSize() const;
@@ -168,14 +168,14 @@ class BASE_EXPORT ProcessMetrics {
   int GetOpenFdSoftLimit() const;
 #endif  // defined(OS_POSIX)
 

 
   // Returns total memory usage of malloc.
   size_t GetMallocUsage();
@@ -187,7 +187,7 @@ class BASE_EXPORT ProcessMetrics {
   ProcessMetrics(ProcessHandle process, PortProvider* port_provider);
 #endif  // !defined(OS_MACOSX) || defined(OS_IOS)
 

   int CalculateIdleWakeupsPerSecond(uint64_t absolute_idle_wakeups);
 #endif
 #if defined(OS_MACOSX)
@@ -216,7 +216,7 @@ class BASE_EXPORT ProcessMetrics {
   // Number of bytes transferred to/from disk in bytes.
   uint64_t last_cumulative_disk_usage_ = 0;
 

   // Same thing for idle wakeups.
   TimeTicks last_idle_wakeups_time_;
   uint64_t last_absolute_idle_wakeups_;
@@ -264,7 +264,7 @@ BASE_EXPORT size_t GetHandleLimit();
 BASE_EXPORT void IncreaseFdLimitTo(unsigned int max_descriptors);
 #endif  // defined(OS_POSIX)
 
-#if defined(OS_WIN) || defined(OS_MACOSX) || defined(OS_LINUX) || \
+#if defined(OS_WIN) || defined(OS_MACOSX) || defined(OS_LINUX) || defined(OS_BSD) || \
     defined(OS_ANDROID) || defined(OS_AIX) || defined(OS_FUCHSIA)
 // Data about system-wide memory consumption. Values are in KB. Available on
 // Windows, Mac, Linux, Android and Chrome OS.
@@ -298,7 +298,7 @@ struct BASE_EXPORT SystemMemoryInfoKB {
@@ -326,7 +326,7 @@ struct BASE_EXPORT SystemMemoryInfoKB {
   int avail_phys = 0;
 #endif
 

   // This provides an estimate of available memory as described here:
   // https://git.kernel.org/cgit/linux/kernel/git/torvalds/linux.git/commit/?id=34e431b0ae398fc54ea69ff85ec700722c9da773
   // NOTE: this is ONLY valid in kernels 3.14 and up.  Its value will always
@@ -312,7 +312,7 @@ struct BASE_EXPORT SystemMemoryInfoKB {
   int swap_free = 0;
 #endif
 
-#if defined(OS_ANDROID) || defined(OS_LINUX) || defined(OS_AIX) || \
+#if defined(OS_ANDROID) || defined(OS_LINUX) || defined(OS_AIX) || defined(OS_BSD) || \
     defined(OS_FUCHSIA)
   int buffers = 0;
   int cached = 0;
@@ -322,7 +322,7 @@ struct BASE_EXPORT SystemMemoryInfoKB {
   int inactive_file = 0;
   int dirty = 0;
   int reclaimable = 0;
-#endif  // defined(OS_ANDROID) || defined(OS_LINUX) || defined(OS_AIX) ||
+#endif  // defined(OS_ANDROID) || defined(OS_LINUX) || defined(OS_AIX) || defined(OS_BSD) ||
         // defined(OS_FUCHSIA)
 
 #if defined(OS_CHROMEOS)
@@ -348,10 +348,10 @@ struct BASE_EXPORT SystemMemoryInfoKB {
 // Exposed for memory debugging widget.
 BASE_EXPORT bool GetSystemMemoryInfo(SystemMemoryInfoKB* meminfo);
 
-#endif  // defined(OS_WIN) || defined(OS_MACOSX) || defined(OS_LINUX) ||
+#endif  // defined(OS_WIN) || defined(OS_MACOSX) || defined(OS_LINUX) || defined(OS_BSD)
         // defined(OS_ANDROID) || defined(OS_AIX) || defined(OS_FUCHSIA)
 
-#if defined(OS_LINUX) || defined(OS_ANDROID) || defined(OS_AIX)
+#if defined(OS_LINUX) || defined(OS_ANDROID) || defined(OS_AIX) || defined(OS_BSD)
 // Parse the data found in /proc/<pid>/stat and return the sum of the
 // CPU-related ticks.  Returns -1 on parse error.
 // Exposed for testing.
@@ -424,7 +424,7 @@ BASE_EXPORT bool GetSystemDiskInfo(SystemDiskInfo* dis
 // Returns the amount of time spent in user space since boot across all CPUs.
 BASE_EXPORT TimeDelta GetUserCpuTimeSinceBoot();
 
-#endif  // defined(OS_LINUX) || defined(OS_ANDROID)
+#endif  // defined(OS_LINUX) || defined(OS_ANDROID) || defined(OS_BSD)
 
 #if defined(OS_CHROMEOS)
 // Data from files in directory /sys/block/zram0 about ZRAM usage.
@@ -519,7 +519,7 @@ class BASE_EXPORT SystemMetrics {
   FRIEND_TEST_ALL_PREFIXES(SystemMetricsTest, SystemMetrics);
 
   size_t committed_memory_;
-#if defined(OS_LINUX) || defined(OS_ANDROID)
+#if defined(OS_LINUX) || defined(OS_ANDROID) || defined(OS_BSD)
   SystemMemoryInfoKB memory_info_;
   VmStatInfo vmstat_info_;
   SystemDiskInfo disk_info_;




--- src/3rdparty/chromium/base/process/process_metrics_freebsd.cc.orig	2019-11-27 21:12:25 UTC
+++ src/3rdparty/chromium/base/process/process_metrics_freebsd.cc
@@ -5,6 +5,7 @@
 #include "base/process/process_metrics.h"

 #include <sys/sysctl.h>
 #include <sys/user.h>
 #include <unistd.h>
@@ -14,11 +15,29 @@
 #include "base/process/process_metrics_iocounters.h"
 #include "base/stl_util.h"
 

+#include <libutil.h>
+
 namespace base {
+namespace {
 
+int GetPageShift() {
+  int pagesize = getpagesize();
+  int pageshift = 0;
+
+  while (pagesize > 1) {
+    pageshift++;
+    pagesize >>= 1;
+  }
+
+  return pageshift;
+}
+}
+
 ProcessMetrics::ProcessMetrics(ProcessHandle process)
-    : process_(process),
-      last_cpu_(0) {}

 
 // static
 std::unique_ptr<ProcessMetrics> ProcessMetrics::CreateProcessMetrics(
@@ -69,4 +88,216 @@ size_t GetSystemCommitCharge() {
   return mem_total - (mem_free*pagesize) - (mem_inactive*pagesize);
 }
 

+  return total_count;
+}
+
+size_t ProcessMetrics::GetResidentSetSize() const {
+  kvm_t *kd = kvm_open(nullptr, "/dev/null", nullptr, O_RDONLY, "kvm_open");
+
+  if (kd == nullptr)
+    return 0;
+
+  struct kinfo_proc *pp;
+  int nproc;
+
+  if ((pp = kvm_getprocs(kd, KERN_PROC_PID, process_, &nproc)) == nullptr) {
+    kvm_close(kd);
+    return 0;
+  }
+  
+  size_t rss;
+
+  if (nproc > 0) {
+    rss = pp->ki_rssize << GetPageShift();
+  } else {
+    rss = 0;
+  }
+
+  kvm_close(kd);
+  return rss;
+}
+
+uint64_t ProcessMetrics::GetVmSwapBytes() const {
+  kvm_t *kd = kvm_open(nullptr, "/dev/null", nullptr, O_RDONLY, "kvm_open");
+
+  if (kd == nullptr)
+    return 0;
+
+  struct kinfo_proc *pp;
+  int nproc;
+
+  if ((pp = kvm_getprocs(kd, KERN_PROC_PID, process_, &nproc)) == nullptr) {
+    kvm_close(kd);
+    return 0;
+  }
+  
+  size_t swrss;
+
+  if (nproc > 0) {
+    swrss = pp->ki_swrss > pp->ki_rssize
+      ? (pp->ki_swrss - pp->ki_rssize) << GetPageShift()
+      : 0;
+  } else {
+    swrss = 0;
+  }
+
+  kvm_close(kd);
+  return swrss;
+}
+
+int ProcessMetrics::GetIdleWakeupsPerSecond() {
+  NOTIMPLEMENTED();
+  return 0;
+}
+
+bool GetSystemDiskInfo(SystemDiskInfo* diskinfo) {
+  NOTIMPLEMENTED();
+  return false;
+}
+
+bool GetVmStatInfo(VmStatInfo* vmstat) {
+  NOTIMPLEMENTED();
+  return false;
+}
+
+SystemDiskInfo::SystemDiskInfo() {
+  reads = 0;
+  reads_merged = 0;
+  sectors_read = 0;
+  read_time = 0;
+  writes = 0;
+  writes_merged = 0;
+  sectors_written = 0;
+  write_time = 0;
+  io = 0;
+  io_time = 0;
+  weighted_io_time = 0;
+}
+
+SystemDiskInfo::SystemDiskInfo(const SystemDiskInfo& other) = default;
+
+std::unique_ptr<Value> SystemDiskInfo::ToValue() const {
+  auto res = std::make_unique<DictionaryValue>();
+
+  // Write out uint64_t variables as doubles.
+  // Note: this may discard some precision, but for JS there's no other option.
+  res->SetDouble("reads", static_cast<double>(reads));
+  res->SetDouble("reads_merged", static_cast<double>(reads_merged));
+  res->SetDouble("sectors_read", static_cast<double>(sectors_read));
+  res->SetDouble("read_time", static_cast<double>(read_time));
+  res->SetDouble("writes", static_cast<double>(writes));
+  res->SetDouble("writes_merged", static_cast<double>(writes_merged));
+  res->SetDouble("sectors_written", static_cast<double>(sectors_written));
+  res->SetDouble("write_time", static_cast<double>(write_time));
+  res->SetDouble("io", static_cast<double>(io));
+  res->SetDouble("io_time", static_cast<double>(io_time));
+  res->SetDouble("weighted_io_time", static_cast<double>(weighted_io_time));
+
+  return std::move(res);
+}
+
+std::unique_ptr<DictionaryValue> SystemMemoryInfoKB::ToValue() const {
+  auto res = std::make_unique<DictionaryValue>();
+  res->SetIntKey("total", total);
+  res->SetIntKey("free", free);
+  res->SetIntKey("available", available);
+  res->SetIntKey("buffers", buffers);
+  res->SetIntKey("cached", cached);
+  res->SetIntKey("active_anon", active_anon);
+  res->SetIntKey("inactive_anon", inactive_anon);
+  res->SetIntKey("active_file", active_file);
+  res->SetIntKey("inactive_file", inactive_file);
+  res->SetIntKey("swap_total", swap_total);
+  res->SetIntKey("swap_free", swap_free);
+  res->SetIntKey("swap_used", swap_total - swap_free);
+  res->SetIntKey("dirty", dirty);
+  res->SetIntKey("reclaimable", reclaimable);
+
+  return res;
+}
+
+std::unique_ptr<DictionaryValue> VmStatInfo::ToValue() const {
+  auto res = std::make_unique<DictionaryValue>();
+  res->SetIntKey("pswpin", pswpin);
+  res->SetIntKey("pswpout", pswpout);
+  res->SetIntKey("pgmajfault", pgmajfault);
+  return res;
+}
 }  // namespace base




--- src/3rdparty/chromium/base/sampling_heap_profiler/sampling_heap_profiler.cc.orig	2019-11-27 21:12:25 UTC
+++ src/3rdparty/chromium/base/sampling_heap_profiler/sampling_heap_profiler.cc
@@ -29,6 +29,10 @@
 #include <sys/prctl.h>
 #endif
 
+#if defined(OS_BSD)
+#include <pthread_np.h>
+#endif
+
 #if defined(OS_ANDROID) && BUILDFLAG(CAN_UNWIND_WITH_CFI_TABLE) && \
     defined(OFFICIAL_BUILD)
 #include "base/trace_event/cfi_backtrace_android.h"
@@ -64,6 +68,10 @@ const char* GetAndLeakThreadName() {
 #elif defined(OS_MACOSX)
   int err = pthread_getname_np(pthread_self(), name, kBufferLen);
   if (err == 0 && *name != '\0')
+    return strdup(name);
+#elif defined(OS_BSD) && __FreeBSD__ >= 12
+  pthread_get_name_np(pthread_self(), name, kBufferLen);
+  if (*name != '\0')
     return strdup(name);
 #endif  // defined(OS_LINUX) || defined(OS_ANDROID)
 




--- src/3rdparty/chromium/base/syslog_logging.cc.orig	2019-11-27 21:12:25 UTC
+++ src/3rdparty/chromium/base/syslog_logging.cc
@@ -11,7 +11,7 @@
 #include "base/callback_helpers.h"
 #include "base/debug/stack_trace.h"
 #include "base/win/win_util.h"
-#elif defined(OS_LINUX)
+#elif defined(OS_LINUX) || defined(OS_BSD)
 // <syslog.h> defines LOG_INFO, LOG_WARNING macros that could conflict with
 // base::LOG_INFO, base::LOG_WARNING.
 #include <syslog.h>
@@ -110,7 +110,7 @@ EventLogMessage::~EventLogMessage() {
 
   if (user_sid != nullptr)
     ::LocalFree(user_sid);
-#elif defined(OS_LINUX)
+#elif defined(OS_LINUX) || defined(OS_BSD)
   const char kEventSource[] = "chrome";
   openlog(kEventSource, LOG_NOWAIT | LOG_PID, LOG_USER);
   // We can't use the defined names for the logging severity from syslog.h

Added Link Here

(-)b/www/qt5-webengine/files/patch-src_3rdparty_chromium_base_system_sys__info.h (+11 lines)
1	--- src/3rdparty/chromium/base/system/sys_info.h.orig 2019-11-27 21:12:25 UTC
2	+++ src/3rdparty/chromium/base/system/sys_info.h
3	@@ -192,7 +192,7 @@ class BASE_EXPORT SysInfo {
4	static bool IsLowEndDeviceImpl();
5	static HardwareInfo GetHardwareInfoSync();
6
7	-#if defined(OS_LINUX) \|\| defined(OS_ANDROID) \|\| defined(OS_AIX)
8	+#if defined(OS_LINUX) \|\| defined(OS_ANDROID) \|\| defined(OS_AIX) \|\| defined(OS_BSD)
9	static int64_t AmountOfAvailablePhysicalMemory(
10	const SystemMemoryInfoKB& meminfo);
11	#endif




--- src/3rdparty/chromium/base/system/sys_info_freebsd.cc.orig	2019-11-27 21:12:25 UTC
+++ src/3rdparty/chromium/base/system/sys_info_freebsd.cc
@@ -13,26 +13,46 @@
 namespace base {
 
 int64_t SysInfo::AmountOfPhysicalMemoryImpl() {

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

+    return name;
+  return std::string();
+}
+
+int SysInfo::NumberOfProcessors() {
+  int mib[] = { CTL_HW, HW_NCPU };
+  int ncpu;
+  size_t size = sizeof(ncpu);
+  if (sysctl(mib, base::size(mib), &ncpu, &size, NULL, 0) == -1) {
+    NOTREACHED();
+    return 1;
+  }
+  return ncpu;
 }
 
 }  // namespace base




--- src/3rdparty/chromium/base/system/sys_info_posix.cc.orig	2019-11-27 21:12:25 UTC
+++ src/3rdparty/chromium/base/system/sys_info_posix.cc
@@ -220,6 +220,8 @@ std::string SysInfo::OperatingSystemArchitecture() {
 
 namespace {
 
-#if !defined(OS_OPENBSD) && !defined(OS_FUCHSIA)
+#if !defined(OS_BSD) && !defined(OS_FUCHSIA)
 int NumberOfProcessors() {
   // sysconf returns the number of "logical" (not "physical") processors on both
   // Mac and Linux.  So we get the number of max available "logical" processors.
@@ -64,7 +64,7 @@ int NumberOfProcessors() {
 
 base::LazyInstance<base::internal::LazySysInfoValue<int, NumberOfProcessors>>::
     Leaky g_lazy_number_of_processors = LAZY_INSTANCE_INITIALIZER;
-#endif  // !defined(OS_OPENBSD) && !defined(OS_FUCHSIA)
+#endif  // !defined(OS_BSD) && !defined(OS_FUCHSIA)
 
 #if !defined(OS_FUCHSIA)
 int64_t AmountOfVirtualMemory() {
@@ -132,7 +132,7 @@ bool GetDiskSpaceInfo(const base::FilePath& path,
 
 namespace base {
 
-#if !defined(OS_OPENBSD) && !defined(OS_FUCHSIA)
+#if !defined(OS_BSD) && !defined(OS_FUCHSIA)
 int SysInfo::NumberOfProcessors() {
   return g_lazy_number_of_processors.Get().value();
 }
@@ -225,7 +225,9 @@ std::string SysInfo::OperatingSystemArchitecture() {
     arch = "x86";
   } else if (arch == "amd64") {
     arch = "x86_64";
-  } else if (std::string(info.sysname) == "AIX") {
+  } else if (arch == "arm64") {
+    arch = "aarch64";
   } else if (std::string(info.sysname) == "AIX") {
     arch = "ppc64";
   }
   return arch;




--- src/3rdparty/chromium/build/config/allocator.gni.orig	2018-11-13 18:25:11 UTC
+++ src/3rdparty/chromium/build/config/allocator.gni
@@ -6,7 +6,7 @@ import("//build/config/sanitizers/sanitizers.gni")
 
 # Temporarily disable tcmalloc on arm64 linux to get rid of compilation errors.
 if (is_android || is_mac || is_ios || is_asan || is_lsan || is_tsan ||
-    is_msan || is_win || is_fuchsia || (is_linux && target_cpu == "arm64")) {
+    is_msan || is_win || is_fuchsia || (is_linux && target_cpu == "arm64") || is_bsd) {
   _default_allocator = "none"
 } else {
   _default_allocator = "tcmalloc"
@@ -17,7 +17,7 @@ if (is_android || is_mac || is_ios || is_asan || is_ls
 # against the debug CRT with "is_nacl=false".
 if ((is_linux || is_android || is_mac ||
      (is_win && !is_shared && !is_debug)) && !is_asan && !is_lsan &&
-    !is_tsan && !is_msan) {
+    !is_tsan && !is_msan && !is_bsd) {
   _default_use_allocator_shim = true
 } else {
   _default_use_allocator_shim = false




--- src/3rdparty/chromium/build/config/compiler/BUILD.gn.orig	2019-11-27 21:12:25 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
   # you are using a custom toolchain and need to control -B in cflags.
   linux_use_bundled_binutils =

       (current_cpu == "x64" || current_cpu == "x86")
   binutils_path = rebase_path("//third_party/binutils/Linux_x64/Release/bin",
                               root_build_dir)
@@ -301,7 +301,7 @@ config("compiler") {
     # Linker warnings.
     if (fatal_linker_warnings && !(is_chromeos && current_cpu == "arm") &&
         !(is_android && use_order_profiling) && !is_mac && !is_ios &&

       # TODO(jochen): Enable this on chromeos on arm. http://crbug.com/356580
       # TODO(lizeb,pasko): Fix link errors when linking with order_profiling=1
       # crbug.com/485542
@@ -407,7 +407,7 @@ config("compiler") {
 
     # 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",
@@ -786,7 +786,7 @@ config("compiler_cpu_abi") {
     }
   }
 
-  if (is_clang && !is_nacl && !use_xcode_clang && !use_qt) {
+  if (is_clang && !is_nacl && !use_xcode_clang && !use_qt && !is_bsd) {
     cflags += [
       # TODO(hans): Remove this once Clang generates better optimized debug info
       # by default. https://crbug.com/765793
@@ -814,11 +814,11 @@ config("compiler_cpu_abi") {
         ]
       }
     } else if (current_cpu == "arm") {
-      if (is_clang && !is_android && !is_nacl) {
+      if (is_clang && !is_android && !is_nacl && !is_bsd) {
         cflags += [ "--target=arm-linux-gnueabihf" ]
         ldflags += [ "--target=arm-linux-gnueabihf" ]
       }
-      if (!is_nacl) {
+      if (!is_nacl && !is_bsd) {
         cflags += [
           "-march=$arm_arch",
           "-mfloat-abi=$arm_float_abi",
@@ -828,7 +828,7 @@ config("compiler_cpu_abi") {
         cflags += [ "-mtune=$arm_tune" ]
       }
     } else if (current_cpu == "arm64") {

         cflags += [ "--target=aarch64-linux-gnu" ]
         ldflags += [ "--target=aarch64-linux-gnu" ]
       }
@@ -1147,7 +1147,7 @@ config("compiler_deterministic") {
       "-Xclang",
       ".",
     ]
-    if (!is_win) {
+    if (!is_win && !is_bsd) {
       # We don't use clang -cc1as on Windows (yet? https://crbug.com/762167)
       asmflags = [ "-Wa,-fdebug-compilation-dir,." ]
     }
@@ -1553,7 +1553,7 @@ config("default_warnings") {
         cflags += [ "-Wno-nonportable-include-path" ]
       }
 

         # Flags NaCl (Clang 3.7) and Xcode 9.2 (Clang clang-900.0.39.2) do not
         # recognize.
         cflags += [
@@ -1761,7 +1761,7 @@ config("thin_archive") {
   # 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" ]
@@ -2356,7 +2356,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) {
-      cflags += [ "-g2" ]
+      cflags += [ "-g0" ]
       }
     }
 
     if (use_debug_fission && !is_nacl && !is_android) {
@@ -2377,7 +2377,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" &&




--- src/3rdparty/chromium/build/config/linux/pkg-config.py.orig	2019-11-27 21:12:25 UTC
+++ src/3rdparty/chromium/build/config/linux/pkg-config.py
@@ -59,8 +59,12 @@ def SetConfigPath(options):
     print("You must specify an architecture via -a if using a sysroot.")
     sys.exit(1)
 
-  libdir = sysroot + '/usr/' + options.system_libdir + '/pkgconfig'

   os.environ['PKG_CONFIG_LIBDIR'] = libdir
   return libdir
 
@@ -109,7 +113,7 @@ def main():
   # If this is run on non-Linux platforms, just return nothing and indicate
   # success. This allows us to "kind of emulate" a Linux build from other
   # platforms.
-  if "linux" not in sys.platform:
+  if "bsd" not in sys.platform:
     print("[[],[],[],[],[]]")
     return 0
 




--- src/3rdparty/chromium/build/toolchain/linux/BUILD.gn.orig	2019-11-27 21:12:25 UTC
+++ src/3rdparty/chromium/build/toolchain/linux/BUILD.gn
@@ -22,7 +22,6 @@ clang_toolchain("clang_arm") {
 import("//build/config/sysroot.gni")
 import("//build/toolchain/gcc_toolchain.gni")
 
+clang_toolchain("clang_ppc64") {
+  enable_linker_map = true
+  toolchain_args = {
+    current_cpu = "ppc64"
+    current_os = "linux"
+  }
+}
+
 clang_toolchain("clang_arm") {
   toolprefix = "arm-linux-gnueabihf-"
   toolchain_args = {
@@ -14,7 +22,6 @@
 }
 
 clang_toolchain("clang_arm64") {




--- src/3rdparty/chromium/cc/BUILD.gn.orig	2019-11-27 21:12:25 UTC
+++ src/3rdparty/chromium/cc/BUILD.gn
@@ -568,7 +568,7 @@ cc_test_static_library("test_support") {
   if (enable_vulkan) {
     deps += [ "//gpu/vulkan/init" ]
   }
-  if (!is_android) {
+  if (!is_android && !is_bsd) {
     data_deps = [
       "//third_party/mesa_headers",
     ]
@@ -773,9 +773,6 @@ cc_test("cc_unittests") {
     "//ui/gfx/geometry",
     "//ui/gl",
     "//ui/gl:test_support",

-  data_deps = [
-    "//third_party/mesa_headers",
   ]
 }
 
   if (enable_vulkan) {




--- src/3rdparty/chromium/chrome/app/chromium_strings.grd.orig	2019-11-27 21:12:25 UTC
+++ src/3rdparty/chromium/chrome/app/chromium_strings.grd
@@ -690,7 +690,7 @@ Signing in anyway will merge Chromium information like
       </if>
 
       <!-- about:browser-switch strings -->
-      <if expr="is_win or is_macosx or (is_linux and not is_chromeos)">
+      <if expr="is_win or is_macosx or (is_posix and not is_chromeos)">
         <message name="IDS_ABOUT_BROWSER_SWITCH_DESCRIPTION_UNKNOWN_BROWSER" desc="Description shown while waiting for an alternative browser to open, when the browser name is not auto-detected">
           Your system administrator has configured Chromium to open an alternative browser to access <ph name="TARGET_URL_HOSTNAME">$1<ex>example.com</ex></ph>.
         </message>
@@ -821,7 +821,7 @@ Signing in anyway will merge Chromium information like
       </message>
 
       <!-- ProcessSingleton -->

         <message name="IDS_PROFILE_IN_USE_POSIX" desc="Message shown when the browser cannot start because the profile is in use on a different host.">
           The profile appears to be in use by another Chromium process (<ph name="PROCESS_ID">$1<ex>12345</ex></ph>) on another computer (<ph name="HOST_NAME">$2<ex>example.com</ex></ph>). Chromium has locked the profile so that it doesn't get corrupted. If you are sure no other processes are using this profile, you can unlock the profile and relaunch Chromium.
         </message>
@@ -1080,7 +1080,7 @@ Please check your email at <ph name="ACCOUNT_EMAIL">$2
       </message>
 
       <!-- Plugin Placeholders -->




--- src/3rdparty/chromium/chrome/app/generated_resources.grd.orig	2019-11-27 21:12:25 UTC
+++ src/3rdparty/chromium/chrome/app/generated_resources.grd
@@ -4796,7 +4796,7 @@ Keep your key file in a safe place. You will need it t
         </message>
       </if>
 
       <!-- chrome://browser-switch strings -->
-      <if expr="is_win or is_macosx or (is_linux and not is_chromeos)">
+      <if expr="is_win or is_macosx or (is_posix and not is_chromeos)">
         <message name="IDS_ABOUT_BROWSER_SWITCH_TITLE" desc="about:browser-switch page title">
           Legacy Browser Support
         </message>
@@ -6373,7 +6373,7 @@ the Bookmarks menu.">
         Google Pay
       </message>
 

         <message name="IDS_SHOW_WINDOW_DECORATIONS" desc="The label of a radio button in the options dialog for using the system title bar and borders.">
           Use system title bar and borders
         </message>
@@ -7222,7 +7222,7 @@ Please help our engineers fix this problem. Tell us wh
         Set as default
       </message>
 




--- src/3rdparty/chromium/chrome/app/google_chrome_strings.grd.orig	2019-11-27 21:12:25 UTC
+++ src/3rdparty/chromium/chrome/app/google_chrome_strings.grd
@@ -702,7 +702,7 @@ Signing in anyway will merge Chrome information like b
       </if>
 
       <!-- about:browser-switch strings -->
-      <if expr="is_win or is_macosx or (is_linux and not is_chromeos)">
+      <if expr="is_win or is_macosx or (is_posix and not is_chromeos)">
         <message name="IDS_ABOUT_BROWSER_SWITCH_DESCRIPTION_UNKNOWN_BROWSER" desc="Description shown while waiting for an alternative browser to open, when the browser name is not auto-detected">
           Your system administrator has configured Google Chrome to open an alternative browser to access <ph name="TARGET_URL_HOSTNAME">$1<ex>example.com</ex></ph>.
         </message>
@@ -833,7 +833,7 @@ Signing in anyway will merge Chrome information like b
       </message>
 
       <!-- ProcessSingleton -->

         <message name="IDS_PROFILE_IN_USE_POSIX" desc="Message shown when the browser cannot start because the profile is in use on a different host.">
           The profile appears to be in use by another Google Chrome process (<ph name="PROCESS_ID">$1<ex>12345</ex></ph>) on another computer (<ph name="HOST_NAME">$2<ex>example.com</ex></ph>).  Chrome has locked the profile so that it doesn't get corrupted.  If you are sure no other processes are using this profile, you can unlock the profile and relaunch Chrome.
         </message>
@@ -1099,7 +1099,7 @@ Please check your email at <ph name="ACCOUNT_EMAIL">$2
       </message>
 
       <!-- Plugin Placeholders -->

Lines 1-6 Link Here

(-)b/www/qt5-webengine/files/patch-src_3rdparty_chromium_chrome_app_theme_chrome__unscaled__resources.grd (-2 / +11 lines)
1	--- src/3rdparty/chromium/chrome/app/theme/chrome_unscaled_resources.grd.orig 2018-11-13 18:25:11 UTC	1	--- src/3rdparty/chromium/chrome/app/theme/chrome_unscaled_resources.grd.orig 2019-11-27 21:12:25 UTC
2	+++ src/3rdparty/chromium/chrome/app/theme/chrome_unscaled_resources.grd	2	+++ src/3rdparty/chromium/chrome/app/theme/chrome_unscaled_resources.grd
3	@@ -88,7 +88,7 @@	3	@@ -18,7 +18,7 @@
		4	<include name="IDR_PRODUCT_LOGO_64" file="google_chrome/product_logo_64.png" type="BINDATA" />
		5	<include name="IDR_PRODUCT_LOGO_128" file="google_chrome/product_logo_128.png" type="BINDATA" />
		6	<include name="IDR_PRODUCT_LOGO_256" file="google_chrome/product_logo_256.png" type="BINDATA" />
		7	- <if expr="is_linux">
		8	+ <if expr="is_posix">
		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" />
		11	</if>
		12	@@ -109,7 +109,7 @@
4	<include name="IDR_PROFILE_AVATAR_2X_25" file="default_200_percent/common/profile_avatar_sun_cloud.png" type="BINDATA" />	13	<include name="IDR_PROFILE_AVATAR_2X_25" file="default_200_percent/common/profile_avatar_sun_cloud.png" type="BINDATA" />
5	<include name="IDR_PROFILE_AVATAR_2X_26" file="default_200_percent/common/profile_avatar_placeholder.png" type="BINDATA" />	14	<include name="IDR_PROFILE_AVATAR_2X_26" file="default_200_percent/common/profile_avatar_placeholder.png" type="BINDATA" />
6	</if>	15	</if>




--- src/3rdparty/chromium/chrome/browser/extensions/api/image_writer_private/image_writer_private_api.cc.orig	2018-11-13 18:25:11 UTC
+++ src/3rdparty/chromium/chrome/browser/extensions/api/image_writer_private/image_writer_private_api.cc
@@ -137,9 +137,11 @@ ImageWriterPrivateListRemovableStorageDevicesFunction:
 }
 
 bool ImageWriterPrivateListRemovableStorageDevicesFunction::RunAsync() {
+#if !defined(OS_FREEBSD)
   RemovableStorageProvider::GetAllDevices(base::BindOnce(
       &ImageWriterPrivateListRemovableStorageDevicesFunction::OnDeviceListReady,
       this));
+#endif
   return true;
 }
 




--- src/3rdparty/chromium/chrome/browser/extensions/api/settings_private/prefs_util.cc.orig	2019-11-27 21:12:25 UTC
+++ src/3rdparty/chromium/chrome/browser/extensions/api/settings_private/prefs_util.cc
@@ -153,7 +153,7 @@ const PrefsUtil::TypedPrefMap& PrefsUtil::GetWhitelist
       settings_api::PrefType::PREF_TYPE_BOOLEAN;
   (*s_whitelist)[bookmarks::prefs::kShowBookmarkBar] =
       settings_api::PrefType::PREF_TYPE_BOOLEAN;
 
-#if defined(OS_LINUX) && !defined(OS_CHROMEOS)
+#if (defined(OS_LINUX) && !defined(OS_CHROMEOS)) || defined(OS_BSD)
   (*s_whitelist)[::prefs::kUseCustomChromeFrame] =
       settings_api::PrefType::PREF_TYPE_BOOLEAN;
 #endif
@@ -163,7 +163,7 @@ const PrefsUtil::TypedPrefMap& PrefsUtil::GetWhitelist
   // Appearance settings.
   (*s_whitelist)[::prefs::kCurrentThemeID] =
       settings_api::PrefType::PREF_TYPE_STRING;




--- src/3rdparty/chromium/chrome/browser/ui/webui/chrome_web_ui_controller_factory.cc.orig	2019-11-27 21:12:25 UTC
+++ src/3rdparty/chromium/chrome/browser/ui/webui/chrome_web_ui_controller_factory.cc
@@ -206,11 +206,11 @@
 #include "chrome/browser/ui/webui/set_as_default_browser_ui_win.h"
 #endif
 
-#if defined(OS_WIN) || defined(OS_MACOSX) || defined(OS_LINUX)

 #include "chrome/browser/ui/webui/sandbox_internals_ui.h"
 #endif
 
@@ -323,7 +323,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)
@@ -638,7 +638,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
@@ -681,17 +681,17 @@ WebUIFactoryFunction GetWebUIFactoryFunction(WebUI* we
     return &NewWebUI<CastUI>;
   }
 #endif

   if (url.host_piece() == chrome::kChromeUIDiscardsHost)
     return &NewWebUI<DiscardsUI>;
 #endif
 #if defined(OS_WIN) || defined(OS_MACOSX) || \
-    (defined(OS_LINUX) && !defined(OS_CHROMEOS))
+    (defined(OS_LINUX) && !defined(OS_CHROMEOS)) || defined(OS_BSD)
   if (url.host_piece() == chrome::kChromeUIBrowserSwitchHost)
     return &NewWebUI<BrowserSwitchUI>;
 #endif




--- src/3rdparty/chromium/chrome/common/chrome_paths.cc.orig	2019-11-27 21:12:25 UTC
+++ src/3rdparty/chromium/chrome/common/chrome_paths.cc
@@ -52,21 +52,21 @@ const base::FilePath::CharType kPepperFlashSystemBaseD
     FILE_PATH_LITERAL("Internet Plug-Ins/PepperFlashPlayer");

 // The path to the external extension <id>.json files.
 // /usr/share seems like a good choice, see: http://www.pathname.com/fhs/
 const base::FilePath::CharType kFilepathSinglePrefExtensions[] =
 #if BUILDFLAG(GOOGLE_CHROME_BRANDING)
-    FILE_PATH_LITERAL("/usr/share/google-chrome/extensions");
+    FILE_PATH_LITERAL("/usr/local/share/google-chrome/extensions");
 #else
-    FILE_PATH_LITERAL("/usr/share/chromium/extensions");
+    FILE_PATH_LITERAL("/usr/local/share/chromium/extensions");
 #endif  // BUILDFLAG(GOOGLE_CHROME_BRANDING)
 
 // The path to the hint file that tells the pepper plugin loader
 // where it can find the latest component updated flash.

       if (!GetUserDownloadsDirectorySafe(&cur))
         return false;
       break;
@@ -470,7 +470,7 @@ bool PathProvider(int key, base::FilePath* result) {
       if (!base::PathExists(cur))  // We don't want to create this
         return false;
       break;
-#if defined(OS_POSIX) && !defined(OS_MACOSX) && !defined(OS_OPENBSD)
+#if defined(OS_POSIX) && !defined(OS_MACOSX)
     case chrome::DIR_POLICY_FILES: {
 #if defined(GOOGLE_CHROME_BUILD)
       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
@@ -470,7 +472,7 @@ bool PathProvider(int key, base::FilePath* result) {
     }
 #endif
 #if defined(OS_CHROMEOS) || \
-    (defined(OS_LINUX) && BUILDFLAG(CHROMIUM_BRANDING)) || defined(OS_MACOSX)
+    ((defined(OS_LINUX) || defined(OS_BSD)) && BUILDFLAG(CHROMIUM_BRANDING)) || defined(OS_MACOSX)
     case chrome::DIR_USER_EXTERNAL_EXTENSIONS: {
       if (!base::PathService::Get(chrome::DIR_USER_DATA, &cur))
         return false;
@@ -478,7 +478,7 @@ bool PathProvider(int key, base::FilePath* result) {
       break;
     }
 #endif

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

+#if defined(OS_LINUX) || defined(OS_MACOSX) || defined(OS_BSD)
     case chrome::DIR_NATIVE_MESSAGING:
 #if defined(OS_MACOSX)
 #if BUILDFLAG(GOOGLE_CHROME_BRANDING)
@@ -527,6 +527,9 @@ bool PathProvider(int key, base::FilePath* result) {
 #if BUILDFLAG(GOOGLE_CHROME_BRANDING)
       cur = base::FilePath(FILE_PATH_LITERAL(
           "/etc/opt/chrome/native-messaging-hosts"));
+#elif defined(OS_BSD)

 #else
       cur = base::FilePath(FILE_PATH_LITERAL(
           "/etc/chromium/native-messaging-hosts"));
@@ -539,7 +542,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))
@@ -547,7 +550,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)) {
@@ -555,7 +558,7 @@ bool PathProvider(int key, base::FilePath* result) {
       }
       cur = cur.Append(kComponentUpdatedFlashHint);
       break;




--- src/3rdparty/chromium/chrome/common/chrome_paths.h.orig	2019-11-27 21:12:25 UTC
+++ src/3rdparty/chromium/chrome/common/chrome_paths.h
@@ -53,7 +53,7 @@ enum {
                      // contains subdirectories.
                                 // contains subdirectories.
 #endif
 #if defined(OS_CHROMEOS) || \
-    (defined(OS_LINUX) && BUILDFLAG(CHROMIUM_BRANDING)) || defined(OS_MACOSX)
+    ((defined(OS_LINUX) || defined(OS_BSD)) && BUILDFLAG(CHROMIUM_BRANDING)) || defined(OS_MACOSX)
   DIR_USER_EXTERNAL_EXTENSIONS,  // Directory for per-user external extensions
                                  // on Chrome Mac and Chromium Linux.
                                  // On Chrome OS, this path is used for OEM
@@ -61,7 +61,7 @@ enum {
                                  // create it.
 #endif
 

   DIR_STANDALONE_EXTERNAL_EXTENSIONS,  // Directory for 'per-extension'
                                        // definition manifest files that
                                        // describe extensions which are to be
@@ -108,7 +108,7 @@ enum {
   DIR_SUPERVISED_USER_INSTALLED_WHITELISTS,  // Directory where sanitized
                                              // supervised user whitelists are
                                              // installed.
-#if defined(OS_LINUX) || defined(OS_MACOSX)
+#if defined(OS_LINUX) || defined(OS_MACOSX) || defined(OS_BSD)
   DIR_NATIVE_MESSAGING,       // System directory where native messaging host
                               // manifest files are stored.
   DIR_USER_NATIVE_MESSAGING,  // Directory with Native Messaging Hosts
@@ -123,10 +123,10 @@ enum {
   DIR_GEN_TEST_DATA,  // Directory where generated test data resides.
   DIR_TEST_DATA,      // Directory where unit test data resides.
   DIR_TEST_TOOLS,     // Directory where unit test tools reside.
-#if defined(OS_LINUX)
+#if defined(OS_LINUX) || defined(OS_BSD)
   FILE_COMPONENT_FLASH_HINT,  // A file in a known location that points to
                               // the component updated flash plugin.
-#endif  // defined(OS_LINUX)
+#endif  // defined(OS_LINUX) || defined(OS_BSD)
 #if defined(OS_CHROMEOS)




--- src/3rdparty/chromium/chrome/common/chrome_switches.cc.orig	2019-11-27 21:12:25 UTC
+++ src/3rdparty/chromium/chrome/common/chrome_switches.cc
@@ -860,7 +860,7 @@ const char kAllowNaClFileHandleAPI[]        = "allow-n
 const char kAllowNaClSocketAPI[]            = "allow-nacl-socket-api";
 #endif
 
-#if defined(OS_WIN) || defined(OS_LINUX)
+#if defined(OS_WIN) || defined(OS_LINUX) || defined(OS_BSD)
 const char kDisableInputImeAPI[] = "disable-input-ime-api";
 const char kEnableInputImeAPI[] = "enable-input-ime-api";
 #endif
 
-#if defined(OS_LINUX) || defined(OS_MACOSX) || defined(OS_WIN)
+#if defined(OS_LINUX) || defined(OS_MACOSX) || defined(OS_WIN) || defined(OS_BSD)
 const char kEnableNewAppMenuIcon[] = "enable-new-app-menu-icon";
 #endif
 
 // Causes the browser to launch directly in guest mode.




--- src/3rdparty/chromium/chrome/common/chrome_switches.h.orig	2019-11-27 21:12:25 UTC
+++ src/3rdparty/chromium/chrome/common/chrome_switches.h
@@ -263,7 +263,7 @@ extern const char kAllowNaClFileHandleAPI[];
 extern const char kAllowNaClSocketAPI[];
 #endif
 
-#if defined(OS_WIN) || defined(OS_LINUX)
+#if defined(OS_WIN) || defined(OS_LINUX) || defined(OS_BSD)
 extern const char kDisableInputImeAPI[];
 extern const char kEnableInputImeAPI[];
 #endif
 
-#if defined(OS_LINUX) || defined(OS_MACOSX) || defined(OS_WIN)
+#if defined(OS_LINUX) || defined(OS_MACOSX) || defined(OS_WIN) || defined(OS_BSD)
 extern const char kEnableNewAppMenuIcon[];
 extern const char kGuest[];
 #endif
 

Lines 1-4 Link Here

(-)b/www/qt5-webengine/files/patch-src_3rdparty_chromium_chrome_common_features.gni (-3 / +3 lines)
1	--- src/3rdparty/chromium/chrome/common/features.gni.orig 2019-05-23 12:39:34 UTC	1	--- src/3rdparty/chromium/chrome/common/features.gni.orig 2019-11-27 21:12:25 UTC
2	+++ src/3rdparty/chromium/chrome/common/features.gni	2	+++ src/3rdparty/chromium/chrome/common/features.gni
3	@@ -41,9 +41,9 @@ declare_args() {	3	@@ -41,9 +41,9 @@ declare_args() {
4	(is_desktop_linux && use_dbus) \|\| is_chromeos	4	(is_desktop_linux && use_dbus) \|\| is_chromeos
Lines 7-14 Link Here
7	- is_win \|\| is_mac \|\| (is_linux && !is_chromeos && !is_chromecast)	7	- is_win \|\| is_mac \|\| (is_linux && !is_chromeos && !is_chromecast)
8	+ is_win \|\| is_mac \|\| is_bsd \|\| (is_linux && !is_chromeos && !is_chromecast)	8	+ is_win \|\| is_mac \|\| is_bsd \|\| (is_linux && !is_chromeos && !is_chromecast)
9		9
10	- enable_service_discovery = (enable_mdns && !is_android && !is_ios) \|\| is_mac	10	- enable_service_discovery = (enable_mdns && !is_android) \|\| is_mac
11	+ enable_service_discovery = (enable_mdns && !is_android && !is_ios) \|\| is_mac \|\| is_bsd	11	+ enable_service_discovery = (enable_mdns && !is_android) \|\| is_mac \|\| is_bsd
12		12
13	# Enables use of the session service, which is enabled by default.	13	# Enables use of the session service, which is enabled by default.
14	# Android stores them separately on the Java side.	14	# Android stores them separately on the Java side.




--- src/3rdparty/chromium/chrome/common/webui_url_constants.cc.orig	2019-11-27 21:12:25 UTC
+++ src/3rdparty/chromium/chrome/common/webui_url_constants.cc
@@ -314,7 +314,7 @@ const char kChromeUIMetroFlowURL[] = "chrome://make-me
 const char kChromeUICastHost[] = "cast";
 #endif
 
-#if defined(OS_WIN) || defined(OS_MACOSX) || defined(OS_LINUX)
+#if defined(OS_WIN) || defined(OS_MACOSX) || defined(OS_LINUX) || defined(OS_BSD)
 const char kChromeUIDiscardsHost[] = "discards";
 const char kChromeUIDiscardsURL[] = "chrome://discards/";
 const char kChromeUIHatsHost[] = "hats";
@@ -325,17 +325,17 @@ const char kChromeUIHatsURL[] = "chrome://hats/";
 const char kChromeUILinuxProxyConfigHost[] = "linux-proxy-config";
 #endif
 

 const char kChromeUISandboxHost[] = "sandbox";
 #endif
 
 #if defined(OS_WIN) || defined(OS_MACOSX) || \
-    (defined(OS_LINUX) && !defined(OS_CHROMEOS))
+    (defined(OS_LINUX) && !defined(OS_CHROMEOS)) || defined(OS_BSD)
 const char kChromeUIBrowserSwitchHost[] = "browser-switch";
 const char kChromeUIBrowserSwitchURL[] = "chrome://browser-switch/";
 #endif
 
-#if (defined(OS_LINUX) && defined(TOOLKIT_VIEWS)) || defined(USE_AURA)
+#if ((defined(OS_BSD) || defined(OS_LINUX)) && defined(TOOLKIT_VIEWS)) || defined(USE_AURA)
 const char kChromeUITabModalConfirmDialogHost[] = "tab-modal-confirm-dialog";
 #endif
 
@@ -579,13 +579,13 @@ const char* const kChromeHostURLs[] = {
     kChromeUIInternetDetailDialogHost,
     kChromeUIAssistantOptInHost,
 #endif




--- src/3rdparty/chromium/chrome/common/webui_url_constants.h.orig	2019-11-27 21:12:25 UTC
+++ src/3rdparty/chromium/chrome/common/webui_url_constants.h
@@ -272,7 +272,7 @@ extern const char kChromeUIMetroFlowURL[];
 extern const char kChromeUICastHost[];
 #endif
 
-#if defined(OS_WIN) || defined(OS_MACOSX) || defined(OS_LINUX)
+#if defined(OS_WIN) || defined(OS_MACOSX) || defined(OS_LINUX) || defined(OS_BSD)
 extern const char kChromeUIDiscardsHost[];
 extern const char kChromeUIDiscardsURL[];
 extern const char kChromeUIHatsHost[];
@@ -284,17 +284,17 @@ extern const char kChromeUIHatsURL[];
 extern const char kChromeUILinuxProxyConfigHost[];
 #endif
 

 extern const char kChromeUISandboxHost[];
 #endif
 
 #if defined(OS_WIN) || defined(OS_MACOSX) || \
-    (defined(OS_LINUX) && !defined(OS_CHROMEOS))
+    (defined(OS_LINUX) && !defined(OS_CHROMEOS)) || defined(OS_BSD)
 extern const char kChromeUIBrowserSwitchHost[];
 extern const char kChromeUIBrowserSwitchURL[];
 #endif
 
-#if (defined(OS_LINUX) && defined(TOOLKIT_VIEWS)) || defined(USE_AURA)
+#if ((defined(OS_BSD) || defined(OS_LINUX)) && defined(TOOLKIT_VIEWS)) || defined(USE_AURA)
 extern const char kChromeUITabModalConfirmDialogHost[];




--- src/3rdparty/chromium/components/crash/content/app/BUILD.gn.orig	2019-11-27 21:12:25 UTC
+++ src/3rdparty/chromium/components/crash/content/app/BUILD.gn
@@ -54,7 +54,7 @@ static_library("app") {
     sources += [ "crashpad.cc" ]
   }
 
-  if (is_android || (is_linux && !is_chromeos)) {
+  if (is_android || (is_linux && !is_chromeos && !is_bsd)) {
     set_sources_assignment_filter([])
     sources += [ "crashpad_linux.cc" ]
   }
 
-  if (is_linux) {
+  if (is_linux && !is_bsd) {
     sources += [
       "breakpad_linux.cc",
       "breakpad_linux.h",
@@ -96,7 +96,7 @@ static_library("app") {
       "//sandbox",
     ]
 
-    if (is_linux) {
+    if (is_bsd) {
+      deps -= [ "//third_party/crashpad/crashpad/snapshot" ]
+    }
+    if (is_linux && !is_bsd) {
       deps += [
         "//content/public/common",
         "//third_party/breakpad:client",




--- src/3rdparty/chromium/components/crash/core/common/BUILD.gn.orig	2019-11-27 21:12:25 UTC
+++ src/3rdparty/chromium/components/crash/core/common/BUILD.gn
@@ -7,7 +7,7 @@ import("//components/gwp_asan/buildflags/buildflags.gn
 
 declare_args() {
   # If set to true, this will stub out and disable the entire crash key system.

 }
 
 group("common") {
@@ -93,7 +93,6 @@ target(crash_key_target_type, "crash_key") {
       ]
     }
 

   }
 }
 
@@ -153,7 +152,7 @@ source_set("unit_tests") {
     sources += [ "objc_zombie_unittest.mm" ]
   }
 
-  if (!is_mac && !is_ios && !is_win && !is_fuchsia && !is_android) {
+  if (!is_mac && !is_ios && !is_win && !is_fuchsia && !is_android && !is_bsd) {
     include_dirs = [ "//third_party/breakpad/breakpad/src/" ]
     sources += [ "crash_key_breakpad_unittest.cc" ]
   }




--- src/3rdparty/chromium/components/download/quarantine/quarantine_linux.cc.orig	2019-05-23 12:39:34 UTC
+++ src/3rdparty/chromium/components/download/quarantine/quarantine_linux.cc
@@ -2,11 +2,15 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
+#include "build/build_config.h"
+
 #include "components/download/quarantine/quarantine.h"
 
 #include <stddef.h>
 #include <sys/types.h>
+#if !defined(OS_BSD)
 #include <sys/xattr.h>
+#endif
 
 #include "base/files/file_path.h"
 #include "base/logging.h"
@@ -25,7 +29,7 @@ bool SetExtendedFileAttribute(const char* path,
                               int flags) {
 // On Chrome OS, there is no component that can validate these extended
 // attributes so there is no need to set them.
-#if !defined(OS_CHROMEOS)
+#if !defined(OS_CHROMEOS) && !defined(OS_BSD)
   base::ScopedBlockingCall scoped_blocking_call(base::BlockingType::MAY_BLOCK);
   int result = setxattr(path, name, value, value_size, flags);
   if (result) {
@@ -33,7 +37,7 @@ bool SetExtendedFileAttribute(const char* path,
                  << path;
     return false;
   }
-#endif  // !defined(OS_CHROMEOS)
+#endif  // !defined(OS_CHROMEOS) && !defined(OS_BSD)
   return true;
 }
 

Lines 1-4 Link Here

(-)b/www/qt5-webengine/files/patch-src_3rdparty_chromium_components_metrics_system__memory__stats__recorder__linux.cc (-2 / +2 lines)
1	--- src/3rdparty/chromium/components/metrics/system_memory_stats_recorder_linux.cc.orig 2018-11-13 18:25:11 UTC	1	--- src/3rdparty/chromium/components/metrics/system_memory_stats_recorder_linux.cc.orig 2019-11-27 21:12:25 UTC
2	+++ src/3rdparty/chromium/components/metrics/system_memory_stats_recorder_linux.cc	2	+++ src/3rdparty/chromium/components/metrics/system_memory_stats_recorder_linux.cc
3	@@ -30,6 +30,7 @@ namespace metrics {	3	@@ -30,6 +30,7 @@ namespace metrics {
4	UMA_HISTOGRAM_LINEAR(name, sample, 2500, 50)	4	UMA_HISTOGRAM_LINEAR(name, sample, 2500, 50)
Lines 8-14 Link Here
8	base::SystemMemoryInfoKB memory;	8	base::SystemMemoryInfoKB memory;
9	if (!base::GetSystemMemoryInfo(&memory))	9	if (!base::GetSystemMemoryInfo(&memory))
10	return;	10	return;
11	@@ -93,6 +94,7 @@ void RecordMemoryStats(RecordMemoryStatsType type) {	11	@@ -81,6 +82,7 @@ void RecordMemoryStats(RecordMemoryStatsType type) {
12	break;	12	break;
13	}	13	}
14	}	14	}




--- src/3rdparty/chromium/components/services/filesystem/file_system_app.cc.orig	2019-05-23 12:39:34 UTC
+++ src/3rdparty/chromium/components/services/filesystem/file_system_app.cc
@@ -19,7 +19,7 @@
 #elif defined(OS_ANDROID)
 #include "base/base_paths_android.h"
 #include "base/path_service.h"
-#elif defined(OS_LINUX)
+#elif defined(OS_LINUX) || defined(OS_BSD)
 #include "base/environment.h"
 #include "base/nix/xdg_util.h"
 #elif defined(OS_MACOSX)
@@ -73,7 +73,7 @@ base::FilePath FileSystemApp::GetUserDataDir() {
     CHECK(base::PathService::Get(base::DIR_APP_DATA, &path));
 #elif defined(OS_ANDROID)
     CHECK(base::PathService::Get(base::DIR_ANDROID_APP_DATA, &path));
-#elif defined(OS_LINUX)
+#elif defined(OS_LINUX) || defined(OS_BSD)
     std::unique_ptr<base::Environment> env(base::Environment::Create());
     path = base::nix::GetXDGDirectory(
         env.get(), base::nix::kXdgConfigHomeEnvVar, base::nix::kDotConfigDir);

Removed Link Here

(-)a/www/qt5-webengine/files/patch-src_3rdparty_chromium_components_services_font_font__service__app.cc (-11 lines)
1	--- src/3rdparty/chromium/components/services/font/font_service_app.cc.orig 2019-05-23 12:39:34 UTC
2	+++ src/3rdparty/chromium/components/services/font/font_service_app.cc
3	@@ -20,7 +20,7 @@
4	#include "components/services/font/ppapi_fontconfig_matching.h" // nogncheck
5	#endif
6
7	-#if defined(OS_LINUX)
8	+#if defined(OS_LINUX) \|\| defined(OS_BSD)
9	#include "base/test/fontconfig_util_linux.h"
10	#endif
11




--- src/3rdparty/chromium/components/storage_monitor/BUILD.gn.orig	2019-11-27 21:12:25 UTC
+++ src/3rdparty/chromium/components/storage_monitor/BUILD.gn
@@ -79,6 +79,13 @@ static_library("storage_monitor") {
     }
   }
 
+  if (is_bsd) {
+    sources -= [
+      "mtab_watcher_linux.cc",
+      "mtab_watcher_linux.h",
+    ]
+    sources += [
+      "storage_monitor_freebsd.cc",
+      "storage_monitor_freebsd.h",

+  }
+
   if (use_udev) {
     sources += [
       "udev_util_linux.cc",




--- src/3rdparty/chromium/components/update_client/update_query_params.cc.orig	2019-11-27 21:12:25 UTC
+++ src/3rdparty/chromium/components/update_client/update_query_params.cc
@@ -38,6 +38,8 @@ const char kOs[] =
     "fuchsia";
 #elif defined(OS_OPENBSD)
     "openbsd";

 #else
 #error "unknown os"
 #endif
@@ -55,6 +57,8 @@
     "mips64el";
 #elif defined(__mips__)
     "mipsel";
+#elif defined(__powerpc64__)
+    "ppc64";
 #else
 #error "unknown arch"
 #endif
@@ -127,6 +131,8 @@
   return "mips32";
 #elif defined(ARCH_CPU_MIPS64EL)
   return "mips64";
+#elif defined(ARCH_CPU_PPC64)
+  return "ppc64";
 #else
 // NOTE: when adding new values here, please remember to update the
 // comment in the .h file about possible return values from this function.




--- src/3rdparty/chromium/content/browser/BUILD.gn.orig	2019-03-01 17:04:22 UTC
+++ src/3rdparty/chromium/content/browser/BUILD.gn
@@ -1883,11 +1883,6 @@ jumbo_source_set("browser") {
       "tracing/cros_tracing_agent.h",
     ]
     deps += [ "//chromeos/resources" ]
-  } else {
-    sources += [
-      "memory/memory_monitor_linux.cc",
-      "memory/memory_monitor_linux.h",
-    ]
   }
 
   if (is_chromeos || is_android || is_chromecast) {

Added Link Here

(-)b/www/qt5-webengine/files/patch-src_3rdparty_chromium_content_browser_gpu_gpu__process__host.cc (+11 lines)
1	--- src/3rdparty/chromium/content/browser/gpu/gpu_process_host.cc.orig 2019-11-27 21:12:25 UTC
2	+++ src/3rdparty/chromium/content/browser/gpu/gpu_process_host.cc
3	@@ -1076,7 +1076,7 @@ bool GpuProcessHost::LaunchGpuProcess() {
4	std::unique_ptr<base::CommandLine> cmd_line =
5	std::make_unique<base::CommandLine>(base::CommandLine::NO_PROGRAM);
6	#else
7	-#if defined(OS_LINUX)
8	+#if defined(OS_LINUX) \|\| defined(OS_BSD)
9	int child_flags = gpu_launcher.empty() ? ChildProcessHost::CHILD_ALLOW_SELF
10	: ChildProcessHost::CHILD_NORMAL;
11	#elif defined(OS_MACOSX)

Lines 1-6 Link Here

(-)b/www/qt5-webengine/files/patch-src_3rdparty_chromium_content_browser_media_media__internals.cc (-2 / +2 lines)
1	--- src/3rdparty/chromium/content/browser/media/media_internals.cc.orig 2018-11-13 18:25:11 UTC	1	--- src/3rdparty/chromium/content/browser/media/media_internals.cc.orig 2019-11-27 21:12:25 UTC
2	+++ src/3rdparty/chromium/content/browser/media/media_internals.cc	2	+++ src/3rdparty/chromium/content/browser/media/media_internals.cc
3	@@ -724,7 +724,7 @@ void MediaInternals::UpdateVideoCaptureDeviceCapabilit	3	@@ -506,7 +506,7 @@ void MediaInternals::UpdateVideoCaptureDeviceCapabilit
4	device_dict->SetString("name", descriptor.GetNameAndModel());	4	device_dict->SetString("name", descriptor.GetNameAndModel());
5	device_dict->Set("formats", std::move(format_list));	5	device_dict->Set("formats", std::move(format_list));
6	#if defined(OS_WIN) \|\| defined(OS_MACOSX) \|\| defined(OS_LINUX) \|\| \	6	#if defined(OS_WIN) \|\| defined(OS_MACOSX) \|\| defined(OS_LINUX) \|\| \

Removed Link Here

(-)a/www/qt5-webengine/files/patch-src_3rdparty_chromium_content_browser_memory_memory__monitor.cc (-11 lines)
1	--- src/3rdparty/chromium/content/browser/memory/memory_monitor.cc.orig 2018-11-13 18:25:11 UTC
2	+++ src/3rdparty/chromium/content/browser/memory/memory_monitor.cc
3	@@ -22,7 +22,7 @@ void MemoryMonitorDelegate::GetSystemMemoryInfo(
4	base::GetSystemMemoryInfo(mem_info);
5	}
6
7	-#if defined(OS_MACOSX)
8	+#if defined(OS_MACOSX) \|\| defined(OS_BSD)
9	// TODO(bashi,bcwhite): Remove when memory monitor for mac is available.
10	std::unique_ptr<MemoryMonitor> CreateMemoryMonitor() {
11	NOTREACHED();

Added Link Here

(-)b/www/qt5-webengine/files/patch-src_3rdparty_chromium_content_browser_ppapi__plugin__process__host.cc (+11 lines)
1	--- src/3rdparty/chromium/content/browser/ppapi_plugin_process_host.cc.orig 2019-11-27 21:12:25 UTC
2	+++ src/3rdparty/chromium/content/browser/ppapi_plugin_process_host.cc
3	@@ -359,7 +359,7 @@ bool PpapiPluginProcessHost::Init(const PepperPluginIn
4	base::CommandLine::StringType plugin_launcher =
5	browser_command_line.GetSwitchValueNative(switches::kPpapiPluginLauncher);
6
7	-#if defined(OS_LINUX)
8	+#if defined(OS_LINUX) \|\| defined(OS_BSD)
9	int flags = plugin_launcher.empty() ? ChildProcessHost::CHILD_ALLOW_SELF :
10	ChildProcessHost::CHILD_NORMAL;
11	#elif defined(OS_MACOSX)




--- src/3rdparty/chromium/content/browser/renderer_host/input/input_device_change_observer.cc.orig	2019-11-27 21:12:25 UTC
+++ src/3rdparty/chromium/content/browser/renderer_host/input/input_device_change_observer.cc
@@ -10,7 +10,7 @@
 

 #include "ui/events/devices/input_device_observer_win.h"
-#elif defined(OS_LINUX)
+#elif defined(OS_LINUX) || defined(OS_BSD)
 #include "ui/events/devices/device_data_manager.h"
 #elif defined(OS_ANDROID)
 #include "ui/events/devices/input_device_observer_android.h"
@@ -22,7 +22,7 @@ InputDeviceChangeObserver::InputDeviceChangeObserver(R

   ui::InputDeviceObserverWin::GetInstance()->AddObserver(this);
-#elif defined(OS_LINUX)
+#elif defined(OS_LINUX) || defined(OS_BSD)
   ui::DeviceDataManager::GetInstance()->AddObserver(this);
 #elif defined(OS_ANDROID)
   ui::InputDeviceObserverAndroid::GetInstance()->AddObserver(this);
@@ -32,7 +32,7 @@ InputDeviceChangeObserver::InputDeviceChangeObserver(R

   ui::InputDeviceObserverWin::GetInstance()->RemoveObserver(this);
-#elif defined(OS_LINUX)
+#elif defined(OS_LINUX) || defined(OS_BSD)
   ui::DeviceDataManager::GetInstance()->RemoveObserver(this);
 #elif defined(OS_ANDROID)
   ui::InputDeviceObserverAndroid::GetInstance()->RemoveObserver(this);




--- src/3rdparty/chromium/content/browser/renderer_host/pepper/pepper_file_io_host.cc.orig	2019-11-27 21:12:25 UTC
+++ src/3rdparty/chromium/content/browser/renderer_host/pepper/pepper_file_io_host.cc
@@ -432,7 +432,7 @@ void PepperFileIOHost::OnLocalFileOpened(
     ppapi::host::ReplyMessageContext reply_context,
     const base::FilePath& path,
     base::File::Error error_code) {
-#if defined(OS_WIN) || defined(OS_LINUX)
+#if defined(OS_WIN) || defined(OS_LINUX) || defined(OS_BSD)
   // Quarantining a file before its contents are available is only supported on
   // Windows and Linux.
   if (!FileOpenForWrite(open_flags_) || error_code != base::File::FILE_OK) {
@@ -452,7 +452,7 @@ void PepperFileIOHost::OnLocalFileOpened(
 #endif
 }
 
-#if defined(OS_WIN) || defined(OS_LINUX)
+#if defined(OS_WIN) || defined(OS_LINUX) || defined(OS_BSD)
 void PepperFileIOHost::OnLocalFileQuarantined(
     ppapi::host::ReplyMessageContext reply_context,
     const base::FilePath& path,




--- src/3rdparty/chromium/content/browser/renderer_host/render_process_host_impl.cc.orig	2019-11-27 21:12:25 UTC
+++ src/3rdparty/chromium/content/browser/renderer_host/render_process_host_impl.cc
@@ -230,7 +230,7 @@
 #include "content/browser/compositor/image_transport_factory.h"
 #endif
 
-#if defined(OS_LINUX)
+#if defined(OS_LINUX) || defined(OS_BSD)
 #include <sys/resource.h>
 #include <sys/time.h>
 #endif
@@ -1232,7 +1232,7 @@ static constexpr size_t kUnknownPlatformProcessLimit =
 // to indicate failure and std::numeric_limits<size_t>::max() to indicate
 // unlimited.
 size_t GetPlatformProcessLimit() {
-#if defined(OS_LINUX)
+#if defined(OS_LINUX) || defined(OS_BSD)
   struct rlimit limit;
   if (getrlimit(RLIMIT_NPROC, &limit) != 0)
     return kUnknownPlatformProcessLimit;
@@ -1243,7 +1243,7 @@ size_t GetPlatformProcessLimit() {
 #else
   // TODO(https://crbug.com/104689): Implement on other platforms.
   return kUnknownPlatformProcessLimit;
-#endif  // defined(OS_LINUX)
+#endif  // defined(OS_LINUX) || defined(OS_BSD)
 }
 #endif  // !defined(OS_ANDROID) && !defined(OS_CHROMEOS)
 
@@ -1651,7 +1651,7 @@ bool RenderProcessHostImpl::Init() {
   renderer_prefix =
       browser_command_line.GetSwitchValueNative(switches::kRendererCmdPrefix);
 
-#if defined(OS_LINUX)
+#if defined(OS_LINUX) || defined(OS_BSD)
   int flags = renderer_prefix.empty() ? ChildProcessHost::CHILD_ALLOW_SELF
                                       : ChildProcessHost::CHILD_NORMAL;
 #elif defined(OS_MACOSX)

Added Link Here

(-)b/www/qt5-webengine/files/patch-src_3rdparty_chromium_content_browser_scheduler_responsiveness_jank__monitor.cc (+11 lines)
1	--- src/3rdparty/chromium/content/browser/scheduler/responsiveness/jank_monitor.cc.orig 2019-11-27 21:12:25 UTC
2	+++ src/3rdparty/chromium/content/browser/scheduler/responsiveness/jank_monitor.cc
3	@@ -298,7 +298,7 @@ void JankMonitor::ThreadExecutionState::DidRunTaskOrEv
4	// in context menus, among others). Simply ignore the mismatches for now.
5	// See https://crbug.com/929813 for the details of why the mismatch
6	// happens.
7	-#if !defined(OS_CHROMEOS) && defined(OS_LINUX) && defined(USE_OZONE)
8	+#if !defined(OS_CHROMEOS) && (defined(OS_LINUX) \|\| defined(OS_BSD)) && defined(USE_OZONE)
9	task_execution_metadata_.clear();
10	#endif
11	return;




--- src/3rdparty/chromium/content/browser/scheduler/responsiveness/watcher.cc.orig	2019-11-27 21:12:25 UTC
+++ src/3rdparty/chromium/content/browser/scheduler/responsiveness/watcher.cc
@@ -96,7 +96,7 @@ void Watcher::DidRunTask(const base::PendingTask* task
     // in context menus, among others). Simply ignore the mismatches for now.
     // See https://crbug.com/929813 for the details of why the mismatch
     // happens.
-#if !defined(OS_CHROMEOS) && defined(OS_LINUX) && defined(USE_OZONE)
+#if !defined(OS_CHROMEOS) && (defined(OS_LINUX) || defined(OS_BSD)) && defined(USE_OZONE)
     return currently_running_metadata_ui_.clear();
 #endif
     DCHECK_LE(*mismatched_task_identifiers, 1);
@@ -156,7 +156,7 @@ void Watcher::DidRunEventOnUIThread(const void* opaque
     mismatched_event_identifiers_ui_ += 1;
     // See comment in DidRunTask() for why |currently_running_metadata_ui_| may
     // be reset.
-#if !defined(OS_CHROMEOS) && defined(OS_LINUX) && defined(USE_OZONE)
+#if !defined(OS_CHROMEOS) && (defined(OS_LINUX) || defined(OS_BSD)) && defined(USE_OZONE)
     return currently_running_metadata_ui_.clear();
 #endif
     DCHECK_LE(mismatched_event_identifiers_ui_, 1);




--- src/3rdparty/chromium/content/browser/service_manager/service_manager_context.cc.orig	2019-05-23 12:39:34 UTC
+++ src/3rdparty/chromium/content/browser/service_manager/service_manager_context.cc
@@ -99,7 +99,7 @@
 #include "jni/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/interfaces/constants.mojom.h"
 #endif
@@ -378,12 +378,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) {
@@ -618,7 +618,7 @@ ServiceManagerContext::ServiceManagerContext(
         base::BindRepeating(&CreateVideoCaptureService));
   }
 
-#if defined(OS_LINUX)
+#if defined(OS_LINUX) || defined(OS_BSD)
   RegisterInProcessService(
       packaged_services_connection_.get(), font_service::mojom::kServiceName,
       base::CreateSequencedTaskRunnerWithTraits(

Removed Link Here

(-)a/www/qt5-webengine/files/patch-src_3rdparty_chromium_content_browser_storage__partition__impl.cc (-11 lines)
1	--- src/3rdparty/chromium/content/browser/storage_partition_impl.cc.orig 2019-05-23 12:39:34 UTC
2	+++ src/3rdparty/chromium/content/browser/storage_partition_impl.cc
3	@@ -768,7 +768,7 @@ net::URLRequestContextGetter* StoragePartitionImpl::Ge
4	// TODO(jam): enable for all, still used on WebView.
5	// See copy of this ifdef in:
6	// StoragePartitionImplMap::Get
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	if (base::FeatureList::IsEnabled(network::features::kNetworkService))
10	NOTREACHED();
11	#endif

Removed Link Here

(-)a/www/qt5-webengine/files/patch-src_3rdparty_chromium_content_browser_storage__partition__impl__map.cc (-11 lines)
1	--- src/3rdparty/chromium/content/browser/storage_partition_impl_map.cc.orig 2019-05-23 12:39:34 UTC
2	+++ src/3rdparty/chromium/content/browser/storage_partition_impl_map.cc
3	@@ -425,7 +425,7 @@ StoragePartitionImpl* StoragePartitionImplMap::Get(
4	bool create_request_context = true;
5	if (base::FeatureList::IsEnabled(network::features::kNetworkService)) {
6	// These ifdefs should match StoragePartitionImpl::GetURLRequestContext.
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	create_request_context = false;
10	#elif defined(OS_ANDROID)
11	create_request_context =

Added Link Here

(-)b/www/qt5-webengine/files/patch-src_3rdparty_chromium_content_browser_utility__process__host.cc (+11 lines)
1	--- src/3rdparty/chromium/content/browser/utility_process_host.cc.orig 2019-11-27 21:12:25 UTC
2	+++ src/3rdparty/chromium/content/browser/utility_process_host.cc
3	@@ -211,7 +211,7 @@ UtilityProcessHost::UtilityProcessHost()
4
5	UtilityProcessHost::UtilityProcessHost(std::unique_ptr<Client> client)
6	: sandbox_type_(service_manager::SANDBOX_TYPE_UTILITY),
7	-#if defined(OS_LINUX)
8	+#if defined(OS_LINUX) \|\| defined(OS_BSD)
9	child_flags_(ChildProcessHost::CHILD_ALLOW_SELF),
10	#else
11	child_flags_(ChildProcessHost::CHILD_NORMAL),

Lines 1-12 Link Here

(-)b/www/qt5-webengine/files/patch-src_3rdparty_chromium_content_browser_webui_shared__resources__data__source.cc (-6 / +9 lines)
1	--- src/3rdparty/chromium/content/browser/webui/shared_resources_data_source.cc.orig 2019-05-23 12:39:34 UTC	1	--- src/3rdparty/chromium/content/browser/webui/shared_resources_data_source.cc.orig 2019-11-27 21:12:25 UTC
2	+++ src/3rdparty/chromium/content/browser/webui/shared_resources_data_source.cc	2	+++ src/3rdparty/chromium/content/browser/webui/shared_resources_data_source.cc
3	@@ -72,9 +72,9 @@ const std::map<int, std::string> CreateMojoResourceIdT	3	@@ -120,12 +120,12 @@ const std::map<int, std::string> CreateMojoResourceIdT
4	return std::map<int, std::string> {	4	"mojo/mojo/public/mojom/base/string16.mojom.html"},
5	{IDR_MOJO_MOJO_BINDINGS_JS, "js/mojo_bindings.js"},	5	{IDR_MOJO_STRING16_MOJOM_LITE_JS,
6	{IDR_MOJO_MOJO_BINDINGS_LITE_JS, "js/mojo_bindings_lite.js"},	6	"mojo/mojo/public/mojom/base/string16.mojom-lite.js"},
7	-#if defined(OS_WIN) \|\| defined(OS_MACOSX) \|\| defined(OS_LINUX)	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)	8	+#if defined(OS_WIN) \|\| defined(OS_MACOSX) \|\| defined(OS_LINUX) \|\| defined(OS_BSD)
9	{IDR_MOJO_TIME_MOJOM_JS, "js/time.mojom.js"},	9	{IDR_MOJO_TIME_MOJOM_HTML,
		10	"mojo/mojo/public/mojom/base/time.mojom.html"},
		11	{IDR_MOJO_TIME_MOJOM_LITE_JS,
		12	"mojo/mojo/public/mojom/base/time.mojom-lite.js"},
10	-#endif // defined(OS_WIN) \|\| defined(OS_MACOSX) \|\| defined(OS_LINUX)	13	-#endif // defined(OS_WIN) \|\| defined(OS_MACOSX) \|\| defined(OS_LINUX)
11	+#endif // defined(OS_WIN) \|\| defined(OS_MACOSX) \|\| defined(OS_LINUX) \|\| defined(OS_BSD)	14	+#endif // defined(OS_WIN) \|\| defined(OS_MACOSX) \|\| defined(OS_LINUX) \|\| defined(OS_BSD)
12	};	15	};




--- src/3rdparty/chromium/content/gpu/gpu_main.cc.orig	2019-11-27 21:12:25 UTC
+++ src/3rdparty/chromium/content/gpu/gpu_main.cc
@@ -84,7 +84,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"
@@ -113,7 +113,7 @@ namespace content {
 
 namespace {
 

 bool StartSandboxLinux(gpu::GpuWatchdogThread*,
                        const gpu::GPUInfo*,
                        const gpu::GpuPreferences&);
@@ -174,7 +174,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_);
@@ -280,7 +280,7 @@ int GpuMain(const MainFunctionParams& parameters) {
     main_thread_task_executor =
         std::make_unique<base::SingleThreadTaskExecutor>(
             gpu_preferences.message_loop_type);
-#elif defined(OS_LINUX)
+#elif defined(OS_LINUX) || defined(OS_BSD)
 #error "Unsupported Linux platform."
 #elif defined(OS_MACOSX)
     // Cross-process CoreAnimation requires a CFRunLoop to function at all, and
@@ -388,7 +388,7 @@ int GpuMain(const MainFunctionParams& parameters) {
 
 namespace {
 

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




--- src/3rdparty/chromium/content/public/app/content_main_delegate.cc.orig	2019-11-27 21:12:25 UTC
+++ src/3rdparty/chromium/content/public/app/content_main_delegate.cc
@@ -38,13 +38,13 @@ bool ContentMainDelegate::DelaySandboxInitialization(
   return false;
 }
 
-#elif defined(OS_LINUX)
+#elif defined(OS_LINUX) || defined(OS_BSD)
 
 void ContentMainDelegate::ZygoteStarting(
     std::vector<std::unique_ptr<service_manager::ZygoteForkDelegate>>*
         delegates) {}
 
-#endif  // defined(OS_LINUX)
+#endif  // defined(OS_LINUX) || defined(OS_BSD)
 
 int ContentMainDelegate::TerminateForFatalInitializationError() {
   CHECK(false);




--- src/3rdparty/chromium/content/public/app/content_main_delegate.h.orig	2019-11-27 21:12:25 UTC
+++ src/3rdparty/chromium/content/public/app/content_main_delegate.h
@@ -71,7 +71,7 @@ class CONTENT_EXPORT ContentMainDelegate {
   // want it at all.
   virtual bool DelaySandboxInitialization(const std::string& process_type);
 
-#elif defined(OS_LINUX)
+#elif defined(OS_LINUX) || defined(OS_BSD)
   // Tells the embedder that the zygote process is starting, and allows it to
   // specify one or more zygote delegates if it wishes by storing them in
   // |*delegates|.
@@ -81,7 +81,7 @@ class CONTENT_EXPORT ContentMainDelegate {
 
   // Called every time the zygote process forks.
   virtual void ZygoteForked() {}
-#endif  // defined(OS_LINUX)
+#endif  // defined(OS_LINUX) || defined(OS_BSD)
 
   // Allows the embedder to prevent locking the scheme registry. The scheme
   // registry is the list of URL schemes we recognize, with some additional




--- src/3rdparty/chromium/content/public/app/content_packaged_services_manifest.cc.orig	2019-05-23 12:39:34 UTC
+++ src/3rdparty/chromium/content/public/app/content_packaged_services_manifest.cc
@@ -23,7 +23,7 @@
 #include "services/video_capture/manifest.h"
 #include "services/viz/manifest.h"
 
-#if defined(OS_LINUX)
+#if defined(OS_LINUX) || defined(OS_BSD)
 #include "components/services/font/manifest.h"
 #endif
 
@@ -67,7 +67,7 @@ const service_manager::Manifest& GetContentPackagedSer
         .PackageService(tracing::GetManifest())
         .PackageService(video_capture::GetManifest())
         .PackageService(viz::GetManifest())
-#if defined(OS_LINUX)
+#if defined(OS_LINUX) || defined(OS_BSD)
         .PackageService(font_service::GetManifest())
 #endif
 #if defined(OS_CHROMEOS)




--- src/3rdparty/chromium/content/public/common/child_process_host.h.orig	2019-11-27 21:12:25 UTC
+++ src/3rdparty/chromium/content/public/common/child_process_host.h
@@ -51,7 +51,7 @@ class CONTENT_EXPORT ChildProcessHost : public IPC::Se
     // No special behavior requested.
     CHILD_NORMAL = 0,
 

     // Indicates that the child execed after forking may be execced from
     // /proc/self/exe rather than using the "real" app path. This prevents
     // autoupdate from confusing us if it changes the file out from under us.
@@ -54,7 +54,7 @@ class CONTENT_EXPORT ChildProcessHost : public IPC::Se
     // gdb). In this case, you'd use GetChildPath to get the real executable
     // file name, and then prepend the GDB command to the command line.
     CHILD_ALLOW_SELF = 1 << 0,
-#endif  // defined(OS_LINUX)
+#endif  // defined(OS_LINUX) || defined(OS_BSD)
   };
 
   // Returns the pathname to be used for a child process.  If a subprocess




--- src/3rdparty/chromium/content/public/common/content_features.cc.orig	2019-11-27 21:12:25 UTC
+++ src/3rdparty/chromium/content/public/common/content_features.cc
@@ -43,7 +43,7 @@ const base::Feature kAudioServiceLaunchOnStartup{
 // Runs the audio service in a separate process.
 const base::Feature kAudioServiceOutOfProcess{
   "AudioServiceOutOfProcess",
-#if defined(OS_LINUX) && !defined(OS_CHROMEOS)
+#if defined(OS_LINUX) && !defined(OS_CHROMEOS) || defined(OS_BSD)
       base::FEATURE_ENABLED_BY_DEFAULT
 #else
       base::FEATURE_DISABLED_BY_DEFAULT
@@ -618,7 +618,7 @@ const base::Feature kWebAssemblyThreads {
 };
 
 // Enable WebAssembly trap handler.
-#if (defined(OS_LINUX) || defined(OS_WIN) || defined(OS_MACOSX)) && \
+#if (defined(OS_BSD) || defined(OS_LINUX) || defined(OS_WIN) || defined(OS_MACOSX)) && \
     defined(ARCH_CPU_X86_64)
 const base::Feature kWebAssemblyTrapHandler{"WebAssemblyTrapHandler",
                                             base::FEATURE_ENABLED_BY_DEFAULT};
@@ -653,7 +653,7 @@ const base::Feature kWebAuthBle{"WebAuthenticationBle"
 // https://w3c.github.io/webauthn
 const base::Feature kWebAuthCable {
   "WebAuthenticationCable",
-#if !defined(OS_CHROMEOS) && defined(OS_LINUX)
+#if (!defined(OS_CHROMEOS) && defined(OS_LINUX)) || defined(OS_BSD)
       base::FEATURE_DISABLED_BY_DEFAULT
 #else
       base::FEATURE_ENABLED_BY_DEFAULT

Removed Link Here

(-)a/www/qt5-webengine/files/patch-src_3rdparty_chromium_content_public_common_renderer__preferences.h (-11 lines)
1	--- src/3rdparty/chromium/content/public/common/renderer_preferences.h.orig 2018-11-13 18:25:11 UTC
2	+++ src/3rdparty/chromium/content/public/common/renderer_preferences.h
3	@@ -137,7 +137,7 @@ struct CONTENT_EXPORT RendererPreferences {
4	// Country iso of the mobile network for content detection purpose.
5	std::string network_contry_iso;
6
7	-#if defined(OS_LINUX)
8	+#if defined(OS_LINUX) \|\| defined(OS_BSD)
9	std::string system_font_family_name;
10	#endif
11




--- src/3rdparty/chromium/content/renderer/media/stream/processed_local_audio_source.cc.orig	2019-05-23 12:39:34 UTC
+++ src/3rdparty/chromium/content/renderer/media/stream/processed_local_audio_source.cc
@@ -35,7 +35,7 @@ void* const kProcessedLocalAudioSourceIdentifier =
     const_cast<void**>(&kProcessedLocalAudioSourceIdentifier);
 
 bool ApmInAudioServiceEnabled() {
-#if defined(OS_WIN) || defined(OS_MACOSX) || defined(OS_LINUX)
+#if defined(OS_WIN) || defined(OS_MACOSX) || defined(OS_LINUX) || defined(OS_BSD)
   return base::FeatureList::IsEnabled(features::kWebRtcApmInAudioService);
 #else
   return false;
@@ -355,7 +355,7 @@ void ProcessedLocalAudioSource::CaptureUsingProcessor(
     bool key_pressed) {
 #if defined(OS_WIN) || defined(OS_MACOSX)
   DCHECK_LE(volume, 1.0);
-#elif (defined(OS_LINUX) && !defined(OS_CHROMEOS)) || defined(OS_OPENBSD)
+#elif (defined(OS_LINUX) && !defined(OS_CHROMEOS)) || defined(OS_BSD)
   // We have a special situation on Linux where the microphone volume can be
   // "higher than maximum". The input volume slider in the sound preference
   // allows the user to set a scaling that is higher than 100%. It means that




--- src/3rdparty/chromium/content/renderer/render_process_impl.cc.orig	2019-11-27 21:12:25 UTC
+++ src/3rdparty/chromium/content/renderer/render_process_impl.cc
@@ -43,7 +43,7 @@
 #if defined(OS_WIN)
 #include "base/win/win_util.h"
 #endif
-#if defined(OS_LINUX) && defined(ARCH_CPU_X86_64)
+#if (defined(OS_LINUX) || defined(OS_BSD)) && defined(ARCH_CPU_X86_64)
 #include "v8/include/v8-wasm-trap-handler-posix.h"
 #endif
 namespace {
@@ -156,7 +156,7 @@ RenderProcessImpl::RenderProcessImpl()
 
   SetV8FlagIfNotFeature(features::kWebAssemblyTrapHandler,
                         "--no-wasm-trap-handler");
-#if defined(OS_LINUX) && defined(ARCH_CPU_X86_64)
+#if (defined(OS_LINUX) || defined(OS_BSD)) && defined(ARCH_CPU_X86_64)
   if (base::FeatureList::IsEnabled(features::kWebAssemblyTrapHandler)) {
     base::CommandLine* command_line = base::CommandLine::ForCurrentProcess();
     if (!command_line->HasSwitch(




--- src/3rdparty/chromium/content/renderer/render_thread_impl.cc.orig	2019-11-27 21:12:25 UTC
+++ src/3rdparty/chromium/content/renderer/render_thread_impl.cc
@@ -186,12 +186,21 @@
 #include "mojo/public/cpp/bindings/message_dumper.h"
 #endif
 

 using base::ThreadRestrictions;
 using blink::WebDocument;
 using blink::WebFrame;
@@ -904,7 +913,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(
@@ -933,7 +942,7 @@ void RenderThreadImpl::Init() {
   base::DiscardableMemoryAllocator::SetInstance(
       discardable_shared_memory_manager_.get());
 
-#if defined(OS_LINUX)
+#if defined(OS_LINUX) || defined(OS_BSD)
   render_message_filter()->SetThreadPriority(
       ChildProcess::current()->io_thread_id(), base::ThreadPriority::DISPLAY);
 #endif
@@ -1313,7 +1322,7 @@ media::GpuVideoAcceleratorFactories* RenderThreadImpl:
        gpu::kGpuFeatureStatusEnabled);
   const bool enable_gpu_memory_buffers =
       !is_gpu_compositing_disabled_ &&
-#if defined(OS_MACOSX) || defined(OS_LINUX) || defined(OS_WIN)
+#if defined(OS_MACOSX) || defined(OS_LINUX) || defined(OS_WIN) || defined(OS_BSD)
       !cmd_line->HasSwitch(switches::kDisableGpuMemoryBufferVideoFrames);
 #else
       cmd_line->HasSwitch(switches::kEnableGpuMemoryBufferVideoFrames);

Lines 1-11 Link Here

(-)b/www/qt5-webengine/files/patch-src_3rdparty_chromium_content_shell_BUILD.gn (-6 / +6 lines)
1	--- src/3rdparty/chromium/content/shell/BUILD.gn.orig 2019-05-23 12:39:34 UTC	1	--- src/3rdparty/chromium/content/shell/BUILD.gn.orig 2019-11-27 21:12:25 UTC
2	+++ src/3rdparty/chromium/content/shell/BUILD.gn	2	+++ src/3rdparty/chromium/content/shell/BUILD.gn
3	@@ -953,7 +953,7 @@ group("content_shell_crash_test") {	3	@@ -980,7 +980,7 @@ group("content_shell_crash_test") {
4	if (is_win) {	4	if (is_win) {
5	data_deps += [ "//build/win:copy_cdb_to_output" ]	5	data_deps += [ "//build/win:copy_cdb_to_output" ]
6	}	6	}
7	- if (is_posix && !is_android) {	7	- if (is_posix) {
8	+ if (is_posix && !is_android && !is_bsd) {	8	+ if (is_posix && !is_bsd) {
9	data_deps += [	9	data_deps += [
10	"//third_party/breakpad:dump_syms($host_toolchain)",	10	"//third_party/breakpad:dump_syms",
11	"//third_party/breakpad:minidump_stackwalk($host_toolchain)",	11	"//third_party/breakpad:minidump_stackwalk",

Lines 1-9 Link Here

(-)b/www/qt5-webengine/files/patch-src_3rdparty_chromium_device_gamepad_gamepad__provider.cc (-4 / +4 lines)
1	--- src/3rdparty/chromium/device/gamepad/gamepad_provider.cc.orig 2018-11-13 18:25:11 UTC	1	--- src/3rdparty/chromium/device/gamepad/gamepad_provider.cc.orig 2019-11-27 21:12:25 UTC
2	+++ src/3rdparty/chromium/device/gamepad/gamepad_provider.cc	2	+++ src/3rdparty/chromium/device/gamepad/gamepad_provider.cc
3	@@ -187,7 +187,7 @@ void GamepadProvider::Initialize(std::unique_ptr<Gamep	3	@@ -167,7 +167,7 @@ void GamepadProvider::Initialize(std::unique_ptr<Gamep
4	monitor->AddDevicesChangedObserver(this);
5		4
6	polling_thread_.reset(new base::Thread("Gamepad polling thread"));	5	if (!polling_thread_)
		6	polling_thread_.reset(new base::Thread("Gamepad polling thread"));
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	// On Linux, the data fetcher needs to watch file descriptors, so the message	9	// On Linux, the data fetcher needs to watch file descriptors, so the message




--- src/3rdparty/chromium/device/usb/BUILD.gn.orig	2018-11-13 18:25:11 UTC
+++ src/3rdparty/chromium/device/usb/BUILD.gn
@@ -109,10 +109,17 @@ static_library("usb") {
     ]
   }
 
-  if (is_android || is_chromeos || is_linux) {
+  if (is_android || is_chromeos || (is_linux && !is_bsd)) {
     sources += [
       "usb_device_handle_usbfs.cc",
       "usb_device_handle_usbfs.h",
+    ]
+  }
+
+  if (is_bsd) {
+    sources -= [
+      "usb_device_linux.cc",
+      "usb_device_linux.h",
     ]
   }
 




--- src/3rdparty/chromium/device/usb/usb_context.cc.orig	2018-11-13 18:25:11 UTC
+++ src/3rdparty/chromium/device/usb/usb_context.cc
@@ -58,7 +58,9 @@ void UsbContext::UsbEventHandler::Run() {
 
 void UsbContext::UsbEventHandler::Stop() {
   base::subtle::Release_Store(&running_, 0);
+#if !defined(OS_FREEBSD) // XXX(rene) not available in base version
   libusb_interrupt_handle_event(context_);
+#endif
 }
 
 UsbContext::UsbContext(PlatformUsbContext context) : context_(context) {

Removed Link Here

(-)a/www/qt5-webengine/files/patch-src_3rdparty_chromium_device_usb_usb__error.cc (-11 lines)
1	--- src/3rdparty/chromium/device/usb/usb_error.cc.orig 2018-11-13 18:25:11 UTC
2	+++ src/3rdparty/chromium/device/usb/usb_error.cc
3	@@ -9,7 +9,7 @@
4	namespace device {
5
6	std::string ConvertPlatformUsbErrorToString(int errcode) {
7	- return libusb_strerror(static_cast<libusb_error>(errcode));
8	+ return "";
9	}
10
11	} // namespace device




--- src/3rdparty/chromium/device/usb/usb_service_impl.cc.orig	2018-11-13 18:25:11 UTC
+++ src/3rdparty/chromium/device/usb/usb_service_impl.cc
@@ -239,8 +239,10 @@ UsbServiceImpl::UsbServiceImpl()
 }
 
 UsbServiceImpl::~UsbServiceImpl() {
+#if !defined(OS_FREEBSD)
   if (hotplug_enabled_)
     libusb_hotplug_deregister_callback(context_->context(), hotplug_handle_);
+#endif // !defined(OS_FREEBSD)
 }
 
 void UsbServiceImpl::GetDevices(const GetDevicesCallback& callback) {
@@ -295,6 +297,7 @@ void UsbServiceImpl::OnUsbContext(scoped_refptr<UsbCon
 
   context_ = std::move(context);
 
+#if !defined(OS_FREEBSD)
   int rv = libusb_hotplug_register_callback(
       context_->context(),
       static_cast<libusb_hotplug_event>(LIBUSB_HOTPLUG_EVENT_DEVICE_ARRIVED |
@@ -307,6 +310,7 @@ void UsbServiceImpl::OnUsbContext(scoped_refptr<UsbCon
 
   // This will call any enumeration callbacks queued while initializing.
   RefreshDevices();
+#endif // !defined(OS_FREEBSD)
 
 #if defined(OS_WIN)
   DeviceMonitorWin* device_monitor = DeviceMonitorWin::GetForAllInterfaces();
@@ -503,6 +507,7 @@ void UsbServiceImpl::RemoveDevice(scoped_refptr<UsbDev
   device->OnDisconnect();
 }
 
+#if !defined(OS_FREEBSD)
 // static
 int LIBUSB_CALL UsbServiceImpl::HotplugCallback(libusb_context* context,
                                                 libusb_device* device_raw,
@@ -537,6 +542,7 @@ int LIBUSB_CALL UsbServiceImpl::HotplugCallback(libusb
 
   return 0;
 }
+#endif // !defined(OS_FREEBSD)
 
 void UsbServiceImpl::OnPlatformDeviceAdded(
     ScopedLibusbDeviceRef platform_device) {




--- src/3rdparty/chromium/device/usb/usb_service_impl.h.orig	2018-11-13 18:25:11 UTC
+++ src/3rdparty/chromium/device/usb/usb_service_impl.h
@@ -73,11 +73,13 @@ class UsbServiceImpl :
                  scoped_refptr<UsbDeviceImpl> device);
   void RemoveDevice(scoped_refptr<UsbDeviceImpl> device);
 
+#if !defined(OS_FREEBSD)
   // Handle hotplug events from libusb.
   static int LIBUSB_CALL HotplugCallback(libusb_context* context,
                                          libusb_device* device,
                                          libusb_hotplug_event event,
                                          void* user_data);
+#endif
   // These functions release a reference to the provided platform device.
   void OnPlatformDeviceAdded(ScopedLibusbDeviceRef platform_device);
   void OnPlatformDeviceRemoved(ScopedLibusbDeviceRef platform_device);
@@ -95,7 +97,9 @@ class UsbServiceImpl :
   // connected instead of only when a full enumeration is requested.
   // TODO(reillyg): Support this on all platforms. crbug.com/411715
   bool hotplug_enabled_ = false;
+#if !defined(OS_FREEBSD)
   libusb_hotplug_callback_handle hotplug_handle_;
+#endif
 
   // Enumeration callbacks are queued until an enumeration completes.
   bool enumeration_ready_ = false;




--- src/3rdparty/chromium/extensions/browser/api/messaging/message_service.cc.orig	2019-11-27 21:12:25 UTC
+++ src/3rdparty/chromium/extensions/browser/api/messaging/message_service.cc
@@ -61,7 +61,7 @@ namespace {
 
 const char kReceivingEndDoesntExistError[] =
     "Could not establish connection. Receiving end does not exist.";

 const char kMissingPermissionError[] =
     "Access to native messaging requires nativeMessaging permission.";
 const char kProhibitedByPoliciesError[] =
@@ -382,7 +382,7 @@ void MessageService::OpenChannelToNativeApp(
   if (!opener_port->IsValidPort())
     return;
 
-#if defined(OS_WIN) || defined(OS_MACOSX) || defined(OS_LINUX)
+#if defined(OS_WIN) || defined(OS_MACOSX) || defined(OS_LINUX) || defined(OS_BSD)
   bool has_permission = extension->permissions_data()->HasAPIPermission(
       APIPermission::kNativeMessaging);
   if (!has_permission) {
@@ -432,11 +432,11 @@ void MessageService::OpenChannelToNativeApp(
   channel->opener->IncrementLazyKeepaliveCount();
 
   AddChannel(std::move(channel), receiver_port_id);

+#else  // !(defined(OS_WIN) || defined(OS_MACOSX) || defined(OS_LINUX) || defined(OS_BSD))
   const char kNativeMessagingNotSupportedError[] =
       "Native Messaging is not supported on this platform.";
   opener_port->DispatchOnDisconnect(kNativeMessagingNotSupportedError);
       source, receiver_port_id, kNativeMessagingNotSupportedError);
-#endif  // !(defined(OS_WIN) || defined(OS_MACOSX) || defined(OS_LINUX))
+#endif  // !(defined(OS_WIN) || defined(OS_MACOSX) || defined(OS_LINUX) || defined(OS_BSD))
 }
 
 void MessageService::OpenChannelToTab(const ChannelEndpoint& source,




--- src/3rdparty/chromium/extensions/shell/app/shell_main_delegate.cc.orig	2019-11-27 21:12:25 UTC
+++ src/3rdparty/chromium/extensions/shell/app/shell_main_delegate.cc
@@ -38,7 +38,7 @@
 

 #include "base/nix/xdg_util.h"
 #elif defined(OS_MACOSX)
 #include "base/base_paths_mac.h"
@@ -52,7 +52,7 @@
 
 namespace {
 
-#if defined(OS_LINUX) && !defined(OS_CHROMEOS)
+#if (defined(OS_BSD) || defined(OS_LINUX)) && !defined(OS_CHROMEOS)
 extensions::ShellCrashReporterClient* GetCrashReporterClient() {
   static base::NoDestructor<extensions::ShellCrashReporterClient> instance;
   return instance.get();
@@ -70,7 +70,7 @@ base::FilePath GetDataPath() {
     return cmd_line->GetSwitchValuePath(switches::kContentShellDataPath);
 




--- src/3rdparty/chromium/gpu/command_buffer/service/external_vk_image_backing.cc.orig	2019-11-27 21:12:25 UTC
+++ src/3rdparty/chromium/gpu/command_buffer/service/external_vk_image_backing.cc
@@ -25,7 +25,7 @@
 #include "gpu/vulkan/fuchsia/vulkan_fuchsia_ext.h"
 #endif
 
-#if defined(OS_LINUX)
+#if defined(OS_LINUX) || defined(OS_BSD)
 #define GL_HANDLE_TYPE_OPAQUE_FD_EXT 0x9586
 #endif
 
@@ -451,7 +451,7 @@ ExternalVkImageBacking::ProduceGLTexture(SharedImageMa
 #if defined(OS_FUCHSIA)
   NOTIMPLEMENTED_LOG_ONCE();
   return nullptr;
-#elif defined(OS_LINUX)
+#elif defined(OS_LINUX) || defined(OS_BSD)
   GrVkImageInfo image_info;
   bool result = backend_texture_.getVkImageInfo(&image_info);
   DCHECK(result);
@@ -520,7 +520,7 @@ ExternalVkImageBacking::ProduceGLTexture(SharedImageMa
   }
   return std::make_unique<ExternalVkImageGlRepresentation>(
       manager, this, tracker, texture_, texture_->service_id());
-#else  // !defined(OS_LINUX) && !defined(OS_FUCHSIA)
+#else  // !defined(OS_LINUX) && !defined(OS_FUCHSIA) && !defined(OS_BSD)
 #error Unsupported OS
 #endif
 }




--- src/3rdparty/chromium/gpu/command_buffer/service/external_vk_image_gl_representation.cc.orig	2019-11-27 21:12:25 UTC
+++ src/3rdparty/chromium/gpu/command_buffer/service/external_vk_image_gl_representation.cc
@@ -183,7 +183,7 @@ GLuint ExternalVkImageGlRepresentation::ImportVkSemaph
 #if defined(OS_FUCHSIA)
   NOTIMPLEMENTED_LOG_ONCE();
   return 0;
-#elif defined(OS_LINUX)
+#elif defined(OS_LINUX) || defined(OS_BSD)
   if (handle.vk_handle_type() !=
       VK_EXTERNAL_SEMAPHORE_HANDLE_TYPE_OPAQUE_FD_BIT) {
     DLOG(ERROR) << "Importing semaphore handle of unexpected type:"
@@ -198,7 +198,7 @@ GLuint ExternalVkImageGlRepresentation::ImportVkSemaph
                                 fd.release());
 
   return gl_semaphore;
-#else  // !defined(OS_FUCHSIA) && !defined(OS_LINUX)
+#else  // !defined(OS_FUCHSIA) && !defined(OS_LINUX) && !defined(OS_BSD)
 #error Unsupported OS
 #endif
 }




--- src/3rdparty/chromium/gpu/ipc/common/gpu_memory_buffer_support.cc.orig	2019-11-27 21:12:25 UTC
+++ src/3rdparty/chromium/gpu/ipc/common/gpu_memory_buffer_support.cc
@@ -12,7 +12,7 @@
 #include "gpu/ipc/common/gpu_memory_buffer_impl_io_surface.h"

 
-#if defined(OS_LINUX)
+#if defined(OS_LINUX) || defined(OS_BSD)
 #include "gpu/ipc/common/gpu_memory_buffer_impl_native_pixmap.h"
 #include "ui/gfx/client_native_pixmap_factory.h"
 #include "ui/gfx/linux/client_native_pixmap_factory_dmabuf.h"
 #endif
@@ -22,7 +22,7 @@
 #include "ui/ozone/public/ozone_platform.h"
 #endif
 
-#if defined(USE_OZONE) || defined(OS_LINUX)
+#if defined(USE_OZONE) || defined(OS_LINUX) || defined(OS_BSD)
 #include "gpu/ipc/common/gpu_memory_buffer_impl_native_pixmap.h"
 #endif
 
@@ -111,7 +111,7 @@ bool GpuMemoryBufferSupport::IsNativeGpuMemoryBufferCo
 #elif defined(USE_OZONE)
   return ui::OzonePlatform::EnsureInstance()->IsNativePixmapConfigSupported(
       format, usage);

   return false;  // TODO(julian.isorce): Add linux support.
 #elif defined(OS_WIN)
   switch (usage) {
@@ -167,7 +167,7 @@ GpuMemoryBufferSupport::CreateGpuMemoryBufferImplFromH
       return GpuMemoryBufferImplIOSurface::CreateFromHandle(
           std::move(handle), size, format, usage, std::move(callback));
 #endif
-#if defined(OS_LINUX) || defined(USE_OZONE)
+#if defined(OS_LINUX) || defined(USE_OZONE) || defined(OS_BSD)
     case gfx::NATIVE_PIXMAP:
       return GpuMemoryBufferImplNativePixmap::CreateFromHandle(
           client_native_pixmap_factory(), std::move(handle), size, format,




--- src/3rdparty/chromium/gpu/ipc/service/gpu_init.cc.orig	2019-11-27 21:12:25 UTC
+++ src/3rdparty/chromium/gpu/ipc/service/gpu_init.cc
@@ -109,7 +109,7 @@ void InitializePlatformOverlaySettings(GPUInfo* gpu_in
 #endif
 }
 #endif  // defined(OS_WIN)
 
-#if defined(OS_LINUX) && !defined(OS_CHROMEOS) && !defined(IS_CHROMECAST)
+#if (defined(OS_LINUX) && !defined(OS_CHROMEOS) && !defined(IS_CHROMECAST)) || defined(OS_BSD)
 bool CanAccessNvidiaDeviceFile() {
   bool res = true;
   base::ScopedBlockingCall scoped_blocking_call(FROM_HERE,
@@ -120,7 +120,7 @@ bool CanAccessNvidiaDeviceFile() {
   }
   return res;
 }
-#endif  // OS_LINUX && !OS_CHROMEOS && !IS_CHROMECAST
+#endif  // (OS_LINUX && !OS_CHROMEOS && !IS_CHROMECAST) || OS_BSD
 
 }  // namespace
 
@@ -152,7 +152,7 @@ bool GpuInit::InitializeAndStartSandbox(base::CommandL
   // 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;
@@ -228,7 +228,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.
@@ -237,7 +237,7 @@ bool GpuInit::InitializeAndStartSandbox(base::CommandL
         watchdog_thread_.get(), &gpu_info_, gpu_preferences_);
     attempted_startsandbox = true;
   }
-#endif  // defined(OS_LINUX)
+#endif  // defined(OS_LINUX) && !defined(OS_BSD)
 
   base::TimeTicks before_initialize_one_off = base::TimeTicks::Now();
 
@@ -284,14 +284,14 @@ bool GpuInit::InitializeAndStartSandbox(base::CommandL
   }
   if (gl_initialized && use_swiftshader &&
       gl::GetGLImplementation() != gl::kGLImplementationSwiftShaderGL) {
-#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;
 #else
     gl::init::ShutdownGL(true);
     gl_initialized = false;
-#endif  // OS_LINUX
+#endif  // OS_LINUX || OS_BSD
   }
   if (!gl_initialized)
     gl_initialized = gl::init::InitializeGLNoExtensionsOneOff();
@@ -317,7 +317,7 @@ bool GpuInit::InitializeAndStartSandbox(base::CommandL
         command_line, gpu_feature_info_,
         gpu_preferences_.disable_software_rasterizer, false);
     if (use_swiftshader) {
-#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;
       }
-#endif  // OS_LINUX
+#endif  // OS_LINUX || OS_BSD
     }
   }
 
@@ -357,7 +357,7 @@ bool GpuInit::InitializeAndStartSandbox(base::CommandL
 
   InitializePlatformOverlaySettings(&gpu_info_);
 
-#if defined(OS_LINUX)
+#if defined(OS_LINUX) || defined(OS_BSD)
   // Driver may create a compatibility profile context when collect graphics
   // information on Linux platform. Try to collect graphics information
   // based on core profile context after disabling platform extensions.
@@ -376,7 +376,7 @@ bool GpuInit::InitializeAndStartSandbox(base::CommandL
       return false;
     }
   }
-#endif  // defined(OS_LINUX)
+#endif  // defined(OS_LINUX) || defined(OS_BSD)
 
   if (use_swiftshader) {
     AdjustInfoToSwiftShader();
@@ -552,7 +552,7 @@ void GpuInit::InitializeInProcess(base::CommandLine* c
 
   InitializePlatformOverlaySettings(&gpu_info_);
 
-#if defined(OS_LINUX)
+#if defined(OS_LINUX) || defined(OS_BSD)
   // Driver may create a compatibility profile context when collect graphics
   // information on Linux platform. Try to collect graphics information
   // based on core profile context after disabling platform extensions.
@@ -572,7 +572,7 @@ void GpuInit::InitializeInProcess(base::CommandLine* c
       }
     }
   }
-#endif  // defined(OS_LINUX)
+#endif  // defined(OS_LINUX) || defined(OS_BSD)
 
   if (use_swiftshader) {
     AdjustInfoToSwiftShader();




--- src/3rdparty/chromium/gpu/ipc/service/gpu_memory_buffer_factory.cc.orig	2019-11-27 21:12:25 UTC
+++ src/3rdparty/chromium/gpu/ipc/service/gpu_memory_buffer_factory.cc
@@ -12,7 +12,7 @@
 #include "gpu/ipc/service/gpu_memory_buffer_factory_io_surface.h"
 #endif
 
-#if defined(OS_LINUX) || defined(OS_FUCHSIA)
+#if defined(OS_LINUX) || defined(OS_FUCHSIA) || defined(OS_BSD)
 #include "gpu/ipc/service/gpu_memory_buffer_factory_native_pixmap.h"
 #endif
 
@@ -34,7 +34,7 @@ GpuMemoryBufferFactory::CreateNativeType(
   return std::make_unique<GpuMemoryBufferFactoryIOSurface>();
 #elif defined(OS_ANDROID)
   return std::make_unique<GpuMemoryBufferFactoryAndroidHardwareBuffer>();
-#elif defined(OS_LINUX) || defined(OS_FUCHSIA)
+#elif defined(OS_LINUX) || defined(OS_FUCHSIA) || defined(OS_BSD)
   return std::make_unique<GpuMemoryBufferFactoryNativePixmap>(
       vulkan_context_provider);
 #elif defined(OS_WIN)
   return base::WrapUnique(new GpuMemoryBufferFactoryDXGI);




--- src/3rdparty/chromium/gpu/ipc/service/gpu_watchdog_thread.cc.orig	2019-11-27 21:12:25 UTC
+++ src/3rdparty/chromium/gpu/ipc/service/gpu_watchdog_thread.cc
@@ -45,8 +45,10 @@ const int kGpuTimeout = 10000;
 #endif
 
 #if defined(USE_X11)

 const unsigned char text[20] = "check";
 #endif
 
@@ -68,9 +70,12 @@ GpuWatchdogThreadImplV1::GpuWatchdogThreadImplV1()
       ,
       display_(nullptr),
       window_(0),
-      atom_(x11::None),
+      atom_(x11::None)
+#if !defined(OS_BSD)
+      ,
       host_tty_(-1)
 #endif
+#endif
 {
   base::subtle::NoBarrier_Store(&awaiting_acknowledge_, false);
 
@@ -85,7 +90,9 @@ GpuWatchdogThreadImplV1::GpuWatchdogThreadImplV1()
 #endif
 
 #if defined(USE_X11)

   SetupXServer();
 #endif
   base::MessageLoopCurrent::Get()->AddTaskObserver(&task_observer_);
@@ -230,8 +237,10 @@ GpuWatchdogThreadImplV1::~GpuWatchdogThreadImplV1() {
   base::PowerMonitor::RemoveObserver(this);
 
 #if defined(USE_X11)
+#if !defined(OS_BSD)

   if (display_) {
     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) {
@@ -515,7 +524,9 @@ void GpuWatchdogThreadImplV1::SetupXServer() {
                       CopyFromParent, InputOutput, CopyFromParent, 0, nullptr);
     atom_ = XInternAtom(display_, "CHECK", x11::False);
   }

+#endif
 }
 
 void GpuWatchdogThreadImplV1::SetupXChangeProp() {
@@ -615,7 +626,7 @@ base::ThreadTicks GpuWatchdogThreadImplV1::GetWatchedT
 }
 #endif
 
-#if defined(USE_X11)
+#if defined(USE_X11) && !defined(OS_BSD)
 int GpuWatchdogThreadImplV1::GetActiveTTY() const {
   char tty_string[8] = {0};
   if (tty_file_ && !fseek(tty_file_, 0, SEEK_SET) &&




--- src/3rdparty/chromium/gpu/vulkan/vulkan_function_pointers.cc.orig	2019-11-27 21:12:25 UTC
+++ src/3rdparty/chromium/gpu/vulkan/vulkan_function_pointers.cc
@@ -716,7 +716,7 @@ bool VulkanFunctionPointers::BindDeviceFunctionPointer
   }
 #endif  // defined(OS_ANDROID)
 
-#if defined(OS_LINUX) || defined(OS_ANDROID)
+#if defined(OS_LINUX) || defined(OS_ANDROID) || defined(OS_BSD)
   if (gfx::HasExtension(enabled_extensions,
                         VK_KHR_EXTERNAL_SEMAPHORE_FD_EXTENSION_NAME)) {
     vkGetSemaphoreFdKHRFn = reinterpret_cast<PFN_vkGetSemaphoreFdKHR>(
@@ -735,9 +735,9 @@ bool VulkanFunctionPointers::BindDeviceFunctionPointer
       return false;
     }
   }
-#endif  // defined(OS_LINUX) || defined(OS_ANDROID)
+#endif  // defined(OS_LINUX) || defined(OS_ANDROID) || defined(OS_BSD)
 
-#if defined(OS_LINUX)
+#if defined(OS_LINUX) || defined(OS_BSD)
   if (gfx::HasExtension(enabled_extensions,
                         VK_KHR_EXTERNAL_MEMORY_FD_EXTENSION_NAME)) {
     vkGetMemoryFdKHRFn = reinterpret_cast<PFN_vkGetMemoryFdKHR>(
@@ -748,7 +748,7 @@ bool VulkanFunctionPointers::BindDeviceFunctionPointer
       return false;
     }
   }
-#endif  // defined(OS_LINUX)
+#endif  // defined(OS_LINUX) || defined(OS_BSD)
 
 #if defined(OS_FUCHSIA)
   if (gfx::HasExtension(enabled_extensions,




--- src/3rdparty/chromium/gpu/vulkan/vulkan_function_pointers.h.orig	2019-11-27 21:12:25 UTC
+++ src/3rdparty/chromium/gpu/vulkan/vulkan_function_pointers.h
@@ -161,14 +161,14 @@ struct VulkanFunctionPointers {
       vkGetAndroidHardwareBufferPropertiesANDROIDFn = nullptr;
 #endif  // defined(OS_ANDROID)
 
-#if defined(OS_LINUX) || defined(OS_ANDROID)
+#if defined(OS_LINUX) || defined(OS_ANDROID) || defined(OS_BSD)
   PFN_vkGetSemaphoreFdKHR vkGetSemaphoreFdKHRFn = nullptr;
   PFN_vkImportSemaphoreFdKHR vkImportSemaphoreFdKHRFn = nullptr;
-#endif  // defined(OS_LINUX) || defined(OS_ANDROID)
+#endif  // defined(OS_LINUX) || defined(OS_ANDROID) || defined(OS_BSD)
 
-#if defined(OS_LINUX)
+#if defined(OS_LINUX) || defined(OS_BSD)
   PFN_vkGetMemoryFdKHR vkGetMemoryFdKHRFn = nullptr;
-#endif  // defined(OS_LINUX)
+#endif  // defined(OS_LINUX) || defined(OS_BSD)
 
 #if defined(OS_FUCHSIA)
   PFN_vkImportSemaphoreZirconHandleFUCHSIA
@@ -342,16 +342,16 @@ struct VulkanFunctionPointers {
       ->vkGetAndroidHardwareBufferPropertiesANDROIDFn
 #endif  // defined(OS_ANDROID)
 
-#if defined(OS_LINUX) || defined(OS_ANDROID)
+#if defined(OS_LINUX) || defined(OS_ANDROID) || defined(OS_BSD)
 #define vkGetSemaphoreFdKHR \
   gpu::GetVulkanFunctionPointers()->vkGetSemaphoreFdKHRFn
 #define vkImportSemaphoreFdKHR \
   gpu::GetVulkanFunctionPointers()->vkImportSemaphoreFdKHRFn
-#endif  // defined(OS_LINUX) || defined(OS_ANDROID)
+#endif  // defined(OS_LINUX) || defined(OS_ANDROID) || defined(OS_BSD)
 
-#if defined(OS_LINUX)
+#if defined(OS_LINUX) || defined(OS_BSD)
 #define vkGetMemoryFdKHR gpu::GetVulkanFunctionPointers()->vkGetMemoryFdKHRFn
-#endif  // defined(OS_LINUX)
+#endif  // defined(OS_LINUX) || defined(OS_BSD)
 
 #if defined(OS_FUCHSIA)
 #define vkImportSemaphoreZirconHandleFUCHSIA \




--- src/3rdparty/chromium/headless/lib/browser/headless_request_context_manager.cc.orig	2019-11-27 21:12:25 UTC
+++ src/3rdparty/chromium/headless/lib/browser/headless_request_context_manager.cc
@@ -23,7 +23,7 @@ namespace headless {
 
 namespace {
 

 static char kProductName[] = "HeadlessChrome";
 #endif
 
@@ -53,7 +53,7 @@ net::NetworkTrafficAnnotationTag GetProxyConfigTraffic
   return traffic_annotation;
 }
 

 ::network::mojom::CryptConfigPtr BuildCryptConfigOnce(
     const base::FilePath& user_data_path) {
   static bool done_once = false;
@@ -193,7 +193,7 @@ HeadlessRequestContextManager::HeadlessRequestContextM
     proxy_config_monitor_ = std::make_unique<HeadlessProxyConfigMonitor>(
         base::ThreadTaskRunnerHandle::Get());
   }
-#if defined(OS_LINUX) && !defined(OS_CHROMEOS)
+#if (defined(OS_LINUX) && !defined(OS_CHROMEOS)) || defined(OS_BSD)
   auto crypt_config = BuildCryptConfigOnce(user_data_path_);
   if (crypt_config)
     content::GetNetworkService()->SetCryptConfig(std::move(crypt_config));
@@ -366,7 +366,7 @@ void HeadlessRequestContextManager::InitializeOnIO() {
                                   std::move(protocol_handler.second));
     }
     protocol_handlers_.clear();
-#if defined(OS_LINUX) && !defined(OS_CHROMEOS)
+#if (defined(OS_LINUX) && !defined(OS_CHROMEOS)) || defined(OS_BSD)
     if (crypt_config_) {
       content::GetNetworkServiceImpl()->SetCryptConfig(
           std::move(crypt_config_));

Removed Link Here

(-)a/www/qt5-webengine/files/patch-src_3rdparty_chromium_headless_lib_browser_headless__request__context__manager.h (-11 lines)
1	--- src/3rdparty/chromium/headless/lib/browser/headless_request_context_manager.h.orig 2019-05-23 12:39:34 UTC
2	+++ src/3rdparty/chromium/headless/lib/browser/headless_request_context_manager.h
3	@@ -69,7 +69,7 @@ class HeadlessRequestContextManager {
4	std::unique_ptr<HeadlessProxyConfigMonitor> proxy_config_monitor_;
5	bool is_system_context_;
6
7	-#if defined(OS_LINUX) && !defined(OS_CHROMEOS)
8	+#if (defined(OS_LINUX) && !defined(OS_CHROMEOS)) \|\| defined(OS_BSD)
9	::network::mojom::CryptConfigPtr crypt_config_;
10	#endif
11




--- src/3rdparty/chromium/headless/lib/headless_content_main_delegate.cc.orig	2019-11-27 21:12:25 UTC
+++ src/3rdparty/chromium/headless/lib/headless_content_main_delegate.cc
@@ -324,7 +324,7 @@ int HeadlessContentMainDelegate::RunProcess(
 }
 #endif  // !defined(CHROME_MULTIPLE_DLL_CHILD)
 
-#if defined(OS_LINUX)
+#if defined(OS_LINUX) || defined(OS_BSD)
 void SIGTERMProfilingShutdown(int signal) {
   content::Profiling::Stop();
   struct sigaction sigact;
@@ -359,7 +359,7 @@ void HeadlessContentMainDelegate::ZygoteForked() {
   breakpad::InitCrashReporter(process_type);
 #endif
 }
-#endif  // defined(OS_LINUX)
+#endif  // defined(OS_LINUX) || defined(OS_BSD)
 
 // static
 HeadlessContentMainDelegate* HeadlessContentMainDelegate::GetInstance() {

Added Link Here

(-)b/www/qt5-webengine/files/patch-src_3rdparty_chromium_headless_lib_headless__content__main__delegate.h (+11 lines)
1	--- src/3rdparty/chromium/headless/lib/headless_content_main_delegate.h.orig 2019-11-27 21:12:25 UTC
2	+++ src/3rdparty/chromium/headless/lib/headless_content_main_delegate.h
3	@@ -58,7 +58,7 @@ class HEADLESS_EXPORT HeadlessContentMainDelegate
4
5	HeadlessBrowserImpl* browser() const { return browser_.get(); }
6
7	-#if defined(OS_LINUX)
8	+#if defined(OS_LINUX) \|\| defined(OS_BSD)
9	void ZygoteForked() override;
10	#endif
11




--- src/3rdparty/chromium/media/base/scopedfd_helper.h.orig	2019-11-27 21:12:25 UTC
+++ src/3rdparty/chromium/media/base/scopedfd_helper.h
@@ -11,17 +11,17 @@
 namespace media {
 
 // Theoretically, we can test on defined(OS_POSIX) || defined(OS_FUCHSIA), but
-// since the only current user is V4L2 we are limiting the scope to OS_LINUX so
+// since the only current user is V4L2 we are limiting the scope to OS_LINUX || OS_BSD so
 // the binary size does not inflate on non-using systems. Feel free to adapt
 // this and BUILD.gn as our needs evolve.
-#if defined(OS_LINUX)
+#if defined(OS_LINUX) || defined(OS_BSD)
 
 // Return a new vector containing duplicates of |fds|, or PCHECKs in case of an
 // error.
 MEDIA_EXPORT std::vector<base::ScopedFD> DuplicateFDs(
     const std::vector<base::ScopedFD>& fds);
 




--- src/3rdparty/chromium/media/base/video_frame.cc.orig	2019-11-27 21:12:25 UTC
+++ src/3rdparty/chromium/media/base/video_frame.cc
@@ -52,7 +52,7 @@ static std::string StorageTypeToString(
       return "OWNED_MEMORY";
     case VideoFrame::STORAGE_SHMEM:
       return "SHMEM";

     case VideoFrame::STORAGE_DMABUFS:
       return "DMABUFS";
 #endif
@@ -67,7 +67,7 @@ static std::string 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 &&
@@ -186,7 +186,7 @@ static base::Optional<VideoFrameLayout> GetDefaultLayo
   return VideoFrameLayout::CreateWithPlanes(format, coded_size, planes);
 }
 
-#if defined(OS_LINUX)
+#if defined(OS_LINUX) || defined(OS_BSD)
 // This class allows us to embed a vector<ScopedFD> into a scoped_refptr, and
 // thus to have several VideoFrames share the same set of DMABUF FDs.
 class VideoFrame::DmabufHolder
@@ -204,7 +204,7 @@ class VideoFrame::DmabufHolder
   friend class base::RefCountedThreadSafe<DmabufHolder>;
   ~DmabufHolder() = default;
 };
-#endif  // defined(OS_LINUX)
+#endif  // defined(OS_LINUX) || defined(OS_BSD)
 
 // static
 bool VideoFrame::IsValidConfig(VideoPixelFormat format,
@@ -510,7 +510,7 @@ scoped_refptr<VideoFrame> VideoFrame::WrapExternalYuva
   return frame;
 }
 

 // static
 scoped_refptr<VideoFrame> VideoFrame::WrapExternalDmabufs(
     const VideoFrameLayout& layout,
@@ -642,7 +642,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_;
@@ -960,7 +960,7 @@ size_t VideoFrame::shared_memory_offset() const {
   return shared_memory_offset_;
 }
 

 const std::vector<base::ScopedFD>& VideoFrame::DmabufFds() const {
   DCHECK_EQ(storage_type_, STORAGE_DMABUFS);
 
@@ -1112,7 +1112,7 @@ VideoFrame::VideoFrame(const VideoFrameLayout& layout,
       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>()),
 #endif
       timestamp_(timestamp),




--- src/3rdparty/chromium/media/base/video_frame.h.orig	2019-11-27 21:12:25 UTC
+++ src/3rdparty/chromium/media/base/video_frame.h
@@ -42,9 +42,9 @@
 #include "base/mac/scoped_cftyperef.h"
 #endif  // defined(OS_MACOSX)
 
-#if defined(OS_LINUX)
+#if defined(OS_LINUX) || defined(OS_BSD)
 #include "base/files/scoped_file.h"
-#endif  // defined(OS_LINUX)
+#endif  // defined(OS_LINUX) || defined(OS_BSD)
 
 namespace media {
 
@@ -79,7 +79,7 @@ class MEDIA_EXPORT VideoFrame : public base::RefCounte
     STORAGE_UNOWNED_MEMORY = 2,  // External, non owned data pointers.
     STORAGE_OWNED_MEMORY = 3,  // VideoFrame has allocated its own data buffer.
     STORAGE_SHMEM = 4,         // Pixels are backed by Shared Memory.

     // TODO(mcasas): Consider turning this type into STORAGE_NATIVE
     // based on the idea of using this same enum value for both DMA
     // buffers on Linux and CVPixelBuffers on Mac (which currently use
@@ -273,7 +273,7 @@ class MEDIA_EXPORT VideoFrame : public base::RefCounte
       uint8_t* a_data,
       base::TimeDelta timestamp);
 

   // Wraps provided dmabufs
   // (https://www.kernel.org/doc/html/latest/driver-api/dma-buf.html) with a
   // VideoFrame. The frame will take ownership of |dmabuf_fds|, and will
@@ -469,7 +469,7 @@ class MEDIA_EXPORT VideoFrame : public base::RefCounte
   // Returns the offset into the shared memory where the frame data begins.
   size_t shared_memory_offset() const;
 

   // Returns a vector containing the backing DmaBufs for this frame. The number
   // of returned DmaBufs will be equal or less than the number of planes of
   // the frame. If there are less, this means that the last FD contains the
@@ -672,7 +672,7 @@ class MEDIA_EXPORT VideoFrame : public base::RefCounte
   // memory.
   size_t shared_memory_offset_;
 
-#if defined(OS_LINUX)
+#if defined(OS_LINUX) || defined(OS_BSD)
   class DmabufHolder;
 
   // Dmabufs for the frame, used when storage is STORAGE_DMABUFS. Size is either
   // equal or less than the number of planes of the frame. If it is less, then
   // the memory area represented by the last FD contains the remaining planes.




--- src/3rdparty/chromium/media/capture/video/linux/video_capture_device_linux.cc.orig	2019-11-27 21:12:25 UTC
+++ src/3rdparty/chromium/media/capture/video/linux/video_capture_device_linux.cc
@@ -15,7 +15,7 @@
 

 
 VideoCaptureDeviceLinux::VideoCaptureDeviceLinux(
     scoped_refptr<V4L2CaptureDevice> v4l2,
@@ -76,6 +78,7 @@ void VideoCaptureDeviceLinux::AllocateAndStart(
 void VideoCaptureDeviceLinux::AllocateAndStart(
     const VideoCaptureParams& params,
     std::unique_ptr<VideoCaptureDevice::Client> client) {
   DCHECK_CALLED_ON_VALID_SEQUENCE(sequence_checker_);
+#if !defined(OS_FREEBSD)
   DCHECK(!capture_impl_);
   if (v4l2_thread_.IsRunning())
     return;  // Wrong state.
@@ -103,10 +106,12 @@ void VideoCaptureDeviceLinux::AllocateAndStart(
   for (auto& request : photo_requests_queue_)
     v4l2_thread_.task_runner()->PostTask(FROM_HERE, std::move(request));
   photo_requests_queue_.clear();

 }
 
 void VideoCaptureDeviceLinux::StopAndDeAllocate() {
   DCHECK_CALLED_ON_VALID_SEQUENCE(sequence_checker_);
+#if !defined(OS_FREEBSD)
   if (!v4l2_thread_.IsRunning())
     return;  // Wrong state.
   v4l2_thread_.task_runner()->PostTask(
@@ -116,6 +121,7 @@ void VideoCaptureDeviceLinux::StopAndDeAllocate() {
   v4l2_thread_.Stop();
 
   capture_impl_ = nullptr;

 }
 
 void VideoCaptureDeviceLinux::TakePhoto(TakePhotoCallback callback) {
@@ -163,11 +169,13 @@ void VideoCaptureDeviceLinux::SetPhotoOptions(
 }
 
 void VideoCaptureDeviceLinux::SetRotation(int rotation) {
   DCHECK_CALLED_ON_VALID_SEQUENCE(sequence_checker_);
   rotation_ = rotation;
+#if !defined(OS_FREEBSD)
   if (v4l2_thread_.IsRunning()) {
     v4l2_thread_.task_runner()->PostTask(

Added Link Here

(-)b/www/qt5-webengine/files/patch-src_3rdparty_chromium_media_capture_video_video__capture__buffer__pool__impl.cc (+11 lines)
1	--- src/3rdparty/chromium/media/capture/video/video_capture_buffer_pool_impl.cc.orig 2019-11-27 21:12:25 UTC
2	+++ src/3rdparty/chromium/media/capture/video/video_capture_buffer_pool_impl.cc
3	@@ -58,7 +58,7 @@ VideoCaptureBufferPoolImpl::CreateSharedMemoryViaRawFi
4	int buffer_id) {
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	base::AutoLock lock(lock_);
10
11	VideoCaptureBufferTracker* tracker = GetTracker(buffer_id);

Lines 1-11 Link Here

(-)b/www/qt5-webengine/files/patch-src_3rdparty_chromium_media_capture_video_video__capture__device__client.cc (-4 / +4 lines)
1	--- src/3rdparty/chromium/media/capture/video/video_capture_device_client.cc.orig 2018-11-13 18:25:11 UTC	1	--- src/3rdparty/chromium/media/capture/video/video_capture_device_client.cc.orig 2019-11-27 21:12:25 UTC
2	+++ src/3rdparty/chromium/media/capture/video/video_capture_device_client.cc	2	+++ src/3rdparty/chromium/media/capture/video/video_capture_device_client.cc
3	@@ -238,7 +238,7 @@ void VideoCaptureDeviceClient::OnIncomingCapturedData(	3	@@ -308,7 +308,7 @@ void VideoCaptureDeviceClient::OnIncomingCapturedData(
4	// see http://linuxtv.org/downloads/v4l-dvb-apis/packed-rgb.html.	4	// see http://linuxtv.org/downloads/v4l-dvb-apis/packed-rgb.html.
5	// Windows RGB24 defines blue at lowest byte,	5	// Windows RGB24 defines blue at lowest byte,
6	// see https://msdn.microsoft.com/en-us/library/windows/desktop/dd407253	6	// see https://msdn.microsoft.com/en-us/library/windows/desktop/dd407253
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	origin_colorspace = libyuv::FOURCC_RAW;	9	fourcc_format = libyuv::FOURCC_RAW;
10	#elif defined(OS_WIN)	10	#elif defined(OS_WIN)
11	origin_colorspace = libyuv::FOURCC_24BG;	11	fourcc_format = libyuv::FOURCC_24BG;




--- src/3rdparty/chromium/media/gpu/libyuv_image_processor.cc.orig	2019-11-27 21:12:25 UTC
+++ src/3rdparty/chromium/media/gpu/libyuv_image_processor.cc
@@ -91,7 +91,7 @@ std::unique_ptr<LibYUVImageProcessor> LibYUVImageProce
   // 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)
+#if defined(OS_LINUX) || defined(OS_BSD)
     if (input_type == VideoFrame::STORAGE_DMABUFS) {
       video_frame_mapper = VideoFrameMapperFactory::CreateMapper(
           input_config.layout.format(), true);
@@ -100,7 +100,7 @@ std::unique_ptr<LibYUVImageProcessor> LibYUVImageProce
         break;
       }
     }
-#endif  // defined(OS_LINUX)
+#endif  // defined(OS_LINUX) || defined(OS_BSD)
 
     if (VideoFrame::IsStorageTypeMappable(input_type)) {
       input_storage_type = input_type;
@@ -203,7 +203,7 @@ void LibYUVImageProcessor::ProcessTask(scoped_refptr<V
                                        FrameReadyCB cb) {
   DCHECK(process_thread_.task_runner()->BelongsToCurrentThread());
   DVLOGF(4);
-#if defined(OS_LINUX)
+#if defined(OS_LINUX) || defined(OS_BSD)
   if (input_frame->storage_type() == VideoFrame::STORAGE_DMABUFS) {
     DCHECK_NE(video_frame_mapper_.get(), nullptr);
     input_frame = video_frame_mapper_->Map(std::move(input_frame));
@@ -213,7 +213,7 @@ void LibYUVImageProcessor::ProcessTask(scoped_refptr<V
       return;
     }
   }
-#endif  // defined(OS_LINUX)
+#endif  // defined(OS_LINUX) || defined(OS_BSD)
 
   int res = DoConversion(input_frame.get(), output_frame.get());
   if (res != 0) {




--- src/3rdparty/chromium/media/gpu/linux/platform_video_frame_utils.cc.orig	2019-11-27 21:12:25 UTC
+++ src/3rdparty/chromium/media/gpu/linux/platform_video_frame_utils.cc
@@ -121,7 +121,7 @@ gfx::GpuMemoryBufferHandle CreateGpuMemoryBufferHandle
   DCHECK(video_frame);
 
   gfx::GpuMemoryBufferHandle handle;
-#if defined(OS_LINUX)
+#if defined(OS_LINUX) || defined(OS_BSD)
   handle.type = gfx::NATIVE_PIXMAP;
 
   std::vector<base::ScopedFD> duped_fds =
@@ -136,7 +136,7 @@ gfx::GpuMemoryBufferHandle CreateGpuMemoryBufferHandle
   }
 #else
   NOTREACHED();
-#endif  // defined(OS_LINUX)
+#endif  // defined(OS_LINUX) || defined(OS_BSD)
   return handle;
 }
 

Added Link Here

(-)b/www/qt5-webengine/files/patch-src_3rdparty_chromium_media_mojo_clients_mojo__video__encode__accelerator.cc (+11 lines)
1	--- src/3rdparty/chromium/media/mojo/clients/mojo_video_encode_accelerator.cc.orig 2019-11-27 21:12:25 UTC
2	+++ src/3rdparty/chromium/media/mojo/clients/mojo_video_encode_accelerator.cc
3	@@ -124,7 +124,7 @@ void MojoVideoEncodeAccelerator::Encode(scoped_refptr<
4	frame->layout().num_planes());
5	DCHECK(vea_.is_bound());
6
7	-#if defined(OS_LINUX)
8	+#if defined(OS_LINUX) \|\| defined(OS_BSD)
9	if (frame->storage_type() == VideoFrame::STORAGE_DMABUFS) {
10	DCHECK(frame->HasDmaBufs());
11	vea_->Encode(




--- src/3rdparty/chromium/media/mojo/services/gpu_mojo_media_client.cc.orig	2019-11-27 21:12:25 UTC
+++ src/3rdparty/chromium/media/mojo/services/gpu_mojo_media_client.cc
@@ -65,7 +65,7 @@ namespace media {
 namespace {
 
 #if defined(OS_ANDROID) || defined(OS_CHROMEOS) || defined(OS_MACOSX) || \
-    defined(OS_WIN) || defined(OS_LINUX)
+    defined(OS_WIN) || defined(OS_LINUX) || defined(OS_BSD)
 gpu::CommandBufferStub* GetCommandBufferStub(
     scoped_refptr<base::SingleThreadTaskRunner> gpu_task_runner,
     base::WeakPtr<MediaGpuChannelManager> media_gpu_channel_manager,
@@ -250,7 +250,7 @@ std::unique_ptr<VideoDecoder> GpuMojoMediaClient::Crea
                                 command_buffer_id->route_id));
       }
 
-#elif defined(OS_MACOSX) || defined(OS_WIN) || defined(OS_LINUX)
+#elif defined(OS_MACOSX) || defined(OS_WIN) || defined(OS_LINUX) || defined(OS_BSD)
       video_decoder = VdaVideoDecoder::Create(
           task_runner, gpu_task_runner_, media_log->Clone(), target_color_space,
           gpu_preferences_, gpu_workarounds_,
       gpu_preferences_, gpu_workarounds_,

Lines 1-11 Link Here

(-)b/www/qt5-webengine/files/patch-src_3rdparty_chromium_mojo_public_js_mojo__bindings__resources.grd (-4 / +4 lines)
1	--- src/3rdparty/chromium/mojo/public/js/mojo_bindings_resources.grd.orig 2019-05-23 12:39:34 UTC	1	--- src/3rdparty/chromium/mojo/public/js/mojo_bindings_resources.grd.orig 2019-11-27 21:12:25 UTC
2	+++ src/3rdparty/chromium/mojo/public/js/mojo_bindings_resources.grd	2	+++ src/3rdparty/chromium/mojo/public/js/mojo_bindings_resources.grd
3	@@ -23,7 +23,7 @@	3	@@ -60,7 +60,7 @@
4	use_base_dir="false"	4	use_base_dir="false"
5	type="BINDATA"	5	type="BINDATA"
6	compress="gzip" />	6	compress="gzip" />
7	- <if expr="is_win or is_macosx or is_linux">	7	- <if expr="is_win or is_macosx or is_linux">
8	+ <if expr="is_win or is_macosx or is_posix">	8	+ <if expr="is_win or is_macosx or is_posix">
9	<include name="IDR_MOJO_TIME_MOJOM_JS"	9	<include name="IDR_MOJO_TIME_MOJOM_HTML"
10	file="${root_gen_dir}/mojo/public/mojom/base/time.mojom.js"	10	file="${root_gen_dir}/mojo/public/mojom/base/time.mojom.html"
11	use_base_dir="false"	11	use_base_dir="false"

Lines 1-6 Link Here

(-)b/www/qt5-webengine/files/patch-src_3rdparty_chromium_net_BUILD.gn (-4 / +13 lines)
1	--- src/3rdparty/chromium/net/BUILD.gn.orig 2019-05-23 12:39:34 UTC	1	--- src/3rdparty/chromium/net/BUILD.gn.orig 2019-11-27 21:12:25 UTC
2	+++ src/3rdparty/chromium/net/BUILD.gn	2	+++ src/3rdparty/chromium/net/BUILD.gn
3	@@ -97,7 +97,7 @@ net_configs = [	3	@@ -105,7 +105,7 @@ net_configs = [
4	"//build/config/compiler:wexit_time_destructors",	4	"//build/config/compiler:wexit_time_destructors",
5	]	5	]
6		6
Lines 9-15 Link Here
9	net_configs += [ "//build/config/linux:libresolv" ]	9	net_configs += [ "//build/config/linux:libresolv" ]
10	}	10	}
11		11
12	@@ -1900,7 +1900,7 @@ component("net") {	12	@@ -1913,7 +1913,7 @@ component("net") {
		13	}
		14	}
		15
		16	- if (is_android \|\| is_chromeos) {
		17	+ if (is_android \|\| is_chromeos \|\| is_bsd) {
		18	sources += [
		19	"base/network_change_notifier_posix.cc",
		20	"base/network_change_notifier_posix.h",
		21	@@ -1946,7 +1946,7 @@ component("net") {
13	}	22	}
14		23
15	# Use getifaddrs() on POSIX platforms, except Linux and Android.	24	# Use getifaddrs() on POSIX platforms, except Linux and Android.
Lines 18-24 Link Here
18	sources += [	27	sources += [
19	"base/network_interfaces_getifaddrs.cc",	28	"base/network_interfaces_getifaddrs.cc",
20	"base/network_interfaces_getifaddrs.h",	29	"base/network_interfaces_getifaddrs.h",
21	@@ -1993,6 +1993,16 @@ component("net") {	30	@@ -2040,6 +2040,16 @@ component("net") {
22	]	31	]
23		32
24	sources -= [ "disk_cache/blockfile/file_posix.cc" ]	33	sources -= [ "disk_cache/blockfile/file_posix.cc" ]




--- src/3rdparty/chromium/net/base/address_tracker_linux.cc.orig	2019-11-27 21:12:25 UTC
+++ src/3rdparty/chromium/net/base/address_tracker_linux.cc
@@ -21,96 +21,10 @@
 namespace net {

 }
 
 AddressTrackerLinux::AddressTrackerLinux()
@@ -147,6 +61,7 @@ AddressTrackerLinux::AddressTrackerLinux(
 AddressTrackerLinux::~AddressTrackerLinux() = default;
 
 void AddressTrackerLinux::Init() {
+#if !defined(OS_FREEBSD)
   netlink_fd_.reset(socket(AF_NETLINK, SOCK_RAW, NETLINK_ROUTE));
   if (!netlink_fd_.is_valid()) {
     PLOG(ERROR) << "Could not create NETLINK socket";
@@ -242,6 +157,7 @@ void AddressTrackerLinux::AbortAndForceOnline() {
   connection_type_initialized_cv_.Broadcast();
-
-  int rv;
-
-  if (tracking_) {
-    // Request notifications.
-    struct sockaddr_nl addr = {};
-    addr.nl_family = AF_NETLINK;
-    addr.nl_pid = getpid();
-    // TODO(szym): Track RTMGRP_LINK as well for ifi_type,
-    // http://crbug.com/113993
-    addr.nl_groups =
-        RTMGRP_IPV4_IFADDR | RTMGRP_IPV6_IFADDR | RTMGRP_NOTIFY | RTMGRP_LINK;
-    rv = bind(
-        netlink_fd_, reinterpret_cast<struct sockaddr*>(&addr), sizeof(addr));
-    if (rv < 0) {
-      PLOG(ERROR) << "Could not bind NETLINK socket";
-      AbortAndForceOnline();
-      return;
-    }
-  }
-
-  // Request dump of addresses.
-  struct sockaddr_nl peer = {};
-  peer.nl_family = AF_NETLINK;
-
-  struct {
-    struct nlmsghdr header;
-    struct rtgenmsg msg;
-  } request = {};
-
-  request.header.nlmsg_len = NLMSG_LENGTH(sizeof(request.msg));
-  request.header.nlmsg_type = RTM_GETADDR;
-  request.header.nlmsg_flags = NLM_F_REQUEST | NLM_F_DUMP;
-  request.header.nlmsg_pid = getpid();
-  request.msg.rtgen_family = AF_UNSPEC;
-
-  rv = HANDLE_EINTR(sendto(netlink_fd_, &request, request.header.nlmsg_len,
-                           0, reinterpret_cast<struct sockaddr*>(&peer),
-                           sizeof(peer)));
-  if (rv < 0) {
-    PLOG(ERROR) << "Could not send NETLINK request";
-    AbortAndForceOnline();
-    return;
-  }
-
-  // Consume pending message to populate the AddressMap, but don't notify.
-  // Sending another request without first reading responses results in EBUSY.
-  bool address_changed;
-  bool link_changed;
-  bool tunnel_changed;
-  ReadMessages(&address_changed, &link_changed, &tunnel_changed);
-
-  // Request dump of link state
-  request.header.nlmsg_type = RTM_GETLINK;
-
-  rv = HANDLE_EINTR(sendto(netlink_fd_, &request, request.header.nlmsg_len, 0,
-                           reinterpret_cast<struct sockaddr*>(&peer),
-                           sizeof(peer)));
-  if (rv < 0) {
-    PLOG(ERROR) << "Could not send NETLINK request";
-    AbortAndForceOnline();
-    return;
-  }
-
-  // Consume pending message to populate links_online_, but don't notify.
-  ReadMessages(&address_changed, &link_changed, &tunnel_changed);
-  {
-    AddressTrackerAutoLock lock(*this, connection_type_lock_);
-    connection_type_initialized_ = true;
-    connection_type_initialized_cv_.Broadcast();
-  }
-
-  if (tracking_) {
-    rv = base::MessageLoopCurrentForIO::Get()->WatchFileDescriptor(
-        netlink_fd_, true, base::MessagePumpForIO::WATCH_READ, &watcher_, this);
-    if (rv < 0) {
-      PLOG(ERROR) << "Could not watch NETLINK socket";
-      AbortAndForceOnline();
-      return;
-    }
-  }
+NOTIMPLEMENTED();
+AbortAndForceOnline();
 }
 
+#if !defined(OS_BSD)
 AddressTrackerLinux::AddressMap AddressTrackerLinux::GetAddressMap() const {
   AddressTrackerAutoLock lock(*this, address_map_lock_);
   return address_map_;
@@ -260,6 +176,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();
 }
+#endif // !OS_BSD
 
-AddressTrackerLinux::AddressMap AddressTrackerLinux::GetAddressMap() const {
-  AddressTrackerAutoLock lock(*this, address_map_lock_);
-  return address_map_;
-}
-
-std::unordered_set<int> AddressTrackerLinux::GetOnlineLinks() const {
-  AddressTrackerAutoLock lock(*this, online_links_lock_);
-  return online_links_;
-}
-
-bool AddressTrackerLinux::IsInterfaceIgnored(int interface_index) const {
-  if (ignored_interfaces_.empty())
-    return false;
-
-  char buf[IFNAMSIZ] = {0};
-  const char* interface_name = get_interface_name_(interface_index, buf);
-  return ignored_interfaces_.find(interface_name) != ignored_interfaces_.end();
-}
-
 NetworkChangeNotifier::ConnectionType
 AddressTrackerLinux::GetCurrentConnectionType() {
@@ -318,6 +235,7 @@ void AddressTrackerLinux::HandleMessage(char* buffer,
@@ -326,102 +136,7 @@ void AddressTrackerLinux::HandleMessage(char* buffer,
                                         bool* address_changed,
                                         bool* link_changed,
                                         bool* tunnel_changed) {
+#if !defined(OS_FREEBSD)
   DCHECK(buffer);
   for (struct nlmsghdr* header = reinterpret_cast<struct nlmsghdr*>(buffer);
        NLMSG_OK(header, length);
@@ -414,6 +332,10 @@ void AddressTrackerLinux::HandleMessage(char* buffer,
         break;
     }
   }
+#else  // !OS_FREEBSD
-            reinterpret_cast<struct nlmsgerr*>(NLMSG_DATA(header));
-        LOG(ERROR) << "Unexpected netlink error " << msg->error << ".";
-      } return;
-      case RTM_NEWADDR: {
-        IPAddress address;
-        bool really_deprecated;
-        struct ifaddrmsg* msg =
-            reinterpret_cast<struct ifaddrmsg*>(NLMSG_DATA(header));
-        if (IsInterfaceIgnored(msg->ifa_index))
-          break;
-        if (GetAddress(header, &address, &really_deprecated)) {
-          AddressTrackerAutoLock lock(*this, address_map_lock_);
-          // Routers may frequently (every few seconds) output the IPv6 ULA
-          // prefix which can cause the linux kernel to frequently output two
-          // back-to-back messages, one without the deprecated flag and one with
-          // the deprecated flag but both with preferred lifetimes of 0. Avoid
-          // interpretting this as an actual change by canonicalizing the two
-          // messages by setting the deprecated flag based on the preferred
-          // lifetime also.  http://crbug.com/268042
-          if (really_deprecated)
-            msg->ifa_flags |= IFA_F_DEPRECATED;
-          // Only indicate change if the address is new or ifaddrmsg info has
-          // changed.
-          auto it = address_map_.find(address);
-          if (it == address_map_.end()) {
-            address_map_.insert(it, std::make_pair(address, *msg));
-            *address_changed = true;
-          } else if (memcmp(&it->second, msg, sizeof(*msg))) {
-            it->second = *msg;
-            *address_changed = true;
-          }
-        }
-      } break;
-      case RTM_DELADDR: {
-        IPAddress address;
-        const struct ifaddrmsg* msg =
-            reinterpret_cast<struct ifaddrmsg*>(NLMSG_DATA(header));
-        if (IsInterfaceIgnored(msg->ifa_index))
-          break;
-        if (GetAddress(header, &address, NULL)) {
-          AddressTrackerAutoLock lock(*this, address_map_lock_);
-          if (address_map_.erase(address))
-            *address_changed = true;
-        }
-      } break;
-      case RTM_NEWLINK: {
-        const struct ifinfomsg* msg =
-            reinterpret_cast<struct ifinfomsg*>(NLMSG_DATA(header));
-        if (IsInterfaceIgnored(msg->ifi_index))
-          break;
-        if (IgnoreWirelessChange(header, msg)) {
-          VLOG(2) << "Ignoring RTM_NEWLINK message";
-          break;
-        }
-        if (!(msg->ifi_flags & IFF_LOOPBACK) && (msg->ifi_flags & IFF_UP) &&
-            (msg->ifi_flags & IFF_LOWER_UP) && (msg->ifi_flags & IFF_RUNNING)) {
-          AddressTrackerAutoLock lock(*this, online_links_lock_);
-          if (online_links_.insert(msg->ifi_index).second) {
-            *link_changed = true;
-            if (IsTunnelInterface(msg->ifi_index))
-              *tunnel_changed = true;
-          }
-        } else {
-          AddressTrackerAutoLock lock(*this, online_links_lock_);
-          if (online_links_.erase(msg->ifi_index)) {
-            *link_changed = true;
-            if (IsTunnelInterface(msg->ifi_index))
-              *tunnel_changed = true;
-          }
-        }
-      } break;
-      case RTM_DELLINK: {
-        const struct ifinfomsg* msg =
-            reinterpret_cast<struct ifinfomsg*>(NLMSG_DATA(header));
-        if (IsInterfaceIgnored(msg->ifi_index))
-          break;
-        AddressTrackerAutoLock lock(*this, online_links_lock_);
-        if (online_links_.erase(msg->ifi_index)) {
-          *link_changed = true;
-          if (IsTunnelInterface(msg->ifi_index))
-            *tunnel_changed = true;
-        }
-      } break;
-      default:
-        break;
-    }
-  }
+  NOTIMPLEMENTED();
+  AbortAndForceOnline();
+#endif // !OS_FREEBSD
 }
 
 void AddressTrackerLinux::OnFileCanReadWithoutBlocking() {
@@ -441,31 +363,7 @@ bool AddressTrackerLinux::IsTunnelInterfaceName(const 
 }
 
 void AddressTrackerLinux::UpdateCurrentConnectionType() {




--- src/3rdparty/chromium/net/base/address_tracker_linux.h.orig	2019-11-27 21:12:25 UTC
+++ src/3rdparty/chromium/net/base/address_tracker_linux.h
@@ -7,9 +7,6 @@
 #define NET_BASE_ADDRESS_TRACKER_LINUX_H_
 
 #include <sys/socket.h>  // Needed to include netlink.
+#if !defined(__FreeBSD__)
 // Mask superfluous definition of |struct net|. This is fixed in Linux 2.6.38.
-#define net net_kernel
-#include <linux/rtnetlink.h>
-#undef net
+#endif
 #include <stddef.h>
 
 #include <map>
@@ -34,8 +36,12 @@ namespace internal {
 class NET_EXPORT_PRIVATE AddressTrackerLinux
     : public base::MessagePumpForIO::FdWatcher {
  public:
+#if !defined(__FreeBSD__)
   typedef std::map<IPAddress, struct ifaddrmsg> AddressMap;
 
+#else
+  typedef void* AddressMap;
+#endif
   // Non-tracking version constructor: it takes a snapshot of the
   // current system configuration. Once Init() returns, the
   // configuration is available through GetOnlineLinks() and




--- src/3rdparty/chromium/net/http/http_auth_gssapi_posix.h.orig	2019-11-27 21:12:25 UTC
+++ src/3rdparty/chromium/net/http/http_auth_gssapi_posix.h
@@ -21,6 +21,9 @@
 #include <GSS/gssapi.h>
 #elif defined(OS_FREEBSD)
 #include <gssapi/gssapi.h>
+#ifndef GSS_C_DELEG_POLICY_FLAG
+#define GSS_C_DELEG_POLICY_FLAG 32768
+#endif
 #else
 #include <gssapi.h>
 #endif




--- src/3rdparty/chromium/net/http/http_network_session.cc.orig	2018-11-13 18:25:11 UTC
+++ src/3rdparty/chromium/net/http/http_network_session.cc
@@ -20,7 +20,9 @@
 #include "base/trace_event/memory_dump_request_args.h"
 #include "base/trace_event/process_memory_dump.h"
 #include "base/values.h"
+#if defined(USE_KERBEROS)
 #include "net/http/http_auth_handler_factory.h"
+#endif
 #include "net/http/http_response_body_drainer.h"
 #include "net/http/http_stream_factory.h"
 #include "net/http/url_security_manager.h"

Added Link Here

(-)b/www/qt5-webengine/files/patch-src_3rdparty_chromium_net_socket_udp__socket__posix.h (+11 lines)
1	--- src/3rdparty/chromium/net/socket/udp_socket_posix.h.orig 2019-11-27 21:12:25 UTC
2	+++ src/3rdparty/chromium/net/socket/udp_socket_posix.h
3	@@ -33,7 +33,7 @@
4
5	#if defined(__ANDROID__) && defined(__aarch64__)
6	#define HAVE_SENDMMSG 1
7	-#elif defined(OS_LINUX)
8	+#elif defined(OS_LINUX) \|\| defined(OS_BSD)
9	#define HAVE_SENDMMSG 1
10	#else
11	#define HAVE_SENDMMSG 0

Added Link Here

(-)b/www/qt5-webengine/files/patch-src_3rdparty_chromium_net_socket_unix__domain__client__socket__posix.cc (+11 lines)
1	--- src/3rdparty/chromium/net/socket/unix_domain_client_socket_posix.cc.orig 2019-11-27 21:12:25 UTC
2	+++ src/3rdparty/chromium/net/socket/unix_domain_client_socket_posix.cc
3	@@ -56,7 +56,7 @@ bool UnixDomainClientSocket::FillAddress(const std::st
4	return true;
5	}
6
7	-#if defined(OS_ANDROID) \|\| defined(OS_LINUX)
8	+#if defined(OS_ANDROID) \|\| defined(OS_LINUX) \|\| defined(OS_BSD)
9	// Convert the path given into abstract socket name. It must start with
10	// the '\0' character, so we are adding it. \|addr_len\| must specify the
11	// length of the structure exactly, as potentially the socket name may

Removed Link Here

(-)a/www/qt5-webengine/files/patch-src_3rdparty_chromium_net_third__party_quic_platform_impl_quic__ip__address__impl.cc (-10 lines)
1	--- src/3rdparty/chromium/net/third_party/quic/platform/impl/quic_ip_address_impl.cc.orig 2018-11-13 18:25:11 UTC
2	+++ src/3rdparty/chromium/net/third_party/quic/platform/impl/quic_ip_address_impl.cc
3	@@ -13,6 +13,7 @@
4	#include <ws2bth.h>
5	#elif defined(OS_POSIX) \|\| defined(OS_FUCHSIA)
6	#include <netinet/in.h>
7	+#include <sys/socket.h>
8	#endif
9
10	using std::string;




--- src/3rdparty/chromium/net/traffic_annotation/network_traffic_annotation.h.orig	2019-11-27 21:12:25 UTC
+++ src/3rdparty/chromium/net/traffic_annotation/network_traffic_annotation.h
@@ -356,7 +356,7 @@ struct MutablePartialNetworkTrafficAnnotationTag {
 }  // namespace net
 
 // Placeholder for unannotated usages.
-#if !defined(OS_WIN) && !defined(OS_LINUX) && !defined(OS_CHROMEOS)
+#if !defined(OS_WIN) && !defined(OS_LINUX) && !defined(OS_CHROMEOS) && !defined(OS_BSD)
 #define TRAFFIC_ANNOTATION_WITHOUT_PROTO(ANNOTATION_ID) \
   net::DefineNetworkTrafficAnnotation(ANNOTATION_ID, "No proto yet.")
 #endif
@@ -367,7 +367,7 @@ struct MutablePartialNetworkTrafficAnnotationTag {
 //
 // On Linux and Windows, use MISSING_TRAFFIC_ANNOTATION or
 // TRAFFIC_ANNOTATION_FOR_TESTS.
-#if (!defined(OS_WIN) && !defined(OS_LINUX)) || defined(OS_CHROMEOS)
+#if (!defined(OS_WIN) && !defined(OS_LINUX) && !defined(OS_BSD)) || defined(OS_CHROMEOS)
 #define NO_TRAFFIC_ANNOTATION_YET \
   net::DefineNetworkTrafficAnnotation("undefined", "Nothing here yet.")
 

Added Link Here

(-)b/www/qt5-webengine/files/patch-src_3rdparty_chromium_net_url__request_url__fetcher.cc (+11 lines)
1	--- src/3rdparty/chromium/net/url_request/url_fetcher.cc.orig 2019-11-27 21:12:25 UTC
2	+++ src/3rdparty/chromium/net/url_request/url_fetcher.cc
3	@@ -11,7 +11,7 @@ namespace net {
4
5	URLFetcher::~URLFetcher() = default;
6
7	-#if (!defined(OS_WIN) && !defined(OS_LINUX)) \|\| defined(OS_CHROMEOS)
8	+#if (!defined(OS_WIN) && !defined(OS_LINUX) && !defined(OS_BSD)) \|\| defined(OS_CHROMEOS)
9	// static
10	std::unique_ptr<URLFetcher> URLFetcher::Create(
11	const GURL& url,

Added Link Here

(-)b/www/qt5-webengine/files/patch-src_3rdparty_chromium_net_url__request_url__fetcher.h (+11 lines)
1	--- src/3rdparty/chromium/net/url_request/url_fetcher.h.orig 2019-11-27 21:12:25 UTC
2	+++ src/3rdparty/chromium/net/url_request/url_fetcher.h
3	@@ -113,7 +113,7 @@ class NET_EXPORT URLFetcher {
4	// The unannotated Create() methods are not available on desktop Linux +
5	// Windows. They are available on other platforms, since we only audit network
6	// annotations on Linux & Windows.
7	-#if (!defined(OS_WIN) && !defined(OS_LINUX)) \|\| defined(OS_CHROMEOS)
8	+#if (!defined(OS_WIN) && !defined(OS_LINUX) && !defined(OS_BSD)) \|\| defined(OS_CHROMEOS)
9	// \|url\| is the URL to send the request to. It must be valid.
10	// \|request_type\| is the type of request to make.
11	// \|d\| the object that will receive the callback on fetch completion.

Added Link Here

(-)b/www/qt5-webengine/files/patch-src_3rdparty_chromium_net_url__request_url__request__context.cc (+11 lines)
1	--- src/3rdparty/chromium/net/url_request/url_request_context.cc.orig 2019-11-27 21:12:25 UTC
2	+++ src/3rdparty/chromium/net/url_request/url_request_context.cc
3	@@ -89,7 +89,7 @@ const HttpNetworkSession::Context* URLRequestContext::
4	return &network_session->context();
5	}
6
7	-#if (!defined(OS_WIN) && !defined(OS_LINUX)) \|\| defined(OS_CHROMEOS)
8	+#if (!defined(OS_WIN) && !defined(OS_LINUX) && !defined(OS_BSD)) \|\| defined(OS_CHROMEOS)
9	std::unique_ptr<URLRequest> URLRequestContext::CreateRequest(
10	const GURL& url,
11	RequestPriority priority,

Added Link Here

(-)b/www/qt5-webengine/files/patch-src_3rdparty_chromium_net_url__request_url__request__context.h (+11 lines)
1	--- src/3rdparty/chromium/net/url_request/url_request_context.h.orig 2019-11-27 21:12:25 UTC
2	+++ src/3rdparty/chromium/net/url_request/url_request_context.h
3	@@ -90,7 +90,7 @@ class NET_EXPORT URLRequestContext
4	// session.
5	const HttpNetworkSession::Context* GetNetworkSessionContext() const;
6
7	-#if (!defined(OS_WIN) && !defined(OS_LINUX)) \|\| defined(OS_CHROMEOS)
8	+#if (!defined(OS_WIN) && !defined(OS_LINUX) && !defined(OS_BSD)) \|\| defined(OS_CHROMEOS)
9	// This function should not be used in Chromium, please use the version with
10	// NetworkTrafficAnnotationTag in the future.
11	//




--- src/3rdparty/chromium/pdf/pdfium/pdfium_engine.cc.orig	2019-11-27 21:12:25 UTC
+++ src/3rdparty/chromium/pdf/pdfium/pdfium_engine.cc
@@ -138,7 +138,7 @@ constexpr base::TimeDelta kMaxProgressivePaintTime =
 constexpr base::TimeDelta kMaxInitialProgressivePaintTime =
     base::TimeDelta::FromMilliseconds(250);
 
-#if defined(OS_LINUX)
+#if defined(OS_LINUX) || defined(OS_BSD)
 
 PP_Instance g_last_instance_id;
 
@@ -560,7 +560,7 @@ bool InitializeSDK() {
   config.m_v8EmbedderSlot = gin::kEmbedderPDFium;
   FPDF_InitLibraryWithConfig(&config);
 

+#if defined(OS_LINUX) || defined(OS_BSD)
   // Font loading doesn't work in the renderer sandbox in Linux.
   FPDF_SetSystemFontInfo(&g_font_info);
 #else
@@ -666,7 +666,7 @@ bool InitializeSDK() {
 
 void ShutdownSDK() {
   FPDF_DestroyLibrary();
-#if !defined(OS_LINUX)
+#if !defined(OS_LINUX) && !defined(OS_BSD)
   delete g_font_info;
 #endif
@@ -593,7 +593,7 @@ PDFiumEngine::PDFiumEngine(PDFEngine::Client* client, 
@@ -690,7 +690,7 @@ PDFiumEngine::PDFiumEngine(PDFEngine::Client* client, 
   IFSDK_PAUSE::user = nullptr;
   IFSDK_PAUSE::NeedToPauseNow = Pause_NeedToPauseNow;
 

   // PreviewModeClient does not know its pp::Instance.
   pp::Instance* instance = client_->GetPluginInstance();
   if (instance)
@@ -1045,7 +1045,7 @@ pp::Buffer_Dev PDFiumEngine::PrintPagesAsRasterPdf(
 
   KillFormFocus();
 

   g_last_instance_id = client_->GetPluginInstance()->pp_instance();
 #endif
 
@@ -2898,7 +2898,7 @@ bool PDFiumEngine::ContinuePaint(int progressive_index
   DCHECK(image_data);
 
   last_progressive_start_time_ = base::Time::Now();

   g_last_instance_id = client_->GetPluginInstance()->pp_instance();
 #endif
 
@@ -3368,7 +3368,7 @@ void PDFiumEngine::SetCurrentPage(int index) {
     FORM_DoPageAAction(old_page, form(), FPDFPAGE_AACTION_CLOSE);
   }
   most_visible_page_ = index;

Added Link Here

(-)b/www/qt5-webengine/files/patch-src_3rdparty_chromium_ppapi_proxy_flash__resource.cc (+11 lines)
1	--- src/3rdparty/chromium/ppapi/proxy/flash_resource.cc.orig 2019-11-27 21:12:25 UTC
2	+++ src/3rdparty/chromium/ppapi/proxy/flash_resource.cc
3	@@ -136,7 +136,7 @@ double FlashResource::GetLocalTimeZoneOffset(PP_Instan
4	// require filesystem access prohibited by the sandbox.
5	// TODO(shess): Figure out why OSX needs the access, the sandbox warmup should
6	// handle it. http://crbug.com/149006
7	-#if defined(OS_LINUX) \|\| defined(OS_MACOSX)
8	+#if defined(OS_LINUX) \|\| defined(OS_MACOSX) \|\| defined(OS_BSD)
9	int32_t result = SyncCall<PpapiPluginMsg_Flash_GetLocalTimeZoneOffsetReply>(
10	BROWSER,
11	PpapiHostMsg_Flash_GetLocalTimeZoneOffset(PPTimeToTime(t)),

Removed Link Here

(-)a/www/qt5-webengine/files/patch-src_3rdparty_chromium_services_catalog_store.cc (-10 lines)
1	--- src/3rdparty/chromium/services/catalog/store.cc.orig 2018-11-13 18:25:11 UTC
2	+++ src/3rdparty/chromium/services/catalog/store.cc
3	@@ -36,5 +36,7 @@ const char Store::kRequiredFilesKey_PlatformValue_MacO
4	const char Store::kRequiredFilesKey_PlatformValue_Android[] = "android";
5	// static
6	const char Store::kRequiredFilesKey_PlatformValue_Fuchsia[] = "fuchsia";
7	+// static
8	+const char Store::kRequiredFilesKey_PlatformValue_FreeBSD[] = "freebsd";
9
10	} // namespace catalog

Removed Link Here

(-)a/www/qt5-webengine/files/patch-src_3rdparty_chromium_services_catalog_store.h (-10 lines)
1	--- src/3rdparty/chromium/services/catalog/store.h.orig 2018-11-13 18:25:11 UTC
2	+++ src/3rdparty/chromium/services/catalog/store.h
3	@@ -36,6 +36,7 @@ class Store {
4	static const char kRequiredFilesKey_PlatformValue_MacOSX[];
5	static const char kRequiredFilesKey_PlatformValue_Android[];
6	static const char kRequiredFilesKey_PlatformValue_Fuchsia[];
7	+ static const char kRequiredFilesKey_PlatformValue_FreeBSD[];
8	};
9
10	} // namespace catalog




--- src/3rdparty/chromium/services/content/simple_browser/simple_browser_service.h.orig	2019-05-23 12:39:34 UTC
+++ src/3rdparty/chromium/services/content/simple_browser/simple_browser_service.h
@@ -16,7 +16,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
 
@@ -50,7 +50,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
 

Removed Link Here

(-)a/www/qt5-webengine/files/patch-src_3rdparty_chromium_services_device_device__service.h (-11 lines)
1	--- src/3rdparty/chromium/services/device/device_service.h.orig 2019-05-23 12:39:34 UTC
2	+++ src/3rdparty/chromium/services/device/device_service.h
3	@@ -198,7 +198,7 @@ class DeviceService : public service_manager::Service
4	#endif
5
6	#if (defined(OS_LINUX) && defined(USE_UDEV)) \|\| defined(OS_WIN) \|\| \
7	- defined(OS_MACOSX)
8	+ defined(OS_MACOSX) \|\| defined(OS_BSD)
9	// Requests for the SerialPortManager interface must be bound to
10	// \|serial_port_manager_\| on \|serial_port_manager_task_runner_\| and it will
11	// be destroyed on that sequence.

Added Link Here

(-)b/www/qt5-webengine/files/patch-src_3rdparty_chromium_services_device_usb_BUILD.gn (+11 lines)
1	--- src/3rdparty/chromium/services/device/usb/BUILD.gn.orig 2019-11-27 21:12:25 UTC
2	+++ src/3rdparty/chromium/services/device/usb/BUILD.gn
3	@@ -110,7 +110,7 @@ static_library("usb") {
4	]
5	}
6
7	- if (is_android \|\| is_chromeos \|\| is_linux) {
8	+ if ((is_android \|\| is_chromeos \|\| is_linux) && !is_bsd) {
9	sources += [
10	"usb_device_handle_usbfs.cc",
11	"usb_device_handle_usbfs.h",




--- src/3rdparty/chromium/services/network/network_context.cc.orig	2019-11-27 21:12:25 UTC
+++ src/3rdparty/chromium/services/network/network_context.cc
@@ -1737,7 +1737,7 @@ URLRequestContextOwner NetworkContext::ApplyContextPar
 #endif  // defined(USE_NSS_CERTS)
 
 #if defined(OS_ANDROID) || defined(OS_FUCHSIA) || \
-    (defined(OS_LINUX) && !defined(OS_CHROMEOS)) || defined(OS_MACOSX)
+    ((defined(OS_BSD) || defined(OS_LINUX)) && !defined(OS_CHROMEOS)) || defined(OS_MACOSX)
 #include "net/cert/cert_net_fetcher.h"
 #include "net/cert_net/cert_net_fetcher_impl.h"
 #endif
@@ -610,7 +610,7 @@ NetworkContext::~NetworkContext() {
 #endif
 
 #if defined(OS_ANDROID) || defined(OS_FUCHSIA) || \
-    (defined(OS_LINUX) && !defined(OS_CHROMEOS)) || defined(OS_MACOSX)
+    ((defined(OS_BSD) || defined(OS_LINUX)) && !defined(OS_CHROMEOS)) || defined(OS_MACOSX)
     net::ShutdownGlobalCertNetFetcher();
 #endif
   }
@@ -1700,7 +1700,7 @@ URLRequestContextOwner NetworkContext::ApplyContextPar
 
     net::CookieCryptoDelegate* crypto_delegate = nullptr;
     if (params_->enable_encrypted_cookies) {

       DCHECK(network_service_->os_crypt_config_set())
           << "NetworkService::SetCryptConfig must be called before creating a "
              "NetworkContext with encrypted cookies.";
@@ -2015,7 +2015,7 @@ URLRequestContextOwner NetworkContext::ApplyContextPar
     net::SetURLRequestContextForNSSHttpIO(result.url_request_context.get());
 #endif
 #if defined(OS_ANDROID) || defined(OS_FUCHSIA) || \
-    (defined(OS_LINUX) && !defined(OS_CHROMEOS)) || defined(OS_MACOSX)
+    ((defined(OS_BSD) || defined(OS_LINUX)) && !defined(OS_CHROMEOS)) || defined(OS_MACOSX)
     net::SetGlobalCertNetFetcher(
         net::CreateCertNetFetcher(result.url_request_context.get()));
 #endif




--- src/3rdparty/chromium/services/resource_coordinator/memory_instrumentation/queued_request_dispatcher.cc.orig	2019-11-27 21:12:25 UTC
+++ src/3rdparty/chromium/services/resource_coordinator/memory_instrumentation/queued_request_dispatcher.cc
@@ -43,7 +43,7 @@ namespace {
 uint32_t CalculatePrivateFootprintKb(const mojom::RawOSMemDump& os_dump,
                                      uint32_t shared_resident_kb) {
   DCHECK(os_dump.platform_private_footprint);
-#if defined(OS_LINUX) || defined(OS_ANDROID)
+#if defined(OS_LINUX) || defined(OS_ANDROID) || defined(OS_BSD)
   uint64_t rss_anon_bytes = os_dump.platform_private_footprint->rss_anon_bytes;
   uint64_t vm_swap_bytes = os_dump.platform_private_footprint->vm_swap_bytes;
   return (rss_anon_bytes + vm_swap_bytes) / 1024;
@@ -82,7 +82,7 @@ memory_instrumentation::mojom::OSMemDumpPtr CreatePubl
   os_dump->is_peak_rss_resettable = internal_os_dump.is_peak_rss_resettable;
   os_dump->private_footprint_kb =
       CalculatePrivateFootprintKb(internal_os_dump, shared_resident_kb);
-#if defined(OS_LINUX) || defined(OS_ANDROID)
+#if defined(OS_LINUX) || defined(OS_ANDROID) || defined(OS_BSD)
   os_dump->private_footprint_swap_kb =
       internal_os_dump.platform_private_footprint->vm_swap_bytes / 1024;
 #endif




--- src/3rdparty/chromium/services/resource_coordinator/public/cpp/memory_instrumentation/os_metrics.h.orig	2019-11-27 21:12:25 UTC
+++ src/3rdparty/chromium/services/resource_coordinator/public/cpp/memory_instrumentation/os_metrics.h
@@ -28,9 +28,9 @@ class COMPONENT_EXPORT(
                                     mojom::RawOSMemDump*);
   static std::vector<mojom::VmRegionPtr> GetProcessMemoryMaps(base::ProcessId);
 
-#if defined(OS_LINUX) || defined(OS_ANDROID)
+#if defined(OS_LINUX) || defined(OS_ANDROID) || defined(OS_BSD)
   static void SetProcSmapsForTesting(FILE*);
-#endif  // defined(OS_LINUX) || defined(OS_ANDROID)
+#endif  // defined(OS_LINUX) || defined(OS_ANDROID) || defined(OS_BSD)
 
  private:
   FRIEND_TEST_ALL_PREFIXES(OSMetricsTest, ParseProcSmaps);
@@ -44,7 +44,7 @@ class COMPONENT_EXPORT(
   static std::vector<mojom::VmRegionPtr> GetProcessModules(base::ProcessId);
 #endif
 
-#if defined(OS_LINUX) || defined(OS_ANDROID)
+#if defined(OS_LINUX) || defined(OS_ANDROID) || defined(OS_BSD)
   // Provides information on the dump state of resident pages.
   enum class MappedAndResidentPagesDumpState {
     // Access to /proc/<pid>/pagemap can be denied for android devices running
@@ -68,7 +68,7 @@ class COMPONENT_EXPORT(
   // TODO(chiniforooshan): move to /base/process/process_metrics_linux.cc after
   // making sure that peak RSS is useful.
   static size_t GetPeakResidentSetSize(base::ProcessId pid);
-#endif  // defined(OS_LINUX) || defined(OS_ANDROID)
+#endif  // defined(OS_LINUX) || defined(OS_ANDROID) || defined(OS_BSD)
 };
 
 }  // namespace memory_instrumentation




--- src/3rdparty/chromium/services/resource_coordinator/public/cpp/memory_instrumentation/os_metrics_linux.cc.orig	2019-11-27 21:12:25 UTC
+++ src/3rdparty/chromium/services/resource_coordinator/public/cpp/memory_instrumentation/os_metrics_linux.cc
@@ -24,8 +24,10 @@
 #include "build/build_config.h"
 #include "services/resource_coordinator/public/cpp/memory_instrumentation/os_metrics.h"
 

 
 namespace memory_instrumentation {
 
@@ -88,6 +90,7 @@ struct ModuleData {
 
 ModuleData GetMainModuleData() {
   ModuleData module_data;
+#if !defined(OS_BSD)
   Dl_info dl_info;
   if (dladdr(&__ehdr_start, &dl_info)) {
     base::debug::ElfBuildIdBuffer build_id;
@@ -98,6 +101,7 @@ ModuleData GetMainModuleData() {
       module_data.build_id = std::string(build_id, build_id_length);
     }
   }
+#endif
   return module_data;
 }
 
@@ -145,14 +149,14 @@ bool ParseSmapsHeader(const char* header_line,
   // Build ID is needed to symbolize heap profiles, and is generated only on
   // official builds. Build ID is only added for the current library (chrome)
   // since it is racy to read other libraries which can be unmapped any time.

 
   return res;
 }
@@ -241,6 +245,7 @@ bool OSMetrics::FillOSMemoryDump(base::ProcessId pid,
 // static
 bool OSMetrics::FillOSMemoryDump(base::ProcessId pid,
                                  mojom::RawOSMemDump* dump) {
   // TODO(chiniforooshan): There is no need to read both /statm and /status
   // files. Refactor to get everything from /status using ProcessMetric.
+#if !defined(OS_BSD)
   auto statm_file = GetProcPidDir(pid).Append("statm");
   auto autoclose = base::ScopedFD(open(statm_file.value().c_str(), O_RDONLY));
   int statm_fd = autoclose.get();
@@ -255,6 +260,10 @@ bool OSMetrics::FillOSMemoryDump(base::ProcessId pid,
 
   if (!success)
     return false;
+#else
+  uint64_t resident_pages = 0;
+  uint64_t shared_pages = 0;
+#endif
 
   auto process_metrics = CreateProcessMetrics(pid);
 
@@ -295,6 +304,10 @@ bool OSMetrics::FillOSMemoryDump(base::ProcessId pid,
 
 // static
 std::vector<VmRegionPtr> OSMetrics::GetProcessMemoryMaps(base::ProcessId pid) {
+#if defined(OS_BSD)
+  NOTIMPLEMENTED();
+  return std::vector<VmRegionPtr>();
+#else
   std::vector<VmRegionPtr> maps;
   uint32_t res = 0;
   if (g_proc_smaps_for_testing) {
@@ -312,6 +325,7 @@ std::vector<VmRegionPtr> OSMetrics::GetProcessMemoryMa
     return std::vector<VmRegionPtr>();
 
   return maps;
+#endif
 }
 
 // static
@@ -319,6 +333,10 @@ OSMetrics::MappedAndResidentPagesDumpState OSMetrics::
     const size_t start_address,
     const size_t end_address,
     std::vector<uint8_t>* accessed_pages_bitmap) {
+#if defined(OS_BSD)
+  NOTIMPLEMENTED();
+  return OSMetrics::MappedAndResidentPagesDumpState::kFailure;
+#else
   const char* kPagemap = "/proc/self/pagemap";
 
   base::ScopedFILE pagemap_file(fopen(kPagemap, "r"));
@@ -360,6 +378,7 @@ OSMetrics::MappedAndResidentPagesDumpState OSMetrics::
     }
   }
   return OSMetrics::MappedAndResidentPagesDumpState::kSuccess;
+#endif
 }
 
 // static

Removed Link Here

(-)a/www/qt5-webengine/files/patch-src_3rdparty_chromium_services_service__manager_runner_host_BUILD.gn (-11 lines)
1	--- src/3rdparty/chromium/services/service_manager/runner/host/BUILD.gn.orig 2018-11-13 18:25:11 UTC
2	+++ src/3rdparty/chromium/services/service_manager/runner/host/BUILD.gn
3	@@ -31,7 +31,7 @@ source_set("lib") {
4	"//mojo/public/cpp/system",
5	]
6
7	- if (is_linux) {
8	+ if (is_linux && !is_bsd) {
9	deps += [ "//sandbox/linux:sandbox_services" ]
10	}
11

Lines 1-4 Link Here

(-)b/www/qt5-webengine/files/patch-src_3rdparty_chromium_services_service__manager_zygote_zygote__linux.cc (-2 / +2 lines)
1	--- src/3rdparty/chromium/services/service_manager/zygote/zygote_linux.cc.orig 2018-11-13 18:25:11 UTC	1	--- src/3rdparty/chromium/services/service_manager/zygote/zygote_linux.cc.orig 2019-11-27 21:12:25 UTC
2	+++ src/3rdparty/chromium/services/service_manager/zygote/zygote_linux.cc	2	+++ src/3rdparty/chromium/services/service_manager/zygote/zygote_linux.cc
3	@@ -1,6 +1,7 @@	3	@@ -1,6 +1,7 @@
4	// Copyright (c) 2012 The Chromium Authors. All rights reserved.	4	// Copyright (c) 2012 The Chromium Authors. All rights reserved.
Lines 8-14 Link Here
8		8
9	#include "services/service_manager/zygote/zygote_linux.h"	9	#include "services/service_manager/zygote/zygote_linux.h"
10		10
11	@@ -664,3 +665,4 @@ bool Zygote::HandleGetSandboxStatus(int fd, base::Pick	11	@@ -657,3 +658,4 @@ bool Zygote::HandleGetSandboxStatus(int fd, base::Pick
12	}	12	}
13		13
14	} // namespace service_manager	14	} // namespace service_manager




--- src/3rdparty/chromium/services/video_capture/broadcasting_receiver.cc.orig	2019-11-27 21:12:25 UTC
+++ src/3rdparty/chromium/services/video_capture/broadcasting_receiver.cc
@@ -40,7 +40,7 @@ void CloneSharedBufferHandle(const mojo::ScopedSharedB
 void CloneSharedBufferToRawFileDescriptorHandle(
     const mojo::ScopedSharedBufferHandle& source,
     media::mojom::VideoBufferHandlePtr* target) {
-#if defined(OS_LINUX)
+#if defined(OS_LINUX) || defined(OS_BSD)
   media::SharedMemoryHandleProvider provider;
   provider.InitFromMojoHandle(
       source->Clone(mojo::SharedBufferHandle::AccessMode::READ_WRITE));
@@ -180,7 +180,7 @@ void BroadcastingReceiver::BufferContext::
     ConvertRawFileDescriptorToSharedBuffer() {
   DCHECK(buffer_handle_->is_shared_memory_via_raw_file_descriptor());
 
-#if defined(OS_LINUX)
+#if defined(OS_LINUX) || defined(OS_BSD)
   media::SharedMemoryHandleProvider provider;
   provider.InitAsReadOnlyFromRawFileDescriptor(
       std::move(buffer_handle_->get_shared_memory_via_raw_file_descriptor()




--- src/3rdparty/chromium/third_party/blink/renderer/BUILD.gn.orig	2019-11-27 21:12:25 UTC
+++ src/3rdparty/chromium/third_party/blink/renderer/BUILD.gn
@@ -45,8 +45,8 @@ config("inside_blink") {
       "-Wconversion",
       "-Wno-float-conversion",
       "-Wno-sign-conversion",
-      "-Wno-implicit-float-conversion",
-      "-Wno-implicit-int-conversion",
+#      "-Wno-implicit-float-conversion",
+#      "-Wno-implicit-int-conversion",
     ]
   }
 }

Lines 1-11 Link Here

(-)b/www/qt5-webengine/files/patch-src_3rdparty_chromium_third__party_blink_renderer_core_inspector_inspector__memory__agent.cc (-6 / +6 lines)
1	--- src/3rdparty/chromium/third_party/blink/renderer/core/inspector/inspector_memory_agent.cc.orig 2019-05-23 12:39:34 UTC	1	--- src/3rdparty/chromium/third_party/blink/renderer/core/inspector/inspector_memory_agent.cc.orig 2019-11-27 21:12:25 UTC
2	+++ src/3rdparty/chromium/third_party/blink/renderer/core/inspector/inspector_memory_agent.cc	2	+++ src/3rdparty/chromium/third_party/blink/renderer/core/inspector/inspector_memory_agent.cc
3	@@ -171,7 +171,7 @@ InspectorMemoryAgent::GetSamplingProfileById(uint32_t	3	@@ -184,7 +184,7 @@ InspectorMemoryAgent::GetSamplingProfileById(uint32_t
4		4
5	std::vector<std::string> InspectorMemoryAgent::Symbolize(	5	Vector<String> InspectorMemoryAgent::Symbolize(
6	const std::vector<void*>& addresses) {	6	const WebVector<void*>& addresses) {
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(alph): Move symbolization to the client.	9	// TODO(alph): Move symbolization to the client.
10	std::vector<void*> addresses_to_symbolize;	10	Vector<void*> addresses_to_symbolize;
11	for (void* address : addresses) {	11	for (size_t i = 0; i < addresses.size(); i++) {




--- src/3rdparty/chromium/third_party/blink/renderer/core/scroll/scrollbar_theme_aura.cc.orig	2019-11-27 21:12:25 UTC
+++ src/3rdparty/chromium/third_party/blink/renderer/core/scroll/scrollbar_theme_aura.cc
@@ -332,7 +332,7 @@ ScrollbarPart ScrollbarThemeAura::InvalidateOnThumbPos
 

   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
 

Lines 1-6 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-05-23 12:39:34 UTC	1	--- src/3rdparty/chromium/third_party/blink/renderer/platform/fonts/font_cache.cc.orig 2019-11-27 21:12:25 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	@@ -66,7 +66,7 @@ namespace blink {	3	@@ -76,7 +76,7 @@ static const char kColorEmojiLocale[] = "und-Zsye";
4		4
5	SkFontMgr* FontCache::static_font_manager_ = nullptr;	5	SkFontMgr* FontCache::static_font_manager_ = nullptr;
6		6
Lines 9-15 Link Here
9	float FontCache::device_scale_factor_ = 1.0;	9	float FontCache::device_scale_factor_ = 1.0;
10	#endif	10	#endif
11		11
12	@@ -89,7 +89,7 @@ FontCache::FontCache()	12	@@ -115,7 +115,7 @@ FontCache::FontCache()
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();




--- src/3rdparty/chromium/third_party/blink/renderer/platform/fonts/font_cache.h.orig	2019-11-27 21:12:25 UTC
+++ src/3rdparty/chromium/third_party/blink/renderer/platform/fonts/font_cache.h
@@ -154,7 +154,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_; }
@@ -215,7 +215,7 @@ class PLATFORM_EXPORT FontCache {
       const FontDescription&);
 #endif  // defined(OS_ANDROID)
 

+#if defined(OS_LINUX) || defined(OS_BSD)
   struct PlatformFallbackFont {
     String name;
     std::string filename;
@@ -227,7 +227,7 @@ class PLATFORM_EXPORT FontCache {
   static void GetFontForCharacter(UChar32,
                                   const char* preferred_locale,
                                   PlatformFallbackFont*);

 
   scoped_refptr<SimpleFontData> FontDataFromFontPlatformData(
       const FontPlatformData*,
@@ -299,12 +299,12 @@ class PLATFORM_EXPORT FontCache {
                                    const FontFaceCreationParams&,
                                    std::string& name);
 
-#if defined(OS_ANDROID) || defined(OS_LINUX)
+#if defined(OS_ANDROID) || defined(OS_LINUX) || defined(OS_BSD)
   static AtomicString GetFamilyNameForCharacter(SkFontMgr*,
                                                 UChar32,
                                                 const FontDescription&,
                                                 FontFallbackPriority);
-#endif  // defined(OS_ANDROID) || defined(OS_LINUX)
+#endif  // defined(OS_ANDROID) || defined(OS_LINUX) || defined(OS_BSD)
 
   scoped_refptr<SimpleFontData> FallbackOnStandardFontStyle(
       const FontDescription&,
@@ -336,7 +336,7 @@ class PLATFORM_EXPORT FontCache {
   bool is_test_font_mgr_ = false;
 #endif  // defined(OS_WIN)
 

Lines 1-8 Link Here

(-)b/www/qt5-webengine/files/patch-src_3rdparty_chromium_third__party_blink_renderer_platform_fonts_font__description.cc (-2 / +2 lines)
1	--- src/3rdparty/chromium/third_party/blink/renderer/platform/fonts/font_description.cc.orig 2019-05-23 12:39:34 UTC	1	--- src/3rdparty/chromium/third_party/blink/renderer/platform/fonts/font_description.cc.orig 2019-11-27 21:12:25 UTC
2	+++ src/3rdparty/chromium/third_party/blink/renderer/platform/fonts/font_description.cc	2	+++ src/3rdparty/chromium/third_party/blink/renderer/platform/fonts/font_description.cc
3	@@ -38,7 +38,7 @@	3	@@ -38,7 +38,7 @@
4	#include "third_party/blink/renderer/platform/wtf/text/atomic_string_hash.h"
5	#include "third_party/blink/renderer/platform/wtf/text/string_hash.h"	4	#include "third_party/blink/renderer/platform/wtf/text/string_hash.h"
		5	#include "third_party/blink/renderer/platform/wtf/text/string_hasher.h"
6		6
7	-#if defined(OS_LINUX) \|\| defined(OS_CHROMEOS)	7	-#if defined(OS_LINUX) \|\| defined(OS_CHROMEOS)
8	+#if defined(OS_LINUX) \|\| defined(OS_CHROMEOS) \|\| defined(OS_BSD)	8	+#if defined(OS_LINUX) \|\| defined(OS_CHROMEOS) \|\| defined(OS_BSD)




--- src/3rdparty/chromium/third_party/blink/renderer/platform/fonts/font_unique_name_lookup.cc.orig	2019-11-27 21:12:25 UTC
+++ src/3rdparty/chromium/third_party/blink/renderer/platform/fonts/font_unique_name_lookup.cc
@@ -8,7 +8,7 @@
 #if defined(OS_ANDROID)
 #include "third_party/blink/public/mojom/font_unique_name_lookup/font_unique_name_lookup.mojom-blink.h"
 #include "third_party/blink/renderer/platform/fonts/android/font_unique_name_lookup_android.h"
-#elif defined(OS_LINUX)
+#elif defined(OS_LINUX) || defined(OS_BSD)
 #include "third_party/blink/renderer/platform/fonts/linux/font_unique_name_lookup_linux.h"
 #elif defined(OS_WIN)
 #include "third_party/blink/renderer/platform/fonts/win/font_unique_name_lookup_win.h"
@@ -23,7 +23,7 @@ std::unique_ptr<FontUniqueNameLookup>
 FontUniqueNameLookup::GetPlatformUniqueNameLookup() {
 #if defined(OS_ANDROID)
   return std::make_unique<FontUniqueNameLookupAndroid>();




--- src/3rdparty/chromium/third_party/blink/renderer/platform/fonts/skia/font_cache_skia.cc.orig	2019-11-27 21:12:25 UTC
+++ src/3rdparty/chromium/third_party/blink/renderer/platform/fonts/skia/font_cache_skia.cc
@@ -59,7 +59,7 @@ AtomicString ToAtomicString(const SkString& str) {
   return AtomicString::FromUTF8(str.c_str(), str.size());
 }
 
-#if defined(OS_ANDROID) || defined(OS_LINUX)
+#if defined(OS_ANDROID) || defined(OS_LINUX) || defined(OS_BSD)
 // This function is called on android or when we are emulating android fonts on
 // linux and the embedder has overriden the default fontManager with
 // WebFontRendering::setSkiaFontMgr.
@@ -82,7 +82,7 @@ AtomicString FontCache::GetFamilyNameForCharacter(
   typeface->getFamilyName(&skia_family_name);
   return ToAtomicString(skia_family_name);
 }
-#endif  // defined(OS_ANDROID) || defined(OS_LINUX)
+#endif  // defined(OS_ANDROID) || defined(OS_LINUX) || defined(OS_BSD)
 
 void FontCache::PlatformInit() {}
 
@@ -227,7 +227,7 @@ sk_sp<SkTypeface> FontCache::CreateTypeface(
   }
 #endif
 

   // On linux if the fontManager has been overridden then we should be calling
   // the embedder provided font Manager rather than calling
   // SkTypeface::CreateFromName which may redirect the call to the default font
@@ -254,7 +254,7 @@ std::unique_ptr<FontPlatformData> FontCache::CreateFon
   std::string name;
 
   sk_sp<SkTypeface> typeface;
-#if defined(OS_ANDROID) || defined(OS_LINUX)
+#if defined(OS_ANDROID) || defined(OS_LINUX) || defined(OS_BSD)
   if (alternate_name == AlternateFontName::kLocalUniqueFace &&
       RuntimeEnabledFeatures::FontSrcLocalMatchingEnabled()) {
     typeface = CreateTypefaceFromUniqueName(creation_params);




--- src/3rdparty/chromium/third_party/blink/renderer/platform/graphics/graphics_context_test.cc.orig	2019-05-23 12:39:34 UTC
+++ src/3rdparty/chromium/third_party/blink/renderer/platform/graphics/graphics_context_test.cc
@@ -52,7 +52,7 @@ namespace blink {
   {                                                              \
     for (int y = opaqueRect.Y(); y < opaqueRect.MaxY(); ++y)     \
       for (int x = opaqueRect.X(); x < opaqueRect.MaxX(); ++x) { \
-        int alpha = *bitmap.getAddr32(x, y) >> 24;               \
+        int alpha = SkGetPackedA32(*bitmap.getAddr32(x, y));	 \
         EXPECT_EQ(255, alpha);                                   \
       }                                                          \
   }
@@ -61,12 +61,16 @@ namespace blink {
   {                                                           \
     for (int y = 0; y < bitmap.height(); ++y)                 \
       for (int x = 0; x < bitmap.width(); ++x) {              \
-        int alpha = *bitmap.getAddr32(x, y) >> 24;            \
+        int alpha = SkGetPackedA32(*bitmap.getAddr32(x, y));  \
         bool opaque = opaqueRect.Contains(x, y);              \
         EXPECT_EQ(opaque, alpha == 255);                      \
       }                                                       \
   }
 
+static inline uint32_t PackARGB32(uint32_t argb) {
+  return SkPackARGB32NoCheck(argb>>24, (argb<<8)>>24, (argb<<16)>>24, (argb<<24)>>24);
+}
+
 TEST(GraphicsContextTest, Recording) {
   SkBitmap bitmap;
   bitmap.allocN32Pixels(100, 100);
@@ -184,10 +188,10 @@ class GraphicsContextHighConstrastTest : public testin
 TEST_F(GraphicsContextHighConstrastTest, MAYBE_NoHighContrast) {
   DrawColorsToContext();
 
-  EXPECT_EQ(0xff000000, *bitmap_.getAddr32(0, 0));
-  EXPECT_EQ(0xffffffff, *bitmap_.getAddr32(1, 0));
-  EXPECT_EQ(0xffff0000, *bitmap_.getAddr32(2, 0));
-  EXPECT_EQ(0xff808080, *bitmap_.getAddr32(3, 0));
+  EXPECT_EQ(PackARGB32(0xff000000), *bitmap_.getAddr32(0, 0));
+  EXPECT_EQ(PackARGB32(0xffffffff), *bitmap_.getAddr32(1, 0));
+  EXPECT_EQ(PackARGB32(0xffff0000), *bitmap_.getAddr32(2, 0));
+  EXPECT_EQ(PackARGB32(0xff808080), *bitmap_.getAddr32(3, 0));
 }
 
 // TODO(crbug.com/850782): Reenable this.
@@ -205,10 +209,10 @@ TEST_F(GraphicsContextHighConstrastTest, MAYBE_HighCon
 
   DrawColorsToContext();
 
-  EXPECT_EQ(0xff000000, *bitmap_.getAddr32(0, 0));
-  EXPECT_EQ(0xffffffff, *bitmap_.getAddr32(1, 0));
-  EXPECT_EQ(0xffff0000, *bitmap_.getAddr32(2, 0));
-  EXPECT_EQ(0xff808080, *bitmap_.getAddr32(3, 0));
+  EXPECT_EQ(PackARGB32(0xff000000), *bitmap_.getAddr32(0, 0));
+  EXPECT_EQ(PackARGB32(0xffffffff), *bitmap_.getAddr32(1, 0));
+  EXPECT_EQ(PackARGB32(0xffff0000), *bitmap_.getAddr32(2, 0));
+  EXPECT_EQ(PackARGB32(0xff808080), *bitmap_.getAddr32(3, 0));
 }
 
 // Simple invert for testing. Each color component |c|
@@ -228,10 +232,10 @@ TEST_F(GraphicsContextHighConstrastTest, MAYBE_SimpleI
 
   DrawColorsToContext();
 
-  EXPECT_EQ(0xffffffff, *bitmap_.getAddr32(0, 0));
-  EXPECT_EQ(0xff000000, *bitmap_.getAddr32(1, 0));
-  EXPECT_EQ(0xff00ffff, *bitmap_.getAddr32(2, 0));
-  EXPECT_EQ(0xff7f7f7f, *bitmap_.getAddr32(3, 0));
+  EXPECT_EQ(PackARGB32(0xffffffff), *bitmap_.getAddr32(0, 0));
+  EXPECT_EQ(PackARGB32(0xff000000), *bitmap_.getAddr32(1, 0));
+  EXPECT_EQ(PackARGB32(0xff00ffff), *bitmap_.getAddr32(2, 0));
+  EXPECT_EQ(PackARGB32(0xff7f7f7f), *bitmap_.getAddr32(3, 0));
 }
 
 // Invert brightness (with gamma correction).
@@ -250,10 +254,10 @@ TEST_F(GraphicsContextHighConstrastTest, MAYBE_InvertB
 
   DrawColorsToContext();
 
-  EXPECT_EQ(0xffffffff, *bitmap_.getAddr32(0, 0));
-  EXPECT_EQ(0xff000000, *bitmap_.getAddr32(1, 0));
-  EXPECT_EQ(0xff00ffff, *bitmap_.getAddr32(2, 0));
-  EXPECT_EQ(0xffdddddd, *bitmap_.getAddr32(3, 0));
+  EXPECT_EQ(PackARGB32(0xffffffff), *bitmap_.getAddr32(0, 0));
+  EXPECT_EQ(PackARGB32(0xff000000), *bitmap_.getAddr32(1, 0));
+  EXPECT_EQ(PackARGB32(0xff00ffff), *bitmap_.getAddr32(2, 0));
+  EXPECT_EQ(PackARGB32(0xffdddddd), *bitmap_.getAddr32(3, 0));
 }
 
 // Invert lightness (in HSL space).
@@ -272,10 +276,10 @@ TEST_F(GraphicsContextHighConstrastTest, MAYBE_InvertL
 
   DrawColorsToContext();
 
-  EXPECT_EQ(0xffffffff, *bitmap_.getAddr32(0, 0));
-  EXPECT_EQ(0xff000000, *bitmap_.getAddr32(1, 0));
-  EXPECT_EQ(0xffff0000, *bitmap_.getAddr32(2, 0));
-  EXPECT_EQ(0xffdddddd, *bitmap_.getAddr32(3, 0));
+  EXPECT_EQ(PackARGB32(0xffffffff), *bitmap_.getAddr32(0, 0));
+  EXPECT_EQ(PackARGB32(0xff000000), *bitmap_.getAddr32(1, 0));
+  EXPECT_EQ(PackARGB32(0xffff0000), *bitmap_.getAddr32(2, 0));
+  EXPECT_EQ(PackARGB32(0xffdddddd), *bitmap_.getAddr32(3, 0));
 }
 
 // Invert lightness plus grayscale.
@@ -288,10 +292,10 @@ TEST_F(GraphicsContextHighConstrastTest, InvertLightne
 
   DrawColorsToContext();
 
-  EXPECT_EQ(0xffffffff, *bitmap_.getAddr32(0, 0));
-  EXPECT_EQ(0xff000000, *bitmap_.getAddr32(1, 0));
-  EXPECT_EQ(0xffe2e2e2, *bitmap_.getAddr32(2, 0));
-  EXPECT_EQ(0xffdddddd, *bitmap_.getAddr32(3, 0));
+  EXPECT_EQ(PackARGB32(0xffffffff), *bitmap_.getAddr32(0, 0));
+  EXPECT_EQ(PackARGB32(0xff000000), *bitmap_.getAddr32(1, 0));
+  EXPECT_EQ(PackARGB32(0xffe2e2e2), *bitmap_.getAddr32(2, 0));
+  EXPECT_EQ(PackARGB32(0xffdddddd), *bitmap_.getAddr32(3, 0));
 }
 
 // TODO(crbug.com/850782): Reenable this.
@@ -309,10 +313,10 @@ TEST_F(GraphicsContextHighConstrastTest, MAYBE_InvertL
 
   DrawColorsToContext();
 
-  EXPECT_EQ(0xffffffff, *bitmap_.getAddr32(0, 0));
-  EXPECT_EQ(0xff000000, *bitmap_.getAddr32(1, 0));
-  EXPECT_EQ(0xffff0000, *bitmap_.getAddr32(2, 0));
-  EXPECT_EQ(0xffeeeeee, *bitmap_.getAddr32(3, 0));
+  EXPECT_EQ(PackARGB32(0xffffffff), *bitmap_.getAddr32(0, 0));
+  EXPECT_EQ(PackARGB32(0xff000000), *bitmap_.getAddr32(1, 0));
+  EXPECT_EQ(PackARGB32(0xffff0000), *bitmap_.getAddr32(2, 0));
+  EXPECT_EQ(PackARGB32(0xffeeeeee), *bitmap_.getAddr32(3, 0));
 }
 
 }  // namespace blink

Removed Link Here

(-)a/www/qt5-webengine/files/patch-src_3rdparty_chromium_third__party_blink_renderer_platform_graphics_highcontrast_highcontrast__classifier.cc (-79 lines)
1	--- src/3rdparty/chromium/third_party/blink/renderer/platform/graphics/highcontrast/highcontrast_classifier.cc.orig 2019-05-23 12:39:34 UTC
2	+++ src/3rdparty/chromium/third_party/blink/renderer/platform/graphics/highcontrast/highcontrast_classifier.cc
3	@@ -1060,55 +1060,47 @@ void DequantizeMinFirst(const int32_t rank,
4
5	// -----------------------------------------------------------------------------
6	// CONSTANTS
7	-// Note that for now, endianness of the target machine needs to match that of
8	-// the one training was performed on.
9	// -----------------------------------------------------------------------------
10	const int32_t dnn_hiddenlayer_0_weights_part_0_shape[2] = {4, 10};
11	const union {
12	- uint8_t bytes[160];
13	float values[40];
14	} dnn_hiddenlayer_0_weights_part_0 = {{
15	- 0xbc, 0x22, 0x0a, 0xbf, 0xb4, 0x46, 0x8c, 0x3f, 0xba, 0x31, 0x34, 0xbe,
16	- 0x4c, 0x65, 0xdb, 0xbe, 0xf0, 0x54, 0x5e, 0xbe, 0xc1, 0x5d, 0xb3, 0x3f,
17	- 0xf4, 0xe6, 0x15, 0xbf, 0x05, 0xc6, 0x34, 0xbf, 0xc0, 0x37, 0x7e, 0xbd,
18	- 0x6c, 0x35, 0x0b, 0xbf, 0xca, 0x53, 0x26, 0xbf, 0x58, 0xb4, 0x87, 0x3f,
19	- 0x37, 0xee, 0x39, 0xbf, 0xda, 0xfa, 0xf9, 0xbe, 0x97, 0xc1, 0x06, 0xbf,
20	- 0xf9, 0x4e, 0x81, 0x3f, 0xb2, 0x44, 0x85, 0xbf, 0x7f, 0x98, 0x7c, 0x3d,
21	- 0x15, 0x26, 0xbc, 0xbe, 0x5c, 0x48, 0x05, 0x3f, 0xc8, 0xaa, 0xa1, 0xbd,
22	- 0x35, 0xb3, 0x43, 0xbe, 0xeb, 0x46, 0x91, 0x3f, 0x80, 0x71, 0xe3, 0x3c,
23	- 0xd1, 0x98, 0x79, 0x3f, 0x3c, 0xd0, 0x0d, 0xbf, 0x1e, 0x02, 0xd3, 0x3e,
24	- 0x5d, 0x4b, 0xa2, 0xbf, 0x68, 0xac, 0xaa, 0xbd, 0xf8, 0xe1, 0x75, 0x3e,
25	- 0x4a, 0x9c, 0x27, 0xbe, 0xf8, 0xae, 0xb2, 0xbe, 0x7f, 0x9d, 0x91, 0x3f,
26	- 0x1e, 0x8b, 0xa8, 0xbe, 0x35, 0x7e, 0xb2, 0x3f, 0xbe, 0x8c, 0xd3, 0xbe,
27	- 0xf9, 0xcd, 0xb5, 0x3f, 0xa1, 0x50, 0xaa, 0x3f, 0xe4, 0x6d, 0xdd, 0xbe,
28	- 0x0d, 0xce, 0xd3, 0xbe,
29	+ -0.539592504501343, 1.09590768814087, -0.175970941781998, -0.428507208824158,
30	+ -0.217120885848999, 1.40129864215851, -0.5855553150177, -0.706146538257599,
31	+ -0.0620648860931396, -0.543783903121948, -0.649716019630432, 1.06019115447998,
32	+ -0.726291120052338, -0.488241970539093, -0.526391446590424, 1.01022255420685,
33	+ -1.04115891456604, 0.0616688691079617, -0.367478042840958, 0.520635366439819,
34	+ -0.0789390206336975, -0.19111330807209, 1.13497674465179, 0.0277640819549561,
35	+ 0.974988043308258, -0.553958654403687, 0.412125527858734, -1.2679249048233,
36	+ -0.0833366513252258, 0.240119814872742, -0.163682132959366, -0.34899115562439,
37	+ 1.1376188993454, -0.329186379909515, 1.3944765329361, -0.413183152675629,
38	+ 1.42034828662872, 1.33058559894562, -0.432479023933411, -0.413681417703629
39	}};
40	const int32_t dnn_hiddenlayer_0_biases_part_0_shape[1] = {10};
41	const union {
42	- uint8_t bytes[40];
43	float values[10];
44	} dnn_hiddenlayer_0_biases_part_0 = {{
45	- 0x00, 0x00, 0x00, 0x00, 0xbf, 0x6a, 0x53, 0x3e, 0xd3, 0xc1,
46	- 0xd0, 0x3e, 0x00, 0x00, 0x00, 0x00, 0xb6, 0xd8, 0xc0, 0x3e,
47	- 0xca, 0xe7, 0x35, 0x3e, 0x23, 0xa5, 0x44, 0x3f, 0x61, 0xfd,
48	- 0xd2, 0x3e, 0x00, 0x00, 0x00, 0x00, 0xb6, 0xe0, 0x43, 0x3c,
49	+ 0.0, 0.206461891531944,
50	+ 0.407728761434555, 0.0,
51	+ 0.376653373241425, 0.177642017602921,
52	+ 0.76814478635788, 0.412089377641678,
53	+ 0.0, 0.0119554307311773
54	}};
55	const int32_t dnn_logits_biases_part_0_shape[1] = {1};
56	const union {
57	- uint8_t bytes[4];
58	float values[1];
59	} dnn_logits_biases_part_0 = {{
60	- 0x75, 0xca, 0xd7, 0xbe,
61	+ -0.421466499567032
62	}};
63	const int32_t dnn_logits_weights_part_0_shape[2] = {10, 1};
64	const union {
65	- uint8_t bytes[40];
66	float values[10];
67	} dnn_logits_weights_part_0 = {{
68	- 0x13, 0x12, 0x39, 0x3f, 0xf3, 0xa5, 0xc2, 0xbf, 0x81, 0x7f,
69	- 0xbe, 0x3f, 0xf8, 0x17, 0x26, 0x3e, 0xa4, 0x19, 0xa6, 0x3f,
70	- 0xf0, 0xc9, 0xb7, 0xbf, 0x6a, 0x99, 0xd2, 0x3f, 0x8a, 0x7d,
71	- 0xe9, 0x3f, 0x83, 0x9a, 0x3a, 0xbf, 0xf1, 0x6c, 0x08, 0x3e,
72	+ 0.722932040691376, -1.52068936824799,
73	+ 1.48826611042023, 0.162200808525085,
74	+ 1.29765748977661, -1.43585014343262,
75	+ 1.64530682563782, 1.82414364814758,
76	+ -0.728920161724091, 0.133228078484535
77	}};
78
79	} // anonymous namespace




--- src/3rdparty/chromium/third_party/blink/renderer/platform/heap/asm/BUILD.gn.orig	2019-05-23 12:39:34 UTC
+++ src/3rdparty/chromium/third_party/blink/renderer/platform/heap/asm/BUILD.gn
@@ -46,6 +46,10 @@ if (current_cpu == "x86" || current_cpu == "x64") {
       sources = [
         "SaveRegisters_mips64.S",
       ]
+    } else if (current_cpu == "ppc64") {
+      sources = [
+        "SaveRegisters_ppc64.S",
+      ]
     }
 
     if (current_cpu == "arm") {




--- src/3rdparty/chromium/third_party/blink/renderer/platform/heap/stack_frame_depth.cc.orig	2018-11-13 18:25:11 UTC
+++ src/3rdparty/chromium/third_party/blink/renderer/platform/heap/stack_frame_depth.cc
@@ -15,6 +15,11 @@
 extern "C" void* __libc_stack_end;  // NOLINT
 #endif
 
+#if defined(OS_FREEBSD)
+#include <sys/signal.h>
+#include <pthread_np.h>
+#endif
+
 namespace blink {
 
 static const char* g_avoid_optimization = nullptr;




--- src/3rdparty/chromium/third_party/blink/renderer/platform/image-decoders/bmp/bmp_image_reader.h.orig	2019-05-23 12:39:34 UTC
+++ src/3rdparty/chromium/third_party/blink/renderer/platform/image-decoders/bmp/bmp_image_reader.h
@@ -37,6 +37,7 @@
 #include "third_party/blink/renderer/platform/wtf/allocator.h"
 #include "third_party/blink/renderer/platform/wtf/cpu.h"
 #include "third_party/blink/renderer/platform/wtf/noncopyable.h"
+#include "base/sys_byteorder.h"
 
 namespace blink {
 
@@ -50,11 +51,11 @@ class PLATFORM_EXPORT BMPImageReader final {
   // Read a value from |buffer|, converting to an int assuming little
   // endianness
   static inline uint16_t ReadUint16(const char* buffer) {
-    return *reinterpret_cast<const uint16_t*>(buffer);
+    return base::ByteSwapToLE16(*reinterpret_cast<const uint16_t*>(buffer));
   }
 
   static inline uint32_t ReadUint32(const char* buffer) {
-    return *reinterpret_cast<const uint32_t*>(buffer);
+    return base::ByteSwapToLE32(*reinterpret_cast<const uint32_t*>(buffer));
   }
 
   // |parent| is the decoder that owns us.




--- src/3rdparty/chromium/third_party/blink/renderer/platform/image-decoders/webp/webp_image_decoder.cc.orig	2019-05-23 12:39:34 UTC
+++ src/3rdparty/chromium/third_party/blink/renderer/platform/image-decoders/webp/webp_image_decoder.cc
@@ -32,18 +32,20 @@
 #include "third_party/blink/renderer/platform/histogram.h"
 #include "third_party/skia/include/core/SkData.h"
 
-#if defined(ARCH_CPU_BIG_ENDIAN)
-#error Blink assumes a little-endian target.
-#endif
-
-#if SK_B32_SHIFT  // Output little-endian RGBA pixels (Android).
+#if SK_PMCOLOR_BYTE_ORDER(R, G, B, A)
 inline WEBP_CSP_MODE outputMode(bool hasAlpha) {
   return hasAlpha ? MODE_rgbA : MODE_RGBA;
 }
-#else  // Output little-endian BGRA pixels.
+#elif SK_PMCOLOR_BYTE_ORDER(B, G, R, A)
 inline WEBP_CSP_MODE outputMode(bool hasAlpha) {
   return hasAlpha ? MODE_bgrA : MODE_BGRA;
 }
+#elif SK_PMCOLOR_BYTE_ORDER(A, R, G, B)
+inline WEBP_CSP_MODE outputMode(bool hasAlpha) {
+  return hasAlpha ? MODE_Argb : MODE_ARGB;
+}
+#else
+#error Component order not supported by libwebp
 #endif
 
 namespace {




--- src/3rdparty/chromium/third_party/blink/renderer/platform/wtf/BUILD.gn.orig	2018-11-13 18:25:11 UTC
+++ src/3rdparty/chromium/third_party/blink/renderer/platform/wtf/BUILD.gn
@@ -276,8 +276,12 @@ jumbo_component("wtf") {
   if (is_android) {
     libs = [ "log" ]
   }
-  if (is_linux) {
+  if (is_linux && !is_bsd) {
     libs = [ "dl" ]
+  }
+
+  if (is_bsd) {
+    libs = [ "execinfo" ]
   }
 
   if (is_mac) {

Removed Link Here

(-)a/www/qt5-webengine/files/patch-src_3rdparty_chromium_third__party_blink_renderer_platform_wtf_assertions.cc (-11 lines)
1	--- src/3rdparty/chromium/third_party/blink/renderer/platform/wtf/assertions.cc.orig 2018-11-13 18:25:11 UTC
2	+++ src/3rdparty/chromium/third_party/blink/renderer/platform/wtf/assertions.cc
3	@@ -48,7 +48,7 @@
4	#include <windows.h>
5	#endif
6
7	-#if defined(OS_MACOSX) \|\| (defined(OS_LINUX) && !defined(__UCLIBC__))
8	+#if defined(OS_MACOSX) \|\| ((defined(OS_LINUX) \|\| defined(OS_BSD)) && !defined(__UCLIBC__))
9	#include <cxxabi.h>
10	#include <dlfcn.h>
11	#include <execinfo.h>

Removed Link Here

(-)a/www/qt5-webengine/files/patch-src_3rdparty_chromium_third__party_blink_renderer_platform_wtf_dtoa_utils.h (-11 lines)
1	--- src/3rdparty/chromium/third_party/blink/renderer/platform/wtf/dtoa/utils.h.orig 2019-05-23 12:39:34 UTC
2	+++ src/3rdparty/chromium/third_party/blink/renderer/platform/wtf/dtoa/utils.h
3	@@ -45,7 +45,7 @@
4	// disabled.)
5	// On Linux,x86 89255e-22 != Div_double(89255.0/1e22)
6	#if defined(_M_X64) \|\| defined(__x86_64__) \|\| defined(__ARMEL__) \|\| \
7	- defined(__aarch64__) \|\| defined(__MIPSEL__)
8	+ defined(__aarch64__) \|\| defined(__MIPSEL__) \|\| defined(__powerpc64__)
9	#define DOUBLE_CONVERSION_CORRECT_DOUBLE_OPERATIONS 1
10	#elif defined(_M_IX86) \|\| defined(__i386__)
11	#if defined(_WIN32)

Lines 1-6 Link Here

(-)b/www/qt5-webengine/files/patch-src_3rdparty_chromium_third__party_blink_renderer_platform_wtf_stack__util.cc (-2 / +2 lines)
1	--- src/3rdparty/chromium/third_party/blink/renderer/platform/wtf/stack_util.cc.orig 2018-11-13 18:25:11 UTC	1	--- src/3rdparty/chromium/third_party/blink/renderer/platform/wtf/stack_util.cc.orig 2019-11-27 21:12:25 UTC
2	+++ src/3rdparty/chromium/third_party/blink/renderer/platform/wtf/stack_util.cc	2	+++ src/3rdparty/chromium/third_party/blink/renderer/platform/wtf/stack_util.cc
3	@@ -16,6 +16,11 @@	3	@@ -17,6 +17,11 @@
4	extern "C" void* __libc_stack_end; // NOLINT	4	extern "C" void* __libc_stack_end; // NOLINT
5	#endif	5	#endif
6		6




--- src/3rdparty/chromium/third_party/blink/renderer/platform/wtf/threading.cc.orig	2019-05-23 12:39:34 UTC
+++ src/3rdparty/chromium/third_party/blink/renderer/platform/wtf/threading.cc
@@ -17,12 +17,16 @@
 #error Blink does not support threading on your platform.
 #endif
 
-#if defined(OS_LINUX)
+#if defined(OS_LINUX) || defined(OS_BSD)
 #include <sys/syscall.h>
 #elif defined(OS_ANDROID)
 #include <sys/types.h>
 #endif
 
+#if defined(OS_BSD)
+#include <pthread_np.h>
+#endif
+
 namespace WTF {
 
 // Current thread identity
@@ -38,6 +42,8 @@ ThreadIdentifier CurrentThreadSyscall() {
   return syscall(__NR_gettid);
 #elif defined(OS_ANDROID)
   return gettid();
+#elif defined(OS_BSD)
+  return pthread_getthreadid_np();
 #else
   return reinterpret_cast<uintptr_t>(pthread_self());
 #endif




--- src/3rdparty/chromium/third_party/boringssl/src/crypto/fipsmodule/modes/gcm.c.orig	2019-05-23 12:39:34 UTC
+++ src/3rdparty/chromium/third_party/boringssl/src/crypto/fipsmodule/modes/gcm.c
@@ -78,6 +78,14 @@
     }                                                                 \
   } while (0)
 
+#ifdef OPENSSL_BIGENDIAN
+#define GCM_bswap4(x) (x)
+#define GCM_bswap8(x) (x)
+#else
+#define GCM_bswap4 CRYPTO_bswap4
+#define GCM_bswap8 CRYPTO_bswap8
+#endif
+
 // kSizeTWithoutLower4Bits is a mask that can be used to zero the lower four
 // bits of a |size_t|.
 static const size_t kSizeTWithoutLower4Bits = (size_t) -16;
@@ -173,8 +181,8 @@ static void gcm_gmult_4bit(uint64_t Xi[2], const u128 
     Z.lo ^= Htable[nlo].lo;
   }
 
-  Xi[0] = CRYPTO_bswap8(Z.hi);
-  Xi[1] = CRYPTO_bswap8(Z.lo);
+  Xi[0] = GCM_bswap8(Z.hi);
+  Xi[1] = GCM_bswap8(Z.lo);
 }
 
 // Streamed gcm_mult_4bit, see CRYPTO_gcm128_[en|de]crypt for
@@ -233,8 +241,8 @@ static void gcm_ghash_4bit(uint64_t Xi[2], const u128 
       Z.lo ^= Htable[nlo].lo;
     }
 
-    Xi[0] = CRYPTO_bswap8(Z.hi);
-    Xi[1] = CRYPTO_bswap8(Z.lo);
+    Xi[0] = GCM_bswap8(Z.hi);
+    Xi[1] = GCM_bswap8(Z.lo);
   } while (inp += 16, len -= 16);
 }
 #else  // GHASH_ASM
@@ -360,8 +368,8 @@ void CRYPTO_ghash_init(gmult_func *out_mult, ghash_fun
   OPENSSL_memcpy(H.c, gcm_key, 16);
 
   // H is stored in host byte order
-  H.u[0] = CRYPTO_bswap8(H.u[0]);
-  H.u[1] = CRYPTO_bswap8(H.u[1]);
+  H.u[0] = GCM_bswap8(H.u[0]);
+  H.u[1] = GCM_bswap8(H.u[1]);
 
   OPENSSL_memcpy(out_key, H.c, 16);
 
@@ -474,15 +482,15 @@ void CRYPTO_gcm128_setiv(GCM128_CONTEXT *ctx, const AE
       GCM_MUL(ctx, Yi);
     }
     len0 <<= 3;
-    ctx->Yi.u[1] ^= CRYPTO_bswap8(len0);
+    ctx->Yi.u[1] ^= GCM_bswap8(len0);
 
     GCM_MUL(ctx, Yi);
-    ctr = CRYPTO_bswap4(ctx->Yi.d[3]);
+    ctr = GCM_bswap4(ctx->Yi.d[3]);
   }
 
   (*ctx->gcm_key.block)(ctx->Yi.c, ctx->EK0.c, key);
   ++ctr;
-  ctx->Yi.d[3] = CRYPTO_bswap4(ctr);
+  ctx->Yi.d[3] = GCM_bswap4(ctr);
 }
 
 int CRYPTO_gcm128_aad(GCM128_CONTEXT *ctx, const uint8_t *aad, size_t len) {
@@ -580,7 +588,7 @@ int CRYPTO_gcm128_encrypt(GCM128_CONTEXT *ctx, const A
     ctx->ares = 0;
   }
 
-  ctr = CRYPTO_bswap4(ctx->Yi.d[3]);
+  ctr = GCM_bswap4(ctx->Yi.d[3]);
 
   n = ctx->mres;
   if (n) {
@@ -602,7 +610,7 @@ int CRYPTO_gcm128_encrypt(GCM128_CONTEXT *ctx, const A
       if (n == 0) {
         (*block)(ctx->Yi.c, ctx->EKi.c, key);
         ++ctr;
-        ctx->Yi.d[3] = CRYPTO_bswap4(ctr);
+        ctx->Yi.d[3] = GCM_bswap4(ctr);
       }
       ctx->Xi.c[n] ^= out[i] = in[i] ^ ctx->EKi.c[n];
       n = (n + 1) % 16;
@@ -621,7 +629,7 @@ int CRYPTO_gcm128_encrypt(GCM128_CONTEXT *ctx, const A
     while (j) {
       (*block)(ctx->Yi.c, ctx->EKi.c, key);
       ++ctr;
-      ctx->Yi.d[3] = CRYPTO_bswap4(ctr);
+      ctx->Yi.d[3] = GCM_bswap4(ctr);
       for (size_t i = 0; i < 16; i += sizeof(size_t)) {
         store_word_le(out + i,
                       load_word_le(in + i) ^ ctx->EKi.t[i / sizeof(size_t)]);
@@ -638,7 +646,7 @@ int CRYPTO_gcm128_encrypt(GCM128_CONTEXT *ctx, const A
     while (len >= 16) {
       (*block)(ctx->Yi.c, ctx->EKi.c, key);
       ++ctr;
-      ctx->Yi.d[3] = CRYPTO_bswap4(ctr);
+      ctx->Yi.d[3] = GCM_bswap4(ctr);
       for (size_t i = 0; i < 16; i += sizeof(size_t)) {
         store_word_le(out + i,
                       load_word_le(in + i) ^ ctx->EKi.t[i / sizeof(size_t)]);
@@ -653,7 +661,7 @@ int CRYPTO_gcm128_encrypt(GCM128_CONTEXT *ctx, const A
   while (len >= 16) {
     (*block)(ctx->Yi.c, ctx->EKi.c, key);
     ++ctr;
-    ctx->Yi.d[3] = CRYPTO_bswap4(ctr);
+    ctx->Yi.d[3] = GCM_bswap4(ctr);
     for (size_t i = 0; i < 16; i += sizeof(size_t)) {
       size_t tmp = load_word_le(in + i) ^ ctx->EKi.t[i / sizeof(size_t)];
       store_word_le(out + i, tmp);
@@ -668,7 +676,7 @@ int CRYPTO_gcm128_encrypt(GCM128_CONTEXT *ctx, const A
   if (len) {
     (*block)(ctx->Yi.c, ctx->EKi.c, key);
     ++ctr;
-    ctx->Yi.d[3] = CRYPTO_bswap4(ctr);
+    ctx->Yi.d[3] = GCM_bswap4(ctr);
     while (len--) {
       ctx->Xi.c[n] ^= out[n] = in[n] ^ ctx->EKi.c[n];
       ++n;
@@ -707,7 +715,7 @@ int CRYPTO_gcm128_decrypt(GCM128_CONTEXT *ctx, const A
     ctx->ares = 0;
   }
 
-  ctr = CRYPTO_bswap4(ctx->Yi.d[3]);
+  ctr = GCM_bswap4(ctx->Yi.d[3]);
 
   n = ctx->mres;
   if (n) {
@@ -732,7 +740,7 @@ int CRYPTO_gcm128_decrypt(GCM128_CONTEXT *ctx, const A
       if (n == 0) {
         (*block)(ctx->Yi.c, ctx->EKi.c, key);
         ++ctr;
-        ctx->Yi.d[3] = CRYPTO_bswap4(ctr);
+        ctx->Yi.d[3] = GCM_bswap4(ctr);
       }
       c = in[i];
       out[i] = c ^ ctx->EKi.c[n];
@@ -754,7 +762,7 @@ int CRYPTO_gcm128_decrypt(GCM128_CONTEXT *ctx, const A
     while (j) {
       (*block)(ctx->Yi.c, ctx->EKi.c, key);
       ++ctr;
-      ctx->Yi.d[3] = CRYPTO_bswap4(ctr);
+      ctx->Yi.d[3] = GCM_bswap4(ctr);
       for (size_t i = 0; i < 16; i += sizeof(size_t)) {
         store_word_le(out + i,
                       load_word_le(in + i) ^ ctx->EKi.t[i / sizeof(size_t)]);
@@ -771,7 +779,7 @@ int CRYPTO_gcm128_decrypt(GCM128_CONTEXT *ctx, const A
     while (len >= 16) {
       (*block)(ctx->Yi.c, ctx->EKi.c, key);
       ++ctr;
-      ctx->Yi.d[3] = CRYPTO_bswap4(ctr);
+      ctx->Yi.d[3] = GCM_bswap4(ctr);
       for (size_t i = 0; i < 16; i += sizeof(size_t)) {
         store_word_le(out + i,
                       load_word_le(in + i) ^ ctx->EKi.t[i / sizeof(size_t)]);
@@ -785,7 +793,7 @@ int CRYPTO_gcm128_decrypt(GCM128_CONTEXT *ctx, const A
   while (len >= 16) {
     (*block)(ctx->Yi.c, ctx->EKi.c, key);
     ++ctr;
-    ctx->Yi.d[3] = CRYPTO_bswap4(ctr);
+    ctx->Yi.d[3] = GCM_bswap4(ctr);
     for (size_t i = 0; i < 16; i += sizeof(size_t)) {
       size_t c = load_word_le(in + i);
       store_word_le(out + i, c ^ ctx->EKi.t[i / sizeof(size_t)]);
@@ -800,7 +808,7 @@ int CRYPTO_gcm128_decrypt(GCM128_CONTEXT *ctx, const A
   if (len) {
     (*block)(ctx->Yi.c, ctx->EKi.c, key);
     ++ctr;
-    ctx->Yi.d[3] = CRYPTO_bswap4(ctr);
+    ctx->Yi.d[3] = GCM_bswap4(ctr);
     while (len--) {
       uint8_t c = in[n];
       ctx->Xi.c[n] ^= c;
@@ -866,13 +874,13 @@ int CRYPTO_gcm128_encrypt_ctr32(GCM128_CONTEXT *ctx, c
   }
 #endif
 
-  ctr = CRYPTO_bswap4(ctx->Yi.d[3]);
+  ctr = GCM_bswap4(ctx->Yi.d[3]);
 
 #if defined(GHASH)
   while (len >= GHASH_CHUNK) {
     (*stream)(in, out, GHASH_CHUNK / 16, key, ctx->Yi.c);
     ctr += GHASH_CHUNK / 16;
-    ctx->Yi.d[3] = CRYPTO_bswap4(ctr);
+    ctx->Yi.d[3] = GCM_bswap4(ctr);
     GHASH(ctx, out, GHASH_CHUNK);
     out += GHASH_CHUNK;
     in += GHASH_CHUNK;
@@ -885,7 +893,7 @@ int CRYPTO_gcm128_encrypt_ctr32(GCM128_CONTEXT *ctx, c
 
     (*stream)(in, out, j, key, ctx->Yi.c);
     ctr += (unsigned int)j;
-    ctx->Yi.d[3] = CRYPTO_bswap4(ctr);
+    ctx->Yi.d[3] = GCM_bswap4(ctr);
     in += i;
     len -= i;
 #if defined(GHASH)
@@ -904,7 +912,7 @@ int CRYPTO_gcm128_encrypt_ctr32(GCM128_CONTEXT *ctx, c
   if (len) {
     (*ctx->gcm_key.block)(ctx->Yi.c, ctx->EKi.c, key);
     ++ctr;
-    ctx->Yi.d[3] = CRYPTO_bswap4(ctr);
+    ctx->Yi.d[3] = GCM_bswap4(ctr);
     while (len--) {
       ctx->Xi.c[n] ^= out[n] = in[n] ^ ctx->EKi.c[n];
       ++n;
@@ -970,14 +978,14 @@ int CRYPTO_gcm128_decrypt_ctr32(GCM128_CONTEXT *ctx, c
   }
 #endif
 
-  ctr = CRYPTO_bswap4(ctx->Yi.d[3]);
+  ctr = GCM_bswap4(ctx->Yi.d[3]);
 
 #if defined(GHASH)
   while (len >= GHASH_CHUNK) {
     GHASH(ctx, in, GHASH_CHUNK);
     (*stream)(in, out, GHASH_CHUNK / 16, key, ctx->Yi.c);
     ctr += GHASH_CHUNK / 16;
-    ctx->Yi.d[3] = CRYPTO_bswap4(ctr);
+    ctx->Yi.d[3] = GCM_bswap4(ctr);
     out += GHASH_CHUNK;
     in += GHASH_CHUNK;
     len -= GHASH_CHUNK;
@@ -1003,7 +1011,7 @@ int CRYPTO_gcm128_decrypt_ctr32(GCM128_CONTEXT *ctx, c
 #endif
     (*stream)(in, out, j, key, ctx->Yi.c);
     ctr += (unsigned int)j;
-    ctx->Yi.d[3] = CRYPTO_bswap4(ctr);
+    ctx->Yi.d[3] = GCM_bswap4(ctr);
     out += i;
     in += i;
     len -= i;
@@ -1011,7 +1019,7 @@ int CRYPTO_gcm128_decrypt_ctr32(GCM128_CONTEXT *ctx, c
   if (len) {
     (*ctx->gcm_key.block)(ctx->Yi.c, ctx->EKi.c, key);
     ++ctr;
-    ctx->Yi.d[3] = CRYPTO_bswap4(ctr);
+    ctx->Yi.d[3] = GCM_bswap4(ctr);
     while (len--) {
       uint8_t c = in[n];
       ctx->Xi.c[n] ^= c;
@@ -1036,8 +1044,8 @@ int CRYPTO_gcm128_finish(GCM128_CONTEXT *ctx, const ui
     GCM_MUL(ctx, Xi);
   }
 
-  alen = CRYPTO_bswap8(alen);
-  clen = CRYPTO_bswap8(clen);
+  alen = GCM_bswap8(alen);
+  clen = GCM_bswap8(clen);
 
   ctx->Xi.u[0] ^= alen;
   ctx->Xi.u[1] ^= clen;

Lines 1-6 Link Here

(-)b/www/qt5-webengine/files/patch-src_3rdparty_chromium_third__party_boringssl_src_third__party_fiat_curve25519.c (-2 / +2 lines)
1	--- src/3rdparty/chromium/third_party/boringssl/src/third_party/fiat/curve25519.c.orig 2019-05-23 12:39:34 UTC	1	--- src/3rdparty/chromium/third_party/boringssl/src/third_party/fiat/curve25519.c.orig 2019-11-27 21:12:25 UTC
2	+++ src/3rdparty/chromium/third_party/boringssl/src/third_party/fiat/curve25519.c	2	+++ src/3rdparty/chromium/third_party/boringssl/src/third_party/fiat/curve25519.c
3	@@ -3032,9 +3032,14 @@ int ED25519_verify(const uint8_t *message, size_t mess	3	@@ -1964,9 +1964,14 @@ int ED25519_verify(const uint8_t *message, size_t mess
4	UINT64_C(0x1000000000000000),	4	UINT64_C(0x1000000000000000),
5	};	5	};
6	for (size_t i = 3;; i--) {	6	for (size_t i = 3;; i--) {




--- src/3rdparty/chromium/third_party/boringssl/src/third_party/fiat/p256.c.orig	2019-05-23 12:39:34 UTC
+++ src/3rdparty/chromium/third_party/boringssl/src/third_party/fiat/p256.c
@@ -882,12 +882,24 @@ static void fe_tobytes(uint8_t out[NBYTES], const fe i
   }
 }
 
+#ifdef OPENSSL_BIGENDIAN
+static void fe_tobytes_be(uint8_t out[NBYTES], const fe in) {
+  for (int i = 0; i<NBYTES; i++) {
+    out[i ^ (BN_BYTES-1)] = (uint8_t)(in[i/sizeof(in[0])] >> (8*(i%sizeof(in[0]))));
+  }
+}
+#endif
+
 static void fe_frombytes(fe out, const uint8_t in[NBYTES]) {
   for (int i = 0; i<NLIMBS; i++) {
     out[i] = 0;
   }
   for (int i = 0; i<NBYTES; i++) {
+#ifdef OPENSSL_BIGENDIAN
+    out[i/sizeof(out[0])] |= ((limb_t)in[i ^ (BN_BYTES-1)]) << (8*(i%sizeof(out[0])));
+#else
     out[i/sizeof(out[0])] |= ((limb_t)in[i]) << (8*(i%sizeof(out[0])));
+#endif
   }
 }
 
@@ -906,7 +918,11 @@ static void fe_to_generic(EC_FELEM *out, const fe in) 
   OPENSSL_STATIC_ASSERT(
       256 / 8 == sizeof(BN_ULONG) * ((256 + BN_BITS2 - 1) / BN_BITS2),
       "fe_tobytes leaves bytes uninitialized");
+#ifdef OPENSSL_BIGENDIAN
+  fe_tobytes_be(out->bytes, in);
+#else
   fe_tobytes(out->bytes, in);
+#endif
 }
 
 // fe_inv calculates |out| = |in|^{-1}
@@ -1524,7 +1540,11 @@ static char get_bit(const uint8_t *in, int i) {
   if (i < 0 || i >= 256) {
     return 0;
   }
+#ifdef OPENSSL_BIGENDIAN
+  return (in[(i >> 3) ^ (sizeof(BN_ULONG)-1)] >> (i & 7)) & 1;
+#else
   return (in[i >> 3] >> (i & 7)) & 1;
+#endif
 }
 
 // Interleaved point multiplication using precomputed point multiples: The




--- src/3rdparty/chromium/third_party/nasm/config/config-linux.h.orig	2019-11-27 21:12:25 UTC
+++ src/3rdparty/chromium/third_party/nasm/config/config-linux.h
@@ -117,7 +117,7 @@
 #define HAVE_ACCESS 1
 
 /* Define to 1 if you have the `canonicalize_file_name' function. */
-#define HAVE_CANONICALIZE_FILE_NAME 1
+/* #undef HAVE_CANONICALIZE_FILE_NAME */
 
 /* Define to 1 if you have the `cpu_to_le16' intrinsic function. */
 /* #undef HAVE_CPU_TO_LE16 */
@@ -161,7 +161,7 @@
 #define HAVE_DECL_STRSEP 1
 
 /* Define to 1 if you have the <endian.h> header file. */
-#define HAVE_ENDIAN_H 1
+/* #undef HAVE_ENDIAN_H */
 
 /* Define to 1 if you have the `faccessat' function. */
 #define HAVE_FACCESSAT 1
@@ -322,7 +322,7 @@
 #define HAVE_SYSCONF 1
 
 /* Define to 1 if you have the <sys/endian.h> header file. */
-/* #undef HAVE_SYS_ENDIAN_H */
+#define HAVE_SYS_ENDIAN_H 1
 
 /* Define to 1 if you have the <sys/mman.h> header file. */
 #define HAVE_SYS_MMAN_H 1

Added Link Here

(-)b/www/qt5-webengine/files/patch-src_3rdparty_chromium_third__party_pdfium_core_fxcrt_cfx__datetime.cpp (+11 lines)
1	--- src/3rdparty/chromium/third_party/pdfium/core/fxcrt/cfx_datetime.cpp.orig 2019-11-27 21:12:25 UTC
2	+++ src/3rdparty/chromium/third_party/pdfium/core/fxcrt/cfx_datetime.cpp
3	@@ -9,7 +9,7 @@
4	#include "build/build_config.h"
5	#include "core/fxcrt/fx_system.h"
6
7	-#if defined(OS_ANDROID) \|\| defined(OS_LINUX) \|\| defined(OS_MACOSX) \|\| \
8	+#if defined(OS_ANDROID) \|\| defined(OS_LINUX) \|\| defined(OS_MACOSX) \|\| defined(OS_BSD) \|\| \
9	defined(OS_ASMJS) \|\| defined(__wasm__)
10	#include <sys/time.h>
11	#include <time.h>




--- src/3rdparty/chromium/third_party/pdfium/core/fxcrt/fx_system.h.orig	2019-11-27 21:12:25 UTC
+++ src/3rdparty/chromium/third_party/pdfium/core/fxcrt/fx_system.h
@@ -26,7 +26,7 @@
 #define _FX_PLATFORM_ _FX_PLATFORM_WINDOWS_
 #elif defined(_WIN64)
 #define _FX_OS_ _FX_OS_WIN64_
 #define _FX_PLATFORM_ _FX_PLATFORM_WINDOWS_
-#elif defined(__linux__)
+#elif defined(__linux__) || defined(__FreeBSD__)
 #define _FX_OS_ _FX_OS_LINUX_
 #define _FX_PLATFORM_ _FX_PLATFORM_LINUX_
 #elif defined(__APPLE__)
 #define _FX_PLATFORM_ _FX_PLATFORM_APPLE_

Added Link Here

(-)b/www/qt5-webengine/files/patch-src_3rdparty_chromium_third__party_pdfium_third__party_base_allocator_partition__allocator_page__allocator.cc (+11 lines)
1	--- src/3rdparty/chromium/third_party/pdfium/third_party/base/allocator/partition_allocator/page_allocator.cc.orig 2019-11-27 21:12:25 UTC
2	+++ src/3rdparty/chromium/third_party/pdfium/third_party/base/allocator/partition_allocator/page_allocator.cc
3	@@ -117,7 +117,7 @@ void* AllocPages(void* address,
4	uintptr_t align_base_mask = ~align_offset_mask;
5	DCHECK(!(reinterpret_cast<uintptr_t>(address) & align_offset_mask));
6
7	-#if defined(OS_LINUX) && defined(ARCH_CPU_64_BITS)
8	+#if (defined(OS_LINUX) \|\| defined(OS_BSD)) && defined(ARCH_CPU_64_BITS)
9	// On 64 bit Linux, we may need to adjust the address space limit for
10	// guarded allocations.
11	if (length >= kMinimumGuardedMemorySize) {




--- src/3rdparty/chromium/third_party/pdfium/third_party/base/allocator/partition_allocator/page_allocator_internals_posix.h.orig	2019-11-27 21:12:25 UTC
+++ src/3rdparty/chromium/third_party/pdfium/third_party/base/allocator/partition_allocator/page_allocator_internals_posix.h
@@ -13,7 +13,7 @@
 #if defined(OS_MACOSX)
 #include <mach/mach.h>
 #endif
-#if defined(OS_LINUX)
+#if defined(OS_LINUX) || defined(OS_BSD)
 #include <sys/resource.h>
 
 #include <algorithm>
@@ -48,7 +48,7 @@ int GetAccessFlags(PageAccessibilityConfiguration acce
   }
 }
 
-#if defined(OS_LINUX) && defined(ARCH_CPU_64_BITS)
+#if (defined(OS_LINUX) || defined(OS_BSD)) && defined(ARCH_CPU_64_BITS)
 
 // Multiple guarded memory regions may exceed the process address space limit.
 // This function will raise or lower the limit by |amount|.
@@ -68,7 +68,7 @@ bool AdjustAddressSpaceLimit(int64_t amount) {
 // schemes that reduce that to 4 GiB.
 constexpr size_t kMinimumGuardedMemorySize = 1ULL << 32;  // 4 GiB
 
-#endif  // defined(OS_LINUX) && defined(ARCH_CPU_64_BITS)
+#endif  // (defined(OS_LINUX) || defined(OS_BSD)) && defined(ARCH_CPU_64_BITS)
 
 void* SystemAllocPagesInternal(void* hint,
                                size_t length,
@@ -134,7 +134,7 @@ void SetSystemPagesAccessInternal(
 void FreePagesInternal(void* address, size_t length) {
   CHECK(!munmap(address, length));
 
-#if defined(OS_LINUX) && defined(ARCH_CPU_64_BITS)
+#if (defined(OS_LINUX) || defined(OS_BSD)) && defined(ARCH_CPU_64_BITS)
   // Restore the address space limit.
   if (length >= kMinimumGuardedMemorySize) {
     CHECK(AdjustAddressSpaceLimit(-base::checked_cast<int64_t>(length)));




--- src/3rdparty/chromium/third_party/pdfium/xfa/fgas/font/cfx_fontsourceenum_file.cpp.orig	2019-11-27 21:12:25 UTC
+++ src/3rdparty/chromium/third_party/pdfium/xfa/fgas/font/cfx_fontsourceenum_file.cpp
@@ -16,9 +16,8 @@ constexpr char kFolderSeparator = '/';
 
 constexpr const char* kFontFolders[] = {
 #if _FX_PLATFORM_ == _FX_PLATFORM_LINUX_
-    "/usr/share/fonts",
-    "/usr/share/X11/fonts/Type1",
-    "/usr/share/X11/fonts/TTF",
+    "/usr/local/share/fonts/Type1",
+    "/usr/local/share/fonts/TTF",
     "/usr/local/share/fonts",
 #elif defined(OS_MACOSX)
     "~/Library/Fonts",
 #elif _FX_PLATFORM_ == _FX_PLATFORM_ANDROID_




--- src/3rdparty/chromium/third_party/perfetto/include/perfetto/base/build_config.h.orig	2019-11-27 21:12:25 UTC
+++ src/3rdparty/chromium/third_party/perfetto/include/perfetto/base/build_config.h
@@ -28,6 +28,7 @@
 #define PERFETTO_BUILDFLAG_DEFINE_PERFETTO_OS_ANDROID() 1
 #define PERFETTO_BUILDFLAG_DEFINE_PERFETTO_OS_MACOSX() 0
 #define PERFETTO_BUILDFLAG_DEFINE_PERFETTO_OS_LINUX() 0
+#define PERFETTO_BUILDFLAG_DEFINE_PERFETTO_OS_FREEBSD() 0
 #define PERFETTO_BUILDFLAG_DEFINE_PERFETTO_OS_WIN() 0
 #define PERFETTO_BUILDFLAG_DEFINE_PERFETTO_OS_WASM() 0
 #define PERFETTO_BUILDFLAG_DEFINE_PERFETTO_OS_FUCHSIA() 0
@@ -35,13 +36,15 @@
 #define PERFETTO_BUILDFLAG_DEFINE_PERFETTO_OS_ANDROID() 0
 #define PERFETTO_BUILDFLAG_DEFINE_PERFETTO_OS_MACOSX() 1
 #define PERFETTO_BUILDFLAG_DEFINE_PERFETTO_OS_LINUX() 0
+#define PERFETTO_BUILDFLAG_DEFINE_PERFETTO_OS_FREEBSD() 0
 #define PERFETTO_BUILDFLAG_DEFINE_PERFETTO_OS_WIN() 0
 #define PERFETTO_BUILDFLAG_DEFINE_PERFETTO_OS_WASM() 0
 #define PERFETTO_BUILDFLAG_DEFINE_PERFETTO_OS_FUCHSIA() 0
-#elif defined(__linux__)
+#elif defined(__linux__) || defined(__FreeBSD__)
 #define PERFETTO_BUILDFLAG_DEFINE_PERFETTO_OS_ANDROID() 0
 #define PERFETTO_BUILDFLAG_DEFINE_PERFETTO_OS_MACOSX() 0
 #define PERFETTO_BUILDFLAG_DEFINE_PERFETTO_OS_LINUX() 1
+#define PERFETTO_BUILDFLAG_DEFINE_PERFETTO_OS_FREEBSD() 1
 #define PERFETTO_BUILDFLAG_DEFINE_PERFETTO_OS_WIN() 0
 #define PERFETTO_BUILDFLAG_DEFINE_PERFETTO_OS_WASM() 0
 #define PERFETTO_BUILDFLAG_DEFINE_PERFETTO_OS_FUCHSIA() 0
@@ -49,6 +52,7 @@
 #define PERFETTO_BUILDFLAG_DEFINE_PERFETTO_OS_ANDROID() 0
 #define PERFETTO_BUILDFLAG_DEFINE_PERFETTO_OS_MACOSX() 0
 #define PERFETTO_BUILDFLAG_DEFINE_PERFETTO_OS_LINUX() 0
+#define PERFETTO_BUILDFLAG_DEFINE_PERFETTO_OS_FREEBSD() 0
 #define PERFETTO_BUILDFLAG_DEFINE_PERFETTO_OS_WIN() 1
 #define PERFETTO_BUILDFLAG_DEFINE_PERFETTO_OS_WASM() 0
 #define PERFETTO_BUILDFLAG_DEFINE_PERFETTO_OS_FUCHSIA() 0
@@ -56,6 +60,7 @@
 #define PERFETTO_BUILDFLAG_DEFINE_PERFETTO_OS_ANDROID() 0
 #define PERFETTO_BUILDFLAG_DEFINE_PERFETTO_OS_MACOSX() 0
 #define PERFETTO_BUILDFLAG_DEFINE_PERFETTO_OS_LINUX() 0
+#define PERFETTO_BUILDFLAG_DEFINE_PERFETTO_OS_FREEBSD() 0
 #define PERFETTO_BUILDFLAG_DEFINE_PERFETTO_OS_WIN() 0
 #define PERFETTO_BUILDFLAG_DEFINE_PERFETTO_OS_WASM() 1
 #define PERFETTO_BUILDFLAG_DEFINE_PERFETTO_OS_FUCHSIA() 0
@@ -63,6 +68,7 @@
 #define PERFETTO_BUILDFLAG_DEFINE_PERFETTO_OS_ANDROID() 0
 #define PERFETTO_BUILDFLAG_DEFINE_PERFETTO_OS_MACOSX() 0
 #define PERFETTO_BUILDFLAG_DEFINE_PERFETTO_OS_LINUX() 0
+#define PERFETTO_BUILDFLAG_DEFINE_PERFETTO_OS_FREEBSD() 0
 #define PERFETTO_BUILDFLAG_DEFINE_PERFETTO_OS_WIN() 0
 #define PERFETTO_BUILDFLAG_DEFINE_PERFETTO_OS_WASM() 0
 #define PERFETTO_BUILDFLAG_DEFINE_PERFETTO_OS_FUCHSIA() 1




--- src/3rdparty/chromium/third_party/perfetto/include/perfetto/ext/base/event_fd.h.orig	2019-11-27 21:12:25 UTC
+++ src/3rdparty/chromium/third_party/perfetto/include/perfetto/ext/base/event_fd.h
@@ -20,8 +20,8 @@
 #include "perfetto/base/build_config.h"
 #include "perfetto/ext/base/scoped_file.h"
 
-#if PERFETTO_BUILDFLAG(PERFETTO_OS_LINUX) || \
-    PERFETTO_BUILDFLAG(PERFETTO_OS_ANDROID)
+#if !PERFETTO_BUILDFLAG(PERFETTO_OS_FREEBSD) && (PERFETTO_BUILDFLAG(PERFETTO_OS_LINUX) || \
+    PERFETTO_BUILDFLAG(PERFETTO_OS_ANDROID))
 #define PERFETTO_USE_EVENTFD() 1
 #else
 #define PERFETTO_USE_EVENTFD() 0




--- src/3rdparty/chromium/third_party/perfetto/include/perfetto/ext/base/thread_utils.h.orig	2019-11-27 21:12:25 UTC
+++ src/3rdparty/chromium/third_party/perfetto/include/perfetto/ext/base/thread_utils.h
@@ -33,6 +33,9 @@
 #include <sys/types.h>
 #include <unistd.h>
 #endif
+#if PERFETTO_BUILDFLAG(PERFETTO_OS_FREEBSD)
+#include <pthread_np.h>
+#endif
 
 namespace perfetto {
 namespace base {
@@ -41,6 +44,11 @@ namespace base {
 using PlatformThreadID = pid_t;
 inline PlatformThreadID GetThreadId() {
   return gettid();
+}
+#elif PERFETTO_BUILDFLAG(PERFETTO_OS_FREEBSD)
+using PlatformThreadID = int;
+inline PlatformThreadID GetThreadId() {
+  return pthread_getthreadid_np();
 }
 #elif PERFETTO_BUILDFLAG(PERFETTO_OS_LINUX)
 using PlatformThreadID = pid_t;




--- src/3rdparty/chromium/third_party/perfetto/include/perfetto/ext/base/time.h.orig	2019-11-27 21:12:25 UTC
+++ src/3rdparty/chromium/third_party/perfetto/include/perfetto/ext/base/time.h
@@ -123,6 +123,9 @@ inline TimeNanos GetTimeInternalNs(clockid_t clk_id) {
 // Return ns from boot. Conversely to GetWallTimeNs, this clock counts also time
 // during suspend (when supported).
 inline TimeNanos GetBootTimeNs() {
+#if PERFETTO_BUILDFLAG(PERFETTO_OS_FREEBSD)
+  return GetTimeInternalNs(kWallTimeClockSource);
+#else
   // Determine if CLOCK_BOOTTIME is available on the first call.
   static const clockid_t kBootTimeClockSource = [] {
     struct timespec ts = {};
@@ -130,6 +133,7 @@ inline TimeNanos GetBootTimeNs() {
     return res == 0 ? CLOCK_BOOTTIME : kWallTimeClockSource;
   }();
   return GetTimeInternalNs(kBootTimeClockSource);
+#endif
 }
 
 inline TimeNanos GetWallTimeNs() {

Lines 1-6 Link Here

(-)b/www/qt5-webengine/files/patch-src_3rdparty_chromium_third__party_perfetto_include_perfetto_ext_base_utils.h (-4 / +4 lines)
1	--- src/3rdparty/chromium/third_party/perfetto/include/perfetto/base/utils.h.orig 2019-05-23 12:39:34 UTC	1	--- src/3rdparty/chromium/third_party/perfetto/include/perfetto/ext/base/utils.h.orig 2019-11-27 21:12:25 UTC
2	+++ src/3rdparty/chromium/third_party/perfetto/include/perfetto/base/utils.h	2	+++ src/3rdparty/chromium/third_party/perfetto/include/perfetto/ext/base/utils.h
3	@@ -22,6 +22,7 @@	3	@@ -23,6 +23,7 @@
4	#include <errno.h>	4	#include <errno.h>
5	#include <stddef.h>	5	#include <stddef.h>
6	#include <stdlib.h>	6	#include <stdlib.h>
Lines 8-14 Link Here
8	#if !PERFETTO_BUILDFLAG(PERFETTO_OS_WIN)	8	#if !PERFETTO_BUILDFLAG(PERFETTO_OS_WIN)
9	#include <sys/types.h>	9	#include <sys/types.h>
10	#endif	10	#endif
11	@@ -91,7 +92,7 @@ struct FreeDeleter {	11	@@ -72,7 +73,7 @@ struct FreeDeleter {
12		12
13	template <typename T>	13	template <typename T>
14	constexpr T AssumeLittleEndian(T value) {	14	constexpr T AssumeLittleEndian(T value) {




--- src/3rdparty/chromium/third_party/perfetto/src/base/unix_socket.cc.orig	2019-11-27 21:12:25 UTC
+++ src/3rdparty/chromium/third_party/perfetto/src/base/unix_socket.cc
@@ -523,7 +523,8 @@ void UnixSocket::DoConnect(const std::string& socket_n
 
 void UnixSocket::ReadPeerCredentials() {
 #if PERFETTO_BUILDFLAG(PERFETTO_OS_LINUX) || \
-    PERFETTO_BUILDFLAG(PERFETTO_OS_ANDROID)
+    PERFETTO_BUILDFLAG(PERFETTO_OS_ANDROID) || \
+    PERFETTO_BUILDFLAG(PERFETTO_OS_FREEBSD)
   struct ucred user_cred;
   socklen_t len = sizeof(user_cred);
   int fd = sock_raw_.fd();




--- src/3rdparty/chromium/third_party/perfetto/src/protozero/proto_decoder.cc.orig	2019-11-27 21:12:25 UTC
+++ src/3rdparty/chromium/third_party/perfetto/src/protozero/proto_decoder.cc
@@ -28,7 +28,8 @@ namespace protozero {
 using namespace proto_utils;
 
 #if __BYTE_ORDER__ != __ORDER_LITTLE_ENDIAN__
-#error Unimplemented for big endian archs.
+#define BYTE_SWAP_TO_LE32(x) __builtin_bswap32(x)
+#define BYTE_SWAP_TO_LE64(x) __builtin_bswap64(x)
 #endif
 
 namespace {




--- src/3rdparty/chromium/third_party/perfetto/src/tracing/core/tracing_service_impl.cc.orig	2019-11-27 21:12:25 UTC
+++ src/3rdparty/chromium/third_party/perfetto/src/tracing/core/tracing_service_impl.cc
@@ -2136,7 +2136,8 @@ void TracingServiceImpl::SnapshotClocks(std::vector<Tr
   protos::ClockSnapshot* clock_snapshot = packet.mutable_clock_snapshot();
 
 #if !PERFETTO_BUILDFLAG(PERFETTO_OS_MACOSX) && \
-    !PERFETTO_BUILDFLAG(PERFETTO_OS_WIN)
+    !PERFETTO_BUILDFLAG(PERFETTO_OS_WIN) && \
+    !PERFETTO_BUILDFLAG(PERFETTO_OS_FREEBSD)
   struct {
     clockid_t id;
     protos::ClockSnapshot::Clock::Type type;




--- src/3rdparty/chromium/third_party/skia/include/core/SkPostConfig.h.orig	2019-05-23 12:39:34 UTC
+++ src/3rdparty/chromium/third_party/skia/include/core/SkPostConfig.h
@@ -40,12 +40,6 @@
 #  error "must define either SK_CPU_LENDIAN or SK_CPU_BENDIAN"
 #endif
 
-#if defined(SK_CPU_BENDIAN) && !defined(I_ACKNOWLEDGE_SKIA_DOES_NOT_SUPPORT_BIG_ENDIAN)
-    #error "The Skia team is not endian-savvy enough to support big-endian CPUs."
-    #error "If you still want to use Skia,"
-    #error "please define I_ACKNOWLEDGE_SKIA_DOES_NOT_SUPPORT_BIG_ENDIAN."
-#endif
-
 /**
  * Ensure the port has defined all of SK_X32_SHIFT, or none of them.
  */

Removed Link Here

(-)a/www/qt5-webengine/files/patch-src_3rdparty_chromium_third__party_skia_src_codec_SkCodecPriv.h (-10 lines)
1	--- src/3rdparty/chromium/third_party/skia/src/codec/SkCodecPriv.h.orig 2019-05-23 12:39:34 UTC
2	+++ src/3rdparty/chromium/third_party/skia/src/codec/SkCodecPriv.h
3	@@ -14,6 +14,7 @@
4	#include "SkEncodedOrigin.h"
5	#include "SkImageInfo.h"
6	#include "SkTypes.h"
7	+#include "SkEndian.h"
8
9	#ifdef SK_PRINT_CODEC_MESSAGES
10	#define SkCodecPrintf SkDebugf




--- src/3rdparty/chromium/third_party/skia/src/opts/SkRasterPipeline_opts.h.orig	2019-10-27 17:19:53 UTC
+++ src/3rdparty/chromium/third_party/skia/src/opts/SkRasterPipeline_opts.h
@@ -729,7 +729,10 @@ SI F approx_powf(F x, F y) {
 }
 
 SI F from_half(U16 h) {
-#if defined(SK_CPU_ARM64) && !defined(SK_BUILD_FOR_GOOGLE3)  // Temporary workaround for some Google3 builds.
+#if defined(SK_CPU_ARM64) && !defined(SK_BUILD_FOR_GOOGLE3) && defined(__aarch64__)  // Required to build on FreeBSD aarch64
+    return vcvt_f32_f16(h);
+
+#elif defined(SK_CPU_ARM64) && !defined(SK_BUILD_FOR_GOOGLE3) // Temporary workaround for some Google3 builds.
     __fp16 fp16;
     memcpy(&fp16, &h, sizeof(U16));
     return float(fp16);
@@ -751,7 +754,10 @@ SI F from_half(U16 h) {
 }
 
 SI U16 to_half(F f) {
-#if defined(SK_CPU_ARM64) && !defined(SK_BUILD_FOR_GOOGLE3)  // Temporary workaround for some Google3 builds.
+#if defined(SK_CPU_ARM64) && !defined(SK_BUILD_FOR_GOOGLE3) && defined(__aarch64__) // Required to build on FreeBSD aarch64
+    return vcvt_f16_f32(f);
+
+#elif defined(SK_CPU_ARM64) && !defined(SK_BUILD_FOR_GOOGLE3)  // Temporary workaround for some Google3 builds.
     __fp16 fp16 = __fp16(f);
     U16 u16;
     memcpy(&u16, &fp16, sizeof(U16));
@@ -954,10 +954,17 @@ SI void from_4444(U16 _4444, F* r, F* g, F* b, F* a) {
     *a = cast(wide & (15<< 0)) * (1.0f / (15<< 0));
 }
 SI void from_8888(U32 _8888, F* r, F* g, F* b, F* a) {
+#ifdef SK_CPU_BENDIAN
+    *r = cast((_8888 >> 24)       ) * (1/255.0f);
+    *g = cast((_8888 >> 16) & 0xff) * (1/255.0f);
+    *b = cast((_8888 >>  8) & 0xff) * (1/255.0f);
+    *a = cast((_8888      ) & 0xff) * (1/255.0f);
+#else
     *r = cast((_8888      ) & 0xff) * (1/255.0f);
     *g = cast((_8888 >>  8) & 0xff) * (1/255.0f);
     *b = cast((_8888 >> 16) & 0xff) * (1/255.0f);
     *a = cast((_8888 >> 24)       ) * (1/255.0f);
+#endif
 }
 SI void from_1010102(U32 rgba, F* r, F* g, F* b, F* a) {
     *r = cast((rgba      ) & 0x3ff) * (1/1023.0f);
@@ -1284,10 +1291,17 @@ STAGE(srcover_rgba_8888, const SkRasterPipeline_Memory
     auto ptr = ptr_at_xy<uint32_t>(ctx, dx,dy);
 
     U32 dst = load<U32>(ptr, tail);
+#ifdef SK_CPU_BENDIAN
+    dr = cast((dst >> 24)       );
+    dg = cast((dst >> 16) & 0xff);
+    db = cast((dst >>  8) & 0xff);
+    da = cast((dst      ) & 0xff);
+#else
     dr = cast((dst      ) & 0xff);
     dg = cast((dst >>  8) & 0xff);
     db = cast((dst >> 16) & 0xff);
     da = cast((dst >> 24)       );
+#endif
     // {dr,dg,db,da} are in [0,255]
     // { r, g, b, a} are in [0,  1] (but may be out of gamut)
 
@@ -1298,10 +1312,17 @@ STAGE(srcover_rgba_8888, const SkRasterPipeline_Memory
     // { r, g, b, a} are now in [0,255]  (but may be out of gamut)
 
     // to_unorm() clamps back to gamut.  Scaling by 1 since we're already 255-biased.
+#ifdef SK_CPU_BENDIAN
+    dst = to_unorm(r, 1, 255) << 24
+        | to_unorm(g, 1, 255) << 16
+        | to_unorm(b, 1, 255) <<  8
+        | to_unorm(a, 1, 255);
+#else
     dst = to_unorm(r, 1, 255)
         | to_unorm(g, 1, 255) <<  8
         | to_unorm(b, 1, 255) << 16
         | to_unorm(a, 1, 255) << 24;
+#endif
     store(ptr, dst, tail);
 }
 
@@ -1700,10 +1721,17 @@ STAGE(gather_8888, const SkRasterPipeline_GatherCtx* c
 STAGE(store_8888, const SkRasterPipeline_MemoryCtx* ctx) {
     auto ptr = ptr_at_xy<uint32_t>(ctx, dx,dy);
 
+#ifdef SK_CPU_BENDIAN
+    U32 px = to_unorm(r, 255) << 24
+           | to_unorm(g, 255) << 16
+           | to_unorm(b, 255) <<  8
+           | to_unorm(a, 255);
+#else
     U32 px = to_unorm(r, 255)
            | to_unorm(g, 255) <<  8
            | to_unorm(b, 255) << 16
            | to_unorm(a, 255) << 24;
+#endif
     store(ptr, px, tail);
 }
 
@@ -2858,10 +2886,17 @@ SI void from_8888(U32 rgba, U16* r, U16* g, U16* b, U1
         return cast<U16>(v);
     };
 #endif
+#ifdef SK_CPU_BENDIAN
+    *r = cast_U16(rgba >>   16) >>  8;
+    *g = cast_U16(rgba >>   16) & 255;
+    *b = cast_U16(rgba & 65535) >>  8;
+    *a = cast_U16(rgba & 65535) & 255;
+#else
     *r = cast_U16(rgba & 65535) & 255;
     *g = cast_U16(rgba & 65535) >>  8;
     *b = cast_U16(rgba >>   16) & 255;
     *a = cast_U16(rgba >>   16) >>  8;
+#endif
 }
 
 SI void load_8888_(const uint32_t* ptr, size_t tail, U16* r, U16* g, U16* b, U16* a) {
@@ -2904,8 +2939,13 @@ SI void store_8888_(uint32_t* ptr, size_t tail, U16 r,
         case 1: vst4_lane_u8((uint8_t*)(ptr+0), rgba, 0);
     }
 #else
+#ifdef SK_CPU_BENDIAN
+    store(ptr, tail, cast<U32>((r<<8) | g) << 16
+                   | cast<U32>((b<<8) | a) << 0);
+#else
     store(ptr, tail, cast<U32>(r | (g<<8)) <<  0
                    | cast<U32>(b | (a<<8)) << 16);
+#endif
 #endif
 }
 




--- src/3rdparty/chromium/third_party/skia/src/ports/SkFontHost_FreeType.cpp.orig	2019-05-23 12:39:34 UTC
+++ src/3rdparty/chromium/third_party/skia/src/ports/SkFontHost_FreeType.cpp
@@ -122,8 +122,6 @@ class FreeTypeLibrary : SkNoncopyable { (public)
         : fGetVarDesignCoordinates(nullptr)
         , fGetVarAxisFlags(nullptr)
         , fLibrary(nullptr)
-        , fIsLCDSupported(false)
-        , fLCDExtra(0)
     {
         if (FT_New_Library(&gFTMemory, &fLibrary)) {
             return;
@@ -183,12 +181,7 @@ class FreeTypeLibrary : SkNoncopyable { (public)
         }
 #endif
 
-        // Setup LCD filtering. This reduces color fringes for LCD smoothed glyphs.
-        // The default has changed over time, so this doesn't mean the same thing to all users.
-        if (FT_Library_SetLcdFilter(fLibrary, FT_LCD_FILTER_DEFAULT) == 0) {
-            fIsLCDSupported = true;
-            fLCDExtra = 2; //Using a filter adds one full pixel to each side.
-        }
+        FT_Library_SetLcdFilter(fLibrary, FT_LCD_FILTER_DEFAULT);
     }
     ~FreeTypeLibrary() {
         if (fLibrary) {
@@ -197,8 +190,6 @@ class FreeTypeLibrary : SkNoncopyable { (public)
     }
 
     FT_Library library() { return fLibrary; }
-    bool isLCDSupported() { return fIsLCDSupported; }
-    int lcdExtra() { return fLCDExtra; }
 
     // FT_Get_{MM,Var}_{Blend,Design}_Coordinates were added in FreeType 2.7.1.
     // Prior to this there was no way to get the coordinates out of the FT_Face.
@@ -215,8 +206,6 @@ class FreeTypeLibrary : SkNoncopyable { (public)
 
 private:
     FT_Library fLibrary;
-    bool fIsLCDSupported;
-    int fLCDExtra;
 
     // FT_Library_SetLcdFilterWeights was introduced in FreeType 2.4.0.
     // The following platforms provide FreeType of at least 2.4.0.
@@ -713,17 +702,6 @@ void SkTypeface_FreeType::onFilterRec(SkScalerContextR
         rec->fTextSize = SkIntToScalar(1 << 14);
     }
 
-    if (isLCD(*rec)) {
-        // TODO: re-work so that FreeType is set-up and selected by the SkFontMgr.
-        SkAutoMutexAcquire ama(gFTMutex);
-        ref_ft_library();
-        if (!gFTLibrary->isLCDSupported()) {
-            // If the runtime Freetype library doesn't support LCD, disable it here.
-            rec->fMaskFormat = SkMask::kA8_Format;
-        }
-        unref_ft_library();
-    }
-
     SkFontHinting h = rec->getHinting();
     if (kFull_SkFontHinting == h && !isLCD(*rec)) {
         // collapse full->normal hinting if we're not doing LCD
@@ -1121,11 +1099,11 @@ bool SkScalerContext_FreeType::getCBoxForLetter(char l
 void SkScalerContext_FreeType::updateGlyphIfLCD(SkGlyph* glyph) {
     if (glyph->fMaskFormat == SkMask::kLCD16_Format) {
         if (fLCDIsVert) {
-            glyph->fHeight += gFTLibrary->lcdExtra();
-            glyph->fTop -= gFTLibrary->lcdExtra() >> 1;
+            glyph->fHeight += 2;
+            glyph->fTop -= 1;
         } else {
-            glyph->fWidth += gFTLibrary->lcdExtra();
-            glyph->fLeft -= gFTLibrary->lcdExtra() >> 1;
+            glyph->fWidth += 2;
+            glyph->fLeft -= 1;
         }
     }
 }




--- src/3rdparty/chromium/third_party/skia/third_party/skcms/src/Transform_inl.h.orig	2019-05-23 12:39:34 UTC
+++ src/3rdparty/chromium/third_party/skia/third_party/skcms/src/Transform_inl.h
@@ -392,9 +392,11 @@ SI U32 gather_32(const uint8_t* p, I32 ix) {
 }
 
 SI U32 gather_24(const uint8_t* p, I32 ix) {
+#if !__BIG_ENDIAN__
     // First, back up a byte.  Any place we're gathering from has a safe junk byte to read
     // in front of it, either a previous table value, or some tag metadata.
     p -= 1;
+#endif
 
     // Load the i'th 24-bit value from p, and 1 extra byte.
     auto load_24_32 = [p](int i) {
@@ -435,8 +437,10 @@ SI U32 gather_24(const uint8_t* p, I32 ix) {
 
 #if !defined(__arm__)
     SI void gather_48(const uint8_t* p, I32 ix, U64* v) {
+#if !__BIG_ENDIAN__
         // As in gather_24(), with everything doubled.
         p -= 2;
+#endif
 
         // Load the i'th 48-bit value from p, and 2 extra bytes.
         auto load_48_64 = [p](int i) {
@@ -499,7 +503,9 @@ SI F F_from_U8(U8 v) {
 SI F F_from_U16_BE(U16 v) {
     // All 16-bit ICC values are big-endian, so we byte swap before converting to float.
     // MSVC catches the "loss" of data here in the portable path, so we also make sure to mask.
+#if !__BIG_ENDIAN__
     v = U16( 0 | ((v & 0x00ff) << 8) | ((v & 0xff00) >> 8) );
+#endif
     return cast<F>(v) * (1/65535.0f);
 }
 
@@ -534,9 +540,15 @@ SI F table(const skcms_Curve* curve, F v) {
 SI void sample_clut_8(const skcms_A2B* a2b, I32 ix, F* r, F* g, F* b) {
     U32 rgb = gather_24(a2b->grid_8, ix);
 
+#if __BIG_ENDIAN__
+    *r = cast<F>((rgb >> 16) & 0xff) * (1/255.0f);
+    *g = cast<F>((rgb >>  8) & 0xff) * (1/255.0f);
+    *b = cast<F>((rgb >>  0) & 0xff) * (1/255.0f);
+#else
     *r = cast<F>((rgb >>  0) & 0xff) * (1/255.0f);
     *g = cast<F>((rgb >>  8) & 0xff) * (1/255.0f);
     *b = cast<F>((rgb >> 16) & 0xff) * (1/255.0f);
+#endif
 }
 
 SI void sample_clut_16(const skcms_A2B* a2b, I32 ix, F* r, F* g, F* b) {
@@ -549,12 +561,18 @@ SI void sample_clut_16(const skcms_A2B* a2b, I32 ix, F
     // This strategy is much faster for 64-bit builds, and fine for 32-bit x86 too.
     U64 rgb;
     gather_48(a2b->grid_16, ix, &rgb);
+#if __BIG_ENDIAN__
+    *r = cast<F>((rgb >> 32) & 0xffff) * (1/65535.0f);
+    *g = cast<F>((rgb >> 16) & 0xffff) * (1/65535.0f);
+    *b = cast<F>((rgb >>  0) & 0xffff) * (1/65535.0f);
+#else
     rgb = swap_endian_16x4(rgb);
 
     *r = cast<F>((rgb >>  0) & 0xffff) * (1/65535.0f);
     *g = cast<F>((rgb >> 16) & 0xffff) * (1/65535.0f);
     *b = cast<F>((rgb >> 32) & 0xffff) * (1/65535.0f);
 #endif
+#endif
 }
 
 // GCC 7.2.0 hits an internal compiler error with -finline-functions (or -O3)
@@ -695,10 +713,17 @@ static void exec_ops(const Op* ops, const void** args,
             case Op_load_8888:{
                 U32 rgba = load<U32>(src + 4*i);
 
+#if __BIG_ENDIAN__
+                r = cast<F>((rgba >> 24) & 0xff) * (1/255.0f);
+                g = cast<F>((rgba >> 16) & 0xff) * (1/255.0f);
+                b = cast<F>((rgba >>  8) & 0xff) * (1/255.0f);
+                a = cast<F>((rgba >>  0) & 0xff) * (1/255.0f);
+#else
                 r = cast<F>((rgba >>  0) & 0xff) * (1/255.0f);
                 g = cast<F>((rgba >>  8) & 0xff) * (1/255.0f);
                 b = cast<F>((rgba >> 16) & 0xff) * (1/255.0f);
                 a = cast<F>((rgba >> 24) & 0xff) * (1/255.0f);
+#endif
             } break;
 
             case Op_load_8888_palette8:{
@@ -727,13 +752,29 @@ static void exec_ops(const Op* ops, const void** args,
                 const uint16_t* rgb = (const uint16_t*)ptr; // cast to const uint16_t* to be safe.
             #if defined(USING_NEON)
                 uint16x4x3_t v = vld3_u16(rgb);
+#if __BIG_ENDIAN__
+                r = cast<F>(swap_endian_16((U16)v.val[0])) * (1/65535.0f);
+                g = cast<F>(swap_endian_16((U16)v.val[1])) * (1/65535.0f);
+                b = cast<F>(swap_endian_16((U16)v.val[2])) * (1/65535.0f);
+#else
                 r = cast<F>((U16)v.val[0]) * (1/65535.0f);
                 g = cast<F>((U16)v.val[1]) * (1/65535.0f);
                 b = cast<F>((U16)v.val[2]) * (1/65535.0f);
+#endif
             #else
+#if __BIG_ENDIAN__
+                U32 R = load_3<U32>(rgb+0),
+                    G = load_3<U32>(rgb+1),
+                    B = load_3<U32>(rgb+2);
+                // R,G,B are little-endian 16-bit, so byte swap them before converting to float.
+                r = cast<F>((R & 0x00ff)<<8 | (R & 0xff00)>>8) * (1/65535.0f);
+                g = cast<F>((G & 0x00ff)<<8 | (G & 0xff00)>>8) * (1/65535.0f);
+                b = cast<F>((B & 0x00ff)<<8 | (B & 0xff00)>>8) * (1/65535.0f);
+#else
                 r = cast<F>(load_3<U32>(rgb+0)) * (1/65535.0f);
                 g = cast<F>(load_3<U32>(rgb+1)) * (1/65535.0f);
                 b = cast<F>(load_3<U32>(rgb+2)) * (1/65535.0f);
+#endif
             #endif
             } break;
 
@@ -743,17 +784,33 @@ static void exec_ops(const Op* ops, const void** args,
                 const uint16_t* rgba = (const uint16_t*)ptr; // cast to const uint16_t* to be safe.
             #if defined(USING_NEON)
                 uint16x4x4_t v = vld4_u16(rgba);
+#if __BIG_ENDIAN__
+                r = cast<F>(swap_endian_16((U16)v.val[0])) * (1/65535.0f);
+                g = cast<F>(swap_endian_16((U16)v.val[1])) * (1/65535.0f);
+                b = cast<F>(swap_endian_16((U16)v.val[2])) * (1/65535.0f);
+                a = cast<F>(swap_endian_16((U16)v.val[3])) * (1/65535.0f);
+#else
                 r = cast<F>((U16)v.val[0]) * (1/65535.0f);
                 g = cast<F>((U16)v.val[1]) * (1/65535.0f);
                 b = cast<F>((U16)v.val[2]) * (1/65535.0f);
                 a = cast<F>((U16)v.val[3]) * (1/65535.0f);
+#endif
             #else
+#if __BIG_ENDIAN__
+                U64 px = swap_endian_16x4(load<U64>(rgba));
+
+                r = cast<F>((px >> 48) & 0xffff) * (1/65535.0f);
+                g = cast<F>((px >> 32) & 0xffff) * (1/65535.0f);
+                b = cast<F>((px >> 16) & 0xffff) * (1/65535.0f);
+                a = cast<F>((px >>  0) & 0xffff) * (1/65535.0f);
+#else
                 U64 px = load<U64>(rgba);
 
                 r = cast<F>((px >>  0) & 0xffff) * (1/65535.0f);
                 g = cast<F>((px >> 16) & 0xffff) * (1/65535.0f);
                 b = cast<F>((px >> 32) & 0xffff) * (1/65535.0f);
                 a = cast<F>((px >> 48) & 0xffff) * (1/65535.0f);
+#endif
             #endif
             } break;
 
@@ -763,10 +820,21 @@ static void exec_ops(const Op* ops, const void** args,
                 const uint16_t* rgb = (const uint16_t*)ptr; // cast to const uint16_t* to be safe.
             #if defined(USING_NEON)
                 uint16x4x3_t v = vld3_u16(rgb);
+#if __BIG_ENDIAN__
+                r = cast<F>((U16)v.val[0]) * (1/65535.0f);
+                g = cast<F>((U16)v.val[1]) * (1/65535.0f);
+                b = cast<F>((U16)v.val[2]) * (1/65535.0f);
+#else
                 r = cast<F>(swap_endian_16((U16)v.val[0])) * (1/65535.0f);
                 g = cast<F>(swap_endian_16((U16)v.val[1])) * (1/65535.0f);
                 b = cast<F>(swap_endian_16((U16)v.val[2])) * (1/65535.0f);
+#endif
             #else
+#if __BIG_ENDIAN__
+                r = cast<F>(load_3<U32>(rgb+0)) * (1/65535.0f);
+                g = cast<F>(load_3<U32>(rgb+1)) * (1/65535.0f);
+                b = cast<F>(load_3<U32>(rgb+2)) * (1/65535.0f);
+#else
                 U32 R = load_3<U32>(rgb+0),
                     G = load_3<U32>(rgb+1),
                     B = load_3<U32>(rgb+2);
@@ -774,6 +842,7 @@ static void exec_ops(const Op* ops, const void** args,
                 r = cast<F>((R & 0x00ff)<<8 | (R & 0xff00)>>8) * (1/65535.0f);
                 g = cast<F>((G & 0x00ff)<<8 | (G & 0xff00)>>8) * (1/65535.0f);
                 b = cast<F>((B & 0x00ff)<<8 | (B & 0xff00)>>8) * (1/65535.0f);
+#endif
             #endif
             } break;
 
@@ -783,17 +852,33 @@ static void exec_ops(const Op* ops, const void** args,
                 const uint16_t* rgba = (const uint16_t*)ptr; // cast to const uint16_t* to be safe.
             #if defined(USING_NEON)
                 uint16x4x4_t v = vld4_u16(rgba);
+#if __BIG_ENDIAN__
+                r = cast<F>((U16)v.val[0]) * (1/65535.0f);
+                g = cast<F>((U16)v.val[1]) * (1/65535.0f);
+                b = cast<F>((U16)v.val[2]) * (1/65535.0f);
+                a = cast<F>((U16)v.val[3]) * (1/65535.0f);
+#else
                 r = cast<F>(swap_endian_16((U16)v.val[0])) * (1/65535.0f);
                 g = cast<F>(swap_endian_16((U16)v.val[1])) * (1/65535.0f);
                 b = cast<F>(swap_endian_16((U16)v.val[2])) * (1/65535.0f);
                 a = cast<F>(swap_endian_16((U16)v.val[3])) * (1/65535.0f);
+#endif
             #else
+#if __BIG_ENDIAN__
+                U64 px = load<U64>(rgba);
+
+                r = cast<F>((px >> 48) & 0xffff) * (1/65535.0f);
+                g = cast<F>((px >> 32) & 0xffff) * (1/65535.0f);
+                b = cast<F>((px >> 16) & 0xffff) * (1/65535.0f);
+                a = cast<F>((px >>  0) & 0xffff) * (1/65535.0f);
+#else
                 U64 px = swap_endian_16x4(load<U64>(rgba));
 
                 r = cast<F>((px >>  0) & 0xffff) * (1/65535.0f);
                 g = cast<F>((px >> 16) & 0xffff) * (1/65535.0f);
                 b = cast<F>((px >> 32) & 0xffff) * (1/65535.0f);
                 a = cast<F>((px >> 48) & 0xffff) * (1/65535.0f);
+#endif
             #endif
             } break;
 
@@ -828,10 +913,17 @@ static void exec_ops(const Op* ops, const void** args,
                     A = (U16)v.val[3];
             #else
                 U64 px = load<U64>(rgba);
+#if __BIG_ENDIAN__
+                U16 R = cast<U16>((px >> 48) & 0xffff),
+                    G = cast<U16>((px >> 32) & 0xffff),
+                    B = cast<U16>((px >> 16) & 0xffff),
+                    A = cast<U16>((px >>  0) & 0xffff);
+#else
                 U16 R = cast<U16>((px >>  0) & 0xffff),
                     G = cast<U16>((px >> 16) & 0xffff),
                     B = cast<U16>((px >> 32) & 0xffff),
                     A = cast<U16>((px >> 48) & 0xffff);
+#endif
             #endif
                 r = F_from_Half(R);
                 g = F_from_Half(G);
@@ -1024,10 +1116,17 @@ static void exec_ops(const Op* ops, const void** args,
             } return;
 
             case Op_store_8888: {
+#if __BIG_ENDIAN__
+                store(dst + 4*i, cast<U32>(to_fixed(r * 255) << 24)
+                               | cast<U32>(to_fixed(g * 255) << 16)
+                               | cast<U32>(to_fixed(b * 255) <<  8)
+                               | cast<U32>(to_fixed(a * 255) <<  0));
+#else
                 store(dst + 4*i, cast<U32>(to_fixed(r * 255) <<  0)
                                | cast<U32>(to_fixed(g * 255) <<  8)
                                | cast<U32>(to_fixed(b * 255) << 16)
                                | cast<U32>(to_fixed(a * 255) << 24));
+#endif
             } return;
 
             case Op_store_1010102: {
@@ -1043,15 +1142,30 @@ static void exec_ops(const Op* ops, const void** args,
                 uint16_t* rgb = (uint16_t*)ptr;          // for this cast to uint16_t* to be safe.
             #if defined(USING_NEON)
                 uint16x4x3_t v = {{
+#if __BIG_ENDIAN__
+                    (uint16x4_t)swap_endian_16(cast<U16>(to_fixed(r * 65535))),
+                    (uint16x4_t)swap_endian_16(cast<U16>(to_fixed(g * 65535))),
+                    (uint16x4_t)swap_endian_16(cast<U16>(to_fixed(b * 65535))),
+#else
                     (uint16x4_t)cast<U16>(to_fixed(r * 65535)),
                     (uint16x4_t)cast<U16>(to_fixed(g * 65535)),
                     (uint16x4_t)cast<U16>(to_fixed(b * 65535)),
+#endif
                 }};
                 vst3_u16(rgb, v);
             #else
+#if __BIG_ENDIAN__
+                I32 R = to_fixed(r * 65535),
+                    G = to_fixed(g * 65535),
+                    B = to_fixed(b * 65535);
+                store_3(rgb+0, cast<U16>((R & 0x00ff) << 8 | (R & 0xff00) >> 8) );
+                store_3(rgb+1, cast<U16>((G & 0x00ff) << 8 | (G & 0xff00) >> 8) );
+                store_3(rgb+2, cast<U16>((B & 0x00ff) << 8 | (B & 0xff00) >> 8) );
+#else
                 store_3(rgb+0, cast<U16>(to_fixed(r * 65535)));
                 store_3(rgb+1, cast<U16>(to_fixed(g * 65535)));
                 store_3(rgb+2, cast<U16>(to_fixed(b * 65535)));
+#endif
             #endif
 
             } return;
@@ -1062,18 +1176,33 @@ static void exec_ops(const Op* ops, const void** args,
                 uint16_t* rgba = (uint16_t*)ptr;        // for this cast to uint16_t* to be safe.
             #if defined(USING_NEON)
                 uint16x4x4_t v = {{
+#if __BIG_ENDIAN__
+                    (uint16x4_t)swap_endian_16(cast<U16>(to_fixed(r * 65535))),
+                    (uint16x4_t)swap_endian_16(cast<U16>(to_fixed(g * 65535))),
+                    (uint16x4_t)swap_endian_16(cast<U16>(to_fixed(b * 65535))),
+                    (uint16x4_t)swap_endian_16(cast<U16>(to_fixed(a * 65535))),
+#else
                     (uint16x4_t)cast<U16>(to_fixed(r * 65535)),
                     (uint16x4_t)cast<U16>(to_fixed(g * 65535)),
                     (uint16x4_t)cast<U16>(to_fixed(b * 65535)),
                     (uint16x4_t)cast<U16>(to_fixed(a * 65535)),
+#endif
                 }};
                 vst4_u16(rgba, v);
             #else
+#if __BIG_ENDIAN__
+                U64 px = cast<U64>(to_fixed(r * 65535)) << 48
+                       | cast<U64>(to_fixed(g * 65535)) << 32
+                       | cast<U64>(to_fixed(b * 65535)) << 16
+                       | cast<U64>(to_fixed(a * 65535)) <<  0;
+                store(rgba, swap_endian_16x4(px));
+#else
                 U64 px = cast<U64>(to_fixed(r * 65535)) <<  0
                        | cast<U64>(to_fixed(g * 65535)) << 16
                        | cast<U64>(to_fixed(b * 65535)) << 32
                        | cast<U64>(to_fixed(a * 65535)) << 48;
                 store(rgba, px);
+#endif
             #endif
             } return;
 
@@ -1083,18 +1212,30 @@ static void exec_ops(const Op* ops, const void** args,
                 uint16_t* rgb = (uint16_t*)ptr;          // for this cast to uint16_t* to be safe.
             #if defined(USING_NEON)
                 uint16x4x3_t v = {{
+#if __BIG_ENDIAN__
+                    (uint16x4_t)cast<U16>(to_fixed(r * 65535)),
+                    (uint16x4_t)cast<U16>(to_fixed(g * 65535)),
+                    (uint16x4_t)cast<U16>(to_fixed(b * 65535)),
+#else
                     (uint16x4_t)swap_endian_16(cast<U16>(to_fixed(r * 65535))),
                     (uint16x4_t)swap_endian_16(cast<U16>(to_fixed(g * 65535))),
                     (uint16x4_t)swap_endian_16(cast<U16>(to_fixed(b * 65535))),
+#endif
                 }};
                 vst3_u16(rgb, v);
             #else
+#if __BIG_ENDIAN__
+                store_3(rgb+0, cast<U16>(to_fixed(r * 65535)));
+                store_3(rgb+1, cast<U16>(to_fixed(g * 65535)));
+                store_3(rgb+2, cast<U16>(to_fixed(b * 65535)));
+#else
                 I32 R = to_fixed(r * 65535),
                     G = to_fixed(g * 65535),
                     B = to_fixed(b * 65535);
                 store_3(rgb+0, cast<U16>((R & 0x00ff) << 8 | (R & 0xff00) >> 8) );
                 store_3(rgb+1, cast<U16>((G & 0x00ff) << 8 | (G & 0xff00) >> 8) );
                 store_3(rgb+2, cast<U16>((B & 0x00ff) << 8 | (B & 0xff00) >> 8) );
+#endif
             #endif
 
             } return;
@@ -1105,18 +1246,33 @@ static void exec_ops(const Op* ops, const void** args,
                 uint16_t* rgba = (uint16_t*)ptr;        // for this cast to uint16_t* to be safe.
             #if defined(USING_NEON)
                 uint16x4x4_t v = {{
+#if __BIG_ENDIAN__
+                    (uint16x4_t)cast<U16>(to_fixed(r * 65535)),
+                    (uint16x4_t)cast<U16>(to_fixed(g * 65535)),
+                    (uint16x4_t)cast<U16>(to_fixed(b * 65535)),
+                    (uint16x4_t)cast<U16>(to_fixed(a * 65535)),
+#else
                     (uint16x4_t)swap_endian_16(cast<U16>(to_fixed(r * 65535))),
                     (uint16x4_t)swap_endian_16(cast<U16>(to_fixed(g * 65535))),
                     (uint16x4_t)swap_endian_16(cast<U16>(to_fixed(b * 65535))),
                     (uint16x4_t)swap_endian_16(cast<U16>(to_fixed(a * 65535))),
+#endif
                 }};
                 vst4_u16(rgba, v);
             #else
+#if __BIG_ENDIAN__
+                U64 px = cast<U64>(to_fixed(r * 65535)) << 48
+                       | cast<U64>(to_fixed(g * 65535)) << 32
+                       | cast<U64>(to_fixed(b * 65535)) << 16
+                       | cast<U64>(to_fixed(a * 65535)) <<  0;
+                store(rgba, px);
+#else
                 U64 px = cast<U64>(to_fixed(r * 65535)) <<  0
                        | cast<U64>(to_fixed(g * 65535)) << 16
                        | cast<U64>(to_fixed(b * 65535)) << 32
                        | cast<U64>(to_fixed(a * 65535)) << 48;
                 store(rgba, swap_endian_16x4(px));
+#endif
             #endif
             } return;
 
@@ -1160,10 +1316,17 @@ static void exec_ops(const Op* ops, const void** args,
                 }};
                 vst4_u16(rgba, v);
             #else
+#if __BIG_ENDIAN__
+                store(rgba, cast<U64>(R) << 48
+                          | cast<U64>(G) << 32
+                          | cast<U64>(B) << 16
+                          | cast<U64>(A) <<  0);
+#else
                 store(rgba, cast<U64>(R) <<  0
                           | cast<U64>(G) << 16
                           | cast<U64>(B) << 32
                           | cast<U64>(A) << 48);
+#endif
             #endif
 
             } return;




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

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

+      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
   RTC_CHECK(num_samples_ >= written);  // detect size_t overflow
+#endif
 }
 




--- src/3rdparty/chromium/third_party/webrtc/rtc_base/BUILD.gn.orig	2018-11-13 18:25:11 UTC
+++ src/3rdparty/chromium/third_party/webrtc/rtc_base/BUILD.gn
@@ -907,8 +907,6 @@ rtc_static_library("rtc_base_generic") {
 
   if (rtc_use_x11) {
     libs += [
-      "dl",
-      "rt",
       "Xext",
       "X11",
       "Xcomposite",
@@ -916,7 +914,7 @@ rtc_static_library("rtc_base_generic") {
     ]
   }
 
-  if (is_linux) {
+  if (is_linux && !is_bsd) {
     libs += [
       "dl",
       "rt",




--- src/3rdparty/chromium/third_party/webrtc/rtc_base/byte_order.h.orig	2019-11-27 21:12:25 UTC
+++ src/3rdparty/chromium/third_party/webrtc/rtc_base/byte_order.h
@@ -89,7 +89,7 @@
 #error WEBRTC_ARCH_BIG_ENDIAN or WEBRTC_ARCH_LITTLE_ENDIAN must be defined.
 #endif  // defined(WEBRTC_ARCH_LITTLE_ENDIAN)
 
 #elif defined(WEBRTC_POSIX)
-#include <endian.h>
+#include <sys/endian.h>
 #else
 #error "Missing byte order functions for this arch."
 #endif  // defined(WEBRTC_MAC)




--- src/3rdparty/chromium/third_party/webrtc/rtc_base/platform_thread_types.cc.orig	2019-11-27 21:12:25 UTC
+++ src/3rdparty/chromium/third_party/webrtc/rtc_base/platform_thread_types.cc
@@ -11,7 +11,11 @@
 #include "rtc_base/platform_thread_types.h"
 
 #if defined(WEBRTC_LINUX)
+#if !defined(__FreeBSD__)
 #include <sys/prctl.h>
+#else
+#include <pthread_np.h>
+#endif
 #include <sys/syscall.h>
 #endif
 
@@ -27,6 +31,8 @@ PlatformThreadId CurrentThreadId() {
   return gettid();
 #elif defined(WEBRTC_FUCHSIA)
   return zx_thread_self();
-#elif defined(WEBRTC_LINUX)
+#elif defined(WEBRTC_LINUX) && !defined(__FreeBSD__)
   return syscall(__NR_gettid);
+#elif defined(__FreeBSD__)
+  return pthread_getthreadid_np();
 #elif defined(WEBRTC_LINUX)
   return syscall(__NR_gettid);
 #elif defined(__EMSCRIPTEN__)
@@ -57,6 +63,7 @@ bool IsThreadRefEqual(const PlatformThreadRef& a, cons
 }
 
 void SetCurrentThreadName(const char* name) {

 #if defined(WEBRTC_WIN)
   struct {
     DWORD dwType;
@@ -74,6 +81,7 @@ void SetCurrentThreadName(const char* name) {
   prctl(PR_SET_NAME, reinterpret_cast<unsigned long>(name));  // NOLINT
 #elif defined(WEBRTC_MAC) || defined(WEBRTC_IOS)
   pthread_setname_np(name);




--- src/3rdparty/chromium/third_party/webrtc/rtc_base/string_utils.h.orig	2019-05-23 12:39:34 UTC
+++ src/3rdparty/chromium/third_party/webrtc/rtc_base/string_utils.h
@@ -25,11 +25,11 @@
 #endif  // WEBRTC_WIN
 
 #if defined(WEBRTC_POSIX)
-#ifdef BSD
+#if defined(WEBRTC_BSD) || defined(BSD)
 #include <stdlib.h>
-#else  // BSD
+#else  // WEBRTC_BSD
 #include <alloca.h>
-#endif  // !BSD
+#endif  // !WEBRTC_BSD
 #include <strings.h>
 #endif  // WEBRTC_POSIX
 




--- src/3rdparty/chromium/third_party/zlib/arm_features.c.orig	2020-03-22 20:03:48 UTC
+++ src/3rdparty/chromium/third_party/zlib/arm_features.c
@@ -27,6 +27,15 @@ int ZLIB_INTERNAL arm_cpu_enable_pmull = 0;
 #include <zircon/types.h>
 #elif defined(ARMV8_OS_WINDOWS)
 #include <windows.h>
+#elif defined(ARMV8_OS_FREEBSD)
-int ZLIB_INTERNAL arm_cpu_enable_pmull = 0;
-
-#if !defined(_MSC_VER)
 #include <pthread.h>
 #include <stdint.h>
+#include <machine/armreg.h>
+#include <sys/types.h>
 
-#if defined(ARMV8_OS_ANDROID)
-#include <cpu-features.h>
-#elif defined(ARMV8_OS_LINUX)
-#include <asm/hwcap.h>
-#include <sys/auxv.h>
-#else
-#error ### No ARM CPU features detection in your platform/OS
-#endif
+int ZLIB_INTERNAL arm_cpu_enable_crc32 = 0;
+int ZLIB_INTERNAL arm_cpu_enable_pmull = 0;
 
 static pthread_once_t cpu_check_inited_once = PTHREAD_ONCE_INIT;
 
 static void init_arm_features(void)
 {
-    uint64_t flag_crc32 = 0, flag_pmull = 0, capabilities = 0;
-
-#if defined(ARMV8_OS_ANDROID)
-    flag_crc32 = ANDROID_CPU_ARM_FEATURE_CRC32;
-    flag_pmull = ANDROID_CPU_ARM_FEATURE_PMULL;
-    capabilities = android_getCpuFeatures();
-#elif defined(ARMV8_OS_LINUX)
-    #if defined(__aarch64__)
-        flag_crc32 = HWCAP_CRC32;
-        flag_pmull = HWCAP_PMULL;
-        capabilities = getauxval(AT_HWCAP);
-    #elif defined(__ARM_NEON) || defined(__ARM_NEON__)
-        /* The use of HWCAP2 is for getting features of newer ARMv8-A SoCs
-         * while running in 32bits mode (i.e. aarch32).
-         */
-        flag_crc32 = HWCAP2_CRC32;
-        flag_pmull = HWCAP2_PMULL;
-        capabilities = getauxval(AT_HWCAP2);
-    #endif
+#if defined (__aarch64__)
+#ifndef ID_AA64ISAR0_AES_VAL
+#define ID_AA64ISAR0_AES_VAL ID_AA64ISAR0_AES
+#endif
+#ifndef ID_AA64ISAR0_CRC32_VAL
+#define ID_AA64ISAR0_CRC32_VAL ID_AA64ISAR0_CRC32
+#endif
 #else
 #error arm_features.c ARM feature detection in not defined for your platform
 #endif
@@ -86,5 +95,12 @@ static void _arm_check_features(void)
 #elif defined(ARMV8_OS_WINDOWS)
     arm_cpu_enable_crc32 = IsProcessorFeaturePresent(PF_ARM_V8_CRC32_INSTRUCTIONS_AVAILABLE);
     arm_cpu_enable_pmull = IsProcessorFeaturePresent(PF_ARM_V8_CRYPTO_INSTRUCTIONS_AVAILABLE);
+#elif defined(ARMV8_OS_FREEBSD)
+    uint64_t id_aa64isar0;
 
-    if (capabilities & flag_crc32)
-        arm_cpu_enable_crc32 = 1;
-
-    if (capabilities & flag_pmull)
+    id_aa64isar0 = READ_SPECIALREG(id_aa64isar0_el1);
+    if (ID_AA64ISAR0_AES_VAL(id_aa64isar0) == ID_AA64ISAR0_AES_PMULL)
+        arm_cpu_enable_pmull = 1;
+    if (ID_AA64ISAR0_CRC32_VAL(id_aa64isar0) == ID_AA64ISAR0_CRC32_BASE)
+        arm_cpu_enable_crc32 = 1;
 #endif
 }
 
 void ZLIB_INTERNAL arm_check_features(void)
 {
     pthread_once(&cpu_check_inited_once, init_arm_features);
 }
-#else
-#include <windows.h>
-
-static BOOL CALLBACK _arm_check_features(PINIT_ONCE once,
-                                         PVOID param,
-                                         PVOID *context);
-static INIT_ONCE cpu_check_inited_once = INIT_ONCE_STATIC_INIT;
-
-
-void ZLIB_INTERNAL arm_check_features(void)
-{
-    InitOnceExecuteOnce(&cpu_check_inited_once, _arm_check_features,
-                        NULL, NULL);
-}
-
-static BOOL CALLBACK _arm_check_features(PINIT_ONCE once,
-                                         PVOID param,
-                                         PVOID *context)
-{
-    if (IsProcessorFeaturePresent(PF_ARM_V8_CRC32_INSTRUCTIONS_AVAILABLE))
-        arm_cpu_enable_crc32 = 1;
-
-    if (IsProcessorFeaturePresent(PF_ARM_V8_CRYPTO_INSTRUCTIONS_AVAILABLE))
-        arm_cpu_enable_pmull = 1;
-
-    return TRUE;
-}
-#endif /* _MSC_VER */




--- src/3rdparty/chromium/ui/aura/mus/os_exchange_data_provider_mus.cc.orig	2019-05-23 12:39:34 UTC
+++ src/3rdparty/chromium/ui/aura/mus/os_exchange_data_provider_mus.cc
@@ -14,6 +14,7 @@
 #include "base/strings/string_split.h"
 #include "base/strings/string_util.h"
 #include "base/strings/utf_string_conversions.h"
+#include "base/sys_byteorder.h"
 #include "net/base/filename_util.h"
 #include "ui/base/clipboard/clipboard_constants.h"
 #include "ui/base/clipboard/clipboard_format_type.h"
@@ -279,8 +280,13 @@ void OSExchangeDataProviderMus::SetHtml(const base::st
   std::vector<unsigned char> bytes;
   // Manually jam a UTF16 BOM into bytes because otherwise, other programs will
   // assume UTF-8.
+#if defined(ARCH_CPU_LITTLE_ENDIAN)
   bytes.push_back(0xFF);
   bytes.push_back(0xFE);
+#else
+  bytes.push_back(0xFE);
+  bytes.push_back(0xFF);
+#endif
   AddString16ToVector(html, &bytes);
   mime_data_[ui::kMimeTypeHTML] = bytes;
 }

Lines 1-4 Link Here

(-)b/www/qt5-webengine/files/patch-src_3rdparty_chromium_ui_base_dragdrop_os__exchange__data__provider__factory.cc (-3 / +3 lines)
1	--- src/3rdparty/chromium/ui/base/dragdrop/os_exchange_data_provider_factory.cc.orig 2018-11-13 18:25:11 UTC	1	--- src/3rdparty/chromium/ui/base/dragdrop/os_exchange_data_provider_factory.cc.orig 2019-11-27 21:12:25 UTC
2	+++ src/3rdparty/chromium/ui/base/dragdrop/os_exchange_data_provider_factory.cc	2	+++ src/3rdparty/chromium/ui/base/dragdrop/os_exchange_data_provider_factory.cc
3	@@ -8,7 +8,7 @@	3	@@ -8,7 +8,7 @@
4		4
Lines 9-16 Link Here
9	#include "ui/base/dragdrop/os_exchange_data_provider_aura.h"	9	#include "ui/base/dragdrop/os_exchange_data_provider_aura.h"
10	#elif defined(OS_MACOSX)	10	#elif defined(OS_MACOSX)
11	#include "ui/base/dragdrop/os_exchange_data_provider_builder_mac.h"	11	#include "ui/base/dragdrop/os_exchange_data_provider_builder_mac.h"
12	@@ -43,7 +43,7 @@ OSExchangeDataProviderFactory::CreateProvider() {	12	@@ -24,7 +24,7 @@ std::unique_ptr<OSExchangeData::Provider>
13		13	OSExchangeDataProviderFactory::CreateProvider() {
14	#if defined(USE_X11)	14	#if defined(USE_X11)
15	return std::make_unique<OSExchangeDataProviderAuraX11>();	15	return std::make_unique<OSExchangeDataProviderAuraX11>();
16	-#elif defined(OS_LINUX)	16	-#elif defined(OS_LINUX)

Removed Link Here

(-)a/www/qt5-webengine/files/patch-src_3rdparty_chromium_ui_base_ime_ime__engine__handler__interface.h (-11 lines)
1	--- src/3rdparty/chromium/ui/base/ime/ime_engine_handler_interface.h.orig 2018-11-13 18:25:11 UTC
2	+++ src/3rdparty/chromium/ui/base/ime/ime_engine_handler_interface.h
3	@@ -162,7 +162,7 @@ class UI_BASE_IME_EXPORT IMEEngineHandlerInterface {
4	// Hides the input view window (from API call).
5	virtual void HideInputView() = 0;
6
7	-#elif defined(OS_LINUX) \|\| defined(OS_WIN)
8	+#elif defined(OS_LINUX) \|\| defined(OS_WIN) \|\| defined(OS_BSD)
9
10	// Get the id of the IME extension.
11	virtual std::string GetExtensionId() const = 0;

Lines 1-5 Link Here

(-)b/www/qt5-webengine/files/patch-src_3rdparty_chromium_ui_base_ime_init_input__method__initializer.cc (-2 / +2 lines)
1	--- src/3rdparty/chromium/ui/base/ime/input_method_initializer.cc.orig 2018-11-13 18:25:11 UTC	1	--- src/3rdparty/chromium/ui/base/ime/init/input_method_initializer.cc.orig 2019-11-27 21:12:25 UTC
2	+++ src/3rdparty/chromium/ui/base/ime/input_method_initializer.cc	2	+++ src/3rdparty/chromium/ui/base/ime/init/input_method_initializer.cc
3	@@ -8,7 +8,7 @@	3	@@ -8,7 +8,7 @@
4		4
5	#if defined(OS_CHROMEOS)	5	#if defined(OS_CHROMEOS)




--- src/3rdparty/chromium/ui/base/ui_base_features.h.orig	2019-11-27 21:12:25 UTC
+++ src/3rdparty/chromium/ui/base/ui_base_features.h
@@ -59,10 +59,10 @@ COMPONENT_EXPORT(UI_BASE_FEATURES)
 extern const base::Feature kEnableAutomaticUiAdjustmentsForTouch;
 #endif  // defined(OS_WIN) || defined(OS_CHROMEOS)
 
-#if defined(OS_WIN) || defined(OS_MACOSX) || defined(OS_LINUX)
+#if defined(OS_WIN) || defined(OS_MACOSX) || defined(OS_LINUX) || defined(OS_BSD)
 COMPONENT_EXPORT(UI_BASE_FEATURES)
 extern const base::Feature kDirectManipulationStylus;
-#endif  // defined(OS_WIN) || defined(OS_MACOSX) || defined(OS_LINUX)
+#endif  // defined(OS_WIN) || defined(OS_MACOSX) || defined(OS_LINUX) || defined(OS_BSD)
 
 // Used to enable the new controls UI.
 COMPONENT_EXPORT(UI_BASE_FEATURES)

Lines 1-4 Link Here

(-)b/www/qt5-webengine/files/patch-src_3rdparty_chromium_ui_gfx_font__render__params.h (-4 / +4 lines)
1	--- src/3rdparty/chromium/ui/gfx/font_render_params.h.orig 2019-05-23 12:39:34 UTC	1	--- src/3rdparty/chromium/ui/gfx/font_render_params.h.orig 2019-11-27 21:12:25 UTC
2	+++ src/3rdparty/chromium/ui/gfx/font_render_params.h	2	+++ src/3rdparty/chromium/ui/gfx/font_render_params.h
3	@@ -111,13 +111,13 @@ GFX_EXPORT FontRenderParams GetFontRenderParams(	3	@@ -111,13 +111,13 @@ GFX_EXPORT FontRenderParams GetFontRenderParams(
4	const FontRenderParamsQuery& query,	4	const FontRenderParamsQuery& query,
Lines 11-18 Link Here
11	GFX_EXPORT void ClearFontRenderParamsCacheForTest();	11	GFX_EXPORT void ClearFontRenderParamsCacheForTest();
12	#endif	12	#endif
13		13
14	-#if defined(OS_LINUX) \|\| defined(OS_ANDROID) \|\| defined(OS_FUCHSIA)	14	-#if defined(OS_WIN) \|\| defined(OS_LINUX) \|\| defined(OS_ANDROID) \|\| \
15	+#if defined(OS_LINUX) \|\| defined(OS_ANDROID) \|\| defined(OS_FUCHSIA) \|\| defined(OS_BSD)	15	+#if defined(OS_WIN) \|\| defined(OS_LINUX) \|\| defined(OS_ANDROID) \|\| defined(OS_BSD) \|\| \
		16	defined(OS_FUCHSIA)
16	// Gets the device scale factor to query the FontRenderParams.	17	// Gets the device scale factor to query the FontRenderParams.
17	GFX_EXPORT float GetFontRenderParamsDeviceScaleFactor();	18	GFX_EXPORT float GetFontRenderParamsDeviceScaleFactor();
18




--- src/3rdparty/chromium/ui/gfx/gpu_memory_buffer.h.orig	2019-11-27 21:12:25 UTC
+++ src/3rdparty/chromium/ui/gfx/gpu_memory_buffer.h
@@ -16,7 +16,7 @@
 #include "ui/gfx/geometry/rect.h"
 #include "ui/gfx/gfx_export.h"
 
-#if defined(USE_OZONE) || defined(OS_LINUX)
+#if defined(USE_OZONE) || defined(OS_LINUX) || defined(OS_BSD)
 #include "ui/gfx/native_pixmap_handle.h"
 #elif defined(OS_MACOSX) && !defined(OS_IOS)
 #include "ui/gfx/mac/io_surface.h"

   base::UnsafeSharedMemoryRegion region;
   uint32_t offset;
   int32_t stride;
-#if defined(OS_LINUX) || defined(OS_FUCHSIA)
+#if defined(OS_LINUX) || defined(OS_FUCHSIA) || defined(OS_BSD)
   // TODO(crbug.com/863011): convert this to a scoped handle.
   NativePixmapHandle native_pixmap_handle;
 #elif defined(OS_MACOSX) && !defined(OS_IOS)
   ScopedRefCountedIOSurfaceMachPort mach_port;




--- src/3rdparty/chromium/ui/gfx/ipc/gfx_param_traits_macros.h.orig	2019-11-27 21:12:25 UTC
+++ src/3rdparty/chromium/ui/gfx/ipc/gfx_param_traits_macros.h
@@ -18,7 +18,7 @@
 #include "ui/gfx/selection_bound.h"

 #endif
 
@@ -51,7 +51,7 @@ IPC_STRUCT_TRAITS_BEGIN(gfx::GpuMemoryBufferHandle)
   IPC_STRUCT_TRAITS_MEMBER(region)
   IPC_STRUCT_TRAITS_MEMBER(offset)
   IPC_STRUCT_TRAITS_MEMBER(stride)
-#if defined(OS_LINUX) || defined(OS_FUCHSIA)
+#if defined(OS_LINUX) || defined(OS_FUCHSIA) || defined(OS_BSD)
   IPC_STRUCT_TRAITS_MEMBER(native_pixmap_handle)
 #elif defined(OS_MACOSX)
   IPC_STRUCT_TRAITS_MEMBER(mach_port)
@@ -66,12 +66,12 @@ IPC_STRUCT_TRAITS_BEGIN(gfx::GpuMemoryBufferId)
   IPC_STRUCT_TRAITS_MEMBER(id)
 IPC_STRUCT_TRAITS_END()
 
-#if defined(OS_LINUX) || defined(OS_FUCHSIA)
+#if defined(OS_LINUX) || defined(OS_FUCHSIA) || defined(OS_BSD)
 IPC_STRUCT_TRAITS_BEGIN(gfx::NativePixmapPlane)
   IPC_STRUCT_TRAITS_MEMBER(stride)
   IPC_STRUCT_TRAITS_MEMBER(offset)
   IPC_STRUCT_TRAITS_MEMBER(size)
-#if defined(OS_LINUX)
+#if defined(OS_LINUX) || defined(OS_BSD)
   IPC_STRUCT_TRAITS_MEMBER(fd)
 #elif defined(OS_FUCHSIA)
   IPC_STRUCT_TRAITS_MEMBER(vmo)




--- src/3rdparty/chromium/ui/gfx/mojo/buffer_types_struct_traits.cc.orig	2019-05-23 12:39:34 UTC
+++ src/3rdparty/chromium/ui/gfx/mojo/buffer_types_struct_traits.cc
@@ -28,7 +28,7 @@ bool StructTraits<gfx::mojom::BufferUsageAndFormatData
   return data.ReadUsage(&out->usage) && data.ReadFormat(&out->format);
 }
 
-#if defined(OS_LINUX)
+#if defined(OS_LINUX) || defined(OS_BSD)
 std::vector<mojo::ScopedHandle>
 StructTraits<gfx::mojom::NativePixmapHandleDataView, gfx::NativePixmapHandle>::
     fds(const gfx::NativePixmapHandle& pixmap_handle) {
@@ -55,7 +55,7 @@ bool StructTraits<
   }
   return data.ReadPlanes(&out->planes);
 }
-#endif  // defined(OS_LINUX)
+#endif  // defined(OS_LINUX) || defined(OS_BSD)
 
 gfx::mojom::GpuMemoryBufferPlatformHandlePtr StructTraits<
     gfx::mojom::GpuMemoryBufferHandleDataView,
@@ -68,7 +68,7 @@ gfx::mojom::GpuMemoryBufferPlatformHandlePtr StructTra
       return gfx::mojom::GpuMemoryBufferPlatformHandle::NewSharedMemoryHandle(
           std::move(handle.region));
     case gfx::NATIVE_PIXMAP:
-#if defined(OS_LINUX)
+#if defined(OS_LINUX) || defined(OS_BSD)
       return gfx::mojom::GpuMemoryBufferPlatformHandle::NewNativePixmapHandle(
           handle.native_pixmap_handle);
 #else
@@ -144,7 +144,7 @@ bool StructTraits<gfx::mojom::GpuMemoryBufferHandleDat
       out->type = gfx::SHARED_MEMORY_BUFFER;
       out->region = std::move(platform_handle->get_shared_memory_handle());
       return true;
-#if defined(OS_LINUX)
+#if defined(OS_LINUX) || defined(OS_BSD)
     case gfx::mojom::GpuMemoryBufferPlatformHandleDataView::Tag::
         NATIVE_PIXMAP_HANDLE:
       out->type = gfx::NATIVE_PIXMAP;




--- src/3rdparty/chromium/ui/gfx/mojo/buffer_types_struct_traits.h.orig	2019-05-23 12:39:34 UTC
+++ src/3rdparty/chromium/ui/gfx/mojo/buffer_types_struct_traits.h
@@ -189,7 +189,7 @@ struct StructTraits<gfx::mojom::GpuMemoryBufferIdDataV
   }
 };
 
-#if defined(OS_LINUX)
+#if defined(OS_LINUX) || defined(OS_BSD)
 template <>
 struct StructTraits<gfx::mojom::NativePixmapPlaneDataView,
                     gfx::NativePixmapPlane> {
@@ -229,7 +229,7 @@ struct StructTraits<gfx::mojom::NativePixmapHandleData
   static bool Read(gfx::mojom::NativePixmapHandleDataView data,
                    gfx::NativePixmapHandle* out);
 };
-#endif  // defined(OS_LINUX)
+#endif  // defined(OS_LINUX) || defined(OS_BSD)
 
 template <>
 struct StructTraits<gfx::mojom::GpuMemoryBufferHandleDataView,




--- src/3rdparty/chromium/ui/gfx/native_pixmap_handle.cc.orig	2019-11-27 21:12:25 UTC
+++ src/3rdparty/chromium/ui/gfx/native_pixmap_handle.cc
@@ -33,7 +33,7 @@ NativePixmapPlane::NativePixmapPlane() : stride(0), of
 NativePixmapPlane::NativePixmapPlane(int stride,
                                      int offset,
                                      uint64_t size
-#if defined(OS_LINUX)
+#if defined(OS_LINUX) || defined(OS_BSD)
                                      ,
                                      base::ScopedFD fd
 #elif defined(OS_FUCHSIA)
@@ -44,7 +44,7 @@ NativePixmapPlane::NativePixmapPlane(int stride,
     : stride(stride),
       offset(offset),
       size(size)
-#if defined(OS_LINUX)
+#if defined(OS_LINUX) || defined(OS_BSD)
       ,
       fd(std::move(fd))
 #elif defined(OS_FUCHSIA)
@@ -72,7 +72,7 @@ NativePixmapHandle& NativePixmapHandle::operator=(Nati
 NativePixmapHandle CloneHandleForIPC(const NativePixmapHandle& handle) {
   NativePixmapHandle clone;
   for (auto& plane : handle.planes) {
-#if defined(OS_LINUX)
+#if defined(OS_LINUX) || defined(OS_BSD)
     DCHECK(plane.fd.is_valid());
     base::ScopedFD fd_dup(HANDLE_EINTR(dup(plane.fd.get())));
     if (!fd_dup.is_valid()) {




--- src/3rdparty/chromium/ui/gfx/native_pixmap_handle.h.orig	2019-11-27 21:12:25 UTC
+++ src/3rdparty/chromium/ui/gfx/native_pixmap_handle.h
@@ -15,7 +15,7 @@
 #include "build/build_config.h"
 #include "ui/gfx/gfx_export.h"
 
-#if defined(OS_LINUX)
+#if defined(OS_LINUX) || defined(OS_BSD)
 #include "base/files/scoped_file.h"
 #endif
 
@@ -32,7 +32,7 @@ struct GFX_EXPORT NativePixmapPlane {
   NativePixmapPlane(int stride,
                     int offset,
                     uint64_t size
-#if defined(OS_LINUX)
+#if defined(OS_LINUX) || defined(OS_BSD)
                     ,
                     base::ScopedFD fd
 #elif defined(OS_FUCHSIA)
@@ -53,7 +53,7 @@ struct GFX_EXPORT NativePixmapPlane {
   // This is necessary to map the buffers.
   uint64_t size;
 
-#if defined(OS_LINUX)
+#if defined(OS_LINUX) || defined(OS_BSD)
   // File descriptor for the underlying memory object (usually dmabuf).
   base::ScopedFD fd;
 #elif defined(OS_FUCHSIA)




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

Added Link Here

(-)b/www/qt5-webengine/files/patch-src_3rdparty_chromium_ui_message__center_public_cpp_message__center__constants.h (+11 lines)
1	--- src/3rdparty/chromium/ui/message_center/public/cpp/message_center_constants.h.orig 2019-11-27 21:12:25 UTC
2	+++ src/3rdparty/chromium/ui/message_center/public/cpp/message_center_constants.h
3	@@ -105,7 +105,7 @@ const int kButtonHorizontalPadding = 16; // In DIPs.
4	const int kButtonIconTopPadding = 11; // In DIPs.
5	const int kButtonIconToTitlePadding = 16; // In DIPs.
6
7	-#if !defined(OS_LINUX) \|\| defined(USE_AURA)
8	+#if (!defined(OS_LINUX) && !defined(OS_BSD)) \|\| defined(USE_AURA)
9	constexpr SkColor kButtonSeparatorColor = SkColorSetRGB(234, 234, 234);
10	constexpr SkColor kHoveredButtonBackgroundColor = SkColorSetRGB(243, 243, 243);
11	#endif

Added Link Here

(-)b/www/qt5-webengine/files/patch-src_3rdparty_chromium_ui_message__center_views_message__popup__view.cc (+11 lines)
1	--- src/3rdparty/chromium/ui/message_center/views/message_popup_view.cc.orig 2019-11-27 21:12:25 UTC
2	+++ src/3rdparty/chromium/ui/message_center/views/message_popup_view.cc
3	@@ -106,7 +106,7 @@ void MessagePopupView::AutoCollapse() {
4	void MessagePopupView::Show() {
5	views::Widget::InitParams params(views::Widget::InitParams::TYPE_POPUP);
6	params.z_order = ui::ZOrderLevel::kFloatingWindow;
7	-#if defined(OS_LINUX) && !defined(OS_CHROMEOS)
8	+#if (defined(OS_LINUX) && !defined(OS_CHROMEOS)) \|\| defined(OS_BSD)
9	// Make the widget explicitly activatable as TYPE_POPUP is not activatable by
10	// default but we need focus for the inline reply textarea.
11	params.activatable = views::Widget::InitParams::ACTIVATABLE_YES;




--- src/3rdparty/chromium/ui/views/controls/label.cc.orig	2019-11-27 21:12:25 UTC
+++ src/3rdparty/chromium/ui/views/controls/label.cc
@@ -651,7 +651,7 @@ bool Label::OnMousePressed(const ui::MouseEvent& event
     GetFocusManager()->SetFocusedView(this);
   }
 

   if (event.IsOnlyMiddleMouseButton() && GetFocusManager() && !had_focus)
     GetFocusManager()->SetFocusedView(this);
 #endif
@@ -836,7 +836,7 @@ bool Label::PasteSelectionClipboard() {
 }
 
 void Label::UpdateSelectionClipboard() {
-#if defined(OS_LINUX) && !defined(OS_CHROMEOS)
+#if (defined(OS_LINUX) && !defined(OS_CHROMEOS)) || defined(OS_BSD)
   if (!GetObscured()) {
     ui::ScopedClipboardWriter(ui::ClipboardType::kSelection)
         .WriteText(GetSelectedText());

Lines 1-11 Link Here

(-)b/www/qt5-webengine/files/patch-src_3rdparty_chromium_ui_views_corewm_tooltip__aura.cc (-4 / +4 lines)
1	--- src/3rdparty/chromium/ui/views/corewm/tooltip_aura.cc.orig 2018-11-13 18:25:11 UTC	1	--- src/3rdparty/chromium/ui/views/corewm/tooltip_aura.cc.orig 2019-11-27 21:12:25 UTC
2	+++ src/3rdparty/chromium/ui/views/corewm/tooltip_aura.cc	2	+++ src/3rdparty/chromium/ui/views/corewm/tooltip_aura.cc
3	@@ -34,7 +34,7 @@ const int kCursorOffsetY = 15;	3	@@ -41,7 +41,7 @@ constexpr int kVerticalPaddingBottom = 5;
4		4
5	// TODO(varkha): Update if native widget can be transparent on Linux.	5	// TODO(varkha): Update if native widget can be transparent on Linux.
6	bool CanUseTranslucentTooltipWidget() {	6	bool CanUseTranslucentTooltipWidget() {
7	-#if defined(OS_LINUX) && !defined(OS_CHROMEOS)	7	-#if (defined(OS_LINUX) && !defined(OS_CHROMEOS)) \|\| defined(OS_WIN)
8	+#if (defined(OS_LINUX) \|\| defined(OS_BSD)) && !defined(OS_CHROMEOS)	8	+#if (defined(OS_LINUX) && !defined(OS_CHROMEOS)) \|\| defined(OS_WIN) \|\| defined(OS_BSD)
9	return false;	9	return false;
10	#else	10	#else
11	return true;	11	return true;

Lines 1-6 Link Here

(-)b/www/qt5-webengine/files/patch-src_3rdparty_chromium_v8_src_api_api.cc (-4 / +4 lines)
1	--- src/3rdparty/chromium/v8/src/api.cc.orig 2019-05-23 12:39:34 UTC	1	--- src/3rdparty/chromium/v8/src/api/api.cc.orig 2019-11-27 21:12:25 UTC
2	+++ src/3rdparty/chromium/v8/src/api.cc	2	+++ src/3rdparty/chromium/v8/src/api/api.cc
3	@@ -107,7 +107,7 @@	3	@@ -110,7 +110,7 @@
4	#include "src/wasm/wasm-result.h"	4	#include "src/wasm/wasm-result.h"
5	#include "src/wasm/wasm-serialization.h"	5	#include "src/wasm/wasm-serialization.h"
6		6
Lines 9-15 Link Here
9	#include <signal.h>	9	#include <signal.h>
10	#include "include/v8-wasm-trap-handler-posix.h"	10	#include "include/v8-wasm-trap-handler-posix.h"
11	#include "src/trap-handler/handler-inside-posix.h"	11	#include "src/trap-handler/handler-inside-posix.h"
12	@@ -5759,7 +5759,7 @@ bool v8::V8::Initialize() {	12	@@ -5550,7 +5550,7 @@ bool v8::V8::Initialize() {
13	return true;	13	return true;
14	}	14	}
15		15




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

Removed Link Here

(-)a/www/qt5-webengine/files/patch-src_3rdparty_chromium_v8_src_external-reference-table.cc (-11 lines)
1	--- src/3rdparty/chromium/v8/src/external-reference-table.cc.orig 2019-05-23 12:39:34 UTC
2	+++ src/3rdparty/chromium/v8/src/external-reference-table.cc
3	@@ -9,7 +9,7 @@
4	#include "src/external-reference.h"
5	#include "src/ic/stub-cache.h"
6
7	-#if defined(DEBUG) && defined(V8_OS_LINUX) && !defined(V8_OS_ANDROID)
8	+#if defined(DEBUG) && (defined(V8_OS_LINUX) \|\| defined(V8_OS_FREEBSD)) && !defined(V8_OS_ANDROID)
9	#define SYMBOLIZE_FUNCTION
10	#include <execinfo.h>
11	#include <vector>

Removed Link Here

(-)a/www/qt5-webengine/files/patch-src_3rdparty_chromium_v8_src_log-utils.h (-11 lines)
1	--- src/3rdparty/chromium/v8/src/log-utils.h.orig 2018-11-13 18:25:11 UTC
2	+++ src/3rdparty/chromium/v8/src/log-utils.h
3	@@ -15,6 +15,8 @@
4	#include "src/flags.h"
5	#include "src/ostreams.h"
6
7	+#include <stdarg.h>
8	+
9	namespace v8 {
10	namespace internal {
11




--- src/3rdparty/chromium/v8/src/ppc/constants-ppc.h.orig	2019-05-23 12:39:34 UTC
+++ src/3rdparty/chromium/v8/src/ppc/constants-ppc.h
@@ -21,7 +21,8 @@
 #endif
 
 #if V8_HOST_ARCH_PPC && \
-    (V8_OS_AIX || (V8_TARGET_ARCH_PPC64 && V8_TARGET_BIG_ENDIAN))
+    (V8_OS_AIX || (V8_TARGET_ARCH_PPC64 && \
+      (V8_TARGET_BIG_ENDIAN && (!defined(_CALL_ELF) || _CALL_ELF == 1))))
 #define ABI_USES_FUNCTION_DESCRIPTORS 1
 #else
 #define ABI_USES_FUNCTION_DESCRIPTORS 0
@@ -33,13 +34,15 @@
 #define ABI_PASSES_HANDLES_IN_REGS 0
 #endif
 
-#if !V8_HOST_ARCH_PPC || !V8_TARGET_ARCH_PPC64 || V8_TARGET_LITTLE_ENDIAN
+#if !V8_HOST_ARCH_PPC || !V8_TARGET_ARCH_PPC64 || \
+    (V8_TARGET_LITTLE_ENDIAN || (defined(_CALL_ELF) && _CALL_ELF == 2))
 #define ABI_RETURNS_OBJECT_PAIRS_IN_REGS 1
 #else
 #define ABI_RETURNS_OBJECT_PAIRS_IN_REGS 0
 #endif
 
-#if !V8_HOST_ARCH_PPC || (V8_TARGET_ARCH_PPC64 && V8_TARGET_LITTLE_ENDIAN)
+#if !V8_HOST_ARCH_PPC || (V8_TARGET_ARCH_PPC64 && \
+    (V8_TARGET_LITTLE_ENDIAN || (defined(_CALL_ELF) && _CALL_ELF == 2)))
 #define ABI_CALL_VIA_IP 1
 #else
 #define ABI_CALL_VIA_IP 0




--- src/3rdparty/chromium/v8/src/ppc/register-ppc.h.orig	2019-05-23 12:39:34 UTC
+++ src/3rdparty/chromium/v8/src/ppc/register-ppc.h
@@ -145,7 +145,8 @@ const int kNumSafepointRegisters = 32;
 // The following constants describe the stack frame linkage area as
 // defined by the ABI.  Note that kNumRequiredStackFrameSlots must
 // satisfy alignment requirements (rounding up if required).
-#if V8_TARGET_ARCH_PPC64 && V8_TARGET_LITTLE_ENDIAN  // ppc64le linux
+#if V8_TARGET_ARCH_PPC64 && (V8_TARGET_LITTLE_ENDIAN || \
+    defined(_CALL_ELF) && _CALL_ELF == 2)
 // [0] back chain
 // [1] condition register save area
 // [2] link register save area




--- src/3rdparty/chromium/v8/test/BUILD.gn.orig	2019-11-27 21:12:25 UTC
+++ src/3rdparty/chromium/v8/test/BUILD.gn
@@ -32,7 +32,7 @@ group("gn_all") {
     deps += [
       "cctest:cctest",
       "cctest:generate-bytecode-expectations",

     ]
   }
 }
@@ -82,10 +82,10 @@ group("v8_bot_default") {
     "mjsunit:v8_mjsunit",
     "mkgrokdump:mkgrokdump",
     "preparser:v8_preparser",
-    "unittests:unittests",
+    #"unittests:unittests",
     "wasm-api-tests:wasm_api_tests",
     "wasm-js:v8_wasm_js",
-    "wasm-spec-tests:v8_wasm_spec_tests",
+    #"wasm-spec-tests:v8_wasm_spec_tests",
     "webkit:v8_webkit",
   ]
 }
@@ -103,10 +103,10 @@ group("v8_default") {
     "mjsunit:v8_mjsunit",
     "mkgrokdump:mkgrokdump",
     "preparser:v8_preparser",
-    "unittests:unittests",
+    #"unittests:unittests",
     "wasm-api-tests:wasm_api_tests",
-    "wasm-js:v8_wasm_js",
-    "wasm-spec-tests:v8_wasm_spec_tests",
+    #"unittests:unittests",
+    #"wasm-js:v8_wasm_js",
+    #"wasm-spec-tests:v8_wasm_spec_tests",
   ]

Added Link Here

(-)b/www/qt5-webengine/files/patch-src_3rdparty_gn_base_files_file__util__posix.cc (+11 lines)
1	--- src/3rdparty/gn/base/files/file_util_posix.cc.orig 2019-11-27 21:12:25 UTC
2	+++ src/3rdparty/gn/base/files/file_util_posix.cc
3	@@ -254,7 +254,7 @@ bool ReplaceFile(const FilePath& from_path,
4	#endif // !defined(OS_NACL_NONSFI)
5
6	bool CreateLocalNonBlockingPipe(int fds[2]) {
7	-#if defined(OS_LINUX)
8	+#if defined(OS_LINUX) \|\| defined(OS_BSD)
9	return pipe2(fds, O_CLOEXEC \| O_NONBLOCK) == 0;
10	#else
11	int raw_fds[2];




--- src/3rdparty/gn/build/gen.py.orig	2019-11-27 21:12:25 UTC
+++ src/3rdparty/gn/build/gen.py
@@ -46,7 +46,7 @@ class Platform(object):
 
   @staticmethod
   def known_platforms():
-    return ['linux', 'darwin', 'msvc', 'aix', 'fuchsia', 'openbsd']
+    return ['linux', 'darwin', 'msvc', 'aix', 'fuchsia', 'openbsd', 'freebsd']
 
   def platform(self):
     return self._platform
@@ -69,6 +69,9 @@ class Platform(object):
   def is_aix(self):
     return self._platform == 'aix'
 

+    return self._platform == 'freebsd'
+
   def is_posix(self):
     return self._platform in ['linux', 'freebsd', 'darwin', 'aix', 'openbsd']
 
@@ -364,6 +367,11 @@ def WriteGNNinja(path, platform, host, options):
     elif platform.is_aix():
       cflags_cc.append('-maix64')
       ldflags.append('-maix64')

Lines 1-6 Link Here

(-)b/www/qt5-webengine/files/patch-src_buildtools_config_linux.pri (-4 / +4 lines)
1	--- src/core/config/linux.pri.orig 2019-01-16 22:42:58 UTC	1	--- src/buildtools/config/linux.pri.orig 2019-12-03 07:18:02 UTC
2	+++ src/core/config/linux.pri	2	+++ src/buildtools/config/linux.pri
3	@@ -166,6 +166,11 @@ host_build {	3	@@ -190,6 +190,11 @@ host_build {
4	} else {	4	} else {
5	gn_args += use_alsa=false	5	gn_args += use_alsa=false
6	}	6	}
Lines 11-14 Link Here
11	+ }	11	+ }
12	!packagesExist(libpci): gn_args += use_libpci=false	12	!packagesExist(libpci): gn_args += use_libpci=false
13		13
14	qtConfig(webengine-system-x11): hasX11Dependencies() {	14	qtConfig(webengine-ozone-x11) {

Added Link Here

(-)b/www/qt5-webengine/files/patch-src_buildtools_config_support.pri (+10 lines)
1	--- src/buildtools/config/support.pri.orig 2020-01-09 09:16:12 UTC
2	+++ src/buildtools/config/support.pri
3	@@ -68,6 +68,7 @@ defineReplace(qtwebengine_checkError) {
4
5	linux:!qtwebengine_checkErrorForLinux():return(false)
6	win:!qtwebengine_checkErrorForWindows():return(false)
7	+ unix:!qtwebengine_checkErrorForLinux():return(false)
8
9	sanitizer: !qtConfig(webengine-sanitizer) {
10	qtwebengine_skipBuild("Chosen sanitizer configuration is not supported for QtWebEngine. Check config.log for details or use -feature-webengine-sanitizer to force build with the chosen sanitizer configuration.")




--- src/core/configure.json.orig	2019-12-03 07:18:02 UTC
+++ src/core/configure.json
@@ -21,6 +21,7 @@
             "webengine-printing-and-pdf": "boolean",
             "webengine-proprietary-codecs": "boolean",
             "webengine-pulseaudio": "boolean",
+            "webengine-sndio": "boolean",
             "webengine-spellchecker": "boolean",
             "webengine-native-spellchecker": "boolean",
             "webengine-extensions": "boolean",
@@ -31,6 +32,7 @@
             "webengine-kerberos": "boolean",
             "alsa": { "type": "boolean", "name": "webengine-alsa" },
             "pulseaudio": { "type": "boolean", "name": "webengine-pulseaudio" },
+	    "sndio": { "type": "boolean", "name": "webengine-sndio" },
             "ffmpeg": { "type": "enum", "name": "webengine-system-ffmpeg", "values": { "system": "yes", "qt": "no" } },
             "opus": { "type": "enum", "name": "webengine-system-opus", "values": { "system": "yes", "qt": "no" } },
             "webp": { "type": "enum", "name": "webengine-system-libwebp", "values": { "system": "yes", "qt": "no" } },
@@ -68,6 +70,12 @@
             "sources": [
                 { "type": "pkgConfig", "args": "libpulse >= 0.9.10 libpulse-mainloop-glib" }
             ]
+        },
+        "sndio": {
+            "label": "sndio",
+            "sources": [
+                { "type": "pkgConfig", "args": "libsndio >= 1.5.0 libsndio" }
+            ]
         }
     },
     "tests" : {
@@ -136,6 +144,10 @@
             "condition": "libs.webengine-pulseaudio",
             "condition": "libs.pulseaudio",
             "output": [ "privateFeature" ]
         },
+        "webengine-sndio": {

         "webengine-pepper-plugins": {
             "label": "Pepper Plugins",
             "purpose": "Enables use of Pepper Flash plugins.",
@@ -305,6 +317,11 @@
                 {
                     "type": "feature",
                     "args": "webengine-pulseaudio",




// Use of this source code is governed by a BSD-style license that can be
// found in the LICENSE file.

#include "media/audio/sndio/sndio_input.h"

#include <stddef.h>

#include "base/bind.h"
#include "base/logging.h"
#include "base/macros.h"
#include "base/message_loop/message_loop.h"
#include "media/base/audio_timestamp_helper.h"
#include "media/audio/openbsd/audio_manager_openbsd.h"
#include "media/audio/audio_manager.h"
#include "media/audio/sndio/sndio_input.h"

namespace media {

static const SampleFormat kSampleFormat = kSampleFormatS16;

void SndioAudioInputStream::OnMoveCallback(void *arg, int delta)
{
  SndioAudioInputStream* self = static_cast<SndioAudioInputStream*>(arg);

  self->hw_delay += delta;
}

void *SndioAudioInputStream::ThreadEntry(void *arg) {
  NOTIMPLEMENTED();
  SndioAudioInputStream* self = static_cast<SndioAudioInputStream*>(arg);

  self->ThreadLoop();
  return NULL;
}

SndioAudioInputStream::SndioAudioInputStream(AudioManagerBase* manager,
                                             const std::string& device_name,
                                             const AudioParameters& params)
    : manager(manager),
      params(params),
      audio_bus(AudioBus::Create(params)),
      state(kClosed) {
      buffer_duration_(base::TimeDelta::FromMicroseconds(
          params.frames_per_buffer() * base::Time::kMicrosecondsPerSecond /
          static_cast<float>(params.sample_rate()))),
      callback_(NULL),
      device_handle_(NULL),
      read_callback_behind_schedule_(false),
      audio_bus_(AudioBus::Create(params)) {
}

SndioAudioInputStream::~SndioAudioInputStream() {
  if (state != kClosed)
    Close();
}

bool SndioAudioInputStream::Open() {
  struct sio_par par;
  int sig;

  if (state != kClosed)
    return false;

  if (params.format() != AudioParameters::AUDIO_PCM_LINEAR &&
      params.format() != AudioParameters::AUDIO_PCM_LOW_LATENCY) {
    LOG(WARNING) << "Unsupported audio format.";
    return false;
  }

  sio_initpar(&par);
  par.rate = params.sample_rate();
  par.rchan = params.channels();
  par.bits = SampleFormatToBitsPerChannel(kSampleFormat);
  par.bps = par.bits / 8;
  par.sig = sig = par.bits != 8 ? 1 : 0;
  par.le = SIO_LE_NATIVE;
  par.appbufsz = params.frames_per_buffer();
  sndio_rec_bufsz_ = par.bufsz;
  sndio_rec_bufsize_ = par.round * par.bps * par.rchan;

  hdl = sio_open(SIO_DEVANY, SIO_REC, 0);

  if (hdl == NULL) {
    LOG(ERROR) << "Couldn't open audio device.";
    return false;
  }

  if (!sio_setpar(hdl, &par) || !sio_getpar(hdl, &par)) {
    LOG(ERROR) << "Couldn't set audio parameters.";
    goto bad_close;
  }

  if (par.rate  != (unsigned int)params.sample_rate() ||
      par.rchan != (unsigned int)params.channels() ||
      par.bits  != (unsigned int)SampleFormatToBitsPerChannel(kSampleFormat) ||
      par.sig   != (unsigned int)sig ||
      (par.bps > 1 && par.le != SIO_LE_NATIVE) ||
      (par.bits != par.bps * 8)) {
    LOG(ERROR) << "Unsupported audio parameters.";
    goto bad_close;
  }
  state = kStopped;
  buffer = new char[audio_bus->frames() * params.GetBytesPerFrame(kSampleFormat)];
  sio_onmove(hdl, &OnMoveCallback, this);

  return true;
bad_close:
  sio_close(hdl);
  return false;
}

void SndioAudioInputStream::Start(AudioInputCallback* cb) {
  DCHECK(!callback_ && callback);
  callback_ = callback;
  StartAgc();

  StartAgc();
  // buffer might have got filled, to accommodate some delays in the audio
  // driver. This could also give us a smooth read sequence going forward.
  base::TimeDelta delay = buffer_duration_ + buffer_duration_ / 2;
  next_read_time_ = base::TimeTicks::Now() + delay;
  if (pthread_create(&thread_, NULL, sndio_in_threadstart, this) != 0)
    LOG(ERROR) << "Failed to create real-time thread.";
}

  state = kRunning;
  hw_delay = 0;
  callback = cb;
  sio_start(hdl);
  if (pthread_create(&thread, NULL, &ThreadEntry, this) != 0) {
    LOG(ERROR) << "Failed to create real-time thread for recording.";
    sio_stop(hdl);
    state = kStopped;
  }
}

void SndioAudioInputStream::Stop() {
  if (!device_handle_ || !callback_)
    return;

  if (state == kStopped)
    return;

  state = kStopWait;
  pthread_join(thread, NULL);
  sio_stop(hdl);
  state = kStopped;

  StopAgc();
}

void SndioAudioInputStream::Close() {
  if (device_handle_) {
    sio_close(device_handle_);
    audio_buffer_.reset();
    device_handle_ = NULL;
  }

  if (state == kClosed)
    return;

  if (state == kRunning)
    Stop();

  state = kClosed;
  delete [] buffer;
  sio_close(hdl);

  manager->ReleaseInputStream(this);
}

double SndioAudioInputStream::GetMaxVolume() {
  // Not supported
  return 0.0;
}

void SndioAudioInputStream::SetVolume(double volume) {
  // Not supported. Do nothing.
}

double SndioAudioInputStream::GetVolume() {
  // Not supported.
  return 0.0;
}

bool SndioAudioInputStream::IsMuted() {
  // Not supported.
  return false;
}

void SndioAudioInputStream::SetOutputDeviceForAec(
    const std::string& output_device_id) {
  // Not supported.
}

void SndioAudioInputStream::ThreadLoop(void) {
  size_t todo, n;
  char *data;
  unsigned int nframes;
  double normalized_volume = 0.0;

  nframes = audio_bus->frames();

  while (state == kRunning && !sio_eof(hdl)) {

    GetAgcVolume(&normalized_volume);

    // read one block
    todo = nframes * params.GetBytesPerFrame(kSampleFormat);
    data = buffer;
    while (todo > 0) {
      n = sio_read(hdl, data, todo);
      if (n == 0)
        return;	// unrecoverable I/O error
      todo -= n;
      data += n;
    }
    hw_delay -= nframes;

    // convert frames count to TimeDelta
    const base::TimeDelta delay = AudioTimestampHelper::FramesToTime(hw_delay,
      params.sample_rate());

    // push into bus
    audio_bus->FromInterleaved(buffer, nframes, SampleFormatToBytesPerChannel(kSampleFormat));

    // invoke callback
    callback->OnData(audio_bus.get(), base::TimeTicks::Now() - delay, 1.);
  }
}

}  // namespace media





class AudioManagerBase;

// Implementation of AudioOutputStream using sndio(7)
extern "C" {
  // Invoked (on the real-time thread) at each sound card clock tick
  void sndio_in_onmove(void *arg, int delta);
  // Invoked (on the real-time thread) whenever the volume changes
  void sndio_in_onvol(void *arg, unsigned int vol);
  // Real-time thread entry point
  void *sndio_in_threadstart(void *arg);
}

// Provides an input stream for audio capture based on the SNDIO PCM interface.
// This object is not thread safe and all methods should be invoked in the
// thread that created the object.
class SndioAudioInputStream : public AgcAudioStream<AudioInputStream> {
 public:
  // Pass this to the constructor if you want to attempt auto-selection

  bool IsMuted() override;
  void SetOutputDeviceForAec(const std::string& output_device_id) override;

  // C-linkage call-backs are friends to access private data
  friend void sndio_in_onmove(void *arg, int delta);
  friend void sndio_in_onvol(void *arg, unsigned int vol);
  friend void *sndio_in_threadstart(void *arg);

 private:

  enum StreamState {
    kClosed,            // Not opened yet
    kStopped,           // Device opened, but not started yet
    kRunning,           // Started, device playing
    kStopWait           // Stopping, waiting for the real-time thread to exit
  };

  // C-style call-backs
  static void OnMoveCallback(void *arg, int delta);
  static void* ThreadEntry(void *arg);

  // Continuously moves data from the device to the consumer
  void ThreadLoop();
  // Our creator, the audio manager needs to be notified when we close.
  AudioManagerBase* manager;
  // Parameters of the source
  AudioParameters params;
  // We store data here for consumer
  std::unique_ptr<AudioBus> audio_bus;
  // Call-back that consumes recorded data
  AudioInputCallback* callback;  // Valid during a recording session.
  // Handle of the audio device
  struct sio_hdl* hdl;
  // Current state of the stream
  enum StreamState state;
  // High priority thread running ThreadLoop()
  pthread_t thread;
  // Number of frames buffered in the hardware
  int hw_delay;
  // Temporary buffer where data is stored sndio-compatible format
  char* buffer;
  pthread_t thread_;

  DISALLOW_COPY_AND_ASSIGN(SndioAudioInputStream);
};





static const SampleFormat kSampleFormat = kSampleFormatS16;

void SndioAudioOutputStream::OnMoveCallback(void *arg, int delta) {
  SndioAudioOutputStream* self = static_cast<SndioAudioOutputStream*>(arg);

  self->hw_delay -= delta;
}

void SndioAudioOutputStream::OnVolCallback(void *arg, unsigned int vol) {
  SndioAudioOutputStream* self = static_cast<SndioAudioOutputStream*>(arg);

  self->vol = vol;
}

void *SndioAudioOutputStream::ThreadEntry(void *arg) {
  SndioAudioOutputStream* self = static_cast<SndioAudioOutputStream*>(arg);

  self->ThreadLoop();
  return NULL;
}


    : manager(manager),
      params(params),
      audio_bus(AudioBus::Create(params)),
      bytes_per_frame(params.GetBytesPerFrame(kSampleFormat)),
      state(kClosed),
      mutex(PTHREAD_MUTEX_INITIALIZER) {
}

  volpending = 0;
  vol = 0;
  buffer = new char[audio_bus->frames() * params.GetBytesPerFrame(kSampleFormat)];
  sio_onmove(hdl, &OnMoveCallback, this);
  sio_onvol(hdl, &OnVolCallback, this);
  return true;
 bad_close:
  sio_close(hdl);

  hw_delay = 0;
  source = callback;
  sio_start(hdl);
  if (pthread_create(&thread, NULL, &ThreadEntry, this) != 0) {
    LOG(ERROR) << "Failed to create real-time thread.";
    sio_stop(hdl);
    state = kStopped;

  pthread_mutex_unlock(&mutex);
}

// This stream is always used with sub second buffer sizes, where it's
// sufficient to simply always flush upon Start().
void SndioAudioOutputStream::Flush() {}

void SndioAudioOutputStream::ThreadLoop(void) {
  int avail, count, result;

  while (state == kRunning) {
    // Update volume if needed

    pthread_mutex_unlock(&mutex);

    // Get data to play
    const base::TimeDelta delay = AudioTimestampHelper::FramesToTime(hw_delay,
	params.sample_rate());
    count = source->OnMoreData(delay, base::TimeTicks::Now(), 0, audio_bus.get());
    audio_bus->ToInterleaved(count, SampleFormatToBytesPerChannel(kSampleFormat), buffer);
    if (count == 0) {


    // Submit data to the device
    avail = count * params.GetBytesPerFrame(kSampleFormat);
    result = sio_write(hdl, buffer, avail);
    if (result == 0) {
      LOG(WARNING) << "Audio device disconnected.";
      break;
    }




#include "base/time/time.h"
#include "media/audio/audio_io.h"


namespace media {

class AudioParameters;
class AudioManagerBase;

// call-backs invoked from C libraries, thus requiring C linkage
extern "C" {
  // Invoked (on the real-time thread) at each sound card clock tick
  void sndio_onmove(void *arg, int delta);
  // Invoked (on the real-time thread) whenever the volume changes
  void sndio_onvol(void *arg, unsigned int vol);
  // Real-time thread entry point
  void *sndio_threadstart(void *arg);
}

// Implementation of AudioOutputStream using sndio(7)
class SndioAudioOutputStream : public AudioOutputStream {
 public:

  virtual ~SndioAudioOutputStream();

  // Implementation of AudioOutputStream.
  bool Open() override;
  void Close() override;
  void Start(AudioSourceCallback* callback) override;
  void Stop() override;
  void SetVolume(double volume) override;
  void GetVolume(double* volume) override;
  void Flush() override;

  // C-linkage call-backs are friends to access private data
  friend void sndio_onmove(void *arg, int delta);
  friend void sndio_onvol(void *arg, unsigned int vol);
  friend void *sndio_threadstart(void *arg);

    kRunning,           // Started, device playing
    kStopWait           // Stopping, waiting for the real-time thread to exit
  };

  // C-style call-backs
  static void OnMoveCallback(void *arg, int delta);
  static void OnVolCallback(void *arg, unsigned int vol);
  static void* ThreadEntry(void *arg);

  // Continuously moves data from the producer to the device
  void ThreadLoop(void);

  // Our creator, the audio manager needs to be notified when we close.
  AudioManagerBase* manager;
  // Parameters of the source
  AudioParameters params;
  // Source stores data here
  std::unique_ptr<AudioBus> audio_bus;
  int bytes_per_frame;
  // Call-back that produces data to play
  AudioSourceCallback* source;
  // Handle of the audio device
  struct sio_hdl* hdl;
  // Current state of the stream
  enum StreamState state;
  // High priority thread running ThreadLoop()
  pthread_t thread;
  // Protects vol, volpending and hw_delay
  pthread_mutex_t mutex;

  int vol;
  // Set to 1 if volumes must be refreshed in the realtime thread
  int volpending;
  // Number of frames buffered in the hardware
  int hw_delay;
  // Temporary buffer where data is stored sndio-compatible format
  char* buffer;




%%QT_INCDIR%%/QtWebEngineCore/QWebEngineCallback
%%QT_INCDIR%%/QtWebEngineCore/QWebEngineClientCertificateStore
%%QT_INCDIR%%/QtWebEngineCore/QWebEngineCookieStore
%%QT_INCDIR%%/QtWebEngineCore/QWebEngineFindTextResult
%%QT_INCDIR%%/QtWebEngineCore/QWebEngineHttpRequest
%%QT_INCDIR%%/QtWebEngineCore/QWebEngineNotification
%%QT_INCDIR%%/QtWebEngineCore/QWebEngineQuotaRequest

%%QT_INCDIR%%/QtWebEngineCore/qwebenginecallback.h
%%QT_INCDIR%%/QtWebEngineCore/qwebengineclientcertificatestore.h
%%QT_INCDIR%%/QtWebEngineCore/qwebenginecookiestore.h
%%QT_INCDIR%%/QtWebEngineCore/qwebenginefindtextresult.h
%%QT_INCDIR%%/QtWebEngineCore/qwebenginehttprequest.h
%%QT_INCDIR%%/QtWebEngineCore/qwebenginenotification.h
%%QT_INCDIR%%/QtWebEngineCore/qwebenginequotarequest.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/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%%/Qt5WebEngine/Qt5WebEngineConfig.cmake
%%QT_CMAKEDIR%%/Qt5WebEngine/Qt5WebEngineConfigVersion.cmake

Lines 4-10 Link Here

(-)b/x11-themes/qt5-style-plugins/Makefile (-1 lines)
4	PORTNAME= qt5-style-plugins	4	PORTNAME= qt5-style-plugins
5	DISTVERSIONPREFIX= v	5	DISTVERSIONPREFIX= v
6	DISTVERSION= 5.0.0-23	6	DISTVERSION= 5.0.0-23
7	PORTREVISION= 7
8	DISTVERSIONSUFFIX= -g335dbe	7	DISTVERSIONSUFFIX= -g335dbe
9	CATEGORIES= x11-themes	8	CATEGORIES= x11-themes
10	DIST_SUBDIR= KDE/Qt/addons	9	DIST_SUBDIR= KDE/Qt/addons

Lines 2-8 Link Here

(-)b/x11-toolkits/qt5-declarative/Makefile (-1 lines)
2		2
3	PORTNAME= declarative	3	PORTNAME= declarative
4	DISTVERSION= ${QT5_VERSION}	4	DISTVERSION= ${QT5_VERSION}
5	PORTREVISION= 1
6	CATEGORIES= x11-toolkits	5	CATEGORIES= x11-toolkits
7	PKGNAMEPREFIX= qt5-	6	PKGNAMEPREFIX= qt5-
8		7

Added Link Here

(-)b/x11-toolkits/qt5-declarative/files/patch-tools_qmlimportscanner_qmlimportscanner.pro (+11 lines)
1	--- tools/qmlimportscanner/qmlimportscanner.pro.orig 2019-12-31 21:19:52 UTC
2	+++ tools/qmlimportscanner/qmlimportscanner.pro
3	@@ -47,7 +47,7 @@ cmake_config_file.output = $$MODULE_BASE_OUTDIR/lib/cm
4	QMAKE_SUBSTITUTES += cmake_config_file
5
6	cmake_build_integration.files = $$cmake_config_file.output $$PWD/Qt5QmlImportScannerTemplate.cpp.in
7	-cmake_build_integration.path = $$[QT_INSTALL_LIBS]/cmake/Qt5QmlImportScanner
8	+cmake_build_integration.path = $$[QT_INSTALL_PREFIX]/lib/cmake/Qt5QmlImportScanner
9	prefix_build: INSTALLS += cmake_build_integration
10	else: COPIES += cmake_build_integration
11




%%QT_INCDIR%%/QtQml/%%FULLVER%%/QtQml/private/qjsvalue_p.h
%%QT_INCDIR%%/QtQml/%%FULLVER%%/QtQml/private/qjsvalueiterator_p.h
%%QT_INCDIR%%/QtQml/%%FULLVER%%/QtQml/private/qlazilyallocated_p.h
%%QT_INCDIR%%/QtQml/%%FULLVER%%/QtQml/private/qlinkedstringhash_p.h
%%QT_INCDIR%%/QtQml/%%FULLVER%%/QtQml/private/qml_compile_hash_p.h
%%QT_INCDIR%%/QtQml/%%FULLVER%%/QtQml/private/qparallelanimationgroupjob_p.h
%%QT_INCDIR%%/QtQml/%%FULLVER%%/QtQml/private/qpauseanimationjob_p.h
%%QT_INCDIR%%/QtQml/%%FULLVER%%/QtQml/private/qpodvector_p.h
%%QT_INCDIR%%/QtQml/%%FULLVER%%/QtQml/private/qprimefornumbits_p.h
%%QT_INCDIR%%/QtQml/%%FULLVER%%/QtQml/private/qqmlabstractbinding_p.h
%%QT_INCDIR%%/QtQml/%%FULLVER%%/QtQml/private/qqmlabstractprofileradapter_p.h
%%QT_INCDIR%%/QtQml/%%FULLVER%%/QtQml/private/qqmlapiversion_p.h
%%QT_INCDIR%%/QtQml/%%FULLVER%%/QtQml/private/qqmlapplicationengine_p.h
%%QT_INCDIR%%/QtQml/%%FULLVER%%/QtQml/private/qqmlbind_p.h
%%QT_INCDIR%%/QtQml/%%FULLVER%%/QtQml/private/qqmlbinding_p.h
%%QT_INCDIR%%/QtQml/%%FULLVER%%/QtQml/private/qqmlboundsignal_p.h
%%QT_INCDIR%%/QtQml/%%FULLVER%%/QtQml/private/qqmlboundsignalexpressionpointer_p.h
%%QT_INCDIR%%/QtQml/%%FULLVER%%/QtQml/private/qqmlbuiltinfunctions_p.h
%%QT_INCDIR%%/QtQml/%%FULLVER%%/QtQml/private/qqmlchangeset_p.h
%%QT_INCDIR%%/QtQml/%%FULLVER%%/QtQml/private/qqmlcleanup_p.h
%%QT_INCDIR%%/QtQml/%%FULLVER%%/QtQml/private/qqmlcomponent_p.h
%%QT_INCDIR%%/QtQml/%%FULLVER%%/QtQml/private/qqmlcomponentattached_p.h

%%QT_INCDIR%%/QtQml/%%FULLVER%%/QtQml/private/qqmlcontext_p.h
%%QT_INCDIR%%/QtQml/%%FULLVER%%/QtQml/private/qqmlcustomparser_p.h
%%QT_INCDIR%%/QtQml/%%FULLVER%%/QtQml/private/qqmldata_p.h
%%QT_INCDIR%%/QtQml/%%FULLVER%%/QtQml/private/qqmldatablob_p.h
%%QT_INCDIR%%/QtQml/%%FULLVER%%/QtQml/private/qqmldebugconnector_p.h
%%QT_INCDIR%%/QtQml/%%FULLVER%%/QtQml/private/qqmldebugpluginmanager_p.h
%%QT_INCDIR%%/QtQml/%%FULLVER%%/QtQml/private/qqmldebugserver_p.h

%%QT_INCDIR%%/QtQml/%%FULLVER%%/QtQml/private/qqmldebugserviceinterfaces_p.h
%%QT_INCDIR%%/QtQml/%%FULLVER%%/QtQml/private/qqmldebugstatesdelegate_p.h
%%QT_INCDIR%%/QtQml/%%FULLVER%%/QtQml/private/qqmldelayedcallqueue_p.h
%%QT_INCDIR%%/QtQml/%%FULLVER%%/QtQml/private/qqmldirdata_p.h
%%QT_INCDIR%%/QtQml/%%FULLVER%%/QtQml/private/qqmldelegatemodel_p.h
%%QT_INCDIR%%/QtQml/%%FULLVER%%/QtQml/private/qqmldelegatemodel_p_p.h
%%QT_INCDIR%%/QtQml/%%FULLVER%%/QtQml/private/qqmldirparser_p.h
%%QT_INCDIR%%/QtQml/%%FULLVER%%/QtQml/private/qqmlengine_p.h
%%QT_INCDIR%%/QtQml/%%FULLVER%%/QtQml/private/qqmlenumdata_p.h
%%QT_INCDIR%%/QtQml/%%FULLVER%%/QtQml/private/qqmlenumvalue_p.h
%%QT_INCDIR%%/QtQml/%%FULLVER%%/QtQml/private/qqmlexpression_p.h
%%QT_INCDIR%%/QtQml/%%FULLVER%%/QtQml/private/qqmlextensionplugin_p.h
%%QT_INCDIR%%/QtQml/%%FULLVER%%/QtQml/private/qqmlfileselector_p.h

%%QT_INCDIR%%/QtQml/%%FULLVER%%/QtQml/private/qqmlguard_p.h
%%QT_INCDIR%%/QtQml/%%FULLVER%%/QtQml/private/qqmlimport_p.h
%%QT_INCDIR%%/QtQml/%%FULLVER%%/QtQml/private/qqmlincubator_p.h
%%QT_INCDIR%%/QtQml/%%FULLVER%%/QtQml/private/qqmlinstantiator_p.h
%%QT_INCDIR%%/QtQml/%%FULLVER%%/QtQml/private/qqmlinstantiator_p_p.h
%%QT_INCDIR%%/QtQml/%%FULLVER%%/QtQml/private/qqmlirbuilder_p.h
%%QT_INCDIR%%/QtQml/%%FULLVER%%/QtQml/private/qqmlirloader_p.h
%%QT_INCDIR%%/QtQml/%%FULLVER%%/QtQml/private/qqmljavascriptexpression_p.h
%%QT_INCDIR%%/QtQml/%%FULLVER%%/QtQml/private/qqmljsast_p.h
%%QT_INCDIR%%/QtQml/%%FULLVER%%/QtQml/private/qqmljsastfwd_p.h
%%QT_INCDIR%%/QtQml/%%FULLVER%%/QtQml/private/qqmljsastvisitor_p.h
%%QT_INCDIR%%/QtQml/%%FULLVER%%/QtQml/private/qqmljsdiagnosticmessage_p.h
%%QT_INCDIR%%/QtQml/%%FULLVER%%/QtQml/private/qqmljsengine_p.h
%%QT_INCDIR%%/QtQml/%%FULLVER%%/QtQml/private/qqmljsfixedpoolarray_p.h
%%QT_INCDIR%%/QtQml/%%FULLVER%%/QtQml/private/qqmljsglobal_p.h
%%QT_INCDIR%%/QtQml/%%FULLVER%%/QtQml/private/qqmljsgrammar_p.h
%%QT_INCDIR%%/QtQml/%%FULLVER%%/QtQml/private/qqmljskeywords_p.h

%%QT_INCDIR%%/QtQml/%%FULLVER%%/QtQml/private/qqmljsparser_p.h
%%QT_INCDIR%%/QtQml/%%FULLVER%%/QtQml/private/qqmljssourcelocation_p.h
%%QT_INCDIR%%/QtQml/%%FULLVER%%/QtQml/private/qqmllist_p.h
%%QT_INCDIR%%/QtQml/%%FULLVER%%/QtQml/private/qqmllistaccessor_p.h
%%QT_INCDIR%%/QtQml/%%FULLVER%%/QtQml/private/qqmllistcompositor_p.h
%%QT_INCDIR%%/QtQml/%%FULLVER%%/QtQml/private/qqmllistmodel_p.h
%%QT_INCDIR%%/QtQml/%%FULLVER%%/QtQml/private/qqmllistmodel_p_p.h
%%QT_INCDIR%%/QtQml/%%FULLVER%%/QtQml/private/qqmllistmodelworkeragent_p.h
%%QT_INCDIR%%/QtQml/%%FULLVER%%/QtQml/private/qqmllistwrapper_p.h
%%QT_INCDIR%%/QtQml/%%FULLVER%%/QtQml/private/qqmllocale_p.h
%%QT_INCDIR%%/QtQml/%%FULLVER%%/QtQml/private/qqmlloggingcategory_p.h
%%QT_INCDIR%%/QtQml/%%FULLVER%%/QtQml/private/qqmlmetaobject_p.h
%%QT_INCDIR%%/QtQml/%%FULLVER%%/QtQml/private/qqmlmetatype_p.h
%%QT_INCDIR%%/QtQml/%%FULLVER%%/QtQml/private/qqmlmetatypedata_p.h
%%QT_INCDIR%%/QtQml/%%FULLVER%%/QtQml/private/qqmlmodelindexvaluetype_p.h
%%QT_INCDIR%%/QtQml/%%FULLVER%%/QtQml/private/qqmlmodelsmodule_p.h
%%QT_INCDIR%%/QtQml/%%FULLVER%%/QtQml/private/qqmlnotifier_p.h
%%QT_INCDIR%%/QtQml/%%FULLVER%%/QtQml/private/qqmlnullablevalue_p.h
%%QT_INCDIR%%/QtQml/%%FULLVER%%/QtQml/private/qqmlobjectcreator_p.h
%%QT_INCDIR%%/QtQml/%%FULLVER%%/QtQml/private/qqmlobjectorgadget_p.h
%%QT_INCDIR%%/QtQml/%%FULLVER%%/QtQml/private/qqmlopenmetaobject_p.h
%%QT_INCDIR%%/QtQml/%%FULLVER%%/QtQml/private/qqmlplatform_p.h
%%QT_INCDIR%%/QtQml/%%FULLVER%%/QtQml/private/qqmlprofiler_p.h

%%QT_INCDIR%%/QtQml/%%FULLVER%%/QtQml/private/qqmlproperty_p.h
%%QT_INCDIR%%/QtQml/%%FULLVER%%/QtQml/private/qqmlpropertycache_p.h
%%QT_INCDIR%%/QtQml/%%FULLVER%%/QtQml/private/qqmlpropertycachecreator_p.h
%%QT_INCDIR%%/QtQml/%%FULLVER%%/QtQml/private/qqmlpropertycachemethodarguments_p.h
%%QT_INCDIR%%/QtQml/%%FULLVER%%/QtQml/private/qqmlpropertycachevector_p.h
%%QT_INCDIR%%/QtQml/%%FULLVER%%/QtQml/private/qqmlpropertydata_p.h
%%QT_INCDIR%%/QtQml/%%FULLVER%%/QtQml/private/qqmlpropertyindex_p.h
%%QT_INCDIR%%/QtQml/%%FULLVER%%/QtQml/private/qqmlpropertyresolver_p.h
%%QT_INCDIR%%/QtQml/%%FULLVER%%/QtQml/private/qqmlpropertyvalidator_p.h
%%QT_INCDIR%%/QtQml/%%FULLVER%%/QtQml/private/qqmlpropertyvalueinterceptor_p.h
%%QT_INCDIR%%/QtQml/%%FULLVER%%/QtQml/private/qqmlproxymetaobject_p.h
%%QT_INCDIR%%/QtQml/%%FULLVER%%/QtQml/private/qqmlrefcount_p.h
%%QT_INCDIR%%/QtQml/%%FULLVER%%/QtQml/private/qqmlscriptblob_p.h
%%QT_INCDIR%%/QtQml/%%FULLVER%%/QtQml/private/qqmlscriptdata_p.h
%%QT_INCDIR%%/QtQml/%%FULLVER%%/QtQml/private/qqmlscriptstring_p.h
%%QT_INCDIR%%/QtQml/%%FULLVER%%/QtQml/private/qqmlsourcecoordinate_p.h
%%QT_INCDIR%%/QtQml/%%FULLVER%%/QtQml/private/qqmlstaticmetaobject_p.h
%%QT_INCDIR%%/QtQml/%%FULLVER%%/QtQml/private/qqmlstringconverters_p.h
%%QT_INCDIR%%/QtQml/%%FULLVER%%/QtQml/private/qqmltableinstancemodel_p.h
%%QT_INCDIR%%/QtQml/%%FULLVER%%/QtQml/private/qqmlthread_p.h
%%QT_INCDIR%%/QtQml/%%FULLVER%%/QtQml/private/qqmltimer_p.h
%%QT_INCDIR%%/QtQml/%%FULLVER%%/QtQml/private/qqmltype_p.h
%%QT_INCDIR%%/QtQml/%%FULLVER%%/QtQml/private/qqmltype_p_p.h
%%QT_INCDIR%%/QtQml/%%FULLVER%%/QtQml/private/qqmltypecompiler_p.h
%%QT_INCDIR%%/QtQml/%%FULLVER%%/QtQml/private/qqmltypedata_p.h
%%QT_INCDIR%%/QtQml/%%FULLVER%%/QtQml/private/qqmltypeloader_p.h
%%QT_INCDIR%%/QtQml/%%FULLVER%%/QtQml/private/qqmltypeloadernetworkreplyproxy_p.h
%%QT_INCDIR%%/QtQml/%%FULLVER%%/QtQml/private/qqmltypeloaderqmldircontent_p.h
%%QT_INCDIR%%/QtQml/%%FULLVER%%/QtQml/private/qqmltypeloaderthread_p.h
%%QT_INCDIR%%/QtQml/%%FULLVER%%/QtQml/private/qqmltypemodule_p.h
%%QT_INCDIR%%/QtQml/%%FULLVER%%/QtQml/private/qqmltypemodule_p_p.h
%%QT_INCDIR%%/QtQml/%%FULLVER%%/QtQml/private/qqmltypemoduleversion_p.h
%%QT_INCDIR%%/QtQml/%%FULLVER%%/QtQml/private/qqmltypenamecache_p.h
%%QT_INCDIR%%/QtQml/%%FULLVER%%/QtQml/private/qqmltypenotavailable_p.h
%%QT_INCDIR%%/QtQml/%%FULLVER%%/QtQml/private/qqmltypewrapper_p.h

%%QT_INCDIR%%/QtQml/%%FULLVER%%/QtQml/private/qqmlvme_p.h
%%QT_INCDIR%%/QtQml/%%FULLVER%%/QtQml/private/qqmlvmemetaobject_p.h
%%QT_INCDIR%%/QtQml/%%FULLVER%%/QtQml/private/qqmlxmlhttprequest_p.h
%%QT_INCDIR%%/QtQml/%%FULLVER%%/QtQml/private/qquickpackage_p.h
%%QT_INCDIR%%/QtQml/%%FULLVER%%/QtQml/private/qquickworkerscript_p.h
%%QT_INCDIR%%/QtQml/%%FULLVER%%/QtQml/private/qrecursionwatcher_p.h
%%QT_INCDIR%%/QtQml/%%FULLVER%%/QtQml/private/qrecyclepool_p.h
%%QT_INCDIR%%/QtQml/%%FULLVER%%/QtQml/private/qsequentialanimationgroupjob_p.h
%%QT_INCDIR%%/QtQml/%%FULLVER%%/QtQml/private/qstringhash_p.h
%%QT_INCDIR%%/QtQml/%%FULLVER%%/QtQml/private/qtqml-config_p.h
%%QT_INCDIR%%/QtQml/%%FULLVER%%/QtQml/private/qtqmlcompilerglobal_p.h
%%QT_INCDIR%%/QtQml/%%FULLVER%%/QtQml/private/qtqmlglobal_p.h
%%QT_INCDIR%%/QtQml/%%FULLVER%%/QtQml/private/qv4alloca_p.h
%%QT_INCDIR%%/QtQml/%%FULLVER%%/QtQml/private/qv4argumentsobject_p.h

%%QT_INCDIR%%/QtQml/%%FULLVER%%/QtQml/private/qv4booleanobject_p.h
%%QT_INCDIR%%/QtQml/%%FULLVER%%/QtQml/private/qv4bytecodegenerator_p.h
%%QT_INCDIR%%/QtQml/%%FULLVER%%/QtQml/private/qv4bytecodehandler_p.h
%%QT_INCDIR%%/QtQml/%%FULLVER%%/QtQml/private/qv4calldata_p.h
%%QT_INCDIR%%/QtQml/%%FULLVER%%/QtQml/private/qv4codegen_p.h
%%QT_INCDIR%%/QtQml/%%FULLVER%%/QtQml/private/qv4compilationunitmapper_p.h
%%QT_INCDIR%%/QtQml/%%FULLVER%%/QtQml/private/qv4compileddata_p.h
%%QT_INCDIR%%/QtQml/%%FULLVER%%/QtQml/private/qv4compiler_p.h
%%QT_INCDIR%%/QtQml/%%FULLVER%%/QtQml/private/qv4compilercontext_p.h
%%QT_INCDIR%%/QtQml/%%FULLVER%%/QtQml/private/qv4compilercontrolflow_p.h
%%QT_INCDIR%%/QtQml/%%FULLVER%%/QtQml/private/qv4compilerglobal_p.h
%%QT_INCDIR%%/QtQml/%%FULLVER%%/QtQml/private/qv4compilerscanfunctions_p.h
%%QT_INCDIR%%/QtQml/%%FULLVER%%/QtQml/private/qv4context_p.h
%%QT_INCDIR%%/QtQml/%%FULLVER%%/QtQml/private/qv4dataview_p.h

%%QT_INCDIR%%/QtQml/%%FULLVER%%/QtQml/private/qv4errorobject_p.h
%%QT_INCDIR%%/QtQml/%%FULLVER%%/QtQml/private/qv4estable_p.h
%%QT_INCDIR%%/QtQml/%%FULLVER%%/QtQml/private/qv4executableallocator_p.h
%%QT_INCDIR%%/QtQml/%%FULLVER%%/QtQml/private/qv4executablecompilationunit_p.h
%%QT_INCDIR%%/QtQml/%%FULLVER%%/QtQml/private/qv4function_p.h
%%QT_INCDIR%%/QtQml/%%FULLVER%%/QtQml/private/qv4functionobject_p.h
%%QT_INCDIR%%/QtQml/%%FULLVER%%/QtQml/private/qv4functiontable_p.h

%%QT_INCDIR%%/QtQml/%%FULLVER%%/QtQml/private/qv4instr_moth_p.h
%%QT_INCDIR%%/QtQml/%%FULLVER%%/QtQml/private/qv4internalclass_p.h
%%QT_INCDIR%%/QtQml/%%FULLVER%%/QtQml/private/qv4iterator_p.h
%%QT_INCDIR%%/QtQml/%%FULLVER%%/QtQml/private/qv4jithelpers_p.h
%%QT_INCDIR%%/QtQml/%%FULLVER%%/QtQml/private/qv4jscall_p.h
%%QT_INCDIR%%/QtQml/%%FULLVER%%/QtQml/private/qv4jsonobject_p.h
%%QT_INCDIR%%/QtQml/%%FULLVER%%/QtQml/private/qv4lookup_p.h

%%QT_INCDIR%%/QtQml/%%FULLVER%%/QtQml/private/qv4scopedvalue_p.h
%%QT_INCDIR%%/QtQml/%%FULLVER%%/QtQml/private/qv4script_p.h
%%QT_INCDIR%%/QtQml/%%FULLVER%%/QtQml/private/qv4sequenceobject_p.h
%%QT_INCDIR%%/QtQml/%%FULLVER%%/QtQml/private/qv4serialize_p.h
%%QT_INCDIR%%/QtQml/%%FULLVER%%/QtQml/private/qv4setiterator_p.h
%%QT_INCDIR%%/QtQml/%%FULLVER%%/QtQml/private/qv4setobject_p.h
%%QT_INCDIR%%/QtQml/%%FULLVER%%/QtQml/private/qv4sparsearray_p.h
%%QT_INCDIR%%/QtQml/%%FULLVER%%/QtQml/private/qv4sqlerrors_p.h
%%QT_INCDIR%%/QtQml/%%FULLVER%%/QtQml/private/qv4stackframe_p.h
%%QT_INCDIR%%/QtQml/%%FULLVER%%/QtQml/private/qv4staticvalue_p.h
%%QT_INCDIR%%/QtQml/%%FULLVER%%/QtQml/private/qv4string_p.h
%%QT_INCDIR%%/QtQml/%%FULLVER%%/QtQml/private/qv4stringiterator_p.h
%%QT_INCDIR%%/QtQml/%%FULLVER%%/QtQml/private/qv4stringobject_p.h
%%QT_INCDIR%%/QtQml/%%FULLVER%%/QtQml/private/qv4stringtoarrayindex_p.h
%%QT_INCDIR%%/QtQml/%%FULLVER%%/QtQml/private/qv4symbol_p.h
%%QT_INCDIR%%/QtQml/%%FULLVER%%/QtQml/private/qv4typedarray_p.h
%%QT_INCDIR%%/QtQml/%%FULLVER%%/QtQml/private/qv4util_p.h

%%QT_INCDIR%%/QtQml/%%FULLVER%%/QtQml/private/qv4vme_moth_p.h
%%QT_INCDIR%%/QtQml/%%FULLVER%%/QtQml/private/qv4vtable_p.h
%%QT_INCDIR%%/QtQml/%%FULLVER%%/QtQml/private/qv4writebarrier_p.h
%%QT_INCDIR%%/QtQml/%%FULLVER%%/QtQml/private/qv8engine_p.h
%%QT_INCDIR%%/QtQml/QJSEngine
%%QT_INCDIR%%/QtQml/QJSValue
%%QT_INCDIR%%/QtQml/QJSValueIterator

%%QT_INCDIR%%/QtQml/qqmlpropertyvaluesource.h
%%QT_INCDIR%%/QtQml/qqmlscriptstring.h
%%QT_INCDIR%%/QtQml/qtqml-config.h
%%QT_INCDIR%%/QtQml/qtqmlcompilerglobal.h
%%QT_INCDIR%%/QtQml/qtqmlglobal.h
%%QT_INCDIR%%/QtQml/qtqmlversion.h
%%QT_INCDIR%%/QtQmlDebug/%%FULLVER%%/QtQmlDebug/private/qqmldebugclient_p.h

%%QT_INCDIR%%/QtQmlDebug/QtQmlDebugDepends
%%QT_INCDIR%%/QtQmlDebug/QtQmlDebugVersion
%%QT_INCDIR%%/QtQmlDebug/qtqmldebugversion.h
%%QT_INCDIR%%/QtQmlModels/%%FULLVER%%/QtQmlModels/private/qqmladaptormodel_p.h
%%QT_INCDIR%%/QtQmlModels/%%FULLVER%%/QtQmlModels/private/qqmlchangeset_p.h
%%QT_INCDIR%%/QtQmlModels/%%FULLVER%%/QtQmlModels/private/qqmldelegatecomponent_p.h
%%QT_INCDIR%%/QtQmlModels/%%FULLVER%%/QtQmlModels/private/qqmldelegatemodel_p.h
%%QT_INCDIR%%/QtQmlModels/%%FULLVER%%/QtQmlModels/private/qqmldelegatemodel_p_p.h
%%QT_INCDIR%%/QtQmlModels/%%FULLVER%%/QtQmlModels/private/qqmlinstantiator_p.h
%%QT_INCDIR%%/QtQmlModels/%%FULLVER%%/QtQmlModels/private/qqmlinstantiator_p_p.h
%%QT_INCDIR%%/QtQmlModels/%%FULLVER%%/QtQmlModels/private/qqmllistaccessor_p.h
%%QT_INCDIR%%/QtQmlModels/%%FULLVER%%/QtQmlModels/private/qqmllistcompositor_p.h
%%QT_INCDIR%%/QtQmlModels/%%FULLVER%%/QtQmlModels/private/qqmllistmodel_p.h
%%QT_INCDIR%%/QtQmlModels/%%FULLVER%%/QtQmlModels/private/qqmllistmodel_p_p.h
%%QT_INCDIR%%/QtQmlModels/%%FULLVER%%/QtQmlModels/private/qqmllistmodelworkeragent_p.h
%%QT_INCDIR%%/QtQmlModels/%%FULLVER%%/QtQmlModels/private/qqmlmodelsmodule_p.h
%%QT_INCDIR%%/QtQmlModels/%%FULLVER%%/QtQmlModels/private/qqmlobjectmodel_p.h
%%QT_INCDIR%%/QtQmlModels/%%FULLVER%%/QtQmlModels/private/qqmltableinstancemodel_p.h
%%QT_INCDIR%%/QtQmlModels/%%FULLVER%%/QtQmlModels/private/qqmltablemodel_p.h
%%QT_INCDIR%%/QtQmlModels/%%FULLVER%%/QtQmlModels/private/qqmltablemodelcolumn_p.h
%%QT_INCDIR%%/QtQmlModels/%%FULLVER%%/QtQmlModels/private/qquickpackage_p.h
%%QT_INCDIR%%/QtQmlModels/%%FULLVER%%/QtQmlModels/private/qtqmlmodels-config_p.h
%%QT_INCDIR%%/QtQmlModels/%%FULLVER%%/QtQmlModels/private/qtqmlmodelsglobal_p.h
%%QT_INCDIR%%/QtQmlModels/QtQmlModels
%%QT_INCDIR%%/QtQmlModels/QtQmlModelsDepends
%%QT_INCDIR%%/QtQmlModels/QtQmlModelsVersion
%%QT_INCDIR%%/QtQmlModels/qtqmlmodels-config.h
%%QT_INCDIR%%/QtQmlModels/qtqmlmodelsglobal.h
%%QT_INCDIR%%/QtQmlModels/qtqmlmodelsversion.h
%%QT_INCDIR%%/QtQmlWorkerScript/%%FULLVER%%/QtQmlWorkerScript/private/qqmlworkerscriptmodule_p.h
%%QT_INCDIR%%/QtQmlWorkerScript/%%FULLVER%%/QtQmlWorkerScript/private/qquickworkerscript_p.h
%%QT_INCDIR%%/QtQmlWorkerScript/%%FULLVER%%/QtQmlWorkerScript/private/qtqmlworkerscriptglobal_p.h
%%QT_INCDIR%%/QtQmlWorkerScript/%%FULLVER%%/QtQmlWorkerScript/private/qv4serialize_p.h
%%QT_INCDIR%%/QtQmlWorkerScript/QtQmlWorkerScript
%%QT_INCDIR%%/QtQmlWorkerScript/QtQmlWorkerScriptDepends
%%QT_INCDIR%%/QtQmlWorkerScript/QtQmlWorkerScriptVersion
%%QT_INCDIR%%/QtQmlWorkerScript/qtqmlworkerscriptglobal.h
%%QT_INCDIR%%/QtQmlWorkerScript/qtqmlworkerscriptversion.h
%%QT_INCDIR%%/QtQuick/%%FULLVER%%/QtQuick/private/qaccessiblequickitem_p.h
%%QT_INCDIR%%/QtQuick/%%FULLVER%%/QtQuick/private/qaccessiblequickview_p.h
%%QT_INCDIR%%/QtQuick/%%FULLVER%%/QtQuick/private/qqmldesignermetaobject_p.h

%%QT_INCDIR%%/QtQuick/%%FULLVER%%/QtQuick/private/qquickbehavior_p.h
%%QT_INCDIR%%/QtQuick/%%FULLVER%%/QtQuick/private/qquickborderimage_p.h
%%QT_INCDIR%%/QtQuick/%%FULLVER%%/QtQuick/private/qquickborderimage_p_p.h
%%QT_INCDIR%%/QtQuick/%%FULLVER%%/QtQuick/private/qquickboundaryrule_p.h
%%QT_INCDIR%%/QtQuick/%%FULLVER%%/QtQuick/private/qquickcanvascontext_p.h
%%QT_INCDIR%%/QtQuick/%%FULLVER%%/QtQuick/private/qquickcanvasitem_p.h
%%QT_INCDIR%%/QtQuick/%%FULLVER%%/QtQuick/private/qquickclipnode_p.h

%%QT_INCDIR%%/QtQuick/%%FULLVER%%/QtQuick/private/qquickmousearea_p.h
%%QT_INCDIR%%/QtQuick/%%FULLVER%%/QtQuick/private/qquickmousearea_p_p.h
%%QT_INCDIR%%/QtQuick/%%FULLVER%%/QtQuick/private/qquickmultipointhandler_p.h
%%QT_INCDIR%%/QtQuick/%%FULLVER%%/QtQuick/private/qquickmultipointhandler_p_p.h
%%QT_INCDIR%%/QtQuick/%%FULLVER%%/QtQuick/private/qquickmultipointtoucharea_p.h
%%QT_INCDIR%%/QtQuick/%%FULLVER%%/QtQuick/private/qquickopenglinfo_p.h
%%QT_INCDIR%%/QtQuick/%%FULLVER%%/QtQuick/private/qquickopenglshadereffect_p.h

%%QT_INCDIR%%/QtQuick/%%FULLVER%%/QtQuick/private/qquickvalidator_p.h
%%QT_INCDIR%%/QtQuick/%%FULLVER%%/QtQuick/private/qquickvaluetypes_p.h
%%QT_INCDIR%%/QtQuick/%%FULLVER%%/QtQuick/private/qquickview_p.h
%%QT_INCDIR%%/QtQuick/%%FULLVER%%/QtQuick/private/qquickwheelhandler_p.h
%%QT_INCDIR%%/QtQuick/%%FULLVER%%/QtQuick/private/qquickwheelhandler_p_p.h
%%QT_INCDIR%%/QtQuick/%%FULLVER%%/QtQuick/private/qquickwindow_p.h
%%QT_INCDIR%%/QtQuick/%%FULLVER%%/QtQuick/private/qquickwindowattached_p.h
%%QT_INCDIR%%/QtQuick/%%FULLVER%%/QtQuick/private/qquickwindowmodule_p.h

%%QT_INCDIR%%/QtQuick/%%FULLVER%%/QtQuick/private/qsgabstractsoftwarerenderer_p.h
%%QT_INCDIR%%/QtQuick/%%FULLVER%%/QtQuick/private/qsgadaptationlayer_p.h
%%QT_INCDIR%%/QtQuick/%%FULLVER%%/QtQuick/private/qsgareaallocator_p.h
%%QT_INCDIR%%/QtQuick/%%FULLVER%%/QtQuick/private/qsgatlastexture_p.h
%%QT_INCDIR%%/QtQuick/%%FULLVER%%/QtQuick/private/qsgbasicglyphnode_p.h
%%QT_INCDIR%%/QtQuick/%%FULLVER%%/QtQuick/private/qsgbasicinternalimagenode_p.h
%%QT_INCDIR%%/QtQuick/%%FULLVER%%/QtQuick/private/qsgbasicinternalrectanglenode_p.h

%%QT_INCDIR%%/QtQuick/%%FULLVER%%/QtQuick/private/qsgcontext_p.h
%%QT_INCDIR%%/QtQuick/%%FULLVER%%/QtQuick/private/qsgcontextplugin_p.h
%%QT_INCDIR%%/QtQuick/%%FULLVER%%/QtQuick/private/qsgdefaultcontext_p.h
%%QT_INCDIR%%/QtQuick/%%FULLVER%%/QtQuick/private/qsgdefaultdistancefieldglyphcache_p.h
%%QT_INCDIR%%/QtQuick/%%FULLVER%%/QtQuick/private/qsgdefaultglyphnode_p.h
%%QT_INCDIR%%/QtQuick/%%FULLVER%%/QtQuick/private/qsgdefaultglyphnode_p_p.h
%%QT_INCDIR%%/QtQuick/%%FULLVER%%/QtQuick/private/qsgdefaultimagenode_p.h
%%QT_INCDIR%%/QtQuick/%%FULLVER%%/QtQuick/private/qsgdefaultinternalimagenode_p.h
%%QT_INCDIR%%/QtQuick/%%FULLVER%%/QtQuick/private/qsgdefaultinternalrectanglenode_p.h
%%QT_INCDIR%%/QtQuick/%%FULLVER%%/QtQuick/private/qsgdefaultlayer_p.h
%%QT_INCDIR%%/QtQuick/%%FULLVER%%/QtQuick/private/qsgdefaultninepatchnode_p.h
%%QT_INCDIR%%/QtQuick/%%FULLVER%%/QtQuick/private/qsgdefaultpainternode_p.h
%%QT_INCDIR%%/QtQuick/%%FULLVER%%/QtQuick/private/qsgdefaultrectanglenode_p.h

%%QT_INCDIR%%/QtQuick/%%FULLVER%%/QtQuick/private/qsgdistancefieldglyphnode_p_p.h
%%QT_INCDIR%%/QtQuick/%%FULLVER%%/QtQuick/private/qsgengine_p.h
%%QT_INCDIR%%/QtQuick/%%FULLVER%%/QtQuick/private/qsggeometry_p.h
%%QT_INCDIR%%/QtQuick/%%FULLVER%%/QtQuick/private/qsgmaterialrhishader_p.h
%%QT_INCDIR%%/QtQuick/%%FULLVER%%/QtQuick/private/qsgmaterialshader_p.h
%%QT_INCDIR%%/QtQuick/%%FULLVER%%/QtQuick/private/qsgnode_p.h
%%QT_INCDIR%%/QtQuick/%%FULLVER%%/QtQuick/private/qsgnodeupdater_p.h
%%QT_INCDIR%%/QtQuick/%%FULLVER%%/QtQuick/private/qsgopenglatlastexture_p.h
%%QT_INCDIR%%/QtQuick/%%FULLVER%%/QtQuick/private/qsgopengldistancefieldglyphcache_p.h
%%QT_INCDIR%%/QtQuick/%%FULLVER%%/QtQuick/private/qsgopengllayer_p.h
%%QT_INCDIR%%/QtQuick/%%FULLVER%%/QtQuick/private/qsgopenglvisualizer_p.h
%%QT_INCDIR%%/QtQuick/%%FULLVER%%/QtQuick/private/qsgplaintexture_p.h
%%QT_INCDIR%%/QtQuick/%%FULLVER%%/QtQuick/private/qsgrenderer_p.h
%%QT_INCDIR%%/QtQuick/%%FULLVER%%/QtQuick/private/qsgrenderloop_p.h
%%QT_INCDIR%%/QtQuick/%%FULLVER%%/QtQuick/private/qsgrendernode_p.h
%%QT_INCDIR%%/QtQuick/%%FULLVER%%/QtQuick/private/qsgrhiatlastexture_p.h
%%QT_INCDIR%%/QtQuick/%%FULLVER%%/QtQuick/private/qsgrhidistancefieldglyphcache_p.h
%%QT_INCDIR%%/QtQuick/%%FULLVER%%/QtQuick/private/qsgrhilayer_p.h
%%QT_INCDIR%%/QtQuick/%%FULLVER%%/QtQuick/private/qsgrhinativetextureimporter_p.h
%%QT_INCDIR%%/QtQuick/%%FULLVER%%/QtQuick/private/qsgrhishadereffectnode_p.h
%%QT_INCDIR%%/QtQuick/%%FULLVER%%/QtQuick/private/qsgrhisupport_p.h
%%QT_INCDIR%%/QtQuick/%%FULLVER%%/QtQuick/private/qsgrhitextureglyphcache_p.h
%%QT_INCDIR%%/QtQuick/%%FULLVER%%/QtQuick/private/qsgrhivisualizer_p.h
%%QT_INCDIR%%/QtQuick/%%FULLVER%%/QtQuick/private/qsgshadersourcebuilder_p.h
%%QT_INCDIR%%/QtQuick/%%FULLVER%%/QtQuick/private/qsgsoftwareadaptation_p.h
%%QT_INCDIR%%/QtQuick/%%FULLVER%%/QtQuick/private/qsgsoftwarecontext_p.h

%%QT_INCDIR%%/QtQuick/QSGGeometryNode
%%QT_INCDIR%%/QtQuick/QSGImageNode
%%QT_INCDIR%%/QtQuick/QSGMaterial
%%QT_INCDIR%%/QtQuick/QSGMaterialRhiShader
%%QT_INCDIR%%/QtQuick/QSGMaterialShader
%%QT_INCDIR%%/QtQuick/QSGMaterialType
%%QT_INCDIR%%/QtQuick/QSGNinePatchNode

%%QT_INCDIR%%/QtQuick/qsggeometry.h
%%QT_INCDIR%%/QtQuick/qsgimagenode.h
%%QT_INCDIR%%/QtQuick/qsgmaterial.h
%%QT_INCDIR%%/QtQuick/qsgmaterialrhishader.h
%%QT_INCDIR%%/QtQuick/qsgmaterialshader.h
%%QT_INCDIR%%/QtQuick/qsgmaterialtype.h
%%QT_INCDIR%%/QtQuick/qsgninepatchnode.h
%%QT_INCDIR%%/QtQuick/qsgnode.h
%%QT_INCDIR%%/QtQuick/qsgrectanglenode.h

%%QT_CMAKEDIR%%/Qt5QmlDebug/Qt5QmlDebugConfigVersion.cmake
%%QT_CMAKEDIR%%/Qt5QmlDevTools/Qt5QmlDevToolsConfig.cmake
%%QT_CMAKEDIR%%/Qt5QmlDevTools/Qt5QmlDevToolsConfigVersion.cmake
%%QT_CMAKEDIR%%/Qt5QmlImportScanner/Qt5QmlImportScannerConfig.cmake
%%QT_CMAKEDIR%%/Qt5QmlImportScanner/Qt5QmlImportScannerTemplate.cpp.in
%%QT_CMAKEDIR%%/Qt5QmlModels/Qt5QmlModelsConfig.cmake
%%QT_CMAKEDIR%%/Qt5QmlModels/Qt5QmlModelsConfigVersion.cmake
%%QT_CMAKEDIR%%/Qt5QmlWorkerScript/Qt5QmlWorkerScriptConfig.cmake
%%QT_CMAKEDIR%%/Qt5QmlWorkerScript/Qt5QmlWorkerScriptConfigVersion.cmake
%%QT_CMAKEDIR%%/Qt5Quick/Qt5QuickConfig.cmake
%%QT_CMAKEDIR%%/Qt5Quick/Qt5QuickConfigVersion.cmake
%%QT_CMAKEDIR%%/Qt5QuickCompiler/Qt5QuickCompilerConfig.cmake

%%QT_LIBDIR%%/libQt5QmlDebug.prl
%%QT_LIBDIR%%/libQt5QmlDevTools.a
%%QT_LIBDIR%%/libQt5QmlDevTools.prl
%%QT_LIBDIR%%/libQt5QmlModels.prl
%%QT_LIBDIR%%/libQt5QmlModels.so
%%QT_LIBDIR%%/libQt5QmlModels.so.5
%%QT_LIBDIR%%/libQt5QmlModels.so.%%SHORTVER%%
%%QT_LIBDIR%%/libQt5QmlModels.so.%%FULLVER%%
%%DEBUG%%%%QT_LIBDIR%%/libQt5QmlModels.so.%%FULLVER%%.debug
%%QT_LIBDIR%%/libQt5QmlWorkerScript.prl
%%QT_LIBDIR%%/libQt5QmlWorkerScript.so
%%QT_LIBDIR%%/libQt5QmlWorkerScript.so.5
%%QT_LIBDIR%%/libQt5QmlWorkerScript.so.%%SHORTVER%%
%%QT_LIBDIR%%/libQt5QmlWorkerScript.so.%%FULLVER%%
%%DEBUG%%%%QT_LIBDIR%%/libQt5QmlWorkerScript.so.%%FULLVER%%.debug
%%QT_LIBDIR%%/libQt5Quick.prl
%%QT_LIBDIR%%/libQt5Quick.so
%%QT_LIBDIR%%/libQt5Quick.so.5

%%QT_MKSPECDIR%%/modules/qt_lib_qml_private.pri
%%QT_MKSPECDIR%%/modules/qt_lib_qmldebug_private.pri
%%QT_MKSPECDIR%%/modules/qt_lib_qmldevtools_private.pri
%%QT_MKSPECDIR%%/modules/qt_lib_qmlmodels.pri
%%QT_MKSPECDIR%%/modules/qt_lib_qmlmodels_private.pri
%%QT_MKSPECDIR%%/modules/qt_lib_qmltest.pri
%%QT_MKSPECDIR%%/modules/qt_lib_qmltest_private.pri
%%QT_MKSPECDIR%%/modules/qt_lib_qmlworkerscript.pri
%%QT_MKSPECDIR%%/modules/qt_lib_qmlworkerscript_private.pri
%%QT_MKSPECDIR%%/modules/qt_lib_quick.pri
%%QT_MKSPECDIR%%/modules/qt_lib_quick_private.pri
%%QT_MKSPECDIR%%/modules/qt_lib_quickparticles_private.pri

%%DEBUG%%%%QT_PLUGINDIR%%/qmltooling/libqmldbg_server.so.debug
%%QT_PLUGINDIR%%/qmltooling/libqmldbg_tcp.so
%%DEBUG%%%%QT_PLUGINDIR%%/qmltooling/libqmldbg_tcp.so.debug
%%QT_QMLDIR%%/Qt/labs/animation/liblabsanimationplugin.so
%%DEBUG%%%%QT_QMLDIR%%/Qt/labs/animation/liblabsanimationplugin.so.debug
%%QT_QMLDIR%%/Qt/labs/animation/plugins.qmltypes
%%QT_QMLDIR%%/Qt/labs/animation/qmldir
%%QT_QMLDIR%%/Qt/labs/folderlistmodel/libqmlfolderlistmodelplugin.so
%%DEBUG%%%%QT_QMLDIR%%/Qt/labs/folderlistmodel/libqmlfolderlistmodelplugin.so.debug
%%QT_QMLDIR%%/Qt/labs/folderlistmodel/plugins.qmltypes

%%DEBUG%%%%QT_QMLDIR%%/QtQml/StateMachine/libqtqmlstatemachine.so.debug
%%QT_QMLDIR%%/QtQml/StateMachine/plugins.qmltypes
%%QT_QMLDIR%%/QtQml/StateMachine/qmldir
%%QT_QMLDIR%%/QtQml/WorkerScript.2/libworkerscriptplugin.so
%%DEBUG%%%%QT_QMLDIR%%/QtQml/WorkerScript.2/libworkerscriptplugin.so.debug
%%QT_QMLDIR%%/QtQml/WorkerScript.2/plugins.qmltypes
%%QT_QMLDIR%%/QtQml/WorkerScript.2/qmldir
%%QT_QMLDIR%%/QtQml/libqmlplugin.so
%%DEBUG%%%%QT_QMLDIR%%/QtQml/libqmlplugin.so.debug
%%QT_QMLDIR%%/QtQml/plugins.qmltypes
%%QT_QMLDIR%%/QtQml/qmldir
%%QT_QMLDIR%%/QtQuick.2/libqtquick2plugin.so

%%QT_QMLDIR%%/QtTest/testlogger.js
%%QT_QMLDIR%%/builtins.qmltypes
libdata/pkgconfig/Qt5Qml.pc
libdata/pkgconfig/Qt5QmlModels.pc
libdata/pkgconfig/Qt5QmlWorkerScript.pc
libdata/pkgconfig/Qt5Quick.pc
libdata/pkgconfig/Qt5QuickTest.pc
libdata/pkgconfig/Qt5QuickWidgets.pc

Lines 2-8 Link Here

(-)b/x11-toolkits/qt5-gtkplatform/Makefile (-1 / +2 lines)
2		2
3	PORTNAME= gtkplatform	3	PORTNAME= gtkplatform
4	DISTVERSION= 0.2.2	4	DISTVERSION= 0.2.2
5	PORTREVISION= 3
6	CATEGORIES= x11-toolkits	5	CATEGORIES= x11-toolkits
7	PKGNAMEPREFIX= qt5-	6	PKGNAMEPREFIX= qt5-
8		7
Lines 29-34 USE_GL= gl egl Link Here
29	USE_GITHUB= yes	28	USE_GITHUB= yes
30	GH_ACCOUNT= CrimsonAS	29	GH_ACCOUNT= CrimsonAS
31		30
		31	BROKEN= Does not build with Qt 5.14
		32
32	post-install:	33	post-install:
33	${STRIP_CMD} ${STAGEDIR}${PREFIX}/lib/qt5/plugins/platforms/libqgtk.so	34	${STRIP_CMD} ${STAGEDIR}${PREFIX}/lib/qt5/plugins/platforms/libqgtk.so
34		35

Lines 2-8 Link Here

(-)b/x11-toolkits/qt5-gui/Makefile (-1 lines)
2		2
3	PORTNAME= gui	3	PORTNAME= gui
4	DISTVERSION= ${QT5_VERSION}	4	DISTVERSION= ${QT5_VERSION}
5	PORTREVISION= 3
6	CATEGORIES= x11-toolkits graphics	5	CATEGORIES= x11-toolkits graphics
7	PKGNAMEPREFIX= qt5-	6	PKGNAMEPREFIX= qt5-
8		7

Lines 1-9 Link Here

(-)b/x11-toolkits/qt5-gui/files/patch-src_platformsupport_input_evdevtouch_qevdevtouchhandler.cpp (-6 / +6 lines)
1	--- src/platformsupport/input/evdevtouch/qevdevtouchhandler.cpp.orig 2019-06-13 04:18:18 UTC	1	--- src/platformsupport/input/evdevtouch/qevdevtouchhandler.cpp.orig 2019-12-31 20:34:48.636796000 +0100
2	+++ src/platformsupport/input/evdevtouch/qevdevtouchhandler.cpp	2	+++ src/platformsupport/input/evdevtouch/qevdevtouchhandler.cpp 2019-12-31 20:35:13.274140000 +0100
3	@@ -49,11 +49,7 @@	3	@@ -52,11 +52,7 @@
4	#include <QtCore/private/qcore_unix_p.h>	4
5	#include <QtGui/private/qhighdpiscaling_p.h>	5	#include <mutex>
6	#include <QtGui/private/qguiapplication_p.h>	6
7	-#ifdef Q_OS_FREEBSD	7	-#ifdef Q_OS_FREEBSD
8	-#include <dev/evdev/input.h>	8	-#include <dev/evdev/input.h>
9	-#else	9	-#else

Lines 66-71 Link Here

(-)b/x11-toolkits/qt5-gui/pkg-plist (-6 / +40 lines)
66	%%QT_INCDIR%%/QtGlxSupport/QtGlxSupportDepends	66	%%QT_INCDIR%%/QtGlxSupport/QtGlxSupportDepends
67	%%QT_INCDIR%%/QtGlxSupport/QtGlxSupportVersion	67	%%QT_INCDIR%%/QtGlxSupport/QtGlxSupportVersion
68	%%QT_INCDIR%%/QtGlxSupport/qtglxsupportversion.h	68	%%QT_INCDIR%%/QtGlxSupport/qtglxsupportversion.h
		69	%%QT_INCDIR%%/QtGui/%%FULLVER%%/QtGui/private/cs_tdr_p.h
69	%%QT_INCDIR%%/QtGui/%%FULLVER%%/QtGui/private/qabstractlayoutstyleinfo_p.h	70	%%QT_INCDIR%%/QtGui/%%FULLVER%%/QtGui/private/qabstractlayoutstyleinfo_p.h
70	%%QT_INCDIR%%/QtGui/%%FULLVER%%/QtGui/private/qabstracttextdocumentlayout_p.h	71	%%QT_INCDIR%%/QtGui/%%FULLVER%%/QtGui/private/qabstracttextdocumentlayout_p.h
71	%%QT_INCDIR%%/QtGui/%%FULLVER%%/QtGui/private/qaccessiblecache_p.h	72	%%QT_INCDIR%%/QtGui/%%FULLVER%%/QtGui/private/qaccessiblecache_p.h
Lines 75-81 Link Here
75	%%QT_INCDIR%%/QtGui/%%FULLVER%%/QtGui/private/qblittable_p.h	76	%%QT_INCDIR%%/QtGui/%%FULLVER%%/QtGui/private/qblittable_p.h
76	%%QT_INCDIR%%/QtGui/%%FULLVER%%/QtGui/private/qbmphandler_p.h	77	%%QT_INCDIR%%/QtGui/%%FULLVER%%/QtGui/private/qbmphandler_p.h
77	%%QT_INCDIR%%/QtGui/%%FULLVER%%/QtGui/private/qcolor_p.h	78	%%QT_INCDIR%%/QtGui/%%FULLVER%%/QtGui/private/qcolor_p.h
78	%%QT_INCDIR%%/QtGui/%%FULLVER%%/QtGui/private/qcolorprofile_p.h	79	%%QT_INCDIR%%/QtGui/%%FULLVER%%/QtGui/private/qcolormatrix_p.h
		80	%%QT_INCDIR%%/QtGui/%%FULLVER%%/QtGui/private/qcolorspace_p.h
		81	%%QT_INCDIR%%/QtGui/%%FULLVER%%/QtGui/private/qcolortransferfunction_p.h
		82	%%QT_INCDIR%%/QtGui/%%FULLVER%%/QtGui/private/qcolortransfertable_p.h
		83	%%QT_INCDIR%%/QtGui/%%FULLVER%%/QtGui/private/qcolortransform_p.h
		84	%%QT_INCDIR%%/QtGui/%%FULLVER%%/QtGui/private/qcolortrc_p.h
		85	%%QT_INCDIR%%/QtGui/%%FULLVER%%/QtGui/private/qcolortrclut_p.h
79	%%QT_INCDIR%%/QtGui/%%FULLVER%%/QtGui/private/qcoregraphics_p.h	86	%%QT_INCDIR%%/QtGui/%%FULLVER%%/QtGui/private/qcoregraphics_p.h
80	%%QT_INCDIR%%/QtGui/%%FULLVER%%/QtGui/private/qcosmeticstroker_p.h	87	%%QT_INCDIR%%/QtGui/%%FULLVER%%/QtGui/private/qcosmeticstroker_p.h
81	%%QT_INCDIR%%/QtGui/%%FULLVER%%/QtGui/private/qcssparser_p.h	88	%%QT_INCDIR%%/QtGui/%%FULLVER%%/QtGui/private/qcssparser_p.h
Lines 105-110 Link Here
105	%%QT_INCDIR%%/QtGui/%%FULLVER%%/QtGui/private/qharfbuzzng_p.h	112	%%QT_INCDIR%%/QtGui/%%FULLVER%%/QtGui/private/qharfbuzzng_p.h
106	%%QT_INCDIR%%/QtGui/%%FULLVER%%/QtGui/private/qhexstring_p.h	113	%%QT_INCDIR%%/QtGui/%%FULLVER%%/QtGui/private/qhexstring_p.h
107	%%QT_INCDIR%%/QtGui/%%FULLVER%%/QtGui/private/qhighdpiscaling_p.h	114	%%QT_INCDIR%%/QtGui/%%FULLVER%%/QtGui/private/qhighdpiscaling_p.h
		115	%%QT_INCDIR%%/QtGui/%%FULLVER%%/QtGui/private/qicc_p.h
108	%%QT_INCDIR%%/QtGui/%%FULLVER%%/QtGui/private/qicon_p.h	116	%%QT_INCDIR%%/QtGui/%%FULLVER%%/QtGui/private/qicon_p.h
109	%%QT_INCDIR%%/QtGui/%%FULLVER%%/QtGui/private/qiconloader_p.h	117	%%QT_INCDIR%%/QtGui/%%FULLVER%%/QtGui/private/qiconloader_p.h
110	%%QT_INCDIR%%/QtGui/%%FULLVER%%/QtGui/private/qimage_p.h	118	%%QT_INCDIR%%/QtGui/%%FULLVER%%/QtGui/private/qimage_p.h
Lines 170-177 Link Here
170	%%QT_INCDIR%%/QtGui/%%FULLVER%%/QtGui/private/qrawfont_p.h	178	%%QT_INCDIR%%/QtGui/%%FULLVER%%/QtGui/private/qrawfont_p.h
171	%%QT_INCDIR%%/QtGui/%%FULLVER%%/QtGui/private/qrbtree_p.h	179	%%QT_INCDIR%%/QtGui/%%FULLVER%%/QtGui/private/qrbtree_p.h
172	%%QT_INCDIR%%/QtGui/%%FULLVER%%/QtGui/private/qrgba64_p.h	180	%%QT_INCDIR%%/QtGui/%%FULLVER%%/QtGui/private/qrgba64_p.h
		181	%%QT_INCDIR%%/QtGui/%%FULLVER%%/QtGui/private/qrhi_p.h
		182	%%QT_INCDIR%%/QtGui/%%FULLVER%%/QtGui/private/qrhi_p_p.h
		183	%%QT_INCDIR%%/QtGui/%%FULLVER%%/QtGui/private/qrhid3d11_p.h
		184	%%QT_INCDIR%%/QtGui/%%FULLVER%%/QtGui/private/qrhid3d11_p_p.h
		185	%%QT_INCDIR%%/QtGui/%%FULLVER%%/QtGui/private/qrhigles2_p.h
		186	%%QT_INCDIR%%/QtGui/%%FULLVER%%/QtGui/private/qrhigles2_p_p.h
		187	%%QT_INCDIR%%/QtGui/%%FULLVER%%/QtGui/private/qrhimetal_p.h
		188	%%QT_INCDIR%%/QtGui/%%FULLVER%%/QtGui/private/qrhimetal_p_p.h
		189	%%QT_INCDIR%%/QtGui/%%FULLVER%%/QtGui/private/qrhinull_p.h
		190	%%QT_INCDIR%%/QtGui/%%FULLVER%%/QtGui/private/qrhinull_p_p.h
		191	%%QT_INCDIR%%/QtGui/%%FULLVER%%/QtGui/private/qrhiprofiler_p.h
		192	%%QT_INCDIR%%/QtGui/%%FULLVER%%/QtGui/private/qrhiprofiler_p_p.h
		193	%%QT_INCDIR%%/QtGui/%%FULLVER%%/QtGui/private/qrhivulkan_p.h
		194	%%QT_INCDIR%%/QtGui/%%FULLVER%%/QtGui/private/qrhivulkan_p_p.h
		195	%%QT_INCDIR%%/QtGui/%%FULLVER%%/QtGui/private/qrhivulkanext_p.h
173	%%QT_INCDIR%%/QtGui/%%FULLVER%%/QtGui/private/qscreen_p.h	196	%%QT_INCDIR%%/QtGui/%%FULLVER%%/QtGui/private/qscreen_p.h
174	%%QT_INCDIR%%/QtGui/%%FULLVER%%/QtGui/private/qsessionmanager_p.h	197	%%QT_INCDIR%%/QtGui/%%FULLVER%%/QtGui/private/qsessionmanager_p.h
		198	%%QT_INCDIR%%/QtGui/%%FULLVER%%/QtGui/private/qshader_p.h
		199	%%QT_INCDIR%%/QtGui/%%FULLVER%%/QtGui/private/qshader_p_p.h
		200	%%QT_INCDIR%%/QtGui/%%FULLVER%%/QtGui/private/qshaderdescription_p.h
		201	%%QT_INCDIR%%/QtGui/%%FULLVER%%/QtGui/private/qshaderdescription_p_p.h
175	%%QT_INCDIR%%/QtGui/%%FULLVER%%/QtGui/private/qshaderformat_p.h	202	%%QT_INCDIR%%/QtGui/%%FULLVER%%/QtGui/private/qshaderformat_p.h
176	%%QT_INCDIR%%/QtGui/%%FULLVER%%/QtGui/private/qshadergenerator_p.h	203	%%QT_INCDIR%%/QtGui/%%FULLVER%%/QtGui/private/qshadergenerator_p.h
177	%%QT_INCDIR%%/QtGui/%%FULLVER%%/QtGui/private/qshadergraph_p.h	204	%%QT_INCDIR%%/QtGui/%%FULLVER%%/QtGui/private/qshadergraph_p.h
Lines 196-201 Link Here
196	%%QT_INCDIR%%/QtGui/%%FULLVER%%/QtGui/private/qtextformat_p.h	223	%%QT_INCDIR%%/QtGui/%%FULLVER%%/QtGui/private/qtextformat_p.h
197	%%QT_INCDIR%%/QtGui/%%FULLVER%%/QtGui/private/qtexthtmlparser_p.h	224	%%QT_INCDIR%%/QtGui/%%FULLVER%%/QtGui/private/qtexthtmlparser_p.h
198	%%QT_INCDIR%%/QtGui/%%FULLVER%%/QtGui/private/qtextimagehandler_p.h	225	%%QT_INCDIR%%/QtGui/%%FULLVER%%/QtGui/private/qtextimagehandler_p.h
		226	%%QT_INCDIR%%/QtGui/%%FULLVER%%/QtGui/private/qtextmarkdownimporter_p.h
		227	%%QT_INCDIR%%/QtGui/%%FULLVER%%/QtGui/private/qtextmarkdownwriter_p.h
199	%%QT_INCDIR%%/QtGui/%%FULLVER%%/QtGui/private/qtextobject_p.h	228	%%QT_INCDIR%%/QtGui/%%FULLVER%%/QtGui/private/qtextobject_p.h
200	%%QT_INCDIR%%/QtGui/%%FULLVER%%/QtGui/private/qtextodfwriter_p.h	229	%%QT_INCDIR%%/QtGui/%%FULLVER%%/QtGui/private/qtextodfwriter_p.h
201	%%QT_INCDIR%%/QtGui/%%FULLVER%%/QtGui/private/qtexttable_p.h	230	%%QT_INCDIR%%/QtGui/%%FULLVER%%/QtGui/private/qtexttable_p.h
Lines 288-293 Link Here
288	%%QT_INCDIR%%/QtGui/QClipboard	317	%%QT_INCDIR%%/QtGui/QClipboard
289	%%QT_INCDIR%%/QtGui/QCloseEvent	318	%%QT_INCDIR%%/QtGui/QCloseEvent
290	%%QT_INCDIR%%/QtGui/QColor	319	%%QT_INCDIR%%/QtGui/QColor
		320	%%QT_INCDIR%%/QtGui/QColorSpace
		321	%%QT_INCDIR%%/QtGui/QColorTransform
291	%%QT_INCDIR%%/QtGui/QConicalGradient	322	%%QT_INCDIR%%/QtGui/QConicalGradient
292	%%QT_INCDIR%%/QtGui/QContextMenuEvent	323	%%QT_INCDIR%%/QtGui/QContextMenuEvent
293	%%QT_INCDIR%%/QtGui/QCursor	324	%%QT_INCDIR%%/QtGui/QCursor
Lines 338-344 Link Here
338	%%QT_INCDIR%%/QtGui/QKeyEvent	369	%%QT_INCDIR%%/QtGui/QKeyEvent
339	%%QT_INCDIR%%/QtGui/QKeySequence	370	%%QT_INCDIR%%/QtGui/QKeySequence
340	%%QT_INCDIR%%/QtGui/QLinearGradient	371	%%QT_INCDIR%%/QtGui/QLinearGradient
341	%%QT_INCDIR%%/QtGui/QList
342	%%QT_INCDIR%%/QtGui/QMatrix	372	%%QT_INCDIR%%/QtGui/QMatrix
343	%%QT_INCDIR%%/QtGui/QMatrix2x2	373	%%QT_INCDIR%%/QtGui/QMatrix2x2
344	%%QT_INCDIR%%/QtGui/QMatrix2x3	374	%%QT_INCDIR%%/QtGui/QMatrix2x3
Lines 521-526 Link Here
521	%%QT_INCDIR%%/QtGui/qbrush.h	551	%%QT_INCDIR%%/QtGui/qbrush.h
522	%%QT_INCDIR%%/QtGui/qclipboard.h	552	%%QT_INCDIR%%/QtGui/qclipboard.h
523	%%QT_INCDIR%%/QtGui/qcolor.h	553	%%QT_INCDIR%%/QtGui/qcolor.h
		554	%%QT_INCDIR%%/QtGui/qcolorspace.h
		555	%%QT_INCDIR%%/QtGui/qcolortransform.h
524	%%QT_INCDIR%%/QtGui/qcursor.h	556	%%QT_INCDIR%%/QtGui/qcursor.h
525	%%QT_INCDIR%%/QtGui/qdesktopservices.h	557	%%QT_INCDIR%%/QtGui/qdesktopservices.h
526	%%QT_INCDIR%%/QtGui/qdrag.h	558	%%QT_INCDIR%%/QtGui/qdrag.h
Lines 649-654 Link Here
649	%%QT_INCDIR%%/QtGui/qwindow.h	681	%%QT_INCDIR%%/QtGui/qwindow.h
650	%%QT_INCDIR%%/QtGui/qwindowdefs.h	682	%%QT_INCDIR%%/QtGui/qwindowdefs.h
651	%%QT_INCDIR%%/QtGui/qwindowdefs_win.h	683	%%QT_INCDIR%%/QtGui/qwindowdefs_win.h
		684	%%QT_INCDIR%%/QtInputSupport/%%FULLVER%%/QtInputSupport/private/devicehandlerlist_p.h
652	%%QT_INCDIR%%/QtInputSupport/%%FULLVER%%/QtInputSupport/private/qevdevkeyboard_defaultmap_p.h	685	%%QT_INCDIR%%/QtInputSupport/%%FULLVER%%/QtInputSupport/private/qevdevkeyboard_defaultmap_p.h
653	%%QT_INCDIR%%/QtInputSupport/%%FULLVER%%/QtInputSupport/private/qevdevkeyboardhandler_p.h	686	%%QT_INCDIR%%/QtInputSupport/%%FULLVER%%/QtInputSupport/private/qevdevkeyboardhandler_p.h
654	%%QT_INCDIR%%/QtInputSupport/%%FULLVER%%/QtInputSupport/private/qevdevkeyboardmanager_p.h	687	%%QT_INCDIR%%/QtInputSupport/%%FULLVER%%/QtInputSupport/private/qevdevkeyboardmanager_p.h
Lines 659-664 Link Here
659	%%QT_INCDIR%%/QtInputSupport/%%FULLVER%%/QtInputSupport/private/qevdevtouchfilter_p.h	692	%%QT_INCDIR%%/QtInputSupport/%%FULLVER%%/QtInputSupport/private/qevdevtouchfilter_p.h
660	%%QT_INCDIR%%/QtInputSupport/%%FULLVER%%/QtInputSupport/private/qevdevtouchhandler_p.h	693	%%QT_INCDIR%%/QtInputSupport/%%FULLVER%%/QtInputSupport/private/qevdevtouchhandler_p.h
661	%%QT_INCDIR%%/QtInputSupport/%%FULLVER%%/QtInputSupport/private/qevdevtouchmanager_p.h	694	%%QT_INCDIR%%/QtInputSupport/%%FULLVER%%/QtInputSupport/private/qevdevtouchmanager_p.h
		695	%%QT_INCDIR%%/QtInputSupport/%%FULLVER%%/QtInputSupport/private/qevdevutil_p.h
662	%%QT_INCDIR%%/QtInputSupport/%%FULLVER%%/QtInputSupport/private/qlibinputhandler_p.h	696	%%QT_INCDIR%%/QtInputSupport/%%FULLVER%%/QtInputSupport/private/qlibinputhandler_p.h
663	%%QT_INCDIR%%/QtInputSupport/%%FULLVER%%/QtInputSupport/private/qlibinputkeyboard_p.h	697	%%QT_INCDIR%%/QtInputSupport/%%FULLVER%%/QtInputSupport/private/qlibinputkeyboard_p.h
664	%%QT_INCDIR%%/QtInputSupport/%%FULLVER%%/QtInputSupport/private/qlibinputpointer_p.h	698	%%QT_INCDIR%%/QtInputSupport/%%FULLVER%%/QtInputSupport/private/qlibinputpointer_p.h
Lines 843-850 Link Here
843	%%DEBUG%%%%QT_LIBDIR%%/libQt5Gui.so.%%FULLVER%%.debug	877	%%DEBUG%%%%QT_LIBDIR%%/libQt5Gui.so.%%FULLVER%%.debug
844	%%QT_LIBDIR%%/libQt5InputSupport.a	878	%%QT_LIBDIR%%/libQt5InputSupport.a
845	%%QT_LIBDIR%%/libQt5InputSupport.prl	879	%%QT_LIBDIR%%/libQt5InputSupport.prl
846	%%QT_LIBDIR%%/libQt5XkbCommonSupport.a
847	%%QT_LIBDIR%%/libQt5XkbCommonSupport.prl
848	%%QT_LIBDIR%%/libQt5KmsSupport.a	880	%%QT_LIBDIR%%/libQt5KmsSupport.a
849	%%QT_LIBDIR%%/libQt5KmsSupport.prl	881	%%QT_LIBDIR%%/libQt5KmsSupport.prl
850	%%QT_LIBDIR%%/libQt5LinuxAccessibilitySupport.a	882	%%QT_LIBDIR%%/libQt5LinuxAccessibilitySupport.a
Lines 865-870 Link Here
865	%%QT_LIBDIR%%/libQt5XcbQpa.so.%%SHORTVER%%	897	%%QT_LIBDIR%%/libQt5XcbQpa.so.%%SHORTVER%%
866	%%QT_LIBDIR%%/libQt5XcbQpa.so.%%FULLVER%%	898	%%QT_LIBDIR%%/libQt5XcbQpa.so.%%FULLVER%%
867	%%DEBUG%%%%QT_LIBDIR%%/libQt5XcbQpa.so.%%FULLVER%%.debug	899	%%DEBUG%%%%QT_LIBDIR%%/libQt5XcbQpa.so.%%FULLVER%%.debug
		900	%%QT_LIBDIR%%/libQt5XkbCommonSupport.a
		901	%%QT_LIBDIR%%/libQt5XkbCommonSupport.prl
868	%%QT_MKSPECDIR%%/modules/qt_lib_accessibility_support_private.pri	902	%%QT_MKSPECDIR%%/modules/qt_lib_accessibility_support_private.pri
869	%%QT_MKSPECDIR%%/modules/qt_lib_devicediscovery_support_private.pri	903	%%QT_MKSPECDIR%%/modules/qt_lib_devicediscovery_support_private.pri
870	%%QT_MKSPECDIR%%/modules/qt_lib_edid_support_private.pri	904	%%QT_MKSPECDIR%%/modules/qt_lib_edid_support_private.pri
Lines 890-897 Link Here
890	%%DEBUG%%%%QT_PLUGINDIR%%/generic/libqbsdkeyboardplugin.so.debug	924	%%DEBUG%%%%QT_PLUGINDIR%%/generic/libqbsdkeyboardplugin.so.debug
891	%%QT_PLUGINDIR%%/generic/libqbsdmouseplugin.so	925	%%QT_PLUGINDIR%%/generic/libqbsdmouseplugin.so
892	%%DEBUG%%%%QT_PLUGINDIR%%/generic/libqbsdmouseplugin.so.debug	926	%%DEBUG%%%%QT_PLUGINDIR%%/generic/libqbsdmouseplugin.so.debug
893	%%QT_PLUGINDIR%%/generic/libqtuiotouchplugin.so
894	%%DEBUG%%%%QT_PLUGINDIR%%/generic/libqtuiotouchplugin.so.debug
895	%%QT_PLUGINDIR%%/generic/libqevdevkeyboardplugin.so	927	%%QT_PLUGINDIR%%/generic/libqevdevkeyboardplugin.so
896	%%DEBUG%%%%QT_PLUGINDIR%%/generic/libqevdevkeyboardplugin.so.debug	928	%%DEBUG%%%%QT_PLUGINDIR%%/generic/libqevdevkeyboardplugin.so.debug
897	%%QT_PLUGINDIR%%/generic/libqevdevmouseplugin.so	929	%%QT_PLUGINDIR%%/generic/libqevdevmouseplugin.so
Lines 900-905 Link Here
900	%%DEBUG%%%%QT_PLUGINDIR%%/generic/libqevdevtabletplugin.so.debug	932	%%DEBUG%%%%QT_PLUGINDIR%%/generic/libqevdevtabletplugin.so.debug
901	%%QT_PLUGINDIR%%/generic/libqevdevtouchplugin.so	933	%%QT_PLUGINDIR%%/generic/libqevdevtouchplugin.so
902	%%DEBUG%%%%QT_PLUGINDIR%%/generic/libqevdevtouchplugin.so.debug	934	%%DEBUG%%%%QT_PLUGINDIR%%/generic/libqevdevtouchplugin.so.debug
		935	%%QT_PLUGINDIR%%/generic/libqtuiotouchplugin.so
		936	%%DEBUG%%%%QT_PLUGINDIR%%/generic/libqtuiotouchplugin.so.debug
903	%%QT_PLUGINDIR%%/imageformats/libqgif.so	937	%%QT_PLUGINDIR%%/imageformats/libqgif.so
904	%%DEBUG%%%%QT_PLUGINDIR%%/imageformats/libqgif.so.debug	938	%%DEBUG%%%%QT_PLUGINDIR%%/imageformats/libqgif.so.debug
905	%%QT_PLUGINDIR%%/imageformats/libqico.so	939	%%QT_PLUGINDIR%%/imageformats/libqico.so

Lines 2-8 Link Here

(-)b/x11-toolkits/qt5-widgets/Makefile (-1 lines)
2		2
3	PORTNAME= widgets	3	PORTNAME= widgets
4	DISTVERSION= ${QT5_VERSION}	4	DISTVERSION= ${QT5_VERSION}
5	PORTREVISION= 1
6	CATEGORIES= x11-toolkits	5	CATEGORIES= x11-toolkits
7	PKGNAMEPREFIX= qt5-	6	PKGNAMEPREFIX= qt5-
8		7

Lines 109-117 Link Here

(-)b/x11-toolkits/qt5-widgets/pkg-plist (-1 / +1 lines)
109	%%QT_INCDIR%%/QtWidgets/%%FULLVER%%/QtWidgets/private/qwidget_p.h	109	%%QT_INCDIR%%/QtWidgets/%%FULLVER%%/QtWidgets/private/qwidget_p.h
110	%%QT_INCDIR%%/QtWidgets/%%FULLVER%%/QtWidgets/private/qwidgetaction_p.h	110	%%QT_INCDIR%%/QtWidgets/%%FULLVER%%/QtWidgets/private/qwidgetaction_p.h
111	%%QT_INCDIR%%/QtWidgets/%%FULLVER%%/QtWidgets/private/qwidgetanimator_p.h	111	%%QT_INCDIR%%/QtWidgets/%%FULLVER%%/QtWidgets/private/qwidgetanimator_p.h
112	%%QT_INCDIR%%/QtWidgets/%%FULLVER%%/QtWidgets/private/qwidgetbackingstore_p.h
113	%%QT_INCDIR%%/QtWidgets/%%FULLVER%%/QtWidgets/private/qwidgetitemdata_p.h	112	%%QT_INCDIR%%/QtWidgets/%%FULLVER%%/QtWidgets/private/qwidgetitemdata_p.h
114	%%QT_INCDIR%%/QtWidgets/%%FULLVER%%/QtWidgets/private/qwidgetlinecontrol_p.h	113	%%QT_INCDIR%%/QtWidgets/%%FULLVER%%/QtWidgets/private/qwidgetlinecontrol_p.h
		114	%%QT_INCDIR%%/QtWidgets/%%FULLVER%%/QtWidgets/private/qwidgetrepaintmanager_p.h
115	%%QT_INCDIR%%/QtWidgets/%%FULLVER%%/QtWidgets/private/qwidgetresizehandler_p.h	115	%%QT_INCDIR%%/QtWidgets/%%FULLVER%%/QtWidgets/private/qwidgetresizehandler_p.h
116	%%QT_INCDIR%%/QtWidgets/%%FULLVER%%/QtWidgets/private/qwidgettextcontrol_p.h	116	%%QT_INCDIR%%/QtWidgets/%%FULLVER%%/QtWidgets/private/qwidgettextcontrol_p.h
117	%%QT_INCDIR%%/QtWidgets/%%FULLVER%%/QtWidgets/private/qwidgettextcontrol_p_p.h	117	%%QT_INCDIR%%/QtWidgets/%%FULLVER%%/QtWidgets/private/qwidgettextcontrol_p_p.h

Lines 2-8 Link Here

(-)b/x11-toolkits/qt5pas/Makefile (-1 lines)
2		2
3	PORTNAME= qt5pas	3	PORTNAME= qt5pas
4	PORTVERSION= 2.6	4	PORTVERSION= 2.6
5	PORTREVISION= 4
6	CATEGORIES= x11-toolkits	5	CATEGORIES= x11-toolkits
7	MASTER_SITES= LOCAL/acm/	6	MASTER_SITES= LOCAL/acm/
8		7

Lines 2-8 Link Here

(-)b/x11/qt5-qev/Makefile (-1 lines)
2		2
3	PORTNAME= qev	3	PORTNAME= qev
4	DISTVERSION= ${QT5_VERSION}	4	DISTVERSION= ${QT5_VERSION}
5	PORTREVISION= 1
6	CATEGORIES= x11	5	CATEGORIES= x11
7	PKGNAMEPREFIX= qt5-	6	PKGNAMEPREFIX= qt5-
8		7

Return to bug 244964

Lines 8-14 PKGNAMEPREFIX= qt5- Link Here

(-)b/accessibility/qt5-speech/Makefile (-3 / +5 lines)
8	MAINTAINER= kde@FreeBSD.org	8	MAINTAINER= kde@FreeBSD.org
9	COMMENT= Accessibilty features for Qt5	9	COMMENT= Accessibilty features for Qt5
10		10
11	USES= compiler:c++11-lang gl pkgconfig qmake:outsource \	11	USES= compiler:c++11-lang gl pkgconfig qmake:outsource,norecursive \
12	qt-dist:5,speech xorg	12	qt-dist:5,speech xorg
13	USE_GL= gl	13	USE_GL= gl
14	USE_QT= core gui buildtools_build qmake_build	14	USE_QT= core gui buildtools_build qmake_build
Lines 22-32 SPEECHD_DESC= Speech Dispatcher Backend Link Here
22	SPEECHD_USES= gettext-runtime gnome	22	SPEECHD_USES= gettext-runtime gnome
23	SPEECHD_USE= GNOME=glib20	23	SPEECHD_USE= GNOME=glib20
24	SPEECHD_LIB_DEPENDS= libspeechd.so:accessibility/speech-dispatcher	24	SPEECHD_LIB_DEPENDS= libspeechd.so:accessibility/speech-dispatcher
25	SPEECHD_QMAKE_ON= CONFIG+=with_speechd	25	SPEECHD_VARS= QMAKE_CONFIGURE_ARGS+=--feature-speechd
		26	SPEECHD_VARS_OFF= QMAKE_CONFIGURE_ARGS+=--no-feature-speechd
26		27
27	FLITE_DESC= Festival Lite Backend	28	FLITE_DESC= Festival Lite Backend
28	FLITE_LIB_DEPENDS= libflite.so:audio/flite	29	FLITE_LIB_DEPENDS= libflite.so:audio/flite
29	FLITE_USE= QT=multimedia,network	30	FLITE_USE= QT=multimedia,network
30	FLITE_QMAKE_ON= CONFIG+=with_flite	31	FLITE_VARS= QMAKE_CONFIGURE_ARGS+=--feature-flite
		32	FLITE_VARS_OFF= QMAKE_CONFIGURE_ARGS+=--no-feature-flite
31		33
32	.include <bsd.port.mk>	34	.include <bsd.port.mk>

Removed Link Here

(-)a/accessibility/qt5-speech/files/patch-qtspeech.pro (-18 lines)
1	--- qtspeech.pro.orig 2019-02-16 08:32:35 UTC
2	+++ qtspeech.pro
3	@@ -1,7 +1,11 @@
4	load(configure)
5	-qtCompileTest(flite)
6	-qtCompileTest(flite_alsa)
7	-!packagesExist(speech-dispatcher) {
8	- qtCompileTest(speechd)
9	+with_flite {
10	+ qtCompileTest(flite)
11	+ qtCompileTest(flite_alsa)
12	+}
13	+with_speechd {
14	+ !packagesExist(speech-dispatcher) {
15	+ qtCompileTest(speechd)
16	+ }
17	}
18	load(qt_parts)

Removed Link Here

(-)a/accessibility/qt5-speech/files/patch-src_plugins_tts_tts.pro (-31 lines)
1	--- src/plugins/tts/tts.pro.orig 2019-02-16 08:43:06 UTC
2	+++ src/plugins/tts/tts.pro
3	@@ -1,10 +1,12 @@
4	TEMPLATE = subdirs
5
6	-unix {
7	- CONFIG += link_pkgconfig
8	- config_speechd \| packagesExist(speech-dispatcher) {
9	- SUBDIRS += speechdispatcher
10	- }
11	+with_speechd {
12	+ unix {
13	+ CONFIG += link_pkgconfig
14	+ config_speechd \| packagesExist(speech-dispatcher) {
15	+ SUBDIRS += speechdispatcher
16	+ }
17	+ }
18	}
19
20	windows:!winrt: SUBDIRS += sapi
21	@@ -15,6 +17,8 @@ uikit: SUBDIRS += ios
22
23	android: SUBDIRS += android
24
25	-config_flite \| config_flite_alsa {
26	- SUBDIRS += flite
27	+with_flite {
28	+ config_flite \| config_flite_alsa {
29	+ SUBDIRS += flite
30	+ }
31	}

Lines 1-5 Link Here

(-)b/accessibility/qt5-speech/pkg-plist (+2 lines)
1	%%QT_INCDIR%%/QtTextToSpeech/%%FULLVER%%/QtTextToSpeech/private/qtexttospeech_p.h	1	%%QT_INCDIR%%/QtTextToSpeech/%%FULLVER%%/QtTextToSpeech/private/qtexttospeech_p.h
2	%%QT_INCDIR%%/QtTextToSpeech/%%FULLVER%%/QtTextToSpeech/private/qvoice_p.h	2	%%QT_INCDIR%%/QtTextToSpeech/%%FULLVER%%/QtTextToSpeech/private/qvoice_p.h
		3	%%QT_INCDIR%%/QtTextToSpeech/%%FULLVER%%/QtTextToSpeech/private/qttexttospeech-config_p.h
3	%%QT_INCDIR%%/QtTextToSpeech/QTextToSpeech	4	%%QT_INCDIR%%/QtTextToSpeech/QTextToSpeech
4	%%QT_INCDIR%%/QtTextToSpeech/QTextToSpeechEngine	5	%%QT_INCDIR%%/QtTextToSpeech/QTextToSpeechEngine
5	%%QT_INCDIR%%/QtTextToSpeech/QTextToSpeechPlugin	6	%%QT_INCDIR%%/QtTextToSpeech/QTextToSpeechPlugin
Lines 12-17 Link Here
12	%%QT_INCDIR%%/QtTextToSpeech/qtexttospeechengine.h	13	%%QT_INCDIR%%/QtTextToSpeech/qtexttospeechengine.h
13	%%QT_INCDIR%%/QtTextToSpeech/qtexttospeechplugin.h	14	%%QT_INCDIR%%/QtTextToSpeech/qtexttospeechplugin.h
14	%%QT_INCDIR%%/QtTextToSpeech/qttexttospeechversion.h	15	%%QT_INCDIR%%/QtTextToSpeech/qttexttospeechversion.h
		16	%%QT_INCDIR%%/QtTextToSpeech/qttexttospeech-config.h
15	%%QT_INCDIR%%/QtTextToSpeech/qvoice.h	17	%%QT_INCDIR%%/QtTextToSpeech/qvoice.h
16	%%QT_CMAKEDIR%%/Qt5TextToSpeech/Qt5TextToSpeechConfig.cmake	18	%%QT_CMAKEDIR%%/Qt5TextToSpeech/Qt5TextToSpeechConfig.cmake
17	%%QT_CMAKEDIR%%/Qt5TextToSpeech/Qt5TextToSpeechConfigVersion.cmake	19	%%QT_CMAKEDIR%%/Qt5TextToSpeech/Qt5TextToSpeechConfigVersion.cmake

Lines 6-11 Link Here

(-)b/comms/qt5-connectivity/pkg-plist (-3 / +6 lines)
6	%%QT_INCDIR%%/QtBluetooth/%%FULLVER%%/QtBluetooth/private/bluetoothmanagement_p.h	6	%%QT_INCDIR%%/QtBluetooth/%%FULLVER%%/QtBluetooth/private/bluetoothmanagement_p.h
7	%%QT_INCDIR%%/QtBluetooth/%%FULLVER%%/QtBluetooth/private/bluez5_helper_p.h	7	%%QT_INCDIR%%/QtBluetooth/%%FULLVER%%/QtBluetooth/private/bluez5_helper_p.h
8	%%QT_INCDIR%%/QtBluetooth/%%FULLVER%%/QtBluetooth/private/bluez_data_p.h	8	%%QT_INCDIR%%/QtBluetooth/%%FULLVER%%/QtBluetooth/private/bluez_data_p.h
		9	%%QT_INCDIR%%/QtBluetooth/%%FULLVER%%/QtBluetooth/private/btdelegates_p.h
		10	%%QT_INCDIR%%/QtBluetooth/%%FULLVER%%/QtBluetooth/private/btraii_p.h
9	%%QT_INCDIR%%/QtBluetooth/%%FULLVER%%/QtBluetooth/private/device1_bluez5_p.h	11	%%QT_INCDIR%%/QtBluetooth/%%FULLVER%%/QtBluetooth/private/device1_bluez5_p.h
10	%%QT_INCDIR%%/QtBluetooth/%%FULLVER%%/QtBluetooth/private/device_p.h	12	%%QT_INCDIR%%/QtBluetooth/%%FULLVER%%/QtBluetooth/private/device_p.h
11	%%QT_INCDIR%%/QtBluetooth/%%FULLVER%%/QtBluetooth/private/devicediscoverybroadcastreceiver_p.h	13	%%QT_INCDIR%%/QtBluetooth/%%FULLVER%%/QtBluetooth/private/devicediscoverybroadcastreceiver_p.h
Lines 30-36 Link Here
30	%%QT_INCDIR%%/QtBluetooth/%%FULLVER%%/QtBluetooth/private/objectmanager_p.h	32	%%QT_INCDIR%%/QtBluetooth/%%FULLVER%%/QtBluetooth/private/objectmanager_p.h
31	%%QT_INCDIR%%/QtBluetooth/%%FULLVER%%/QtBluetooth/private/osxbluetooth_p.h	33	%%QT_INCDIR%%/QtBluetooth/%%FULLVER%%/QtBluetooth/private/osxbluetooth_p.h
32	%%QT_INCDIR%%/QtBluetooth/%%FULLVER%%/QtBluetooth/private/osxbtcentralmanager_p.h	34	%%QT_INCDIR%%/QtBluetooth/%%FULLVER%%/QtBluetooth/private/osxbtcentralmanager_p.h
33	%%QT_INCDIR%%/QtBluetooth/%%FULLVER%%/QtBluetooth/private/osxbtchanneldelegate_p.h
34	%%QT_INCDIR%%/QtBluetooth/%%FULLVER%%/QtBluetooth/private/osxbtconnectionmonitor_p.h	35	%%QT_INCDIR%%/QtBluetooth/%%FULLVER%%/QtBluetooth/private/osxbtconnectionmonitor_p.h
35	%%QT_INCDIR%%/QtBluetooth/%%FULLVER%%/QtBluetooth/private/osxbtdeviceinquiry_p.h	36	%%QT_INCDIR%%/QtBluetooth/%%FULLVER%%/QtBluetooth/private/osxbtdeviceinquiry_p.h
36	%%QT_INCDIR%%/QtBluetooth/%%FULLVER%%/QtBluetooth/private/osxbtdevicepair_p.h	37	%%QT_INCDIR%%/QtBluetooth/%%FULLVER%%/QtBluetooth/private/osxbtdevicepair_p.h
Lines 54-60 Link Here
54	%%QT_INCDIR%%/QtBluetooth/%%FULLVER%%/QtBluetooth/private/qbluetoothdeviceinfo_p.h	55	%%QT_INCDIR%%/QtBluetooth/%%FULLVER%%/QtBluetooth/private/qbluetoothdeviceinfo_p.h
55	%%QT_INCDIR%%/QtBluetooth/%%FULLVER%%/QtBluetooth/private/qbluetoothhostinfo_p.h	56	%%QT_INCDIR%%/QtBluetooth/%%FULLVER%%/QtBluetooth/private/qbluetoothhostinfo_p.h
56	%%QT_INCDIR%%/QtBluetooth/%%FULLVER%%/QtBluetooth/private/qbluetoothlocaldevice_p.h	57	%%QT_INCDIR%%/QtBluetooth/%%FULLVER%%/QtBluetooth/private/qbluetoothlocaldevice_p.h
57	%%QT_INCDIR%%/QtBluetooth/%%FULLVER%%/QtBluetooth/private/qbluetoothserver_osx_p.h
58	%%QT_INCDIR%%/QtBluetooth/%%FULLVER%%/QtBluetooth/private/qbluetoothserver_p.h	58	%%QT_INCDIR%%/QtBluetooth/%%FULLVER%%/QtBluetooth/private/qbluetoothserver_p.h
59	%%QT_INCDIR%%/QtBluetooth/%%FULLVER%%/QtBluetooth/private/qbluetoothservicediscoveryagent_p.h	59	%%QT_INCDIR%%/QtBluetooth/%%FULLVER%%/QtBluetooth/private/qbluetoothservicediscoveryagent_p.h
60	%%QT_INCDIR%%/QtBluetooth/%%FULLVER%%/QtBluetooth/private/qbluetoothserviceinfo_p.h	60	%%QT_INCDIR%%/QtBluetooth/%%FULLVER%%/QtBluetooth/private/qbluetoothserviceinfo_p.h
Lines 63-68 Link Here
63	%%QT_INCDIR%%/QtBluetooth/%%FULLVER%%/QtBluetooth/private/qbluetoothsocket_bluezdbus_p.h	63	%%QT_INCDIR%%/QtBluetooth/%%FULLVER%%/QtBluetooth/private/qbluetoothsocket_bluezdbus_p.h
64	%%QT_INCDIR%%/QtBluetooth/%%FULLVER%%/QtBluetooth/private/qbluetoothsocket_dummy_p.h	64	%%QT_INCDIR%%/QtBluetooth/%%FULLVER%%/QtBluetooth/private/qbluetoothsocket_dummy_p.h
65	%%QT_INCDIR%%/QtBluetooth/%%FULLVER%%/QtBluetooth/private/qbluetoothsocket_osx_p.h	65	%%QT_INCDIR%%/QtBluetooth/%%FULLVER%%/QtBluetooth/private/qbluetoothsocket_osx_p.h
		66	%%QT_INCDIR%%/QtBluetooth/%%FULLVER%%/QtBluetooth/private/qbluetoothsocket_win_p.h
66	%%QT_INCDIR%%/QtBluetooth/%%FULLVER%%/QtBluetooth/private/qbluetoothsocket_winrt_p.h	67	%%QT_INCDIR%%/QtBluetooth/%%FULLVER%%/QtBluetooth/private/qbluetoothsocket_winrt_p.h
67	%%QT_INCDIR%%/QtBluetooth/%%FULLVER%%/QtBluetooth/private/qbluetoothsocketbase_p.h	68	%%QT_INCDIR%%/QtBluetooth/%%FULLVER%%/QtBluetooth/private/qbluetoothsocketbase_p.h
68	%%QT_INCDIR%%/QtBluetooth/%%FULLVER%%/QtBluetooth/private/qbluetoothtransferreply_bluez_p.h	69	%%QT_INCDIR%%/QtBluetooth/%%FULLVER%%/QtBluetooth/private/qbluetoothtransferreply_bluez_p.h
Lines 74-81 Link Here
74	%%QT_INCDIR%%/QtBluetooth/%%FULLVER%%/QtBluetooth/private/qlowenergycontroller_android_p.h	75	%%QT_INCDIR%%/QtBluetooth/%%FULLVER%%/QtBluetooth/private/qlowenergycontroller_android_p.h
75	%%QT_INCDIR%%/QtBluetooth/%%FULLVER%%/QtBluetooth/private/qlowenergycontroller_bluez_p.h	76	%%QT_INCDIR%%/QtBluetooth/%%FULLVER%%/QtBluetooth/private/qlowenergycontroller_bluez_p.h
76	%%QT_INCDIR%%/QtBluetooth/%%FULLVER%%/QtBluetooth/private/qlowenergycontroller_bluezdbus_p.h	77	%%QT_INCDIR%%/QtBluetooth/%%FULLVER%%/QtBluetooth/private/qlowenergycontroller_bluezdbus_p.h
77	%%QT_INCDIR%%/QtBluetooth/%%FULLVER%%/QtBluetooth/private/qlowenergycontroller_osx_p.h	78	%%QT_INCDIR%%/QtBluetooth/%%FULLVER%%/QtBluetooth/private/qlowenergycontroller_darwin_p.h
78	%%QT_INCDIR%%/QtBluetooth/%%FULLVER%%/QtBluetooth/private/qlowenergycontroller_p.h	79	%%QT_INCDIR%%/QtBluetooth/%%FULLVER%%/QtBluetooth/private/qlowenergycontroller_p.h
		80	%%QT_INCDIR%%/QtBluetooth/%%FULLVER%%/QtBluetooth/private/qlowenergycontroller_win_p.h
79	%%QT_INCDIR%%/QtBluetooth/%%FULLVER%%/QtBluetooth/private/qlowenergycontroller_winrt_new_p.h	81	%%QT_INCDIR%%/QtBluetooth/%%FULLVER%%/QtBluetooth/private/qlowenergycontroller_winrt_new_p.h
80	%%QT_INCDIR%%/QtBluetooth/%%FULLVER%%/QtBluetooth/private/qlowenergycontroller_winrt_p.h	82	%%QT_INCDIR%%/QtBluetooth/%%FULLVER%%/QtBluetooth/private/qlowenergycontroller_winrt_p.h
81	%%QT_INCDIR%%/QtBluetooth/%%FULLVER%%/QtBluetooth/private/qlowenergycontrollerbase_p.h	83	%%QT_INCDIR%%/QtBluetooth/%%FULLVER%%/QtBluetooth/private/qlowenergycontrollerbase_p.h
Lines 83-88 Link Here
83	%%QT_INCDIR%%/QtBluetooth/%%FULLVER%%/QtBluetooth/private/qprivatelinearbuffer_p.h	85	%%QT_INCDIR%%/QtBluetooth/%%FULLVER%%/QtBluetooth/private/qprivatelinearbuffer_p.h
84	%%QT_INCDIR%%/QtBluetooth/%%FULLVER%%/QtBluetooth/private/qtbluetooth-config_p.h	86	%%QT_INCDIR%%/QtBluetooth/%%FULLVER%%/QtBluetooth/private/qtbluetooth-config_p.h
85	%%QT_INCDIR%%/QtBluetooth/%%FULLVER%%/QtBluetooth/private/qtbluetoothglobal_p.h	87	%%QT_INCDIR%%/QtBluetooth/%%FULLVER%%/QtBluetooth/private/qtbluetoothglobal_p.h
		88	%%QT_INCDIR%%/QtBluetooth/%%FULLVER%%/QtBluetooth/private/qwinlowenergybluetooth_p.h
86	%%QT_INCDIR%%/QtBluetooth/%%FULLVER%%/QtBluetooth/private/remotedevicemanager_p.h	89	%%QT_INCDIR%%/QtBluetooth/%%FULLVER%%/QtBluetooth/private/remotedevicemanager_p.h
87	%%QT_INCDIR%%/QtBluetooth/%%FULLVER%%/QtBluetooth/private/serveracceptancethread_p.h	90	%%QT_INCDIR%%/QtBluetooth/%%FULLVER%%/QtBluetooth/private/serveracceptancethread_p.h
88	%%QT_INCDIR%%/QtBluetooth/%%FULLVER%%/QtBluetooth/private/service_p.h	91	%%QT_INCDIR%%/QtBluetooth/%%FULLVER%%/QtBluetooth/private/service_p.h

Lines 1-12 Link Here

(-)b/comms/qt5-serialport/pkg-plist (-1 / +3 lines)
1	%%QT_INCDIR%%/QtSerialPort/%%FULLVER%%/QtSerialPort/private/qserialport_p.h	1	%%QT_INCDIR%%/QtSerialPort/%%FULLVER%%/QtSerialPort/private/qserialport_p.h
2	%%QT_INCDIR%%/QtSerialPort/%%FULLVER%%/QtSerialPort/private/qserialportinfo_p.h	2	%%QT_INCDIR%%/QtSerialPort/%%FULLVER%%/QtSerialPort/private/qserialportinfo_p.h
		3	%%QT_INCDIR%%/QtSerialPort/%%FULLVER%%/QtSerialPort/private/qtntdll_p.h
		4	%%QT_INCDIR%%/QtSerialPort/%%FULLVER%%/QtSerialPort/private/qtserialport-config_p.h
3	%%QT_INCDIR%%/QtSerialPort/%%FULLVER%%/QtSerialPort/private/qtudev_p.h	5	%%QT_INCDIR%%/QtSerialPort/%%FULLVER%%/QtSerialPort/private/qtudev_p.h
4	%%QT_INCDIR%%/QtSerialPort/%%FULLVER%%/QtSerialPort/private/qwinoverlappedionotifier_p.h
5	%%QT_INCDIR%%/QtSerialPort/QSerialPort	6	%%QT_INCDIR%%/QtSerialPort/QSerialPort
6	%%QT_INCDIR%%/QtSerialPort/QSerialPortInfo	7	%%QT_INCDIR%%/QtSerialPort/QSerialPortInfo
7	%%QT_INCDIR%%/QtSerialPort/QtSerialPort	8	%%QT_INCDIR%%/QtSerialPort/QtSerialPort
8	%%QT_INCDIR%%/QtSerialPort/QtSerialPortDepends	9	%%QT_INCDIR%%/QtSerialPort/QtSerialPortDepends
9	%%QT_INCDIR%%/QtSerialPort/QtSerialPortVersion	10	%%QT_INCDIR%%/QtSerialPort/QtSerialPortVersion
		11	%%QT_INCDIR%%/QtSerialPort/qtserialport-config.h
10	%%QT_INCDIR%%/QtSerialPort/qserialport.h	12	%%QT_INCDIR%%/QtSerialPort/qserialport.h
11	%%QT_INCDIR%%/QtSerialPort/qserialportglobal.h	13	%%QT_INCDIR%%/QtSerialPort/qserialportglobal.h
12	%%QT_INCDIR%%/QtSerialPort/qserialportinfo.h	14	%%QT_INCDIR%%/QtSerialPort/qserialportinfo.h

Lines 11-16 Link Here

(-)b/devel/qt5-core/pkg-plist (-2 / +20 lines)
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/qbytearray_p.h	12	%%QT_INCDIR%%/QtCore/%%FULLVER%%/QtCore/private/qbytearray_p.h
13	%%QT_INCDIR%%/QtCore/%%FULLVER%%/QtCore/private/qbytedata_p.h	13	%%QT_INCDIR%%/QtCore/%%FULLVER%%/QtCore/private/qbytedata_p.h
		14	%%QT_INCDIR%%/QtCore/%%FULLVER%%/QtCore/private/qcalendarbackend_p.h
		15	%%QT_INCDIR%%/QtCore/%%FULLVER%%/QtCore/private/qcalendarmath_p.h
14	%%QT_INCDIR%%/QtCore/%%FULLVER%%/QtCore/private/qcborvalue_p.h	16	%%QT_INCDIR%%/QtCore/%%FULLVER%%/QtCore/private/qcborvalue_p.h
15	%%QT_INCDIR%%/QtCore/%%FULLVER%%/QtCore/private/qcfsocketnotifier_p.h	17	%%QT_INCDIR%%/QtCore/%%FULLVER%%/QtCore/private/qcfsocketnotifier_p.h
16	%%QT_INCDIR%%/QtCore/%%FULLVER%%/QtCore/private/qcollator_p.h	18	%%QT_INCDIR%%/QtCore/%%FULLVER%%/QtCore/private/qcollator_p.h
Lines 55-61 Link Here
55	%%QT_INCDIR%%/QtCore/%%FULLVER%%/QtCore/private/qfilesystemwatcher_polling_p.h	57	%%QT_INCDIR%%/QtCore/%%FULLVER%%/QtCore/private/qfilesystemwatcher_polling_p.h
56	%%QT_INCDIR%%/QtCore/%%FULLVER%%/QtCore/private/qfilesystemwatcher_win_p.h	58	%%QT_INCDIR%%/QtCore/%%FULLVER%%/QtCore/private/qfilesystemwatcher_win_p.h
57	%%QT_INCDIR%%/QtCore/%%FULLVER%%/QtCore/private/qfinalstate_p.h	59	%%QT_INCDIR%%/QtCore/%%FULLVER%%/QtCore/private/qfinalstate_p.h
58	%%QT_INCDIR%%/QtCore/%%FULLVER%%/QtCore/private/qfloat16_p.h
59	%%QT_INCDIR%%/QtCore/%%FULLVER%%/QtCore/private/qfreelist_p.h	60	%%QT_INCDIR%%/QtCore/%%FULLVER%%/QtCore/private/qfreelist_p.h
60	%%QT_INCDIR%%/QtCore/%%FULLVER%%/QtCore/private/qfsfileengine_iterator_p.h	61	%%QT_INCDIR%%/QtCore/%%FULLVER%%/QtCore/private/qfsfileengine_iterator_p.h
61	%%QT_INCDIR%%/QtCore/%%FULLVER%%/QtCore/private/qfsfileengine_p.h	62	%%QT_INCDIR%%/QtCore/%%FULLVER%%/QtCore/private/qfsfileengine_p.h
Lines 66-72 Link Here
66	%%QT_INCDIR%%/QtCore/%%FULLVER%%/QtCore/private/qfuturewatcher_p.h	67	%%QT_INCDIR%%/QtCore/%%FULLVER%%/QtCore/private/qfuturewatcher_p.h
67	%%QT_INCDIR%%/QtCore/%%FULLVER%%/QtCore/private/qgb18030codec_p.h	68	%%QT_INCDIR%%/QtCore/%%FULLVER%%/QtCore/private/qgb18030codec_p.h
68	%%QT_INCDIR%%/QtCore/%%FULLVER%%/QtCore/private/qglobal_p.h	69	%%QT_INCDIR%%/QtCore/%%FULLVER%%/QtCore/private/qglobal_p.h
		70	%%QT_INCDIR%%/QtCore/%%FULLVER%%/QtCore/private/qgregoriancalendar_p.h
69	%%QT_INCDIR%%/QtCore/%%FULLVER%%/QtCore/private/qharfbuzz_p.h	71	%%QT_INCDIR%%/QtCore/%%FULLVER%%/QtCore/private/qharfbuzz_p.h
		72	%%QT_INCDIR%%/QtCore/%%FULLVER%%/QtCore/private/qhijricalendar_data_p.h
		73	%%QT_INCDIR%%/QtCore/%%FULLVER%%/QtCore/private/qhijricalendar_p.h
70	%%QT_INCDIR%%/QtCore/%%FULLVER%%/QtCore/private/qhistorystate_p.h	74	%%QT_INCDIR%%/QtCore/%%FULLVER%%/QtCore/private/qhistorystate_p.h
71	%%QT_INCDIR%%/QtCore/%%FULLVER%%/QtCore/private/qhooks_p.h	75	%%QT_INCDIR%%/QtCore/%%FULLVER%%/QtCore/private/qhooks_p.h
72	%%QT_INCDIR%%/QtCore/%%FULLVER%%/QtCore/private/qiconvcodec_p.h	76	%%QT_INCDIR%%/QtCore/%%FULLVER%%/QtCore/private/qiconvcodec_p.h
Lines 74-80 Link Here
74	%%QT_INCDIR%%/QtCore/%%FULLVER%%/QtCore/private/qiodevice_p.h	78	%%QT_INCDIR%%/QtCore/%%FULLVER%%/QtCore/private/qiodevice_p.h
75	%%QT_INCDIR%%/QtCore/%%FULLVER%%/QtCore/private/qipaddress_p.h	79	%%QT_INCDIR%%/QtCore/%%FULLVER%%/QtCore/private/qipaddress_p.h
76	%%QT_INCDIR%%/QtCore/%%FULLVER%%/QtCore/private/qisciicodec_p.h	80	%%QT_INCDIR%%/QtCore/%%FULLVER%%/QtCore/private/qisciicodec_p.h
		81	%%QT_INCDIR%%/QtCore/%%FULLVER%%/QtCore/private/qislamiccivilcalendar_p.h
77	%%QT_INCDIR%%/QtCore/%%FULLVER%%/QtCore/private/qitemselectionmodel_p.h	82	%%QT_INCDIR%%/QtCore/%%FULLVER%%/QtCore/private/qitemselectionmodel_p.h
		83	%%QT_INCDIR%%/QtCore/%%FULLVER%%/QtCore/private/qjalalicalendar_data_p.h
		84	%%QT_INCDIR%%/QtCore/%%FULLVER%%/QtCore/private/qjalalicalendar_p.h
78	%%QT_INCDIR%%/QtCore/%%FULLVER%%/QtCore/private/qjiscodec_p.h	85	%%QT_INCDIR%%/QtCore/%%FULLVER%%/QtCore/private/qjiscodec_p.h
79	%%QT_INCDIR%%/QtCore/%%FULLVER%%/QtCore/private/qjni_p.h	86	%%QT_INCDIR%%/QtCore/%%FULLVER%%/QtCore/private/qjni_p.h
80	%%QT_INCDIR%%/QtCore/%%FULLVER%%/QtCore/private/qjnihelpers_p.h	87	%%QT_INCDIR%%/QtCore/%%FULLVER%%/QtCore/private/qjnihelpers_p.h
Lines 82-102 Link Here
82	%%QT_INCDIR%%/QtCore/%%FULLVER%%/QtCore/private/qjson_p.h	89	%%QT_INCDIR%%/QtCore/%%FULLVER%%/QtCore/private/qjson_p.h
83	%%QT_INCDIR%%/QtCore/%%FULLVER%%/QtCore/private/qjsonparser_p.h	90	%%QT_INCDIR%%/QtCore/%%FULLVER%%/QtCore/private/qjsonparser_p.h
84	%%QT_INCDIR%%/QtCore/%%FULLVER%%/QtCore/private/qjsonwriter_p.h	91	%%QT_INCDIR%%/QtCore/%%FULLVER%%/QtCore/private/qjsonwriter_p.h
		92	%%QT_INCDIR%%/QtCore/%%FULLVER%%/QtCore/private/qjuliancalendar_p.h
85	%%QT_INCDIR%%/QtCore/%%FULLVER%%/QtCore/private/qlatincodec_p.h	93	%%QT_INCDIR%%/QtCore/%%FULLVER%%/QtCore/private/qlatincodec_p.h
86	%%QT_INCDIR%%/QtCore/%%FULLVER%%/QtCore/private/qlibrary_p.h	94	%%QT_INCDIR%%/QtCore/%%FULLVER%%/QtCore/private/qlibrary_p.h
87	%%QT_INCDIR%%/QtCore/%%FULLVER%%/QtCore/private/qlocale_data_p.h	95	%%QT_INCDIR%%/QtCore/%%FULLVER%%/QtCore/private/qlocale_data_p.h
88	%%QT_INCDIR%%/QtCore/%%FULLVER%%/QtCore/private/qlocale_p.h	96	%%QT_INCDIR%%/QtCore/%%FULLVER%%/QtCore/private/qlocale_p.h
89	%%QT_INCDIR%%/QtCore/%%FULLVER%%/QtCore/private/qlocale_tools_p.h	97	%%QT_INCDIR%%/QtCore/%%FULLVER%%/QtCore/private/qlocale_tools_p.h
90	%%QT_INCDIR%%/QtCore/%%FULLVER%%/QtCore/private/qlockfile_p.h	98	%%QT_INCDIR%%/QtCore/%%FULLVER%%/QtCore/private/qlockfile_p.h
		99	%%QT_INCDIR%%/QtCore/%%FULLVER%%/QtCore/private/qlocking_p.h
91	%%QT_INCDIR%%/QtCore/%%FULLVER%%/QtCore/private/qlogging_p.h	100	%%QT_INCDIR%%/QtCore/%%FULLVER%%/QtCore/private/qlogging_p.h
92	%%QT_INCDIR%%/QtCore/%%FULLVER%%/QtCore/private/qloggingregistry_p.h	101	%%QT_INCDIR%%/QtCore/%%FULLVER%%/QtCore/private/qloggingregistry_p.h
93	%%QT_INCDIR%%/QtCore/%%FULLVER%%/QtCore/private/qmachparser_p.h	102	%%QT_INCDIR%%/QtCore/%%FULLVER%%/QtCore/private/qmachparser_p.h
94	%%QT_INCDIR%%/QtCore/%%FULLVER%%/QtCore/private/qmakearray_p.h	103	%%QT_INCDIR%%/QtCore/%%FULLVER%%/QtCore/private/qmakearray_p.h
		104	%%QT_INCDIR%%/QtCore/%%FULLVER%%/QtCore/private/qmemory_p.h
95	%%QT_INCDIR%%/QtCore/%%FULLVER%%/QtCore/private/qmetaobject_moc_p.h	105	%%QT_INCDIR%%/QtCore/%%FULLVER%%/QtCore/private/qmetaobject_moc_p.h
96	%%QT_INCDIR%%/QtCore/%%FULLVER%%/QtCore/private/qmetaobject_p.h	106	%%QT_INCDIR%%/QtCore/%%FULLVER%%/QtCore/private/qmetaobject_p.h
97	%%QT_INCDIR%%/QtCore/%%FULLVER%%/QtCore/private/qmetaobjectbuilder_p.h	107	%%QT_INCDIR%%/QtCore/%%FULLVER%%/QtCore/private/qmetaobjectbuilder_p.h
98	%%QT_INCDIR%%/QtCore/%%FULLVER%%/QtCore/private/qmetatype_p.h	108	%%QT_INCDIR%%/QtCore/%%FULLVER%%/QtCore/private/qmetatype_p.h
99	%%QT_INCDIR%%/QtCore/%%FULLVER%%/QtCore/private/qmetatypeswitcher_p.h	109	%%QT_INCDIR%%/QtCore/%%FULLVER%%/QtCore/private/qmetatypeswitcher_p.h
		110	%%QT_INCDIR%%/QtCore/%%FULLVER%%/QtCore/private/qmilankoviccalendar_p.h
100	%%QT_INCDIR%%/QtCore/%%FULLVER%%/QtCore/private/qmimedatabase_p.h	111	%%QT_INCDIR%%/QtCore/%%FULLVER%%/QtCore/private/qmimedatabase_p.h
101	%%QT_INCDIR%%/QtCore/%%FULLVER%%/QtCore/private/qmimeglobpattern_p.h	112	%%QT_INCDIR%%/QtCore/%%FULLVER%%/QtCore/private/qmimeglobpattern_p.h
102	%%QT_INCDIR%%/QtCore/%%FULLVER%%/QtCore/private/qmimemagicrule_p.h	113	%%QT_INCDIR%%/QtCore/%%FULLVER%%/QtCore/private/qmimemagicrule_p.h
Lines 105-111 Link Here
105	%%QT_INCDIR%%/QtCore/%%FULLVER%%/QtCore/private/qmimetype_p.h	116	%%QT_INCDIR%%/QtCore/%%FULLVER%%/QtCore/private/qmimetype_p.h
106	%%QT_INCDIR%%/QtCore/%%FULLVER%%/QtCore/private/qmimetypeparser_p.h	117	%%QT_INCDIR%%/QtCore/%%FULLVER%%/QtCore/private/qmimetypeparser_p.h
107	%%QT_INCDIR%%/QtCore/%%FULLVER%%/QtCore/private/qmutex_p.h	118	%%QT_INCDIR%%/QtCore/%%FULLVER%%/QtCore/private/qmutex_p.h
108	%%QT_INCDIR%%/QtCore/%%FULLVER%%/QtCore/private/qmutexpool_p.h
109	%%QT_INCDIR%%/QtCore/%%FULLVER%%/QtCore/private/qnoncontiguousbytedevice_p.h	119	%%QT_INCDIR%%/QtCore/%%FULLVER%%/QtCore/private/qnoncontiguousbytedevice_p.h
110	%%QT_INCDIR%%/QtCore/%%FULLVER%%/QtCore/private/qnumeric_p.h	120	%%QT_INCDIR%%/QtCore/%%FULLVER%%/QtCore/private/qnumeric_p.h
111	%%QT_INCDIR%%/QtCore/%%FULLVER%%/QtCore/private/qobject_p.h	121	%%QT_INCDIR%%/QtCore/%%FULLVER%%/QtCore/private/qobject_p.h
Lines 127-132 Link Here
127	%%QT_INCDIR%%/QtCore/%%FULLVER%%/QtCore/private/qresource_iterator_p.h	137	%%QT_INCDIR%%/QtCore/%%FULLVER%%/QtCore/private/qresource_iterator_p.h
128	%%QT_INCDIR%%/QtCore/%%FULLVER%%/QtCore/private/qresource_p.h	138	%%QT_INCDIR%%/QtCore/%%FULLVER%%/QtCore/private/qresource_p.h
129	%%QT_INCDIR%%/QtCore/%%FULLVER%%/QtCore/private/qringbuffer_p.h	139	%%QT_INCDIR%%/QtCore/%%FULLVER%%/QtCore/private/qringbuffer_p.h
		140	%%QT_INCDIR%%/QtCore/%%FULLVER%%/QtCore/private/qromancalendar_data_p.h
		141	%%QT_INCDIR%%/QtCore/%%FULLVER%%/QtCore/private/qromancalendar_p.h
130	%%QT_INCDIR%%/QtCore/%%FULLVER%%/QtCore/private/qsavefile_p.h	142	%%QT_INCDIR%%/QtCore/%%FULLVER%%/QtCore/private/qsavefile_p.h
131	%%QT_INCDIR%%/QtCore/%%FULLVER%%/QtCore/private/qscopedpointer_p.h	143	%%QT_INCDIR%%/QtCore/%%FULLVER%%/QtCore/private/qscopedpointer_p.h
132	%%QT_INCDIR%%/QtCore/%%FULLVER%%/QtCore/private/qsequentialanimationgroup_p.h	144	%%QT_INCDIR%%/QtCore/%%FULLVER%%/QtCore/private/qsequentialanimationgroup_p.h
Lines 174-179 Link Here
174	%%QT_INCDIR%%/QtCore/%%FULLVER%%/QtCore/private/qwindowspipereader_p.h	186	%%QT_INCDIR%%/QtCore/%%FULLVER%%/QtCore/private/qwindowspipereader_p.h
175	%%QT_INCDIR%%/QtCore/%%FULLVER%%/QtCore/private/qwindowspipewriter_p.h	187	%%QT_INCDIR%%/QtCore/%%FULLVER%%/QtCore/private/qwindowspipewriter_p.h
176	%%QT_INCDIR%%/QtCore/%%FULLVER%%/QtCore/private/qwineventnotifier_p.h	188	%%QT_INCDIR%%/QtCore/%%FULLVER%%/QtCore/private/qwineventnotifier_p.h
		189	%%QT_INCDIR%%/QtCore/%%FULLVER%%/QtCore/private/qwinregistry_p.h
177	%%QT_INCDIR%%/QtCore/%%FULLVER%%/QtCore/private/qxmlstream_p.h	190	%%QT_INCDIR%%/QtCore/%%FULLVER%%/QtCore/private/qxmlstream_p.h
178	%%QT_INCDIR%%/QtCore/%%FULLVER%%/QtCore/private/qxmlutils_p.h	191	%%QT_INCDIR%%/QtCore/%%FULLVER%%/QtCore/private/qxmlutils_p.h
179	%%QT_INCDIR%%/QtCore/QAbstractAnimation	192	%%QT_INCDIR%%/QtCore/QAbstractAnimation
Lines 210-215 Link Here
210	%%QT_INCDIR%%/QtCore/QByteArrayMatcher	223	%%QT_INCDIR%%/QtCore/QByteArrayMatcher
211	%%QT_INCDIR%%/QtCore/QByteRef	224	%%QT_INCDIR%%/QtCore/QByteRef
212	%%QT_INCDIR%%/QtCore/QCache	225	%%QT_INCDIR%%/QtCore/QCache
		226	%%QT_INCDIR%%/QtCore/QCalendar
213	%%QT_INCDIR%%/QtCore/QCborArray	227	%%QT_INCDIR%%/QtCore/QCborArray
214	%%QT_INCDIR%%/QtCore/QCborError	228	%%QT_INCDIR%%/QtCore/QCborError
215	%%QT_INCDIR%%/QtCore/QCborMap	229	%%QT_INCDIR%%/QtCore/QCborMap
Lines 365-370 Link Here
365	%%QT_INCDIR%%/QtCore/QPauseAnimation	379	%%QT_INCDIR%%/QtCore/QPauseAnimation
366	%%QT_INCDIR%%/QtCore/QPersistentModelIndex	380	%%QT_INCDIR%%/QtCore/QPersistentModelIndex
367	%%QT_INCDIR%%/QtCore/QPluginLoader	381	%%QT_INCDIR%%/QtCore/QPluginLoader
		382	%%QT_INCDIR%%/QtCore/QPluginMetaData
368	%%QT_INCDIR%%/QtCore/QPoint	383	%%QT_INCDIR%%/QtCore/QPoint
369	%%QT_INCDIR%%/QtCore/QPointF	384	%%QT_INCDIR%%/QtCore/QPointF
370	%%QT_INCDIR%%/QtCore/QPointer	385	%%QT_INCDIR%%/QtCore/QPointer
Lines 378-383 Link Here
378	%%QT_INCDIR%%/QtCore/QReadWriteLock	393	%%QT_INCDIR%%/QtCore/QReadWriteLock
379	%%QT_INCDIR%%/QtCore/QRect	394	%%QT_INCDIR%%/QtCore/QRect
380	%%QT_INCDIR%%/QtCore/QRectF	395	%%QT_INCDIR%%/QtCore/QRectF
		396	%%QT_INCDIR%%/QtCore/QRecursiveMutex
381	%%QT_INCDIR%%/QtCore/QRegExp	397	%%QT_INCDIR%%/QtCore/QRegExp
382	%%QT_INCDIR%%/QtCore/QRegularExpression	398	%%QT_INCDIR%%/QtCore/QRegularExpression
383	%%QT_INCDIR%%/QtCore/QRegularExpressionMatch	399	%%QT_INCDIR%%/QtCore/QRegularExpressionMatch
Lines 538-543 Link Here
538	%%QT_INCDIR%%/QtCore/qbytearraylist.h	554	%%QT_INCDIR%%/QtCore/qbytearraylist.h
539	%%QT_INCDIR%%/QtCore/qbytearraymatcher.h	555	%%QT_INCDIR%%/QtCore/qbytearraymatcher.h
540	%%QT_INCDIR%%/QtCore/qcache.h	556	%%QT_INCDIR%%/QtCore/qcache.h
		557	%%QT_INCDIR%%/QtCore/qcalendar.h
541	%%QT_INCDIR%%/QtCore/qcborarray.h	558	%%QT_INCDIR%%/QtCore/qcborarray.h
542	%%QT_INCDIR%%/QtCore/qcborcommon.h	559	%%QT_INCDIR%%/QtCore/qcborcommon.h
543	%%QT_INCDIR%%/QtCore/qcbormap.h	560	%%QT_INCDIR%%/QtCore/qcbormap.h
Lines 552-557 Link Here
552	%%QT_INCDIR%%/QtCore/qconfig-bootstrapped.h	569	%%QT_INCDIR%%/QtCore/qconfig-bootstrapped.h
553	%%QT_INCDIR%%/QtCore/qconfig.h	570	%%QT_INCDIR%%/QtCore/qconfig.h
554	%%QT_INCDIR%%/QtCore/qcontainerfwd.h	571	%%QT_INCDIR%%/QtCore/qcontainerfwd.h
		572	%%QT_INCDIR%%/QtCore/qcontainertools_impl.h
555	%%QT_INCDIR%%/QtCore/qcontiguouscache.h	573	%%QT_INCDIR%%/QtCore/qcontiguouscache.h
556	%%QT_INCDIR%%/QtCore/qcoreapplication.h	574	%%QT_INCDIR%%/QtCore/qcoreapplication.h
557	%%QT_INCDIR%%/QtCore/qcoreevent.h	575	%%QT_INCDIR%%/QtCore/qcoreevent.h

Lines 235-240 Link Here

(-)b/devel/qt5-location/pkg-plist (+3 lines)
235	%%QT_INCDIR%%/QtPositioning/%%FULLVER%%/QtPositioning/private/qgeopolygon_p.h	235	%%QT_INCDIR%%/QtPositioning/%%FULLVER%%/QtPositioning/private/qgeopolygon_p.h
236	%%QT_INCDIR%%/QtPositioning/%%FULLVER%%/QtPositioning/private/qgeopositioninfo_p.h	236	%%QT_INCDIR%%/QtPositioning/%%FULLVER%%/QtPositioning/private/qgeopositioninfo_p.h
237	%%QT_INCDIR%%/QtPositioning/%%FULLVER%%/QtPositioning/private/qgeopositioninfosource_p.h	237	%%QT_INCDIR%%/QtPositioning/%%FULLVER%%/QtPositioning/private/qgeopositioninfosource_p.h
		238	%%QT_INCDIR%%/QtPositioning/%%FULLVER%%/QtPositioning/private/qgeosatelliteinfo_p.h
		239	%%QT_INCDIR%%/QtPositioning/%%FULLVER%%/QtPositioning/private/qgeosatelliteinfosource_p.h
238	%%QT_INCDIR%%/QtPositioning/%%FULLVER%%/QtPositioning/private/qgeorectangle_p.h	240	%%QT_INCDIR%%/QtPositioning/%%FULLVER%%/QtPositioning/private/qgeorectangle_p.h
239	%%QT_INCDIR%%/QtPositioning/%%FULLVER%%/QtPositioning/private/qgeoshape_p.h	241	%%QT_INCDIR%%/QtPositioning/%%FULLVER%%/QtPositioning/private/qgeoshape_p.h
240	%%QT_INCDIR%%/QtPositioning/%%FULLVER%%/QtPositioning/private/qlocationdata_simulator_p.h	242	%%QT_INCDIR%%/QtPositioning/%%FULLVER%%/QtPositioning/private/qlocationdata_simulator_p.h
Lines 283-288 Link Here
283	%%QT_INCDIR%%/QtPositioning/qtpositioningversion.h	285	%%QT_INCDIR%%/QtPositioning/qtpositioningversion.h
284	%%QT_INCDIR%%/QtPositioningQuick/%%FULLVER%%/QtPositioningQuick/private/qdeclarativegeoaddress_p.h	286	%%QT_INCDIR%%/QtPositioningQuick/%%FULLVER%%/QtPositioningQuick/private/qdeclarativegeoaddress_p.h
285	%%QT_INCDIR%%/QtPositioningQuick/%%FULLVER%%/QtPositioningQuick/private/qdeclarativegeolocation_p.h	287	%%QT_INCDIR%%/QtPositioningQuick/%%FULLVER%%/QtPositioningQuick/private/qdeclarativegeolocation_p.h
		288	%%QT_INCDIR%%/QtPositioningQuick/%%FULLVER%%/QtPositioningQuick/private/qdeclarativepluginparameter_p.h
286	%%QT_INCDIR%%/QtPositioningQuick/%%FULLVER%%/QtPositioningQuick/private/qdeclarativeposition_p.h	289	%%QT_INCDIR%%/QtPositioningQuick/%%FULLVER%%/QtPositioningQuick/private/qdeclarativeposition_p.h
287	%%QT_INCDIR%%/QtPositioningQuick/%%FULLVER%%/QtPositioningQuick/private/qdeclarativepositionsource_p.h	290	%%QT_INCDIR%%/QtPositioningQuick/%%FULLVER%%/QtPositioningQuick/private/qdeclarativepositionsource_p.h
288	%%QT_INCDIR%%/QtPositioningQuick/%%FULLVER%%/QtPositioningQuick/private/qpositioningquickglobal_p.h	291	%%QT_INCDIR%%/QtPositioningQuick/%%FULLVER%%/QtPositioningQuick/private/qpositioningquickglobal_p.h

Lines 2-8 Link Here

(-)b/devel/qt5-qdoc/Makefile (-2 / +3 lines)
2		2
3	PORTNAME= qdoc	3	PORTNAME= qdoc
4	DISTVERSION= ${QT5_VERSION}	4	DISTVERSION= ${QT5_VERSION}
5	PORTREVISION= 1
6	CATEGORIES= devel textproc	5	CATEGORIES= devel textproc
7	PKGNAMEPREFIX= qt5-	6	PKGNAMEPREFIX= qt5-
8		7
Lines 18-24 USE_QT= core declarative buildtools_build qdoc-data_run Link Here
18	BUILD_WRKSRC= ${WRKSRC}/src/${PORTNAME}	17	BUILD_WRKSRC= ${WRKSRC}/src/${PORTNAME}
19	INSTALL_WRKSRC= ${BUILD_WRKSRC}	18	INSTALL_WRKSRC= ${BUILD_WRKSRC}
20		19
21	PLIST_FILES= ${QT_BINDIR}/qdoc	20	PLIST_FILES= ${QT_BINDIR}/qdoc \
		21	${QT_CMAKEDIR}/Qt5DocTools/Qt5DocToolsConfig.cmake \
		22	${QT_CMAKEDIR}/Qt5DocTools/Qt5DocToolsConfigVersion.cmake
22		23
23	CONFIGURE_ENV= LLVM_INSTALL_DIR=${LOCALBASE}/llvm${LLVM_DEFAULT}	24	CONFIGURE_ENV= LLVM_INSTALL_DIR=${LOCALBASE}/llvm${LLVM_DEFAULT}
24		25

Lines 5-15 Link Here

(-)b/devel/qt5-qmake/pkg-plist (-4 / +16 lines)
5	%%QT_MKSPECDIR%%/aix-g++/qplatformdefs.h	5	%%QT_MKSPECDIR%%/aix-g++/qplatformdefs.h
6	%%QT_MKSPECDIR%%/android-clang/qmake.conf	6	%%QT_MKSPECDIR%%/android-clang/qmake.conf
7	%%QT_MKSPECDIR%%/android-clang/qplatformdefs.h	7	%%QT_MKSPECDIR%%/android-clang/qplatformdefs.h
8	%%QT_MKSPECDIR%%/android-g++/qmake.conf
9	%%QT_MKSPECDIR%%/android-g++/qplatformdefs.h
10	%%QT_MKSPECDIR%%/common/aix/qplatformdefs.h	8	%%QT_MKSPECDIR%%/common/aix/qplatformdefs.h
11	%%QT_MKSPECDIR%%/common/android-base-head.conf
12	%%QT_MKSPECDIR%%/common/android-base-tail.conf
13	%%QT_MKSPECDIR%%/common/android/qplatformdefs.h	9	%%QT_MKSPECDIR%%/common/android/qplatformdefs.h
14	%%QT_MKSPECDIR%%/common/angle.conf	10	%%QT_MKSPECDIR%%/common/angle.conf
15	%%QT_MKSPECDIR%%/common/bsd/bsd.conf	11	%%QT_MKSPECDIR%%/common/bsd/bsd.conf
Lines 53-58 Link Here
53	%%QT_MKSPECDIR%%/common/qcc-base-qnx.conf	49	%%QT_MKSPECDIR%%/common/qcc-base-qnx.conf
54	%%QT_MKSPECDIR%%/common/qcc-base.conf	50	%%QT_MKSPECDIR%%/common/qcc-base.conf
55	%%QT_MKSPECDIR%%/common/qnx/qplatformdefs.h	51	%%QT_MKSPECDIR%%/common/qnx/qplatformdefs.h
		52	%%QT_MKSPECDIR%%/common/rtems-base.conf
		53	%%QT_MKSPECDIR%%/common/rtems/qplatformdefs.h
56	%%QT_MKSPECDIR%%/common/sanitize.conf	54	%%QT_MKSPECDIR%%/common/sanitize.conf
57	%%QT_MKSPECDIR%%/common/shell-unix.conf	55	%%QT_MKSPECDIR%%/common/shell-unix.conf
58	%%QT_MKSPECDIR%%/common/shell-win32.conf	56	%%QT_MKSPECDIR%%/common/shell-win32.conf
Lines 123-128 Link Here
123	%%QT_MKSPECDIR%%/devices/linux-imx6-g++/qplatformdefs.h	121	%%QT_MKSPECDIR%%/devices/linux-imx6-g++/qplatformdefs.h
124	%%QT_MKSPECDIR%%/devices/linux-imx7-g++/qmake.conf	122	%%QT_MKSPECDIR%%/devices/linux-imx7-g++/qmake.conf
125	%%QT_MKSPECDIR%%/devices/linux-imx7-g++/qplatformdefs.h	123	%%QT_MKSPECDIR%%/devices/linux-imx7-g++/qplatformdefs.h
		124	%%QT_MKSPECDIR%%/devices/linux-imx8-g++/qmake.conf
		125	%%QT_MKSPECDIR%%/devices/linux-imx8-g++/qplatformdefs.h
126	%%QT_MKSPECDIR%%/devices/linux-jetson-tk1-g++/qmake.conf	126	%%QT_MKSPECDIR%%/devices/linux-jetson-tk1-g++/qmake.conf
127	%%QT_MKSPECDIR%%/devices/linux-jetson-tk1-g++/qplatformdefs.h	127	%%QT_MKSPECDIR%%/devices/linux-jetson-tk1-g++/qplatformdefs.h
128	%%QT_MKSPECDIR%%/devices/linux-jetson-tk1-pro-g++/qmake.conf	128	%%QT_MKSPECDIR%%/devices/linux-jetson-tk1-pro-g++/qmake.conf
Lines 146-151 Link Here
146	%%QT_MKSPECDIR%%/devices/linux-rasp-pi3-g++/qplatformdefs.h	146	%%QT_MKSPECDIR%%/devices/linux-rasp-pi3-g++/qplatformdefs.h
147	%%QT_MKSPECDIR%%/devices/linux-rasp-pi3-vc4-g++/qmake.conf	147	%%QT_MKSPECDIR%%/devices/linux-rasp-pi3-vc4-g++/qmake.conf
148	%%QT_MKSPECDIR%%/devices/linux-rasp-pi3-vc4-g++/qplatformdefs.h	148	%%QT_MKSPECDIR%%/devices/linux-rasp-pi3-vc4-g++/qplatformdefs.h
		149	%%QT_MKSPECDIR%%/devices/linux-rasp-pi4-v3d-g++/qmake.conf
		150	%%QT_MKSPECDIR%%/devices/linux-rasp-pi4-v3d-g++/qplatformdefs.h
149	%%QT_MKSPECDIR%%/devices/linux-rcar-h2-g++/qmake.conf	151	%%QT_MKSPECDIR%%/devices/linux-rcar-h2-g++/qmake.conf
150	%%QT_MKSPECDIR%%/devices/linux-rcar-h2-g++/qplatformdefs.h	152	%%QT_MKSPECDIR%%/devices/linux-rcar-h2-g++/qplatformdefs.h
151	%%QT_MKSPECDIR%%/devices/linux-rcar-m3-g++/qmake.conf	153	%%QT_MKSPECDIR%%/devices/linux-rcar-m3-g++/qmake.conf
Lines 163-168 Link Here
163	%%QT_MKSPECDIR%%/dummy/qmake.conf	165	%%QT_MKSPECDIR%%/dummy/qmake.conf
164	%%QT_MKSPECDIR%%/features/android/android.prf	166	%%QT_MKSPECDIR%%/features/android/android.prf
165	%%QT_MKSPECDIR%%/features/android/android_deployment_settings.prf	167	%%QT_MKSPECDIR%%/features/android/android_deployment_settings.prf
		168	%%QT_MKSPECDIR%%/features/android/default_pre.prf
		169	%%QT_MKSPECDIR%%/features/android/resolve_config.prf
166	%%QT_MKSPECDIR%%/features/android/resolve_target.prf	170	%%QT_MKSPECDIR%%/features/android/resolve_target.prf
167	%%QT_MKSPECDIR%%/features/android/sdk.prf	171	%%QT_MKSPECDIR%%/features/android/sdk.prf
168	%%QT_MKSPECDIR%%/features/android/spec_post.prf	172	%%QT_MKSPECDIR%%/features/android/spec_post.prf
Lines 180-191 Link Here
180	%%QT_MKSPECDIR%%/features/data/cmake/ExtraSourceIncludes.cmake.in	184	%%QT_MKSPECDIR%%/features/data/cmake/ExtraSourceIncludes.cmake.in
181	%%QT_MKSPECDIR%%/features/data/cmake/Qt5BasicConfig.cmake.in	185	%%QT_MKSPECDIR%%/features/data/cmake/Qt5BasicConfig.cmake.in
182	%%QT_MKSPECDIR%%/features/data/cmake/Qt5ConfigVersion.cmake.in	186	%%QT_MKSPECDIR%%/features/data/cmake/Qt5ConfigVersion.cmake.in
		187	%%QT_MKSPECDIR%%/features/data/cmake/Qt5ImportPlugin.cpp.in
183	%%QT_MKSPECDIR%%/features/data/cmake/Qt5PluginTarget.cmake.in	188	%%QT_MKSPECDIR%%/features/data/cmake/Qt5PluginTarget.cmake.in
184	%%QT_MKSPECDIR%%/features/data/configure.json	189	%%QT_MKSPECDIR%%/features/data/configure.json
185	%%QT_MKSPECDIR%%/features/data/dummy.cpp	190	%%QT_MKSPECDIR%%/features/data/dummy.cpp
186	%%QT_MKSPECDIR%%/features/data/dumpvcvars.bat	191	%%QT_MKSPECDIR%%/features/data/dumpvcvars.bat
187	%%QT_MKSPECDIR%%/features/data/mac/objc_namespace.sh	192	%%QT_MKSPECDIR%%/features/data/mac/objc_namespace.sh
188	%%QT_MKSPECDIR%%/features/data/macros.cpp	193	%%QT_MKSPECDIR%%/features/data/macros.cpp
		194	%%QT_MKSPECDIR%%/features/data/testserver/Dockerfile
		195	%%QT_MKSPECDIR%%/features/data/testserver/docker-compose-common.yml
189	%%QT_MKSPECDIR%%/features/data/unix/findclasslist.pl	196	%%QT_MKSPECDIR%%/features/data/unix/findclasslist.pl
190	%%QT_MKSPECDIR%%/features/dbusadaptors.prf	197	%%QT_MKSPECDIR%%/features/dbusadaptors.prf
191	%%QT_MKSPECDIR%%/features/dbuscommon.pri	198	%%QT_MKSPECDIR%%/features/dbuscommon.pri
Lines 215-220 Link Here
215	%%QT_MKSPECDIR%%/features/mac/default_post.prf	222	%%QT_MKSPECDIR%%/features/mac/default_post.prf
216	%%QT_MKSPECDIR%%/features/mac/default_pre.prf	223	%%QT_MKSPECDIR%%/features/mac/default_pre.prf
217	%%QT_MKSPECDIR%%/features/mac/mac.prf	224	%%QT_MKSPECDIR%%/features/mac/mac.prf
		225	%%QT_MKSPECDIR%%/features/mac/no_warn_empty_obj_files.prf
218	%%QT_MKSPECDIR%%/features/mac/objective_c.prf	226	%%QT_MKSPECDIR%%/features/mac/objective_c.prf
219	%%QT_MKSPECDIR%%/features/mac/rez.prf	227	%%QT_MKSPECDIR%%/features/mac/rez.prf
220	%%QT_MKSPECDIR%%/features/mac/sdk.mk	228	%%QT_MKSPECDIR%%/features/mac/sdk.mk
Lines 261-266 Link Here
261	%%QT_MKSPECDIR%%/features/resolve_config.prf	269	%%QT_MKSPECDIR%%/features/resolve_config.prf
262	%%QT_MKSPECDIR%%/features/resolve_target.prf	270	%%QT_MKSPECDIR%%/features/resolve_target.prf
263	%%QT_MKSPECDIR%%/features/resources.prf	271	%%QT_MKSPECDIR%%/features/resources.prf
		272	%%QT_MKSPECDIR%%/features/resources_functions.prf
264	%%QT_MKSPECDIR%%/features/rtti.prf	273	%%QT_MKSPECDIR%%/features/rtti.prf
265	%%QT_MKSPECDIR%%/features/rtti_off.prf	274	%%QT_MKSPECDIR%%/features/rtti_off.prf
266	%%QT_MKSPECDIR%%/features/sanitizer.prf	275	%%QT_MKSPECDIR%%/features/sanitizer.prf
Lines 302-311 Link Here
302	%%QT_MKSPECDIR%%/features/unix/x11inc.prf	311	%%QT_MKSPECDIR%%/features/unix/x11inc.prf
303	%%QT_MKSPECDIR%%/features/unix/x11lib.prf	312	%%QT_MKSPECDIR%%/features/unix/x11lib.prf
304	%%QT_MKSPECDIR%%/features/unix/x11sm.prf	313	%%QT_MKSPECDIR%%/features/unix/x11sm.prf
		314	%%QT_MKSPECDIR%%/features/unsupported/testserver.prf
305	%%QT_MKSPECDIR%%/features/use_c_linker.prf	315	%%QT_MKSPECDIR%%/features/use_c_linker.prf
306	%%QT_MKSPECDIR%%/features/vxworks.prf	316	%%QT_MKSPECDIR%%/features/vxworks.prf
307	%%QT_MKSPECDIR%%/features/warn_off.prf	317	%%QT_MKSPECDIR%%/features/warn_off.prf
308	%%QT_MKSPECDIR%%/features/warn_on.prf	318	%%QT_MKSPECDIR%%/features/warn_on.prf
		319	%%QT_MKSPECDIR%%/features/wasm/default_pre.prf
		320	%%QT_MKSPECDIR%%/features/wasm/emcc_ver.prf
309	%%QT_MKSPECDIR%%/features/wasm/wasm.prf	321	%%QT_MKSPECDIR%%/features/wasm/wasm.prf
310	%%QT_MKSPECDIR%%/features/wayland-scanner.prf	322	%%QT_MKSPECDIR%%/features/wayland-scanner.prf
311	%%QT_MKSPECDIR%%/features/win32/console.prf	323	%%QT_MKSPECDIR%%/features/win32/console.prf

Lines 1-81 Link Here

(-)b/devel/qt5/distinfo (-81 / +81 lines)
1	TIMESTAMP = 1572554821	1	TIMESTAMP = 1580149510
2	SHA256 (KDE/Qt/5.13.2/qt3d-everywhere-src-5.13.2.tar.xz) = d1b9fc0be82264b5f76c3a5330901dff95c1f2bcb67916c3fac6bad4ff69adc9	2	SHA256 (KDE/Qt/5.14.1/qt3d-everywhere-src-5.14.1.tar.xz) = 86f425e8bdf55b7b3f6a8384c2b9cffee30407fcf87ece0db060fdfb797a0774
3	SIZE (KDE/Qt/5.13.2/qt3d-everywhere-src-5.13.2.tar.xz) = 81537856	3	SIZE (KDE/Qt/5.14.1/qt3d-everywhere-src-5.14.1.tar.xz) = 81561704
4	SHA256 (KDE/Qt/5.13.2/qtactiveqt-everywhere-src-5.13.2.tar.xz) = 0f34a2f59a4438b4d060066eaed35e0f738d620b42782d598bad2f1a56cc094a	4	SHA256 (KDE/Qt/5.14.1/qtactiveqt-everywhere-src-5.14.1.tar.xz) = 457dba433497d79a0ee0e44f9f8cf8afbcbb2e36861f98516413a688a5e88aa0
5	SIZE (KDE/Qt/5.13.2/qtactiveqt-everywhere-src-5.13.2.tar.xz) = 264608	5	SIZE (KDE/Qt/5.14.1/qtactiveqt-everywhere-src-5.14.1.tar.xz) = 265688
6	SHA256 (KDE/Qt/5.13.2/qtandroidextras-everywhere-src-5.13.2.tar.xz) = 403e8f463552564333b1a4d2e0a52c28b27296d096737e55a2327642a7277af8	6	SHA256 (KDE/Qt/5.14.1/qtandroidextras-everywhere-src-5.14.1.tar.xz) = 7986b087532ec6011c8dfa03977cf945f42ec245e84e941acebbe9068f1ca3c6
7	SIZE (KDE/Qt/5.13.2/qtandroidextras-everywhere-src-5.13.2.tar.xz) = 105628	7	SIZE (KDE/Qt/5.14.1/qtandroidextras-everywhere-src-5.14.1.tar.xz) = 105860
8	SHA256 (KDE/Qt/5.13.2/qtbase-everywhere-src-5.13.2.tar.xz) = 26b6b686d66a7ad28eaca349e55e2894e5a735f3831e45f2049e93b1daa92121	8	SHA256 (KDE/Qt/5.14.1/qtbase-everywhere-src-5.14.1.tar.xz) = d9d423a6e7bcf1055c0372fc029f14a6fe67dd62c67b83095cde68b60b762cf7
9	SIZE (KDE/Qt/5.13.2/qtbase-everywhere-src-5.13.2.tar.xz) = 48735704	9	SIZE (KDE/Qt/5.14.1/qtbase-everywhere-src-5.14.1.tar.xz) = 49828188
10	SHA256 (KDE/Qt/5.13.2/qtcharts-everywhere-src-5.13.2.tar.xz) = 3bad81c3cfb32cf72fb0ce2ac2794d031cf78a3902b4715f89c09b2d0e041e87	10	SHA256 (KDE/Qt/5.14.1/qtcharts-everywhere-src-5.14.1.tar.xz) = 3dd7466c06130ec3a7842189a203a72576e7ed5424950903410fa1a4f70d9c2b
11	SIZE (KDE/Qt/5.13.2/qtcharts-everywhere-src-5.13.2.tar.xz) = 4244092	11	SIZE (KDE/Qt/5.14.1/qtcharts-everywhere-src-5.14.1.tar.xz) = 4250588
12	SHA256 (KDE/Qt/5.13.2/qtconnectivity-everywhere-src-5.13.2.tar.xz) = 644e234eb64f602ef5cdeb8802ef9b58e75478f1124f001937275d62ed692e17	12	SHA256 (KDE/Qt/5.14.1/qtconnectivity-everywhere-src-5.14.1.tar.xz) = ef0cb1883c0e765cacf6c8b9422997b93fd861cf2289e56791615401eefa2d72
13	SIZE (KDE/Qt/5.13.2/qtconnectivity-everywhere-src-5.13.2.tar.xz) = 2777504	13	SIZE (KDE/Qt/5.14.1/qtconnectivity-everywhere-src-5.14.1.tar.xz) = 2803040
14	SHA256 (KDE/Qt/5.13.2/qtdatavis3d-everywhere-src-5.13.2.tar.xz) = ecf934c3eb07173505781734f95cfc2cf9d89e6b1b98516ac98a137797f4ef28	14	SHA256 (KDE/Qt/5.14.1/qtdatavis3d-everywhere-src-5.14.1.tar.xz) = cfb94803a88c7405abf78ac445c4603b614889504fbf5279c9c192451a378f96
15	SIZE (KDE/Qt/5.13.2/qtdatavis3d-everywhere-src-5.13.2.tar.xz) = 5182216	15	SIZE (KDE/Qt/5.14.1/qtdatavis3d-everywhere-src-5.14.1.tar.xz) = 5190456
16	SHA256 (KDE/Qt/5.13.2/qtdeclarative-everywhere-src-5.13.2.tar.xz) = d9a524f45fe9e136cda2252f9d7013ec17046d907e3f39606db920987c22d1fd	16	SHA256 (KDE/Qt/5.14.1/qtdeclarative-everywhere-src-5.14.1.tar.xz) = 762fe495d2f97fd70f06dc7d3929506ea3b5e3151ad813e0629209b7bc504c8a
17	SIZE (KDE/Qt/5.13.2/qtdeclarative-everywhere-src-5.13.2.tar.xz) = 20940748	17	SIZE (KDE/Qt/5.14.1/qtdeclarative-everywhere-src-5.14.1.tar.xz) = 21299728
18	SHA256 (KDE/Qt/5.13.2/qtdoc-everywhere-src-5.13.2.tar.xz) = be09543143d5dca984d2c2d9085751317e7a95b78fdbe9b6a30f2faa03543e46	18	SHA256 (KDE/Qt/5.14.1/qtdoc-everywhere-src-5.14.1.tar.xz) = 17c66b4c0bbee3d7d7ed8e93453d2b994b2a16921b0789dc198fdb8085988c4b
19	SIZE (KDE/Qt/5.13.2/qtdoc-everywhere-src-5.13.2.tar.xz) = 5747084	19	SIZE (KDE/Qt/5.14.1/qtdoc-everywhere-src-5.14.1.tar.xz) = 5735776
20	SHA256 (KDE/Qt/5.13.2/qtgamepad-everywhere-src-5.13.2.tar.xz) = 75164885433e36a90b557aa7f319ff3d6278c3616469f67b42dda6eb8b92e76e	20	SHA256 (KDE/Qt/5.14.1/qtgamepad-everywhere-src-5.14.1.tar.xz) = 13277d7362ebe912b55e233674bc862e4b5342705c9207bd16c83f107d0e3499
21	SIZE (KDE/Qt/5.13.2/qtgamepad-everywhere-src-5.13.2.tar.xz) = 386668	21	SIZE (KDE/Qt/5.14.1/qtgamepad-everywhere-src-5.14.1.tar.xz) = 386892
22	SHA256 (KDE/Qt/5.13.2/qtgraphicaleffects-everywhere-src-5.13.2.tar.xz) = 297a89bb6c771f849c4ce866e5c98dadf665163b3dab03bc48a58f51424e7e66	22	SHA256 (KDE/Qt/5.14.1/qtgraphicaleffects-everywhere-src-5.14.1.tar.xz) = aabb87d9f982a8cb213de06b954cef29551f2d9ce10afa0ff9e5571203b56138
23	SIZE (KDE/Qt/5.13.2/qtgraphicaleffects-everywhere-src-5.13.2.tar.xz) = 14845928	23	SIZE (KDE/Qt/5.14.1/qtgraphicaleffects-everywhere-src-5.14.1.tar.xz) = 14040704
24	SHA256 (KDE/Qt/5.13.2/qtimageformats-everywhere-src-5.13.2.tar.xz) = 6968649fdccc7d633cf9ada25f1bdaf0a2fb45a214d58c2c47896166d4553ac0	24	SHA256 (KDE/Qt/5.14.1/qtimageformats-everywhere-src-5.14.1.tar.xz) = b8b177ea68df3a99f45740cb3193e3b38738c5e2b272028445bd31a4305c8e5e
25	SIZE (KDE/Qt/5.13.2/qtimageformats-everywhere-src-5.13.2.tar.xz) = 1803796	25	SIZE (KDE/Qt/5.14.1/qtimageformats-everywhere-src-5.14.1.tar.xz) = 1810072
26	SHA256 (KDE/Qt/5.13.2/qtlocation-everywhere-src-5.13.2.tar.xz) = 5fe4b824d3dc6c800682ff986333ec09edb9c27582066e928b1862b4d58212e3	26	SHA256 (KDE/Qt/5.14.1/qtlocation-everywhere-src-5.14.1.tar.xz) = a0dd1712a5b7a0425b57d17318294b6f7e968c4b81d52048696d029b04d2f12f
27	SIZE (KDE/Qt/5.13.2/qtlocation-everywhere-src-5.13.2.tar.xz) = 6050044	27	SIZE (KDE/Qt/5.14.1/qtlocation-everywhere-src-5.14.1.tar.xz) = 6119236
28	SHA256 (KDE/Qt/5.13.2/qtlottie-everywhere-src-5.13.2.tar.xz) = af9a10aaa110767ffd88e02cb8ad0a3930ccfeb61f0c125afbf3791136d36253	28	SHA256 (KDE/Qt/5.14.1/qtlottie-everywhere-src-5.14.1.tar.xz) = 098fbb8d8ce1288f940a3203f1353b4da522623d59fe5bed61abd3df41e5b2aa
29	SIZE (KDE/Qt/5.13.2/qtlottie-everywhere-src-5.13.2.tar.xz) = 82052	29	SIZE (KDE/Qt/5.14.1/qtlottie-everywhere-src-5.14.1.tar.xz) = 82616
30	SHA256 (KDE/Qt/5.13.2/qtmacextras-everywhere-src-5.13.2.tar.xz) = 545ede0783ebc2405c6efa6ed0b2b7147a1d7e60eb7fcb853abfca0a9cb65ed5	30	SHA256 (KDE/Qt/5.14.1/qtmacextras-everywhere-src-5.14.1.tar.xz) = 8c263fdba519d7e04bc64767883283eedede0752aa47cc440670129725696e29
31	SIZE (KDE/Qt/5.13.2/qtmacextras-everywhere-src-5.13.2.tar.xz) = 69164	31	SIZE (KDE/Qt/5.14.1/qtmacextras-everywhere-src-5.14.1.tar.xz) = 69340
32	SHA256 (KDE/Qt/5.13.2/qtmultimedia-everywhere-src-5.13.2.tar.xz) = 5f885459d46ea2f2bb24597678befd4913d8f88029730d01984f51f9c367b9f4	32	SHA256 (KDE/Qt/5.14.1/qtmultimedia-everywhere-src-5.14.1.tar.xz) = c458121c8db7ff77eefe643a7c9847ff324647f2603bb5664bcafa6435edeae7
33	SIZE (KDE/Qt/5.13.2/qtmultimedia-everywhere-src-5.13.2.tar.xz) = 3820660	33	SIZE (KDE/Qt/5.14.1/qtmultimedia-everywhere-src-5.14.1.tar.xz) = 3795732
34	SHA256 (KDE/Qt/5.13.2/qtnetworkauth-everywhere-src-5.13.2.tar.xz) = 6326943e5c1a3e6eac8dcc44d088f1a3d1c45d14100ff1e95f833b0463243af3	34	SHA256 (KDE/Qt/5.14.1/qtnetworkauth-everywhere-src-5.14.1.tar.xz) = e7f9705d014056a0d8a9751e7ad4b472f1184b8ef822124f0363753730536ae0
35	SIZE (KDE/Qt/5.13.2/qtnetworkauth-everywhere-src-5.13.2.tar.xz) = 141172	35	SIZE (KDE/Qt/5.14.1/qtnetworkauth-everywhere-src-5.14.1.tar.xz) = 141432
36	SHA256 (KDE/Qt/5.13.2/qtpurchasing-everywhere-src-5.13.2.tar.xz) = e9ef800b7d79f660c72f7024f82a2915b1111b47417f93c3dc2354b9bf307ff4	36	SHA256 (KDE/Qt/5.14.1/qtpurchasing-everywhere-src-5.14.1.tar.xz) = bcb0a7f62be4a116feee4af759b89a55084c0364327a83ab0b73acdc60eab8a9
37	SIZE (KDE/Qt/5.13.2/qtpurchasing-everywhere-src-5.13.2.tar.xz) = 208096	37	SIZE (KDE/Qt/5.14.1/qtpurchasing-everywhere-src-5.14.1.tar.xz) = 208688
38	SHA256 (KDE/Qt/5.13.2/qtquickcontrols-everywhere-src-5.13.2.tar.xz) = d6e64d8db13ada55fcb0d5e8ca26097085680087d931435c6c6db859d87493ea	38	SHA256 (KDE/Qt/5.14.1/qtquickcontrols-everywhere-src-5.14.1.tar.xz) = 54519e7c6748bb9af46435a7ba2ce1c53e4ad164a70e88915fe0e61277540a1a
39	SIZE (KDE/Qt/5.13.2/qtquickcontrols-everywhere-src-5.13.2.tar.xz) = 5955448	39	SIZE (KDE/Qt/5.14.1/qtquickcontrols-everywhere-src-5.14.1.tar.xz) = 5982788
40	SHA256 (KDE/Qt/5.13.2/qtquickcontrols2-everywhere-src-5.13.2.tar.xz) = 90ee8be7b66cc65f3f22e71a0b35adab5c169ac4f8ebc6f9e7685228bf8a7d70	40	SHA256 (KDE/Qt/5.14.1/qtquickcontrols2-everywhere-src-5.14.1.tar.xz) = 52d652c48933cc8416a91138eb6fb4c31625734265671f286b6c0d3e27d120ae
41	SIZE (KDE/Qt/5.13.2/qtquickcontrols2-everywhere-src-5.13.2.tar.xz) = 9252912	41	SIZE (KDE/Qt/5.14.1/qtquickcontrols2-everywhere-src-5.14.1.tar.xz) = 8151808
42	SHA256 (KDE/Qt/5.13.2/qtremoteobjects-everywhere-src-5.13.2.tar.xz) = bd24db9d2bb08ae7955291af52ee7510aa193d0f72ed0e3ff74f7cf7e81f4d65	42	SHA256 (KDE/Qt/5.14.1/qtremoteobjects-everywhere-src-5.14.1.tar.xz) = 189c8bddaebde0420742af0d85b7e7bf00c558f030bc0a7b704ce86072706e75
43	SIZE (KDE/Qt/5.13.2/qtremoteobjects-everywhere-src-5.13.2.tar.xz) = 367032	43	SIZE (KDE/Qt/5.14.1/qtremoteobjects-everywhere-src-5.14.1.tar.xz) = 376104
44	SHA256 (KDE/Qt/5.13.2/qtscript-everywhere-src-5.13.2.tar.xz) = 3d92691c25577fbf7511d40253de0cd9d31444ea5a0aa860f65efb9fa0f3ce70	44	SHA256 (KDE/Qt/5.14.1/qtscript-everywhere-src-5.14.1.tar.xz) = d8071e665935f7f6733f5ef700054a0cbbf8b569e7900439b89d3301f70adadd
45	SIZE (KDE/Qt/5.13.2/qtscript-everywhere-src-5.13.2.tar.xz) = 2696452	45	SIZE (KDE/Qt/5.14.1/qtscript-everywhere-src-5.14.1.tar.xz) = 2654744
46	SHA256 (KDE/Qt/5.13.2/qtscxml-everywhere-src-5.13.2.tar.xz) = e489dff21e18c1e7f72ffd31af82404f845bd90824c6b978140591366398a9d9	46	SHA256 (KDE/Qt/5.14.1/qtscxml-everywhere-src-5.14.1.tar.xz) = 6dbcf012cc11931050c8d9422cbf478ee173dfb0c5b8aebf0f829b6f74d741aa
47	SIZE (KDE/Qt/5.13.2/qtscxml-everywhere-src-5.13.2.tar.xz) = 435428	47	SIZE (KDE/Qt/5.14.1/qtscxml-everywhere-src-5.14.1.tar.xz) = 433256
48	SHA256 (KDE/Qt/5.13.2/qtsensors-everywhere-src-5.13.2.tar.xz) = 46f73bbfddfd78a419c6424d6839318774b84c955a7f7a96c12c590f6d8fb177	48	SHA256 (KDE/Qt/5.14.1/qtsensors-everywhere-src-5.14.1.tar.xz) = eda3862cf079ac2357553be4faaae0136aa017e954506ca0c4239995b5be214c
49	SIZE (KDE/Qt/5.13.2/qtsensors-everywhere-src-5.13.2.tar.xz) = 2046708	49	SIZE (KDE/Qt/5.14.1/qtsensors-everywhere-src-5.14.1.tar.xz) = 2050076
50	SHA256 (KDE/Qt/5.13.2/qtserialbus-everywhere-src-5.13.2.tar.xz) = 48159393b1368976b5324eac48424e2a6e5d63c783194d0576a978151f882da3	50	SHA256 (KDE/Qt/5.14.1/qtserialbus-everywhere-src-5.14.1.tar.xz) = a49f72ef59e2ad82155269bd54322bf2638d2793b5adc0cd44ae99bab88f1045
51	SIZE (KDE/Qt/5.13.2/qtserialbus-everywhere-src-5.13.2.tar.xz) = 338428	51	SIZE (KDE/Qt/5.14.1/qtserialbus-everywhere-src-5.14.1.tar.xz) = 349772
52	SHA256 (KDE/Qt/5.13.2/qtserialport-everywhere-src-5.13.2.tar.xz) = 7677ffc1dce3b75c0a98d07d215588a8dccb5c276c55b4ecd60c35ed1c89cb34	52	SHA256 (KDE/Qt/5.14.1/qtserialport-everywhere-src-5.14.1.tar.xz) = ac7e51e99294998fae8bb3e2feebbd1820ecd774eb9ad8e7ea507f5bd06dcd6f
53	SIZE (KDE/Qt/5.13.2/qtserialport-everywhere-src-5.13.2.tar.xz) = 310736	53	SIZE (KDE/Qt/5.14.1/qtserialport-everywhere-src-5.14.1.tar.xz) = 316528
54	SHA256 (KDE/Qt/5.13.2/qtspeech-everywhere-src-5.13.2.tar.xz) = a0aca08feeac6925ead7f841319bdcfd60bfc126de07807edaf267c2ca8d13d5	54	SHA256 (KDE/Qt/5.14.1/qtspeech-everywhere-src-5.14.1.tar.xz) = abd9a1863a64de0a148ae37e5fdecde7fd486348f7b26c054008f8506223e425
55	SIZE (KDE/Qt/5.13.2/qtspeech-everywhere-src-5.13.2.tar.xz) = 100312	55	SIZE (KDE/Qt/5.14.1/qtspeech-everywhere-src-5.14.1.tar.xz) = 101072
56	SHA256 (KDE/Qt/5.13.2/qtsvg-everywhere-src-5.13.2.tar.xz) = 849e2e357e1333b64ecb728352f652cd8d916f029ed848f775b15d0b500cb7d7	56	SHA256 (KDE/Qt/5.14.1/qtsvg-everywhere-src-5.14.1.tar.xz) = 8540a57312f815f81a45b891b49959d776727fde17579bb6bf1a537996bc9359
57	SIZE (KDE/Qt/5.13.2/qtsvg-everywhere-src-5.13.2.tar.xz) = 1890380	57	SIZE (KDE/Qt/5.14.1/qtsvg-everywhere-src-5.14.1.tar.xz) = 1879708
58	SHA256 (KDE/Qt/5.13.2/qttools-everywhere-src-5.13.2.tar.xz) = 919a2713b6d2d7873a09ad85bd93cf4282606e5bf84d5884250f665a253ec06e	58	SHA256 (KDE/Qt/5.14.1/qttools-everywhere-src-5.14.1.tar.xz) = 7f5e6370cf4ed59f2bdd6517870cdcb1df9a055bbd885d056d90938ab302c70c
59	SIZE (KDE/Qt/5.13.2/qttools-everywhere-src-5.13.2.tar.xz) = 9110256	59	SIZE (KDE/Qt/5.14.1/qttools-everywhere-src-5.14.1.tar.xz) = 8810972
60	SHA256 (KDE/Qt/5.13.2/qttranslations-everywhere-src-5.13.2.tar.xz) = 25755941a2525de2d7ae48e0011d04db7cc09e4e73fe83293206ceafa0aa82d9	60	SHA256 (KDE/Qt/5.14.1/qttranslations-everywhere-src-5.14.1.tar.xz) = a7598068802f4ddda99865ea9c3503015d02ed1e1ff5875e936b42ab8eb2de46
61	SIZE (KDE/Qt/5.13.2/qttranslations-everywhere-src-5.13.2.tar.xz) = 1365880	61	SIZE (KDE/Qt/5.14.1/qttranslations-everywhere-src-5.14.1.tar.xz) = 1348664
62	SHA256 (KDE/Qt/5.13.2/qtvirtualkeyboard-everywhere-src-5.13.2.tar.xz) = 8e368dde237d21666f6cc8512a060e205388e519a4d7559c0505cc75224ed62b	62	SHA256 (KDE/Qt/5.14.1/qtvirtualkeyboard-everywhere-src-5.14.1.tar.xz) = 277baaf6043328d06585c7a9046461308aa7602b21f531bcda12e6df5bce5295
63	SIZE (KDE/Qt/5.13.2/qtvirtualkeyboard-everywhere-src-5.13.2.tar.xz) = 10923292	63	SIZE (KDE/Qt/5.14.1/qtvirtualkeyboard-everywhere-src-5.14.1.tar.xz) = 10950684
64	SHA256 (KDE/Qt/5.13.2/qtwayland-everywhere-src-5.13.2.tar.xz) = 3c9b2358d9cee02552b875db93b56f3b9bc3b0f4df7a2ff7e8b72f2a8f2ca952	64	SHA256 (KDE/Qt/5.14.1/qtwayland-everywhere-src-5.14.1.tar.xz) = 2a03b9f554e88c5824ef237c814b3dd45844c022e97be0e091f4a502ca4c9520
65	SIZE (KDE/Qt/5.13.2/qtwayland-everywhere-src-5.13.2.tar.xz) = 495536	65	SIZE (KDE/Qt/5.14.1/qtwayland-everywhere-src-5.14.1.tar.xz) = 544744
66	SHA256 (KDE/Qt/5.13.2/qtwebchannel-everywhere-src-5.13.2.tar.xz) = f452d419d8b19b566835f316bbf282dabc8b1c2a74c9c98c1aec4184465e9c13	66	SHA256 (KDE/Qt/5.14.1/qtwebchannel-everywhere-src-5.14.1.tar.xz) = 3af5262fde14c7dfe7bcc12d5796a482837bd09f0878851fd8de5db0b1985e6a
67	SIZE (KDE/Qt/5.13.2/qtwebchannel-everywhere-src-5.13.2.tar.xz) = 192652	67	SIZE (KDE/Qt/5.14.1/qtwebchannel-everywhere-src-5.14.1.tar.xz) = 202524
68	SHA256 (KDE/Qt/5.13.2/qtwebengine-everywhere-src-5.13.2.tar.xz) = adcf56b5de6f34744bba2307b696fc75611884f4270e87dfa760d6e99dd711bb	68	SHA256 (KDE/Qt/5.14.1/qtwebengine-everywhere-src-5.14.1.tar.xz) = 4ec77040a876a83aa2a833ebfe7b3e88dcc167ceb317095eb226a0b8d455e887
69	SIZE (KDE/Qt/5.13.2/qtwebengine-everywhere-src-5.13.2.tar.xz) = 255593964	69	SIZE (KDE/Qt/5.14.1/qtwebengine-everywhere-src-5.14.1.tar.xz) = 242438244
70	SHA256 (KDE/Qt/5.13.2/qtwebglplugin-everywhere-src-5.13.2.tar.xz) = ae369929d5a3356391bccd25cac22846dc44cbb726ce7b60924f53944addabb7	70	SHA256 (KDE/Qt/5.14.1/qtwebglplugin-everywhere-src-5.14.1.tar.xz) = de7768ab6a8de06e09467b6dc8714fa71ed5781e2654aa3498a7105328f565a6
71	SIZE (KDE/Qt/5.13.2/qtwebglplugin-everywhere-src-5.13.2.tar.xz) = 73608	71	SIZE (KDE/Qt/5.14.1/qtwebglplugin-everywhere-src-5.14.1.tar.xz) = 74120
72	SHA256 (KDE/Qt/5.13.2/qtwebsockets-everywhere-src-5.13.2.tar.xz) = fc11236c8bf69b27a4e237a27b9ea27fc90d8c25d81d1d451ce3a0b63cbc02d3	72	SHA256 (KDE/Qt/5.14.1/qtwebsockets-everywhere-src-5.14.1.tar.xz) = 742fb3d39043728ca4fc1533e9a1e3b701bc5bf4e27cba316077e9f0df0b3fef
73	SIZE (KDE/Qt/5.13.2/qtwebsockets-everywhere-src-5.13.2.tar.xz) = 244668	73	SIZE (KDE/Qt/5.14.1/qtwebsockets-everywhere-src-5.14.1.tar.xz) = 252616
74	SHA256 (KDE/Qt/5.13.2/qtwebview-everywhere-src-5.13.2.tar.xz) = 394cc7a9cb29b7883816ff3137b022f30568151aada0739fc99a23789c21c015	74	SHA256 (KDE/Qt/5.14.1/qtwebview-everywhere-src-5.14.1.tar.xz) = 8c18e7686d1480eb255b68e57a196f3ebc37cc4e2fbcd698ec3bed903517adff
75	SIZE (KDE/Qt/5.13.2/qtwebview-everywhere-src-5.13.2.tar.xz) = 131168	75	SIZE (KDE/Qt/5.14.1/qtwebview-everywhere-src-5.14.1.tar.xz) = 132824
76	SHA256 (KDE/Qt/5.13.2/qtwinextras-everywhere-src-5.13.2.tar.xz) = e94d70f68dacbcfa2bb0cbe53c7024083b16d5d44806c107fe268d34028cb779	76	SHA256 (KDE/Qt/5.14.1/qtwinextras-everywhere-src-5.14.1.tar.xz) = 222b888b89a8fb02948faf985e8614ac543603a000c1cf2e7489f8bf15ccc3cc
77	SIZE (KDE/Qt/5.13.2/qtwinextras-everywhere-src-5.13.2.tar.xz) = 760204	77	SIZE (KDE/Qt/5.14.1/qtwinextras-everywhere-src-5.14.1.tar.xz) = 763656
78	SHA256 (KDE/Qt/5.13.2/qtx11extras-everywhere-src-5.13.2.tar.xz) = 95a7c5c30f42e9575c3a17a2c0eb0cdbdd2d89dbcb3ee1426cd41bb07e28c51c	78	SHA256 (KDE/Qt/5.14.1/qtx11extras-everywhere-src-5.14.1.tar.xz) = b268907deb06570671c1f584feb1508e7fded129209a268183decc122bfac181
79	SIZE (KDE/Qt/5.13.2/qtx11extras-everywhere-src-5.13.2.tar.xz) = 127228	79	SIZE (KDE/Qt/5.14.1/qtx11extras-everywhere-src-5.14.1.tar.xz) = 135740
80	SHA256 (KDE/Qt/5.13.2/qtxmlpatterns-everywhere-src-5.13.2.tar.xz) = 1e87d8c004ec0beea3b29d13f0964c563aa9fae51c392c998750ca4e386374e2	80	SHA256 (KDE/Qt/5.14.1/qtxmlpatterns-everywhere-src-5.14.1.tar.xz) = fb993a112e591c84ea159a752a4026031a212a7af6f31a1b288552c924c18224
81	SIZE (KDE/Qt/5.13.2/qtxmlpatterns-everywhere-src-5.13.2.tar.xz) = 1392192	81	SIZE (KDE/Qt/5.14.1/qtxmlpatterns-everywhere-src-5.14.1.tar.xz) = 1403600

Lines 11-20 We chose the third option. To patch qmake's internal cmake generation function Link Here

(-)b/devel/qt5/files/extrapatch-mkspecs_features_create__cmake.prf (-10 / +7 lines)
11	to fix up the paths so that cmake files still land in the the "correct" location	11	to fix up the paths so that cmake files still land in the the "correct" location
12	in /usr/local/lib/cmake -- as this seemed to be the least intrusive method.	12	in /usr/local/lib/cmake -- as this seemed to be the least intrusive method.
13		13
14		14	--- mkspecs/features/create_cmake.prf.orig 2019-10-19 18:36:13.000000000 +0200
15	--- mkspecs/features/create_cmake.prf.orig 2017-06-28 11:54:29.000000000 +0200	15	+++ mkspecs/features/create_cmake.prf 2019-11-01 22:20:25.732072000 +0100
16	+++ mkspecs/features/create_cmake.prf 2017-07-14 15:04:51.254262000 +0200	16	@@ -78,13 +78,13 @@
17	@@ -48,7 +48,7 @@
18	}	17	}
19		18
20	CMAKE_INCLUDE_DIR = $$cmakeRelativePath($$[QT_INSTALL_HEADERS], $$[QT_INSTALL_PREFIX])	19	CMAKE_INCLUDE_DIR = $$cmakeRelativePath($$[QT_INSTALL_HEADERS], $$[QT_INSTALL_PREFIX])
Lines 23-30 in /usr/local/lib/cmake -- as this seemed to be the least intrusive method. Link Here
23	CMAKE_INCLUDE_DIR = $$[QT_INSTALL_HEADERS]/	22	CMAKE_INCLUDE_DIR = $$[QT_INSTALL_HEADERS]/
24	CMAKE_INCLUDE_DIR_IS_ABSOLUTE = True	23	CMAKE_INCLUDE_DIR_IS_ABSOLUTE = True
25	}	24	}
26	@@ -56,7 +56,7 @@
27	!exists($$first(QT.$${MODULE}_private.includes)): CMAKE_NO_PRIVATE_INCLUDES = true
28		25
29	CMAKE_LIB_DIR = $$cmakeRelativePath($$[QT_INSTALL_LIBS], $$[QT_INSTALL_PREFIX])	26	CMAKE_LIB_DIR = $$cmakeRelativePath($$[QT_INSTALL_LIBS], $$[QT_INSTALL_PREFIX])
30	-contains(CMAKE_LIB_DIR,"^\\.\\./.*") {	27	-contains(CMAKE_LIB_DIR,"^\\.\\./.*") {
Lines 32-38 in /usr/local/lib/cmake -- as this seemed to be the least intrusive method. Link Here
32	CMAKE_LIB_DIR = $$[QT_INSTALL_LIBS]/	29	CMAKE_LIB_DIR = $$[QT_INSTALL_LIBS]/
33	CMAKE_LIB_DIR_IS_ABSOLUTE = True	30	CMAKE_LIB_DIR_IS_ABSOLUTE = True
34	} else {	31	} else {
35	@@ -67,13 +67,13 @@	32	@@ -95,13 +95,13 @@
36	}	33	}
37		34
38	CMAKE_BIN_DIR = $$cmakeRelativePath($$[QT_HOST_BINS], $$[QT_INSTALL_PREFIX])	35	CMAKE_BIN_DIR = $$cmakeRelativePath($$[QT_HOST_BINS], $$[QT_INSTALL_PREFIX])
Lines 48-63 in /usr/local/lib/cmake -- as this seemed to be the least intrusive method. Link Here
48	CMAKE_PLUGIN_DIR = $$[QT_INSTALL_PLUGINS]/	45	CMAKE_PLUGIN_DIR = $$[QT_INSTALL_PLUGINS]/
49	CMAKE_PLUGIN_DIR_IS_ABSOLUTE = True	46	CMAKE_PLUGIN_DIR_IS_ABSOLUTE = True
50	}	47	}
51	@@ -167,7 +167,7 @@	48	@@ -259,7 +259,7 @@
52	cmake_target_file
53		49
54	cmake_qt5_plugin_file.files = $$cmake_target_file.output	50	cmake_qt5_plugin_file.files = $$cmake_target_file.output
		51	static\|staticlib: cmake_qt5_plugin_file.files += $$cmake_qt5_plugin_import_file.output
55	- cmake_qt5_plugin_file.path = $$[QT_INSTALL_LIBS]/cmake/Qt5$${CMAKE_MODULE_NAME}	52	- cmake_qt5_plugin_file.path = $$[QT_INSTALL_LIBS]/cmake/Qt5$${CMAKE_MODULE_NAME}
56	+ cmake_qt5_plugin_file.path = $$[QT_INSTALL_PREFIX]/lib/cmake/Qt5$${CMAKE_MODULE_NAME}	53	+ cmake_qt5_plugin_file.path = $$[QT_INSTALL_PREFIX]/lib/cmake/Qt5$${CMAKE_MODULE_NAME}
57	INSTALLS += cmake_qt5_plugin_file	54	INSTALLS += cmake_qt5_plugin_file
58		55
59	return()	56	return()
60	@@ -314,7 +314,7 @@	57	@@ -406,7 +406,7 @@
61	cmake_qt5_module_files.files += $$cmake_macros_file.output	58	cmake_qt5_module_files.files += $$cmake_macros_file.output
62	}	59	}
63		60

Lines 50-55 Link Here

(-)b/misc/qt5-l10n/pkg-plist (+6 lines)
50	%%QT_L10NDIR%%/linguist_ru.qm	50	%%QT_L10NDIR%%/linguist_ru.qm
51	%%QT_L10NDIR%%/linguist_sk.qm	51	%%QT_L10NDIR%%/linguist_sk.qm
52	%%QT_L10NDIR%%/linguist_sl.qm	52	%%QT_L10NDIR%%/linguist_sl.qm
		53	%%QT_L10NDIR%%/linguist_sv.qm
53	%%QT_L10NDIR%%/linguist_uk.qm	54	%%QT_L10NDIR%%/linguist_uk.qm
54	%%QT_L10NDIR%%/linguist_zh_CN.qm	55	%%QT_L10NDIR%%/linguist_zh_CN.qm
55	%%QT_L10NDIR%%/linguist_zh_TW.qm	56	%%QT_L10NDIR%%/linguist_zh_TW.qm
Lines 69-74 Link Here
69	%%QT_L10NDIR%%/qt_he.qm	70	%%QT_L10NDIR%%/qt_he.qm
70	%%QT_L10NDIR%%/qt_help_ar.qm	71	%%QT_L10NDIR%%/qt_help_ar.qm
71	%%QT_L10NDIR%%/qt_help_bg.qm	72	%%QT_L10NDIR%%/qt_help_bg.qm
		73	%%QT_L10NDIR%%/qt_help_ca.qm
72	%%QT_L10NDIR%%/qt_help_cs.qm	74	%%QT_L10NDIR%%/qt_help_cs.qm
73	%%QT_L10NDIR%%/qt_help_da.qm	75	%%QT_L10NDIR%%/qt_help_da.qm
74	%%QT_L10NDIR%%/qt_help_de.qm	76	%%QT_L10NDIR%%/qt_help_de.qm
Lines 125-130 Link Here
125	%%QT_L10NDIR%%/qtbase_uk.qm	127	%%QT_L10NDIR%%/qtbase_uk.qm
126	%%QT_L10NDIR%%/qtbase_zh_TW.qm	128	%%QT_L10NDIR%%/qtbase_zh_TW.qm
127	%%QT_L10NDIR%%/qtconnectivity_bg.qm	129	%%QT_L10NDIR%%/qtconnectivity_bg.qm
		130	%%QT_L10NDIR%%/qtconnectivity_ca.qm
128	%%QT_L10NDIR%%/qtconnectivity_da.qm	131	%%QT_L10NDIR%%/qtconnectivity_da.qm
129	%%QT_L10NDIR%%/qtconnectivity_de.qm	132	%%QT_L10NDIR%%/qtconnectivity_de.qm
130	%%QT_L10NDIR%%/qtconnectivity_en.qm	133	%%QT_L10NDIR%%/qtconnectivity_en.qm
Lines 150-155 Link Here
150	%%QT_L10NDIR%%/qtdeclarative_sk.qm	153	%%QT_L10NDIR%%/qtdeclarative_sk.qm
151	%%QT_L10NDIR%%/qtdeclarative_uk.qm	154	%%QT_L10NDIR%%/qtdeclarative_uk.qm
152	%%QT_L10NDIR%%/qtlocation_bg.qm	155	%%QT_L10NDIR%%/qtlocation_bg.qm
		156	%%QT_L10NDIR%%/qtlocation_ca.qm
153	%%QT_L10NDIR%%/qtlocation_da.qm	157	%%QT_L10NDIR%%/qtlocation_da.qm
154	%%QT_L10NDIR%%/qtlocation_de.qm	158	%%QT_L10NDIR%%/qtlocation_de.qm
155	%%QT_L10NDIR%%/qtlocation_en.qm	159	%%QT_L10NDIR%%/qtlocation_en.qm
Lines 228-233 Link Here
228	%%QT_L10NDIR%%/qtserialport_pl.qm	232	%%QT_L10NDIR%%/qtserialport_pl.qm
229	%%QT_L10NDIR%%/qtserialport_ru.qm	233	%%QT_L10NDIR%%/qtserialport_ru.qm
230	%%QT_L10NDIR%%/qtserialport_uk.qm	234	%%QT_L10NDIR%%/qtserialport_uk.qm
		235	%%QT_L10NDIR%%/qtwebengine_ca.qm
231	%%QT_L10NDIR%%/qtwebengine_de.qm	236	%%QT_L10NDIR%%/qtwebengine_de.qm
232	%%QT_L10NDIR%%/qtwebengine_en.qm	237	%%QT_L10NDIR%%/qtwebengine_en.qm
233	%%QT_L10NDIR%%/qtwebengine_es.qm	238	%%QT_L10NDIR%%/qtwebengine_es.qm
Lines 235-240 Link Here
235	%%QT_L10NDIR%%/qtwebengine_pl.qm	240	%%QT_L10NDIR%%/qtwebengine_pl.qm
236	%%QT_L10NDIR%%/qtwebengine_ru.qm	241	%%QT_L10NDIR%%/qtwebengine_ru.qm
237	%%QT_L10NDIR%%/qtwebengine_uk.qm	242	%%QT_L10NDIR%%/qtwebengine_uk.qm
		243	%%QT_L10NDIR%%/qtwebsockets_ca.qm
238	%%QT_L10NDIR%%/qtwebsockets_de.qm	244	%%QT_L10NDIR%%/qtwebsockets_de.qm
239	%%QT_L10NDIR%%/qtwebsockets_en.qm	245	%%QT_L10NDIR%%/qtwebsockets_en.qm
240	%%QT_L10NDIR%%/qtwebsockets_es.qm	246	%%QT_L10NDIR%%/qtwebsockets_es.qm

Lines 4-11 Link Here

(-)b/multimedia/qt5-multimedia/pkg-plist (-7 / +6 lines)
4	%%QT_INCDIR%%/QtMultimedia/%%FULLVER%%/QtMultimedia/private/qaudiohelpers_p.h	4	%%QT_INCDIR%%/QtMultimedia/%%FULLVER%%/QtMultimedia/private/qaudiohelpers_p.h
5	%%QT_INCDIR%%/QtMultimedia/%%FULLVER%%/QtMultimedia/private/qaudiosystempluginext_p.h	5	%%QT_INCDIR%%/QtMultimedia/%%FULLVER%%/QtMultimedia/private/qaudiosystempluginext_p.h
6	%%QT_INCDIR%%/QtMultimedia/%%FULLVER%%/QtMultimedia/private/qcamera_p.h	6	%%QT_INCDIR%%/QtMultimedia/%%FULLVER%%/QtMultimedia/private/qcamera_p.h
7	%%QT_INCDIR%%/QtMultimedia/%%FULLVER%%/QtMultimedia/private/qdeclarativevideooutput_backend_p.h
8	%%QT_INCDIR%%/QtMultimedia/%%FULLVER%%/QtMultimedia/private/qdeclarativevideooutput_p.h
9	%%QT_INCDIR%%/QtMultimedia/%%FULLVER%%/QtMultimedia/private/qimagevideobuffer_p.h	7	%%QT_INCDIR%%/QtMultimedia/%%FULLVER%%/QtMultimedia/private/qimagevideobuffer_p.h
10	%%QT_INCDIR%%/QtMultimedia/%%FULLVER%%/QtMultimedia/private/qmediacontrol_p.h	8	%%QT_INCDIR%%/QtMultimedia/%%FULLVER%%/QtMultimedia/private/qmediacontrol_p.h
11	%%QT_INCDIR%%/QtMultimedia/%%FULLVER%%/QtMultimedia/private/qmedianetworkplaylistprovider_p.h	9	%%QT_INCDIR%%/QtMultimedia/%%FULLVER%%/QtMultimedia/private/qmedianetworkplaylistprovider_p.h
Lines 29-40 Link Here
29	%%QT_INCDIR%%/QtMultimedia/%%FULLVER%%/QtMultimedia/private/qmultimediautils_p.h	27	%%QT_INCDIR%%/QtMultimedia/%%FULLVER%%/QtMultimedia/private/qmultimediautils_p.h
30	%%QT_INCDIR%%/QtMultimedia/%%FULLVER%%/QtMultimedia/private/qplaylistfileparser_p.h	28	%%QT_INCDIR%%/QtMultimedia/%%FULLVER%%/QtMultimedia/private/qplaylistfileparser_p.h
31	%%QT_INCDIR%%/QtMultimedia/%%FULLVER%%/QtMultimedia/private/qsamplecache_p.h	29	%%QT_INCDIR%%/QtMultimedia/%%FULLVER%%/QtMultimedia/private/qsamplecache_p.h
32	%%QT_INCDIR%%/QtMultimedia/%%FULLVER%%/QtMultimedia/private/qsgvideonode_p.h
33	%%QT_INCDIR%%/QtMultimedia/%%FULLVER%%/QtMultimedia/private/qsoundeffect_pulse_p.h	30	%%QT_INCDIR%%/QtMultimedia/%%FULLVER%%/QtMultimedia/private/qsoundeffect_pulse_p.h
34	%%QT_INCDIR%%/QtMultimedia/%%FULLVER%%/QtMultimedia/private/qsoundeffect_qaudio_p.h	31	%%QT_INCDIR%%/QtMultimedia/%%FULLVER%%/QtMultimedia/private/qsoundeffect_qaudio_p.h
35	%%QT_INCDIR%%/QtMultimedia/%%FULLVER%%/QtMultimedia/private/qtmultimedia-config_p.h	32	%%QT_INCDIR%%/QtMultimedia/%%FULLVER%%/QtMultimedia/private/qtmultimedia-config_p.h
36	%%QT_INCDIR%%/QtMultimedia/%%FULLVER%%/QtMultimedia/private/qtmultimediaglobal_p.h	33	%%QT_INCDIR%%/QtMultimedia/%%FULLVER%%/QtMultimedia/private/qtmultimediaglobal_p.h
37	%%QT_INCDIR%%/QtMultimedia/%%FULLVER%%/QtMultimedia/private/qtmultimediaquickdefs_p.h
38	%%QT_INCDIR%%/QtMultimedia/%%FULLVER%%/QtMultimedia/private/qvideoframe_p.h	34	%%QT_INCDIR%%/QtMultimedia/%%FULLVER%%/QtMultimedia/private/qvideoframe_p.h
39	%%QT_INCDIR%%/QtMultimedia/%%FULLVER%%/QtMultimedia/private/qvideoframeconversionhelper_p.h	35	%%QT_INCDIR%%/QtMultimedia/%%FULLVER%%/QtMultimedia/private/qvideoframeconversionhelper_p.h
40	%%QT_INCDIR%%/QtMultimedia/%%FULLVER%%/QtMultimedia/private/qvideooutputorientationhandler_p.h	36	%%QT_INCDIR%%/QtMultimedia/%%FULLVER%%/QtMultimedia/private/qvideooutputorientationhandler_p.h
Lines 238-244 Link Here
238	%%GSTREAMER%%%%QT_INCDIR%%/QtMultimediaGstTools/%%FULLVER%%/QtMultimediaGstTools/private/qgstreamerbufferprobe_p.h	234	%%GSTREAMER%%%%QT_INCDIR%%/QtMultimediaGstTools/%%FULLVER%%/QtMultimediaGstTools/private/qgstreamerbufferprobe_p.h
239	%%GSTREAMER%%%%QT_INCDIR%%/QtMultimediaGstTools/%%FULLVER%%/QtMultimediaGstTools/private/qgstreamerbushelper_p.h	235	%%GSTREAMER%%%%QT_INCDIR%%/QtMultimediaGstTools/%%FULLVER%%/QtMultimediaGstTools/private/qgstreamerbushelper_p.h
240	%%GSTREAMER%%%%QT_INCDIR%%/QtMultimediaGstTools/%%FULLVER%%/QtMultimediaGstTools/private/qgstreamermessage_p.h	236	%%GSTREAMER%%%%QT_INCDIR%%/QtMultimediaGstTools/%%FULLVER%%/QtMultimediaGstTools/private/qgstreamermessage_p.h
241	%%GSTREAMER%%%%QT_INCDIR%%/QtMultimediaGstTools/%%FULLVER%%/QtMultimediaGstTools/private/qgstreamermirtexturerenderer_p.h
242	%%GSTREAMER%%%%QT_INCDIR%%/QtMultimediaGstTools/%%FULLVER%%/QtMultimediaGstTools/private/qgstreamerplayercontrol_p.h	237	%%GSTREAMER%%%%QT_INCDIR%%/QtMultimediaGstTools/%%FULLVER%%/QtMultimediaGstTools/private/qgstreamerplayercontrol_p.h
243	%%GSTREAMER%%%%QT_INCDIR%%/QtMultimediaGstTools/%%FULLVER%%/QtMultimediaGstTools/private/qgstreamerplayersession_p.h	238	%%GSTREAMER%%%%QT_INCDIR%%/QtMultimediaGstTools/%%FULLVER%%/QtMultimediaGstTools/private/qgstreamerplayersession_p.h
244	%%GSTREAMER%%%%QT_INCDIR%%/QtMultimediaGstTools/%%FULLVER%%/QtMultimediaGstTools/private/qgstreamervideoinputdevicecontrol_p.h	239	%%GSTREAMER%%%%QT_INCDIR%%/QtMultimediaGstTools/%%FULLVER%%/QtMultimediaGstTools/private/qgstreamervideoinputdevicecontrol_p.h
Lines 254-264 Link Here
254	%%GSTREAMER%%%%QT_INCDIR%%/QtMultimediaGstTools/%%FULLVER%%/QtMultimediaGstTools/private/qgstvideorendererplugin_p.h	249	%%GSTREAMER%%%%QT_INCDIR%%/QtMultimediaGstTools/%%FULLVER%%/QtMultimediaGstTools/private/qgstvideorendererplugin_p.h
255	%%GSTREAMER%%%%QT_INCDIR%%/QtMultimediaGstTools/%%FULLVER%%/QtMultimediaGstTools/private/qgstvideorenderersink_p.h	250	%%GSTREAMER%%%%QT_INCDIR%%/QtMultimediaGstTools/%%FULLVER%%/QtMultimediaGstTools/private/qgstvideorenderersink_p.h
256	%%GSTREAMER%%%%QT_INCDIR%%/QtMultimediaGstTools/%%FULLVER%%/QtMultimediaGstTools/private/qvideosurfacegstsink_p.h	251	%%GSTREAMER%%%%QT_INCDIR%%/QtMultimediaGstTools/%%FULLVER%%/QtMultimediaGstTools/private/qvideosurfacegstsink_p.h
		252	%%QT_INCDIR%%/QtMultimediaQuick/%%FULLVER%%/QtMultimediaQuick/private/qdeclarativevideooutput_backend_p.h
		253	%%QT_INCDIR%%/QtMultimediaQuick/%%FULLVER%%/QtMultimediaQuick/private/qdeclarativevideooutput_p.h
257	%%QT_INCDIR%%/QtMultimediaQuick/%%FULLVER%%/QtMultimediaQuick/private/qdeclarativevideooutput_render_p.h	254	%%QT_INCDIR%%/QtMultimediaQuick/%%FULLVER%%/QtMultimediaQuick/private/qdeclarativevideooutput_render_p.h
258	%%QT_INCDIR%%/QtMultimediaQuick/%%FULLVER%%/QtMultimediaQuick/private/qdeclarativevideooutput_window_p.h	255	%%QT_INCDIR%%/QtMultimediaQuick/%%FULLVER%%/QtMultimediaQuick/private/qdeclarativevideooutput_window_p.h
		256	%%QT_INCDIR%%/QtMultimediaQuick/%%FULLVER%%/QtMultimediaQuick/private/qsgvideonode_p.h
259	%%QT_INCDIR%%/QtMultimediaQuick/%%FULLVER%%/QtMultimediaQuick/private/qsgvideonode_rgb_p.h	257	%%QT_INCDIR%%/QtMultimediaQuick/%%FULLVER%%/QtMultimediaQuick/private/qsgvideonode_rgb_p.h
260	%%QT_INCDIR%%/QtMultimediaQuick/%%FULLVER%%/QtMultimediaQuick/private/qsgvideonode_texture_p.h	258	%%QT_INCDIR%%/QtMultimediaQuick/%%FULLVER%%/QtMultimediaQuick/private/qsgvideonode_texture_p.h
261	%%QT_INCDIR%%/QtMultimediaQuick/%%FULLVER%%/QtMultimediaQuick/private/qsgvideonode_yuv_p.h	259	%%QT_INCDIR%%/QtMultimediaQuick/%%FULLVER%%/QtMultimediaQuick/private/qsgvideonode_yuv_p.h
		260	%%QT_INCDIR%%/QtMultimediaQuick/%%FULLVER%%/QtMultimediaQuick/private/qtmultimediaquickdefs_p.h
262	%%QT_INCDIR%%/QtMultimediaQuick/QtMultimediaQuick	261	%%QT_INCDIR%%/QtMultimediaQuick/QtMultimediaQuick
263	%%QT_INCDIR%%/QtMultimediaQuick/QtMultimediaQuickDepends	262	%%QT_INCDIR%%/QtMultimediaQuick/QtMultimediaQuickDepends
264	%%QT_INCDIR%%/QtMultimediaQuick/QtMultimediaQuickVersion	263	%%QT_INCDIR%%/QtMultimediaQuick/QtMultimediaQuickVersion
Lines 280-287 Link Here
280	%%QT_INCDIR%%/QtMultimediaWidgets/qvideowidgetcontrol.h	279	%%QT_INCDIR%%/QtMultimediaWidgets/qvideowidgetcontrol.h
281	%%QT_CMAKEDIR%%/Qt5MultimediaWidgets/Qt5MultimediaWidgetsConfig.cmake	280	%%QT_CMAKEDIR%%/Qt5MultimediaWidgets/Qt5MultimediaWidgetsConfig.cmake
282	%%QT_CMAKEDIR%%/Qt5MultimediaWidgets/Qt5MultimediaWidgetsConfigVersion.cmake	281	%%QT_CMAKEDIR%%/Qt5MultimediaWidgets/Qt5MultimediaWidgetsConfigVersion.cmake
283	%%GSTREAMER%%%%QT_CMAKEDIR%%/Qt5MultimediaGstTools/Qt5MultimediaGstToolsConfig.cmake	282	%%QT_CMAKEDIR%%/Qt5MultimediaGstTools/Qt5MultimediaGstToolsConfig.cmake
284	%%GSTREAMER%%%%QT_CMAKEDIR%%/Qt5MultimediaGstTools/Qt5MultimediaGstToolsConfigVersion.cmake	283	%%QT_CMAKEDIR%%/Qt5MultimediaGstTools/Qt5MultimediaGstToolsConfigVersion.cmake
285	%%QT_CMAKEDIR%%/Qt5MultimediaQuick/Qt5MultimediaQuickConfig.cmake	284	%%QT_CMAKEDIR%%/Qt5MultimediaQuick/Qt5MultimediaQuickConfig.cmake
286	%%QT_CMAKEDIR%%/Qt5MultimediaQuick/Qt5MultimediaQuickConfigVersion.cmake	285	%%QT_CMAKEDIR%%/Qt5MultimediaQuick/Qt5MultimediaQuickConfigVersion.cmake
287	%%QT_CMAKEDIR%%/Qt5Multimedia/Qt5MultimediaConfig.cmake	286	%%QT_CMAKEDIR%%/Qt5Multimedia/Qt5MultimediaConfig.cmake

Removed Link Here

(-)a/net/qt5-network/files/patch-qsslsocket_openssl11_symbols_p.h (-71 lines)
1	--- src/network/ssl/qsslsocket_openssl11_symbols_p.h.orig 2019-10-01 07:47:24 UTC
2	+++ src/network/ssl/qsslsocket_openssl11_symbols_p.h
3	@@ -77,19 +77,48 @@
4
5	const unsigned char * q_ASN1_STRING_get0_data(const ASN1_STRING *x);
6
7	+#if defined(LIBRESSL_VERSION_NUMBER) && LIBRESSL_VERSION_NUMBER >= 0x20700000L
8	+// LibreSSL 2.7 has stack_st but not OPENSSL_STACK
9	+typedef struct stack_st OPENSSL_STACK; /* Use STACK_OF(...) instead */
10	+// From the signature in LibreSSL
11	+#define OPENSSL_INIT_SETTINGS void
12	+// https://github.com/openssl/openssl/blob/master/include/openssl/x509_vfy.h#L63
13	+typedef int (X509_STORE_CTX_verify_cb)(int, X509_STORE_CTX );
14	+#endif
15	+
16	+
17	Q_AUTOTEST_EXPORT BIO q_BIO_new(const BIO_METHOD a);
18	Q_AUTOTEST_EXPORT const BIO_METHOD *q_BIO_s_mem();
19
20	-int q_DSA_bits(DSA *a);
21	+#ifdef LIBRESSL_VERSION_NUMBER
22	+#define q_DSA_bits(dsa) q_BN_num_bits((dsa)->p)
23	+#else
24	+ int q_DSA_bits(DSA *a);
25	+#endif
26	int q_EVP_CIPHER_CTX_reset(EVP_CIPHER_CTX *c);
27	int q_EVP_PKEY_base_id(EVP_PKEY *a);
28	int q_RSA_bits(RSA *a);
29	+#ifdef LIBRESSL_VERSION_NUMBER
30	+int q_sk_num(OPENSSL_STACK *a);
31	+void q_sk_pop_free(OPENSSL_STACK a, void (b)(void *));
32	+OPENSSL_STACK *q_sk_new_null();
33	+void q_sk_push(OPENSSL_STACK st, void data);
34	+void q_sk_free(OPENSSL_STACK *a);
35	+void * q_sk_value(OPENSSL_STACK *a, int b);
36	+#define q_OPENSSL_sk_num(a) q_sk_num(a)
37	+#define q_OPENSSL_sk_pop_free(a, b) q_sk_pop_free(a, b)
38	+#define q_OPENSSL_sk_new_null() q_sk_new_null()
39	+#define q_OPENSSL_sk_push(a, b) q_sk_push(a, b)
40	+#define q_OPENSSL_sk_free q_sk_free
41	+#define q_OPENSSL_sk_value(a, b) q_sk_value(a, b)
42	+#else
43	Q_AUTOTEST_EXPORT int q_OPENSSL_sk_num(OPENSSL_STACK *a);
44	Q_AUTOTEST_EXPORT void q_OPENSSL_sk_pop_free(OPENSSL_STACK a, void (b)(void *));
45	Q_AUTOTEST_EXPORT OPENSSL_STACK *q_OPENSSL_sk_new_null();
46	Q_AUTOTEST_EXPORT void q_OPENSSL_sk_push(OPENSSL_STACK st, void data);
47	Q_AUTOTEST_EXPORT void q_OPENSSL_sk_free(OPENSSL_STACK *a);
48	Q_AUTOTEST_EXPORT void * q_OPENSSL_sk_value(OPENSSL_STACK *a, int b);
49	+#endif
50	int q_SSL_session_reused(SSL *a);
51	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);
53	@@ -110,12 +139,15 @@ STACK_OF(X509) *q_X509_STORE_CTX_get0_chain(X509_STORE
54	void q_DH_get0_pqg(const DH dh, const BIGNUM p, const BIGNUM q, const BIGNUM *g);
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)
60	-
61	+#ifdef LIBRESSL_VERSION_NUMBER
62	+#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)
64	+#else
65	#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)
67	-
68	+#endif
69	#define q_OPENSSL_add_all_algorithms_conf() q_OPENSSL_init_crypto(OPENSSL_INIT_ADD_ALL_CIPHERS \
70	\| OPENSSL_INIT_ADD_ALL_DIGESTS \
71	\| OPENSSL_INIT_LOAD_CONFIG, NULL)

Removed Link Here

(-)a/net/qt5-network/files/patch-src_network_ssl_qsslsocket_openssl_symbols.cpp (-86 lines)
1	--- src/network/ssl/qsslsocket_openssl_symbols.cpp.orig 2019-10-25 09:16:48.000000000 +0200
2	+++ src/network/ssl/qsslsocket_openssl_symbols.cpp 2019-11-01 20:03:08.715014000 +0100
3	@@ -152,6 +152,14 @@
4	DEFINEFUNC(int, EVP_CIPHER_CTX_reset, EVP_CIPHER_CTX *c, c, return 0, return)
5	DEFINEFUNC(int, EVP_PKEY_base_id, EVP_PKEY *a, a, return NID_undef, return)
6	DEFINEFUNC(int, RSA_bits, RSA *a, a, return 0, return)
7	+#ifdef LIBRESSL_VERSION_NUMBER
8	+DEFINEFUNC(int, sk_num, OPENSSL_STACK *a, a, return -1, return)
9	+DEFINEFUNC2(void, sk_pop_free, OPENSSL_STACK a, a, void (b)(void*), b, return, DUMMYARG)
10	+DEFINEFUNC(OPENSSL_STACK *, sk_new_null, DUMMYARG, DUMMYARG, return nullptr, return)
11	+DEFINEFUNC2(void, sk_push, OPENSSL_STACK a, a, void b, b, return, DUMMYARG)
12	+DEFINEFUNC(void, sk_free, OPENSSL_STACK *a, a, return, DUMMYARG)
13	+DEFINEFUNC2(void , sk_value, OPENSSL_STACK a, a, int b, b, return nullptr, return)
14	+#else
15	DEFINEFUNC(int, DSA_bits, DSA *a, a, return 0, return)
16	DEFINEFUNC(int, OPENSSL_sk_num, OPENSSL_STACK *a, a, return -1, return)
17	DEFINEFUNC2(void, OPENSSL_sk_pop_free, OPENSSL_STACK a, a, void (b)(void*), b, return, DUMMYARG)
18	@@ -159,6 +167,7 @@
19	DEFINEFUNC2(void, OPENSSL_sk_push, OPENSSL_STACK a, a, void b, b, return, DUMMYARG)
20	DEFINEFUNC(void, OPENSSL_sk_free, OPENSSL_STACK *a, a, return, DUMMYARG)
21	DEFINEFUNC2(void , OPENSSL_sk_value, OPENSSL_STACK a, a, int b, b, return nullptr, return)
22	+#endif
23	DEFINEFUNC(int, SSL_session_reused, SSL *a, a, return 0, return)
24	DEFINEFUNC2(unsigned long, SSL_CTX_set_options, SSL_CTX *ctx, ctx, unsigned long op, op, return 0, return)
25	#ifdef TLS1_3_VERSION
26	@@ -443,7 +452,7 @@
27	DEFINEFUNC2(int, SSL_CTX_use_RSAPrivateKey, SSL_CTX a, a, RSA b, b, return -1, return)
28	DEFINEFUNC3(int, SSL_CTX_use_PrivateKey_file, SSL_CTX a, a, const char b, b, int c, c, return -1, return)
29	DEFINEFUNC(X509_STORE , SSL_CTX_get_cert_store, const SSL_CTX a, a, return nullptr, return)
30	-#if OPENSSL_VERSION_NUMBER >= 0x10002000L
31	+#if OPENSSL_VERSION_NUMBER >= 0x10002000L && !defined(LIBRESSL_VERSION_NUMBER)
32	DEFINEFUNC(SSL_CONF_CTX *, SSL_CONF_CTX_new, DUMMYARG, DUMMYARG, return nullptr, return);
33	DEFINEFUNC(void, SSL_CONF_CTX_free, SSL_CONF_CTX *a, a, return ,return);
34	DEFINEFUNC2(void, SSL_CONF_CTX_set_ssl_ctx, SSL_CONF_CTX a, a, SSL_CTX b, b, return, return);
35	@@ -839,8 +848,8 @@
36	#endif
37	#if defined(SHLIB_VERSION_NUMBER) && !defined(Q_OS_QNX) // on QNX, the libs are always libssl.so and libcrypto.so
38	// first attempt: the canonical name is libssl.so.<SHLIB_VERSION_NUMBER>
39	- libssl->setFileNameAndVersion(QLatin1String("ssl"), QLatin1String(SHLIB_VERSION_NUMBER));
40	- libcrypto->setFileNameAndVersion(QLatin1String("crypto"), QLatin1String(SHLIB_VERSION_NUMBER));
41	+ libssl->setFileNameAndVersion(QLatin1String("%%OPENSSLLIB%%/libssl"), QLatin1String(SHLIB_VERSION_NUMBER));
42	+ libcrypto->setFileNameAndVersion(QLatin1String("%%OPENSSLLIB%%/libcrypto"), QLatin1String(SHLIB_VERSION_NUMBER));
43	if (libcrypto->load() && libssl->load()) {
44	// libssl.so.<SHLIB_VERSION_NUMBER> and libcrypto.so.<SHLIB_VERSION_NUMBER> found
45	return pair;
46	@@ -980,12 +989,21 @@
47	RESOLVEFUNC(EVP_CIPHER_CTX_reset)
48	RESOLVEFUNC(EVP_PKEY_base_id)
49	RESOLVEFUNC(RSA_bits)
50	+#ifdef LIBRESSL_VERSION_NUMBER
51	+ RESOLVEFUNC(sk_new_null)
52	+ RESOLVEFUNC(sk_push)
53	+ RESOLVEFUNC(sk_free)
54	+ RESOLVEFUNC(sk_num)
55	+ RESOLVEFUNC(sk_pop_free)
56	+ RESOLVEFUNC(sk_value)
57	+#else
58	RESOLVEFUNC(OPENSSL_sk_new_null)
59	RESOLVEFUNC(OPENSSL_sk_push)
60	RESOLVEFUNC(OPENSSL_sk_free)
61	RESOLVEFUNC(OPENSSL_sk_num)
62	RESOLVEFUNC(OPENSSL_sk_pop_free)
63	RESOLVEFUNC(OPENSSL_sk_value)
64	+#endif
65	RESOLVEFUNC(DH_get0_pqg)
66	RESOLVEFUNC(SSL_CTX_set_options)
67	#ifdef TLS1_3_VERSION
68	@@ -1024,7 +1042,9 @@
69
70	RESOLVEFUNC(SSL_SESSION_get_ticket_lifetime_hint)
71	RESOLVEFUNC(DH_bits)
72	+#ifndef LIBRESSL_VERSION_NUMBER
73	RESOLVEFUNC(DSA_bits)
74	+#endif
75
76	#if QT_CONFIG(dtls)
77	RESOLVEFUNC(DTLSv1_listen)
78	@@ -1280,7 +1300,7 @@
79	RESOLVEFUNC(SSL_CTX_use_RSAPrivateKey)
80	RESOLVEFUNC(SSL_CTX_use_PrivateKey_file)
81	RESOLVEFUNC(SSL_CTX_get_cert_store);
82	-#if OPENSSL_VERSION_NUMBER >= 0x10002000L
83	+#if OPENSSL_VERSION_NUMBER >= 0x10002000L && !defined(LIBRESSL_VERSION_NUMBER)
84	RESOLVEFUNC(SSL_CONF_CTX_new);
85	RESOLVEFUNC(SSL_CONF_CTX_free);
86	RESOLVEFUNC(SSL_CONF_CTX_set_ssl_ctx);

Lines 36-41 Link Here

(-)b/net/qt5-network/pkg-plist (+3 lines)
36	%%QT_INCDIR%%/QtNetwork/%%FULLVER%%/QtNetwork/private/qnativesocketengine_p.h	36	%%QT_INCDIR%%/QtNetwork/%%FULLVER%%/QtNetwork/private/qnativesocketengine_p.h
37	%%QT_INCDIR%%/QtNetwork/%%FULLVER%%/QtNetwork/private/qnativesocketengine_winrt_p.h	37	%%QT_INCDIR%%/QtNetwork/%%FULLVER%%/QtNetwork/private/qnativesocketengine_winrt_p.h
38	%%QT_INCDIR%%/QtNetwork/%%FULLVER%%/QtNetwork/private/qnet_unix_p.h	38	%%QT_INCDIR%%/QtNetwork/%%FULLVER%%/QtNetwork/private/qnet_unix_p.h
		39	%%QT_INCDIR%%/QtNetwork/%%FULLVER%%/QtNetwork/private/qnetconmonitor_p.h
39	%%QT_INCDIR%%/QtNetwork/%%FULLVER%%/QtNetwork/private/qnetworkaccessauthenticationmanager_p.h	40	%%QT_INCDIR%%/QtNetwork/%%FULLVER%%/QtNetwork/private/qnetworkaccessauthenticationmanager_p.h
40	%%QT_INCDIR%%/QtNetwork/%%FULLVER%%/QtNetwork/private/qnetworkaccessbackend_p.h	41	%%QT_INCDIR%%/QtNetwork/%%FULLVER%%/QtNetwork/private/qnetworkaccessbackend_p.h
41	%%QT_INCDIR%%/QtNetwork/%%FULLVER%%/QtNetwork/private/qnetworkaccesscache_p.h	42	%%QT_INCDIR%%/QtNetwork/%%FULLVER%%/QtNetwork/private/qnetworkaccesscache_p.h
Lines 107-112 Link Here
107	%%QT_INCDIR%%/QtNetwork/QHostInfo	108	%%QT_INCDIR%%/QtNetwork/QHostInfo
108	%%QT_INCDIR%%/QtNetwork/QHstsPolicy	109	%%QT_INCDIR%%/QtNetwork/QHstsPolicy
109	%%QT_INCDIR%%/QtNetwork/QHttpMultiPart	110	%%QT_INCDIR%%/QtNetwork/QHttpMultiPart
		111	%%QT_INCDIR%%/QtNetwork/QHttp2Configuration
110	%%QT_INCDIR%%/QtNetwork/QHttpPart	112	%%QT_INCDIR%%/QtNetwork/QHttpPart
111	%%QT_INCDIR%%/QtNetwork/QIPv6Address	113	%%QT_INCDIR%%/QtNetwork/QIPv6Address
112	%%QT_INCDIR%%/QtNetwork/QLocalServer	114	%%QT_INCDIR%%/QtNetwork/QLocalServer
Lines 156-161 Link Here
156	%%QT_INCDIR%%/QtNetwork/qhostaddress.h	158	%%QT_INCDIR%%/QtNetwork/qhostaddress.h
157	%%QT_INCDIR%%/QtNetwork/qhostinfo.h	159	%%QT_INCDIR%%/QtNetwork/qhostinfo.h
158	%%QT_INCDIR%%/QtNetwork/qhstspolicy.h	160	%%QT_INCDIR%%/QtNetwork/qhstspolicy.h
		161	%%QT_INCDIR%%/QtNetwork/qhttp2configuration.h
159	%%QT_INCDIR%%/QtNetwork/qhttpmultipart.h	162	%%QT_INCDIR%%/QtNetwork/qhttpmultipart.h
160	%%QT_INCDIR%%/QtNetwork/qlocalserver.h	163	%%QT_INCDIR%%/QtNetwork/qlocalserver.h
161	%%QT_INCDIR%%/QtNetwork/qlocalsocket.h	164	%%QT_INCDIR%%/QtNetwork/qlocalsocket.h

Lines 18-24 Link Here

(-)b/www/qt5-webengine/Makefile (-4 / +3 lines)
18		18
19	PORTNAME= webengine	19	PORTNAME= webengine
20	DISTVERSION= ${QT5_VERSION}	20	DISTVERSION= ${QT5_VERSION}
21	PORTREVISION= 3
22	CATEGORIES= www	21	CATEGORIES= www
23	PKGNAMEPREFIX= qt5-	22	PKGNAMEPREFIX= qt5-
24		23
Lines 49-55 LIB_DEPENDS= libavcodec.so:multimedia/ffmpeg \ Link Here
49	libwebp.so:graphics/webp	48	libwebp.so:graphics/webp
50		49
51	DISTINFO_FILE= ${.CURDIR}/distinfo	50	DISTINFO_FILE= ${.CURDIR}/distinfo
52	QT5_VERSION= 5.13.2	51	QT5_VERSION= 5.14.0
53		52
54	OPTIONS_SINGLE= AUDIO	53	OPTIONS_SINGLE= AUDIO
55	OPTIONS_SINGLE_AUDIO= ALSA PULSEAUDIO SNDIO	54	OPTIONS_SINGLE_AUDIO= ALSA PULSEAUDIO SNDIO
Lines 79-85 USE_GL= gl Link Here
79	USE_GNOME= glib20 libxml2 libxslt	78	USE_GNOME= glib20 libxml2 libxslt
80	USE_QT= core declarative designer gui location network webchannel \	79	USE_QT= core declarative designer gui location network webchannel \
81	widgets buildtools_build qmake_build printsupport	80	widgets buildtools_build qmake_build printsupport
82	USE_XORG= x11 xcb xcomposite xcursor xext xi xorgproto \	81	USE_XORG= x11 xcb xcomposite xcursor xdamage xext xfixes xi xorgproto \
83	xrandr xrender xscrnsaver xtst	82	xrandr xrender xscrnsaver xtst
84		83
85	USE_LDCONFIG= ${QT_LIBDIR}	84	USE_LDCONFIG= ${QT_LIBDIR}
Lines 123-129 PLIST_SUB+= BE="@comment " LE="" Link Here
123		122
124	post-extract:	123	post-extract:
125	# Install FreeBSD's freebsd.pri file.	124	# Install FreeBSD's freebsd.pri file.
126	${CP} ${FILESDIR}/freebsd.pri ${WRKSRC}/src/core/config/freebsd.pri	125	${CP} ${FILESDIR}/freebsd.pri ${WRKSRC}/src/buildtools/config/freebsd.pri
127		126
128	post-extract-SNDIO-on:	127	post-extract-SNDIO-on:
129	@cd ${WRKSRC}/src/3rdparty/chromium/media/audio && ${MKDIR} sndio openbsd	128	@cd ${WRKSRC}/src/3rdparty/chromium/media/audio && ${MKDIR} sndio openbsd

Lines 38-55 Link Here

(-)b/www/qt5-webengine/files/patch-clang (-12 lines)
38		38
39	EXPECT_CALL(callback_, OnError()).Times(2);	39	EXPECT_CALL(callback_, OnError()).Times(2);
40		40
41	--- src/3rdparty/chromium/third_party/libjingle_xmpp/task_runner/taskrunner.cc.orig 2019-03-07 09:23:57 UTC
42	+++ src/3rdparty/chromium/third_party/libjingle_xmpp/task_runner/taskrunner.cc
43	@@ -80,7 +80,7 @@ void TaskRunner::InternalRunTasks(bool in_destructor)
44	std::vector<Task *>::iterator it;
45	it = std::remove(tasks_.begin(),
46	tasks_.end(),
47	- reinterpret_cast<Task *>(NULL));
48	+ static_cast<Task *>(NULL));
49
50	tasks_.erase(it, tasks_.end());
51	tasks_running_ = false;
52
53	--- src/3rdparty/chromium/third_party/sfntly/src/cpp/src/sfntly/table/core/cmap_table.cc.orig 2018-11-13 18:25:11 UTC	41	--- src/3rdparty/chromium/third_party/sfntly/src/cpp/src/sfntly/table/core/cmap_table.cc.orig 2018-11-13 18:25:11 UTC
54	+++ src/3rdparty/chromium/third_party/sfntly/src/cpp/src/sfntly/table/core/cmap_table.cc	42	+++ src/3rdparty/chromium/third_party/sfntly/src/cpp/src/sfntly/table/core/cmap_table.cc
55	@@ -439,7 +439,7 @@ CMapTable::CMapFormat0::Builder::Builder(	43	@@ -439,7 +439,7 @@ CMapTable::CMapFormat0::Builder::Builder(

Added Link Here

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

Removed Link Here

(-)a/www/qt5-webengine/files/patch-mkspecs_features_configure.prf (-34 lines)
1	--- mkspecs/features/configure.prf.orig 2019-10-23 10:30:33 UTC
2	+++ mkspecs/features/configure.prf
3	@@ -26,7 +26,7 @@ defineTest(runConfigure) {
4	return(false)
5	}
6
7	- linux:contains(QT_CONFIG,no-pkg-config) {
8	+ unix:contains(QT_CONFIG,no-pkg-config) {
9	skipBuild("pkg-config is required")
10	return(false)
11	}
12	@@ -68,17 +68,17 @@ defineTest(runConfigure) {
13	return(false);
14	}
15
16	- linux {
17	+ unix {
18
19	!qtConfig(webengine-host-pkg-config) {
20	skipBuild("Host pkg-config is required")
21	return(false)
22	}
23
24	- !qtConfig(webengine-system-glibc) {
25	- skipBuild("A suitable version >= 2.27 of libc could not be found.")
26	- return(false)
27	- }
28	+ #!qtConfig(webengine-system-glibc) {
29	+ # skipBuild("A suitable version >= 2.27 of libc could not be found.")
30	+ # return(false)
31	+ #}
32
33	QT_FOR_CONFIG += gui-private
34

Lines 1-17 Link Here

(-)b/www/qt5-webengine/files/patch-mkspecs_features_functions.prf (-11 / +8 lines)
1	Include the freebsd.pri file provided by the port, to pass FreeBSD specific	1	--- mkspecs/features/functions.prf.orig 2019-12-03 07:18:02 UTC
2	settings to gn.
3
4	--- mkspecs/features/functions.prf.orig 2019-05-24 09:01:39 UTC
5	+++ mkspecs/features/functions.prf	2	+++ mkspecs/features/functions.prf
6	@@ -82,6 +82,7 @@ defineReplace(gnArgs) {	3	@@ -75,6 +75,7 @@ defineReplace(gnArgs) {
7	linux: include($$QTWEBENGINE_ROOT/src/core/config/linux.pri)	4	linux: include($$QTWEBENGINE_ROOT/src/buildtools/config/linux.pri)
8	macos: include($$QTWEBENGINE_ROOT/src/core/config/mac_osx.pri)	5	macos: include($$QTWEBENGINE_ROOT/src/buildtools/config/mac_osx.pri)
9	win32: include($$QTWEBENGINE_ROOT/src/core/config/windows.pri)	6	win32: include($$QTWEBENGINE_ROOT/src/buildtools/config/windows.pri)
10	+ freebsd: include($$QTWEBENGINE_ROOT/src/core/config/freebsd.pri)	7	+ freebsd: include($$QTWEBENGINE_ROOT/src/buildtools/config/freebsd.pri)
11	isEmpty(gn_args): error(No gn_args found please make sure you have valid configuration.)	8	isEmpty(gn_args): error(No gn_args found please make sure you have valid configuration.)
12	return($$gn_args)	9	return($$gn_args)
13	}	10	}
14	@@ -94,6 +95,7 @@ defineReplace(gnArch) {	11	@@ -87,6 +88,7 @@ defineReplace(gnArch) {
15	contains(qtArch, "arm64"): return(arm64)	12	contains(qtArch, "arm64"): return(arm64)
16	contains(qtArch, "mips"): return(mipsel)	13	contains(qtArch, "mips"): return(mipsel)
17	contains(qtArch, "mips64"): return(mips64el)	14	contains(qtArch, "mips64"): return(mips64el)
Lines 19-25 settings to gn. Link Here
19	return(unknown)	16	return(unknown)
20	}	17	}
21		18
22	@@ -101,6 +103,7 @@ defineReplace(gnOS) {	19	@@ -94,6 +96,7 @@ defineReplace(gnOS) {
23	macos: return(mac)	20	macos: return(mac)
24	win32: return(win)	21	win32: return(win)
25	linux: return(linux)	22	linux: return(linux)

Removed Link Here

(-)a/www/qt5-webengine/files/patch-mkspecs_features_platform.prf (-19 lines)
1	--- mkspecs/features/platform.prf.orig 2019-05-24 09:01:39 UTC
2	+++ mkspecs/features/platform.prf
3	@@ -11,7 +11,7 @@ defineTest(isQtMinimum) {
4
5	defineTest(isPlatformSupported) {
6	QT_FOR_CONFIG += gui-private
7	- linux {
8	+ unix {
9	if(!gcc:!clang)\|intel_icc {
10	skipBuild("Qt WebEngine on Linux requires clang or GCC.")
11	return(false)
12	@@ -84,6 +84,7 @@ defineTest(isArchSupported) {
13	contains(QT_ARCH, "arm")\|contains(QT_ARCH, "arm64"): return(true)
14	contains(QT_ARCH, "mips"): return(true)
15	# contains(QT_ARCH, "mips64"): return(true)
16	+ contains(QT_ARCH, "power64"): return(true)
17
18	skipBuild("QtWebEngine can only be built for x86, x86-64, ARM, Aarch64, and MIPSel architectures.")
19	return(false)

Added Link Here

(-)b/www/qt5-webengine/files/patch-src_3rdparty_chromium_base_base__switches.cc (+20 lines)
1	--- src/3rdparty/chromium/base/base_switches.cc.orig 2019-11-27 21:12:25 UTC
2	+++ src/3rdparty/chromium/base/base_switches.cc
3	@@ -114,7 +114,7 @@ const char kWaitForDebugger[] = "wait-for-debugger";
4	const char kDisableUsbKeyboardDetect[] = "disable-usb-keyboard-detect";
5	#endif
6
7	-#if defined(OS_LINUX) && !defined(OS_CHROMEOS)
8	+#if (defined(OS_LINUX) && !defined(OS_CHROMEOS)) \|\| defined(OS_BSD)
9	// The /dev/shm partition is too small in certain VM environments, causing
10	// Chrome to fail or crash (see http://crbug.com/715363). Use this flag to
11	// work-around this issue (a temporary directory will always be used to create
12	@@ -135,7 +135,7 @@ const char kEnableCrashReporterForTesting[] =
13	const char kEnableReachedCodeProfiler[] = "enable-reached-code-profiler";
14	#endif
15
16	-#if defined(OS_LINUX)
17	+#if defined(OS_LINUX) \|\| defined(OS_BSD)
18	// Controls whether or not retired instruction counts are surfaced for threads
19	// in trace events on Linux.
20	//

Added Link Here

(-)b/www/qt5-webengine/files/patch-src_3rdparty_chromium_base_cpu.cc (+38 lines)
1	--- src/3rdparty/chromium/base/cpu.cc.orig 2019-11-27 21:12:25 UTC
2	+++ src/3rdparty/chromium/base/cpu.cc
3	@@ -15,7 +15,7 @@
4	#include "base/stl_util.h"
5	#include "build/build_config.h"
6
7	-#if defined(ARCH_CPU_ARM_FAMILY) && (defined(OS_ANDROID) \|\| defined(OS_LINUX))
8	+#if defined(ARCH_CPU_ARM_FAMILY) && (defined(OS_ANDROID) \|\| defined(OS_LINUX) \|\| defined(OS_BSD))
9	#include "base/files/file_util.h"
10	#endif
11
12	@@ -98,7 +98,7 @@ uint64_t xgetbv(uint32_t xcr) {
13
14	#endif // ARCH_CPU_X86_FAMILY
15
16	-#if defined(ARCH_CPU_ARM_FAMILY) && (defined(OS_ANDROID) \|\| defined(OS_LINUX))
17	+#if defined(ARCH_CPU_ARM_FAMILY) && (defined(OS_ANDROID) \|\| defined(OS_LINUX) \|\| defined(OS_BSD))
18	std::string* CpuInfoBrand() {
19	static std::string* brand = []() {
20	// This function finds the value from /proc/cpuinfo under the key "model
21	@@ -128,7 +128,7 @@ std::string* CpuInfoBrand() {
22	return brand;
23	}
24	#endif // defined(ARCH_CPU_ARM_FAMILY) && (defined(OS_ANDROID) \|\|
25	- // defined(OS_LINUX))
26	+ // defined(OS_LINUX) \|\| defined(OS_BSD))
27
28	} // namespace
29
30	@@ -252,7 +252,7 @@ void CPU::Initialize() {
31	}
32	}
33	#elif defined(ARCH_CPU_ARM_FAMILY)
34	-#if (defined(OS_ANDROID) \|\| defined(OS_LINUX))
35	+#if (defined(OS_ANDROID) \|\| defined(OS_LINUX) \|\| defined(OS_BSD))
36	cpu_brand_ = *CpuInfoBrand();
37	#elif defined(OS_WIN)
38	// Windows makes high-resolution thread timing information available in

Added Link Here

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

Added Link Here

(-)b/www/qt5-webengine/files/patch-src_3rdparty_chromium_base_memory_platform__shared__memory__region.h (+29 lines)
1	--- src/3rdparty/chromium/base/memory/platform_shared_memory_region.h.orig 2019-11-27 21:12:25 UTC
2	+++ src/3rdparty/chromium/base/memory/platform_shared_memory_region.h
3	@@ -28,7 +28,7 @@
4	#include "base/files/scoped_file.h"
5	#endif
6
7	-#if defined(OS_LINUX)
8	+#if defined(OS_LINUX) \|\| defined(OS_BSD)
9	namespace content {
10	class SandboxIPCHandler;
11	}
12	@@ -122,7 +122,7 @@ class BASE_EXPORT PlatformSharedMemoryRegion {
13	kMaxValue = GET_SHMEM_TEMP_DIR_FAILURE
14	};
15
16	-#if defined(OS_LINUX)
17	+#if defined(OS_LINUX) \|\| defined(OS_BSD)
18	// Structure to limit access to executable region creation.
19	struct ExecutableRegion {
20	private:
21	@@ -276,7 +276,7 @@ class BASE_EXPORT PlatformSharedMemoryRegion {
22	CheckPlatformHandlePermissionsCorrespondToMode);
23	static PlatformSharedMemoryRegion Create(Mode mode,
24	size_t size
25	-#if defined(OS_LINUX)
26	+#if defined(OS_LINUX) \|\| defined(OS_BSD)
27	,
28	bool executable = false
29	#endif

Added Link Here

(-)b/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

Lines 1-13 Link Here

(-)b/www/qt5-webengine/files/patch-src_3rdparty_chromium_base_numerics_safe__math__shared__impl.h (-9 / +8 lines)
1	--- src/3rdparty/chromium/base/numerics/safe_math_shared_impl.h.orig 2019-05-23 12:39:34 UTC	1	--- src/3rdparty/chromium/base/numerics/safe_math_shared_impl.h.orig 2019-11-27 21:12:25 UTC
2	+++ src/3rdparty/chromium/base/numerics/safe_math_shared_impl.h	2	+++ src/3rdparty/chromium/base/numerics/safe_math_shared_impl.h
3	@@ -19,9 +19,7 @@	3	@@ -23,8 +23,7 @@
4
5	// Where available use builtin math overflow support on Clang and GCC.	4	// Where available use builtin math overflow support on Clang and GCC.
6	#if !defined(__native_client__) && \	5	#elif !defined(__native_client__) && \
7	- ((defined(__clang__) && \	6	((defined(__clang__) && \
8	- ((__clang_major__ > 3) \|\| \	7	- ((__clang_major__ > 3) \|\| \
9	- (__clang_major__ == 3 && __clang_minor__ >= 4))) \|\| \	8	- (__clang_major__ == 3 && __clang_minor__ >= 4))) \|\| \
10	+ ((defined(__clang__) && (__clang_major__ > 6)) \|\| \	9	+ (__clang_major__ > 6)) \|\| \
11	(defined(__GNUC__) && __GNUC__ >= 5))	10	(defined(__GNUC__) && __GNUC__ >= 5))
12	#include "base/numerics/safe_math_clang_gcc_impl.h"	11	#include "base/numerics/safe_math_clang_gcc_impl.h"
13	#define BASE_HAS_OPTIMIZED_SAFE_MATH (1)	12	#define BASE_HAS_OPTIMIZED_SAFE_MATH (1)

Lines 1-5 Link Here

(-)b/www/qt5-webengine/files/patch-src_3rdparty_chromium_base_process_process__metrics.cc (-1 / +19 lines)
1	--- src/3rdparty/chromium/base/process/process_metrics.cc.orig 2019-05-23 12:39:34 UTC	1	--- src/3rdparty/chromium/base/process/process_metrics.cc.orig 2019-11-27 21:12:25 UTC
2	+++ src/3rdparty/chromium/base/process/process_metrics.cc	2	+++ src/3rdparty/chromium/base/process/process_metrics.cc
		3	@@ -57,7 +57,7 @@ SystemMetrics SystemMetrics::Sample() {
		4	SystemMetrics system_metrics;
		5
		6	system_metrics.committed_memory_ = GetSystemCommitCharge();
		7	-#if defined(OS_LINUX) \|\| defined(OS_ANDROID)
		8	+#if defined(OS_LINUX) \|\| defined(OS_ANDROID) \|\| defined(OS_BSD)
		9	GetSystemMemoryInfo(&system_metrics.memory_info_);
		10	GetVmStatInfo(&system_metrics.vmstat_info_);
		11	GetSystemDiskInfo(&system_metrics.disk_info_);
		12	@@ -75,7 +75,7 @@ std::unique_ptr<Value> SystemMetrics::ToValue() const
		13	std::unique_ptr<DictionaryValue> res(new DictionaryValue());
		14
		15	res->SetIntKey("committed_memory", static_cast<int>(committed_memory_));
		16	-#if defined(OS_LINUX) \|\| defined(OS_ANDROID)
		17	+#if defined(OS_LINUX) \|\| defined(OS_ANDROID) \|\| defined(OS_BSD)
		18	std::unique_ptr<DictionaryValue> meminfo = memory_info_.ToValue();
		19	std::unique_ptr<DictionaryValue> vmstat = vmstat_info_.ToValue();
		20	meminfo->MergeDictionary(vmstat.get());
3	@@ -126,7 +126,7 @@ double ProcessMetrics::GetPlatformIndependentCPUUsage(	21	@@ -126,7 +126,7 @@ double ProcessMetrics::GetPlatformIndependentCPUUsage(
4	}	22	}
5	#endif	23	#endif