<pre style='margin:0'>
Ryan Carsten Schmidt (ryandesign) pushed a commit to branch master
in repository macports-ports.
</pre>
<p><a href="https://github.com/macports/macports-ports/commit/bbed9a5e77bab54ad8700799257fe60872406315">https://github.com/macports/macports-ports/commit/bbed9a5e77bab54ad8700799257fe60872406315</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 bbed9a5e77b mongo-c-driver: Update to 1.25.4
</span>bbed9a5e77b is described below
<span style='display:block; white-space:pre;color:#808000;'>commit bbed9a5e77bab54ad8700799257fe60872406315
</span>Author: Ryan Carsten Schmidt <ryandesign@macports.org>
AuthorDate: Wed Jan 3 22:31:19 2024 -0600
<span style='display:block; white-space:pre;color:#404040;'> mongo-c-driver: Update to 1.25.4
</span>---
devel/mongo-c-driver/Portfile | 23 ++++++++++++---------
devel/mongo-c-driver/files/aligned_alloc.patch | 14 ++++++++-----
devel/mongo-c-driver/files/libbson.patch | 6 +++---
devel/mongo-c-driver/files/overlinking.patch | 28 --------------------------
4 files changed, 25 insertions(+), 46 deletions(-)
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/devel/mongo-c-driver/Portfile b/devel/mongo-c-driver/Portfile
</span><span style='display:block; white-space:pre;color:#808080;'>index 42d22b36908..f92ad67489e 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/devel/mongo-c-driver/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/devel/mongo-c-driver/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -8,16 +8,22 @@ PortGroup legacysupport 1.1
</span> # clock_gettime
legacysupport.newest_darwin_requires_legacy 15
<span style='display:block; white-space:pre;background:#ffe0e0;'>-github.setup mongodb mongo-c-driver 1.24.4
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-checksums rmd160 c53e2a8dc7a1b5a8553d07c5a9f8004c59d32179 \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- sha256 2f4a3e8943bfe3b8672c2053f88cf74acc8494dc98a45445f727901eee141544 \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- size 7916661
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+github.setup mongodb mongo-c-driver 1.25.4
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+checksums rmd160 552b2dc3ae9ac19140188f9224c5e9cc9d5f1685 \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ sha256 0ab3c5b238803b82a6b217d1ef21ea71a6e96251063322dc1038bea70a3da541 \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ size 7308431
</span>
categories devel
maintainers {ryandesign @ryandesign} openmaintainer
license Apache-2
<span style='display:block; white-space:pre;background:#ffe0e0;'>-github.tarball_from releases
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+# As of 1.25.0 a release download is no longer provided.
</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;'>+# It cannot figure out its own version when not in a git repository.
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+# https://jira.mongodb.org/browse/CDRIVER-4767
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+configure.args-append \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ -DBUILD_VERSION=${version}
</span>
configure.args-append \
-DENABLE_AUTOMATIC_INIT_AND_CLEANUP=OFF \
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -27,7 +33,7 @@ configure.args-append \
</span> -DMONGO_USE_CCACHE=OFF
if {${subport} eq ${name}} {
<span style='display:block; white-space:pre;background:#ffe0e0;'>- revision 1
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ revision 0
</span>
categories-append \
databases
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -40,7 +46,7 @@ if {${subport} eq ${name}} {
</span> ${subport} provides libmongoc, a ${description}.
depends_build-append \
<span style='display:block; white-space:pre;background:#ffe0e0;'>- port:pkgconfig
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ path:bin/pkg-config:pkgconfig
</span>
depends_lib-append \
port:cyrus-sasl2 \
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -49,9 +55,6 @@ if {${subport} eq ${name}} {
</span> port:snappy \
port:zlib
<span style='display:block; white-space:pre;background:#ffe0e0;'>- patchfiles-append \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- overlinking.patch
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span> configure.args-append \
-DENABLE_ICU=ON \
-DENABLE_MONGOC=ON \
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/devel/mongo-c-driver/files/aligned_alloc.patch b/devel/mongo-c-driver/files/aligned_alloc.patch
</span><span style='display:block; white-space:pre;color:#808080;'>index d3454001d8a..3d577b5c850 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/devel/mongo-c-driver/files/aligned_alloc.patch
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/devel/mongo-c-driver/files/aligned_alloc.patch
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1,8 +1,12 @@
</span> Don't try to use aligned_alloc on macOS 10.14.x or earlier; it's not available
in the OS's libc++ even if the compiler supports it.
<span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+The developers of mongo-c-driver decline to fix issues exclusively affecting
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+unsupported OS versions so we get to maintain this patch forever.
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span> https://jira.mongodb.org/browse/CDRIVER-4609
<span style='display:block; white-space:pre;background:#ffe0e0;'>---- src/libbson/src/bson/bson-memory.c.orig 2023-06-06 12:42:51.000000000 -0500
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ src/libbson/src/bson/bson-memory.c 2023-06-19 09:25:42.000000000 -0500
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- src/libbson/src/bson/bson-memory.c.orig 2024-01-02 14:57:49.000000000 -0600
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ src/libbson/src/bson/bson-memory.c 2024-01-03 21:30:51.000000000 -0600
</span> @@ -19,6 +19,9 @@
#include <string.h>
#include <stdio.h>
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -11,13 +15,13 @@ https://jira.mongodb.org/browse/CDRIVER-4609
</span> +#include <AvailabilityMacros.h>
+#endif
<span style='display:block; white-space:pre;background:#ffe0e0;'>- #include "bson-atomic.h"
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- #include "bson-config.h"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #include <bson/bson-atomic.h>
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #include <bson/bson-config.h>
</span> @@ -34,6 +37,7 @@
static void *
_aligned_alloc_impl (size_t alignment, size_t num_bytes)
#if defined(__STDC_VERSION__) && __STDC_VERSION__ >= 201112L && \
+ (!defined(MAC_OS_X_VERSION_MIN_REQUIRED) || MAC_OS_X_VERSION_MIN_REQUIRED >= 101500) && \
<span style='display:block; white-space:pre;background:#ffe0e0;'>- !defined(_WIN32) && !defined(__ANDROID__)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ !defined(_WIN32) && !defined(__ANDROID__) && !defined(_AIX)
</span> {
return aligned_alloc (alignment, num_bytes);
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/devel/mongo-c-driver/files/libbson.patch b/devel/mongo-c-driver/files/libbson.patch
</span><span style='display:block; white-space:pre;color:#808080;'>index 0daca741cfb..3ede4374ec5 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/devel/mongo-c-driver/files/libbson.patch
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/devel/mongo-c-driver/files/libbson.patch
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1,8 +1,8 @@
</span> Install the libbson documentation files to a place that doesn't conflict
with the mongo-c-driver documentation files.
<span style='display:block; white-space:pre;background:#ffe0e0;'>---- CMakeLists.txt.orig 2023-06-21 07:31:37.000000000 -0500
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ CMakeLists.txt 2023-06-30 19:29:27.000000000 -0500
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -603,7 +603,7 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- CMakeLists.txt.orig 2024-01-02 14:57:49.000000000 -0600
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ CMakeLists.txt 2024-01-03 21:35:35.000000000 -0600
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -550,7 +550,7 @@
</span> endif ()
install (FILES COPYING NEWS README.rst THIRD_PARTY_NOTICES
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/devel/mongo-c-driver/files/overlinking.patch b/devel/mongo-c-driver/files/overlinking.patch
</span>deleted file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index 21a7709ba2f..00000000000
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/devel/mongo-c-driver/files/overlinking.patch
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ /dev/null
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1,28 +0,0 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-Prevent libraries that use cmake to find libmongoc from being overlinked.
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-https://jira.mongodb.org/browse/CDRIVER-3431
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>---- src/libmongoc/build/cmake/libmongoc-1.0-config.cmake.in.orig 2020-01-16 21:14:56.000000000 -0600
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ src/libmongoc/build/cmake/libmongoc-1.0-config.cmake.in 2020-01-18 20:57:11.000000000 -0600
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -33,23 +33,4 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- find_library (MONGOC_LIBRARY mongoc-1.0 PATHS "@PACKAGE_LIBRARY_INSTALL_DIRS@" NO_DEFAULT_PATH)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- set (MONGOC_LIBRARIES ${MONGOC_LIBRARY} ${BSON_LIBRARIES})
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--# If this file is generated by the Autotools on Mac, SSL_LIBRARIES might be
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--# "-framework CoreFoundation -framework Security". Split into a CMake array
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--# like "-framework CoreFoundation;-framework Security".
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--set (IS_FRAMEWORK_VAR 0)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--foreach (LIB
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- @SASL_LIBRARIES@ @SSL_LIBRARIES@ @SHM_LIBRARIES@ @RESOLV_LIBRARIES@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- @SNAPPY_LIBRARIES@ @ICU_LIBRARIES@ @MONGOC_ZSTD_LIBRARIES@ @LIBMONGOCRYPT_LIBRARY@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- if (LIB STREQUAL "-framework")
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- set (IS_FRAMEWORK_VAR 1)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- continue ()
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- elseif (IS_FRAMEWORK_VAR)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- list (APPEND MONGOC_LIBRARIES "-framework ${LIB}")
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- set (IS_FRAMEWORK_VAR 0)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- else ()
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- list (APPEND MONGOC_LIBRARIES ${LIB})
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- endif ()
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--endforeach ()
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- set (MONGOC_DEFINITIONS ${BSON_DEFINITIONS})
</span></pre><pre style='margin:0'>
</pre>