From 9ddbb3455bedef1180f9f1d3e252f91864f6b9e6 Mon Sep 17 00:00:00 2001 From: toge Date: Tue, 11 Aug 2026 02:14:59 +0900 Subject: [PATCH] [lmdb] update to 1.0.1 (#53310) Co-authored-by: Billy Robert O'Neal III --- ports/lmdb/msvc.diff | 89 --------------------------------------- ports/lmdb/portfile.cmake | 3 +- ports/lmdb/vcpkg.json | 2 +- versions/baseline.json | 2 +- versions/l-/lmdb.json | 5 +++ 5 files changed, 8 insertions(+), 93 deletions(-) delete mode 100644 ports/lmdb/msvc.diff diff --git a/ports/lmdb/msvc.diff b/ports/lmdb/msvc.diff deleted file mode 100644 index 5f5d8a1fc7..0000000000 --- a/ports/lmdb/msvc.diff +++ /dev/null @@ -1,89 +0,0 @@ -diff --git a/libraries/liblmdb/mdb.c b/libraries/liblmdb/mdb.c -index 6802cc7..0862916 100644 ---- a/libraries/liblmdb/mdb.c -+++ b/libraries/liblmdb/mdb.c -@@ -7213,7 +7213,7 @@ ok: - #endif - *ret = p; - if (enc && env->me_encfunc) { -- *enc = (MDB_page *)(id3.mptr + rem * env->me_psize); -+ *enc = (MDB_page *)((char *)id3.mptr + rem * env->me_psize); - } - return rc; - } -@@ -11614,7 +11614,8 @@ mdb_env_copyfd0(MDB_env *env, HANDLE fd) - #endif - #if MDB_RPAGE_CACHE - #ifdef _WIN32 -- LARGE_INTEGER off = 0; -+ LARGE_INTEGER off; -+ off.QuadPart = 0; - #else - off_t off = 0; - #endif -@@ -11678,7 +11679,11 @@ mdb_env_copyfd0(MDB_env *env, HANDLE fd) - } - #if MDB_RPAGE_CACHE - if (MDB_REMAPPING(env->me_flags)) { -+#ifdef _WIN32 -+ off.QuadPart = wsize; -+#else - off = wsize; -+#endif - } - #endif - wsize = w3 - wsize; -@@ -11686,7 +11691,11 @@ mdb_env_copyfd0(MDB_env *env, HANDLE fd) - w2 = (wsize > MAX_WRITE) ? MAX_WRITE : wsize; - #if MDB_RPAGE_CACHE - if (MDB_REMAPPING(env->me_flags)) { -+#ifdef _WIN32 -+ MAP(rc, env, ptr, w2, off.QuadPart); -+#else - MAP(rc, env, ptr, w2, off); -+#endif - } - #endif - DO_WRITE(rc, fd, ptr, w2, len); -@@ -11704,7 +11713,11 @@ mdb_env_copyfd0(MDB_env *env, HANDLE fd) - wsize -= len; - #if MDB_RPAGE_CACHE - if (MDB_REMAPPING(env->me_flags)) { -+#ifdef _WIN32 -+ off.QuadPart += len; -+#else - off += len; -+#endif - } - #endif - continue; -@@ -11946,7 +11959,8 @@ mdb_env_incr_loadfd(MDB_env *env, HANDLE fd) - return ENOMEM; - - #ifdef _WIN32 -- SetFilePointerEx(env->me_fd, 0, NULL, FILE_BEGIN); -+ off.QuadPart = 0; -+ SetFilePointerEx(env->me_fd, off, NULL, FILE_BEGIN); - #else - lseek(env->me_fd, 0, SEEK_SET); - #endif -@@ -12011,15 +12025,16 @@ mdb_env_incr_loadfd(MDB_env *env, HANDLE fd) - ptr += rlen; - rsize -= rlen; - } -- off = (pg-prevpg-numprev) * env->me_psize; - rsize = numpgs * env->me_psize; -- if (off) { - #ifdef _WIN32 -+ off.QuadPart = (pg-prevpg-numprev) * env->me_psize; -+ if (off.QuadPart) - SetFilePointerEx(env->me_fd, off, NULL, FILE_CURRENT); - #else -+ off = (pg-prevpg-numprev) * env->me_psize; -+ if (off) - lseek(env->me_fd, off, SEEK_CUR); - #endif -- } - ptr = pbuf; - while (rsize > 0) { - w2 = (rsize > MAX_WRITE) ? MAX_WRITE: rsize; diff --git a/ports/lmdb/portfile.cmake b/ports/lmdb/portfile.cmake index c4d0793716..10ef6f17f5 100644 --- a/ports/lmdb/portfile.cmake +++ b/ports/lmdb/portfile.cmake @@ -2,11 +2,10 @@ vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO LMDB/lmdb REF "LMDB_${VERSION}" - SHA512 e51013e4fcd375cacbda19ccd49998b2f4f0b59f6888b91bb6e6cff883ada80451137fd95fb5fb9a46ef4ea294fff75a54a81448af71ac654993b52de62f2374 + SHA512 902908ca5fa66f8e2064ab44505f8172cd193c88c608a8369cc76e1285e9b36ef4c275f5b8ed21fd1ee31f0d7148a0050945dd0d5ea7cf74c24ada2f7c8d222d HEAD_REF master PATCHES getopt-win32.diff - msvc.diff ) file(COPY "${CMAKE_CURRENT_LIST_DIR}/cmake/" DESTINATION "${SOURCE_PATH}/libraries/liblmdb") diff --git a/ports/lmdb/vcpkg.json b/ports/lmdb/vcpkg.json index 9b95cfa938..9f3e6bec00 100644 --- a/ports/lmdb/vcpkg.json +++ b/ports/lmdb/vcpkg.json @@ -1,6 +1,6 @@ { "name": "lmdb", - "version": "1.0.0", + "version": "1.0.1", "description": "LMDB is an extraordinarily fast, memory-efficient database.", "homepage": "https://www.symas.com/mdb", "documentation": "http://www.lmdb.tech/doc/", diff --git a/versions/baseline.json b/versions/baseline.json index 12d6468c93..95d3eecce8 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -6225,7 +6225,7 @@ "port-version": 6 }, "lmdb": { - "baseline": "1.0.0", + "baseline": "1.0.1", "port-version": 0 }, "lodepng": { diff --git a/versions/l-/lmdb.json b/versions/l-/lmdb.json index ced7b5bb08..76f0a45319 100644 --- a/versions/l-/lmdb.json +++ b/versions/l-/lmdb.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "f739ce7cd21c21e1f5220cdf3f2d6ff1c3f48bb0", + "version": "1.0.1", + "port-version": 0 + }, { "git-tree": "56851dcbc2083a9743092224c40eb9b29d0b8933", "version": "1.0.0",