[dev-db/mongodb] bump 7

This commit is contained in:
Robert Förster 2025-04-14 22:14:38 +02:00
parent 9bcea35893
commit 7c5d982f3f
4 changed files with 16 additions and 13 deletions

View File

@ -1,2 +1,2 @@
DIST mongodb-6.0.21.gh.tar.gz 87688509 BLAKE2B 38bd6a62298567e2e190ccd3c3878812dde487b139e0bce2b2e5eaff83d34f474f1e62e9fed782cb0d9a50af2be9d5c5014b3a0f052b4bc5eb40a82089f0e93d SHA512 eb0fa9fe4eb27e6bb9c03ba9fc88f12c58633629e7a281442b517c4b563bc48edf19eb65d47e31748548a30510ac75b2ed0de2080f737190099fe1f9a2253de7 DIST mongodb-6.0.21.gh.tar.gz 87688509 BLAKE2B 38bd6a62298567e2e190ccd3c3878812dde487b139e0bce2b2e5eaff83d34f474f1e62e9fed782cb0d9a50af2be9d5c5014b3a0f052b4bc5eb40a82089f0e93d SHA512 eb0fa9fe4eb27e6bb9c03ba9fc88f12c58633629e7a281442b517c4b563bc48edf19eb65d47e31748548a30510ac75b2ed0de2080f737190099fe1f9a2253de7
DIST mongodb-7.0.15.gh.tar.gz 87140137 BLAKE2B e569fa4bbfdc631060071868872da57258ee1b43a6d79efb431baa33c88da405bc52f9b2b95290dbc93bc09b49cb0413b6013bdefba37a4e9acd75fccfe85e77 SHA512 79c7c3651944e37c624f8bfeb79d161b3f3f67ed8243f114f0ed943ced5f9734ef464b15a575ee6d83892728fb2b584fd943ff0dc8576c290a170c374331e6d8 DIST mongodb-7.0.18.gh.tar.gz 87225100 BLAKE2B 7ede32f4c6b6968ee8d797ce71457133020a3e4a039cd0db914e344e5042a0b871deb5741f86098b2e82b9ff619a511a754a06a29dcbb9527a3b7a7edf52b3ac SHA512 599767db66e95d8dd0bd0e6d51fd70129ea6df1e18a0cdaa52bc6cbe301c982684ff5aab446c50cb825573051e372d8f791aeab7df58e2a4d855e6073f2b46d5

View File

@ -147,13 +147,3 @@ index 92d557b..80ee9e8 100644
if use_system_version_of_library("boost"): if use_system_version_of_library("boost"):
if not conf.CheckCXXHeader("boost/filesystem/operations.hpp"): if not conf.CheckCXXHeader("boost/filesystem/operations.hpp"):
myenv.ConfError("can't find boost headers") myenv.ConfError("can't find boost headers")
@@ -5327,6 +5252,9 @@ def doConfigure(myenv):
mongoc_mode = get_option('use-system-mongo-c')
conf.env['MONGO_HAVE_LIBMONGOC'] = False
+ conf.env.ParseConfig('pkg-config libbson-1.0 libmongoc-1.0 --cflags')
+ conf.env['LIBDEPS_LIBBSON_SYSLIBDEP'] = 'bson-1.0'
+
if mongoc_mode != 'off':
if conf.CheckLibWithHeader(
["mongoc-1.0"],

View File

@ -0,0 +1,12 @@
diff -u -r a/src/mongo/util/pcre.h b/src/mongo/util/pcre.h
--- a/src/mongo/util/pcre.h 2025-03-02 16:46:18.443355487 -0500
+++ b/src/mongo/util/pcre.h 2025-03-02 16:46:59.651708274 -0500
@@ -155,7 +155,7 @@
X(ERROR_ALPHA_ASSERTION_UNKNOWN) \
X(ERROR_SCRIPT_RUN_NOT_AVAILABLE) \
X(ERROR_TOO_MANY_CAPTURES) \
- X(ERROR_CONDITION_ATOMIC_ASSERTION_EXPECTED) \
+ /*X(ERROR_CONDITION_ATOMIC_ASSERTION_EXPECTED)*/ \
X(ERROR_BACKSLASH_K_IN_LOOKAROUND) \
X(ERROR_NOMATCH) \
X(ERROR_PARTIAL) \

View File

@ -73,6 +73,7 @@ PATCHES=(
"${FILESDIR}/${PN}-6.0.21-mozjs-remove-unused-constructor.patch" "${FILESDIR}/${PN}-6.0.21-mozjs-remove-unused-constructor.patch"
"${FILESDIR}/${PN}-6.0.21-boost-filesystem-1.85.patch" "${FILESDIR}/${PN}-6.0.21-boost-filesystem-1.85.patch"
"${FILESDIR}/${PN}-6.0.21-boost-filesystem-1.85-2.patch" "${FILESDIR}/${PN}-6.0.21-boost-filesystem-1.85-2.patch"
"${FILESDIR}/${PN}-7.0.18-system-pcre.patch"
) )
python_check_deps() { python_check_deps() {
@ -99,7 +100,7 @@ pkg_pretend() {
if ver_replacing -lt ${oldver}.0; then if ver_replacing -lt ${oldver}.0; then
ewarn "To upgrade from a version earlier than the ${oldver}.0-series, you must" ewarn "To upgrade from a version earlier than the ${oldver}.0-series, you must"
ewarn "successively upgrade major releases until you have upgraded" ewarn "successively upgrade major releases until you have upgraded"
ewarn "to ${oldver}.0-series. Then upgrade to $(ver_cut 2) series." ewarn "to ${oldver}.0-series. Then upgrade to $(ver_cut 1).0 series."
else else
ewarn "Be sure to set featureCompatibilityVersion to ${oldver}.0 before upgrading." ewarn "Be sure to set featureCompatibilityVersion to ${oldver}.0 before upgrading."
fi fi
@ -128,7 +129,7 @@ src_configure() {
VERBOSE=1 VERBOSE=1
VARIANT_DIR=gentoo VARIANT_DIR=gentoo
MONGO_VERSION="${PV}" MONGO_VERSION="${PV}"
MONGO_GIT_HASH="57939cc60865b0ce431c7e08c2589fa266a1a740" MONGO_GIT_HASH="1624e181d0dac03edb34ef25b9b58a6d79969825"
--disable-warnings-as-errors --disable-warnings-as-errors
--force-jobs # Reapply #906897, fix #935274 --force-jobs # Reapply #906897, fix #935274