Update Qt5 to 5.14.2

Very big thanks go again to kai@ who provided the www/qt5-webengine upgrade (to 5.14.0).
Notably, video capture support was re-enabled.

Announcement:
        https://www.qt.io/blog/qt-5.14-has-released

PR:		244964
Exp-run by:	antoine
This commit is contained in:
Tobias C. Berner 2020-04-13 12:35:58 +00:00
parent 161589998c
commit a25eafc3bc
Notes: svn2git 2021-03-31 03:12:20 +00:00
svn path=/head/; revision=531601
304 changed files with 3246 additions and 3880 deletions

View file

@ -24,7 +24,7 @@ _QT_MK_INCLUDED= qt.mk
# Qt versions currently supported by the framework.
_QT_SUPPORTED?= 5
QT5_VERSION?= 5.13.2
QT5_VERSION?= 5.14.2
# We accept the Qt version to be passed by either or all of the three mk files.
. if empty(qt_ARGS) && empty(qmake_ARGS) && empty(qt-dist_ARGS)

View file

@ -8,7 +8,7 @@ PKGNAMEPREFIX= qt5-
MAINTAINER= kde@FreeBSD.org
COMMENT= Accessibilty features for Qt5
USES= compiler:c++11-lang gl pkgconfig qmake:outsource \
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
@ -22,11 +22,13 @@ SPEECHD_DESC= Speech Dispatcher Backend
SPEECHD_USES= gettext-runtime gnome
SPEECHD_USE= GNOME=glib20
SPEECHD_LIB_DEPENDS= libspeechd.so:accessibility/speech-dispatcher
SPEECHD_QMAKE_ON= CONFIG+=with_speechd
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_QMAKE_ON= CONFIG+=with_flite
FLITE_VARS= QMAKE_CONFIGURE_ARGS+=--feature-flite
FLITE_VARS_OFF= QMAKE_CONFIGURE_ARGS+=--no-feature-flite
.include <bsd.port.mk>

View file

@ -1,18 +0,0 @@
--- 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)

View file

@ -1,31 +0,0 @@
--- 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
+ }
}

View file

@ -1,5 +1,6 @@
%%QT_INCDIR%%/QtTextToSpeech/%%FULLVER%%/QtTextToSpeech/private/qtexttospeech_p.h
%%QT_INCDIR%%/QtTextToSpeech/%%FULLVER%%/QtTextToSpeech/private/qvoice_p.h
%%QT_INCDIR%%/QtTextToSpeech/%%FULLVER%%/QtTextToSpeech/private/qttexttospeech-config_p.h
%%QT_INCDIR%%/QtTextToSpeech/QTextToSpeech
%%QT_INCDIR%%/QtTextToSpeech/QTextToSpeechEngine
%%QT_INCDIR%%/QtTextToSpeech/QTextToSpeechPlugin
@ -12,6 +13,7 @@
%%QT_INCDIR%%/QtTextToSpeech/qtexttospeechengine.h
%%QT_INCDIR%%/QtTextToSpeech/qtexttospeechplugin.h
%%QT_INCDIR%%/QtTextToSpeech/qttexttospeechversion.h
%%QT_INCDIR%%/QtTextToSpeech/qttexttospeech-config.h
%%QT_INCDIR%%/QtTextToSpeech/qvoice.h
%%QT_CMAKEDIR%%/Qt5TextToSpeech/Qt5TextToSpeechConfig.cmake
%%QT_CMAKEDIR%%/Qt5TextToSpeech/Qt5TextToSpeechConfigVersion.cmake

View file

@ -56,6 +56,9 @@ CFLAGS_i386= -fPIC
CXXFLAGS_i386= -fPIC
pre-configure:
${MKDIR} ${WRKSRC}/src/3rdparty/qt-labs-qtscriptgenerator-${_QT_VERSION}
${CP} ${WRKSRC}/src/3rdparty/qt-labs-qtscriptgenerator-5.13.2/qt-labs-qtscriptgenerator-5.13.2.pro \
${WRKSRC}/src/3rdparty/qt-labs-qtscriptgenerator-${_QT_VERSION}/qt-labs-qtscriptgenerator-${_QT_VERSION}.pro
${REINPLACE_CMD} -e "s|%%DATADIR%%|${DATADIR}|" \
${WRKSRC}/src/core/RS.cpp
${REINPLACE_CMD} -e "s|%%DATADIR%%|${DATADIR}|" \

View file

@ -6,6 +6,8 @@
%%QT_INCDIR%%/QtBluetooth/%%FULLVER%%/QtBluetooth/private/bluetoothmanagement_p.h
%%QT_INCDIR%%/QtBluetooth/%%FULLVER%%/QtBluetooth/private/bluez5_helper_p.h
%%QT_INCDIR%%/QtBluetooth/%%FULLVER%%/QtBluetooth/private/bluez_data_p.h
%%QT_INCDIR%%/QtBluetooth/%%FULLVER%%/QtBluetooth/private/btdelegates_p.h
%%QT_INCDIR%%/QtBluetooth/%%FULLVER%%/QtBluetooth/private/btraii_p.h
%%QT_INCDIR%%/QtBluetooth/%%FULLVER%%/QtBluetooth/private/device1_bluez5_p.h
%%QT_INCDIR%%/QtBluetooth/%%FULLVER%%/QtBluetooth/private/device_p.h
%%QT_INCDIR%%/QtBluetooth/%%FULLVER%%/QtBluetooth/private/devicediscoverybroadcastreceiver_p.h
@ -30,7 +32,6 @@
%%QT_INCDIR%%/QtBluetooth/%%FULLVER%%/QtBluetooth/private/objectmanager_p.h
%%QT_INCDIR%%/QtBluetooth/%%FULLVER%%/QtBluetooth/private/osxbluetooth_p.h
%%QT_INCDIR%%/QtBluetooth/%%FULLVER%%/QtBluetooth/private/osxbtcentralmanager_p.h
%%QT_INCDIR%%/QtBluetooth/%%FULLVER%%/QtBluetooth/private/osxbtchanneldelegate_p.h
%%QT_INCDIR%%/QtBluetooth/%%FULLVER%%/QtBluetooth/private/osxbtconnectionmonitor_p.h
%%QT_INCDIR%%/QtBluetooth/%%FULLVER%%/QtBluetooth/private/osxbtdeviceinquiry_p.h
%%QT_INCDIR%%/QtBluetooth/%%FULLVER%%/QtBluetooth/private/osxbtdevicepair_p.h
@ -54,7 +55,6 @@
%%QT_INCDIR%%/QtBluetooth/%%FULLVER%%/QtBluetooth/private/qbluetoothdeviceinfo_p.h
%%QT_INCDIR%%/QtBluetooth/%%FULLVER%%/QtBluetooth/private/qbluetoothhostinfo_p.h
%%QT_INCDIR%%/QtBluetooth/%%FULLVER%%/QtBluetooth/private/qbluetoothlocaldevice_p.h
%%QT_INCDIR%%/QtBluetooth/%%FULLVER%%/QtBluetooth/private/qbluetoothserver_osx_p.h
%%QT_INCDIR%%/QtBluetooth/%%FULLVER%%/QtBluetooth/private/qbluetoothserver_p.h
%%QT_INCDIR%%/QtBluetooth/%%FULLVER%%/QtBluetooth/private/qbluetoothservicediscoveryagent_p.h
%%QT_INCDIR%%/QtBluetooth/%%FULLVER%%/QtBluetooth/private/qbluetoothserviceinfo_p.h
@ -63,6 +63,7 @@
%%QT_INCDIR%%/QtBluetooth/%%FULLVER%%/QtBluetooth/private/qbluetoothsocket_bluezdbus_p.h
%%QT_INCDIR%%/QtBluetooth/%%FULLVER%%/QtBluetooth/private/qbluetoothsocket_dummy_p.h
%%QT_INCDIR%%/QtBluetooth/%%FULLVER%%/QtBluetooth/private/qbluetoothsocket_osx_p.h
%%QT_INCDIR%%/QtBluetooth/%%FULLVER%%/QtBluetooth/private/qbluetoothsocket_win_p.h
%%QT_INCDIR%%/QtBluetooth/%%FULLVER%%/QtBluetooth/private/qbluetoothsocket_winrt_p.h
%%QT_INCDIR%%/QtBluetooth/%%FULLVER%%/QtBluetooth/private/qbluetoothsocketbase_p.h
%%QT_INCDIR%%/QtBluetooth/%%FULLVER%%/QtBluetooth/private/qbluetoothtransferreply_bluez_p.h
@ -74,8 +75,9 @@
%%QT_INCDIR%%/QtBluetooth/%%FULLVER%%/QtBluetooth/private/qlowenergycontroller_android_p.h
%%QT_INCDIR%%/QtBluetooth/%%FULLVER%%/QtBluetooth/private/qlowenergycontroller_bluez_p.h
%%QT_INCDIR%%/QtBluetooth/%%FULLVER%%/QtBluetooth/private/qlowenergycontroller_bluezdbus_p.h
%%QT_INCDIR%%/QtBluetooth/%%FULLVER%%/QtBluetooth/private/qlowenergycontroller_osx_p.h
%%QT_INCDIR%%/QtBluetooth/%%FULLVER%%/QtBluetooth/private/qlowenergycontroller_darwin_p.h
%%QT_INCDIR%%/QtBluetooth/%%FULLVER%%/QtBluetooth/private/qlowenergycontroller_p.h
%%QT_INCDIR%%/QtBluetooth/%%FULLVER%%/QtBluetooth/private/qlowenergycontroller_win_p.h
%%QT_INCDIR%%/QtBluetooth/%%FULLVER%%/QtBluetooth/private/qlowenergycontroller_winrt_new_p.h
%%QT_INCDIR%%/QtBluetooth/%%FULLVER%%/QtBluetooth/private/qlowenergycontroller_winrt_p.h
%%QT_INCDIR%%/QtBluetooth/%%FULLVER%%/QtBluetooth/private/qlowenergycontrollerbase_p.h
@ -83,6 +85,7 @@
%%QT_INCDIR%%/QtBluetooth/%%FULLVER%%/QtBluetooth/private/qprivatelinearbuffer_p.h
%%QT_INCDIR%%/QtBluetooth/%%FULLVER%%/QtBluetooth/private/qtbluetooth-config_p.h
%%QT_INCDIR%%/QtBluetooth/%%FULLVER%%/QtBluetooth/private/qtbluetoothglobal_p.h
%%QT_INCDIR%%/QtBluetooth/%%FULLVER%%/QtBluetooth/private/qwinlowenergybluetooth_p.h
%%QT_INCDIR%%/QtBluetooth/%%FULLVER%%/QtBluetooth/private/remotedevicemanager_p.h
%%QT_INCDIR%%/QtBluetooth/%%FULLVER%%/QtBluetooth/private/serveracceptancethread_p.h
%%QT_INCDIR%%/QtBluetooth/%%FULLVER%%/QtBluetooth/private/service_p.h

View file

@ -2,7 +2,6 @@
PORTNAME= serialbus
DISTVERSION= ${QT5_VERSION}
PORTREVISION= 1
CATEGORIES= comms
PKGNAMEPREFIX= qt5-

View file

@ -1,12 +1,14 @@
%%QT_INCDIR%%/QtSerialPort/%%FULLVER%%/QtSerialPort/private/qserialport_p.h
%%QT_INCDIR%%/QtSerialPort/%%FULLVER%%/QtSerialPort/private/qserialportinfo_p.h
%%QT_INCDIR%%/QtSerialPort/%%FULLVER%%/QtSerialPort/private/qtntdll_p.h
%%QT_INCDIR%%/QtSerialPort/%%FULLVER%%/QtSerialPort/private/qtserialport-config_p.h
%%QT_INCDIR%%/QtSerialPort/%%FULLVER%%/QtSerialPort/private/qtudev_p.h
%%QT_INCDIR%%/QtSerialPort/%%FULLVER%%/QtSerialPort/private/qwinoverlappedionotifier_p.h
%%QT_INCDIR%%/QtSerialPort/QSerialPort
%%QT_INCDIR%%/QtSerialPort/QSerialPortInfo
%%QT_INCDIR%%/QtSerialPort/QtSerialPort
%%QT_INCDIR%%/QtSerialPort/QtSerialPortDepends
%%QT_INCDIR%%/QtSerialPort/QtSerialPortVersion
%%QT_INCDIR%%/QtSerialPort/qtserialport-config.h
%%QT_INCDIR%%/QtSerialPort/qserialport.h
%%QT_INCDIR%%/QtSerialPort/qserialportglobal.h
%%QT_INCDIR%%/QtSerialPort/qserialportinfo.h

View file

@ -2,7 +2,6 @@
PORTNAME= assistant
DISTVERSION= ${QT5_VERSION}
PORTREVISION= 1
CATEGORIES= devel
PKGNAMEPREFIX= qt5-

View file

@ -2,7 +2,6 @@
PORTNAME= buildtools
DISTVERSION= ${QT5_VERSION}
PORTREVISION= 1
CATEGORIES= devel
PKGNAMEPREFIX= qt5-

View file

@ -2,7 +2,6 @@
PORTNAME= core
DISTVERSION= ${QT5_VERSION}
PORTREVISION= 2
CATEGORIES= devel
PKGNAMEPREFIX= qt5-
@ -35,7 +34,7 @@ QT_BINARIES= yes
QT_DEFINES= GLIB
QT_CONFIG= glib icu
MORE_WRKSRCS= src/tools/bootstrap src/tools/qfloat16-tables src/corelib src/tools/qlalr
MORE_WRKSRCS= src/tools/bootstrap src/corelib src/tools/qlalr
.include <bsd.port.pre.mk>
# FreeBSD base gained /etc/os-release in r354922, which

View file

@ -1,18 +0,0 @@
global/qfloat16.cpp:149:31: error: use of undeclared identifier 'vcvt_f16_f32'
vst1_f16(out_f16 + i, vcvt_f16_f32(vld1q_f32(in + i)));
^
global/qfloat16.cpp:159:28: error: use of undeclared identifier 'vcvt_f32_f16'
vst1q_f32(out + i, vcvt_f32_f16(vld1_f16(in_f16 + i)));
^
--- src/corelib/global/qfloat16.cpp.orig 2018-06-15 07:29:31 UTC
+++ src/corelib/global/qfloat16.cpp
@@ -135,7 +135,7 @@ f16cextern void qFloatFromFloat16_fast(float *out, con
#undef f16cextern
}
-#elif defined(__ARM_FP16_FORMAT_IEEE) && defined(__ARM_NEON__)
+#elif defined(__ARM_FP16_FORMAT_IEEE) && defined(__ARM_NEON__) && (__ARM_FP & 2)
static inline bool hasFastF16()
{
return true;

View file

@ -1,6 +1,6 @@
--- src/corelib/tools/qtimezoneprivate_tz.cpp.orig 2018-06-13 08:09:13.578248000 -0700
+++ src/corelib/tools/qtimezoneprivate_tz.cpp 2018-06-13 08:11:15.328743000 -0700
@@ -1072,6 +1072,17 @@ QByteArray QTzTimeZonePrivate::systemTim
--- src/corelib/time/qtimezoneprivate_tz.cpp.orig 2019-11-01 21:30:15 UTC
+++ src/corelib/time/qtimezoneprivate_tz.cpp
@@ -1126,6 +1126,17 @@ QByteArray QTzTimeZonePrivate::systemTimeZoneId() cons
}
}

View file

