<pre style='margin:0'>
Perry E. Metzger (pmetzger) pushed a commit to branch master
in repository macports-ports.
</pre>
<p><a href="https://github.com/macports/macports-ports/commit/5a118750007a209653d51dec01e878d7eea3fc78">https://github.com/macports/macports-ports/commit/5a118750007a209653d51dec01e878d7eea3fc78</a></p>
<pre style="white-space: pre; background: #F8F8F8">The following commit(s) were added to refs/heads/master by this push:
<span style='display:block; white-space:pre;color:#404040;'> new 5a118750007 qt5: update to 5.15.11
</span>5a118750007 is described below
<span style='display:block; white-space:pre;color:#808000;'>commit 5a118750007a209653d51dec01e878d7eea3fc78
</span>Author: Christopher Chavez <chrischavez@gmx.us>
AuthorDate: Wed Oct 4 19:18:13 2023 -0500
<span style='display:block; white-space:pre;color:#404040;'> qt5: update to 5.15.11
</span><span style='display:block; white-space:pre;color:#404040;'>
</span><span style='display:block; white-space:pre;color:#404040;'> qt5-qtvirtualkeyboard: drop patch superseded by upstream
</span>---
aqua/qt5/Portfile | 230 +++++++++++-----------
aqua/qt5/files/patch-qtvirtualkeyboard_noxcb.diff | 17 --
2 files changed, 112 insertions(+), 135 deletions(-)
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/aqua/qt5/Portfile b/aqua/qt5/Portfile
</span><span style='display:block; white-space:pre;color:#808080;'>index 25275dcc56c..b453630bd27 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/aqua/qt5/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/aqua/qt5/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -14,7 +14,7 @@ license {LGPL-3 GPL-3 OpenSSLException}
</span> homepage https://www.qt.io
# When updating, also update py-pyside2
<span style='display:block; white-space:pre;background:#ffe0e0;'>-set qt_version 5.15.10
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+set qt_version 5.15.11
</span> version ${qt_version}
set middle_name everywhere-opensource
set worksrcdir_middle_name everywhere
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -105,7 +105,7 @@ foreach {qt_test_name qt_test_info} [array get available_qt_versions] {
</span> }
# MacPorts LLVM/Clang version to use when required.
<span style='display:block; white-space:pre;background:#ffe0e0;'>-set llvm_version 16
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+set llvm_version 17
</span>
############################################################################### Modules Not Considered
#
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -189,9 +189,9 @@ set llvm_version 16
</span> array set modules {
qt3d {
{
<span style='display:block; white-space:pre;background:#ffe0e0;'>- ba4234eef98e1994542cd3f599e1910d7b11df35
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- 225c06128b9b3574fd96d87890bd28c856198c157b91619e1e8ea8de41958c5f
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- 118262456
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ 610d9fe405b3edeb75d559a7cdb9d73d1236132c
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ 76e1c779b6744029b39035c28980153fd43d1d9c9b25112f7f6c2a6c7554eb4c
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ 118260068
</span> }
""
"port:assimp"
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -204,9 +204,9 @@ array set modules {
</span> }
qtbase {
{
<span style='display:block; white-space:pre;background:#ffe0e0;'>- 77a3ff43ce3efcec532792ef1dac70ab0c681859
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- c0d06cb18d20f10bf7ad53552099e097ec39362d30a5d6f104724f55fa1c8fb9
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- 50422688
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ 2e25040776f81fae490e6ae4cbb75863ae7d37ab
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ 425ad301acd91ca66c10c0dabee0704e2d0cd2801a6b670115800cbb95f84846
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ 50825756
</span> }
""
"port:zlib port:libpng path:include/turbojpeg.h:libjpeg-turbo port:freetype path:bin/dbus-daemon:dbus path:lib/pkgconfig/glib-2.0.pc:glib2 path:lib/pkgconfig/icu-uc.pc:icu port:pcre2 path:lib/pkgconfig/harfbuzz.pc:harfbuzz port:double-conversion port:zstd"
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -214,14 +214,14 @@ array set modules {
</span> {"Qt Core" "Qt GUI" "Qt Network" "Qt SQL" "Qt Test" "Qt Widgets" "Qt Concurrent" "Qt D-Bus" "Qt OpenGL" "Qt Platform Headers" "Qt Print Support" "Qt XML"}
""
"variant overrides: "
<span style='display:block; white-space:pre;background:#ffe0e0;'>- "revision 2"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ "revision 0"
</span> "License: "
}
qtcharts {
{
<span style='display:block; white-space:pre;background:#ffe0e0;'>- 1b821f2de9031686484f7cdfaa338381cd3007ee
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- d074be49e2ec9a1f87c979b3fd6510c81379a2d59556be96982bae1896c2a12b
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- 4254496
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ c6842cc320412fd3f5278df774eafef08a57ebb0
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ 48bc3ba505c9e7400edb92a33788e8dc6215400a28695e5ddf82caffdfe1ea2d
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ 4254628
</span> }
""
""
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -234,9 +234,9 @@ array set modules {
</span> }
qtconnectivity {
{
<span style='display:block; white-space:pre;background:#ffe0e0;'>- 029673e9659d8df6d65f9bd724fefb559df1517f
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- 3fdb1c0315eadc7674d583aa3af6708609ac157a108fce4bc4283bd98ee1b9e9
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- 2828256
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ b84fa2942b4ead902bd95b9a66e2c4de7de9e3dc
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ 31e7d2d5c2cfeba9fba921b8588bc839f7e081f61bf9d9bf4d753f6f25ec2178
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ 2829704
</span> }
""
""
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -249,9 +249,9 @@ array set modules {
</span> }
qtdatavis3d {
{
<span style='display:block; white-space:pre;background:#ffe0e0;'>- 0325fa65bc0f86c20132cfd028d4311ff27a67ca
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- e515605e599b4989399a350a085ce8c65a23ed9b9faf33836015550a01351ed2
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- 5193796
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ 3bfb5631a3bc4a8a92fa7e73ef02bb574746a9d3
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ 6e46688bcecc2920a73e575279e782ebf233e4e5fcd9d469a8c63a6f9df47fe2
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ 5193556
</span> }
""
""
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -264,9 +264,9 @@ array set modules {
</span> }
qtdeclarative {
{
<span style='display:block; white-space:pre;background:#ffe0e0;'>- 9e3ef1a14b266f4f5ad4f3b04a6e328bc806ceb1
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- 239b4c3c4cc49b174391445ad4b8320c11c8655300977955febd5dde69d33df4
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- 21596352
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ 4e5685f01ee642a5463443e38b80513ea6f7029b
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ 491e8473808ee3c5700081a68cc2095fee6bd3e36da07e444a37f2e5daa432c8
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ 21601640
</span> }
"port:python311"
""
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -279,9 +279,9 @@ array set modules {
</span> }
qtdoc {
{
<span style='display:block; white-space:pre;background:#ffe0e0;'>- 82a70011d937167a0b44d1ba38d67d167ae98786
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- 6df8cc5b199e949de8a3efc59de2bb57607cf36d47279fda3daa4256b9595ddf
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- 5751072
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ 5256aaeb622778c268661cc9abcb9aee6574d802
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ bf29e985dccf597527ea4420c3f7aaa5e7ef3ecbfd385115b9958872c258337b
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ 5751308
</span> }
""
""
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -294,9 +294,9 @@ array set modules {
</span> }
qtgamepad {
{
<span style='display:block; white-space:pre;background:#ffe0e0;'>- ba484f7ca99cd5788462fed9db9f0c49ad6f4134
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- 6808beb2d78a4346793043358afbfd46a064fce3fe11f79491347434c48a6a76
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- 389844
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ 81397664d007f163fda0ebcaa8693c6ec58759e9
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ 968bffc57d5ea7872d7850e3a319a94fb249603d81414b210e2df87e20346d22
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ 389848
</span> }
""
"port:libsdl2"
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -309,9 +309,9 @@ array set modules {
</span> }
qtgraphicaleffects {
{
<span style='display:block; white-space:pre;background:#ffe0e0;'>- 97764dbfafaba2f3e068414bfa2be9aa815c44f0
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- ab2cb196b2f4da5a415daa364691c474700c07bbaabae6282da990c31e7dc005
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- 14045288
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ d265c1c920207b161180668c4800fe5950b1e1e1
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ f52223a3e8b0c371eb1a47211ca740f0cbf8e6a93793da6c649002288ac479de
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ 14045384
</span> }
""
""
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -324,9 +324,9 @@ array set modules {
</span> }
qtimageformats {
{
<span style='display:block; white-space:pre;background:#ffe0e0;'>- 46a0904fd3601294dea5fa75615c6474906c12eb
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- 4f248a48c467d684cecedf36c6fd7d1f0edb47748fd7854c24a178b41154d1b2
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- 1845088
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ c7647ddb4bb33a13cd83ebe4573b54e2daeb0e47
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ 12fb3a15f927b46178e73891efed3e63313997b025129cdf053fd211fdc9b47f
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ 1869312
</span> }
""
"port:jasper port:libmng port:tiff port:webp"
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -339,9 +339,9 @@ array set modules {
</span> }
qtlocation {
{
<span style='display:block; white-space:pre;background:#ffe0e0;'>- 7f357c52a1f05df8009e21f084e2ad086ef1f9d5
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- 8816d26b947fc2b9ddb936acba3135ccb7517b4f9567d8a59916f3fc80bb6c33
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- 6552240
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ 25de8a61755ee751dd31c44649dc29e493e2f5da
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ aa3bed8e93b5d675c4fecac5dfe1fe6c5a50bd6d8dd72bcbcff8c88334845c14
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ 6554216
</span> }
""
"path:lib/pkgconfig/icu-uc.pc:icu port:zlib"
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -354,9 +354,9 @@ array set modules {
</span> }
qtlottie {
{
<span style='display:block; white-space:pre;background:#ffe0e0;'>- 88b2e21efb8513d0a9b8b2cc487e3e7cb673913c
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- 1fd3ab2a54223be60a57498fa0f213fb7dd4829f918928cc7d3f328ff34ad5a5
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- 85380
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ 668bba203b968f311779bf9fd676e7d732ad7977
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ fe4ef65c47d7f109dbe43d0e30b7d2b9ea6c58c3fe2a5031b66284d0ef5299e5
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ 85352
</span> }
""
""
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -369,9 +369,9 @@ array set modules {
</span> }
qtmacextras {
{
<span style='display:block; white-space:pre;background:#ffe0e0;'>- e1a944495b659b694b35201f4fdbf086dc00ea2c
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- 0c839ff69c3b9e73c9ff134b3b2bd2ec302127272e47cd67411524a388200e92
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- 72444
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ 90a59af85037a622740e3ad4c62a19a11cf6d4c8
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ 763d119175be7a9a726ba17d32429074123db62f8f2a723e725a03a6a477d8e0
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ 72468
</span> }
""
""
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -384,9 +384,9 @@ array set modules {
</span> }
qtmultimedia {
{
<span style='display:block; white-space:pre;background:#ffe0e0;'>- 422fa1ce45f438ef162537b29894492488c600eb
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- 1106e0bd8ec65b2c0a89170e452ea104ca9431050f507da5e874be2cb54f29b6
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- 3832156
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ 9ffdc4b5754ade50fa8cd4c0d577ec50c7145a81
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ 28ba35efe904c05f2d28c275ec9bd90a00b3f5857457bbd21c6d3c55c2aa521c
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ 3849160
</span> }
""
""
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -399,9 +399,9 @@ array set modules {
</span> }
qtnetworkauth {
{
<span style='display:block; white-space:pre;background:#ffe0e0;'>- 1b681dd9f3a48522d29ec4249d535303c0eb4398
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- 91462651054a078e98b87cff510b56bc636fd0fa209843dd887ed17c206ec961
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- 144780
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ 8769bc62aa2d70ee8dc6c2fd113f4b4e6c70ee42
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ af17a868bbb2a6ffc9425b9d8ef46c4e9089a5b4d4f16ee877252490ca893f75
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ 144768
</span> }
""
""
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -414,9 +414,9 @@ array set modules {
</span> }
qtpurchasing {
{
<span style='display:block; white-space:pre;background:#ffe0e0;'>- 83371bc2914f6029e45d281c0380b96c713940d4
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- 8b297f0f0a235c36e9e833648901e84a6da88b5c0d0644406ab6909e32fbfd3f
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- 309732
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ 57de89c1a56383738869772fd38bcd6d402fcc00
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ ffc8e4616e84567c9a507d4464e68b6a81b0aeec856690d1ccd219650c6e7e1e
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ 309824
</span> }
""
""
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -429,9 +429,9 @@ array set modules {
</span> }
qtquick3d {
{
<span style='display:block; white-space:pre;background:#ffe0e0;'>- c6e86a2b7b8b3be8f70372387690699a442ad73f
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- 6db37612f9a37d0fa6e8af302411f058b1fdd73c8bc9be1ba18b7f765f81d893
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- 55756692
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ 391853f9fdb2d32f36c436d5f0dc89274a6c8d28
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ c35d40d08649cc78e8f518e26a0c5276c03dbbd84c46fa1757e16fa302e6f3a2
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ 55746080
</span> }
""
"port:assimp"
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -444,9 +444,9 @@ array set modules {
</span> }
qtquickcontrols {
{
<span style='display:block; white-space:pre;background:#ffe0e0;'>- 2774ac937385f65ff2878cb620574536c0f68aa4
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- a06a6e73109857f0fce7e4d6a75fbe6b8ce4e27bc4f99802a6948a86daa9efeb
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- 5984520
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ 45c7b3b00c7f053aaf92999642ef47a7bfe42334
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ 45585cca7bdc751f2622824fa45b44e3ae381e1dae78511c57075bdc19075195
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ 5984928
</span> }
""
""
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -459,9 +459,9 @@ array set modules {
</span> }
qtquickcontrols2 {
{
<span style='display:block; white-space:pre;background:#ffe0e0;'>- 21256c02131198f636cb0534397ef260d48cce96
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- 97954c92fee9031ec31341812ccf53afb3c132e2b271bcef1174367fa002fc8e
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- 8293436
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ 15ed912d2acc2a874dc25760590b96f1203e4702
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ 263d3b8751007a45ed083ebc585b572552ab36e2fdc28468994ff29f384c6ad2
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ 8294208
</span> }
""
""
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -474,9 +474,9 @@ array set modules {
</span> }
qtquicktimeline {
{
<span style='display:block; white-space:pre;background:#ffe0e0;'>- f718ea57e6c9f92ce26829ac397a2b89f089f7e3
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- a0effcbf39c68591e5b788edb96ba3f1315df0eb6bd6f0c6b43594b32b640011
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- 105584
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ e61b2e8b4b5765b983e1784dd0e1e5e90241ae79
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ ded99ca86a384a2483aa34b152e682188a114f9e44583b11475aeaf09a8052a4
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ 105592
</span> }
""
""
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -489,9 +489,9 @@ array set modules {
</span> }
qtremoteobjects {
{
<span style='display:block; white-space:pre;background:#ffe0e0;'>- ca2a270ee9d3c2468455f2b2805839126d4b2dfb
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- 36fa891c1d9299cb13b422ac5626291db30f799f481ec50a493392d4618ce9c2
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- 379348
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ 81c2bd91f4ad75b41eebc685c8cc8b2b4d74a071
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ ba7ba0dcefe1290cbca046f452dfab62b33f18dd601787a222b6e4a3f664ea0e
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ 379452
</span> }
""
""
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -504,9 +504,9 @@ array set modules {
</span> }
qtscript {
{
<span style='display:block; white-space:pre;background:#ffe0e0;'>- 16bdfc929adde38d8f160419638224dc767a4b1b
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- 642dcd4506dd4ff19de6f671c3687ad5cce682a1ddc55dd7e9cfb840ac96703b
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- 2666052
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ 0764b70eb74b0142ea7ed6dca5920c8abad675a5
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ b6feb447f41dea3967f07bdae0aa0d6be264bc4b5c0f3e20e7867425e1de9f3b
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ 2666016
</span> }
""
""
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -519,9 +519,9 @@ array set modules {
</span> }
qtscxml {
{
<span style='display:block; white-space:pre;background:#ffe0e0;'>- 2bc200f3641aa566b0b3984cbe67a0b1004f2bc8
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- f1ffc78b1fd25bc813c79992e22590099f8cc65ce4360c1bdd22f7d97adb9d82
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- 437404
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ da9eb2b877fe2445a336637bf093039abc644a4c
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ e96a6db3423af6b4643e8e170905926642379537fe5d023ec989bd07b3c7f0ec
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ 437492
</span> }
""
""
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -534,9 +534,9 @@ array set modules {
</span> }
qtsensors {
{
<span style='display:block; white-space:pre;background:#ffe0e0;'>- 7785497633063ea756f188ab42911e859b6976d5
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- cd3c2ac4d6097f506f7864718b8823dbb0cd0b34fac4a6ca8a23bac8fa59ff01
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- 2059812
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ a3c9ae6dbc8b27e85b86187bae99b39f7c587e89
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ 90a1569b050897951035bcf8d3ac01267669717eb913c64fa3b580c5d6d5056b
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ 2060032
</span> }
""
""
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -549,9 +549,9 @@ array set modules {
</span> }
qtserialbus {
{
<span style='display:block; white-space:pre;background:#ffe0e0;'>- db3e9338e601e3d585a62602c9182cebf704cdfd
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- c9c13a71de5bf3be1a18b91218686f9aa08a7f429a526cb2067ea54b6d61ffc4
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- 359256
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ 2b9fb1fd03b4ff7595862549b13987df8ea984ba
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ b5d4262f58bbf5f52d0de4a6ee24bae27b952f64a186addd70a03617a0dce975
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ 359464
</span> }
""
""
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -564,9 +564,9 @@ array set modules {
</span> }
qtserialport {
{
<span style='display:block; white-space:pre;background:#ffe0e0;'>- 4033caad38ff2bddcf4bbd385b29e83d5a42ae0c
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- fc6f4e2a4585dd24898c3a823ab82f05f7337c0e0fd710bbde7745bc80f068fe
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- 324256
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ 1e51dac7890a4010ac3dd406e3f8d4c9a2a83270
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ 54d25d62278b6dab4e18f6a8005cd6af0b28310580b7f0e17962c351809ab243
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ 323460
</span> }
""
""
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -579,9 +579,9 @@ array set modules {
</span> }
qtspeech {
{
<span style='display:block; white-space:pre;background:#ffe0e0;'>- 4452e4c18a57e1713537ac3c2db9be77b52c8f7e
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- 8af34b46ae8a81749e455acd3e3602ae53983b01df76138172dba76a3bb64ce3
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- 104944
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ 1aed47616f70aad0d03cf9ea94b7997e6483a093
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ 3e0e9b2df656b86c18a00f74aa123aa3aa854c0b07cfcde97ff4f1ec2e70a42d
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ 104996
</span> }
""
""
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -594,9 +594,9 @@ array set modules {
</span> }
qtsvg {
{
<span style='display:block; white-space:pre;background:#ffe0e0;'>- 8f7adebf09542cd6c9165c3bb0b0daae6e690312
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- cf13e3835b8a767779d041e556b0942c2d5aeb3b5a5d325ae5d2028c37004ae8
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- 1889960
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ d58677480cbcd9a7ca97fc6ada0ba1ae839812d8
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ da80c8f0842544481e7bea8693c03fbba480cb3bd9da59ba03e3ce38eba64afa
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ 1890072
</span> }
""
""
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -609,9 +609,9 @@ array set modules {
</span> }
qttools {
{
<span style='display:block; white-space:pre;background:#ffe0e0;'>- c8961544c2d76dd6142b7968fd4a5f4693901ce4
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- 66f46c9729c831dce431778a9c561cca32daceaede1c7e58568d7a5898167dae
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- 8899372
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ 991ab813fdacd4cc403ea6087a0c7580b320834c
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ 7cd847ae6ff09416df617136eadcaf0eb98e3bc9b89979219a3ea8111fb8d339
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ 8898428
</span> }
""
"port:clang-${llvm_version}"
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -624,9 +624,9 @@ array set modules {
</span> }
qttranslations {
{
<span style='display:block; white-space:pre;background:#ffe0e0;'>- 74c10465a1037406fc18500e7d5fbae9cb8c093c
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- 38b942bc7e62794dd072945c8a92bb9dfffed24070aea300327a3bb42f855609
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- 1635736
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ 55ce25cd6891d3951135876e1ac7aec2c52c1a7d
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ a31785948c640b7c66d9fe2db4993728ca07f64e41c560b3625ad191b276ff20
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ 1635932
</span> }
"port:qt5-qttools"
""
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -634,14 +634,14 @@ array set modules {
</span> {"translation files"}
""
"variant overrides: ~examples ~tests ~debug noarch ~docs"
<span style='display:block; white-space:pre;background:#ffe0e0;'>- "revision 1"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ "revision 0"
</span> "License: "
}
qtvirtualkeyboard {
{
<span style='display:block; white-space:pre;background:#ffe0e0;'>- 9d03f170ba2cd8dcbd7c8da4d19436956da7f851
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- 4571faa716c36a3db0211379881d70c2ef510f7649289d434633e03ac3b43da8
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- 10958048
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ 970cd491f63a5ceab1f9ba7f4c264e220ca04e9c
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ 69cb4206f7ee01907d7bc7e8df539d355f2fc19ccb144815d3e7f18fef5d099b
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ 10960552
</span> }
""
"port:hunspell"
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -654,9 +654,9 @@ array set modules {
</span> }
qtwebchannel {
{
<span style='display:block; white-space:pre;background:#ffe0e0;'>- fe78508267059b73705350133fbcc471d4e3d5c4
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- e25702f842057063075e7dd8460b3143b6c6666ba76d274f69bb039c2f8effe5
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- 211876
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ 2b6e504205701e4462f3a9024151132943446c51
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ cf3fedfd05709fe29bac3ec3b2a3309c6a5abc6ad91507da0e9428a88f1b3dec
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ 211992
</span> }
""
""
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -680,9 +680,9 @@ array set modules {
</span> }
qtwebglplugin {
{
<span style='display:block; white-space:pre;background:#ffe0e0;'>- c6d47766f7056ddac01f0e56e1db3d53a46ab60f
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- 19a9b6007dc74c3eda9304a4b94e6cdafb31677b835c6073dff1e6e20bde6c8a
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- 77096
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ c8d88d6491a856d3bcf935f860f0ffa8de336a70
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ 05332df01b9d40c39dcdf266babf7ab5b95cc08e653a98925004c0af089f0458
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ 77116
</span> }
""
""
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -725,9 +725,9 @@ array set modules {
</span> }
qtwebsockets {
{
<span style='display:block; white-space:pre;background:#ffe0e0;'>- 77cbe8127395b4cead65053639253abbc7025c97
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- 2b9562db9e5c4b4585ab017f9b46b59ddc75b4d7222c5b03ebbc479652f6d98a
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- 261792
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ 9c8d0ac8e3be59d7b4fbfc24073994e7c0d01fb7
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ 1e31a5854ea987cabb195b704d36396a3eea9c4d1414749d3625c48d2262a478
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ 261948
</span> }
""
""
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -740,9 +740,9 @@ array set modules {
</span> }
qtwebview {
{
<span style='display:block; white-space:pre;background:#ffe0e0;'>- cf707aff1b2ba2b98b241c451e11b544becfc235
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- 2458c606dd9caa6e92b2fb136cc0f74ebb0757c1616a4c5180b2857d42328400
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- 136584
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ 22d07bf75724828b84a1aa8d09347fc07ac20e8f
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ a2f9dc0bbf917f5fdd71943aecdb19d295aa1d563457fbf04e2242432f0673fb
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ 136856
</span> }
""
""
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -755,9 +755,9 @@ array set modules {
</span> }
qtxmlpatterns {
{
<span style='display:block; white-space:pre;background:#ffe0e0;'>- 0c29c63c381a4a5b41c8afc3fb6faf8d885ec3ae
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- 03577573a2bbc035192a75917ceceadfd787899c3622d91e6a8844ad29d1da0d
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- 5195076
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ a8f57d99650662f951ebc0a826303498d34b7cdc
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ ea7ea2e63a57b296b362009b35e200d7bc497abfa1d278582d4acea914c4c7e8
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ 5192940
</span> }
""
""
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1848,12 +1848,6 @@ foreach {module module_info} [array get modules] {
</span> }
}
<span style='display:block; white-space:pre;background:#ffe0e0;'>- # special case
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- if { ${module} eq "qtvirtualkeyboard" } {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- # do not opportunistically use xcb
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- patchfiles-append patch-qtvirtualkeyboard_noxcb.diff
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- }
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span> # special case
if { ${module} eq "qtmultimedia" } {
PortGroup conflicts_build 1.0
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/aqua/qt5/files/patch-qtvirtualkeyboard_noxcb.diff b/aqua/qt5/files/patch-qtvirtualkeyboard_noxcb.diff
</span>deleted file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index 437654a43ad..00000000000
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/aqua/qt5/files/patch-qtvirtualkeyboard_noxcb.diff
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ /dev/null
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1,17 +0,0 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>---- src/virtualkeyboard/virtualkeyboard.pro.orig 2016-11-28 02:45:25.000000000 -0700
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ src/virtualkeyboard/virtualkeyboard.pro 2017-06-20 07:13:44.000000000 -0700
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -405,10 +405,10 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- SOURCES += desktopinputpanel.cpp inputview.cpp
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- HEADERS += desktopinputpanel_p.h inputview_p.h
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- DEFINES += QT_VIRTUALKEYBOARD_DESKTOP
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- !no-pkg-config:packagesExist(xcb) {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- PKGCONFIG += xcb xcb-xfixes
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- DEFINES += QT_VIRTUALKEYBOARD_HAVE_XCB
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- }
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ #!no-pkg-config:packagesExist(xcb) {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ # PKGCONFIG += xcb xcb-xfixes
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ # DEFINES += QT_VIRTUALKEYBOARD_HAVE_XCB
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ #}
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- }
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- record-trace-input {
</span></pre><pre style='margin:0'>
</pre>