cpet/freebsd-ports
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Update Qt5 to 5.12.2

Browse Source 
- Thanks to kai for updating webengine.

Exp-run by:	antoine
PR:		236895
This commit is contained in:
Tobias C. Berner 2019-04-05 20:50:59 +00:00
parent 789d8f116a
commit 1c35361b47
Notes: svn2git 2021-03-31 03:12:20 +00:00 
svn path=/head/; revision=497990
121 changed files with 700 additions and 387 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
Mk/Uses/qt.mk
View File

@ -22,7 +22,7 @@ _QT_MK_INCLUDED= qt.mk
# Qt versions currently supported by the framework.
_QT_SUPPORTED?= 5
QT5_VERSION?= 5.12.1
QT5_VERSION?= 5.12.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)

1
accessibility/qt5-speech/Makefile
View File

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

4
devel/qt5-assistant/files/patch-src__src.pro
View File

@ -1,7 +1,7 @@
Only enter the directories we want to build, otherwise we might fail due to
missing dependencies.
--- src/src.pro.orig 2019-02-08 21:21:18 UTC
--- src/src.pro.orig 2019-03-18 18:40:06 UTC
+++ src/src.pro
@@ -1,54 +1,3 @@
TEMPLATE = subdirs
@ -43,7 +43,7 @@ missing dependencies.
-
-win32|winrt:SUBDIRS += windeployqt
-winrt:SUBDIRS += winrtrunner
-qtHaveModule(gui):!android:!uikit:!qnx:!winrt: SUBDIRS += qtdiag
-qtHaveModule(gui):!wasm:!android:!uikit:!qnx:!winrt: SUBDIRS += qtdiag
-
-qtNomakeTools( \
- distancefieldgenerator \

1
devel/qt5-core/Makefile
View File

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

4
devel/qt5-designer/files/patch-src__src.pro
View File

@ -1,7 +1,7 @@
Only enter the directories we want to build, otherwise we might fail due to
missing dependencies.
--- src/src.pro.orig 2019-02-08 21:28:33 UTC
--- src/src.pro.orig 2019-03-18 19:49:07 UTC
+++ src/src.pro
@@ -1,54 +1,3 @@
TEMPLATE = subdirs
@ -43,7 +43,7 @@ missing dependencies.
-
-win32|winrt:SUBDIRS += windeployqt
-winrt:SUBDIRS += winrtrunner
-qtHaveModule(gui):!android:!uikit:!qnx:!winrt: SUBDIRS += qtdiag
-qtHaveModule(gui):!wasm:!android:!uikit:!qnx:!winrt: SUBDIRS += qtdiag
-
-qtNomakeTools( \
- distancefieldgenerator \

4
devel/qt5-help/files/patch-src__src.pro
View File

@ -1,7 +1,7 @@
Only enter the directories we want to build, otherwise we might fail due to
missing dependencies.
--- src/src.pro.orig 2019-02-08 21:08:58 UTC
--- src/src.pro.orig 2019-03-18 18:25:44 UTC
+++ src/src.pro
@@ -1,54 +1,3 @@
TEMPLATE = subdirs
@ -43,7 +43,7 @@ missing dependencies.
-
-win32|winrt:SUBDIRS += windeployqt
-winrt:SUBDIRS += winrtrunner
-qtHaveModule(gui):!android:!uikit:!qnx:!winrt: SUBDIRS += qtdiag
-qtHaveModule(gui):!wasm:!android:!uikit:!qnx:!winrt: SUBDIRS += qtdiag
-
-qtNomakeTools( \
- distancefieldgenerator \

4
devel/qt5-linguist/files/patch-src__src.pro
View File

@ -1,7 +1,7 @@
Only enter the directories we want to build, otherwise we might fail due to
missing dependencies.
--- src/src.pro.orig 2019-02-08 21:36:50 UTC
--- src/src.pro.orig 2019-03-18 19:54:17 UTC
+++ src/src.pro
@@ -1,54 +1,3 @@
TEMPLATE = subdirs
@ -43,7 +43,7 @@ missing dependencies.
-
-win32|winrt:SUBDIRS += windeployqt
-winrt:SUBDIRS += winrtrunner
-qtHaveModule(gui):!android:!uikit:!qnx:!winrt: SUBDIRS += qtdiag
-qtHaveModule(gui):!wasm:!android:!uikit:!qnx:!winrt: SUBDIRS += qtdiag
-
-qtNomakeTools( \
- distancefieldgenerator \

6
devel/qt5-linguisttools/files/patch-src__src.pro
View File

@ -1,7 +1,7 @@
Only enter the directories we want to build, otherwise we might fail due to
missing dependencies.
--- src/src.pro.orig 2019-02-08 21:14:29 UTC
--- src/src.pro.orig 2019-03-18 18:35:56 UTC
+++ src/src.pro
@@ -1,54 +1,3 @@
TEMPLATE = subdirs
@ -43,7 +43,7 @@ missing dependencies.
-
-win32|winrt:SUBDIRS += windeployqt
-winrt:SUBDIRS += winrtrunner
-qtHaveModule(gui):!android:!uikit:!qnx:!winrt: SUBDIRS += qtdiag
-qtHaveModule(gui):!wasm:!android:!uikit:!qnx:!winrt: SUBDIRS += qtdiag
-
-qtNomakeTools( \
- distancefieldgenerator \
@ -58,4 +58,4 @@ missing dependencies.
- winrtrunner.depends += qtattributionsscanner
- linguist.depends += qtattributionsscanner
-}
+SUBDIRS += linguist \
+SUBDIRS += linguist

13
devel/qt5-location/files/patch-src_plugins_position_position.pro
View File

@ -1,13 +0,0 @@
--- src/plugins/position/position.pro.orig 2019-02-08 20:56:53 UTC
+++ src/plugins/position/position.pro
@@ -2,8 +2,8 @@ TEMPLATE = subdirs
QT_FOR_CONFIG += positioning-private
-linux:qtHaveModule(dbus):SUBDIRS += geoclue
-linux:qtHaveModule(dbus):SUBDIRS += geoclue2
+linux|freebsd:qtHaveModule(dbus):SUBDIRS += geoclue
+linux|freebsd:qtHaveModule(dbus):SUBDIRS += geoclue2
qtConfig(gypsy):SUBDIRS += gypsy
qtConfig(winrt_geolocation):SUBDIRS += winrt
qtHaveModule(simulator):SUBDIRS += simulator

4
devel/qt5-qdbus/files/patch-src_src.pro
View File

@ -1,7 +1,7 @@
Only enter the directories we want to build, otherwise we might fail due to
missing dependencies
--- src/src.pro.orig 2019-02-07 05:50:19 UTC
--- src/src.pro.orig 2019-03-18 18:07:43 UTC
+++ src/src.pro
@@ -1,54 +1,3 @@
TEMPLATE = subdirs
@ -43,7 +43,7 @@ missing dependencies
-
-win32|winrt:SUBDIRS += windeployqt
-winrt:SUBDIRS += winrtrunner
-qtHaveModule(gui):!android:!uikit:!qnx:!winrt: SUBDIRS += qtdiag
-qtHaveModule(gui):!wasm:!android:!uikit:!qnx:!winrt: SUBDIRS += qtdiag
-
-qtNomakeTools( \
- distancefieldgenerator \

4
devel/qt5-qdbusviewer/files/patch-src__src.pro
View File

@ -1,7 +1,7 @@
Only enter the directories we want to build, otherwise we might fail due to
missing dependencies.
--- src/src.pro.orig 2019-02-08 21:10:39 UTC
--- src/src.pro.orig 2019-03-18 18:27:32 UTC
+++ src/src.pro
@@ -1,54 +1,3 @@
TEMPLATE = subdirs
@ -43,7 +43,7 @@ missing dependencies.
-
-win32|winrt:SUBDIRS += windeployqt
-winrt:SUBDIRS += winrtrunner
-qtHaveModule(gui):!android:!uikit:!qnx:!winrt: SUBDIRS += qtdiag
-qtHaveModule(gui):!wasm:!android:!uikit:!qnx:!winrt: SUBDIRS += qtdiag
-
-qtNomakeTools( \
- distancefieldgenerator \

7
devel/qt5-qdoc/files/patch-src_src.pro
View File

@ -1,7 +1,4 @@
Only enter the directories we want to build, otherwise we might fail due to
missing dependencies.
--- src/src.pro.orig 2019-02-08 21:19:15 UTC
--- src/src.pro.orig 2019-03-18 18:40:57 UTC
+++ src/src.pro
@@ -1,54 +1,5 @@
TEMPLATE = subdirs
@ -43,7 +40,7 @@ missing dependencies.
-
-win32|winrt:SUBDIRS += windeployqt
-winrt:SUBDIRS += winrtrunner
-qtHaveModule(gui):!android:!uikit:!qnx:!winrt: SUBDIRS += qtdiag
-qtHaveModule(gui):!wasm:!android:!uikit:!qnx:!winrt: SUBDIRS += qtdiag
-
-qtNomakeTools( \
- distancefieldgenerator \

3
devel/qt5-qmake/pkg-plist
View File

@ -167,6 +167,7 @@
%%QT_MKSPECDIR%%/features/benchmark.prf
%%QT_MKSPECDIR%%/features/build_pass.prf
%%QT_MKSPECDIR%%/features/cmake_functions.prf
%%QT_MKSPECDIR%%/features/cmdline.prf
%%QT_MKSPECDIR%%/features/configure.prf
%%QT_MKSPECDIR%%/features/configure_base.prf
%%QT_MKSPECDIR%%/features/create_cmake.prf
@ -468,6 +469,8 @@
%%QT_MKSPECDIR%%/winrt-arm-msvc2015/qplatformdefs.h
%%QT_MKSPECDIR%%/winrt-arm-msvc2017/qmake.conf
%%QT_MKSPECDIR%%/winrt-arm-msvc2017/qplatformdefs.h
%%QT_MKSPECDIR%%/winrt-arm64-msvc2017/qmake.conf
%%QT_MKSPECDIR%%/winrt-arm64-msvc2017/qplatformdefs.h
%%QT_MKSPECDIR%%/winrt-x64-msvc2015/qmake.conf
%%QT_MKSPECDIR%%/winrt-x64-msvc2015/qplatformdefs.h
%%QT_MKSPECDIR%%/winrt-x64-msvc2017/qmake.conf

4
devel/qt5-uitools/files/patch-src__src.pro
View File

@ -1,7 +1,7 @@
Only enter the directories we want to build, otherwise we might fail due to
missing dependencies.
--- src/src.pro.orig 2019-02-08 21:08:17 UTC
--- src/src.pro.orig 2019-03-18 18:39:04 UTC
+++ src/src.pro
@@ -1,54 +1,3 @@
TEMPLATE = subdirs
@ -43,7 +43,7 @@ missing dependencies.
-
-win32|winrt:SUBDIRS += windeployqt
-winrt:SUBDIRS += winrtrunner
-qtHaveModule(gui):!android:!uikit:!qnx:!winrt: SUBDIRS += qtdiag
-qtHaveModule(gui):!wasm:!android:!uikit:!qnx:!winrt: SUBDIRS += qtdiag
-
-qtNomakeTools( \
- distancefieldgenerator \

158
devel/qt5/distinfo
View File

@ -1,79 +1,79 @@
TIMESTAMP = 1549515795
SHA256 (KDE/Qt/5.12.1/qt3d-everywhere-src-5.12.1.tar.xz) = ce51ed3fe403672db2c874cbaa60f3a139ec817abd1270dc5e4255d35fd64bf1
SIZE (KDE/Qt/5.12.1/qt3d-everywhere-src-5.12.1.tar.xz) = 84953112
SHA256 (KDE/Qt/5.12.1/qtactiveqt-everywhere-src-5.12.1.tar.xz) = a56fbd9aa018b9b91a1de6018db6538f4bc4309bfbdd86c52d437e7297983c45
SIZE (KDE/Qt/5.12.1/qtactiveqt-everywhere-src-5.12.1.tar.xz) = 261984
SHA256 (KDE/Qt/5.12.1/qtandroidextras-everywhere-src-5.12.1.tar.xz) = 17d0bfe13e75b1a28de2f35dc81670741fd227664aa155170453dc34c82e071e
SIZE (KDE/Qt/5.12.1/qtandroidextras-everywhere-src-5.12.1.tar.xz) = 104620
SHA256 (KDE/Qt/5.12.1/qtbase-everywhere-src-5.12.1.tar.xz) = 533078ce02678988576e224cb3844979907950cf83e0fda3364bc1d5701c9049
SIZE (KDE/Qt/5.12.1/qtbase-everywhere-src-5.12.1.tar.xz) = 48239912
SHA256 (KDE/Qt/5.12.1/qtcanvas3d-everywhere-src-5.12.1.tar.xz) = c7c940a06062b1e5078fd697e1da0cdaeaa315b6fcea81de15308a9d3f8ac254
SIZE (KDE/Qt/5.12.1/qtcanvas3d-everywhere-src-5.12.1.tar.xz) = 10915000
SHA256 (KDE/Qt/5.12.1/qtcharts-everywhere-src-5.12.1.tar.xz) = 142eb2b87a0bc2220a9f12e56bf390b846968c201d135b1a2a2338545692fdc0
SIZE (KDE/Qt/5.12.1/qtcharts-everywhere-src-5.12.1.tar.xz) = 4242664
SHA256 (KDE/Qt/5.12.1/qtconnectivity-everywhere-src-5.12.1.tar.xz) = 0edd0bd784a71809540dc23d24a842bd88dee2cdb5394b69c9e704f7e1ac8d6c
SIZE (KDE/Qt/5.12.1/qtconnectivity-everywhere-src-5.12.1.tar.xz) = 2748888
SHA256 (KDE/Qt/5.12.1/qtdatavis3d-everywhere-src-5.12.1.tar.xz) = 8ebb94459e5eb5b978dcdac1d2d6503a7763d790ce74b03f78388beb480436a0
SIZE (KDE/Qt/5.12.1/qtdatavis3d-everywhere-src-5.12.1.tar.xz) = 5199768
SHA256 (KDE/Qt/5.12.1/qtdeclarative-everywhere-src-5.12.1.tar.xz) = a384a734d94f28a98aa74e076d50fa6b9724af83526feb6c371945545d8cb409
SIZE (KDE/Qt/5.12.1/qtdeclarative-everywhere-src-5.12.1.tar.xz) = 20486428
SHA256 (KDE/Qt/5.12.1/qtdoc-everywhere-src-5.12.1.tar.xz) = 7d4204e6ef5d9307975337cd18ffdc0b04e2d851c368eb36a48b9331377deadd
SIZE (KDE/Qt/5.12.1/qtdoc-everywhere-src-5.12.1.tar.xz) = 5588248
SHA256 (KDE/Qt/5.12.1/qtgamepad-everywhere-src-5.12.1.tar.xz) = 717c11f8fba4e23c0096fcf3161d43223956038e866fcd7a18d2255755415d62
SIZE (KDE/Qt/5.12.1/qtgamepad-everywhere-src-5.12.1.tar.xz) = 385492
SHA256 (KDE/Qt/5.12.1/qtgraphicaleffects-everywhere-src-5.12.1.tar.xz) = 2e63abf6b02b86461b73b317eba00b6721601a9469c22da28e3f4ea1d5df68d7
SIZE (KDE/Qt/5.12.1/qtgraphicaleffects-everywhere-src-5.12.1.tar.xz) = 14270888
SHA256 (KDE/Qt/5.12.1/qtimageformats-everywhere-src-5.12.1.tar.xz) = 0425f35dbcc83cd5840e2d3a73ed4c57c426af9d6ac7b9fe3a40d23560653421
SIZE (KDE/Qt/5.12.1/qtimageformats-everywhere-src-5.12.1.tar.xz) = 1782660
SHA256 (KDE/Qt/5.12.1/qtlocation-everywhere-src-5.12.1.tar.xz) = 8b922373e6eefd1b0e2a993dbf3d0b3f3df777bc720d40cad3ccb46e1936bc50
SIZE (KDE/Qt/5.12.1/qtlocation-everywhere-src-5.12.1.tar.xz) = 5902336
SHA256 (KDE/Qt/5.12.1/qtmacextras-everywhere-src-5.12.1.tar.xz) = af6449c052aea19d100deb2b7f558835b8b88862d6bfdae3c510b60c80bc64c3
SIZE (KDE/Qt/5.12.1/qtmacextras-everywhere-src-5.12.1.tar.xz) = 68680
SHA256 (KDE/Qt/5.12.1/qtmultimedia-everywhere-src-5.12.1.tar.xz) = 9c5ba11225f57d3a8124f109514443e290a9eb94e063a5b1f78e63edfb5f0b18
SIZE (KDE/Qt/5.12.1/qtmultimedia-everywhere-src-5.12.1.tar.xz) = 3740192
SHA256 (KDE/Qt/5.12.1/qtnetworkauth-everywhere-src-5.12.1.tar.xz) = 090fbb6be35b2f2edf7cc4cb32f0f9c27a9a66defa06f6d23e1397836e31d44c
SIZE (KDE/Qt/5.12.1/qtnetworkauth-everywhere-src-5.12.1.tar.xz) = 139024
SHA256 (KDE/Qt/5.12.1/qtpurchasing-everywhere-src-5.12.1.tar.xz) = 80485095ab64f48951b27795c72e7ed7c13e1ab3db2670c061548834584b1d19
SIZE (KDE/Qt/5.12.1/qtpurchasing-everywhere-src-5.12.1.tar.xz) = 207812
SHA256 (KDE/Qt/5.12.1/qtquickcontrols2-everywhere-src-5.12.1.tar.xz) = caa47b6d771b11c65d595fdd0f0942c3d78cda2884d318e3b1da8ec67155a8e7
SIZE (KDE/Qt/5.12.1/qtquickcontrols2-everywhere-src-5.12.1.tar.xz) = 9289452
SHA256 (KDE/Qt/5.12.1/qtquickcontrols-everywhere-src-5.12.1.tar.xz) = 15164b00921352b5145a4fc3be0015b8521138a0cb1ecfb9811f39fd35ecd62c
SIZE (KDE/Qt/5.12.1/qtquickcontrols-everywhere-src-5.12.1.tar.xz) = 6055248
SHA256 (KDE/Qt/5.12.1/qtremoteobjects-everywhere-src-5.12.1.tar.xz) = f18cfde8d060d76f5f56ffb701a27f6e0c39b5abdae3dbac933dbb41d191f740
SIZE (KDE/Qt/5.12.1/qtremoteobjects-everywhere-src-5.12.1.tar.xz) = 335956
SHA256 (KDE/Qt/5.12.1/qtscript-everywhere-src-5.12.1.tar.xz) = e5c158fb85799404d20d1ec5dd33a25d5f5736807e1008ce626f666a52c80624
SIZE (KDE/Qt/5.12.1/qtscript-everywhere-src-5.12.1.tar.xz) = 2674208
SHA256 (KDE/Qt/5.12.1/qtscxml-everywhere-src-5.12.1.tar.xz) = 59a2aa1000fe03b0a3eff6fddd21f782e305408fcdd7af1f564a382331cb20b7
SIZE (KDE/Qt/5.12.1/qtscxml-everywhere-src-5.12.1.tar.xz) = 434112
SHA256 (KDE/Qt/5.12.1/qtsensors-everywhere-src-5.12.1.tar.xz) = ebc8b4bcfacf10c3bea3f400da7bf3fc7f44f90fa9eb0320c3b87f17307a63e4
SIZE (KDE/Qt/5.12.1/qtsensors-everywhere-src-5.12.1.tar.xz) = 2036116
SHA256 (KDE/Qt/5.12.1/qtserialbus-everywhere-src-5.12.1.tar.xz) = 97f0c690c77b0e19a8c90e376ecc94d59b21adb20a90179700d1c514a4c50d74
SIZE (KDE/Qt/5.12.1/qtserialbus-everywhere-src-5.12.1.tar.xz) = 328608
SHA256 (KDE/Qt/5.12.1/qtserialport-everywhere-src-5.12.1.tar.xz) = 243b2502283c45f5163d68c3f23c787d46eb0e3ba58f3d9a0560dc7968a6ce19
SIZE (KDE/Qt/5.12.1/qtserialport-everywhere-src-5.12.1.tar.xz) = 302656
SHA256 (KDE/Qt/5.12.1/qtspeech-everywhere-src-5.12.1.tar.xz) = 147524ba6f97c76784beb315ee939614b7a3b4eb1a6417cc0beea662cf0d9121
SIZE (KDE/Qt/5.12.1/qtspeech-everywhere-src-5.12.1.tar.xz) = 99716
SHA256 (KDE/Qt/5.12.1/qtsvg-everywhere-src-5.12.1.tar.xz) = 5bc1f744d32c06f5aa4eff33759568106a995ce21fa1326a247dfa5f783f63c8
SIZE (KDE/Qt/5.12.1/qtsvg-everywhere-src-5.12.1.tar.xz) = 1859248
SHA256 (KDE/Qt/5.12.1/qttools-everywhere-src-5.12.1.tar.xz) = ab1da4fbd84a9d3873e4ed212a0ae614c6059b8e7dca2f0a599a6f7e61f6cbf3
SIZE (KDE/Qt/5.12.1/qttools-everywhere-src-5.12.1.tar.xz) = 9818060
SHA256 (KDE/Qt/5.12.1/qttranslations-everywhere-src-5.12.1.tar.xz) = 7443d70d8572321e810c52fbdd096666e61510e07e17437f1910f0b800cca6a7
SIZE (KDE/Qt/5.12.1/qttranslations-everywhere-src-5.12.1.tar.xz) = 1372812
SHA256 (KDE/Qt/5.12.1/qtvirtualkeyboard-everywhere-src-5.12.1.tar.xz) = a9e3ed4786d603314144c7ad29a9fdeb6e5c3f2ea5a27f6545cc9777244cd683
SIZE (KDE/Qt/5.12.1/qtvirtualkeyboard-everywhere-src-5.12.1.tar.xz) = 10917704
SHA256 (KDE/Qt/5.12.1/qtwayland-everywhere-src-5.12.1.tar.xz) = 88f0507628b3697b0d59349d27b5e60a313a3138927722d6cf981089fff02553
SIZE (KDE/Qt/5.12.1/qtwayland-everywhere-src-5.12.1.tar.xz) = 430032
SHA256 (KDE/Qt/5.12.1/qtwebchannel-everywhere-src-5.12.1.tar.xz) = 40c3e74347c67a9864d0d54f14120555860e4ce529746407325b3cd6e9aeb5bf
SIZE (KDE/Qt/5.12.1/qtwebchannel-everywhere-src-5.12.1.tar.xz) = 182060
SHA256 (KDE/Qt/5.12.1/qtwebengine-everywhere-src-5.12.1.tar.xz) = 43e91e06bc4a60ef0f91d15ae06425cf9c6b4f7dafe960259a5b013c687c3bd0
SIZE (KDE/Qt/5.12.1/qtwebengine-everywhere-src-5.12.1.tar.xz) = 249191844
SHA256 (KDE/Qt/5.12.1/qtwebsockets-everywhere-src-5.12.1.tar.xz) = 2fd0627916d817599c5f855a97156113ed3625b90b350603be6f668762abfc79
SIZE (KDE/Qt/5.12.1/qtwebsockets-everywhere-src-5.12.1.tar.xz) = 235360
SHA256 (KDE/Qt/5.12.1/qtwebview-everywhere-src-5.12.1.tar.xz) = 092624ba45913f6c90f7311c96bb5c3e97f2c2b427d834d3669434f97234bc97
SIZE (KDE/Qt/5.12.1/qtwebview-everywhere-src-5.12.1.tar.xz) = 130712
SHA256 (KDE/Qt/5.12.1/qtwinextras-everywhere-src-5.12.1.tar.xz) = 8d312155a7da329df41cc2ea5d265eb632be7dd9cbd789fa3bc0206b4022f557
SIZE (KDE/Qt/5.12.1/qtwinextras-everywhere-src-5.12.1.tar.xz) = 759900
SHA256 (KDE/Qt/5.12.1/qtx11extras-everywhere-src-5.12.1.tar.xz) = 08fb1c40e1562d43087368a5efa39569fa1ad52b72d2360f9fc1fe18b00da366
SIZE (KDE/Qt/5.12.1/qtx11extras-everywhere-src-5.12.1.tar.xz) = 115964
SHA256 (KDE/Qt/5.12.1/qtxmlpatterns-everywhere-src-5.12.1.tar.xz) = 76988ca9a7a184b9013b8a5864dad150e4603890c7eb7aecad4baad071802ecb
SIZE (KDE/Qt/5.12.1/qtxmlpatterns-everywhere-src-5.12.1.tar.xz) = 1389136
TIMESTAMP = 1552888505
SHA256 (KDE/Qt/5.12.2/qt3d-everywhere-src-5.12.2.tar.xz) = d4036e7ac146ba78784dde0dd99e8182372b7c38e832e33b61fed4187de0ad06
SIZE (KDE/Qt/5.12.2/qt3d-everywhere-src-5.12.2.tar.xz) = 84950848
SHA256 (KDE/Qt/5.12.2/qtactiveqt-everywhere-src-5.12.2.tar.xz) = 281ec22e43c5e8385ed7da0ad7f317cf200bc6c2b72e6980e7c1c318635c636b
SIZE (KDE/Qt/5.12.2/qtactiveqt-everywhere-src-5.12.2.tar.xz) = 261972
SHA256 (KDE/Qt/5.12.2/qtandroidextras-everywhere-src-5.12.2.tar.xz) = a48e524b0b4e43f3784083f956fda29eb388b7beb7b8bb4f786d9ed8cbc5ef92
SIZE (KDE/Qt/5.12.2/qtandroidextras-everywhere-src-5.12.2.tar.xz) = 104672
SHA256 (KDE/Qt/5.12.2/qtbase-everywhere-src-5.12.2.tar.xz) = 562c095a59c95f393762ec53bc05c0d80fad1758fd5ff7a5231967d1a98d56c1
SIZE (KDE/Qt/5.12.2/qtbase-everywhere-src-5.12.2.tar.xz) = 48364464
SHA256 (KDE/Qt/5.12.2/qtcanvas3d-everywhere-src-5.12.2.tar.xz) = 5e74b083294956505945621f6f56a3d7a314502277a109d6fb6b25c74dea2dca
SIZE (KDE/Qt/5.12.2/qtcanvas3d-everywhere-src-5.12.2.tar.xz) = 10915092
SHA256 (KDE/Qt/5.12.2/qtcharts-everywhere-src-5.12.2.tar.xz) = 11d88d3e0ec86730219f7c2efa17f696ec8766415c488b208bfcb8f3c3a68a31
SIZE (KDE/Qt/5.12.2/qtcharts-everywhere-src-5.12.2.tar.xz) = 4242568
SHA256 (KDE/Qt/5.12.2/qtconnectivity-everywhere-src-5.12.2.tar.xz) = 15eb21a1c102408e43c7204a82ad144e97ebe05dc4a15edb0900cd49762a226e
SIZE (KDE/Qt/5.12.2/qtconnectivity-everywhere-src-5.12.2.tar.xz) = 2750052
SHA256 (KDE/Qt/5.12.2/qtdatavis3d-everywhere-src-5.12.2.tar.xz) = 4758a8126335e90f194c2a3aadd4db5eb2e3926e34faf908695945aa4f0d4690
SIZE (KDE/Qt/5.12.2/qtdatavis3d-everywhere-src-5.12.2.tar.xz) = 5201424
SHA256 (KDE/Qt/5.12.2/qtdeclarative-everywhere-src-5.12.2.tar.xz) = 470568745602e7fa21cdca42b1641162e4257cfeb7a2dcf8af24538c9516cc5b
SIZE (KDE/Qt/5.12.2/qtdeclarative-everywhere-src-5.12.2.tar.xz) = 20496648
SHA256 (KDE/Qt/5.12.2/qtdoc-everywhere-src-5.12.2.tar.xz) = ced15d42f1be7057e928d612e548ae5a0560f000328c4db9fd343bbbb18f7fe1
SIZE (KDE/Qt/5.12.2/qtdoc-everywhere-src-5.12.2.tar.xz) = 5649800
SHA256 (KDE/Qt/5.12.2/qtgamepad-everywhere-src-5.12.2.tar.xz) = d289d8c983f4e88018c9ccb22bbde196c9f97efd20ecd48ae92994885f2334a7
SIZE (KDE/Qt/5.12.2/qtgamepad-everywhere-src-5.12.2.tar.xz) = 385808
SHA256 (KDE/Qt/5.12.2/qtgraphicaleffects-everywhere-src-5.12.2.tar.xz) = 429398b6c661897b3c7cd62fb3657a2de60ad9152578edeeca0abde6e7ae5a86
SIZE (KDE/Qt/5.12.2/qtgraphicaleffects-everywhere-src-5.12.2.tar.xz) = 14271176
SHA256 (KDE/Qt/5.12.2/qtimageformats-everywhere-src-5.12.2.tar.xz) = 1ea757728f205deb6b3f5873f5c7c3129cded5993077500a9fb249559bee7a9c
SIZE (KDE/Qt/5.12.2/qtimageformats-everywhere-src-5.12.2.tar.xz) = 1788388
SHA256 (KDE/Qt/5.12.2/qtlocation-everywhere-src-5.12.2.tar.xz) = a31f27f457ac57e7203ae808b95ba0053d182e22425de03840af761e343d8bef
SIZE (KDE/Qt/5.12.2/qtlocation-everywhere-src-5.12.2.tar.xz) = 5907108
SHA256 (KDE/Qt/5.12.2/qtmacextras-everywhere-src-5.12.2.tar.xz) = b793a8ba24282c7c695be0e17ad6120264593efd744b22f8dacba4c356044160
SIZE (KDE/Qt/5.12.2/qtmacextras-everywhere-src-5.12.2.tar.xz) = 68668
SHA256 (KDE/Qt/5.12.2/qtmultimedia-everywhere-src-5.12.2.tar.xz) = 5d3c90c546e64abf523432a3df5e7a3f1b5ad72e7d0b5ea6260729fbefeb30f5
SIZE (KDE/Qt/5.12.2/qtmultimedia-everywhere-src-5.12.2.tar.xz) = 3745076
SHA256 (KDE/Qt/5.12.2/qtnetworkauth-everywhere-src-5.12.2.tar.xz) = 5876c1d8e37238eca8d5fbc945dfeb90bac013597bcac5c5beff23c12a8a4383
SIZE (KDE/Qt/5.12.2/qtnetworkauth-everywhere-src-5.12.2.tar.xz) = 139104
SHA256 (KDE/Qt/5.12.2/qtpurchasing-everywhere-src-5.12.2.tar.xz) = d3466f764d99918c07b9e68301af4572002a32cf3138393853fc0b83d3955caa
SIZE (KDE/Qt/5.12.2/qtpurchasing-everywhere-src-5.12.2.tar.xz) = 207828
SHA256 (KDE/Qt/5.12.2/qtquickcontrols2-everywhere-src-5.12.2.tar.xz) = 1fbd703612a2c0257861e07a2b709f6fbad00cb6df70a1c2c1fafa9de522e549
SIZE (KDE/Qt/5.12.2/qtquickcontrols2-everywhere-src-5.12.2.tar.xz) = 9291844
SHA256 (KDE/Qt/5.12.2/qtquickcontrols-everywhere-src-5.12.2.tar.xz) = 9b5c87605d08849927dd09bf9b03a939511461372b7e20004abe1116cf9fc73e
SIZE (KDE/Qt/5.12.2/qtquickcontrols-everywhere-src-5.12.2.tar.xz) = 6054972
SHA256 (KDE/Qt/5.12.2/qtremoteobjects-everywhere-src-5.12.2.tar.xz) = 2ae04817cd67c8550ccc685e6db9ca78ed2d7ec0b90e1de28a9fd7cda88d9811
SIZE (KDE/Qt/5.12.2/qtremoteobjects-everywhere-src-5.12.2.tar.xz) = 336052
SHA256 (KDE/Qt/5.12.2/qtscript-everywhere-src-5.12.2.tar.xz) = f8717d51072b4d4455755ae081e45f23f3d0ce25602f96231dd7703bd818a2e6
SIZE (KDE/Qt/5.12.2/qtscript-everywhere-src-5.12.2.tar.xz) = 2673104
SHA256 (KDE/Qt/5.12.2/qtscxml-everywhere-src-5.12.2.tar.xz) = 69592542fdf4b2efe6a6378ecb1bfdda9e7f48007e191d7f77a0009e213a8623
SIZE (KDE/Qt/5.12.2/qtscxml-everywhere-src-5.12.2.tar.xz) = 434184
SHA256 (KDE/Qt/5.12.2/qtsensors-everywhere-src-5.12.2.tar.xz) = 758a131ad86c4b8b8364e48d659a680ed12d03c091c5ab2958d06b7b0aa2e50c
SIZE (KDE/Qt/5.12.2/qtsensors-everywhere-src-5.12.2.tar.xz) = 2036148
SHA256 (KDE/Qt/5.12.2/qtserialbus-everywhere-src-5.12.2.tar.xz) = 16bfee0be81805d82d4f9c04425b5bc2678ca01fa1617fc72613a893438aaa48
SIZE (KDE/Qt/5.12.2/qtserialbus-everywhere-src-5.12.2.tar.xz) = 328700
SHA256 (KDE/Qt/5.12.2/qtserialport-everywhere-src-5.12.2.tar.xz) = 72163cedda4c6fa787db8666bec6b5057272dc87bf8de6addba3440dd472bd7f
SIZE (KDE/Qt/5.12.2/qtserialport-everywhere-src-5.12.2.tar.xz) = 302792
SHA256 (KDE/Qt/5.12.2/qtspeech-everywhere-src-5.12.2.tar.xz) = 5ad4b5931d6a677d8c4569a2a9147b992653962b339bd2f233400ffb43955911
SIZE (KDE/Qt/5.12.2/qtspeech-everywhere-src-5.12.2.tar.xz) = 99828
SHA256 (KDE/Qt/5.12.2/qtsvg-everywhere-src-5.12.2.tar.xz) = ed9f2118a6d33f53e5d9ed18dcd36f252a4fbaf68382a1c4a663ba75b25ae7bd
SIZE (KDE/Qt/5.12.2/qtsvg-everywhere-src-5.12.2.tar.xz) = 1859108
SHA256 (KDE/Qt/5.12.2/qttools-everywhere-src-5.12.2.tar.xz) = 4aa3a089794ab1c629b666fffb5da4371351a9e85ea691d5d988c2ff63586005
SIZE (KDE/Qt/5.12.2/qttools-everywhere-src-5.12.2.tar.xz) = 9808600
SHA256 (KDE/Qt/5.12.2/qttranslations-everywhere-src-5.12.2.tar.xz) = bbe47b3995be8528ee5e78eae263a5ec224cd18e588219191716a17802e60c7b
SIZE (KDE/Qt/5.12.2/qttranslations-everywhere-src-5.12.2.tar.xz) = 1372756
SHA256 (KDE/Qt/5.12.2/qtvirtualkeyboard-everywhere-src-5.12.2.tar.xz) = 7111de5c78f8a0d29394409727647b90ae5906fd5105c843af98c3ae3804248d
SIZE (KDE/Qt/5.12.2/qtvirtualkeyboard-everywhere-src-5.12.2.tar.xz) = 10919524
SHA256 (KDE/Qt/5.12.2/qtwayland-everywhere-src-5.12.2.tar.xz) = b7840692420d106871433eb1b678277f09927d48ec6eb31a1851ee9c60d9df84
SIZE (KDE/Qt/5.12.2/qtwayland-everywhere-src-5.12.2.tar.xz) = 431976
SHA256 (KDE/Qt/5.12.2/qtwebchannel-everywhere-src-5.12.2.tar.xz) = 8eb9cff9492937daa1bf5d001e39afec68c310ce5596807345e2a555dcc80b8e
SIZE (KDE/Qt/5.12.2/qtwebchannel-everywhere-src-5.12.2.tar.xz) = 182736
SHA256 (KDE/Qt/5.12.2/qtwebengine-everywhere-src-5.12.2.tar.xz) = 082b1d6e60c1be61881bc8533acc67d9688620d6b3a538417f62b27b34ead493
SIZE (KDE/Qt/5.12.2/qtwebengine-everywhere-src-5.12.2.tar.xz) = 249240772
SHA256 (KDE/Qt/5.12.2/qtwebsockets-everywhere-src-5.12.2.tar.xz) = ab9ce815b1466abe52910c9b50c0f61df8af74f9521574bb534f7f562d0e8c04
SIZE (KDE/Qt/5.12.2/qtwebsockets-everywhere-src-5.12.2.tar.xz) = 235208
SHA256 (KDE/Qt/5.12.2/qtwebview-everywhere-src-5.12.2.tar.xz) = 44c131e2f21aded85424e355f433ac51d81925065d21b113568c6d62cf73ee90
SIZE (KDE/Qt/5.12.2/qtwebview-everywhere-src-5.12.2.tar.xz) = 130972
SHA256 (KDE/Qt/5.12.2/qtwinextras-everywhere-src-5.12.2.tar.xz) = 3141027c4f7dbb2bcef8a35fd60d673adfff0e4fb20c36f73930570252136787
SIZE (KDE/Qt/5.12.2/qtwinextras-everywhere-src-5.12.2.tar.xz) = 759968
SHA256 (KDE/Qt/5.12.2/qtx11extras-everywhere-src-5.12.2.tar.xz) = 711f39ddc6237787a5522278be235fe3af547a4674bb265e6dff5c2892fe6084
SIZE (KDE/Qt/5.12.2/qtx11extras-everywhere-src-5.12.2.tar.xz) = 115860
SHA256 (KDE/Qt/5.12.2/qtxmlpatterns-everywhere-src-5.12.2.tar.xz) = 2e535ec17b542f2a0b87a9db93284666015cc07b6188894ace7e75104c6d860d
SIZE (KDE/Qt/5.12.2/qtxmlpatterns-everywhere-src-5.12.2.tar.xz) = 1389320

3
graphics/qt5-3d/pkg-plist
View File

@ -1181,7 +1181,6 @@
%%QT_CMAKEDIR%%/Qt53DQuickScene2D/Qt53DQuickScene2DConfigVersion.cmake
%%QT_CMAKEDIR%%/Qt53DRender/Qt53DRenderConfig.cmake
%%QT_CMAKEDIR%%/Qt53DRender/Qt53DRenderConfigVersion.cmake
%%QT_CMAKEDIR%%/Qt53DRender/Qt53DRender_AssimpSceneImportPlugin.cmake
%%QT_CMAKEDIR%%/Qt53DRender/Qt53DRender_DefaultGeometryLoaderPlugin.cmake
%%QT_CMAKEDIR%%/Qt53DRender/Qt53DRender_GLTFGeometryLoaderPlugin.cmake
%%QT_CMAKEDIR%%/Qt53DRender/Qt53DRender_GLTFSceneExportPlugin.cmake
@ -1290,8 +1289,6 @@
%%DEBUG%%%%QT_PLUGINDIR%%/geometryloaders/libgltfgeometryloader.so.debug
%%QT_PLUGINDIR%%/renderplugins/libscene2d.so
%%DEBUG%%%%QT_PLUGINDIR%%/renderplugins/libscene2d.so.debug
%%QT_PLUGINDIR%%/sceneparsers/libassimpsceneimport.so
%%DEBUG%%%%QT_PLUGINDIR%%/sceneparsers/libassimpsceneimport.so.debug
%%QT_PLUGINDIR%%/sceneparsers/libgltfsceneexport.so
%%DEBUG%%%%QT_PLUGINDIR%%/sceneparsers/libgltfsceneexport.so.debug
%%QT_PLUGINDIR%%/sceneparsers/libgltfsceneimport.so

4
graphics/qt5-pixeltool/files/patch-src__src.pro
View File

@ -1,7 +1,7 @@
Only enter the directories we want to build, otherwise we might fail due to
missing dependencies.
--- src/src.pro.orig 2019-02-08 21:09:32 UTC
--- src/src.pro.orig 2019-03-18 18:28:15 UTC
+++ src/src.pro
@@ -1,54 +1,3 @@
TEMPLATE = subdirs
@ -43,7 +43,7 @@ missing dependencies.
-
-win32|winrt:SUBDIRS += windeployqt
-winrt:SUBDIRS += winrtrunner
-qtHaveModule(gui):!android:!uikit:!qnx:!winrt: SUBDIRS += qtdiag
-qtHaveModule(gui):!wasm:!android:!uikit:!qnx:!winrt: SUBDIRS += qtdiag
-
-qtNomakeTools( \
- distancefieldgenerator \

18
graphics/qt5-wayland/pkg-plist
View File

@ -1,5 +1,14 @@
%%QT_INCDIR%%/QtWaylandClient/%%FULLVER%%/QtWaylandClient/private/qtwaylandclient-config_p.h
%%QT_INCDIR%%/QtWaylandClient/%%FULLVER%%/QtWaylandClient/private/qtwaylandclientglobal_p.h
%%QT_INCDIR%%/QtWaylandClient/%%FULLVER%%/QtWaylandClient/private/qwayland-hardware-integration.h
%%QT_INCDIR%%/QtWaylandClient/%%FULLVER%%/QtWaylandClient/private/qwayland-qt-key-unstable-v1.h
%%QT_INCDIR%%/QtWaylandClient/%%FULLVER%%/QtWaylandClient/private/qwayland-qt-windowmanager.h
%%QT_INCDIR%%/QtWaylandClient/%%FULLVER%%/QtWaylandClient/private/qwayland-server-buffer-extension.h
%%QT_INCDIR%%/QtWaylandClient/%%FULLVER%%/QtWaylandClient/private/qwayland-surface-extension.h
%%QT_INCDIR%%/QtWaylandClient/%%FULLVER%%/QtWaylandClient/private/qwayland-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-xdg-output-unstable-v1.h
%%QT_INCDIR%%/QtWaylandClient/%%FULLVER%%/QtWaylandClient/private/qwaylandabstractdecoration_p.h
%%QT_INCDIR%%/QtWaylandClient/%%FULLVER%%/QtWaylandClient/private/qwaylandbuffer_p.h
%%QT_INCDIR%%/QtWaylandClient/%%FULLVER%%/QtWaylandClient/private/qwaylandclientbufferintegration_p.h
@ -41,6 +50,15 @@
%%QT_INCDIR%%/QtWaylandClient/%%FULLVER%%/QtWaylandClient/private/qwaylandtouch_p.h
%%QT_INCDIR%%/QtWaylandClient/%%FULLVER%%/QtWaylandClient/private/qwaylandwindow_p.h
%%QT_INCDIR%%/QtWaylandClient/%%FULLVER%%/QtWaylandClient/private/qwaylandwindowmanagerintegration_p.h
%%QT_INCDIR%%/QtWaylandClient/%%FULLVER%%/QtWaylandClient/private/wayland-hardware-integration-client-protocol.h
%%QT_INCDIR%%/QtWaylandClient/%%FULLVER%%/QtWaylandClient/private/wayland-qt-key-unstable-v1-client-protocol.h
%%QT_INCDIR%%/QtWaylandClient/%%FULLVER%%/QtWaylandClient/private/wayland-qt-windowmanager-client-protocol.h
%%QT_INCDIR%%/QtWaylandClient/%%FULLVER%%/QtWaylandClient/private/wayland-server-buffer-extension-client-protocol.h
%%QT_INCDIR%%/QtWaylandClient/%%FULLVER%%/QtWaylandClient/private/wayland-surface-extension-client-protocol.h
%%QT_INCDIR%%/QtWaylandClient/%%FULLVER%%/QtWaylandClient/private/wayland-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-xdg-output-unstable-v1-client-protocol.h
%%QT_INCDIR%%/QtWaylandClient/QWaylandClientExtension
%%QT_INCDIR%%/QtWaylandClient/QWaylandClientExtensionTemplate
%%QT_INCDIR%%/QtWaylandClient/QtWaylandClient

2
misc/qt5-doc/Makefile
View File

@ -6,7 +6,7 @@ DISTVERSION= ${QT5_VERSION}
CATEGORIES= misc
MASTER_SITES= QT/online/qtsdkrepository/linux_x64/desktop/qt5_${QT5_VERSION:S/.//g}_src_doc_examples/qt.qt5.${QT5_VERSION:S/.//g}.doc/
PKGNAMEPREFIX= qt5-
DISTNAME= ${QT5_VERSION}-0-201901300533qt-everywhere-documentation
DISTNAME= ${QT5_VERSION}-0-201903121945qt-everywhere-documentation
DIST_SUBDIR= KDE/Qt/${QT5_VERSION}
MAINTAINER= kde@FreeBSD.org

6
misc/qt5-doc/distinfo
View File

@ -1,3 +1,3 @@
TIMESTAMP = 1549517894
SHA256 (KDE/Qt/5.12.1/5.12.1-0-201901300533qt-everywhere-documentation.7z) = 7396a7154e30ba53719f8f147ebbf04c89111e66876a9f2f7c798924563b35a9
SIZE (KDE/Qt/5.12.1/5.12.1-0-201901300533qt-everywhere-documentation.7z) = 253481395
TIMESTAMP = 1552888823
SHA256 (KDE/Qt/5.12.2/5.12.2-0-201903121945qt-everywhere-documentation.7z) = a0591b89c2c9dd935c85e09ee738f14be64c0b9b66c4a53b32cebce26aeeda24
SIZE (KDE/Qt/5.12.2/5.12.2-0-201903121945qt-everywhere-documentation.7z) = 253951223

38
misc/qt5-doc/pkg-plist
View File

@ -4072,6 +4072,7 @@
%%QT_DOCDIR%%/qtdoc/images/project-view-2.png
%%QT_DOCDIR%%/qtdoc/images/project-view.png
%%QT_DOCDIR%%/qtdoc/images/project-wizard.png
%%QT_DOCDIR%%/qtdoc/images/qml-extending-types.gif
%%QT_DOCDIR%%/qtdoc/images/qml-uses-animation.png
%%QT_DOCDIR%%/qtdoc/images/qml-uses-integratingjs.png
%%QT_DOCDIR%%/qtdoc/images/qml-uses-layouts-anchors.png
@ -4512,6 +4513,7 @@
%%QT_DOCDIR%%/qtdoc/qtexamplesandtutorials.html
%%QT_DOCDIR%%/qtdoc/qtmain.html
%%QT_DOCDIR%%/qtdoc/qtmodules.html
%%QT_DOCDIR%%/qtdoc/qtopenglextensions.html
%%QT_DOCDIR%%/qtdoc/qtquick-debugging.html
%%QT_DOCDIR%%/qtdoc/qtquick-deployment.html
%%QT_DOCDIR%%/qtdoc/qtquick-internationalization.html
@ -4568,6 +4570,7 @@
%%QT_DOCDIR%%/qtdoc/unicode.html
%%QT_DOCDIR%%/qtdoc/unix-signals.html
%%QT_DOCDIR%%/qtdoc/vxworks.html
%%QT_DOCDIR%%/qtdoc/wasm.html
%%QT_DOCDIR%%/qtdoc/webgl.html
%%QT_DOCDIR%%/qtdoc/whatsnew50.html
%%QT_DOCDIR%%/qtdoc/whatsnew51.html
@ -4635,6 +4638,10 @@
%%QT_DOCDIR%%/qtgamepad/qgamepadmanager-members.html
%%QT_DOCDIR%%/qtgamepad/qgamepadmanager-obsolete.html
%%QT_DOCDIR%%/qtgamepad/qgamepadmanager.html
%%QT_DOCDIR%%/qtgamepad/qml-qtgamepad-gamepad-members.html
%%QT_DOCDIR%%/qtgamepad/qml-qtgamepad-gamepad.html
%%QT_DOCDIR%%/qtgamepad/qml-qtgamepad-gamepadmanager-members.html
%%QT_DOCDIR%%/qtgamepad/qml-qtgamepad-gamepadmanager.html
%%QT_DOCDIR%%/qtgamepad/qtgamepad-configurebuttons-android-androidmanifest-xml.html
%%QT_DOCDIR%%/qtgamepad/qtgamepad-configurebuttons-configurebuttons-pro.html
%%QT_DOCDIR%%/qtgamepad/qtgamepad-configurebuttons-example.html
@ -6163,20 +6170,20 @@
%%QT_DOCDIR%%/qtlocation/qgeoserviceproviderfactoryv2.html
%%QT_DOCDIR%%/qtlocation/qlocation.html
%%QT_DOCDIR%%/qtlocation/qml-location5-maps.html
%%QT_DOCDIR%%/qtlocation/qml-mapcircleobject-members.html
%%QT_DOCDIR%%/qtlocation/qml-mapcircleobject.html
%%QT_DOCDIR%%/qtlocation/qml-mapiconobject-members.html
%%QT_DOCDIR%%/qtlocation/qml-mapiconobject.html
%%QT_DOCDIR%%/qtlocation/qml-mapobjectview-members.html
%%QT_DOCDIR%%/qtlocation/qml-mapobjectview.html
%%QT_DOCDIR%%/qtlocation/qml-mappolygonobject-members.html
%%QT_DOCDIR%%/qtlocation/qml-mappolygonobject.html
%%QT_DOCDIR%%/qtlocation/qml-mappolylineobject-members.html
%%QT_DOCDIR%%/qtlocation/qml-mappolylineobject.html
%%QT_DOCDIR%%/qtlocation/qml-maprouteobject-members.html
%%QT_DOCDIR%%/qtlocation/qml-maprouteobject.html
%%QT_DOCDIR%%/qtlocation/qml-navigator-members.html
%%QT_DOCDIR%%/qtlocation/qml-navigator.html
%%QT_DOCDIR%%/qtlocation/qml-qt-labs-location-mapcircleobject-members.html
%%QT_DOCDIR%%/qtlocation/qml-qt-labs-location-mapcircleobject.html
%%QT_DOCDIR%%/qtlocation/qml-qt-labs-location-mapiconobject-members.html
%%QT_DOCDIR%%/qtlocation/qml-qt-labs-location-mapiconobject.html
%%QT_DOCDIR%%/qtlocation/qml-qt-labs-location-mapobjectview-members.html
%%QT_DOCDIR%%/qtlocation/qml-qt-labs-location-mapobjectview.html
%%QT_DOCDIR%%/qtlocation/qml-qt-labs-location-mappolygonobject-members.html
%%QT_DOCDIR%%/qtlocation/qml-qt-labs-location-mappolygonobject.html
%%QT_DOCDIR%%/qtlocation/qml-qt-labs-location-mappolylineobject-members.html
%%QT_DOCDIR%%/qtlocation/qml-qt-labs-location-mappolylineobject.html
%%QT_DOCDIR%%/qtlocation/qml-qt-labs-location-maprouteobject-members.html
%%QT_DOCDIR%%/qtlocation/qml-qt-labs-location-maprouteobject.html
%%QT_DOCDIR%%/qtlocation/qml-qt-labs-location-navigator-members.html
%%QT_DOCDIR%%/qtlocation/qml-qt-labs-location-navigator.html
%%QT_DOCDIR%%/qtlocation/qml-qtlocation-cameracapabilities-members.html
%%QT_DOCDIR%%/qtlocation/qml-qtlocation-cameracapabilities.html
%%QT_DOCDIR%%/qtlocation/qml-qtlocation-category-members.html
@ -6325,6 +6332,7 @@
%%QT_DOCDIR%%/qtlocation/qplacesupplier.html
%%QT_DOCDIR%%/qtlocation/qplaceuser-members.html
%%QT_DOCDIR%%/qtlocation/qplaceuser.html
%%QT_DOCDIR%%/qtlocation/qt-labs-location-qmlmodule.html
%%QT_DOCDIR%%/qtlocation/qtlocation-attribution-clip2tri.html
%%QT_DOCDIR%%/qtlocation/qtlocation-attribution-clipper.html
%%QT_DOCDIR%%/qtlocation/qtlocation-attribution-earcut.html
@ -7732,6 +7740,8 @@
%%QT_DOCDIR%%/qtplatformheaders/qeglnativecontext.html
%%QT_DOCDIR%%/qtplatformheaders/qglxnativecontext-members.html
%%QT_DOCDIR%%/qtplatformheaders/qglxnativecontext.html
%%QT_DOCDIR%%/qtplatformheaders/qlinuxfbfunctions-members.html
%%QT_DOCDIR%%/qtplatformheaders/qlinuxfbfunctions.html
%%QT_DOCDIR%%/qtplatformheaders/qtplatformheaders-index.html
%%QT_DOCDIR%%/qtplatformheaders/qtplatformheaders-module.html
%%QT_DOCDIR%%/qtplatformheaders/qtplatformheaders.index

6
misc/qt5-examples/distinfo
View File

@ -1,3 +1,3 @@
TIMESTAMP = 1549517708
SHA256 (KDE/Qt/5.12.1/qt-everywhere-src-5.12.1.tar.xz) = caffbd625c7bc10ff8c5c7a27dbc7d84fa4de146975c0e1ffe904b514ccd6da4
SIZE (KDE/Qt/5.12.1/qt-everywhere-src-5.12.1.tar.xz) = 507568064
TIMESTAMP = 1552888933
SHA256 (KDE/Qt/5.12.2/qt-everywhere-src-5.12.2.tar.xz) = 59b8cb4e728450b21224dcaaa40eb25bafc5196b6988f2225c394c6b7f881ff5
SIZE (KDE/Qt/5.12.2/qt-everywhere-src-5.12.2.tar.xz) = 507757480

3
www/qt5-webengine/Makefile
View File

@ -20,7 +20,6 @@
PORTNAME= webengine
DISTVERSION= ${QT5_VERSION}
PORTREVISION= 1
CATEGORIES= www
PKGNAMEPREFIX= qt5-
@ -51,7 +50,7 @@ LIB_DEPENDS= libavcodec.so:multimedia/ffmpeg \
libwebp.so:graphics/webp
DISTINFO_FILE= ${.CURDIR}/distinfo
QT5_VERSION= 5.12.1
QT5_VERSION= 5.12.2
OPTIONS_SINGLE= AUDIO
OPTIONS_SINGLE_AUDIO= ALSA PULSEAUDIO SNDIO

6
www/qt5-webengine/distinfo
View File

@ -1,3 +1,3 @@
TIMESTAMP = 1549725518
SHA256 (KDE/Qt/5.12.1/qtwebengine-everywhere-src-5.12.1.tar.xz) = 43e91e06bc4a60ef0f91d15ae06425cf9c6b4f7dafe960259a5b013c687c3bd0
SIZE (KDE/Qt/5.12.1/qtwebengine-everywhere-src-5.12.1.tar.xz) = 249191844
TIMESTAMP = 1553273996
SHA256 (KDE/Qt/5.12.2/qtwebengine-everywhere-src-5.12.2.tar.xz) = 082b1d6e60c1be61881bc8533acc67d9688620d6b3a538417f62b27b34ead493
SIZE (KDE/Qt/5.12.2/qtwebengine-everywhere-src-5.12.2.tar.xz) = 249240772

15
www/qt5-webengine/files/patch-config.tests-enable-on-FreeBSD
View File

@ -1,15 +0,0 @@
--- config.tests/khr/khr.pro.orig 2017-04-19 08:32:39 UTC
+++ config.tests/khr/khr.pro
@@ -3,4 +3,4 @@
CONFIG-=qt
-linux:SOURCES += khr.cpp
+SOURCES += khr.cpp
--- config.tests/snappy/snappy.pro.orig 2017-04-11 14:08:45 UTC
+++ config.tests/snappy/snappy.pro
@@ -1,3 +1,3 @@
-linux:SOURCES += snappy.cpp
+SOURCES += snappy.cpp
LIBS += -lsnappy
CONFIG -= qt

8
www/qt5-webengine/files/patch-config.tests_khr_khr.pro Normal file
View File

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

7
www/qt5-webengine/files/patch-config.tests_snappy_snappy.pro Normal file
View File

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

14
www/qt5-webengine/files/patch-configure.pri Normal file
View File

@ -0,0 +1,14 @@
--- configure.pri.orig 2018-11-27 04:10:38 UTC
+++ configure.pri
@@ -85,9 +85,9 @@ defineTest(qtConfTest_detectFlex) {
}
defineTest(qtConfTest_detectGlibc) {
- ldd = $$qtConfFindInPath("ldd")
+ ldd = $$qtConfFindInPath("ld.bfd")
!isEmpty(ldd) {
- qtLog("Found ldd from path: $$ldd")
+ qtLog("Found ld.bfd from path: $$ldd")
qtRunLoggedCommand("$$ldd --version", version)|return(true)
version ~= 's/^.*[^0-9]\([0-9]*\.[0-9]*\).*$/\1/'
version = $$first(version)

7
www/qt5-webengine/files/patch-src_3rdparty_chromium_base_debug_thread__heap__usage__tracker.cc
View File

@ -1,6 +1,6 @@
--- src/3rdparty/chromium/base/debug/thread_heap_usage_tracker.cc.orig 2017-01-26 00:49:07 UTC
--- src/3rdparty/chromium/base/debug/thread_heap_usage_tracker.cc.orig 2018-11-13 18:25:11 UTC
+++ src/3rdparty/chromium/base/debug/thread_heap_usage_tracker.cc
@@ -14,11 +14,13 @@
@@ -17,10 +17,12 @@
#include "base/threading/thread_local_storage.h"
#include "build/build_config.h"
@ -9,8 +9,7 @@
#include <malloc/malloc.h>
#else
#include <malloc.h>
#endif
+#endif
#endif
namespace base {
namespace debug {

4
www/qt5-webengine/files/patch-src_3rdparty_chromium_base_linux__util.cc
View File

@ -1,6 +1,6 @@
--- src/3rdparty/chromium/base/linux_util.cc.orig 2017-01-26 00:49:07 UTC
--- src/3rdparty/chromium/base/linux_util.cc.orig 2018-11-13 18:25:11 UTC
+++ src/3rdparty/chromium/base/linux_util.cc
@@ -110,12 +110,14 @@ char g_linux_distro[kDistroSize] =
@@ -111,12 +111,14 @@ char g_linux_distro[kDistroSize] =
"CrOS";
#elif defined(OS_ANDROID)
"Android";

4
www/qt5-webengine/files/patch-src_3rdparty_chromium_base_process_launch.cc
View File

@ -1,6 +1,6 @@
--- src/3rdparty/chromium/base/process/launch.cc.orig 2017-01-26 00:49:07 UTC
--- src/3rdparty/chromium/base/process/launch.cc.orig 2018-11-13 18:25:11 UTC
+++ src/3rdparty/chromium/base/process/launch.cc
@@ -15,7 +15,7 @@ LaunchOptions::~LaunchOptions() = defaul
@@ -15,7 +15,7 @@ LaunchOptions::~LaunchOptions() = default;
LaunchOptions LaunchOptionsForTest() {
LaunchOptions options;

4
www/qt5-webengine/files/patch-src_3rdparty_chromium_base_process_launch__posix.cc
View File

@ -1,6 +1,6 @@
--- src/3rdparty/chromium/base/process/launch_posix.cc.orig 2017-01-26 00:49:07 UTC
--- src/3rdparty/chromium/base/process/launch_posix.cc.orig 2018-11-13 18:25:11 UTC
+++ src/3rdparty/chromium/base/process/launch_posix.cc
@@ -64,6 +64,7 @@
@@ -65,6 +65,7 @@
#include "base/feature_list.h"
#else
extern char** environ;

4
www/qt5-webengine/files/patch-src_3rdparty_chromium_base_profiler_stack__sampling__profiler__unittest.cc
View File

@ -1,6 +1,6 @@
--- src/3rdparty/chromium/base/profiler/stack_sampling_profiler_unittest.cc.orig 2017-01-26 00:49:07 UTC
--- src/3rdparty/chromium/base/profiler/stack_sampling_profiler_unittest.cc.orig 2018-11-13 18:25:11 UTC
+++ src/3rdparty/chromium/base/profiler/stack_sampling_profiler_unittest.cc
@@ -31,7 +31,7 @@
@@ -39,7 +39,7 @@
#include <intrin.h>
#include <malloc.h>
#include <windows.h>

4
www/qt5-webengine/files/patch-src_3rdparty_chromium_base_security__unittest.cc
View File

@ -1,6 +1,6 @@
--- src/3rdparty/chromium/base/security_unittest.cc.orig 2017-01-26 00:49:07 UTC
--- src/3rdparty/chromium/base/security_unittest.cc.orig 2018-11-13 18:25:11 UTC
+++ src/3rdparty/chromium/base/security_unittest.cc
@@ -74,7 +74,7 @@ bool IsTcMallocBypassed() {
@@ -59,7 +59,7 @@ NOINLINE Type HideValueFromCompiler(volatile Type valu
// FAILS_ is too clunky.
void OverflowTestsSoftExpectTrue(bool overflow_detected) {
if (!overflow_detected) {

4
www/qt5-webengine/files/patch-src_3rdparty_chromium_base_threading_platform__thread.h
View File

@ -1,6 +1,6 @@
--- src/3rdparty/chromium/base/threading/platform_thread.h.orig 2017-01-26 00:49:07 UTC
--- src/3rdparty/chromium/base/threading/platform_thread.h.orig 2018-11-13 18:25:11 UTC
+++ src/3rdparty/chromium/base/threading/platform_thread.h
@@ -205,7 +205,7 @@ class BASE_EXPORT PlatformThread {
@@ -217,7 +217,7 @@ class BASE_EXPORT PlatformThread {
static ThreadPriority GetCurrentThreadPriority();

4
www/qt5-webengine/files/patch-src_3rdparty_chromium_base_threading_platform__thread__posix.cc
View File

@ -1,6 +1,6 @@
--- src/3rdparty/chromium/base/threading/platform_thread_posix.cc.orig 2017-01-26 00:49:07 UTC
--- src/3rdparty/chromium/base/threading/platform_thread_posix.cc.orig 2018-11-13 18:25:11 UTC
+++ src/3rdparty/chromium/base/threading/platform_thread_posix.cc
@@ -56,7 +56,7 @@ void* ThreadFunc(void* params) {
@@ -61,7 +61,7 @@ void* ThreadFunc(void* params) {
if (!thread_params->joinable)
base::ThreadRestrictions::SetSingletonAllowed(false);

4
www/qt5-webengine/files/patch-src_3rdparty_chromium_build_toolchain_get__concurrent__links.py
View File

@ -1,6 +1,6 @@
--- src/3rdparty/chromium/build/toolchain/get_concurrent_links.py.orig 2017-01-26 00:49:07 UTC
--- src/3rdparty/chromium/build/toolchain/get_concurrent_links.py.orig 2018-11-13 18:25:11 UTC
+++ src/3rdparty/chromium/build/toolchain/get_concurrent_links.py
@@ -45,6 +45,14 @@ def _GetTotalMemoryInBytes():
@@ -46,6 +46,14 @@ def _GetTotalMemoryInBytes():
return int(subprocess.check_output(['sysctl', '-n', 'hw.memsize']))
except Exception:
return 0

4
www/qt5-webengine/files/patch-src_3rdparty_chromium_cc_layers_scrollbar__layer__impl__base.cc
View File

@ -1,6 +1,6 @@
--- src/3rdparty/chromium/cc/layers/scrollbar_layer_impl_base.cc.orig 2017-01-26 00:49:07 UTC
--- src/3rdparty/chromium/cc/layers/scrollbar_layer_impl_base.cc.orig 2018-11-13 18:25:11 UTC
+++ src/3rdparty/chromium/cc/layers/scrollbar_layer_impl_base.cc
@@ -174,8 +174,8 @@ gfx::Rect ScrollbarLayerImplBase::Comput
@@ -210,8 +210,8 @@ gfx::Rect ScrollbarLayerImplBase::ComputeThumbQuadRect
int thumb_offset = TrackStart();
if (maximum > 0) {
float ratio = clamped_current_pos / maximum;

8
www/qt5-webengine/files/patch-src_3rdparty_chromium_cc_trees_property__tree.cc
View File

@ -1,8 +1,8 @@
--- src/3rdparty/chromium/cc/trees/property_tree.cc.orig 2017-01-26 00:49:07 UTC
--- src/3rdparty/chromium/cc/trees/property_tree.cc.orig 2018-11-13 18:25:11 UTC
+++ src/3rdparty/chromium/cc/trees/property_tree.cc
@@ -1113,13 +1113,13 @@ gfx::ScrollOffset ScrollTree::MaxScrollO
@@ -1295,13 +1295,13 @@ gfx::ScrollOffset ScrollTree::MaxScrollOffset(int scro
gfx::Size clip_layer_bounds = scroll_clip_layer_bounds(scroll_node->id);
gfx::Size clip_layer_bounds = container_bounds(scroll_node->id);
- gfx::ScrollOffset max_offset(
+ gfx::ScrollOffset _max_offset(
@ -17,4 +17,4 @@
+ return _max_offset;
}
void ScrollTree::OnScrollOffsetAnimated(int layer_id,
void ScrollTree::OnScrollOffsetAnimated(ElementId id,

4
www/qt5-webengine/files/patch-src_3rdparty_chromium_chrome_browser_extensions_api_input__ime_input__ime__api.h
View File

@ -1,6 +1,6 @@
--- src/3rdparty/chromium/chrome/browser/extensions/api/input_ime/input_ime_api.h.orig 2017-01-26 00:49:08 UTC
--- src/3rdparty/chromium/chrome/browser/extensions/api/input_ime/input_ime_api.h.orig 2018-11-13 18:25:11 UTC
+++ src/3rdparty/chromium/chrome/browser/extensions/api/input_ime/input_ime_api.h
@@ -28,7 +28,7 @@
@@ -31,7 +31,7 @@
#if defined(OS_CHROMEOS)
#include "chrome/browser/extensions/api/input_ime/input_ime_api_chromeos.h"

14
www/qt5-webengine/files/patch-src_3rdparty_chromium_chrome_common_chrome__paths.cc
View File

@ -1,6 +1,6 @@
--- src/3rdparty/chromium/chrome/common/chrome_paths.cc.orig 2017-01-26 00:49:09 UTC
--- src/3rdparty/chromium/chrome/common/chrome_paths.cc.orig 2018-11-13 18:25:11 UTC
+++ src/3rdparty/chromium/chrome/common/chrome_paths.cc
@@ -197,7 +197,7 @@ bool PathProvider(int key, base::FilePat
@@ -193,7 +193,7 @@ bool PathProvider(int key, base::FilePath* result) {
return false;
break;
case chrome::DIR_DEFAULT_DOWNLOADS_SAFE:
@ -9,7 +9,7 @@
if (!GetUserDownloadsDirectorySafe(&cur))
return false;
break;
@@ -480,10 +480,12 @@ bool PathProvider(int key, base::FilePat
@@ -472,10 +472,12 @@ bool PathProvider(int key, base::FilePath* result) {
if (!base::PathExists(cur)) // We don't want to create this
return false;
break;
@ -23,7 +23,7 @@
#else
cur = base::FilePath(FILE_PATH_LITERAL("/etc/chromium/policies"));
#endif
@@ -534,7 +536,7 @@ bool PathProvider(int key, base::FilePat
@@ -526,7 +528,7 @@ bool PathProvider(int key, base::FilePath* result) {
#endif
break;
@ -32,7 +32,7 @@
case chrome::DIR_NATIVE_MESSAGING:
#if defined(OS_MACOSX)
#if defined(GOOGLE_CHROME_BUILD)
@@ -548,6 +550,9 @@ bool PathProvider(int key, base::FilePat
@@ -540,6 +542,9 @@ bool PathProvider(int key, base::FilePath* result) {
#if defined(GOOGLE_CHROME_BUILD)
cur = base::FilePath(FILE_PATH_LITERAL(
"/etc/opt/chrome/native-messaging-hosts"));
@ -42,7 +42,7 @@
#else
cur = base::FilePath(FILE_PATH_LITERAL(
"/etc/chromium/native-messaging-hosts"));
@@ -560,7 +565,7 @@ bool PathProvider(int key, base::FilePat
@@ -552,7 +557,7 @@ bool PathProvider(int key, base::FilePath* result) {
return false;
cur = cur.Append(FILE_PATH_LITERAL("NativeMessagingHosts"));
break;
@ -50,4 +50,4 @@
+#endif // defined(OS_LINUX) || defined(OS_MACOSX) || defined(OS_BSD)
#if !defined(OS_ANDROID)
case chrome::DIR_GLOBAL_GCM_STORE:
if (!PathService::Get(chrome::DIR_USER_DATA, &cur))
if (!base::PathService::Get(chrome::DIR_USER_DATA, &cur))

8
www/qt5-webengine/files/patch-src_3rdparty_chromium_chrome_common_chrome__paths.h
View File

@ -1,6 +1,6 @@
--- src/3rdparty/chromium/chrome/common/chrome_paths.h.orig 2017-01-26 00:49:09 UTC
--- src/3rdparty/chromium/chrome/common/chrome_paths.h.orig 2018-11-13 18:25:11 UTC
+++ src/3rdparty/chromium/chrome/common/chrome_paths.h
@@ -49,7 +49,7 @@ enum {
@@ -51,7 +51,7 @@ enum {
// to set policies for chrome. This directory
// contains subdirectories.
#endif
@ -9,7 +9,7 @@
defined(OS_MACOSX)
DIR_USER_EXTERNAL_EXTENSIONS, // Directory for per-user external extensions
// on Chrome Mac and Chromium Linux.
@@ -58,7 +58,7 @@ enum {
@@ -60,7 +60,7 @@ enum {
// create it.
#endif
@ -18,7 +18,7 @@
DIR_STANDALONE_EXTERNAL_EXTENSIONS, // Directory for 'per-extension'
// definition manifest files that
// describe extensions which are to be
@@ -112,7 +112,7 @@ enum {
@@ -111,7 +111,7 @@ enum {
DIR_SUPERVISED_USER_INSTALLED_WHITELISTS, // Directory where sanitized
// supervised user whitelists are
// installed.

4
www/qt5-webengine/files/patch-src_3rdparty_chromium_chrome_common_chrome__paths__internal.h
View File

@ -1,6 +1,6 @@
--- src/3rdparty/chromium/chrome/common/chrome_paths_internal.h.orig 2017-01-26 00:49:09 UTC
--- src/3rdparty/chromium/chrome/common/chrome_paths_internal.h.orig 2018-11-13 18:25:11 UTC
+++ src/3rdparty/chromium/chrome/common/chrome_paths_internal.h
@@ -39,7 +39,7 @@ void GetUserCacheDirectory(const base::F
@@ -45,7 +45,7 @@ void GetUserCacheDirectory(const base::FilePath& profi
// Get the path to the user's documents directory.
bool GetUserDocumentsDirectory(base::FilePath* result);

4
www/qt5-webengine/files/patch-src_3rdparty_chromium_components_cookie__config_cookie__store__util.cc
View File

@ -1,4 +1,4 @@
--- src/3rdparty/chromium/components/cookie_config/cookie_store_util.cc.orig 2017-01-26 00:49:11 UTC
--- src/3rdparty/chromium/components/cookie_config/cookie_store_util.cc.orig 2018-11-13 18:25:11 UTC
+++ src/3rdparty/chromium/components/cookie_config/cookie_store_util.cc
@@ -11,7 +11,7 @@
@ -9,7 +9,7 @@
namespace {
// Use the operating system's mechanisms to encrypt cookies before writing
@@ -63,10 +63,10 @@ base::LazyInstance<CookieOSCryptoDelegat
@@ -63,10 +63,10 @@ base::LazyInstance<CookieOSCryptoDelegate>::Destructor
net::CookieCryptoDelegate* GetCookieCryptoDelegate() {
return g_cookie_crypto_delegate.Pointer();
}

4
www/qt5-webengine/files/patch-src_3rdparty_chromium_components_flags__ui_flags__state.cc
View File

@ -1,6 +1,6 @@
--- src/3rdparty/chromium/components/flags_ui/flags_state.cc.orig 2017-01-26 00:49:11 UTC
--- src/3rdparty/chromium/components/flags_ui/flags_state.cc.orig 2018-11-13 18:25:11 UTC
+++ src/3rdparty/chromium/components/flags_ui/flags_state.cc
@@ -544,7 +544,7 @@ int FlagsState::GetCurrentPlatform() {
@@ -653,7 +653,7 @@ int FlagsState::GetCurrentPlatform() {
return kOsWin;
#elif defined(OS_CHROMEOS) // Needs to be before the OS_LINUX check.
return kOsCrOS;

2
www/qt5-webengine/files/patch-src_3rdparty_chromium_components_json__schema_json__schema__validator.cc
View File

@ -1,4 +1,4 @@
--- src/3rdparty/chromium/components/json_schema/json_schema_validator.cc.orig 2017-01-26 00:49:11 UTC
--- src/3rdparty/chromium/components/json_schema/json_schema_validator.cc.orig 2018-11-13 18:25:11 UTC
+++ src/3rdparty/chromium/components/json_schema/json_schema_validator.cc
@@ -21,7 +21,11 @@
#include "base/strings/stringprintf.h"

2
www/qt5-webengine/files/patch-src_3rdparty_chromium_components_keyed__service_core_dependency__graph__unittest.cc
View File

@ -1,4 +1,4 @@
--- src/3rdparty/chromium/components/keyed_service/core/dependency_graph_unittest.cc.orig 2017-01-26 00:49:11 UTC
--- src/3rdparty/chromium/components/keyed_service/core/dependency_graph_unittest.cc.orig 2018-11-13 18:25:11 UTC
+++ src/3rdparty/chromium/components/keyed_service/core/dependency_graph_unittest.cc
@@ -9,7 +9,11 @@
#include "components/keyed_service/core/dependency_graph.h"

2
www/qt5-webengine/files/patch-src_3rdparty_chromium_components_metrics_drive__metrics__provider__linux.cc
View File

@ -1,4 +1,4 @@
--- src/3rdparty/chromium/components/metrics/drive_metrics_provider_linux.cc.orig 2017-01-26 00:49:12 UTC
--- src/3rdparty/chromium/components/metrics/drive_metrics_provider_linux.cc.orig 2018-11-13 18:25:11 UTC
+++ src/3rdparty/chromium/components/metrics/drive_metrics_provider_linux.cc
@@ -4,7 +4,13 @@

4
www/qt5-webengine/files/patch-src_3rdparty_chromium_components_metrics_system__memory__stats__recorder__linux.cc
View File

@ -1,4 +1,4 @@
--- src/3rdparty/chromium/components/metrics/system_memory_stats_recorder_linux.cc.orig 2017-01-26 00:49:12 UTC
--- src/3rdparty/chromium/components/metrics/system_memory_stats_recorder_linux.cc.orig 2018-11-13 18:25:11 UTC
+++ src/3rdparty/chromium/components/metrics/system_memory_stats_recorder_linux.cc
@@ -30,6 +30,7 @@ namespace metrics {
UMA_HISTOGRAM_LINEAR(name, sample, 2500, 50)
@ -8,7 +8,7 @@
base::SystemMemoryInfoKB memory;
if (!base::GetSystemMemoryInfo(&memory))
return;
@@ -93,6 +94,7 @@ void RecordMemoryStats(RecordMemoryStats
@@ -93,6 +94,7 @@ void RecordMemoryStats(RecordMemoryStatsType type) {
break;
}
}

2
www/qt5-webengine/files/patch-src_3rdparty_chromium_components_password__manager_core_browser_import_csv__reader.cc
View File

@ -1,4 +1,4 @@
--- src/3rdparty/chromium/components/password_manager/core/browser/import/csv_reader.cc.orig 2017-01-26 00:49:12 UTC
--- src/3rdparty/chromium/components/password_manager/core/browser/import/csv_reader.cc.orig 2018-11-13 18:25:11 UTC
+++ src/3rdparty/chromium/components/password_manager/core/browser/import/csv_reader.cc
@@ -9,7 +9,11 @@
#include "base/logging.h"

6
www/qt5-webengine/files/patch-src_3rdparty_chromium_components_update__client_update__query__params.cc
View File

@ -1,7 +1,7 @@
--- src/3rdparty/chromium/components/update_client/update_query_params.cc.orig 2017-01-26 00:49:13 UTC
--- src/3rdparty/chromium/components/update_client/update_query_params.cc.orig 2018-11-13 18:25:11 UTC
+++ src/3rdparty/chromium/components/update_client/update_query_params.cc
@@ -31,6 +31,8 @@ const char kOs[] =
"linux";
@@ -38,6 +38,8 @@ const char kOs[] =
"fuchsia";
#elif defined(OS_OPENBSD)
"openbsd";
+#elif defined(OS_FREEBSD)

6
www/qt5-webengine/files/patch-src_3rdparty_chromium_components_url__matcher_regex__set__matcher.cc
View File

@ -1,7 +1,7 @@
--- src/3rdparty/chromium/components/url_matcher/regex_set_matcher.cc.orig 2017-01-26 00:49:13 UTC
--- src/3rdparty/chromium/components/url_matcher/regex_set_matcher.cc.orig 2018-11-13 18:25:11 UTC
+++ src/3rdparty/chromium/components/url_matcher/regex_set_matcher.cc
@@ -10,8 +10,13 @@
#include "base/memory/ptr_util.h"
@@ -11,8 +11,13 @@
#include "base/logging.h"
#include "base/strings/string_util.h"
#include "components/url_matcher/substring_set_matcher.h"
+#if defined(OS_BSD)

2
www/qt5-webengine/files/patch-src_3rdparty_chromium_components_url__matcher_url__matcher__factory.cc
View File

@ -1,4 +1,4 @@
--- src/3rdparty/chromium/components/url_matcher/url_matcher_factory.cc.orig 2017-01-26 00:49:13 UTC
--- src/3rdparty/chromium/components/url_matcher/url_matcher_factory.cc.orig 2018-11-13 18:25:11 UTC
+++ src/3rdparty/chromium/components/url_matcher/url_matcher_factory.cc
@@ -16,7 +16,11 @@
#include "base/values.h"

6
www/qt5-webengine/files/patch-src_3rdparty_chromium_content_browser_media_media__internals.cc
View File

@ -1,8 +1,8 @@
--- src/3rdparty/chromium/content/browser/media/media_internals.cc.orig 2017-01-26 00:49:13 UTC
--- src/3rdparty/chromium/content/browser/media/media_internals.cc.orig 2018-11-13 18:25:11 UTC
+++ src/3rdparty/chromium/content/browser/media/media_internals.cc
@@ -755,7 +755,7 @@ void MediaInternals::UpdateVideoCaptureD
@@ -724,7 +724,7 @@ void MediaInternals::UpdateVideoCaptureDeviceCapabilit
device_dict->SetString("name", descriptor.GetNameAndModel());
device_dict->Set("formats", format_list);
device_dict->Set("formats", std::move(format_list));
#if defined(OS_WIN) || defined(OS_MACOSX) || defined(OS_LINUX) || \
- defined(OS_ANDROID)
+ defined(OS_ANDROID) || defined(OS_BSD)

69
www/qt5-webengine/files/patch-src_3rdparty_chromium_content_browser_webui_web__ui__data__source__impl.cc Normal file
View File

@ -0,0 +1,69 @@
--- src/3rdparty/chromium/content/browser/webui/web_ui_data_source_impl.cc.orig 2018-11-13 18:25:11 UTC
+++ src/3rdparty/chromium/content/browser/webui/web_ui_data_source_impl.cc
@@ -120,24 +120,24 @@ WebUIDataSourceImpl::WebUIDataSourceImpl(const std::st
WebUIDataSourceImpl::~WebUIDataSourceImpl() {
}
-void WebUIDataSourceImpl::AddString(base::StringPiece name,
+void WebUIDataSourceImpl::AddString(const std::string& name,
const base::string16& value) {
// TODO(dschuyler): Share only one copy of these strings.
localized_strings_.SetKey(name, base::Value(value));
- replacements_[name.as_string()] = base::UTF16ToUTF8(value);
+ replacements_[name] = base::UTF16ToUTF8(value);
}
-void WebUIDataSourceImpl::AddString(base::StringPiece name,
+void WebUIDataSourceImpl::AddString(const std::string& name,
const std::string& value) {
localized_strings_.SetKey(name, base::Value(value));
- replacements_[name.as_string()] = value;
+ replacements_[name] = value;
}
-void WebUIDataSourceImpl::AddLocalizedString(base::StringPiece name, int ids) {
+void WebUIDataSourceImpl::AddLocalizedString(const std::string& name, int ids) {
std::string utf8_str =
base::UTF16ToUTF8(GetContentClient()->GetLocalizedString(ids));
localized_strings_.SetKey(name, base::Value(utf8_str));
- replacements_[name.as_string()] = utf8_str;
+ replacements_[name] = utf8_str;
}
void WebUIDataSourceImpl::AddLocalizedStrings(
@@ -147,7 +147,7 @@ void WebUIDataSourceImpl::AddLocalizedStrings(
&replacements_);
}
-void WebUIDataSourceImpl::AddBoolean(base::StringPiece name, bool value) {
+void WebUIDataSourceImpl::AddBoolean(const std::string& name, bool value) {
localized_strings_.SetBoolean(name, value);
// TODO(dschuyler): Change name of |localized_strings_| to |load_time_data_|
// or similar. These values haven't been found as strings for
@@ -156,21 +156,21 @@ void WebUIDataSourceImpl::AddBoolean(base::StringPiece
// replacements.
}
-void WebUIDataSourceImpl::AddInteger(base::StringPiece name, int32_t value) {
+void WebUIDataSourceImpl::AddInteger(const std::string& name, int32_t value) {
localized_strings_.SetInteger(name, value);
}
-void WebUIDataSourceImpl::SetJsonPath(base::StringPiece path) {
+void WebUIDataSourceImpl::SetJsonPath(const std::string& path) {
DCHECK(json_path_.empty());
DCHECK(!path.empty());
- json_path_ = path.as_string();
+ json_path_ = path;
excluded_paths_.insert(json_path_);
}
-void WebUIDataSourceImpl::AddResourcePath(base::StringPiece path,
+void WebUIDataSourceImpl::AddResourcePath(const std::string& path,
int resource_id) {
- path_to_idr_map_[path.as_string()] = resource_id;
+ path_to_idr_map_[path] = resource_id;
}
void WebUIDataSourceImpl::SetDefaultResource(int resource_id) {

25
www/qt5-webengine/files/patch-src_3rdparty_chromium_content_browser_webui_web__ui__data__source__impl.h Normal file
View File

@ -0,0 +1,25 @@
--- src/3rdparty/chromium/content/browser/webui/web_ui_data_source_impl.h.orig 2018-11-13 18:25:11 UTC
+++ src/3rdparty/chromium/content/browser/webui/web_ui_data_source_impl.h
@@ -31,15 +31,15 @@ class CONTENT_EXPORT WebUIDataSourceImpl : public URLD
public WebUIDataSource {
public:
// WebUIDataSource implementation:
- void AddString(base::StringPiece name, const base::string16& value) override;
- void AddString(base::StringPiece name, const std::string& value) override;
- void AddLocalizedString(base::StringPiece name, int ids) override;
+ void AddString(const std::string& name, const base::string16& value) override;
+ void AddString(const std::string& name, const std::string& value) override;
+ void AddLocalizedString(const std::string& name, int ids) override;
void AddLocalizedStrings(
const base::DictionaryValue& localized_strings) override;
- void AddBoolean(base::StringPiece name, bool value) override;
- void AddInteger(base::StringPiece name, int32_t value) override;
- void SetJsonPath(base::StringPiece path) override;
- void AddResourcePath(base::StringPiece path, int resource_id) override;
+ void AddBoolean(const std::string& name, bool value) override;
+ void AddInteger(const std::string& name, int32_t value) override;
+ void SetJsonPath(const std::string& path) override;
+ void AddResourcePath(const std::string& path, int resource_id) override;
void SetDefaultResource(int resource_id) override;
void SetRequestFilter(
const WebUIDataSource::HandleRequestCallback& callback) override;

14
www/qt5-webengine/files/patch-src_3rdparty_chromium_content_browser_webui_web__ui__impl.cc Normal file
View File

@ -0,0 +1,14 @@
--- src/3rdparty/chromium/content/browser/webui/web_ui_impl.cc.orig 2018-11-13 18:25:11 UTC
+++ src/3rdparty/chromium/content/browser/webui/web_ui_impl.cc
@@ -249,9 +249,9 @@ void WebUIImpl::CallJavascriptFunctionUnsafe(
ExecuteJavascript(GetJavascriptCall(function_name, args));
}
-void WebUIImpl::RegisterMessageCallback(base::StringPiece message,
+void WebUIImpl::RegisterMessageCallback(const std::string& message,
const MessageCallback& callback) {
- message_callbacks_.emplace(message.as_string(), callback);
+ message_callbacks_.insert(std::make_pair(message, callback));
}
void WebUIImpl::ProcessWebUIMessage(const GURL& source_url,

11
www/qt5-webengine/files/patch-src_3rdparty_chromium_content_browser_webui_web__ui__impl.h Normal file
View File

@ -0,0 +1,11 @@
--- src/3rdparty/chromium/content/browser/webui/web_ui_impl.h.orig 2018-11-13 18:25:11 UTC
+++ src/3rdparty/chromium/content/browser/webui/web_ui_impl.h
@@ -52,7 +52,7 @@ class CONTENT_EXPORT WebUIImpl : public WebUI,
int GetBindings() const override;
void SetBindings(int bindings) override;
void AddMessageHandler(std::unique_ptr<WebUIMessageHandler> handler) override;
- void RegisterMessageCallback(base::StringPiece message,
+ void RegisterMessageCallback(const std::string& message,
const MessageCallback& callback) override;
void ProcessWebUIMessage(const GURL& source_url,
const std::string& message,

19
www/qt5-webengine/files/patch-src_3rdparty_chromium_content_public_browser_web__ui.h Normal file
View File

@ -0,0 +1,19 @@
--- src/3rdparty/chromium/content/public/browser/web_ui.h.orig 2018-11-13 18:25:11 UTC
+++ src/3rdparty/chromium/content/public/browser/web_ui.h
@@ -11,7 +11,6 @@
#include "base/callback.h"
#include "base/strings/string16.h"
-#include "base/strings/string_piece.h"
#include "content/common/content_export.h"
#include "ui/base/page_transition_types.h"
@@ -75,7 +74,7 @@ class CONTENT_EXPORT WebUI {
// Used by WebUIMessageHandlers. If the given message is already registered,
// the call has no effect.
using MessageCallback = base::RepeatingCallback<void(const base::ListValue*)>;
- virtual void RegisterMessageCallback(base::StringPiece message,
+ virtual void RegisterMessageCallback(const std::string& message,
const MessageCallback& callback) = 0;
// This is only needed if an embedder overrides handling of a WebUIMessage and

51
www/qt5-webengine/files/patch-src_3rdparty_chromium_content_public_browser_web__ui__data__source.h Normal file
View File

@ -0,0 +1,51 @@
--- src/3rdparty/chromium/content/public/browser/web_ui_data_source.h.orig 2018-11-13 18:25:11 UTC
+++ src/3rdparty/chromium/content/public/browser/web_ui_data_source.h
@@ -13,7 +13,6 @@
#include "base/callback.h"
#include "base/strings/string16.h"
-#include "base/strings/string_piece.h"
#include "content/common/content_export.h"
namespace base {
@@ -45,33 +44,33 @@ class WebUIDataSource {
std::unique_ptr<base::DictionaryValue> update);
// Adds a string keyed to its name to our dictionary.
- virtual void AddString(base::StringPiece name,
+ virtual void AddString(const std::string& name,
const base::string16& value) = 0;
// Adds a string keyed to its name to our dictionary.
- virtual void AddString(base::StringPiece name, const std::string& value) = 0;
+ virtual void AddString(const std::string& name, const std::string& value) = 0;
// Adds a localized string with resource |ids| keyed to its name to our
// dictionary.
- virtual void AddLocalizedString(base::StringPiece name, int ids) = 0;
+ virtual void AddLocalizedString(const std::string& name, int ids) = 0;
// Add strings from |localized_strings| to our dictionary.
virtual void AddLocalizedStrings(
const base::DictionaryValue& localized_strings) = 0;
// Adds a boolean keyed to its name to our dictionary.
- virtual void AddBoolean(base::StringPiece name, bool value) = 0;
+ virtual void AddBoolean(const std::string& name, bool value) = 0;
// Adds a signed 32-bit integer keyed to its name to our dictionary. Larger
// integers may not be exactly representable in JavaScript. See
// MAX_SAFE_INTEGER in /v8/src/globals.h.
- virtual void AddInteger(base::StringPiece name, int32_t value) = 0;
+ virtual void AddInteger(const std::string& name, int32_t value) = 0;
// Sets the path which will return the JSON strings.
- virtual void SetJsonPath(base::StringPiece path) = 0;
+ virtual void SetJsonPath(const std::string& path) = 0;
// Adds a mapping between a path name and a resource to return.
- virtual void AddResourcePath(base::StringPiece path, int resource_id) = 0;
+ virtual void AddResourcePath(const std::string& path, int resource_id) = 0;
// Sets the resource to returned when no other paths match.
virtual void SetDefaultResource(int resource_id) = 0;

6
www/qt5-webengine/files/patch-src_3rdparty_chromium_content_public_common_child__process__host.h
View File

@ -1,6 +1,6 @@
--- src/3rdparty/chromium/content/public/common/child_process_host.h.orig 2017-01-26 00:49:13 UTC
--- src/3rdparty/chromium/content/public/common/child_process_host.h.orig 2018-11-13 18:25:11 UTC
+++ src/3rdparty/chromium/content/public/common/child_process_host.h
@@ -53,7 +53,7 @@ class CONTENT_EXPORT ChildProcessHost :
@@ -45,7 +45,7 @@ class CONTENT_EXPORT ChildProcessHost : public IPC::Se
// No special behavior requested.
CHILD_NORMAL = 0,
@ -9,7 +9,7 @@
// Indicates that the child execed after forking may be execced from
// /proc/self/exe rather than using the "real" app path. This prevents
// autoupdate from confusing us if it changes the file out from under us.
@@ -62,7 +62,7 @@ class CONTENT_EXPORT ChildProcessHost :
@@ -54,7 +54,7 @@ class CONTENT_EXPORT ChildProcessHost : public IPC::Se
// gdb). In this case, you'd use GetChildPath to get the real executable
// file name, and then prepend the GDB command to the command line.
CHILD_ALLOW_SELF = 1 << 0,

6
www/qt5-webengine/files/patch-src_3rdparty_chromium_content_public_common_content__switches.cc
View File

@ -1,7 +1,7 @@
--- src/3rdparty/chromium/content/public/common/content_switches.cc.orig 2017-01-26 00:49:13 UTC
--- src/3rdparty/chromium/content/public/common/content_switches.cc.orig 2018-11-13 18:25:11 UTC
+++ src/3rdparty/chromium/content/public/common/content_switches.cc
@@ -992,7 +992,7 @@ const char kDisableVaapiAcceleratedVideo
"disable-vaapi-accelerated-video-encode";
@@ -978,7 +978,7 @@ const char kDisableAudioSupportForDesktopShare[] =
const char kDisablePanelFitting[] = "disable-panel-fitting";
#endif
-#if defined(OS_LINUX) && !defined(OS_CHROMEOS)

6
www/qt5-webengine/files/patch-src_3rdparty_chromium_content_public_common_content__switches.h
View File

@ -1,7 +1,7 @@
--- src/3rdparty/chromium/content/public/common/content_switches.h.orig 2017-01-26 00:49:13 UTC
--- src/3rdparty/chromium/content/public/common/content_switches.h.orig 2018-11-13 18:25:11 UTC
+++ src/3rdparty/chromium/content/public/common/content_switches.h
@@ -293,7 +293,7 @@ CONTENT_EXPORT extern const char kDisabl
CONTENT_EXPORT extern const char kDisableVaapiAcceleratedVideoEncode[];
@@ -277,7 +277,7 @@ CONTENT_EXPORT extern const char kEnableOSKOverscroll[
CONTENT_EXPORT extern const char kDisablePanelFitting[];
#endif
-#if defined(OS_LINUX) && !defined(OS_CHROMEOS)

4
www/qt5-webengine/files/patch-src_3rdparty_chromium_content_public_common_renderer__preferences.h
View File

@ -1,6 +1,6 @@
--- src/3rdparty/chromium/content/public/common/renderer_preferences.h.orig 2017-01-26 00:49:13 UTC
--- src/3rdparty/chromium/content/public/common/renderer_preferences.h.orig 2018-11-13 18:25:11 UTC
+++ src/3rdparty/chromium/content/public/common/renderer_preferences.h
@@ -139,7 +139,7 @@ struct CONTENT_EXPORT RendererPreference
@@ -137,7 +137,7 @@ struct CONTENT_EXPORT RendererPreferences {
// Country iso of the mobile network for content detection purpose.
std::string network_contry_iso;

6
www/qt5-webengine/files/patch-src_3rdparty_chromium_content_renderer_renderer__main__platform__delegate__linux.cc
View File

@ -1,6 +1,6 @@
--- src/3rdparty/chromium/content/renderer/renderer_main_platform_delegate_linux.cc.orig 2017-01-26 00:49:13 UTC
--- src/3rdparty/chromium/content/renderer/renderer_main_platform_delegate_linux.cc.orig 2018-11-13 18:25:11 UTC
+++ src/3rdparty/chromium/content/renderer/renderer_main_platform_delegate_linux.cc
@@ -29,6 +29,7 @@ void RendererMainPlatformDelegate::Platf
@@ -30,6 +30,7 @@ void RendererMainPlatformDelegate::PlatformUninitializ
}
bool RendererMainPlatformDelegate::EnableSandbox() {
@ -8,7 +8,7 @@
// The setuid sandbox is started in the zygote process: zygote_main_linux.cc
// https://chromium.googlesource.com/chromium/src/+/master/docs/linux_suid_sandbox.md
//
@@ -59,7 +60,7 @@ bool RendererMainPlatformDelegate::Enabl
@@ -65,7 +66,7 @@ bool RendererMainPlatformDelegate::EnableSandbox() {
CHECK_EQ(errno, EPERM);
}
#endif // __x86_64__

4
www/qt5-webengine/files/patch-src_3rdparty_chromium_device_gamepad_gamepad__provider.cc
View File

@ -1,6 +1,6 @@
--- src/3rdparty/chromium/device/gamepad/gamepad_provider.cc.orig 2017-02-02 02:02:54 UTC
--- src/3rdparty/chromium/device/gamepad/gamepad_provider.cc.orig 2018-11-13 18:25:11 UTC
+++ src/3rdparty/chromium/device/gamepad/gamepad_provider.cc
@@ -145,7 +145,7 @@ void GamepadProvider::Initialize(std::un
@@ -187,7 +187,7 @@ void GamepadProvider::Initialize(std::unique_ptr<Gamep
monitor->AddDevicesChangedObserver(this);
polling_thread_.reset(new base::Thread("Gamepad polling thread"));

4
www/qt5-webengine/files/patch-src_3rdparty_chromium_extensions_browser_api_networking__private_networking__private__event__router__factory.cc
View File

@ -1,4 +1,4 @@
--- src/3rdparty/chromium/extensions/browser/api/networking_private/networking_private_event_router_factory.cc.orig 2017-01-26 00:49:14 UTC
--- src/3rdparty/chromium/extensions/browser/api/networking_private/networking_private_event_router_factory.cc.orig 2018-11-13 18:25:11 UTC
+++ src/3rdparty/chromium/extensions/browser/api/networking_private/networking_private_event_router_factory.cc
@@ -13,6 +13,7 @@
@ -8,7 +8,7 @@
// static
NetworkingPrivateEventRouter*
NetworkingPrivateEventRouterFactory::GetForProfile(
@@ -57,5 +58,6 @@ bool NetworkingPrivateEventRouterFactory
@@ -57,5 +58,6 @@ bool NetworkingPrivateEventRouterFactory::ServiceIsCre
bool NetworkingPrivateEventRouterFactory::ServiceIsNULLWhileTesting() const {
return true;
}

2
www/qt5-webengine/files/patch-src_3rdparty_chromium_extensions_common_image__util.cc
View File

@ -1,4 +1,4 @@
--- src/3rdparty/chromium/extensions/common/image_util.cc.orig 2017-01-26 00:49:14 UTC
--- src/3rdparty/chromium/extensions/common/image_util.cc.orig 2018-11-13 18:25:11 UTC
+++ src/3rdparty/chromium/extensions/common/image_util.cc
@@ -11,7 +11,11 @@
#include "base/strings/string_number_conversions.h"

2
www/qt5-webengine/files/patch-src_3rdparty_chromium_extensions_common_stack__frame.cc
View File

@ -1,4 +1,4 @@
--- src/3rdparty/chromium/extensions/common/stack_frame.cc.orig 2017-01-26 00:49:14 UTC
--- src/3rdparty/chromium/extensions/common/stack_frame.cc.orig 2018-11-13 18:25:11 UTC
+++ src/3rdparty/chromium/extensions/common/stack_frame.cc
@@ -7,7 +7,11 @@
#include <string>

4
www/qt5-webengine/files/patch-src_3rdparty_chromium_ipc_ipc__channel.h
View File

@ -1,6 +1,6 @@
--- src/3rdparty/chromium/ipc/ipc_channel.h.orig 2017-01-26 00:49:15 UTC
--- src/3rdparty/chromium/ipc/ipc_channel.h.orig 2018-11-13 18:25:11 UTC
+++ src/3rdparty/chromium/ipc/ipc_channel.h
@@ -245,7 +245,7 @@ class IPC_EXPORT Channel : public Sender
@@ -244,7 +244,7 @@ class COMPONENT_EXPORT(IPC) Channel : public Sender {
static std::string GenerateUniqueRandomChannelID();
#endif

6
www/qt5-webengine/files/patch-src_3rdparty_chromium_media_BUILD.gn
View File

@ -1,6 +1,6 @@
--- src/3rdparty/chromium/media/BUILD.gn.orig 2018-06-21 14:13:32 UTC
--- src/3rdparty/chromium/media/BUILD.gn.orig 2018-11-13 18:25:11 UTC
+++ src/3rdparty/chromium/media/BUILD.gn
@@ -53,6 +53,9 @@ config("media_config") {
@@ -63,6 +63,9 @@ config("media_config") {
if (use_cras) {
defines += [ "USE_CRAS" ]
}
@ -9,4 +9,4 @@
+ }
}
config("media_implementation") {
# Internal grouping of the configs necessary to support sub-folders having their

4
www/qt5-webengine/files/patch-src_3rdparty_chromium_media_capture_video_file__video__capture__device__factory.cc
View File

@ -1,6 +1,6 @@
--- src/3rdparty/chromium/media/capture/video/file_video_capture_device_factory.cc.orig 2017-01-26 00:49:15 UTC
--- src/3rdparty/chromium/media/capture/video/file_video_capture_device_factory.cc.orig 2018-11-13 18:25:11 UTC
+++ src/3rdparty/chromium/media/capture/video/file_video_capture_device_factory.cc
@@ -53,7 +53,7 @@ void FileVideoCaptureDeviceFactory::GetD
@@ -53,7 +53,7 @@ void FileVideoCaptureDeviceFactory::GetDeviceDescripto
#elif defined(OS_MACOSX)
command_line_file_path.value(), kFileVideoCaptureDeviceName,
VideoCaptureApi::MACOSX_AVFOUNDATION

4
www/qt5-webengine/files/patch-src_3rdparty_chromium_media_capture_video_video__capture__device__client.cc
View File

@ -1,6 +1,6 @@
--- src/3rdparty/chromium/media/capture/video/video_capture_device_client.cc.orig 2017-01-26 00:49:15 UTC
--- src/3rdparty/chromium/media/capture/video/video_capture_device_client.cc.orig 2018-11-13 18:25:11 UTC
+++ src/3rdparty/chromium/media/capture/video/video_capture_device_client.cc
@@ -193,7 +193,7 @@ void VideoCaptureDeviceClient::OnIncomin
@@ -238,7 +238,7 @@ void VideoCaptureDeviceClient::OnIncomingCapturedData(
// see http://linuxtv.org/downloads/v4l-dvb-apis/packed-rgb.html.
// Windows RGB24 defines blue at lowest byte,
// see https://msdn.microsoft.com/en-us/library/windows/desktop/dd407253

4
www/qt5-webengine/files/patch-src_3rdparty_chromium_media_filters_vp9__parser.h
View File

@ -1,4 +1,4 @@
--- src/3rdparty/chromium/media/filters/vp9_parser.h.orig 2017-01-26 00:49:15 UTC
--- src/3rdparty/chromium/media/filters/vp9_parser.h.orig 2018-11-13 18:25:11 UTC
+++ src/3rdparty/chromium/media/filters/vp9_parser.h
@@ -14,6 +14,7 @@
@ -7,4 +7,4 @@
+#include <unistd.h>
#include <sys/types.h>
#include <deque>
#include <memory>

4
www/qt5-webengine/files/patch-src_3rdparty_chromium_media_formats_common_offset__byte__queue.cc
View File

@ -1,6 +1,6 @@
--- src/3rdparty/chromium/media/formats/common/offset_byte_queue.cc.orig 2017-01-26 00:49:15 UTC
--- src/3rdparty/chromium/media/formats/common/offset_byte_queue.cc.orig 2018-11-13 18:25:11 UTC
+++ src/3rdparty/chromium/media/formats/common/offset_byte_queue.cc
@@ -46,13 +46,13 @@ void OffsetByteQueue::PeekAt(int64_t off
@@ -46,13 +46,13 @@ void OffsetByteQueue::PeekAt(int64_t offset, const uin
*size = tail() - offset;
}

2
www/qt5-webengine/files/patch-src_3rdparty_chromium_media_formats_common_offset__byte__queue.h
View File

@ -1,4 +1,4 @@
--- src/3rdparty/chromium/media/formats/common/offset_byte_queue.h.orig 2017-01-26 00:49:15 UTC
--- src/3rdparty/chromium/media/formats/common/offset_byte_queue.h.orig 2018-11-13 18:25:11 UTC
+++ src/3rdparty/chromium/media/formats/common/offset_byte_queue.h
@@ -36,15 +36,15 @@ class MEDIA_EXPORT OffsetByteQueue {
// a null |buf| and a |size| of zero.

6
www/qt5-webengine/files/patch-src_3rdparty_chromium_media_formats_mp2t_es__parser__adts.cc
View File

@ -1,6 +1,6 @@
--- src/3rdparty/chromium/media/formats/mp2t/es_parser_adts.cc.orig 2017-01-26 00:49:15 UTC
--- src/3rdparty/chromium/media/formats/mp2t/es_parser_adts.cc.orig 2018-11-13 18:25:11 UTC
+++ src/3rdparty/chromium/media/formats/mp2t/es_parser_adts.cc
@@ -54,11 +54,11 @@ bool EsParserAdts::LookForAdtsFrame(Adts
@@ -63,11 +63,11 @@ bool EsParserAdts::LookForAdtsFrame(AdtsFrame* adts_fr
const uint8_t* es;
es_queue_->Peek(&es, &es_size);
@ -15,7 +15,7 @@
const uint8_t* cur_buf = &es[offset];
if (!isAdtsSyncWord(cur_buf))
continue;
@@ -96,7 +96,7 @@ bool EsParserAdts::LookForAdtsFrame(Adts
@@ -107,7 +107,7 @@ bool EsParserAdts::LookForAdtsFrame(AdtsFrame* adts_fr
return true;
}

6
www/qt5-webengine/files/patch-src_3rdparty_chromium_media_formats_mp2t_es__parser__mpeg1audio.cc
View File

@ -1,6 +1,6 @@
--- src/3rdparty/chromium/media/formats/mp2t/es_parser_mpeg1audio.cc.orig 2017-01-26 00:49:15 UTC
--- src/3rdparty/chromium/media/formats/mp2t/es_parser_mpeg1audio.cc.orig 2018-11-13 18:25:11 UTC
+++ src/3rdparty/chromium/media/formats/mp2t/es_parser_mpeg1audio.cc
@@ -109,11 +109,11 @@ bool EsParserMpeg1Audio::LookForMpeg1Aud
@@ -108,11 +108,11 @@ bool EsParserMpeg1Audio::LookForMpeg1AudioFrame(
const uint8_t* es;
es_queue_->Peek(&es, &es_size);
@ -15,7 +15,7 @@
const uint8_t* cur_buf = &es[offset];
if (cur_buf[0] != 0xff)
continue;
@@ -154,7 +154,7 @@ bool EsParserMpeg1Audio::LookForMpeg1Aud
@@ -153,7 +153,7 @@ bool EsParserMpeg1Audio::LookForMpeg1AudioFrame(
return true;
}

12
www/qt5-webengine/files/patch-src_3rdparty_chromium_media_media__options.gni
View File

@ -1,12 +1,12 @@
--- src/3rdparty/chromium/media/media_options.gni.orig 2018-06-21 14:06:20 UTC
--- src/3rdparty/chromium/media/media_options.gni.orig 2018-11-13 18:25:11 UTC
+++ src/3rdparty/chromium/media/media_options.gni
@@ -53,6 +53,9 @@ declare_args() {
@@ -99,6 +99,9 @@ declare_args() {
# Enables runtime selection of ALSA library for audio.
use_alsa = false
+
+ # Enables runtime selection of sndio library for audio.
+ use_sndio = false
+ # Enables runtime selection of sndio library for audio.
+ use_sndio = false
+
# Alsa should be used on non-Android, non-Mac POSIX systems.
# Alsa should be used on desktop Chromecast and audio-only Chromecast builds.
if (is_posix && !is_android && !is_mac &&

10
www/qt5-webengine/files/patch-src_3rdparty_chromium_net_base_address__tracker__linux.h
View File

@ -1,4 +1,4 @@
--- src/3rdparty/chromium/net/base/address_tracker_linux.h.orig 2017-01-26 00:49:16 UTC
--- src/3rdparty/chromium/net/base/address_tracker_linux.h.orig 2018-11-13 18:25:11 UTC
+++ src/3rdparty/chromium/net/base/address_tracker_linux.h
@@ -6,10 +6,12 @@
#define NET_BASE_ADDRESS_TRACKER_LINUX_H_
@ -13,13 +13,13 @@
#include <stddef.h>
#include <map>
@@ -34,8 +36,11 @@ namespace internal {
class NET_EXPORT_PRIVATE AddressTrackerLinux :
public base::MessageLoopForIO::Watcher {
@@ -34,8 +36,12 @@ namespace internal {
class NET_EXPORT_PRIVATE AddressTrackerLinux
: public base::MessagePumpForIO::FdWatcher {
public:
+#if !defined(__FreeBSD__)
typedef std::map<IPAddress, struct ifaddrmsg> AddressMap;
-
+#else
+ typedef void* AddressMap;
+#endif

2
www/qt5-webengine/files/patch-src_3rdparty_chromium_net_base_address__tracker__linux__unittest.cc
View File

@ -1,4 +1,4 @@
--- src/3rdparty/chromium/net/base/address_tracker_linux_unittest.cc.orig 2017-01-26 00:49:16 UTC
--- src/3rdparty/chromium/net/base/address_tracker_linux_unittest.cc.orig 2018-11-13 18:25:11 UTC
+++ src/3rdparty/chromium/net/base/address_tracker_linux_unittest.cc
@@ -4,7 +4,11 @@

10
www/qt5-webengine/files/patch-src_3rdparty_chromium_net_base_network__change__notifier.h
View File

@ -1,15 +1,15 @@
--- src/3rdparty/chromium/net/base/network_change_notifier.h.orig 2017-01-26 00:49:16 UTC
--- src/3rdparty/chromium/net/base/network_change_notifier.h.orig 2018-11-13 18:25:11 UTC
+++ src/3rdparty/chromium/net/base/network_change_notifier.h
@@ -26,7 +26,7 @@ struct NetworkInterface;
@@ -22,7 +22,7 @@ class NetworkChangeNotifierFactory;
struct NetworkInterface;
typedef std::vector<NetworkInterface> NetworkInterfaceList;
class URLRequest;
-#if defined(OS_LINUX)
+#if defined(OS_LINUX) || defined(OS_BSD)
namespace internal {
class AddressTrackerLinux;
}
@@ -332,7 +332,7 @@ class NET_EXPORT NetworkChangeNotifier {
@@ -348,7 +348,7 @@ class NET_EXPORT NetworkChangeNotifier {
// a large HOSTS file.
static void GetDnsConfig(DnsConfig* config);
@ -18,7 +18,7 @@
// Returns the AddressTrackerLinux if present.
static const internal::AddressTrackerLinux* GetAddressTracker();
#endif
@@ -488,7 +488,7 @@ class NET_EXPORT NetworkChangeNotifier {
@@ -499,7 +499,7 @@ class NET_EXPORT NetworkChangeNotifier {
const NetworkChangeCalculatorParams& params =
NetworkChangeCalculatorParams());

2
www/qt5-webengine/files/patch-src_3rdparty_chromium_net_dns_dns__config__service__posix__unittest.cc
View File

@ -1,4 +1,4 @@
--- src/3rdparty/chromium/net/dns/dns_config_service_posix_unittest.cc.orig 2017-01-26 00:49:16 UTC
--- src/3rdparty/chromium/net/dns/dns_config_service_posix_unittest.cc.orig 2018-11-13 18:25:11 UTC
+++ src/3rdparty/chromium/net/dns/dns_config_service_posix_unittest.cc
@@ -2,8 +2,6 @@
// Use of this source code is governed by a BSD-style license that can be

4
www/qt5-webengine/files/patch-src_3rdparty_chromium_net_dns_dns__reloader.cc
View File

@ -1,8 +1,8 @@
--- src/3rdparty/chromium/net/dns/dns_reloader.cc.orig 2017-01-26 00:49:16 UTC
--- src/3rdparty/chromium/net/dns/dns_reloader.cc.orig 2018-11-13 18:25:11 UTC
+++ src/3rdparty/chromium/net/dns/dns_reloader.cc
@@ -7,6 +7,10 @@
#if defined(OS_POSIX) && !defined(OS_MACOSX) && !defined(OS_OPENBSD) && \
!defined(OS_ANDROID)
!defined(OS_ANDROID) && !defined(OS_FUCHSIA)
+#if defined(OS_FREEBSD)
+#include <netinet/in.h>

2
www/qt5-webengine/files/patch-src_3rdparty_chromium_net_socket_socks5__client__socket.cc
View File

@ -1,4 +1,4 @@
--- src/3rdparty/chromium/net/socket/socks5_client_socket.cc.orig 2017-01-26 00:49:16 UTC
--- src/3rdparty/chromium/net/socket/socks5_client_socket.cc.orig 2018-11-13 18:25:11 UTC
+++ src/3rdparty/chromium/net/socket/socks5_client_socket.cc
@@ -4,6 +4,10 @@

10
www/qt5-webengine/files/patch-src_3rdparty_chromium_ppapi_proxy_file__io__resource.cc
View File

@ -1,13 +1,11 @@
--- src/3rdparty/chromium/ppapi/proxy/file_io_resource.cc.orig 2017-01-26 00:49:16 UTC
--- src/3rdparty/chromium/ppapi/proxy/file_io_resource.cc.orig 2018-11-13 18:25:11 UTC
+++ src/3rdparty/chromium/ppapi/proxy/file_io_resource.cc
@@ -285,17 +285,19 @@ int32_t FileIOResource::Write(int64_t of
@@ -285,17 +285,17 @@ int32_t FileIOResource::Write(int64_t offset,
if (check_quota_) {
int64_t increase = 0;
- uint64_t max_offset = 0;
+ uint64_t _max_offset = 0;
+ // (rene) avoid name collission with /usr/include/vm/vm_map.h on FreeBSD
+ // which also defines max_offset
bool append = (open_flags_ & PP_FILEOPENFLAG_APPEND) != 0;
if (append) {
increase = bytes_to_write;
@ -24,7 +22,7 @@
}
if (increase > 0) {
@@ -319,7 +321,7 @@ int32_t FileIOResource::Write(int64_t of
@@ -319,7 +319,7 @@ int32_t FileIOResource::Write(int64_t offset,
if (append)
append_mode_write_amount_ += bytes_to_write;
else
@ -33,7 +31,7 @@
}
}
return WriteValidated(offset, buffer, bytes_to_write, callback);
@@ -597,9 +599,9 @@ void FileIOResource::OnRequestWriteQuota
@@ -597,9 +597,9 @@ void FileIOResource::OnRequestWriteQuotaComplete(
} else {
DCHECK_LE(offset + bytes_to_write - max_written_offset_, granted);

2
www/qt5-webengine/files/patch-src_3rdparty_chromium_printing_cups__config__helper.py
View File

@ -1,4 +1,4 @@
--- src/3rdparty/chromium/printing/cups_config_helper.py.orig 2017-01-26 00:49:17 UTC
--- src/3rdparty/chromium/printing/cups_config_helper.py.orig 2018-11-13 18:25:11 UTC
+++ src/3rdparty/chromium/printing/cups_config_helper.py
@@ -65,7 +65,7 @@ def main():
mode = sys.argv[1]

4
www/qt5-webengine/files/patch-src_3rdparty_chromium_third__party_boringssl_src_crypto_ex__data.c
View File

@ -1,6 +1,6 @@
--- src/3rdparty/chromium/third_party/boringssl/src/crypto/ex_data.c.orig 2017-01-26 00:50:08 UTC
--- src/3rdparty/chromium/third_party/boringssl/src/crypto/ex_data.c.orig 2018-11-13 18:25:11 UTC
+++ src/3rdparty/chromium/third_party/boringssl/src/crypto/ex_data.c
@@ -188,7 +188,9 @@ int CRYPTO_set_ex_data(CRYPTO_EX_DATA *a
@@ -186,7 +186,9 @@ int CRYPTO_set_ex_data(CRYPTO_EX_DATA *ad, int index,
}
}

6
www/qt5-webengine/files/patch-src_3rdparty_chromium_third__party_ffmpeg_BUILD.gn
View File

@ -1,7 +1,7 @@
--- src/3rdparty/chromium/third_party/ffmpeg/BUILD.gn.orig 2017-01-26 00:50:10 UTC
--- src/3rdparty/chromium/third_party/ffmpeg/BUILD.gn.orig 2018-11-13 18:25:11 UTC
+++ src/3rdparty/chromium/third_party/ffmpeg/BUILD.gn
@@ -6,8 +6,13 @@ import("ffmpeg_options.gni")
import("ffmpeg_generated.gni")
@@ -9,8 +9,13 @@ import("//build/buildflag_header.gni")
import("//build/config/sanitizers/sanitizers.gni")
# Path to platform configuration files.
-platform_config_root =

2
www/qt5-webengine/files/patch-src_3rdparty_chromium_third__party_ffmpeg_libavutil_mem.c
View File

@ -1,4 +1,4 @@
--- src/3rdparty/chromium/third_party/ffmpeg/libavutil/mem.c.orig 2017-01-26 00:50:11 UTC
--- src/3rdparty/chromium/third_party/ffmpeg/libavutil/mem.c.orig 2018-11-13 18:25:11 UTC
+++ src/3rdparty/chromium/third_party/ffmpeg/libavutil/mem.c
@@ -32,9 +32,6 @@
#include <stdint.h>

8
www/qt5-webengine/files/patch-src_3rdparty_chromium_third__party_libyuv_include_libyuv_row.h
View File

@ -1,6 +1,6 @@
--- src/3rdparty/chromium/third_party/libyuv/include/libyuv/row.h.orig 2017-01-26 00:50:13 UTC
--- src/3rdparty/chromium/third_party/libyuv/include/libyuv/row.h.orig 2018-11-13 18:25:11 UTC
+++ src/3rdparty/chromium/third_party/libyuv/include/libyuv/row.h
@@ -161,10 +161,14 @@ extern "C" {
@@ -157,10 +157,14 @@ extern "C" {
#define HAS_ARGBSHADEROW_SSE2
#define HAS_ARGBSUBTRACTROW_SSE2
#define HAS_ARGBUNATTENUATEROW_SSE2
@ -15,7 +15,7 @@
#define HAS_RGBCOLORTABLEROW_X86
#define HAS_SOBELROW_SSE2
#define HAS_SOBELTOPLANEROW_SSE2
@@ -211,7 +215,9 @@ extern "C" {
@@ -206,7 +210,9 @@ extern "C" {
#define HAS_I422TORGB565ROW_AVX2
#define HAS_I422TORGBAROW_AVX2
#define HAS_I444TOARGBROW_AVX2
@ -25,7 +25,7 @@
#define HAS_J422TOARGBROW_AVX2
#define HAS_MERGEUVROW_AVX2
#define HAS_MIRRORROW_AVX2
@@ -234,7 +240,9 @@ extern "C" {
@@ -231,7 +237,9 @@ extern "C" {
#define HAS_ARGBMULTIPLYROW_AVX2
#define HAS_ARGBSUBTRACTROW_AVX2
#define HAS_ARGBUNATTENUATEROW_AVX2

2
www/qt5-webengine/files/patch-src_3rdparty_chromium_third__party_pdfium_third__party_base_logging.h
View File

@ -1,4 +1,4 @@
--- src/3rdparty/chromium/third_party/pdfium/third_party/base/logging.h.orig 2017-01-26 00:50:15 UTC
--- src/3rdparty/chromium/third_party/pdfium/third_party/base/logging.h.orig 2018-11-13 18:25:11 UTC
+++ src/3rdparty/chromium/third_party/pdfium/third_party/base/logging.h
@@ -10,7 +10,7 @@

41
www/qt5-webengine/files/patch-src_3rdparty_chromium_third__party_skia_src_images_SkJpegEncoder.cpp Normal file
View File

@ -0,0 +1,41 @@
--- src/3rdparty/chromium/third_party/skia/src/images/SkJpegEncoder.cpp.orig 2018-11-13 18:25:11 UTC
+++ src/3rdparty/chromium/third_party/skia/src/images/SkJpegEncoder.cpp
@@ -77,9 +77,14 @@ bool SkJpegEncoderMgr::setParams(const SkImageInfo& sr
return transform_scanline_to_premul_legacy;
};
+#ifdef JCS_EXTENSIONS
J_COLOR_SPACE jpegColorType = JCS_EXT_RGBA;
+#else
+ J_COLOR_SPACE jpegColorType = JCS_RGB;
+#endif
int numComponents = 0;
switch (srcInfo.colorType()) {
+#ifdef JCS_EXTENSIONS
case kRGBA_8888_SkColorType:
fProc = chooseProc8888();
jpegColorType = JCS_EXT_RGBA;
@@ -90,6 +95,7 @@ bool SkJpegEncoderMgr::setParams(const SkImageInfo& sr
jpegColorType = JCS_EXT_BGRA;
numComponents = 4;
break;
+#endif
case kRGB_565_SkColorType:
fProc = transform_scanline_565;
jpegColorType = JCS_RGB;
@@ -109,6 +115,7 @@ bool SkJpegEncoderMgr::setParams(const SkImageInfo& sr
jpegColorType = JCS_GRAYSCALE;
numComponents = 1;
break;
+#ifdef JCS_EXTENSIONS
case kRGBA_F16_SkColorType:
if (!srcInfo.colorSpace()) {
return false;
@@ -124,6 +131,7 @@ bool SkJpegEncoderMgr::setParams(const SkImageInfo& sr
jpegColorType = JCS_EXT_RGBA;
numComponents = 4;
break;
+#endif
default:
return false;
}

77
www/qt5-webengine/files/patch-src_3rdparty_chromium_third__party_skia_src_ports_SkFontHost__FreeType.cpp Normal file
View File

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

2
www/qt5-webengine/files/patch-src_3rdparty_chromium_third__party_webrtc_modules_rtp__rtcp_source_forward__error__correction.cc
View File

@ -1,4 +1,4 @@
--- src/3rdparty/chromium/third_party/webrtc/modules/rtp_rtcp/source/forward_error_correction.cc.orig 2017-01-26 00:50:17 UTC
--- src/3rdparty/chromium/third_party/webrtc/modules/rtp_rtcp/source/forward_error_correction.cc.orig 2018-11-13 18:25:11 UTC
+++ src/3rdparty/chromium/third_party/webrtc/modules/rtp_rtcp/source/forward_error_correction.cc
@@ -13,6 +13,7 @@
#include <string.h>

4
www/qt5-webengine/files/patch-src_3rdparty_chromium_ui_base_ime_ime__engine__handler__interface.h
View File

@ -1,6 +1,6 @@
--- src/3rdparty/chromium/ui/base/ime/ime_engine_handler_interface.h.orig 2017-01-26 00:49:31 UTC
--- src/3rdparty/chromium/ui/base/ime/ime_engine_handler_interface.h.orig 2018-11-13 18:25:11 UTC
+++ src/3rdparty/chromium/ui/base/ime/ime_engine_handler_interface.h
@@ -138,7 +138,7 @@ class UI_BASE_IME_EXPORT IMEEngineHandle
@@ -162,7 +162,7 @@ class UI_BASE_IME_EXPORT IMEEngineHandlerInterface {
// Hides the input view window (from API call).
virtual void HideInputView() = 0;

4
www/qt5-webengine/files/patch-src_3rdparty_chromium_ui_events_event__switches.cc
View File

@ -1,6 +1,6 @@
--- src/3rdparty/chromium/ui/events/event_switches.cc.orig 2017-01-26 00:49:31 UTC
--- src/3rdparty/chromium/ui/events/event_switches.cc.orig 2018-11-13 18:25:11 UTC
+++ src/3rdparty/chromium/ui/events/event_switches.cc
@@ -28,7 +28,7 @@ const char kTouchEventsDisabled[] = "dis
@@ -17,7 +17,7 @@ const char kEnableScrollPrediction[] = "enable-scroll-
const char kCompensateForUnstablePinchZoom[] =
"compensate-for-unstable-pinch-zoom";

8
www/qt5-webengine/files/patch-src_3rdparty_chromium_ui_events_event__switches.h
View File

@ -1,11 +1,11 @@
--- src/3rdparty/chromium/ui/events/event_switches.h.orig 2017-01-26 00:49:31 UTC
--- src/3rdparty/chromium/ui/events/event_switches.h.orig 2018-11-13 18:25:11 UTC
+++ src/3rdparty/chromium/ui/events/event_switches.h
@@ -18,7 +18,7 @@ EVENTS_BASE_EXPORT extern const char kTo
EVENTS_BASE_EXPORT extern const char kTouchEventsDisabled[];
@@ -14,7 +14,7 @@ namespace switches {
EVENTS_BASE_EXPORT extern const char kEnableScrollPrediction[];
EVENTS_BASE_EXPORT extern const char kCompensateForUnstablePinchZoom[];
-#if defined(OS_LINUX)
+#if defined(OS_LINUX) || defined(OS_FREEBSD)
EVENTS_BASE_EXPORT extern const char kTouchDevices[];
EVENTS_BASE_EXPORT extern const char kPenDevices[];
#endif

4
www/qt5-webengine/files/patch-src_3rdparty_chromium_ui_events_keycodes_dom_keycode__converter.cc
View File

@ -1,6 +1,6 @@
--- src/3rdparty/chromium/ui/events/keycodes/dom/keycode_converter.cc.orig 2017-01-26 00:49:31 UTC
--- src/3rdparty/chromium/ui/events/keycodes/dom/keycode_converter.cc.orig 2018-11-13 18:25:11 UTC
+++ src/3rdparty/chromium/ui/events/keycodes/dom/keycode_converter.cc
@@ -19,7 +19,7 @@ namespace {
@@ -20,7 +20,7 @@ namespace {
// and DOM Level 3 |code| strings.
#if defined(OS_WIN)
#define USB_KEYMAP(usb, evdev, xkb, win, mac, code, id) {usb, win, code}

4
www/qt5-webengine/files/patch-src_3rdparty_chromium_ui_gfx_canvas__skia.cc
View File

@ -1,6 +1,6 @@
--- src/3rdparty/chromium/ui/gfx/canvas_skia.cc.orig 2017-01-26 00:49:31 UTC
--- src/3rdparty/chromium/ui/gfx/canvas_skia.cc.orig 2018-11-13 18:25:11 UTC
+++ src/3rdparty/chromium/ui/gfx/canvas_skia.cc
@@ -209,7 +209,7 @@ void Canvas::DrawStringRectWithShadows(c
@@ -208,7 +208,7 @@ void Canvas::DrawStringRectWithFlags(const base::strin
Range range = StripAcceleratorChars(flags, &adjusted_text);
bool elide_text = ((flags & NO_ELLIPSIS) == 0);

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