@ -11,6 +11,8 @@
%%QT_INCDIR%%/QtCore/%%FULLVER%%/QtCore/private/qbig5codec_p.h
%%QT_INCDIR%%/QtCore/%%FULLVER%%/QtCore/private/qbytearray_p.h
%%QT_INCDIR%%/QtCore/%%FULLVER%%/QtCore/private/qbytedata_p.h
%%QT_INCDIR%%/QtCore/%%FULLVER%%/QtCore/private/qcalendarbackend_p.h
%%QT_INCDIR%%/QtCore/%%FULLVER%%/QtCore/private/qcalendarmath_p.h
%%QT_INCDIR%%/QtCore/%%FULLVER%%/QtCore/private/qcborvalue_p.h
%%QT_INCDIR%%/QtCore/%%FULLVER%%/QtCore/private/qcfsocketnotifier_p.h
%%QT_INCDIR%%/QtCore/%%FULLVER%%/QtCore/private/qcollator_p.h
@ -55,7 +57,6 @@
%%QT_INCDIR%%/QtCore/%%FULLVER%%/QtCore/private/qfilesystemwatcher_polling_p.h
%%QT_INCDIR%%/QtCore/%%FULLVER%%/QtCore/private/qfilesystemwatcher_win_p.h
%%QT_INCDIR%%/QtCore/%%FULLVER%%/QtCore/private/qfinalstate_p.h
%%QT_INCDIR%%/QtCore/%%FULLVER%%/QtCore/private/qfloat16_p.h
%%QT_INCDIR%%/QtCore/%%FULLVER%%/QtCore/private/qfreelist_p.h
%%QT_INCDIR%%/QtCore/%%FULLVER%%/QtCore/private/qfsfileengine_iterator_p.h
%%QT_INCDIR%%/QtCore/%%FULLVER%%/QtCore/private/qfsfileengine_p.h
@ -66,7 +67,10 @@
%%QT_INCDIR%%/QtCore/%%FULLVER%%/QtCore/private/qfuturewatcher_p.h
%%QT_INCDIR%%/QtCore/%%FULLVER%%/QtCore/private/qgb18030codec_p.h
%%QT_INCDIR%%/QtCore/%%FULLVER%%/QtCore/private/qglobal_p.h
%%QT_INCDIR%%/QtCore/%%FULLVER%%/QtCore/private/qgregoriancalendar_p.h
%%QT_INCDIR%%/QtCore/%%FULLVER%%/QtCore/private/qharfbuzz_p.h
%%QT_INCDIR%%/QtCore/%%FULLVER%%/QtCore/private/qhijricalendar_data_p.h
%%QT_INCDIR%%/QtCore/%%FULLVER%%/QtCore/private/qhijricalendar_p.h
%%QT_INCDIR%%/QtCore/%%FULLVER%%/QtCore/private/qhistorystate_p.h
%%QT_INCDIR%%/QtCore/%%FULLVER%%/QtCore/private/qhooks_p.h
%%QT_INCDIR%%/QtCore/%%FULLVER%%/QtCore/private/qiconvcodec_p.h
@ -74,7 +78,10 @@
%%QT_INCDIR%%/QtCore/%%FULLVER%%/QtCore/private/qiodevice_p.h
%%QT_INCDIR%%/QtCore/%%FULLVER%%/QtCore/private/qipaddress_p.h
%%QT_INCDIR%%/QtCore/%%FULLVER%%/QtCore/private/qisciicodec_p.h
%%QT_INCDIR%%/QtCore/%%FULLVER%%/QtCore/private/qislamiccivilcalendar_p.h
%%QT_INCDIR%%/QtCore/%%FULLVER%%/QtCore/private/qitemselectionmodel_p.h
%%QT_INCDIR%%/QtCore/%%FULLVER%%/QtCore/private/qjalalicalendar_data_p.h
%%QT_INCDIR%%/QtCore/%%FULLVER%%/QtCore/private/qjalalicalendar_p.h
%%QT_INCDIR%%/QtCore/%%FULLVER%%/QtCore/private/qjiscodec_p.h
%%QT_INCDIR%%/QtCore/%%FULLVER%%/QtCore/private/qjni_p.h
%%QT_INCDIR%%/QtCore/%%FULLVER%%/QtCore/private/qjnihelpers_p.h
@ -82,21 +89,25 @@
%%QT_INCDIR%%/QtCore/%%FULLVER%%/QtCore/private/qjson_p.h
%%QT_INCDIR%%/QtCore/%%FULLVER%%/QtCore/private/qjsonparser_p.h
%%QT_INCDIR%%/QtCore/%%FULLVER%%/QtCore/private/qjsonwriter_p.h
%%QT_INCDIR%%/QtCore/%%FULLVER%%/QtCore/private/qjuliancalendar_p.h
%%QT_INCDIR%%/QtCore/%%FULLVER%%/QtCore/private/qlatincodec_p.h
%%QT_INCDIR%%/QtCore/%%FULLVER%%/QtCore/private/qlibrary_p.h
%%QT_INCDIR%%/QtCore/%%FULLVER%%/QtCore/private/qlocale_data_p.h
%%QT_INCDIR%%/QtCore/%%FULLVER%%/QtCore/private/qlocale_p.h
%%QT_INCDIR%%/QtCore/%%FULLVER%%/QtCore/private/qlocale_tools_p.h
%%QT_INCDIR%%/QtCore/%%FULLVER%%/QtCore/private/qlockfile_p.h
%%QT_INCDIR%%/QtCore/%%FULLVER%%/QtCore/private/qlocking_p.h
%%QT_INCDIR%%/QtCore/%%FULLVER%%/QtCore/private/qlogging_p.h
%%QT_INCDIR%%/QtCore/%%FULLVER%%/QtCore/private/qloggingregistry_p.h
%%QT_INCDIR%%/QtCore/%%FULLVER%%/QtCore/private/qmachparser_p.h
%%QT_INCDIR%%/QtCore/%%FULLVER%%/QtCore/private/qmakearray_p.h
%%QT_INCDIR%%/QtCore/%%FULLVER%%/QtCore/private/qmemory_p.h
%%QT_INCDIR%%/QtCore/%%FULLVER%%/QtCore/private/qmetaobject_moc_p.h
%%QT_INCDIR%%/QtCore/%%FULLVER%%/QtCore/private/qmetaobject_p.h
%%QT_INCDIR%%/QtCore/%%FULLVER%%/QtCore/private/qmetaobjectbuilder_p.h
%%QT_INCDIR%%/QtCore/%%FULLVER%%/QtCore/private/qmetatype_p.h
%%QT_INCDIR%%/QtCore/%%FULLVER%%/QtCore/private/qmetatypeswitcher_p.h
%%QT_INCDIR%%/QtCore/%%FULLVER%%/QtCore/private/qmilankoviccalendar_p.h
%%QT_INCDIR%%/QtCore/%%FULLVER%%/QtCore/private/qmimedatabase_p.h
%%QT_INCDIR%%/QtCore/%%FULLVER%%/QtCore/private/qmimeglobpattern_p.h
%%QT_INCDIR%%/QtCore/%%FULLVER%%/QtCore/private/qmimemagicrule_p.h
@ -105,7 +116,6 @@
%%QT_INCDIR%%/QtCore/%%FULLVER%%/QtCore/private/qmimetype_p.h
%%QT_INCDIR%%/QtCore/%%FULLVER%%/QtCore/private/qmimetypeparser_p.h
%%QT_INCDIR%%/QtCore/%%FULLVER%%/QtCore/private/qmutex_p.h
%%QT_INCDIR%%/QtCore/%%FULLVER%%/QtCore/private/qmutexpool_p.h
%%QT_INCDIR%%/QtCore/%%FULLVER%%/QtCore/private/qnoncontiguousbytedevice_p.h
%%QT_INCDIR%%/QtCore/%%FULLVER%%/QtCore/private/qnumeric_p.h
%%QT_INCDIR%%/QtCore/%%FULLVER%%/QtCore/private/qobject_p.h
@ -127,6 +137,8 @@
%%QT_INCDIR%%/QtCore/%%FULLVER%%/QtCore/private/qresource_iterator_p.h
%%QT_INCDIR%%/QtCore/%%FULLVER%%/QtCore/private/qresource_p.h
%%QT_INCDIR%%/QtCore/%%FULLVER%%/QtCore/private/qringbuffer_p.h
%%QT_INCDIR%%/QtCore/%%FULLVER%%/QtCore/private/qromancalendar_data_p.h
%%QT_INCDIR%%/QtCore/%%FULLVER%%/QtCore/private/qromancalendar_p.h
%%QT_INCDIR%%/QtCore/%%FULLVER%%/QtCore/private/qsavefile_p.h
%%QT_INCDIR%%/QtCore/%%FULLVER%%/QtCore/private/qscopedpointer_p.h
%%QT_INCDIR%%/QtCore/%%FULLVER%%/QtCore/private/qsequentialanimationgroup_p.h
@ -174,6 +186,7 @@
%%QT_INCDIR%%/QtCore/%%FULLVER%%/QtCore/private/qwindowspipereader_p.h
%%QT_INCDIR%%/QtCore/%%FULLVER%%/QtCore/private/qwindowspipewriter_p.h
%%QT_INCDIR%%/QtCore/%%FULLVER%%/QtCore/private/qwineventnotifier_p.h
%%QT_INCDIR%%/QtCore/%%FULLVER%%/QtCore/private/qwinregistry_p.h
%%QT_INCDIR%%/QtCore/%%FULLVER%%/QtCore/private/qxmlstream_p.h
%%QT_INCDIR%%/QtCore/%%FULLVER%%/QtCore/private/qxmlutils_p.h
%%QT_INCDIR%%/QtCore/QAbstractAnimation
@ -210,6 +223,7 @@
%%QT_INCDIR%%/QtCore/QByteArrayMatcher
%%QT_INCDIR%%/QtCore/QByteRef
%%QT_INCDIR%%/QtCore/QCache
%%QT_INCDIR%%/QtCore/QCalendar
%%QT_INCDIR%%/QtCore/QCborArray
%%QT_INCDIR%%/QtCore/QCborError
%%QT_INCDIR%%/QtCore/QCborMap
@ -365,6 +379,7 @@
%%QT_INCDIR%%/QtCore/QPauseAnimation
%%QT_INCDIR%%/QtCore/QPersistentModelIndex
%%QT_INCDIR%%/QtCore/QPluginLoader
%%QT_INCDIR%%/QtCore/QPluginMetaData
%%QT_INCDIR%%/QtCore/QPoint
%%QT_INCDIR%%/QtCore/QPointF
%%QT_INCDIR%%/QtCore/QPointer
@ -378,6 +393,7 @@
%%QT_INCDIR%%/QtCore/QReadWriteLock
%%QT_INCDIR%%/QtCore/QRect
%%QT_INCDIR%%/QtCore/QRectF
%%QT_INCDIR%%/QtCore/QRecursiveMutex
%%QT_INCDIR%%/QtCore/QRegExp
%%QT_INCDIR%%/QtCore/QRegularExpression
%%QT_INCDIR%%/QtCore/QRegularExpressionMatch
@ -538,6 +554,7 @@
%%QT_INCDIR%%/QtCore/qbytearraylist.h
%%QT_INCDIR%%/QtCore/qbytearraymatcher.h
%%QT_INCDIR%%/QtCore/qcache.h
%%QT_INCDIR%%/QtCore/qcalendar.h
%%QT_INCDIR%%/QtCore/qcborarray.h
%%QT_INCDIR%%/QtCore/qcborcommon.h
%%QT_INCDIR%%/QtCore/qcbormap.h
@ -552,6 +569,7 @@
%%QT_INCDIR%%/QtCore/qconfig-bootstrapped.h
%%QT_INCDIR%%/QtCore/qconfig.h
%%QT_INCDIR%%/QtCore/qcontainerfwd.h
%%QT_INCDIR%%/QtCore/qcontainertools_impl.h
%%QT_INCDIR%%/QtCore/qcontiguouscache.h
%%QT_INCDIR%%/QtCore/qcoreapplication.h
%%QT_INCDIR%%/QtCore/qcoreevent.h

View file

@ -2,7 +2,6 @@
PORTNAME= dbus
DISTVERSION= ${QT5_VERSION}
PORTREVISION= 1
CATEGORIES= devel
PKGNAMEPREFIX= qt5-

View file

@ -2,7 +2,6 @@
PORTNAME= designer
DISTVERSION= ${QT5_VERSION}
PORTREVISION= 1
CATEGORIES= devel
PKGNAMEPREFIX= qt5-

View file

@ -2,7 +2,6 @@
PORTNAME= help
DISTVERSION= ${QT5_VERSION}
PORTREVISION= 1
CATEGORIES= devel
PKGNAMEPREFIX= qt5-

View file

@ -2,7 +2,6 @@
PORTNAME= linguist
DISTVERSION= ${QT5_VERSION}
PORTREVISION= 1
CATEGORIES= devel
PKGNAMEPREFIX= qt5-

View file

@ -2,7 +2,6 @@
PORTNAME= linguisttools
DISTVERSION= ${QT5_VERSION}
PORTREVISION= 1
CATEGORIES= devel
PKGNAMEPREFIX= qt5-

View file

@ -235,6 +235,8 @@
%%QT_INCDIR%%/QtPositioning/%%FULLVER%%/QtPositioning/private/qgeopolygon_p.h
%%QT_INCDIR%%/QtPositioning/%%FULLVER%%/QtPositioning/private/qgeopositioninfo_p.h
%%QT_INCDIR%%/QtPositioning/%%FULLVER%%/QtPositioning/private/qgeopositioninfosource_p.h
%%QT_INCDIR%%/QtPositioning/%%FULLVER%%/QtPositioning/private/qgeosatelliteinfo_p.h
%%QT_INCDIR%%/QtPositioning/%%FULLVER%%/QtPositioning/private/qgeosatelliteinfosource_p.h
%%QT_INCDIR%%/QtPositioning/%%FULLVER%%/QtPositioning/private/qgeorectangle_p.h
%%QT_INCDIR%%/QtPositioning/%%FULLVER%%/QtPositioning/private/qgeoshape_p.h
%%QT_INCDIR%%/QtPositioning/%%FULLVER%%/QtPositioning/private/qlocationdata_simulator_p.h
@ -283,6 +285,7 @@
%%QT_INCDIR%%/QtPositioning/qtpositioningversion.h
%%QT_INCDIR%%/QtPositioningQuick/%%FULLVER%%/QtPositioningQuick/private/qdeclarativegeoaddress_p.h
%%QT_INCDIR%%/QtPositioningQuick/%%FULLVER%%/QtPositioningQuick/private/qdeclarativegeolocation_p.h
%%QT_INCDIR%%/QtPositioningQuick/%%FULLVER%%/QtPositioningQuick/private/qdeclarativepluginparameter_p.h
%%QT_INCDIR%%/QtPositioningQuick/%%FULLVER%%/QtPositioningQuick/private/qdeclarativeposition_p.h
%%QT_INCDIR%%/QtPositioningQuick/%%FULLVER%%/QtPositioningQuick/private/qdeclarativepositionsource_p.h
%%QT_INCDIR%%/QtPositioningQuick/%%FULLVER%%/QtPositioningQuick/private/qpositioningquickglobal_p.h

View file

@ -2,7 +2,6 @@
PORTNAME= qdbus
DISTVERSION= ${QT5_VERSION}
PORTREVISION= 1
CATEGORIES= devel
PKGNAMEPREFIX= qt5-

View file

@ -2,7 +2,6 @@
PORTNAME= qdbusviewer
DISTVERSION= ${QT5_VERSION}
PORTREVISION= 1
CATEGORIES= devel
PKGNAMEPREFIX= qt5-

View file

@ -14,6 +14,7 @@
%%QT_DOCDIR%%/global/includes-online/search.qdoc
%%QT_DOCDIR%%/global/includes/examples-run.qdocinc
%%QT_DOCDIR%%/global/includes/module-use.qdocinc
%%QT_DOCDIR%%/global/includes/standardpath/functiondocs.qdocinc
%%QT_DOCDIR%%/global/macros.qdocconf
%%QT_DOCDIR%%/global/manifest-meta.qdocconf
%%QT_DOCDIR%%/global/qt-cpp-defines.qdocconf

View file

@ -2,7 +2,6 @@
PORTNAME= qdoc
DISTVERSION= ${QT5_VERSION}
PORTREVISION= 1
CATEGORIES= devel textproc
PKGNAMEPREFIX= qt5-
@ -18,7 +17,9 @@ USE_QT= core declarative buildtools_build qdoc-data_run
BUILD_WRKSRC= ${WRKSRC}/src/${PORTNAME}
INSTALL_WRKSRC= ${BUILD_WRKSRC}
PLIST_FILES= ${QT_BINDIR}/qdoc
PLIST_FILES= ${QT_BINDIR}/qdoc \
${QT_CMAKEDIR}/Qt5DocTools/Qt5DocToolsConfig.cmake \
${QT_CMAKEDIR}/Qt5DocTools/Qt5DocToolsConfigVersion.cmake
CONFIGURE_ENV= LLVM_INSTALL_DIR=${LOCALBASE}/llvm${LLVM_DEFAULT}

View file

@ -0,0 +1,10 @@
--- src/qdoc/qdoc.pro.orig 2019-12-31 21:11:48 UTC
+++ src/qdoc/qdoc.pro
@@ -152,6 +152,6 @@ cmake_qdoc_config_version_file.output = $$MODULE_BASE_
QMAKE_SUBSTITUTES += cmake_qdoc_config_file cmake_qdoc_config_version_file
cmake_qdoc_tools_files.files += $$cmake_qdoc_config_file.output $$cmake_qdoc_config_version_file.output
-cmake_qdoc_tools_files.path = $$[QT_INSTALL_LIBS]/cmake/Qt5DocTools
+cmake_qdoc_tools_files.path = $$[QT_INSTALL_PREFIX]/lib/cmake/Qt5DocTools
cmake_qdoc_tools_files.CONFIG = no_check_exist
INSTALLS += cmake_qdoc_tools_files

View file

@ -2,7 +2,6 @@
PORTNAME= qmake
DISTVERSION= ${QT5_VERSION}
PORTREVISION= 2
CATEGORIES= devel
PKGNAMEPREFIX= qt5-

View file

