<pre style='margin:0'>
Perry E. Metzger (pmetzger) pushed a commit to branch master
in repository macports-ports.
</pre>
<p><a href="https://github.com/macports/macports-ports/commit/fd42d015d99ff51b6ce1f90915f3bd0a1c0a647e">https://github.com/macports/macports-ports/commit/fd42d015d99ff51b6ce1f90915f3bd0a1c0a647e</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 fd42d015d99 KeePassXC: -devel: update to latest + adapt Portfile
</span>fd42d015d99 is described below
<span style='display:block; white-space:pre;color:#808000;'>commit fd42d015d99ff51b6ce1f90915f3bd0a1c0a647e
</span>Author: tenzap <fabstz-it@yahoo.fr>
AuthorDate: Wed Dec 15 15:42:28 2021 +0100
<span style='display:block; white-space:pre;color:#404040;'> KeePassXC: -devel: update to latest + adapt Portfile
</span><span style='display:block; white-space:pre;color:#404040;'>
</span><span style='display:block; white-space:pre;color:#404040;'> - quazip1 replaced by minizip in devel
</span><span style='display:block; white-space:pre;color:#404040;'> (move quazip1 to stable, and add minizip to devel, remove quazip patch in devel)
</span><span style='display:block; white-space:pre;color:#404040;'> - WITH_XC_KEESHARE_SECURE doesn't exist anymore in devel
</span><span style='display:block; white-space:pre;color:#404040;'> (so move it to stable)
</span>---
security/KeePassXC/Portfile | 24 +++++++++++---------
security/KeePassXC/files/devel/patch-quazip.diff | 29 ------------------------
2 files changed, 13 insertions(+), 40 deletions(-)
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/security/KeePassXC/Portfile b/security/KeePassXC/Portfile
</span><span style='display:block; white-space:pre;color:#808080;'>index 045426db2fb..3014af6ee6f 100755
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/security/KeePassXC/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/security/KeePassXC/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -54,6 +54,11 @@ if {${subport} eq ${name}} {
</span> gpg_verify.use_gpg_verification \
yes
<span style='display:block; white-space:pre;background:#e0ffe0;'>+ depends_lib-append port:quazip1
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ configure.pre_args-append \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ -DWITH_XC_KEESHARE_SECURE=ON
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span> compiler.cxx_standard 2011
patchfiles patch-no-deployqt.diff \
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -62,26 +67,25 @@ if {${subport} eq ${name}} {
</span> patch-old-mac.diff
} else {
# devel subport
<span style='display:block; white-space:pre;background:#ffe0e0;'>- github.setup keepassxreboot keepassxc 456726556dbf288fd881fcf453d7bb13c335f155
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ github.setup keepassxreboot keepassxc 12990e59ada1628a3a491afef045902ef254e38f
</span> set githash [string range ${github.version} 0 6]
<span style='display:block; white-space:pre;background:#ffe0e0;'>- version 20211208+git${githash}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ version 20211215+git${githash}
</span> revision 0
conflicts KeePassXC
<span style='display:block; white-space:pre;background:#ffe0e0;'>- checksums rmd160 84e8cba8ab75f124f9b9ae244a06a7cd4b7f906d \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- sha256 d1104c587298c26d1d02ccb01593ee70313c354d049b36ed480d8384a128e986 \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- size 10077852
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ checksums rmd160 71a484f172097333e891029ef94e510594c045ae \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ sha256 9a1c22f3ca4febf1e40fd3ce31b0643f4fd8b48c57aa30082ace44bf2ec8c278 \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ size 10070552
</span>
gpg_verify.use_gpg_verification \
no
<span style='display:block; white-space:pre;background:#ffe0e0;'>- depends_lib-append port:botan
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ depends_lib-append port:botan \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ port:minizip
</span>
patchfiles devel/patch-no-deployqt.diff \
<span style='display:block; white-space:pre;background:#ffe0e0;'>- devel/patch-no-findpackage-path.diff \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- devel/patch-quazip.diff
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ devel/patch-no-findpackage-path.diff
</span>
compiler.cxx_standard 2017
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -121,7 +125,6 @@ depends_lib-append port:argon2 \
</span> port:libsodium \
port:readline \
port:qrencode \
<span style='display:block; white-space:pre;background:#ffe0e0;'>- port:quazip1 \
</span> port:ykpers \
port:zlib
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -140,7 +143,6 @@ configure.pre_args-append \
</span> -DKEEPASSXC_BUILD_TYPE=Release \
-DWITH_XC_BROWSER=ON \
-DWITH_XC_KEESHARE=ON \
<span style='display:block; white-space:pre;background:#ffe0e0;'>- -DWITH_XC_KEESHARE_SECURE=ON \
</span> -DWITH_XC_NETWORKING=ON \
-DWITH_XC_SSHAGENT=ON \
-DWITH_XC_YUBIKEY=ON \
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/security/KeePassXC/files/devel/patch-quazip.diff b/security/KeePassXC/files/devel/patch-quazip.diff
</span>deleted file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index 4d81ba1057f..00000000000
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/security/KeePassXC/files/devel/patch-quazip.diff
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ /dev/null
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1,29 +0,0 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-From 6cfadfaabafed8d0db213044a0bd22537609381c Mon Sep 17 00:00:00 2001
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-From: tenzap <fabstz-it@yahoo.fr>
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-Date: Sat, 13 Nov 2021 15:11:35 +0100
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-Subject: [PATCH] add support for QuaZip >= 1.0
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>----
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- src/keeshare/CMakeLists.txt | 9 ++++++++-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- 1 file changed, 8 insertions(+), 1 deletion(-)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-diff --git a/src/keeshare/CMakeLists.txt b/src/keeshare/CMakeLists.txt
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-index af4bc61a8d..8749c2e4ec 100644
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>---- src/keeshare/CMakeLists.txt
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ src/keeshare/CMakeLists.txt
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -23,7 +23,14 @@ if(WITH_XC_KEESHARE)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- # Try to find libquazip5, if found, enable secure sharing
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- find_package(QuaZip)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- if(QUAZIP_FOUND)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ find_package(QuaZip-Qt5)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ if(QuaZip-Qt5_FOUND)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ message(STATUS "Using QuaZip-Qt5 (quazip ${QuaZip-Qt5_VERSION})")
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ set(WITH_XC_KEESHARE_SECURE ON PARENT_SCOPE)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ target_include_directories(keeshare SYSTEM PRIVATE QuaZip::QuaZip)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ target_link_libraries(keeshare PRIVATE QuaZip::QuaZip)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ elseif(NOT QuaZip-Qt5_FOUND AND QUAZIP_FOUND)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ message(STATUS "Using QuaZip (quazip <1.0)")
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- set(WITH_XC_KEESHARE_SECURE ON PARENT_SCOPE)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- target_include_directories(keeshare SYSTEM PRIVATE ${QUAZIP_INCLUDE_DIR})
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- target_link_libraries(keeshare PRIVATE ${QUAZIP_LIBRARIES})
</span></pre><pre style='margin:0'>
</pre>