<pre style='margin:0'>
Marcus Calhoun-Lopez (MarcusCalhoun-Lopez) pushed a commit to branch master
in repository macports-ports.
</pre>
<p><a href="https://github.com/macports/macports-ports/commit/c35b405c2b72da5bbd71963afcd40b9bed96541d">https://github.com/macports/macports-ports/commit/c35b405c2b72da5bbd71963afcd40b9bed96541d</a></p>
<pre style="white-space: pre; background: #F8F8F8"><span style='display:block; white-space:pre;color:#808000;'>commit c35b405c2b72da5bbd71963afcd40b9bed96541d
</span>Author: Marcus Calhoun-Lopez <mcalhoun@macports.org>
AuthorDate: Fri Dec 20 03:50:51 2019 -0700
<span style='display:block; white-space:pre;color:#404040;'> qt59: update version 5.9.8->5.9.9
</span>---
aqua/qt59/Portfile | 219 ++++++++++++++++++--------------------
aqua/qt59/files/patch-shared.diff | 11 --
2 files changed, 106 insertions(+), 124 deletions(-)
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/aqua/qt59/Portfile b/aqua/qt59/Portfile
</span><span style='display:block; white-space:pre;color:#808080;'>index 480919e..78080e5 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/aqua/qt59/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/aqua/qt59/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -13,7 +13,7 @@ license {LGPL-3 GPL-3 OpenSSLException}
</span>
homepage https://www.qt.io
<span style='display:block; white-space:pre;background:#ffe0e0;'>-version 5.9.8
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+version 5.9.9
</span> if { ${subport} eq "${name}-qtwebkit" ||
${subport} eq "${name}-qtwebkit-examples" ||
${subport} eq "${name}-qtwebkit-docs" } {
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -137,9 +137,9 @@ if { ${os.major} == 14 } {
</span> array set modules {
qt3d {
{
<span style='display:block; white-space:pre;background:#ffe0e0;'>- ec6934acfbb102f22b625f6297d02d84dc7e8cbb
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- 21a4890cc52c015c1be0568ef2d322d48b430470fb8c482e283ff6d783cb93f9
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- 83723260
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ 412e93a2e8352715c457ca7589455bd1811653de
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ 558ca9b4040c0d8a5c744d56599f4a4572d6c4d4082cbe86b79f583df3c97300
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ 83730292
</span> }
""
"port:assimp"
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -152,9 +152,9 @@ array set modules {
</span> }
qtbase {
{
<span style='display:block; white-space:pre;background:#ffe0e0;'>- 09ba56007ee1236c54046c5ef6962b0db60e681a
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- 9b9dec1f67df1f94bce2955c5604de992d529dde72050239154c56352da0907d
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- 45245896
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ c422ddf7dd8b2b67912cb547a5bd66793ac4d942
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ d5a97381b9339c0fbaf13f0c05d599a5c999dcf94145044058198987183fed65
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ 45219440
</span> }
""
"port:zlib port:libpng port:jpeg port:freetype path:bin/dbus-daemon:dbus path:lib/pkgconfig/glib-2.0.pc:glib2 port:icu port:pcre2 port:harfbuzz"
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -162,14 +162,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 4"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ "revision 0"
</span> "License: "
}
qtcanvas3d {
{
<span style='display:block; white-space:pre;background:#ffe0e0;'>- 86313e3668bcbf4d27ad6a7da208154f61587d35
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- 94478c68abbf081581eda593fdc0d69ff131435e0550daa1a36dc6b3eaf21a6f
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- 10890748
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ fa0066a94d1c5dfcf3f6ddd837477b58448436bc
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ 851750fab8b7ccaaa7fbd32921a6fa663260a8179c6c8907ec6e38ec6bf2cc2a
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ 10851888
</span> }
""
""
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -182,9 +182,9 @@ array set modules {
</span> }
qtcharts {
{
<span style='display:block; white-space:pre;background:#ffe0e0;'>- 02818b7143571fe09f7e7fb7fe4bfd68b746708c
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- a75f89c0081af9635b50cab335a4871d476b36abc8a11dc4f24724bd3cf42437
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- 4156072
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ 70b01e77edd9804a6e4ab4a5f20dce95540b6082
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ a503e9f1504c41a6a7850ca2e0e4e786fce45345c94eb81a6abd352d15b7d95c
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ 4161568
</span> }
""
""
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -197,9 +197,9 @@ array set modules {
</span> }
qtconnectivity {
{
<span style='display:block; white-space:pre;background:#ffe0e0;'>- 1191cd1d7d9600759466bae9050717ed2d74bf47
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- 4bd2e385c9cb245ac770198220983c4b0e2555d5317788814b66ac5f2aec6879
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- 2712112
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ c2b70d0f8d3f467deda1a852af09a0c83d8536f1
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ 755666bcbd19acd0af582b826af5148f4df72ad1e110d6950aa430d631492213
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ 2713960
</span> }
""
""
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -212,9 +212,9 @@ array set modules {
</span> }
qtdatavis3d {
{
<span style='display:block; white-space:pre;background:#ffe0e0;'>- b31b56f87d37ee641dd114cca513e6d533f2ce8e
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- 8fba8a7f0f6d24b002423aa033c91a838cc1c62742a50e722c14f8921c095f7e
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- 5162932
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ cd78573e329d7ffbfcd6a9d913142ff42b33ffce
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ f33f3b942cc776659c1fc11e8a5ce1c3894e29519610fe4fbe05e849b0259135
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ 5169228
</span> }
""
""
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -227,9 +227,9 @@ array set modules {
</span> }
qtdeclarative {
{
<span style='display:block; white-space:pre;background:#ffe0e0;'>- 22158bb129af9c4eb5cd251ee1d12882929f4bb7
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- b4e47b6038f3c604dee8128aeed12a0e9558a7b2bba63a2c44e4ad0743de5450
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- 21417896
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ 2c5e7dfa934e801bd361d26465e4a4ccba2da8e0
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ 45a0132a0c97a6fe446061bbcd01b3fb7a551f2f8d7223c619f34a06585fb3da
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ 21456112
</span> }
"port:python27"
""
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -242,9 +242,9 @@ array set modules {
</span> }
qtdoc {
{
<span style='display:block; white-space:pre;background:#ffe0e0;'>- f9c467867e62cd6b33ca04e491682d6a8a24a158
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- f8cd3768bb951403ad76d174f18e6f499c373d273fe4112d3429bc6930f361a0
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- 2892448
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ d602f20e7353c4f7a1fb1c6cc52f874427a95840
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ 1fcfac747b874848259109faa3ed39e9634101510369f66edfa10709f28cbfef
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ 2895540
</span> }
""
""
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -257,9 +257,9 @@ array set modules {
</span> }
qtgamepad {
{
<span style='display:block; white-space:pre;background:#ffe0e0;'>- 8432205f076f3e9315dc5178d32c5440f84be1a0
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- 4d3e45484030475e858895484acf739d31125a2b94fa9cde08805f19eb8464e4
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- 365144
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ df35620c94ac3e89608f88ff46f67e45e9c78aa7
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ 1d8232fcbddfe7b0e3746fa3c974197dd2c4f3a2b524b0bfcf14776273e2c39b
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ 365648
</span> }
""
"port:libsdl2"
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -272,9 +272,9 @@ array set modules {
</span> }
qtgraphicaleffects {
{
<span style='display:block; white-space:pre;background:#ffe0e0;'>- 97080bdd5ef39a8e405faad91f84f0b751efa395
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- 7f0d47ed7a92440de8d4a149210ecb76f2020586d7704388f5fd69063ab01a1b
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- 14227012
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ ff8f46beddbff3286b56278ff924d2efc04d37a7
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ 8a4ec3642e369a519db44055fade4d8c33811abf53d84677964ee33068d8c804
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ 14013268
</span> }
""
""
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -287,9 +287,9 @@ array set modules {
</span> }
qtimageformats {
{
<span style='display:block; white-space:pre;background:#ffe0e0;'>- 7a2ea49580ef88302ae7844ba29bab1dddc0c564
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- 5357f3ab91c67bfcc88c1dea3213c9538af6823f99a20cfec89ba66fab513627
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- 2112056
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ 6be87ffaab94b3cfaad44d5635ada73f734701cc
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ e747b17d98286f72ffbac67e452bb944ffd092cbaf3f215b73e9e76064c0d9cc
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ 2125700
</span> }
""
"port:jasper port:libmng port:tiff port:webp"
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -302,9 +302,9 @@ array set modules {
</span> }
qtlocation {
{
<span style='display:block; white-space:pre;background:#ffe0e0;'>- c10aed76494527a3e0c01e9f58bf275972d387a5
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- d4a4bf7d30a50aeb1202494a946c46053643a46fcea2d7b5a5ae0c5dddbad728
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- 5405312
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ 4ffcd4115ca035f9f28fb5c8626fa6b1de9fb8e7
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ 4a04f1a325e9f31f51d471ac4fcb9fbf914f45802521ba678ac4e1c41fb07c0e
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ 5406996
</span> }
""
"port:icu port:zlib"
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -312,14 +312,14 @@ array set modules {
</span> {"Qt Location" "Qt Positioning"}
""
"variant overrides: "
<span style='display:block; white-space:pre;background:#ffe0e0;'>- "revision 3"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ "revision 0"
</span> "License: "
}
qtmacextras {
{
<span style='display:block; white-space:pre;background:#ffe0e0;'>- eb2c4144776dc13c54c31232e3b06955641366a3
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- 294acb9184cc812acfa7f119c00a2437d157cf873068ccbd8876f21b895eab69
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- 48672
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ 2201f5af0d98ffc65ae2e41de375b47b91bc0e5c
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ ad560e33a54bf9ef1f5196bd05f57b381c3b69d496a66a7805cdfd4336971622
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ 48856
</span> }
""
""
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -332,9 +332,9 @@ array set modules {
</span> }
qtmultimedia {
{
<span style='display:block; white-space:pre;background:#ffe0e0;'>- 7e462ffdff2edf4e15349134a0e11f967ba994ec
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- 007881d47fb1f91dab0734385998324c8550bdd21e71bfc2f3b466311946c1a6
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- 3589804
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ 3aaa7ec23cb71bd5cb48918a548b227a7f150f98
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ 7efdacff5144b44a57d2ad742edc9843e65a599877e6ba7446696c947078ebee
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ 3589588
</span> }
""
""
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -347,9 +347,9 @@ array set modules {
</span> }
qtnetworkauth {
{
<span style='display:block; white-space:pre;background:#ffe0e0;'>- 34ef2367b4ea36d04d2c38e05ae83dabc1fcfe45
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- af67eb2656b83bf7cc43479d2a60a09c33ea241e4ec847fb30e8704fd1264ec8
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- 112232
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ fb8a4b31f8291364e546e44d5c523f03be3a6f1d
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ 6f905ad66ef73806987c137bbe0958d2f191c63a6e734e5c3eed42fa846cf351
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ 112752
</span> }
""
""
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -362,9 +362,9 @@ array set modules {
</span> }
qtpurchasing {
{
<span style='display:block; white-space:pre;background:#ffe0e0;'>- aba364b177917e3da5008fd1d665ec164e319094
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- a972a3b7dcd486e66de68344c2db41a3a97171932951d6f73d6fdedb818f8c45
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- 187764
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ 9ae8dde54e6973862929c7f4a0c2b6b2c2ff3ec4
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ 53595eb707c7e20b73b35e3a8ba53672616e381b28e6061d5d66a0f609c18811
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ 188008
</span> }
""
""
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -377,9 +377,9 @@ array set modules {
</span> }
qtquickcontrols {
{
<span style='display:block; white-space:pre;background:#ffe0e0;'>- a32d43df49ff2051888a9db96c516026e3487f83
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- 8fba8b190b2f6259cafb9a13d57f1ae9806d871957d65a6af75030cf303ec665
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- 6016096
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ 2666d5d032cb89f20b8de5d17d20a1781163493a
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ 7b7a1bb674bd19a7bf83a9e64990272f5445e0705d33d4017c84478890a39f07
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ 5953096
</span> }
""
""
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -392,9 +392,9 @@ array set modules {
</span> }
qtquickcontrols2 {
{
<span style='display:block; white-space:pre;background:#ffe0e0;'>- 8470b2334f42c49ef42218a0d5eac7373c3dda3c
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- 6c1e47188facca82f443e2d3d9692d5a9574db073c37e218b1d89f795b697018
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- 4158564
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ 2bb0d11ccc8c12b79d137d34f56353777a71b5b8
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ bd3dbd1305620e0292c0eed9f7b5646542c386b0a5129179c6b82a10307d38ec
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ 4147044
</span> }
""
""
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -407,9 +407,9 @@ array set modules {
</span> }
qtremoteobjects {
{
<span style='display:block; white-space:pre;background:#ffe0e0;'>- 564e5771db4ce97c90f7b94fdc5a2b3d11865eb4
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- 697d153d69b13f61415955727ca3b62b7338a6b098428cc5d5cf2c84edeb8246
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- 282388
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ f1e554b0e2d58d4c15d8948d46bdb5650808e355
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ f9084d042d5418e391aa4cd4345e105fc96496979568b4c1dd1b226f76db94de
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ 282596
</span> }
""
""
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -422,9 +422,9 @@ array set modules {
</span> }
qtscript {
{
<span style='display:block; white-space:pre;background:#ffe0e0;'>- 28ef283cf9aa79f1a8f20eb50ab53c89258d527c
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- f60944404fa38052f5a0f75e3e63ccd1c4c5a2e99fa966d621cca6420771f7f5
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- 2607332
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ e0c1280e88bdad533e504587d79cd15cd95b43e8
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ 7addb75ebdfbaa2d3cdc3e9c6cb27fe6ccc4d61376cc133a522c4c30d5f973a0
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ 2599344
</span> }
""
""
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -432,14 +432,14 @@ array set modules {
</span> {"Qt Script" "Qt Script Tools"}
"deprecated in favor QJS* in Qt QML"
"variant overrides: "
<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: "
}
qtscxml {
{
<span style='display:block; white-space:pre;background:#ffe0e0;'>- dc15c3a86f95881bbbe1256cce848a56aa49d359
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- 7cac9b74bf2b16d36271d10cd9d0d58d380b9c87244c465ef89f9c83a641f6cb
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- 414148
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ 5775b93d0469c22abd8296652446540bcbd7da35
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ 441189c7c1d242d599f3ff6e09d99f40e51b8ccb2a6fd66c03835ebda95eb5f1
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ 412240
</span> }
""
""
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -452,9 +452,9 @@ array set modules {
</span> }
qtsensors {
{
<span style='display:block; white-space:pre;background:#ffe0e0;'>- 6f60286af779df1926f771cc60cbc263972ef01f
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- 64d154eaa0e11262d75ee753fb02c6547a391a1c31dd17a36155c688bdcb1e66
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- 1994744
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ 46430ffede5beb54ce3efac9970092fefb39b35e
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ 075eb08575912d8aa4f3942ae2d0e771b913bac598e0be44b73179c820f9d4b0
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ 1991540
</span> }
""
""
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -467,9 +467,9 @@ array set modules {
</span> }
qtserialbus {
{
<span style='display:block; white-space:pre;background:#ffe0e0;'>- 182c3b223a96311b97000a51e219e32719c61b82
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- 593f31025e24fae2699d9c512d257ef0734b7e78c273a50a5e41a9bb30a11a5a
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- 279084
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ 0a77880a4d73acc5d682738e402e5024a2e2a590
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ acc85c9cea15c1e1a013cad976cbde476ed6a83f79beb00828a26eaef459332e
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ 279728
</span> }
""
""
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -482,9 +482,9 @@ array set modules {
</span> }
qtserialport {
{
<span style='display:block; white-space:pre;background:#ffe0e0;'>- 1648da444f72615bee35c98da3f0b52b0ce7b3df
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- 141eb4f49b3b3e94433e7941d57713d2a1cc8e16f6fc22779d683359ef965d7b
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- 268448
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ a0a219c2d30eb1c7a96b5d926b93a660020732ec
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ 65c2fa8add33c96afd2937feaa8f8a1e2b5c429319946a3beca85c666bf17c23
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ 267856
</span> }
""
""
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -497,9 +497,9 @@ array set modules {
</span> }
qtspeech {
{
<span style='display:block; white-space:pre;background:#ffe0e0;'>- 23beae4af7c745afe434d9a58d1bf6cf94846c51
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- d234d21647edb04bb510fe71c21e4dc0f83ae75014a2757645131d0afc3fb7df
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- 80708
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ 38da4fd4aba657e7b9c7c21a32c331282b113676
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ 299860ad0ca47ad50564ef52275b292950326c0effb605f0498157075eafc708
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ 81240
</span> }
""
""
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -512,9 +512,9 @@ array set modules {
</span> }
qtsvg {
{
<span style='display:block; white-space:pre;background:#ffe0e0;'>- d1cdefcc5f77d4328ddc5a14d939287b1e9c4910
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- c15d0c4ed93b168a6473749dd70cb04b3cc8e8af584447f2701be4cf2f11c5db
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- 1779000
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ 4dee6fc8aca31c69e1663a92c1f5fc7a045e16d4
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ 0d2759178c0c1ec8c7ea0d05b7bf57787c09d8059ca9b9518607a8e97933e888
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ 1776840
</span> }
""
""
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -527,9 +527,9 @@ array set modules {
</span> }
qttools {
{
<span style='display:block; white-space:pre;background:#ffe0e0;'>- 8db2daf2db4f0ba3417f75b401befd6a8412183b
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- a97556eb7b2f30252cdd8a598c396cfce2b2f79d2bae883af6d3b26a2cdcc63c
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- 9574668
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ 74091caeb0bfe05375ed5d6c4ac1edb77074bbd9
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ fce6e0fd39a40bcef880c669080087dba94af1ec442296222210472e0852bf98
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ 9590324
</span> }
""
""
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -542,9 +542,9 @@ array set modules {
</span> }
qttranslations {
{
<span style='display:block; white-space:pre;background:#ffe0e0;'>- bdd71d95cf20d9a11dd27d3383f8fba4e72a14bd
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- fb5a47799754af73d3bf501fe513342cfe2fc37f64e80df5533f6110e804220c
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- 1376288
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ cbef238abbcd00f1ef9024d67ec7e14fda850acc
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ f7474f260a1382549720081bf2359a3d425ec3bf7d31976c512834303d30d73b
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ 1329900
</span> }
""
""
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -557,9 +557,9 @@ array set modules {
</span> }
qtvirtualkeyboard {
{
<span style='display:block; white-space:pre;background:#ffe0e0;'>- a47e93173668a867e549716d47a302718147818a
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- 06e950bf4fd195f22b2fb7ccfa7425c50cdda3d42615e0589857fe9219677ccf
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- 10051508
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ cf77865a294bcd70dc33311db6ae9b089fb7f0dc
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ d621ab4cc313d41d7eac419f115d5e2b7ebb99c7fe53358b1093c52a2fdaff28
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ 10028308
</span> }
""
"port:hunspell"
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -572,9 +572,9 @@ array set modules {
</span> }
qtwebchannel {
{
<span style='display:block; white-space:pre;background:#ffe0e0;'>- 4f1a66313b256cbcc309863ca52b55add1ec22f5
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- 692acb68884fb3f47891f5b91f21d0f3b67242b3ef3fbc9f4a753ec2f25725ea
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- 147692
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ 400a8e9482bdfed2691dc98a7713b53bebf7ba75
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ 5537d4ecb890b758d780d7edc0c68d53a688c2b0b8c93c38e0d0e05b211214fd
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ 148052
</span> }
""
""
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -587,9 +587,9 @@ array set modules {
</span> }
qtwebengine {
{
<span style='display:block; white-space:pre;background:#ffe0e0;'>- 6877881369df06fc3a2171c9a7c27ad4882e07fe
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- 74d3c3430a294faac2c6048ac5224f82fe98247a86cac13b386aa5a1c22db27c
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- 215346584
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ 52ee8ea4e0e531f56960fb3c278cd4061bc9010e
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ dd1926f8ca4025ef15293f389adafe26b3da93764bd837acba948c9f0529f1ef
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ 215808964
</span> }
"port:python27 port:py27-ply path:bin/ninja:ninja"
""
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -632,9 +632,9 @@ array set modules {
</span> }
qtwebsockets {
{
<span style='display:block; white-space:pre;background:#ffe0e0;'>- 7a8e1002f4c815d225ca791daa00d8ca4a106c0c
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- 616907dfc0e581ceb18cde27d998576abc22d677af17f7fc26ddfc4328eec2f3
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- 199684
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ 2056c312fcac4c5317fb99f83b8e9fac7ce3ef59
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ e73afadaa5f2008a4f9ad36f9a1ca4026060864ad3259d8ac9efbffe5de8f70b
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ 199896
</span> }
""
""
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -647,9 +647,9 @@ array set modules {
</span> }
qtwebview {
{
<span style='display:block; white-space:pre;background:#ffe0e0;'>- f96b5422aeac539ede5cb8a1e293b630317545ff
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- 3e5082e5c53002ad6797a8a98b2738aea271dea5e26e658e51d4c1aac7ca552a
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- 108808
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ fad506b6012c4cf32b35fd44aafe4f1f24310032
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ e92fd1b050b5bbe5f6784e7ec8b3c7d9438e672bb9e903b2e57c77f9d9ff6072
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ 108856
</span> }
""
""
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -662,9 +662,9 @@ array set modules {
</span> }
qtxmlpatterns {
{
<span style='display:block; white-space:pre;background:#ffe0e0;'>- b0dd387bf439e75b7f226ec816b2979cf7a572e8
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- e4fab0a2d985994b5810af84488d6a6a7b295bd75b8efea982ab1754ddf774fe
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- 1344068
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ 29cc8524d02d4da573c3996fd18ae544b430eb01
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ 9852ab556e8b0dfc9fce29ca9cd1e4c2a0dfacb06462c3b68b672aff220f4c42
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ 1344832
</span> }
""
""
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1423,13 +1423,6 @@ foreach {module module_info} [array get modules] {
</span> set qt_list [lreplace ${qt_list} 0 0]
set framework_list [lreplace ${framework_list} 0 0]
}
<span style='display:block; white-space:pre;background:#ffe0e0;'>- set libreplace [string repeat ../ [llength ${qt_list}]][join ${framework_list} /]
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- if { ${libreplace} ne "lib" } {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- patchfiles-append patch-shared.diff
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- post-patch {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- reinplace "s|__MACPORTS_FRAMWORK_DIR__|${libreplace}|g" ${worksrcpath}/src/macdeployqt/shared/shared.cpp
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- }
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- }
</span> }
# special case
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/aqua/qt59/files/patch-shared.diff b/aqua/qt59/files/patch-shared.diff
</span>deleted file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index fde1129..0000000
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/aqua/qt59/files/patch-shared.diff
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ /dev/null
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1,11 +0,0 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>---- src/macdeployqt/shared/shared.cpp.orig 2015-02-16 21:57:17.000000000 -0700
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ src/macdeployqt/shared/shared.cpp 2015-05-31 10:36:56.000000000 -0700
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -233,7 +233,7 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- state = DylibName;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- continue;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- } else if (part < parts.count() && parts.at(part).endsWith(".framework")) {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- info.installName += "/" + (qtPath + "lib/").simplified();
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ info.installName += "/" + (qtPath + "__MACPORTS_FRAMWORK_DIR__/").simplified();
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- info.frameworkDirectory = info.installName;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- state = FrameworkName;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- continue;
</span></pre><pre style='margin:0'>
</pre>