@ -5,11 +5,7 @@
%%QT_MKSPECDIR%%/aix-g++/qplatformdefs.h
%%QT_MKSPECDIR%%/android-clang/qmake.conf
%%QT_MKSPECDIR%%/android-clang/qplatformdefs.h
%%QT_MKSPECDIR%%/android-g++/qmake.conf
%%QT_MKSPECDIR%%/android-g++/qplatformdefs.h
%%QT_MKSPECDIR%%/common/aix/qplatformdefs.h
%%QT_MKSPECDIR%%/common/android-base-head.conf
%%QT_MKSPECDIR%%/common/android-base-tail.conf
%%QT_MKSPECDIR%%/common/android/qplatformdefs.h
%%QT_MKSPECDIR%%/common/angle.conf
%%QT_MKSPECDIR%%/common/bsd/bsd.conf
@ -53,6 +49,8 @@
%%QT_MKSPECDIR%%/common/qcc-base-qnx.conf
%%QT_MKSPECDIR%%/common/qcc-base.conf
%%QT_MKSPECDIR%%/common/qnx/qplatformdefs.h
%%QT_MKSPECDIR%%/common/rtems-base.conf
%%QT_MKSPECDIR%%/common/rtems/qplatformdefs.h
%%QT_MKSPECDIR%%/common/sanitize.conf
%%QT_MKSPECDIR%%/common/shell-unix.conf
%%QT_MKSPECDIR%%/common/shell-win32.conf
@ -123,6 +121,8 @@
%%QT_MKSPECDIR%%/devices/linux-imx6-g++/qplatformdefs.h
%%QT_MKSPECDIR%%/devices/linux-imx7-g++/qmake.conf
%%QT_MKSPECDIR%%/devices/linux-imx7-g++/qplatformdefs.h
%%QT_MKSPECDIR%%/devices/linux-imx8-g++/qmake.conf
%%QT_MKSPECDIR%%/devices/linux-imx8-g++/qplatformdefs.h
%%QT_MKSPECDIR%%/devices/linux-jetson-tk1-g++/qmake.conf
%%QT_MKSPECDIR%%/devices/linux-jetson-tk1-g++/qplatformdefs.h
%%QT_MKSPECDIR%%/devices/linux-jetson-tk1-pro-g++/qmake.conf
@ -146,6 +146,8 @@
%%QT_MKSPECDIR%%/devices/linux-rasp-pi3-g++/qplatformdefs.h
%%QT_MKSPECDIR%%/devices/linux-rasp-pi3-vc4-g++/qmake.conf
%%QT_MKSPECDIR%%/devices/linux-rasp-pi3-vc4-g++/qplatformdefs.h
%%QT_MKSPECDIR%%/devices/linux-rasp-pi4-v3d-g++/qmake.conf
%%QT_MKSPECDIR%%/devices/linux-rasp-pi4-v3d-g++/qplatformdefs.h
%%QT_MKSPECDIR%%/devices/linux-rcar-h2-g++/qmake.conf
%%QT_MKSPECDIR%%/devices/linux-rcar-h2-g++/qplatformdefs.h
%%QT_MKSPECDIR%%/devices/linux-rcar-m3-g++/qmake.conf
@ -163,6 +165,8 @@
%%QT_MKSPECDIR%%/dummy/qmake.conf
%%QT_MKSPECDIR%%/features/android/android.prf
%%QT_MKSPECDIR%%/features/android/android_deployment_settings.prf
%%QT_MKSPECDIR%%/features/android/default_pre.prf
%%QT_MKSPECDIR%%/features/android/resolve_config.prf
%%QT_MKSPECDIR%%/features/android/resolve_target.prf
%%QT_MKSPECDIR%%/features/android/sdk.prf
%%QT_MKSPECDIR%%/features/android/spec_post.prf
@ -180,12 +184,15 @@
%%QT_MKSPECDIR%%/features/data/cmake/ExtraSourceIncludes.cmake.in
%%QT_MKSPECDIR%%/features/data/cmake/Qt5BasicConfig.cmake.in
%%QT_MKSPECDIR%%/features/data/cmake/Qt5ConfigVersion.cmake.in
%%QT_MKSPECDIR%%/features/data/cmake/Qt5ImportPlugin.cpp.in
%%QT_MKSPECDIR%%/features/data/cmake/Qt5PluginTarget.cmake.in
%%QT_MKSPECDIR%%/features/data/configure.json
%%QT_MKSPECDIR%%/features/data/dummy.cpp
%%QT_MKSPECDIR%%/features/data/dumpvcvars.bat
%%QT_MKSPECDIR%%/features/data/mac/objc_namespace.sh
%%QT_MKSPECDIR%%/features/data/macros.cpp
%%QT_MKSPECDIR%%/features/data/testserver/Dockerfile
%%QT_MKSPECDIR%%/features/data/testserver/docker-compose-common.yml
%%QT_MKSPECDIR%%/features/data/unix/findclasslist.pl
%%QT_MKSPECDIR%%/features/dbusadaptors.prf
%%QT_MKSPECDIR%%/features/dbuscommon.pri
@ -215,6 +222,7 @@
%%QT_MKSPECDIR%%/features/mac/default_post.prf
%%QT_MKSPECDIR%%/features/mac/default_pre.prf
%%QT_MKSPECDIR%%/features/mac/mac.prf
%%QT_MKSPECDIR%%/features/mac/no_warn_empty_obj_files.prf
%%QT_MKSPECDIR%%/features/mac/objective_c.prf
%%QT_MKSPECDIR%%/features/mac/rez.prf
%%QT_MKSPECDIR%%/features/mac/sdk.mk
@ -261,6 +269,7 @@
%%QT_MKSPECDIR%%/features/resolve_config.prf
%%QT_MKSPECDIR%%/features/resolve_target.prf
%%QT_MKSPECDIR%%/features/resources.prf
%%QT_MKSPECDIR%%/features/resources_functions.prf
%%QT_MKSPECDIR%%/features/rtti.prf
%%QT_MKSPECDIR%%/features/rtti_off.prf
%%QT_MKSPECDIR%%/features/sanitizer.prf
@ -302,10 +311,13 @@
%%QT_MKSPECDIR%%/features/unix/x11inc.prf
%%QT_MKSPECDIR%%/features/unix/x11lib.prf
%%QT_MKSPECDIR%%/features/unix/x11sm.prf
%%QT_MKSPECDIR%%/features/unsupported/testserver.prf
%%QT_MKSPECDIR%%/features/use_c_linker.prf
%%QT_MKSPECDIR%%/features/vxworks.prf
%%QT_MKSPECDIR%%/features/warn_off.prf
%%QT_MKSPECDIR%%/features/warn_on.prf
%%QT_MKSPECDIR%%/features/wasm/default_pre.prf
%%QT_MKSPECDIR%%/features/wasm/emcc_ver.prf
%%QT_MKSPECDIR%%/features/wasm/wasm.prf
%%QT_MKSPECDIR%%/features/wayland-scanner.prf
%%QT_MKSPECDIR%%/features/win32/console.prf

View file

@ -2,7 +2,6 @@
PORTNAME= remoteobjects
DISTVERSION= ${QT5_VERSION}
PORTREVISION= 1
CATEGORIES= devel
PKGNAMEPREFIX= qt5-

View file

@ -2,7 +2,6 @@
PORTNAME= scxml
DISTVERSION= ${QT5_VERSION}
PORTREVISION= 1
CATEGORIES= devel
PKGNAMEPREFIX= qt5-

View file

@ -2,7 +2,6 @@
PORTNAME= qt5
DISTVERSION= ${QT5_VERSION}
PORTREVISION= 3
CATEGORIES= devel
MAINTAINER= kde@FreeBSD.org

View file

