<pre style='margin:0'>
Herby Gillot (herbygillot) pushed a commit to branch master
in repository macports-ports.
</pre>
<p><a href="https://github.com/macports/macports-ports/commit/b1b4e8f1fdcf82ca813248c8a2c7d53557a639b9">https://github.com/macports/macports-ports/commit/b1b4e8f1fdcf82ca813248c8a2c7d53557a639b9</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 b1b4e8f1fdc qtkeychain: update to 0.13.2 for Qt5/6, 0.11.1 for Qt 4
</span>b1b4e8f1fdc is described below
<span style='display:block; white-space:pre;color:#808000;'>commit b1b4e8f1fdcf82ca813248c8a2c7d53557a639b9
</span>Author: Herby Gillot <herby.gillot@gmail.com>
AuthorDate: Wed May 10 05:21:21 2023 -0400
<span style='display:block; white-space:pre;color:#404040;'> qtkeychain: update to 0.13.2 for Qt5/6, 0.11.1 for Qt 4
</span><span style='display:block; white-space:pre;color:#404040;'>
</span><span style='display:block; white-space:pre;color:#404040;'> - add Qt6 subport
</span>---
security/qtkeychain/Portfile | 70 +++++++++++++++++++++++++++++++++-----------
1 file changed, 53 insertions(+), 17 deletions(-)
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/security/qtkeychain/Portfile b/security/qtkeychain/Portfile
</span><span style='display:block; white-space:pre;color:#808080;'>index 0a043c5eaaa..087856349cb 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/security/qtkeychain/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/security/qtkeychain/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -4,37 +4,68 @@ PortSystem 1.0
</span> PortGroup github 1.0
name qtkeychain
<span style='display:block; white-space:pre;background:#ffe0e0;'>-github.setup frankosterfeld qtkeychain 0.9.1 v
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+version 0.13.2
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+description QtKeyChain stores passwords securely
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+long_description {*}${description}
</span>
categories security
license BSD
maintainers nomaintainer
<span style='display:block; white-space:pre;background:#ffe0e0;'>-description QtKeyChain stores passwords securely
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-long_description ${description}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+depends_lib-append port:pkgconfig
</span>
use_parallel_build no
<span style='display:block; white-space:pre;background:#ffe0e0;'>-checksums rmd160 5b1a99b7f798f1d0f4b3e93136cfc04af694391e \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- sha256 e2426197f2786435ea986595943e98689cd596f70b68896186e5060b4cd11f12 \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- size 35803
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-foreach qt_major {4 5} {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+foreach qt_major {4 5 6} {
</span> subport ${name}-qt${qt_major} {
PortGroup cmake 1.1
PortGroup qt${qt_major} 1.0
<span style='display:block; white-space:pre;background:#ffe0e0;'>- if {${qt_major} eq 5} {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- qt5.depends_component qttranslations
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- configure.args-append -DBUILD_WITH_QT4=OFF
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # Only versions older than 0.12.0 support Qt4
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ if {${qt_major} eq 4} {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ github.setup frankosterfeld qtkeychain 0.11.1 v
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ checksums rmd160 9f587e90344fe2661f967a29ec7464a1977c2af1 \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ sha256 77fc6841c1743d9e6bd499989481cd9239c21bc9bf0760d41a4f4068d2f0a49d \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ size 41001
</span> } else {
<span style='display:block; white-space:pre;background:#ffe0e0;'>- configure.args-append -DBUILD_WITH_QT4=ON
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ github.setup frankosterfeld qtkeychain ${version} v
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ checksums rmd160 15931f1356fb7109882eb89bf69332a3cc27f19d \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ sha256 20beeb32de7c4eb0af9039b21e18370faf847ac8697ab3045906076afbc4caa5 \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ size 43494
</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;'>+ github.tarball_from archive
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ switch ${qt_major} {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ 6 {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ qt6.depends_lib-append qttranslations
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ configure.args-append -DBUILD_WITH_QT6=ON
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ configure.args-append -DBUILD_WITH_QT4=OFF
</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;'>+ 5 {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ qt5.depends_component qttranslations
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ configure.args-append -DBUILD_WITH_QT4=OFF
</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;'>+ 4 {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ configure.args-append -DBUILD_WITH_QT4=ON
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ }
</span> }
<span style='display:block; white-space:pre;background:#ffe0e0;'>- # correct module directory is not found for either Qt4 or Qt5
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- # see cmake/Modules/ECMGeneratePriFile.cmake
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- configure.args-append \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- -DECM_MKSPECS_INSTALL_DIR=${qt_mkspecs_dir}/modules
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ if {${qt_major} ne 6} {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # correct module directory is not found for either Qt4 or Qt5
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # see cmake/Modules/ECMGeneratePriFile.cmake
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ configure.args-append \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ -DECM_MKSPECS_INSTALL_DIR=${qt_mkspecs_dir}/modules
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ } else {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # $qt_mkspecs_dir is not defined by the Qt6 portgroups
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ configure.args-append \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ -DECM_MKSPECS_INSTALL_DIR=${prefix}/libexec/qt6/mkspecs/modules
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ }
</span> }
}
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -56,5 +87,10 @@ if {${subport} eq ${name}} {
</span> variant qt5 description "build Qt5 version of ${name}" {
depends_lib-append port:${name}-qt5
}
<span style='display:block; white-space:pre;background:#ffe0e0;'>- default_variants +qt5
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ variant qt6 description "build Qt6 version of ${name}" {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ depends_lib-append port:${name}-qt6
</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;'>+ default_variants +qt6
</span> }
</pre><pre style='margin:0'>
</pre>