<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/820b1a0189293993f38f46b38011ce1d2360c89f">https://github.com/macports/macports-ports/commit/820b1a0189293993f38f46b38011ce1d2360c89f</a></p>
<pre style="white-space: pre; background: #F8F8F8"><span style='display:block; white-space:pre;color:#808000;'>commit 820b1a0189293993f38f46b38011ce1d2360c89f
</span>Author: John Hoyt <john.hoyt@gmail.com>
AuthorDate: Fri Nov 5 16:08:28 2021 -0400
<span style='display:block; white-space:pre;color:#404040;'> qt6: Fix sql plugin installation as some files conflict with qtbase
</span>---
aqua/qt6/Portfile | 22 ++++++++++++++++++++--
1 file changed, 20 insertions(+), 2 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 b9f33cb52be..342b13425f9 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;'>@@ -30,6 +30,7 @@ set qt_major [lindex [split ${version} .] 0]
</span>
# Save off the actual macports prefix for use late
set mp_prefix ${prefix}
<span style='display:block; white-space:pre;background:#e0ffe0;'>+set isSQL_module false
</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;'>@@ -745,6 +746,7 @@ foreach {module module_info} [array get modules] {
</span> -shared \
-accessibility
<span style='display:block; white-space:pre;background:#e0ffe0;'>+ # SQL Options
</span> foreach driver { db2 ibase mysql oci odbc psql sqlite } {
configure.args-append -no-sql-${driver}
}
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1014,6 +1016,10 @@ foreach {sql_names sql_info} [array get sql_plugins] {
</span> description ${dbms} Database Driver for Qt Tool Kit ${qt_major}
long_description ${dbms} Database Driver for Qt Tool Kit ${qt_major}
<span style='display:block; white-space:pre;background:#e0ffe0;'>+ # qtbase already creates the symlinks for the sql plugins
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ set isSQL_module true
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ cmake.install_prefix ${qt_dir}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span> # We need to use qt-cmake to configure the build
configure.cmd ${qt_cmake_cmd}
configure.dir ${workpath}/build
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1057,8 +1063,6 @@ foreach {sql_names sql_info} [array get sql_plugins] {
</span> }
}
<span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- # as of Qt 5.8, QMAKE_USE is used to find external libraries
</span> set use_name [string toupper ${driver}]
# In QT6, the include and library paths are now SQL database specific
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1076,6 +1080,20 @@ foreach {sql_names sql_info} [array get sql_plugins] {
</span> [subst -DCMAKE_LIBRARY_PATH=\"[lindex ${variant_info} 3]\"]
}
}
<span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ post-destroot {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # qt6-qtbase installs some Sql cmake files by default, we want to skip installing these
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # as of 6.2.1 this is necessary for:
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ if { [ file exists ${qt_dir}/lib/cmake/Qt6Sql/Qt6QSQLiteDriverPluginConfig.cmake ] } {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ set cmake_SQL_dir ${destroot}${qt_dir}/lib/cmake/Qt6Sql
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ file delete -force ${cmake_SQL_dir}/Qt6QSQLiteDriverPluginAdditionalTargetInfo.cmake
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ file delete -force ${cmake_SQL_dir}/Qt6QSQLiteDriverPluginConfig.cmake
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ file delete -force ${cmake_SQL_dir}/Qt6QSQLiteDriverPluginConfigVersion.cmake
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ file delete -force ${cmake_SQL_dir}/Qt6QSQLiteDriverPluginTargets-release.cmake
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ file delete -force ${cmake_SQL_dir}/Qt6QSQLiteDriverPluginTargets.cmake
</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> # Specify the actual location of the sqldrivers
cmake.source_dir ${cmake.source_dir}/src/plugins/sqldrivers/
}
</pre><pre style='margin:0'>
</pre>