@ -1,81 +1,81 @@
TIMESTAMP = 1572554821
SHA256 (KDE/Qt/5.13.2/qt3d-everywhere-src-5.13.2.tar.xz) = d1b9fc0be82264b5f76c3a5330901dff95c1f2bcb67916c3fac6bad4ff69adc9
SIZE (KDE/Qt/5.13.2/qt3d-everywhere-src-5.13.2.tar.xz) = 81537856
SHA256 (KDE/Qt/5.13.2/qtactiveqt-everywhere-src-5.13.2.tar.xz) = 0f34a2f59a4438b4d060066eaed35e0f738d620b42782d598bad2f1a56cc094a
SIZE (KDE/Qt/5.13.2/qtactiveqt-everywhere-src-5.13.2.tar.xz) = 264608
SHA256 (KDE/Qt/5.13.2/qtandroidextras-everywhere-src-5.13.2.tar.xz) = 403e8f463552564333b1a4d2e0a52c28b27296d096737e55a2327642a7277af8
SIZE (KDE/Qt/5.13.2/qtandroidextras-everywhere-src-5.13.2.tar.xz) = 105628
SHA256 (KDE/Qt/5.13.2/qtbase-everywhere-src-5.13.2.tar.xz) = 26b6b686d66a7ad28eaca349e55e2894e5a735f3831e45f2049e93b1daa92121
SIZE (KDE/Qt/5.13.2/qtbase-everywhere-src-5.13.2.tar.xz) = 48735704
SHA256 (KDE/Qt/5.13.2/qtcharts-everywhere-src-5.13.2.tar.xz) = 3bad81c3cfb32cf72fb0ce2ac2794d031cf78a3902b4715f89c09b2d0e041e87
SIZE (KDE/Qt/5.13.2/qtcharts-everywhere-src-5.13.2.tar.xz) = 4244092
SHA256 (KDE/Qt/5.13.2/qtconnectivity-everywhere-src-5.13.2.tar.xz) = 644e234eb64f602ef5cdeb8802ef9b58e75478f1124f001937275d62ed692e17
SIZE (KDE/Qt/5.13.2/qtconnectivity-everywhere-src-5.13.2.tar.xz) = 2777504
SHA256 (KDE/Qt/5.13.2/qtdatavis3d-everywhere-src-5.13.2.tar.xz) = ecf934c3eb07173505781734f95cfc2cf9d89e6b1b98516ac98a137797f4ef28
SIZE (KDE/Qt/5.13.2/qtdatavis3d-everywhere-src-5.13.2.tar.xz) = 5182216
SHA256 (KDE/Qt/5.13.2/qtdeclarative-everywhere-src-5.13.2.tar.xz) = d9a524f45fe9e136cda2252f9d7013ec17046d907e3f39606db920987c22d1fd
SIZE (KDE/Qt/5.13.2/qtdeclarative-everywhere-src-5.13.2.tar.xz) = 20940748
SHA256 (KDE/Qt/5.13.2/qtdoc-everywhere-src-5.13.2.tar.xz) = be09543143d5dca984d2c2d9085751317e7a95b78fdbe9b6a30f2faa03543e46
SIZE (KDE/Qt/5.13.2/qtdoc-everywhere-src-5.13.2.tar.xz) = 5747084
SHA256 (KDE/Qt/5.13.2/qtgamepad-everywhere-src-5.13.2.tar.xz) = 75164885433e36a90b557aa7f319ff3d6278c3616469f67b42dda6eb8b92e76e
SIZE (KDE/Qt/5.13.2/qtgamepad-everywhere-src-5.13.2.tar.xz) = 386668
SHA256 (KDE/Qt/5.13.2/qtgraphicaleffects-everywhere-src-5.13.2.tar.xz) = 297a89bb6c771f849c4ce866e5c98dadf665163b3dab03bc48a58f51424e7e66
SIZE (KDE/Qt/5.13.2/qtgraphicaleffects-everywhere-src-5.13.2.tar.xz) = 14845928
SHA256 (KDE/Qt/5.13.2/qtimageformats-everywhere-src-5.13.2.tar.xz) = 6968649fdccc7d633cf9ada25f1bdaf0a2fb45a214d58c2c47896166d4553ac0
SIZE (KDE/Qt/5.13.2/qtimageformats-everywhere-src-5.13.2.tar.xz) = 1803796
SHA256 (KDE/Qt/5.13.2/qtlocation-everywhere-src-5.13.2.tar.xz) = 5fe4b824d3dc6c800682ff986333ec09edb9c27582066e928b1862b4d58212e3
SIZE (KDE/Qt/5.13.2/qtlocation-everywhere-src-5.13.2.tar.xz) = 6050044
SHA256 (KDE/Qt/5.13.2/qtlottie-everywhere-src-5.13.2.tar.xz) = af9a10aaa110767ffd88e02cb8ad0a3930ccfeb61f0c125afbf3791136d36253
SIZE (KDE/Qt/5.13.2/qtlottie-everywhere-src-5.13.2.tar.xz) = 82052
SHA256 (KDE/Qt/5.13.2/qtmacextras-everywhere-src-5.13.2.tar.xz) = 545ede0783ebc2405c6efa6ed0b2b7147a1d7e60eb7fcb853abfca0a9cb65ed5
SIZE (KDE/Qt/5.13.2/qtmacextras-everywhere-src-5.13.2.tar.xz) = 69164
SHA256 (KDE/Qt/5.13.2/qtmultimedia-everywhere-src-5.13.2.tar.xz) = 5f885459d46ea2f2bb24597678befd4913d8f88029730d01984f51f9c367b9f4
SIZE (KDE/Qt/5.13.2/qtmultimedia-everywhere-src-5.13.2.tar.xz) = 3820660
SHA256 (KDE/Qt/5.13.2/qtnetworkauth-everywhere-src-5.13.2.tar.xz) = 6326943e5c1a3e6eac8dcc44d088f1a3d1c45d14100ff1e95f833b0463243af3
SIZE (KDE/Qt/5.13.2/qtnetworkauth-everywhere-src-5.13.2.tar.xz) = 141172
SHA256 (KDE/Qt/5.13.2/qtpurchasing-everywhere-src-5.13.2.tar.xz) = e9ef800b7d79f660c72f7024f82a2915b1111b47417f93c3dc2354b9bf307ff4
SIZE (KDE/Qt/5.13.2/qtpurchasing-everywhere-src-5.13.2.tar.xz) = 208096
SHA256 (KDE/Qt/5.13.2/qtquickcontrols-everywhere-src-5.13.2.tar.xz) = d6e64d8db13ada55fcb0d5e8ca26097085680087d931435c6c6db859d87493ea
SIZE (KDE/Qt/5.13.2/qtquickcontrols-everywhere-src-5.13.2.tar.xz) = 5955448
SHA256 (KDE/Qt/5.13.2/qtquickcontrols2-everywhere-src-5.13.2.tar.xz) = 90ee8be7b66cc65f3f22e71a0b35adab5c169ac4f8ebc6f9e7685228bf8a7d70
SIZE (KDE/Qt/5.13.2/qtquickcontrols2-everywhere-src-5.13.2.tar.xz) = 9252912
SHA256 (KDE/Qt/5.13.2/qtremoteobjects-everywhere-src-5.13.2.tar.xz) = bd24db9d2bb08ae7955291af52ee7510aa193d0f72ed0e3ff74f7cf7e81f4d65
SIZE (KDE/Qt/5.13.2/qtremoteobjects-everywhere-src-5.13.2.tar.xz) = 367032
SHA256 (KDE/Qt/5.13.2/qtscript-everywhere-src-5.13.2.tar.xz) = 3d92691c25577fbf7511d40253de0cd9d31444ea5a0aa860f65efb9fa0f3ce70
SIZE (KDE/Qt/5.13.2/qtscript-everywhere-src-5.13.2.tar.xz) = 2696452
SHA256 (KDE/Qt/5.13.2/qtscxml-everywhere-src-5.13.2.tar.xz) = e489dff21e18c1e7f72ffd31af82404f845bd90824c6b978140591366398a9d9
SIZE (KDE/Qt/5.13.2/qtscxml-everywhere-src-5.13.2.tar.xz) = 435428
SHA256 (KDE/Qt/5.13.2/qtsensors-everywhere-src-5.13.2.tar.xz) = 46f73bbfddfd78a419c6424d6839318774b84c955a7f7a96c12c590f6d8fb177
SIZE (KDE/Qt/5.13.2/qtsensors-everywhere-src-5.13.2.tar.xz) = 2046708
SHA256 (KDE/Qt/5.13.2/qtserialbus-everywhere-src-5.13.2.tar.xz) = 48159393b1368976b5324eac48424e2a6e5d63c783194d0576a978151f882da3
SIZE (KDE/Qt/5.13.2/qtserialbus-everywhere-src-5.13.2.tar.xz) = 338428
SHA256 (KDE/Qt/5.13.2/qtserialport-everywhere-src-5.13.2.tar.xz) = 7677ffc1dce3b75c0a98d07d215588a8dccb5c276c55b4ecd60c35ed1c89cb34
SIZE (KDE/Qt/5.13.2/qtserialport-everywhere-src-5.13.2.tar.xz) = 310736
SHA256 (KDE/Qt/5.13.2/qtspeech-everywhere-src-5.13.2.tar.xz) = a0aca08feeac6925ead7f841319bdcfd60bfc126de07807edaf267c2ca8d13d5
SIZE (KDE/Qt/5.13.2/qtspeech-everywhere-src-5.13.2.tar.xz) = 100312
SHA256 (KDE/Qt/5.13.2/qtsvg-everywhere-src-5.13.2.tar.xz) = 849e2e357e1333b64ecb728352f652cd8d916f029ed848f775b15d0b500cb7d7
SIZE (KDE/Qt/5.13.2/qtsvg-everywhere-src-5.13.2.tar.xz) = 1890380
SHA256 (KDE/Qt/5.13.2/qttools-everywhere-src-5.13.2.tar.xz) = 919a2713b6d2d7873a09ad85bd93cf4282606e5bf84d5884250f665a253ec06e
SIZE (KDE/Qt/5.13.2/qttools-everywhere-src-5.13.2.tar.xz) = 9110256
SHA256 (KDE/Qt/5.13.2/qttranslations-everywhere-src-5.13.2.tar.xz) = 25755941a2525de2d7ae48e0011d04db7cc09e4e73fe83293206ceafa0aa82d9
SIZE (KDE/Qt/5.13.2/qttranslations-everywhere-src-5.13.2.tar.xz) = 1365880
SHA256 (KDE/Qt/5.13.2/qtvirtualkeyboard-everywhere-src-5.13.2.tar.xz) = 8e368dde237d21666f6cc8512a060e205388e519a4d7559c0505cc75224ed62b
SIZE (KDE/Qt/5.13.2/qtvirtualkeyboard-everywhere-src-5.13.2.tar.xz) = 10923292
SHA256 (KDE/Qt/5.13.2/qtwayland-everywhere-src-5.13.2.tar.xz) = 3c9b2358d9cee02552b875db93b56f3b9bc3b0f4df7a2ff7e8b72f2a8f2ca952
SIZE (KDE/Qt/5.13.2/qtwayland-everywhere-src-5.13.2.tar.xz) = 495536
SHA256 (KDE/Qt/5.13.2/qtwebchannel-everywhere-src-5.13.2.tar.xz) = f452d419d8b19b566835f316bbf282dabc8b1c2a74c9c98c1aec4184465e9c13
SIZE (KDE/Qt/5.13.2/qtwebchannel-everywhere-src-5.13.2.tar.xz) = 192652
SHA256 (KDE/Qt/5.13.2/qtwebengine-everywhere-src-5.13.2.tar.xz) = adcf56b5de6f34744bba2307b696fc75611884f4270e87dfa760d6e99dd711bb
SIZE (KDE/Qt/5.13.2/qtwebengine-everywhere-src-5.13.2.tar.xz) = 255593964
SHA256 (KDE/Qt/5.13.2/qtwebglplugin-everywhere-src-5.13.2.tar.xz) = ae369929d5a3356391bccd25cac22846dc44cbb726ce7b60924f53944addabb7
SIZE (KDE/Qt/5.13.2/qtwebglplugin-everywhere-src-5.13.2.tar.xz) = 73608
SHA256 (KDE/Qt/5.13.2/qtwebsockets-everywhere-src-5.13.2.tar.xz) = fc11236c8bf69b27a4e237a27b9ea27fc90d8c25d81d1d451ce3a0b63cbc02d3
SIZE (KDE/Qt/5.13.2/qtwebsockets-everywhere-src-5.13.2.tar.xz) = 244668
SHA256 (KDE/Qt/5.13.2/qtwebview-everywhere-src-5.13.2.tar.xz) = 394cc7a9cb29b7883816ff3137b022f30568151aada0739fc99a23789c21c015
SIZE (KDE/Qt/5.13.2/qtwebview-everywhere-src-5.13.2.tar.xz) = 131168
SHA256 (KDE/Qt/5.13.2/qtwinextras-everywhere-src-5.13.2.tar.xz) = e94d70f68dacbcfa2bb0cbe53c7024083b16d5d44806c107fe268d34028cb779
SIZE (KDE/Qt/5.13.2/qtwinextras-everywhere-src-5.13.2.tar.xz) = 760204
SHA256 (KDE/Qt/5.13.2/qtx11extras-everywhere-src-5.13.2.tar.xz) = 95a7c5c30f42e9575c3a17a2c0eb0cdbdd2d89dbcb3ee1426cd41bb07e28c51c
SIZE (KDE/Qt/5.13.2/qtx11extras-everywhere-src-5.13.2.tar.xz) = 127228
SHA256 (KDE/Qt/5.13.2/qtxmlpatterns-everywhere-src-5.13.2.tar.xz) = 1e87d8c004ec0beea3b29d13f0964c563aa9fae51c392c998750ca4e386374e2
SIZE (KDE/Qt/5.13.2/qtxmlpatterns-everywhere-src-5.13.2.tar.xz) = 1392192
TIMESTAMP = 1586029185
SHA256 (KDE/Qt/5.14.2/qt3d-everywhere-src-5.14.2.tar.xz) = 9da82f1cc4b7d416d31ec96224c59d221473a48f6e579eef978f7d2e3932c674
SIZE (KDE/Qt/5.14.2/qt3d-everywhere-src-5.14.2.tar.xz) = 81576496
SHA256 (KDE/Qt/5.14.2/qtactiveqt-everywhere-src-5.14.2.tar.xz) = b53517d5d128719773a2941ba52da10acd7aa3149948862bc08c98f5b64152a9
SIZE (KDE/Qt/5.14.2/qtactiveqt-everywhere-src-5.14.2.tar.xz) = 265976
SHA256 (KDE/Qt/5.14.2/qtandroidextras-everywhere-src-5.14.2.tar.xz) = 4a8fd92b5c49a663cf0bd492804eaf1574d11137e2cbdd41d6bf5fad0c3c4d76
SIZE (KDE/Qt/5.14.2/qtandroidextras-everywhere-src-5.14.2.tar.xz) = 105844
SHA256 (KDE/Qt/5.14.2/qtbase-everywhere-src-5.14.2.tar.xz) = 48b9e79220941665a9dd827548c6428f7aa3052ccba8f4f7e039a94aa1d2b28a
SIZE (KDE/Qt/5.14.2/qtbase-everywhere-src-5.14.2.tar.xz) = 49865752
SHA256 (KDE/Qt/5.14.2/qtcharts-everywhere-src-5.14.2.tar.xz) = adb25203ea748d886cc3d8993c20def702115eccea311594592058134ba83bb7
SIZE (KDE/Qt/5.14.2/qtcharts-everywhere-src-5.14.2.tar.xz) = 4250508
SHA256 (KDE/Qt/5.14.2/qtconnectivity-everywhere-src-5.14.2.tar.xz) = abe67b3e3a775e2a2e27c62a5391f37007ffbe72bce58b96116995616cfcbc28
SIZE (KDE/Qt/5.14.2/qtconnectivity-everywhere-src-5.14.2.tar.xz) = 2804940
SHA256 (KDE/Qt/5.14.2/qtdatavis3d-everywhere-src-5.14.2.tar.xz) = 723c03db2d2805b1be4ca534ac7bc867a1a21894d33a7e9261a382f3fa9d0e20
SIZE (KDE/Qt/5.14.2/qtdatavis3d-everywhere-src-5.14.2.tar.xz) = 5190800
SHA256 (KDE/Qt/5.14.2/qtdeclarative-everywhere-src-5.14.2.tar.xz) = a3c4617adc9760347c93d2eb6c25d22f620cd22f44afa0494eb499a805831650
SIZE (KDE/Qt/5.14.2/qtdeclarative-everywhere-src-5.14.2.tar.xz) = 21305980
SHA256 (KDE/Qt/5.14.2/qtdoc-everywhere-src-5.14.2.tar.xz) = 5a55cdb55af35eb222d06179567851c175f24a3732f7dee5be073df4a893172b
SIZE (KDE/Qt/5.14.2/qtdoc-everywhere-src-5.14.2.tar.xz) = 5736088
SHA256 (KDE/Qt/5.14.2/qtgamepad-everywhere-src-5.14.2.tar.xz) = f77daadb4755cf760e11812264259fb103396fd1b06df1e06b5df162081c8d03
SIZE (KDE/Qt/5.14.2/qtgamepad-everywhere-src-5.14.2.tar.xz) = 386940
SHA256 (KDE/Qt/5.14.2/qtgraphicaleffects-everywhere-src-5.14.2.tar.xz) = 487a7f858244a08264363733055a8cf8b00e77c658c5608cc462817d15e4b50f
SIZE (KDE/Qt/5.14.2/qtgraphicaleffects-everywhere-src-5.14.2.tar.xz) = 14040880
SHA256 (KDE/Qt/5.14.2/qtimageformats-everywhere-src-5.14.2.tar.xz) = 733eca0165c15e046b106039c989dac7f6bc2ecf215396d965ed065369264f8c
SIZE (KDE/Qt/5.14.2/qtimageformats-everywhere-src-5.14.2.tar.xz) = 1805208
SHA256 (KDE/Qt/5.14.2/qtlocation-everywhere-src-5.14.2.tar.xz) = c37708bc396f6dac397b49a6a268d5edb39e1c8296ca2337ce9e80bde04775cc
SIZE (KDE/Qt/5.14.2/qtlocation-everywhere-src-5.14.2.tar.xz) = 6120852
SHA256 (KDE/Qt/5.14.2/qtlottie-everywhere-src-5.14.2.tar.xz) = 55d1392dc92cbec11263084360075dc5fc3fdc25c1969adfbdec84299b285978
SIZE (KDE/Qt/5.14.2/qtlottie-everywhere-src-5.14.2.tar.xz) = 82572
SHA256 (KDE/Qt/5.14.2/qtmacextras-everywhere-src-5.14.2.tar.xz) = d12587b46c84a7822194fc3ccf46f7c18ff3b31566d3dde4f5fe772f1d8776e5
SIZE (KDE/Qt/5.14.2/qtmacextras-everywhere-src-5.14.2.tar.xz) = 69360
SHA256 (KDE/Qt/5.14.2/qtmultimedia-everywhere-src-5.14.2.tar.xz) = 7acd8ede6835314206e407b35b668f0add67544577fb51fe67afb03137fb9fe9
SIZE (KDE/Qt/5.14.2/qtmultimedia-everywhere-src-5.14.2.tar.xz) = 3793964
SHA256 (KDE/Qt/5.14.2/qtnetworkauth-everywhere-src-5.14.2.tar.xz) = 4f00513dd18598487d02187b80b54c669662cf8a8f2573858c7f9282d7b9265e
SIZE (KDE/Qt/5.14.2/qtnetworkauth-everywhere-src-5.14.2.tar.xz) = 141424
SHA256 (KDE/Qt/5.14.2/qtpurchasing-everywhere-src-5.14.2.tar.xz) = 69b087001e8fcec5bb49ca333d5f44e6b7eb09f76421dc792fc9cd76dee9e851
SIZE (KDE/Qt/5.14.2/qtpurchasing-everywhere-src-5.14.2.tar.xz) = 208664
SHA256 (KDE/Qt/5.14.2/qtquickcontrols-everywhere-src-5.14.2.tar.xz) = d55def1dd4ee1250bd6a4e76849f4e362368b6411c2216d5f669c761216d4461
SIZE (KDE/Qt/5.14.2/qtquickcontrols-everywhere-src-5.14.2.tar.xz) = 5981560
SHA256 (KDE/Qt/5.14.2/qtquickcontrols2-everywhere-src-5.14.2.tar.xz) = faf7d349d8f4a8db36cd3c62a5724bcf689300f2fdb7dc1ea034392aab981560
SIZE (KDE/Qt/5.14.2/qtquickcontrols2-everywhere-src-5.14.2.tar.xz) = 8153752
SHA256 (KDE/Qt/5.14.2/qtremoteobjects-everywhere-src-5.14.2.tar.xz) = a6a601c4f4aab6fe41a462dae57033819f697e3317240a382cee45c08be614d6
SIZE (KDE/Qt/5.14.2/qtremoteobjects-everywhere-src-5.14.2.tar.xz) = 376740
SHA256 (KDE/Qt/5.14.2/qtscript-everywhere-src-5.14.2.tar.xz) = e9fd487ccb3cbf00e86b0b803aa79e9f6bbe7a337b8e97d069e040c3e0789bfe
SIZE (KDE/Qt/5.14.2/qtscript-everywhere-src-5.14.2.tar.xz) = 2654528
SHA256 (KDE/Qt/5.14.2/qtscxml-everywhere-src-5.14.2.tar.xz) = 030cea352a56074f577200f967ef37c959b2767127de61f766f59b0d99763790
SIZE (KDE/Qt/5.14.2/qtscxml-everywhere-src-5.14.2.tar.xz) = 433268
SHA256 (KDE/Qt/5.14.2/qtsensors-everywhere-src-5.14.2.tar.xz) = bccfca6910b0383d8f65823496ff5011abed2fa8fd446b4b27333d0fd7bb8c61
SIZE (KDE/Qt/5.14.2/qtsensors-everywhere-src-5.14.2.tar.xz) = 2050616
SHA256 (KDE/Qt/5.14.2/qtserialbus-everywhere-src-5.14.2.tar.xz) = 0b7762175a649a40c4dd619c5de61d772235dc86099343278e2c3229d0836a91
SIZE (KDE/Qt/5.14.2/qtserialbus-everywhere-src-5.14.2.tar.xz) = 349808
SHA256 (KDE/Qt/5.14.2/qtserialport-everywhere-src-5.14.2.tar.xz) = a6d977dd723ad4d3368b5163691405b8852f809974a96ec54103494e834aea21
SIZE (KDE/Qt/5.14.2/qtserialport-everywhere-src-5.14.2.tar.xz) = 316492
SHA256 (KDE/Qt/5.14.2/qtspeech-everywhere-src-5.14.2.tar.xz) = 5e9e8ea62f0207ba894df1e136df0af9fc5443c7817d28c39f0ea2bbae9ec6da
SIZE (KDE/Qt/5.14.2/qtspeech-everywhere-src-5.14.2.tar.xz) = 101100
SHA256 (KDE/Qt/5.14.2/qtsvg-everywhere-src-5.14.2.tar.xz) = c7d7faa01a3e7a6e4d38fafcec5529a488258218749779e6fa0e09a21173b5a1
SIZE (KDE/Qt/5.14.2/qtsvg-everywhere-src-5.14.2.tar.xz) = 1880100
SHA256 (KDE/Qt/5.14.2/qttools-everywhere-src-5.14.2.tar.xz) = 5bb0cf7832b88eb6bc9d4289f98307eb14b16a453ad6cf42cca13c4fe1a053c5
SIZE (KDE/Qt/5.14.2/qttools-everywhere-src-5.14.2.tar.xz) = 8815020
SHA256 (KDE/Qt/5.14.2/qttranslations-everywhere-src-5.14.2.tar.xz) = 2088ebee9f5dd0336c9fd11436899a95b7ce0141ce072290de1e8f315d82d1a6
SIZE (KDE/Qt/5.14.2/qttranslations-everywhere-src-5.14.2.tar.xz) = 1348684
SHA256 (KDE/Qt/5.14.2/qtvirtualkeyboard-everywhere-src-5.14.2.tar.xz) = 364f3338563e617e7c964a37170b415b546c5f82965e781271f9dada3e3868d7
SIZE (KDE/Qt/5.14.2/qtvirtualkeyboard-everywhere-src-5.14.2.tar.xz) = 10957372
SHA256 (KDE/Qt/5.14.2/qtwayland-everywhere-src-5.14.2.tar.xz) = d31633ca718fb407cf70870613d45d0ed80aa04c058586ac3036bae1aff7832a
SIZE (KDE/Qt/5.14.2/qtwayland-everywhere-src-5.14.2.tar.xz) = 544532
SHA256 (KDE/Qt/5.14.2/qtwebchannel-everywhere-src-5.14.2.tar.xz) = 7d1dc8441523638c3d455c7d408ec65aebc073acab80e24063865f929231f874
SIZE (KDE/Qt/5.14.2/qtwebchannel-everywhere-src-5.14.2.tar.xz) = 202592
SHA256 (KDE/Qt/5.14.2/qtwebengine-everywhere-src-5.14.2.tar.xz) = e169d6a75d8c397e04f843bc1b9585950fb9a001255cd18d6293f66fa8a6c947
SIZE (KDE/Qt/5.14.2/qtwebengine-everywhere-src-5.14.2.tar.xz) = 242467568
SHA256 (KDE/Qt/5.14.2/qtwebglplugin-everywhere-src-5.14.2.tar.xz) = eb4118910b65d03d8448658ac1646e860d337e59b82d6575beda21824e313417
SIZE (KDE/Qt/5.14.2/qtwebglplugin-everywhere-src-5.14.2.tar.xz) = 74140
SHA256 (KDE/Qt/5.14.2/qtwebsockets-everywhere-src-5.14.2.tar.xz) = f06e62b18313fe1b40a35566e79645de4a8e7ac9f7717d1d98a06c5b49afca84
SIZE (KDE/Qt/5.14.2/qtwebsockets-everywhere-src-5.14.2.tar.xz) = 252820
SHA256 (KDE/Qt/5.14.2/qtwebview-everywhere-src-5.14.2.tar.xz) = c61f9213ee84fd7408898c0194468208ffb51af9d257e87e6b53daf24f65ff4b
SIZE (KDE/Qt/5.14.2/qtwebview-everywhere-src-5.14.2.tar.xz) = 132840
SHA256 (KDE/Qt/5.14.2/qtwinextras-everywhere-src-5.14.2.tar.xz) = 980f1bc31b37c8597c0bac55f69ecf00d1677218ce82f7bc3933236cb6d907f2
SIZE (KDE/Qt/5.14.2/qtwinextras-everywhere-src-5.14.2.tar.xz) = 763632
SHA256 (KDE/Qt/5.14.2/qtx11extras-everywhere-src-5.14.2.tar.xz) = be9a84a03a2ee81771215264e5dff7a996d04be6192b8cdaa1d41e319a81545a
SIZE (KDE/Qt/5.14.2/qtx11extras-everywhere-src-5.14.2.tar.xz) = 135712
SHA256 (KDE/Qt/5.14.2/qtxmlpatterns-everywhere-src-5.14.2.tar.xz) = 219a876665345e3801baff71f31f30f5495c1cb9ab23fbbd27602632c80fcfb7
SIZE (KDE/Qt/5.14.2/qtxmlpatterns-everywhere-src-5.14.2.tar.xz) = 1404028

