<pre style='margin:0'>
Ken (kencu) pushed a commit to branch master
in repository macports-ports.
</pre>
<p><a href="https://github.com/macports/macports-ports/commit/f62ba64ef289b0e87ebc43e2fdb71bc5d3d8c9a6">https://github.com/macports/macports-ports/commit/f62ba64ef289b0e87ebc43e2fdb71bc5d3d8c9a6</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 f62ba64ef28 qt5-qtquick3d: fix build
</span>f62ba64ef28 is described below
<span style='display:block; white-space:pre;color:#808000;'>commit f62ba64ef289b0e87ebc43e2fdb71bc5d3d8c9a6
</span>Author: Christopher Chavez <chrischavez@gmx.us>
AuthorDate: Thu Jan 14 06:40:57 2021 -0600
<span style='display:block; white-space:pre;color:#404040;'> qt5-qtquick3d: fix build
</span><span style='display:block; white-space:pre;color:#404040;'>
</span><span style='display:block; white-space:pre;color:#404040;'> Add patch to resolve error:
</span><span style='display:block; white-space:pre;color:#404040;'> Project ERROR: Library 'assimp' is not defined.
</span><span style='display:block; white-space:pre;color:#404040;'>
</span><span style='display:block; white-space:pre;color:#404040;'> Upstream issue report:
</span><span style='display:block; white-space:pre;color:#404040;'> https://bugreports.qt.io/browse/QTBUG-84037
</span>---
aqua/qt5/Portfile | 5 ++++-
aqua/qt5/files/patch-qtquick3d-assimp.diff | 14 ++++++++++++++
2 files changed, 18 insertions(+), 1 deletion(-)
<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 6c511f81247..3754f2cf80c 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;'>@@ -387,7 +387,7 @@ array set modules {
</span> {"Provides a high-level API for creating 3D content or UIs based on Qt Quick."}
"technology preview module; GPLv3 license only"
"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: {GPL-3 OpenSSLException}"
}
qtquickcontrols {
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1444,6 +1444,9 @@ foreach {module module_info} [array get modules] {
</span>
# special case
if { ${module} eq "qtquick3d" } {
<span style='display:block; white-space:pre;background:#e0ffe0;'>+ # see https://bugreports.qt.io/browse/QTBUG-84037
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ patchfiles-append patch-qtquick3d-assimp.diff
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span> # see config_help.txt
configure.post_args-append -- \
-system-quick3d-assimp
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/aqua/qt5/files/patch-qtquick3d-assimp.diff b/aqua/qt5/files/patch-qtquick3d-assimp.diff
</span>new file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index 00000000000..7998a4c8ec3
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--- /dev/null
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/aqua/qt5/files/patch-qtquick3d-assimp.diff
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -0,0 +1,14 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+See https://bugreports.qt.io/browse/QTBUG-84037 (incorrectly closed as fixed in 5.15.1; only fixed in Qt 6.0)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+Adapted from Arch Linux patch: https://git.io/JtJs8
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+Upstream-Status: Backport
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- src/plugins/assetimporters/assimp/assimp.pro.orig
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ src/plugins/assetimporters/assimp/assimp.pro
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -10,7 +10,7 @@ QT_FOR_CONFIG += assetimporters-private
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ include($$OUT_PWD/../qtassetimporters-config.pri)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ qtConfig(system-assimp):!if(cross_compile:host_build) {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- QMAKE_USE_PRIVATE += assimp
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ QMAKE_USE_PRIVATE += quick3d-assimp
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ } else {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ include(../../../3rdparty/assimp/assimp.pri)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ }
</span></pre><pre style='margin:0'>
</pre>