<pre style='margin:0'>
Christopher Nielsen (mascguy) pushed a commit to branch master
in repository macports-ports.
</pre>
<p><a href="https://github.com/macports/macports-ports/commit/e3cc9df77ed1f907ad35c0712668a53fad962518">https://github.com/macports/macports-ports/commit/e3cc9df77ed1f907ad35c0712668a53fad962518</a></p>
<pre style="white-space: pre; background: #F8F8F8"><span style='display:block; white-space:pre;color:#808000;'>commit e3cc9df77ed1f907ad35c0712668a53fad962518
</span>Author: John Hoyt <john.hoyt@gmail.com>
AuthorDate: Fri Nov 5 07:43:14 2021 -0400
<span style='display:block; white-space:pre;color:#404040;'> qt6: dependency and configure flag clean up, add qtremoteobjects, qtsensors, webchannel, and websockets
</span><span style='display:block; white-space:pre;color:#404040;'> qt6: configure flag and dependency clean up, add qtremoteobjects, qtsensors, webchannel, and websockets
</span>---
aqua/qt6/Portfile | 127 +++++++++++++++++++++++++++++++-----------------------
1 file changed, 73 insertions(+), 54 deletions(-)
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/aqua/qt6/Portfile b/aqua/qt6/Portfile
</span><span style='display:block; white-space:pre;color:#808080;'>index 6489d3827f1..8aae6133601 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/aqua/qt6/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/aqua/qt6/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -26,7 +26,7 @@ set branch [join [lrange [split ${version} .] 0 1] .]
</span> set qt_major [lindex [split ${version} .] 0]
# see https://www.qt.io/blog/qt-6.0-released
<span style='display:block; white-space:pre;background:#ffe0e0;'>-compiler.cxx_standard 17
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+#compiler.cxx_standard 17
</span>
master_sites https://download.qt.io/official_releases/qt/${branch}/${version}/submodules
# file sizes are significantly smaller using xz
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -133,7 +133,12 @@ array set modules {
</span> 46641424
}
""
<span style='display:block; white-space:pre;background:#ffe0e0;'>- "port:cmake port:Ninja port:harfbuzz 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 port:icu port:pcre2 path:lib/pkgconfig/harfbuzz.pc:harfbuzz port:double-conversion port:zstd"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ "port:cmake port:Ninja port:nodejs16 port:pkgconfig path:lib/pkgconfig/glib-2.0.pc:glib2 \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ path:lib/pkgconfig/harfbuzz.pc:harfbuzz port:harfbuzz port:assimp port:brotli \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ path:bin/dbus-daemon:dbus port:dbus port:double-conversion port:freetype port:glib2 port:hunspell \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ port:icu port:jasper path:include/turbojpeg.h:libjpeg-turbo port:libjpeg-turbo port:libb2 port:libpng \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ port:tiff port:md4c path:lib/pkgconfig/libpcre2-posix.pc:pcre2 port:pcre2 port:python39 port:sqlite3 \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ port:webp port:zlib path:lib/pkgconfig/libzstd.pc:zstd port:zstd port:libiconv"
</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"}
""
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -141,21 +146,6 @@ array set modules {
</span> "revision 0"
"License: "
}
<span style='display:block; white-space:pre;background:#ffe0e0;'>- qtcharts {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- 9416511d83ce2b23b9492fbf9284762f39128d65 \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- f92ad16abd382a1488e6aafa129d88887a14300cb0f237fe37bca9173cf5a688
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- 4382880
</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;'>- "qtbase qtdeclarative qtmultimedia"
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- {"Qt Charts"}
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- "GPLv3 license only"
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- "variant overrides: "
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- "revision 0"
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- "License: {GPL-3 OpenSSLException}"
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- }
</span> qtconnectivity {
{
c15218f42ec48aad9633d82a6b5594d46e533c44 \
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -179,7 +169,7 @@ array set modules {
</span> }
"port:python39"
""
<span style='display:block; white-space:pre;background:#ffe0e0;'>- "qtbase qtsvg"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ "qtbase qtsvg qtimageformats"
</span> {"Qt QML" "Qt Quick" "Qt Quick Layouts" "Qt Quick Widgets"}
""
"variant overrides: "
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -216,51 +206,51 @@ array set modules {
</span> "revision 0"
"License: "
}
<span style='display:block; white-space:pre;background:#ffe0e0;'>- qtmultimedia {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ qtnetworkauth {
</span> {
<span style='display:block; white-space:pre;background:#ffe0e0;'>- 46e921cdd129c0a112634f08faee2da0f43b2483 \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- 07764ad31d4d4ef679c3ceb861e762d12690b4fa899b3ccec45e5353309a90d0
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- 3710324
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ 56547cc10525dbf557c151a8455ac2055d680bb7 \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ 8027f85095a9c56d8cada988527454f786a5f8dd4157206db4f21299016d1c9e
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ 144292
</span> }
""
""
<span style='display:block; white-space:pre;background:#ffe0e0;'>- "qtbase qtdeclarative qtshadertools"
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- {"Qt Multimedia" "Qt Multimedia Widgets"}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ "qtbase"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ {"Qt Network Authorization"}
</span> ""
"variant overrides: "
"revision 0"
"License: "
}
<span style='display:block; white-space:pre;background:#ffe0e0;'>- qtnetworkauth {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ qtremoteobjects {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ 94d3e5037e083243c7df9ef25c628ed8b3ad63e8 \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ 76681b03bb63e1cafa38a1bfde23c194f232aaff4b010d5f58c065fdcc0b379f
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ 358628
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ }
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ ""
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ ""
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ "qtbase qtdeclarative"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ {"Qt Remote Objects"}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ ""
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ "variant overrides: "
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ "revision 0"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ "License: "
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ }
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ qtsensors {
</span> {
<span style='display:block; white-space:pre;background:#ffe0e0;'>- 56547cc10525dbf557c151a8455ac2055d680bb7 \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- 8027f85095a9c56d8cada988527454f786a5f8dd4157206db4f21299016d1c9e
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- 144292
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ d7f061244537b3b483529e8b5766198a978c502c \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ 5f55c972c52848f5c828148fded1b30de32955f7ee04867568c559991214739a
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ 2045476
</span> }
""
""
<span style='display:block; white-space:pre;background:#ffe0e0;'>- "qtbase"
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- {"Qt Network Authorization"}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ "qtbase qtdeclarative"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ {"Qt Sensors"}
</span> ""
"variant overrides: "
"revision 0"
"License: "
}
<span style='display:block; white-space:pre;background:#ffe0e0;'>- qtshadertools {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- 5cd3ff4c1bbd1c56f54fac710ce0841a1e11eba8 \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- 2c8d38724181b31cd828a56e377775c2d461ee2ea0d6362ebec411c3b288067e
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- 986656
</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;'>- "qtbase"
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- {"Qt Shader Tools" "Qt Shader Widgets"}
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- ""
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- "variant overrides: "
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- "revision 0"
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- "License: "
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- }
</span> qtserialbus {
{
00c46347f19928501a798a6f73a6a35af7c9a457 \
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -336,6 +326,36 @@ array set modules {
</span> "revision 0"
"License: "
}
<span style='display:block; white-space:pre;background:#e0ffe0;'>+ qtwebchannel {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ 88773d8e3904df163d9593c04c5e9262412bad0d \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ 035ba2e9a0e9de0baddd40f9d50014e6eb5f0b4ec741e9aec1b434e7c9e4e9c9
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ 211188
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ }
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ ""
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ ""
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ "qtbase qtdeclarative qtwebsockets"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ {"Qt WebChannel"}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ ""
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ "variant overrides: "
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ "revision 0"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ "License: "
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ }
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ qtwebsockets {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ da59cdb38216ad2fd8a563b39bb6b697fe1399d1 \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ 23344e21e96a839697abed7bf7931a8c08a752f08bf25edf240748501aba3816
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ 258064
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ }
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ ""
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ ""
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ "qtbase qtdeclarative"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ {"Qt WebSockets"}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ ""
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ "variant overrides: "
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ "revision 0"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ "License: "
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ }
</span> }
############################################################################### SQL Plugin Format
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -540,7 +560,7 @@ foreach {module module_info} [array get modules] {
</span> PortGroup openssl 1.0
# use ninja for the build/installation
<span style='display:block; white-space:pre;background:#ffe0e0;'>- build.cmd ninja
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ build.cmd "ninja"
</span> destroot.target install
# ninja needs the DESTDIR argument in the environment
destroot.destdir
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -688,6 +708,8 @@ foreach {module module_info} [array get modules] {
</span> # worksrcpatch is not necessary since using the qt configure script
configure.post_args-delete ${worksrcpath}
<span style='display:block; white-space:pre;background:#e0ffe0;'>+ configure.post_args-append -DFEATURE_pkg_config=ON
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span> # Installation options:
#-extprefix SYSROOT/PREFIX
#-hostprefix EXTPREFIX
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -730,7 +752,6 @@ foreach {module module_info} [array get modules] {
</span>
configure.args-append \
-no-testcocoon \
<span style='display:block; white-space:pre;background:#ffe0e0;'>- -no-gcov \
</span> -force-pkg-config
# Third Party Libraries:
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -742,6 +763,8 @@ foreach {module module_info} [array get modules] {
</span> -system-libpng \
-system-libjpeg \
-system-freetype \
<span style='display:block; white-space:pre;background:#e0ffe0;'>+ -system-harfbuzz \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ -system-pcre \
</span> -no-openssl \
-no-libproxy \
-system-pcre \
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -761,7 +784,6 @@ foreach {module module_info} [array get modules] {
</span> -no-tslib \
-icu \
-no-fontconfig \
<span style='display:block; white-space:pre;background:#ffe0e0;'>- -strip \
</span> -no-pch \
-no-ltcg \
-dbus-linked \
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -774,18 +796,15 @@ foreach {module module_info} [array get modules] {
</span> -no-linuxfb \
-no-kms \
-no-libinput \
<span style='display:block; white-space:pre;background:#ffe0e0;'>- -no-system-proxies
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ -no-system-proxies \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ -no-libudev \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ -no-egl
</span>
# MacOS/iOS options:
configure.args-append \
-framework \
-securetransport
<span style='display:block; white-space:pre;background:#ffe0e0;'>- # configure options that don't show up in configure --help
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- configure.args-append \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- -no-libudev \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- -no-egl
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span> # Qt builds part of the system using environment provided my MacPorts.
# It builds the rest using its own internal environment.
# For consistency, clear MacPorts environment.
</pre><pre style='margin:0'>
</pre>