View file

@ -11,10 +11,9 @@ We chose the third option. To patch qmake's internal cmake generation function
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 2017-06-28 11:54:29.000000000 +0200
+++ mkspecs/features/create_cmake.prf 2017-07-14 15:04:51.254262000 +0200
@@ -48,7 +48,7 @@
--- 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 @@
}
CMAKE_INCLUDE_DIR = $$cmakeRelativePath($$[QT_INSTALL_HEADERS], $$[QT_INSTALL_PREFIX])
@ -23,8 +22,6 @@ in /usr/local/lib/cmake -- as this seemed to be the least intrusive method.
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,"^\\.\\./.*") {
@ -32,7 +29,7 @@ in /usr/local/lib/cmake -- as this seemed to be the least intrusive method.
CMAKE_LIB_DIR = $$[QT_INSTALL_LIBS]/
CMAKE_LIB_DIR_IS_ABSOLUTE = True
} else {
@@ -67,13 +67,13 @@
@@ -95,13 +95,13 @@
}
CMAKE_BIN_DIR = $$cmakeRelativePath($$[QT_HOST_BINS], $$[QT_INSTALL_PREFIX])
@ -48,16 +45,16 @@ in /usr/local/lib/cmake -- as this seemed to be the least intrusive method.
CMAKE_PLUGIN_DIR = $$[QT_INSTALL_PLUGINS]/
CMAKE_PLUGIN_DIR_IS_ABSOLUTE = True
}
@@ -167,7 +167,7 @@
cmake_target_file
@@ -259,7 +259,7 @@
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()
@@ -314,7 +314,7 @@
@@ -406,7 +406,7 @@
cmake_qt5_module_files.files += $$cmake_macros_file.output
}

View file

@ -10,6 +10,8 @@ COMMENT= Colour Management System (CMS)
LICENSE= BSD3CLAUSE
BROKEN= Does not build with Qt5-5.14
RUN_DEPENDS= ${LOCALBASE}/share/color/icc/OpenICC/sRGB.icc:graphics/icc-profiles-openicc \
${LOCALBASE}/share/color/icc/basICColor/ISOcoated_v2_300_bas.ICC:graphics/icc-profiles-basiccolor \
xcalib:x11/xcalib

View file

@ -2,7 +2,6 @@
PORTNAME= 3d
DISTVERSION= ${QT5_VERSION}
PORTREVISION= 2
CATEGORIES= graphics
PKGNAMEPREFIX= qt5-

View file

@ -1,3 +1,4 @@
%%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
@ -145,9 +146,7 @@
%%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
@ -190,7 +189,6 @@
%%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
@ -440,6 +438,7 @@
%%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
@ -642,13 +641,13 @@
%%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
@ -680,7 +679,6 @@
%%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
@ -699,12 +697,12 @@
%%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
@ -726,7 +724,6 @@
%%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
@ -742,6 +739,7 @@
%%QT_INCDIR%%/Qt3DRender/%%FULLVER%%/Qt3DRender/private/graphicshelpergl4_p.h
%%QT_INCDIR%%/Qt3DRender/%%FULLVER%%/Qt3DRender/private/graphicshelperinterface_p.h
%%QT_INCDIR%%/Qt3DRender/%%FULLVER%%/Qt3DRender/private/handle_types_p.h
%%QT_INCDIR%%/Qt3DRender/%%FULLVER%%/Qt3DRender/private/imagesubmissioncontext_p.h
%%QT_INCDIR%%/Qt3DRender/%%FULLVER%%/Qt3DRender/private/job_common_p.h
%%QT_INCDIR%%/Qt3DRender/%%FULLVER%%/Qt3DRender/private/joint_p.h
%%QT_INCDIR%%/Qt3DRender/%%FULLVER%%/Qt3DRender/private/layer_p.h
@ -754,7 +752,6 @@
%%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
@ -762,6 +759,7 @@
%%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
@ -797,6 +795,7 @@
%%QT_INCDIR%%/Qt3DRender/%%FULLVER%%/Qt3DRender/private/qcolormask_p.h
%%QT_INCDIR%%/Qt3DRender/%%FULLVER%%/Qt3DRender/private/qcomputecommand_p.h
%%QT_INCDIR%%/Qt3DRender/%%FULLVER%%/Qt3DRender/private/qcullface_p.h
%%QT_INCDIR%%/Qt3DRender/%%FULLVER%%/Qt3DRender/private/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
@ -815,6 +814,7 @@
%%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
@ -824,10 +824,12 @@
%%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
@ -855,6 +857,7 @@
%%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
@ -864,11 +867,13 @@
%%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
@ -896,7 +901,8 @@
%%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/renderviewbuilderjob_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
@ -910,6 +916,7 @@
%%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
@ -921,11 +928,11 @@
%%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
@ -933,7 +940,6 @@
%%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
@ -974,6 +980,7 @@
%%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
@ -1004,6 +1011,7 @@
%%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
@ -1020,6 +1028,7 @@
%%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
@ -1040,6 +1049,7 @@
%%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
@ -1049,11 +1059,13 @@
%%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
@ -1089,6 +1101,7 @@
%%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
@ -1116,6 +1129,7 @@
%%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
@ -1128,6 +1142,7 @@
%%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
@ -1147,6 +1162,7 @@
%%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
@ -1156,6 +1172,7 @@
%%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
@ -1163,6 +1180,7 @@
%%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

View file

@ -2,7 +2,6 @@
PORTNAME= imageformats
DISTVERSION= ${QT5_VERSION}
PORTREVISION= 1
CATEGORIES= graphics
PKGNAMEPREFIX= qt5-

View file

@ -2,7 +2,6 @@
PORTNAME= pixeltool
DISTVERSION= ${QT5_VERSION}
PORTREVISION= 1
CATEGORIES= graphics
PKGNAMEPREFIX= qt5-

View file

@ -19,10 +19,10 @@
%%QT_INCDIR%%/QtSvg/qsvgwidget.h
%%QT_INCDIR%%/QtSvg/qtsvgglobal.h
%%QT_INCDIR%%/QtSvg/qtsvgversion.h
%%QT_CMAKEDIR%%/Qt5Gui/Qt5Gui_QSvgIconPlugin.cmake
%%QT_CMAKEDIR%%/Qt5Gui/Qt5Gui_QSvgPlugin.cmake
%%QT_CMAKEDIR%%/Qt5Svg/Qt5SvgConfig.cmake
%%QT_CMAKEDIR%%/Qt5Svg/Qt5SvgConfigVersion.cmake
%%QT_CMAKEDIR%%/Qt5Svg/Qt5Svg_QSvgIconPlugin.cmake
%%QT_CMAKEDIR%%/Qt5Svg/Qt5Svg_QSvgPlugin.cmake
%%QT_LIBDIR%%/libQt5Svg.prl
%%QT_LIBDIR%%/libQt5Svg.so
%%QT_LIBDIR%%/libQt5Svg.so.5

View file

@ -2,7 +2,6 @@
PORTNAME= wayland
DISTVERSION= ${QT5_VERSION}
PORTREVISION= 1
CATEGORIES= graphics
PKGNAMEPREFIX= qt5-

View file

@ -8,6 +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
@ -34,6 +35,7 @@
%%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
@ -47,6 +49,7 @@
%%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
@ -58,6 +61,7 @@
%%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
@ -72,8 +76,10 @@
%%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
@ -82,12 +88,14 @@
%%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
@ -114,6 +122,7 @@
%%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
@ -141,8 +150,10 @@
%%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
@ -151,6 +162,7 @@
%%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
@ -161,6 +173,7 @@
%%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
@ -175,8 +188,10 @@
%%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
@ -195,6 +210,8 @@
%%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
@ -219,6 +236,7 @@
%%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
@ -233,8 +251,10 @@
%%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
@ -249,6 +269,7 @@
%%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
@ -271,6 +292,7 @@
%%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
@ -281,6 +303,7 @@
%%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
@ -316,6 +339,8 @@
%%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
@ -330,6 +355,8 @@
%%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
@ -348,11 +375,17 @@
%%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
%%DEBUG%%%%QT_QMLDIR%%/QtWayland/Compositor/plugins.qmltypes
%%DEBUG%%%%QT_QMLDIR%%/QtWayland/Compositor/qmldir
%%QT_QMLDIR%%/QtWayland/Compositor/plugins.qmltypes
%%QT_QMLDIR%%/QtWayland/Compositor/qmldir
libdata/pkgconfig/Qt5WaylandClient.pc
libdata/pkgconfig/Qt5WaylandCompositor.pc

View file

@ -13,6 +13,8 @@ COMMENT= Keyboard-oriented desktop scientific calculator
LICENSE= GPLv2+
BROKEN= Does not build with Qt5-5.14
BB_ACCOUNT= heldercorreia
BB_PROJECT= ${PORTNAME}
BB_COMMIT= c0fc9c68d292

View file

@ -1,3 +1,3 @@
TIMESTAMP = 1572555131
SHA256 (KDE/Qt/5.13.2/qt-everywhere-src-5.13.2.tar.xz) = 55e8273536be41f4f63064a79e552a22133848bb419400b6fa8e9fc0dc05de08
SIZE (KDE/Qt/5.13.2/qt-everywhere-src-5.13.2.tar.xz) = 500830260
TIMESTAMP = 1586029328
SHA256 (KDE/Qt/5.14.2/qt-everywhere-src-5.14.2.tar.xz) = c6fcd53c744df89e7d3223c02838a33309bd1c291fcb6f9341505fe99f7f19fa
SIZE (KDE/Qt/5.14.2/qt-everywhere-src-5.14.2.tar.xz) = 549205340

View file

