<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/4c823d4bc71773b624f00f1eca4185367053aa37">https://github.com/macports/macports-ports/commit/4c823d4bc71773b624f00f1eca4185367053aa37</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 4c823d4bc71 cryfs: update to 0.11.4
</span>4c823d4bc71 is described below
<span style='display:block; white-space:pre;color:#808000;'>commit 4c823d4bc71773b624f00f1eca4185367053aa37
</span>Author: Jolan <jolan78@gmail.com>
AuthorDate: Sun Jan 28 22:41:23 2024 +0100
<span style='display:block; white-space:pre;color:#404040;'> cryfs: update to 0.11.4
</span><span style='display:block; white-space:pre;color:#404040;'>
</span><span style='display:block; white-space:pre;color:#404040;'> * update to version 0.11.4
</span><span style='display:block; white-space:pre;color:#404040;'> * specify libfmt port to be used according to spdlog
</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/69167
</span>---
net/cryfs/Portfile | 16 ++++++++++------
net/cryfs/files/gitversion_python3_fix.diff | 6 +++---
2 files changed, 13 insertions(+), 9 deletions(-)
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/net/cryfs/Portfile b/net/cryfs/Portfile
</span><span style='display:block; white-space:pre;color:#808080;'>index c7dfaf17643..7f81cd819a0 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/net/cryfs/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/net/cryfs/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -6,7 +6,7 @@ PortGroup github 1.0
</span> PortGroup cmake 1.1
PortGroup boost 1.0
<span style='display:block; white-space:pre;background:#ffe0e0;'>-github.setup cryfs cryfs 0.11.2
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+github.setup cryfs cryfs 0.11.4
</span> revision 0
github.tarball_from releases
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -24,25 +24,29 @@ long_description CryFS encrypts your files, so you can safely store the
</span>
homepage https://www.cryfs.org/
<span style='display:block; white-space:pre;background:#ffe0e0;'>-checksums rmd160 798106ac28621532695bf29ec39c47e64f5bf674 \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- sha256 a89ab8fea2d494b496867107ec0a3772fe606ebd71ef12152fcd233f463a2c00 \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- size 10419264
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+checksums rmd160 dc9eb50bad04492bb7b610066661492384665d76 \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ sha256 6caca6276ce5aec40bf321fd0911b0af7bcffc44c3cb82ff5c5af944d6f75a45 \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ size 10420289
</span>
extract.mkdir yes
patchfiles gitversion_python3_fix.diff
post-patch {
<span style='display:block; white-space:pre;background:#ffe0e0;'>- reinplace "s|@@PYTHONBIN@@|${prefix}/bin/python3.10|g" ${worksrcpath}/src/gitversion/gitversion.cmake
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ reinplace "s|@@PYTHONBIN@@|${prefix}/bin/python3.12|g" ${worksrcpath}/src/gitversion/gitversion.cmake
</span> }
depends_build-append path:lib/libssl.dylib:openssl \
port:range-v3 \
port:spdlog \
<span style='display:block; white-space:pre;background:#ffe0e0;'>- port:python310
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ port:python312
</span>
depends_lib-append port:curl \
port:libomp
<span style='display:block; white-space:pre;background:#e0ffe0;'>+# This has to match the version of libfmt used by spdlog.
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+# See https://trac.macports.org/ticket/68248
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+cmake.module_path-append ${prefix}/lib/libfmt10/cmake
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span> cmake.build_type Release
universal_variant no
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/net/cryfs/files/gitversion_python3_fix.diff b/net/cryfs/files/gitversion_python3_fix.diff
</span><span style='display:block; white-space:pre;color:#808080;'>index 5660025ce29..0cc7f935706 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/net/cryfs/files/gitversion_python3_fix.diff
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/net/cryfs/files/gitversion_python3_fix.diff
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1,10 +1,10 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>---- src/gitversion/gitversion.cmake.orig 2022-02-22 06:22:55.000000000 +0100
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ src/gitversion/gitversion.cmake 2022-05-07 15:40:30.000000000 +0200
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- src/gitversion/gitversion.cmake.orig 2023-07-20 07:26:32.000000000 +0200
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ src/gitversion/gitversion.cmake 2024-01-28 00:47:33.000000000 +0100
</span> @@ -1,7 +1,7 @@
set(DIR_OF_GITVERSION_TOOL "${CMAKE_CURRENT_LIST_DIR}" CACHE INTERNAL "DIR_OF_GITVERSION_TOOL")
function (get_git_version OUTPUT_VARIABLE)
<span style='display:block; white-space:pre;background:#ffe0e0;'>-- EXECUTE_PROCESS(COMMAND python ${DIR_OF_GITVERSION_TOOL}/getversion.py
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- EXECUTE_PROCESS(COMMAND python3 ${DIR_OF_GITVERSION_TOOL}/getversion.py
</span> + EXECUTE_PROCESS(COMMAND @@PYTHONBIN@@ ${DIR_OF_GITVERSION_TOOL}/getversion.py
WORKING_DIRECTORY ${DIR_OF_GITVERSION_TOOL}
OUTPUT_VARIABLE VERSION
</pre><pre style='margin:0'>
</pre>