<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/a8d3cf421b10ba0604ebd4905a9a879bcfa54b81">https://github.com/macports/macports-ports/commit/a8d3cf421b10ba0604ebd4905a9a879bcfa54b81</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 a8d3cf421b1 KeePassXC-devel: update to latest devel (>= 2.7.0-beta1)
</span>a8d3cf421b1 is described below
<span style='display:block; white-space:pre;color:#808000;'>commit a8d3cf421b10ba0604ebd4905a9a879bcfa54b81
</span>Author: tenzap <fabstz-it@yahoo.fr>
AuthorDate: Thu Mar 10 20:07:12 2022 +0100
<span style='display:block; white-space:pre;color:#404040;'> KeePassXC-devel: update to latest devel (>= 2.7.0-beta1)
</span>---
security/KeePassXC/Portfile | 10 ++++----
.../KeePassXC/files/devel/patch-no-deployqt.diff | 30 ++++++++++++++--------
2 files changed, 24 insertions(+), 16 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 3014af6ee6f..6258a24e57f 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;'>@@ -67,16 +67,16 @@ 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 12990e59ada1628a3a491afef045902ef254e38f
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ github.setup keepassxreboot keepassxc 0ad75ccb8fa4228880b035516eb9905517f8b12f
</span> set githash [string range ${github.version} 0 6]
<span style='display:block; white-space:pre;background:#ffe0e0;'>- version 20211215+git${githash}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ version 20220307+git${githash}
</span> revision 0
conflicts KeePassXC
<span style='display:block; white-space:pre;background:#ffe0e0;'>- checksums rmd160 71a484f172097333e891029ef94e510594c045ae \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- sha256 9a1c22f3ca4febf1e40fd3ce31b0643f4fd8b48c57aa30082ace44bf2ec8c278 \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- size 10070552
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ checksums rmd160 24a38c4d0d97ae73f1bbfb3ebba9f6e525c10be7 \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ sha256 ce0c8531e93d3981280fe0044909ef05d9f4c47314f82eab801b98e6b1b8d4e4 \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ size 10637994
</span>
gpg_verify.use_gpg_verification \
no
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/security/KeePassXC/files/devel/patch-no-deployqt.diff b/security/KeePassXC/files/devel/patch-no-deployqt.diff
</span><span style='display:block; white-space:pre;color:#808080;'>index 75f01199f8b..37c29d1b259 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/security/KeePassXC/files/devel/patch-no-deployqt.diff
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/security/KeePassXC/files/devel/patch-no-deployqt.diff
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -28,37 +28,45 @@
</span> install(TARGETS ${PROGNAME}
--- src/autotype/mac/CMakeLists.txt
+++ src/autotype/mac/CMakeLists.txt
<span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -7,8 +7,8 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -10,10 +10,8 @@
</span> if(WITH_APP_BUNDLE)
add_custom_command(TARGET keepassxc-autotype-cocoa
POST_BUILD
+ COMMAND ${CMAKE_COMMAND} -E make_directory ${PLUGIN_INSTALL_DIR}
COMMAND ${CMAKE_COMMAND} -E copy ${CMAKE_CURRENT_BINARY_DIR}/libkeepassxc-autotype-cocoa.so ${PLUGIN_INSTALL_DIR}/libkeepassxc-autotype-cocoa.so
<span style='display:block; white-space:pre;background:#ffe0e0;'>-- COMMAND ${MACDEPLOYQT_EXE} ${PROGNAME}.app -executable=${PLUGIN_INSTALL_DIR}/libkeepassxc-autotype-cocoa.so -no-plugins 2> /dev/null
</span> WORKING_DIRECTORY ${CMAKE_BINARY_DIR}/src
<span style='display:block; white-space:pre;background:#ffe0e0;'>- COMMENT "Deploying autotype plugin")
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- else()
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ COMMENT "Copying autotype plugin into app bundle")
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- kpxc_run_macdeployqt_on_installed_helper_binary(
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- "${PROGNAME}" "${PLUGIN_INSTALL_DIR}/libkeepassxc-autotype-cocoa.so")
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ endif()
</span> --- src/cli/CMakeLists.txt
+++ src/cli/CMakeLists.txt
<span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -73,8 +73,8 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- set(CLI_APP_DIR "${CMAKE_BINARY_DIR}/src/${CLI_INSTALL_DIR}")
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -74,10 +74,8 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span> add_custom_command(TARGET keepassxc-cli
POST_BUILD
+ COMMAND ${CMAKE_COMMAND} -E make_directory ${CLI_APP_DIR}
COMMAND ${CMAKE_COMMAND} -E copy ${CMAKE_CURRENT_BINARY_DIR}/keepassxc-cli ${CLI_APP_DIR}/keepassxc-cli
<span style='display:block; white-space:pre;background:#ffe0e0;'>-- COMMAND ${MACDEPLOYQT_EXE} ${PROGNAME}.app -executable=${CLI_APP_DIR}/keepassxc-cli -no-plugins 2> /dev/null
</span> WORKING_DIRECTORY ${CMAKE_BINARY_DIR}/src
<span style='display:block; white-space:pre;background:#ffe0e0;'>- COMMENT "Deploying keepassxc-cli")
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ COMMENT "Copying keepassxc-cli into app bundle")
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- kpxc_run_macdeployqt_on_installed_helper_binary(
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- "${PROGNAME}" "${CLI_INSTALL_DIR}/keepassxc-cli")
</span> endif()
--- src/proxy/CMakeLists.txt
+++ src/proxy/CMakeLists.txt
<span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -33,8 +33,8 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -33,12 +33,10 @@
</span> set(PROXY_APP_DIR "${CMAKE_BINARY_DIR}/src/${PROXY_INSTALL_DIR}")
add_custom_command(TARGET keepassxc-proxy
POST_BUILD
+ COMMAND ${CMAKE_COMMAND} -E make_directory ${PROXY_APP_DIR}
COMMAND ${CMAKE_COMMAND} -E copy ${CMAKE_CURRENT_BINARY_DIR}/keepassxc-proxy ${PROXY_APP_DIR}/keepassxc-proxy
<span style='display:block; white-space:pre;background:#ffe0e0;'>-- COMMAND ${MACDEPLOYQT_EXE} ${PROGNAME}.app -executable=${PROXY_APP_DIR}/keepassxc-proxy -no-plugins 2> /dev/null
</span> WORKING_DIRECTORY ${CMAKE_BINARY_DIR}/src
<span style='display:block; white-space:pre;background:#ffe0e0;'>- COMMENT "Deploying keepassxc-proxy")
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ COMMENT "Copying keepassxc-proxy into app bundle")
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- kpxc_run_macdeployqt_on_installed_helper_binary(
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- "${PROGNAME}" "${PROXY_INSTALL_DIR}/keepassxc-proxy")
</span> endif()
<span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ if(WIN32)
</span></pre><pre style='margin:0'>
</pre>