@ -1830,6 +1830,11 @@
%%QT_EXAMPLEDIR%%/multimedia/spectrum/doc/src/spectrum.qdoc
%%QT_EXAMPLEDIR%%/multimedia/spectrum/spectrum.pri
%%QT_EXAMPLEDIR%%/multimedia/spectrum/spectrum.pro
%%QT_EXAMPLEDIR%%/multimedia/video/android/android.pro
%%QT_EXAMPLEDIR%%/multimedia/video/android/gstreamer/gstreamer.pro
%%QT_EXAMPLEDIR%%/multimedia/video/android/gstreamer/main.cpp
%%QT_EXAMPLEDIR%%/multimedia/video/android/gstreamer/main.qml
%%QT_EXAMPLEDIR%%/multimedia/video/android/gstreamer/qml.qrc
%%QT_EXAMPLEDIR%%/multimedia/video/doc/images/qmlvideo-menu.jpg
%%QT_EXAMPLEDIR%%/multimedia/video/doc/images/qmlvideo-overlay.jpg
%%QT_EXAMPLEDIR%%/multimedia/video/doc/images/qmlvideofx-camera-glow.jpg
@ -2890,6 +2895,12 @@
%%QT_EXAMPLEDIR%%/qt3d/controls/controls.qrc
%%QT_EXAMPLEDIR%%/qt3d/controls/main.cpp
%%QT_EXAMPLEDIR%%/qt3d/controls/main.qml
%%QT_EXAMPLEDIR%%/qt3d/controlsunderlay/Logo.qml
%%QT_EXAMPLEDIR%%/qt3d/controlsunderlay/Qt_logo.obj
%%QT_EXAMPLEDIR%%/qt3d/controlsunderlay/controls.qrc
%%QT_EXAMPLEDIR%%/qt3d/controlsunderlay/controlsunderlay.pro
%%QT_EXAMPLEDIR%%/qt3d/controlsunderlay/main.cpp
%%QT_EXAMPLEDIR%%/qt3d/controlsunderlay/main.qml
%%QT_EXAMPLEDIR%%/qt3d/exampleresources/assets/LICENSE
%%QT_EXAMPLEDIR%%/qt3d/exampleresources/assets/cubemaps/default/default_irradiance.dds
%%QT_EXAMPLEDIR%%/qt3d/exampleresources/assets/cubemaps/default/default_specular.dds
@ -3153,6 +3164,13 @@
%%QT_EXAMPLEDIR%%/qt3d/scene3d/main.qml
%%QT_EXAMPLEDIR%%/qt3d/scene3d/scene3d.pro
%%QT_EXAMPLEDIR%%/qt3d/scene3d/scene3d.qrc
%%QT_EXAMPLEDIR%%/qt3d/scene3dview/AnimatedEntity.qml
%%QT_EXAMPLEDIR%%/qt3d/scene3dview/doc/images/scene3dview.png
%%QT_EXAMPLEDIR%%/qt3d/scene3dview/doc/src/scene3dview.qdoc
%%QT_EXAMPLEDIR%%/qt3d/scene3dview/main.cpp
%%QT_EXAMPLEDIR%%/qt3d/scene3dview/main.qml
%%QT_EXAMPLEDIR%%/qt3d/scene3dview/scene3dview.pro
%%QT_EXAMPLEDIR%%/qt3d/scene3dview/scene3dview.qrc
%%QT_EXAMPLEDIR%%/qt3d/shadow-map-qml/AdsEffect.qml
%%QT_EXAMPLEDIR%%/qt3d/shadow-map-qml/AdsMaterial.qml
%%QT_EXAMPLEDIR%%/qt3d/shadow-map-qml/GroundPlane.qml
@ -3432,17 +3450,20 @@
%%QT_EXAMPLEDIR%%/quick/imageelements/content/colors-round.sci
%%QT_EXAMPLEDIR%%/quick/imageelements/content/colors-stretch.sci
%%QT_EXAMPLEDIR%%/quick/imageelements/content/colors.png
%%QT_EXAMPLEDIR%%/quick/imageelements/content/multi.ico
%%QT_EXAMPLEDIR%%/quick/imageelements/content/qt-logo.png
%%QT_EXAMPLEDIR%%/quick/imageelements/content/shadow.png
%%QT_EXAMPLEDIR%%/quick/imageelements/content/speaker.png
%%QT_EXAMPLEDIR%%/quick/imageelements/doc/images/qml-imageelements-example.png
%%QT_EXAMPLEDIR%%/quick/imageelements/doc/src/imageelements.qdoc
%%QT_EXAMPLEDIR%%/quick/imageelements/framestepping.qml
%%QT_EXAMPLEDIR%%/quick/imageelements/image.qml
%%QT_EXAMPLEDIR%%/quick/imageelements/imageelements.pro
%%QT_EXAMPLEDIR%%/quick/imageelements/imageelements.qml
%%QT_EXAMPLEDIR%%/quick/imageelements/imageelements.qmlproject
%%QT_EXAMPLEDIR%%/quick/imageelements/imageelements.qrc
%%QT_EXAMPLEDIR%%/quick/imageelements/main.cpp
%%QT_EXAMPLEDIR%%/quick/imageelements/multiframeborderimage.qml
%%QT_EXAMPLEDIR%%/quick/imageelements/shadows.qml
%%QT_EXAMPLEDIR%%/quick/imageelements/spritesequence.qml
%%QT_EXAMPLEDIR%%/quick/imageprovider/ImageProviderCore/qmldir
@ -3704,6 +3725,24 @@
%%QT_EXAMPLEDIR%%/quick/scenegraph/customgeometry/doc/src/customgeometry.qdoc
%%QT_EXAMPLEDIR%%/quick/scenegraph/customgeometry/main.cpp
%%QT_EXAMPLEDIR%%/quick/scenegraph/customgeometry/main.qml
%%QT_EXAMPLEDIR%%/quick/scenegraph/d3d11underqml/d3d11squircle.cpp
%%QT_EXAMPLEDIR%%/quick/scenegraph/d3d11underqml/d3d11squircle.h
%%QT_EXAMPLEDIR%%/quick/scenegraph/d3d11underqml/d3d11underqml.pro
%%QT_EXAMPLEDIR%%/quick/scenegraph/d3d11underqml/d3d11underqml.qrc
%%QT_EXAMPLEDIR%%/quick/scenegraph/d3d11underqml/doc/images/d3d11underqml-example.jpg
%%QT_EXAMPLEDIR%%/quick/scenegraph/d3d11underqml/doc/src/d3d11underqml.qdoc
%%QT_EXAMPLEDIR%%/quick/scenegraph/d3d11underqml/main.cpp
%%QT_EXAMPLEDIR%%/quick/scenegraph/d3d11underqml/main.qml
%%QT_EXAMPLEDIR%%/quick/scenegraph/d3d11underqml/squircle.frag
%%QT_EXAMPLEDIR%%/quick/scenegraph/d3d11underqml/squircle.vert
%%QT_EXAMPLEDIR%%/quick/scenegraph/fboitem/doc/images/fboitem-example.jpg
%%QT_EXAMPLEDIR%%/quick/scenegraph/fboitem/doc/src/fboitem.qdoc
%%QT_EXAMPLEDIR%%/quick/scenegraph/fboitem/fboinsgrenderer.cpp
%%QT_EXAMPLEDIR%%/quick/scenegraph/fboitem/fboinsgrenderer.h
%%QT_EXAMPLEDIR%%/quick/scenegraph/fboitem/fboitem.pro
%%QT_EXAMPLEDIR%%/quick/scenegraph/fboitem/fboitem.qrc
%%QT_EXAMPLEDIR%%/quick/scenegraph/fboitem/main.cpp
%%QT_EXAMPLEDIR%%/quick/scenegraph/fboitem/main.qml
%%QT_EXAMPLEDIR%%/quick/scenegraph/graph/doc/images/graph-example.jpg
%%QT_EXAMPLEDIR%%/quick/scenegraph/graph/doc/src/graph.qdoc
%%QT_EXAMPLEDIR%%/quick/scenegraph/graph/graph.cpp
@ -3722,6 +3761,26 @@
%%QT_EXAMPLEDIR%%/quick/scenegraph/graph/shaders/line.vsh
%%QT_EXAMPLEDIR%%/quick/scenegraph/graph/shaders/noisy.fsh
%%QT_EXAMPLEDIR%%/quick/scenegraph/graph/shaders/noisy.vsh
%%QT_EXAMPLEDIR%%/quick/scenegraph/metaltextureimport/doc/images/metaltextureimport-example.jpg
%%QT_EXAMPLEDIR%%/quick/scenegraph/metaltextureimport/doc/src/metaltextureimport.qdoc
%%QT_EXAMPLEDIR%%/quick/scenegraph/metaltextureimport/main.cpp
%%QT_EXAMPLEDIR%%/quick/scenegraph/metaltextureimport/main.qml
%%QT_EXAMPLEDIR%%/quick/scenegraph/metaltextureimport/metaltextureimport.h
%%QT_EXAMPLEDIR%%/quick/scenegraph/metaltextureimport/metaltextureimport.mm
%%QT_EXAMPLEDIR%%/quick/scenegraph/metaltextureimport/metaltextureimport.pro
%%QT_EXAMPLEDIR%%/quick/scenegraph/metaltextureimport/metaltextureimport.qrc
%%QT_EXAMPLEDIR%%/quick/scenegraph/metaltextureimport/squircle.frag
%%QT_EXAMPLEDIR%%/quick/scenegraph/metaltextureimport/squircle.vert
%%QT_EXAMPLEDIR%%/quick/scenegraph/metalunderqml/doc/images/metalunderqml-example.jpg
%%QT_EXAMPLEDIR%%/quick/scenegraph/metalunderqml/doc/src/metalunderqml.qdoc
%%QT_EXAMPLEDIR%%/quick/scenegraph/metalunderqml/main.cpp
%%QT_EXAMPLEDIR%%/quick/scenegraph/metalunderqml/main.qml
%%QT_EXAMPLEDIR%%/quick/scenegraph/metalunderqml/metalsquircle.h
%%QT_EXAMPLEDIR%%/quick/scenegraph/metalunderqml/metalsquircle.mm
%%QT_EXAMPLEDIR%%/quick/scenegraph/metalunderqml/metalunderqml.pro
%%QT_EXAMPLEDIR%%/quick/scenegraph/metalunderqml/metalunderqml.qrc
%%QT_EXAMPLEDIR%%/quick/scenegraph/metalunderqml/squircle.frag
%%QT_EXAMPLEDIR%%/quick/scenegraph/metalunderqml/squircle.vert
%%QT_EXAMPLEDIR%%/quick/scenegraph/openglunderqml/doc/images/openglunderqml-example.jpg
%%QT_EXAMPLEDIR%%/quick/scenegraph/openglunderqml/doc/src/openglunderqml.qdoc
%%QT_EXAMPLEDIR%%/quick/scenegraph/openglunderqml/main.cpp
@ -3734,8 +3793,14 @@
%%QT_EXAMPLEDIR%%/quick/scenegraph/rendernode/customrenderitem.h
%%QT_EXAMPLEDIR%%/quick/scenegraph/rendernode/d3d12renderer.cpp
%%QT_EXAMPLEDIR%%/quick/scenegraph/rendernode/d3d12renderer.h
%%QT_EXAMPLEDIR%%/quick/scenegraph/rendernode/doc/images/rendernode-example.jpg
%%QT_EXAMPLEDIR%%/quick/scenegraph/rendernode/doc/src/rendernode.qdoc
%%QT_EXAMPLEDIR%%/quick/scenegraph/rendernode/main.cpp
%%QT_EXAMPLEDIR%%/quick/scenegraph/rendernode/main.qml
%%QT_EXAMPLEDIR%%/quick/scenegraph/rendernode/metalrenderer.h
%%QT_EXAMPLEDIR%%/quick/scenegraph/rendernode/metalrenderer.mm
%%QT_EXAMPLEDIR%%/quick/scenegraph/rendernode/metalshader.frag
%%QT_EXAMPLEDIR%%/quick/scenegraph/rendernode/metalshader.vert
%%QT_EXAMPLEDIR%%/quick/scenegraph/rendernode/openglrenderer.cpp
%%QT_EXAMPLEDIR%%/quick/scenegraph/rendernode/openglrenderer.h
%%QT_EXAMPLEDIR%%/quick/scenegraph/rendernode/rendernode.pro
@ -3754,20 +3819,14 @@
%%QT_EXAMPLEDIR%%/quick/scenegraph/sgengine/window.h
%%QT_EXAMPLEDIR%%/quick/scenegraph/shared/logorenderer.cpp
%%QT_EXAMPLEDIR%%/quick/scenegraph/shared/logorenderer.h
%%QT_EXAMPLEDIR%%/quick/scenegraph/shared/squircle_rhi.frag
%%QT_EXAMPLEDIR%%/quick/scenegraph/shared/squircle_rhi.vert
%%QT_EXAMPLEDIR%%/quick/scenegraph/simplematerial/doc/images/simplematerial-example.jpg
%%QT_EXAMPLEDIR%%/quick/scenegraph/simplematerial/doc/src/simplematerial.qdoc
%%QT_EXAMPLEDIR%%/quick/scenegraph/simplematerial/main.qml
%%QT_EXAMPLEDIR%%/quick/scenegraph/simplematerial/simplematerial.cpp
%%QT_EXAMPLEDIR%%/quick/scenegraph/simplematerial/simplematerial.pro
%%QT_EXAMPLEDIR%%/quick/scenegraph/simplematerial/simplematerial.qrc
%%QT_EXAMPLEDIR%%/quick/scenegraph/textureinsgnode/doc/images/textureinsgnode-example.jpg
%%QT_EXAMPLEDIR%%/quick/scenegraph/textureinsgnode/doc/src/textureinsgnode.qdoc
%%QT_EXAMPLEDIR%%/quick/scenegraph/textureinsgnode/fboinsgrenderer.cpp
%%QT_EXAMPLEDIR%%/quick/scenegraph/textureinsgnode/fboinsgrenderer.h
%%QT_EXAMPLEDIR%%/quick/scenegraph/textureinsgnode/main.cpp
%%QT_EXAMPLEDIR%%/quick/scenegraph/textureinsgnode/main.qml
%%QT_EXAMPLEDIR%%/quick/scenegraph/textureinsgnode/textureinsgnode.pro
%%QT_EXAMPLEDIR%%/quick/scenegraph/textureinsgnode/textureinsgnode.qrc
%%QT_EXAMPLEDIR%%/quick/scenegraph/textureinthread/doc/images/textureinthread-example.jpg
%%QT_EXAMPLEDIR%%/quick/scenegraph/textureinthread/doc/src/textureinthread.qdoc
%%QT_EXAMPLEDIR%%/quick/scenegraph/textureinthread/error.qml
@ -3792,6 +3851,16 @@
%%QT_EXAMPLEDIR%%/quick/scenegraph/twotextureproviders/twotextureproviders.qrc
%%QT_EXAMPLEDIR%%/quick/scenegraph/twotextureproviders/xorblender.cpp
%%QT_EXAMPLEDIR%%/quick/scenegraph/twotextureproviders/xorblender.h
%%QT_EXAMPLEDIR%%/quick/scenegraph/vulkanunderqml/doc/images/vulkanunderqml-example.jpg
%%QT_EXAMPLEDIR%%/quick/scenegraph/vulkanunderqml/doc/src/vulkanunderqml.qdoc
%%QT_EXAMPLEDIR%%/quick/scenegraph/vulkanunderqml/main.cpp
%%QT_EXAMPLEDIR%%/quick/scenegraph/vulkanunderqml/main.qml
%%QT_EXAMPLEDIR%%/quick/scenegraph/vulkanunderqml/squircle.frag.spv
%%QT_EXAMPLEDIR%%/quick/scenegraph/vulkanunderqml/squircle.vert.spv
%%QT_EXAMPLEDIR%%/quick/scenegraph/vulkanunderqml/vulkansquircle.cpp
%%QT_EXAMPLEDIR%%/quick/scenegraph/vulkanunderqml/vulkansquircle.h
%%QT_EXAMPLEDIR%%/quick/scenegraph/vulkanunderqml/vulkanunderqml.pro
%%QT_EXAMPLEDIR%%/quick/scenegraph/vulkanunderqml/vulkanunderqml.qrc
%%QT_EXAMPLEDIR%%/quick/shadereffects/content/Slider.qml
%%QT_EXAMPLEDIR%%/quick/shadereffects/content/face-smile.png
%%QT_EXAMPLEDIR%%/quick/shadereffects/content/qt-logo.png
@ -3801,10 +3870,23 @@
%%QT_EXAMPLEDIR%%/quick/shadereffects/content/shaders/+hlsl/outline.frag
%%QT_EXAMPLEDIR%%/quick/shadereffects/content/shaders/+hlsl/shadow.frag
%%QT_EXAMPLEDIR%%/quick/shadereffects/content/shaders/+hlsl/wobble.frag
%%QT_EXAMPLEDIR%%/quick/shadereffects/content/shaders/+qsb/blur.frag
%%QT_EXAMPLEDIR%%/quick/shadereffects/content/shaders/+qsb/colorize.frag
%%QT_EXAMPLEDIR%%/quick/shadereffects/content/shaders/+qsb/genie.vert
%%QT_EXAMPLEDIR%%/quick/shadereffects/content/shaders/+qsb/outline.frag
%%QT_EXAMPLEDIR%%/quick/shadereffects/content/shaders/+qsb/shadow.frag
%%QT_EXAMPLEDIR%%/quick/shadereffects/content/shaders/+qsb/wobble.frag
%%QT_EXAMPLEDIR%%/quick/shadereffects/content/shaders/blur.frag
%%QT_EXAMPLEDIR%%/quick/shadereffects/content/shaders/colorize.frag
%%QT_EXAMPLEDIR%%/quick/shadereffects/content/shaders/genie.vert
%%QT_EXAMPLEDIR%%/quick/shadereffects/content/shaders/outline.frag
%%QT_EXAMPLEDIR%%/quick/shadereffects/content/shaders/rhi/blur.frag
%%QT_EXAMPLEDIR%%/quick/shadereffects/content/shaders/rhi/colorize.frag
%%QT_EXAMPLEDIR%%/quick/shadereffects/content/shaders/rhi/compile.bat
%%QT_EXAMPLEDIR%%/quick/shadereffects/content/shaders/rhi/genie.vert
%%QT_EXAMPLEDIR%%/quick/shadereffects/content/shaders/rhi/outline.frag
%%QT_EXAMPLEDIR%%/quick/shadereffects/content/shaders/rhi/shadow.frag
%%QT_EXAMPLEDIR%%/quick/shadereffects/content/shaders/rhi/wobble.frag
%%QT_EXAMPLEDIR%%/quick/shadereffects/content/shaders/shadow.frag
%%QT_EXAMPLEDIR%%/quick/shadereffects/content/shaders/wobble.frag
%%QT_EXAMPLEDIR%%/quick/shadereffects/doc/images/qml-shadereffects-example.png
@ -4975,6 +5057,22 @@
%%QT_EXAMPLEDIR%%/remoteobjects/ssl/sslserver/timemodel.cpp
%%QT_EXAMPLEDIR%%/remoteobjects/ssl/sslserver/timemodel.h
%%QT_EXAMPLEDIR%%/remoteobjects/timemodel.rep
%%QT_EXAMPLEDIR%%/remoteobjects/websockets/common/cert/cert.qrc
%%QT_EXAMPLEDIR%%/remoteobjects/websockets/common/cert/client.crt
%%QT_EXAMPLEDIR%%/remoteobjects/websockets/common/cert/client.key
%%QT_EXAMPLEDIR%%/remoteobjects/websockets/common/cert/rootCA.key
%%QT_EXAMPLEDIR%%/remoteobjects/websockets/common/cert/rootCA.pem
%%QT_EXAMPLEDIR%%/remoteobjects/websockets/common/cert/rootCA.srl
%%QT_EXAMPLEDIR%%/remoteobjects/websockets/common/cert/server.crt
%%QT_EXAMPLEDIR%%/remoteobjects/websockets/common/cert/server.key
%%QT_EXAMPLEDIR%%/remoteobjects/websockets/common/common.pri
%%QT_EXAMPLEDIR%%/remoteobjects/websockets/common/websocketiodevice.cpp
%%QT_EXAMPLEDIR%%/remoteobjects/websockets/common/websocketiodevice.h
%%QT_EXAMPLEDIR%%/remoteobjects/websockets/websockets.pro
%%QT_EXAMPLEDIR%%/remoteobjects/websockets/wsclient/main.cpp
%%QT_EXAMPLEDIR%%/remoteobjects/websockets/wsclient/wsclient.pro
%%QT_EXAMPLEDIR%%/remoteobjects/websockets/wsserver/main.cpp
%%QT_EXAMPLEDIR%%/remoteobjects/websockets/wsserver/wsserver.pro
%%QT_EXAMPLEDIR%%/script/README
%%QT_EXAMPLEDIR%%/script/calculator/calculator.js
%%QT_EXAMPLEDIR%%/script/calculator/calculator.pro
@ -5290,6 +5388,7 @@
%%QT_EXAMPLEDIR%%/sensors/sensor_explorer/import/import.json
%%QT_EXAMPLEDIR%%/sensors/sensor_explorer/import/import.pro
%%QT_EXAMPLEDIR%%/sensors/sensor_explorer/import/main.cpp
%%QT_EXAMPLEDIR%%/sensors/sensor_explorer/import/main.h
%%QT_EXAMPLEDIR%%/sensors/sensor_explorer/import/propertyinfo.cpp
%%QT_EXAMPLEDIR%%/sensors/sensor_explorer/import/propertyinfo.h
%%QT_EXAMPLEDIR%%/sensors/sensor_explorer/import/qmldir
@ -5909,6 +6008,21 @@
%%QT_EXAMPLEDIR%%/wayland/spanning-screens/main.qml
%%QT_EXAMPLEDIR%%/wayland/spanning-screens/spanning-screens.pro
%%QT_EXAMPLEDIR%%/wayland/spanning-screens/spanning-screens.qrc
%%QT_EXAMPLEDIR%%/wayland/texture-sharing/README
%%QT_EXAMPLEDIR%%/wayland/texture-sharing/custom-compositor/compositor.qrc
%%QT_EXAMPLEDIR%%/wayland/texture-sharing/custom-compositor/custom-compositor.pro
%%QT_EXAMPLEDIR%%/wayland/texture-sharing/custom-compositor/images/background.png
%%QT_EXAMPLEDIR%%/wayland/texture-sharing/custom-compositor/images/car.ktx
%%QT_EXAMPLEDIR%%/wayland/texture-sharing/custom-compositor/images/qt4.astc
%%QT_EXAMPLEDIR%%/wayland/texture-sharing/custom-compositor/images/qt_logo.png
%%QT_EXAMPLEDIR%%/wayland/texture-sharing/custom-compositor/main.cpp
%%QT_EXAMPLEDIR%%/wayland/texture-sharing/custom-compositor/qml/main.qml
%%QT_EXAMPLEDIR%%/wayland/texture-sharing/minimal-compositor.qml
%%QT_EXAMPLEDIR%%/wayland/texture-sharing/qml-client/main.cpp
%%QT_EXAMPLEDIR%%/wayland/texture-sharing/qml-client/main.qml
%%QT_EXAMPLEDIR%%/wayland/texture-sharing/qml-client/qml-client.pro
%%QT_EXAMPLEDIR%%/wayland/texture-sharing/qml-client/qml-client.qrc
%%QT_EXAMPLEDIR%%/wayland/texture-sharing/texture-sharing.pro
%%QT_EXAMPLEDIR%%/wayland/wayland.pro
%%QT_EXAMPLEDIR%%/webchannel/chatclient-html/chatclient-html.pro
%%QT_EXAMPLEDIR%%/webchannel/chatclient-html/chatclient.html
@ -5964,6 +6078,7 @@
%%QT_EXAMPLEDIR%%/webengine/customdialogs/doc/images/customdialogs-menu.png
%%QT_EXAMPLEDIR%%/webengine/customdialogs/doc/images/customdialogs-prompt1.png
%%QT_EXAMPLEDIR%%/webengine/customdialogs/doc/images/customdialogs-prompt2.png
%%QT_EXAMPLEDIR%%/webengine/customdialogs/doc/images/customdialogs-tooltip.png
%%QT_EXAMPLEDIR%%/webengine/customdialogs/doc/images/customdialogs.png
%%QT_EXAMPLEDIR%%/webengine/customdialogs/doc/src/customdialogs.qdoc
%%QT_EXAMPLEDIR%%/webengine/customdialogs/forms/Authentication.qml
@ -5986,6 +6101,20 @@
%%QT_EXAMPLEDIR%%/webengine/customdialogs/server.cpp
%%QT_EXAMPLEDIR%%/webengine/customdialogs/server.h
%%QT_EXAMPLEDIR%%/webengine/customdialogs/style.css
%%QT_EXAMPLEDIR%%/webengine/lifecycle/WebBrowser.qml
%%QT_EXAMPLEDIR%%/webengine/lifecycle/WebTab.qml
%%QT_EXAMPLEDIR%%/webengine/lifecycle/WebTabBar.qml
%%QT_EXAMPLEDIR%%/webengine/lifecycle/WebTabButton.qml
%%QT_EXAMPLEDIR%%/webengine/lifecycle/WebTabStack.qml
%%QT_EXAMPLEDIR%%/webengine/lifecycle/WebToolButton.qml
%%QT_EXAMPLEDIR%%/webengine/lifecycle/doc/images/lifecycle-automatic.png
%%QT_EXAMPLEDIR%%/webengine/lifecycle/doc/images/lifecycle-manual.png
%%QT_EXAMPLEDIR%%/webengine/lifecycle/doc/images/lifecycle.png
%%QT_EXAMPLEDIR%%/webengine/lifecycle/doc/src/lifecycle.qdoc
%%QT_EXAMPLEDIR%%/webengine/lifecycle/lifecycle.pro
%%QT_EXAMPLEDIR%%/webengine/lifecycle/main.cpp
%%QT_EXAMPLEDIR%%/webengine/lifecycle/qtquickcontrols2.conf
%%QT_EXAMPLEDIR%%/webengine/lifecycle/resources.qrc
%%QT_EXAMPLEDIR%%/webengine/minimal/doc/src/minimal.qdoc
%%QT_EXAMPLEDIR%%/webengine/minimal/main.cpp
%%QT_EXAMPLEDIR%%/webengine/minimal/main.qml
@ -5995,6 +6124,7 @@
%%QT_EXAMPLEDIR%%/webengine/quicknanobrowser/BrowserDialog.qml
%%QT_EXAMPLEDIR%%/webengine/quicknanobrowser/BrowserWindow.qml
%%QT_EXAMPLEDIR%%/webengine/quicknanobrowser/DownloadView.qml
%%QT_EXAMPLEDIR%%/webengine/quicknanobrowser/FindBar.qml
%%QT_EXAMPLEDIR%%/webengine/quicknanobrowser/FullScreenNotification.qml
%%QT_EXAMPLEDIR%%/webengine/quicknanobrowser/doc/images/quicknanobrowser-demo.jpg
%%QT_EXAMPLEDIR%%/webengine/quicknanobrowser/doc/src/quicknanobrowser.qdoc
@ -7245,6 +7375,10 @@
%%QT_EXAMPLEDIR%%/widgets/painting/transformations/transformations.pro
%%QT_EXAMPLEDIR%%/widgets/painting/transformations/window.cpp
%%QT_EXAMPLEDIR%%/widgets/painting/transformations/window.h
%%QT_EXAMPLEDIR%%/widgets/qnx/foreignwindows/collector.cpp
%%QT_EXAMPLEDIR%%/widgets/qnx/foreignwindows/collector.h
%%QT_EXAMPLEDIR%%/widgets/qnx/foreignwindows/foreignwindows.pro
%%QT_EXAMPLEDIR%%/widgets/qnx/foreignwindows/main.cpp
%%QT_EXAMPLEDIR%%/widgets/richtext/README
%%QT_EXAMPLEDIR%%/widgets/richtext/calendar/calendar.pro
%%QT_EXAMPLEDIR%%/widgets/richtext/calendar/main.cpp
@ -7264,7 +7398,10 @@
%%QT_EXAMPLEDIR%%/widgets/richtext/syntaxhighlighter/mainwindow.h
%%QT_EXAMPLEDIR%%/widgets/richtext/syntaxhighlighter/syntaxhighlighter.pro
%%QT_EXAMPLEDIR%%/widgets/richtext/textedit/example.html
%%QT_EXAMPLEDIR%%/widgets/richtext/textedit/example.md
%%QT_EXAMPLEDIR%%/widgets/richtext/textedit/images/logo32.png
%%QT_EXAMPLEDIR%%/widgets/richtext/textedit/images/mac/checkbox-checked.png
%%QT_EXAMPLEDIR%%/widgets/richtext/textedit/images/mac/checkbox.png
%%QT_EXAMPLEDIR%%/widgets/richtext/textedit/images/mac/editcopy.png
%%QT_EXAMPLEDIR%%/widgets/richtext/textedit/images/mac/editcut.png
%%QT_EXAMPLEDIR%%/widgets/richtext/textedit/images/mac/editpaste.png
@ -7275,6 +7412,8 @@
%%QT_EXAMPLEDIR%%/widgets/richtext/textedit/images/mac/fileopen.png
%%QT_EXAMPLEDIR%%/widgets/richtext/textedit/images/mac/fileprint.png
%%QT_EXAMPLEDIR%%/widgets/richtext/textedit/images/mac/filesave.png
%%QT_EXAMPLEDIR%%/widgets/richtext/textedit/images/mac/format-indent-less.png
%%QT_EXAMPLEDIR%%/widgets/richtext/textedit/images/mac/format-indent-more.png
%%QT_EXAMPLEDIR%%/widgets/richtext/textedit/images/mac/textbold.png
%%QT_EXAMPLEDIR%%/widgets/richtext/textedit/images/mac/textcenter.png
%%QT_EXAMPLEDIR%%/widgets/richtext/textedit/images/mac/textitalic.png
@ -7284,6 +7423,8 @@
%%QT_EXAMPLEDIR%%/widgets/richtext/textedit/images/mac/textunder.png
%%QT_EXAMPLEDIR%%/widgets/richtext/textedit/images/mac/zoomin.png
%%QT_EXAMPLEDIR%%/widgets/richtext/textedit/images/mac/zoomout.png
%%QT_EXAMPLEDIR%%/widgets/richtext/textedit/images/win/checkbox-checked.png
%%QT_EXAMPLEDIR%%/widgets/richtext/textedit/images/win/checkbox.png
%%QT_EXAMPLEDIR%%/widgets/richtext/textedit/images/win/editcopy.png
%%QT_EXAMPLEDIR%%/widgets/richtext/textedit/images/win/editcut.png
%%QT_EXAMPLEDIR%%/widgets/richtext/textedit/images/win/editpaste.png
@ -7294,6 +7435,8 @@
%%QT_EXAMPLEDIR%%/widgets/richtext/textedit/images/win/fileopen.png
%%QT_EXAMPLEDIR%%/widgets/richtext/textedit/images/win/fileprint.png
%%QT_EXAMPLEDIR%%/widgets/richtext/textedit/images/win/filesave.png
%%QT_EXAMPLEDIR%%/widgets/richtext/textedit/images/win/format-indent-less.png
%%QT_EXAMPLEDIR%%/widgets/richtext/textedit/images/win/format-indent-more.png
%%QT_EXAMPLEDIR%%/widgets/richtext/textedit/images/win/textbold.png
%%QT_EXAMPLEDIR%%/widgets/richtext/textedit/images/win/textcenter.png
%%QT_EXAMPLEDIR%%/widgets/richtext/textedit/images/win/textitalic.png

