<pre style='margin:0'>
Zhenfu Shi (i0ntempest) pushed a commit to branch master
in repository macports-ports.
</pre>
<p><a href="https://github.com/macports/macports-ports/commit/f6cad011451888193a33ab8a4499b83cc30565e1">https://github.com/macports/macports-ports/commit/f6cad011451888193a33ab8a4499b83cc30565e1</a></p>
<pre style="white-space: pre; background: #F8F8F8"><span style='display:block; white-space:pre;color:#808000;'>commit f6cad011451888193a33ab8a4499b83cc30565e1
</span>Author: i0ntempest <szf1234@me.com>
AuthorDate: Tue Jul 5 23:19:01 2022 -0400
<span style='display:block; white-space:pre;color:#404040;'> qBittorrent: switch to qt6 and cmake
</span>---
net/qBittorrent/Portfile | 96 +++++++++++++++++-------------------------------
1 file changed, 34 insertions(+), 62 deletions(-)
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/net/qBittorrent/Portfile b/net/qBittorrent/Portfile
</span><span style='display:block; white-space:pre;color:#808080;'>index 052a2b13fd5..39c8b5debd9 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/net/qBittorrent/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/net/qBittorrent/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -2,10 +2,14 @@
</span>
PortSystem 1.0
PortGroup github 1.0
<span style='display:block; white-space:pre;background:#ffe0e0;'>-PortGroup qmake5 1.0
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+PortGroup cmake 1.1
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+PortGroup qt6 1.0
</span> PortGroup compiler_blacklist_versions 1.0
PortGroup boost 1.0
<span style='display:block; white-space:pre;background:#e0ffe0;'>+github.setup qbittorrent qBittorrent 4.4.3.1 release-
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+revision 5
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+conflicts qBittorrent-qt5
</span> categories net
maintainers {i0ntempest @i0ntempest} openmaintainer
platforms darwin
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -21,44 +25,24 @@ long_description \
</span>
homepage https://www.qbittorrent.org
<span style='display:block; white-space:pre;background:#ffe0e0;'>-if {${os.platform} ne "darwin" || ${os.major} >= 17} {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- github.setup qbittorrent qBittorrent 4.4.3.1 release-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- revision 0
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- checksums rmd160 b242c8838d212b18f3b97ee285b9a64a77c31887 \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- sha256 55900d4ccd8f6d57355225ea5ad8e14ef7cb1da5fd14c795ad3a2040afe79e81 \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- size 7736035
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- qt5.min_version 5.11
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- configure.args-append \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- CONFIG+=c++17 \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- DEFINES+=QBT_USES_LIBTORRENT2
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- compiler.cxx_standard 2017
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- compiler.blacklist-append *gcc-3.* *gcc-4.* {clang < 900.0.39.2}
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- # Taken from MKVToolNix port
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- if {${os.platform} eq "darwin" && ${os.major} == 17} {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- # libc++ on 10.13 supports std::optional but the compilers that
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- # shipped with 10.13's Xcode incorrectly believed that it didn't.
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- # https://github.com/llvm/llvm-project/commit/7fb40e1569dd66292b647f4501b85517e9247953
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- # MacPorts clang 8 and later have applied this fix.
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- compiler.blacklist-append clang macports-clang-5.0 macports-clang-6.0 macports-clang-7.0
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- }
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-} else {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- # qBittorrent 4.3.3 and later requires C++17 features and therefore won't build with
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- # libc++ on Sierra and older
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- # Also 4.3.4 to 4.3.4.1 required Qt 5.12 then lowered to 5.11 after
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- github.setup qbittorrent qBittorrent 4.3.2 release-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- revision 3
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- checksums rmd160 543c1a5b59c15912cde31d98bed55810709aef75 \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- sha256 187b8625e8787384a68a30eff3702b0e5c246512cb20013a38a25553cb18c5e7 \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- size 7867939
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- qt5.min_version 5.9
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- configure.args-append \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- CONFIG+=c++14
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- compiler.cxx_standard 2014
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- compiler.blacklist-append *gcc-3.* *gcc-4.* {clang < 900.0.39.2}
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-}
</span>
<span style='display:block; white-space:pre;background:#e0ffe0;'>+checksums rmd160 b242c8838d212b18f3b97ee285b9a64a77c31887 \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ sha256 55900d4ccd8f6d57355225ea5ad8e14ef7cb1da5fd14c795ad3a2040afe79e81 \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ size 7736035
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+qt6.min_version 6.2
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+configure.args-append \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ -DQT6=ON \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ -DVERBOSE_CONFIGURE=ON \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ -DWEBUI=OFF \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ -DGUI=OFF
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+qt6.depends_build_component \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ qttools
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+qt6.depends_component \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ qttranslations
</span>
depends_build-append \
port:pkgconfig
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -71,28 +55,17 @@ depends_lib-append \
</span> boost.depends_type \
build
<span style='display:block; white-space:pre;background:#ffe0e0;'>-qt5.depends_build_component \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- qttools
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+configure.cxxflags-append \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ -std=c++17
</span>
<span style='display:block; white-space:pre;background:#ffe0e0;'>-qt5.depends_component \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- qttranslations
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+cmake.install_rpath-append \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ ${qt_dir}/lib
</span>
<span style='display:block; white-space:pre;background:#ffe0e0;'>-# Workaround xcrun: error: SDK "macosx12" cannot be located
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-configure.sdk_version
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+compiler.cxx_standard 2017
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+compiler.blacklist-append *gcc-3.* *gcc-4.* {clang < 900.0.39.2}
</span>
<span style='display:block; white-space:pre;background:#ffe0e0;'>-configure.args-append \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- CONFIG-=silent \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- CONFIG+=nogui \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- CONFIG+=nowebui \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- CONFIG+=link_pkgconfig \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- PKGCONFIG+=libtorrent-rasterbar \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- PKGCONFIG+=openssl \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- PKGCONFIG+=zlib \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- INCLUDEPATH+=[boost::include_dir] \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- QMAKE_MACOSX_DEPLOYMENT_TARGET=${macosx_deployment_target}
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-# fix the deployment target setting to the MacPorts setting
</span> post-patch {
<span style='display:block; white-space:pre;background:#e0ffe0;'>+ # fix the deployment target setting to the MacPorts setting
</span> reinplace "s|QMAKE_MACOSX_DEPLOYMENT_TARGET = 10.14|QMAKE_MACOSX_DEPLOYMENT_TARGET = ${macosx_deployment_target}|g" \
${worksrcpath}/macxconf.pri
}
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -103,21 +76,20 @@ destroot {
</span> } else {
set appname "qbittorrent-nox"
}
<span style='display:block; white-space:pre;background:#ffe0e0;'>- reinplace "s|Plugins = PlugIns|Plugins = ${qt_dir}/plugins|g" ${worksrcpath}/src/${appname}.app/Contents/Resources/qt.conf
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- system -W ${worksrcpath}/src "/usr/bin/codesign --sign - ${appname}.app"
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- copy ${worksrcpath}/src/${appname}.app ${destroot}${applications_dir}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ reinplace "s|Plugins = PlugIns|Plugins = ${qt_dir}/plugins|g" ${build.dir}/${appname}.app/Contents/Resources/qt.conf
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ system -W ${build.dir} "/usr/bin/codesign --sign - ${appname}.app"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ copy ${build.dir}/${appname}.app ${destroot}${applications_dir}
</span> if {![variant_isset gui]} {
ln -s ${applications_dir}/${appname}.app/Contents/MacOS/${appname} ${destroot}${prefix}/bin
}
}
variant gui description {Enable GUI} {
<span style='display:block; white-space:pre;background:#ffe0e0;'>- configure.args-delete CONFIG+=nogui
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- qt5.depends_component qtmacextras
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ configure.args-replace -DGUI=OFF -DGUI=ON
</span> }
variant webui description {Enable WebUI} {
<span style='display:block; white-space:pre;background:#ffe0e0;'>- configure.args-delete CONFIG+=nowebui
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ configure.args-replace -DWEBUI=OFF -DWEBUI=ON
</span> }
default_variants \
</pre><pre style='margin:0'>
</pre>