<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/34135577eb642796660d1e4ba1e679af3c8b38a0">https://github.com/macports/macports-ports/commit/34135577eb642796660d1e4ba1e679af3c8b38a0</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 3413557 qt5*-{qtbase,qtscript}: refine dependencies
</span>3413557 is described below
<span style='display:block; white-space:pre;color:#808000;'>commit 34135577eb642796660d1e4ba1e679af3c8b38a0
</span>Author: Chih-Hsuan Yen <yan12125@gmail.com>
AuthorDate: Thu Oct 10 11:54:20 2019 +0800
<span style='display:block; white-space:pre;color:#404040;'> qt5*-{qtbase,qtscript}: refine dependencies
</span><span style='display:block; white-space:pre;color:#404040;'>
</span><span style='display:block; white-space:pre;color:#404040;'> 1. libmng and tiff for qtbase
</span><span style='display:block; white-space:pre;color:#404040;'>
</span><span style='display:block; white-space:pre;color:#404040;'> Apparently vestiges from qt4. The usages have been split into
</span><span style='display:block; white-space:pre;color:#404040;'> qtimageformats.
</span><span style='display:block; white-space:pre;color:#404040;'>
</span><span style='display:block; white-space:pre;color:#404040;'> 2. qttools for qtscript
</span><span style='display:block; white-space:pre;color:#404040;'>
</span><span style='display:block; white-space:pre;color:#404040;'> qt5-qttools brings clang and several other heavy ports. That
</span><span style='display:block; white-space:pre;color:#404040;'> dependency is not needed for qtscript by default as analyzed below.
</span><span style='display:block; white-space:pre;color:#404040;'>
</span><span style='display:block; white-space:pre;color:#404040;'> The dependency qttools of qtscript was added in 5251d66664e3 to be
</span><span style='display:block; white-space:pre;color:#404040;'> consistent with http://code.qt.io/cgit/qt/qt5.git/tree/.gitmodules.
</span><span style='display:block; white-space:pre;color:#404040;'> Here are some relevant commits in qt5.git:
</span><span style='display:block; white-space:pre;color:#404040;'>
</span><span style='display:block; white-space:pre;color:#404040;'> https://code.qt.io/cgit/qt/qt5.git/commit/?id=06c3d40cc90ae33a4d06b3dc21b9c0f23ad00c35
</span><span style='display:block; white-space:pre;color:#404040;'> (move module dependencies from qt.pro to .gitmodules)
</span><span style='display:block; white-space:pre;color:#404040;'>
</span><span style='display:block; white-space:pre;color:#404040;'> https://code.qt.io/cgit/qt/qt5.git/commit/?id=758d922716ebdedeaa6fa26369c8dbb9dff4bae4
</span><span style='display:block; white-space:pre;color:#404040;'> (Refine qt-module dependencies for massively parallel builds)
</span><span style='display:block; white-space:pre;color:#404040;'>
</span><span style='display:block; white-space:pre;color:#404040;'> In the second commit, qttools is added as a dependency of qtscript as
</span><span style='display:block; white-space:pre;color:#404040;'>
</span><span style='display:block; white-space:pre;color:#404040;'> > QtScript should be build after QtTools because an example uses UiTools.
</span><span style='display:block; white-space:pre;color:#404040;'>
</span><span style='display:block; white-space:pre;color:#404040;'> So make qtscript depend on qttools only if +examples is enabled.
</span>---
aqua/qt5/Portfile | 13 +++++++++----
aqua/qt511/Portfile | 13 +++++++++----
aqua/qt53/Portfile | 13 +++++++++----
aqua/qt55/Portfile | 13 +++++++++----
aqua/qt56/Portfile | 13 +++++++++----
aqua/qt57/Portfile | 13 +++++++++----
aqua/qt58/Portfile | 13 +++++++++----
aqua/qt59/Portfile | 13 +++++++++----
8 files changed, 72 insertions(+), 32 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 e29b90b..514a02d 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;'>@@ -151,12 +151,12 @@ array set modules {
</span> 48463288
}
""
<span style='display:block; white-space:pre;background:#ffe0e0;'>- "port:zlib port:libpng port:jpeg port:freetype path:bin/dbus-daemon:dbus port:tiff port:libmng path:lib/pkgconfig/glib-2.0.pc:glib2 port:icu port:pcre2 port:harfbuzz port:double-conversion"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ "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 port:double-conversion"
</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 3"
</span> "License: "
}
qtcanvas3d {
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -422,11 +422,11 @@ array set modules {
</span> }
""
""
<span style='display:block; white-space:pre;background:#ffe0e0;'>- "qtbase qttools"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ "qtbase"
</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 0"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ "revision 1"
</span> "License: "
}
qtscxml {
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1544,6 +1544,11 @@ foreach {module module_info} [array get modules] {
</span> if { ${module} eq "qtscript" } {
# see https://trac.macports.org/ticket/54453
patchfiles-append patch-qtscript_ceil.diff
<span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # See https://code.qt.io/cgit/qt/qt5.git/commit/?id=758d922716ebdedeaa6fa26369c8dbb9dff4bae4
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ if {[variant_isset examples]} {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ depends_lib-append port:${name}-qttools
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ }
</span> }
}
}
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/aqua/qt511/Portfile b/aqua/qt511/Portfile
</span><span style='display:block; white-space:pre;color:#808080;'>index 683a340..32066da 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/aqua/qt511/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/aqua/qt511/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -159,12 +159,12 @@ array set modules {
</span> 46997676
}
""
<span style='display:block; white-space:pre;background:#ffe0e0;'>- "port:zlib port:libpng port:jpeg port:freetype path:bin/dbus-daemon:dbus port:tiff port:libmng path:lib/pkgconfig/glib-2.0.pc:glib2 port:icu port:pcre2 port:harfbuzz"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ "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> ""
{"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 1"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ "revision 2"
</span> "License: "
}
qtcanvas3d {
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -430,11 +430,11 @@ array set modules {
</span> }
""
""
<span style='display:block; white-space:pre;background:#ffe0e0;'>- "qtbase qttools"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ "qtbase"
</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 0"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ "revision 1"
</span> "License: "
}
qtscxml {
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1530,6 +1530,11 @@ foreach {module module_info} [array get modules] {
</span> if { ${module} eq "qtscript" } {
# see https://trac.macports.org/ticket/54453
patchfiles-append patch-qtscript_ceil.diff
<span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # See https://code.qt.io/cgit/qt/qt5.git/commit/?id=758d922716ebdedeaa6fa26369c8dbb9dff4bae4
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ if {[variant_isset examples]} {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ depends_lib-append port:${name}-qttools
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ }
</span> }
}
}
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/aqua/qt53/Portfile b/aqua/qt53/Portfile
</span><span style='display:block; white-space:pre;color:#808080;'>index 7a7c5e2..b2a39af 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/aqua/qt53/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/aqua/qt53/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -135,12 +135,12 @@ array set modules {
</span> 46694044
}
""
<span style='display:block; white-space:pre;background:#ffe0e0;'>- "port:zlib port:libpng port:jpeg path:bin/dbus-daemon:dbus port:tiff port:libmng path:lib/pkgconfig/glib-2.0.pc:glib2 port:icu port:pcre port:harfbuzz"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ "port:zlib port:libpng port:jpeg path:bin/dbus-daemon:dbus path:lib/pkgconfig/glib-2.0.pc:glib2 port:icu port:pcre port:harfbuzz"
</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 0"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ "revision 1"
</span> "License: "
}
qtconnectivity {
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -316,11 +316,11 @@ array set modules {
</span> }
""
""
<span style='display:block; white-space:pre;background:#ffe0e0;'>- "qtbase qttools"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ "qtbase"
</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 0"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ "revision 1"
</span> "License: "
}
qtsensors {
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1371,6 +1371,11 @@ foreach {module module_info} [array get modules] {
</span> if { ${module} eq "qtscript" } {
# see https://trac.macports.org/ticket/54453
patchfiles-append patch-qtscript_ceil.diff
<span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # See https://code.qt.io/cgit/qt/qt5.git/commit/?id=758d922716ebdedeaa6fa26369c8dbb9dff4bae4
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ if {[variant_isset examples]} {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ depends_lib-append port:${name}-qttools
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ }
</span> }
}
}
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/aqua/qt55/Portfile b/aqua/qt55/Portfile
</span><span style='display:block; white-space:pre;color:#808080;'>index ccf0e0f..8721920 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/aqua/qt55/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/aqua/qt55/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -147,12 +147,12 @@ array set modules {
</span> 46389212
}
""
<span style='display:block; white-space:pre;background:#ffe0e0;'>- "port:zlib port:libpng port:jpeg path:bin/dbus-daemon:dbus port:tiff port:libmng path:lib/pkgconfig/glib-2.0.pc:glib2 port:icu port:pcre port:harfbuzz"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ "port:zlib port:libpng port:jpeg path:bin/dbus-daemon:dbus path:lib/pkgconfig/glib-2.0.pc:glib2 port:icu port:pcre port:harfbuzz"
</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 13"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ "revision 14"
</span> "License: "
}
qtcanvas3d {
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -343,11 +343,11 @@ array set modules {
</span> }
""
""
<span style='display:block; white-space:pre;background:#ffe0e0;'>- "qtbase qttools"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ "qtbase"
</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 2"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ "revision 3"
</span> "License: "
}
qtsensors {
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1394,6 +1394,11 @@ foreach {module module_info} [array get modules] {
</span> if { ${module} eq "qtscript" } {
# see https://trac.macports.org/ticket/54453
patchfiles-append patch-qtscript_ceil.diff
<span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # See https://code.qt.io/cgit/qt/qt5.git/commit/?id=758d922716ebdedeaa6fa26369c8dbb9dff4bae4
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ if {[variant_isset examples]} {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ depends_lib-append port:${name}-qttools
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ }
</span> }
}
}
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/aqua/qt56/Portfile b/aqua/qt56/Portfile
</span><span style='display:block; white-space:pre;color:#808080;'>index 32c8c30..ea7aefe 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/aqua/qt56/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/aqua/qt56/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -153,12 +153,12 @@ array set modules {
</span> 47840424
}
""
<span style='display:block; white-space:pre;background:#ffe0e0;'>- "port:zlib port:libpng port:jpeg port:freetype path:bin/dbus-daemon:dbus port:tiff port:libmng path:lib/pkgconfig/glib-2.0.pc:glib2 port:icu port:pcre port:harfbuzz"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ "port:zlib port:libpng port:jpeg port:freetype path:bin/dbus-daemon:dbus path:lib/pkgconfig/glib-2.0.pc:glib2 port:icu port:pcre port:harfbuzz"
</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 6"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ "revision 7"
</span> "License: "
}
qtcanvas3d {
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -349,11 +349,11 @@ array set modules {
</span> }
""
""
<span style='display:block; white-space:pre;background:#ffe0e0;'>- "qtbase qttools"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ "qtbase"
</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 2"
</span> "License: "
}
qtsensors {
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1420,6 +1420,11 @@ foreach {module module_info} [array get modules] {
</span> if { ${module} eq "qtscript" } {
# see https://trac.macports.org/ticket/54453
patchfiles-append patch-qtscript_ceil.diff
<span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # See https://code.qt.io/cgit/qt/qt5.git/commit/?id=758d922716ebdedeaa6fa26369c8dbb9dff4bae4
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ if {[variant_isset examples]} {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ depends_lib-append port:${name}-qttools
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ }
</span> }
# special case
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/aqua/qt57/Portfile b/aqua/qt57/Portfile
</span><span style='display:block; white-space:pre;color:#808080;'>index 776028d..ab1ff21 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/aqua/qt57/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/aqua/qt57/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -155,12 +155,12 @@ array set modules {
</span> 44992616
}
""
<span style='display:block; white-space:pre;background:#ffe0e0;'>- "port:zlib port:libpng port:jpeg port:freetype path:bin/dbus-daemon:dbus port:tiff port:libmng path:lib/pkgconfig/glib-2.0.pc:glib2 port:icu port:pcre port:harfbuzz"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ "port:zlib port:libpng port:jpeg port:freetype path:bin/dbus-daemon:dbus path:lib/pkgconfig/glib-2.0.pc:glib2 port:icu port:pcre port:harfbuzz"
</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 6"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ "revision 7"
</span> "License: "
}
qtcanvas3d {
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -411,11 +411,11 @@ array set modules {
</span> }
""
""
<span style='display:block; white-space:pre;background:#ffe0e0;'>- "qtbase qttools"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ "qtbase"
</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 2"
</span> "License: "
}
qtscxml {
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1503,6 +1503,11 @@ foreach {module module_info} [array get modules] {
</span> if { ${module} eq "qtscript" } {
# see https://trac.macports.org/ticket/54453
patchfiles-append patch-qtscript_ceil.diff
<span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # See https://code.qt.io/cgit/qt/qt5.git/commit/?id=758d922716ebdedeaa6fa26369c8dbb9dff4bae4
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ if {[variant_isset examples]} {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ depends_lib-append port:${name}-qttools
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ }
</span> }
# special case
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/aqua/qt58/Portfile b/aqua/qt58/Portfile
</span><span style='display:block; white-space:pre;color:#808080;'>index 1e3ea5b..7efd633 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/aqua/qt58/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/aqua/qt58/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -153,12 +153,12 @@ array set modules {
</span> 44318700
}
""
<span style='display:block; white-space:pre;background:#ffe0e0;'>- "port:zlib port:libpng port:jpeg port:freetype path:bin/dbus-daemon:dbus port:tiff port:libmng path:lib/pkgconfig/glib-2.0.pc:glib2 port:icu port:pcre port:harfbuzz"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ "port:zlib port:libpng port:jpeg port:freetype path:bin/dbus-daemon:dbus path:lib/pkgconfig/glib-2.0.pc:glib2 port:icu port:pcre port:harfbuzz"
</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 5"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ "revision 6"
</span> "License: "
}
qtcanvas3d {
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -409,11 +409,11 @@ array set modules {
</span> }
""
""
<span style='display:block; white-space:pre;background:#ffe0e0;'>- "qtbase qttools"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ "qtbase"
</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 0"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ "revision 1"
</span> "License: "
}
qtscxml {
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1528,6 +1528,11 @@ foreach {module module_info} [array get modules] {
</span> if { ${module} eq "qtscript" } {
# see https://trac.macports.org/ticket/54453
patchfiles-append patch-qtscript_ceil.diff
<span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # See https://code.qt.io/cgit/qt/qt5.git/commit/?id=758d922716ebdedeaa6fa26369c8dbb9dff4bae4
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ if {[variant_isset examples]} {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ depends_lib-append port:${name}-qttools
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ }
</span> }
# special case
<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 0c2a7e05..be6c832 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;'>@@ -157,12 +157,12 @@ array set modules {
</span> 45245896
}
""
<span style='display:block; white-space:pre;background:#ffe0e0;'>- "port:zlib port:libpng port:jpeg port:freetype path:bin/dbus-daemon:dbus port:tiff port:libmng path:lib/pkgconfig/glib-2.0.pc:glib2 port:icu port:pcre2 port:harfbuzz"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ "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> ""
{"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 1"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ "revision 2"
</span> "License: "
}
qtcanvas3d {
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -428,11 +428,11 @@ array set modules {
</span> }
""
""
<span style='display:block; white-space:pre;background:#ffe0e0;'>- "qtbase qttools"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ "qtbase"
</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 0"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ "revision 1"
</span> "License: "
}
qtscxml {
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1507,6 +1507,11 @@ foreach {module module_info} [array get modules] {
</span> if { ${module} eq "qtscript" } {
# see https://trac.macports.org/ticket/54453
patchfiles-append patch-qtscript_ceil.diff
<span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # See https://code.qt.io/cgit/qt/qt5.git/commit/?id=758d922716ebdedeaa6fa26369c8dbb9dff4bae4
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ if {[variant_isset examples]} {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ depends_lib-append port:${name}-qttools
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ }
</span> }
# special case
</pre><pre style='margin:0'>
</pre>