View file

@ -50,6 +50,7 @@
%%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
@ -69,6 +70,7 @@
%%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
@ -125,6 +127,7 @@
%%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
@ -150,6 +153,7 @@
%%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
@ -228,6 +232,7 @@
%%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
@ -235,6 +240,7 @@
%%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

0
misc/qtchooser/files/update-qtchooser-wrapper.in Normal file → Executable file
View file

View file

@ -12,6 +12,8 @@ COMMENT= Sewing pattern drafting tool aiming to remake the garment industry
LICENSE= GPLv3
LICENSE_FILE= ${WRKSRC}/LICENSE_GPL.txt
BROKEN= Does not build with Qt5-5.14
USES= compiler:c++11-lang desktop-file-utils gl gmake qmake qt:5
USE_QT= concurrent core gui network opengl printsupport svg widgets xml xmlpatterns buildtools_build linguisttools_build testlib_build
USE_GL= gl

View file

@ -2,7 +2,6 @@
PORTNAME= multimedia
DISTVERSION= ${QT5_VERSION}
PORTREVISION= 1
CATEGORIES= multimedia
PKGNAMEPREFIX= qt5-

View file

@ -4,8 +4,6 @@
%%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
@ -29,12 +27,10 @@
%%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
@ -238,7 +234,6 @@
%%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
@ -254,11 +249,15 @@
%%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
@ -280,8 +279,8 @@
%%QT_INCDIR%%/QtMultimediaWidgets/qvideowidgetcontrol.h
%%QT_CMAKEDIR%%/Qt5MultimediaWidgets/Qt5MultimediaWidgetsConfig.cmake
%%QT_CMAKEDIR%%/Qt5MultimediaWidgets/Qt5MultimediaWidgetsConfigVersion.cmake
%%GSTREAMER%%%%QT_CMAKEDIR%%/Qt5MultimediaGstTools/Qt5MultimediaGstToolsConfig.cmake
%%GSTREAMER%%%%QT_CMAKEDIR%%/Qt5MultimediaGstTools/Qt5MultimediaGstToolsConfigVersion.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

View file

@ -1,71 +0,0 @@
--- 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)

View file

@ -1,11 +0,0 @@
--- src/network/ssl/qsslcontext_openssl.cpp.orig 2019-10-01 08:05:51 UTC
+++ src/network/ssl/qsslcontext_openssl.cpp
@@ -265,7 +265,7 @@ void QSslContext::applyBackendConfig(QSslContext *sslC
}
#endif // ocsp
-#if OPENSSL_VERSION_NUMBER >= 0x10002000L
+#if OPENSSL_VERSION_NUMBER >= 0x10002000L && !defined(LIBRESSL_VERSION_NUMBER)
if (QSslSocket::sslLibraryVersionNumber() >= 0x10002000L) {
QSharedPointer<SSL_CONF_CTX> cctx(q_SSL_CONF_CTX_new(), &q_SSL_CONF_CTX_free);
if (cctx) {

View file

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

View file

@ -1,86 +0,0 @@
--- 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);

View file

@ -1,24 +0,0 @@
--- src/network/ssl/qsslsocket_openssl_symbols_p.h.orig 2019-10-01 07:47:06 UTC
+++ src/network/ssl/qsslsocket_openssl_symbols_p.h
@@ -72,6 +72,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);

View file

@ -36,6 +36,7 @@
%%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
@ -107,6 +108,7 @@
%%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
@ -156,6 +158,7 @@
%%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

View file

@ -2,7 +2,6 @@
PORTNAME= qtdiag
DISTVERSION= ${QT5_VERSION}
PORTREVISION= 1
CATEGORIES= sysutils
PKGNAMEPREFIX= qt5-

View file

@ -2,7 +2,6 @@
PORTNAME= qtpaths
DISTVERSION= ${QT5_VERSION}
PORTREVISION= 1
CATEGORIES= sysutils
PKGNAMEPREFIX= qt5-

View file

@ -2,7 +2,6 @@
PORTNAME= qtplugininfo
DISTVERSION= ${QT5_VERSION}
PORTREVISION= 1
CATEGORIES= sysutils
PKGNAMEPREFIX= qt5-

View file

@ -2,7 +2,6 @@
PORTNAME= xmlpatterns
DISTVERSION= ${QT5_VERSION}
PORTREVISION= 1
CATEGORIES= textproc
PKGNAMEPREFIX= qt5-

View file

@ -18,7 +18,6 @@
PORTNAME= webengine
DISTVERSION= ${QT5_VERSION}
PORTREVISION= 3
CATEGORIES= www
PKGNAMEPREFIX= qt5-
@ -49,7 +48,7 @@ LIB_DEPENDS= libavcodec.so:multimedia/ffmpeg \
libwebp.so:graphics/webp
DISTINFO_FILE= ${.CURDIR}/distinfo
QT5_VERSION= 5.13.2
QT5_VERSION= 5.14.0
OPTIONS_SINGLE= AUDIO
OPTIONS_SINGLE_AUDIO= ALSA PULSEAUDIO SNDIO
@ -79,7 +78,7 @@ USE_GL= gl
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 xext xi xorgproto \
USE_XORG= x11 xcb xcomposite xcursor xdamage xext xfixes xi xorgproto \
xrandr xrender xscrnsaver xtst
USE_LDCONFIG= ${QT_LIBDIR}
@ -123,7 +122,7 @@ PLIST_SUB+= BE="@comment " LE=""
post-extract:
# Install FreeBSD's freebsd.pri file.
${CP} ${FILESDIR}/freebsd.pri ${WRKSRC}/src/core/config/freebsd.pri
${CP} ${FILESDIR}/freebsd.pri ${WRKSRC}/src/buildtools/config/freebsd.pri
post-extract-SNDIO-on:
@cd ${WRKSRC}/src/3rdparty/chromium/media/audio && ${MKDIR} sndio openbsd

View file

@ -1,3 +1,3 @@
TIMESTAMP = 1572640408
SHA256 (KDE/Qt/5.13.2/qtwebengine-everywhere-src-5.13.2.tar.xz) = adcf56b5de6f34744bba2307b696fc75611884f4270e87dfa760d6e99dd711bb
SIZE (KDE/Qt/5.13.2/qtwebengine-everywhere-src-5.13.2.tar.xz) = 255593964
TIMESTAMP = 1578321366
SHA256 (KDE/Qt/5.14.0/qtwebengine-everywhere-src-5.14.0.tar.xz) = 74f8c11cc318612c8d9dc87cf791badb1efe7080c10d8b3ed5843b249a942d32
SIZE (KDE/Qt/5.14.0/qtwebengine-everywhere-src-5.14.0.tar.xz) = 241565016

View file

