Dessa/gentoo
1
0
Fork 0
Code Issues Pull Requests Wiki Activity

[dev-libs/mongo-c-driver] refresh patch from pr, fix libutf8proc dep

Browse Source
This commit is contained in:
Robert Förster
2025-11-15 17:04:05 +01:00
parent a0f5784eaa
commit 1231cdafe5
3 changed files with 60 additions and 24 deletions
Download Patch File Download Diff File Expand all files Collapse all files

64
dev-libs/mongo-c-driver/files/mongo-c-driver-1.30.6-docutils-0.22.patch
View File

@@ -1,24 +1,68 @@
https://jira.mongodb.org/browse/CDRIVER-6133
https://github.com/mongodb/mongo-c-driver/pull/2173
From 18143a0adc478c25df98619668635945b3f74278 Mon Sep 17 00:00:00 2001
From: Kevin Albertson <kevin.albertson@mongodb.com>
Date: Fri, 14 Nov 2025 13:36:04 -0500
Subject: [PATCH 1/2] remove unused substitutions
---
src/libmongoc/doc/conf.py | 18 ------------------
1 file changed, 18 deletions(-)
diff --git a/src/libmongoc/doc/conf.py b/src/libmongoc/doc/conf.py
index 009c33670f..7431bb55f0 100644
--- a/src/libmongoc/doc/conf.py
+++ b/src/libmongoc/doc/conf.py
@@ -133,7 +133,7 @@
.. |qenc:is-experimental| replace::
@@ -128,24 +128,6 @@ def _maybe_update_inventories(app: Sphinx):
html_use_index = True
is part of the experimental
rst_prolog = rf"""
-.. |qenc:is-experimental| replace::
-
- is part of the experimental
- `Queryable Encryption <queryable-encryption_>`_ API and may be subject
+ `Queryable Encryption <queryable-encryption_>` API and may be subject
to breaking changes in future releases.
- to breaking changes in future releases.
-
-.. |qenc:opt-is-experimental| replace::
-
- This option |qenc:is-experimental|
-
-.. |qenc:api-is-experimental| replace::
-
- This API |qenc:is-experimental|
-
-.. |qenc:range-is-experimental| replace::
-
- Range algorithm is experimental only and not intended for public use. It is subject to breaking changes.
-
.. _the findAndModify command:
https://www.mongodb.com/docs/manual/reference/command/findAndModify/
.. |qenc:opt-is-experimental| replace::
@@ -190,10 +190,10 @@
From 0466f8dd191c32fbe87585cb991192e080cae77a Mon Sep 17 00:00:00 2001
From: Kevin Albertson <kevin.albertson@mongodb.com>
Date: Fri, 14 Nov 2025 15:20:44 -0500
Subject: [PATCH 2/2] CDRIVER-6133 remove target references in substituions
---
src/libmongoc/doc/conf.py | 6 ++++--
1 file changed, 4 insertions(+), 2 deletions(-)
diff --git a/src/libmongoc/doc/conf.py b/src/libmongoc/doc/conf.py
index 7431bb55f0..6fc8e28501 100644
--- a/src/libmongoc/doc/conf.py
+++ b/src/libmongoc/doc/conf.py
@@ -170,10 +170,12 @@ def _maybe_update_inventories(app: Sphinx):
:cmake:command:`find_package() <command:find_package>`
.. |bson_t-storage-ptr| replace::
- non-``NULL`` pointer to `overwritable storage <bson_lifetimes_>`_ for a :symbol:`bson_t`
+ non-``NULL`` pointer to `overwritable storage <bson_lifetimes_>` for a :symbol:`bson_t`
+ non-``NULL`` pointer to `overwritable storage`_ for a :symbol:`bson_t`
.. |bson_t-opt-storage-ptr| replace::
- maybe-``NULL`` pointer to `overwritable storage <bson_lifetimes_>`_ for a :symbol:`bson_t`
+ maybe-``NULL`` pointer to `overwritable storage <bson_lifetimes_>` for a :symbol:`bson_t`
+ maybe-``NULL`` pointer to `overwritable storage`_ for a :symbol:`bson_t`
+
+.. _overwritable storage: https://www.mongodb.com/docs/languages/c/c-driver/current/libbson/guides/lifetimes/#overwritable-storage
.. _mongodb_docs_cdriver: https://www.mongodb.com/docs/languages/c/c-driver/current/

10
dev-libs/mongo-c-driver/mongo-c-driver-1.30.6-r1.ebuild
View File

@@ -43,11 +43,9 @@ RDEPEND="
app-arch/zstd:=
~dev-libs/libbson-${PV}[static-libs?]
>=dev-libs/libmongocrypt-1.12.0
>=dev-libs/libutf8proc-2.8.0:=[static-libs?]
virtual/zlib:=
sasl? (
dev-libs/cyrus-sasl:=
>=dev-libs/libutf8proc-2.8.0:=[static-libs?]
)
sasl? ( dev-libs/cyrus-sasl:= )
ssl? ( dev-libs/openssl:= )
"
DEPEND="
@@ -55,9 +53,7 @@ DEPEND="
test? (
dev-libs/libbson[static-libs]
dev-libs/libmongocrypt[static-libs]
sasl? (
dev-libs/libutf8proc[static-libs]
)
dev-libs/libutf8proc[static-libs]
test-full? (
dev-db/mongodb
)

10
dev-libs/mongo-c-driver/mongo-c-driver-1.30.6.ebuild
View File

@@ -42,20 +42,16 @@ RDEPEND="
app-arch/snappy:=
app-arch/zstd:=
~dev-libs/libbson-${PV}[static-libs?]
>=dev-libs/libutf8proc-2.8.0:=[static-libs?]
virtual/zlib:=
sasl? (
dev-libs/cyrus-sasl:=
>=dev-libs/libutf8proc-2.8.0:=[static-libs?]
)
sasl? ( dev-libs/cyrus-sasl:= )
ssl? ( dev-libs/openssl:= )
"
DEPEND="
${RDEPEND}
test? (
dev-libs/libbson[static-libs]
sasl? (
dev-libs/libutf8proc[static-libs]
)
dev-libs/libutf8proc[static-libs]
test-full? (
dev-db/mongodb
)