[sqlcipher] fix windows build (microsoft#42675)

Co-authored-by: Nick D'Ademo <dademo.n@duerr-ndt.com> Co-authored-by: Kai Pastor <dg0yt@darc.de>
ParvusLacertus · Dec 16, 2024 · 39cd4f4 · 39cd4f4
1 parent 58b4954
commit 39cd4f4
Show file tree

Hide file tree

Showing 4 changed files with 9 additions and 3 deletions.
diff --git a/ports/sqlcipher/portfile.cmake b/ports/sqlcipher/portfile.cmake
@@ -18,9 +18,9 @@ file(GLOB TCLSH_CMD
 file(TO_NATIVE_PATH "${TCLSH_CMD}" TCLSH_CMD)
 file(TO_NATIVE_PATH "${SOURCE_PATH}" SOURCE_PATH_NAT)
 
-# Determine TCL version (e.g. [path]tclsh90s.exe -> 90)
+# Determine TCL version (e.g. [path]tclsh90sx.exe -> 90)
 string(REGEX REPLACE ^.*tclsh "" TCLVERSION ${TCLSH_CMD})
-string(REGEX REPLACE [A-Za-z]?${VCPKG_HOST_EXECUTABLE_SUFFIX}$ "" TCLVERSION ${TCLVERSION})
+string(REGEX REPLACE [A-Za-z]*${VCPKG_HOST_EXECUTABLE_SUFFIX}$ "" TCLVERSION ${TCLVERSION})
 
 list(APPEND NMAKE_OPTIONS
 		TCLSH_CMD="${TCLSH_CMD}"

diff --git a/ports/sqlcipher/vcpkg.json b/ports/sqlcipher/vcpkg.json
@@ -1,6 +1,7 @@
 {
   "name": "sqlcipher",
   "version": "4.6.1",
+  "port-version": 1,
   "description": "SQLCipher extends the SQLite database library to add security enhancements that make it more suitable for encrypted local data storage.",
   "homepage": "https://www.zetetic.net/sqlcipher",
   "license": null,

diff --git a/versions/baseline.json b/versions/baseline.json
@@ -8650,7 +8650,7 @@
     },
     "sqlcipher": {
       "baseline": "4.6.1",
-      "port-version": 0
+      "port-version": 1
     },
     "sqlite-modern-cpp": {
       "baseline": "2023-12-03",

diff --git a/versions/s-/sqlcipher.json b/versions/s-/sqlcipher.json
@@ -1,5 +1,10 @@
 {
   "versions": [
+    {
+      "git-tree": "11732bd26171c4420ce06505e0ab52dfb841714e",
+      "version": "4.6.1",
+      "port-version": 1
+    },
     {
       "git-tree": "50e124ac105168dff2cbe199adf15e1d13f5562f",
       "version": "4.6.1",