@ -38,18 +38,6 @@
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(

View file

@ -1,8 +0,0 @@
--- config.tests/khr/khr.pro.orig 2018-11-27 04:10:38 UTC
+++ config.tests/khr/khr.pro
@@ -3,4 +3,4 @@
CONFIG-=qt
-linux:SOURCES += khr.cpp
+unix:SOURCES += khr.cpp

View file

@ -1,7 +0,0 @@
--- config.tests/snappy/snappy.pro.orig 2018-11-27 04:10:38 UTC
+++ config.tests/snappy/snappy.pro
@@ -1,3 +1,3 @@
-linux:SOURCES += snappy.cpp
+unix:SOURCES += snappy.cpp
LIBS += -lsnappy
CONFIG -= qt

View file

@ -0,0 +1,30 @@
--- 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() {
@@ -126,6 +126,9 @@ defineTest(qtConfTest_detectPlatform) {
macos:qtwebengine_isMacOsPlatformSupported() {
$${1}.platform = "macos"
}
+ unix:qtwebengine_isLinuxPlatformSupported() {
+ $${1}.platform = "linux"
+ }
}
!isEmpty(platformError) {
@@ -163,7 +166,7 @@ defineTest(qtConfTest_detectNinja) {
!isEmpty(ninja) {
qtLog("Found ninja from path: $$ninja")
qtRunLoggedCommand("$$ninja --version", version)|return(false)
- contains(version, "1.[7-9].*"): return(true)
+ contains(version, "1\.([7-9]|1[0-9])\..*"): return(true)
qtLog("Ninja version too old")
}
qtLog("Building own ninja")

View file

@ -1,34 +0,0 @@
--- 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

View file

@ -1,17 +1,14 @@
Include the freebsd.pri file provided by the port, to pass FreeBSD specific
settings to gn.
--- mkspecs/features/functions.prf.orig 2019-05-24 09:01:39 UTC
--- mkspecs/features/functions.prf.orig 2019-12-03 07:18:02 UTC
+++ mkspecs/features/functions.prf
@@ -82,6 +82,7 @@ defineReplace(gnArgs) {
linux: include($$QTWEBENGINE_ROOT/src/core/config/linux.pri)
macos: include($$QTWEBENGINE_ROOT/src/core/config/mac_osx.pri)
win32: include($$QTWEBENGINE_ROOT/src/core/config/windows.pri)
+ freebsd: include($$QTWEBENGINE_ROOT/src/core/config/freebsd.pri)
@@ -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)
}
@@ -94,6 +95,7 @@ defineReplace(gnArch) {
@@ -87,6 +88,7 @@ defineReplace(gnArch) {
contains(qtArch, "arm64"): return(arm64)
contains(qtArch, "mips"): return(mipsel)
contains(qtArch, "mips64"): return(mips64el)
@ -19,7 +16,7 @@ settings to gn.
return(unknown)
}
@@ -101,6 +103,7 @@ defineReplace(gnOS) {
@@ -94,6 +96,7 @@ defineReplace(gnOS) {
macos: return(mac)
win32: return(win)
linux: return(linux)

View file

@ -1,19 +0,0 @@
--- 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)

View file

@ -1,7 +1,7 @@
--- src/3rdparty/chromium/BUILD.gn.orig 2019-03-01 17:04:22 UTC
--- src/3rdparty/chromium/BUILD.gn.orig 2019-11-27 21:12:25 UTC
+++ src/3rdparty/chromium/BUILD.gn
@@ -366,7 +366,7 @@ group("gn_all") {
[ "//third_party/android_crazy_linker:android_crazy_linker_zip_fuzzer" ]
@@ -400,7 +400,7 @@ group("gn_all") {
]
}
- if (is_linux || is_android) {
@ -9,7 +9,7 @@
deps += [
"//third_party/breakpad:breakpad_unittests",
"//third_party/breakpad:core-2-minidump",
@@ -408,8 +408,6 @@ group("gn_all") {
@@ -441,8 +441,6 @@ group("gn_all") {
"//net:disk_cache_memory_test",
"//net:quic_client",
"//net:quic_server",
@ -18,10 +18,10 @@
"//testing:empty_main",
]
@@ -466,10 +464,6 @@ group("gn_all") {
@@ -497,10 +495,6 @@ group("gn_all") {
"//chrome/test:load_library_perf_tests",
"//chrome/test:sync_performance_tests",
"//chrome/test/chromedriver:chromedriver",
"//chrome/test/chromedriver:chromedriver_tests",
"//components/sync:run_sync_testserver",
- "//courgette:courgette",
- "//courgette:courgette_fuzz",
- "//courgette:courgette_minimal_tool",
@ -29,7 +29,7 @@
"//media/cast:generate_barcode_video",
"//media/cast:generate_timecode_audio",
"//net:crash_cache",
@@ -536,10 +530,6 @@ group("gn_all") {
@@ -567,10 +561,6 @@ group("gn_all") {
"//mojo:mojo_perftests",
"//services/service_manager/public/cpp",
"//testing/gmock:gmock_main",
@ -40,7 +40,7 @@
]
if (!is_android) {
@@ -614,7 +604,7 @@ group("gn_all") {
@@ -644,7 +634,7 @@ group("gn_all") {
host_os == "win" && !use_qt) {
deps += [ "//chrome/test/mini_installer:mini_installer_tests" ]
}
@ -49,7 +49,15 @@
deps += [ "//third_party/breakpad:symupload($host_toolchain)" ]
}
@@ -853,7 +843,6 @@ if (is_chromeos) {
@@ -783,7 +773,6 @@ group("gn_all") {
"//chrome/browser/vr:vr_common_perftests",
"//chrome/browser/vr:vr_common_unittests",
"//chrome/browser/vr:vr_pixeltests",
- "//tools/perf/contrib/vr_benchmarks:vr_perf_tests",
]
if (is_desktop_linux && use_ozone) {
deps += [ "//chrome/browser/vr/testapp:vr_testapp" ]
@@ -902,7 +891,6 @@ if (is_chromeos) {
"//ppapi/examples/video_decode",
"//sandbox/linux:chrome_sandbox",
"//sandbox/linux:sandbox_linux_unittests",
@ -57,7 +65,7 @@
# Blocked on https://github.com/catapult-project/catapult/issues/2297
#"//third_party/catapult/telemetry:bitmaptools",
@@ -958,7 +947,7 @@ if (!is_ios && !use_qt) {
@@ -1070,7 +1058,7 @@ if (!is_ios && !use_qt) {
]
}
@ -66,7 +74,7 @@
data_deps +=
[ "//third_party/breakpad:minidump_stackwalk($host_toolchain)" ]
}
@@ -967,7 +956,7 @@ if (!is_ios && !use_qt) {
@@ -1079,7 +1067,7 @@ if (!is_ios && !use_qt) {
data_deps += [ "//third_party/breakpad:dump_syms($host_toolchain)" ]
}
@ -75,7 +83,7 @@
data_deps += [ "//third_party/breakpad:dump_syms($host_toolchain)" ]
}
@@ -1091,9 +1080,6 @@ group("chromium_builder_perf") {
@@ -1221,9 +1209,6 @@ group("chromium_builder_perf") {
if (is_win) {
data_deps += [ "//chrome/installer/mini_installer:mini_installer" ]

View file

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

View file

@ -1,9 +1,9 @@
--- src/3rdparty/chromium/base/allocator/allocator_shim_default_dispatch_to_glibc.cc.orig 2018-11-13 18:25:11 UTC
--- 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
@@ -4,18 +4,28 @@
@@ -5,18 +5,28 @@
#include "base/allocator/allocator_shim.h"
#include <dlfcn.h>
-#include <malloc.h>
+#include <stdio.h>
+#include <stdlib.h>
@ -22,13 +22,13 @@
-void __libc_free(void* ptr);
+void* __malloc(size_t size);
+void* __calloc(size_t n, size_t size);
+void* __realloc(void* address, 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;
+ return nullptr;
+ } else {
+ return ret;
+ return ret;
+ }
+}
+int __posix_memalign(void **ptr, size_t alignment, size_t size);
@ -36,7 +36,7 @@
} // extern "C"
namespace {
@@ -23,32 +33,32 @@ namespace {
@@ -24,32 +34,32 @@ namespace {
using base::allocator::AllocatorDispatch;
void* GlibcMalloc(const AllocatorDispatch*, size_t size, void* context) {

View file

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

View file

@ -1,7 +1,7 @@
--- src/3rdparty/chromium/base/allocator/partition_allocator/page_allocator_internals_posix.h.orig 2019-05-23 12:39:34 UTC
--- 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
@@ -14,7 +14,7 @@
#if defined(OS_MACOSX)
@@ -16,7 +16,7 @@
#include <mach/mach.h>
#endif
-#if defined(OS_LINUX)
@ -9,30 +9,3 @@
#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)));

View file

@ -0,0 +1,20 @@
--- 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.
//

View file

@ -0,0 +1,20 @@
--- 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

View file

@ -0,0 +1,38 @@
--- 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

View file

@ -0,0 +1,18 @@
--- src/3rdparty/chromium/base/debug/elf_reader.cc.orig 2019-11-27 21:12:25 UTC
+++ src/3rdparty/chromium/base/debug/elf_reader.cc
@@ -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) +

View file

@ -1,13 +0,0 @@
--- 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) +

View file

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

View file

@ -0,0 +1,11 @@
--- src/3rdparty/chromium/base/files/file_path_watcher.cc.orig 2019-11-27 21:12:25 UTC
+++ src/3rdparty/chromium/base/files/file_path_watcher.cc
@@ -20,7 +20,7 @@ FilePathWatcher::~FilePathWatcher() {
// static
bool FilePathWatcher::RecursiveWatchAvailable() {
#if (defined(OS_MACOSX) && !defined(OS_IOS)) || defined(OS_WIN) || \
- defined(OS_LINUX) || defined(OS_ANDROID) || defined(OS_AIX)
+ defined(OS_LINUX) || defined(OS_ANDROID) || defined(OS_AIX) || defined(OS_BSD)
return true;
#else
// FSEvents isn't available on iOS.

View file

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

View file

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

View file

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

View file

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

View file

@ -0,0 +1,29 @@
--- 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

View file

@ -0,0 +1,38 @@
--- 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 */,

View file

@ -0,0 +1,31 @@
--- 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

View file

@ -1,13 +1,12 @@
--- src/3rdparty/chromium/base/numerics/safe_math_shared_impl.h.orig 2019-05-23 12:39:34 UTC
--- 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
@@ -19,9 +19,7 @@
@@ -23,8 +23,7 @@
// Where available use builtin math overflow support on Clang and GCC.
#if !defined(__native_client__) && \
- ((defined(__clang__) && \
- ((__clang_major__ > 3) || \
- (__clang_major__ == 3 && __clang_minor__ >= 4))) || \
+ ((defined(__clang__) && (__clang_major__ > 6)) || \
(defined(__GNUC__) && __GNUC__ >= 5))
#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)

View file

@ -1,5 +1,23 @@
--- src/3rdparty/chromium/base/process/process_metrics.cc.orig 2019-05-23 12:39:34 UTC
--- 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

View file

@ -1,4 +1,4 @@
--- src/3rdparty/chromium/base/process/process_metrics.h.orig 2019-05-23 12:39:34 UTC
--- 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.
@ -27,7 +27,7 @@
// 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;
@@ -199,14 +199,14 @@ class BASE_EXPORT ProcessMetrics {
@@ -168,14 +168,14 @@ class BASE_EXPORT ProcessMetrics {
int GetOpenFdSoftLimit() const;
#endif // defined(OS_POSIX)
@ -44,7 +44,7 @@
// Returns total memory usage of malloc.
size_t GetMallocUsage();
@@ -218,7 +218,7 @@ class BASE_EXPORT ProcessMetrics {
@@ -187,7 +187,7 @@ class BASE_EXPORT ProcessMetrics {
ProcessMetrics(ProcessHandle process, PortProvider* port_provider);
#endif // !defined(OS_MACOSX) || defined(OS_IOS)
@ -53,7 +53,7 @@
int CalculateIdleWakeupsPerSecond(uint64_t absolute_idle_wakeups);
#endif
#if defined(OS_MACOSX)
@@ -247,7 +247,7 @@ class BASE_EXPORT ProcessMetrics {
@@ -216,7 +216,7 @@ class BASE_EXPORT ProcessMetrics {
// Number of bytes transferred to/from disk in bytes.
uint64_t last_cumulative_disk_usage_ = 0;
@ -62,16 +62,16 @@
// Same thing for idle wakeups.
TimeTicks last_idle_wakeups_time_;
uint64_t last_absolute_idle_wakeups_;
@@ -293,7 +293,7 @@ BASE_EXPORT void IncreaseFdLimitTo(unsigned int max_de
@@ -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) || \
- defined(OS_ANDROID) || defined(OS_AIX) || defined(OS_FUCHSIA)
+ defined(OS_ANDROID) || defined(OS_AIX) || defined(OS_FUCHSIA) || defined(OS_BSD)
-#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.
//
@@ -326,7 +326,7 @@ struct BASE_EXPORT SystemMemoryInfoKB {
@@ -298,7 +298,7 @@ struct BASE_EXPORT SystemMemoryInfoKB {
int avail_phys = 0;
#endif
@ -80,33 +80,52 @@
// 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
@@ -341,7 +341,7 @@ struct BASE_EXPORT SystemMemoryInfoKB {
@@ -312,7 +312,7 @@ struct BASE_EXPORT SystemMemoryInfoKB {
int swap_free = 0;
#endif
#if defined(OS_ANDROID) || defined(OS_LINUX) || defined(OS_AIX) || \
- defined(OS_FUCHSIA)
+ defined(OS_FUCHSIA) || defined(OS_BSD)
-#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;
int active_anon = 0;
@@ -351,7 +351,7 @@ struct BASE_EXPORT SystemMemoryInfoKB {
@@ -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) ||
- // defined(OS_FUCHSIA)
+ // defined(OS_FUCHSIA) || defined(OS_BSD)
-#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)
int shmem = 0;
@@ -377,9 +377,9 @@ struct BASE_EXPORT SystemMemoryInfoKB {
@@ -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) ||
- // defined(OS_ANDROID) || defined(OS_AIX) || defined(OS_FUCHSIA)
+ // defined(OS_ANDROID) || defined(OS_AIX) || defined(OS_FUCHSIA) || defined(OS_BSD)
-#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_;

View file

@ -1,4 +1,4 @@
--- src/3rdparty/chromium/base/process/process_metrics_freebsd.cc.orig 2019-05-23 12:39:34 UTC
--- 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"
@ -8,7 +8,7 @@
#include <sys/sysctl.h>
#include <sys/user.h>
#include <unistd.h>
@@ -14,11 +15,15 @@
@@ -14,11 +15,29 @@
#include "base/process/process_metrics_iocounters.h"
#include "base/stl_util.h"
@ -18,7 +18,21 @@
+#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) {}
@ -26,7 +40,7 @@
// static
std::unique_ptr<ProcessMetrics> ProcessMetrics::CreateProcessMetrics(
@@ -69,4 +74,93 @@ size_t GetSystemCommitCharge() {
@@ -69,4 +88,216 @@ size_t GetSystemCommitCharge() {
return mem_total - (mem_free*pagesize) - (mem_inactive*pagesize);
}
@ -110,13 +124,136 @@
+ 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 {
+ NOTIMPLEMENTED();
+ return 0;
+ 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

View file

@ -0,0 +1,24 @@
--- 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)

View file

@ -0,0 +1,20 @@
--- 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

View file

@ -0,0 +1,11 @@
--- src/3rdparty/chromium/base/system/sys_info.h.orig 2019-11-27 21:12:25 UTC
+++ src/3rdparty/chromium/base/system/sys_info.h
@@ -192,7 +192,7 @@ class BASE_EXPORT SysInfo {
static bool IsLowEndDeviceImpl();
static HardwareInfo GetHardwareInfoSync();
-#if defined(OS_LINUX) || defined(OS_ANDROID) || defined(OS_AIX)
+#if defined(OS_LINUX) || defined(OS_ANDROID) || defined(OS_AIX) || defined(OS_BSD)
static int64_t AmountOfAvailablePhysicalMemory(
const SystemMemoryInfoKB& meminfo);
#endif

View file

@ -1,6 +1,6 @@
--- src/3rdparty/chromium/base/system/sys_info_freebsd.cc.orig 2019-05-23 12:39:34 UTC
--- 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,58 @@
@@ -13,26 +13,46 @@
namespace base {
int64_t SysInfo::AmountOfPhysicalMemoryImpl() {
@ -45,8 +45,8 @@
}
- 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 };
@ -56,16 +56,4 @@
+ 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

View file

@ -1,40 +1,11 @@
--- src/3rdparty/chromium/base/system/sys_info_posix.cc.orig 2019-05-23 12:39:34 UTC
--- 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
@@ -38,7 +38,7 @@
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() {
@@ -220,6 +220,8 @@ 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 (arch == "powerpc" || arch == "powerpc64") {
} else if (std::string(info.sysname) == "AIX") {
arch = "ppc64";
}
return arch;

View file

@ -1,20 +0,0 @@
--- 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

View file

@ -1,6 +1,6 @@
--- src/3rdparty/chromium/build/config/compiler/BUILD.gn.orig 2019-05-23 12:39:34 UTC
--- src/3rdparty/chromium/build/config/compiler/BUILD.gn.orig 2019-11-27 21:12:25 UTC
+++ src/3rdparty/chromium/build/config/compiler/BUILD.gn
@@ -56,7 +56,7 @@ declare_args() {
@@ -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 =
@ -9,7 +9,7 @@
(current_cpu == "x64" || current_cpu == "x86")
binutils_path = rebase_path("//third_party/binutils/Linux_x64/Release/bin",
root_build_dir)
@@ -281,7 +281,7 @@ config("compiler") {
@@ -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 &&
@ -18,7 +18,7 @@
# 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
@@ -412,7 +412,7 @@ config("compiler") {
@@ -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.
@ -27,30 +27,7 @@
ldflags += [
"-Wl,-z,defs",
"-Wl,--as-needed",
@@ -520,7 +520,7 @@ config("compiler") {
}
}
- if (is_clang && !is_nacl && !use_xcode_clang && !use_qt) {
+ if (is_clang && !is_nacl && !use_xcode_clang && !use_qt && !is_bsd) {
cflags += [
# 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") {
@@ -786,7 +786,7 @@ config("compiler_cpu_abi") {
cflags += [ "-mtune=$arm_tune" ]
}
} else if (current_cpu == "arm64") {
@ -59,7 +36,16 @@
cflags += [ "--target=aarch64-linux-gnu" ]
ldflags += [ "--target=aarch64-linux-gnu" ]
}
@@ -1522,7 +1522,7 @@ config("default_warnings") {
@@ -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" ]
}
@ -68,7 +54,7 @@
# Flags NaCl (Clang 3.7) and Xcode 9.2 (Clang clang-900.0.39.2) do not
# recognize.
cflags += [
@@ -1722,7 +1722,7 @@ config("thin_archive") {
@@ -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).
@ -77,16 +63,16 @@
arflags = [ "-T" ]
} else if (is_win && use_lld) {
arflags = [ "/llvmlibthin" ]
@@ -2314,7 +2314,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" ]
}
@@ -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) {
@@ -2335,7 +2335,7 @@ config("symbols") {
@@ -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" &&

View file

@ -1,7 +1,7 @@
--- src/3rdparty/chromium/build/config/linux/pkg-config.py.orig 2017-01-26 00:49:07 UTC
--- 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
@@ -57,8 +57,12 @@ def SetConfigPath(options):
print "You must specify an architecture via -a if using a sysroot."
@@ -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'
@ -15,12 +15,12 @@
os.environ['PKG_CONFIG_LIBDIR'] = libdir
return libdir
@@ -107,7 +111,7 @@ def main():
@@ -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 "[[],[],[],[],[]]"
print("[[],[],[],[],[]]")
return 0

View file

@ -1,21 +1,6 @@
--- src/3rdparty/chromium/build/toolchain/linux/BUILD.gn.orig 2019-05-23 14:39:34.000000000 +0200
+++ src/3rdparty/chromium/build/toolchain/linux/BUILD.gn 2019-10-29 02:47:24.026830000 +0100
@@ -5,6 +5,14 @@
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 @@
--- 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") {
}
clang_toolchain("clang_arm64") {

Some files were not shown because too many files have changed in this diff Show more