<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/a68c0a3e76ace3c49dc7de5787572217277f60fb">https://github.com/macports/macports-ports/commit/a68c0a3e76ace3c49dc7de5787572217277f60fb</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 a68c0a3e76a KeePassXC: fix compilation with minizip
</span>a68c0a3e76a is described below

<span style='display:block; white-space:pre;color:#808000;'>commit a68c0a3e76ace3c49dc7de5787572217277f60fb
</span>Author: tenzap <fabstz-it@yahoo.fr>
AuthorDate: Sun Apr 3 21:11:12 2022 +0200

<span style='display:block; white-space:pre;color:#404040;'>    KeePassXC: fix compilation with minizip
</span><span style='display:block; white-space:pre;color:#404040;'>    
</span><span style='display:block; white-space:pre;color:#404040;'>    Closes: https://trac.macports.org/ticket/64921
</span>---
 security/KeePassXC/Portfile                        |  3 +-
 .../KeePassXC/files/patch-minizip-include.diff     | 56 ++++++++++++++++++++++
 2 files changed, 58 insertions(+), 1 deletion(-)

<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 aaecc4aad5b..d89bc66729b 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;'>@@ -33,7 +33,7 @@ license_noconflict      openssl
</span> if {${subport} eq ${name}} {
     # stable
     github.setup        keepassxreboot keepassxc 2.7.0
<span style='display:block; white-space:pre;background:#ffe0e0;'>-    revision            1
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+    revision            2
</span>     github.tarball_from releases
     distname            keepassxc-${version}-src
     use_xz              yes
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -104,6 +104,7 @@ depends_lib-append      port:argon2 \
</span> patchfiles              patch-no-deployqt.diff \
                         patch-no-findpackage-path.diff \
                         patch-qt56-qoverload.diff \
<span style='display:block; white-space:pre;background:#e0ffe0;'>+                        patch-minizip-include.diff \
</span>                         patch-touch-id.diff
 
 # KeePassXC uses -fstack-protector-strong on Clang [1]. That flag is not
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/security/KeePassXC/files/patch-minizip-include.diff b/security/KeePassXC/files/patch-minizip-include.diff
</span>new file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index 00000000000..34dfce57264
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--- /dev/null
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/security/KeePassXC/files/patch-minizip-include.diff
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -0,0 +1,56 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+From 31db3c325d2ffc9dedc240d8ac5036fe6f1cf5c3 Mon Sep 17 00:00:00 2001
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+From: Jonathan White <support@dmapps.us>
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+Date: Thu, 24 Mar 2022 22:53:02 -0400
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+Subject: [PATCH] Fix compiling with minizip-ng
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+* minizip-ng has slightly different defines and function names than the original minizip. These changes adapt the existing code to use the minizip-ng versions if necessary.
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+---
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ src/keeshare/CMakeLists.txt  | 1 -
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ src/keeshare/ShareExport.cpp | 9 ++++++++-
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ src/keeshare/ShareImport.cpp | 2 +-
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ 3 files changed, 9 insertions(+), 3 deletions(-)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+diff --git a/src/keeshare/CMakeLists.txt b/src/keeshare/CMakeLists.txt
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+index 9fcc55dc28..a108b784b8 100644
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- src/keeshare/CMakeLists.txt
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ src/keeshare/CMakeLists.txt
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -17,6 +17,5 @@ if(WITH_XC_KEESHARE)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ 
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+     add_library(keeshare STATIC ${keeshare_SOURCES})
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+     target_link_libraries(keeshare PUBLIC Qt5::Core Qt5::Widgets ${BOTAN2_LIBRARIES} ${ZLIB_LIBRARIES} PRIVATE ${MINIZIP_LIBRARIES})
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-    target_include_directories(keeshare SYSTEM PRIVATE ${MINIZIP_INCLUDE_DIR})
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+     include_directories(${CMAKE_CURRENT_SOURCE_DIR} ${CMAKE_CURRENT_BINARY_DIR})
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ endif(WITH_XC_KEESHARE)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+diff --git a/src/keeshare/ShareExport.cpp b/src/keeshare/ShareExport.cpp
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+index a457033af7..d43ef73cb3 100644
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- src/keeshare/ShareExport.cpp
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ src/keeshare/ShareExport.cpp
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -27,7 +27,14 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ 
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #include <QBuffer>
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #include <botan/pubkey.h>
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-#include <zip.h>
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++#include <minizip/zip.h>
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++// Compatibility with minizip-ng
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++#ifdef MZ_VERSION_BUILD
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++#undef Z_BEST_COMPRESSION
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++#define Z_BEST_COMPRESSION MZ_COMPRESS_LEVEL_BEST
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++#define zipOpenNewFileInZip64 zipOpenNewFileInZip_64
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++#endif
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ 
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ namespace
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+diff --git a/src/keeshare/ShareImport.cpp b/src/keeshare/ShareImport.cpp
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+index 123486456e..eb93912e76 100644
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- src/keeshare/ShareImport.cpp
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ src/keeshare/ShareImport.cpp
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -21,7 +21,7 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #include "keys/PasswordKey.h"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ 
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #include <QBuffer>
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-#include <unzip.h>
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++#include <minizip/unzip.h>
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ 
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ namespace
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ {
</span></pre><pre style='margin:0'>

</pre>